From fedora-extras-commits at redhat.com  Tue Mar  1 08:19:15 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 1 Mar 2005 03:19:15 -0500
Subject: rpms/gnome-themes-extras/FC-3
	gnome-themes-extras-0.8.0-fix-subscript-out-of-range.patch,
	NONE, 1.1 gnome-themes-extras.spec, 1.5, 1.6
Message-ID: <200503010819.j218JFFm030423@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/gnome-themes-extras/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30416

Modified Files:
	gnome-themes-extras.spec 
Added Files:
	gnome-themes-extras-0.8.0-fix-subscript-out-of-range.patch 
Log Message:
need to remember to check in changes also on FC-3 branch


gnome-themes-extras-0.8.0-fix-subscript-out-of-range.patch:

--- NEW FILE gnome-themes-extras-0.8.0-fix-subscript-out-of-range.patch ---
diff -ur gnome-themes-extras-0.8.0-orig/Smooth/smooth_style.c gnome-themes-extras-0.8.0/Smooth/smooth_style.c
--- gnome-themes-extras-0.8.0-orig/Smooth/smooth_style.c	2005-02-27 18:15:17.000000000 +0100
+++ gnome-themes-extras-0.8.0/Smooth/smooth_style.c	2005-02-28 17:15:08.000000000 +0100
@@ -1369,7 +1369,7 @@
 	
 	/* draw inner shadow line(s)  */	
 	{
-	  GdkGC		*gc[3], *use_gc=NULL, *mid_gc=NULL, *bg_gc=style->bg_gc[state_type];
+	  GdkGC		*gc[4], *use_gc=NULL, *mid_gc=NULL, *bg_gc=style->bg_gc[state_type];
 	  gdouble		angle;
 	  gint		j,i, x1,y1, x2,y2, xt, yt, mx=0,my=0, sign;
 	


Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-3/gnome-themes-extras.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-themes-extras.spec	2 Feb 2005 13:59:16 -0000	1.5
+++ gnome-themes-extras.spec	1 Mar 2005 08:19:13 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           gnome-themes-extras
 Version:        0.8.0
-Release:        1
+Release:        2
 Summary:        Collection of metathemes for the GNOME desktop environment
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://librsvg.sourceforge.net/theme.php
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.8/gnome-themes-extras-0.8.0.tar.bz2
+Patch0:         gnome-themes-extras-0.8.0-fix-subscript-out-of-range.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  librsvg2-devel >= 2.1.3
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure
@@ -37,6 +39,7 @@
 
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/gtk-2.0/2.4.0/engines/*.la
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/gtk-2.0/2.4.0/engines/*.a
+# part of gnome-themes
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/gtk-2.0/2.4.0/engines/libsmooth.so
 
 %clean
@@ -54,6 +57,9 @@
 
 
 %changelog
+* Mon Feb 28 2005 Adrian Reber <adrian at lisas.de> - 0.8.0-2
+- added a patch with a fix for compiler warnings (bug #149713)
+
 * Fri Nov 26 2004 Adrian Reber <adrian at lisas.de> - 0:0.8.0-0.fdr.1
 - updated to 0.8.0
 - changed gtk-2.0/2.2 to gtk-2.0/2.4



From adrian at lisas.de  Tue Mar  1 16:55:36 2005
From: adrian at lisas.de (Adrian Reber)
Date: Tue, 1 Mar 2005 17:55:36 +0100
Subject: APPROVED: vnstat
Message-ID: <20050301165536.GA3057@lisas.de>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

https://www.redhat.com/archives/fedora-extras-list/2005-February/msg00591.html
vnstat: A console-based network traffic monitor

Maintainer: Adrian Reber
Reviewed by: Matthias Saou
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)

iD8DBQFCJJ5stzAqCj7W8DQRAkNbAKDM2In2eCxbOFpADAl/y+v27xkKlQCgrLjR
eiSTdQ3ZaPMTIZIv64I71Mw=
=hc+a
-----END PGP SIGNATURE-----



From fedora-extras-commits at redhat.com  Tue Mar  1 18:26:13 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Mar 2005 13:26:13 -0500
Subject: rpms/lighttpd/devel lighttpd.spec,1.1,1.2
Message-ID: <200503011826.j21IQDMt012315@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	lighttpd.spec 
Log Message:
Fix missing defattr in sub-packages.



Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lighttpd.spec	23 Feb 2005 00:12:23 -0000	1.1
+++ lighttpd.spec	1 Mar 2005 18:26:10 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.3.11
-Release: 1
+Release: 2
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -147,11 +147,13 @@
 %{webroot}/
 
 %files mod_mysql_vhost
+%defattr(-, root, root, 0755)
 %doc doc/mysqlvhost.txt
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
 %files fastcgi
+%defattr(-, root, root, 0755)
 %doc doc/fastcgi*.txt
 %config(noreplace) %{_sysconfdir}/php.d/lighttpd.ini
 %{_bindir}/spawn-fcgi
@@ -160,6 +162,9 @@
 
 
 %changelog
+* Tue Mar  1 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-2
+- Add missing defattr to sub-packages (#150018).
+
 * Mon Feb 21 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-0
 - Update to 1.3.11.
 - Remove cleanconf and init.d patches (merged upstream).



From fedora-extras-commits at redhat.com  Tue Mar  1 18:26:13 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Mar 2005 13:26:13 -0500
Subject: rpms/lighttpd/FC-3 lighttpd.spec,1.1,1.2
Message-ID: <200503011826.j21IQDPI012312@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	lighttpd.spec 
Log Message:
Fix missing defattr in sub-packages.



Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-3/lighttpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lighttpd.spec	23 Feb 2005 00:12:23 -0000	1.1
+++ lighttpd.spec	1 Mar 2005 18:26:10 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.3.11
-Release: 1
+Release: 2
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -147,11 +147,13 @@
 %{webroot}/
 
 %files mod_mysql_vhost
+%defattr(-, root, root, 0755)
 %doc doc/mysqlvhost.txt
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
 %files fastcgi
+%defattr(-, root, root, 0755)
 %doc doc/fastcgi*.txt
 %config(noreplace) %{_sysconfdir}/php.d/lighttpd.ini
 %{_bindir}/spawn-fcgi
@@ -160,6 +162,9 @@
 
 
 %changelog
+* Tue Mar  1 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-2
+- Add missing defattr to sub-packages (#150018).
+
 * Mon Feb 21 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-0
 - Update to 1.3.11.
 - Remove cleanconf and init.d patches (merged upstream).



From fedora-extras-commits at redhat.com  Tue Mar  1 18:36:30 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 1 Mar 2005 13:36:30 -0500
Subject: rpms/vnstat - New directory
Message-ID: <200503011836.j21IaUhs012415@cvs-int.fedora.redhat.com>

Author: adrian

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

Log Message:
Directory /cvs/extras/rpms/vnstat added to the repository




From fedora-extras-commits at redhat.com  Tue Mar  1 18:36:30 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 1 Mar 2005 13:36:30 -0500
Subject: rpms/vnstat/devel - New directory
Message-ID: <200503011836.j21IaUjh012418@cvs-int.fedora.redhat.com>

Author: adrian

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

Log Message:
Directory /cvs/extras/rpms/vnstat/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar  1 18:36:51 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 1 Mar 2005 13:36:51 -0500
Subject: rpms/vnstat Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503011836.j21IapjZ012477@cvs-int.fedora.redhat.com>

Author: adrian

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module vnstat


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

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

common : CVS/Root
	@cvs 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 Mar  1 18:36:51 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 1 Mar 2005 13:36:51 -0500
Subject: rpms/vnstat/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503011836.j21IapNg012480@cvs-int.fedora.redhat.com>

Author: adrian

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vnstat


--- 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 Mar  1 18:37:44 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 1 Mar 2005 13:37:44 -0500
Subject: rpms/vnstat import.log,1.1,1.2
Message-ID: <200503011837.j21Ibihd012580@cvs-int.fedora.redhat.com>

Author: adrian

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vnstat/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Mar 2005 18:36:49 -0000	1.1
+++ import.log	1 Mar 2005 18:37:42 -0000	1.2
@@ -0,0 +1 @@
+vnstat-1_4-3:HEAD:vnstat-1.4-3.src.rpm:1109702252



From fedora-extras-commits at redhat.com  Tue Mar  1 18:37:44 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 1 Mar 2005 13:37:44 -0500
Subject: rpms/vnstat/devel FAQ.vnstat, NONE, 1.1 vnstat.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503011837.j21IbieV012583@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	.cvsignore sources 
Added Files:
	FAQ.vnstat vnstat.spec 
Log Message:
auto-import vnstat-1.4-3 on branch devel from vnstat-1.4-3.src.rpm


--- NEW FILE FAQ.vnstat ---
vnStat FAQ (for version 1.4+, 15.4.2004)


1. How should dialup users use vnStat? There's some errors
because the interface isn't available when offline.

 That's all explained at the end of the README. The idea
 is to include vnStat with enable/disable parameters in
 scripts related with the used interface. Example scripts
 can be found from the pppd directory that came with the
 source package.

2. Does vnStat work for PPPOE users?

 Although I haven't tested it, it's been reported to work
 if the supplied ppp scripts are installed correctly. As
 always, see the README and the man page.

3. How do I uninstall vnStat?

 You only need to run 'make uninstall' in the directory that
 comes when the .tar.gz is extracted. Just make sure it's
 the same version you have installed.

4. What does the 'estimated' value mean?

 The estimated value is an calculated average that tries to
 guess the total traffic for the current day/month based on
 previous traffic. This estimate works fairly well if the
 monitored interface has constant traffic of the same
 magnitude (like game servers). It can't predic peaks but
 the accuracy usually gets better by the end of the day/month.

5. Why isn't the estimated value shown with --dumpdb?

 That features only dumps the database and since the estimate
 is always calculated in realtime, there's no reason to write
 it into the database.

6. How is the estimated value calculated?

 estimate = ( x / y ) * z

   x = traffic so far for the day/month
   y = passed minutes/hours ...
   z = total minutes/hours ...

7. Why does vnStat show sometimes multiple GB of traffic although
my network connection can't even transfer that much?
     OR
Each update adds the complete amount of traffic and 'vnstat -u -D'
claims that the system has been rebooted between updates.

 That's most likely a broken kernel. Run with --testkernel
 (version 1.2+ required) and see the result. See the next question
 for some explanation.

8. Why is there problems with most 2.4.18 kernels?

 Every current kernel has a btime (boot time) value in /proc/stat
 that indicates when the system was booted. vnStat uses this to
 know when the interface counters in the database should be
 reseted. Unfortunately, some kernels don't keep the btime value
 static even when the system isn't rebooted.

9. warning: integer constant is too large for "long" type -messages
during compiling with gcc 3.xx?

 Like that message says, that's only a warning, not an error.

10. About bug reports

 Any bug report should at least include an explanation about
 how the bug can be reproduced. Having output dumps usually
 helps and the --dumpdb feature should be used if there's some
 reason to assume the bug has something to do with the database.
 Also include information about the used distribution, kernel
 (uname -a), compiler (gcc --version) and network interface
 card. Read the report again before sending it. :)


--- NEW FILE vnstat.spec ---
Summary: 	Console-based network traffic monitor
Name: 		vnstat
Version: 	1.4
Release: 	3
License: 	GPL
Group: 		System Environment/Daemons
URL: 		http://humdi.net/vnstat/
Source0: 	http://humdi.net/vnstat/vnstat-%{version}.tar.gz
Source1: 	FAQ.vnstat
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
vnStat is a console-based network traffic monitor that uses the
/proc -filesystem to get the needed information. This means that vnStat wont
actually be sniffing any traffic. See the webpage for few 'screenshots'.

%prep
%setup -q
%{__cp} %{SOURCE1} FAQ

%build
%{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
%{__mkdir_p} $RPM_BUILD_ROOT%{_sbindir}
%{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/man1
%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig

%{__install} -m 644 man/vnstat.1 $RPM_BUILD_ROOT%{_mandir}/man1
%{__install} -m 755 src/vnstat $RPM_BUILD_ROOT%{_bindir}

%{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/%{name} << END
MAILTO=root
# to enable intrerface monitoring via vnstat remove comment on next line
# */5 * * * *  vnstat %{_sbindir}/%{name}.cron
END

%{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} << END
# see also: vnstat(1)
# the following sets vnstat up to monitor eth0
VNSTAT_OPTIONS="-u -i eth0"
END

%{__cat} >> $RPM_BUILD_ROOT%{_sbindir}/%{name}.cron << END
#!/bin/bash
# this script (%{_sbindir}/%{name}.cron) reads %{_sysconfdir}/sysconfig/%{name}
# to start %{_bindir}/%{name}.
# example for %{_sysconfdir}/sysconfig/%{name}:
# VNSTAT_OPTIONS="-u -i eth0"
# see also: vnstat(1)

VNSTAT_CONF=%{_sysconfdir}/sysconfig/%{name}

if [ ! -f $VNSTAT_CONF ]; then
        exit 0
fi

. \$VNSTAT_CONF

%{_bindir}/%{name} \$VNSTAT_OPTIONS
END

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%pre
useradd -r -s /sbin/nologin -d %{_localstatedir}/lib/%{name} -c 'vnstat user' %{name} >/dev/null 2>&1 ||:

%preun
if [ "$1" -eq "0" ]; then
        userdel %{name}
fi

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING FAQ README INSTALL cron pppd
%config(noreplace) %{_sysconfdir}/cron.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_mandir}/man1/*
%{_bindir}/%{name}
%attr(755,root,root)%{_sbindir}/%{name}.cron
%attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name}

%changelog
* Mon Feb 28 2005 Adrian Reber <adrian at lisas.de> 1.4-3
- removed occurences of VNSTAT_DISABLED in
  %{_sysconfdir}/sysconfig/%{name} and
  %{_sbindir}/%{name}.cron 

* Thu Feb 24 2005 Adrian Reber <adrian at lisas.de> 1.4-2
- removed "#--------------"
- added %%{version} to Source0
- replaced almost empty FAQ with the one from the web
- added INSTALL to %%doc
- added %{_sysconfdir}/sysconfig/%{name}
  and %{_sbindir}/%{name}.cron to allow flexible configuration
- cron script and configuration file defaults to vnstat disabled
- added example scripts from cron/* and pppd/* to %%doc

* Wed Jul 21 2004 Adrian Reber <adrian at lisas.de> 1.4-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vnstat/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Mar 2005 18:36:49 -0000	1.1
+++ .cvsignore	1 Mar 2005 18:37:42 -0000	1.2
@@ -0,0 +1 @@
+vnstat-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vnstat/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Mar 2005 18:36:49 -0000	1.1
+++ sources	1 Mar 2005 18:37:42 -0000	1.2
@@ -0,0 +1 @@
+9184f79b5e60499bc059f670032291e5  vnstat-1.4.tar.gz



From adrian at lisas.de  Tue Mar  1 19:06:02 2005
From: adrian at lisas.de (Adrian Reber)
Date: Tue, 1 Mar 2005 20:06:02 +0100
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <20050227024321.73e1a839.bugs.michael@gmx.net>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
Message-ID: <20050301190602.GA14804@lisas.de>

On Sun, Feb 27, 2005 at 02:43:21AM +0100, Michael Schwendt wrote:
> > > > Packages imported using cvs-import.sh seem to appear in devel only?
> > > > What is the procedure for managing packages in both FC-3 and devel.
> > > 
> > > "cvs-import -b FC-3 ..." or to check out the FC-3 branch directory
> > > of the module you want to edit, e.g. "cvs co foo/FC-3".
> > Hmmm...
> > Checking out the modules file...
> > ERROR: You have requested to import a package into the branch FC-3 of
> > the
> > module graveman, but according to the modules file this branch does not
> > exist.
> 
> That is because cvs-import.sh can only create new modules in the "devel"
> branch.
> 
> Effectively, after the FC-3-split, we now cannot import new packages
> into the FC-3 tree like we could not import new packages into FC-2,
> FC-1, RHL-9 before (we have tracked all those deferred updates on the
> FC3Status page).

Just to make sure I understand this correctly: All newly imported packages
after branching CVS cannot be available for FC-3 and there is no way around it?

		Adrian



From skvidal at phy.duke.edu  Tue Mar  1 19:12:20 2005
From: skvidal at phy.duke.edu (seth vidal)
Date: Tue, 01 Mar 2005 14:12:20 -0500
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <20050301190602.GA14804@lisas.de>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
Message-ID: <1109704340.31304.16.camel@cutter>


>Just to make sure I understand this correctly: All newly imported packages
>after branching CVS cannot be available for FC-3 and there is no way around it?

I think that was just a problem with a script. 

Michael, didn't you fix that with your patches from the other day?

-sv




From gafton at redhat.com  Tue Mar  1 19:11:35 2005
From: gafton at redhat.com (Cristian Gafton)
Date: Tue, 1 Mar 2005 14:11:35 -0500 (EST)
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <20050301190602.GA14804@lisas.de>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
Message-ID: <Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>

On Tue, 1 Mar 2005, Adrian Reber wrote:

>> Effectively, after the FC-3-split, we now cannot import new packages
>> into the FC-3 tree like we could not import new packages into FC-2,
>> FC-1, RHL-9 before (we have tracked all those deferred updates on the
>> FC3Status page).
>
> Just to make sure I understand this correctly: All newly imported packages
> after branching CVS cannot be available for FC-3 and there is no way around it?

There is a way around it - for now it requires manual intervention. People 
need to understand that this is a consequence of using the same scripts we 
have for branching internally the fedora core package set. In the FC case, 
once we branch there are no package changes committed to the branch - thus 
the reason why cvs-import can not create new branches.

I realize that for FE this is not the case, and I am working on a solution 
that will allow branches to be created at the cvs-import time.

For now, please use cvs-import to import the new packages and once the 
import is done ask on this list for a branch to be created for your new 
import. We'll wade through this manual process until I adapt the scripts.

Cristian
-- 
----------------------------------------------------------------------
Cristian Gafton     --     gafton at redhat.com      --     Red Hat, Inc.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"Linux is a leprosy; and is having a deleterious effect on the U.S. IT
industry because it is steadily depreciating the value of the software
industry sector."
     -- Kenneth Brown, President, Alexis de Tocqueville Institution



From gafton at redhat.com  Tue Mar  1 19:13:25 2005
From: gafton at redhat.com (Cristian Gafton)
Date: Tue, 1 Mar 2005 14:13:25 -0500 (EST)
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <1109704340.31304.16.camel@cutter>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<1109704340.31304.16.camel@cutter>
Message-ID: <Pine.LNX.4.61.0503011411550.26940@alien.devel.redhat.com>

On Tue, 1 Mar 2005, seth vidal wrote:

> I think that was just a problem with a script.

Yes, the script does not support it.

> Michael, didn't you fix that with your patches from the other day?

He can not - cvs-import does not have access to the cvs layout in a way 
that would allow it to create branches. It requires cooperation from the 
backend.

Cristian
-- 
----------------------------------------------------------------------
Cristian Gafton     --     gafton at redhat.com      --     Red Hat, Inc.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"Linux is a leprosy; and is having a deleterious effect on the U.S. IT
industry because it is steadily depreciating the value of the software
industry sector."
     -- Kenneth Brown, President, Alexis de Tocqueville Institution



From skvidal at phy.duke.edu  Tue Mar  1 19:19:48 2005
From: skvidal at phy.duke.edu (seth vidal)
Date: Tue, 01 Mar 2005 14:19:48 -0500
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011411550.26940@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de> <1109704340.31304.16.camel@cutter>
	<Pine.LNX.4.61.0503011411550.26940@alien.devel.redhat.com>
Message-ID: <1109704788.31304.18.camel@cutter>

On Tue, 2005-03-01 at 14:13 -0500, Cristian Gafton wrote:
>On Tue, 1 Mar 2005, seth vidal wrote:
>
>> I think that was just a problem with a script.
>
>Yes, the script does not support it.
>
>> Michael, didn't you fix that with your patches from the other day?
>
>He can not - cvs-import does not have access to the cvs layout in a way 
>that would allow it to create branches. It requires cooperation from the 
>backend.

ah, okay. thanks for the explanation, glad it's not a permanent problem,
though.

-sv




From adrian at lisas.de  Tue Mar  1 19:19:27 2005
From: adrian at lisas.de (Adrian Reber)
Date: Tue, 1 Mar 2005 20:19:27 +0100
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
Message-ID: <20050301191927.GA3916@lisas.de>

On Tue, Mar 01, 2005 at 02:11:35PM -0500, Cristian Gafton wrote:
> >Just to make sure I understand this correctly: All newly imported packages
> >after branching CVS cannot be available for FC-3 and there is no way 
> >around it?
> 
> There is a way around it - for now it requires manual intervention. People 
> need to understand that this is a consequence of using the same scripts we 
> have for branching internally the fedora core package set. In the FC case, 
> once we branch there are no package changes committed to the branch - thus 
> the reason why cvs-import can not create new branches.
> 
> I realize that for FE this is not the case, and I am working on a solution 
> that will allow branches to be created at the cvs-import time.
> 
> For now, please use cvs-import to import the new packages and once the 
> import is done ask on this list for a branch to be created for your new 
> import. We'll wade through this manual process until I adapt the scripts.

Ah, okay. Thanks for that information.

		Adrian



From skvidal at phy.duke.edu  Tue Mar  1 19:25:31 2005
From: skvidal at phy.duke.edu (seth vidal)
Date: Tue, 01 Mar 2005 14:25:31 -0500
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <20050301191927.GA3916@lisas.de>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<20050301191927.GA3916@lisas.de>
Message-ID: <1109705131.31304.24.camel@cutter>

>Ah, okay. Thanks for that information.
>

Adrian,
 would you mind adding this information and how you solved it to the CVS
Faq on http://fedoraproject.org/wiki/Extras/UsingCvsFaq

thanks,
-sv




From bugs.michael at gmx.net  Tue Mar  1 19:23:06 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Tue, 1 Mar 2005 20:23:06 +0100
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011411550.26940@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<1109704340.31304.16.camel@cutter>
	<Pine.LNX.4.61.0503011411550.26940@alien.devel.redhat.com>
Message-ID: <20050301202306.28880baa.bugs.michael@gmx.net>

On Tue, 1 Mar 2005 14:13:25 -0500 (EST), Cristian Gafton wrote:

> On Tue, 1 Mar 2005, seth vidal wrote:
> 
> > I think that was just a problem with a script.
> 
> Yes, the script does not support it.
> 
> > Michael, didn't you fix that with your patches from the other day?
> 
> He can not - cvs-import does not have access to the cvs layout in a way 
> that would allow it to create branches. It requires cooperation from the 
> backend.

What I fixed with regard to the FC-3 branch can be seen in the
CVSROOT/modules changelog. cvs-import failed for existing modules in the
FC-3 branch.



From adrian at lisas.de  Tue Mar  1 19:30:46 2005
From: adrian at lisas.de (Adrian Reber)
Date: Tue, 1 Mar 2005 20:30:46 +0100
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <1109705131.31304.24.camel@cutter>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<20050301191927.GA3916@lisas.de> <1109705131.31304.24.camel@cutter>
Message-ID: <20050301193046.GA7637@lisas.de>

On Tue, Mar 01, 2005 at 02:25:31PM -0500, seth vidal wrote:
> >Ah, okay. Thanks for that information.
> 
> Adrian,
>  would you mind adding this information and how you solved it to the CVS
> Faq on http://fedoraproject.org/wiki/Extras/UsingCvsFaq

If you mean by "how you solved it" that I know now that I have to
request it on this mailinglist I can add it of course.

		Adrian



From ville.skytta at iki.fi  Tue Mar  1 19:46:53 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Tue, 01 Mar 2005 21:46:53 +0200
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
Message-ID: <1109706413.15077.126.camel@bobcat.mine.nu>

On Tue, 2005-03-01 at 14:11 -0500, Cristian Gafton wrote:

> For now, please use cvs-import to import the new packages and once the 
> import is done ask on this list for a branch to be created for your new 
> import. We'll wade through this manual process until I adapt the scripts.

Related: there's a pretty long list at
http://fedoraproject.org/wiki/Extras_2fCVSSyncNeeded , but all of those
are (for now) for < FC3 fedora.us updates, as far as I can tell.  These
can probably wait at least until the script can take care of things.



From gafton at redhat.com  Tue Mar  1 21:09:29 2005
From: gafton at redhat.com (Cristian Gafton)
Date: Tue, 1 Mar 2005 16:09:29 -0500 (EST)
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <1109706413.15077.126.camel@bobcat.mine.nu>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<1109706413.15077.126.camel@bobcat.mine.nu>
Message-ID: <Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>

On Tue, 1 Mar 2005, Ville [ISO-8859-1] Skytt? wrote:

>> For now, please use cvs-import to import the new packages and once the
>> import is done ask on this list for a branch to be created for your new
>> import. We'll wade through this manual process until I adapt the scripts.
>
> Related: there's a pretty long list at
> http://fedoraproject.org/wiki/Extras_2fCVSSyncNeeded , but all of those
> are (for now) for < FC3 fedora.us updates, as far as I can tell.  These
> can probably wait at least until the script can take care of things.

I can create the branches for all those. I assume that if the branch 
source is devel/ everything would be fine?

Cristian
-- 
----------------------------------------------------------------------
Cristian Gafton     --     gafton at redhat.com      --     Red Hat, Inc.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"Linux is a leprosy; and is having a deleterious effect on the U.S. IT
industry because it is steadily depreciating the value of the software
industry sector."
     -- Kenneth Brown, President, Alexis de Tocqueville Institution

From fedora-extras-commits at redhat.com  Tue Mar  1 21:09:27 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 1 Mar 2005 16:09:27 -0500
Subject: rpms/libol/FC-3 .cvsignore, 1.2, 1.3 libol.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <200503012109.j21L9R2x015336@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	.cvsignore libol.spec sources 
Log Message:
Update to 0.3.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:55 -0000	1.2
+++ .cvsignore	1 Mar 2005 21:09:25 -0000	1.3
@@ -1 +1 @@
-libol-0.3.13.tar.gz
+libol-0.3.15.tar.gz


Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-3/libol.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libol.spec	10 Dec 2004 22:03:05 -0000	1.4
+++ libol.spec	1 Mar 2005 21:09:25 -0000	1.5
@@ -1,31 +1,35 @@
-Summary:   Support library for syslog-ng
-Name:      libol
-Version:   0.3.13
-Release:   2
-Epoch:     0
-License:   GPL
-Group:     System Environment/Libraries
-Url:       http://www.balabit.hu/products/syslog-ng/
-Source:    http://www.balabit.hu/downloads/syslog-ng/libol/0.3/libol-0.3.13.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
-Requires(post,postun): /sbin/ldconfig
+#
+# Before changing the macro below see the README file included in
+# the syslog-ng package.
+#
+%define with_scheme_preprocessor 0
+
+Name:           libol
+Version:        0.3.15
+Release:        2
+Epoch:          0
+Summary:        Support library for syslog-ng
+
+Group:          Development/Libraries
+License:        GPL
+Url:            http://www.balabit.com/products/syslog-ng/
+Source:         http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.15.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{with_scheme_preprocessor}
+BuildRequires:  scsh
+%endif
 
 %description
 Support library for syslog-ng.
 
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
 
 %package devel
-Summary: Support library libol for syslog-ng headers and libraries
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary:        Support library for syslog-ng: headers and libraries
+Group:          Development/Libraries
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
-Support library libol for syslog-ng headers and libraries
-
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
+Support library for syslog-ng: headers and libraries.
 
 
 %prep
@@ -33,21 +37,14 @@
 
 %build
 %configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-#
-# make_class
-#   -- this file is installed without an interpreter
-#   -- doesn't appear to be required to build syslog-ng
-#   -> file manually removed
-#
-rm ${RPM_BUILD_ROOT}%{_bindir}/make_class
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -56,13 +53,18 @@
 
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING
 %{_libdir}/libol.so.0
 %{_libdir}/libol.so.0.0.0
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%if %{with_scheme_preprocessor}
+%{_bindir}/make_class
+%else
+%exclude %{_bindir}/make_class
+%endif
 %{_bindir}/libol-config
 %{_libdir}/libol.a
 %{_libdir}/libol.la
@@ -71,32 +73,43 @@
 
 
 %changelog
-* Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
+* Tue Mar 01 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3.15-2
+- Remove redundant explicit /sbin/ldconfig dependency.
+
+* Sat Feb 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.15-0.fdr.1
+- Update to 0.3.15.
+
+* Wed Aug 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.14-0.fdr.1
+- Update to 0.3.14.
+- Merged upstream specfile changes.
+- Upstream configure.in has been patched (make CFLAGS no longer needed).
+
+* Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
 - building with CFLAGS="$RPM_OPT_FLAGS"
 
-* Sat Feb 28 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.1
+* Sat Feb 28 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.1
 - removed blockers listed in the first comment of bugzilla entry 1331
 - https://bugzilla.fedora.us/show_bug.cgi?id=1331
 
-* Fri Feb 27 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.0.1
+* Fri Feb 27 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.0.1
 - updated to version 0.3.13
 
-* Sat Feb  7 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.3
+* Sat Feb  7 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.3
 - make %{?_smp_mflags}
 
-* Sun Jan 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.2
+* Sun Jan 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.2
 - moved files libol-config and libol.so into the devel RPM
 
-* Sat Jan 10 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.1
+* Sat Jan 10 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.1
 - first spec for fedora.us
 
-* Tue Oct  7 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Tue Oct  7 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - updated to version 0.3.11
 
-* Tue Apr 15 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Tue Apr 15 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - included missing file: /usr/bin/make_class (caused problems in RH9)
  
-* Thu Apr 10 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Thu Apr 10 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - specfile reformated 
 - replaced hard coded values by RPM macros
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:55 -0000	1.2
+++ sources	1 Mar 2005 21:09:25 -0000	1.3
@@ -1 +1 @@
-b66e21769e21ac9b953cbafe517630fd  libol-0.3.13.tar.gz
+1c8d6a9c72a9200738a04d68e5a7b439  libol-0.3.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  1 21:12:45 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 1 Mar 2005 16:12:45 -0500
Subject: rpms/libol/devel .cvsignore, 1.2, 1.3 libol.spec, 1.5, 1.6 sources,
	1.2, 1.3
Message-ID: <200503012112.j21LCjTv015448@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	.cvsignore libol.spec sources 
Log Message:
Update to 0.3.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libol/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:55 -0000	1.2
+++ .cvsignore	1 Mar 2005 21:12:43 -0000	1.3
@@ -1 +1 @@
-libol-0.3.13.tar.gz
+libol-0.3.15.tar.gz


Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/devel/libol.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libol.spec	26 Feb 2005 18:40:12 -0000	1.5
+++ libol.spec	1 Mar 2005 21:12:43 -0000	1.6
@@ -1,30 +1,35 @@
-Summary:   Support library for syslog-ng
-Name:      libol
-Version:   0.3.13
-Release:   3
-Epoch:     0
-License:   GPL
-Group:     System Environment/Libraries
-Url:       http://www.balabit.hu/products/syslog-ng/
-Source:    http://www.balabit.hu/downloads/syslog-ng/libol/0.3/libol-0.3.13.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+#
+# Before changing the macro below see the README file included in
+# the syslog-ng package.
+#
+%define with_scheme_preprocessor 0
+
+Name:           libol
+Version:        0.3.15
+Release:        2
+Epoch:          0
+Summary:        Support library for syslog-ng
+
+Group:          Development/Libraries
+License:        GPL
+Url:            http://www.balabit.com/products/syslog-ng/
+Source:         http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.15.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{with_scheme_preprocessor}
+BuildRequires:  scsh
+%endif
 
 %description
 Support library for syslog-ng.
 
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
 
 %package devel
-Summary: Support library libol for syslog-ng headers and libraries
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary:        Support library for syslog-ng: headers and libraries
+Group:          Development/Libraries
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
-Support library libol for syslog-ng headers and libraries
-
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
+Support library for syslog-ng: headers and libraries.
 
 
 %prep
@@ -32,21 +37,14 @@
 
 %build
 %configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-#
-# make_class
-#   -- this file is installed without an interpreter
-#   -- doesn't appear to be required to build syslog-ng
-#   -> file manually removed
-#
-rm ${RPM_BUILD_ROOT}%{_bindir}/make_class
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -55,13 +53,18 @@
 
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING
 %{_libdir}/libol.so.0
 %{_libdir}/libol.so.0.0.0
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%if %{with_scheme_preprocessor}
+%{_bindir}/make_class
+%else
+%exclude %{_bindir}/make_class
+%endif
 %{_bindir}/libol-config
 %{_libdir}/libol.a
 %{_libdir}/libol.la
@@ -70,35 +73,43 @@
 
 
 %changelog
-* Sat Feb 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3.13-3
+* Tue Mar 01 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3.15-2
 - Remove redundant explicit /sbin/ldconfig dependency.
 
-* Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
+* Sat Feb 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.15-0.fdr.1
+- Update to 0.3.15.
+
+* Wed Aug 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.14-0.fdr.1
+- Update to 0.3.14.
+- Merged upstream specfile changes.
+- Upstream configure.in has been patched (make CFLAGS no longer needed).
+
+* Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
 - building with CFLAGS="$RPM_OPT_FLAGS"
 
-* Sat Feb 28 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.1
+* Sat Feb 28 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.1
 - removed blockers listed in the first comment of bugzilla entry 1331
 - https://bugzilla.fedora.us/show_bug.cgi?id=1331
 
-* Fri Feb 27 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.0.1
+* Fri Feb 27 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.0.1
 - updated to version 0.3.13
 
-* Sat Feb  7 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.3
+* Sat Feb  7 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.3
 - make %{?_smp_mflags}
 
-* Sun Jan 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.2
+* Sun Jan 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.2
 - moved files libol-config and libol.so into the devel RPM
 
-* Sat Jan 10 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.1
+* Sat Jan 10 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.1
 - first spec for fedora.us
 
-* Tue Oct  7 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Tue Oct  7 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - updated to version 0.3.11
 
-* Tue Apr 15 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Tue Apr 15 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - included missing file: /usr/bin/make_class (caused problems in RH9)
  
-* Thu Apr 10 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Thu Apr 10 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - specfile reformated 
 - replaced hard coded values by RPM macros
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libol/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:55 -0000	1.2
+++ sources	1 Mar 2005 21:12:43 -0000	1.3
@@ -1 +1 @@
-b66e21769e21ac9b953cbafe517630fd  libol-0.3.13.tar.gz
+1c8d6a9c72a9200738a04d68e5a7b439  libol-0.3.15.tar.gz



From ville.skytta at iki.fi  Tue Mar  1 21:44:02 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Tue, 01 Mar 2005 23:44:02 +0200
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<1109706413.15077.126.camel@bobcat.mine.nu>
	<Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
Message-ID: <1109713442.15077.181.camel@bobcat.mine.nu>

On Tue, 2005-03-01 at 16:09 -0500, Cristian Gafton wrote:
> On Tue, 1 Mar 2005, Ville [ISO-8859-1] Skytt wrote:
> 
> >> For now, please use cvs-import to import the new packages and once the
> >> import is done ask on this list for a branch to be created for your new
> >> import. We'll wade through this manual process until I adapt the scripts.
> >
> > Related: there's a pretty long list at
> > http://fedoraproject.org/wiki/Extras_2fCVSSyncNeeded , but all of those
> > are (for now) for < FC3 fedora.us updates, as far as I can tell.  These
> > can probably wait at least until the script can take care of things.
> 
> I can create the branches for all those.

Cool, thanks.

> I assume that if the branch 
> source is devel/ everything would be fine?

Hm, I'm not sure I follow, but I think it'd be best to just create the
empty branches if possible, and then use cvs-import.sh with the actual
packages from download.fedora.us to bring in the contents.  There are
some differences between the current devel/ and the older distro
branches in all of them.  When the branches are there, I can take care
of the imports.



From gafton at redhat.com  Tue Mar  1 22:04:00 2005
From: gafton at redhat.com (Cristian Gafton)
Date: Tue, 1 Mar 2005 17:04:00 -0500 (EST)
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<1109706413.15077.126.camel@bobcat.mine.nu>
	<Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
Message-ID: <Pine.LNX.4.61.0503011643380.12801@alien.devel.redhat.com>

On Tue, 1 Mar 2005, Cristian Gafton wrote:

> I can create the branches for all those. I assume that if the branch source 
> is devel/ everything would be fine?

Branches created.

Cristian
-- 
----------------------------------------------------------------------
Cristian Gafton     --     gafton at redhat.com      --     Red Hat, Inc.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"Linux is a leprosy; and is having a deleterious effect on the U.S. IT
industry because it is steadily depreciating the value of the software
industry sector."
     -- Kenneth Brown, President, Alexis de Tocqueville Institution



From fedora-extras-commits at redhat.com  Tue Mar  1 22:05:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Mar 2005 17:05:06 -0500
Subject: rpms/pth/devel pth-2.0.3.tar.gz.sig,1.1,NONE
Message-ID: <200503012205.j21M569g023553@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Removed Files:
	pth-2.0.3.tar.gz.sig 
Log Message:
remove file left over since previous commit


--- pth-2.0.3.tar.gz.sig DELETED ---



From fedora-extras-commits at redhat.com  Tue Mar  1 22:05:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:05:11 -0500
Subject: rpms/xemacs/devel - New directory
Message-ID: <200503012205.j21M5Bo4023585@cvs-int.fedora.redhat.com>

Author: scop

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

Log Message:
Directory /cvs/extras/rpms/xemacs/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar  1 22:05:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:05:11 -0500
Subject: rpms/xemacs - New directory
Message-ID: <200503012205.j21M5BVS023582@cvs-int.fedora.redhat.com>

Author: scop

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

Log Message:
Directory /cvs/extras/rpms/xemacs added to the repository




From fedora-extras-commits at redhat.com  Tue Mar  1 22:05:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:05:26 -0500
Subject: rpms/xemacs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503012205.j21M5Q56023644@cvs-int.fedora.redhat.com>

Author: scop

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module xemacs


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

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

common : CVS/Root
	@cvs 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 Mar  1 22:05:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:05:26 -0500
Subject: rpms/xemacs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503012205.j21M5QRp023647@cvs-int.fedora.redhat.com>

Author: scop

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xemacs


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From gafton at redhat.com  Tue Mar  1 22:06:35 2005
From: gafton at redhat.com (Cristian Gafton)
Date: Tue, 1 Mar 2005 17:06:35 -0500 (EST)
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <1109713442.15077.181.camel@bobcat.mine.nu>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<1109706413.15077.126.camel@bobcat.mine.nu>
	<Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
	<1109713442.15077.181.camel@bobcat.mine.nu>
Message-ID: <Pine.LNX.4.61.0503011704210.12801@alien.devel.redhat.com>

On Tue, 1 Mar 2005, Ville [ISO-8859-1] Skytt? wrote:

>> I assume that if the branch
>> source is devel/ everything would be fine?
>
> Hm, I'm not sure I follow, but I think it'd be best to just create the
> empty branches if possible, and then use cvs-import.sh with the actual
> packages from download.fedora.us to bring in the contents.  There are
> some differences between the current devel/ and the older distro
> branches in all of them.  When the branches are there, I can take care
> of the imports.

You can think of "branching" as basically a "cp -r $src $dst". In most 
cases, we branch the devel/ directory as FC-3/ (kind of like a snapshot).

For things like RHL-9 and FC-1 and whatnot, "devel/" might be too 
comples/advanced/whatever. subsequent cvs-imports into those branches will 
clear things out, so this is only a matter of pedantery as far as choosing 
the initial branch point.

Cristian
-- 
----------------------------------------------------------------------
Cristian Gafton     --     gafton at redhat.com      --     Red Hat, Inc.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"Linux is a leprosy; and is having a deleterious effect on the U.S. IT
industry because it is steadily depreciating the value of the software
industry sector."
     -- Kenneth Brown, President, Alexis de Tocqueville Institution

From fedora-extras-commits at redhat.com  Tue Mar  1 22:11:38 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:11:38 -0500
Subject: rpms/xemacs import.log,1.1,1.2
Message-ID: <200503012211.j21MBcND024115@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	import.log 
Log Message:
auto-import xemacs-21.4.17-2 on branch devel from xemacs-21.4.17-2.src.rpm
Latest from Core devel CVS adapted to Extras + some improvements.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xemacs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Mar 2005 22:05:24 -0000	1.1
+++ import.log	1 Mar 2005 22:11:36 -0000	1.2
@@ -0,0 +1 @@
+xemacs-21_4_17-2:HEAD:xemacs-21.4.17-2.src.rpm:1109715087



From fedora-extras-commits at redhat.com  Tue Mar  1 22:11:38 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:11:38 -0500
Subject: rpms/xemacs/devel default.el, NONE, 1.1 delprevline.py, NONE,
	1.1 dotxemacs-init.el, NONE, 1.1 menubar-games.patch, NONE,
	1.1 movemail-mktemp.patch, NONE, 1.1 xemacs-21-cursor.patch,
	NONE, 1.1 xemacs-21.4.10-find-paths-pkgdir.patch, NONE,
	1.1 xemacs-21.4.12-find-paths-libexec-lib64.patch, NONE,
	1.1 xemacs-21.4.12-mk-nochk-features.patch, NONE,
	1.1 xemacs-21.4.13-dump-paths-lispdir.patch, NONE,
	1.1 xemacs-21.4.13-utf8-fontsets.patch, NONE,
	1.1 xemacs-21.4.15-wnnfix-128362.patch, NONE,
	1.1 xemacs-debian-docdir-dump.patch, NONE,
	1.1 xemacs-no-expdyn-ia64-106744.patch, NONE,
	1.1 xemacs-sitestart.el, NONE, 1.1 xemacs.desktop, NONE,
	1.1 xemacs.png, NONE, 1.1 xemacs.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503012211.j21MBc5C024119@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore sources 
Added Files:
	default.el delprevline.py dotxemacs-init.el 
	menubar-games.patch movemail-mktemp.patch 
	xemacs-21-cursor.patch xemacs-21.4.10-find-paths-pkgdir.patch 
	xemacs-21.4.12-find-paths-libexec-lib64.patch 
	xemacs-21.4.12-mk-nochk-features.patch 
	xemacs-21.4.13-dump-paths-lispdir.patch 
	xemacs-21.4.13-utf8-fontsets.patch 
	xemacs-21.4.15-wnnfix-128362.patch 
	xemacs-debian-docdir-dump.patch 
	xemacs-no-expdyn-ia64-106744.patch xemacs-sitestart.el 
	xemacs.desktop xemacs.png xemacs.spec 
Log Message:
auto-import xemacs-21.4.17-2 on branch devel from xemacs-21.4.17-2.src.rpm
Latest from Core devel CVS adapted to Extras + some improvements.


--- NEW FILE default.el ---
;;; default.el - loaded at startup after "~/.xemacs/init.el" by default
;;;
;;; Setting `inhibit-default-init' non-nil in "~/.xemacs/init.el"
;;; prevents loading of this file.  The "-q" option to xemacs
;;; prevents "~/.xemacs/init.el" *and* this file from being loaded
;;; at startup.

;; enable wheelmouse support by default
(when window-system
  (mwheel-install))

;; make gnus save articles be mbox format not rmail format
(defvar gnus-default-article-saver 'gnus-summary-save-in-file)

;; use terminfo by default
(defvar system-uses-terminfo t)


--- NEW FILE delprevline.py ---
#!/usr/bin/python

import string
import sys

match="(japanese)"
file=open(sys.argv[1])
lines=file.readlines()
file.close
lines2=[]
for line in lines:
    if string.find(line,match)>0:
        lines2.pop()
    else:
        lines2.append(line)
file=open(sys.argv[1],"w")
file.writelines(lines2)





--- NEW FILE dotxemacs-init.el ---
;;; .xemacs/init.el

;;; uncomment this line to disable loading of "default.el" at startup
;; (setq inhibit-default-init t)

;; default to unified diffs
(setq diff-switches "-u")

menubar-games.patch:

--- NEW FILE menubar-games.patch ---
--- xemacs-21.4.12/lisp/menubar-items.el~	2003-01-17 04:46:27.000000000 +0900
+++ xemacs-21.4.12/lisp/menubar-items.el	2003-01-17 04:46:27.000000000 +0900
@@ -627,8 +627,8 @@
       ("Ga%_mes"
        ["%_Mine Game" xmine
 	:active (fboundp 'xmine)]
-       ["%_Tetris" tetris
-	:active (fboundp 'tetris)]
+;;        ["%_Tetris" tetris
+;; 	:active (fboundp 'tetris)]
        ["%_Sokoban" sokoban
 	:active (fboundp 'sokoban)]
        ["Quote from %_Zippy" yow

movemail-mktemp.patch:

--- NEW FILE movemail-mktemp.patch ---
--- xemacs-21.4.10/lib-src/movemail.c.mktemp	2002-08-20 20:34:22.000000000 +0900
+++ xemacs-21.4.10/lib-src/movemail.c	2002-12-18 22:09:11.000000000 +0900
@@ -588,7 +588,7 @@
     p--;
   *p = 0;
   strcpy (p, "EXXXXXX");
-  mktemp (tempname);
+  mkstemp (tempname);
   unlink (tempname);
 
   for (;;)

xemacs-21-cursor.patch:

--- NEW FILE xemacs-21-cursor.patch ---
--- gtk-xemacs/src/redisplay-tty.c.cursor	Tue Nov 28 18:24:15 2000
+++ gtk-xemacs/src/redisplay-tty.c	Tue Nov 28 18:25:09 2000
@@ -1236,7 +1236,7 @@
     }
 
   TTY_SD (c).cursor_visible = tgetstr ("ve", &bufptr);
-  TTY_SD (c).cursor_normal = tgetstr ("vs", &bufptr);
+  TTY_SD (c).cursor_normal = tgetstr ("ve", &bufptr);
   TTY_SD (c).init_motion = tgetstr ("ti", &bufptr);
   TTY_SD (c).end_motion = tgetstr ("te", &bufptr);
   TTY_SD (c).keypad_on = tgetstr ("ks", &bufptr);

xemacs-21.4.10-find-paths-pkgdir.patch:

--- NEW FILE xemacs-21.4.10-find-paths-pkgdir.patch ---
diff -u xemacs-21.4.10/lisp/find-paths.el~ xemacs-21.4.10/lisp/find-paths.el
--- xemacs-21.4.10/lisp/find-paths.el~	2002-12-21 08:56:42.000000000 +0900
+++ xemacs-21.4.10/lisp/find-paths.el	2002-12-21 08:56:42.000000000 +0900
@@ -103,8 +103,8 @@
   (or
    ;; installed
    (paths-file-readable-directory-p (paths-construct-path (list directory
-								"lib"
-								emacs-program-name)))
+								"share"
+								(construct-emacs-version-name))))
    ;; in-place or windows-nt
    (and
     (paths-file-readable-directory-p (paths-construct-path (list directory "lisp")))
@@ -211,7 +211,7 @@
   (paths-find-emacs-directory roots
 			      (file-name-as-directory
 			       (paths-construct-path (list
-						      "lib"
+						      "share"
 						      emacs-program-name)))
 			      base
 			      envvar default

xemacs-21.4.12-find-paths-libexec-lib64.patch:

--- NEW FILE xemacs-21.4.12-find-paths-libexec-lib64.patch ---
--- xemacs-21.4.12/lisp/find-paths.el.pkgdir	2003-01-21 18:37:30.000000000 +0900
+++ xemacs-21.4.12/lisp/find-paths.el	2003-01-21 18:37:30.000000000 +0900
@@ -225,7 +225,7 @@
   (paths-find-emacs-directory roots
 			      (file-name-as-directory
 			       (paths-construct-path
-				(list "lib"
+				(list "lib64"
 				      (construct-emacs-version-name))))
 			      base
 			      envvar default

xemacs-21.4.12-mk-nochk-features.patch:

--- NEW FILE xemacs-21.4.12-mk-nochk-features.patch ---
--- xemacs-21.4.12/Makefile.in.in~	2003-02-08 00:28:44.000000000 +0900
+++ xemacs-21.4.12/Makefile.in.in	2003-02-08 00:28:44.000000000 +0900
@@ -407,7 +407,7 @@
 
 install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep
 
-install: all check-features install-arch-dep install-arch-indep
+install: all install-arch-dep install-arch-indep
 
 install-arch-dep: mkdir
 	for subdir in ${INSTALL_ARCH_DEP_SUBDIR}; do \

xemacs-21.4.13-dump-paths-lispdir.patch:

--- NEW FILE xemacs-21.4.13-dump-paths-lispdir.patch ---
diff -u xemacs-21.4.13/lisp/dump-paths.el.dump-path xemacs-21.4.13/lisp/dump-paths.el
--- xemacs-21.4.13/lisp/dump-paths.el.dump-path	2003-06-26 23:33:42.000000000 +0900
+++ xemacs-21.4.13/lisp/dump-paths.el	2003-06-26 23:33:42.000000000 +0900
@@ -58,15 +58,14 @@
 		       late-packages late-package-load-path)
 	       'external-debugging-output)))
 
-  (setq lisp-directory (paths-find-lisp-directory roots))
+  (setq lisp-directory "@srcdir@/lisp")
   (if debug-paths
       (princ (format "lisp-directory:\n%S\n" lisp-directory)
 	     'external-debugging-output))
   (if (featurep 'mule)
       (progn
 	(setq mule-lisp-directory
-	      (paths-find-mule-lisp-directory roots
-					      lisp-directory))
+	      "@srcdir@/lisp/mule")
 	(if debug-paths
 	    (princ (format "mule-lisp-directory:\n%S\n"
 			   mule-lisp-directory)

xemacs-21.4.13-utf8-fontsets.patch:

--- NEW FILE xemacs-21.4.13-utf8-fontsets.patch ---
--- xemacs-21.4.13/etc/Emacs.ad~	2002-12-12 08:21:12.000000000 +0200
+++ xemacs-21.4.13/etc/Emacs.ad	2003-07-13 19:47:48.000000000 +0300
@@ -203,11 +203,13 @@
 *menubar*FontSet:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
 			-*-*-*-*-*-*-*-120-*-iso10646-1, \
 			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
-			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0
+			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \
+			-*-*-*-*-*-*-*-120-*-*-*
 *popup*FontSet:		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
 			-*-*-*-*-*-*-*-120-*-iso10646-1, \
 			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
-			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0
+			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \
+			-*-*-*-*-*-*-*-120-*-*-*
 
 ! Gui elements share this font
 !

xemacs-21.4.15-wnnfix-128362.patch:

--- NEW FILE xemacs-21.4.15-wnnfix-128362.patch ---
--- xemacs-21.4.15/src/mule-wnnfns.c.orig	2004-07-22 15:34:28.473317319 +0900
+++ xemacs-21.4.15/src/mule-wnnfns.c	2004-07-22 15:34:38.932537998 +0900
@@ -318,7 +318,7 @@
 Lisp_Object	Qwnn_jisho, Qwnn_sbn, Qwnn_dbn_len, Qwnn_sbn_cnt, Qwnn_suuji;
 Lisp_Object	Qwnn_kana, Qwnn_eisuu, Qwnn_kigou, Qwnn_toji_kakko, Qwnn_fuzokogo, Qwnn_kaikakko;
 Lisp_Object	Vwnn_server_type;
-Lisp_Object	Vcwnn_zhuyin;
+//Lisp_Object	Vcwnn_zhuyin;
 Lisp_Object	Vwnnenv_sticky;
 Lisp_Object	Vwnn_uniq_level;
 Fixnum		lb_sisheng;
@@ -1899,9 +1899,11 @@
   DEFVAR_LISP ("wnn-server-type", &Vwnn_server_type /*
 *jserver, cserver ..
 */ );
-  DEFVAR_LISP ("cwnn-zhuyin", &Vcwnn_zhuyin /*
+#if 0
+   DEFVAR_LISP ("cwnn-zhuyin", &Vcwnn_zhuyin /*
 *pinyin or zhuyin
 */ );
+#endif
   DEFVAR_LISP ("wnnenv-sticky", &Vwnnenv_sticky /*
 *If non-nil, make environment sticky
 */ );
@@ -1910,7 +1912,7 @@
 */ );
 
   Vwnn_server_type = Qjserver;
-  Vcwnn_zhuyin = Qnil;
+  //Vcwnn_zhuyin = Qnil;
   Vwnnenv_sticky = Qnil;
 
   Vwnn_uniq_level = Qwnn_uniq;
@@ -1932,10 +1934,14 @@
 	case 0x80:
 	  if (EQ(Vwnn_server_type, Qcserver))
 	    {
+#if 0
 	      len = cwnn_yincod_pzy (pzy, wc,
 				     NILP (Vcwnn_zhuyin)
 				     ? CWNN_PINYIN
 				     : CWNN_ZHUYIN);
+#else
+	      len = 0;
+#endif
 	      for (i = 0; i < len; i++)
 		{
 		  if (pzy[i] & 0x80)
@@ -2038,8 +2044,12 @@
       else	       *pin = *w;
       w++; pin++;
     }
+#if 0
   len = cwnn_pzy_yincod (ybuf, pbuf,
 			 NILP (Vcwnn_zhuyin) ? CWNN_PINYIN : CWNN_ZHUYIN);
+#else
+  return;
+#endif
   if (len <= 0)
     return;
 

xemacs-debian-docdir-dump.patch:

--- NEW FILE xemacs-debian-docdir-dump.patch ---
--- xemacs21-21.4.15.orig/src/config.h.in
+++ xemacs21-21.4.15/src/config.h.in
@@ -905,6 +905,7 @@
 #undef MODULEDIR_USER_DEFINED
 #undef SITEMODULEDIR_USER_DEFINED
 #undef DOCDIR_USER_DEFINED
+#undef DOCDIR
 #undef LISPDIR_USER_DEFINED
 #undef PACKAGE_PATH_USER_DEFINED
 #undef SITELISPDIR_USER_DEFINED
--- xemacs-21.4.15/configure.in~	2004-04-06 21:05:13.000000000 +0900
+++ xemacs-21.4.15/configure.in	2004-04-06 21:05:13.000000000 +0900
@@ -4856,6 +4856,7 @@
   esac
 done
 AC_SUBST(DOCDIR)
+AC_DEFINE_UNQUOTED(DOCDIR, "$docdir")
 
 AC_SUBST(archlibdir)
 AC_SUBST(ARCHLIBDIR_USER_DEFINED)
--- xemacs21-21.4.15.orig/src/dumper.c
+++ xemacs21-21.4.15/src/dumper.c
@@ -1322,9 +1322,24 @@
 }
 #endif /* !WIN32_NATIVE */
 
+static int
+pdump_file_doc_dir_try (char *exe_path)
+{
+  char *w = exe_path + strlen (exe_path);
+
+  sprintf (w, "%s", "DUMP");
+
+  if (pdump_file_get (exe_path))
+    {
+      if (pdump_load_check ())
+        return 1;
+      pdump_free ();
+    }
+  return 0;
+}
 
 static int
-pdump_file_try (char *exe_path)
+pdump_file_exe_path_try (char *exe_path)
 {
   char *w = exe_path + strlen (exe_path);
 
@@ -1439,9 +1454,16 @@
 
   /* Save exe_path because pdump_file_try() modifies it */
   strcpy(real_exe_path, exe_path);
-  if (pdump_file_try (exe_path)
+  if (pdump_file_exe_path_try (exe_path)
       || (xrealpath(real_exe_path, real_exe_path)
-	  && pdump_file_try (real_exe_path)))
+	  && pdump_file_exe_path_try (real_exe_path)))
+    {
+      pdump_load_finish ();
+      return 1;
+    }
+
+  sprintf(exe_path, "%s", DOCDIR);
+  if (pdump_file_doc_dir_try (exe_path))
     {
       pdump_load_finish ();
       return 1;

xemacs-no-expdyn-ia64-106744.patch:

--- NEW FILE xemacs-no-expdyn-ia64-106744.patch ---
diff -u xemacs-21.4.15/aclocal.m4~ xemacs-21.4.15/aclocal.m4
--- xemacs-21.4.15/aclocal.m4~	2004-05-07 07:55:22.000000000 -0400
+++ xemacs-21.4.15/aclocal.m4	2004-05-07 07:55:22.000000000 -0400
@@ -530,11 +530,12 @@
 dnl usually need to be prefix with ${wl} or some other such thing.
 dnl
 
-if test "$xe_gnu_ld" = yes; then
-  if test "$ld_shlibs" = yes; then
-    ld_dynamic_link_flags="${wl}-export-dynamic"
-  fi
-fi
+dnl dnl avoid -export-dynamic on ia64
+dnl if test "$xe_gnu_ld" = yes; then
+dnl   if test "$ld_shlibs" = yes; then
+dnl     ld_dynamic_link_flags="${wl}-export-dynamic"
+dnl   fi
+dnl fi
 
 if test -z "$ld_dynamic_link_flags"; then
   case "$xehost_os" in


--- NEW FILE xemacs-sitestart.el ---
;;; site-start.el - loaded at startup before "~/.xemacs/init.el"
;;;
;;; The "-no-site-file" option to xemacs prevents this file from being loaded.

;; fix default info path
(setq Info-directory-list '("/usr/share/info/"
			    "/usr/share/xemacs/xemacs-packages/info/"
			    "/usr/share/xemacs/mule-packages/info/"))

;;; psgml catalog list
(setq sgml-catalog-files
	      (if (getenv "SGML_CATALOG_FILES")
		  (split-path (getenv "SGML_CATALOG_FILES"))
		(list "CATALOG" "catalog"
		      "/etc/sgml/catalog"
		      "/etc/xml/catalog"
		      (locate-data-file "CATALOG"))))

;; default to non-kerberos ftp
(setq efs-ftp-program-name "/usr/bin/ftp")

;; load .el files in "site-start.d/"
(let ((files (directory-files "/usr/share/xemacs/site-packages/lisp/site-start.d" t "\\.el$")))
  (mapc 'load-file files))

;; fix default courier italics
;; for courier, oblique usually produces better results than italic
(setq try-oblique-before-italic-fonts t)
(when window-system
  (make-face-italic 'italic)
  (make-face-italic 'bold-italic))

;; setup coding-systems
(when (featurep 'mule)
  (let* ((locale (or (getenv "LC_ALL")
		   (getenv "LC_CTYPE")
		   (getenv "LANG")))
       (lang-region (and locale
			 (substring locale 0 (min 5 (length locale)))))
       (lang (and lang-region
		  (substring lang-region 0 (min 2 (length lang-region))))))
  (cond ((equal lang "ja")
	 (set-language-environment "Japanese"))
	((equal lang "ko")
	 (set-language-environment "Korean"))
	((equal lang-region "zh_CN")
	 (set-language-environment "Chinese-GB"))
	((equal lang-region "zh_TW")
	 (set-language-environment "Chinese-BIG5")))
  (cond ((and locale (string-match "UTF-8" locale))
	 (require 'un-define)
	 (set-default-coding-systems 'utf-8)
	 (set-coding-priority-list '(utf-8))
	 (set-coding-category-system 'utf-8 'utf-8))
	((equal lang "ja")
	 (set-default-coding-systems 'euc-jp))
	((equal lang "ko")
	 (set-default-coding-systems 'euc-kr))
	((equal lang-region "zh_CN")
	 (set-default-coding-systems 'cn-gb-2312))
	((equal lang-region "zh_TW")
	 (set-default-coding-systems 'big5)))
  ;; register available Input Methods
  (load "leim-list")
  (when (member lang '("ja" "ko" "zh"))
    ;; ispell doesn't support CJK
    (setq-default ispell-local-dictionary "english"))))

;; try to preserve user/group when saving files
(setq-default backup-by-copying-when-mismatch t)

;; when saving a buffer always end it with a newline
(setq-default require-final-newline t)



--- NEW FILE xemacs.desktop ---
[Desktop Entry]
Name=XEmacs Text Editor
Name[bg]=???????????????? XEmacs
Name[ca]=Editor XEmacs
Name[cs]=Editor XEmacs
Name[da]=XEmacs tekstredigerer
Name[de]=XEmacs Texteditor
Name[eo]=La redaktilo XEmakso
Name[es]=Emacs para X
Name[et]=Emacs X'i kasutajaliidesega
Name[fi]=XEmacs editori
Name[fr]=??diteur XEmacs
Name[hu]=XEmacs sz??vegszerkeszt??
Name[is]=XEmacs-ritill
Name[it]=Emacs per X
Name[ja]=XEmacs ??????????????????????????????
Name[mk]=?????????????????????????????? XEmacs ????????????????
Name[no]=XEmacs-tekstredigerer
Name[pt]=Editor XEmacs
Name[ro]=Editorul XEmacs
Name[ru]=???????????????? XEmacs
Name[sk]=Editor XEmacs
Name[sl]=Urejevalnik XEmacs
Name[uk]=???????????????? XEmacs
GenericName=Text Editor
Comment=Edit text
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
Exec=xemacs %f
Icon=xemacs
Type=Application
Terminal=false
Categories=Application;Development;TextEditor;X-Red-Hat-Extra;
Encoding=UTF-8
StartupWMClass=Emacs


--- NEW FILE xemacs.spec ---
Summary: A different version of Emacs.
Name: xemacs
Version: 21.4.17
Release: 2
License: GPL
Group: Applications/Editors
Source0: ftp://ftp.xemacs.org/xemacs-21.4/xemacs-%{version}.tar.bz2
Source1: %{name}.png
Source6: xemacs.desktop
Source9: xemacs-sitestart.el
#Used for cleaning finder-inf.el when it needs compilation
Source22: delprevline.py
Source23: dotxemacs-init.el
Source24: default.el
Patch5: xemacs-21-cursor.patch
Patch10: xemacs-21.4.10-find-paths-pkgdir.patch
Patch11: movemail-mktemp.patch
Patch14: menubar-games.patch
Patch15: xemacs-21.4.12-find-paths-libexec-lib64.patch
Patch16: xemacs-21.4.12-mk-nochk-features.patch
Patch18: xemacs-21.4.13-dump-paths-lispdir.patch
Patch19: xemacs-21.4.13-utf8-fontsets.patch
Patch21: xemacs-debian-docdir-dump.patch
Patch23: xemacs-no-expdyn-ia64-106744.patch
Patch24: xemacs-21.4.15-wnnfix-128362.patch
URL: http://www.xemacs.org/
Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: perl python autoconf213
BuildRequires: XFree86-devel ncurses-devel gpm-devel
BuildRequires: pam-devel zlib-devel libjpeg-devel glibc-devel compface
BuildRequires: libpng-devel libtiff-devel Canna-devel
#BuildRequires: postgresql-devel db4-devel openldap-devel krb5-devel
%{?_with_gtk:BuildRequires: gtk+-devel libglade-devel}
%{!?_with_gtk:BuildRequires: Xaw3d-devel}
Requires: xemacs-sumo >= 20050118-2, xemacs-common = %{version}-%{release}
Obsoletes: xemacs-extras xemacs-noX xemacs-X11 xemacs-mule xemacs-static

%description 
XEmacs is a highly customizable open source text editor and
application development system. It is protected under the
GNU General Public License and related to other versions of Emacs,
in particular GNU Emacs. Its emphasis is on modern graphical
user interface support and an open software development
model, similar to Linux.

This package contains xemacs built for X Windows with MULE support.

%package common
Summary: The byte-compiled lisp files and other common files for XEmacs.
Group: Applications/Editors
PreReq: %{_sbindir}/alternatives

%description common
XEmacs is a highly customizable open source text editor and
application development system. It is protected under the
GNU General Public License and related to other versions of Emacs,
in particular GNU Emacs. Its emphasis is on modern graphical
user interface support and an open software development
model, similar to Linux.

This package contains byte-compiled lisp and other common files for XEmacs.

%package nox
Summary: A different version of Emacs built without X Windows Support.
Group: Applications/Editors
# Note: no xemacs-sumo dependency here, we need -nox to build the sumo package.
Requires: xemacs-common = %{version}-%{release}

%description nox
XEmacs is a highly customizable open source text editor and
application development system. It is protected under the
GNU General Public License and related to other versions of Emacs,
in particular GNU Emacs. Its emphasis is on modern graphical
user interface support and an open software development
model, similar to Linux.

This package contains XEmacs built without X Windows support.

%package el
Summary: The .el source files for XEmacs.
Group: Applications/Editors

%description el
XEmacs is a highly customizable open source text editor and
application development system. It is protected under the
GNU General Public License and related to other versions of Emacs,
in particular GNU Emacs. Its emphasis is on modern graphical
user interface support and an open software development
model, similar to Linux.

This package contains the lisp source files for XEmacs.

%package info
Summary: Information files for XEmacs.
Group: Applications/Editors
PreReq: /sbin/install-info

%description info
XEmacs is a highly customizable open source text editor and
application development system. It is protected under the
GNU General Public License and related to other versions of Emacs,
in particular GNU Emacs. Its emphasis is on modern graphical
user interface support and an open software development
model, similar to Linux.

This package contains the XEmacs manuals in info format.


%define pkgdir %{_datadir}/xemacs
%define exectop %{_libdir}/xemacs-%{version}


%prep
%setup -q

## Lisp patches ## 
# make find-paths.el look in datadir
rm lisp/find-paths.elc
%patch10 -p1
# fix "libexec" on multilib
%ifarch x86_64 s390x
%patch15 -p1 -b .lib64
%endif
# remove game we shouldn't ship
%patch14 -p1
# make lisp dir and mule-lisp dir be the source lisp dirs (not in datadir)
%patch18 -p1
rm lisp/dump-paths.elc
sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el

## non-Lisp patches ##
%patch5 -p1 -b .cursor
# movemail
%patch11 -p1 -b .mkstemp
# skip redundant check-features
%patch16 -p1 -b .feature-chk
# fix missing charsets warning with Xaw/UTF-8
%patch19 -p1
# look for dump file docdir/DUMP as well as bindir/xemacs.dmp
%patch21 -p1 -b .docdmp
%ifarch ia64
# don't link with -dynamic-export on ia64
%patch23 -p1 -b .dyn-exp
%endif
# remove cwnn symbols
%patch24 -p1 -b .cwnn

# patch21 touch configure.in, and patch23 touches aclocal.m4
autoconf-2.13


%build
export CFLAGS="${CFLAGS:-%optflags}"

# XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir,
#   --includedir, --libexecdir, --localstatedir, --sharedstatedir
# NB datadir has to be defined because it defaults to /usr/lib
common_options="
	%{_target_platform}
	--prefix=%{_prefix}
	--datadir=%{_datadir}
	--infodir=%{_infodir}
	--libdir=%{_libdir}
	--mandir=%{_mandir}/man1
	--with-gpm=yes
	--with-pop
	--mail-locking=lockf
	--with-clash-detection
	--with-database=no
	--with-postgresql=no
	--with-ldap=no
	--with-hesiod=no
	--with-msw=no
	--pdump
	--debug=%{?_without_debug:no}%{!?_without_debug:yes}
	%{!?_without_mule:--with-mule=yes}
%ifarch alpha ia64 ppc64
	--with-system-malloc
%endif
%ifarch ia64
	--without-modules
%endif
"

## build without X
#
# NB docdir requires trailing slash
./configure $common_options \
	--docdir=%{exectop}/doc-nox/ \
	--with-sound=no \
	--with-x11=no \
	--with-canna=no \
	--with-wnn=no \
	--with-xim=no
# toplevel smp build fails
make %{?_smp_mflags} -C lib-src
#make src/Emacs.ad.h
make %{?_smp_mflags} -C src
EMACSLOADPATH=$PWD/lisp make # EMACSDEBUGPATHS=yes
mv lib-src/DOC{,-nox}
mv src/xemacs{,-nox-%{version}}
mv src/{xemacs.dmp,DUMP-nox}
mv lib-src/config.values{,-nox}

#make clean

## build with X
#
# NB docdir requires trailing slash
./configure $common_options \
	--docdir=%{exectop}/doc/ \
	--with-sound=native \
	%{!?_without_mule:--with-canna=yes --with-xim=xlib} \
	%{?_with_gtk: --with-gtk --with-gnome} \
	%{!?_with_gtk: --with-athena=3d --with-widgets=athena --with-menubars=lucid --with-scrollbars=lucid --with-dialogs=athena } \
	--with-xfs=no
# toplevel smp build fails
make %{?_smp_mflags} -C lib-src
make src/Emacs.ad.h
make %{?_smp_mflags} -C src
EMACSLOADPATH=$PWD/lisp make # EMACSDEBUGPATHS=yes


%install
rm -rf %buildroot
# adjust mandir
export EMACSLOADPATH=$PWD/lisp
# make docdir
mkdir -p %buildroot%{exectop}/doc
%makeinstall mandir=%buildroot%{_mandir}/man1 docdir=%buildroot%{exectop}/doc/

# install nox files
mkdir -p %buildroot%{exectop}/doc-nox
cp -p src/xemacs-nox-%{version} %buildroot%{_bindir}
ln -s xemacs-nox-%{version} %buildroot%{_bindir}/xemacs-nox
cp -p src/DUMP-nox %buildroot%{exectop}/doc-nox/DUMP
cp -p lib-src/DOC-nox %buildroot%{exectop}/doc-nox/DOC
cp -p lib-src/config.values-nox %buildroot%{exectop}/doc-nox/config.values

mv %buildroot%{_bindir}/xemacs-%{version}-*.dmp %buildroot%{exectop}/doc/DUMP

# these clash with GNU Emacs
mv %buildroot%{_bindir}/{etags,etags.xemacs}
rm -f %buildroot%{_bindir}/{ctags,rcs-checkin,b2m}
rm %buildroot%{_mandir}/man1/{etags.1,ctags.1}

rm -f %buildroot%{_infodir}/dir

#These clash with other packages
rm -f %buildroot%{_infodir}/info*
rm -f %buildroot%{_infodir}/standards*
rm -f %buildroot%{_infodir}/termcap*

install -m 755 -d %buildroot%{_datadir}/applications
install -m 644 %SOURCE6 %buildroot%{_datadir}/applications/net-xemacs.desktop

# Lockdir
mkdir -p %buildroot%{_localstatedir}/lock/xemacs

# site-start.el
mkdir -p %buildroot%{pkgdir}/site-packages/lisp/site-start.d/
install -m 644 %SOURCE9 %buildroot%{pkgdir}/site-packages/lisp/site-start.el

# default.el
install -m 644 %SOURCE24 %buildroot%{pkgdir}/site-packages/lisp

# default user init file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs
install -m 0644 %SOURCE23 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el

# icon
install -Dpm 644 %{SOURCE1} %buildroot%{_datadir}/pixmaps/xemacs.png

# Make sure nothing is 0400
chmod -R a+rX  %buildroot%{_prefix}

# filter out buildroot from finder-inf.el
sed -i -e "s|%buildroot||" %buildroot%{_datadir}/xemacs-%{version}/lisp/finder-inf.el
[ -x %{_bindir}/xemacs ] && python %SOURCE22 %buildroot%{_datadir}/xemacs-%{version}/lisp/finder-inf.el

# separate files
rm -f *.files base-files el-files info-files
echo "%defattr(-,root,root)" > base-files
echo "%defattr(-,root,root)" > el-files
echo "%defattr(-,root,root)" > info-files

find %buildroot%{_datadir}/xemacs-%{version} %buildroot%{pkgdir} \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \( -type d -name info -fprint info.files -prune \) -o \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o -fprint base-el-not-bytecomped.files \) \)

# remove buildroot prefix from files
sed -i -e "s|%buildroot||" *.files
# make site-packages lisp files config files
perl -pe 's|^(.+/site-packages/lisp/.+)$|%%config $1|' base-el-not-bytecomped.files
# combine the file lists
cat base-*.files dir.files >> base-files
cat el-*.files dir.files >> el-files
cat info.files >> info-files


%clean
rm -rf %buildroot


%post common
alternatives --install %{_bindir}/etags etags %{_bindir}/etags.xemacs 40

%preun common
if [ "$1" = 0 ]; then
  alternatives --remove etags %{_bindir}/etags.xemacs
fi

%post info
for file in xemacs cl internals lispref new-users-guide; do
  /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir
done
 
%preun info
if [ "$1" = "0" ]; then
  for file in xemacs cl internals lispref new-users-guide; do
    /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir
  done
fi


%files
%defattr(-, root, root)
%{_bindir}/xemacs
%{_bindir}/xemacs-%{version}
%{_bindir}/gnuclient
%{exectop}/*/gnuserv
%{exectop}/doc
%{_datadir}/applications/*

%files nox
%defattr(-, root, root)
%{_bindir}/xemacs-nox
%{_bindir}/xemacs-nox-%{version}
%{exectop}/doc-nox

%files common -f base-files
%defattr(-, root, root)
%doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release
%doc etc/NEWS etc/MAILINGLISTS BUGS README.packages
%doc etc/TUTORIAL
%exclude %{_bindir}/xemacs*
# needs X libs
%exclude %{_bindir}/gnuclient
%{_bindir}
%exclude %{exectop}/doc*
# needs X libs
%exclude %{exectop}/*/gnuserv
%{exectop}
%{_datadir}/pixmaps/xemacs.png
%config %{_sysconfdir}/skel/.xemacs
%{_mandir}/*/*
%attr(1777, root, root) %{_localstatedir}/lock/xemacs

%files el -f el-files
%defattr(-, root, root)

%files info -f info-files
%defattr(-, root, root)
%{_infodir}/*


%changelog
* Tue Mar  1 2005 Ville Skytt?? <scop at xemacs.org> - 21.4.17-2
- Drop xemacs-sumo build dependency and -nox install time dependency on it
  to solve chicken-egg bootstrap problem.
- Include X-Face support.
- Include Glade support when built with GTK.
- Include prettier icon, based on upstream xemacs.xpm.
- Drop FreeWnn-devel build dependency.
- Drop main package dependency from -info.
- Require updated -sumo.
- Avoid shipping patch backups.
- Improve package summaries and descriptions.
- Trim pre-XEmacs-21.4 %%changelog entries.
- Some specfile maintainablity improvements and cleanups.

* Fri Feb 25 2005 Jens Petersen <petersen at redhat.com>
- use PreReq not Requires(post,preun) for install and uninstall script 
  requirements (Axel Thimm, 147791)
- use sed instead of perl to fixup filelists

* Mon Feb  7 2005 Jens Petersen <petersen at redhat.com> - 21.4.17-1
- update to 21.4.17
  - fixes movemail format string vulnerability (CAN-2005-0100, 146705)
  - xemacs-21.4.16-xutil-keysym-144601.patch no longer needed

* Tue Jan 25 2005 Jens Petersen <petersen at redhat.com> - 21.4.16-2
- workaround xorg-x11 issue with iso-level3-shift (Ville Skytt??, 144601)
  - add xemacs-21.4.16-xutil-keysym-144601.patch

* Mon Dec 13 2004 Jens Petersen <petersen at redhat.com> - 21.4.16-1
- update to new stable release
  - no longer need configure-ppc-ldscript.patch and
    xemacs-21.4.15-pui-120437.patch
- default to unified diff in .xemacs/init.el

* Thu Nov 18 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-10
- show xemacs again in the desktop menu (132567)

* Mon Oct 18 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-9
- fix etag alternatives removal when uninstalling (Karsten Hopp, 136137)

* Wed Oct  6 2004 Jens Petersen <petersen at redhat.com>
- xemacs-el no longer requires xemacs for -nox users
  (Lars Hupfeldt Nielsen, 134479)

* Thu Sep 30 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-8
- cleanup and update .desktop file
- make xemacs not appear in the desktop menu (Seth Nickell,132567)
- move the desktop file from -common to main package
- etags is now handled by alternatives (92256)
- no longer require ctags
- turn back on wnn support and add xemacs-21.4.15-wnnfix-128362.patch
  (Yukihiro Nakai, 128362)

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Jun  7 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-6
- don't link with -export-dynamic on ia64 to stop dumped function pointers from
  breaking (Roland McGrath & Jakub Jelinek, #106744)
- disable dynamic module support on ia64
- change the xemacs-info uninstall script from %%postun to %%preun and move
  the post/preun install-info requires to xemacs-info
- simplify coding-system setup somewhat in site-start.el
- fix up the desktop file (Ville Skytt??, 123135)
- xemacs-nox now requires xemacs-sumo
- build without xfs since it seems to cause some problem with fonts missing

* Wed May  5 2004 Jens Petersen <petersen at redhat.com>
- move install-info requirement to xemacs-info
- drop unnecessary Canna-libs requirement

* Fri Apr  9 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-5
- add xemacs-21.4.15-pui-120437.patch to fix pui problems in 21.4.15
  (Ville Skytt??)
- buildrequire gpm-devel and build xemacs-nox with gpm (Ville Skytt??,120437)
- separate patches into lisp and non-lisp patches
- move gnuclient and gnuserv from xemacs-common to xemacs since they
  require X libs (Ville Skytt??,110649)

* Wed Apr  7 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-4
- add xemacs-nox subpackage (Jamie Zawinski, #110649) and xemacs-common
  - add xemacs-debian-docdir-dump.patch and put dump files in docdir
  - xemacs and xemacs-nox require xemacs-common
  - define exectop and use it
  - one configure and build for xemacs-nox and one for xemacs
- update package descriptions
- don't create backup of patched Emacs.ad since it gets installed, and
  drop Canna-devel version requirement (Ville Skytt??, #115270)
- default ispell dictionary to english for CJK locale, since aspell doesn't
  support widechars (#103145)
- rebuild against latest Canna built with xorg-x11 xmkmf (Kaj Niemi, #119562)
- simplify coding-system setup
- enable gpm for xemacs package

* Tue Mar 16 2004 Mike A. Harris <mharris at redhat.com> 21.4.15-3
- Removed bogus Requires: XFree86-libs, and other similar library runtime
  dependancies, because rpm find-requires automatically puts dependancy info
  in the binary rpms which are on the .so files rather than a specific
  package.  The XFree86-libs removal is necessary in order to replace XFree86
  with xorg-x11 in an X11 implementation agnostic fashion.  (#118483)
- Changed "Requires(post,preun): info" dependancy to
  "Requires(post,postun): /sbin/install-info"

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Feb  5 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-1
- update to 21.4.15
- improve language and coding-system startup in site-start.el like
  lang-coding-systems-init.el in emacs package
- build without wnn support
- drop xemacs-21.4.13-regexp-stack-overflow-107402.patch

* Sat Dec 27 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-6
- set EMACSLOADPATH during final make and install so that it is buildable
  even when xemacs isn't installed
- disable ldap, postgresql and dbm support for now (#110649) [jwz]

* Sat Dec 13 2003 Jeff Johnson <jbj at jbj.org>
- rebuild against db-4.2.52.

* Fri Nov  7 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-5
- add a "--without mule" rpmbuild option for the 8bit dead-hards (#102718)
  which disables mule and Input Method support
- only load un-define in site-start.el when there is mule support

* Thu Nov  6 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-4
- increase regexp re_max_failures to 40000 in
  xemacs-21.4.13-regexp-stack-overflow-107402.patch (#107402) [Rik Faith]

* Mon Oct 27 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-3
- no longer obsolete xemacs-sumo-el for xemacs-el [thanks to Axel Thimm]
- fix "Stack overflow in regexp matcher" (#107402) [reported by Rik Faith,
  patch by Stephen J. Turnbull]

* Fri Oct 17 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-2
- require Canna-libs not Canna
- move CJK X resource files to xemacs-sumo
- no longer need to define ispell program to be aspell

* Thu Sep 25 2003 Jeff Johnson <jbj at jbj.org> - 21.4.14-1.1
- rebuild against db-4.2.42.

* Mon Sep  8 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-1
- update to 21.4.14
- default require-final-newline to t in site-start.el (#102022)

* Tue Sep  2 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-5
- default require-final-newline to ask in site-start.el
  and remove redundant setting of next-line-add-newlines to nil in default.el
  (#102022) [reported by Ville Skytt??]

* Mon Jul 14 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-4
- build with --debug=yes by default (suggested by Ville Skytt??)

* Sun Jul 13 2003 Ville Skytt?? <scop at xemacs.org>
- add xemacs-21.4.13-utf8-fontsets.patch to eliminate warning about missing
  charsets in utf-8 locale with Xaw
- motif-specific xemacs-21.4.13-EmacsFrame-fontlock.patch no longer needed

* Fri Jun 27 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-3
- add xemacs-21.4.13-dump-paths-lispdir.patch, so that the source lisp files
  get re-bytecompiled and dumped, not the installed ones
- use Athena/Xaw3d instead of motif for dialogs and widgets
- buildrequirements fixes
- use _localstatedir

* Sat May 31 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-2
- add xemacs-21.4.13-EmacsFrame-fontlock.patch to stop font-lock being
  very slow (Ville Skytt??)

* Fri May 30 2003 Ville Skytt?? <scop at xemacs.org>
- Use upstream icon in desktop entry, add missing semicolon to Categories.
- Have backup-by-copying-when-mismatch default to true in site-start.el.
- Mark init files as %%config.

* Thu May 29 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-1
- update to 21.4.13
  - rcs2log-update.patch no longer needed
- buildrequire recent xemacs-sumo
- set system-uses-terminfo in default.el (#76102)
- use defvar in default.el not to override user's settings
- default gnus-default-article-saver to mbox format (#90604)
- add aspell as ispell program in site-start.el (#88262)
- add rpmbuild option "--with gtk" allowing building with gtk
- exclude s390x temporarily

* Mon May 12 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-12
- sumo packages moved to separate xemacs-sumo package

* Sat May 10 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-11
- build with system malloc on ppc64

* Tue Apr 22 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-10
- obsoletes ruby-mode-xemacs (#84673)
- move obsoletes xemacs-sumo-el to -el subpackage
- fix links in jde html documentation (#89499)

* Tue Apr 15 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-8
- comment out ja and ko menubar translations in X resource files for now,
  to avoid startup hanging in utf-8 locale (#88860)
- use default menubar font in ja and ko locale
- in a UTF-8 locale set default coding systems to utf-8 (partly #77130
  and #74227)
- set Info-directory-list in site-start.el again
- move psgml setup into site-start.el
- move previous contents of "dotxemacs-init.el" to new "default.el"

* Mon Mar 31 2003 Akira TAGOH <tagoh at redhat.com> 21.4.12-7
- Rebuild against the latest Canna.

* Thu Feb 20 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-6
- default browse-url to use htmlview and update psgml-html browser
  defaults (#84262)

* Tue Feb 11 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-5
- build with system-malloc on alpha and ia64
- skip redundant check-features target

* Thu Feb  6 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-4
- fix "libexec dir" to be under lib64 on multilib archs
- set default ftp to be non-kerberos in site-start.el
- update sumos to 2003-02-05
- mspec patch and rpm-spec-mode update no longer needed
- buildrequire autoconf213
- add ".xemacs/init.el" to /etc/skel
- skip redundant check-features target on s390 and s390x

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Tue Jan 21 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-2
- fix `paths-emacs-root-p' (find-paths.el) to look in share not lib
- don't generate backup files when updating autoloads
- try startup notification in desktop file
- cleanup desktop file to use name XEmacs and add encoding key

* Fri Jan 17 2003 Jens Petersen <petersen at redhat.com> 21.4.12-1
- update to 21.4.12 bugfix release (21.4 series now declared stable branch)
- renumbered sumo package patches to be greater than 100
- install sumo packages by copying rather than moving
- patch sh-script.el to append m?spec entry to auto-mode-alist 
- avoid ppc.ldscript and build on ppc
- remove games that we shouldn't ship
- update to latest rcs2log
- update to latest rpm-spec-mode.el
- use _smp_mflags for lib-src and src
- run batch-update-directory and batch-byte-recompile-directory on sumo lisp
  dirs
- improve datadir/xemacs-version/ ownership

* Sat Jan  4 2003 Jens Petersen <petersen at redhat.com> 21.4.11-1
- update to 21.4.11
- don't configure with union-type, since it causes runtime problems apparently
- only do postun info dir deletions when uninstalling

* Wed Jan  1 2003 Jens Petersen <petersen at redhat.com> 21.4.10-6
- move apel to separate package and require it
- renamed psgml-init.el-xemacs to xemacs-psgml-init.el
- use datadir in site-start.el
- really include the movemail mkstemp patch
- use mapc to load site-start.d files

* Tue Dec 31 2002 Ville Skytt?? <scop at xemacs.org>
- New Sumos (2002-12-30).
- Use `construct-emacs-version-name' in `paths-emacs-root-p' (find-paths.el),
  fixing "Couldn't find obvious default for XEmacs hierarchy" warnings
  (as in XEmacs 21.5).
- Move site-start stuff to site-packages.
- Don't set Info-directory-list in site-start.el.
- Don't use --pkgdir, it's ignored.  Don't pass pkgdir to makeinstall.
- Fix source tarball URLs.
- Don't override the defcustom in psgml-init.el, set its default value instead.
- Add rpmbuild option: "--with debug" for building a debug-enabled XEmacs.

* Sun Dec 29 2002 Jens Petersen <petersen at redhat.com>
- updates package sumos to 2002-12-26 release

* Mon Dec 23 2002 Jens Petersen <petersen at redhat.com> 21.4.10-5
- patch find-paths.el to search in datadir
- setup lisp packages under datadir not libdir
- use buildroot macro instead of RPM_BUILD_ROOT
- drop local configure macro
- fix buildrequires and requires
- list configure options one-per-line
- improve psgml-init.el catalog setup
- remove and add lisp packages with package-admin
- rebyte-compile lisp packages
- keep etags as etags.xemacs (#78106)
- don't bother removing non-existent udp2tcp nor .cvsignore files
- simply filelist generation to a single find search pass
- put core .el files in -el package
- put package info files into -info package
- don't create backup files when patching in lisp packages tree
- don't explicitly gzip lisp package info files
- don't mark the applications files noreplace
- exclude ppc, since __init_array_start undefined

* Wed Dec 18 2002 Jens Petersen <petersen at redhat.com>
- patch egg-wnn to default to unix domain socket (#79826)
  [patch from ynakai at redhat.com]
- add ia64 patch from SuSE
- use mkstemp in movemail

* Tue Nov 19 2002 Jens Petersen <petersen at redhat.com>
- apply jlatex autodetect patch correctly and drop append to tex-site.el
- default to pTeX and pLaTeX for Japanese TeX and LaTeX

* Mon Nov 18 2002 Jens Petersen <petersen at redhat.com> 21.4.10-3
- backout uncommenting of deactivate-mark (#77696)
- update psgml dtd catalog path in psgml-init.el (#78022)
  [reported by ville.skytta at iki.fi]
- build with --use-union-type (#78024)
  [suggested by ville.skytta at iki.fi]

* Fri Nov 15 2002 Jens Petersen <petersen at redhat.com>
- fix autodetection of jlatex (#69129)

* Tue Nov 12 2002 Elliot Lee <sopwith at redhat.com> 21.4.10-2
- build on x86_64

* Mon Nov 11 2002 Jens Petersen <petersen at redhat.com> 21.4.10-1
- update to 21.4.10
- update sumos to 2002-09-19
- no longer backout mule-ucs package
- encode this file in utf-8
- xemacs-21.1.14-xfs.patch no longer needed
- use _libdir, _datadir, _bindir, _prefix
- exclude x86_64 (requires Canna)
- own /usr/lib/xemacs/{,mule-packages} and /usr/X11R6/lib/X11/<locale> (#73982)
  [reported by enrico.scholz at informatik.tu-chemnitz.de]
- fix default italic font size (#75275)
  [reported with fix by ville.skytta at iki.fi]
- update ja menubar translations in ja locale X resource file (#76068)
  [from ynakai at redhat.com]
- update ko locale X resource file (#76072) [from ynakai at redhat.com]
- add pkgdir rpm macro for packages dir
- uncomment deactivate-mark in simple.el (#77696)

* Mon Aug 26 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-16
- some cleanups - and remove the info tarball, it's now part 
  of the base tarball. Wow, the package gets smaller. (#72480)

* Mon Aug 19 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-15
- Bug in specfile from -14 gave bug on startup (#71743)

* Thu Aug 15 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-14
- Use utf-8 by default for input/output (#71584 )
- Make it not segfault when handling utf-8 (#71589)

* Wed Aug  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-13
- Add openmotif-devel to buildrequires, as it will use it for widgets 
  if it finds it

* Fri Aug  2 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-12
- Don't package po-mode separately, it's now in sumo
- Compile with drag'n'drop support
- Use the bundled rpm-spec-mode, it has some adaptions for XEmacs

* Wed Jul 31 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-11
- Don't use a separate ispell.el file anymore - the included one is newer
- Fix html-mode (#64826)

* Tue Jul 23 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-10
- Update lisp tarballs
- desktop file fixes (#69542)
- Add bdb support (#65640)

* Mon Jul  8 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-9
- Make it provide ruby-mode-xemacs (request from tagoh)

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Mon Jun 17 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-7
- #66835

* Wed May 29 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-6
- Make it build... Evil.
- Exclude IA64
- Upgrade sumo tarballs to 2002-05-22

* Fri May 24 2002 Jens Petersen <petersen at xemacs.org> 21.4.8-5
- Build using portable dumper, so that build with glibc-2.3 malloc is ok

* Mon May 13 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-2
- Remove the s390 patches so it builds on s390 :)

* Fri May 10 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-1
- 21.4.8

* Tue May  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-9
- Rebuild... chmod -x pstogif to work around an rpm bug until 
  it's fixed (#64320)

* Tue Apr 23 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-8
- New sumo packages

* Thu Feb 21 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-7
- Rebuild

* Tue Jan 29 2002 Jens Petersen <petersen at redhat.com> 21.4.6-6
- Remove skk package, since it conflicts with ddskk-xemacs (newer)

* Thu Jan 24 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-5
- New sumos

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Dec 19 2001 Jens Petersen <petersen at redhat.com> 21.4.6-3
- Fix fontlist pattern in Emacs.ad.Japanese.
- CHANGES-beta is now CHANGES-release.
- Obsolete xemacs-sumo xemacs-sumo-el

* Wed Dec 19 2001 Jens Petersen <petersen at redhat.com> 21.4.6-2
- Don't obsolete flim.

* Mon Dec 17 2001 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-1
- 21.4.6
- New sumo packages
- disable alpha

* Wed Nov 14 2001 Jens Petersen <petersen at redhat.com> 21.4.5-2
- Add -znocombreloc configure option to override new ld default.

* Tue Nov  6 2001 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.5-1
- 21.4.5. It builds on IA64 and fixes #55578


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Mar 2005 22:05:24 -0000	1.1
+++ .cvsignore	1 Mar 2005 22:11:36 -0000	1.2
@@ -0,0 +1 @@
+xemacs-21.4.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Mar 2005 22:05:24 -0000	1.1
+++ sources	1 Mar 2005 22:11:36 -0000	1.2
@@ -0,0 +1 @@
+a207e106138c085711160855d78b72a2  xemacs-21.4.17.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar  1 22:15:20 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:15:20 -0500
Subject: rpms/xemacs-sumo - New directory
Message-ID: <200503012215.j21MFKVu024339@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24332/xemacs-sumo

Log Message:
Directory /cvs/extras/rpms/xemacs-sumo added to the repository




From fedora-extras-commits at redhat.com  Tue Mar  1 22:15:20 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:15:20 -0500
Subject: rpms/xemacs-sumo/devel - New directory
Message-ID: <200503012215.j21MFKwF024342@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24332/xemacs-sumo/devel

Log Message:
Directory /cvs/extras/rpms/xemacs-sumo/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar  1 22:15:39 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:15:39 -0500
Subject: rpms/xemacs-sumo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503012215.j21MFdO3024403@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24394

Added Files:
	Makefile import.log 
Log Message:
Setup of module xemacs-sumo


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

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

common : CVS/Root
	@cvs 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 Mar  1 22:15:39 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:15:39 -0500
Subject: rpms/xemacs-sumo/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503012215.j21MFdL1024406@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24394/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xemacs-sumo


--- 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 Mar  1 22:31:06 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:31:06 -0500
Subject: rpms/xemacs-sumo import.log,1.1,1.2
Message-ID: <200503012231.j21MV6DK024791@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24781

Modified Files:
	import.log 
Log Message:
auto-import xemacs-sumo-20050118-2 on branch devel from xemacs-sumo-20050118-2.src.rpm
Latest from Core devel CVS adapted to Extras + some improvements.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Mar 2005 22:15:37 -0000	1.1
+++ import.log	1 Mar 2005 22:31:04 -0000	1.2
@@ -0,0 +1 @@
+xemacs-sumo-20050118-2:HEAD:xemacs-sumo-20050118-2.src.rpm:1109716216



From fedora-extras-commits at redhat.com  Tue Mar  1 22:31:06 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:31:06 -0500
Subject: rpms/xemacs-sumo/devel Emacs.ad.ja_JP.UTF-8, NONE,
	1.1 Emacs.ad.ja_JP.eucJP, NONE, 1.1 Emacs.ad.ko_KR.UTF-8, NONE,
	1.1 Emacs.ad.ko_KR.eucKR, NONE, 1.1 Emacs.ad.zh_CN.GB2312,
	NONE, 1.1 Emacs.ad.zh_CN.UTF-8, NONE, 1.1 Emacs.ad.zh_TW.Big5,
	NONE, 1.1 Emacs.ad.zh_TW.UTF-8, NONE,
	1.1 auctex-texjp-platex.patch, NONE,
	1.1 auctex-texsite-jlatex-detect-69129.patch, NONE,
	1.1 avoid-catch-error-65346.patch, NONE,
	1.1 browse-url-htmlview-84262.patch, NONE,
	1.1 egg-wnn-host-unix-79826.patch, NONE,
	1.1 jde-ug-rel-links.patch, NONE,
	1.1 jde-ug-section-links-89499.patch, NONE,
	1.1 mh-e-7.4.2-toolbar-100764.patch, NONE,
	1.1 psgml-browsers-84262.patch, NONE, 1.1 xemacs-sumo.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503012231.j21MV6Sv024794@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24781/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Emacs.ad.ja_JP.UTF-8 Emacs.ad.ja_JP.eucJP Emacs.ad.ko_KR.UTF-8 
	Emacs.ad.ko_KR.eucKR Emacs.ad.zh_CN.GB2312 
	Emacs.ad.zh_CN.UTF-8 Emacs.ad.zh_TW.Big5 Emacs.ad.zh_TW.UTF-8 
	auctex-texjp-platex.patch 
	auctex-texsite-jlatex-detect-69129.patch 
	avoid-catch-error-65346.patch browse-url-htmlview-84262.patch 
	egg-wnn-host-unix-79826.patch jde-ug-rel-links.patch 
	jde-ug-section-links-89499.patch 
	mh-e-7.4.2-toolbar-100764.patch psgml-browsers-84262.patch 
	xemacs-sumo.spec 
Log Message:
auto-import xemacs-sumo-20050118-2 on branch devel from xemacs-sumo-20050118-2.src.rpm
Latest from Core devel CVS adapted to Extras + some improvements.


--- NEW FILE Emacs.ad.ja_JP.UTF-8 ---
! XEmacs 21.x ?????????????????????????????????????????? (??????????????????)
!
!              MATSUBAYASHI 'Shaolin' Kohji (shaolin at rins.st.ryukoku.ac.jp)
!              Yukihiro Nakai <ynakai at redhat.com>
!                                   Time-stamp: <03/10/17 21:08:54 petersen>
!
!
! This is the app-defaults file for XEmacs.
!
! This used to be identical to sample.Xdefaults, but the resources
! below have been rewritten to be as general as possible to avoid
! overriding user resources.  Other than the form rewriting, both
! files should be kept in sync. 
! 
! The resources below are loaded into the XEmacs executable at compile-time:
! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
! effect.
! 
! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
! (or whatever the standard app-defaults directory is at your site) to cause
! it to be consulted at run-time.  (Do this only for site-wide customizations:
! personal customizations should be put into ~/.Xdefaults instead.)
! Note that the file must be named Emacs, not XEmacs.
! 
! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of
! the various resources and the syntax for setting them.
! 
! Energize users: note that this is not the same app-defaults file that is
! used with the Energize-specific version of XEmacs.


! Colors and backgrounds.
! ======================
! The contrasts of these colors will cause them to map to the appropriate
! one of "black" or "white" on monochrome systems.
! 
! The valid color names on your system can be found by looking in the file
! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/.

! ! Set the modeline colors.
! Emacs.modeline*attributeForeground:	Black
! Emacs.modeline*attributeBackground:	Gray75

! ! Set the color of the text cursor.
! Emacs.text-cursor*attributeBackground:	Red3

! If you want to set the color of the mouse pointer, do this:
! Emacs.pointer*attributeForeground:	Black
! If you want to set the background of the mouse pointer, do this:
! Emacs.pointer*attributeBackground:	White
! Note that by default, the pointer foreground and background are the same
! as the default face.

! Set the menubar colors.  This overrides the default foreground and
! background colors specified above.
*menubar*Foreground:			Gray30
*menubar*Background:			Gray80
! This is for buttons in the menubar.  
! Yellow would be better, but that would map to white on monochrome.
*menubar*buttonForeground:		Blue
*XlwMenu*highlightForeground:		Red
*XlwMenu*titleForeground:		Maroon
*XlwMenu*selectColor:			ForestGreen
*XmToggleButton*selectColor:		ForestGreen

! Specify the colors of popup menus.
*popup*Foreground:			Black
*popup*Background:			Gray80

! Specify the colors of the various sub-widgets of the dialog boxes.
*dialog*Foreground:			Black
! #A5C0C1 is a shade of blue
*dialog*Background:			#A5C0C1
! The following three are for Motif dialog boxes ...
*dialog*XmTextField*Background:		WhiteSmoke
*dialog*XmText*Background:		WhiteSmoke
*dialog*XmList*Background:		WhiteSmoke
! While this one is for Athena dialog boxes.
*dialog*Command*Background:		WhiteSmoke

! Xlw Scrollbar colors
*XlwScrollBar*Foreground:		Gray30
*XlwScrollBar*Background:		Gray80
*XmScrollBar*Foreground:		Gray30
*XmScrollBar*Background:		Gray80

!
! The Lucid Scrollbar supports two added resources, SliderStyle is either
! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
! of the slider that depresses when the slider is clicked on.  ArrowPosition is
! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
! of the scrollbar, same puts both arrows at the same end, like the Amiga.
!
Emacs*XlwScrollBar.SliderStyle:    dimple
! Emacs*XlwScrollBar.ArrowPosition:  opposite

!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

! *topToolBarShadowColor:		Gray90
! *bottomToolBarShadowColor:		Gray40
! *backgroundToolBarColor:		Gray80
! *toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
Emacs.default.attributeFont:  -misc-fixed-medium-r-*-*-14-*-*-*-*-*-*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
! *menubar*Font: 			-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*popup*Font:			-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*

! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:	-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*XmTextField*FontList:		-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*XmText*FontList:		-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*XmList*FontList:		-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField*translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton*translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! ! XIM fontset (defaults to system fontset default)
! ! *EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
! !    Japanese localization resources for XEmacs.
! ! @(#)Emacs	1.3 96/09/22
! !    Copyright (C) 1996 Sun Microsystems, Inc.
! !!
! ! This file is part of XEmacs.
! ! 
! ! XEmacs is free software; you can redistribute it and/or modify it
! ! under the terms of the GNU General Public License as published by the
! ! Free Software Foundation; either version 2, or (at your option) any
! ! later version.
! ! XEmacs 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 XEmacs; see the file COPYING.  If not, write to the
! ! Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! ! Boston, MA 02111-1307, USA.
! ! Copyright (C) 1996 Sun Microsystems Inc.
! !
! ! Japanese Resources to be placed in etc/app-defaults/ja/Emacs
! ! for xemacs-mule.  It is same on another languages such like fr,
! ! if you want to have French menu label, place it on
! ! etc/app-defaults/fr/Emacs.
! 
! ! ! Pulldown menu internationalization.  The first line of the file
! ! ! "*XlwMenu.resourceLabels: True" has to be there to make sure
! ! ! all the labelString will be read and displayed by X.
! ! *XlwMenu.resourceLabels: True
! 
! ! CDE doesn't require this but OpenWindows does.
! ! Note that this `gothic' font family is effective just for Japanese.
! ! And fontList is just used under Motif menubar.
! *fontList: -misc-fixed-medium-r-normal--14-*:
! !! FontSet for menus when you use --with-xfs or --with-xim=xlib.
! *fontSet: -*-fixed-medium-r-normal--14-*
! ! 
! ! ! ! Starting below here are menu label string which can be translated to
! ! ! ! different languages. 
! ! ! ! Example: *XlwMenu.file.labelString: File  
! ! ! ! Characters before the ":" sign, "Example: *XlwMenu.file.labelString"
! ! ! ! can not be changed. They must stay exactly the way they are.
! ! ! ! The only string to be translated is the string, "File".
! ! ! ! Some resource names such as "file", "quit" have been used in several
! ! ! ! places.  However, each of them only has to be translated once in this X
! ! ! ! resource file.
! ! ! ! Emacs*XlwMenu.file.labelString:	%_File
! ! ! Emacs*XlwMenu.file.labelString:		????????????(%_F)
! ! ! ! Emacs*XlwMenu.edit.labelString:	%_Edit
! ! ! Emacs*XlwMenu.edit.labelString:		??????(%_E)
! ! ! ! Emacs*XlwMenu.view.labelString:	%_View
! ! ! Emacs*XlwMenu.view.labelString:		??????(%_V)
! ! ! ! Emacs*XlwMenu.c_mds.labelString:	C%_mds
! ! ! Emacs*XlwMenu.c_mds.labelString:	????????????(%_M)
! ! ! ! Emacs*XlwMenu.tools.labelString:	%_Tools
! ! ! Emacs*XlwMenu.tools.labelString:	?????????(%_T)
! ! ! ! Emacs*XlwMenu.options.labelString:	%_Options
! ! ! Emacs*XlwMenu.options.labelString:	???????????????(%_O)
! ! ! ! Emacs*XlwMenu.buffers.labelString:	%_Buffers
! ! ! Emacs*XlwMenu.buffers.labelString:	????????????(%_B)
! ! ! ! Emacs*XlwMenu.help.labelString:	%_Help
! ! ! Emacs*XlwMenu.help.labelString:		?????????(%_H)
! ! ! ! Emacs*XlwMenu.lisp.labelString:	%_Lisp
! ! ! Emacs*XlwMenu.lisp.labelString:		%_Lisp
! ! ! ! Emacs*XlwMenu.open___.labelString:	%_Open...
! ! ! Emacs*XlwMenu.open___.labelString:	??????(%_O)...
! ! ! ! Emacs*XlwMenu.openInOtherWindow___.labelString:	Open in Other %_Window...
! ! ! Emacs*XlwMenu.openInOtherWindow___.labelString:		??????????????????????????????(%_W)...
! ! ! ! Emacs*XlwMenu.openInNewFrame___.labelString:	Open in New %_Frame...
! ! ! Emacs*XlwMenu.openInNewFrame___.labelString:	??????????????????????????????(%_F)...
! ! ! ! Emacs*XlwMenu.hexEditFile___.labelString:	%_Hex Edit File...
! ! ! Emacs*XlwMenu.hexEditFile___.labelString:	16??????????????????(%_H)...
! ! ! ! Emacs*XlwMenu.insertFile___.labelString:	%_Insert File...
! ! ! Emacs*XlwMenu.insertFile___.labelString:	?????????????????????(%_I)...
! ! ! ! Emacs*XlwMenu.viewFile___.labelString:	%_View File...
! ! ! Emacs*XlwMenu.viewFile___.labelString:		?????????????????????(%_V)...
! ! ! ! Emacs*XlwMenu.save.labelString:	%_Save
! ! ! Emacs*XlwMenu.save.labelString:		??????(%_S)
! ! ! ! Emacs*XlwMenu.saveAs___.labelString:	Save %_As...
! ! ! Emacs*XlwMenu.saveAs___.labelString:	???????????????(%_A)...
! ! ! ! Emacs*XlwMenu.saveSo_meBuffers.labelString:	Save So%_me Buffers
! ! ! Emacs*XlwMenu.saveSo_meBuffers.labelString:	??????????????????????????????(%_M)
! ! ! ! Emacs*XlwMenu.print.labelString:	%_Print
! ! ! Emacs*XlwMenu.print.labelString:	??????(%_P)
! ! ! ! Emacs*XlwMenu.prett_yPrint.labelString:	Prett%_y-Print
! ! ! Emacs*XlwMenu.prett_yPrint.labelString:		????????????(%_Y)
! ! ! ! Emacs*XlwMenu.revertBuffer.labelString:	%_Revert Buffer
! ! ! Emacs*XlwMenu.revertBuffer.labelString:		??????????????????(%_R)
! ! ! ! Emacs*XlwMenu.re_coverFile___.labelString:	Re%_cover File...
! ! ! Emacs*XlwMenu.re_coverFile___.labelString:	??????????????????(%_C)...
! ! ! ! Emacs*XlwMenu.recoverS_ession___.labelString:	Recover S%_ession...
! ! ! Emacs*XlwMenu.recoverS_ession___.labelString:	????????????????????????(%_S)...
! ! ! ! Emacs*XlwMenu.e_xitXEmacs.labelString:	E%_xit XEmacs
! ! ! Emacs*XlwMenu.e_xitXEmacs.labelString:		XEmacs?????????(%_X)
! ! ! ! Emacs*XlwMenu.undo.labelString:	%_Undo
! ! ! Emacs*XlwMenu.undo.labelString:		????????????(%_U)
! ! ! ! Emacs*XlwMenu.cu_t.labelString:	Cu%_t
! ! ! Emacs*XlwMenu.cu_t.labelString:		????????????(%_T)
! ! ! ! Emacs*XlwMenu.copy.labelString:	%_Copy
! ! ! Emacs*XlwMenu.copy.labelString:		?????????(%_C)
! ! ! ! Emacs*XlwMenu.paste.labelString:	%_Paste
! ! ! Emacs*XlwMenu.paste.labelString:	????????????(%_P)
! ! ! ! Emacs*XlwMenu.delete.labelString:	%_Delete
! ! ! Emacs*XlwMenu.delete.labelString:	??????(%_D)
! ! ! ! Emacs*XlwMenu.selectAll.labelString:	Select %_All
! ! ! Emacs*XlwMenu.selectAll.labelString:	??????????????????(%_A)
! ! ! ! Emacs*XlwMenu.selectPa_ge.labelString:	Select Pa%_ge
! ! ! Emacs*XlwMenu.selectPa_ge.labelString:	??????????????????(%_G)
! ! ! ! Emacs*XlwMenu.find___.labelString:	%_Find...
! ! ! Emacs*XlwMenu.find___.labelString:	??????(%_F)...
! ! ! ! Emacs*XlwMenu.r_eplace___.labelString:	R%_eplace...
! ! ! Emacs*XlwMenu.r_eplace___.labelString:		??????(%_E)...
! ! ! ! Emacs*XlwMenu.replaceRege_xp___.labelString:	Replace (Rege%_xp)...
! ! ! Emacs*XlwMenu.replaceRege_xp___.labelString:	?????? (????????????)(%_X)...
! ! ! ! Emacs*XlwMenu.listMatchingLines___.labelString:	%_List Matching Lines...
! ! ! Emacs*XlwMenu.listMatchingLines___.labelString:		????????????????????????(%_L)...
! ! ! ! Emacs*XlwMenu.multilingualMule.labelString:	%_Multilingual ("Mule")
! ! ! Emacs*XlwMenu.multilingualMule.labelString:	?????????(%_M) ("Mule")
! ! ! ! Emacs*XlwMenu.t_oggleInputMethod.labelString:	T%_oggle Input Method
! ! ! Emacs*XlwMenu.t_oggleInputMethod.labelString:	??????????????????????????????(%_O)
! ! ! ! Emacs*XlwMenu.selectInputMethod.labelString:	Select %_Input Method
! ! ! Emacs*XlwMenu.selectInputMethod.labelString:	???????????????????????????(%_I)
! ! ! ! Emacs*XlwMenu.d_escribeInputMethod.labelString:	D%_escribe Input Method
! ! ! Emacs*XlwMenu.d_escribeInputMethod.labelString:	???????????????????????????(%_E)
! ! ! ! Emacs*XlwMenu.describeCurrentCodingSystems.labelString:	Describe Current %_Coding Systems
! ! ! Emacs*XlwMenu.describeCurrentCodingSystems.labelString:		????????????????????????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.setCodingSystemOfBufferFile___.labelString:	Set Coding System of %_Buffer File...
! ! ! Emacs*XlwMenu.setCodingSystemOfBufferFile___.labelString:	?????????????????????????????????????????????????????????????????????(%_B)...
! ! ! ! Emacs*XlwMenu.setCodingSystemOfTerminal___.labelString:	Set Coding System of %_Terminal...
! ! ! Emacs*XlwMenu.setCodingSystemOfTerminal___.labelString:		????????????????????????????????????????????????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.setCodingSystemOfKeyboard___.labelString:	Set Coding System of %_Keyboard...
! ! ! Emacs*XlwMenu.setCodingSystemOfKeyboard___.labelString:		????????????????????????????????????????????????????????????(%_K)...
! ! ! ! Emacs*XlwMenu.setCodingSystemOfProcess___.labelString:	Set Coding System of %_Process...
! ! ! Emacs*XlwMenu.setCodingSystemOfProcess___.labelString:		?????????????????????????????????????????????????????????(%_P)...
! ! ! ! Emacs*XlwMenu.showCha_racterTable.labelString:	Show Cha%_racter Table
! ! ! Emacs*XlwMenu.showCha_racterTable.labelString:		????????????????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.showDia_gnosisForMULE.labelString:	Show Dia%_gnosis for MULE
! ! ! Emacs*XlwMenu.showDia_gnosisForMULE.labelString:	MULE??????????????????(%_G)
! ! ! ! Emacs*XlwMenu.showHelloInManyLanguages.labelString:	Show "%_hello" in Many Languages
! ! ! Emacs*XlwMenu.showHelloInManyLanguages.labelString:	????????????"Hello"?????????(%_H)
! ! ! ! Emacs*XlwMenu.newFrame.labelString:	%_New Frame
! ! ! Emacs*XlwMenu.newFrame.labelString:			??????????????????(%_N)
! ! ! ! Emacs*XlwMenu.frameOnOtherDispla_y___.labelString:	Frame on Other Displa%_y...
! ! ! Emacs*XlwMenu.frameOnOtherDispla_y___.labelString:	???????????????????????????????????????(%_Y)...
! ! ! ! Emacs*XlwMenu.deleteFrame.labelString:	%_Delete Frame
! ! ! Emacs*XlwMenu.deleteFrame.labelString:		?????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.splitWindow.labelString:	%_Split Window
! ! ! Emacs*XlwMenu.splitWindow.labelString:		????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.s_plitWindowSideBySide.labelString:	S%_plit Window (Side by Side)
! ! ! Emacs*XlwMenu.s_plitWindowSideBySide.labelString:	????????????????????????(???)(%_P)
! ! ! ! Emacs*XlwMenu.unSplitKeepThis.labelString:	%_Un-Split (Keep This)
! ! ! Emacs*XlwMenu.unSplitKeepThis.labelString:	?????????????????????(%_U) (???????????????)
! ! ! ! Emacs*XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep %_Others)
! ! ! Emacs*XlwMenu.unSplitKeepOthers.labelString:	?????????????????????(%_O) (????????????)
! ! ! ! Emacs*XlwMenu.n_arrow.labelString:	N%_arrow
! ! ! Emacs*XlwMenu.n_arrow.labelString:	N%_arrow
! ! ! ! Emacs*XlwMenu.showMessageLog.labelString:	Show Message %_Log
! ! ! Emacs*XlwMenu.showMessageLog.labelString:	??????????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.gotoLine___.labelString:	%_Goto Line...
! ! ! Emacs*XlwMenu.gotoLine___.labelString:		????????????(%_G)...
! ! ! ! Emacs*XlwMenu.whatLine.labelString:	%_What Line
! ! ! Emacs*XlwMenu.whatLine.labelString:	???????????????(%_W)
! ! ! ! Emacs*XlwMenu.bookmarks.labelString:	%_Bookmarks
! ! ! Emacs*XlwMenu.bookmarks.labelString:	??????????????????(%_B)
! ! ! ! Emacs*XlwMenu.jumpToPreviousMark.labelString:	%_Jump to Previous Mark
! ! ! Emacs*XlwMenu.jumpToPreviousMark.labelString:	????????????????????????(%_J)
! ! ! ! Emacs*XlwMenu.narrowToRegion.labelString:	%_Narrow to Region
! ! ! Emacs*XlwMenu.narrowToRegion.labelString:	%_Narrow to Region
! ! ! ! Emacs*XlwMenu.narrowToPage.labelString:	Narrow to %_Page
! ! ! Emacs*XlwMenu.narrowToPage.labelString:		Narrow to %_Page
! ! ! ! Emacs*XlwMenu.narrowToDefun.labelString:	Narrow to %_Defun
! ! ! Emacs*XlwMenu.narrowToDefun.labelString:	Narrow to %_Defun
! ! ! ! Emacs*XlwMenu.widen.labelString:	%_Widen
! ! ! Emacs*XlwMenu.widen.labelString:	%_Widen
! ! ! ! Emacs*XlwMenu.jumpToBookmark.labelString:	%_Jump to Bookmark
! ! ! Emacs*XlwMenu.jumpToBookmark.labelString:	???????????????????????????(%_J)
! ! ! ! Emacs*XlwMenu.setBookmark.labelString:	Set %_Bookmark
! ! ! Emacs*XlwMenu.setBookmark.labelString:		???????????????????????????(%_B)
! ! ! ! Emacs*XlwMenu.insertContents.labelString:	Insert %_Contents
! ! ! Emacs*XlwMenu.insertContents.labelString:	????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.insertL_ocation.labelString:	Insert L%_ocation
! ! ! Emacs*XlwMenu.insertL_ocation.labelString:	???????????????(%_L)
! ! ! ! Emacs*XlwMenu.renameBookmark.labelString:	%_Rename Bookmark
! ! ! Emacs*XlwMenu.renameBookmark.labelString:	?????????????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.deleteBookmark.labelString:	%_Delete Bookmark
! ! ! Emacs*XlwMenu.deleteBookmark.labelString:	???????????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.editBookmarkList.labelString:	%_Edit Bookmark List
! ! ! Emacs*XlwMenu.editBookmarkList.labelString:	????????????????????????????????????(%_E)
! ! ! ! Emacs*XlwMenu.saveBookmarks.labelString:	%_Save Bookmarks
! ! ! Emacs*XlwMenu.saveBookmarks.labelString:	???????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.saveBookmarksAs___.labelString:	Save Bookmarks %_As...
! ! ! Emacs*XlwMenu.saveBookmarksAs___.labelString:	????????????????????????????????????(%_A)...
! ! ! ! Emacs*XlwMenu.loadABookmarkFile.labelString:	%_Load a Bookmark File
! ! ! Emacs*XlwMenu.loadABookmarkFile.labelString:	?????????????????????????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.repeatLastComplexCommand___.labelString:	Repeat %_Last Complex Command...
! ! ! Emacs*XlwMenu.repeatLastComplexCommand___.labelString:	??????????????????????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.e_valuateLispExpression___.labelString:	E%_valuate Lisp Expression...
! ! ! Emacs*XlwMenu.e_valuateLispExpression___.labelString:	Lisp????????????????????? (%_V)
! ! ! ! Emacs*XlwMenu.executeNamedCommand___.labelString:	Execute %_Named Command...
! ! ! Emacs*XlwMenu.executeNamedCommand___.labelString:	?????????????????????????????????(%_N)
! ! ! ! Emacs*XlwMenu.startMacroRecording.labelString:	Start %_Macro Recording
! ! ! Emacs*XlwMenu.startMacroRecording.labelString:		????????????????????????(%_M)
! ! ! ! Emacs*XlwMenu.e_xecuteLastMacro.labelString:	E%_xecute Last Macro
! ! ! Emacs*XlwMenu.e_xecuteLastMacro.labelString:	??????????????????????????? (%_X)
! ! ! ! Emacs*XlwMenu.otherMacro.labelString:	%_Other Macro
! ! ! Emacs*XlwMenu.otherMacro.labelString:	????????????????????????(%_O)
! ! ! ! Emacs*XlwMenu.abbrev.labelString:	%_Abbrev
! ! ! Emacs*XlwMenu.abbrev.labelString:	??????(%_A)
! ! ! ! Emacs*XlwMenu.register.labelString:	%_Register
! ! ! Emacs*XlwMenu.register.labelString:	??????(%_R)
! ! ! ! Emacs*XlwMenu.r_ectangles.labelString:	R%_ectangles
! ! ! Emacs*XlwMenu.r_ectangles.labelString:		??????(%_E)
! ! ! ! Emacs*XlwMenu.sort.labelString:	%_Sort
! ! ! Emacs*XlwMenu.sort.labelString:		?????????(%_S)
! ! ! ! Emacs*XlwMenu.changeCase.labelString:	%_Change Case
! ! ! Emacs*XlwMenu.changeCase.labelString:	?????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.ce_nter.labelString:	Ce%_nter
! ! ! Emacs*XlwMenu.ce_nter.labelString:	??????????????????(%_N)
! ! ! ! Emacs*XlwMenu.indent.labelString:	%_Indent
! ! ! Emacs*XlwMenu.indent.labelString:	???????????????(%_I)
! ! ! ! Emacs*XlwMenu.s_pellCheck.labelString:	S%_pell-Check
! ! ! Emacs*XlwMenu.s_pellCheck.labelString:		?????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.footnotes.labelString:	%_Footnotes
! ! ! Emacs*XlwMenu.footnotes.labelString:	??????(%_F)
! ! ! ! Emacs*XlwMenu.d_ynamicAbbrevExpand.labelString:	D%_ynamic Abbrev Expand
! ! ! Emacs*XlwMenu.d_ynamicAbbrevExpand.labelString:		?????????????????????????????????(%_Y)
! ! ! ! Emacs*XlwMenu.dynamicAbbrevComplete.labelString:	Dynamic Abbrev %_Complete
! ! ! Emacs*XlwMenu.dynamicAbbrevComplete.labelString:	?????????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.dynamicAbbrevCompleteInAllBuffers.labelString:	Dynamic Abbrev Complete in %_All Buffers
! ! ! Emacs*XlwMenu.dynamicAbbrevCompleteInAllBuffers.labelString:	?????????????????????????????????????????????????????????(%_A)
! ! ! ! Emacs*XlwMenu.defineGlobalAbbrevFor.labelString:	%_Define Global Abbrev for 
! ! ! Emacs*XlwMenu.defineGlobalAbbrevFor.labelString:	??????????????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.defineModeSpecificAbbrevFor.labelString:	Define %_Mode-Specific Abbrev for 
! ! ! Emacs*XlwMenu.defineModeSpecificAbbrevFor.labelString:		?????????????????????????????????(%_M)
! ! ! ! Emacs*XlwMenu.defineGlobalEx_pansionFor.labelString:	Define Global Ex%_pansion for 
! ! ! Emacs*XlwMenu.defineGlobalEx_pansionFor.labelString:	??????????????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.defineModeSpecificExpa_nsionFor.labelString:	Define Mode-Specific Expa%_nsion for 
! ! ! Emacs*XlwMenu.defineModeSpecificExpa_nsionFor.labelString:	?????????????????????????????????(%_N)
! ! ! ! Emacs*XlwMenu.e_xpandAbbrev.labelString:	E%_xpand Abbrev
! ! ! Emacs*XlwMenu.e_xpandAbbrev.labelString:	???????????????(%_X)
! ! ! ! Emacs*XlwMenu.expandAbbrevsInRe_gion.labelString:	Expand Abbrevs in Re%_gion
! ! ! Emacs*XlwMenu.expandAbbrevsInRe_gion.labelString:	????????????????????????????????????(%_G)
! ! ! ! Emacs*XlwMenu.unexpandLastAbbrev.labelString:	%_Unexpand Last Abbrev
! ! ! Emacs*XlwMenu.unexpandLastAbbrev.labelString:	?????????????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.killAllAbbrevs.labelString:	%_Kill All Abbrevs
! ! ! Emacs*XlwMenu.killAllAbbrevs.labelString:	???????????????????????????(%_K)
! ! ! ! Emacs*XlwMenu.insertAllAbbrevsIntoBuffer.labelString:	%_Insert All Abbrevs into Buffer
! ! ! Emacs*XlwMenu.insertAllAbbrevsIntoBuffer.labelString:	??????????????????????????????????????????(%_I)
! ! ! ! Emacs*XlwMenu.listAbbrevs.labelString:	%_List Abbrevs
! ! ! Emacs*XlwMenu.listAbbrevs.labelString:		???????????????(%_L)
! ! ! ! Emacs*XlwMenu.editAbbrevs.labelString:	%_Edit Abbrevs
! ! ! Emacs*XlwMenu.editAbbrevs.labelString:		???????????????(%_L)
! ! ! ! Emacs*XlwMenu.redefineAbbrevsFromBuffer.labelString:	%_Redefine Abbrevs from Buffer
! ! ! Emacs*XlwMenu.redefineAbbrevsFromBuffer.labelString:	????????????????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.saveAbbrevsAs___.labelString:	%_Save Abbrevs As...
! ! ! Emacs*XlwMenu.saveAbbrevsAs___.labelString:	????????????????????????(%_S)...
! ! ! ! Emacs*XlwMenu.l_oadAbbrevs___.labelString:	L%_oad Abbrevs...
! ! ! Emacs*XlwMenu.l_oadAbbrevs___.labelString:	?????????????????????(%_O)...
! ! ! ! Emacs*XlwMenu.copyToRegister___.labelString:	%_Copy to Register...
! ! ! Emacs*XlwMenu.copyToRegister___.labelString:	????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.pasteRegister___.labelString:	%_Paste Register...
! ! ! Emacs*XlwMenu.pasteRegister___.labelString:	??????????????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.savePointToRegister.labelString:	%_Save Point to Register
! ! ! Emacs*XlwMenu.savePointToRegister.labelString:		????????????????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.jumpToRegister.labelString:	%_Jump to Register
! ! ! Emacs*XlwMenu.jumpToRegister.labelString:	?????????????????????(%_J)
! ! ! ! Emacs*XlwMenu.killRectangle.labelString:	%_Kill Rectangle
! ! ! Emacs*XlwMenu.killRectangle.labelString:	???????????????(%_K)
! ! ! ! Emacs*XlwMenu.yankRectangle.labelString:	%_Yank Rectangle
! ! ! Emacs*XlwMenu.yankRectangle.labelString:	??????????????????(%_Y)
! ! ! ! Emacs*XlwMenu.rectangleToRegister.labelString:	Rectangle %_to Register
! ! ! Emacs*XlwMenu.rectangleToRegister.labelString:		??????????????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.rectangleFromRegister.labelString:	Rectangle %_from Register
! ! ! Emacs*XlwMenu.rectangleFromRegister.labelString:	?????????????????????????????????(%_F)
! ! ! ! Emacs*XlwMenu.clearRectangle.labelString:	%_Clear Rectangle
! ! ! Emacs*XlwMenu.clearRectangle.labelString:	??????????????????(%_C)
! ! ! ! Emacs*XlwMenu.openRectangle.labelString:	%_Open Rectangle
! ! ! Emacs*XlwMenu.openRectangle.labelString:	???????????????(%_O)
! ! ! ! Emacs*XlwMenu.prefixRectangle___.labelString:	%_Prefix Rectangle...
! ! ! Emacs*XlwMenu.prefixRectangle___.labelString:	?????????????????????(%_P)...
! ! ! ! Emacs*XlwMenu.rectangleMousing.labelString:	Rectangle %_Mousing
! ! ! Emacs*XlwMenu.rectangleMousing.labelString:	??????????????????(%_M)
! ! ! ! Emacs*XlwMenu.linesInRegion.labelString:	%_Lines in Region
! ! ! Emacs*XlwMenu.linesInRegion.labelString:	???????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.paragraphsInRegion.labelString:	%_Paragraphs in Region
! ! ! Emacs*XlwMenu.paragraphsInRegion.labelString:	??????????????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.p_agesInRegion.labelString:	P%_ages in Region
! ! ! Emacs*XlwMenu.p_agesInRegion.labelString:	?????????????????????????????????(%_A)
! ! ! ! Emacs*XlwMenu.columnsInRegion.labelString:	%_Columns in Region
! ! ! Emacs*XlwMenu.columnsInRegion.labelString:	?????????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.regexp___.labelString:	%_Regexp...
! ! ! Emacs*XlwMenu.regexp___.labelString:	????????????(%_R)...
! ! ! ! Emacs*XlwMenu.upcaseRegion.labelString:	%_Upcase Region
! ! ! Emacs*XlwMenu.upcaseRegion.labelString:		?????????????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.downcaseRegion.labelString:	%_Downcase Region
! ! ! Emacs*XlwMenu.downcaseRegion.labelString:	?????????????????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.capitalizeRegion.labelString:	%_Capitalize Region
! ! ! Emacs*XlwMenu.capitalizeRegion.labelString:	??????????????????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.titleCaseRegion.labelString:	%_Title-Case Region
! ! ! Emacs*XlwMenu.titleCaseRegion.labelString:	??????????????????????????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.line.labelString:	%_Line
! ! ! Emacs*XlwMenu.line.labelString:		?????????(%_L)
! ! ! ! Emacs*XlwMenu.paragraph.labelString:	%_Paragraph
! ! ! Emacs*XlwMenu.paragraph.labelString:	??????(%_P)
! ! ! ! Emacs*XlwMenu.region.labelString:	%_Region
! ! ! Emacs*XlwMenu.region.labelString:	???????????????(%_R)
! ! ! ! Emacs*XlwMenu.asPreviousLine.labelString:	%_As Previous Line
! ! ! Emacs*XlwMenu.asPreviousLine.labelString:	????????????(%_A)
! ! ! ! Emacs*XlwMenu.toColumn___.labelString:	%_To Column...
! ! ! Emacs*XlwMenu.toColumn___.labelString:		??????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.balancedExpression.labelString:	%_Balanced Expression
! ! ! Emacs*XlwMenu.balancedExpression.labelString:	????????????(%_B)
! ! ! ! Emacs*XlwMenu.cExpression.labelString:	%_C Expression
! ! ! Emacs*XlwMenu.cExpression.labelString:		C???(%_C)
! ! ! ! Emacs*XlwMenu.buffer.labelString:	%_Buffer
! ! ! Emacs*XlwMenu.buffer.labelString:	????????????(%_B)
! ! ! ! Emacs*XlwMenu.word.labelString:	%_Word
! ! ! Emacs*XlwMenu.word.labelString:		?????????(%_W)
! ! ! ! Emacs*XlwMenu.completeWord.labelString:	%_Complete Word
! ! ! Emacs*XlwMenu.completeWord.labelString:		???????????????(%_C)
! ! ! ! Emacs*XlwMenu.addFootnote.labelString:	%_Add Footnote
! ! ! Emacs*XlwMenu.addFootnote.labelString:		???????????????(%_A)
! ! ! ! Emacs*XlwMenu.deleteFootnote.labelString:	%_Delete Footnote
! ! ! Emacs*XlwMenu.deleteFootnote.labelString:	??????????????? (%_D)
! ! ! ! Emacs*XlwMenu.gotoFootnote.labelString:	%_Goto Footnote
! ! ! Emacs*XlwMenu.gotoFootnote.labelString:		???????????????(%_G)
! ! ! ! Emacs*XlwMenu.backToMessage.labelString:	%_Back to Message
! ! ! Emacs*XlwMenu.backToMessage.labelString:	????????????????????????(%_B)
! ! ! ! Emacs*XlwMenu.renumberFootnotes.labelString:	%_Renumber Footnotes
! ! ! Emacs*XlwMenu.renumberFootnotes.labelString:	??????????????????(%_R)
! ! ! ! Emacs*XlwMenu.setFootnoteStyle.labelString:	%_Set Footnote Style
! ! ! Emacs*XlwMenu.setFootnoteStyle.labelString:	???????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.cycleFootnoteStyle.labelString:	%_Cycle Footnote Style
! ! ! Emacs*XlwMenu.cycleFootnoteStyle.labelString:	?????????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.packages.labelString:	%_Packages
! ! ! Emacs*XlwMenu.packages.labelString:	???????????????(%_P)
! ! ! ! Emacs*XlwMenu.internet.labelString:	%_Internet
! ! ! Emacs*XlwMenu.internet.labelString:	?????????????????????(%_I)
! ! ! ! Emacs*XlwMenu.grep.labelString:	%_Grep
! ! ! Emacs*XlwMenu.grep.labelString:		%_Grep
! ! ! ! Emacs*XlwMenu.compile.labelString:	%_Compile
! ! ! Emacs*XlwMenu.compile.labelString:	???????????????(%_C)
! ! ! ! Emacs*XlwMenu.debug.labelString:	%_Debug
! ! ! Emacs*XlwMenu.debug.labelString:	????????????(%_D)
! ! ! ! Emacs*XlwMenu.shell.labelString:	%_Shell
! ! ! Emacs*XlwMenu.shell.labelString:	?????????(%_S)
! ! ! ! Emacs*XlwMenu.tags.labelString:	%_Tags
! ! ! Emacs*XlwMenu.tags.labelString:		??????(%_T)
! ! ! ! Emacs*XlwMenu.ca_lendar.labelString:	Ca%_lendar
! ! ! Emacs*XlwMenu.ca_lendar.labelString:	????????????(%_L)
! ! ! ! Emacs*XlwMenu.ga_mes.labelString:	Ga%_mes
! ! ! Emacs*XlwMenu.ga_mes.labelString:	?????????(%_M)
! ! ! ! Emacs*XlwMenu.vC.labelString:	%_VC
! ! ! Emacs*XlwMenu.vC.labelString:	%_VC
! ! ! ! Emacs*XlwMenu.compare.labelString:	%_Compare
! ! ! Emacs*XlwMenu.compare.labelString:	??????(%_C)
! ! ! ! Emacs*XlwMenu.merge.labelString:	%_Merge
! ! ! Emacs*XlwMenu.merge.labelString:	?????????(%_M)
! ! ! ! Emacs*XlwMenu.applyPatch.labelString:	%_Apply Patch
! ! ! Emacs*XlwMenu.applyPatch.labelString:	??????????????????(%_A)
! ! ! ! Emacs*XlwMenu.ediffMiscellanea.labelString:	%_Ediff Miscellanea
! ! ! Emacs*XlwMenu.ediffMiscellanea.labelString:	%_Ediff?????????
! ! ! ! Emacs*XlwMenu.directorySearch.labelString:	%_Directory Search
! ! ! Emacs*XlwMenu.directorySearch.labelString:	????????????(%_D)
! ! ! ! Emacs*XlwMenu.pCLCVS.labelString:	%_PCL CVS
! ! ! Emacs*XlwMenu.pCLCVS.labelString:	%_PCL CVS
! ! ! ! Emacs*XlwMenu.addDownloadSite.labelString:	%_Add Download Site
! ! ! Emacs*XlwMenu.addDownloadSite.labelString:	????????????????????????????????????(%_A)
! ! ! ! Emacs*XlwMenu.updatePackageIndex.labelString:	%_Update Package Index
! ! ! Emacs*XlwMenu.updatePackageIndex.labelString:	???????????????????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.listAndInstall.labelString:	%_List and Install
! ! ! Emacs*XlwMenu.listAndInstall.labelString:	?????????????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.u_pdateInstalledPackages.labelString:	U%_pdate Installed Packages
! ! ! Emacs*XlwMenu.u_pdateInstalledPackages.labelString:	?????????????????????????????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.usingCustom.labelString:	Using %_Custom
! ! ! Emacs*XlwMenu.usingCustom.labelString:		?????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.1PreReleases.labelString:	%_1 Pre-Releases
! ! ! Emacs*XlwMenu.1PreReleases.labelString:		%_1 ??????????????????
! ! ! ! Emacs*XlwMenu.2Xemacs_org.labelString:	%_2 xemacs.org
! ! ! Emacs*XlwMenu.2Xemacs_org.labelString:		%_2 xemacs.org
! ! ! ! Emacs*XlwMenu.3Crc_caCanada.labelString:	%_3 crc.ca (Canada)
! ! ! Emacs*XlwMenu.3Crc_caCanada.labelString:	%_3 crc.ca (?????????)
! ! ! ! Emacs*XlwMenu.4Ualberta_caCanada.labelString:	%_4 ualberta.ca (Canada)
! ! ! Emacs*XlwMenu.4Ualberta_caCanada.labelString:	%_4 ualberta.ca (?????????)
! ! ! ! Emacs*XlwMenu.5Uiuc_eduUnitedStates.labelString:	%_5 uiuc.edu (United States)
! ! ! Emacs*XlwMenu.5Uiuc_eduUnitedStates.labelString:	%_5 uiuc.edu (?????????)
! ! ! ! Emacs*XlwMenu.6Unc_eduUnitedStates.labelString:	%_6 unc.edu (United States)
! ! ! Emacs*XlwMenu.6Unc_eduUnitedStates.labelString:		%_6 unc.edu (?????????)
! ! ! ! Emacs*XlwMenu.7Utk_eduUnitedStates.labelString:	%_7 utk.edu (United States)
! ! ! Emacs*XlwMenu.7Utk_eduUnitedStates.labelString:		%_7 utk.edu (?????????)
! ! ! ! Emacs*XlwMenu.8Unicamp_brBrazil.labelString:	%_8 unicamp.br (Brazil)
! ! ! Emacs*XlwMenu.8Unicamp_brBrazil.labelString:	%_8 unicamp.br (????????????)
! ! ! ! Emacs*XlwMenu.9Tuwien_ac_atAustria.labelString:	%_9 tuwien.ac.at (Austria)
! ! ! Emacs*XlwMenu.9Tuwien_ac_atAustria.labelString:		tuwien.ac.at (??????????????????)
! ! ! ! Emacs*XlwMenu.0Auc_dkDenmark.labelString:	%_0 auc.dk (Denmark)
! ! ! Emacs*XlwMenu.0Auc_dkDenmark.labelString:	%_0 auc.dk (???????????????)
! ! ! ! Emacs*XlwMenu.aDoc_ic_ac_ukEngland.labelString:	%_a doc.ic.ac.uk (England)
! ! ! Emacs*XlwMenu.aDoc_ic_ac_ukEngland.labelString:		%_a doc.ic.ac.uk (????????????)
! ! ! ! Emacs*XlwMenu.bFunet_fiFinland.labelString:	%_b funet.fi (Finland)
! ! ! Emacs*XlwMenu.bFunet_fiFinland.labelString:	%_b funet.fi (??????????????????)
! ! ! ! Emacs*XlwMenu.cCenatls_cena_dgac_frFrance.labelString:	%_c cenatls.cena.dgac.fr (France)
! ! ! Emacs*XlwMenu.cCenatls_cena_dgac_frFrance.labelString:	%_c cenatls.cena.dgac.fr (????????????)
! ! ! ! Emacs*XlwMenu.dPasteur_frFrance.labelString:	%_d pasteur.fr (France)
! ! ! Emacs*XlwMenu.dPasteur_frFrance.labelString:	%_d pasteur.fr (????????????)
! ! ! ! Emacs*XlwMenu.eTuDarmstadt_deGermany.labelString:	%_e tu-darmstadt.de (Germany)
! ! ! Emacs*XlwMenu.eTuDarmstadt_deGermany.labelString:	%_e tu-darmstadt.de (?????????)
! ! ! ! Emacs*XlwMenu.fKfki_huHungary.labelString:	%_f kfki.hu (Hungary)
! ! ! Emacs*XlwMenu.fKfki_huHungary.labelString:	%_f kfki.hu (???????????????)
! ! ! ! Emacs*XlwMenu.gEunet_ieIreland.labelString:	%_g eunet.ie (Ireland)
! ! ! Emacs*XlwMenu.gEunet_ieIreland.labelString:	%_g eunet.ie (??????????????????)
! ! ! ! Emacs*XlwMenu.hUniroma2_itItaly.labelString:	%_h uniroma2.it (Italy)
! ! ! Emacs*XlwMenu.hUniroma2_itItaly.labelString:	%_h uniroma2.it (????????????)
! ! ! ! Emacs*XlwMenu.iUio_noNorway.labelString:	%_i uio.no (Norway)
! ! ! Emacs*XlwMenu.iUio_noNorway.labelString:	%_i uio.no (???????????????)
! ! ! ! Emacs*XlwMenu.jIcm_edu_plPoland.labelString:	%_j icm.edu.pl (Poland)
! ! ! Emacs*XlwMenu.jIcm_edu_plPoland.labelString:	%_j icm.edu.pl (???????????????)
! ! ! ! Emacs*XlwMenu.kSrcc_msu_suRussia.labelString:	%_k srcc.msu.su (Russia)
! ! ! Emacs*XlwMenu.kSrcc_msu_suRussia.labelString:	%_k srcc.msu.su (?????????)
! ! ! ! Emacs*XlwMenu.lSunet_seSweden.labelString:	%_l sunet.se (Sweden)
! ! ! Emacs*XlwMenu.lSunet_seSweden.labelString:	%_l sunet.se (??????????????????)
! ! ! ! Emacs*XlwMenu.mCnlabSwitch_chSwitzerland.labelString:	%_m cnlab-switch.ch (Switzerland)
! ! ! Emacs*XlwMenu.mCnlabSwitch_chSwitzerland.labelString:	%_m cnlab-switch.ch (?????????)
! ! ! ! Emacs*XlwMenu.nAist_go_jpJapan.labelString:	%_n aist.go.jp (Japan)
! ! ! Emacs*XlwMenu.nAist_go_jpJapan.labelString:	%_n aist.go.jp (??????)
! ! ! ! Emacs*XlwMenu.oAsahiNet_or_jpJapan.labelString:	%_o asahi-net.or.jp (Japan)
! ! ! Emacs*XlwMenu.oAsahiNet_or_jpJapan.labelString:	%_o asahi-net.or.jp (??????)
! ! ! ! Emacs*XlwMenu.pDti_ad_jpJapan.labelString:	%_p dti.ad.jp (Japan)
! ! ! Emacs*XlwMenu.pDti_ad_jpJapan.labelString:	%_p dti.ad.jp (??????)
! ! ! ! Emacs*XlwMenu.qJaist_ac_jpJapan.labelString:	%_q jaist.ac.jp (Japan)
! ! ! Emacs*XlwMenu.qJaist_ac_jpJapan.labelString:	%_q jaist.ac.jp (??????)
! ! ! ! Emacs*XlwMenu.rNucba_ac_jpJapan.labelString:	%_r nucba.ac.jp (Japan)
! ! ! Emacs*XlwMenu.rNucba_ac_jpJapan.labelString:	%_r nucba.ac.jp (??????)
! ! ! ! Emacs*XlwMenu.sSut_ac_jpJapan.labelString:	%_s sut.ac.jp (Japan)
! ! ! Emacs*XlwMenu.sSut_ac_jpJapan.labelString:	%_s sut.ac.jp (??????)
! ! ! ! Emacs*XlwMenu.tTsukuba_ac_jpJapan.labelString:	%_t tsukuba.ac.jp (Japan)
! ! ! Emacs*XlwMenu.tTsukuba_ac_jpJapan.labelString:		%_t tsukuba.ac.jp (??????)
! ! ! ! Emacs*XlwMenu.uKreonet_re_krKorea.labelString:	%_u kreonet.re.kr (Korea)
! ! ! Emacs*XlwMenu.uKreonet_re_krKorea.labelString:		%_u kreonet.re.kr (??????)
! ! ! ! Emacs*XlwMenu.vNctu_edu_twTaiwan.labelString:	%_v nctu.edu.tw (Taiwan)
! ! ! Emacs*XlwMenu.vNctu_edu_twTaiwan.labelString:		%_v nctu.edu.tw (??????)
! ! ! ! Emacs*XlwMenu.wSun_ac_zaSouthAfrica.labelString:	%_w sun.ac.za (South Africa)
! ! ! Emacs*XlwMenu.wSun_ac_zaSouthAfrica.labelString:	%_w sun.ac.za (???????????????)
! ! ! ! Emacs*XlwMenu.xIsu_net_saSaudiArabia.labelString:	%_x isu.net.sa (Saudi Arabia)
! ! ! Emacs*XlwMenu.xIsu_net_saSaudiArabia.labelString:	%_x isu.net.sa (?????????????????????)
! ! ! ! Emacs*XlwMenu.yAarnet_edu_auAustralia.labelString:	%_y aarnet.edu.au (Australia)
! ! ! Emacs*XlwMenu.yAarnet_edu_auAustralia.labelString:	%_y aarnet.edu.au (?????????????????????)
! ! ! ! Emacs*XlwMenu.pleaseLoadPackageIndex.labelString:	Please load Package Index
! ! ! Emacs*XlwMenu.pleaseLoadPackageIndex.labelString:	????????????????????????????????????????????????????????????
! ! ! ! Emacs*XlwMenu.readMail1VM___.labelString:	Read Mail %_1 (VM)...
! ! ! Emacs*XlwMenu.readMail1VM___.labelString:	??????????????????(%_1)(VM)...
! ! ! ! Emacs*XlwMenu.readMail2MH___.labelString:	Read Mail %_2 (MH)...
! ! ! Emacs*XlwMenu.readMail2MH___.labelString:	??????????????????(%_2)(MH)...
! ! ! ! Emacs*XlwMenu.sendMail___.labelString:	Send %_Mail...
! ! ! Emacs*XlwMenu.sendMail___.labelString:		??????????????????(%_M)...
! ! ! ! Emacs*XlwMenu.usenetNews.labelString:	Usenet %_News
! ! ! Emacs*XlwMenu.usenetNews.labelString:	Usenet????????????(%_N)
! ! ! ! Emacs*XlwMenu.browseTheWeb.labelString:	Browse the %_Web
! ! ! Emacs*XlwMenu.browseTheWeb.labelString:		????????????????????????(%_W)
! ! ! ! Emacs*XlwMenu.grep___.labelString:	%_Grep...
! ! ! Emacs*XlwMenu.grep___.labelString:	%_Grep...
! ! ! ! Emacs*XlwMenu.killGrep.labelString:	%_Kill Grep
! ! ! Emacs*XlwMenu.killGrep.labelString:	Grep?????????(%_K)
! ! ! ! Emacs*XlwMenu.grepAllFilesInCurrentDirectory___.labelString:	Grep %_All Files in Current Directory...
! ! ! Emacs*XlwMenu.grepAllFilesInCurrentDirectory___.labelString:	????????????????????????????????????????????????????????????grep(%_A)
! ! ! ! Emacs*XlwMenu.grepCAndCHeaderFilesInCurrentDirectory___.labelString:	Grep %_C and C Header Files in Current Directory...
! ! ! Emacs*XlwMenu.grepCAndCHeaderFilesInCurrentDirectory___.labelString:	?????????????????????????????????C???C???????????????????????????grep(%_C)
! ! ! ! Emacs*XlwMenu.grepCHea_derFilesInCurrentDirectory___.labelString:	Grep C Hea%_der Files in Current Directory...
! ! ! Emacs*XlwMenu.grepCHea_derFilesInCurrentDirectory___.labelString:	?????????????????????????????????C????????????????????????grep(%_H)
! ! ! ! Emacs*XlwMenu.grepELispFilesInCurrentDirectory___.labelString:	Grep %_E-Lisp Files in Current Directory...
! ! ! Emacs*XlwMenu.grepELispFilesInCurrentDirectory___.labelString:	?????????????????????????????????E-Lisp???????????????grep(%_E)
! ! ! ! Emacs*XlwMenu.grepPerlFilesInCurrentDirectory___.labelString:	Grep %_Perl Files in Current Directory...
! ! ! Emacs*XlwMenu.grepPerlFilesInCurrentDirectory___.labelString:	?????????????????????????????????Perl???????????????grep(%_P)
! ! ! ! Emacs*XlwMenu.grepHTMLFilesInCurrentDirectory___.labelString:	Grep %_HTML Files in Current Directory...
! ! ! Emacs*XlwMenu.grepHTMLFilesInCurrentDirectory___.labelString:	?????????????????????????????????HTML???????????????grep(%_H)
! ! ! ! Emacs*XlwMenu.nextMatch.labelString:	%_Next Match
! ! ! Emacs*XlwMenu.nextMatch.labelString:	???????????????(%_N)
! ! ! ! Emacs*XlwMenu.pre_viousMatch.labelString:	Pre%_vious Match
! ! ! Emacs*XlwMenu.pre_viousMatch.labelString:	???????????????(%_V)
! ! ! ! Emacs*XlwMenu.firstMatch.labelString:	%_First Match
! ! ! Emacs*XlwMenu.firstMatch.labelString:	??????????????????(%_F)
! ! ! ! Emacs*XlwMenu.g_otoMatch.labelString:	G%_oto Match
! ! ! Emacs*XlwMenu.g_otoMatch.labelString:	???????????????(%_G)
! ! ! ! Emacs*XlwMenu.setGrepCommand___.labelString:	%_Set Grep Command...
! ! ! Emacs*XlwMenu.setGrepCommand___.labelString:	grep?????????????????????(%_S)...
! ! ! ! Emacs*XlwMenu.compile___.labelString:	%_Compile...
! ! ! Emacs*XlwMenu.compile___.labelString:	???????????????(%_C)
! ! ! ! Emacs*XlwMenu.repeatCompilation.labelString:	%_Repeat Compilation
! ! ! Emacs*XlwMenu.repeatCompilation.labelString:	??????????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.killCompilation.labelString:	%_Kill Compilation
! ! ! Emacs*XlwMenu.killCompilation.labelString:	??????????????????????????????(%_K)
! ! ! ! Emacs*XlwMenu.nextError.labelString:	%_Next Error
! ! ! Emacs*XlwMenu.nextError.labelString:	??????????????????(%_N)
! ! ! ! Emacs*XlwMenu.pre_viousError.labelString:	Pre%_vious Error
! ! ! Emacs*XlwMenu.pre_viousError.labelString:	??????????????????(%_V)
! ! ! ! Emacs*XlwMenu.firstError.labelString:	%_First Error
! ! ! Emacs*XlwMenu.firstError.labelString:	?????????????????????(%_F)
! ! ! ! Emacs*XlwMenu.g_otoError.labelString:	G%_oto Error
! ! ! Emacs*XlwMenu.g_otoError.labelString:	??????????????????(%_O)
! ! ! ! Emacs*XlwMenu.gDB___.labelString:	%_GDB...
! ! ! Emacs*XlwMenu.gDB___.labelString:	%_GDB...
! ! ! ! Emacs*XlwMenu.dBX___.labelString:	%_DBX...
! ! ! Emacs*XlwMenu.dBX___.labelString:	%_DBX...
! ! ! ! Emacs*XlwMenu.s_hellCommand___.labelString:	S%_hell Command...
! ! ! Emacs*XlwMenu.s_hellCommand___.labelString:	?????????????????????(%_H)...
! ! ! ! Emacs*XlwMenu.shellCommandOnRegion___.labelString:	Shell Command on %_Region...
! ! ! Emacs*XlwMenu.shellCommandOnRegion___.labelString:	????????????????????????????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.findTag___.labelString:	%_Find Tag...
! ! ! Emacs*XlwMenu.findTag___.labelString:	???????????????(%_F)...
! ! ! ! Emacs*XlwMenu.findOtherWindow___.labelString:	Find %_Other Window...
! ! ! Emacs*XlwMenu.findOtherWindow___.labelString:	??????????????????????????????(%_O)
! ! ! ! Emacs*XlwMenu.nextTag___.labelString:	%_Next Tag...
! ! ! Emacs*XlwMenu.nextTag___.labelString:	???????????????(%_N)...
! ! ! ! Emacs*XlwMenu.n_extOtherWindow___.labelString:	N%_ext Other Window...
! ! ! Emacs*XlwMenu.n_extOtherWindow___.labelString:	?????????????????????????????????(%_E)...
! ! ! ! Emacs*XlwMenu.nextFile.labelString:	Next %_File
! ! ! Emacs*XlwMenu.nextFile.labelString:	??????????????????(%_F)
! ! ! ! Emacs*XlwMenu.tagsSearch___.labelString:	Tags %_Search...
! ! ! Emacs*XlwMenu.tagsSearch___.labelString:	????????????(%_S)...
! ! ! ! Emacs*XlwMenu.tagsReplace___.labelString:	Tags %_Replace...
! ! ! Emacs*XlwMenu.tagsReplace___.labelString:	????????????(%_R)...
! ! ! ! Emacs*XlwMenu.continueSearchReplace.labelString:	%_Continue Search/Replace
! ! ! Emacs*XlwMenu.continueSearchReplace.labelString:	??????/??????????????????(%_C)
! ! ! ! Emacs*XlwMenu.popStack.labelString:	%_Pop stack
! ! ! Emacs*XlwMenu.popStack.labelString:	???????????????pop(%_P)
! ! ! ! Emacs*XlwMenu.apropos___.labelString:	%_Apropos...
! ! ! Emacs*XlwMenu.apropos___.labelString:	%_Apropos...
! ! ! ! Emacs*XlwMenu.setTagsTableFile___.labelString:	%_Set Tags Table File...
! ! ! Emacs*XlwMenu.setTagsTableFile___.labelString:	???????????????????????????????????????(%_S)...
! ! ! ! Emacs*XlwMenu.3MonthCalendar.labelString:	%_3-Month Calendar
! ! ! Emacs*XlwMenu.3MonthCalendar.labelString:	3??????????????????(%_3)
! ! ! ! Emacs*XlwMenu.diary.labelString:	%_Diary
! ! ! Emacs*XlwMenu.diary.labelString:	??????(%_D)
! ! ! ! Emacs*XlwMenu.holidays.labelString:	%_Holidays
! ! ! Emacs*XlwMenu.holidays.labelString:	??????(%_H)
! ! ! ! Emacs*XlwMenu.phasesOfTheMoon.labelString:	%_Phases of the Moon
! ! ! Emacs*XlwMenu.phasesOfTheMoon.labelString:	??????(%_P)
! ! ! ! Emacs*XlwMenu.sunriseSunset.labelString:	%_Sunrise/Sunset
! ! ! Emacs*XlwMenu.sunriseSunset.labelString:	?????????/?????????(%_S)
! ! ! ! Emacs*XlwMenu.mineGame.labelString:	%_Mine Game
! ! ! Emacs*XlwMenu.mineGame.labelString:	???????????????(%_M)
! ! ! ! Emacs*XlwMenu.tetris.labelString:	%_Tetris
! ! ! Emacs*XlwMenu.tetris.labelString:	????????????(%_T)
! ! ! ! Emacs*XlwMenu.sokoban.labelString:	%_Sokoban
! ! ! Emacs*XlwMenu.sokoban.labelString:	?????????(%_S)
! ! ! ! Emacs*XlwMenu.quoteFromZippy.labelString:	Quote from %_Zippy
! ! ! Emacs*XlwMenu.quoteFromZippy.labelString:	Zippy?????????(%_Z)
! ! ! ! Emacs*XlwMenu.psychoanalyst.labelString:	%_Psychoanalyst
! ! ! Emacs*XlwMenu.psychoanalyst.labelString:	XEmacs????????????(%_P)
! ! ! ! Emacs*XlwMenu.ps_ychoanalyzeZippy.labelString:	Ps%_ychoanalyze Zippy!
! ! ! Emacs*XlwMenu.ps_ychoanalyzeZippy.labelString:	Zippy???????????????!(%_Y)
! ! ! ! Emacs*XlwMenu.randomFlames.labelString:	%_Random Flames
! ! ! Emacs*XlwMenu.randomFlames.labelString:		??????????????????(%_R)
! ! ! ! Emacs*XlwMenu.dunnetAdventure.labelString:	%_Dunnet (Adventure)
! ! ! Emacs*XlwMenu.dunnetAdventure.labelString:	Dunnet(?????????????????????)(%_D)
! ! ! ! Emacs*XlwMenu.towersOfHanoi.labelString:	Towers of %_Hanoi
! ! ! Emacs*XlwMenu.towersOfHanoi.labelString:	???????????????(%_H)
! ! ! ! Emacs*XlwMenu.gameOfLife.labelString:	Game of %_Life
! ! ! Emacs*XlwMenu.gameOfLife.labelString:	??????????????????(%_L)
! ! ! ! Emacs*XlwMenu.m_ultiplicationPuzzle.labelString:	M%_ultiplication Puzzle
! ! ! Emacs*XlwMenu.m_ultiplicationPuzzle.labelString:	??????????????????(%_U)
! ! ! ! Emacs*XlwMenu.loadVC.labelString:	%_Load VC
! ! ! Emacs*XlwMenu.loadVC.labelString:	VC???????????????(%_L)
! ! ! ! Emacs*XlwMenu.twoFiles___.labelString:	%_Two Files...
! ! ! Emacs*XlwMenu.twoFiles___.labelString:		2????????????(%_T)...
! ! ! ! Emacs*XlwMenu.twoBuffers___.labelString:	%_Two Buffers...
! ! ! Emacs*XlwMenu.twoBuffers___.labelString:	2????????????(%_T)...
! ! ! ! Emacs*XlwMenu.threeFiles___.labelString:	%_Three Files...
! ! ! Emacs*XlwMenu.threeFiles___.labelString:	3????????????(%_T)...
! ! ! ! Emacs*XlwMenu.threeBuffers___.labelString:	%_Three Buffers...
! ! ! Emacs*XlwMenu.threeBuffers___.labelString:	3????????????(%_T)...
! ! ! ! Emacs*XlwMenu.twoDirectories___.labelString:	%_Two Directories...
! ! ! Emacs*XlwMenu.twoDirectories___.labelString:	2??????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.threeDirectories___.labelString:	%_Three Directories...
! ! ! Emacs*XlwMenu.threeDirectories___.labelString:	3??????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.fileWithRevision___.labelString:	%_File with Revision...
! ! ! Emacs*XlwMenu.fileWithRevision___.labelString:	?????????????????????????????????(%_F)...
! ! ! ! Emacs*XlwMenu.directoryRevisions___.labelString:	%_Directory Revisions...
! ! ! Emacs*XlwMenu.directoryRevisions___.labelString:	?????????????????????????????????(%_D)...
! ! ! ! Emacs*XlwMenu.windowsWordByWord___.labelString:	%_Windows Word-by-word...
! ! ! Emacs*XlwMenu.windowsWordByWord___.labelString:	?????????????????????????????????(%_W)...
! ! ! ! Emacs*XlwMenu.windowsLineByLine___.labelString:	%_Windows Line-by-line...
! ! ! Emacs*XlwMenu.windowsLineByLine___.labelString:	???????????????????????????(%_W)...
! ! ! ! Emacs*XlwMenu.regionsWordByWord___.labelString:	%_Regions Word-by-word...
! ! ! Emacs*XlwMenu.regionsWordByWord___.labelString:	?????????????????????????????????(%_R)...
! ! ! ! Emacs*XlwMenu.regionsLineByLine___.labelString:	%_Regions Line-by-line...
! ! ! Emacs*XlwMenu.regionsLineByLine___.labelString:	???????????????????????????(%_R)...
! ! ! ! Emacs*XlwMenu.files___.labelString:	%_Files...
! ! ! Emacs*XlwMenu.files___.labelString:	????????????(%_F)...
! ! ! ! Emacs*XlwMenu.filesWithAncestor___.labelString:	%_Files with Ancestor...
! ! ! Emacs*XlwMenu.filesWithAncestor___.labelString:	???????????????????????????(%_F)...
! ! ! ! Emacs*XlwMenu.buffers___.labelString:	%_Buffers...
! ! ! Emacs*XlwMenu.buffers___.labelString:	????????????(%_B)...
! ! ! ! Emacs*XlwMenu.buffersWithAncestor___.labelString:	%_Buffers with Ancestor...
! ! ! Emacs*XlwMenu.buffersWithAncestor___.labelString:	???????????????????????????(%_B)...
! ! ! ! Emacs*XlwMenu.directories___.labelString:	%_Directories...
! ! ! Emacs*XlwMenu.directories___.labelString:	??????????????????(%_D)...
! ! ! ! Emacs*XlwMenu.directoriesWithAncestor___.labelString:	%_Directories with Ancestor...
! ! ! Emacs*XlwMenu.directoriesWithAncestor___.labelString:	?????????????????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.revisions___.labelString:	%_Revisions...
! ! ! Emacs*XlwMenu.revisions___.labelString:	???????????????(%_R)...
! ! ! ! Emacs*XlwMenu.revisionsWithAncestor___.labelString:	%_Revisions with Ancestor...
! ! ! Emacs*XlwMenu.revisionsWithAncestor___.labelString:	??????????????????????????????(%_R)...
! ! ! ! Emacs*XlwMenu.directoryRevisionsWithAncestor___.labelString:	%_Directory Revisions with Ancestor...
! ! ! Emacs*XlwMenu.directoryRevisionsWithAncestor___.labelString:	????????????????????????????????????????????????(%_D)...
! ! ! ! Emacs*XlwMenu.toAFile___.labelString:	%_To a file...
! ! ! Emacs*XlwMenu.toAFile___.labelString:	?????????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.toABuffer___.labelString:	%_To a buffer...
! ! ! Emacs*XlwMenu.toABuffer___.labelString:	?????????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.ediffManual___.labelString:	%_Ediff Manual...
! ! ! Emacs*XlwMenu.ediffManual___.labelString:	??????????????????ediff(%_E)...
! ! ! ! Emacs*XlwMenu.customizeEdiff___.labelString:	%_Customize Ediff...
! ! ! Emacs*XlwMenu.customizeEdiff___.labelString:	ediff?????????????????????(%_C)...
! ! ! ! Emacs*XlwMenu.listEdiffSessions___.labelString:	%_List Ediff Sessions...
! ! ! Emacs*XlwMenu.listEdiffSessions___.labelString:	ediff????????????????????????(%_L)...
! ! ! ! Emacs*XlwMenu.useSeparateFrameForEdiffControlBuffer___.labelString:	%_Use separate frame for Ediff control buffer...
! ! ! Emacs*XlwMenu.useSeparateFrameForEdiffControlBuffer___.labelString:	ediff????????????????????????????????????????????????????????????(%_U)...
! ! ! ! Emacs*XlwMenu.useAToolbarWithEdiffControlBuffer.labelString:	%_Use a toolbar with Ediff control buffer
! ! ! Emacs*XlwMenu.useAToolbarWithEdiffControlBuffer.labelString:	ediff?????????????????????????????????????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.loadHotlistOfServers.labelString:	%_Load Hotlist of Servers
! ! ! Emacs*XlwMenu.loadHotlistOfServers.labelString:	?????????????????????????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.newServer.labelString:	%_New Server
! ! ! Emacs*XlwMenu.newServer.labelString:	???????????????(%_N)
! ! ! ! Emacs*XlwMenu.queryWithForm.labelString:	%_Query with Form
! ! ! Emacs*XlwMenu.queryWithForm.labelString:	???????????????????????????(%_Q)
! ! ! ! Emacs*XlwMenu.expandInlineQuery.labelString:	%_Expand Inline Query
! ! ! Emacs*XlwMenu.expandInlineQuery.labelString:	????????????????????????????????????(%_E)
! ! ! ! Emacs*XlwMenu.getEmail.labelString:	%_Get Email
! ! ! Emacs*XlwMenu.getEmail.labelString:	????????????????????????(%_G)
! ! ! ! Emacs*XlwMenu.getPhone.labelString:	%_Get Phone
! ! ! Emacs*XlwMenu.getPhone.labelString:	?????????????????????(%_G)
! ! ! ! Emacs*XlwMenu.updateDirectory.labelString:	%_Update Directory
! ! ! Emacs*XlwMenu.updateDirectory.labelString:	???????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.examineDirectory.labelString:	%_Examine Directory
! ! ! Emacs*XlwMenu.examineDirectory.labelString:	???????????????????????????(%_E)
! ! ! ! Emacs*XlwMenu.statusDirectory.labelString:	%_Status Directory
! ! ! Emacs*XlwMenu.statusDirectory.labelString:	?????????????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.checkoutModule.labelString:	%_Checkout Module
! ! ! Emacs*XlwMenu.checkoutModule.labelString:	???????????????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.advancedCustomize.labelString:	%_Advanced (Customize)
! ! ! Emacs*XlwMenu.advancedCustomize.labelString:	??????(??????????????????)(%_A)
! ! ! ! Emacs*XlwMenu.editing.labelString:	%_Editing
! ! ! Emacs*XlwMenu.editing.labelString:	??????(%_E)
! ! ! ! Emacs*XlwMenu.keyboardAndMouse.labelString:	%_Keyboard and Mouse
! ! ! Emacs*XlwMenu.keyboardAndMouse.labelString:	???????????????????????????(%_K)
! ! ! ! Emacs*XlwMenu.printing.labelString:	%_Printing
! ! ! Emacs*XlwMenu.printing.labelString:	??????(%_P)
! ! ! ! Emacs*XlwMenu.troubleshooting.labelString:	%_Troubleshooting
! ! ! Emacs*XlwMenu.troubleshooting.labelString:	?????????????????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.display.labelString:	%_Display
! ! ! Emacs*XlwMenu.display.labelString:	??????????????????(%_D)
! ! ! ! Emacs*XlwMenu.menubars.labelString:	%_Menubars
! ! ! Emacs*XlwMenu.menubars.labelString:	??????????????????(%_M)
! ! ! ! Emacs*XlwMenu.s_yntaxHighlighting.labelString:	S%_yntax Highlighting
! ! ! Emacs*XlwMenu.s_yntaxHighlighting.labelString:	????????????????????????(%_Y)
! ! ! ! Emacs*XlwMenu.font.labelString:	%_Font
! ! ! Emacs*XlwMenu.font.labelString:		????????????(%_F)
! ! ! ! Emacs*XlwMenu.fontSi_ze.labelString:	Font Si%_ze
! ! ! Emacs*XlwMenu.fontSi_ze.labelString:	?????????????????????(%_Z)
! ! ! ! Emacs*XlwMenu.editFa_ces___.labelString:	Edit Fa%_ces...
! ! ! Emacs*XlwMenu.editFa_ces___.labelString:	???????????????(%_C)...
! ! ! ! Emacs*XlwMenu.editI_nitFile.labelString:	Edit I%_nit File
! ! ! Emacs*XlwMenu.editI_nitFile.labelString:	init?????????????????????(%_I)
! ! ! ! Emacs*XlwMenu.saveOptionsToInitFile.labelString:	%_Save Options to Init File
! ! ! Emacs*XlwMenu.saveOptionsToInitFile.labelString:	??????????????????init?????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.thisBufferReadOnly.labelString:	This Buffer %_Read Only
! ! ! Emacs*XlwMenu.thisBufferReadOnly.labelString:	???????????????????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.yankKillInteractWithClipboard.labelString:	%_Yank/Kill Interact With Clipboard
! ! ! Emacs*XlwMenu.yankKillInteractWithClipboard.labelString:	?????????????????????????????????/Kill?????????
! ! ! ! Emacs*XlwMenu.overstrike.labelString:	%_Overstrike
! ! ! Emacs*XlwMenu.overstrike.labelString:	????????????(%_O)
! ! ! ! Emacs*XlwMenu.abbrevMode.labelString:	%_Abbrev Mode
! ! ! Emacs*XlwMenu.abbrevMode.labelString:	???????????????(%_A)
! ! ! ! Emacs*XlwMenu.activeRe_gions.labelString:	Active Re%_gions
! ! ! Emacs*XlwMenu.activeRe_gions.labelString:	????????????????????????????????????(%_G)
! ! ! ! Emacs*XlwMenu.caseSensitiveSearch.labelString:	%_Case Sensitive Search
! ! ! Emacs*XlwMenu.caseSensitiveSearch.labelString:	?????????/??????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.caseMatchingReplace.labelString:	Case %_Matching Replace
! ! ! Emacs*XlwMenu.caseMatchingReplace.labelString:	?????????/??????????????????????????????(%_M)
! ! ! ! Emacs*XlwMenu.newlineAtEndOfFile___.labelString:	%_Newline at End of File...
! ! ! Emacs*XlwMenu.newlineAtEndOfFile___.labelString:	??????????????????????????????(%_N)
! ! ! ! Emacs*XlwMenu.addNewlineWhenMovingPastEnd.labelString:	Add Newline When Moving Past %_End
! ! ! Emacs*XlwMenu.addNewlineWhenMovingPastEnd.labelString:	???????????????????????????????????????(_E)
! ! ! ! Emacs*XlwMenu.donTRequire.labelString:	%_Don't Require
! ! ! Emacs*XlwMenu.donTRequire.labelString:	??????????????????(%_D)
! ! ! ! Emacs*XlwMenu.require.labelString:	%_Require
! ! ! Emacs*XlwMenu.require.labelString:	???????????????(%_R)
! ! ! ! Emacs*XlwMenu.ask.labelString:	%_Ask
! ! ! Emacs*XlwMenu.ask.labelString:		????????????(%_A)
! ! ! ! Emacs*XlwMenu.deleteKeyDeletesSelection.labelString:	%_Delete Key Deletes Selection
! ! ! Emacs*XlwMenu.deleteKeyDeletesSelection.labelString:	Delete??????????????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.killLineKillsWholeLineAtBeg.labelString:	`%_kill-line' Kills Whole Line at %_Beg
! ! ! Emacs*XlwMenu.killLineKillsWholeLineAtBeg.labelString:	'kill-line'?????????????????????????????????(%_B)
! ! ! ! Emacs*XlwMenu.sizeForBlockMovementCommands___.labelString:	Size for %_Block-Movement Commands...
! ! ! Emacs*XlwMenu.sizeForBlockMovementCommands___.labelString:	??????????????????????????????????????????(%_B)
! ! ! ! Emacs*XlwMenu.vIEmulation.labelString:	%_VI Emulation
! ! ! Emacs*XlwMenu.vIEmulation.labelString:	VI???????????????????????? (%_V)
! ! ! ! Emacs*XlwMenu.s_hiftedMotionKeysSelectRegion.labelString:	S%_hifted Motion Keys Select Region
! ! ! Emacs*XlwMenu.s_hiftedMotionKeysSelectRegion.labelString:	??????????????????????????????????????????(%_H)
! ! ! ! Emacs*XlwMenu.afterShiftedMotionUnshiftedMotionKeysDeselect.labelString:	%_After Shifted Motion, Unshifted Motion Keys Deselect
! ! ! Emacs*XlwMenu.afterShiftedMotionUnshiftedMotionKeysDeselect.labelString:	?????????????????????????????????????????????????????????(%_A)
! ! ! ! Emacs*XlwMenu.setKey___.labelString:	%_Set Key...
! ! ! Emacs*XlwMenu.setKey___.labelString:	???????????????(%_S)...
! ! ! ! Emacs*XlwMenu.unsetKey___.labelString:	%_Unset Key...
! ! ! Emacs*XlwMenu.unsetKey___.labelString:	?????????????????????(%_U)...
! ! ! ! Emacs*XlwMenu.mousePasteAtTextCursorNotClickedLocation.labelString:	%_Mouse Paste at Text Cursor (not Clicked Location)
! ! ! Emacs*XlwMenu.mousePasteAtTextCursorNotClickedLocation.labelString:	???????????????????????????????????????????????????(????????????????????????????????????)(%_M)
! ! ! ! Emacs*XlwMenu.teachExtendedCommands.labelString:	%_Teach Extended Commands
! ! ! Emacs*XlwMenu.teachExtendedCommands.labelString:	??????????????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.setPrinterNameForGenericPrintSupport___.labelString:	Set Printer %_Name for Generic Print Support...
! ! ! Emacs*XlwMenu.setPrinterNameForGenericPrintSupport___.labelString:	????????????????????????????????????????????????????????????????????????(%_N)
! ! ! ! Emacs*XlwMenu.commandLineSwitchesForLprLp___.labelString:	Command-Line %_Switches for `lpr'/`lp'...
! ! ! Emacs*XlwMenu.commandLineSwitchesForLprLp___.labelString:	'lpr'/'lp'????????????????????????????????????...
! ! ! ! Emacs*XlwMenu.prettyPrintPaperSize.labelString:	%_Pretty-Print Paper Size
! ! ! Emacs*XlwMenu.prettyPrintPaperSize.labelString:	??????????????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.colorPrinting.labelString:	%_Color Printing
! ! ! Emacs*XlwMenu.colorPrinting.labelString:	???????????????(%_C)
! ! ! ! Emacs*XlwMenu.letter.labelString:	%_Letter
! ! ! Emacs*XlwMenu.letter.labelString:	?????????(%_L)
! ! ! ! Emacs*XlwMenu.lette_rSmall.labelString:	Lette%_r-Small
! ! ! Emacs*XlwMenu.lette_rSmall.labelString:	????????????(%_R)
! ! ! ! Emacs*XlwMenu.le_gal.labelString:	Le%_gal
! ! ! Emacs*XlwMenu.le_gal.labelString:	????????????(%_G)
! ! ! ! Emacs*XlwMenu.statement.labelString:	%_Statement
! ! ! Emacs*XlwMenu.statement.labelString:	?????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.executive.labelString:	%_Executive
! ! ! Emacs*XlwMenu.executive.labelString:	?????????????????????(%_E)
! ! ! ! Emacs*XlwMenu.tabloid.labelString:	%_Tabloid
! ! ! Emacs*XlwMenu.tabloid.labelString:	??????????????? (%_T)
! ! ! ! Emacs*XlwMenu.le_dger.labelString:	Le%_dger
! ! ! Emacs*XlwMenu.le_dger.labelString:	??????(%_D)
! ! ! ! Emacs*XlwMenu.a_3.labelString:	A%_3
! ! ! Emacs*XlwMenu.a_3.labelString:		A%_3
! ! ! ! Emacs*XlwMenu.a4.labelString:	%_A4
! ! ! Emacs*XlwMenu.a4.labelString:	%_A4
! ! ! ! Emacs*XlwMenu.a4s_mall.labelString:	A4s%_mall
! ! ! Emacs*XlwMenu.a4s_mall.labelString:	A4???(%_M)
! ! ! ! Emacs*XlwMenu.b_4.labelString:	B%_4
! ! ! Emacs*XlwMenu.b_4.labelString:		B%_4
! ! ! ! Emacs*XlwMenu.b5.labelString:	%_B5
! ! ! Emacs*XlwMenu.b5.labelString:	%_B5
! ! ! ! Emacs*XlwMenu.composeMailWith.labelString:	%_Compose Mail With
! ! ! Emacs*XlwMenu.composeMailWith.labelString:	???????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.setMyEmailAddress___.labelString:	Set My %_Email Address...
! ! ! Emacs*XlwMenu.setMyEmailAddress___.labelString:	????????????????????????????????????(%_E)...
! ! ! ! Emacs*XlwMenu.setMachineEmailName___.labelString:	Set %_Machine Email Name...
! ! ! Emacs*XlwMenu.setMachineEmailName___.labelString:	???????????????????????????????????????(%_M)
! ! ! ! Emacs*XlwMenu.setSMTPServer___.labelString:	Set %_SMTP Server...
! ! ! Emacs*XlwMenu.setSMTPServer___.labelString:	SMTP??????????????????(%_S)...
! ! ! ! Emacs*XlwMenu.sMTPDebugInfo.labelString:	SMTP %_Debug Info
! ! ! Emacs*XlwMenu.sMTPDebugInfo.labelString:	SMTP??????????????????(%_D)...
! ! ! ! Emacs*XlwMenu.openURLsWith.labelString:	%_Open URLs With
! ! ! Emacs*XlwMenu.openURLsWith.labelString:		URL??????????????????(%_O)
! ! ! ! Emacs*XlwMenu.defaultEmacsMailer.labelString:	%_Default Emacs Mailer
! ! ! Emacs*XlwMenu.defaultEmacsMailer.labelString:	???????????????Emacs?????????(%_D)
! ! ! ! Emacs*XlwMenu.mH.labelString:	%_MH
! ! ! Emacs*XlwMenu.mH.labelString:	%_MH
! ! ! ! Emacs*XlwMenu.gNUS.labelString:	%_GNUS
! ! ! Emacs*XlwMenu.gNUS.labelString:	%_GNUS
! ! ! ! Emacs*XlwMenu.emacsW3.labelString:	%_Emacs-W3
! ! ! Emacs*XlwMenu.emacsW3.labelString:	%_Emacs-W3
! ! ! ! Emacs*XlwMenu.netscape.labelString:	%_Netscape
! ! ! Emacs*XlwMenu.netscape.labelString:	%_Netscape
! ! ! ! Emacs*XlwMenu.mosaic.labelString:	%_Mosaic
! ! ! Emacs*XlwMenu.mosaic.labelString:	%_Mosaic
! ! ! ! Emacs*XlwMenu.mosaicCCI.labelString:	Mosaic (%_CCI)
! ! ! Emacs*XlwMenu.mosaicCCI.labelString:	Mosaic (%_CCI)
! ! ! ! Emacs*XlwMenu.iXIMosaic.labelString:	%_IXI Mosaic
! ! ! Emacs*XlwMenu.iXIMosaic.labelString:	%_IXI Mosaic
! ! ! ! Emacs*XlwMenu.lynxXterm.labelString:	%_Lynx (xterm)
! ! ! Emacs*XlwMenu.lynxXterm.labelString:	%_Lynx (xterm)
! ! ! ! Emacs*XlwMenu.l_ynxXemacs.labelString:	L%_ynx (xemacs)
! ! ! Emacs*XlwMenu.l_ynxXemacs.labelString:	L%_ynx (xemacs)
! ! ! ! Emacs*XlwMenu.grail.labelString:	%_Grail
! ! ! Emacs*XlwMenu.grail.labelString:	%_Grail
! ! ! ! Emacs*XlwMenu.kfm.labelString:	%_Kfm
! ! ! Emacs*XlwMenu.kfm.labelString:		%_Kfm
! ! ! ! Emacs*XlwMenu.debugOnError.labelString:	%_Debug on Error
! ! ! Emacs*XlwMenu.debugOnError.labelString:	????????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.debugOnQuit.labelString:	Debug on %_Quit
! ! ! Emacs*XlwMenu.debugOnQuit.labelString:	?????????????????????(%_Q)
! ! ! ! Emacs*XlwMenu.debugOnS_ignal.labelString:	Debug on S%_ignal
! ! ! Emacs*XlwMenu.debugOnS_ignal.labelString:	???????????????????????????(%_I)
! ! ! ! Emacs*XlwMenu.stackTraceOnError.labelString:	%_Stack Trace on Error
! ! ! Emacs*XlwMenu.stackTraceOnError.labelString:	????????????????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.stackTraceOnSi_gnal.labelString:	Stack Trace on Si%_gnal
! ! ! Emacs*XlwMenu.stackTraceOnSi_gnal.labelString:	???????????????????????????????????????(%_G)
! ! ! ! Emacs*XlwMenu.scrollbars.labelString:	%_Scrollbars
! ! ! Emacs*XlwMenu.scrollbars.labelString:	?????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.wrapLongLines.labelString:	%_Wrap Long Lines
! ! ! Emacs*XlwMenu.wrapLongLines.labelString:	????????????????????????(%_W)
! ! ! ! Emacs*XlwMenu.3DModeline.labelString:	%_3D Modeline
! ! ! Emacs*XlwMenu.3DModeline.labelString:	3D??????????????????(%_3)
! ! ! ! Emacs*XlwMenu.modelineHorizontalScrolling.labelString:	Modeline %_Horizontal Scrolling
! ! ! Emacs*XlwMenu.modelineHorizontalScrolling.labelString:	??????????????????????????????????????????(%_H)
! ! ! ! Emacs*XlwMenu.toolbarsVisible.labelString:	%_Toolbars Visible
! ! ! Emacs*XlwMenu.toolbarsVisible.labelString:	????????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.toolbarsCa_ptioned.labelString:	Toolbars Ca%_ptioned
! ! ! Emacs*XlwMenu.toolbarsCa_ptioned.labelString:	??????????????????????????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.defaultToolba_rLocation.labelString:	Default Toolba%_r Location
! ! ! Emacs*XlwMenu.defaultToolba_rLocation.labelString:	???????????????????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.b_uffersTabVisible.labelString:	B%_uffers Tab Visible
! ! ! Emacs*XlwMenu.b_uffersTabVisible.labelString:	???????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.defaultGutterLocation.labelString:	Default %_Gutter Location
! ! ! Emacs*XlwMenu.defaultGutterLocation.labelString:	?????????????????????????????????(%_G)
! ! ! ! Emacs*XlwMenu.blinkingCursor.labelString:	%_Blinking Cursor
! ! ! Emacs*XlwMenu.blinkingCursor.labelString:	?????????????????????(%_B)
! ! ! ! Emacs*XlwMenu.bl_ockCursor.labelString:	Bl%_ock Cursor
! ! ! Emacs*XlwMenu.bl_ockCursor.labelString:	????????????????????????(%_O)
! ! ! ! Emacs*XlwMenu.barCursor1Pixel.labelString:	Bar Cursor (%_1 Pixel)
! ! ! Emacs*XlwMenu.barCursor1Pixel.labelString:	??????????????????(%_1????????????)
! ! ! ! Emacs*XlwMenu.barCursor2Pixels.labelString:	Bar Cursor (%_2 Pixels)
! ! ! Emacs*XlwMenu.barCursor2Pixels.labelString:	??????????????????(%_2????????????)
! ! ! ! Emacs*XlwMenu.pa_renHighlighting.labelString:	Pa%_ren Highlighting
! ! ! Emacs*XlwMenu.pa_renHighlighting.labelString:	?????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.lineNumbers.labelString:	%_Line Numbers
! ! ! Emacs*XlwMenu.lineNumbers.labelString:		?????????(%_L)
! ! ! ! Emacs*XlwMenu.columnNumbers.labelString:	%_Column Numbers
! ! ! Emacs*XlwMenu.columnNumbers.labelString:	???????????????(%_C)
! ! ! ! Emacs*XlwMenu.otherWindowLocation.labelString:	"Other %_Window" Location
! ! ! Emacs*XlwMenu.otherWindowLocation.labelString:	"?????????????????????"??????(%_W)
! ! ! ! Emacs*XlwMenu.none.labelString:	%_None
! ! ! Emacs*XlwMenu.none.labelString:	??????(%_N)
! ! ! ! Emacs*XlwMenu.asText.labelString:	As %_Text
! ! ! Emacs*XlwMenu.asText.labelString:	?????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.asScrollbar.labelString:	As %_Scrollbar
! ! ! Emacs*XlwMenu.asScrollbar.labelString:	??????????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.top.labelString:	%_Top
! ! ! Emacs*XlwMenu.top.labelString:	???(%_T)
! ! ! ! Emacs*XlwMenu.bottom.labelString:	%_Bottom
! ! ! Emacs*XlwMenu.bottom.labelString:	???(%_B)
! ! ! ! Emacs*XlwMenu.left.labelString:	%_Left
! ! ! Emacs*XlwMenu.left.labelString:		???(%_L)
! ! ! ! Emacs*XlwMenu.right.labelString:	%_Right
! ! ! Emacs*XlwMenu.right.labelString:	???(%_R)
! ! ! ! Emacs*XlwMenu.blinkingParen.labelString:	%_Blinking Paren
! ! ! Emacs*XlwMenu.blinkingParen.labelString:	???????????????(%_B)
! ! ! ! Emacs*XlwMenu.steadyParen.labelString:	%_Steady Paren
! ! ! Emacs*XlwMenu.steadyParen.labelString:		????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.expression.labelString:	%_Expression
! ! ! Emacs*XlwMenu.expression.labelString:	???(%_E)
! ! ! ! Emacs*XlwMenu.alwaysInSameFrame.labelString:	%_Always in Same Frame
! ! ! Emacs*XlwMenu.alwaysInSameFrame.labelString:	???????????????????????????(%_A)
! ! ! ! Emacs*XlwMenu.otherFrame2FramesMax.labelString:	Other Frame (%_2 Frames Max)
! ! ! Emacs*XlwMenu.otherFrame2FramesMax.labelString:	??????????????????(??????%_2????????????)
! ! ! ! Emacs*XlwMenu.otherFrame3FramesMax.labelString:	Other Frame (%_3 Frames Max)
! ! ! Emacs*XlwMenu.otherFrame3FramesMax.labelString:	??????????????????(??????%_3????????????)
! ! ! ! Emacs*XlwMenu.otherFrame4FramesMax.labelString:	Other Frame (%_4 Frames Max)
! ! ! Emacs*XlwMenu.otherFrame4FramesMax.labelString:	??????????????????(??????%_4????????????)
! ! ! ! Emacs*XlwMenu.otherFrame5FramesMax.labelString:	Other Frame (%_5 Frames Max)
! ! ! Emacs*XlwMenu.otherFrame5FramesMax.labelString:	??????????????????(??????(%_5????????????)
! ! ! ! Emacs*XlwMenu.alwaysCreateNewFrame.labelString:	Always Create %_New Frame
! ! ! Emacs*XlwMenu.alwaysCreateNewFrame.labelString:	?????????????????????????????????
! ! ! ! Emacs*XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	%_Temp Buffers Always in Same Frame
! ! ! Emacs*XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	????????????????????????????????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.tempBuffersLikeOtherBuffers.labelString:	Temp Buffers %_Like Other Buffers
! ! ! Emacs*XlwMenu.tempBuffersLikeOtherBuffers.labelString:	???????????????????????????????????????????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.makeCurrentFrameGnuservTarget.labelString:	%_Make Current Frame Gnuserv Target
! ! ! Emacs*XlwMenu.makeCurrentFrameGnuservTarget.labelString:	????????????????????????Gnuserv??????????????????(%_M)
! ! ! ! Emacs*XlwMenu.frameLocalFontMenu.labelString:	%_Frame-Local Font Menu
! ! ! Emacs*XlwMenu.frameLocalFontMenu.labelString:	???????????????????????????????????????????????????(%_F)
! ! ! ! Emacs*XlwMenu.altMetaSelectsMenuItems.labelString:	%_Alt/Meta Selects Menu Items
! ! ! Emacs*XlwMenu.altMetaSelectsMenuItems.labelString:	Alt/Meta????????????????????????????????????(%_A)
! ! ! ! Emacs*XlwMenu.buffersMenuLength___.labelString:	Buffers Menu %_Length...
! ! ! Emacs*XlwMenu.buffersMenuLength___.labelString:		?????????????????????????????????(%_L)...
! ! ! ! Emacs*XlwMenu.multiOperationBuffersSubMenus.labelString:	%_Multi-Operation Buffers Sub-Menus
! ! ! Emacs*XlwMenu.multiOperationBuffersSubMenus.labelString:	????????????????????????????????????????????????????????????(%_M)
! ! ! ! Emacs*XlwMenu.s_ubmenusForBufferGroups.labelString:	S%_ubmenus for Buffer Groups
! ! ! Emacs*XlwMenu.s_ubmenusForBufferGroups.labelString:	?????????????????????????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.verboseBufferMenuEntries.labelString:	%_Verbose Buffer Menu Entries
! ! ! Emacs*XlwMenu.verboseBufferMenuEntries.labelString:	??????????????????????????????????????????(%_V)
! ! ! ! Emacs*XlwMenu.buffersMenuSorting.labelString:	Buffers Menu %_Sorting
! ! ! Emacs*XlwMenu.buffersMenuSorting.labelString:	????????????????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.ignoreScaledFonts.labelString:	%_Ignore Scaled Fonts
! ! ! Emacs*XlwMenu.ignoreScaledFonts.labelString:	???????????????????????????(%_I)
! ! ! ! Emacs*XlwMenu.inThisBuffer.labelString:	%_In This Buffer
! ! ! Emacs*XlwMenu.inThisBuffer.labelString:	??????????????????(%_I)
! ! ! ! Emacs*XlwMenu.automatic.labelString:	%_Automatic
! ! ! Emacs*XlwMenu.automatic.labelString:	??????(%_A)
! ! ! ! Emacs*XlwMenu.forceRehighlightInThisBuffer.labelString:	Force %_Rehighlight in this Buffer
! ! ! Emacs*XlwMenu.forceRehighlightInThisBuffer.labelString:	????????????????????????????????????
! ! ! ! Emacs*XlwMenu.fonts.labelString:	%_Fonts
! ! ! Emacs*XlwMenu.fonts.labelString:	????????????(%_F)
! ! ! ! Emacs*XlwMenu.colors.labelString:	%_Colors
! ! ! Emacs*XlwMenu.colors.labelString:	?????????(%_C)
! ! ! ! Emacs*XlwMenu.1Least.labelString:	%_1 Least
! ! ! Emacs*XlwMenu.1Least.labelString:	%_1 ??????
! ! ! ! Emacs*XlwMenu.2More.labelString:	%_2 More
! ! ! Emacs*XlwMenu.2More.labelString:	%_2 ???????????????
! ! ! ! Emacs*XlwMenu.3EvenMore.labelString:	%_3 Even More
! ! ! Emacs*XlwMenu.3EvenMore.labelString:	%_3 ?????????
! ! ! ! Emacs*XlwMenu.4Most.labelString:	%_4 Most
! ! ! Emacs*XlwMenu.4Most.labelString:	%_4 ??????
! ! ! ! Emacs*XlwMenu.lazyLock.labelString:	Lazy %_Lock
! ! ! Emacs*XlwMenu.lazyLock.labelString:	?????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.lazyShot.labelString:	Lazy %_Shot
! ! ! Emacs*XlwMenu.lazyShot.labelString:	????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.cac_hing.labelString:	Cac%_hing
! ! ! Emacs*XlwMenu.cac_hing.labelString:	??????????????????(%_H)
! ! ! ! Emacs*XlwMenu.1Anagnostiko___Avantgarde.labelString:	%_1 Anagnostiko  ... Avantgarde
! ! ! Emacs*XlwMenu.1Anagnostiko___Avantgarde.labelString:	%_1 Anagnostiko  ... Avantgarde
! ! ! ! Emacs*XlwMenu.2Bookman___Chimera.labelString:	%_2 Bookman      ... Chimera
! ! ! Emacs*XlwMenu.2Bookman___Chimera.labelString:	%_2 Bookman      ... Chimera
! ! ! ! Emacs*XlwMenu.3Courier___Helvetica.labelString:	%_3 Courier      ... Helvetica
! ! ! Emacs*XlwMenu.3Courier___Helvetica.labelString:	%_3 Courier      ... Helvetica
! ! ! ! Emacs*XlwMenu.4Kathimerini___LuxiSans.labelString:	%_4 Kathimerini  ... Luxi Sans
! ! ! Emacs*XlwMenu.4Kathimerini___LuxiSans.labelString:	%_4 Kathimerini  ... Luxi Sans
! ! ! ! Emacs*XlwMenu.5LuxiSerif___Palatino.labelString:	%_5 Luxi Serif   ... Palatino
! ! ! Emacs*XlwMenu.5LuxiSerif___Palatino.labelString:	%_5 Luxi Serif   ... Palatino
! ! ! ! Emacs*XlwMenu.6PalladioL___Zysong18030.labelString:	%_6 Palladio L   ... Zysong18030
! ! ! Emacs*XlwMenu.6PalladioL___Zysong18030.labelString:	%_6 Palladio L   ... Zysong18030
! ! ! ! Emacs*XlwMenu.15.labelString:	%_1 5
! ! ! Emacs*XlwMenu.15.labelString:	%_1 5
! ! ! ! Emacs*XlwMenu.26.labelString:	%_2 6
! ! ! Emacs*XlwMenu.26.labelString:	%_2 6
! ! ! ! Emacs*XlwMenu.37.labelString:	%_3 7
! ! ! Emacs*XlwMenu.37.labelString:	%_3 7
! ! ! ! Emacs*XlwMenu.48.labelString:	%_4 8
! ! ! Emacs*XlwMenu.48.labelString:	%_4 8
! ! ! ! Emacs*XlwMenu.59.labelString:	%_5 9
! ! ! Emacs*XlwMenu.59.labelString:	%_5 9
! ! ! ! Emacs*XlwMenu.610.labelString:	%_6 10
! ! ! Emacs*XlwMenu.610.labelString:	%_6 10
! ! ! ! Emacs*XlwMenu.711.labelString:	%_7 11
! ! ! Emacs*XlwMenu.711.labelString:	%_7 11
! ! ! ! Emacs*XlwMenu.812.labelString:	%_8 12
! ! ! Emacs*XlwMenu.812.labelString:	%_8 12
! ! ! ! Emacs*XlwMenu.913.labelString:	%_9 13
! ! ! Emacs*XlwMenu.913.labelString:	%_9 13
! ! ! ! Emacs*XlwMenu.014.labelString:	%_0 14
! ! ! Emacs*XlwMenu.014.labelString:	%_0 14
! ! ! ! Emacs*XlwMenu.a15.labelString:	%_a 15
! ! ! Emacs*XlwMenu.a15.labelString:	%_a 15
! ! ! ! Emacs*XlwMenu.b16.labelString:	%_b 16
! ! ! Emacs*XlwMenu.b16.labelString:	%_b 16
! ! ! ! Emacs*XlwMenu.c17.labelString:	%_c 17
! ! ! Emacs*XlwMenu.c17.labelString:	%_c 17
! ! ! ! Emacs*XlwMenu.d18.labelString:	%_d 18
! ! ! Emacs*XlwMenu.d18.labelString:	%_d 18
! ! ! ! Emacs*XlwMenu.e19.labelString:	%_e 19
! ! ! Emacs*XlwMenu.e19.labelString:	%_e 19
! ! ! ! Emacs*XlwMenu.f20.labelString:	%_f 20
! ! ! Emacs*XlwMenu.f20.labelString:	%_f 20
! ! ! ! Emacs*XlwMenu.g23.labelString:	%_g 23
! ! ! Emacs*XlwMenu.g23.labelString:	%_g 23
! ! ! ! Emacs*XlwMenu.h24.labelString:	%_h 24
! ! ! Emacs*XlwMenu.h24.labelString:	%_h 24
! ! ! ! Emacs*XlwMenu.goToPreviousBuffer.labelString:	Go To %_Previous Buffer
! ! ! Emacs*XlwMenu.goToPreviousBuffer.labelString:	???????????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.goToBuffer___.labelString:	Go To %_Buffer...
! ! ! Emacs*XlwMenu.goToBuffer___.labelString:	?????????????????????(%_B)...
! ! ! ! Emacs*XlwMenu.listAllBuffers.labelString:	%_List All Buffers
! ! ! Emacs*XlwMenu.listAllBuffers.labelString:	???????????????????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.deleteBuffer.labelString:	%_Delete Buffer
! ! ! Emacs*XlwMenu.deleteBuffer.labelString:	?????????????????????(%_D)
! ! ! ! Emacs*XlwMenu..labelString:	%_
! ! ! Emacs*XlwMenu..labelString:	%_
! ! ! ! Emacs*XlwMenu.evaluateRegionOrDefun.labelString:	%_Evaluate Region or Defun
! ! ! Emacs*XlwMenu.evaluateRegionOrDefun.labelString:	??????????????????defun?????????(%_E)
! ! ! ! Emacs*XlwMenu.evaluateWholeBuffer.labelString:	Evaluate %_Whole Buffer
! ! ! Emacs*XlwMenu.evaluateWholeBuffer.labelString:		???????????????????????????(%_W)
! ! ! ! Emacs*XlwMenu.evaluateLastSExpression.labelString:	Evaluate Last %_S-expression
! ! ! Emacs*XlwMenu.evaluateLastSExpression.labelString:	?????????S????????????(%_S)
! ! ! ! Emacs*XlwMenu.findFunction___.labelString:	Find %_Function...
! ! ! Emacs*XlwMenu.findFunction___.labelString:	???????????????(%_F)...
! ! ! ! Emacs*XlwMenu.findVariable___.labelString:	Find %_Variable...
! ! ! Emacs*XlwMenu.findVariable___.labelString:	???????????????(%_V)...
! ! ! ! Emacs*XlwMenu.helpOnFunction___.labelString:	%_Help on Function...
! ! ! Emacs*XlwMenu.helpOnFunction___.labelString:	????????????????????????(%_H)...
! ! ! ! Emacs*XlwMenu.hel_pOnVariable___.labelString:	Hel%_p on Variable...
! ! ! Emacs*XlwMenu.hel_pOnVariable___.labelString:	????????????????????????(%_P)...
! ! ! ! Emacs*XlwMenu.instrumentThisDefunForDebugging.labelString:	Instrument This Defun for %_Debugging
! ! ! Emacs*XlwMenu.instrumentThisDefunForDebugging.labelString:	??????defun????????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.traceFunction___.labelString:	%_Trace Function...
! ! ! Emacs*XlwMenu.traceFunction___.labelString:	?????????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.untraceAllFunctions.labelString:	%_Untrace All Functions
! ! ! Emacs*XlwMenu.untraceAllFunctions.labelString:	?????????????????????????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.commentOutRegion.labelString:	%_Comment Out Region
! ! ! Emacs*XlwMenu.commentOutRegion.labelString:	???????????????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.indentRegionOrBalancedExpression.labelString:	%_Indent Region or Balanced Expression
! ! ! Emacs*XlwMenu.indentRegionOrBalancedExpression.labelString:	?????????????????????????????????(%_I)
! ! ! ! Emacs*XlwMenu.i_ndentDefun.labelString:	I%_ndent Defun
! ! ! Emacs*XlwMenu.i_ndentDefun.labelString:	defun??????????????????(%_N)
! ! ! ! Emacs*XlwMenu.lookForDebugOnErrorUnderOptionsTroubleshooting.labelString:	Look for debug-on-error under Options->Troubleshooting
! ! ! Emacs*XlwMenu.lookForDebugOnErrorUnderOptionsTroubleshooting.labelString:	[???????????????]-[?????????????????????????????????]???[????????????????????????]???????????????????????????
! ! ! ! Emacs*XlwMenu.aboutXEmacs___.labelString:	%_About XEmacs...
! ! ! Emacs*XlwMenu.aboutXEmacs___.labelString:	XEmacs????????????(%_A)...
! ! ! ! Emacs*XlwMenu.whatSNewInXEmacs.labelString:	What's %_New in XEmacs
! ! ! Emacs*XlwMenu.whatSNewInXEmacs.labelString:	XEmacs????????????(%_N)
! ! ! ! Emacs*XlwMenu.obtainingXEmacs.labelString:	%_Obtaining XEmacs
! ! ! Emacs*XlwMenu.obtainingXEmacs.labelString:	XEmacs?????????????????????(%_O)
! ! ! ! Emacs*XlwMenu.infoOnlineDocs.labelString:	%_Info (Online Docs)
! ! ! Emacs*XlwMenu.infoOnlineDocs.labelString:	%_Info (???????????????doc)
! ! ! ! Emacs*XlwMenu.xEmacsFAQ.labelString:	XEmacs %_FAQ
! ! ! Emacs*XlwMenu.xEmacsFAQ.labelString:	XEmacs %_FAQ
! ! ! ! Emacs*XlwMenu.tutorials.labelString:	%_Tutorials
! ! ! Emacs*XlwMenu.tutorials.labelString:	?????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.samples.labelString:	%_Samples
! ! ! Emacs*XlwMenu.samples.labelString:	????????????(%_S)
! ! ! ! Emacs*XlwMenu.commandsKeys.labelString:	%_Commands & Keys
! ! ! Emacs*XlwMenu.commandsKeys.labelString:	?????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.recentMessages.labelString:	%_Recent Messages
! ! ! Emacs*XlwMenu.recentMessages.labelString:	????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.misc.labelString:	%_Misc
! ! ! Emacs*XlwMenu.misc.labelString:	?????????(%_M)
! ! ! ! Emacs*XlwMenu.sendBugReport___.labelString:	Send %_Bug Report...
! ! ! Emacs*XlwMenu.sendBugReport___.labelString:	???????????????????????????(%_B)...
! ! ! ! Emacs*XlwMenu.infoContents.labelString:	%_Info Contents
! ! ! Emacs*XlwMenu.infoContents.labelString:	Info???????????????(%_I)
! ! ! ! Emacs*XlwMenu.lookupKeyBinding___.labelString:	Lookup %_Key Binding...
! ! ! Emacs*XlwMenu.lookupKeyBinding___.labelString:	?????????????????????????????????(%_K)...
! ! ! ! Emacs*XlwMenu.lookupCommand___.labelString:	Lookup %_Command...
! ! ! Emacs*XlwMenu.lookupCommand___.labelString:	??????????????????(%_C)...
! ! ! ! Emacs*XlwMenu.lookupFunction___.labelString:	Lookup %_Function...
! ! ! Emacs*XlwMenu.lookupFunction___.labelString:	????????????(%_F)...
! ! ! ! Emacs*XlwMenu.lookupTopic___.labelString:	Lookup %_Topic...
! ! ! Emacs*XlwMenu.lookupTopic___.labelString:	??????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.fAQLocal.labelString:	%_FAQ (local)
! ! ! Emacs*XlwMenu.fAQLocal.labelString:	%_FAQ (????????????)
! ! ! ! Emacs*XlwMenu.fAQViaWWW.labelString:	FAQ via %_WWW
! ! ! Emacs*XlwMenu.fAQViaWWW.labelString:	WWW??????FAQ(%_W)
! ! ! ! Emacs*XlwMenu.homePage.labelString:	%_Home Page
! ! ! Emacs*XlwMenu.homePage.labelString:	??????????????????(%_H)
! ! ! ! Emacs*XlwMenu.defaultJapanese.labelString:	%_Default (Japanese)
! ! ! Emacs*XlwMenu.defaultJapanese.labelString:	???????????????(%_D) (?????????)
! ! ! ! Emacs*XlwMenu.1ThaiXTIS.labelString:	%_1 Thai-XTIS
! ! ! Emacs*XlwMenu.1ThaiXTIS.labelString:	%_1 ?????????-XTIS
! ! ! ! Emacs*XlwMenu.2Korean.labelString:	%_2 Korean
! ! ! Emacs*XlwMenu.2Korean.labelString:	%_2 ?????????
! ! ! ! Emacs*XlwMenu.3Slovenian.labelString:	%_3 Slovenian
! ! ! Emacs*XlwMenu.3Slovenian.labelString:	%_3 ??????????????????
! ! ! ! Emacs*XlwMenu.4German.labelString:	%_4 German
! ! ! Emacs*XlwMenu.4German.labelString:	%_4 ????????????
! ! ! ! Emacs*XlwMenu.5Czech.labelString:	%_5 Czech
! ! ! Emacs*XlwMenu.5Czech.labelString:	%_5 ????????????
! ! ! ! Emacs*XlwMenu.6Romanian.labelString:	%_6 Romanian
! ! ! Emacs*XlwMenu.6Romanian.labelString:	%_6 ??????????????????
! ! ! ! Emacs*XlwMenu.7Polish.labelString:	%_7 Polish
! ! ! Emacs*XlwMenu.7Polish.labelString:	%_7 ??????????????????
! ! ! ! Emacs*XlwMenu.8Croatian.labelString:	%_8 Croatian
! ! ! Emacs*XlwMenu.8Croatian.labelString:	%_8 ??????????????????
! ! ! ! Emacs*XlwMenu.9Norwegian.labelString:	%_9 Norwegian
! ! ! Emacs*XlwMenu.9Norwegian.labelString:	%_9 ??????????????????
! ! ! ! Emacs*XlwMenu.0French.labelString:	%_0 French
! ! ! Emacs*XlwMenu.0French.labelString:	%_0 ???????????????
! ! ! ! Emacs*XlwMenu.aEnglish.labelString:	%_a English
! ! ! Emacs*XlwMenu.aEnglish.labelString:	%_a ??????
! ! ! ! Emacs*XlwMenu.bCyrillicALT.labelString:	%_b Cyrillic-ALT
! ! ! Emacs*XlwMenu.bCyrillicALT.labelString:	%_b ???????????????-ALT
! ! ! ! Emacs*XlwMenu.cCyrillicWin.labelString:	%_c Cyrillic-Win
! ! ! Emacs*XlwMenu.cCyrillicWin.labelString: %_c ???????????????-Win
! ! ! ! Emacs*XlwMenu.dCyrillicKOI8.labelString:	%_d Cyrillic-KOI8
! ! ! Emacs*XlwMenu.dCyrillicKOI8.labelString: %_d ???????????????-KOI8
! ! ! ! Emacs*XlwMenu.eCyrillicISO.labelString:	%_e Cyrillic-ISO
! ! ! Emacs*XlwMenu.eCyrillicISO.labelString: %_d ???????????????-ISO
! ! ! ! Emacs*XlwMenu.sampleInit_el.labelString:	Sample %_init.el
! ! ! Emacs*XlwMenu.sampleInit_el.labelString:	????????????init.el(%_I)
! ! ! ! Emacs*XlwMenu.sample__Xdefaults.labelString:	Sample .%_Xdefaults
! ! ! Emacs*XlwMenu.sample__Xdefaults.labelString:	????????????.Xdefaults(%_X)
! ! ! ! Emacs*XlwMenu.sampleEnriched.labelString:	Sample %_enriched
! ! ! Emacs*XlwMenu.sampleEnriched.labelString:	????????????enriched(%_E)
! ! ! ! Emacs*XlwMenu.mode.labelString:	%_Mode
! ! ! Emacs*XlwMenu.mode.labelString:	?????????(%_M)
! ! ! ! Emacs*XlwMenu.aproposDocs___.labelString:	Apropos %_Docs...
! ! ! Emacs*XlwMenu.aproposDocs___.labelString:	Apropos??????????????????(%_D)...
! ! ! ! Emacs*XlwMenu.key___.labelString:	%_Key...
! ! ! Emacs*XlwMenu.key___.labelString:	??????(%_I)...
! ! ! ! Emacs*XlwMenu.bindings.labelString:	%_Bindings
! ! ! Emacs*XlwMenu.bindings.labelString:	?????????????????????(%_B)
! ! ! ! Emacs*XlwMenu.mouseBindings.labelString:	%_Mouse Bindings
! ! ! Emacs*XlwMenu.mouseBindings.labelString:	??????????????????????????????(%_M)
! ! ! ! Emacs*XlwMenu.recentKeys.labelString:	%_Recent Keys
! ! ! Emacs*XlwMenu.recentKeys.labelString:	???????????????(%_R)
! ! ! ! Emacs*XlwMenu.function___.labelString:	%_Function...
! ! ! Emacs*XlwMenu.function___.labelString:	??????(%_F)...
! ! ! ! Emacs*XlwMenu.variable___.labelString:	%_Variable...
! ! ! Emacs*XlwMenu.variable___.labelString:	??????(%_V)...
! ! ! ! Emacs*XlwMenu.locateCommand___.labelString:	%_Locate Command...
! ! ! Emacs*XlwMenu.locateCommand___.labelString:	???????????????locate(%_L)...
! ! ! ! Emacs*XlwMenu.currentInstallationInfo.labelString:	%_Current Installation Info
! ! ! Emacs*XlwMenu.currentInstallationInfo.labelString:	????????????????????????????????????Info(%_C)
! ! ! ! Emacs*XlwMenu.noWarranty.labelString:	%_No Warranty
! ! ! Emacs*XlwMenu.noWarranty.labelString:	?????????(%_N)
! ! ! ! Emacs*XlwMenu.xEmacsLicense.labelString:	XEmacs %_License
! ! ! Emacs*XlwMenu.xEmacsLicense.labelString:	XEmacs???????????????(%_L)
! ! ! ! Emacs*XlwMenu.findPackages.labelString:	Find %_Packages
! ! ! Emacs*XlwMenu.findPackages.labelString:	?????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.viewSplashScreen.labelString:	View %_Splash Screen
! ! ! Emacs*XlwMenu.viewSplashScreen.labelString:	??????????????????????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.unixManual___.labelString:	%_Unix Manual...
! ! ! Emacs*XlwMenu.unixManual___.labelString:	Unix???????????????(%_U)...


--- NEW FILE Emacs.ad.ja_JP.eucJP ---
! XEmacs 21.x ???????????????????????????? (????????????)
!
!              MATSUBAYASHI 'Shaolin' Kohji (shaolin at rins.st.ryukoku.ac.jp)
!              Yukihiro Nakai <ynakai at redhat.com>
!                                   Time-stamp: <03/10/17 21:51:24 petersen>
!
!
! This is the app-defaults file for XEmacs.
!
! This used to be identical to sample.Xdefaults, but the resources
! below have been rewritten to be as general as possible to avoid
! overriding user resources.  Other than the form rewriting, both
! files should be kept in sync. 
! 
! The resources below are loaded into the XEmacs executable at compile-time:
! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
! effect.
! 
! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
! (or whatever the standard app-defaults directory is at your site) to cause
! it to be consulted at run-time.  (Do this only for site-wide customizations:
! personal customizations should be put into ~/.Xdefaults instead.)
! Note that the file must be named Emacs, not XEmacs.
! 
! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of
! the various resources and the syntax for setting them.
! 
! Energize users: note that this is not the same app-defaults file that is
! used with the Energize-specific version of XEmacs.


! Colors and backgrounds.
! ======================
! The contrasts of these colors will cause them to map to the appropriate
! one of "black" or "white" on monochrome systems.
! 
! The valid color names on your system can be found by looking in the file
! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/.

! ! Set the modeline colors.
! Emacs.modeline*attributeForeground:	Black
! Emacs.modeline*attributeBackground:	Gray75

! ! Set the color of the text cursor.
! Emacs.text-cursor*attributeBackground:	Red3

! If you want to set the color of the mouse pointer, do this:
! Emacs.pointer*attributeForeground:	Black
! If you want to set the background of the mouse pointer, do this:
! Emacs.pointer*attributeBackground:	White
! Note that by default, the pointer foreground and background are the same
! as the default face.

! Set the menubar colors.  This overrides the default foreground and
! background colors specified above.
*menubar*Foreground:			Gray30
*menubar*Background:			Gray80
! This is for buttons in the menubar.  
! Yellow would be better, but that would map to white on monochrome.
*menubar*buttonForeground:		Blue
*XlwMenu*highlightForeground:		Red
*XlwMenu*titleForeground:		Maroon
*XlwMenu*selectColor:			ForestGreen
*XmToggleButton*selectColor:		ForestGreen

! Specify the colors of popup menus.
*popup*Foreground:			Black
*popup*Background:			Gray80

! Specify the colors of the various sub-widgets of the dialog boxes.
*dialog*Foreground:			Black
! #A5C0C1 is a shade of blue
*dialog*Background:			#A5C0C1
! The following three are for Motif dialog boxes ...
*dialog*XmTextField*Background:		WhiteSmoke
*dialog*XmText*Background:		WhiteSmoke
*dialog*XmList*Background:		WhiteSmoke
! While this one is for Athena dialog boxes.
*dialog*Command*Background:		WhiteSmoke

! Xlw Scrollbar colors
*XlwScrollBar*Foreground:		Gray30
*XlwScrollBar*Background:		Gray80
*XmScrollBar*Foreground:		Gray30
*XmScrollBar*Background:		Gray80

!
! The Lucid Scrollbar supports two added resources, SliderStyle is either
! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
! of the slider that depresses when the slider is clicked on.  ArrowPosition is
! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
! of the scrollbar, same puts both arrows at the same end, like the Amiga.
!
Emacs*XlwScrollBar.SliderStyle:    dimple
! Emacs*XlwScrollBar.ArrowPosition:  opposite

!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

! *topToolBarShadowColor:		Gray90
! *bottomToolBarShadowColor:		Gray40
! *backgroundToolBarColor:		Gray80
! *toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
Emacs.default.attributeFont:  -misc-fixed-medium-r-*-*-14-*-*-*-*-*-*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
*menubar*Font: 			-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*popup*Font:			-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*

! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:	-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*XmTextField*FontList:		-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*XmText*FontList:		-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*XmList*FontList:		-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField*translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton*translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! XIM fontset (defaults to system fontset default)
! *EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
!    Japanese localization resources for XEmacs.
! @(#)Emacs	1.3 96/09/22
!    Copyright (C) 1996 Sun Microsystems, Inc.
!!
! This file is part of XEmacs.
! 
! XEmacs is free software; you can redistribute it and/or modify it
! under the terms of the GNU General Public License as published by the
! Free Software Foundation; either version 2, or (at your option) any
! later version.
! XEmacs 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 XEmacs; see the file COPYING.  If not, write to the
! Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! Boston, MA 02111-1307, USA.
! Copyright (C) 1996 Sun Microsystems Inc.
!
! Japanese Resources to be placed in etc/app-defaults/ja/Emacs
! for xemacs-mule.  It is same on another languages such like fr,
! if you want to have French menu label, place it on
! etc/app-defaults/fr/Emacs.

! Pulldown menu internationalization.  The first line of the file
! "*XlwMenu.resourceLabels: True" has to be there to make sure
! all the labelString will be read and displayed by X.
*XlwMenu.resourceLabels: True

! CDE doesn't require this but OpenWindows does.
! Note that this `gothic' font family is effective just for Japanese.
! And fontList is just used under Motif menubar.
*fontList: -misc-fixed-medium-r-normal--14-*:
!! FontSet for menus when you use --with-xfs or --with-xim=xlib.
*fontSet: -*-fixed-medium-r-normal--14-*

! Starting below here are menu label string which can be translated to
! different languages. 
! Example: *XlwMenu.file.labelString: File  
! Characters before the ":" sign, "Example: *XlwMenu.file.labelString"
! can not be changed. They must stay exactly the way they are.
! The only string to be translated is the string, "File".
! Some resource names such as "file", "quit" have been used in several
! places.  However, each of them only has to be translated once in this X
! resource file.
! Emacs*XlwMenu.file.labelString:	%_File
Emacs*XlwMenu.file.labelString:		????????(%_F)
! Emacs*XlwMenu.edit.labelString:	%_Edit
Emacs*XlwMenu.edit.labelString:		????(%_E)
! Emacs*XlwMenu.view.labelString:	%_View
Emacs*XlwMenu.view.labelString:		????(%_V)
! Emacs*XlwMenu.c_mds.labelString:	C%_mds
Emacs*XlwMenu.c_mds.labelString:	????????(%_M)
! Emacs*XlwMenu.tools.labelString:	%_Tools
Emacs*XlwMenu.tools.labelString:	??????(%_T)
! Emacs*XlwMenu.options.labelString:	%_Options
Emacs*XlwMenu.options.labelString:	??????????(%_O)
! Emacs*XlwMenu.buffers.labelString:	%_Buffers
Emacs*XlwMenu.buffers.labelString:	????????(%_B)
! Emacs*XlwMenu.help.labelString:	%_Help
Emacs*XlwMenu.help.labelString:		??????(%_H)
! Emacs*XlwMenu.lisp.labelString:	%_Lisp
Emacs*XlwMenu.lisp.labelString:		%_Lisp
! Emacs*XlwMenu.open___.labelString:	%_Open...
Emacs*XlwMenu.open___.labelString:	????(%_O)...
! Emacs*XlwMenu.openInOtherWindow___.labelString:	Open in Other %_Window...
Emacs*XlwMenu.openInOtherWindow___.labelString:		????????????????????(%_W)...
! Emacs*XlwMenu.openInNewFrame___.labelString:	Open in New %_Frame...
Emacs*XlwMenu.openInNewFrame___.labelString:	????????????????????(%_F)...
! Emacs*XlwMenu.hexEditFile___.labelString:	%_Hex Edit File...
Emacs*XlwMenu.hexEditFile___.labelString:	16????????????(%_H)...
! Emacs*XlwMenu.insertFile___.labelString:	%_Insert File...
Emacs*XlwMenu.insertFile___.labelString:	??????????????(%_I)...
! Emacs*XlwMenu.viewFile___.labelString:	%_View File...
Emacs*XlwMenu.viewFile___.labelString:		??????????????(%_V)...
! Emacs*XlwMenu.save.labelString:	%_Save
Emacs*XlwMenu.save.labelString:		????(%_S)
! Emacs*XlwMenu.saveAs___.labelString:	Save %_As...
Emacs*XlwMenu.saveAs___.labelString:	??????????(%_A)...
! Emacs*XlwMenu.saveSo_meBuffers.labelString:	Save So%_me Buffers
Emacs*XlwMenu.saveSo_meBuffers.labelString:	????????????????????(%_M)
! Emacs*XlwMenu.print.labelString:	%_Print
Emacs*XlwMenu.print.labelString:	????(%_P)
! Emacs*XlwMenu.prett_yPrint.labelString:	Prett%_y-Print
Emacs*XlwMenu.prett_yPrint.labelString:		????????(%_Y)
! Emacs*XlwMenu.revertBuffer.labelString:	%_Revert Buffer
Emacs*XlwMenu.revertBuffer.labelString:		????????????(%_R)
! Emacs*XlwMenu.re_coverFile___.labelString:	Re%_cover File...
Emacs*XlwMenu.re_coverFile___.labelString:	????????????(%_C)...
! Emacs*XlwMenu.recoverS_ession___.labelString:	Recover S%_ession...
Emacs*XlwMenu.recoverS_ession___.labelString:	????????????????(%_S)...
! Emacs*XlwMenu.e_xitXEmacs.labelString:	E%_xit XEmacs
Emacs*XlwMenu.e_xitXEmacs.labelString:		XEmacs??????(%_X)
! Emacs*XlwMenu.undo.labelString:	%_Undo
Emacs*XlwMenu.undo.labelString:		????????(%_U)
! Emacs*XlwMenu.cu_t.labelString:	Cu%_t
Emacs*XlwMenu.cu_t.labelString:		????????(%_T)
! Emacs*XlwMenu.copy.labelString:	%_Copy
Emacs*XlwMenu.copy.labelString:		??????(%_C)
! Emacs*XlwMenu.paste.labelString:	%_Paste
Emacs*XlwMenu.paste.labelString:	????????(%_P)
! Emacs*XlwMenu.delete.labelString:	%_Delete
Emacs*XlwMenu.delete.labelString:	????(%_D)
! Emacs*XlwMenu.selectAll.labelString:	Select %_All
Emacs*XlwMenu.selectAll.labelString:	????????????(%_A)
! Emacs*XlwMenu.selectPa_ge.labelString:	Select Pa%_ge
Emacs*XlwMenu.selectPa_ge.labelString:	????????????(%_G)
! Emacs*XlwMenu.find___.labelString:	%_Find...
Emacs*XlwMenu.find___.labelString:	????(%_F)...
! Emacs*XlwMenu.r_eplace___.labelString:	R%_eplace...
Emacs*XlwMenu.r_eplace___.labelString:		????(%_E)...
! Emacs*XlwMenu.replaceRege_xp___.labelString:	Replace (Rege%_xp)...
Emacs*XlwMenu.replaceRege_xp___.labelString:	???? (????????)(%_X)...
! Emacs*XlwMenu.listMatchingLines___.labelString:	%_List Matching Lines...
Emacs*XlwMenu.listMatchingLines___.labelString:		????????????????(%_L)...
! Emacs*XlwMenu.multilingualMule.labelString:	%_Multilingual ("Mule")
Emacs*XlwMenu.multilingualMule.labelString:	??????(%_M) ("Mule")
! Emacs*XlwMenu.t_oggleInputMethod.labelString:	T%_oggle Input Method
Emacs*XlwMenu.t_oggleInputMethod.labelString:	????????????????????(%_O)
! Emacs*XlwMenu.selectInputMethod.labelString:	Select %_Input Method
Emacs*XlwMenu.selectInputMethod.labelString:	??????????????????(%_I)
! Emacs*XlwMenu.d_escribeInputMethod.labelString:	D%_escribe Input Method
Emacs*XlwMenu.d_escribeInputMethod.labelString:	??????????????????(%_E)
! Emacs*XlwMenu.describeCurrentCodingSystems.labelString:	Describe Current %_Coding Systems
Emacs*XlwMenu.describeCurrentCodingSystems.labelString:		????????????????????????????????(%_C)
! Emacs*XlwMenu.setCodingSystemOfBufferFile___.labelString:	Set Coding System of %_Buffer File...
Emacs*XlwMenu.setCodingSystemOfBufferFile___.labelString:	??????????????????????????????????????????????(%_B)...
! Emacs*XlwMenu.setCodingSystemOfTerminal___.labelString:	Set Coding System of %_Terminal...
Emacs*XlwMenu.setCodingSystemOfTerminal___.labelString:		????????????????????????????????????????(%_T)...
! Emacs*XlwMenu.setCodingSystemOfKeyboard___.labelString:	Set Coding System of %_Keyboard...
Emacs*XlwMenu.setCodingSystemOfKeyboard___.labelString:		????????????????????????????????????????(%_K)...
! Emacs*XlwMenu.setCodingSystemOfProcess___.labelString:	Set Coding System of %_Process...
Emacs*XlwMenu.setCodingSystemOfProcess___.labelString:		??????????????????????????????????????(%_P)...
! Emacs*XlwMenu.showCha_racterTable.labelString:	Show Cha%_racter Table
Emacs*XlwMenu.showCha_racterTable.labelString:		????????????????????????(%_R)
! Emacs*XlwMenu.showDia_gnosisForMULE.labelString:	Show Dia%_gnosis for MULE
Emacs*XlwMenu.showDia_gnosisForMULE.labelString:	MULE????????????(%_G)
! Emacs*XlwMenu.showHelloInManyLanguages.labelString:	Show "%_hello" in Many Languages
Emacs*XlwMenu.showHelloInManyLanguages.labelString:	????????"Hello"??????(%_H)
! Emacs*XlwMenu.newFrame.labelString:	%_New Frame
Emacs*XlwMenu.newFrame.labelString:			????????????(%_N)
! Emacs*XlwMenu.frameOnOtherDispla_y___.labelString:	Frame on Other Displa%_y...
Emacs*XlwMenu.frameOnOtherDispla_y___.labelString:	??????????????????????????(%_Y)...
! Emacs*XlwMenu.deleteFrame.labelString:	%_Delete Frame
Emacs*XlwMenu.deleteFrame.labelString:		??????????????(%_D)
! Emacs*XlwMenu.splitWindow.labelString:	%_Split Window
Emacs*XlwMenu.splitWindow.labelString:		????????????????(%_S)
! Emacs*XlwMenu.s_plitWindowSideBySide.labelString:	S%_plit Window (Side by Side)
Emacs*XlwMenu.s_plitWindowSideBySide.labelString:	????????????????(??)(%_P)
! Emacs*XlwMenu.unSplitKeepThis.labelString:	%_Un-Split (Keep This)
Emacs*XlwMenu.unSplitKeepThis.labelString:	??????????????(%_U) (??????????)
! Emacs*XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep %_Others)
Emacs*XlwMenu.unSplitKeepOthers.labelString:	??????????????(%_O) (????????)
! Emacs*XlwMenu.n_arrow.labelString:	N%_arrow
Emacs*XlwMenu.n_arrow.labelString:	N%_arrow
! Emacs*XlwMenu.showMessageLog.labelString:	Show Message %_Log
Emacs*XlwMenu.showMessageLog.labelString:	????????????????????(%_L)
! Emacs*XlwMenu.gotoLine___.labelString:	%_Goto Line...
Emacs*XlwMenu.gotoLine___.labelString:		????????(%_G)...
! Emacs*XlwMenu.whatLine.labelString:	%_What Line
Emacs*XlwMenu.whatLine.labelString:	??????????(%_W)
! Emacs*XlwMenu.bookmarks.labelString:	%_Bookmarks
Emacs*XlwMenu.bookmarks.labelString:	????????????(%_B)
! Emacs*XlwMenu.jumpToPreviousMark.labelString:	%_Jump to Previous Mark
Emacs*XlwMenu.jumpToPreviousMark.labelString:	????????????????(%_J)
! Emacs*XlwMenu.narrowToRegion.labelString:	%_Narrow to Region
Emacs*XlwMenu.narrowToRegion.labelString:	%_Narrow to Region
! Emacs*XlwMenu.narrowToPage.labelString:	Narrow to %_Page
Emacs*XlwMenu.narrowToPage.labelString:		Narrow to %_Page
! Emacs*XlwMenu.narrowToDefun.labelString:	Narrow to %_Defun
Emacs*XlwMenu.narrowToDefun.labelString:	Narrow to %_Defun
! Emacs*XlwMenu.widen.labelString:	%_Widen
Emacs*XlwMenu.widen.labelString:	%_Widen
! Emacs*XlwMenu.jumpToBookmark.labelString:	%_Jump to Bookmark
Emacs*XlwMenu.jumpToBookmark.labelString:	??????????????????(%_J)
! Emacs*XlwMenu.setBookmark.labelString:	Set %_Bookmark
Emacs*XlwMenu.setBookmark.labelString:		??????????????????(%_B)
! Emacs*XlwMenu.insertContents.labelString:	Insert %_Contents
Emacs*XlwMenu.insertContents.labelString:	????????????????(%_C)
! Emacs*XlwMenu.insertL_ocation.labelString:	Insert L%_ocation
Emacs*XlwMenu.insertL_ocation.labelString:	??????????(%_L)
! Emacs*XlwMenu.renameBookmark.labelString:	%_Rename Bookmark
Emacs*XlwMenu.renameBookmark.labelString:	??????????????????????(%_R)
! Emacs*XlwMenu.deleteBookmark.labelString:	%_Delete Bookmark
Emacs*XlwMenu.deleteBookmark.labelString:	??????????????????(%_D)
! Emacs*XlwMenu.editBookmarkList.labelString:	%_Edit Bookmark List
Emacs*XlwMenu.editBookmarkList.labelString:	????????????????????????(%_E)
! Emacs*XlwMenu.saveBookmarks.labelString:	%_Save Bookmarks
Emacs*XlwMenu.saveBookmarks.labelString:	??????????????????(%_S)
! Emacs*XlwMenu.saveBookmarksAs___.labelString:	Save Bookmarks %_As...
Emacs*XlwMenu.saveBookmarksAs___.labelString:	????????????????????????(%_A)...
! Emacs*XlwMenu.loadABookmarkFile.labelString:	%_Load a Bookmark File
Emacs*XlwMenu.loadABookmarkFile.labelString:	??????????????????????????????(%_L)
! Emacs*XlwMenu.repeatLastComplexCommand___.labelString:	Repeat %_Last Complex Command...
Emacs*XlwMenu.repeatLastComplexCommand___.labelString:	????????????????????????????(%_L)
! Emacs*XlwMenu.e_valuateLispExpression___.labelString:	E%_valuate Lisp Expression...
Emacs*XlwMenu.e_valuateLispExpression___.labelString:	Lisp?????????????? (%_V)
! Emacs*XlwMenu.executeNamedCommand___.labelString:	Execute %_Named Command...
Emacs*XlwMenu.executeNamedCommand___.labelString:	??????????????????????(%_N)
! Emacs*XlwMenu.startMacroRecording.labelString:	Start %_Macro Recording
Emacs*XlwMenu.startMacroRecording.labelString:		????????????????(%_M)
! Emacs*XlwMenu.e_xecuteLastMacro.labelString:	E%_xecute Last Macro
Emacs*XlwMenu.e_xecuteLastMacro.labelString:	?????????????????? (%_X)
! Emacs*XlwMenu.otherMacro.labelString:	%_Other Macro
Emacs*XlwMenu.otherMacro.labelString:	????????????????(%_O)
! Emacs*XlwMenu.abbrev.labelString:	%_Abbrev
Emacs*XlwMenu.abbrev.labelString:	????(%_A)
! Emacs*XlwMenu.register.labelString:	%_Register
Emacs*XlwMenu.register.labelString:	????(%_R)
! Emacs*XlwMenu.r_ectangles.labelString:	R%_ectangles
Emacs*XlwMenu.r_ectangles.labelString:		????(%_E)
! Emacs*XlwMenu.sort.labelString:	%_Sort
Emacs*XlwMenu.sort.labelString:		??????(%_S)
! Emacs*XlwMenu.changeCase.labelString:	%_Change Case
Emacs*XlwMenu.changeCase.labelString:	??????????????(%_C)
! Emacs*XlwMenu.ce_nter.labelString:	Ce%_nter
Emacs*XlwMenu.ce_nter.labelString:	????????????(%_N)
! Emacs*XlwMenu.indent.labelString:	%_Indent
Emacs*XlwMenu.indent.labelString:	??????????(%_I)
! Emacs*XlwMenu.s_pellCheck.labelString:	S%_pell-Check
Emacs*XlwMenu.s_pellCheck.labelString:		??????????????(%_P)
! Emacs*XlwMenu.footnotes.labelString:	%_Footnotes
Emacs*XlwMenu.footnotes.labelString:	????(%_F)
! Emacs*XlwMenu.d_ynamicAbbrevExpand.labelString:	D%_ynamic Abbrev Expand
Emacs*XlwMenu.d_ynamicAbbrevExpand.labelString:		??????????????????????(%_Y)
! Emacs*XlwMenu.dynamicAbbrevComplete.labelString:	Dynamic Abbrev %_Complete
Emacs*XlwMenu.dynamicAbbrevComplete.labelString:	??????????????????????(%_C)
! Emacs*XlwMenu.dynamicAbbrevCompleteInAllBuffers.labelString:	Dynamic Abbrev Complete in %_All Buffers
Emacs*XlwMenu.dynamicAbbrevCompleteInAllBuffers.labelString:	??????????????????????????????????????(%_A)
! Emacs*XlwMenu.defineGlobalAbbrevFor.labelString:	%_Define Global Abbrev for 
Emacs*XlwMenu.defineGlobalAbbrevFor.labelString:	????????????????????(%_D)
! Emacs*XlwMenu.defineModeSpecificAbbrevFor.labelString:	Define %_Mode-Specific Abbrev for 
Emacs*XlwMenu.defineModeSpecificAbbrevFor.labelString:		??????????????????????(%_M)
! Emacs*XlwMenu.defineGlobalEx_pansionFor.labelString:	Define Global Ex%_pansion for 
Emacs*XlwMenu.defineGlobalEx_pansionFor.labelString:	????????????????????(%_P)
! Emacs*XlwMenu.defineModeSpecificExpa_nsionFor.labelString:	Define Mode-Specific Expa%_nsion for 
Emacs*XlwMenu.defineModeSpecificExpa_nsionFor.labelString:	??????????????????????(%_N)
! Emacs*XlwMenu.e_xpandAbbrev.labelString:	E%_xpand Abbrev
Emacs*XlwMenu.e_xpandAbbrev.labelString:	??????????(%_X)
! Emacs*XlwMenu.expandAbbrevsInRe_gion.labelString:	Expand Abbrevs in Re%_gion
Emacs*XlwMenu.expandAbbrevsInRe_gion.labelString:	????????????????????????(%_G)
! Emacs*XlwMenu.unexpandLastAbbrev.labelString:	%_Unexpand Last Abbrev
Emacs*XlwMenu.unexpandLastAbbrev.labelString:	??????????????????????(%_U)
! Emacs*XlwMenu.killAllAbbrevs.labelString:	%_Kill All Abbrevs
Emacs*XlwMenu.killAllAbbrevs.labelString:	??????????????????(%_K)
! Emacs*XlwMenu.insertAllAbbrevsIntoBuffer.labelString:	%_Insert All Abbrevs into Buffer
Emacs*XlwMenu.insertAllAbbrevsIntoBuffer.labelString:	????????????????????????????(%_I)
! Emacs*XlwMenu.listAbbrevs.labelString:	%_List Abbrevs
Emacs*XlwMenu.listAbbrevs.labelString:		??????????(%_L)
! Emacs*XlwMenu.editAbbrevs.labelString:	%_Edit Abbrevs
Emacs*XlwMenu.editAbbrevs.labelString:		??????????(%_L)
! Emacs*XlwMenu.redefineAbbrevsFromBuffer.labelString:	%_Redefine Abbrevs from Buffer
Emacs*XlwMenu.redefineAbbrevsFromBuffer.labelString:	????????????????????????(%_R)
! Emacs*XlwMenu.saveAbbrevsAs___.labelString:	%_Save Abbrevs As...
Emacs*XlwMenu.saveAbbrevsAs___.labelString:	????????????????(%_S)...
! Emacs*XlwMenu.l_oadAbbrevs___.labelString:	L%_oad Abbrevs...
Emacs*XlwMenu.l_oadAbbrevs___.labelString:	??????????????(%_O)...
! Emacs*XlwMenu.copyToRegister___.labelString:	%_Copy to Register...
Emacs*XlwMenu.copyToRegister___.labelString:	????????????????(%_C)
! Emacs*XlwMenu.pasteRegister___.labelString:	%_Paste Register...
Emacs*XlwMenu.pasteRegister___.labelString:	????????????????????(%_P)
! Emacs*XlwMenu.savePointToRegister.labelString:	%_Save Point to Register
Emacs*XlwMenu.savePointToRegister.labelString:		????????????????????????(%_S)
! Emacs*XlwMenu.jumpToRegister.labelString:	%_Jump to Register
Emacs*XlwMenu.jumpToRegister.labelString:	??????????????(%_J)
! Emacs*XlwMenu.killRectangle.labelString:	%_Kill Rectangle
Emacs*XlwMenu.killRectangle.labelString:	??????????(%_K)
! Emacs*XlwMenu.yankRectangle.labelString:	%_Yank Rectangle
Emacs*XlwMenu.yankRectangle.labelString:	????????????(%_Y)
! Emacs*XlwMenu.rectangleToRegister.labelString:	Rectangle %_to Register
Emacs*XlwMenu.rectangleToRegister.labelString:		????????????????????(%_T)
! Emacs*XlwMenu.rectangleFromRegister.labelString:	Rectangle %_from Register
Emacs*XlwMenu.rectangleFromRegister.labelString:	??????????????????????(%_F)
! Emacs*XlwMenu.clearRectangle.labelString:	%_Clear Rectangle
Emacs*XlwMenu.clearRectangle.labelString:	????????????(%_C)
! Emacs*XlwMenu.openRectangle.labelString:	%_Open Rectangle
Emacs*XlwMenu.openRectangle.labelString:	??????????(%_O)
! Emacs*XlwMenu.prefixRectangle___.labelString:	%_Prefix Rectangle...
Emacs*XlwMenu.prefixRectangle___.labelString:	??????????????(%_P)...
! Emacs*XlwMenu.rectangleMousing.labelString:	Rectangle %_Mousing
Emacs*XlwMenu.rectangleMousing.labelString:	????????????(%_M)
! Emacs*XlwMenu.linesInRegion.labelString:	%_Lines in Region
Emacs*XlwMenu.linesInRegion.labelString:	??????????????????(%_L)
! Emacs*XlwMenu.paragraphsInRegion.labelString:	%_Paragraphs in Region
Emacs*XlwMenu.paragraphsInRegion.labelString:	????????????????????(%_P)
! Emacs*XlwMenu.p_agesInRegion.labelString:	P%_ages in Region
Emacs*XlwMenu.p_agesInRegion.labelString:	??????????????????????(%_A)
! Emacs*XlwMenu.columnsInRegion.labelString:	%_Columns in Region
Emacs*XlwMenu.columnsInRegion.labelString:	??????????????????????(%_C)
! Emacs*XlwMenu.regexp___.labelString:	%_Regexp...
Emacs*XlwMenu.regexp___.labelString:	????????(%_R)...
! Emacs*XlwMenu.upcaseRegion.labelString:	%_Upcase Region
Emacs*XlwMenu.upcaseRegion.labelString:		??????????????????????(%_U)
! Emacs*XlwMenu.downcaseRegion.labelString:	%_Downcase Region
Emacs*XlwMenu.downcaseRegion.labelString:	??????????????????????(%_D)
! Emacs*XlwMenu.capitalizeRegion.labelString:	%_Capitalize Region
Emacs*XlwMenu.capitalizeRegion.labelString:	????????????????????????????(%_C)
! Emacs*XlwMenu.titleCaseRegion.labelString:	%_Title-Case Region
Emacs*XlwMenu.titleCaseRegion.labelString:	????????????????????????????(%_T)
! Emacs*XlwMenu.line.labelString:	%_Line
Emacs*XlwMenu.line.labelString:		??????(%_L)
! Emacs*XlwMenu.paragraph.labelString:	%_Paragraph
Emacs*XlwMenu.paragraph.labelString:	????(%_P)
! Emacs*XlwMenu.region.labelString:	%_Region
Emacs*XlwMenu.region.labelString:	??????????(%_R)
! Emacs*XlwMenu.asPreviousLine.labelString:	%_As Previous Line
Emacs*XlwMenu.asPreviousLine.labelString:	????????(%_A)
! Emacs*XlwMenu.toColumn___.labelString:	%_To Column...
Emacs*XlwMenu.toColumn___.labelString:		????????????(%_T)...
! Emacs*XlwMenu.balancedExpression.labelString:	%_Balanced Expression
Emacs*XlwMenu.balancedExpression.labelString:	????????(%_B)
! Emacs*XlwMenu.cExpression.labelString:	%_C Expression
Emacs*XlwMenu.cExpression.labelString:		C??(%_C)
! Emacs*XlwMenu.buffer.labelString:	%_Buffer
Emacs*XlwMenu.buffer.labelString:	????????(%_B)
! Emacs*XlwMenu.word.labelString:	%_Word
Emacs*XlwMenu.word.labelString:		??????(%_W)
! Emacs*XlwMenu.completeWord.labelString:	%_Complete Word
Emacs*XlwMenu.completeWord.labelString:		??????????(%_C)
! Emacs*XlwMenu.addFootnote.labelString:	%_Add Footnote
Emacs*XlwMenu.addFootnote.labelString:		??????????(%_A)
! Emacs*XlwMenu.deleteFootnote.labelString:	%_Delete Footnote
Emacs*XlwMenu.deleteFootnote.labelString:	?????????? (%_D)
! Emacs*XlwMenu.gotoFootnote.labelString:	%_Goto Footnote
Emacs*XlwMenu.gotoFootnote.labelString:		??????????(%_G)
! Emacs*XlwMenu.backToMessage.labelString:	%_Back to Message
Emacs*XlwMenu.backToMessage.labelString:	????????????????(%_B)
! Emacs*XlwMenu.renumberFootnotes.labelString:	%_Renumber Footnotes
Emacs*XlwMenu.renumberFootnotes.labelString:	????????????(%_R)
! Emacs*XlwMenu.setFootnoteStyle.labelString:	%_Set Footnote Style
Emacs*XlwMenu.setFootnoteStyle.labelString:	??????????????????(%_S)
! Emacs*XlwMenu.cycleFootnoteStyle.labelString:	%_Cycle Footnote Style
Emacs*XlwMenu.cycleFootnoteStyle.labelString:	??????????????????????(%_C)
! Emacs*XlwMenu.packages.labelString:	%_Packages
Emacs*XlwMenu.packages.labelString:	??????????(%_P)
! Emacs*XlwMenu.internet.labelString:	%_Internet
Emacs*XlwMenu.internet.labelString:	??????????????(%_I)
! Emacs*XlwMenu.grep.labelString:	%_Grep
Emacs*XlwMenu.grep.labelString:		%_Grep
! Emacs*XlwMenu.compile.labelString:	%_Compile
Emacs*XlwMenu.compile.labelString:	??????????(%_C)
! Emacs*XlwMenu.debug.labelString:	%_Debug
Emacs*XlwMenu.debug.labelString:	????????(%_D)
! Emacs*XlwMenu.shell.labelString:	%_Shell
Emacs*XlwMenu.shell.labelString:	??????(%_S)
! Emacs*XlwMenu.tags.labelString:	%_Tags
Emacs*XlwMenu.tags.labelString:		????(%_T)
! Emacs*XlwMenu.ca_lendar.labelString:	Ca%_lendar
Emacs*XlwMenu.ca_lendar.labelString:	????????(%_L)
! Emacs*XlwMenu.ga_mes.labelString:	Ga%_mes
Emacs*XlwMenu.ga_mes.labelString:	??????(%_M)
! Emacs*XlwMenu.vC.labelString:	%_VC
Emacs*XlwMenu.vC.labelString:	%_VC
! Emacs*XlwMenu.compare.labelString:	%_Compare
Emacs*XlwMenu.compare.labelString:	????(%_C)
! Emacs*XlwMenu.merge.labelString:	%_Merge
Emacs*XlwMenu.merge.labelString:	??????(%_M)
! Emacs*XlwMenu.applyPatch.labelString:	%_Apply Patch
Emacs*XlwMenu.applyPatch.labelString:	????????????(%_A)
! Emacs*XlwMenu.ediffMiscellanea.labelString:	%_Ediff Miscellanea
Emacs*XlwMenu.ediffMiscellanea.labelString:	%_Ediff??????
! Emacs*XlwMenu.directorySearch.labelString:	%_Directory Search
Emacs*XlwMenu.directorySearch.labelString:	????????(%_D)
! Emacs*XlwMenu.pCLCVS.labelString:	%_PCL CVS
Emacs*XlwMenu.pCLCVS.labelString:	%_PCL CVS
! Emacs*XlwMenu.addDownloadSite.labelString:	%_Add Download Site
Emacs*XlwMenu.addDownloadSite.labelString:	????????????????????????(%_A)
! Emacs*XlwMenu.updatePackageIndex.labelString:	%_Update Package Index
Emacs*XlwMenu.updatePackageIndex.labelString:	??????????????????????????(%_U)
! Emacs*XlwMenu.listAndInstall.labelString:	%_List and Install
Emacs*XlwMenu.listAndInstall.labelString:	??????????????????????(%_L)
! Emacs*XlwMenu.u_pdateInstalledPackages.labelString:	U%_pdate Installed Packages
Emacs*XlwMenu.u_pdateInstalledPackages.labelString:	??????????????????????????????(%_P)
! Emacs*XlwMenu.usingCustom.labelString:	Using %_Custom
Emacs*XlwMenu.usingCustom.labelString:		??????????????(%_C)
! Emacs*XlwMenu.1PreReleases.labelString:	%_1 Pre-Releases
Emacs*XlwMenu.1PreReleases.labelString:		%_1 ????????????
! Emacs*XlwMenu.2Xemacs_org.labelString:	%_2 xemacs.org
Emacs*XlwMenu.2Xemacs_org.labelString:		%_2 xemacs.org
! Emacs*XlwMenu.3Crc_caCanada.labelString:	%_3 crc.ca (Canada)
Emacs*XlwMenu.3Crc_caCanada.labelString:	%_3 crc.ca (??????)
! Emacs*XlwMenu.4Ualberta_caCanada.labelString:	%_4 ualberta.ca (Canada)
Emacs*XlwMenu.4Ualberta_caCanada.labelString:	%_4 ualberta.ca (??????)
! Emacs*XlwMenu.5Uiuc_eduUnitedStates.labelString:	%_5 uiuc.edu (United States)
Emacs*XlwMenu.5Uiuc_eduUnitedStates.labelString:	%_5 uiuc.edu (??????)
! Emacs*XlwMenu.6Unc_eduUnitedStates.labelString:	%_6 unc.edu (United States)
Emacs*XlwMenu.6Unc_eduUnitedStates.labelString:		%_6 unc.edu (??????)
! Emacs*XlwMenu.7Utk_eduUnitedStates.labelString:	%_7 utk.edu (United States)
Emacs*XlwMenu.7Utk_eduUnitedStates.labelString:		%_7 utk.edu (??????)
! Emacs*XlwMenu.8Unicamp_brBrazil.labelString:	%_8 unicamp.br (Brazil)
Emacs*XlwMenu.8Unicamp_brBrazil.labelString:	%_8 unicamp.br (????????)
! Emacs*XlwMenu.9Tuwien_ac_atAustria.labelString:	%_9 tuwien.ac.at (Austria)
Emacs*XlwMenu.9Tuwien_ac_atAustria.labelString:		tuwien.ac.at (????????????)
! Emacs*XlwMenu.0Auc_dkDenmark.labelString:	%_0 auc.dk (Denmark)
Emacs*XlwMenu.0Auc_dkDenmark.labelString:	%_0 auc.dk (??????????)
! Emacs*XlwMenu.aDoc_ic_ac_ukEngland.labelString:	%_a doc.ic.ac.uk (England)
Emacs*XlwMenu.aDoc_ic_ac_ukEngland.labelString:		%_a doc.ic.ac.uk (????????)
! Emacs*XlwMenu.bFunet_fiFinland.labelString:	%_b funet.fi (Finland)
Emacs*XlwMenu.bFunet_fiFinland.labelString:	%_b funet.fi (????????????)
! Emacs*XlwMenu.cCenatls_cena_dgac_frFrance.labelString:	%_c cenatls.cena.dgac.fr (France)
Emacs*XlwMenu.cCenatls_cena_dgac_frFrance.labelString:	%_c cenatls.cena.dgac.fr (????????)
! Emacs*XlwMenu.dPasteur_frFrance.labelString:	%_d pasteur.fr (France)
Emacs*XlwMenu.dPasteur_frFrance.labelString:	%_d pasteur.fr (????????)
! Emacs*XlwMenu.eTuDarmstadt_deGermany.labelString:	%_e tu-darmstadt.de (Germany)
Emacs*XlwMenu.eTuDarmstadt_deGermany.labelString:	%_e tu-darmstadt.de (??????)
! Emacs*XlwMenu.fKfki_huHungary.labelString:	%_f kfki.hu (Hungary)
Emacs*XlwMenu.fKfki_huHungary.labelString:	%_f kfki.hu (??????????)
! Emacs*XlwMenu.gEunet_ieIreland.labelString:	%_g eunet.ie (Ireland)
Emacs*XlwMenu.gEunet_ieIreland.labelString:	%_g eunet.ie (????????????)
! Emacs*XlwMenu.hUniroma2_itItaly.labelString:	%_h uniroma2.it (Italy)
Emacs*XlwMenu.hUniroma2_itItaly.labelString:	%_h uniroma2.it (????????)
! Emacs*XlwMenu.iUio_noNorway.labelString:	%_i uio.no (Norway)
Emacs*XlwMenu.iUio_noNorway.labelString:	%_i uio.no (??????????)
! Emacs*XlwMenu.jIcm_edu_plPoland.labelString:	%_j icm.edu.pl (Poland)
Emacs*XlwMenu.jIcm_edu_plPoland.labelString:	%_j icm.edu.pl (??????????)
! Emacs*XlwMenu.kSrcc_msu_suRussia.labelString:	%_k srcc.msu.su (Russia)
Emacs*XlwMenu.kSrcc_msu_suRussia.labelString:	%_k srcc.msu.su (??????)
! Emacs*XlwMenu.lSunet_seSweden.labelString:	%_l sunet.se (Sweden)
Emacs*XlwMenu.lSunet_seSweden.labelString:	%_l sunet.se (????????????)
! Emacs*XlwMenu.mCnlabSwitch_chSwitzerland.labelString:	%_m cnlab-switch.ch (Switzerland)
Emacs*XlwMenu.mCnlabSwitch_chSwitzerland.labelString:	%_m cnlab-switch.ch (??????)
! Emacs*XlwMenu.nAist_go_jpJapan.labelString:	%_n aist.go.jp (Japan)
Emacs*XlwMenu.nAist_go_jpJapan.labelString:	%_n aist.go.jp (????)
! Emacs*XlwMenu.oAsahiNet_or_jpJapan.labelString:	%_o asahi-net.or.jp (Japan)
Emacs*XlwMenu.oAsahiNet_or_jpJapan.labelString:	%_o asahi-net.or.jp (????)
! Emacs*XlwMenu.pDti_ad_jpJapan.labelString:	%_p dti.ad.jp (Japan)
Emacs*XlwMenu.pDti_ad_jpJapan.labelString:	%_p dti.ad.jp (????)
! Emacs*XlwMenu.qJaist_ac_jpJapan.labelString:	%_q jaist.ac.jp (Japan)
Emacs*XlwMenu.qJaist_ac_jpJapan.labelString:	%_q jaist.ac.jp (????)
! Emacs*XlwMenu.rNucba_ac_jpJapan.labelString:	%_r nucba.ac.jp (Japan)
Emacs*XlwMenu.rNucba_ac_jpJapan.labelString:	%_r nucba.ac.jp (????)
! Emacs*XlwMenu.sSut_ac_jpJapan.labelString:	%_s sut.ac.jp (Japan)
Emacs*XlwMenu.sSut_ac_jpJapan.labelString:	%_s sut.ac.jp (????)
! Emacs*XlwMenu.tTsukuba_ac_jpJapan.labelString:	%_t tsukuba.ac.jp (Japan)
Emacs*XlwMenu.tTsukuba_ac_jpJapan.labelString:		%_t tsukuba.ac.jp (????)
! Emacs*XlwMenu.uKreonet_re_krKorea.labelString:	%_u kreonet.re.kr (Korea)
Emacs*XlwMenu.uKreonet_re_krKorea.labelString:		%_u kreonet.re.kr (????)
! Emacs*XlwMenu.vNctu_edu_twTaiwan.labelString:	%_v nctu.edu.tw (Taiwan)
Emacs*XlwMenu.vNctu_edu_twTaiwan.labelString:		%_v nctu.edu.tw (????)
! Emacs*XlwMenu.wSun_ac_zaSouthAfrica.labelString:	%_w sun.ac.za (South Africa)
Emacs*XlwMenu.wSun_ac_zaSouthAfrica.labelString:	%_w sun.ac.za (??????????)
! Emacs*XlwMenu.xIsu_net_saSaudiArabia.labelString:	%_x isu.net.sa (Saudi Arabia)
Emacs*XlwMenu.xIsu_net_saSaudiArabia.labelString:	%_x isu.net.sa (??????????????)
! Emacs*XlwMenu.yAarnet_edu_auAustralia.labelString:	%_y aarnet.edu.au (Australia)
Emacs*XlwMenu.yAarnet_edu_auAustralia.labelString:	%_y aarnet.edu.au (??????????????)
! Emacs*XlwMenu.pleaseLoadPackageIndex.labelString:	Please load Package Index
Emacs*XlwMenu.pleaseLoadPackageIndex.labelString:	????????????????????????????????????????
! Emacs*XlwMenu.readMail1VM___.labelString:	Read Mail %_1 (VM)...
Emacs*XlwMenu.readMail1VM___.labelString:	????????????(%_1)(VM)...
! Emacs*XlwMenu.readMail2MH___.labelString:	Read Mail %_2 (MH)...
Emacs*XlwMenu.readMail2MH___.labelString:	????????????(%_2)(MH)...
! Emacs*XlwMenu.sendMail___.labelString:	Send %_Mail...
Emacs*XlwMenu.sendMail___.labelString:		????????????(%_M)...
! Emacs*XlwMenu.usenetNews.labelString:	Usenet %_News
Emacs*XlwMenu.usenetNews.labelString:	Usenet????????(%_N)
! Emacs*XlwMenu.browseTheWeb.labelString:	Browse the %_Web
Emacs*XlwMenu.browseTheWeb.labelString:		????????????????(%_W)
! Emacs*XlwMenu.grep___.labelString:	%_Grep...
Emacs*XlwMenu.grep___.labelString:	%_Grep...
! Emacs*XlwMenu.killGrep.labelString:	%_Kill Grep
Emacs*XlwMenu.killGrep.labelString:	Grep??????(%_K)
! Emacs*XlwMenu.grepAllFilesInCurrentDirectory___.labelString:	Grep %_All Files in Current Directory...
Emacs*XlwMenu.grepAllFilesInCurrentDirectory___.labelString:	????????????????????????????????????????grep(%_A)
! Emacs*XlwMenu.grepCAndCHeaderFilesInCurrentDirectory___.labelString:	Grep %_C and C Header Files in Current Directory...
Emacs*XlwMenu.grepCAndCHeaderFilesInCurrentDirectory___.labelString:	??????????????????????C??C??????????????????grep(%_C)
! Emacs*XlwMenu.grepCHea_derFilesInCurrentDirectory___.labelString:	Grep C Hea%_der Files in Current Directory...
Emacs*XlwMenu.grepCHea_derFilesInCurrentDirectory___.labelString:	??????????????????????C????????????????grep(%_H)
! Emacs*XlwMenu.grepELispFilesInCurrentDirectory___.labelString:	Grep %_E-Lisp Files in Current Directory...
Emacs*XlwMenu.grepELispFilesInCurrentDirectory___.labelString:	??????????????????????E-Lisp??????????grep(%_E)
! Emacs*XlwMenu.grepPerlFilesInCurrentDirectory___.labelString:	Grep %_Perl Files in Current Directory...
Emacs*XlwMenu.grepPerlFilesInCurrentDirectory___.labelString:	??????????????????????Perl??????????grep(%_P)
! Emacs*XlwMenu.grepHTMLFilesInCurrentDirectory___.labelString:	Grep %_HTML Files in Current Directory...
Emacs*XlwMenu.grepHTMLFilesInCurrentDirectory___.labelString:	??????????????????????HTML??????????grep(%_H)
! Emacs*XlwMenu.nextMatch.labelString:	%_Next Match
Emacs*XlwMenu.nextMatch.labelString:	??????????(%_N)
! Emacs*XlwMenu.pre_viousMatch.labelString:	Pre%_vious Match
Emacs*XlwMenu.pre_viousMatch.labelString:	??????????(%_V)
! Emacs*XlwMenu.firstMatch.labelString:	%_First Match
Emacs*XlwMenu.firstMatch.labelString:	????????????(%_F)
! Emacs*XlwMenu.g_otoMatch.labelString:	G%_oto Match
Emacs*XlwMenu.g_otoMatch.labelString:	??????????(%_G)
! Emacs*XlwMenu.setGrepCommand___.labelString:	%_Set Grep Command...
Emacs*XlwMenu.setGrepCommand___.labelString:	grep??????????????(%_S)...
! Emacs*XlwMenu.compile___.labelString:	%_Compile...
Emacs*XlwMenu.compile___.labelString:	??????????(%_C)
! Emacs*XlwMenu.repeatCompilation.labelString:	%_Repeat Compilation
Emacs*XlwMenu.repeatCompilation.labelString:	????????????????????(%_R)
! Emacs*XlwMenu.killCompilation.labelString:	%_Kill Compilation
Emacs*XlwMenu.killCompilation.labelString:	????????????????????(%_K)
! Emacs*XlwMenu.nextError.labelString:	%_Next Error
Emacs*XlwMenu.nextError.labelString:	????????????(%_N)
! Emacs*XlwMenu.pre_viousError.labelString:	Pre%_vious Error
Emacs*XlwMenu.pre_viousError.labelString:	????????????(%_V)
! Emacs*XlwMenu.firstError.labelString:	%_First Error
Emacs*XlwMenu.firstError.labelString:	??????????????(%_F)
! Emacs*XlwMenu.g_otoError.labelString:	G%_oto Error
Emacs*XlwMenu.g_otoError.labelString:	????????????(%_O)
! Emacs*XlwMenu.gDB___.labelString:	%_GDB...
Emacs*XlwMenu.gDB___.labelString:	%_GDB...
! Emacs*XlwMenu.dBX___.labelString:	%_DBX...
Emacs*XlwMenu.dBX___.labelString:	%_DBX...
! Emacs*XlwMenu.s_hellCommand___.labelString:	S%_hell Command...
Emacs*XlwMenu.s_hellCommand___.labelString:	??????????????(%_H)...
! Emacs*XlwMenu.shellCommandOnRegion___.labelString:	Shell Command on %_Region...
Emacs*XlwMenu.shellCommandOnRegion___.labelString:	????????????????????????????????(%_R)
! Emacs*XlwMenu.findTag___.labelString:	%_Find Tag...
Emacs*XlwMenu.findTag___.labelString:	??????????(%_F)...
! Emacs*XlwMenu.findOtherWindow___.labelString:	Find %_Other Window...
Emacs*XlwMenu.findOtherWindow___.labelString:	????????????????????(%_O)
! Emacs*XlwMenu.nextTag___.labelString:	%_Next Tag...
Emacs*XlwMenu.nextTag___.labelString:	??????????(%_N)...
! Emacs*XlwMenu.n_extOtherWindow___.labelString:	N%_ext Other Window...
Emacs*XlwMenu.n_extOtherWindow___.labelString:	??????????????????????(%_E)...
! Emacs*XlwMenu.nextFile.labelString:	Next %_File
Emacs*XlwMenu.nextFile.labelString:	????????????(%_F)
! Emacs*XlwMenu.tagsSearch___.labelString:	Tags %_Search...
Emacs*XlwMenu.tagsSearch___.labelString:	????????(%_S)...
! Emacs*XlwMenu.tagsReplace___.labelString:	Tags %_Replace...
Emacs*XlwMenu.tagsReplace___.labelString:	????????(%_R)...
! Emacs*XlwMenu.continueSearchReplace.labelString:	%_Continue Search/Replace
Emacs*XlwMenu.continueSearchReplace.labelString:	????/????????????(%_C)
! Emacs*XlwMenu.popStack.labelString:	%_Pop stack
Emacs*XlwMenu.popStack.labelString:	??????????pop(%_P)
! Emacs*XlwMenu.apropos___.labelString:	%_Apropos...
Emacs*XlwMenu.apropos___.labelString:	%_Apropos...
! Emacs*XlwMenu.setTagsTableFile___.labelString:	%_Set Tags Table File...
Emacs*XlwMenu.setTagsTableFile___.labelString:	??????????????????????????(%_S)...
! Emacs*XlwMenu.3MonthCalendar.labelString:	%_3-Month Calendar
Emacs*XlwMenu.3MonthCalendar.labelString:	3????????????(%_3)
! Emacs*XlwMenu.diary.labelString:	%_Diary
Emacs*XlwMenu.diary.labelString:	????(%_D)
! Emacs*XlwMenu.holidays.labelString:	%_Holidays
Emacs*XlwMenu.holidays.labelString:	????(%_H)
! Emacs*XlwMenu.phasesOfTheMoon.labelString:	%_Phases of the Moon
Emacs*XlwMenu.phasesOfTheMoon.labelString:	????(%_P)
! Emacs*XlwMenu.sunriseSunset.labelString:	%_Sunrise/Sunset
Emacs*XlwMenu.sunriseSunset.labelString:	??????/??????(%_S)
! Emacs*XlwMenu.mineGame.labelString:	%_Mine Game
Emacs*XlwMenu.mineGame.labelString:	??????????(%_M)
! Emacs*XlwMenu.tetris.labelString:	%_Tetris
Emacs*XlwMenu.tetris.labelString:	????????(%_T)
! Emacs*XlwMenu.sokoban.labelString:	%_Sokoban
Emacs*XlwMenu.sokoban.labelString:	??????(%_S)
! Emacs*XlwMenu.quoteFromZippy.labelString:	Quote from %_Zippy
Emacs*XlwMenu.quoteFromZippy.labelString:	Zippy??????(%_Z)
! Emacs*XlwMenu.psychoanalyst.labelString:	%_Psychoanalyst
Emacs*XlwMenu.psychoanalyst.labelString:	XEmacs????????(%_P)
! Emacs*XlwMenu.ps_ychoanalyzeZippy.labelString:	Ps%_ychoanalyze Zippy!
Emacs*XlwMenu.ps_ychoanalyzeZippy.labelString:	Zippy??????????!(%_Y)
! Emacs*XlwMenu.randomFlames.labelString:	%_Random Flames
Emacs*XlwMenu.randomFlames.labelString:		????????????(%_R)
! Emacs*XlwMenu.dunnetAdventure.labelString:	%_Dunnet (Adventure)
Emacs*XlwMenu.dunnetAdventure.labelString:	Dunnet(??????????????)(%_D)
! Emacs*XlwMenu.towersOfHanoi.labelString:	Towers of %_Hanoi
Emacs*XlwMenu.towersOfHanoi.labelString:	??????????(%_H)
! Emacs*XlwMenu.gameOfLife.labelString:	Game of %_Life
Emacs*XlwMenu.gameOfLife.labelString:	????????????(%_L)
! Emacs*XlwMenu.m_ultiplicationPuzzle.labelString:	M%_ultiplication Puzzle
Emacs*XlwMenu.m_ultiplicationPuzzle.labelString:	????????????(%_U)
! Emacs*XlwMenu.loadVC.labelString:	%_Load VC
Emacs*XlwMenu.loadVC.labelString:	VC??????????(%_L)
! Emacs*XlwMenu.twoFiles___.labelString:	%_Two Files...
Emacs*XlwMenu.twoFiles___.labelString:		2????????(%_T)...
! Emacs*XlwMenu.twoBuffers___.labelString:	%_Two Buffers...
Emacs*XlwMenu.twoBuffers___.labelString:	2????????(%_T)...
! Emacs*XlwMenu.threeFiles___.labelString:	%_Three Files...
Emacs*XlwMenu.threeFiles___.labelString:	3????????(%_T)...
! Emacs*XlwMenu.threeBuffers___.labelString:	%_Three Buffers...
Emacs*XlwMenu.threeBuffers___.labelString:	3????????(%_T)...
! Emacs*XlwMenu.twoDirectories___.labelString:	%_Two Directories...
Emacs*XlwMenu.twoDirectories___.labelString:	2????????????(%_T)...
! Emacs*XlwMenu.threeDirectories___.labelString:	%_Three Directories...
Emacs*XlwMenu.threeDirectories___.labelString:	3????????????(%_T)...
! Emacs*XlwMenu.fileWithRevision___.labelString:	%_File with Revision...
Emacs*XlwMenu.fileWithRevision___.labelString:	??????????????????????(%_F)...
! Emacs*XlwMenu.directoryRevisions___.labelString:	%_Directory Revisions...
Emacs*XlwMenu.directoryRevisions___.labelString:	??????????????????????(%_D)...
! Emacs*XlwMenu.windowsWordByWord___.labelString:	%_Windows Word-by-word...
Emacs*XlwMenu.windowsWordByWord___.labelString:	??????????????????????(%_W)...
! Emacs*XlwMenu.windowsLineByLine___.labelString:	%_Windows Line-by-line...
Emacs*XlwMenu.windowsLineByLine___.labelString:	??????????????????(%_W)...
! Emacs*XlwMenu.regionsWordByWord___.labelString:	%_Regions Word-by-word...
Emacs*XlwMenu.regionsWordByWord___.labelString:	??????????????????????(%_R)...
! Emacs*XlwMenu.regionsLineByLine___.labelString:	%_Regions Line-by-line...
Emacs*XlwMenu.regionsLineByLine___.labelString:	??????????????????(%_R)...
! Emacs*XlwMenu.files___.labelString:	%_Files...
Emacs*XlwMenu.files___.labelString:	????????(%_F)...
! Emacs*XlwMenu.filesWithAncestor___.labelString:	%_Files with Ancestor...
Emacs*XlwMenu.filesWithAncestor___.labelString:	??????????????????(%_F)...
! Emacs*XlwMenu.buffers___.labelString:	%_Buffers...
Emacs*XlwMenu.buffers___.labelString:	????????(%_B)...
! Emacs*XlwMenu.buffersWithAncestor___.labelString:	%_Buffers with Ancestor...
Emacs*XlwMenu.buffersWithAncestor___.labelString:	??????????????????(%_B)...
! Emacs*XlwMenu.directories___.labelString:	%_Directories...
Emacs*XlwMenu.directories___.labelString:	????????????(%_D)...
! Emacs*XlwMenu.directoriesWithAncestor___.labelString:	%_Directories with Ancestor...
Emacs*XlwMenu.directoriesWithAncestor___.labelString:	??????????????????????(%_D)
! Emacs*XlwMenu.revisions___.labelString:	%_Revisions...
Emacs*XlwMenu.revisions___.labelString:	??????????(%_R)...
! Emacs*XlwMenu.revisionsWithAncestor___.labelString:	%_Revisions with Ancestor...
Emacs*XlwMenu.revisionsWithAncestor___.labelString:	????????????????????(%_R)...
! Emacs*XlwMenu.directoryRevisionsWithAncestor___.labelString:	%_Directory Revisions with Ancestor...
Emacs*XlwMenu.directoryRevisionsWithAncestor___.labelString:	????????????????????????????????(%_D)...
! Emacs*XlwMenu.toAFile___.labelString:	%_To a file...
Emacs*XlwMenu.toAFile___.labelString:	??????????????(%_T)...
! Emacs*XlwMenu.toABuffer___.labelString:	%_To a buffer...
Emacs*XlwMenu.toABuffer___.labelString:	??????????????(%_T)...
! Emacs*XlwMenu.ediffManual___.labelString:	%_Ediff Manual...
Emacs*XlwMenu.ediffManual___.labelString:	????????????ediff(%_E)...
! Emacs*XlwMenu.customizeEdiff___.labelString:	%_Customize Ediff...
Emacs*XlwMenu.customizeEdiff___.labelString:	ediff??????????????(%_C)...
! Emacs*XlwMenu.listEdiffSessions___.labelString:	%_List Ediff Sessions...
Emacs*XlwMenu.listEdiffSessions___.labelString:	ediff????????????????(%_L)...
! Emacs*XlwMenu.useSeparateFrameForEdiffControlBuffer___.labelString:	%_Use separate frame for Ediff control buffer...
Emacs*XlwMenu.useSeparateFrameForEdiffControlBuffer___.labelString:	ediff????????????????????????????????????????(%_U)...
! Emacs*XlwMenu.useAToolbarWithEdiffControlBuffer.labelString:	%_Use a toolbar with Ediff control buffer
Emacs*XlwMenu.useAToolbarWithEdiffControlBuffer.labelString:	ediff??????????????????????????????????????(%_U)
! Emacs*XlwMenu.loadHotlistOfServers.labelString:	%_Load Hotlist of Servers
Emacs*XlwMenu.loadHotlistOfServers.labelString:	??????????????????????????????(%_L)
! Emacs*XlwMenu.newServer.labelString:	%_New Server
Emacs*XlwMenu.newServer.labelString:	??????????(%_N)
! Emacs*XlwMenu.queryWithForm.labelString:	%_Query with Form
Emacs*XlwMenu.queryWithForm.labelString:	??????????????????(%_Q)
! Emacs*XlwMenu.expandInlineQuery.labelString:	%_Expand Inline Query
Emacs*XlwMenu.expandInlineQuery.labelString:	????????????????????????(%_E)
! Emacs*XlwMenu.getEmail.labelString:	%_Get Email
Emacs*XlwMenu.getEmail.labelString:	????????????????(%_G)
! Emacs*XlwMenu.getPhone.labelString:	%_Get Phone
Emacs*XlwMenu.getPhone.labelString:	??????????????(%_G)
! Emacs*XlwMenu.updateDirectory.labelString:	%_Update Directory
Emacs*XlwMenu.updateDirectory.labelString:	??????????????????(%_U)
! Emacs*XlwMenu.examineDirectory.labelString:	%_Examine Directory
Emacs*XlwMenu.examineDirectory.labelString:	??????????????????(%_E)
! Emacs*XlwMenu.statusDirectory.labelString:	%_Status Directory
Emacs*XlwMenu.statusDirectory.labelString:	??????????????????????(%_S)
! Emacs*XlwMenu.checkoutModule.labelString:	%_Checkout Module
Emacs*XlwMenu.checkoutModule.labelString:	??????????????????????????(%_C)
! Emacs*XlwMenu.advancedCustomize.labelString:	%_Advanced (Customize)
Emacs*XlwMenu.advancedCustomize.labelString:	????(????????????)(%_A)
! Emacs*XlwMenu.editing.labelString:	%_Editing
Emacs*XlwMenu.editing.labelString:	????(%_E)
! Emacs*XlwMenu.keyboardAndMouse.labelString:	%_Keyboard and Mouse
Emacs*XlwMenu.keyboardAndMouse.labelString:	??????????????????(%_K)
! Emacs*XlwMenu.printing.labelString:	%_Printing
Emacs*XlwMenu.printing.labelString:	????(%_P)
! Emacs*XlwMenu.troubleshooting.labelString:	%_Troubleshooting
Emacs*XlwMenu.troubleshooting.labelString:	??????????????????????(%_T)
! Emacs*XlwMenu.display.labelString:	%_Display
Emacs*XlwMenu.display.labelString:	????????????(%_D)
! Emacs*XlwMenu.menubars.labelString:	%_Menubars
Emacs*XlwMenu.menubars.labelString:	????????????(%_M)
! Emacs*XlwMenu.s_yntaxHighlighting.labelString:	S%_yntax Highlighting
Emacs*XlwMenu.s_yntaxHighlighting.labelString:	????????????????(%_Y)
! Emacs*XlwMenu.font.labelString:	%_Font
Emacs*XlwMenu.font.labelString:		????????(%_F)
! Emacs*XlwMenu.fontSi_ze.labelString:	Font Si%_ze
Emacs*XlwMenu.fontSi_ze.labelString:	??????????????(%_Z)
! Emacs*XlwMenu.editFa_ces___.labelString:	Edit Fa%_ces...
Emacs*XlwMenu.editFa_ces___.labelString:	??????????(%_C)...
! Emacs*XlwMenu.editI_nitFile.labelString:	Edit I%_nit File
Emacs*XlwMenu.editI_nitFile.labelString:	init??????????????(%_I)
! Emacs*XlwMenu.saveOptionsToInitFile.labelString:	%_Save Options to Init File
Emacs*XlwMenu.saveOptionsToInitFile.labelString:	????????????init??????????????(%_S)
! Emacs*XlwMenu.thisBufferReadOnly.labelString:	This Buffer %_Read Only
Emacs*XlwMenu.thisBufferReadOnly.labelString:	??????????????????????????(%_R)
! Emacs*XlwMenu.yankKillInteractWithClipboard.labelString:	%_Yank/Kill Interact With Clipboard
Emacs*XlwMenu.yankKillInteractWithClipboard.labelString:	??????????????????????/Kill??????
! Emacs*XlwMenu.overstrike.labelString:	%_Overstrike
Emacs*XlwMenu.overstrike.labelString:	????????(%_O)
! Emacs*XlwMenu.abbrevMode.labelString:	%_Abbrev Mode
Emacs*XlwMenu.abbrevMode.labelString:	??????????(%_A)
! Emacs*XlwMenu.activeRe_gions.labelString:	Active Re%_gions
Emacs*XlwMenu.activeRe_gions.labelString:	????????????????????????(%_G)
! Emacs*XlwMenu.caseSensitiveSearch.labelString:	%_Case Sensitive Search
Emacs*XlwMenu.caseSensitiveSearch.labelString:	??????/????????????????????(%_C)
! Emacs*XlwMenu.caseMatchingReplace.labelString:	Case %_Matching Replace
Emacs*XlwMenu.caseMatchingReplace.labelString:	??????/????????????????????(%_M)
! Emacs*XlwMenu.newlineAtEndOfFile___.labelString:	%_Newline at End of File...
Emacs*XlwMenu.newlineAtEndOfFile___.labelString:	????????????????????(%_N)
! Emacs*XlwMenu.addNewlineWhenMovingPastEnd.labelString:	Add Newline When Moving Past %_End
Emacs*XlwMenu.addNewlineWhenMovingPastEnd.labelString:	??????????????????????????(_E)
! Emacs*XlwMenu.donTRequire.labelString:	%_Don't Require
Emacs*XlwMenu.donTRequire.labelString:	????????????(%_D)
! Emacs*XlwMenu.require.labelString:	%_Require
Emacs*XlwMenu.require.labelString:	??????????(%_R)
! Emacs*XlwMenu.ask.labelString:	%_Ask
Emacs*XlwMenu.ask.labelString:		????????(%_A)
! Emacs*XlwMenu.deleteKeyDeletesSelection.labelString:	%_Delete Key Deletes Selection
Emacs*XlwMenu.deleteKeyDeletesSelection.labelString:	Delete????????????????????(%_D)
! Emacs*XlwMenu.killLineKillsWholeLineAtBeg.labelString:	`%_kill-line' Kills Whole Line at %_Beg
Emacs*XlwMenu.killLineKillsWholeLineAtBeg.labelString:	'kill-line'??????????????????????(%_B)
! Emacs*XlwMenu.sizeForBlockMovementCommands___.labelString:	Size for %_Block-Movement Commands...
Emacs*XlwMenu.sizeForBlockMovementCommands___.labelString:	????????????????????????????(%_B)
! Emacs*XlwMenu.vIEmulation.labelString:	%_VI Emulation
Emacs*XlwMenu.vIEmulation.labelString:	VI???????????????? (%_V)
! Emacs*XlwMenu.s_hiftedMotionKeysSelectRegion.labelString:	S%_hifted Motion Keys Select Region
Emacs*XlwMenu.s_hiftedMotionKeysSelectRegion.labelString:	????????????????????????????(%_H)
! Emacs*XlwMenu.afterShiftedMotionUnshiftedMotionKeysDeselect.labelString:	%_After Shifted Motion, Unshifted Motion Keys Deselect
Emacs*XlwMenu.afterShiftedMotionUnshiftedMotionKeysDeselect.labelString:	??????????????????????????????????????(%_A)
! Emacs*XlwMenu.setKey___.labelString:	%_Set Key...
Emacs*XlwMenu.setKey___.labelString:	??????????(%_S)...
! Emacs*XlwMenu.unsetKey___.labelString:	%_Unset Key...
Emacs*XlwMenu.unsetKey___.labelString:	??????????????(%_U)...
! Emacs*XlwMenu.mousePasteAtTextCursorNotClickedLocation.labelString:	%_Mouse Paste at Text Cursor (not Clicked Location)
Emacs*XlwMenu.mousePasteAtTextCursorNotClickedLocation.labelString:	??????????????????????????????????(????????????????????????)(%_M)
! Emacs*XlwMenu.teachExtendedCommands.labelString:	%_Teach Extended Commands
Emacs*XlwMenu.teachExtendedCommands.labelString:	????????????????????(%_T)
! Emacs*XlwMenu.setPrinterNameForGenericPrintSupport___.labelString:	Set Printer %_Name for Generic Print Support...
Emacs*XlwMenu.setPrinterNameForGenericPrintSupport___.labelString:	????????????????????????????????????????????????(%_N)
! Emacs*XlwMenu.commandLineSwitchesForLprLp___.labelString:	Command-Line %_Switches for `lpr'/`lp'...
Emacs*XlwMenu.commandLineSwitchesForLprLp___.labelString:	'lpr'/'lp'????????????????????????...
! Emacs*XlwMenu.prettyPrintPaperSize.labelString:	%_Pretty-Print Paper Size
Emacs*XlwMenu.prettyPrintPaperSize.labelString:	????????????????????(%_P)
! Emacs*XlwMenu.colorPrinting.labelString:	%_Color Printing
Emacs*XlwMenu.colorPrinting.labelString:	??????????(%_C)
! Emacs*XlwMenu.letter.labelString:	%_Letter
Emacs*XlwMenu.letter.labelString:	??????(%_L)
! Emacs*XlwMenu.lette_rSmall.labelString:	Lette%_r-Small
Emacs*XlwMenu.lette_rSmall.labelString:	????????(%_R)
! Emacs*XlwMenu.le_gal.labelString:	Le%_gal
Emacs*XlwMenu.le_gal.labelString:	????????(%_G)
! Emacs*XlwMenu.statement.labelString:	%_Statement
Emacs*XlwMenu.statement.labelString:	??????????????(%_S)
! Emacs*XlwMenu.executive.labelString:	%_Executive
Emacs*XlwMenu.executive.labelString:	??????????????(%_E)
! Emacs*XlwMenu.tabloid.labelString:	%_Tabloid
Emacs*XlwMenu.tabloid.labelString:	?????????? (%_T)
! Emacs*XlwMenu.le_dger.labelString:	Le%_dger
Emacs*XlwMenu.le_dger.labelString:	????(%_D)
! Emacs*XlwMenu.a_3.labelString:	A%_3
Emacs*XlwMenu.a_3.labelString:		A%_3
! Emacs*XlwMenu.a4.labelString:	%_A4
Emacs*XlwMenu.a4.labelString:	%_A4
! Emacs*XlwMenu.a4s_mall.labelString:	A4s%_mall
Emacs*XlwMenu.a4s_mall.labelString:	A4??(%_M)
! Emacs*XlwMenu.b_4.labelString:	B%_4
Emacs*XlwMenu.b_4.labelString:		B%_4
! Emacs*XlwMenu.b5.labelString:	%_B5
Emacs*XlwMenu.b5.labelString:	%_B5
! Emacs*XlwMenu.composeMailWith.labelString:	%_Compose Mail With
Emacs*XlwMenu.composeMailWith.labelString:	??????????????????(%_C)
! Emacs*XlwMenu.setMyEmailAddress___.labelString:	Set My %_Email Address...
Emacs*XlwMenu.setMyEmailAddress___.labelString:	????????????????????????(%_E)...
! Emacs*XlwMenu.setMachineEmailName___.labelString:	Set %_Machine Email Name...
Emacs*XlwMenu.setMachineEmailName___.labelString:	??????????????????????????(%_M)
! Emacs*XlwMenu.setSMTPServer___.labelString:	Set %_SMTP Server...
Emacs*XlwMenu.setSMTPServer___.labelString:	SMTP????????????(%_S)...
! Emacs*XlwMenu.sMTPDebugInfo.labelString:	SMTP %_Debug Info
Emacs*XlwMenu.sMTPDebugInfo.labelString:	SMTP????????????(%_D)...
! Emacs*XlwMenu.openURLsWith.labelString:	%_Open URLs With
Emacs*XlwMenu.openURLsWith.labelString:		URL????????????(%_O)
! Emacs*XlwMenu.defaultEmacsMailer.labelString:	%_Default Emacs Mailer
Emacs*XlwMenu.defaultEmacsMailer.labelString:	??????????Emacs??????(%_D)
! Emacs*XlwMenu.mH.labelString:	%_MH
Emacs*XlwMenu.mH.labelString:	%_MH
! Emacs*XlwMenu.gNUS.labelString:	%_GNUS
Emacs*XlwMenu.gNUS.labelString:	%_GNUS
! Emacs*XlwMenu.emacsW3.labelString:	%_Emacs-W3
Emacs*XlwMenu.emacsW3.labelString:	%_Emacs-W3
! Emacs*XlwMenu.netscape.labelString:	%_Netscape
Emacs*XlwMenu.netscape.labelString:	%_Netscape
! Emacs*XlwMenu.mosaic.labelString:	%_Mosaic
Emacs*XlwMenu.mosaic.labelString:	%_Mosaic
! Emacs*XlwMenu.mosaicCCI.labelString:	Mosaic (%_CCI)
Emacs*XlwMenu.mosaicCCI.labelString:	Mosaic (%_CCI)
! Emacs*XlwMenu.iXIMosaic.labelString:	%_IXI Mosaic
Emacs*XlwMenu.iXIMosaic.labelString:	%_IXI Mosaic
! Emacs*XlwMenu.lynxXterm.labelString:	%_Lynx (xterm)
Emacs*XlwMenu.lynxXterm.labelString:	%_Lynx (xterm)
! Emacs*XlwMenu.l_ynxXemacs.labelString:	L%_ynx (xemacs)
Emacs*XlwMenu.l_ynxXemacs.labelString:	L%_ynx (xemacs)
! Emacs*XlwMenu.grail.labelString:	%_Grail
Emacs*XlwMenu.grail.labelString:	%_Grail
! Emacs*XlwMenu.kfm.labelString:	%_Kfm
Emacs*XlwMenu.kfm.labelString:		%_Kfm
! Emacs*XlwMenu.debugOnError.labelString:	%_Debug on Error
Emacs*XlwMenu.debugOnError.labelString:	????????????????(%_D)
! Emacs*XlwMenu.debugOnQuit.labelString:	Debug on %_Quit
Emacs*XlwMenu.debugOnQuit.labelString:	??????????????(%_Q)
! Emacs*XlwMenu.debugOnS_ignal.labelString:	Debug on S%_ignal
Emacs*XlwMenu.debugOnS_ignal.labelString:	??????????????????(%_I)
! Emacs*XlwMenu.stackTraceOnError.labelString:	%_Stack Trace on Error
Emacs*XlwMenu.stackTraceOnError.labelString:	????????????????????????(%_S)
! Emacs*XlwMenu.stackTraceOnSi_gnal.labelString:	Stack Trace on Si%_gnal
Emacs*XlwMenu.stackTraceOnSi_gnal.labelString:	??????????????????????????(%_G)
! Emacs*XlwMenu.scrollbars.labelString:	%_Scrollbars
Emacs*XlwMenu.scrollbars.labelString:	??????????????(%_S)
! Emacs*XlwMenu.wrapLongLines.labelString:	%_Wrap Long Lines
Emacs*XlwMenu.wrapLongLines.labelString:	????????????????(%_W)
! Emacs*XlwMenu.3DModeline.labelString:	%_3D Modeline
Emacs*XlwMenu.3DModeline.labelString:	3D????????????(%_3)
! Emacs*XlwMenu.modelineHorizontalScrolling.labelString:	Modeline %_Horizontal Scrolling
Emacs*XlwMenu.modelineHorizontalScrolling.labelString:	????????????????????????????(%_H)
! Emacs*XlwMenu.toolbarsVisible.labelString:	%_Toolbars Visible
Emacs*XlwMenu.toolbarsVisible.labelString:	????????????????(%_T)
! Emacs*XlwMenu.toolbarsCa_ptioned.labelString:	Toolbars Ca%_ptioned
Emacs*XlwMenu.toolbarsCa_ptioned.labelString:	????????????????????????????(%_P)
! Emacs*XlwMenu.defaultToolba_rLocation.labelString:	Default Toolba%_r Location
Emacs*XlwMenu.defaultToolba_rLocation.labelString:	??????????????????????????(%_R)
! Emacs*XlwMenu.b_uffersTabVisible.labelString:	B%_uffers Tab Visible
Emacs*XlwMenu.b_uffersTabVisible.labelString:	??????????????????(%_U)
! Emacs*XlwMenu.defaultGutterLocation.labelString:	Default %_Gutter Location
Emacs*XlwMenu.defaultGutterLocation.labelString:	??????????????????????(%_G)
! Emacs*XlwMenu.blinkingCursor.labelString:	%_Blinking Cursor
Emacs*XlwMenu.blinkingCursor.labelString:	??????????????(%_B)
! Emacs*XlwMenu.bl_ockCursor.labelString:	Bl%_ock Cursor
Emacs*XlwMenu.bl_ockCursor.labelString:	????????????????(%_O)
! Emacs*XlwMenu.barCursor1Pixel.labelString:	Bar Cursor (%_1 Pixel)
Emacs*XlwMenu.barCursor1Pixel.labelString:	????????????(%_1????????)
! Emacs*XlwMenu.barCursor2Pixels.labelString:	Bar Cursor (%_2 Pixels)
Emacs*XlwMenu.barCursor2Pixels.labelString:	????????????(%_2????????)
! Emacs*XlwMenu.pa_renHighlighting.labelString:	Pa%_ren Highlighting
Emacs*XlwMenu.pa_renHighlighting.labelString:	??????????????(%_R)
! Emacs*XlwMenu.lineNumbers.labelString:	%_Line Numbers
Emacs*XlwMenu.lineNumbers.labelString:		??????(%_L)
! Emacs*XlwMenu.columnNumbers.labelString:	%_Column Numbers
Emacs*XlwMenu.columnNumbers.labelString:	??????????(%_C)
! Emacs*XlwMenu.otherWindowLocation.labelString:	"Other %_Window" Location
Emacs*XlwMenu.otherWindowLocation.labelString:	"??????????????"????(%_W)
! Emacs*XlwMenu.none.labelString:	%_None
Emacs*XlwMenu.none.labelString:	????(%_N)
! Emacs*XlwMenu.asText.labelString:	As %_Text
Emacs*XlwMenu.asText.labelString:	??????????????(%_T)
! Emacs*XlwMenu.asScrollbar.labelString:	As %_Scrollbar
Emacs*XlwMenu.asScrollbar.labelString:	????????????????????(%_S)
! Emacs*XlwMenu.top.labelString:	%_Top
Emacs*XlwMenu.top.labelString:	??(%_T)
! Emacs*XlwMenu.bottom.labelString:	%_Bottom
Emacs*XlwMenu.bottom.labelString:	??(%_B)
! Emacs*XlwMenu.left.labelString:	%_Left
Emacs*XlwMenu.left.labelString:		??(%_L)
! Emacs*XlwMenu.right.labelString:	%_Right
Emacs*XlwMenu.right.labelString:	??(%_R)
! Emacs*XlwMenu.blinkingParen.labelString:	%_Blinking Paren
Emacs*XlwMenu.blinkingParen.labelString:	??????????(%_B)
! Emacs*XlwMenu.steadyParen.labelString:	%_Steady Paren
Emacs*XlwMenu.steadyParen.labelString:		????????????????(%_S)
! Emacs*XlwMenu.expression.labelString:	%_Expression
Emacs*XlwMenu.expression.labelString:	??(%_E)
! Emacs*XlwMenu.alwaysInSameFrame.labelString:	%_Always in Same Frame
Emacs*XlwMenu.alwaysInSameFrame.labelString:	??????????????????(%_A)
! Emacs*XlwMenu.otherFrame2FramesMax.labelString:	Other Frame (%_2 Frames Max)
Emacs*XlwMenu.otherFrame2FramesMax.labelString:	????????????(????%_2????????)
! Emacs*XlwMenu.otherFrame3FramesMax.labelString:	Other Frame (%_3 Frames Max)
Emacs*XlwMenu.otherFrame3FramesMax.labelString:	????????????(????%_3????????)
! Emacs*XlwMenu.otherFrame4FramesMax.labelString:	Other Frame (%_4 Frames Max)
Emacs*XlwMenu.otherFrame4FramesMax.labelString:	????????????(????%_4????????)
! Emacs*XlwMenu.otherFrame5FramesMax.labelString:	Other Frame (%_5 Frames Max)
Emacs*XlwMenu.otherFrame5FramesMax.labelString:	????????????(????(%_5????????)
! Emacs*XlwMenu.alwaysCreateNewFrame.labelString:	Always Create %_New Frame
Emacs*XlwMenu.alwaysCreateNewFrame.labelString:	??????????????????????
! Emacs*XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	%_Temp Buffers Always in Same Frame
Emacs*XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	????????????????????????????????(%_T)
! Emacs*XlwMenu.tempBuffersLikeOtherBuffers.labelString:	Temp Buffers %_Like Other Buffers
Emacs*XlwMenu.tempBuffersLikeOtherBuffers.labelString:	??????????????????????????????????????????(%_L)
! Emacs*XlwMenu.makeCurrentFrameGnuservTarget.labelString:	%_Make Current Frame Gnuserv Target
Emacs*XlwMenu.makeCurrentFrameGnuservTarget.labelString:	????????????????Gnuserv????????????(%_M)
! Emacs*XlwMenu.frameLocalFontMenu.labelString:	%_Frame-Local Font Menu
Emacs*XlwMenu.frameLocalFontMenu.labelString:	??????????????????????????????????(%_F)
! Emacs*XlwMenu.altMetaSelectsMenuItems.labelString:	%_Alt/Meta Selects Menu Items
Emacs*XlwMenu.altMetaSelectsMenuItems.labelString:	Alt/Meta????????????????????????(%_A)
! Emacs*XlwMenu.buffersMenuLength___.labelString:	Buffers Menu %_Length...
Emacs*XlwMenu.buffersMenuLength___.labelString:		??????????????????????(%_L)...
! Emacs*XlwMenu.multiOperationBuffersSubMenus.labelString:	%_Multi-Operation Buffers Sub-Menus
Emacs*XlwMenu.multiOperationBuffersSubMenus.labelString:	????????????????????????????????????????(%_M)
! Emacs*XlwMenu.s_ubmenusForBufferGroups.labelString:	S%_ubmenus for Buffer Groups
Emacs*XlwMenu.s_ubmenusForBufferGroups.labelString:	??????????????????????????????(%_U)
! Emacs*XlwMenu.verboseBufferMenuEntries.labelString:	%_Verbose Buffer Menu Entries
Emacs*XlwMenu.verboseBufferMenuEntries.labelString:	????????????????????????????(%_V)
! Emacs*XlwMenu.buffersMenuSorting.labelString:	Buffers Menu %_Sorting
Emacs*XlwMenu.buffersMenuSorting.labelString:	????????????????????????(%_S)
! Emacs*XlwMenu.ignoreScaledFonts.labelString:	%_Ignore Scaled Fonts
Emacs*XlwMenu.ignoreScaledFonts.labelString:	??????????????????(%_I)
! Emacs*XlwMenu.inThisBuffer.labelString:	%_In This Buffer
Emacs*XlwMenu.inThisBuffer.labelString:	????????????(%_I)
! Emacs*XlwMenu.automatic.labelString:	%_Automatic
Emacs*XlwMenu.automatic.labelString:	????(%_A)
! Emacs*XlwMenu.forceRehighlightInThisBuffer.labelString:	Force %_Rehighlight in this Buffer
Emacs*XlwMenu.forceRehighlightInThisBuffer.labelString:	????????????????????????
! Emacs*XlwMenu.fonts.labelString:	%_Fonts
Emacs*XlwMenu.fonts.labelString:	????????(%_F)
! Emacs*XlwMenu.colors.labelString:	%_Colors
Emacs*XlwMenu.colors.labelString:	??????(%_C)
! Emacs*XlwMenu.1Least.labelString:	%_1 Least
Emacs*XlwMenu.1Least.labelString:	%_1 ????
! Emacs*XlwMenu.2More.labelString:	%_2 More
Emacs*XlwMenu.2More.labelString:	%_2 ??????????
! Emacs*XlwMenu.3EvenMore.labelString:	%_3 Even More
Emacs*XlwMenu.3EvenMore.labelString:	%_3 ??????
! Emacs*XlwMenu.4Most.labelString:	%_4 Most
Emacs*XlwMenu.4Most.labelString:	%_4 ????
! Emacs*XlwMenu.lazyLock.labelString:	Lazy %_Lock
Emacs*XlwMenu.lazyLock.labelString:	??????????????(%_L)
! Emacs*XlwMenu.lazyShot.labelString:	Lazy %_Shot
Emacs*XlwMenu.lazyShot.labelString:	????????????????(%_S)
! Emacs*XlwMenu.cac_hing.labelString:	Cac%_hing
Emacs*XlwMenu.cac_hing.labelString:	????????????(%_H)
! Emacs*XlwMenu.1Anagnostiko___Avantgarde.labelString:	%_1 Anagnostiko  ... Avantgarde
Emacs*XlwMenu.1Anagnostiko___Avantgarde.labelString:	%_1 Anagnostiko  ... Avantgarde
! Emacs*XlwMenu.2Bookman___Chimera.labelString:	%_2 Bookman      ... Chimera
Emacs*XlwMenu.2Bookman___Chimera.labelString:	%_2 Bookman      ... Chimera
! Emacs*XlwMenu.3Courier___Helvetica.labelString:	%_3 Courier      ... Helvetica
Emacs*XlwMenu.3Courier___Helvetica.labelString:	%_3 Courier      ... Helvetica
! Emacs*XlwMenu.4Kathimerini___LuxiSans.labelString:	%_4 Kathimerini  ... Luxi Sans
Emacs*XlwMenu.4Kathimerini___LuxiSans.labelString:	%_4 Kathimerini  ... Luxi Sans
! Emacs*XlwMenu.5LuxiSerif___Palatino.labelString:	%_5 Luxi Serif   ... Palatino
Emacs*XlwMenu.5LuxiSerif___Palatino.labelString:	%_5 Luxi Serif   ... Palatino
! Emacs*XlwMenu.6PalladioL___Zysong18030.labelString:	%_6 Palladio L   ... Zysong18030
Emacs*XlwMenu.6PalladioL___Zysong18030.labelString:	%_6 Palladio L   ... Zysong18030
! Emacs*XlwMenu.15.labelString:	%_1 5
Emacs*XlwMenu.15.labelString:	%_1 5
! Emacs*XlwMenu.26.labelString:	%_2 6
Emacs*XlwMenu.26.labelString:	%_2 6
! Emacs*XlwMenu.37.labelString:	%_3 7
Emacs*XlwMenu.37.labelString:	%_3 7
! Emacs*XlwMenu.48.labelString:	%_4 8
Emacs*XlwMenu.48.labelString:	%_4 8
! Emacs*XlwMenu.59.labelString:	%_5 9
Emacs*XlwMenu.59.labelString:	%_5 9
! Emacs*XlwMenu.610.labelString:	%_6 10
Emacs*XlwMenu.610.labelString:	%_6 10
! Emacs*XlwMenu.711.labelString:	%_7 11
Emacs*XlwMenu.711.labelString:	%_7 11
! Emacs*XlwMenu.812.labelString:	%_8 12
Emacs*XlwMenu.812.labelString:	%_8 12
! Emacs*XlwMenu.913.labelString:	%_9 13
Emacs*XlwMenu.913.labelString:	%_9 13
! Emacs*XlwMenu.014.labelString:	%_0 14
Emacs*XlwMenu.014.labelString:	%_0 14
! Emacs*XlwMenu.a15.labelString:	%_a 15
Emacs*XlwMenu.a15.labelString:	%_a 15
! Emacs*XlwMenu.b16.labelString:	%_b 16
Emacs*XlwMenu.b16.labelString:	%_b 16
! Emacs*XlwMenu.c17.labelString:	%_c 17
Emacs*XlwMenu.c17.labelString:	%_c 17
! Emacs*XlwMenu.d18.labelString:	%_d 18
Emacs*XlwMenu.d18.labelString:	%_d 18
! Emacs*XlwMenu.e19.labelString:	%_e 19
Emacs*XlwMenu.e19.labelString:	%_e 19
! Emacs*XlwMenu.f20.labelString:	%_f 20
Emacs*XlwMenu.f20.labelString:	%_f 20
! Emacs*XlwMenu.g23.labelString:	%_g 23
Emacs*XlwMenu.g23.labelString:	%_g 23
! Emacs*XlwMenu.h24.labelString:	%_h 24
Emacs*XlwMenu.h24.labelString:	%_h 24
! Emacs*XlwMenu.goToPreviousBuffer.labelString:	Go To %_Previous Buffer
Emacs*XlwMenu.goToPreviousBuffer.labelString:	??????????????????(%_P)
! Emacs*XlwMenu.goToBuffer___.labelString:	Go To %_Buffer...
Emacs*XlwMenu.goToBuffer___.labelString:	??????????????(%_B)...
! Emacs*XlwMenu.listAllBuffers.labelString:	%_List All Buffers
Emacs*XlwMenu.listAllBuffers.labelString:	??????????????????????????(%_L)
! Emacs*XlwMenu.deleteBuffer.labelString:	%_Delete Buffer
Emacs*XlwMenu.deleteBuffer.labelString:	??????????????(%_D)
! Emacs*XlwMenu..labelString:	%_
Emacs*XlwMenu..labelString:	%_
! Emacs*XlwMenu.evaluateRegionOrDefun.labelString:	%_Evaluate Region or Defun
Emacs*XlwMenu.evaluateRegionOrDefun.labelString:	????????????defun??????(%_E)
! Emacs*XlwMenu.evaluateWholeBuffer.labelString:	Evaluate %_Whole Buffer
Emacs*XlwMenu.evaluateWholeBuffer.labelString:		??????????????????(%_W)
! Emacs*XlwMenu.evaluateLastSExpression.labelString:	Evaluate Last %_S-expression
Emacs*XlwMenu.evaluateLastSExpression.labelString:	??????S????????(%_S)
! Emacs*XlwMenu.findFunction___.labelString:	Find %_Function...
Emacs*XlwMenu.findFunction___.labelString:	??????????(%_F)...
! Emacs*XlwMenu.findVariable___.labelString:	Find %_Variable...
Emacs*XlwMenu.findVariable___.labelString:	??????????(%_V)...
! Emacs*XlwMenu.helpOnFunction___.labelString:	%_Help on Function...
Emacs*XlwMenu.helpOnFunction___.labelString:	????????????????(%_H)...
! Emacs*XlwMenu.hel_pOnVariable___.labelString:	Hel%_p on Variable...
Emacs*XlwMenu.hel_pOnVariable___.labelString:	????????????????(%_P)...
! Emacs*XlwMenu.instrumentThisDefunForDebugging.labelString:	Instrument This Defun for %_Debugging
Emacs*XlwMenu.instrumentThisDefunForDebugging.labelString:	????defun????????????????(%_D)
! Emacs*XlwMenu.traceFunction___.labelString:	%_Trace Function...
Emacs*XlwMenu.traceFunction___.labelString:	??????????????(%_T)...
! Emacs*XlwMenu.untraceAllFunctions.labelString:	%_Untrace All Functions
Emacs*XlwMenu.untraceAllFunctions.labelString:	??????????????????????????????(%_U)
! Emacs*XlwMenu.commentOutRegion.labelString:	%_Comment Out Region
Emacs*XlwMenu.commentOutRegion.labelString:	??????????????????????????(%_C)
! Emacs*XlwMenu.indentRegionOrBalancedExpression.labelString:	%_Indent Region or Balanced Expression
Emacs*XlwMenu.indentRegionOrBalancedExpression.labelString:	??????????????????????(%_I)
! Emacs*XlwMenu.i_ndentDefun.labelString:	I%_ndent Defun
Emacs*XlwMenu.i_ndentDefun.labelString:	defun????????????(%_N)
! Emacs*XlwMenu.lookForDebugOnErrorUnderOptionsTroubleshooting.labelString:	Look for debug-on-error under Options->Troubleshooting
Emacs*XlwMenu.lookForDebugOnErrorUnderOptionsTroubleshooting.labelString:	[??????????]-[??????????????????????]??[????????????????]??????????????????
! Emacs*XlwMenu.aboutXEmacs___.labelString:	%_About XEmacs...
Emacs*XlwMenu.aboutXEmacs___.labelString:	XEmacs????????(%_A)...
! Emacs*XlwMenu.whatSNewInXEmacs.labelString:	What's %_New in XEmacs
Emacs*XlwMenu.whatSNewInXEmacs.labelString:	XEmacs????????(%_N)
! Emacs*XlwMenu.obtainingXEmacs.labelString:	%_Obtaining XEmacs
Emacs*XlwMenu.obtainingXEmacs.labelString:	XEmacs??????????????(%_O)
! Emacs*XlwMenu.infoOnlineDocs.labelString:	%_Info (Online Docs)
Emacs*XlwMenu.infoOnlineDocs.labelString:	%_Info (??????????doc)
! Emacs*XlwMenu.xEmacsFAQ.labelString:	XEmacs %_FAQ
Emacs*XlwMenu.xEmacsFAQ.labelString:	XEmacs %_FAQ
! Emacs*XlwMenu.tutorials.labelString:	%_Tutorials
Emacs*XlwMenu.tutorials.labelString:	??????????????(%_T)
! Emacs*XlwMenu.samples.labelString:	%_Samples
Emacs*XlwMenu.samples.labelString:	????????(%_S)
! Emacs*XlwMenu.commandsKeys.labelString:	%_Commands & Keys
Emacs*XlwMenu.commandsKeys.labelString:	??????????????(%_C)
! Emacs*XlwMenu.recentMessages.labelString:	%_Recent Messages
Emacs*XlwMenu.recentMessages.labelString:	????????????????(%_R)
! Emacs*XlwMenu.misc.labelString:	%_Misc
Emacs*XlwMenu.misc.labelString:	??????(%_M)
! Emacs*XlwMenu.sendBugReport___.labelString:	Send %_Bug Report...
Emacs*XlwMenu.sendBugReport___.labelString:	??????????????????(%_B)...
! Emacs*XlwMenu.infoContents.labelString:	%_Info Contents
Emacs*XlwMenu.infoContents.labelString:	Info??????????(%_I)
! Emacs*XlwMenu.lookupKeyBinding___.labelString:	Lookup %_Key Binding...
Emacs*XlwMenu.lookupKeyBinding___.labelString:	??????????????????????(%_K)...
! Emacs*XlwMenu.lookupCommand___.labelString:	Lookup %_Command...
Emacs*XlwMenu.lookupCommand___.labelString:	????????????(%_C)...
! Emacs*XlwMenu.lookupFunction___.labelString:	Lookup %_Function...
Emacs*XlwMenu.lookupFunction___.labelString:	????????(%_F)...
! Emacs*XlwMenu.lookupTopic___.labelString:	Lookup %_Topic...
Emacs*XlwMenu.lookupTopic___.labelString:	????????????(%_T)...
! Emacs*XlwMenu.fAQLocal.labelString:	%_FAQ (local)
Emacs*XlwMenu.fAQLocal.labelString:	%_FAQ (????????)
! Emacs*XlwMenu.fAQViaWWW.labelString:	FAQ via %_WWW
Emacs*XlwMenu.fAQViaWWW.labelString:	WWW????FAQ(%_W)
! Emacs*XlwMenu.homePage.labelString:	%_Home Page
Emacs*XlwMenu.homePage.labelString:	????????????(%_H)
! Emacs*XlwMenu.defaultJapanese.labelString:	%_Default (Japanese)
Emacs*XlwMenu.defaultJapanese.labelString:	??????????(%_D) (??????)
! Emacs*XlwMenu.1ThaiXTIS.labelString:	%_1 Thai-XTIS
Emacs*XlwMenu.1ThaiXTIS.labelString:	%_1 ??????-XTIS
! Emacs*XlwMenu.2Korean.labelString:	%_2 Korean
Emacs*XlwMenu.2Korean.labelString:	%_2 ??????
! Emacs*XlwMenu.3Slovenian.labelString:	%_3 Slovenian
Emacs*XlwMenu.3Slovenian.labelString:	%_3 ????????????
! Emacs*XlwMenu.4German.labelString:	%_4 German
Emacs*XlwMenu.4German.labelString:	%_4 ????????
! Emacs*XlwMenu.5Czech.labelString:	%_5 Czech
Emacs*XlwMenu.5Czech.labelString:	%_5 ????????
! Emacs*XlwMenu.6Romanian.labelString:	%_6 Romanian
Emacs*XlwMenu.6Romanian.labelString:	%_6 ????????????
! Emacs*XlwMenu.7Polish.labelString:	%_7 Polish
Emacs*XlwMenu.7Polish.labelString:	%_7 ????????????
! Emacs*XlwMenu.8Croatian.labelString:	%_8 Croatian
Emacs*XlwMenu.8Croatian.labelString:	%_8 ????????????
! Emacs*XlwMenu.9Norwegian.labelString:	%_9 Norwegian
Emacs*XlwMenu.9Norwegian.labelString:	%_9 ????????????
! Emacs*XlwMenu.0French.labelString:	%_0 French
Emacs*XlwMenu.0French.labelString:	%_0 ??????????
! Emacs*XlwMenu.aEnglish.labelString:	%_a English
Emacs*XlwMenu.aEnglish.labelString:	%_a ????
! Emacs*XlwMenu.bCyrillicALT.labelString:	%_b Cyrillic-ALT
Emacs*XlwMenu.bCyrillicALT.labelString:	%_b ??????????-ALT
! Emacs*XlwMenu.cCyrillicWin.labelString:	%_c Cyrillic-Win
Emacs*XlwMenu.cCyrillicWin.labelString: %_c ??????????-Win
! Emacs*XlwMenu.dCyrillicKOI8.labelString:	%_d Cyrillic-KOI8
Emacs*XlwMenu.dCyrillicKOI8.labelString: %_d ??????????-KOI8
! Emacs*XlwMenu.eCyrillicISO.labelString:	%_e Cyrillic-ISO
Emacs*XlwMenu.eCyrillicISO.labelString: %_d ??????????-ISO
! Emacs*XlwMenu.sampleInit_el.labelString:	Sample %_init.el
Emacs*XlwMenu.sampleInit_el.labelString:	????????init.el(%_I)
! Emacs*XlwMenu.sample__Xdefaults.labelString:	Sample .%_Xdefaults
Emacs*XlwMenu.sample__Xdefaults.labelString:	????????.Xdefaults(%_X)
! Emacs*XlwMenu.sampleEnriched.labelString:	Sample %_enriched
Emacs*XlwMenu.sampleEnriched.labelString:	????????enriched(%_E)
! Emacs*XlwMenu.mode.labelString:	%_Mode
Emacs*XlwMenu.mode.labelString:	??????(%_M)
! Emacs*XlwMenu.aproposDocs___.labelString:	Apropos %_Docs...
Emacs*XlwMenu.aproposDocs___.labelString:	Apropos????????????(%_D)...
! Emacs*XlwMenu.key___.labelString:	%_Key...
Emacs*XlwMenu.key___.labelString:	????(%_I)...
! Emacs*XlwMenu.bindings.labelString:	%_Bindings
Emacs*XlwMenu.bindings.labelString:	??????????????(%_B)
! Emacs*XlwMenu.mouseBindings.labelString:	%_Mouse Bindings
Emacs*XlwMenu.mouseBindings.labelString:	????????????????????(%_M)
! Emacs*XlwMenu.recentKeys.labelString:	%_Recent Keys
Emacs*XlwMenu.recentKeys.labelString:	??????????(%_R)
! Emacs*XlwMenu.function___.labelString:	%_Function...
Emacs*XlwMenu.function___.labelString:	????(%_F)...
! Emacs*XlwMenu.variable___.labelString:	%_Variable...
Emacs*XlwMenu.variable___.labelString:	????(%_V)...
! Emacs*XlwMenu.locateCommand___.labelString:	%_Locate Command...
Emacs*XlwMenu.locateCommand___.labelString:	??????????locate(%_L)...
! Emacs*XlwMenu.currentInstallationInfo.labelString:	%_Current Installation Info
Emacs*XlwMenu.currentInstallationInfo.labelString:	????????????????????????Info(%_C)
! Emacs*XlwMenu.noWarranty.labelString:	%_No Warranty
Emacs*XlwMenu.noWarranty.labelString:	??????(%_N)
! Emacs*XlwMenu.xEmacsLicense.labelString:	XEmacs %_License
Emacs*XlwMenu.xEmacsLicense.labelString:	XEmacs??????????(%_L)
! Emacs*XlwMenu.findPackages.labelString:	Find %_Packages
Emacs*XlwMenu.findPackages.labelString:	??????????????(%_P)
! Emacs*XlwMenu.viewSplashScreen.labelString:	View %_Splash Screen
Emacs*XlwMenu.viewSplashScreen.labelString:	????????????????????????????(%_S)
! Emacs*XlwMenu.unixManual___.labelString:	%_Unix Manual...
Emacs*XlwMenu.unixManual___.labelString:	Unix??????????(%_U)...


--- NEW FILE Emacs.ad.ko_KR.UTF-8 ---
! XEmacs 21.x ??? ?????? (??????)
!
!	Xiaolin Park <xlpark at kankou.cs.uec.ac.jp>
!			Time-stamp: <03/10/17 21:10:54 petersen>
!
! This is the app-defaults file for XEmacs.
!
! This used to be identical to sample.Xdefaults, but the resources
! below have been rewritten to be as general as possible to avoid
! overriding user resources.  Other than the form rewriting, both
! files should be kept in sync. 
! 
! The resources below are loaded into the XEmacs executable at compile-time:
! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
! effect.
! 
! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
! (or whatever the standard app-defaults directory is at your site) to cause
! it to be consulted at run-time.  (Do this only for site-wide customizations:
! personal customizations should be put into ~/.Xdefaults instead.)
! Note that the file must be named Emacs, not XEmacs.
! 
! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of
! the various resources and the syntax for setting them.
! 
! Energize users: note that this is not the same app-defaults file that is
! used with the Energize-specific version of XEmacs.


! Colors and backgrounds.
! ======================
! The contrasts of these colors will cause them to map to the appropriate
! one of "black" or "white" on monochrome systems.
! 
! The valid color names on your system can be found by looking in the file
! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/.

! ! Set the modeline colors.
! Emacs.modeline*attributeForeground:	Black
! Emacs.modeline*attributeBackground:	Gray75

! ! Set the color of the text cursor.
! Emacs.text-cursor*attributeBackground:	Red3

! If you want to set the color of the mouse pointer, do this:
! Emacs.pointer*attributeForeground:	Black
! If you want to set the background of the mouse pointer, do this:
! Emacs.pointer*attributeBackground:	White
! Note that by default, the pointer foreground and background are the same
! as the default face.

! Set the menubar colors.  This overrides the default foreground and
! background colors specified above.
*menubar*Foreground:			Gray30
*menubar*Background:			Gray80
! This is for buttons in the menubar.  
! Yellow would be better, but that would map to white on monochrome.
*menubar*buttonForeground:		Blue
*XlwMenu*highlightForeground:		Red
*XlwMenu*titleForeground:		Maroon
*XlwMenu*selectColor:			ForestGreen
*XmToggleButton*selectColor:		ForestGreen

! Specify the colors of popup menus.
*popup*Foreground:			Black
*popup*Background:			Gray80

! Specify the colors of the various sub-widgets of the dialog boxes.
*dialog*Foreground:			Black
! #A5C0C1 is a shade of blue
*dialog*Background:			#A5C0C1
! The following three are for Motif dialog boxes ...
*dialog*XmTextField*Background:		WhiteSmoke
*dialog*XmText*Background:		WhiteSmoke
*dialog*XmList*Background:		WhiteSmoke
! While this one is for Athena dialog boxes.
*dialog*Command*Background:		WhiteSmoke

! Xlw Scrollbar colors
*XlwScrollBar*Foreground:		Gray30
*XlwScrollBar*Background:		Gray80
*XmScrollBar*Foreground:		Gray30
*XmScrollBar*Background:		Gray80

!
! The Lucid Scrollbar supports two added resources, SliderStyle is either
! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
! of the slider that depresses when the slider is clicked on.  ArrowPosition is
! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
! of the scrollbar, same puts both arrows at the same end, like the Amiga.
!
Emacs*XlwScrollBar.SliderStyle:    dimple
! Emacs*XlwScrollBar.ArrowPosition:  opposite

!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

! *topToolBarShadowColor:		Gray90
! *bottomToolBarShadowColor:		Gray40
! *backgroundToolBarColor:		Gray80
! *toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
Emacs.default.attributeFont:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
*menubar*Font:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*popup*Font:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*XmTextField*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*XmText*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*XmList*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField*translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton*translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! ! XIM fontset (defaults to system fontset default)
! ! *EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
! !    Japanese localization resources for XEmacs.
! ! @(#)Emacs	1.3 96/09/22
! !    Copyright (C) 1996 Sun Microsystems, Inc.
! !!
! ! This file is part of XEmacs.
! ! 
! ! XEmacs is free software; you can redistribute it and/or modify it
! ! under the terms of the GNU General Public License as published by the
! ! Free Software Foundation; either version 2, or (at your option) any
! ! later version.
! ! XEmacs 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 XEmacs; see the file COPYING.  If not, write to the
! ! Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! ! Boston, MA 02111-1307, USA.
! ! Copyright (C) 1996 Sun Microsystems Inc.
! !
! ! Japanese Resources to be placed in etc/app-defaults/ja/Emacs
! ! for xemacs-mule.  It is same on another languages such like fr,
! ! if you want to have French menu label, place it on
! ! etc/app-defaults/fr/Emacs.
! 
! ! Pulldown menu internationalization.  The first line of the file
! ! "*XlwMenu.resourceLabels: True" has to be there to make sure
! ! all the labelString will be read and displayed by X.
! *XlwMenu.resourceLabels: True
! 
! ! CDE doesn't require this but OpenWindows does.
! ! Note that this `gothic' font family is effective just for Japanese.
! ! And fontList is just used under Motif menubar.
! !*fontList: -misc-fixed-medium-r-normal--16-*-*-*-*-*-*-*:
! *fontList: -*-gothic-medium-r-normal--16-*-*-*-*-*-*-*:
! !! FontSet for menus when you use --with-xfs or --with-xim=xlib.
! *fontSet: -daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*
! 
! ! Starting below here are menu label string which can be translated to
! ! different languages. 
! ! Example: *XlwMenu.file.labelString: File  
! ! Characters before the ":" sign, "Example: *XlwMenu.file.labelString"
! ! can not be changed. They must stay exactly the way they are.
! ! The only string to be translated is the string, "File".
! ! Some resource names such as "file", "quit" have been used in several
! ! places.  However, each of them only has to be translated once in this X
! ! resource file.
! ! *XlwMenu.readMailVM___.labelString:	Read Mail (VM)...
! *XlwMenu.readMailVM___.labelString:	????????? ?????? (VM)...
! ! *XlwMenu.readMailMH___.labelString:	Read Mail (MH)...
! *XlwMenu.readMailMH___.labelString:	????????? ?????? (MH)...
! ! *XlwMenu.sendMail___.labelString:	Send mail...
! *XlwMenu.sendMail___.labelString:	????????? ?????????
! ! *XlwMenu.usenetNews.labelString:	Usenet News
! *XlwMenu.usenetNews.labelString:	?????? ??????
! ! *XlwMenu.browseTheWeb.labelString:	Browse the Web
! *XlwMenu.browseTheWeb.labelString:	????????? ??????
! ! *XlwMenu.gopher.labelString:	Gopher
! *XlwMenu.gopher.labelString:	Gopher
! ! *XlwMenu.hyperbole___.labelString:	Hyperbole...
! *XlwMenu.hyperbole___.labelString:	Hyperbole...
! ! *XlwMenu.spellCheckBuffer.labelString:	Spell-Check Buffer
! *XlwMenu.spellCheckBuffer.labelString:	???????????? ????????????
! ! *XlwMenu.toggleVIEmulation.labelString:	Toggle VI emulation
! *XlwMenu.toggleVIEmulation.labelString: 	VI ????????? ?????????
! ! *XlwMenu.calendar.labelString:	Calendar
! *XlwMenu.calendar.labelString:		??????
! ! *XlwMenu.games.labelString:	Games
! *XlwMenu.games.labelString:	??????
! ! *XlwMenu.3MonthCalendar.labelString:	3-Month Calendar
! *XlwMenu.3MonthCalendar.labelString:	?????? ??????
! ! *XlwMenu.diary.labelString:	Diary
! *XlwMenu.diary.labelString:	??????
! ! *XlwMenu.holidays.labelString:	Holidays
! *XlwMenu.holidays.labelString:		??????
! ! *XlwMenu.phasesOfTheMoon.labelString:	Phases of the Moon
! *XlwMenu.phasesOfTheMoon.labelString:	??????
! ! *XlwMenu.sunriseSunset.labelString:	Sunrise/Sunset
! *XlwMenu.sunriseSunset.labelString:	????????????/????????????
! ! *XlwMenu.mineGame.labelString:	Mine Game 
! *XlwMenu.mineGame.labelString:		Mine ??????
! ! *XlwMenu.tetris.labelString:	Tetris
! *XlwMenu.tetris.labelString:	????????????
! ! *XlwMenu.quoteFromZippy.labelString:	Quote from Zippy
! *XlwMenu.quoteFromZippy.labelString:	Zippy ??? ??????
! ! *XlwMenu.psychoanalyst.labelString:	Psychoanalyst
! *XlwMenu.psychoanalyst.labelString:	????????????
! ! *XlwMenu.psychoanalyzeZippy.labelString:	Psychoanalyze Zippy!
! *XlwMenu.psychoanalyzeZippy.labelString:	Zippy ??? ????????????
! ! *XlwMenu.randomFlames.labelString:	Random Flames
! *XlwMenu.randomFlames.labelString:	????????????
! ! *XlwMenu.dunnetAdventure.labelString:	Dunnet (Adventure)
! *XlwMenu.dunnetAdventure.labelString:	Dunnet (??????)
! ! *XlwMenu.towersOfHanoi.labelString:	Towers of Hanoi
! *XlwMenu.towersOfHanoi.labelString:	Hanoi ??? ???
! ! *XlwMenu.gameOfLife.labelString:	Game of Life
! *XlwMenu.gameOfLife.labelString:	????????????
! ! *XlwMenu.multiplicationPuzzle.labelString:	Multiplication Puzzle
! *XlwMenu.multiplicationPuzzle.labelString:	?????? ????????????
! ! *XlwMenu.listAllBuffers.labelString:	List All Buffers
! *XlwMenu.listAllBuffers.labelString:	?????? ????????? ??????
! ! *XlwMenu..labelString:	
! ! *XlwMenu..labelString:
! ! *XlwMenu.emacs.labelString:	Emacs
! ! *XlwMenu.emacs.labelString:
! ! *XlwMenu.group___.labelString:	Group...
! ! *XlwMenu.group___.labelString:	??????...
! ! *XlwMenu.variable___.labelString:	Variable...
! ! *XlwMenu.variable___.labelString:	??????...
! ! *XlwMenu.face___.labelString:	Face...
! ! *XlwMenu.face___.labelString:	???...
! ! *XlwMenu.saved___.labelString:	Saved...
! ! *XlwMenu.saved___.labelString:	???????????? ??????...
! ! *XlwMenu.set___.labelString:	Set...
! ! *XlwMenu.set___.labelString:	??????...
! ! *XlwMenu.apropos___.labelString:	Apropos...
! ! *XlwMenu.apropos___.labelString:	????????? ??????...
! ! *XlwMenu.browse___.labelString:	Browse...
! ! *XlwMenu.browse___.labelString:	????????????...
! ! *XlwMenu.emacs___.labelString:	Emacs...
! ! *XlwMenu.emacs___.labelString:
! ! *XlwMenu.editing.labelString:	Editing
! *XlwMenu.editing.labelString:	??????
! ! *XlwMenu.external.labelString:	External
! *XlwMenu.external.labelString:		??????
! ! *XlwMenu.programming.labelString:	Programming
! *XlwMenu.programming.labelString:	??????????????????
! ! *XlwMenu.applications.labelString:	Applications
! *XlwMenu.applications.labelString:	??????
! ! *XlwMenu.development.labelString:	Development
! *XlwMenu.development.labelString:	??????
! ! *XlwMenu.environment.labelString:	Environment
! *XlwMenu.environment.labelString:	??????
! ! *XlwMenu.data.labelString:	Data
! *XlwMenu.data.labelString:	?????????
! ! *XlwMenu.files.labelString:	Files
! *XlwMenu.files.labelString:	??????
! ! *XlwMenu.wp.labelString:	Wp
! *XlwMenu.wp.labelString:	????????????
! ! *XlwMenu.faces.labelString:	Faces
! *XlwMenu.faces.labelString:	???
! ! *XlwMenu.hypermedia.labelString:	Hypermedia
! *XlwMenu.hypermedia.labelString:	?????????
! ! *XlwMenu.help.labelString:	Help
! ! *XlwMenu.help.labelString:	?????????
! ! *XlwMenu.local.labelString:	Local
! *XlwMenu.local.labelString:	??????
! ! *XlwMenu.undo.labelString:	Undo
! *XlwMenu.undo.labelString:	?????? ??????
! ! *XlwMenu.cut.labelString:	Cut
! *XlwMenu.cut.labelString:	?????????
! ! *XlwMenu.copy.labelString:	Copy
! *XlwMenu.copy.labelString:	??????
! ! *XlwMenu.paste.labelString:	Paste
! *XlwMenu.paste.labelString:	?????????
! ! *XlwMenu.clear.labelString:	Clear
! *XlwMenu.clear.labelString:	?????????
! ! *XlwMenu.search___.labelString:	Search...
! *XlwMenu.search___.labelString:		??????...
! ! *XlwMenu.searchBackward___.labelString:	Search Backward...
! *XlwMenu.searchBackward___.labelString:		????????? ??????
! ! *XlwMenu.replace___.labelString:	Replace...
! *XlwMenu.replace___.labelString:	?????????
! ! *XlwMenu.searchRegexp___.labelString:	Search (Regexp)...
! *XlwMenu.searchRegexp___.labelString:	?????? (Regexp)...
! ! *XlwMenu.searchBackwardRegexp___.labelString:	Search Backward (Regexp)...
! *XlwMenu.searchBackwardRegexp___.labelString:	????????? ?????? (Regexp)...
! ! *XlwMenu.replaceRegexp___.labelString:	Replace (Regexp)...
! *XlwMenu.replaceRegexp___.labelString:		????????? (Regexp)...
! ! *XlwMenu.gotoLine___.labelString:	Goto Line...
! *XlwMenu.gotoLine___.labelString:	????????? ????????? ??????	
! ! *XlwMenu.whatLine.labelString:	What Line
! *XlwMenu.whatLine.labelString:		?????????
! ! *XlwMenu.bookmarks.labelString:	Bookmarks
! *XlwMenu.bookmarks.labelString:		?????????
! ! *XlwMenu.startMacroRecording.labelString:	Start Macro Recording
! *XlwMenu.startMacroRecording.labelString:	????????? ?????? ??????
! ! *XlwMenu.endMacroRecording.labelString:	End Macro Recording
! *XlwMenu.endMacroRecording.labelString:		????????? ?????? ??????
! ! *XlwMenu.executeLastMacro.labelString:	Execute Last Macro
! *XlwMenu.executeLastMacro.labelString:		?????? ????????? ??????
! ! *XlwMenu.showMessageLog.labelString:	Show Message Log
! *XlwMenu.showMessageLog.labelString:	????????? ?????? ??????
! ! *XlwMenu.jumpToBookmark.labelString:	Jump to Bookmark
! *XlwMenu.jumpToBookmark.labelString:	???????????? ??????
! ! *XlwMenu.setBookmark.labelString:	Set bookmark
! *XlwMenu.setBookmark.labelString:	????????? ??????
! ! *XlwMenu.insertContents.labelString:	Insert contents
! *XlwMenu.insertContents.labelString:	????????? ????????????
! ! *XlwMenu.insertLocation.labelString:	Insert location
! *XlwMenu.insertLocation.labelString:	????????? ????????????
! ! *XlwMenu.renameBookmark.labelString:	Rename bookmark
! *XlwMenu.renameBookmark.labelString:	????????? ?????? ?????????
! ! *XlwMenu.deleteBookmark.labelString:	Delete Bookmark
! *XlwMenu.deleteBookmark.labelString:	????????? ?????????
! ! *XlwMenu.editBookmarkList.labelString:	Edit Bookmark List
! *XlwMenu.editBookmarkList.labelString:		????????? ???????????????
! ! *XlwMenu.saveBookmarks.labelString:	Save bookmarks
! *XlwMenu.saveBookmarks.labelString:	????????? ??????
! ! *XlwMenu.saveBookmarksAs___.labelString:	Save bookmarks as...
! *XlwMenu.saveBookmarksAs___.labelString:	???????????? ?????? ???????????? ??????
! ! *XlwMenu.loadABookmarkFile.labelString:	Load a bookmark file
! *XlwMenu.loadABookmarkFile.labelString:		????????? ?????? ???????????????
! ! *XlwMenu.open___.labelString:	Open...
! *XlwMenu.open___.labelString:	??????...
! ! *XlwMenu.openInOtherWindow___.labelString:	Open in Other Window...
! *XlwMenu.openInOtherWindow___.labelString:	?????? ???????????? ??????
! ! *XlwMenu.openInNewFrame___.labelString:	Open in New Frame...
! *XlwMenu.openInNewFrame___.labelString:		??? ??????????????? ??????
! ! *XlwMenu.insertFile___.labelString:	Insert File...
! *XlwMenu.insertFile___.labelString:	?????? ????????????...
! ! *XlwMenu.viewFile___.labelString:	View File...
! *XlwMenu.viewFile___.labelString:	?????? ??????...
! ! *XlwMenu.save.labelString:	Save
! *XlwMenu.save.labelString:	??????
! ! *XlwMenu.saveAs___.labelString:	Save As...
! *XlwMenu.saveAs___.labelString:		?????? ???????????? ??????
! ! *XlwMenu.saveSomeBuffers.labelString:	Save Some Buffers
! *XlwMenu.saveSomeBuffers.labelString:	????????? ???????????? ??????
! ! *XlwMenu.printBuffer.labelString:	Print Buffer
! *XlwMenu.printBuffer.labelString:	????????? ??????
! ! *XlwMenu.prettyPrintBuffer.labelString:	Pretty-Print Buffer
! *XlwMenu.prettyPrintBuffer.labelString:		???????????? ????????????
! ! *XlwMenu.newFrame.labelString:	New Frame
! *XlwMenu.newFrame.labelString:		??? ?????????
! ! *XlwMenu.frameOnOtherDisplay___.labelString:	Frame on Other Display...
! *XlwMenu.frameOnOtherDisplay___.labelString: ?????? ????????????????????? ?????????...
! ! *XlwMenu.deleteFrame.labelString:	Delete Frame
! *XlwMenu.deleteFrame.labelString:	????????? ?????????
! ! *XlwMenu.splitWindow.labelString:	Split Window
! *XlwMenu.splitWindow.labelString:	????????? ??????
! ! *XlwMenu.unSplitKeepThis.labelString:	Un-Split (Keep This)
! *XlwMenu.unSplitKeepThis.labelString:	???????????? (????????? ??????)
! ! *XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep Others)
! *XlwMenu.unSplitKeepOthers.labelString:		???????????? (???????????? ??????)
! ! *XlwMenu.revertBuffer.labelString:	Revert Buffer
! *XlwMenu.revertBuffer.labelString:	????????? ??????
! ! *XlwMenu.deleteBuffer.labelString:	Delete Buffer
! *XlwMenu.deleteBuffer.labelString:	????????? ?????????
! ! *XlwMenu.exitXEmacs.labelString:	Exit XEmacs
! *XlwMenu.exitXEmacs.labelString:	XEmacs ??????
! ! *XlwMenu.aboutXEmacs___.labelString:	About XEmacs...
! *XlwMenu.aboutXEmacs___.labelString:	XEmacs ??? ?????????
! ! *XlwMenu.basics.labelString:	Basics
! *XlwMenu.basics.labelString:	??????
! ! *XlwMenu.xEmacsFAQ.labelString:	XEmacs FAQ
! *XlwMenu.xEmacsFAQ.labelString:	XEmacs FAQ
! ! *XlwMenu.samples.labelString:	Samples
! *XlwMenu.samples.labelString:	??????
! ! *XlwMenu.lookupInInfo.labelString:	Lookup in Info
! *XlwMenu.lookupInInfo.labelString:	Info?????? ??????
! ! *XlwMenu.manuals.labelString:	Manuals
! *XlwMenu.manuals.labelString:	?????????
! ! *XlwMenu.commandsKeys.labelString:	Commands & Keys
! *XlwMenu.commandsKeys.labelString:	?????? & ???
! ! *XlwMenu.recentMessages.labelString:	Recent Messages
! *XlwMenu.recentMessages.labelString:	?????? ?????????
! ! *XlwMenu.misc.labelString:	Misc
! *XlwMenu.misc.labelString:	???????????????
! ! *XlwMenu.submitBugReport.labelString:	Submit Bug Report
! *XlwMenu.submitBugReport.labelString:	???Bug Report ??????
! ! *XlwMenu.tutorial.labelString:	Tutorial
! *XlwMenu.tutorial.labelString:	?????????
! ! *XlwMenu.news.labelString:	News
! *XlwMenu.news.labelString:	??????
! ! *XlwMenu.packages.labelString:	Packages
! *XlwMenu.packages.labelString:		?????????
! ! *XlwMenu.splash.labelString:	Splash
! *XlwMenu.splash.labelString:	Splash
! ! *XlwMenu.fAQLocal.labelString:	FAQ (local)
! *XlwMenu.fAQLocal.labelString:	FAQ (local)
! ! *XlwMenu.fAQViaWWW.labelString:	FAQ via WWW
! *XlwMenu.fAQViaWWW.labelString:		FAQ (WWW ??????)
! ! *XlwMenu.homePage.labelString:	Home Page
! *XlwMenu.homePage.labelString:		Home Page
! ! *XlwMenu.sample.labelString:	Sample
! *XlwMenu.sample.labelString:	??????
! ! *XlwMenu.keyBinding___.labelString:	Key Binding...
! *XlwMenu.keyBinding___.labelString: ?????????...
! ! *XlwMenu.command___.labelString:	Command...
! *XlwMenu.command___.labelString:	??????...
! ! *XlwMenu.function___.labelString:	Function...
! *XlwMenu.function___.labelString:	??????...
! ! *XlwMenu.topic___.labelString:	Topic...
! *XlwMenu.topic___.labelString:		??????...
! ! *XlwMenu.info.labelString:	Info
! *XlwMenu.info.labelString:	Info
! ! *XlwMenu.unixManual___.labelString:	Unix Manual...
! *XlwMenu.unixManual___.labelString:	Unix Manual...
! ! *XlwMenu.mode.labelString:	Mode
! *XlwMenu.mode.labelString:	??????
! ! *XlwMenu.apropos___.labelString:	Apropos...
! ! *XlwMenu.apropos___.labelString:	????????? ??????...
! ! *XlwMenu.aproposDocs___.labelString:	Apropos Docs...
! *XlwMenu.aproposDocs___.labelString:	???????????? ????????? ??????...
! ! *XlwMenu.key___.labelString:	Key...
! *XlwMenu.key___.labelString:	???...
! ! *XlwMenu.bindings.labelString:	Bindings
! *XlwMenu.bindings.labelString:		??????
! ! *XlwMenu.mouseBindings.labelString:	Mouse Bindings
! *XlwMenu.mouseBindings.labelString:	Mouse ??????
! ! *XlwMenu.recentKeys.labelString:	Recent Keys
! *XlwMenu.recentKeys.labelString:	?????????
! ! *XlwMenu.variable___.labelString:	Variable...
! ! *XlwMenu.variable___.labelString:
! ! *XlwMenu.locateCommand___.labelString:	Locate Command...
! *XlwMenu.locateCommand___.labelString:	????????? ??????...
! ! *XlwMenu.noWarranty.labelString:	No Warranty
! *XlwMenu.noWarranty.labelString:	?????????
! ! *XlwMenu.xEmacsLicense.labelString:	XEmacs License
! *XlwMenu.xEmacsLicense.labelString:	XEmacs ?????????
! ! *XlwMenu.theLatestVersion.labelString:	The Latest Version
! *XlwMenu.theLatestVersion.labelString:	?????? ??????
! ! *XlwMenu.evaluateLastSExpression.labelString:	Evaluate Last S-expression
! *XlwMenu.evaluateLastSExpression.labelString:	?????? S?????? ??????
! ! *XlwMenu.evaluateEntireBuffer.labelString:	Evaluate Entire Buffer
! *XlwMenu.evaluateEntireBuffer.labelString:	?????????????????? ??????
! ! *XlwMenu.evaluateRegion.labelString:	Evaluate Region
! *XlwMenu.evaluateRegion.labelString:	?????? ??????
! ! *XlwMenu.evaluateThisDefun.labelString:	Evaluate This Defun
! *XlwMenu.evaluateThisDefun.labelString:	??? Defun??? ??????
! ! *XlwMenu.debugThisDefun.labelString:	Debug This Defun
! *XlwMenu.debugThisDefun.labelString:	??? Defun??? ?????????
! ! *XlwMenu.traceAFunction.labelString:	Trace a Function
! *XlwMenu.traceAFunction.labelString:	????????? ??????
! ! *XlwMenu.untraceAllFunctions.labelString:	Untrace All Functions
! *XlwMenu.untraceAllFunctions.labelString:	?????? ????????? ?????????
! ! *XlwMenu.commentOutRegion.labelString:	Comment Out Region
! *XlwMenu.commentOutRegion.labelString:	??????????????? ?????????
! ! *XlwMenu.indentRegion.labelString:	Indent Region
! *XlwMenu.indentRegion.labelString:	?????? ?????????
! ! *XlwMenu.indentLine.labelString:	Indent Line
! *XlwMenu.indentLine.labelString:	??? ?????????
! ! *XlwMenu.debugOnError.labelString:	Debug On Error
! ! *XlwMenu.debugOnError.labelString:	????????? ??? ?????????
! ! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
! ! *XlwMenu.debugOnQuit.labelString:	???????????? ?????????
! ! *XlwMenu.debugOnSignal.labelString:	Debug on Signal
! *XlwMenu.debugOnSignal.labelString: ????????? ?????????
! ! *XlwMenu.describeLanguageSupport.labelString:	Describe language support
! *XlwMenu.describeLanguageSupport.labelString:	?????? ???????????? ??????
! ! *XlwMenu.setLanguageEnvironment.labelString:	Set language environment
! *XlwMenu.setLanguageEnvironment.labelString:	??????????????? ??????
! ! *XlwMenu.toggleInputMethod.labelString:	Toggle input method
! *XlwMenu.toggleInputMethod.labelString:		??????????????? ?????????
! ! *XlwMenu.selectInputMethod.labelString:	Select input method
! *XlwMenu.selectInputMethod.labelString:	???????????? ??????
! ! *XlwMenu.describeInputMethod.labelString:	Describe input method
! *XlwMenu.describeInputMethod.labelString:???????????? ??????
! ! *XlwMenu.describeCurrentCodingSystems.labelString:	Describe current coding systems
! *XlwMenu.describeCurrentCodingSystems.labelString:	?????? ?????? ???????????? ??????
! ! *XlwMenu.setCodingSystemOfBufferFile.labelString:	Set coding system of buffer file
! *XlwMenu.setCodingSystemOfBufferFile.labelString:	????????? ?????? ?????? ????????? ??????
! ! *XlwMenu.setCodingSystemOfTerminal.labelString:	Set coding system of terminal
! *XlwMenu.setCodingSystemOfTerminal.labelString:		????????? ?????? ????????? ??????
! ! *XlwMenu.setCodingSystemOfKeyboard.labelString:	Set coding system of keyboard
! *XlwMenu.setCodingSystemOfKeyboard.labelString:	????????? ?????? ????????? ??????
! ! *XlwMenu.setCodingSystemOfProcess.labelString:	Set coding system of process
! *XlwMenu.setCodingSystemOfProcess.labelString:	???????????? ?????? ????????? ??????
! ! *XlwMenu.showCharacterTable.labelString:	Show character table
! *XlwMenu.showCharacterTable.labelString:	???????????? ??????
! ! *XlwMenu.showDiagnosisForMULE.labelString:	Show diagnosis for MULE
! *XlwMenu.showDiagnosisForMULE.labelString:	MULE??? ????????????
! ! *XlwMenu.showManyLanguages.labelString:	Show many languages
! *XlwMenu.showManyLanguages.labelString:	?????? ????????????
! ! *XlwMenu.chineseGB.labelString:	Chinese-GB
! *XlwMenu.chineseGB.labelString:		?????????-GB
! ! *XlwMenu.chineseBIG5.labelString:	Chinese-BIG5
! *XlwMenu.chineseBIG5.labelString:	?????????-BIG5
! ! *XlwMenu.cyrillicISO.labelString:	Cyrillic-ISO
! *XlwMenu.cyrillicISO.labelString:	??????-ISO
! ! *XlwMenu.cyrillicKOI8.labelString:	Cyrillic-KOI8
! *XlwMenu.cyrillicKOI8.labelString:	??????-KOI8
! ! *XlwMenu.cyrillicALT.labelString:	Cyrillic-ALT
! *XlwMenu.cyrillicALT.labelString:	??????-ALT
! ! *XlwMenu.cyrillic.labelString:	Cyrillic
! *XlwMenu.cyrillic.labelString:	??????
! ! ! *XlwMenu.english.labelString:	English
! *XlwMenu.english.labelString:		??????
! ! *XlwMenu.aSCII.labelString:	ASCII
! ! *XlwMenu.aSCII.labelString:
! ! *XlwMenu.latin1.labelString:	Latin-1
! *XlwMenu.latin1.labelString:	??????-1
! ! *XlwMenu.german.labelString:	German
! *XlwMenu.german.labelString:	?????????
! ! *XlwMenu.french.labelString:	French
! *XlwMenu.french.labelString:	????????????
! ! *XlwMenu.norwegian.labelString:	Norwegian
! *XlwMenu.norwegian.labelString:		???????????????
! ! *XlwMenu.latin2.labelString:	Latin-2
! *XlwMenu.latin2.labelString:	??????-2
! ! *XlwMenu.croatian.labelString:	Croatian
! *XlwMenu.croatian.labelString:		???????????????
! ! *XlwMenu.polish.labelString:	Polish
! *XlwMenu.polish.labelString:	????????????
! ! *XlwMenu.latin3.labelString:	Latin-3
! *XlwMenu.latin3.labelString:	??????-3
! ! *XlwMenu.latin4.labelString:	Latin-4
! *XlwMenu.latin4.labelString:	??????-4
! ! *XlwMenu.latin5.labelString:	Latin-5
! *XlwMenu.latin5.labelString:	??????-5
! ! *XlwMenu.greek.labelString:	Greek
! *XlwMenu.greek.labelString:	????????????
! ! *XlwMenu.hebrew.labelString:	Hebrew
! *XlwMenu.hebrew.labelString:	???????????????
! ! *XlwMenu.japanese.labelString:	Japanese
! *XlwMenu.japanese.labelString:		?????????
! ! *XlwMenu.korean.labelString:	Korean
! *XlwMenu.korean.labelString:	??????
! ! *XlwMenu.iPA.labelString:	IPA
! ! *XlwMenu.iPA.labelString:
! ! *XlwMenu.customize.labelString:	Customize
! *XlwMenu.customize.labelString:	??????????????????
! ! *XlwMenu.readOnly.labelString:	Read Only
! *XlwMenu.readOnly.labelString:	?????? ????????? ??????
! ! *XlwMenu.editingOptions.labelString:	Editing Options
! *XlwMenu.editingOptions.labelString:	?????? ????????????
! ! *XlwMenu.generalOptions.labelString:	General Options
! *XlwMenu.generalOptions.labelString:	?????? ????????????
! ! *XlwMenu.printingOptions.labelString:	Printing Options
! *XlwMenu.printingOptions.labelString:	?????? ????????????
! ! *XlwMenu.otherWindowLocation.labelString:	"Other Window" Location
! *XlwMenu.otherWindowLocation.labelString:	?????? ????????? ????????????
! ! *XlwMenu.syntaxHighlighting.labelString:	Syntax Highlighting
! *XlwMenu.syntaxHighlighting.labelString:	????????? ??????
! ! *XlwMenu.parenHighlighting.labelString:	Paren Highlighting
! *XlwMenu.parenHighlighting.labelString:	????????? ??????
! ! *XlwMenu.frameAppearance.labelString:	Frame Appearance
! *XlwMenu.frameAppearance.labelString:	????????? ??????
! ! *XlwMenu.menubarAppearance.labelString:	Menubar Appearance
! *XlwMenu.menubarAppearance.labelString: ????????? ??????
! ! *XlwMenu.toolbarAppearance.labelString:	Toolbar Appearance
! *XlwMenu.toolbarAppearance.labelString:	????????? ??????
! ! *XlwMenu.mouse.labelString:	Mouse
! *XlwMenu.mouse.labelString:	Mouse
! ! *XlwMenu.openURLsWith.labelString:	Open URLs With
! *XlwMenu.openURLsWith.labelString:	URLs ??????
! ! *XlwMenu.browseFaces___.labelString:	Browse Faces...
! *XlwMenu.browseFaces___.labelString: ?????? ??????
! ! *XlwMenu.font.labelString:	Font
! *XlwMenu.font.labelString:	?????????
! ! *XlwMenu.size.labelString:	Size
! *XlwMenu.size.labelString:	??????
! ! *XlwMenu.weight.labelString:	Weight
! *XlwMenu.weight.labelString:	??????
! ! *XlwMenu.saveOptions.labelString:	Save Options
! *XlwMenu.saveOptions.labelString: ?????? Options
! ! *XlwMenu.emacs.labelString:	Emacs
! ! *XlwMenu.emacs.labelString:
! ! *XlwMenu.group___.labelString:	Group...
! *XlwMenu.group___.labelString:	??????...
! ! *XlwMenu.variable___.labelString:	Variable...
! *XlwMenu.variable___.labelString:	??????...
! ! *XlwMenu.face___.labelString:	Face...
! *XlwMenu.face___.labelString:	???...
! ! *XlwMenu.saved___.labelString:	Saved...
! *XlwMenu.saved___.labelString:		???????????? ??????...
! ! *XlwMenu.set___.labelString:	Set...
! *XlwMenu.set___.labelString:	??????...
! ! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	????????? ??????...
! ! *XlwMenu.browse___.labelString:	Browse...
! *XlwMenu.browse___.labelString:		????????????...
! !! *XlwMenu.overstrike.labelString:	Overstrike
! *XlwMenu.overstrike.labelString:	???????????? ??????
! ! *XlwMenu.caseSensitiveSearch.labelString:	Case Sensitive Search
! *XlwMenu.caseSensitiveSearch.labelString:	??? ???????????? ??????????????? ??????
! ! *XlwMenu.caseMatchingReplace.labelString:	Case Matching Replace
! *XlwMenu.caseMatchingReplace.labelString:	??? ???????????? ??????????????? ?????????
! ! *XlwMenu.autoDeleteSelection.labelString:	Auto Delete Selection
! *XlwMenu.autoDeleteSelection.labelString:	??????????????? ???????????????
! ! *XlwMenu.activeRegions.labelString:	Active Regions
! *XlwMenu.activeRegions.labelString:	????????? ???????????? ??????
! ! *XlwMenu.mousePasteAtTextCursor.labelString:	Mouse Paste At Text Cursor
! *XlwMenu.mousePasteAtTextCursor.labelString: ????????? ?????? ???????????? Mouse ?????????
! ! *XlwMenu.requireNewlineAtEnd.labelString:	Require Newline At End
! *XlwMenu.requireNewlineAtEnd.labelString:	????????? ??????????????? ??????
! ! *XlwMenu.addNewlineWhenMovingPastEnd.labelString:	Add Newline When Moving Past End
! *XlwMenu.addNewlineWhenMovingPastEnd.labelString: ????????? ????????? ?????? ??????????????? ??????
! ! *XlwMenu.teachExtendedCommands.labelString:	Teach Extended Commands
! *XlwMenu.teachExtendedCommands.labelString:	???????????? ??????
! ! *XlwMenu.debugOnError.labelString:	Debug On Error
! *XlwMenu.debugOnError.labelString:	???????????? ?????????
! ! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
! *XlwMenu.debugOnQuit.labelString:	???????????? ?????????
! ! *XlwMenu.commandLineSwitchesForLprLp___.labelString:	Command-Line Switches for `lpr'/`lp'...
! *XlwMenu.commandLineSwitchesForLprLp___.labelString:	`lpr'/`lp' ??????????????? ?????????
! ! *XlwMenu.prettyPrintPaperSize.labelString:	Pretty-Print Paper Size
! *XlwMenu.prettyPrintPaperSize.labelString:	????????? ??????????????? ????????????
! ! *XlwMenu.colorPrinting.labelString:	Color Printing
! *XlwMenu.colorPrinting.labelString:	?????? ??????
! ! *XlwMenu.letter.labelString:	Letter
! ! *XlwMenu.letter.labelString:
! ! *XlwMenu.letterSmall.labelString:	Letter-small
! ! *XlwMenu.letterSmall.labelString:
! ! *XlwMenu.legal.labelString:	Legal
! ! *XlwMenu.legal.labelString:
! ! *XlwMenu.statement.labelString:	Statement
! ! *XlwMenu.statement.labelString:
! ! *XlwMenu.executive.labelString:	Executive
! ! *XlwMenu.executive.labelString:
! ! *XlwMenu.tabloid.labelString:	Tabloid
! ! *XlwMenu.tabloid.labelString:
! ! *XlwMenu.ledger.labelString:	Ledger
! ! *XlwMenu.ledger.labelString:
! ! *XlwMenu.a3.labelString:	A3
! ! *XlwMenu.a3.labelString:
! ! *XlwMenu.a4.labelString:	A4
! ! *XlwMenu.a4.labelString:
! ! *XlwMenu.a4small.labelString:	A4small
! ! *XlwMenu.a4small.labelString:
! ! *XlwMenu.b4.labelString:	B4
! ! *XlwMenu.b4.labelString:
! ! *XlwMenu.b5.labelString:	B5
! ! *XlwMenu.b5.labelString:
! ! *XlwMenu.alwaysInSameFrame.labelString:	Always in Same Frame
! *XlwMenu.alwaysInSameFrame.labelString:		?????? ?????? ?????????
! ! *XlwMenu.otherFrame2FramesMax.labelString:	Other Frame (2 Frames Max)
! *XlwMenu.otherFrame2FramesMax.labelString:	?????? ????????? (?????? 2 ?????????)
! ! *XlwMenu.otherFrame3FramesMax.labelString:	Other Frame (3 Frames Max)
! *XlwMenu.otherFrame3FramesMax.labelString:	?????? ????????? (?????? 3 ?????????)
! ! *XlwMenu.otherFrame4FramesMax.labelString:	Other Frame (4 Frames Max)
! *XlwMenu.otherFrame4FramesMax.labelString:	?????? ????????? (?????? 4 ?????????)
! ! *XlwMenu.otherFrame5FramesMax.labelString:	Other Frame (5 Frames Max)
! *XlwMenu.otherFrame5FramesMax.labelString:	?????? ????????? (?????? 5 ?????????)
! ! *XlwMenu.alwaysCreateNewFrame.labelString:	Always Create New Frame
! *XlwMenu.alwaysCreateNewFrame.labelString:??? ??? ???????????? ??????
! ! *XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	Temp Buffers Always in Same Frame
! *XlwMenu.tempBuffersAlwaysInSameFrame.labelString: ?????? ???????????? ????????? ?????? ???????????????
! ! *XlwMenu.tempBuffersLikeOtherBuffers.labelString:	Temp Buffers Like Other Buffers
! *XlwMenu.tempBuffersLikeOtherBuffers.labelString: ?????? ???????????? ?????? ???????????? ??????
! ! *XlwMenu.makeCurrentFrameGnuservTarget.labelString:	Make current frame gnuserv target
! *XlwMenu.makeCurrentFrameGnuservTarget.labelString:??? ???????????? gnuserv ??? ?????????
! ! *XlwMenu.inThisBuffer.labelString:	In This Buffer
! *XlwMenu.inThisBuffer.labelString:	??? ???????????????
! ! *XlwMenu.automatic.labelString:	Automatic
! *XlwMenu.automatic.labelString:		??????
! ! *XlwMenu.fonts.labelString:	Fonts
! *XlwMenu.fonts.labelString:	?????????
! ! *XlwMenu.colors.labelString:	Colors
! *XlwMenu.colors.labelString:	???
! ! *XlwMenu.least.labelString:	Least
! *XlwMenu.least.labelString:	??????
! ! *XlwMenu.more.labelString:	More
! *XlwMenu.more.labelString:	??? ???
! ! *XlwMenu.evenMore.labelString:	Even More
! *XlwMenu.evenMore.labelString:?????? ??????
! ! *XlwMenu.most.labelString:	Most
! *XlwMenu.most.labelString:	??????
! ! *XlwMenu.lazy.labelString:	Lazy
! *XlwMenu.lazy.labelString:	????????????
! ! *XlwMenu.caching.labelString:	Caching
! *XlwMenu.caching.labelString: Caching
! ! *XlwMenu.none.labelString:	None
! *XlwMenu.none.labelString:	??????
! ! *XlwMenu.blinkingParen.labelString:	Blinking Paren
! *XlwMenu.blinkingParen.labelString:	????????????
! ! *XlwMenu.steadyParen.labelString:	Steady Paren
! *XlwMenu.steadyParen.labelString:	????????? ??????
! ! *XlwMenu.expression.labelString:	Expression
! *XlwMenu.expression.labelString:	?????? ??????
! ! *XlwMenu.scrollbars.labelString:	Scrollbars
! *XlwMenu.scrollbars.labelString:	???????????????
! ! *XlwMenu.3DModeline.labelString:	3D Modeline
! *XlwMenu.3DModeline.labelString:	???????????? ?????????
! ! *XlwMenu.truncateLines.labelString:	Truncate Lines
! *XlwMenu.truncateLines.labelString:	?????? ????????? ?????????
! ! *XlwMenu.barCursor.labelString:	Bar Cursor
! *XlwMenu.barCursor.labelString:		??? ??????
! ! *XlwMenu.blinkingCursor.labelString:	Blinking Cursor
! *XlwMenu.blinkingCursor.labelString:	???????????? ??????
! ! *XlwMenu.frameLocalFontMenu.labelString:	Frame-Local Font Menu
! *XlwMenu.frameLocalFontMenu.labelString: ??????????????? ???????????????
! ! *XlwMenu.buffersMenuLength___.labelString:	Buffers Menu Length...
! *XlwMenu.buffersMenuLength___.labelString:	??????????????? ??????
! ! *XlwMenu.multiOperationBuffersSubMenus.labelString:	Multi-Operation Buffers Sub-Menus
! *XlwMenu.multiOperationBuffersSubMenus.labelString:	?????????????????? ????????????
! ! *XlwMenu.buffersMenuSorting.labelString:	Buffers Menu Sorting
! *XlwMenu.buffersMenuSorting.labelString:	??????????????? ??????
! ! *XlwMenu.submenusForBufferGroups.labelString:	Submenus for Buffer Groups
! *XlwMenu.submenusForBufferGroups.labelString: ????????? ????????? ????????????
! ! *XlwMenu.ignoreScaledFonts.labelString:	Ignore Scaled Fonts
! *XlwMenu.ignoreScaledFonts.labelString:	?????? ???????????? ??????
! ! *XlwMenu.mostRecentlyUsed.labelString:	Most Recently Used
! *XlwMenu.mostRecentlyUsed.labelString:		?????? ????????????
! ! *XlwMenu.alphabetically.labelString:	Alphabetically
! *XlwMenu.alphabetically.labelString:	????????????
! ! *XlwMenu.byMajorModeThenAlphabetically.labelString:	By Major Mode, Then Alphabetically
! *XlwMenu.byMajorModeThenAlphabetically.labelString: ???????????????????????? ????????????
! ! *XlwMenu.visible.labelString:	Visible
! *XlwMenu.visible.labelString:	??????
! ! *XlwMenu.captioned.labelString:	Captioned
! *XlwMenu.captioned.labelString:	?????? ??????
! ! *XlwMenu.defaultLocation.labelString:	Default Location
! *XlwMenu.defaultLocation.labelString: Default ??????
! ! *XlwMenu.top.labelString:	Top
! *XlwMenu.top.labelString:	???
! ! *XlwMenu.bottom.labelString:	Bottom
! *XlwMenu.bottom.labelString:	???
! ! *XlwMenu.left.labelString:	Left
! *XlwMenu.left.labelString:	??????
! ! *XlwMenu.right.labelString:	Right
! *XlwMenu.right.labelString:	?????????
! ! *XlwMenu.avoidText.labelString:	Avoid-Text
! *XlwMenu.avoidText.labelString:		????????? ?????????
! ! *XlwMenu.strokesMode.labelString:	strokes-mode
! *XlwMenu.strokesMode.labelString:	strokes-??????
! ! *XlwMenu.emacsW3.labelString:	Emacs-W3
! ! *XlwMenu.emacsW3.labelString:
! ! *XlwMenu.netscape.labelString:	Netscape
! ! *XlwMenu.netscape.labelString:
! ! *XlwMenu.mosaic.labelString:	Mosaic
! ! *XlwMenu.mosaic.labelString:
! ! *XlwMenu.mosaicCCI.labelString:	Mosaic (CCI)
! ! *XlwMenu.mosaicCCI.labelString:
! ! *XlwMenu.iXIMosaic.labelString:	IXI Mosaic
! ! *XlwMenu.iXIMosaic.labelString:
! ! *XlwMenu.lynxXterm.labelString:	Lynx (xterm)
! ! *XlwMenu.lynxXterm.labelString:
! ! *XlwMenu.lynxXemacs.labelString:	Lynx (xemacs)
! ! *XlwMenu.lynxXemacs.labelString:
! ! *XlwMenu.grail.labelString:	Grail
! ! *XlwMenu.grail.labelString:
! ! *XlwMenu.charter.labelString:	Charter
! ! *XlwMenu.charter.labelString:
! ! *XlwMenu.clean.labelString:	Clean
! ! *XlwMenu.clean.labelString:
! ! *XlwMenu.courier.labelString:	Courier
! ! *XlwMenu.courier.labelString:
! ! *XlwMenu.fixed.labelString:	Fixed
! ! *XlwMenu.fixed.labelString:
! ! *XlwMenu.helvetica.labelString:	Helvetica
! ! *XlwMenu.helvetica.labelString:
! ! *XlwMenu.lucida.labelString:	Lucida
! ! *XlwMenu.lucida.labelString:
! ! *XlwMenu.lucidabright.labelString:	Lucidabright
! ! *XlwMenu.lucidabright.labelString:
! ! *XlwMenu.lucidatypewriter.labelString:	Lucidatypewriter
! ! *XlwMenu.lucidatypewriter.labelString:
! ! *XlwMenu.newCenturySchoolbook.labelString:	New Century Schoolbook
! ! *XlwMenu.newCenturySchoolbook.labelString:
! ! *XlwMenu.terminal.labelString:	Terminal
! ! *XlwMenu.terminal.labelString:
! ! *XlwMenu.times.labelString:	Times
! ! *XlwMenu.times.labelString:
! ! *XlwMenu.utopia.labelString:	Utopia
! ! *XlwMenu.utopia.labelString:
! ! *XlwMenu.5.labelString:	5
! ! *XlwMenu.5.labelString:
! ! *XlwMenu.6.labelString:	6
! ! *XlwMenu.6.labelString:
! ! *XlwMenu.7.labelString:	7
! ! *XlwMenu.7.labelString:
! ! *XlwMenu.8.labelString:	8
! ! *XlwMenu.8.labelString:
! ! *XlwMenu.9.labelString:	9
! ! *XlwMenu.9.labelString:
! ! *XlwMenu.10.labelString:	10
! ! *XlwMenu.10.labelString:
! ! *XlwMenu.11.labelString:	11
! ! *XlwMenu.11.labelString:
! ! *XlwMenu.12.labelString:	12
! ! *XlwMenu.12.labelString:
! ! *XlwMenu.13.labelString:	13
! ! *XlwMenu.13.labelString:
! ! *XlwMenu.14.labelString:	14
! ! *XlwMenu.14.labelString:
! ! *XlwMenu.15.labelString:	15
! ! *XlwMenu.15.labelString:
! ! *XlwMenu.16.labelString:	16
! ! *XlwMenu.16.labelString:
! ! *XlwMenu.17.labelString:	17
! ! *XlwMenu.17.labelString:
! ! *XlwMenu.18.labelString:	18
! ! *XlwMenu.18.labelString:
! ! *XlwMenu.19.labelString:	19
! ! *XlwMenu.19.labelString:
! ! *XlwMenu.20.labelString:	20
! ! *XlwMenu.20.labelString:
! ! *XlwMenu.23.labelString:	23
! ! *XlwMenu.23.labelString:
! ! *XlwMenu.24.labelString:	24
! ! *XlwMenu.24.labelString:
! ! *XlwMenu.black.labelString:	Black
! ! *XlwMenu.black.labelString:
! ! *XlwMenu.bold.labelString:	Bold
! ! *XlwMenu.bold.labelString:
! ! *XlwMenu.demibold.labelString:	Demibold
! ! *XlwMenu.demibold.labelString:
! ! *XlwMenu.medium.labelString:	Medium
! ! *XlwMenu.medium.labelString:
! ! *XlwMenu.regular.labelString:	Regular
! ! *XlwMenu.regular.labelString:
! ! *XlwMenu.grep___.labelString:	Grep...
! ! *XlwMenu.grep___.labelString:
! ! *XlwMenu.compile___.labelString:	Compile...
! *XlwMenu.compile___.labelString:	?????????...
! ! *XlwMenu.shell.labelString:	Shell
! *XlwMenu.shell.labelString:	??????
! ! *XlwMenu.shellCommand___.labelString:	Shell Command...
! *XlwMenu.shellCommand___.labelString:	?????? ??????...
! ! *XlwMenu.shellCommandOnRegion___.labelString:	Shell Command on Region...
! *XlwMenu.shellCommandOnRegion___.labelString:	???????????? ??????????????? ??????...
! ! *XlwMenu.debugGDB___.labelString:	Debug (GDB)...
! *XlwMenu.debugGDB___.labelString:	????????? (GDB)...
! ! *XlwMenu.debugDBX___.labelString:	Debug (DBX)...
! *XlwMenu.debugDBX___.labelString:	????????? (DBX)...
! ! *XlwMenu.oOBrowser___.labelString:	OO-Browser...
! *XlwMenu.oOBrowser___.labelString:	OO-?????????...
! ! *XlwMenu.tags.labelString:	Tags
! *XlwMenu.tags.labelString:	??????
! ! *XlwMenu.vC.labelString:	VC
! ! *XlwMenu.vC.labelString:
! ! *XlwMenu.findTag___.labelString:	Find Tag...
! *XlwMenu.findTag___.labelString:	????????? ??????...
! ! *XlwMenu.findOtherWindow___.labelString:	Find Other Window...
! *XlwMenu.findOtherWindow___.labelString:	????????? ??????????????? ??????...
! ! *XlwMenu.nextTag___.labelString:	Next Tag...
! *XlwMenu.nextTag___.labelString:	????????? ??????...
! ! *XlwMenu.nextOtherWindow___.labelString:	Next Other Window...
! *XlwMenu.nextOtherWindow___.labelString:	????????? ??????????????? ????????? ????????????...
! ! *XlwMenu.nextFile.labelString:	Next File
! *XlwMenu.nextFile.labelString:		????????? ??????
! ! *XlwMenu.tagsSearch___.labelString:	Tags Search...
! *XlwMenu.tagsSearch___.labelString:	?????? ??????...
! ! *XlwMenu.tagsReplace___.labelString:	Tags Replace...
! *XlwMenu.tagsReplace___.labelString:	?????? ?????????...
! ! *XlwMenu.continueSearchReplace.labelString:	Continue Search/Replace
! *XlwMenu.continueSearchReplace.labelString:	??????/????????? ??????
! ! *XlwMenu.popStack.labelString:	Pop stack
! *XlwMenu.popStack.labelString:		???????????? ??????
! ! *XlwMenu.apropos___.labelString:	Apropos...
! ! *XlwMenu.apropos___.labelString:	???????????? ??????...
! ! *XlwMenu.setTagsTableFile___.labelString:	Set Tags Table File...
! *XlwMenu.setTagsTableFile___.labelString:	????????? ????????? ??????...
! ! *XlwMenu.registerFile.labelString:	Register File
! *XlwMenu.registerFile.labelString:	?????? ??????
! ! *XlwMenu.revertToLastRevision.labelString:	Revert to Last Revision
! *XlwMenu.revertToLastRevision.labelString:	????????? ??????????????? ??????
! ! *XlwMenu.cancelLastCheckin.labelString:	Cancel Last Checkin
! *XlwMenu.cancelLastCheckin.labelString:		????????? Checkin ??? ?????????
! ! *XlwMenu.renameFile.labelString:	Rename File
! *XlwMenu.renameFile.labelString:	????????? ?????? ?????????
! ! *XlwMenu.diffAgainstLastVersion.labelString:	Diff Against Last Version
! *XlwMenu.diffAgainstLastVersion.labelString:	??????????????? diff
! ! *XlwMenu.diffBetweenRevisions___.labelString:	Diff Between Revisions...
! *XlwMenu.diffBetweenRevisions___.labelString:	????????? ??????????????? diff...
! ! *XlwMenu.visitOtherVersion___.labelString:	Visit Other Version...
! *XlwMenu.visitOtherVersion___.labelString:	??????  ????????????...
! ! *XlwMenu.showEditHistory.labelString:	Show Edit History
! *XlwMenu.showEditHistory.labelString:	??????????????? ??????
! ! *XlwMenu.listLockedFilesAnyUser.labelString:	List Locked Files Any User
! *XlwMenu.listLockedFilesAnyUser.labelString:	????????? ????????? ??????
! ! *XlwMenu.createSnapshot.labelString:	Create Snapshot
! *XlwMenu.createSnapshot.labelString:	???????????? ?????????
! ! *XlwMenu.retrieveSnapshot.labelString:	Retrieve Snapshot
! *XlwMenu.retrieveSnapshot.labelString:	???????????? ?????????
! ! *XlwMenu.cVSUpdateDirectory.labelString:	CVS Update Directory
! *XlwMenu.cVSUpdateDirectory.labelString:	CVS ?????? ??????
! ! *XlwMenu.file.labelString:	File
! *XlwMenu.file.labelString:	??????
! ! *XlwMenu.edit.labelString:	Edit
! *XlwMenu.edit.labelString:	??????
! ! *XlwMenu.mule.labelString:	Mule
! ! *XlwMenu.mule.labelString:
! ! *XlwMenu.apps.labelString:	Apps
! *XlwMenu.apps.labelString:	??????
! ! *XlwMenu.options.labelString:	Options
! *XlwMenu.options.labelString:	??????
! ! *XlwMenu.buffers.labelString:	Buffers
! *XlwMenu.buffers.labelString:	?????????
! ! *XlwMenu.tools.labelString:	Tools
! *XlwMenu.tools.labelString:	??????
! ! *XlwMenu.lispInteraction.labelString:	Lisp-Interaction
! *XlwMenu.lispInteraction.labelString:	Lisp-??????
! ! *XlwMenu.load_emacs.labelString:	Load .emacs
! *XlwMenu.load_emacs.labelString:	.emacs ??? ???????????????
! ! *XlwMenu.help.labelString:	Help
! *XlwMenu.help.labelString:	?????????


--- NEW FILE Emacs.ad.ko_KR.eucKR ---
! XEmacs 21.x ?? ???? (????)
!
!	Xiaolin Park <xlpark at kankou.cs.uec.ac.jp>
!			Time-stamp: <03/10/17 21:15:10 petersen>
!
! This is the app-defaults file for XEmacs.
!
! This used to be identical to sample.Xdefaults, but the resources
! below have been rewritten to be as general as possible to avoid
! overriding user resources.  Other than the form rewriting, both
! files should be kept in sync. 
! 
! The resources below are loaded into the XEmacs executable at compile-time:
! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
! effect.
! 
! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
! (or whatever the standard app-defaults directory is at your site) to cause
! it to be consulted at run-time.  (Do this only for site-wide customizations:
! personal customizations should be put into ~/.Xdefaults instead.)
! Note that the file must be named Emacs, not XEmacs.
! 
! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of
! the various resources and the syntax for setting them.
! 
! Energize users: note that this is not the same app-defaults file that is
! used with the Energize-specific version of XEmacs.


! Colors and backgrounds.
! ======================
! The contrasts of these colors will cause them to map to the appropriate
! one of "black" or "white" on monochrome systems.
! 
! The valid color names on your system can be found by looking in the file
! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/.

! ! Set the modeline colors.
! Emacs.modeline*attributeForeground:	Black
! Emacs.modeline*attributeBackground:	Gray75

! ! Set the color of the text cursor.
! Emacs.text-cursor*attributeBackground:	Red3

! If you want to set the color of the mouse pointer, do this:
! Emacs.pointer*attributeForeground:	Black
! If you want to set the background of the mouse pointer, do this:
! Emacs.pointer*attributeBackground:	White
! Note that by default, the pointer foreground and background are the same
! as the default face.

! Set the menubar colors.  This overrides the default foreground and
! background colors specified above.
*menubar*Foreground:			Gray30
*menubar*Background:			Gray80
! This is for buttons in the menubar.  
! Yellow would be better, but that would map to white on monochrome.
*menubar*buttonForeground:		Blue
*XlwMenu*highlightForeground:		Red
*XlwMenu*titleForeground:		Maroon
*XlwMenu*selectColor:			ForestGreen
*XmToggleButton*selectColor:		ForestGreen

! Specify the colors of popup menus.
*popup*Foreground:			Black
*popup*Background:			Gray80

! Specify the colors of the various sub-widgets of the dialog boxes.
*dialog*Foreground:			Black
! #A5C0C1 is a shade of blue
*dialog*Background:			#A5C0C1
! The following three are for Motif dialog boxes ...
*dialog*XmTextField*Background:		WhiteSmoke
*dialog*XmText*Background:		WhiteSmoke
*dialog*XmList*Background:		WhiteSmoke
! While this one is for Athena dialog boxes.
*dialog*Command*Background:		WhiteSmoke

! Xlw Scrollbar colors
*XlwScrollBar*Foreground:		Gray30
*XlwScrollBar*Background:		Gray80
*XmScrollBar*Foreground:		Gray30
*XmScrollBar*Background:		Gray80

!
! The Lucid Scrollbar supports two added resources, SliderStyle is either
! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
! of the slider that depresses when the slider is clicked on.  ArrowPosition is
! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
! of the scrollbar, same puts both arrows at the same end, like the Amiga.
!
Emacs*XlwScrollBar.SliderStyle:    dimple
! Emacs*XlwScrollBar.ArrowPosition:  opposite

!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

! *topToolBarShadowColor:		Gray90
! *bottomToolBarShadowColor:		Gray40
! *backgroundToolBarColor:		Gray80
! *toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
Emacs.default.attributeFont:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
! *menubar*Font:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*popup*Font:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*XmTextField*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*XmText*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*XmList*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField*translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton*translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! XIM fontset (defaults to system fontset default)
! *EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
!    Japanese localization resources for XEmacs.
! @(#)Emacs	1.3 96/09/22
!    Copyright (C) 1996 Sun Microsystems, Inc.
!!
! This file is part of XEmacs.
! 
! XEmacs is free software; you can redistribute it and/or modify it
! under the terms of the GNU General Public License as published by the
! Free Software Foundation; either version 2, or (at your option) any
! later version.
! XEmacs 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 XEmacs; see the file COPYING.  If not, write to the
! Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! Boston, MA 02111-1307, USA.
! Copyright (C) 1996 Sun Microsystems Inc.
!
! Japanese Resources to be placed in etc/app-defaults/ja/Emacs
! for xemacs-mule.  It is same on another languages such like fr,
! if you want to have French menu label, place it on
! etc/app-defaults/fr/Emacs.

! Pulldown menu internationalization.  The first line of the file
! "*XlwMenu.resourceLabels: True" has to be there to make sure
! all the labelString will be read and displayed by X.
*XlwMenu.resourceLabels: True

! CDE doesn't require this but OpenWindows does.
! Note that this `gothic' font family is effective just for Japanese.
! And fontList is just used under Motif menubar.
!*fontList: -misc-fixed-medium-r-normal--16-*-*-*-*-*-*-*:
*fontList: -*-gothic-medium-r-normal--16-*-*-*-*-*-*-*:
!! FontSet for menus when you use --with-xfs or --with-xim=xlib.
*fontSet: -daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*

! Starting below here are menu label string which can be translated to
! different languages. 
! Example: *XlwMenu.file.labelString: File  
! Characters before the ":" sign, "Example: *XlwMenu.file.labelString"
! can not be changed. They must stay exactly the way they are.
! The only string to be translated is the string, "File".
! Some resource names such as "file", "quit" have been used in several
! places.  However, each of them only has to be translated once in this X
! resource file.
! *XlwMenu.readMailVM___.labelString:	Read Mail (VM)...
*XlwMenu.readMailVM___.labelString:	?????? ???? (VM)...
! *XlwMenu.readMailMH___.labelString:	Read Mail (MH)...
*XlwMenu.readMailMH___.labelString:	?????? ???? (MH)...
! *XlwMenu.sendMail___.labelString:	Send mail...
*XlwMenu.sendMail___.labelString:	?????? ??????
! *XlwMenu.usenetNews.labelString:	Usenet News
*XlwMenu.usenetNews.labelString:	???? ????
! *XlwMenu.browseTheWeb.labelString:	Browse the Web
*XlwMenu.browseTheWeb.labelString:	?????? ????
! *XlwMenu.gopher.labelString:	Gopher
*XlwMenu.gopher.labelString:	Gopher
! *XlwMenu.hyperbole___.labelString:	Hyperbole...
*XlwMenu.hyperbole___.labelString:	Hyperbole...
! *XlwMenu.spellCheckBuffer.labelString:	Spell-Check Buffer
*XlwMenu.spellCheckBuffer.labelString:	???????? ????????
! *XlwMenu.toggleVIEmulation.labelString:	Toggle VI emulation
*XlwMenu.toggleVIEmulation.labelString: 	VI ?????? ??????
! *XlwMenu.calendar.labelString:	Calendar
*XlwMenu.calendar.labelString:		????
! *XlwMenu.games.labelString:	Games
*XlwMenu.games.labelString:	????
! *XlwMenu.3MonthCalendar.labelString:	3-Month Calendar
*XlwMenu.3MonthCalendar.labelString:	???? ????
! *XlwMenu.diary.labelString:	Diary
*XlwMenu.diary.labelString:	????
! *XlwMenu.holidays.labelString:	Holidays
*XlwMenu.holidays.labelString:		????
! *XlwMenu.phasesOfTheMoon.labelString:	Phases of the Moon
*XlwMenu.phasesOfTheMoon.labelString:	????
! *XlwMenu.sunriseSunset.labelString:	Sunrise/Sunset
*XlwMenu.sunriseSunset.labelString:	????????/????????
! *XlwMenu.mineGame.labelString:	Mine Game 
*XlwMenu.mineGame.labelString:		Mine ????
! *XlwMenu.tetris.labelString:	Tetris
*XlwMenu.tetris.labelString:	????????
! *XlwMenu.quoteFromZippy.labelString:	Quote from Zippy
*XlwMenu.quoteFromZippy.labelString:	Zippy ?? ????
! *XlwMenu.psychoanalyst.labelString:	Psychoanalyst
*XlwMenu.psychoanalyst.labelString:	????????
! *XlwMenu.psychoanalyzeZippy.labelString:	Psychoanalyze Zippy!
*XlwMenu.psychoanalyzeZippy.labelString:	Zippy ?? ????????
! *XlwMenu.randomFlames.labelString:	Random Flames
*XlwMenu.randomFlames.labelString:	????????
! *XlwMenu.dunnetAdventure.labelString:	Dunnet (Adventure)
*XlwMenu.dunnetAdventure.labelString:	Dunnet (????)
! *XlwMenu.towersOfHanoi.labelString:	Towers of Hanoi
*XlwMenu.towersOfHanoi.labelString:	Hanoi ?? ??
! *XlwMenu.gameOfLife.labelString:	Game of Life
*XlwMenu.gameOfLife.labelString:	????????
! *XlwMenu.multiplicationPuzzle.labelString:	Multiplication Puzzle
*XlwMenu.multiplicationPuzzle.labelString:	???? ????????
! *XlwMenu.listAllBuffers.labelString:	List All Buffers
*XlwMenu.listAllBuffers.labelString:	???? ?????? ????
! *XlwMenu..labelString:	
! *XlwMenu..labelString:
! *XlwMenu.emacs.labelString:	Emacs
! *XlwMenu.emacs.labelString:
! *XlwMenu.group___.labelString:	Group...
! *XlwMenu.group___.labelString:	????...
! *XlwMenu.variable___.labelString:	Variable...
! *XlwMenu.variable___.labelString:	????...
! *XlwMenu.face___.labelString:	Face...
! *XlwMenu.face___.labelString:	??...
! *XlwMenu.saved___.labelString:	Saved...
! *XlwMenu.saved___.labelString:	???????? ????...
! *XlwMenu.set___.labelString:	Set...
! *XlwMenu.set___.labelString:	????...
! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	?????? ????...
! *XlwMenu.browse___.labelString:	Browse...
! *XlwMenu.browse___.labelString:	????????...
! *XlwMenu.emacs___.labelString:	Emacs...
! *XlwMenu.emacs___.labelString:
! *XlwMenu.editing.labelString:	Editing
*XlwMenu.editing.labelString:	????
! *XlwMenu.external.labelString:	External
*XlwMenu.external.labelString:		????
! *XlwMenu.programming.labelString:	Programming
*XlwMenu.programming.labelString:	????????????
! *XlwMenu.applications.labelString:	Applications
*XlwMenu.applications.labelString:	????
! *XlwMenu.development.labelString:	Development
*XlwMenu.development.labelString:	????
! *XlwMenu.environment.labelString:	Environment
*XlwMenu.environment.labelString:	????
! *XlwMenu.data.labelString:	Data
*XlwMenu.data.labelString:	??????
! *XlwMenu.files.labelString:	Files
*XlwMenu.files.labelString:	????
! *XlwMenu.wp.labelString:	Wp
*XlwMenu.wp.labelString:	????????
! *XlwMenu.faces.labelString:	Faces
*XlwMenu.faces.labelString:	??
! *XlwMenu.hypermedia.labelString:	Hypermedia
*XlwMenu.hypermedia.labelString:	??????
! *XlwMenu.help.labelString:	Help
! *XlwMenu.help.labelString:	??????
! *XlwMenu.local.labelString:	Local
*XlwMenu.local.labelString:	????
! *XlwMenu.undo.labelString:	Undo
*XlwMenu.undo.labelString:	???? ????
! *XlwMenu.cut.labelString:	Cut
*XlwMenu.cut.labelString:	??????
! *XlwMenu.copy.labelString:	Copy
*XlwMenu.copy.labelString:	????
! *XlwMenu.paste.labelString:	Paste
*XlwMenu.paste.labelString:	??????
! *XlwMenu.clear.labelString:	Clear
*XlwMenu.clear.labelString:	??????
! *XlwMenu.search___.labelString:	Search...
*XlwMenu.search___.labelString:		????...
! *XlwMenu.searchBackward___.labelString:	Search Backward...
*XlwMenu.searchBackward___.labelString:		?????? ????
! *XlwMenu.replace___.labelString:	Replace...
*XlwMenu.replace___.labelString:	??????
! *XlwMenu.searchRegexp___.labelString:	Search (Regexp)...
*XlwMenu.searchRegexp___.labelString:	???? (Regexp)...
! *XlwMenu.searchBackwardRegexp___.labelString:	Search Backward (Regexp)...
*XlwMenu.searchBackwardRegexp___.labelString:	?????? ???? (Regexp)...
! *XlwMenu.replaceRegexp___.labelString:	Replace (Regexp)...
*XlwMenu.replaceRegexp___.labelString:		?????? (Regexp)...
! *XlwMenu.gotoLine___.labelString:	Goto Line...
*XlwMenu.gotoLine___.labelString:	?????? ?????? ????	
! *XlwMenu.whatLine.labelString:	What Line
*XlwMenu.whatLine.labelString:		??????
! *XlwMenu.bookmarks.labelString:	Bookmarks
*XlwMenu.bookmarks.labelString:		??????
! *XlwMenu.startMacroRecording.labelString:	Start Macro Recording
*XlwMenu.startMacroRecording.labelString:	?????? ???? ????
! *XlwMenu.endMacroRecording.labelString:	End Macro Recording
*XlwMenu.endMacroRecording.labelString:		?????? ???? ????
! *XlwMenu.executeLastMacro.labelString:	Execute Last Macro
*XlwMenu.executeLastMacro.labelString:		???? ?????? ????
! *XlwMenu.showMessageLog.labelString:	Show Message Log
*XlwMenu.showMessageLog.labelString:	?????? ???? ????
! *XlwMenu.jumpToBookmark.labelString:	Jump to Bookmark
*XlwMenu.jumpToBookmark.labelString:	???????? ????
! *XlwMenu.setBookmark.labelString:	Set bookmark
*XlwMenu.setBookmark.labelString:	?????? ????
! *XlwMenu.insertContents.labelString:	Insert contents
*XlwMenu.insertContents.labelString:	?????? ????????
! *XlwMenu.insertLocation.labelString:	Insert location
*XlwMenu.insertLocation.labelString:	?????? ????????
! *XlwMenu.renameBookmark.labelString:	Rename bookmark
*XlwMenu.renameBookmark.labelString:	?????? ???? ??????
! *XlwMenu.deleteBookmark.labelString:	Delete Bookmark
*XlwMenu.deleteBookmark.labelString:	?????? ??????
! *XlwMenu.editBookmarkList.labelString:	Edit Bookmark List
*XlwMenu.editBookmarkList.labelString:		?????? ??????????
! *XlwMenu.saveBookmarks.labelString:	Save bookmarks
*XlwMenu.saveBookmarks.labelString:	?????? ????
! *XlwMenu.saveBookmarksAs___.labelString:	Save bookmarks as...
*XlwMenu.saveBookmarksAs___.labelString:	???????? ???? ???????? ????
! *XlwMenu.loadABookmarkFile.labelString:	Load a bookmark file
*XlwMenu.loadABookmarkFile.labelString:		?????? ???? ??????????
! *XlwMenu.open___.labelString:	Open...
*XlwMenu.open___.labelString:	????...
! *XlwMenu.openInOtherWindow___.labelString:	Open in Other Window...
*XlwMenu.openInOtherWindow___.labelString:	???? ???????? ????
! *XlwMenu.openInNewFrame___.labelString:	Open in New Frame...
*XlwMenu.openInNewFrame___.labelString:		?? ?????????? ????
! *XlwMenu.insertFile___.labelString:	Insert File...
*XlwMenu.insertFile___.labelString:	???? ????????...
! *XlwMenu.viewFile___.labelString:	View File...
*XlwMenu.viewFile___.labelString:	???? ????...
! *XlwMenu.save.labelString:	Save
*XlwMenu.save.labelString:	????
! *XlwMenu.saveAs___.labelString:	Save As...
*XlwMenu.saveAs___.labelString:		???? ???????? ????
! *XlwMenu.saveSomeBuffers.labelString:	Save Some Buffers
*XlwMenu.saveSomeBuffers.labelString:	?????? ???????? ????
! *XlwMenu.printBuffer.labelString:	Print Buffer
*XlwMenu.printBuffer.labelString:	?????? ????
! *XlwMenu.prettyPrintBuffer.labelString:	Pretty-Print Buffer
*XlwMenu.prettyPrintBuffer.labelString:		???????? ????????
! *XlwMenu.newFrame.labelString:	New Frame
*XlwMenu.newFrame.labelString:		?? ??????
! *XlwMenu.frameOnOtherDisplay___.labelString:	Frame on Other Display...
*XlwMenu.frameOnOtherDisplay___.labelString: ???? ?????????????? ??????...
! *XlwMenu.deleteFrame.labelString:	Delete Frame
*XlwMenu.deleteFrame.labelString:	?????? ??????
! *XlwMenu.splitWindow.labelString:	Split Window
*XlwMenu.splitWindow.labelString:	?????? ????
! *XlwMenu.unSplitKeepThis.labelString:	Un-Split (Keep This)
*XlwMenu.unSplitKeepThis.labelString:	???????? (?????? ????)
! *XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep Others)
*XlwMenu.unSplitKeepOthers.labelString:		???????? (???????? ????)
! *XlwMenu.revertBuffer.labelString:	Revert Buffer
*XlwMenu.revertBuffer.labelString:	?????? ????
! *XlwMenu.deleteBuffer.labelString:	Delete Buffer
*XlwMenu.deleteBuffer.labelString:	?????? ??????
! *XlwMenu.exitXEmacs.labelString:	Exit XEmacs
*XlwMenu.exitXEmacs.labelString:	XEmacs ????
! *XlwMenu.aboutXEmacs___.labelString:	About XEmacs...
*XlwMenu.aboutXEmacs___.labelString:	XEmacs ?? ??????
! *XlwMenu.basics.labelString:	Basics
*XlwMenu.basics.labelString:	????
! *XlwMenu.xEmacsFAQ.labelString:	XEmacs FAQ
*XlwMenu.xEmacsFAQ.labelString:	XEmacs FAQ
! *XlwMenu.samples.labelString:	Samples
*XlwMenu.samples.labelString:	????
! *XlwMenu.lookupInInfo.labelString:	Lookup in Info
*XlwMenu.lookupInInfo.labelString:	Info???? ????
! *XlwMenu.manuals.labelString:	Manuals
*XlwMenu.manuals.labelString:	??????
! *XlwMenu.commandsKeys.labelString:	Commands & Keys
*XlwMenu.commandsKeys.labelString:	???? & ??
! *XlwMenu.recentMessages.labelString:	Recent Messages
*XlwMenu.recentMessages.labelString:	???? ??????
! *XlwMenu.misc.labelString:	Misc
*XlwMenu.misc.labelString:	??????????
! *XlwMenu.submitBugReport.labelString:	Submit Bug Report
*XlwMenu.submitBugReport.labelString:	??Bug Report ????
! *XlwMenu.tutorial.labelString:	Tutorial
*XlwMenu.tutorial.labelString:	??????
! *XlwMenu.news.labelString:	News
*XlwMenu.news.labelString:	????
! *XlwMenu.packages.labelString:	Packages
*XlwMenu.packages.labelString:		??????
! *XlwMenu.splash.labelString:	Splash
*XlwMenu.splash.labelString:	Splash
! *XlwMenu.fAQLocal.labelString:	FAQ (local)
*XlwMenu.fAQLocal.labelString:	FAQ (local)
! *XlwMenu.fAQViaWWW.labelString:	FAQ via WWW
*XlwMenu.fAQViaWWW.labelString:		FAQ (WWW ????)
! *XlwMenu.homePage.labelString:	Home Page
*XlwMenu.homePage.labelString:		Home Page
! *XlwMenu.sample.labelString:	Sample
*XlwMenu.sample.labelString:	????
! *XlwMenu.keyBinding___.labelString:	Key Binding...
*XlwMenu.keyBinding___.labelString: ??????...
! *XlwMenu.command___.labelString:	Command...
*XlwMenu.command___.labelString:	????...
! *XlwMenu.function___.labelString:	Function...
*XlwMenu.function___.labelString:	????...
! *XlwMenu.topic___.labelString:	Topic...
*XlwMenu.topic___.labelString:		????...
! *XlwMenu.info.labelString:	Info
*XlwMenu.info.labelString:	Info
! *XlwMenu.unixManual___.labelString:	Unix Manual...
*XlwMenu.unixManual___.labelString:	Unix Manual...
! *XlwMenu.mode.labelString:	Mode
*XlwMenu.mode.labelString:	????
! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	?????? ????...
! *XlwMenu.aproposDocs___.labelString:	Apropos Docs...
*XlwMenu.aproposDocs___.labelString:	???????? ?????? ????...
! *XlwMenu.key___.labelString:	Key...
*XlwMenu.key___.labelString:	??...
! *XlwMenu.bindings.labelString:	Bindings
*XlwMenu.bindings.labelString:		????
! *XlwMenu.mouseBindings.labelString:	Mouse Bindings
*XlwMenu.mouseBindings.labelString:	Mouse ????
! *XlwMenu.recentKeys.labelString:	Recent Keys
*XlwMenu.recentKeys.labelString:	??????
! *XlwMenu.variable___.labelString:	Variable...
! *XlwMenu.variable___.labelString:
! *XlwMenu.locateCommand___.labelString:	Locate Command...
*XlwMenu.locateCommand___.labelString:	?????? ????...
! *XlwMenu.noWarranty.labelString:	No Warranty
*XlwMenu.noWarranty.labelString:	??????
! *XlwMenu.xEmacsLicense.labelString:	XEmacs License
*XlwMenu.xEmacsLicense.labelString:	XEmacs ??????
! *XlwMenu.theLatestVersion.labelString:	The Latest Version
*XlwMenu.theLatestVersion.labelString:	???? ????
! *XlwMenu.evaluateLastSExpression.labelString:	Evaluate Last S-expression
*XlwMenu.evaluateLastSExpression.labelString:	???? S???? ????
! *XlwMenu.evaluateEntireBuffer.labelString:	Evaluate Entire Buffer
*XlwMenu.evaluateEntireBuffer.labelString:	???????????? ????
! *XlwMenu.evaluateRegion.labelString:	Evaluate Region
*XlwMenu.evaluateRegion.labelString:	???? ????
! *XlwMenu.evaluateThisDefun.labelString:	Evaluate This Defun
*XlwMenu.evaluateThisDefun.labelString:	?? Defun?? ????
! *XlwMenu.debugThisDefun.labelString:	Debug This Defun
*XlwMenu.debugThisDefun.labelString:	?? Defun?? ??????
! *XlwMenu.traceAFunction.labelString:	Trace a Function
*XlwMenu.traceAFunction.labelString:	?????? ????
! *XlwMenu.untraceAllFunctions.labelString:	Untrace All Functions
*XlwMenu.untraceAllFunctions.labelString:	???? ?????? ??????
! *XlwMenu.commentOutRegion.labelString:	Comment Out Region
*XlwMenu.commentOutRegion.labelString:	?????????? ??????
! *XlwMenu.indentRegion.labelString:	Indent Region
*XlwMenu.indentRegion.labelString:	???? ??????
! *XlwMenu.indentLine.labelString:	Indent Line
*XlwMenu.indentLine.labelString:	?? ??????
! *XlwMenu.debugOnError.labelString:	Debug On Error
! *XlwMenu.debugOnError.labelString:	?????? ?? ??????
! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
! *XlwMenu.debugOnQuit.labelString:	???????? ??????
! *XlwMenu.debugOnSignal.labelString:	Debug on Signal
*XlwMenu.debugOnSignal.labelString: ?????? ??????
! *XlwMenu.describeLanguageSupport.labelString:	Describe language support
*XlwMenu.describeLanguageSupport.labelString:	???? ???????? ????
! *XlwMenu.setLanguageEnvironment.labelString:	Set language environment
*XlwMenu.setLanguageEnvironment.labelString:	?????????? ????
! *XlwMenu.toggleInputMethod.labelString:	Toggle input method
*XlwMenu.toggleInputMethod.labelString:		?????????? ??????
! *XlwMenu.selectInputMethod.labelString:	Select input method
*XlwMenu.selectInputMethod.labelString:	???????? ????
! *XlwMenu.describeInputMethod.labelString:	Describe input method
*XlwMenu.describeInputMethod.labelString:???????? ????
! *XlwMenu.describeCurrentCodingSystems.labelString:	Describe current coding systems
*XlwMenu.describeCurrentCodingSystems.labelString:	???? ???? ???????? ????
! *XlwMenu.setCodingSystemOfBufferFile.labelString:	Set coding system of buffer file
*XlwMenu.setCodingSystemOfBufferFile.labelString:	?????? ???? ???? ?????? ????
! *XlwMenu.setCodingSystemOfTerminal.labelString:	Set coding system of terminal
*XlwMenu.setCodingSystemOfTerminal.labelString:		?????? ???? ?????? ????
! *XlwMenu.setCodingSystemOfKeyboard.labelString:	Set coding system of keyboard
*XlwMenu.setCodingSystemOfKeyboard.labelString:	?????? ???? ?????? ????
! *XlwMenu.setCodingSystemOfProcess.labelString:	Set coding system of process
*XlwMenu.setCodingSystemOfProcess.labelString:	???????? ???? ?????? ????
! *XlwMenu.showCharacterTable.labelString:	Show character table
*XlwMenu.showCharacterTable.labelString:	???????? ????
! *XlwMenu.showDiagnosisForMULE.labelString:	Show diagnosis for MULE
*XlwMenu.showDiagnosisForMULE.labelString:	MULE?? ????????
! *XlwMenu.showManyLanguages.labelString:	Show many languages
*XlwMenu.showManyLanguages.labelString:	???? ????????
! *XlwMenu.chineseGB.labelString:	Chinese-GB
*XlwMenu.chineseGB.labelString:		??????-GB
! *XlwMenu.chineseBIG5.labelString:	Chinese-BIG5
*XlwMenu.chineseBIG5.labelString:	??????-BIG5
! *XlwMenu.cyrillicISO.labelString:	Cyrillic-ISO
*XlwMenu.cyrillicISO.labelString:	????-ISO
! *XlwMenu.cyrillicKOI8.labelString:	Cyrillic-KOI8
*XlwMenu.cyrillicKOI8.labelString:	????-KOI8
! *XlwMenu.cyrillicALT.labelString:	Cyrillic-ALT
*XlwMenu.cyrillicALT.labelString:	????-ALT
! *XlwMenu.cyrillic.labelString:	Cyrillic
*XlwMenu.cyrillic.labelString:	????
! ! *XlwMenu.english.labelString:	English
*XlwMenu.english.labelString:		????
! *XlwMenu.aSCII.labelString:	ASCII
! *XlwMenu.aSCII.labelString:
! *XlwMenu.latin1.labelString:	Latin-1
*XlwMenu.latin1.labelString:	????-1
! *XlwMenu.german.labelString:	German
*XlwMenu.german.labelString:	??????
! *XlwMenu.french.labelString:	French
*XlwMenu.french.labelString:	????????
! *XlwMenu.norwegian.labelString:	Norwegian
*XlwMenu.norwegian.labelString:		??????????
! *XlwMenu.latin2.labelString:	Latin-2
*XlwMenu.latin2.labelString:	????-2
! *XlwMenu.croatian.labelString:	Croatian
*XlwMenu.croatian.labelString:		??????????
! *XlwMenu.polish.labelString:	Polish
*XlwMenu.polish.labelString:	????????
! *XlwMenu.latin3.labelString:	Latin-3
*XlwMenu.latin3.labelString:	????-3
! *XlwMenu.latin4.labelString:	Latin-4
*XlwMenu.latin4.labelString:	????-4
! *XlwMenu.latin5.labelString:	Latin-5
*XlwMenu.latin5.labelString:	????-5
! *XlwMenu.greek.labelString:	Greek
*XlwMenu.greek.labelString:	????????
! *XlwMenu.hebrew.labelString:	Hebrew
*XlwMenu.hebrew.labelString:	??????????
! *XlwMenu.japanese.labelString:	Japanese
*XlwMenu.japanese.labelString:		??????
! *XlwMenu.korean.labelString:	Korean
*XlwMenu.korean.labelString:	????
! *XlwMenu.iPA.labelString:	IPA
! *XlwMenu.iPA.labelString:
! *XlwMenu.customize.labelString:	Customize
*XlwMenu.customize.labelString:	????????????
! *XlwMenu.readOnly.labelString:	Read Only
*XlwMenu.readOnly.labelString:	???? ?????? ????
! *XlwMenu.editingOptions.labelString:	Editing Options
*XlwMenu.editingOptions.labelString:	???? ????????
! *XlwMenu.generalOptions.labelString:	General Options
*XlwMenu.generalOptions.labelString:	???? ????????
! *XlwMenu.printingOptions.labelString:	Printing Options
*XlwMenu.printingOptions.labelString:	???? ????????
! *XlwMenu.otherWindowLocation.labelString:	"Other Window" Location
*XlwMenu.otherWindowLocation.labelString:	???? ?????? ????????
! *XlwMenu.syntaxHighlighting.labelString:	Syntax Highlighting
*XlwMenu.syntaxHighlighting.labelString:	?????? ????
! *XlwMenu.parenHighlighting.labelString:	Paren Highlighting
*XlwMenu.parenHighlighting.labelString:	?????? ????
! *XlwMenu.frameAppearance.labelString:	Frame Appearance
*XlwMenu.frameAppearance.labelString:	?????? ????
! *XlwMenu.menubarAppearance.labelString:	Menubar Appearance
*XlwMenu.menubarAppearance.labelString: ?????? ????
! *XlwMenu.toolbarAppearance.labelString:	Toolbar Appearance
*XlwMenu.toolbarAppearance.labelString:	?????? ????
! *XlwMenu.mouse.labelString:	Mouse
*XlwMenu.mouse.labelString:	Mouse
! *XlwMenu.openURLsWith.labelString:	Open URLs With
*XlwMenu.openURLsWith.labelString:	URLs ????
! *XlwMenu.browseFaces___.labelString:	Browse Faces...
*XlwMenu.browseFaces___.labelString: ???? ????
! *XlwMenu.font.labelString:	Font
*XlwMenu.font.labelString:	??????
! *XlwMenu.size.labelString:	Size
*XlwMenu.size.labelString:	????
! *XlwMenu.weight.labelString:	Weight
*XlwMenu.weight.labelString:	????
! *XlwMenu.saveOptions.labelString:	Save Options
*XlwMenu.saveOptions.labelString: ???? Options
! *XlwMenu.emacs.labelString:	Emacs
! *XlwMenu.emacs.labelString:
! *XlwMenu.group___.labelString:	Group...
*XlwMenu.group___.labelString:	????...
! *XlwMenu.variable___.labelString:	Variable...
*XlwMenu.variable___.labelString:	????...
! *XlwMenu.face___.labelString:	Face...
*XlwMenu.face___.labelString:	??...
! *XlwMenu.saved___.labelString:	Saved...
*XlwMenu.saved___.labelString:		???????? ????...
! *XlwMenu.set___.labelString:	Set...
*XlwMenu.set___.labelString:	????...
! *XlwMenu.apropos___.labelString:	Apropos...
*XlwMenu.apropos___.labelString:	?????? ????...
! *XlwMenu.browse___.labelString:	Browse...
*XlwMenu.browse___.labelString:		????????...
!! *XlwMenu.overstrike.labelString:	Overstrike
*XlwMenu.overstrike.labelString:	???????? ????
! *XlwMenu.caseSensitiveSearch.labelString:	Case Sensitive Search
*XlwMenu.caseSensitiveSearch.labelString:	?? ???????? ?????????? ????
! *XlwMenu.caseMatchingReplace.labelString:	Case Matching Replace
*XlwMenu.caseMatchingReplace.labelString:	?? ???????? ?????????? ??????
! *XlwMenu.autoDeleteSelection.labelString:	Auto Delete Selection
*XlwMenu.autoDeleteSelection.labelString:	?????????? ??????????
! *XlwMenu.activeRegions.labelString:	Active Regions
*XlwMenu.activeRegions.labelString:	?????? ???????? ????
! *XlwMenu.mousePasteAtTextCursor.labelString:	Mouse Paste At Text Cursor
*XlwMenu.mousePasteAtTextCursor.labelString: ?????? ???? ???????? Mouse ??????
! *XlwMenu.requireNewlineAtEnd.labelString:	Require Newline At End
*XlwMenu.requireNewlineAtEnd.labelString:	?????? ?????????? ????
! *XlwMenu.addNewlineWhenMovingPastEnd.labelString:	Add Newline When Moving Past End
*XlwMenu.addNewlineWhenMovingPastEnd.labelString: ?????? ?????? ???? ?????????? ????
! *XlwMenu.teachExtendedCommands.labelString:	Teach Extended Commands
*XlwMenu.teachExtendedCommands.labelString:	???????? ????
! *XlwMenu.debugOnError.labelString:	Debug On Error
*XlwMenu.debugOnError.labelString:	???????? ??????
! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
*XlwMenu.debugOnQuit.labelString:	???????? ??????
! *XlwMenu.commandLineSwitchesForLprLp___.labelString:	Command-Line Switches for `lpr'/`lp'...
*XlwMenu.commandLineSwitchesForLprLp___.labelString:	`lpr'/`lp' ?????????? ??????
! *XlwMenu.prettyPrintPaperSize.labelString:	Pretty-Print Paper Size
*XlwMenu.prettyPrintPaperSize.labelString:	?????? ?????????? ????????
! *XlwMenu.colorPrinting.labelString:	Color Printing
*XlwMenu.colorPrinting.labelString:	???? ????
! *XlwMenu.letter.labelString:	Letter
! *XlwMenu.letter.labelString:
! *XlwMenu.letterSmall.labelString:	Letter-small
! *XlwMenu.letterSmall.labelString:
! *XlwMenu.legal.labelString:	Legal
! *XlwMenu.legal.labelString:
! *XlwMenu.statement.labelString:	Statement
! *XlwMenu.statement.labelString:
! *XlwMenu.executive.labelString:	Executive
! *XlwMenu.executive.labelString:
! *XlwMenu.tabloid.labelString:	Tabloid
! *XlwMenu.tabloid.labelString:
! *XlwMenu.ledger.labelString:	Ledger
! *XlwMenu.ledger.labelString:
! *XlwMenu.a3.labelString:	A3
! *XlwMenu.a3.labelString:
! *XlwMenu.a4.labelString:	A4
! *XlwMenu.a4.labelString:
! *XlwMenu.a4small.labelString:	A4small
! *XlwMenu.a4small.labelString:
! *XlwMenu.b4.labelString:	B4
! *XlwMenu.b4.labelString:
! *XlwMenu.b5.labelString:	B5
! *XlwMenu.b5.labelString:
! *XlwMenu.alwaysInSameFrame.labelString:	Always in Same Frame
*XlwMenu.alwaysInSameFrame.labelString:		???? ???? ??????
! *XlwMenu.otherFrame2FramesMax.labelString:	Other Frame (2 Frames Max)
*XlwMenu.otherFrame2FramesMax.labelString:	???? ?????? (???? 2 ??????)
! *XlwMenu.otherFrame3FramesMax.labelString:	Other Frame (3 Frames Max)
*XlwMenu.otherFrame3FramesMax.labelString:	???? ?????? (???? 3 ??????)
! *XlwMenu.otherFrame4FramesMax.labelString:	Other Frame (4 Frames Max)
*XlwMenu.otherFrame4FramesMax.labelString:	???? ?????? (???? 4 ??????)
! *XlwMenu.otherFrame5FramesMax.labelString:	Other Frame (5 Frames Max)
*XlwMenu.otherFrame5FramesMax.labelString:	???? ?????? (???? 5 ??????)
! *XlwMenu.alwaysCreateNewFrame.labelString:	Always Create New Frame
*XlwMenu.alwaysCreateNewFrame.labelString:?? ?? ???????? ????
! *XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	Temp Buffers Always in Same Frame
*XlwMenu.tempBuffersAlwaysInSameFrame.labelString: ???? ???????? ?????? ???? ??????????
! *XlwMenu.tempBuffersLikeOtherBuffers.labelString:	Temp Buffers Like Other Buffers
*XlwMenu.tempBuffersLikeOtherBuffers.labelString: ???? ???????? ???? ???????? ????
! *XlwMenu.makeCurrentFrameGnuservTarget.labelString:	Make current frame gnuserv target
*XlwMenu.makeCurrentFrameGnuservTarget.labelString:?? ???????? gnuserv ?? ??????
! *XlwMenu.inThisBuffer.labelString:	In This Buffer
*XlwMenu.inThisBuffer.labelString:	?? ??????????
! *XlwMenu.automatic.labelString:	Automatic
*XlwMenu.automatic.labelString:		????
! *XlwMenu.fonts.labelString:	Fonts
*XlwMenu.fonts.labelString:	??????
! *XlwMenu.colors.labelString:	Colors
*XlwMenu.colors.labelString:	??
! *XlwMenu.least.labelString:	Least
*XlwMenu.least.labelString:	????
! *XlwMenu.more.labelString:	More
*XlwMenu.more.labelString:	?? ??
! *XlwMenu.evenMore.labelString:	Even More
*XlwMenu.evenMore.labelString:???? ????
! *XlwMenu.most.labelString:	Most
*XlwMenu.most.labelString:	????
! *XlwMenu.lazy.labelString:	Lazy
*XlwMenu.lazy.labelString:	????????
! *XlwMenu.caching.labelString:	Caching
*XlwMenu.caching.labelString: Caching
! *XlwMenu.none.labelString:	None
*XlwMenu.none.labelString:	????
! *XlwMenu.blinkingParen.labelString:	Blinking Paren
*XlwMenu.blinkingParen.labelString:	????????
! *XlwMenu.steadyParen.labelString:	Steady Paren
*XlwMenu.steadyParen.labelString:	?????? ????
! *XlwMenu.expression.labelString:	Expression
*XlwMenu.expression.labelString:	???? ????
! *XlwMenu.scrollbars.labelString:	Scrollbars
*XlwMenu.scrollbars.labelString:	??????????
! *XlwMenu.3DModeline.labelString:	3D Modeline
*XlwMenu.3DModeline.labelString:	???????? ??????
! *XlwMenu.truncateLines.labelString:	Truncate Lines
*XlwMenu.truncateLines.labelString:	???? ?????? ??????
! *XlwMenu.barCursor.labelString:	Bar Cursor
*XlwMenu.barCursor.labelString:		?? ????
! *XlwMenu.blinkingCursor.labelString:	Blinking Cursor
*XlwMenu.blinkingCursor.labelString:	???????? ????
! *XlwMenu.frameLocalFontMenu.labelString:	Frame-Local Font Menu
*XlwMenu.frameLocalFontMenu.labelString: ?????????? ??????????
! *XlwMenu.buffersMenuLength___.labelString:	Buffers Menu Length...
*XlwMenu.buffersMenuLength___.labelString:	?????????? ????
! *XlwMenu.multiOperationBuffersSubMenus.labelString:	Multi-Operation Buffers Sub-Menus
*XlwMenu.multiOperationBuffersSubMenus.labelString:	???????????? ????????
! *XlwMenu.buffersMenuSorting.labelString:	Buffers Menu Sorting
*XlwMenu.buffersMenuSorting.labelString:	?????????? ????
! *XlwMenu.submenusForBufferGroups.labelString:	Submenus for Buffer Groups
*XlwMenu.submenusForBufferGroups.labelString: ?????? ?????? ????????
! *XlwMenu.ignoreScaledFonts.labelString:	Ignore Scaled Fonts
*XlwMenu.ignoreScaledFonts.labelString:	???? ???????? ????
! *XlwMenu.mostRecentlyUsed.labelString:	Most Recently Used
*XlwMenu.mostRecentlyUsed.labelString:		???? ????????
! *XlwMenu.alphabetically.labelString:	Alphabetically
*XlwMenu.alphabetically.labelString:	????????
! *XlwMenu.byMajorModeThenAlphabetically.labelString:	By Major Mode, Then Alphabetically
*XlwMenu.byMajorModeThenAlphabetically.labelString: ???????????????? ????????
! *XlwMenu.visible.labelString:	Visible
*XlwMenu.visible.labelString:	????
! *XlwMenu.captioned.labelString:	Captioned
*XlwMenu.captioned.labelString:	???? ????
! *XlwMenu.defaultLocation.labelString:	Default Location
*XlwMenu.defaultLocation.labelString: Default ????
! *XlwMenu.top.labelString:	Top
*XlwMenu.top.labelString:	??
! *XlwMenu.bottom.labelString:	Bottom
*XlwMenu.bottom.labelString:	??
! *XlwMenu.left.labelString:	Left
*XlwMenu.left.labelString:	????
! *XlwMenu.right.labelString:	Right
*XlwMenu.right.labelString:	??????
! *XlwMenu.avoidText.labelString:	Avoid-Text
*XlwMenu.avoidText.labelString:		?????? ??????
! *XlwMenu.strokesMode.labelString:	strokes-mode
*XlwMenu.strokesMode.labelString:	strokes-????
! *XlwMenu.emacsW3.labelString:	Emacs-W3
! *XlwMenu.emacsW3.labelString:
! *XlwMenu.netscape.labelString:	Netscape
! *XlwMenu.netscape.labelString:
! *XlwMenu.mosaic.labelString:	Mosaic
! *XlwMenu.mosaic.labelString:
! *XlwMenu.mosaicCCI.labelString:	Mosaic (CCI)
! *XlwMenu.mosaicCCI.labelString:
! *XlwMenu.iXIMosaic.labelString:	IXI Mosaic
! *XlwMenu.iXIMosaic.labelString:
! *XlwMenu.lynxXterm.labelString:	Lynx (xterm)
! *XlwMenu.lynxXterm.labelString:
! *XlwMenu.lynxXemacs.labelString:	Lynx (xemacs)
! *XlwMenu.lynxXemacs.labelString:
! *XlwMenu.grail.labelString:	Grail
! *XlwMenu.grail.labelString:
! *XlwMenu.charter.labelString:	Charter
! *XlwMenu.charter.labelString:
! *XlwMenu.clean.labelString:	Clean
! *XlwMenu.clean.labelString:
! *XlwMenu.courier.labelString:	Courier
! *XlwMenu.courier.labelString:
! *XlwMenu.fixed.labelString:	Fixed
! *XlwMenu.fixed.labelString:
! *XlwMenu.helvetica.labelString:	Helvetica
! *XlwMenu.helvetica.labelString:
! *XlwMenu.lucida.labelString:	Lucida
! *XlwMenu.lucida.labelString:
! *XlwMenu.lucidabright.labelString:	Lucidabright
! *XlwMenu.lucidabright.labelString:
! *XlwMenu.lucidatypewriter.labelString:	Lucidatypewriter
! *XlwMenu.lucidatypewriter.labelString:
! *XlwMenu.newCenturySchoolbook.labelString:	New Century Schoolbook
! *XlwMenu.newCenturySchoolbook.labelString:
! *XlwMenu.terminal.labelString:	Terminal
! *XlwMenu.terminal.labelString:
! *XlwMenu.times.labelString:	Times
! *XlwMenu.times.labelString:
! *XlwMenu.utopia.labelString:	Utopia
! *XlwMenu.utopia.labelString:
! *XlwMenu.5.labelString:	5
! *XlwMenu.5.labelString:
! *XlwMenu.6.labelString:	6
! *XlwMenu.6.labelString:
! *XlwMenu.7.labelString:	7
! *XlwMenu.7.labelString:
! *XlwMenu.8.labelString:	8
! *XlwMenu.8.labelString:
! *XlwMenu.9.labelString:	9
! *XlwMenu.9.labelString:
! *XlwMenu.10.labelString:	10
! *XlwMenu.10.labelString:
! *XlwMenu.11.labelString:	11
! *XlwMenu.11.labelString:
! *XlwMenu.12.labelString:	12
! *XlwMenu.12.labelString:
! *XlwMenu.13.labelString:	13
! *XlwMenu.13.labelString:
! *XlwMenu.14.labelString:	14
! *XlwMenu.14.labelString:
! *XlwMenu.15.labelString:	15
! *XlwMenu.15.labelString:
! *XlwMenu.16.labelString:	16
! *XlwMenu.16.labelString:
! *XlwMenu.17.labelString:	17
! *XlwMenu.17.labelString:
! *XlwMenu.18.labelString:	18
! *XlwMenu.18.labelString:
! *XlwMenu.19.labelString:	19
! *XlwMenu.19.labelString:
! *XlwMenu.20.labelString:	20
! *XlwMenu.20.labelString:
! *XlwMenu.23.labelString:	23
! *XlwMenu.23.labelString:
! *XlwMenu.24.labelString:	24
! *XlwMenu.24.labelString:
! *XlwMenu.black.labelString:	Black
! *XlwMenu.black.labelString:
! *XlwMenu.bold.labelString:	Bold
! *XlwMenu.bold.labelString:
! *XlwMenu.demibold.labelString:	Demibold
! *XlwMenu.demibold.labelString:
! *XlwMenu.medium.labelString:	Medium
! *XlwMenu.medium.labelString:
! *XlwMenu.regular.labelString:	Regular
! *XlwMenu.regular.labelString:
! *XlwMenu.grep___.labelString:	Grep...
! *XlwMenu.grep___.labelString:
! *XlwMenu.compile___.labelString:	Compile...
*XlwMenu.compile___.labelString:	??????...
! *XlwMenu.shell.labelString:	Shell
*XlwMenu.shell.labelString:	????
! *XlwMenu.shellCommand___.labelString:	Shell Command...
*XlwMenu.shellCommand___.labelString:	???? ????...
! *XlwMenu.shellCommandOnRegion___.labelString:	Shell Command on Region...
*XlwMenu.shellCommandOnRegion___.labelString:	???????? ?????????? ????...
! *XlwMenu.debugGDB___.labelString:	Debug (GDB)...
*XlwMenu.debugGDB___.labelString:	?????? (GDB)...
! *XlwMenu.debugDBX___.labelString:	Debug (DBX)...
*XlwMenu.debugDBX___.labelString:	?????? (DBX)...
! *XlwMenu.oOBrowser___.labelString:	OO-Browser...
*XlwMenu.oOBrowser___.labelString:	OO-??????...
! *XlwMenu.tags.labelString:	Tags
*XlwMenu.tags.labelString:	????
! *XlwMenu.vC.labelString:	VC
! *XlwMenu.vC.labelString:
! *XlwMenu.findTag___.labelString:	Find Tag...
*XlwMenu.findTag___.labelString:	?????? ????...
! *XlwMenu.findOtherWindow___.labelString:	Find Other Window...
*XlwMenu.findOtherWindow___.labelString:	?????? ?????????? ????...
! *XlwMenu.nextTag___.labelString:	Next Tag...
*XlwMenu.nextTag___.labelString:	?????? ????...
! *XlwMenu.nextOtherWindow___.labelString:	Next Other Window...
*XlwMenu.nextOtherWindow___.labelString:	?????? ?????????? ?????? ????????...
! *XlwMenu.nextFile.labelString:	Next File
*XlwMenu.nextFile.labelString:		?????? ????
! *XlwMenu.tagsSearch___.labelString:	Tags Search...
*XlwMenu.tagsSearch___.labelString:	???? ????...
! *XlwMenu.tagsReplace___.labelString:	Tags Replace...
*XlwMenu.tagsReplace___.labelString:	???? ??????...
! *XlwMenu.continueSearchReplace.labelString:	Continue Search/Replace
*XlwMenu.continueSearchReplace.labelString:	????/?????? ????
! *XlwMenu.popStack.labelString:	Pop stack
*XlwMenu.popStack.labelString:		???????? ????
! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	???????? ????...
! *XlwMenu.setTagsTableFile___.labelString:	Set Tags Table File...
*XlwMenu.setTagsTableFile___.labelString:	?????? ?????? ????...
! *XlwMenu.registerFile.labelString:	Register File
*XlwMenu.registerFile.labelString:	???? ????
! *XlwMenu.revertToLastRevision.labelString:	Revert to Last Revision
*XlwMenu.revertToLastRevision.labelString:	?????? ?????????? ????
! *XlwMenu.cancelLastCheckin.labelString:	Cancel Last Checkin
*XlwMenu.cancelLastCheckin.labelString:		?????? Checkin ?? ??????
! *XlwMenu.renameFile.labelString:	Rename File
*XlwMenu.renameFile.labelString:	?????? ???? ??????
! *XlwMenu.diffAgainstLastVersion.labelString:	Diff Against Last Version
*XlwMenu.diffAgainstLastVersion.labelString:	?????????? diff
! *XlwMenu.diffBetweenRevisions___.labelString:	Diff Between Revisions...
*XlwMenu.diffBetweenRevisions___.labelString:	?????? ?????????? diff...
! *XlwMenu.visitOtherVersion___.labelString:	Visit Other Version...
*XlwMenu.visitOtherVersion___.labelString:	????  ????????...
! *XlwMenu.showEditHistory.labelString:	Show Edit History
*XlwMenu.showEditHistory.labelString:	?????????? ????
! *XlwMenu.listLockedFilesAnyUser.labelString:	List Locked Files Any User
*XlwMenu.listLockedFilesAnyUser.labelString:	?????? ?????? ????
! *XlwMenu.createSnapshot.labelString:	Create Snapshot
*XlwMenu.createSnapshot.labelString:	???????? ??????
! *XlwMenu.retrieveSnapshot.labelString:	Retrieve Snapshot
*XlwMenu.retrieveSnapshot.labelString:	???????? ??????
! *XlwMenu.cVSUpdateDirectory.labelString:	CVS Update Directory
*XlwMenu.cVSUpdateDirectory.labelString:	CVS ???? ????
! *XlwMenu.file.labelString:	File
*XlwMenu.file.labelString:	????
! *XlwMenu.edit.labelString:	Edit
*XlwMenu.edit.labelString:	????
! *XlwMenu.mule.labelString:	Mule
! *XlwMenu.mule.labelString:
! *XlwMenu.apps.labelString:	Apps
*XlwMenu.apps.labelString:	????
! *XlwMenu.options.labelString:	Options
*XlwMenu.options.labelString:	????
! *XlwMenu.buffers.labelString:	Buffers
*XlwMenu.buffers.labelString:	??????
! *XlwMenu.tools.labelString:	Tools
*XlwMenu.tools.labelString:	????
! *XlwMenu.lispInteraction.labelString:	Lisp-Interaction
*XlwMenu.lispInteraction.labelString:	Lisp-????
! *XlwMenu.load_emacs.labelString:	Load .emacs
*XlwMenu.load_emacs.labelString:	.emacs ?? ??????????
! *XlwMenu.help.labelString:	Help
*XlwMenu.help.labelString:	??????


--- NEW FILE Emacs.ad.zh_CN.GB2312 ---
! XEmacs 21.x ??????????????(????????????gb2312)
! 
!              Donald Park 'Piao Xiaolin' <xlpark at kankou.cs.uec.ac.jp>
!                                   Time-stamp: <01/06/13 20:00:00 park>
!
! This is the app-defaults file for XEmacs.
!
! This used to be identical to sample.Xdefaults, but the resources
! below have been rewritten to be as general as possible to avoid
! overriding user resources.  Other than the form rewriting, both
! files should be kept in sync. 
! 
! The resources below are loaded into the XEmacs executable at compile-time:
! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
! effect.
! 
! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
! (or whatever the standard app-defaults directory is at your site) to cause
! it to be consulted at run-time.  (Do this only for site-wide customizations:
! personal customizations should be put into ~/.Xdefaults instead.)
! Note that the file must be named Emacs, not XEmacs.
! 
! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of
! the various resources and the syntax for setting them.
! 
! Energize users: note that this is not the same app-defaults file that is
! used with the Energize-specific version of XEmacs.


! Colors and backgrounds.
! ======================
! The contrasts of these colors will cause them to map to the appropriate
! one of "black" or "white" on monochrome systems.
! 
! The valid color names on your system can be found by looking in the file
! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/.

! Set the modeline colors.
Emacs.modeline*attributeForeground:	Black
Emacs.modeline*attributeBackground:	Gray75

! Set the color of the text cursor.
Emacs.text-cursor*attributeBackground:	Red3

! If you want to set the color of the mouse pointer, do this:
! Emacs.pointer*attributeForeground:	Black
! If you want to set the background of the mouse pointer, do this:
! Emacs.pointer*attributeBackground:	White
! Note that by default, the pointer foreground and background are the same
! as the default face.

! Set the menubar colors.  This overrides the default foreground and
! background colors specified above.
*menubar*Foreground:			Gray30
*menubar*Background:			Gray80
! This is for buttons in the menubar.  
! Yellow would be better, but that would map to white on monochrome.
*menubar*buttonForeground:		Blue
*XlwMenu*highlightForeground:		Red
*XlwMenu*titleForeground:		Maroon
*XlwMenu*selectColor:			ForestGreen
*XmToggleButton*selectColor:		ForestGreen

! Specify the colors of popup menus.
*popup*Foreground:			Black
*popup*Background:			Gray80

! Specify the colors of the various sub-widgets of the dialog boxes.
*dialog*Foreground:			Black
! #A5C0C1 is a shade of blue
*dialog*Background:			#A5C0C1
! The following three are for Motif dialog boxes ...
*dialog*XmTextField*Background:		WhiteSmoke
*dialog*XmText*Background:		WhiteSmoke
*dialog*XmList*Background:		WhiteSmoke
! While this one is for Athena dialog boxes.
*dialog*Command*Background:		WhiteSmoke

! Xlw Scrollbar colors
*XlwScrollBar*Foreground:		Gray30
*XlwScrollBar*Background:		Gray80
*XmScrollBar*Foreground:		Gray30
*XmScrollBar*Background:		Gray80

!
! The Lucid Scrollbar supports two added resources, SliderStyle is either
! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
! of the slider that depresses when the slider is clicked on.  ArrowPosition is
! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
! of the scrollbar, same puts both arrows at the same end, like the Amiga.
!
Emacs*XlwScrollBar.SliderStyle:    dimple
Emacs*XlwScrollBar.ArrowPosition:  opposite


!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

*topToolBarShadowColor:			Gray90
*bottomToolBarShadowColor:		Gray40
*backgroundToolBarColor:		Gray80
*toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
Emacs.default.attributeFont:  -isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
*menubar*Font: 		-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*
*popup*Font:		-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*

! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*
*XmTextField*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*
*XmText*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*
*XmList*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField*translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton*translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! XIM fontset (defaults to system fontset default)
! *EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
!    Japanese localization resources for XEmacs.
! @(#)Emacs	1.3 96/09/22
!    Copyright (C) 1996 Sun Microsystems, Inc.
!!
! This file is part of XEmacs.
! 
! XEmacs is free software; you can redistribute it and/or modify it
! under the terms of the GNU General Public License as published by the
! Free Software Foundation; either version 2, or (at your option) any
! later version.
! XEmacs 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 XEmacs; see the file COPYING.  If not, write to the
! Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! Boston, MA 02111-1307, USA.
! Copyright (C) 1996 Sun Microsystems Inc.
!
! Japanese Resources to be placed in etc/app-defaults/ja/Emacs
! for xemacs-mule.  It is same on another languages such like fr,
! if you want to have French menu label, place it on
! etc/app-defaults/fr/Emacs.

! Pulldown menu internationalization.  The first line of the file
! "*XlwMenu.resourceLabels: True" has to be there to make sure
! all the labelString will be read and displayed by X.
*XlwMenu.resourceLabels: True

! CDE doesn't require this but OpenWindows does.
! Note that this `gothic' font family is effective just for Japanese.
! And fontList is just used under Motif menubar.
*fontList: -*-gothic-medium-r-normal--14-120-75-75-c-*-*-*:
!! FontSet for menus when you use --with-xfs or --with-xim=xlib.
*fontSet: -isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*

! Starting below here are menu label string which can be translated to
! different languages. 
! Example: *XlwMenu.file.labelString: File  
! Characters before the ":" sign, "Example: *XlwMenu.file.labelString"
! can not be changed. They must stay exactly the way they are.
! The only string to be translated is the string, "File".
! Some resource names such as "file", "quit" have been used in several
! places.  However, each of them only has to be translated once in this X
! resource file.
! *XlwMenu.readMailVM___.labelString:	Read Mail (VM)...
*XlwMenu.readMailVM___.labelString:	?????????? (VM)...
! *XlwMenu.readMailMH___.labelString:	Read Mail (MH)...
*XlwMenu.readMailMH___.labelString:	?????????? (MH)...
! *XlwMenu.sendMail___.labelString:	Send mail...
*XlwMenu.sendMail___.labelString:	??????????...
! *XlwMenu.usenetNews.labelString:	Usenet News
*XlwMenu.usenetNews.labelString:	????????
! *XlwMenu.browseTheWeb.labelString:	Browse the Web
*XlwMenu.browseTheWeb.labelString:	????????
! *XlwMenu.gopher.labelString:	Gopher
*XlwMenu.gopher.labelString:	Gopher
! *XlwMenu.hyperbole___.labelString:	Hyperbole...
*XlwMenu.hyperbole___.labelString:	????????...
! *XlwMenu.spellCheckBuffer.labelString:	Spell-Check Buffer
*XlwMenu.spellCheckBuffer.labelString:	??????????????
! *XlwMenu.toggleVIEmulation.labelString:	Toggle VI emulation
*XlwMenu.toggleVIEmulation.labelString:	?????? VI ??????????
! *XlwMenu.calendar.labelString:	Calendar
*XlwMenu.calendar.labelString:	????
! *XlwMenu.games.labelString:	Games
*XlwMenu.games.labelString:	????
! *XlwMenu.3MonthCalendar.labelString:	3-Month Calendar
*XlwMenu.3MonthCalendar.labelString:	3????????
! *XlwMenu.diary.labelString:	Diary
*XlwMenu.diary.labelString:	????
! *XlwMenu.holidays.labelString:	Holidays
*XlwMenu.holidays.labelString:	??????
! *XlwMenu.phasesOfTheMoon.labelString:	Phases of the Moon
*XlwMenu.phasesOfTheMoon.labelString:	????
! *XlwMenu.sunriseSunset.labelString:	Sunrise/Sunset
*XlwMenu.sunriseSunset.labelString:	????/????
! *XlwMenu.mineGame.labelString:	Mine Game
*XlwMenu.mineGame.labelString:	??????????
! *XlwMenu.tetris.labelString:	Tetris
*XlwMenu.tetris.labelString:	??????????	
! *XlwMenu.quoteFromZippy.labelString:	Quote from Zippy
*XlwMenu.quoteFromZippy.labelString:	Zippy ??????
! *XlwMenu.psychoanalyst.labelString:	Psychoanalyst
*XlwMenu.psychoanalyst.labelString:	????????
! *XlwMenu.psychoanalyzeZippy.labelString:	Psychoanalyze Zippy!
*XlwMenu.psychoanalyzeZippy.labelString:	???????? Zippy!
! *XlwMenu.randomFlames.labelString:	Random Flames
*XlwMenu.randomFlames.labelString:	????????
! *XlwMenu.dunnetAdventure.labelString:	Dunnet (Adventure)
*XlwMenu.dunnetAdventure.labelString:	Dunnet (????)
! *XlwMenu.towersOfHanoi.labelString:	Towers of Hanoi
*XlwMenu.towersOfHanoi.labelString:	Hanoi ??
! *XlwMenu.gameOfLife.labelString:	Game of Life
*XlwMenu.gameOfLife.labelString:	????????
! *XlwMenu.multiplicationPuzzle.labelString:	Multiplication Puzzle
*XlwMenu.multiplicationPuzzle.labelString:	????????????
! *XlwMenu.listAllBuffers.labelString:	List All Buffers
*XlwMenu.listAllBuffers.labelString:	??????????????
! *XlwMenu..labelString:	
! *XlwMenu..labelString:
! *XlwMenu.emacs.labelString:	Emacs
! *XlwMenu.emacs.labelString:
! *XlwMenu.group___.labelString:	Group...
! *XlwMenu.group___.labelString:	??...
! *XlwMenu.variable___.labelString:	Variable...
! *XlwMenu.variable___.labelString:	????...
! *XlwMenu.face___.labelString:	Face...
! *XlwMenu.face___.labelString:	??...
! *XlwMenu.saved___.labelString:	Saved...
! *XlwMenu.saved___.labelString:	????...
! *XlwMenu.set___.labelString:	Set...
! *XlwMenu.set___.labelString:	????...
! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	????????...
! *XlwMenu.browse___.labelString:	Browse...
! *XlwMenu.browse___.labelString:	????...
! *XlwMenu.emacs___.labelString:	Emacs...
! *XlwMenu.emacs___.labelString:
! *XlwMenu.editing.labelString:	Editing
*XlwMenu.editing.labelString:	????
! *XlwMenu.external.labelString:	External
*XlwMenu.external.labelString:	????
! *XlwMenu.programming.labelString:	Programming
*XlwMenu.programming.labelString:	????
! *XlwMenu.applications.labelString:	Applications
*XlwMenu.applications.labelString:	????
! *XlwMenu.development.labelString:	Development
*XlwMenu.development.labelString:	????
! *XlwMenu.environment.labelString:	Environment
*XlwMenu.environment.labelString:	????
! *XlwMenu.data.labelString:	Data
*XlwMenu.data.labelString:	????
! *XlwMenu.files.labelString:	Files
*XlwMenu.files.labelString:	????
! *XlwMenu.wp.labelString:	Wp
*XlwMenu.wp.labelString:	????????
! *XlwMenu.faces.labelString:	Faces
*XlwMenu.faces.labelString:	??
! *XlwMenu.hypermedia.labelString:	Hypermedia
*XlwMenu.hypermedia.labelString:	??????
! *XlwMenu.help.labelString:	Help
! *XlwMenu.help.labelString:	????
! *XlwMenu.local.labelString:	Local
*XlwMenu.local.labelString:	????
! *XlwMenu.undo.labelString:	Undo
*XlwMenu.undo.labelString:	????
! *XlwMenu.cut.labelString:	Cut
*XlwMenu.cut.labelString:	????
! *XlwMenu.copy.labelString:	Copy
*XlwMenu.copy.labelString:	????
! *XlwMenu.paste.labelString:	Paste
*XlwMenu.paste.labelString:	????
! *XlwMenu.clear.labelString:	Clear
*XlwMenu.clear.labelString:	????
! *XlwMenu.search___.labelString:	Search...
*XlwMenu.search___.labelString:	????...
! *XlwMenu.searchBackward___.labelString:	Search Backward...
*XlwMenu.searchBackward___.labelString:	??????????
! *XlwMenu.replace___.labelString:	Replace...
*XlwMenu.replace___.labelString:	????...
! *XlwMenu.searchRegexp___.labelString:	Search (Regexp)...
*XlwMenu.searchRegexp___.labelString:	???? (????) ...
! *XlwMenu.searchBackwardRegexp___.labelString:	Search Backward (Regexp)...
*XlwMenu.searchBackwardRegexp___.labelString:	?????????? (????) ...
! *XlwMenu.replaceRegexp___.labelString:	Replace (Regexp)...
*XlwMenu.replaceRegexp___.labelString:	???? (????) ...
! *XlwMenu.gotoLine___.labelString:	Goto Line...
*XlwMenu.gotoLine___.labelString:	??????????...
! *XlwMenu.whatLine.labelString:	What Line
*XlwMenu.whatLine.labelString:	??????????
! *XlwMenu.bookmarks.labelString:	Bookmarks
*XlwMenu.bookmarks.labelString:	????
! *XlwMenu.startMacroRecording.labelString:	Start Macro Recording
*XlwMenu.startMacroRecording.labelString:	??????????
! *XlwMenu.endMacroRecording.labelString:	End Macro Recording
*XlwMenu.endMacroRecording.labelString:	??????????
! *XlwMenu.executeLastMacro.labelString:	Execute Last Macro
*XlwMenu.executeLastMacro.labelString:	??????????????
! *XlwMenu.showMessageLog.labelString:	Show Message Log
*XlwMenu.showMessageLog.labelString:	????????????
! *XlwMenu.jumpToBookmark.labelString:	Jump to Bookmark
*XlwMenu.jumpToBookmark.labelString:	????????
! *XlwMenu.setBookmark.labelString:	Set bookmark
*XlwMenu.setBookmark.labelString:	????????
! *XlwMenu.insertContents.labelString:	Insert contents
*XlwMenu.insertContents.labelString:	????????
! *XlwMenu.insertLocation.labelString:	Insert location
*XlwMenu.insertLocation.labelString:	????????
! *XlwMenu.renameBookmark.labelString:	Rename bookmark
*XlwMenu.renameBookmark.labelString:	????????
! *XlwMenu.deleteBookmark.labelString:	Delete Bookmark
*XlwMenu.deleteBookmark.labelString:	????????
! *XlwMenu.editBookmarkList.labelString:	Edit Bookmark List
*XlwMenu.editBookmarkList.labelString:	????????????
! *XlwMenu.saveBookmarks.labelString:	Save bookmarks
*XlwMenu.saveBookmarks.labelString:	????????
! *XlwMenu.saveBookmarksAs___.labelString:	Save bookmarks as...
*XlwMenu.saveBookmarksAs___.labelString:	????????????...
! *XlwMenu.loadABookmarkFile.labelString:	Load a bookmark file
*XlwMenu.loadABookmarkFile.labelString:	????????????
! *XlwMenu.open___.labelString:	Open...
*XlwMenu.open___.labelString:	????...
! *XlwMenu.openInOtherWindow___.labelString:	Open in Other Window...
*XlwMenu.openInOtherWindow___.labelString:	????????????????...
! *XlwMenu.openInNewFrame___.labelString:	Open in New Frame...
*XlwMenu.openInNewFrame___.labelString:	????????????...
! *XlwMenu.insertFile___.labelString:	Insert File...
*XlwMenu.insertFile___.labelString:	????????...
! *XlwMenu.viewFile___.labelString:	View File...
*XlwMenu.viewFile___.labelString:	????????...
! *XlwMenu.save.labelString:	Save
*XlwMenu.save.labelString:	????
! *XlwMenu.saveAs___.labelString:	Save As...
*XlwMenu.saveAs___.labelString:	??????...
! *XlwMenu.saveSomeBuffers.labelString:	Save Some Buffers
*XlwMenu.saveSomeBuffers.labelString:	??????????
! *XlwMenu.printBuffer.labelString:	Print Buffer
*XlwMenu.printBuffer.labelString:	??????????
! *XlwMenu.prettyPrintBuffer.labelString:	Pretty-Print Buffer
*XlwMenu.prettyPrintBuffer.labelString:	??????????
! *XlwMenu.newFrame.labelString:	New Frame
*XlwMenu.newFrame.labelString:	????
! *XlwMenu.frameOnOtherDisplay___.labelString:	Frame on Other Display...
*XlwMenu.frameOnOtherDisplay___.labelString:	????????????????...
! *XlwMenu.deleteFrame.labelString:	Delete Frame
*XlwMenu.deleteFrame.labelString:	??????
! *XlwMenu.splitWindow.labelString:	Split Window
*XlwMenu.splitWindow.labelString:	????????
! *XlwMenu.unSplitKeepThis.labelString:	Un-Split (Keep This)
*XlwMenu.unSplitKeepThis.labelString:	??????????
! *XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep Others)
*XlwMenu.unSplitKeepOthers.labelString:	??????????
! *XlwMenu.revertBuffer.labelString:	Revert Buffer
*XlwMenu.revertBuffer.labelString:	??????????
! *XlwMenu.deleteBuffer.labelString:	Delete Buffer
*XlwMenu.deleteBuffer.labelString:	??????????
! *XlwMenu.exitXEmacs.labelString:	Exit XEmacs
*XlwMenu.exitXEmacs.labelString:	???? XEmacs
! *XlwMenu.aboutXEmacs___.labelString:	About XEmacs...
*XlwMenu.aboutXEmacs___.labelString:	???? XEmacs...
! *XlwMenu.basics.labelString:	Basics
*XlwMenu.basics.labelString:	????
! *XlwMenu.xEmacsFAQ.labelString:	XEmacs FAQ
*XlwMenu.xEmacsFAQ.labelString:	XEmacs ????????????????
! *XlwMenu.samples.labelString:	Samples
*XlwMenu.samples.labelString:	????
! *XlwMenu.lookupInInfo.labelString:	Lookup in Info
*XlwMenu.lookupInInfo.labelString:	?? Info ??????
! *XlwMenu.manuals.labelString:	Manuals
*XlwMenu.manuals.labelString:	????
! *XlwMenu.commandsKeys.labelString:	Commands & Keys
*XlwMenu.commandsKeys.labelString:	????????
! *XlwMenu.recentMessages.labelString:	Recent Messages
*XlwMenu.recentMessages.labelString:	??????????
! *XlwMenu.misc.labelString:	Misc
*XlwMenu.misc.labelString:	????
! *XlwMenu.submitBugReport.labelString:	Submit Bug Report
*XlwMenu.submitBugReport.labelString:	?? Bug ????
! *XlwMenu.tutorial.labelString:	Tutorial
*XlwMenu.tutorial.labelString:	????
! *XlwMenu.news.labelString:	News
*XlwMenu.news.labelString:	????
! *XlwMenu.packages.labelString:	Packages
*XlwMenu.packages.labelString:	??
! *XlwMenu.splash.labelString:	Splash
*XlwMenu.splash.labelString:	Splash
! *XlwMenu.fAQLocal.labelString:	FAQ (local)
*XlwMenu.fAQLocal.labelString:	???????????????? (????)
! *XlwMenu.fAQViaWWW.labelString:	FAQ via WWW
*XlwMenu.fAQViaWWW.labelString:	???????????????? (????WWW)
! *XlwMenu.homePage.labelString:	Home Page
*XlwMenu.homePage.labelString:	????
! *XlwMenu.sample.labelString:	Sample
*XlwMenu.sample.labelString:	????
! *XlwMenu.keyBinding___.labelString:	Key Binding...
*XlwMenu.keyBinding___.labelString:	????????...
! *XlwMenu.command___.labelString:	Command...
*XlwMenu.command___.labelString:	????...
! *XlwMenu.function___.labelString:	Function...
*XlwMenu.function___.labelString:	????...
! *XlwMenu.topic___.labelString:	Topic...
*XlwMenu.topic___.labelString:	????...
! *XlwMenu.info.labelString:	Info
*XlwMenu.info.labelString:	Info
! *XlwMenu.unixManual___.labelString:	Unix Manual...
*XlwMenu.unixManual___.labelString:	Unix ????...
! *XlwMenu.mode.labelString:	Mode
*XlwMenu.mode.labelString:	????
! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	????????...
! *XlwMenu.aproposDocs___.labelString:	Apropos Docs...
*XlwMenu.aproposDocs___.labelString:	????????????????...
! *XlwMenu.key___.labelString:	Key...
*XlwMenu.key___.labelString:	??...
! *XlwMenu.bindings.labelString:	Bindings
*XlwMenu.bindings.labelString:	????
! *XlwMenu.mouseBindings.labelString:	Mouse Bindings
*XlwMenu.mouseBindings.labelString:	????????
! *XlwMenu.recentKeys.labelString:	Recent Keys
*XlwMenu.recentKeys.labelString:	????????
! *XlwMenu.variable___.labelString:	Variable...
! *XlwMenu.variable___.labelString:	????...
! *XlwMenu.locateCommand___.labelString:	Locate Command...
*XlwMenu.locateCommand___.labelString:	????????...
! *XlwMenu.noWarranty.labelString:	No Warranty
*XlwMenu.noWarranty.labelString:	????????
! *XlwMenu.xEmacsLicense.labelString:	XEmacs License
*XlwMenu.xEmacsLicense.labelString:	XEmacs ??????
! *XlwMenu.theLatestVersion.labelString:	The Latest Version
*XlwMenu.theLatestVersion.labelString:	????????
! *XlwMenu.evaluateLastSExpression.labelString:	Evaluate Last S-expression
*XlwMenu.evaluateLastSExpression.labelString:	?????????? S ??????
! *XlwMenu.evaluateEntireBuffer.labelString:	Evaluate Entire Buffer
*XlwMenu.evaluateEntireBuffer.labelString:	??????????????
! *XlwMenu.evaluateRegion.labelString:	Evaluate Region
*XlwMenu.evaluateRegion.labelString:	????????
! *XlwMenu.evaluateThisDefun.labelString:	Evaluate This Defun
*XlwMenu.evaluateThisDefun.labelString:	???????? Defun
! *XlwMenu.debugThisDefun.labelString:	Debug This Defun
*XlwMenu.debugThisDefun.labelString:	???????? Defun
! *XlwMenu.traceAFunction.labelString:	Trace a Function
*XlwMenu.traceAFunction.labelString:	????????????
! *XlwMenu.untraceAllFunctions.labelString:	Untrace All Functions
*XlwMenu.untraceAllFunctions.labelString:	??????????????
! *XlwMenu.commentOutRegion.labelString:	Comment Out Region
*XlwMenu.commentOutRegion.labelString:	????????
! *XlwMenu.indentRegion.labelString:	Indent Region
*XlwMenu.indentRegion.labelString:	????????
! *XlwMenu.indentLine.labelString:	Indent Line
*XlwMenu.indentLine.labelString:	????????
! *XlwMenu.debugOnError.labelString:	Debug On Error
! *XlwMenu.debugOnError.labelString:	??????????????
! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
! *XlwMenu.debugOnQuit.labelString:	??????????
! *XlwMenu.debugOnSignal.labelString:	Debug on Signal
*XlwMenu.debugOnSignal.labelString:	????????
! *XlwMenu.describeLanguageSupport.labelString:	Describe language support
*XlwMenu.describeLanguageSupport.labelString:	????????????
! *XlwMenu.setLanguageEnvironment.labelString:	Set language environment
*XlwMenu.setLanguageEnvironment.labelString:	????????????
! *XlwMenu.toggleInputMethod.labelString:	Toggle input method
*XlwMenu.toggleInputMethod.labelString:	??????????
! *XlwMenu.selectInputMethod.labelString:	Select input method
*XlwMenu.selectInputMethod.labelString:	??????????
! *XlwMenu.describeInputMethod.labelString:	Describe input method
*XlwMenu.describeInputMethod.labelString:	??????????
! *XlwMenu.describeCurrentCodingSystems.labelString:	Describe current coding systems
*XlwMenu.describeCurrentCodingSystems.labelString:	????????????????
! *XlwMenu.setCodingSystemOfBufferFile.labelString:	Set coding system of buffer file
*XlwMenu.setCodingSystemOfBufferFile.labelString:	????????????????????????
! *XlwMenu.setCodingSystemOfTerminal.labelString:	Set coding system of terminal
*XlwMenu.setCodingSystemOfTerminal.labelString:	??????????????????
! *XlwMenu.setCodingSystemOfKeyboard.labelString:	Set coding system of keyboard
*XlwMenu.setCodingSystemOfKeyboard.labelString:	??????????????????
! *XlwMenu.setCodingSystemOfProcess.labelString:	Set coding system of process
*XlwMenu.setCodingSystemOfProcess.labelString:	??????????????????
! *XlwMenu.showCharacterTable.labelString:	Show character table
*XlwMenu.showCharacterTable.labelString:	??????????
! *XlwMenu.showDiagnosisForMULE.labelString:	Show diagnosis for MULE
*XlwMenu.showDiagnosisForMULE.labelString:	???? MULE ??????????
! *XlwMenu.showManyLanguages.labelString:	Show many languages
*XlwMenu.showManyLanguages.labelString:	??????????
! *XlwMenu.chineseGB.labelString:	Chinese-GB
*XlwMenu.chineseGB.labelString:	???? GB ??
! *XlwMenu.chineseBIG5.labelString:	Chinese-BIG5
*XlwMenu.chineseBIG5.labelString:	???? BIG5 ??
! *XlwMenu.cyrillicISO.labelString:	Cyrillic-ISO
!*XlwMenu.cyrillicISO.labelString:
! *XlwMenu.cyrillicKOI8.labelString:	Cyrillic-KOI8
!*XlwMenu.cyrillicKOI8.labelString:
! *XlwMenu.cyrillicALT.labelString:	Cyrillic-ALT
!*XlwMenu.cyrillicALT.labelString:
! *XlwMenu.cyrillic.labelString:	Cyrillic
!*XlwMenu.cyrillic.labelString:
! ! *XlwMenu.english.labelString:	English
*XlwMenu.english.labelString:	????
! *XlwMenu.aSCII.labelString:	ASCII
! *XlwMenu.aSCII.labelString:
! *XlwMenu.latin1.labelString:	Latin-1
*XlwMenu.latin1.labelString:	??????-1
! *XlwMenu.german.labelString:	German
*XlwMenu.german.labelString:	????
! *XlwMenu.french.labelString:	French
*XlwMenu.french.labelString:	????
! *XlwMenu.norwegian.labelString:	Norwegian
*XlwMenu.norwegian.labelString:	??????
! *XlwMenu.latin2.labelString:	Latin-2
*XlwMenu.latin2.labelString:	??????-2
! *XlwMenu.croatian.labelString:	Croatian
*XlwMenu.croatian.labelString:	??????????
! *XlwMenu.polish.labelString:	Polish
*XlwMenu.polish.labelString:	??????
! *XlwMenu.latin3.labelString:	Latin-3
*XlwMenu.latin3.labelString:	??????-3
! *XlwMenu.latin4.labelString:	Latin-4
*XlwMenu.latin4.labelString:	??????-4
! *XlwMenu.latin5.labelString:	Latin-5
*XlwMenu.latin5.labelString:	??????-5
! *XlwMenu.greek.labelString:	Greek
*XlwMenu.greek.labelString:	??????
! *XlwMenu.hebrew.labelString:	Hebrew
*XlwMenu.hebrew.labelString:	Hebrew
! *XlwMenu.japanese.labelString:	Japanese
*XlwMenu.japanese.labelString:	????
! *XlwMenu.korean.labelString:	Korean
*XlwMenu.korean.labelString:	??????
! *XlwMenu.iPA.labelString:	IPA
! *XlwMenu.iPA.labelString:
! *XlwMenu.customize.labelString:	Customize
*XlwMenu.customize.labelString:	????
! *XlwMenu.readOnly.labelString:	Read Only
*XlwMenu.readOnly.labelString:	????
! *XlwMenu.editingOptions.labelString:	Editing Options
*XlwMenu.editingOptions.labelString:	????????
! *XlwMenu.generalOptions.labelString:	General Options
*XlwMenu.generalOptions.labelString:	????????
! *XlwMenu.printingOptions.labelString:	Printing Options
*XlwMenu.printingOptions.labelString:	????????
! *XlwMenu.otherWindowLocation.labelString:	"Other Window" Location
*XlwMenu.otherWindowLocation.labelString:	"????????"????
! *XlwMenu.syntaxHighlighting.labelString:	Syntax Highlighting
*XlwMenu.syntaxHighlighting.labelString:	????????????
! *XlwMenu.parenHighlighting.labelString:	Paren Highlighting
*XlwMenu.parenHighlighting.labelString:	????????????
! *XlwMenu.frameAppearance.labelString:	Frame Appearance
*XlwMenu.frameAppearance.labelString:	??????
! *XlwMenu.menubarAppearance.labelString:	Menubar Appearance
*XlwMenu.menubarAppearance.labelString:	??????????
! *XlwMenu.toolbarAppearance.labelString:	Toolbar Appearance
*XlwMenu.toolbarAppearance.labelString:	??????????
! *XlwMenu.mouse.labelString:	Mouse
*XlwMenu.mouse.labelString:	????
! *XlwMenu.openURLsWith.labelString:	Open URLs With
*XlwMenu.openURLsWith.labelString:	??????????
! *XlwMenu.browseFaces___.labelString:	Browse Faces...
*XlwMenu.browseFaces___.labelString:	??????...
! *XlwMenu.font.labelString:	Font
*XlwMenu.font.labelString:	????
! *XlwMenu.size.labelString:	Size
*XlwMenu.size.labelString:	????
! *XlwMenu.weight.labelString:	Weight
*XlwMenu.weight.labelString:	????


! *XlwMenu.saveOptions.labelString:	Save Options
*XlwMenu.saveOptions.labelString:	????????
!
! described by menu-customize?
! *XlwMenu.emacs.labelString:	Emacs
! *XlwMenu.emacs.labelString:
! *XlwMenu.group___.labelString:	Group...
*XlwMenu.group___.labelString:	??...
! *XlwMenu.variable___.labelString:	Variable...
*XlwMenu.variable___.labelString:	????...
! *XlwMenu.face___.labelString:	Face...
*XlwMenu.face___.labelString:	??...
! *XlwMenu.saved___.labelString:	Saved...
*XlwMenu.saved___.labelString:	????...
! *XlwMenu.set___.labelString:	Set...
*XlwMenu.set___.labelString:	????...
! *XlwMenu.apropos___.labelString:	Apropos...
*XlwMenu.apropos___.labelString:	????????...
!
! *XlwMenu.browse___.labelString:	Browse...
*XlwMenu.browse___.labelString:	????...
!! *XlwMenu.overstrike.labelString:	Overstrike
*XlwMenu.overstrike.labelString:	????
! *XlwMenu.caseSensitiveSearch.labelString:	Case Sensitive Search
*XlwMenu.caseSensitiveSearch.labelString:	??????????????
! *XlwMenu.caseMatchingReplace.labelString:	Case Matching Replace
*XlwMenu.caseMatchingReplace.labelString:	??????????????
! *XlwMenu.autoDeleteSelection.labelString:	Auto Delete Selection
*XlwMenu.autoDeleteSelection.labelString:	????????????
! *XlwMenu.activeRegions.labelString:	Active Regions
*XlwMenu.activeRegions.labelString:	????????
! *XlwMenu.mousePasteAtTextCursor.labelString:	Mouse Paste At Text Cursor
*XlwMenu.mousePasteAtTextCursor.labelString:	??????????????????????
! *XlwMenu.requireNewlineAtEnd.labelString:	Require Newline At End
*XlwMenu.requireNewlineAtEnd.labelString:	????????????????????
! *XlwMenu.addNewlineWhenMovingPastEnd.labelString:	Add Newline When Moving Past End
*XlwMenu.addNewlineWhenMovingPastEnd.labelString:	????????????????????????
! *XlwMenu.teachExtendedCommands.labelString:	Teach Extended Commands
*XlwMenu.teachExtendedCommands.labelString:	????????????
! *XlwMenu.debugOnError.labelString:	Debug On Error
*XlwMenu.debugOnError.labelString:	????????????
! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
*XlwMenu.debugOnQuit.labelString:	????????????
! *XlwMenu.commandLineSwitchesForLprLp___.labelString:	Command-Line Switches for `lpr'/`lp'...
*XlwMenu.commandLineSwitchesForLprLp___.labelString:	?????? lpr/lp ??????
! *XlwMenu.prettyPrintPaperSize.labelString:	Pretty-Print Paper Size
*XlwMenu.prettyPrintPaperSize.labelString:	????????????
! *XlwMenu.colorPrinting.labelString:	Color Printing
*XlwMenu.colorPrinting.labelString:	????????
! *XlwMenu.letter.labelString:	Letter
! *XlwMenu.letter.labelString:
! *XlwMenu.letterSmall.labelString:	Letter-small
! *XlwMenu.letterSmall.labelString:
! *XlwMenu.legal.labelString:	Legal
! *XlwMenu.legal.labelString:
! *XlwMenu.statement.labelString:	Statement
! *XlwMenu.statement.labelString:
! *XlwMenu.executive.labelString:	Executive
! *XlwMenu.executive.labelString:
! *XlwMenu.tabloid.labelString:	Tabloid
! *XlwMenu.tabloid.labelString:
! *XlwMenu.ledger.labelString:	Ledger
! *XlwMenu.ledger.labelString:
! *XlwMenu.a3.labelString:	A3
! *XlwMenu.a3.labelString:
! *XlwMenu.a4.labelString:	A4
! *XlwMenu.a4.labelString:
! *XlwMenu.a4small.labelString:	A4small
! *XlwMenu.a4small.labelString:
! *XlwMenu.b4.labelString:	B4
! *XlwMenu.b4.labelString:
! *XlwMenu.b5.labelString:	B5
! *XlwMenu.b5.labelString:
! *XlwMenu.alwaysInSameFrame.labelString:	Always in Same Frame
*XlwMenu.alwaysInSameFrame.labelString:	????????????
! *XlwMenu.otherFrame2FramesMax.labelString:	Other Frame (2 Frames Max)
*XlwMenu.otherFrame2FramesMax.labelString:	?????? (????2??)
! *XlwMenu.otherFrame3FramesMax.labelString:	Other Frame (3 Frames Max)
*XlwMenu.otherFrame3FramesMax.labelString:	?????? (????3??)
! *XlwMenu.otherFrame4FramesMax.labelString:	Other Frame (4 Frames Max)
*XlwMenu.otherFrame4FramesMax.labelString:	?????? (????4??)
! *XlwMenu.otherFrame5FramesMax.labelString:	Other Frame (5 Frames Max)
*XlwMenu.otherFrame5FramesMax.labelString:	?????? (????5??)
! *XlwMenu.alwaysCreateNewFrame.labelString:	Always Create New Frame
*XlwMenu.alwaysCreateNewFrame.labelString:	????????????
! *XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	Temp Buffers Always in Same Frame
*XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	??????????????????????
! *XlwMenu.tempBuffersLikeOtherBuffers.labelString:	Temp Buffers Like Other Buffers
*XlwMenu.tempBuffersLikeOtherBuffers.labelString: ??????????????????????????
! *XlwMenu.makeCurrentFrameGnuservTarget.labelString:	Make current frame gnuserv target
*XlwMenu.makeCurrentFrameGnuservTarget.labelString:?????????????? gnuserv ??????
! *XlwMenu.inThisBuffer.labelString:	In This Buffer
*XlwMenu.inThisBuffer.labelString:	??????????????
! *XlwMenu.automatic.labelString:	Automatic
*XlwMenu.automatic.labelString:	????
! *XlwMenu.fonts.labelString:	Fonts
*XlwMenu.fonts.labelString:	????
! *XlwMenu.colors.labelString:	Colors
*XlwMenu.colors.labelString:    ????
! *XlwMenu.least.labelString:	Least
*XlwMenu.least.labelString:	????
! *XlwMenu.more.labelString:	More
*XlwMenu.more.labelString:	??
! *XlwMenu.evenMore.labelString:	Even More
*XlwMenu.evenMore.labelString:	????
! *XlwMenu.most.labelString:	Most
*XlwMenu.most.labelString:	????
! *XlwMenu.lazy.labelString:	Lazy
*XlwMenu.lazy.labelString:	????
! *XlwMenu.caching.labelString:	Caching
*XlwMenu.caching.labelString:	????????
! *XlwMenu.none.labelString:	None
*XlwMenu.none.labelString:	??
! *XlwMenu.blinkingParen.labelString:	Blinking Paren
*XlwMenu.blinkingParen.labelString:	????????
! *XlwMenu.steadyParen.labelString:	Steady Paren
*XlwMenu.steadyParen.labelString:	????????
! *XlwMenu.expression.labelString:	Expression
*XlwMenu.expression.labelString:	??????????
! *XlwMenu.scrollbars.labelString:	Scrollbars
*XlwMenu.scrollbars.labelString:	??????
! *XlwMenu.3DModeline.labelString:	3D Modeline
*XlwMenu.3DModeline.labelString:	3 ????????
! *XlwMenu.truncateLines.labelString:	Truncate Lines
*XlwMenu.truncateLines.labelString:	??????
! *XlwMenu.barCursor.labelString:	Bar Cursor
*XlwMenu.barCursor.labelString:	????????
! *XlwMenu.blinkingCursor.labelString:	Blinking Cursor
*XlwMenu.blinkingCursor.labelString:	????????
! *XlwMenu.frameLocalFontMenu.labelString:	Frame-Local Font Menu
*XlwMenu.frameLocalFontMenu.labelString:	??????????????
! *XlwMenu.buffersMenuLength___.labelString:	Buffers Menu Length...
*XlwMenu.buffersMenuLength___.labelString:	??????????????...
! *XlwMenu.multiOperationBuffersSubMenus.labelString:	Multi-Operation Buffers Sub-Menus
*XlwMenu.multiOperationBuffersSubMenus.labelString:	??????????????????
! *XlwMenu.buffersMenuSorting.labelString:	Buffers Menu Sorting
*XlwMenu.buffersMenuSorting.labelString:	??????????????
! *XlwMenu.submenusForBufferGroups.labelString:	Submenus for Buffer Groups
*XlwMenu.submenusForBufferGroups.labelString:	??????????????????????
! *XlwMenu.ignoreScaledFonts.labelString:	Ignore Scaled Fonts
*XlwMenu.ignoreScaledFonts.labelString:	????????????
! *XlwMenu.mostRecentlyUsed.labelString:	Most Recently Used
*XlwMenu.mostRecentlyUsed.labelString:	??????????????
! *XlwMenu.alphabetically.labelString:	Alphabetically
*XlwMenu.alphabetically.labelString:	????????
! *XlwMenu.byMajorModeThenAlphabetically.labelString:	By Major Mode, Then Alphabetically
*XlwMenu.byMajorModeThenAlphabetically.labelString:	????????, ??????????
! *XlwMenu.visible.labelString:	Visible
*XlwMenu.visible.labelString:	????
! *XlwMenu.captioned.labelString:	Captioned
*XlwMenu.captioned.labelString:	??????
! *XlwMenu.defaultLocation.labelString:	Default Location
*XlwMenu.defaultLocation.labelString:	????????
! *XlwMenu.top.labelString:	Top
*XlwMenu.top.labelString:	??
! *XlwMenu.bottom.labelString:	Bottom
*XlwMenu.bottom.labelString:	??
! *XlwMenu.left.labelString:	Left
*XlwMenu.left.labelString:	??
! *XlwMenu.right.labelString:	Right
*XlwMenu.right.labelString:	??
! *XlwMenu.avoidText.labelString:	Avoid-Text
*XlwMenu.avoidText.labelString:	????????
! *XlwMenu.strokesMode.labelString:	strokes-mode
*XlwMenu.strokesMode.labelString:	strokes ????
! *XlwMenu.emacsW3.labelString:	Emacs-W3
! *XlwMenu.emacsW3.labelString:
! *XlwMenu.netscape.labelString:	Netscape
! *XlwMenu.netscape.labelString:
! *XlwMenu.mosaic.labelString:	Mosaic
! *XlwMenu.mosaic.labelString:
! *XlwMenu.mosaicCCI.labelString:	Mosaic (CCI)
! *XlwMenu.mosaicCCI.labelString:
! *XlwMenu.iXIMosaic.labelString:	IXI Mosaic
! *XlwMenu.iXIMosaic.labelString:
! *XlwMenu.lynxXterm.labelString:	Lynx (xterm)
! *XlwMenu.lynxXterm.labelString:
! *XlwMenu.lynxXemacs.labelString:	Lynx (xemacs)
! *XlwMenu.lynxXemacs.labelString:
! *XlwMenu.grail.labelString:	Grail
! *XlwMenu.grail.labelString:
! *XlwMenu.charter.labelString:	Charter
! *XlwMenu.charter.labelString:
! *XlwMenu.clean.labelString:	Clean
! *XlwMenu.clean.labelString:
! *XlwMenu.courier.labelString:	Courier
! *XlwMenu.courier.labelString:
! *XlwMenu.fixed.labelString:	Fixed
! *XlwMenu.fixed.labelString:
! *XlwMenu.helvetica.labelString:	Helvetica
! *XlwMenu.helvetica.labelString:
! *XlwMenu.lucida.labelString:	Lucida
! *XlwMenu.lucida.labelString:
! *XlwMenu.lucidabright.labelString:	Lucidabright
! *XlwMenu.lucidabright.labelString:
! *XlwMenu.lucidatypewriter.labelString:	Lucidatypewriter
! *XlwMenu.lucidatypewriter.labelString:
! *XlwMenu.newCenturySchoolbook.labelString:	New Century Schoolbook
! *XlwMenu.newCenturySchoolbook.labelString:
! *XlwMenu.terminal.labelString:	Terminal
! *XlwMenu.terminal.labelString:
! *XlwMenu.times.labelString:	Times
! *XlwMenu.times.labelString:
! *XlwMenu.utopia.labelString:	Utopia
! *XlwMenu.utopia.labelString:
! *XlwMenu.5.labelString:	5
! *XlwMenu.5.labelString:
! *XlwMenu.6.labelString:	6
! *XlwMenu.6.labelString:
! *XlwMenu.7.labelString:	7
! *XlwMenu.7.labelString:
! *XlwMenu.8.labelString:	8
! *XlwMenu.8.labelString:
! *XlwMenu.9.labelString:	9
! *XlwMenu.9.labelString:
! *XlwMenu.10.labelString:	10
! *XlwMenu.10.labelString:
! *XlwMenu.11.labelString:	11
! *XlwMenu.11.labelString:
! *XlwMenu.12.labelString:	12
! *XlwMenu.12.labelString:
! *XlwMenu.13.labelString:	13
! *XlwMenu.13.labelString:
! *XlwMenu.14.labelString:	14
! *XlwMenu.14.labelString:
! *XlwMenu.15.labelString:	15
! *XlwMenu.15.labelString:
! *XlwMenu.16.labelString:	16
! *XlwMenu.16.labelString:
! *XlwMenu.17.labelString:	17
! *XlwMenu.17.labelString:
! *XlwMenu.18.labelString:	18
! *XlwMenu.18.labelString:
! *XlwMenu.19.labelString:	19
! *XlwMenu.19.labelString:
! *XlwMenu.20.labelString:	20
! *XlwMenu.20.labelString:
! *XlwMenu.23.labelString:	23
! *XlwMenu.23.labelString:
! *XlwMenu.24.labelString:	24
! *XlwMenu.24.labelString:
! *XlwMenu.black.labelString:	Black
! *XlwMenu.black.labelString:
! *XlwMenu.bold.labelString:	Bold
! *XlwMenu.bold.labelString:
! *XlwMenu.demibold.labelString:	Demibold
! *XlwMenu.demibold.labelString:
! *XlwMenu.medium.labelString:	Medium
! *XlwMenu.medium.labelString:
! *XlwMenu.regular.labelString:	Regular
! *XlwMenu.regular.labelString:
! *XlwMenu.grep___.labelString:	Grep...
! *XlwMenu.grep___.labelString:
! *XlwMenu.compile___.labelString:	Compile...
*XlwMenu.compile___.labelString:	????...
! *XlwMenu.shell.labelString:	Shell
*XlwMenu.shell.labelString:	??
! *XlwMenu.shellCommand___.labelString:	Shell Command...
*XlwMenu.shellCommand___.labelString:	??????...
! *XlwMenu.shellCommandOnRegion___.labelString:	Shell Command on Region...
*XlwMenu.shellCommandOnRegion___.labelString:	??????????????????...
! *XlwMenu.debugGDB___.labelString:	Debug (GDB)...
*XlwMenu.debugGDB___.labelString:	???? (GDB)...
! *XlwMenu.debugDBX___.labelString:	Debug (DBX)...
*XlwMenu.debugDBX___.labelString:	???? (DBX)...
! *XlwMenu.oOBrowser___.labelString:	OO-Browser...
*XlwMenu.oOBrowser___.labelString:	OO-??????...
! *XlwMenu.tags.labelString:	Tags
*XlwMenu.tags.labelString:	????
! *XlwMenu.vC.labelString:	VC
! *XlwMenu.vC.labelString:	VC
! *XlwMenu.findTag___.labelString:	Find Tag...
*XlwMenu.findTag___.labelString:	????????...
! *XlwMenu.findOtherWindow___.labelString:	Find Other Window...
*XlwMenu.findOtherWindow___.labelString:	??????????????...
! *XlwMenu.nextTag___.labelString:	Next Tag...
*XlwMenu.nextTag___.labelString:	??????????...
! *XlwMenu.nextOtherWindow___.labelString:	Next Other Window...
*XlwMenu.nextOtherWindow___.labelString:	??????????????...
! *XlwMenu.nextFile.labelString:	Next File
*XlwMenu.nextFile.labelString:	??????????
! *XlwMenu.tagsSearch___.labelString:	Tags Search...
*XlwMenu.tagsSearch___.labelString:	????????...
! *XlwMenu.tagsReplace___.labelString:	Tags Replace...
*XlwMenu.tagsReplace___.labelString:	????????...
! *XlwMenu.continueSearchReplace.labelString:	Continue Search/Replace
*XlwMenu.continueSearchReplace.labelString:	????????/????
! *XlwMenu.popStack.labelString:	Pop stack
*XlwMenu.popStack.labelString:	??????
! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	????????...
! *XlwMenu.setTagsTableFile___.labelString:	Set Tags Table File...
*XlwMenu.setTagsTableFile___.labelString:	??????????????...
! *XlwMenu.registerFile.labelString:	Register File
*XlwMenu.registerFile.labelString:	????????
! *XlwMenu.revertToLastRevision.labelString:	Revert to Last Revision
*XlwMenu.revertToLastRevision.labelString:	????????????????
! *XlwMenu.cancelLastCheckin.labelString:	Cancel Last Checkin
*XlwMenu.cancelLastCheckin.labelString:	?????????? Checkin
! *XlwMenu.renameFile.labelString:	Rename File
*XlwMenu.renameFile.labelString:	????????
! *XlwMenu.diffAgainstLastVersion.labelString:	Diff Against Last Version
*XlwMenu.diffAgainstLastVersion.labelString:	????????????????????
! *XlwMenu.diffBetweenRevisions___.labelString:	Diff Between Revisions...
*XlwMenu.diffBetweenRevisions___.labelString:	????????????????????...
! *XlwMenu.visitOtherVersion___.labelString:	Visit Other Version...
*XlwMenu.visitOtherVersion___.labelString:	????????????...
! *XlwMenu.showEditHistory.labelString:	Show Edit History
*XlwMenu.showEditHistory.labelString:	????????????
! *XlwMenu.listLockedFilesAnyUser.labelString:	List Locked Files Any User
*XlwMenu.listLockedFilesAnyUser.labelString:	??????????????
! *XlwMenu.createSnapshot.labelString:	Create Snapshot
*XlwMenu.createSnapshot.labelString:	????????
! *XlwMenu.retrieveSnapshot.labelString:	Retrieve Snapshot
*XlwMenu.retrieveSnapshot.labelString:	????????
! *XlwMenu.cVSUpdateDirectory.labelString:	CVS Update Directory
*XlwMenu.cVSUpdateDirectory.labelString:	CVS ????????
! *XlwMenu.file.labelString:	File
*XlwMenu.file.labelString:	????
! *XlwMenu.edit.labelString:	Edit
*XlwMenu.edit.labelString:	????
! *XlwMenu.mule.labelString:	Mule
! *XlwMenu.mule.labelString:
! *XlwMenu.apps.labelString:	Apps
*XlwMenu.apps.labelString:	????
! *XlwMenu.options.labelString:	Options
*XlwMenu.options.labelString:	??????
! *XlwMenu.buffers.labelString:	Buffers
*XlwMenu.buffers.labelString:   ??????
! *XlwMenu.tools.labelString:	Tools
*XlwMenu.tools.labelString:	????
! *XlwMenu.lispInteraction.labelString:	Lisp-Interaction
*XlwMenu.lispInteraction.labelString:	??????Lisp
! *XlwMenu.load_emacs.labelString:	Load .emacs
*XlwMenu.load_emacs.labelString:	???? .emacs
! *XlwMenu.help.labelString:	Help
*XlwMenu.help.labelString:	????


--- NEW FILE Emacs.ad.zh_CN.UTF-8 ---
! XEmacs 21.x ?????????????????????(??????????????????gb2312)
! 
!              Donald Park 'Piao Xiaolin' <xlpark at kankou.cs.uec.ac.jp>
!                                   Time-stamp: <03/10/17 21:30:00 petersen>
!
! This is the app-defaults file for XEmacs.
!
! This used to be identical to sample.Xdefaults, but the resources
! below have been rewritten to be as general as possible to avoid
! overriding user resources.  Other than the form rewriting, both
! files should be kept in sync. 
! 
! The resources below are loaded into the XEmacs executable at compile-time:
! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
! effect.
! 
! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
! (or whatever the standard app-defaults directory is at your site) to cause
! it to be consulted at run-time.  (Do this only for site-wide customizations:
! personal customizations should be put into ~/.Xdefaults instead.)
! Note that the file must be named Emacs, not XEmacs.
! 
! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of
! the various resources and the syntax for setting them.
! 
! Energize users: note that this is not the same app-defaults file that is
! used with the Energize-specific version of XEmacs.


! Colors and backgrounds.
! ======================
! The contrasts of these colors will cause them to map to the appropriate
! one of "black" or "white" on monochrome systems.
! 
! The valid color names on your system can be found by looking in the file
! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/.

! Set the modeline colors.
Emacs.modeline*attributeForeground:	Black
Emacs.modeline*attributeBackground:	Gray75

! Set the color of the text cursor.
Emacs.text-cursor*attributeBackground:	Red3

! If you want to set the color of the mouse pointer, do this:
! Emacs.pointer*attributeForeground:	Black
! If you want to set the background of the mouse pointer, do this:
! Emacs.pointer*attributeBackground:	White
! Note that by default, the pointer foreground and background are the same
! as the default face.

! Set the menubar colors.  This overrides the default foreground and
! background colors specified above.
*menubar*Foreground:			Gray30
*menubar*Background:			Gray80
! This is for buttons in the menubar.  
! Yellow would be better, but that would map to white on monochrome.
*menubar*buttonForeground:		Blue
*XlwMenu*highlightForeground:		Red
*XlwMenu*titleForeground:		Maroon
*XlwMenu*selectColor:			ForestGreen
*XmToggleButton*selectColor:		ForestGreen

! Specify the colors of popup menus.
*popup*Foreground:			Black
*popup*Background:			Gray80

! Specify the colors of the various sub-widgets of the dialog boxes.
*dialog*Foreground:			Black
! #A5C0C1 is a shade of blue
*dialog*Background:			#A5C0C1
! The following three are for Motif dialog boxes ...
*dialog*XmTextField*Background:		WhiteSmoke
*dialog*XmText*Background:		WhiteSmoke
*dialog*XmList*Background:		WhiteSmoke
! While this one is for Athena dialog boxes.
*dialog*Command*Background:		WhiteSmoke

! Xlw Scrollbar colors
*XlwScrollBar*Foreground:		Gray30
*XlwScrollBar*Background:		Gray80
*XmScrollBar*Foreground:		Gray30
*XmScrollBar*Background:		Gray80

!
! The Lucid Scrollbar supports two added resources, SliderStyle is either
! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
! of the slider that depresses when the slider is clicked on.  ArrowPosition is
! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
! of the scrollbar, same puts both arrows at the same end, like the Amiga.
!
Emacs*XlwScrollBar.SliderStyle:    dimple
Emacs*XlwScrollBar.ArrowPosition:  opposite


!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

*topToolBarShadowColor:			Gray90
*bottomToolBarShadowColor:		Gray40
*backgroundToolBarColor:		Gray80
*toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
Emacs.default.attributeFont:  -isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
*menubar*Font: 		-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*
*popup*Font:		-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*

! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*
*XmTextField*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*
*XmText*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*
*XmList*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField*translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton*translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! ! XIM fontset (defaults to system fontset default)
! ! *EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
! !    Japanese localization resources for XEmacs.
! ! @(#)Emacs	1.3 96/09/22
! !    Copyright (C) 1996 Sun Microsystems, Inc.
! !!
! ! This file is part of XEmacs.
! ! 
! ! XEmacs is free software; you can redistribute it and/or modify it
! ! under the terms of the GNU General Public License as published by the
! ! Free Software Foundation; either version 2, or (at your option) any
! ! later version.
! ! XEmacs 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 XEmacs; see the file COPYING.  If not, write to the
! ! Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! ! Boston, MA 02111-1307, USA.
! ! Copyright (C) 1996 Sun Microsystems Inc.
! !
! ! Japanese Resources to be placed in etc/app-defaults/ja/Emacs
! ! for xemacs-mule.  It is same on another languages such like fr,
! ! if you want to have French menu label, place it on
! ! etc/app-defaults/fr/Emacs.
! 
! ! Pulldown menu internationalization.  The first line of the file
! ! "*XlwMenu.resourceLabels: True" has to be there to make sure
! ! all the labelString will be read and displayed by X.
! *XlwMenu.resourceLabels: True
! 
! ! CDE doesn't require this but OpenWindows does.
! ! Note that this `gothic' font family is effective just for Japanese.
! ! And fontList is just used under Motif menubar.
! *fontList: -*-gothic-medium-r-normal--14-120-75-75-c-*-*-*:
! !! FontSet for menus when you use --with-xfs or --with-xim=xlib.
! *fontSet: -isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*
! 
! ! Starting below here are menu label string which can be translated to
! ! different languages. 
! ! Example: *XlwMenu.file.labelString: File  
! ! Characters before the ":" sign, "Example: *XlwMenu.file.labelString"
! ! can not be changed. They must stay exactly the way they are.
! ! The only string to be translated is the string, "File".
! ! Some resource names such as "file", "quit" have been used in several
! ! places.  However, each of them only has to be translated once in this X
! ! resource file.
! ! *XlwMenu.readMailVM___.labelString:	Read Mail (VM)...
! *XlwMenu.readMailVM___.labelString:	??????????????? (VM)...
! ! *XlwMenu.readMailMH___.labelString:	Read Mail (MH)...
! *XlwMenu.readMailMH___.labelString:	??????????????? (MH)...
! ! *XlwMenu.sendMail___.labelString:	Send mail...
! *XlwMenu.sendMail___.labelString:	???????????????...
! ! *XlwMenu.usenetNews.labelString:	Usenet News
! *XlwMenu.usenetNews.labelString:	????????????
! ! *XlwMenu.browseTheWeb.labelString:	Browse the Web
! *XlwMenu.browseTheWeb.labelString:	????????????
! ! *XlwMenu.gopher.labelString:	Gopher
! *XlwMenu.gopher.labelString:	Gopher
! ! *XlwMenu.hyperbole___.labelString:	Hyperbole...
! *XlwMenu.hyperbole___.labelString:	????????????...
! ! *XlwMenu.spellCheckBuffer.labelString:	Spell-Check Buffer
! *XlwMenu.spellCheckBuffer.labelString:	?????????????????????
! ! *XlwMenu.toggleVIEmulation.labelString:	Toggle VI emulation
! *XlwMenu.toggleVIEmulation.labelString:	????????? VI ???????????????
! ! *XlwMenu.calendar.labelString:	Calendar
! *XlwMenu.calendar.labelString:	??????
! ! *XlwMenu.games.labelString:	Games
! *XlwMenu.games.labelString:	??????
! ! *XlwMenu.3MonthCalendar.labelString:	3-Month Calendar
! *XlwMenu.3MonthCalendar.labelString:	3????????????
! ! *XlwMenu.diary.labelString:	Diary
! *XlwMenu.diary.labelString:	??????
! ! *XlwMenu.holidays.labelString:	Holidays
! *XlwMenu.holidays.labelString:	?????????
! ! *XlwMenu.phasesOfTheMoon.labelString:	Phases of the Moon
! *XlwMenu.phasesOfTheMoon.labelString:	??????
! ! *XlwMenu.sunriseSunset.labelString:	Sunrise/Sunset
! *XlwMenu.sunriseSunset.labelString:	??????/??????
! ! *XlwMenu.mineGame.labelString:	Mine Game
! *XlwMenu.mineGame.labelString:	???????????????
! ! *XlwMenu.tetris.labelString:	Tetris
! *XlwMenu.tetris.labelString:	???????????????	
! ! *XlwMenu.quoteFromZippy.labelString:	Quote from Zippy
! *XlwMenu.quoteFromZippy.labelString:	Zippy ?????????
! ! *XlwMenu.psychoanalyst.labelString:	Psychoanalyst
! *XlwMenu.psychoanalyst.labelString:	????????????
! ! *XlwMenu.psychoanalyzeZippy.labelString:	Psychoanalyze Zippy!
! *XlwMenu.psychoanalyzeZippy.labelString:	???????????? Zippy!
! ! *XlwMenu.randomFlames.labelString:	Random Flames
! *XlwMenu.randomFlames.labelString:	????????????
! ! *XlwMenu.dunnetAdventure.labelString:	Dunnet (Adventure)
! *XlwMenu.dunnetAdventure.labelString:	Dunnet (??????)
! ! *XlwMenu.towersOfHanoi.labelString:	Towers of Hanoi
! *XlwMenu.towersOfHanoi.labelString:	Hanoi ???
! ! *XlwMenu.gameOfLife.labelString:	Game of Life
! *XlwMenu.gameOfLife.labelString:	????????????
! ! *XlwMenu.multiplicationPuzzle.labelString:	Multiplication Puzzle
! *XlwMenu.multiplicationPuzzle.labelString:	??????????????????
! ! *XlwMenu.listAllBuffers.labelString:	List All Buffers
! *XlwMenu.listAllBuffers.labelString:	?????????????????????
! ! *XlwMenu..labelString:	
! ! *XlwMenu..labelString:
! ! *XlwMenu.emacs.labelString:	Emacs
! ! *XlwMenu.emacs.labelString:
! ! *XlwMenu.group___.labelString:	Group...
! ! *XlwMenu.group___.labelString:	???...
! ! *XlwMenu.variable___.labelString:	Variable...
! ! *XlwMenu.variable___.labelString:	??????...
! ! *XlwMenu.face___.labelString:	Face...
! ! *XlwMenu.face___.labelString:	???...
! ! *XlwMenu.saved___.labelString:	Saved...
! ! *XlwMenu.saved___.labelString:	??????...
! ! *XlwMenu.set___.labelString:	Set...
! ! *XlwMenu.set___.labelString:	??????...
! ! *XlwMenu.apropos___.labelString:	Apropos...
! ! *XlwMenu.apropos___.labelString:	????????????...
! ! *XlwMenu.browse___.labelString:	Browse...
! ! *XlwMenu.browse___.labelString:	??????...
! ! *XlwMenu.emacs___.labelString:	Emacs...
! ! *XlwMenu.emacs___.labelString:
! ! *XlwMenu.editing.labelString:	Editing
! *XlwMenu.editing.labelString:	??????
! ! *XlwMenu.external.labelString:	External
! *XlwMenu.external.labelString:	??????
! ! *XlwMenu.programming.labelString:	Programming
! *XlwMenu.programming.labelString:	??????
! ! *XlwMenu.applications.labelString:	Applications
! *XlwMenu.applications.labelString:	??????
! ! *XlwMenu.development.labelString:	Development
! *XlwMenu.development.labelString:	??????
! ! *XlwMenu.environment.labelString:	Environment
! *XlwMenu.environment.labelString:	??????
! ! *XlwMenu.data.labelString:	Data
! *XlwMenu.data.labelString:	??????
! ! *XlwMenu.files.labelString:	Files
! *XlwMenu.files.labelString:	??????
! ! *XlwMenu.wp.labelString:	Wp
! *XlwMenu.wp.labelString:	????????????
! ! *XlwMenu.faces.labelString:	Faces
! *XlwMenu.faces.labelString:	???
! ! *XlwMenu.hypermedia.labelString:	Hypermedia
! *XlwMenu.hypermedia.labelString:	?????????
! ! *XlwMenu.help.labelString:	Help
! ! *XlwMenu.help.labelString:	??????
! ! *XlwMenu.local.labelString:	Local
! *XlwMenu.local.labelString:	??????
! ! *XlwMenu.undo.labelString:	Undo
! *XlwMenu.undo.labelString:	??????
! ! *XlwMenu.cut.labelString:	Cut
! *XlwMenu.cut.labelString:	??????
! ! *XlwMenu.copy.labelString:	Copy
! *XlwMenu.copy.labelString:	??????
! ! *XlwMenu.paste.labelString:	Paste
! *XlwMenu.paste.labelString:	??????
! ! *XlwMenu.clear.labelString:	Clear
! *XlwMenu.clear.labelString:	??????
! ! *XlwMenu.search___.labelString:	Search...
! *XlwMenu.search___.labelString:	??????...
! ! *XlwMenu.searchBackward___.labelString:	Search Backward...
! *XlwMenu.searchBackward___.labelString:	???????????????
! ! *XlwMenu.replace___.labelString:	Replace...
! *XlwMenu.replace___.labelString:	??????...
! ! *XlwMenu.searchRegexp___.labelString:	Search (Regexp)...
! *XlwMenu.searchRegexp___.labelString:	?????? (??????) ...
! ! *XlwMenu.searchBackwardRegexp___.labelString:	Search Backward (Regexp)...
! *XlwMenu.searchBackwardRegexp___.labelString:	??????????????? (??????) ...
! ! *XlwMenu.replaceRegexp___.labelString:	Replace (Regexp)...
! *XlwMenu.replaceRegexp___.labelString:	?????? (??????) ...
! ! *XlwMenu.gotoLine___.labelString:	Goto Line...
! *XlwMenu.gotoLine___.labelString:	???????????????...
! ! *XlwMenu.whatLine.labelString:	What Line
! *XlwMenu.whatLine.labelString:	???????????????
! ! *XlwMenu.bookmarks.labelString:	Bookmarks
! *XlwMenu.bookmarks.labelString:	??????
! ! *XlwMenu.startMacroRecording.labelString:	Start Macro Recording
! *XlwMenu.startMacroRecording.labelString:	???????????????
! ! *XlwMenu.endMacroRecording.labelString:	End Macro Recording
! *XlwMenu.endMacroRecording.labelString:	???????????????
! ! *XlwMenu.executeLastMacro.labelString:	Execute Last Macro
! *XlwMenu.executeLastMacro.labelString:	?????????????????????
! ! *XlwMenu.showMessageLog.labelString:	Show Message Log
! *XlwMenu.showMessageLog.labelString:	??????????????????
! ! *XlwMenu.jumpToBookmark.labelString:	Jump to Bookmark
! *XlwMenu.jumpToBookmark.labelString:	????????????
! ! *XlwMenu.setBookmark.labelString:	Set bookmark
! *XlwMenu.setBookmark.labelString:	????????????
! ! *XlwMenu.insertContents.labelString:	Insert contents
! *XlwMenu.insertContents.labelString:	????????????
! ! *XlwMenu.insertLocation.labelString:	Insert location
! *XlwMenu.insertLocation.labelString:	????????????
! ! *XlwMenu.renameBookmark.labelString:	Rename bookmark
! *XlwMenu.renameBookmark.labelString:	????????????
! ! *XlwMenu.deleteBookmark.labelString:	Delete Bookmark
! *XlwMenu.deleteBookmark.labelString:	????????????
! ! *XlwMenu.editBookmarkList.labelString:	Edit Bookmark List
! *XlwMenu.editBookmarkList.labelString:	??????????????????
! ! *XlwMenu.saveBookmarks.labelString:	Save bookmarks
! *XlwMenu.saveBookmarks.labelString:	????????????
! ! *XlwMenu.saveBookmarksAs___.labelString:	Save bookmarks as...
! *XlwMenu.saveBookmarksAs___.labelString:	??????????????????...
! ! *XlwMenu.loadABookmarkFile.labelString:	Load a bookmark file
! *XlwMenu.loadABookmarkFile.labelString:	??????????????????
! ! *XlwMenu.open___.labelString:	Open...
! *XlwMenu.open___.labelString:	??????...
! ! *XlwMenu.openInOtherWindow___.labelString:	Open in Other Window...
! *XlwMenu.openInOtherWindow___.labelString:	????????????????????????...
! ! *XlwMenu.openInNewFrame___.labelString:	Open in New Frame...
! *XlwMenu.openInNewFrame___.labelString:	??????????????????...
! ! *XlwMenu.insertFile___.labelString:	Insert File...
! *XlwMenu.insertFile___.labelString:	????????????...
! ! *XlwMenu.viewFile___.labelString:	View File...
! *XlwMenu.viewFile___.labelString:	????????????...
! ! *XlwMenu.save.labelString:	Save
! *XlwMenu.save.labelString:	??????
! ! *XlwMenu.saveAs___.labelString:	Save As...
! *XlwMenu.saveAs___.labelString:	?????????...
! ! *XlwMenu.saveSomeBuffers.labelString:	Save Some Buffers
! *XlwMenu.saveSomeBuffers.labelString:	???????????????
! ! *XlwMenu.printBuffer.labelString:	Print Buffer
! *XlwMenu.printBuffer.labelString:	???????????????
! ! *XlwMenu.prettyPrintBuffer.labelString:	Pretty-Print Buffer
! *XlwMenu.prettyPrintBuffer.labelString:	???????????????
! ! *XlwMenu.newFrame.labelString:	New Frame
! *XlwMenu.newFrame.labelString:	??????
! ! *XlwMenu.frameOnOtherDisplay___.labelString:	Frame on Other Display...
! *XlwMenu.frameOnOtherDisplay___.labelString:	????????????????????????...
! ! *XlwMenu.deleteFrame.labelString:	Delete Frame
! *XlwMenu.deleteFrame.labelString:	?????????
! ! *XlwMenu.splitWindow.labelString:	Split Window
! *XlwMenu.splitWindow.labelString:	????????????
! ! *XlwMenu.unSplitKeepThis.labelString:	Un-Split (Keep This)
! *XlwMenu.unSplitKeepThis.labelString:	???????????????
! ! *XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep Others)
! *XlwMenu.unSplitKeepOthers.labelString:	???????????????
! ! *XlwMenu.revertBuffer.labelString:	Revert Buffer
! *XlwMenu.revertBuffer.labelString:	???????????????
! ! *XlwMenu.deleteBuffer.labelString:	Delete Buffer
! *XlwMenu.deleteBuffer.labelString:	???????????????
! ! *XlwMenu.exitXEmacs.labelString:	Exit XEmacs
! *XlwMenu.exitXEmacs.labelString:	?????? XEmacs
! ! *XlwMenu.aboutXEmacs___.labelString:	About XEmacs...
! *XlwMenu.aboutXEmacs___.labelString:	?????? XEmacs...
! ! *XlwMenu.basics.labelString:	Basics
! *XlwMenu.basics.labelString:	??????
! ! *XlwMenu.xEmacsFAQ.labelString:	XEmacs FAQ
! *XlwMenu.xEmacsFAQ.labelString:	XEmacs ????????????????????????
! ! *XlwMenu.samples.labelString:	Samples
! *XlwMenu.samples.labelString:	??????
! ! *XlwMenu.lookupInInfo.labelString:	Lookup in Info
! *XlwMenu.lookupInInfo.labelString:	??? Info ?????????
! ! *XlwMenu.manuals.labelString:	Manuals
! *XlwMenu.manuals.labelString:	??????
! ! *XlwMenu.commandsKeys.labelString:	Commands & Keys
! *XlwMenu.commandsKeys.labelString:	????????????
! ! *XlwMenu.recentMessages.labelString:	Recent Messages
! *XlwMenu.recentMessages.labelString:	???????????????
! ! *XlwMenu.misc.labelString:	Misc
! *XlwMenu.misc.labelString:	??????
! ! *XlwMenu.submitBugReport.labelString:	Submit Bug Report
! *XlwMenu.submitBugReport.labelString:	??? Bug ??????
! ! *XlwMenu.tutorial.labelString:	Tutorial
! *XlwMenu.tutorial.labelString:	??????
! ! *XlwMenu.news.labelString:	News
! *XlwMenu.news.labelString:	??????
! ! *XlwMenu.packages.labelString:	Packages
! *XlwMenu.packages.labelString:	???
! ! *XlwMenu.splash.labelString:	Splash
! *XlwMenu.splash.labelString:	Splash
! ! *XlwMenu.fAQLocal.labelString:	FAQ (local)
! *XlwMenu.fAQLocal.labelString:	???????????????????????? (??????)
! ! *XlwMenu.fAQViaWWW.labelString:	FAQ via WWW
! *XlwMenu.fAQViaWWW.labelString:	???????????????????????? (??????WWW)
! ! *XlwMenu.homePage.labelString:	Home Page
! *XlwMenu.homePage.labelString:	??????
! ! *XlwMenu.sample.labelString:	Sample
! *XlwMenu.sample.labelString:	??????
! ! *XlwMenu.keyBinding___.labelString:	Key Binding...
! *XlwMenu.keyBinding___.labelString:	????????????...
! ! *XlwMenu.command___.labelString:	Command...
! *XlwMenu.command___.labelString:	??????...
! ! *XlwMenu.function___.labelString:	Function...
! *XlwMenu.function___.labelString:	??????...
! ! *XlwMenu.topic___.labelString:	Topic...
! *XlwMenu.topic___.labelString:	??????...
! ! *XlwMenu.info.labelString:	Info
! *XlwMenu.info.labelString:	Info
! ! *XlwMenu.unixManual___.labelString:	Unix Manual...
! *XlwMenu.unixManual___.labelString:	Unix ??????...
! ! *XlwMenu.mode.labelString:	Mode
! *XlwMenu.mode.labelString:	??????
! ! *XlwMenu.apropos___.labelString:	Apropos...
! ! *XlwMenu.apropos___.labelString:	????????????...
! ! *XlwMenu.aproposDocs___.labelString:	Apropos Docs...
! *XlwMenu.aproposDocs___.labelString:	????????????????????????...
! ! *XlwMenu.key___.labelString:	Key...
! *XlwMenu.key___.labelString:	???...
! ! *XlwMenu.bindings.labelString:	Bindings
! *XlwMenu.bindings.labelString:	??????
! ! *XlwMenu.mouseBindings.labelString:	Mouse Bindings
! *XlwMenu.mouseBindings.labelString:	????????????
! ! *XlwMenu.recentKeys.labelString:	Recent Keys
! *XlwMenu.recentKeys.labelString:	????????????
! ! *XlwMenu.variable___.labelString:	Variable...
! ! *XlwMenu.variable___.labelString:	??????...
! ! *XlwMenu.locateCommand___.labelString:	Locate Command...
! *XlwMenu.locateCommand___.labelString:	????????????...
! ! *XlwMenu.noWarranty.labelString:	No Warranty
! *XlwMenu.noWarranty.labelString:	????????????
! ! *XlwMenu.xEmacsLicense.labelString:	XEmacs License
! *XlwMenu.xEmacsLicense.labelString:	XEmacs ?????????
! ! *XlwMenu.theLatestVersion.labelString:	The Latest Version
! *XlwMenu.theLatestVersion.labelString:	????????????
! ! *XlwMenu.evaluateLastSExpression.labelString:	Evaluate Last S-expression
! *XlwMenu.evaluateLastSExpression.labelString:	??????????????? S ?????????
! ! *XlwMenu.evaluateEntireBuffer.labelString:	Evaluate Entire Buffer
! *XlwMenu.evaluateEntireBuffer.labelString:	?????????????????????
! ! *XlwMenu.evaluateRegion.labelString:	Evaluate Region
! *XlwMenu.evaluateRegion.labelString:	????????????
! ! *XlwMenu.evaluateThisDefun.labelString:	Evaluate This Defun
! *XlwMenu.evaluateThisDefun.labelString:	???????????? Defun
! ! *XlwMenu.debugThisDefun.labelString:	Debug This Defun
! *XlwMenu.debugThisDefun.labelString:	???????????? Defun
! ! *XlwMenu.traceAFunction.labelString:	Trace a Function
! *XlwMenu.traceAFunction.labelString:	??????????????????
! ! *XlwMenu.untraceAllFunctions.labelString:	Untrace All Functions
! *XlwMenu.untraceAllFunctions.labelString:	?????????????????????
! ! *XlwMenu.commentOutRegion.labelString:	Comment Out Region
! *XlwMenu.commentOutRegion.labelString:	????????????
! ! *XlwMenu.indentRegion.labelString:	Indent Region
! *XlwMenu.indentRegion.labelString:	????????????
! ! *XlwMenu.indentLine.labelString:	Indent Line
! *XlwMenu.indentLine.labelString:	????????????
! ! *XlwMenu.debugOnError.labelString:	Debug On Error
! ! *XlwMenu.debugOnError.labelString:	?????????????????????
! ! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
! ! *XlwMenu.debugOnQuit.labelString:	???????????????
! ! *XlwMenu.debugOnSignal.labelString:	Debug on Signal
! *XlwMenu.debugOnSignal.labelString:	????????????
! ! *XlwMenu.describeLanguageSupport.labelString:	Describe language support
! *XlwMenu.describeLanguageSupport.labelString:	??????????????????
! ! *XlwMenu.setLanguageEnvironment.labelString:	Set language environment
! *XlwMenu.setLanguageEnvironment.labelString:	??????????????????
! ! *XlwMenu.toggleInputMethod.labelString:	Toggle input method
! *XlwMenu.toggleInputMethod.labelString:	???????????????
! ! *XlwMenu.selectInputMethod.labelString:	Select input method
! *XlwMenu.selectInputMethod.labelString:	???????????????
! ! *XlwMenu.describeInputMethod.labelString:	Describe input method
! *XlwMenu.describeInputMethod.labelString:	???????????????
! ! *XlwMenu.describeCurrentCodingSystems.labelString:	Describe current coding systems
! *XlwMenu.describeCurrentCodingSystems.labelString:	????????????????????????
! ! *XlwMenu.setCodingSystemOfBufferFile.labelString:	Set coding system of buffer file
! *XlwMenu.setCodingSystemOfBufferFile.labelString:	????????????????????????????????????
! ! *XlwMenu.setCodingSystemOfTerminal.labelString:	Set coding system of terminal
! *XlwMenu.setCodingSystemOfTerminal.labelString:	???????????????????????????
! ! *XlwMenu.setCodingSystemOfKeyboard.labelString:	Set coding system of keyboard
! *XlwMenu.setCodingSystemOfKeyboard.labelString:	???????????????????????????
! ! *XlwMenu.setCodingSystemOfProcess.labelString:	Set coding system of process
! *XlwMenu.setCodingSystemOfProcess.labelString:	???????????????????????????
! ! *XlwMenu.showCharacterTable.labelString:	Show character table
! *XlwMenu.showCharacterTable.labelString:	???????????????
! ! *XlwMenu.showDiagnosisForMULE.labelString:	Show diagnosis for MULE
! *XlwMenu.showDiagnosisForMULE.labelString:	?????? MULE ???????????????
! ! *XlwMenu.showManyLanguages.labelString:	Show many languages
! *XlwMenu.showManyLanguages.labelString:	???????????????
! ! *XlwMenu.chineseGB.labelString:	Chinese-GB
! *XlwMenu.chineseGB.labelString:	?????? GB ???
! ! *XlwMenu.chineseBIG5.labelString:	Chinese-BIG5
! *XlwMenu.chineseBIG5.labelString:	?????? BIG5 ???
! ! *XlwMenu.cyrillicISO.labelString:	Cyrillic-ISO
! !*XlwMenu.cyrillicISO.labelString:
! ! *XlwMenu.cyrillicKOI8.labelString:	Cyrillic-KOI8
! !*XlwMenu.cyrillicKOI8.labelString:
! ! *XlwMenu.cyrillicALT.labelString:	Cyrillic-ALT
! !*XlwMenu.cyrillicALT.labelString:
! ! *XlwMenu.cyrillic.labelString:	Cyrillic
! !*XlwMenu.cyrillic.labelString:
! ! ! *XlwMenu.english.labelString:	English
! *XlwMenu.english.labelString:	??????
! ! *XlwMenu.aSCII.labelString:	ASCII
! ! *XlwMenu.aSCII.labelString:
! ! *XlwMenu.latin1.labelString:	Latin-1
! *XlwMenu.latin1.labelString:	?????????-1
! ! *XlwMenu.german.labelString:	German
! *XlwMenu.german.labelString:	??????
! ! *XlwMenu.french.labelString:	French
! *XlwMenu.french.labelString:	??????
! ! *XlwMenu.norwegian.labelString:	Norwegian
! *XlwMenu.norwegian.labelString:	?????????
! ! *XlwMenu.latin2.labelString:	Latin-2
! *XlwMenu.latin2.labelString:	?????????-2
! ! *XlwMenu.croatian.labelString:	Croatian
! *XlwMenu.croatian.labelString:	???????????????
! ! *XlwMenu.polish.labelString:	Polish
! *XlwMenu.polish.labelString:	?????????
! ! *XlwMenu.latin3.labelString:	Latin-3
! *XlwMenu.latin3.labelString:	?????????-3
! ! *XlwMenu.latin4.labelString:	Latin-4
! *XlwMenu.latin4.labelString:	?????????-4
! ! *XlwMenu.latin5.labelString:	Latin-5
! *XlwMenu.latin5.labelString:	?????????-5
! ! *XlwMenu.greek.labelString:	Greek
! *XlwMenu.greek.labelString:	?????????
! ! *XlwMenu.hebrew.labelString:	Hebrew
! *XlwMenu.hebrew.labelString:	Hebrew
! ! *XlwMenu.japanese.labelString:	Japanese
! *XlwMenu.japanese.labelString:	??????
! ! *XlwMenu.korean.labelString:	Korean
! *XlwMenu.korean.labelString:	?????????
! ! *XlwMenu.iPA.labelString:	IPA
! ! *XlwMenu.iPA.labelString:
! ! *XlwMenu.customize.labelString:	Customize
! *XlwMenu.customize.labelString:	??????
! ! *XlwMenu.readOnly.labelString:	Read Only
! *XlwMenu.readOnly.labelString:	??????
! ! *XlwMenu.editingOptions.labelString:	Editing Options
! *XlwMenu.editingOptions.labelString:	????????????
! ! *XlwMenu.generalOptions.labelString:	General Options
! *XlwMenu.generalOptions.labelString:	????????????
! ! *XlwMenu.printingOptions.labelString:	Printing Options
! *XlwMenu.printingOptions.labelString:	????????????
! ! *XlwMenu.otherWindowLocation.labelString:	"Other Window" Location
! *XlwMenu.otherWindowLocation.labelString:	"????????????"??????
! ! *XlwMenu.syntaxHighlighting.labelString:	Syntax Highlighting
! *XlwMenu.syntaxHighlighting.labelString:	??????????????????
! ! *XlwMenu.parenHighlighting.labelString:	Paren Highlighting
! *XlwMenu.parenHighlighting.labelString:	??????????????????
! ! *XlwMenu.frameAppearance.labelString:	Frame Appearance
! *XlwMenu.frameAppearance.labelString:	?????????
! ! *XlwMenu.menubarAppearance.labelString:	Menubar Appearance
! *XlwMenu.menubarAppearance.labelString:	???????????????
! ! *XlwMenu.toolbarAppearance.labelString:	Toolbar Appearance
! *XlwMenu.toolbarAppearance.labelString:	???????????????
! ! *XlwMenu.mouse.labelString:	Mouse
! *XlwMenu.mouse.labelString:	??????
! ! *XlwMenu.openURLsWith.labelString:	Open URLs With
! *XlwMenu.openURLsWith.labelString:	???????????????
! ! *XlwMenu.browseFaces___.labelString:	Browse Faces...
! *XlwMenu.browseFaces___.labelString:	?????????...
! ! *XlwMenu.font.labelString:	Font
! *XlwMenu.font.labelString:	??????
! ! *XlwMenu.size.labelString:	Size
! *XlwMenu.size.labelString:	??????
! ! *XlwMenu.weight.labelString:	Weight
! *XlwMenu.weight.labelString:	??????
! 
! 
! ! *XlwMenu.saveOptions.labelString:	Save Options
! *XlwMenu.saveOptions.labelString:	????????????
! !
! ! described by menu-customize?
! ! *XlwMenu.emacs.labelString:	Emacs
! ! *XlwMenu.emacs.labelString:
! ! *XlwMenu.group___.labelString:	Group...
! *XlwMenu.group___.labelString:	???...
! ! *XlwMenu.variable___.labelString:	Variable...
! *XlwMenu.variable___.labelString:	??????...
! ! *XlwMenu.face___.labelString:	Face...
! *XlwMenu.face___.labelString:	???...
! ! *XlwMenu.saved___.labelString:	Saved...
! *XlwMenu.saved___.labelString:	??????...
! ! *XlwMenu.set___.labelString:	Set...
! *XlwMenu.set___.labelString:	??????...
! ! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	????????????...
! !
! ! *XlwMenu.browse___.labelString:	Browse...
! *XlwMenu.browse___.labelString:	??????...
! !! *XlwMenu.overstrike.labelString:	Overstrike
! *XlwMenu.overstrike.labelString:	??????
! ! *XlwMenu.caseSensitiveSearch.labelString:	Case Sensitive Search
! *XlwMenu.caseSensitiveSearch.labelString:	?????????????????????
! ! *XlwMenu.caseMatchingReplace.labelString:	Case Matching Replace
! *XlwMenu.caseMatchingReplace.labelString:	?????????????????????
! ! *XlwMenu.autoDeleteSelection.labelString:	Auto Delete Selection
! *XlwMenu.autoDeleteSelection.labelString:	??????????????????
! ! *XlwMenu.activeRegions.labelString:	Active Regions
! *XlwMenu.activeRegions.labelString:	????????????
! ! *XlwMenu.mousePasteAtTextCursor.labelString:	Mouse Paste At Text Cursor
! *XlwMenu.mousePasteAtTextCursor.labelString:	?????????????????????????????????
! ! *XlwMenu.requireNewlineAtEnd.labelString:	Require Newline At End
! *XlwMenu.requireNewlineAtEnd.labelString:	??????????????????????????????
! ! *XlwMenu.addNewlineWhenMovingPastEnd.labelString:	Add Newline When Moving Past End
! *XlwMenu.addNewlineWhenMovingPastEnd.labelString:	????????????????????????????????????
! ! *XlwMenu.teachExtendedCommands.labelString:	Teach Extended Commands
! *XlwMenu.teachExtendedCommands.labelString:	??????????????????
! ! *XlwMenu.debugOnError.labelString:	Debug On Error
! *XlwMenu.debugOnError.labelString:	??????????????????
! ! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
! *XlwMenu.debugOnQuit.labelString:	??????????????????
! ! *XlwMenu.commandLineSwitchesForLprLp___.labelString:	Command-Line Switches for `lpr'/`lp'...
! *XlwMenu.commandLineSwitchesForLprLp___.labelString:	????????? lpr/lp ?????????
! ! *XlwMenu.prettyPrintPaperSize.labelString:	Pretty-Print Paper Size
! *XlwMenu.prettyPrintPaperSize.labelString:	??????????????????
! ! *XlwMenu.colorPrinting.labelString:	Color Printing
! *XlwMenu.colorPrinting.labelString:	????????????
! ! *XlwMenu.letter.labelString:	Letter
! ! *XlwMenu.letter.labelString:
! ! *XlwMenu.letterSmall.labelString:	Letter-small
! ! *XlwMenu.letterSmall.labelString:
! ! *XlwMenu.legal.labelString:	Legal
! ! *XlwMenu.legal.labelString:
! ! *XlwMenu.statement.labelString:	Statement
! ! *XlwMenu.statement.labelString:
! ! *XlwMenu.executive.labelString:	Executive
! ! *XlwMenu.executive.labelString:
! ! *XlwMenu.tabloid.labelString:	Tabloid
! ! *XlwMenu.tabloid.labelString:
! ! *XlwMenu.ledger.labelString:	Ledger
! ! *XlwMenu.ledger.labelString:
! ! *XlwMenu.a3.labelString:	A3
! ! *XlwMenu.a3.labelString:
! ! *XlwMenu.a4.labelString:	A4
! ! *XlwMenu.a4.labelString:
! ! *XlwMenu.a4small.labelString:	A4small
! ! *XlwMenu.a4small.labelString:
! ! *XlwMenu.b4.labelString:	B4
! ! *XlwMenu.b4.labelString:
! ! *XlwMenu.b5.labelString:	B5
! ! *XlwMenu.b5.labelString:
! ! *XlwMenu.alwaysInSameFrame.labelString:	Always in Same Frame
! *XlwMenu.alwaysInSameFrame.labelString:	??????????????????
! ! *XlwMenu.otherFrame2FramesMax.labelString:	Other Frame (2 Frames Max)
! *XlwMenu.otherFrame2FramesMax.labelString:	????????? (??????2???)
! ! *XlwMenu.otherFrame3FramesMax.labelString:	Other Frame (3 Frames Max)
! *XlwMenu.otherFrame3FramesMax.labelString:	????????? (??????3???)
! ! *XlwMenu.otherFrame4FramesMax.labelString:	Other Frame (4 Frames Max)
! *XlwMenu.otherFrame4FramesMax.labelString:	????????? (??????4???)
! ! *XlwMenu.otherFrame5FramesMax.labelString:	Other Frame (5 Frames Max)
! *XlwMenu.otherFrame5FramesMax.labelString:	????????? (??????5???)
! ! *XlwMenu.alwaysCreateNewFrame.labelString:	Always Create New Frame
! *XlwMenu.alwaysCreateNewFrame.labelString:	??????????????????
! ! *XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	Temp Buffers Always in Same Frame
! *XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	?????????????????????????????????
! ! *XlwMenu.tempBuffersLikeOtherBuffers.labelString:	Temp Buffers Like Other Buffers
! *XlwMenu.tempBuffersLikeOtherBuffers.labelString: ???????????????????????????????????????
! ! *XlwMenu.makeCurrentFrameGnuservTarget.labelString:	Make current frame gnuserv target
! *XlwMenu.makeCurrentFrameGnuservTarget.labelString:????????????????????? gnuserv ?????????
! ! *XlwMenu.inThisBuffer.labelString:	In This Buffer
! *XlwMenu.inThisBuffer.labelString:	?????????????????????
! ! *XlwMenu.automatic.labelString:	Automatic
! *XlwMenu.automatic.labelString:	??????
! ! *XlwMenu.fonts.labelString:	Fonts
! *XlwMenu.fonts.labelString:	??????
! ! *XlwMenu.colors.labelString:	Colors
! *XlwMenu.colors.labelString:    ??????
! ! *XlwMenu.least.labelString:	Least
! *XlwMenu.least.labelString:	??????
! ! *XlwMenu.more.labelString:	More
! *XlwMenu.more.labelString:	???
! ! *XlwMenu.evenMore.labelString:	Even More
! *XlwMenu.evenMore.labelString:	??????
! ! *XlwMenu.most.labelString:	Most
! *XlwMenu.most.labelString:	??????
! ! *XlwMenu.lazy.labelString:	Lazy
! *XlwMenu.lazy.labelString:	??????
! ! *XlwMenu.caching.labelString:	Caching
! *XlwMenu.caching.labelString:	????????????
! ! *XlwMenu.none.labelString:	None
! *XlwMenu.none.labelString:	???
! ! *XlwMenu.blinkingParen.labelString:	Blinking Paren
! *XlwMenu.blinkingParen.labelString:	????????????
! ! *XlwMenu.steadyParen.labelString:	Steady Paren
! *XlwMenu.steadyParen.labelString:	????????????
! ! *XlwMenu.expression.labelString:	Expression
! *XlwMenu.expression.labelString:	???????????????
! ! *XlwMenu.scrollbars.labelString:	Scrollbars
! *XlwMenu.scrollbars.labelString:	?????????
! ! *XlwMenu.3DModeline.labelString:	3D Modeline
! *XlwMenu.3DModeline.labelString:	3 ????????????
! ! *XlwMenu.truncateLines.labelString:	Truncate Lines
! *XlwMenu.truncateLines.labelString:	?????????
! ! *XlwMenu.barCursor.labelString:	Bar Cursor
! *XlwMenu.barCursor.labelString:	????????????
! ! *XlwMenu.blinkingCursor.labelString:	Blinking Cursor
! *XlwMenu.blinkingCursor.labelString:	????????????
! ! *XlwMenu.frameLocalFontMenu.labelString:	Frame-Local Font Menu
! *XlwMenu.frameLocalFontMenu.labelString:	?????????????????????
! ! *XlwMenu.buffersMenuLength___.labelString:	Buffers Menu Length...
! *XlwMenu.buffersMenuLength___.labelString:	?????????????????????...
! ! *XlwMenu.multiOperationBuffersSubMenus.labelString:	Multi-Operation Buffers Sub-Menus
! *XlwMenu.multiOperationBuffersSubMenus.labelString:	???????????????????????????
! ! *XlwMenu.buffersMenuSorting.labelString:	Buffers Menu Sorting
! *XlwMenu.buffersMenuSorting.labelString:	?????????????????????
! ! *XlwMenu.submenusForBufferGroups.labelString:	Submenus for Buffer Groups
! *XlwMenu.submenusForBufferGroups.labelString:	?????????????????????????????????
! ! *XlwMenu.ignoreScaledFonts.labelString:	Ignore Scaled Fonts
! *XlwMenu.ignoreScaledFonts.labelString:	??????????????????
! ! *XlwMenu.mostRecentlyUsed.labelString:	Most Recently Used
! *XlwMenu.mostRecentlyUsed.labelString:	?????????????????????
! ! *XlwMenu.alphabetically.labelString:	Alphabetically
! *XlwMenu.alphabetically.labelString:	????????????
! ! *XlwMenu.byMajorModeThenAlphabetically.labelString:	By Major Mode, Then Alphabetically
! *XlwMenu.byMajorModeThenAlphabetically.labelString:	????????????, ???????????????
! ! *XlwMenu.visible.labelString:	Visible
! *XlwMenu.visible.labelString:	??????
! ! *XlwMenu.captioned.labelString:	Captioned
! *XlwMenu.captioned.labelString:	?????????
! ! *XlwMenu.defaultLocation.labelString:	Default Location
! *XlwMenu.defaultLocation.labelString:	????????????
! ! *XlwMenu.top.labelString:	Top
! *XlwMenu.top.labelString:	???
! ! *XlwMenu.bottom.labelString:	Bottom
! *XlwMenu.bottom.labelString:	???
! ! *XlwMenu.left.labelString:	Left
! *XlwMenu.left.labelString:	???
! ! *XlwMenu.right.labelString:	Right
! *XlwMenu.right.labelString:	???
! ! *XlwMenu.avoidText.labelString:	Avoid-Text
! *XlwMenu.avoidText.labelString:	????????????
! ! *XlwMenu.strokesMode.labelString:	strokes-mode
! *XlwMenu.strokesMode.labelString:	strokes ??????
! ! *XlwMenu.emacsW3.labelString:	Emacs-W3
! ! *XlwMenu.emacsW3.labelString:
! ! *XlwMenu.netscape.labelString:	Netscape
! ! *XlwMenu.netscape.labelString:
! ! *XlwMenu.mosaic.labelString:	Mosaic
! ! *XlwMenu.mosaic.labelString:
! ! *XlwMenu.mosaicCCI.labelString:	Mosaic (CCI)
! ! *XlwMenu.mosaicCCI.labelString:
! ! *XlwMenu.iXIMosaic.labelString:	IXI Mosaic
! ! *XlwMenu.iXIMosaic.labelString:
! ! *XlwMenu.lynxXterm.labelString:	Lynx (xterm)
! ! *XlwMenu.lynxXterm.labelString:
! ! *XlwMenu.lynxXemacs.labelString:	Lynx (xemacs)
! ! *XlwMenu.lynxXemacs.labelString:
! ! *XlwMenu.grail.labelString:	Grail
! ! *XlwMenu.grail.labelString:
! ! *XlwMenu.charter.labelString:	Charter
! ! *XlwMenu.charter.labelString:
! ! *XlwMenu.clean.labelString:	Clean
! ! *XlwMenu.clean.labelString:
! ! *XlwMenu.courier.labelString:	Courier
! ! *XlwMenu.courier.labelString:
! ! *XlwMenu.fixed.labelString:	Fixed
! ! *XlwMenu.fixed.labelString:
! ! *XlwMenu.helvetica.labelString:	Helvetica
! ! *XlwMenu.helvetica.labelString:
! ! *XlwMenu.lucida.labelString:	Lucida
! ! *XlwMenu.lucida.labelString:
! ! *XlwMenu.lucidabright.labelString:	Lucidabright
! ! *XlwMenu.lucidabright.labelString:
! ! *XlwMenu.lucidatypewriter.labelString:	Lucidatypewriter
! ! *XlwMenu.lucidatypewriter.labelString:
! ! *XlwMenu.newCenturySchoolbook.labelString:	New Century Schoolbook
! ! *XlwMenu.newCenturySchoolbook.labelString:
! ! *XlwMenu.terminal.labelString:	Terminal
! ! *XlwMenu.terminal.labelString:
! ! *XlwMenu.times.labelString:	Times
! ! *XlwMenu.times.labelString:
! ! *XlwMenu.utopia.labelString:	Utopia
! ! *XlwMenu.utopia.labelString:
! ! *XlwMenu.5.labelString:	5
! ! *XlwMenu.5.labelString:
! ! *XlwMenu.6.labelString:	6
! ! *XlwMenu.6.labelString:
! ! *XlwMenu.7.labelString:	7
! ! *XlwMenu.7.labelString:
! ! *XlwMenu.8.labelString:	8
! ! *XlwMenu.8.labelString:
! ! *XlwMenu.9.labelString:	9
! ! *XlwMenu.9.labelString:
! ! *XlwMenu.10.labelString:	10
! ! *XlwMenu.10.labelString:
! ! *XlwMenu.11.labelString:	11
! ! *XlwMenu.11.labelString:
! ! *XlwMenu.12.labelString:	12
! ! *XlwMenu.12.labelString:
! ! *XlwMenu.13.labelString:	13
! ! *XlwMenu.13.labelString:
! ! *XlwMenu.14.labelString:	14
! ! *XlwMenu.14.labelString:
! ! *XlwMenu.15.labelString:	15
! ! *XlwMenu.15.labelString:
! ! *XlwMenu.16.labelString:	16
! ! *XlwMenu.16.labelString:
! ! *XlwMenu.17.labelString:	17
! ! *XlwMenu.17.labelString:
! ! *XlwMenu.18.labelString:	18
! ! *XlwMenu.18.labelString:
! ! *XlwMenu.19.labelString:	19
! ! *XlwMenu.19.labelString:
! ! *XlwMenu.20.labelString:	20
! ! *XlwMenu.20.labelString:
! ! *XlwMenu.23.labelString:	23
! ! *XlwMenu.23.labelString:
! ! *XlwMenu.24.labelString:	24
! ! *XlwMenu.24.labelString:
! ! *XlwMenu.black.labelString:	Black
! ! *XlwMenu.black.labelString:
! ! *XlwMenu.bold.labelString:	Bold
! ! *XlwMenu.bold.labelString:
! ! *XlwMenu.demibold.labelString:	Demibold
! ! *XlwMenu.demibold.labelString:
! ! *XlwMenu.medium.labelString:	Medium
! ! *XlwMenu.medium.labelString:
! ! *XlwMenu.regular.labelString:	Regular
! ! *XlwMenu.regular.labelString:
! ! *XlwMenu.grep___.labelString:	Grep...
! ! *XlwMenu.grep___.labelString:
! ! *XlwMenu.compile___.labelString:	Compile...
! *XlwMenu.compile___.labelString:	??????...
! ! *XlwMenu.shell.labelString:	Shell
! *XlwMenu.shell.labelString:	???
! ! *XlwMenu.shellCommand___.labelString:	Shell Command...
! *XlwMenu.shellCommand___.labelString:	?????????...
! ! *XlwMenu.shellCommandOnRegion___.labelString:	Shell Command on Region...
! *XlwMenu.shellCommandOnRegion___.labelString:	???????????????????????????...
! ! *XlwMenu.debugGDB___.labelString:	Debug (GDB)...
! *XlwMenu.debugGDB___.labelString:	?????? (GDB)...
! ! *XlwMenu.debugDBX___.labelString:	Debug (DBX)...
! *XlwMenu.debugDBX___.labelString:	?????? (DBX)...
! ! *XlwMenu.oOBrowser___.labelString:	OO-Browser...
! *XlwMenu.oOBrowser___.labelString:	OO-?????????...
! ! *XlwMenu.tags.labelString:	Tags
! *XlwMenu.tags.labelString:	??????
! ! *XlwMenu.vC.labelString:	VC
! ! *XlwMenu.vC.labelString:	VC
! ! *XlwMenu.findTag___.labelString:	Find Tag...
! *XlwMenu.findTag___.labelString:	????????????...
! ! *XlwMenu.findOtherWindow___.labelString:	Find Other Window...
! *XlwMenu.findOtherWindow___.labelString:	?????????????????????...
! ! *XlwMenu.nextTag___.labelString:	Next Tag...
! *XlwMenu.nextTag___.labelString:	???????????????...
! ! *XlwMenu.nextOtherWindow___.labelString:	Next Other Window...
! *XlwMenu.nextOtherWindow___.labelString:	?????????????????????...
! ! *XlwMenu.nextFile.labelString:	Next File
! *XlwMenu.nextFile.labelString:	???????????????
! ! *XlwMenu.tagsSearch___.labelString:	Tags Search...
! *XlwMenu.tagsSearch___.labelString:	????????????...
! ! *XlwMenu.tagsReplace___.labelString:	Tags Replace...
! *XlwMenu.tagsReplace___.labelString:	????????????...
! ! *XlwMenu.continueSearchReplace.labelString:	Continue Search/Replace
! *XlwMenu.continueSearchReplace.labelString:	????????????/??????
! ! *XlwMenu.popStack.labelString:	Pop stack
! *XlwMenu.popStack.labelString:	?????????
! ! *XlwMenu.apropos___.labelString:	Apropos...
! ! *XlwMenu.apropos___.labelString:	????????????...
! ! *XlwMenu.setTagsTableFile___.labelString:	Set Tags Table File...
! *XlwMenu.setTagsTableFile___.labelString:	?????????????????????...
! ! *XlwMenu.registerFile.labelString:	Register File
! *XlwMenu.registerFile.labelString:	????????????
! ! *XlwMenu.revertToLastRevision.labelString:	Revert to Last Revision
! *XlwMenu.revertToLastRevision.labelString:	????????????????????????
! ! *XlwMenu.cancelLastCheckin.labelString:	Cancel Last Checkin
! *XlwMenu.cancelLastCheckin.labelString:	??????????????? Checkin
! ! *XlwMenu.renameFile.labelString:	Rename File
! *XlwMenu.renameFile.labelString:	????????????
! ! *XlwMenu.diffAgainstLastVersion.labelString:	Diff Against Last Version
! *XlwMenu.diffAgainstLastVersion.labelString:	??????????????????????????????
! ! *XlwMenu.diffBetweenRevisions___.labelString:	Diff Between Revisions...
! *XlwMenu.diffBetweenRevisions___.labelString:	??????????????????????????????...
! ! *XlwMenu.visitOtherVersion___.labelString:	Visit Other Version...
! *XlwMenu.visitOtherVersion___.labelString:	??????????????????...
! ! *XlwMenu.showEditHistory.labelString:	Show Edit History
! *XlwMenu.showEditHistory.labelString:	??????????????????
! ! *XlwMenu.listLockedFilesAnyUser.labelString:	List Locked Files Any User
! *XlwMenu.listLockedFilesAnyUser.labelString:	?????????????????????
! ! *XlwMenu.createSnapshot.labelString:	Create Snapshot
! *XlwMenu.createSnapshot.labelString:	????????????
! ! *XlwMenu.retrieveSnapshot.labelString:	Retrieve Snapshot
! *XlwMenu.retrieveSnapshot.labelString:	????????????
! ! *XlwMenu.cVSUpdateDirectory.labelString:	CVS Update Directory
! *XlwMenu.cVSUpdateDirectory.labelString:	CVS ????????????
! ! *XlwMenu.file.labelString:	File
! *XlwMenu.file.labelString:	??????
! ! *XlwMenu.edit.labelString:	Edit
! *XlwMenu.edit.labelString:	??????
! ! *XlwMenu.mule.labelString:	Mule
! ! *XlwMenu.mule.labelString:
! ! *XlwMenu.apps.labelString:	Apps
! *XlwMenu.apps.labelString:	??????
! ! *XlwMenu.options.labelString:	Options
! *XlwMenu.options.labelString:	?????????
! ! *XlwMenu.buffers.labelString:	Buffers
! *XlwMenu.buffers.labelString:   ?????????
! ! *XlwMenu.tools.labelString:	Tools
! *XlwMenu.tools.labelString:	??????
! ! *XlwMenu.lispInteraction.labelString:	Lisp-Interaction
! *XlwMenu.lispInteraction.labelString:	?????????Lisp
! ! *XlwMenu.load_emacs.labelString:	Load .emacs
! *XlwMenu.load_emacs.labelString:	?????? .emacs
! ! *XlwMenu.help.labelString:	Help
! *XlwMenu.help.labelString:	??????


--- NEW FILE Emacs.ad.zh_TW.Big5 ---
! Last Updated on 98/09/19
! Chinese localization resources for XEmacs
! Author: Clem Chuang (b5506056 at csie.ntu.edu.tw)
! modify from /usr/local/lib/xemacs-20.4/etc/app-defaults/ja/Emacs
! ??????????????!  ?Y???????N???B?]???s?????A?O?b?I???B?? :)
! ???O?q?????????????????A?o?????G???I???F?A???? XEmacs ?????W???w?g???F
! ???H?????????S???? ?Y?A?????????X?? Just do it!
! Fix not to affect emacs 2001/01/21 Yukihiro Nakai <ynakai at redhat.com>

! this is just to set the default fonts
!Emacs.default.attributeFont:  -*-courier-medium-r-*-*-*-140-*-*-*-*-iso8859-*
!Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-140-*-*-*-*-iso8859-*

.default.attributeFont: -*-courier-medium-r-*-*-*-*-*-*-*-80-iso8859-

! pulldown menu internationalization.  The first line of the file
! "Emacs*XlwMenu.resourceLabels: True" has to be there to make sure
! all the labelString will be read and displayed by X.
*XlwMenu.resourceLabels: True

*fontList: -*-gothic-medium-r-normal--14-120-75-75-c-*-*-*:
!! FontSet for the window frame and menus when you use USE_XFONTSET
!Emacs*fontSet: -*-fixed-medium-r-normal--16-*
*fontSet: -*-fixed-medium-r-normal--16-* 

! Starting below here are menu label string which can be translated to
! different languages. 
! Example: Emacs*XlwMenu.file.labelString: File  
! Characters before the ":" sign, "Example: Emacs*XlwMenu.file.labelString"
! can not be changed. They must stay exactly the way they are.
! The only string to be translated is the string, "File".
! Some resource names such as "file", "quit" have been used in several
! places.  However, each of them only has to be translated once in this X
! resource file.
!!! Default Menubar Top Level

! Emacs*XlwMenu.file.labelString:	File
*XlwMenu.file.labelString:	????
! Emacs*XlwMenu.edit.labelString:	Edit
*XlwMenu.edit.labelString:	?s??
! Emacs*XlwMenu.edit.labelString:	Mule
*XlwMenu.mule.labelString:	?y??
! Emacs*XlwMenu.apps.labelString:	Apps
*XlwMenu.apps.labelString:	?????n??
! Emacs*XlwMenu.options.labelString:	Options
*XlwMenu.options.labelString:	????
! Emacs*XlwMenu.buffers.labelString:	Buffers
*XlwMenu.buffers.labelString:	Buffers
! Emacs*XlwMenu.tools.labelString:	Tools
*XlwMenu.tools.labelString:	?u??
! Emacs*XlwMenu.help.labelString:	Help
*XlwMenu.help.labelString:	????

!! File menu

! Emacs*XlwMenu.open___.labelString:	Open...
*XlwMenu.open___.labelString:	?}??...
! Emacs*XlwMenu.openInOtherWindow___.labelString:	Open in Other Window...
*XlwMenu.openInOtherWindow___.labelString:	?}???b?s Window ??...
! Emacs*XlwMenu.openInNewFrame___.labelString:	Open in New Frame...
*XlwMenu.openInNewFrame___.labelString:	?}???b?s Frame ??...
! Emacs*XlwMenu.insertFile___.labelString:	Insert File...
*XlwMenu.insertFile___.labelString:	???J????...
! Emacs*XlwMenu.viewFile___.labelString:	View File...
*XlwMenu.viewFile___.labelString:	?[??????...
! Emacs*XlwMenu.save.labelString:	Save
*XlwMenu.save.labelString:	?s??:
! Emacs*XlwMenu.saveAs___.labelString:	Save As...
*XlwMenu.saveAs___.labelString:	?s???s??
! Emacs*XlwMenu.saveSomeBuffers.labelString:	Save Some Buffers
*XlwMenu.saveSomeBuffers.labelString:	???????x?s
! Emacs*XlwMenu.printBuffer.labelString:	Print Buffer
*XlwMenu.printBuffer.labelString:	?C?L:
! Emacs*XlwMenu.prettyPrintBuffer.labelString:	Pretty-Print Buffer
*XlwMenu.prettyPrintBuffer.labelString:	???~???C?L:
! Emacs*XlwMenu.newFrame.labelString:	New Frame
*XlwMenu.newFrame.labelString:	?}?s Frame
! Emacs*XlwMenu.frameOnOtherDisplay___.labelString:	Frame on Other Display...
*XlwMenu.frameOnOtherDisplay___.labelString:	?b?O?? Display ?W?}?s Frame
! Emacs*XlwMenu.deleteFrame.labelString:	Delete Frame
*XlwMenu.deleteFrame.labelString:	???? Frame
! Emacs*XlwMenu.splitWindow.labelString:	Split Window
*XlwMenu.splitWindow.labelString:	???? Window
! Emacs*XlwMenu.unSplitKeepThis.labelString:	Un-Split (Keep This)
*XlwMenu.unSplitKeepThis.labelString:	???j?o?? Window
! Emacs*XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep Others)
*XlwMenu.unSplitKeepOthers.labelString:	?Y?p?o?? Window
! Emacs*XlwMenu.revertBuffer.labelString:	Revert Buffer
*XlwMenu.revertBuffer.labelString:	?_???^??????:
! Emacs*XlwMenu.deleteBuffer.labelString:	Delete Buffer
*XlwMenu.deleteBuffer.labelString:	?M?? buffer:
! Emacs*XlwMenu.exitXEmacs.labelString:	Exit XEmacs
*XlwMenu.exitXEmacs.labelString:	???} XEmacs 

!! Edit menu

! Emacs*XlwMenu.undo.labelString:	Undo
*XlwMenu.undo.labelString:	?_??
! Emacs*XlwMenu.cut.labelString:	Cut
*XlwMenu.cut.labelString: ???U
! Emacs*XlwMenu.copy.labelString:	Copy
*XlwMenu.copy.labelString:	???s
! Emacs*XlwMenu.paste.labelString:	Paste
*XlwMenu.paste.labelString:	?K?W
! Emacs*XlwMenu.clear.labelString:	Clear
*XlwMenu.clear.labelString:	???h
! Emacs*XlwMenu.search___.labelString:	Search...
*XlwMenu.search___.labelString:	?j??...
! Emacs*XlwMenu.searchBackward___.labelString:	Search Backward...
*XlwMenu.searchBackward___.labelString:	?V???j??...
! Emacs*XlwMenu.replace___.labelString:	Replace...
*XlwMenu.replace___.labelString:	?m??...
! Emacs*XlwMenu.searchRegexp___.labelString:	Search (Regexp)...
*XlwMenu.searchRegexp___.labelString:	?j??(Regexp)...
! Emacs*XlwMenu.searchBackwardRegexp___.labelString:	Search Backward (Regexp)...
*XlwMenu.searchBackwardRegexp___.labelString:	?V???j??(Regexp)...
! Emacs*XlwMenu.replaceRegexp___.labelString:	Replace (Regexp)...
*XlwMenu.replaceRegexp___.labelString:	?m??(Regexp)...
! Emacs*XlwMenu.bookmarks.labelString:	Bookmarks
*XlwMenu.bookmarks.labelString:	????
! Emacs*XlwMenu.gotoLine___.labelString:	Goto Line...
*XlwMenu.gotoLine___.labelString:	?????Y?@??...
! Emacs*XlwMenu.whatLine.labelString:	What Line
*XlwMenu.whatLine.labelString:	???e????
! Emacs*XlwMenu.startMacroRecording.labelString:	Start Macro Recording
*XlwMenu.startMacroRecording.labelString:	?}?l?? Macro
! Emacs*XlwMenu.endMacroRecording.labelString:	End Macro Recording
*XlwMenu.endMacroRecording.labelString:	?????? Macro
*XlwMenu.showMessageLog.labelString:	?????T??????
! Emacs*XlwMenu.executeLastMacro.labelString:	Execute Last Macro
*XlwMenu.executeLastMacro.labelString:	??????????
! Emacs*XlwMenu.jumpToBookmark.labelString:	Jump to bookmark
*XlwMenu.jumpToBookmark.labelString:	????????
! Emacs*XlwMenu.setBookmark.labelString:	Set bookmark
*XlwMenu.setBookmark.labelString:	?]?w????
! Emacs*XlwMenu.insertContents.labelString:	Insert contents
*XlwMenu.insertContents.labelString:	???J???e
! Emacs*XlwMenu.insertLocation.labelString:	Insert location
*XlwMenu.insertLocation.labelString:	???J???m
! Emacs*XlwMenu.renameBookmark.labelString:	Rename bookmark
*XlwMenu.renameBookmark.labelString:	???s?R?W
! Emacs*XlwMenu.deleteBookmark.labelString:	Delete bookmark
*XlwMenu.deleteBookmark.labelString:	?R??
! Emacs*XlwMenu.editBookmarkList.labelString:	Edit Bookmark List
*XlwMenu.editBookmarkList.labelString:	?s???????C??
! Emacs*XlwMenu.saveBookmarks.labelString:	Save bookmarks
*XlwMenu.saveBookmarks.labelString:	?x?s????
! Emacs*XlwMenu.saveBookmarksAs___.labelString:	Save bookmarks as...
*XlwMenu.saveBookmarksAs___.labelString:	?N?????s??...
! Emacs*XlwMenu.loadABookmarkFile.labelString:	Load a bookmark file
*XlwMenu.loadABookmarkFile.labelString:	???J??????

!! Apps menu

! Emacs*XlwMenu.readMailVM___.labelString:	Read Mail (VM)...
*XlwMenu.readMailVM___.labelString:	???H (???? VM)...
! Emacs*XlwMenu.readMailMH___.labelString:	Read Mail (MH)...
*XlwMenu.readMailMH___.labelString:	???H (???? MH)...
! Emacs*XlwMenu.sendMail___.labelString:	Send mail...
*XlwMenu.sendMail___.labelString:	?H?H...
! Emacs*XlwMenu.usenetNews.labelString:	Usenet News
*XlwMenu.usenetNews.labelString:	Usenet News
! Emacs*XlwMenu.browseTheWeb.labelString:	Browse the Web
*XlwMenu.browseTheWeb.labelString:	?y?? WWW
! Emacs*XlwMenu.gopher.labelString:	Gopher
*XlwMenu.gopher.labelString:	Gopher
! Emacs*XlwMenu.hyperbole___.labelString:	Hyperbole...
*XlwMenu.hyperbole___.labelString:	Hyperbole...
! Emacs*XlwMenu.spellCheckBuffer.labelString:	Spell-Check Buffer
*XlwMenu.spellCheckBuffer.labelString:	???r???d?{??
! Emacs*XlwMenu.emulateVI.labelString:	Emulate VI
*XlwMenu.toggleVIEmulation.labelString:	???? vi
! Emacs*XlwMenu.calendar.labelString:	Calendar
*XlwMenu.calendar.labelString:	????
! Emacs*XlwMenu.games.labelString:	Games
*XlwMenu.games.labelString:	?C??
! Emacs*XlwMenu.3MonthCalendar.labelString:	3-Month Calendar
*XlwMenu.3MonthCalendar.labelString:	?????T????
! Emacs*XlwMenu.diary.labelString:	Diary
*XlwMenu.diary.labelString:	???O
! Emacs*XlwMenu.holidays.labelString:	Holidays
*XlwMenu.holidays.labelString:	?`??
! Emacs*XlwMenu.phasesOfTheMoon.labelString:	Phases of the Moon
*XlwMenu.phasesOfTheMoon.labelString:	???G
! Emacs*XlwMenu.sunriseSunset.labelString:	Sunrise/Sunset
*XlwMenu.sunriseSunset.labelString:	???X/????
! Emacs*XlwMenu.quoteFromZippy.labelString:	Quote from Zippy
*XlwMenu.quoteFromZippy.labelString:	Zippy ??????
! Emacs*XlwMenu.psychoanalyst.labelString:	Psychoanalyst
*XlwMenu.psychoanalyst.labelString:	????????
*XlwMenu.mineGame.labelString:	???a?p
! Emacs*XlwMenu.tetris.abelString:	Tetris
*XlwMenu.tetris.labelString:	?X????????
! Emacs*XlwMenu.psychoanalyzeZippy.labelString:	Psychoanalyze Zippy!
*XlwMenu.psychoanalyzeZippy.labelString:	???????R Zippy!
! Emacs*XlwMenu.randomFlames.labelString:	Random Flames
*XlwMenu.randomFlames.labelString:	???o???@??
! Emacs*XlwMenu.dunnetAdventure.labelString:	Dunnet (Adventure)
*XlwMenu.dunnetAdventure.labelString:	Dunnet (?_?I)
[...2178 lines suppressed...]
! Emacs*XlwScrollBar.ArrowPosition:  opposite


!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

*topToolBarShadowColor:		Gray90
*bottomToolBarShadowColor:		Gray40
*backgroundToolBarColor:		Gray75
*toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
! Emacs.default.attributeFont:  -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
!*menubar*Font: 		-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*
!*popup*Font:		-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*


! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:	-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*
*XmTextField*FontList:	-*-courier-medium-r-*-*-*-160-*-*-*-*-iso8859-*
*XmText*FontList:		-*-courier-medium-r-*-*-*-160-*-*-*-*-iso8859-*
*XmList*FontList:		-*-courier-medium-r-*-*-*-160-*-*-*-*-iso8859-*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:		-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField.translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton.translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! XIM fontset (defaults to system fontset default)
! Emacs*EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*

.geometry: 80x25


--- NEW FILE Emacs.ad.zh_TW.UTF-8 ---
! Last Updated on 98/09/19
! Chinese localization resources for XEmacs
! Author: Clem Chuang (b5506056 at csie.ntu.edu.tw)
! modify from /usr/local/lib/xemacs-20.4/etc/app-defaults/ja/Emacs
! ?????????????????????!  ????????????????????????????????????????????????????????? :)
! ????????????????????????????????????????????????????????????????????? XEmacs ????????????????????????
! ??????????????????????????? ???????????????????????? Just do it!
! Fix not to affect emacs 2001/01/21 Yukihiro Nakai <ynakai at redhat.com>

! this is just to set the default fonts
!Emacs.default.attributeFont:  -*-courier-medium-r-*-*-*-140-*-*-*-*-iso8859-*
!Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-140-*-*-*-*-iso8859-*

.default.attributeFont: -*-courier-medium-r-*-*-*-*-*-*-*-80-iso8859-

! ! pulldown menu internationalization.  The first line of the file
! ! "Emacs*XlwMenu.resourceLabels: True" has to be there to make sure
! ! all the labelString will be read and displayed by X.
! *XlwMenu.resourceLabels: True
! 
! *fontList: -*-gothic-medium-r-normal--14-120-75-75-c-*-*-*:
! !! FontSet for the window frame and menus when you use USE_XFONTSET
! !Emacs*fontSet: -*-fixed-medium-r-normal--16-*
! *fontSet: -*-fixed-medium-r-normal--16-* 
! 
! ! Starting below here are menu label string which can be translated to
! ! different languages. 
! ! Example: Emacs*XlwMenu.file.labelString: File  
! ! Characters before the ":" sign, "Example: Emacs*XlwMenu.file.labelString"
! ! can not be changed. They must stay exactly the way they are.
! ! The only string to be translated is the string, "File".
! ! Some resource names such as "file", "quit" have been used in several
! ! places.  However, each of them only has to be translated once in this X
! ! resource file.
! !!! Default Menubar Top Level
! 
! ! Emacs*XlwMenu.file.labelString:	File
! *XlwMenu.file.labelString:	??????
! ! Emacs*XlwMenu.edit.labelString:	Edit
! *XlwMenu.edit.labelString:	??????
! ! Emacs*XlwMenu.edit.labelString:	Mule
! *XlwMenu.mule.labelString:	??????
! ! Emacs*XlwMenu.apps.labelString:	Apps
! *XlwMenu.apps.labelString:	????????????
! ! Emacs*XlwMenu.options.labelString:	Options
! *XlwMenu.options.labelString:	??????
! ! Emacs*XlwMenu.buffers.labelString:	Buffers
! *XlwMenu.buffers.labelString:	Buffers
! ! Emacs*XlwMenu.tools.labelString:	Tools
! *XlwMenu.tools.labelString:	??????
! ! Emacs*XlwMenu.help.labelString:	Help
! *XlwMenu.help.labelString:	??????
! 
! !! File menu
! 
! ! Emacs*XlwMenu.open___.labelString:	Open...
! *XlwMenu.open___.labelString:	??????...
! ! Emacs*XlwMenu.openInOtherWindow___.labelString:	Open in Other Window...
! *XlwMenu.openInOtherWindow___.labelString:	???????????? Window ???...
! ! Emacs*XlwMenu.openInNewFrame___.labelString:	Open in New Frame...
! *XlwMenu.openInNewFrame___.labelString:	???????????? Frame ???...
! ! Emacs*XlwMenu.insertFile___.labelString:	Insert File...
! *XlwMenu.insertFile___.labelString:	????????????...
! ! Emacs*XlwMenu.viewFile___.labelString:	View File...
! *XlwMenu.viewFile___.labelString:	????????????...
! ! Emacs*XlwMenu.save.labelString:	Save
! *XlwMenu.save.labelString:	??????:
! ! Emacs*XlwMenu.saveAs___.labelString:	Save As...
! *XlwMenu.saveAs___.labelString:	????????????
! ! Emacs*XlwMenu.saveSomeBuffers.labelString:	Save Some Buffers
! *XlwMenu.saveSomeBuffers.labelString:	???????????????
! ! Emacs*XlwMenu.printBuffer.labelString:	Print Buffer
! *XlwMenu.printBuffer.labelString:	??????:
! ! Emacs*XlwMenu.prettyPrintBuffer.labelString:	Pretty-Print Buffer
! *XlwMenu.prettyPrintBuffer.labelString:	???????????????:
! ! Emacs*XlwMenu.newFrame.labelString:	New Frame
! *XlwMenu.newFrame.labelString:	?????? Frame
! ! Emacs*XlwMenu.frameOnOtherDisplay___.labelString:	Frame on Other Display...
! *XlwMenu.frameOnOtherDisplay___.labelString:	????????? Display ????????? Frame
! ! Emacs*XlwMenu.deleteFrame.labelString:	Delete Frame
! *XlwMenu.deleteFrame.labelString:	?????? Frame
! ! Emacs*XlwMenu.splitWindow.labelString:	Split Window
! *XlwMenu.splitWindow.labelString:	?????? Window
! ! Emacs*XlwMenu.unSplitKeepThis.labelString:	Un-Split (Keep This)
! *XlwMenu.unSplitKeepThis.labelString:	???????????? Window
! ! Emacs*XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep Others)
! *XlwMenu.unSplitKeepOthers.labelString:	???????????? Window
! ! Emacs*XlwMenu.revertBuffer.labelString:	Revert Buffer
! *XlwMenu.revertBuffer.labelString:	??????????????????:
! ! Emacs*XlwMenu.deleteBuffer.labelString:	Delete Buffer
! *XlwMenu.deleteBuffer.labelString:	?????? buffer:
! ! Emacs*XlwMenu.exitXEmacs.labelString:	Exit XEmacs
! *XlwMenu.exitXEmacs.labelString:	?????? XEmacs 
! 
! !! Edit menu
! 
! ! Emacs*XlwMenu.undo.labelString:	Undo
! *XlwMenu.undo.labelString:	??????
! ! Emacs*XlwMenu.cut.labelString:	Cut
! *XlwMenu.cut.labelString: ??????
! ! Emacs*XlwMenu.copy.labelString:	Copy
! *XlwMenu.copy.labelString:	??????
! ! Emacs*XlwMenu.paste.labelString:	Paste
! *XlwMenu.paste.labelString:	??????
! ! Emacs*XlwMenu.clear.labelString:	Clear
! *XlwMenu.clear.labelString:	??????
! ! Emacs*XlwMenu.search___.labelString:	Search...
! *XlwMenu.search___.labelString:	??????...
! ! Emacs*XlwMenu.searchBackward___.labelString:	Search Backward...
! *XlwMenu.searchBackward___.labelString:	????????????...
! ! Emacs*XlwMenu.replace___.labelString:	Replace...
! *XlwMenu.replace___.labelString:	??????...
! ! Emacs*XlwMenu.searchRegexp___.labelString:	Search (Regexp)...
! *XlwMenu.searchRegexp___.labelString:	??????(Regexp)...
! ! Emacs*XlwMenu.searchBackwardRegexp___.labelString:	Search Backward (Regexp)...
! *XlwMenu.searchBackwardRegexp___.labelString:	????????????(Regexp)...
! ! Emacs*XlwMenu.replaceRegexp___.labelString:	Replace (Regexp)...
! *XlwMenu.replaceRegexp___.labelString:	??????(Regexp)...
! ! Emacs*XlwMenu.bookmarks.labelString:	Bookmarks
! *XlwMenu.bookmarks.labelString:	??????
! ! Emacs*XlwMenu.gotoLine___.labelString:	Goto Line...
! *XlwMenu.gotoLine___.labelString:	???????????????...
! ! Emacs*XlwMenu.whatLine.labelString:	What Line
! *XlwMenu.whatLine.labelString:	????????????
! ! Emacs*XlwMenu.startMacroRecording.labelString:	Start Macro Recording
! *XlwMenu.startMacroRecording.labelString:	????????? Macro
! ! Emacs*XlwMenu.endMacroRecording.labelString:	End Macro Recording
! *XlwMenu.endMacroRecording.labelString:	????????? Macro
! *XlwMenu.showMessageLog.labelString:	??????????????????
! ! Emacs*XlwMenu.executeLastMacro.labelString:	Execute Last Macro
! *XlwMenu.executeLastMacro.labelString:	???????????????
! ! Emacs*XlwMenu.jumpToBookmark.labelString:	Jump to bookmark
! *XlwMenu.jumpToBookmark.labelString:	????????????
! ! Emacs*XlwMenu.setBookmark.labelString:	Set bookmark
! *XlwMenu.setBookmark.labelString:	????????????
! ! Emacs*XlwMenu.insertContents.labelString:	Insert contents
! *XlwMenu.insertContents.labelString:	????????????
! ! Emacs*XlwMenu.insertLocation.labelString:	Insert location
! *XlwMenu.insertLocation.labelString:	????????????
! ! Emacs*XlwMenu.renameBookmark.labelString:	Rename bookmark
! *XlwMenu.renameBookmark.labelString:	????????????
! ! Emacs*XlwMenu.deleteBookmark.labelString:	Delete bookmark
! *XlwMenu.deleteBookmark.labelString:	??????
! ! Emacs*XlwMenu.editBookmarkList.labelString:	Edit Bookmark List
! *XlwMenu.editBookmarkList.labelString:	??????????????????
! ! Emacs*XlwMenu.saveBookmarks.labelString:	Save bookmarks
! *XlwMenu.saveBookmarks.labelString:	????????????
! ! Emacs*XlwMenu.saveBookmarksAs___.labelString:	Save bookmarks as...
! *XlwMenu.saveBookmarksAs___.labelString:	???????????????...
! ! Emacs*XlwMenu.loadABookmarkFile.labelString:	Load a bookmark file
! *XlwMenu.loadABookmarkFile.labelString:	???????????????
! 
! !! Apps menu
! 
! ! Emacs*XlwMenu.readMailVM___.labelString:	Read Mail (VM)...
! *XlwMenu.readMailVM___.labelString:	?????? (?????? VM)...
! ! Emacs*XlwMenu.readMailMH___.labelString:	Read Mail (MH)...
! *XlwMenu.readMailMH___.labelString:	?????? (?????? MH)...
! ! Emacs*XlwMenu.sendMail___.labelString:	Send mail...
! *XlwMenu.sendMail___.labelString:	??????...
! ! Emacs*XlwMenu.usenetNews.labelString:	Usenet News
! *XlwMenu.usenetNews.labelString:	Usenet News
! ! Emacs*XlwMenu.browseTheWeb.labelString:	Browse the Web
! *XlwMenu.browseTheWeb.labelString:	?????? WWW
! ! Emacs*XlwMenu.gopher.labelString:	Gopher
! *XlwMenu.gopher.labelString:	Gopher
! ! Emacs*XlwMenu.hyperbole___.labelString:	Hyperbole...
! *XlwMenu.hyperbole___.labelString:	Hyperbole...
! ! Emacs*XlwMenu.spellCheckBuffer.labelString:	Spell-Check Buffer
! *XlwMenu.spellCheckBuffer.labelString:	??????????????????
! ! Emacs*XlwMenu.emulateVI.labelString:	Emulate VI
! *XlwMenu.toggleVIEmulation.labelString:	?????? vi
! ! Emacs*XlwMenu.calendar.labelString:	Calendar
! *XlwMenu.calendar.labelString:	??????
! ! Emacs*XlwMenu.games.labelString:	Games
! *XlwMenu.games.labelString:	??????
! ! Emacs*XlwMenu.3MonthCalendar.labelString:	3-Month Calendar
! *XlwMenu.3MonthCalendar.labelString:	???????????????
! ! Emacs*XlwMenu.diary.labelString:	Diary
! *XlwMenu.diary.labelString:	??????
! ! Emacs*XlwMenu.holidays.labelString:	Holidays
! *XlwMenu.holidays.labelString:	??????
! ! Emacs*XlwMenu.phasesOfTheMoon.labelString:	Phases of the Moon
! *XlwMenu.phasesOfTheMoon.labelString:	??????
! ! Emacs*XlwMenu.sunriseSunset.labelString:	Sunrise/Sunset
! *XlwMenu.sunriseSunset.labelString:	??????/??????
! ! Emacs*XlwMenu.quoteFromZippy.labelString:	Quote from Zippy
! *XlwMenu.quoteFromZippy.labelString:	Zippy ?????????
! ! Emacs*XlwMenu.psychoanalyst.labelString:	Psychoanalyst
! *XlwMenu.psychoanalyst.labelString:	????????????
! *XlwMenu.mineGame.labelString:	?????????
! ! Emacs*XlwMenu.tetris.abelString:	Tetris
! *XlwMenu.tetris.labelString:	???????????????
! ! Emacs*XlwMenu.psychoanalyzeZippy.labelString:	Psychoanalyze Zippy!
! *XlwMenu.psychoanalyzeZippy.labelString:	???????????? Zippy!
! ! Emacs*XlwMenu.randomFlames.labelString:	Random Flames
! *XlwMenu.randomFlames.labelString:	???????????????
! ! Emacs*XlwMenu.dunnetAdventure.labelString:	Dunnet (Adventure)
! *XlwMenu.dunnetAdventure.labelString:	Dunnet (??????)
[...2178 lines suppressed...]
! Emacs*XlwScrollBar.ArrowPosition:  opposite


!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

*topToolBarShadowColor:		Gray90
*bottomToolBarShadowColor:		Gray40
*backgroundToolBarColor:		Gray75
*toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
! Emacs.default.attributeFont:  -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
!*menubar*Font: 		-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*
!*popup*Font:		-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*


! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:	-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*
*XmTextField*FontList:	-*-courier-medium-r-*-*-*-160-*-*-*-*-iso8859-*
*XmText*FontList:		-*-courier-medium-r-*-*-*-160-*-*-*-*-iso8859-*
*XmList*FontList:		-*-courier-medium-r-*-*-*-160-*-*-*-*-iso8859-*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:		-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField.translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton.translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! XIM fontset (defaults to system fontset default)
! Emacs*EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*

.geometry: 80x25

auctex-texjp-platex.patch:

--- NEW FILE auctex-texjp-platex.patch ---
diff -u xemacs-sumo-20050118/xemacs-packages/lisp/auctex/tex-jp.el.orig xemacs-sumo-20050118/xemacs-packages/lisp/auctex/tex-jp.el
--- xemacs-sumo-20050118/xemacs-packages/lisp/auctex/tex-jp.el.orig	2005-01-20 12:27:27.948972184 +0900
+++ xemacs-sumo-20050118/xemacs-packages/lisp/auctex/tex-jp.el	2005-01-20 12:27:27.954970759 +0900
@@ -115,7 +115,7 @@
   :type 'string)
   (make-variable-buffer-local 'japanese-TeX-command-default)
 
-(defcustom japanese-LaTeX-command-default "LaTeX"
+(defcustom japanese-LaTeX-command-default "pLaTeX"
   "*The default command for TeX-command in the japanese-LaTeX mode."
   :group 'AUCTeX-jp
   :type 'string)

auctex-texsite-jlatex-detect-69129.patch:

--- NEW FILE auctex-texsite-jlatex-detect-69129.patch ---
diff -u xemacs-packages/lisp/auctex/tex-site.el~ xemacs-packages/lisp/auctex/tex-site.el
--- xemacs-packages/lisp/auctex/tex-site.el~	2002-11-15 12:48:22.000000000 +0900
+++ xemacs-packages/lisp/auctex/tex-site.el	2002-11-15 12:48:22.000000000 +0900
@@ -78,6 +78,35 @@
   ;; Try to make life easy for MikTeX users.
   (require 'tex-mik))
 
+;; Where to find style files
+(defvar TeX-macro-global '("/usr/share/texmf/tex/")
+  "*The TeX installation directory, where to find site wide style files.")
+
+;; fix to assume jlatex only for the standard Japanese classes 
+(defvar TeX-format-list
+  '(("JLATEX" japanese-latex-mode
+     ;; "\\\\\\(documentstyle[^%\n]*{j\\|documentclass[^%\n]*{j\\)")
+     "\\\\document\\(style\\|class\\)[^%\n]*{\\(j\\|t\\)\\(article\\|book\\|report\\)")
+    ("JTEX" japanese-plain-tex-mode
+     "-- string likely in Japanese TeX --")
+    ("AMSTEX" ams-tex-mode
+     "\\\\document\\b")
+    ("LATEX" latex-mode 
+     "\\\\\\(begin\\|section\\|chapter\\|documentstyle\\|documentclass\\)\\b")
+    ("TEX" plain-tex-mode "."))
+  "*List of format packages to consider when choosing a TeX mode.
+
+A list with a entry for each format package available at the site.
+
+Each entry is a list with three elements.
+
+1. The name of the format package.
+2. The name of the major mode.
+3. A regexp typically matched in the beginning of the file.
+
+When entering tex-mode, each regexp is tried in turn in order to find
+when major mode to enter.")
+
 (provide 'tex-site)
 
 ;;; tex-site.el ends here

avoid-catch-error-65346.patch:

--- NEW FILE avoid-catch-error-65346.patch ---
diff -u xemacs-packages/lisp/edit-utils/avoid.el~ xemacs-packages/lisp/edit-utils/avoid.el
--- xemacs-packages/lisp/edit-utils/avoid.el~	2003-05-19 17:54:30.000000000 +0900
+++ xemacs-packages/lisp/edit-utils/avoid.el	2003-05-19 17:54:30.000000000 +0900
@@ -173,13 +173,15 @@
 (defun mouse-avoidance-too-close-p (mouse)
   ;;  Return t if mouse pointer and point cursor are too close.
   ;; Acceptable distance is defined by mouse-avoidance-threshold.
+ (condition-case nil
   (let ((point (mouse-avoidance-point-position)))
     (and (eq (car mouse) (car point))
 	 (car (cdr mouse))
 	 (< (abs (- (car (cdr mouse)) (car (cdr point))))
 	    mouse-avoidance-threshold)
 	 (< (abs (- (cdr (cdr mouse)) (cdr (cdr point))))
-	    mouse-avoidance-threshold))))
+	    mouse-avoidance-threshold)))
+  (error nil)))
 
 (defun mouse-avoidance-banish-destination ()
   "The position to which mouse-avoidance-mode `banish' moves the mouse.

browse-url-htmlview-84262.patch:

--- NEW FILE browse-url-htmlview-84262.patch ---
--- xemacs-packages/lisp/mail-lib/browse-url.el~	2003-02-20 22:35:23.000000000 +0900
+++ xemacs-packages/lisp/mail-lib/browse-url.el	2003-02-20 22:35:23.000000000 +0900
@@ -831,7 +831,7 @@
   :group 'browse-url)
 
 ;;;###autoload
-(defcustom browse-url-generic-program nil
+(defcustom browse-url-generic-program "htmlview"
   "*The name of the browser program used by `browse-url-generic'."
   :type '(choice string (const :tag "None" nil))
   :group 'browse-url)
@@ -880,12 +880,12 @@
 :type 'number
 :group 'browse-url)
 
-(defcustom browse-url-kde-program "kfmclient"
+(defcustom browse-url-kde-program "konqueror"
   "*The name by which to invoke the KDE web browser."
   :type 'string
   :group 'browse-url)
 
-(defcustom browse-url-kde-args '("openURL")
+(defcustom browse-url-kde-args nil
   "*A list of strings defining options for `browse-url-kde-program'."
   :type '(repeat (string :tag "Argument"))
   :group 'browse-url)
@@ -838,6 +838,7 @@
 and then W3."
   (apply
     (cond
+     (browse-url-generic-program 'browse-url-generic)
      ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz)
      ((executable-find browse-url-mozilla-program) 'browse-url-mozilla)
      ((executable-find browse-url-galeon-program) 'browse-url-galeon)

egg-wnn-host-unix-79826.patch:

--- NEW FILE egg-wnn-host-unix-79826.patch ---
--- mule-packages/lisp/egg-its/egg-wnn.el.orig	2002-12-17 14:32:07.000000000 +0900
+++ mule-packages/lisp/egg-its/egg-wnn.el	2002-12-17 14:32:39.000000000 +0900
@@ -699,7 +699,7 @@
   (let ((wnn-server-type 'jserver)) (close-wnn))
   (setq jserver-list
 	(make-host-list
-	 name (or jserver-list (list (or wnn-host-name (getenv "JSERVER") "localhost"))))))
+	 name (or jserver-list (list (or wnn-host-name (getenv "JSERVER") "unix"))))))
 
 (fset 'set-jserver-host-name (symbol-function 'set-wnn-host-name))
 
@@ -709,7 +709,7 @@
   (let ((wnn-server-type 'cserver)) (close-wnn))
   (setq cserver-list
 	(make-host-list
-	 name (or cserver-list (list (or cwnn-host-name (getenv "CSERVER") "localhost"))))))
+	 name (or cserver-list (list (or cwnn-host-name (getenv "CSERVER") "unix"))))))
 
 (fset 'set-cserver-host-name (symbol-function 'set-cwnn-host-name))
 
@@ -719,7 +719,7 @@
   (let ((wnn-server-type 'kserver)) (close-wnn))
   (setq kserver-list
 	(make-host-list
-	 name (or kserver-list (list (or kwnn-host-name (getenv "KSERVER") "localhost"))))))
+	 name (or kserver-list (list (or kwnn-host-name (getenv "KSERVER") "unix"))))))
 
 (fset 'set-kserver-host-name (symbol-function 'set-kwnn-host-name))
 
@@ -728,13 +728,13 @@
       (let ((hostlist
 	     (cond ((eq wnn-server-type 'jserver)
 		    (or jserver-list
-			(list (or wnn-host-name (getenv "JSERVER") "localhost"))))
+			(list (or wnn-host-name (getenv "JSERVER") "unix"))))
 		   ((eq wnn-server-type 'cserver)
 		    (or cserver-list
-			(list (or cwnn-host-name (getenv "CSERVER") "localhost"))))
+			(list (or cwnn-host-name (getenv "CSERVER") "unix"))))
 		   ((eq wnn-server-type 'kserver)
 		    (or kserver-list
-			(list (or kwnn-host-name (getenv "KSERVER") "localhost"))))))
+			(list (or kwnn-host-name (getenv "KSERVER") "unix"))))))
 	    (loginname (user-login-name)))
 	(catch 'succ
 	  (while hostlist

jde-ug-rel-links.patch:

--- NEW FILE jde-ug-rel-links.patch ---
diff -u -r1.4 jde-ug-content.html
--- xemacs-packages/etc/jde/doc/html/jde-ug/jde-ug-content.html.orig	2002/11/14 05:18:31	1.4
+++ xemacs-packages/etc/jde/doc/html/jde-ug/jde-ug-content.html	2003/04/24 06:31:05
@@ -70,54 +70,54 @@
       </p><div class="itemizedlist"><ul type="disc"><li><p> 
 
 
-	    <a href="../../../lisp/jde.el"><tt>jde.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde.el"><tt>jde.el</tt></a>. 
 	    Defines jde-mode, a major Emacs mode for developing Java code.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-run.el"><tt>jde-run.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-run.el"><tt>jde-run.el</tt></a>. 
 	    Runs Java applications and applets
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-db.el"><tt>jde-db.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-db.el"><tt>jde-db.el</tt></a>. 
 	    Interfaces Emacs to <b>jdb</b>, the command-line debugger that
 	    comes with the JDK.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-gen.el"><tt>jde-gen.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-gen.el"><tt>jde-gen.el</tt></a>. 
 	    Contains code generation templates.
 	  </p></li><li><p>
 	    <tt>bsh.jar</tt>. Compiled files for the
 	    <a href="http://www.beanshell.org/">BeanShell</a>,
 	    a Java source code interpreter developed by Pat Neimeyer.
 	  </p></li><li><p>
-	    <a href="../../../lisp/beanshell.el"><tt>beanshell.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/beanshell.el"><tt>beanshell.el</tt></a>. 
 	    Provides an Emacs interface to the BeanShell interpreter.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-wiz.el"><tt>jde-wiz.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-wiz.el"><tt>jde-wiz.el</tt></a>. 
 	    Provides "wizards" that generate skeleton
 	    implementations of interfaces and skeleton overrides of
 	    methods declared by superclasses.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-complete.el"><tt>jde-complete.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-complete.el"><tt>jde-complete.el</tt></a>. 
 	    Automatic field and method completion package.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-parse.el"><tt>jde-parse.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-parse.el"><tt>jde-parse.el</tt></a>. 
 	    Java parser package.</p></li><li><p>
-	    <a href="../../../lisp/java.bnf"><tt>java.bnf</tt></a>. 
+	    <a href="../../../../../lisp/jde/java.bnf"><tt>java.bnf</tt></a>. 
 	    Java grammar used to generate the JDE's lisp-based Java parser.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-bug.el"><tt>jde-bug.el
+	    <a href="../../../../../lisp/jde/jde-bug.el"><tt>jde-bug.el
 	      </tt></a>. 
 	    JDEbug user interface package.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-dbs.el"><tt>jde-dbs.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-dbs.el"><tt>jde-dbs.el</tt></a>. 
 	    JDEbug low-level command interface package.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-dbo.el"><tt>jde-dbo.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-dbo.el"><tt>jde-dbo.el</tt></a>. 
 	    JDEbug output processing functions.
 	  </p></li><li><p>
 	    source code, jar files, and documentation for the <a href="../../java/">Java components</a> of the
-	    JDE.</p></li><li><p><a href="../../../lisp/jtags"><tt>jtags</tt></a> 
+	    JDE.</p></li><li><p><a href="../../../../../lisp/jde/jtags"><tt>jtags</tt></a> 
 	    is a bash shell script that tags Java source hierarchies.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jtags.csh"><tt>jtags.csh</tt></a> 
+	    <a href="../../../../../lisp/jde/jtags.csh"><tt>jtags.csh</tt></a> 
 	    is a c shell script that tags Java source heierarchies.
 	  </p></li></ul></div></div><div class="sect3"><div class="titlepage"><div><h4 class="title"><a name="d0e264"></a><a name="LatestVersion"></a>Latest Version</h4></div></div><p>See <a href="http://jdee.sunsite.dk/rootpage.html#Downloading">
 	  Downloading the JDE</a> on the JDE website for instructions on

jde-ug-section-links-89499.patch:

--- NEW FILE jde-ug-section-links-89499.patch ---
diff -u xemacs-packages/etc/jde/doc/html/jde-ug/jde-ug-toc.html~ xemacs-packages/etc/jde/doc/html/jde-ug/jde-ug-toc.html
--- xemacs-packages/etc/jde/doc/html/jde-ug/jde-ug-toc.html~	2003-04-25 16:54:27.000000000 +0900
+++ xemacs-packages/etc/jde/doc/html/jde-ug/jde-ug-toc.html	2003-04-25 16:54:27.000000000 +0900
@@ -20,67 +20,67 @@
          <table border="0" width="100%" cols="1">
             <tbody>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Introduction</a></td>
+                  <td><a href="jde-ug-content.html#Intro" target="content">Introduction</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Registering and Selecting a JDK</a></td>
+                  <td><a href="jde-ug-content.html#RegisterSelectJDK" target="content">Registering and Selecting a JDK</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Editing Java Source Files</a></td>
+                  <td><a href="jde-ug-content.html#EditingJavaSourceFiles" target="content">Editing Java Source Files</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Documenting Code</a></td>
+                  <td><a href="jde-ug-content.html#DocumentingCode" target="content">Documenting Code</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Abbreviations</a></td>
+                  <td><a href="jde-ug-content.html#Abbrevs" target="content">Abbreviations</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Completing Expressions</a></td>
+                  <td><a href="jde-ug-content.html#CodeCompletion" target="content">Completing Expressions</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Generating Code</a></td>
+                  <td><a href="jde-ug-content.html#GeneratingCode" target="content">Generating Code</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Checking Coding Style</a></td>
+                  <td><a href="jde-ug-content.html#CheckStyle" target="content">Checking Coding Style</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Compiling Java Programs</a></td>
+                  <td><a href="jde-ug-content.html#CompilingJavaPrograms" target="content">Compiling Java Programs</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Building Java Applications</a></td>
+                  <td><a href="jde-ug-content.html#BuildingJavaApplications" target="content">Building Java Applications</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Running Java
+                  <td><a href="jde-ug-content.html#RunningJavaApps" target="content">Running Java
                               Applications</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content"> Working with Applets</a></td>
+                  <td><a href="jde-ug-content.html#WorkingWithApplets" target="content"> Working with Applets</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Debugging Applications</a></td>
+                  <td><a href="jde-ug-content.html#DebuggingApplets" target="content">Debugging Applications</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Specifying
+                  <td><a href="jde-ug-content.html#SpecifyingClasspaths" target="content">Specifying
                               Classpaths</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Using Project Files</a></td>
+                  <td><a href="jde-ug-content.html#UsingProjectFiles" target="content">Using Project Files</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content"> Displaying Java Documentation</a></td>
+                  <td><a href="jde-ug-content.html#DisplayingDoc" target="content"> Displaying Java Documentation</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Browsing Source Code</a></td>
+                  <td><a href="jde-ug-content.html#BrowsingSourceCode" target="content">Browsing Source Code</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Searching Source Code</a></td>
+                  <td><a href="jde-ug-content.html#SearchSource" target="content">Searching Source Code</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Customizing the JDE</a></td>
+                  <td><a href="jde-ug-content.html#CustomizingJDE" target="content">Customizing the JDE</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content"> Customizing jde-mode</a></td>
+                  <td><a href="jde-ug-content.html#Customizingjde_mode" target="content"> Customizing jde-mode</a></td>
                </tr>
             </tbody>
          </table></applet></body>
-</html>
\ ?????????????????????????????????????????????
+</html>

mh-e-7.4.2-toolbar-100764.patch:

--- NEW FILE mh-e-7.4.2-toolbar-100764.patch ---
diff -u xemacs-packages/lisp/mh-e/mh-xemacs-icons.el~ xemacs-packages/lisp/mh-e/mh-xemacs-icons.el
--- xemacs-packages/lisp/mh-e/mh-xemacs-icons.el~	2003-10-18 09:37:49.000000000 +0900
+++ xemacs-packages/lisp/mh-e/mh-xemacs-icons.el	2003-10-18 09:37:49.000000000 +0900
@@ -42,6 +42,8 @@
 ;; Avoid compiler warning
 (eval-and-compile
   (require 'mh-utils)
+  ;; See http://list-archive.xemacs.org/xemacs-beta/200307/msg00138.html
+  (require 'toolbar)
   (defvar mh-xemacs-toolbar-folder-toolbar nil)
   (defvar mh-xemacs-toolbar-letter-toolbar nil))
 

psgml-browsers-84262.patch:

--- NEW FILE psgml-browsers-84262.patch ---
--- xemacs-packages/lisp/psgml/psgml-html.el~	2003-02-20 22:47:29.000000000 +0900
+++ xemacs-packages/lisp/psgml/psgml-html.el	2003-02-20 22:47:29.000000000 +0900
@@ -927,12 +927,12 @@
 
 (defvar sgml-html-menu
   (cons "HTML"
-	(append '(["View in Netscape" sgml-html-netscape-file
-		   (buffer-file-name
-		    (current-buffer))]
-		  ["View in W3" w3-preview-this-buffer t]
-		  ["View in kfm" sgml-html-kfm-file
+	(append '(["View in default browser" browse-url-of-buffer t]
+		  ["View in mozilla" sgml-html-netscape-file
+		   (buffer-file-name (current-buffer))]
+		  ["View in konqueror" sgml-html-kfm-file
 		   (buffer-file-name (current-buffer))]
+		  ["View in W3" w3-preview-this-buffer t]
 		  "---"
 		  ["HTML-Quote Region" html-quote-region t]
 		  "---")
@@ -941,13 +941,13 @@
 (defun sgml-html-netscape-file ()
   "Preview the file for the current buffer in Netscape."
   (interactive)
-  (highlight-headers-follow-url-netscape
+  (browse-url-mozilla
    (concat "file:" (buffer-file-name (current-buffer)))))
 
 (defun sgml-html-kfm-file ()
   "Preview the file for the current buffer in kfm."
   (interactive)
-  (highlight-headers-follow-url-kfm
+  (browse-url-kde
    (concat "file:" (buffer-file-name (current-buffer)))))
 
 ;;;###autoload(add-to-list 'auto-mode-alist '("\\.[sj]?html?\\'" . html-mode))


--- NEW FILE xemacs-sumo.spec ---
%define sumo_ver 2005-01-18

Summary: XEmacs Lisp packages
Name: xemacs-sumo
Version: %(echo %{sumo_ver} | tr -d -)
Release: 2
License: GPL
Group: Applications/Editors
Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2
Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo_ver}.tar.bz2 
Source10: Emacs.ad.ja_JP.eucJP
Source11: Emacs.ad.ko_KR.eucKR
Source12: Emacs.ad.zh_CN.GB2312
Source13: Emacs.ad.zh_TW.Big5
Source14: Emacs.ad.ja_JP.UTF-8
Source15: Emacs.ad.ko_KR.UTF-8
Source16: Emacs.ad.zh_CN.UTF-8
Source17: Emacs.ad.zh_TW.UTF-8
URL: http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball
Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: xemacs-nox perl /sbin/install-info
Requires: xemacs-common
Conflicts: xemacs < 21.4.12-12
BuildArch: noarch
Provides:  ruby-mode-xemacs
Obsoletes: ruby-mode-xemacs tm
# Provides/Obsoletes for upgradeability from the latest FC version, needed
# until (if?) there will be separate apel, mew, and ddskk packages for
# XEmacs again.  ddskk-xemacs is not provided because the
# version shipping here is the original skk, not ddskk.  It is obsoleted
# anyway to for the sake of smooth upgrades.
Provides: apel-xemacs = 10.2 mew-xemacs = 1.94.2
Obsoletes: apel-xemacs < 10.6-6 mew-xemacs < 4.1-2 ddskk-xemacs < 12.2.0-5
Patch6: auctex-texsite-jlatex-detect-69129.patch
Patch7: auctex-texjp-platex.patch
Patch8: egg-wnn-host-unix-79826.patch
Patch11: browse-url-htmlview-84262.patch
Patch12: psgml-browsers-84262.patch
Patch13: jde-ug-rel-links.patch
Patch14: jde-ug-section-links-89499.patch
Patch15: avoid-catch-error-65346.patch
Patch16: mh-e-7.4.2-toolbar-100764.patch

%description
XEmacs (like GNU Emacs) is a self-documenting, customizable,
extensible, real-time display editor. XEmacs is self-documenting
because at any time you can type control-h to find out what your
options are or find out what a command does. XEmacs is customizable
because you can change the definitions of XEmacs commands. XEmacs is
extensible because you can write entirely new commands-programs in the
Lisp language to be run by Emacs' own Lisp interpreter. XEmacs
includes a real-time display, which means that the text being edited
is visible on the screen and is updated very frequently (usually after
every character or pair of characters) as you type.

The XEmacs Sumo packages contain a large collection of useful
Lisp packages for XEmacs including mailreaders, programming modes
and utilities, and mule related packages.

%package el
Summary: The .el source files for the XEmacs Sumo packages.
Group: Applications/Editors
Requires: xemacs-sumo = %{version}
Conflicts: xemacs-el < 21.4.12-12

%description el
xemacs-sumo-el is not needed to run XEmacs. You only need to install it if
you are planning to incorporate some Lisp programming into your XEmacs
experience.

%package info
Summary: Information files for XEmacs.
Group: Applications/Editors
Conflicts: xemacs-info < 21.4.12-12

%description info
This package contains optional info files that are distributed
with the XEmacs Sumo packages.

%define pkgdir %{_datadir}/xemacs

%prep
%setup -q -c xemacs-sumo-%{version} -a1

# fix jlatex autodetection
%patch6 -p0
# use ptex rather jtex by default for Japanese
%patch7 -p1
# make egg-wnn use unix domain socket by default
%patch8 -p0
# default to htmlview as generic browse-url browser
%patch11 -p0
# update psgml-html preview menu to modern browsers
%patch12 -p0
# fix relative links to elisp in user-guide html doc
%patch13 -p0
# and section links in toc
%patch14 -p0
# catch harmless errors in mouse-avoidance-too-close-p (avoid.el)
%patch15 -p0
# fix toolbar specifier error
%patch16 -p0

# avoid spurious dependencies
chmod -x xemacs-packages/lisp/erc/*ChangeLog*


%build
%define _xemacs_batch xemacs-nox -batch -vanilla

# remove game we shouldn't ship
rm xemacs-packages/lisp/games/tetris.el*

%_xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/*
%_xemacs_batch -f batch-byte-recompile-directory xemacs-packages/lisp mule-packages/lisp


%install
rm -rf %buildroot

# install packages in buildroot
mkdir -p %buildroot%{pkgdir}
cp -rp xemacs-packages mule-packages %buildroot%{pkgdir}

( cd %buildroot%{pkgdir}/mule-packages/etc/app-defaults
  mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,zh_CN,zh_TW}.UTF-8 ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5
  iconv -f ISO-8859-1 -t UTF-8 de/Emacs > de_DE.UTF-8/Emacs
  iconv -f ISO-8859-1 -t UTF-8 fr/Emacs > fr_FR.UTF-8/Emacs
  iconv -f ISO-8859-16 -t UTF-8 ro/Emacs > ro_RO.UTF-8/Emacs
  mv de de_DE
  mv fr fr_FR
  mv ro ro_RO
  install -m 644 %SOURCE10 ja_JP.eucJP/Emacs
  install -m 644 %SOURCE11 ko_KR.eucKR/Emacs
  install -m 644 %SOURCE12 zh_CN.GB2312/Emacs
  install -m 644 %SOURCE13 zh_TW.Big5/Emacs
  install -m 644 %SOURCE14 ja_JP.UTF-8/Emacs
  install -m 644 %SOURCE15 ko_KR.UTF-8/Emacs
  install -m 644 %SOURCE16 zh_CN.UTF-8/Emacs
  install -m 644 %SOURCE17 zh_TW.UTF-8/Emacs
## don't seem to appear in manifest
#  ln -s ja_JP.eucJP ja_JP
#  ln -s ko_KR.eucKR ko_KR
#  ln -s zh_CN.GB2312 zh_CN
#  ln -s zh_TW.Big5 zh_TW
)

# so as not to require /usr/local/bin/perl[5]
( cd %buildroot%{pkgdir}/xemacs-packages
  perl -pi -e "s|/usr/local/bin/perl5|/usr/bin/perl|g; s|/usr/local/bin/perl|/usr/bin/perl|g;" \
	lisp/hyperbole/file-newer \
	etc/bbdb/*.pl
)

# the header of this file is weird... and confuses dependency checking
chmod 0644 %buildroot%{pkgdir}/xemacs-packages/lib-src/pstogif

# Make sure nothing is 0400
chmod -R a+rX  %buildroot/usr

# info docs: pre-generate "dir"s and compress files
for file in %buildroot%{pkgdir}/*-packages/info/*.info ; do
  /sbin/install-info $file `dirname $file`/dir
done
find %buildroot%{pkgdir} -type f -name '*.info*' | xargs -r gzip -9

# separate files
rm -f *.files base-files el-files info-files
echo "%defattr(-,root,root)" > base-files
echo "%defattr(-,root,root)" > el-files
echo "%defattr(-,root,root)" > info-files

find %buildroot%{pkgdir}/* \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \( -type d -name info -fprint info.files -prune \) -o \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o -fprint base-el-not-bytecomped.files \) \)

perl -pi -e "s|%buildroot||" *.files
cat base-*.files dir.files >> base-files
cat el-*.files dir.files >> el-files
cat info.files >> info-files


%clean
rm -rf %buildroot


%files -f base-files

%files el -f el-files

%files info -f info-files


%changelog
* Tue Mar  1 2005 Ville Skytt?? <scop at xemacs.org> - 20050118-2
- Revert back to bundled apel, mew and skk in the sumo.
- Drop xemacs-packages* Obsoletes.
- Build with xemacs-nox to fix chicken-egg bootstrap problem.
- Require xemacs-common.
- Remove pre-XEmacs-21.4 %%changelog entries.

* Wed Jan 19 2005 Jens Petersen <petersen at redhat.com> 20050118-1
- update to new sumos
  - update auctex-texjp-platex.patch
  - auctex-texsite-lisp-dir.patch no longer needed
  - auc-tex.info is now correctly auctex.info
- physically remove .el.orig patch backup files

* Tue Dec 14 2004 Jens Petersen <petersen at redhat.com>
- add auctex-texsite-lisp-dir.patch to initialise auctex TeX-lisp-directory
- exclude .orig backup files

* Wed Oct  6 2004 Jens Petersen <petersen at redhat.com> - 20040818-2
- rename auc-tex.info to auctex.info (Francis Tang, 134624)

* Wed Aug 18 2004 Jens Petersen <petersen at redhat.com> 20040818-1
- update to 2004-08-18 sumos
  - no longer need to replace xlib and xwem packages
  - cvs.el-history-log.patch is now upstream

* Mon Aug 16 2004 Ville Skytt?? <scop at xemacs.org> - 20040517-4
- replace xlib-autoload-startup-msg-125415.patch with xlib and xwem pre-release
  pkgs to really make them quiet at startup (125415,130019)
- pre-generate package info dir files and compress all the info files (130019)

* Mon Aug  9 2004 Jens Petersen <petersen at redhat.com> - 20040517-3
- default cvs-no-log-option to nil since cvs no longer accepts "-l" option
  with cvs.el-history-log.patch
- silence startup messages from xlib and xwem (125415) with
  xlib-autoload-startup-msg-125415.patch

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 20 2004 Jens Petersen <petersen at redhat.com> 20040517-1
- update to 2004-05-17 release

* Fri May  7 2004 Jens Petersen <petersen at redhat.com> - 20040202-4
- do not require xemacs, so that it is installable with xemacs-nox

* Thu Apr  1 2004 Jens Petersen <petersen at redhat.com> - 20040202-3
- remove executable flags from erc Changelog files [Ville Skytt??]

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Feb  4 2004 Jens Petersen <petersen at redhat.com> - 20040202-1
- update to 2004-02-02 sumos
- update browse-url-htmlview-84262.patch
- subtract 100 from all patch numbers

* Tue Nov 18 2003 Jens Petersen <petersen at redhat.com> - 20031113-1
- update to 2003-11-13 release

* Sat Oct 18 2003 Jens Petersen <petersen at redhat.com> - 20031003-3
- fix mh-e toolbar error (#100764) [reported by vonbrand at inf.utfsm.cl,
  fix by Stephen J. Turnbull]

* Fri Oct 17 2003 Jens Petersen <petersen at redhat.com> - 20031003-2
- generate X resource files in utf-8 for de, fr and ro (#107310) [frh at gmx.de]
- move our CJK X resource files here from xemacs with one file for
  native encoding and one for utf-8
- re-enable menubar translations for native CJK encodings (part of #106994)
  [Yukihiro Nakai]

* Mon Oct  6 2003 Jens Petersen <petersen at redhat.com> - 20031003-1
- update to 2003-10-03 release

* Mon Sep  1 2003 Jens Petersen <petersen at redhat.com> - 20030831-1
- update to 2003-08-31 release
- simplify /usr/local/bin/perl cleaning

* Tue Jul  1 2003 Jens Petersen <petersen at redhat.com> - 20030629-1
- update to 2003-06-29 release
- catch harmless mouse-avoidance-mode errors (#65346)
  [suggested by Reuben Thomas]

* Mon May 12 2003 Jens Petersen <petersen at redhat.com> - 20030414-1
- new package to separate xemacs-sumo and xemacs-mule-sumo from
  main xemacs package


* Sat May 10 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-11
- build with system malloc on ppc64

* Tue Apr 22 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-10
- obsoletes ruby-mode-xemacs (#84673)
- move obsoletes xemacs-sumo-el to -el subpackage
- fix links in jde html documentation (#89499)

* Tue Apr 15 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-8
- comment out ja and ko menubar translations in X resource files for now,
  to avoid startup hanging in utf-8 locale (#88860)
- use default menubar font in ja and ko locale
- in a UTF-8 locale set default coding systems to utf-8 (partly #77130
  and #74227)
- set Info-directory-list in site-start.el again
- move psgml setup into site-start.el
- move previous contents of "dotxemacs-init.el" to new "default.el"

* Mon Mar 31 2003 Akira TAGOH <tagoh at redhat.com> 21.4.12-7
- Rebuild against the latest Canna.

* Thu Feb 20 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-6
- default browse-url to use htmlview and update psgml-html browser
  defaults (#84262)

* Tue Feb 11 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-5
- build with system-malloc on alpha and ia64
- skip redundant check-features target

* Thu Feb  6 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-4
- fix "libexec dir" to be under lib64 on multilib archs
- set default ftp to be non-kerberos in site-start.el
- update sumos to 2003-02-05
- mspec patch and rpm-spec-mode update no longer needed
- buildrequire autoconf213
- add ".xemacs/init.el" to /etc/skel
- skip redundant check-features target on s390 and s390x

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Tue Jan 21 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-2
- fix `paths-emacs-root-p' (find-paths.el) to look in share not lib
- don't generate backup files when updating autoloads
- try startup notification in desktop file
- cleanup desktop file to use name XEmacs and add encoding key

* Fri Jan 17 2003 Jens Petersen <petersen at redhat.com> 21.4.12-1
- update to 21.4.12 bugfix release (21.4 series now declared stable branch)
- renumbered sumo package patches to be greater than 100
- install sumo packages by copying rather than moving
- patch sh-script.el to append m?spec entry to auto-mode-alist 
- avoid ppc.ldscript and build on ppc
- remove games that we shouldn't ship
- update to latest rcs2log
- update to latest rpm-spec-mode.el
- use _smp_mflags for lib-src and src
- run batch-update-directory and batch-byte-recompile-directory on sumo lisp
  dirs
- improve datadir/xemacs-version/ ownership

* Sat Jan  4 2003 Jens Petersen <petersen at redhat.com> 21.4.11-1
- update to 21.4.11
- don't configure with union-type, since it causes runtime problems apparently
- only do postun info dir deletions when uninstalling

* Wed Jan  1 2003 Jens Petersen <petersen at redhat.com> 21.4.10-6
- move apel to separate package and require it
- renamed psgml-init.el-xemacs to xemacs-psgml-init.el
- use datadir in site-start.el
- really include the movemail mkstemp patch
- use mapc to load site-start.d files

* Tue Dec 31 2002 Ville Skytt?? <scop at xemacs.org>
- New Sumos (2002-12-30).
- Use `construct-emacs-version-name' in `paths-emacs-root-p' (find-paths.el),
  fixing "Couldn't find obvious default for XEmacs hierarchy" warnings
  (as in XEmacs 21.5).
- Move site-start stuff to site-packages.
- Don't set Info-directory-list in site-start.el.
- Don't use --pkgdir, it's ignored.  Don't pass pkgdir to makeinstall.
- Fix source tarball URLs.
- Don't override the defcustom in psgml-init.el, set its default value instead.
- Add rpmbuild option: "--with debug" for building a debug-enabled XEmacs.

* Sun Dec 29 2002 Jens Petersen <petersen at redhat.com>
- updates package sumos to 2002-12-26 release

* Mon Dec 23 2002 Jens Petersen <petersen at redhat.com> 21.4.10-5
- patch find-paths.el to search in datadir
- setup lisp packages under datadir not libdir
- use buildroot macro instead of RPM_BUILD_ROOT
- drop local configure macro
- fix buildrequires and requires
- list configure options one-per-line
- improve psgml-init.el catalog setup
- remove and add lisp packages with package-admin
- rebyte-compile lisp packages
- keep etags as etags.xemacs (#78106)
- don't bother removing non-existent udp2tcp nor .cvsignore files
- simply filelist generation to a single find search pass
- put core .el files in -el package
- put package info files into -info package
- don't create backup files when patching in lisp packages tree
- don't explicitly gzip lisp package info files
- don't mark the applications files noreplace
- exclude ppc, since __init_array_start undefined

* Wed Dec 18 2002 Jens Petersen <petersen at redhat.com>
- patch egg-wnn to default to unix domain socket (#79826)
  [patch from ynakai at redhat.com]
- add ia64 patch from SuSE
- use mkstemp in movemail

* Tue Nov 19 2002 Jens Petersen <petersen at redhat.com>
- apply jlatex autodetect patch correctly and drop append to tex-site.el
- default to pTeX and pLaTeX for Japanese TeX and LaTeX

* Mon Nov 18 2002 Jens Petersen <petersen at redhat.com> 21.4.10-3
- backout uncommenting of deactivate-mark (#77696)
- update psgml dtd catalog path in psgml-init.el (#78022)
  [reported by ville.skytta at iki.fi]
- build with --use-union-type (#78024)
  [suggested by ville.skytta at iki.fi]

* Fri Nov 15 2002 Jens Petersen <petersen at redhat.com>
- fix autodetection of jlatex (#69129)

* Tue Nov 12 2002 Elliot Lee <sopwith at redhat.com> 21.4.10-2
- build on x86_64

* Mon Nov 11 2002 Jens Petersen <petersen at redhat.com> 21.4.10-1
- update to 21.4.10
- update sumos to 2002-09-19
- no longer backout mule-ucs package
- encode this file in utf-8
- xemacs-21.1.14-xfs.patch no longer needed
- use _libdir, _datadir, _bindir, _prefix
- exclude x86_64 (requires Canna)
- own /usr/lib/xemacs/{,mule-packages} and /usr/X11R6/lib/X11/<locale> (#73982)
  [reported by enrico.scholz at informatik.tu-chemnitz.de]
- fix default italic font size (#75275)
  [reported with fix by ville.skytta at iki.fi]
- update ja menubar translations in ja locale X resource file (#76068)
  [from ynakai at redhat.com]
- update ko locale X resource file (#76072) [from ynakai at redhat.com]
- add pkgdir rpm macro for packages dir
- uncomment deactivate-mark in simple.el (#77696)

* Mon Aug 26 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-16
- some cleanups - and remove the info tarball, it's now part 
  of the base tarball. Wow, the package gets smaller. (#72480)

* Mon Aug 19 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-15
- Bug in specfile from -14 gave bug on startup (#71743)

* Thu Aug 15 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-14
- Use utf-8 by default for input/output (#71584 )
- Make it not segfault when handling utf-8 (#71589)

* Wed Aug  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-13
- Add openmotif-devel to buildrequires, as it will use it for widgets 
  if it finds it

* Fri Aug  2 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-12
- Don't package po-mode separately, it's now in sumo
- Compile with drag'n'drop support
- Use the bundled rpm-spec-mode, it has some adaptions for XEmacs

* Wed Jul 31 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-11
- Don't use a separate ispell.el file anymore - the included one is newer
- Fix html-mode (#64826)

* Tue Jul 23 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-10
- Update lisp tarballs
- desktop file fixes (#69542)
- Add bdb support (#65640)

* Mon Jul  8 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-9
- Make it provide ruby-mode-xemacs (request from tagoh)

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Mon Jun 17 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-7
- #66835

* Wed May 29 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-6
- Make it build... Evil.
- Exclude IA64
- Upgrade sumo tarballs to 2002-05-22

* Fri May 24 2002 Jens Petersen <petersen at xemacs.org> 21.4.8-5
- Build using portable dumper, so that build with glibc-2.3 malloc is ok

* Mon May 13 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-2
- Remove the s390 patches so it builds on s390 :)

* Fri May 10 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-1
- 21.4.8

* Tue May  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-9
- Rebuild... chmod -x pstogif to work around an rpm bug until 
  it's fixed (#64320)

* Tue Apr 23 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-8
- New sumo packages

* Thu Feb 21 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-7
- Rebuild

* Tue Jan 29 2002 Jens Petersen <petersen at redhat.com> 21.4.6-6
- Remove skk package, since it conflicts with ddskk-xemacs (newer)

* Thu Jan 24 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-5
- New sumos

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Dec 19 2001 Jens Petersen <petersen at redhat.com> 21.4.6-3
- Fix fontlist pattern in Emacs.ad.Japanese.
- CHANGES-beta is now CHANGES-release.
- Obsolete xemacs-sumo xemacs-sumo-el

* Wed Dec 19 2001 Jens Petersen <petersen at redhat.com> 21.4.6-2
- Don't obsolete flim.

* Mon Dec 17 2001 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-1
- 21.4.6
- New sumo packages
- disable alpha

* Wed Nov 14 2001 Jens Petersen <petersen at redhat.com> 21.4.5-2
- Add -znocombreloc configure option to override new ld default.

* Tue Nov  6 2001 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.5-1
- 21.4.5. It builds on IA64 and fixes #55578


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Mar 2005 22:15:37 -0000	1.1
+++ .cvsignore	1 Mar 2005 22:31:04 -0000	1.2
@@ -0,0 +1,2 @@
+xemacs-mule-sumo-2005-01-18.tar.bz2
+xemacs-sumo-2005-01-18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Mar 2005 22:15:37 -0000	1.1
+++ sources	1 Mar 2005 22:31:04 -0000	1.2
@@ -0,0 +1,2 @@
+8c902131842ecaafeba6682ae956e554  xemacs-mule-sumo-2005-01-18.tar.bz2
+d30cbe9069121e035a42e73e4133ccee  xemacs-sumo-2005-01-18.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar  2 07:10:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:10:32 -0500
Subject: rpms/i810switch/RHL-9 i810switch.spec,1.1,1.2
Message-ID: <200503020710.j227AWAH032522@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/i810switch/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32509/RHL-9

Modified Files:
	i810switch.spec 
Log Message:
auto-import i810switch-0.6.2-0.fdr.3.rh90 on branch RHL-9 from i810switch-0.6.2-0.fdr.3.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/RHL-9/i810switch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- i810switch.spec	25 Jan 2005 16:49:20 -0000	1.1
+++ i810switch.spec	2 Mar 2005 07:10:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.2
-Release: 3
+Release: 0.fdr.3.rh90
 Epoch: 0
 Summary: A utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -40,7 +40,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Tue Jan 18 2005 David Kaplan <dmk at localhost.localdomain> - 0:0.6.2-3
+* Tue Jan 18 2005 David Kaplan <dmk at localhost.localdomain> - 0:0.6.2-0.fdr.3
 - Added back INSTALL file to rpm because it explains how to SUID root
   the executable so that all users can use i810switch.
 



From fedora-extras-commits at redhat.com  Wed Mar  2 07:10:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:10:32 -0500
Subject: rpms/i810switch import.log,1.2,1.3
Message-ID: <200503020710.j227AW7I032518@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	import.log 
Log Message:
auto-import i810switch-0.6.2-0.fdr.3.rh90 on branch RHL-9 from i810switch-0.6.2-0.fdr.3.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/i810switch/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	25 Jan 2005 16:49:20 -0000	1.2
+++ import.log	2 Mar 2005 07:10:30 -0000	1.3
@@ -1 +1,2 @@
 i810switch-0_6_2-3:HEAD:i810switch-0.6.2-3.src.rpm:1106671753
+i810switch-0_6_2-0_fdr_3_rh90:RHL-9:i810switch-0.6.2-0.fdr.3.rh90.src.rpm:1109747422



From fedora-extras-commits at redhat.com  Wed Mar  2 07:11:54 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:11:54 -0500
Subject: rpms/perl-Error import.log,1.2,1.3
Message-ID: <200503020711.j227BsPw032625@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Error
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32615

Modified Files:
	import.log 
Log Message:
auto-import perl-Error-0.15-0.fdr.1.rh90 on branch RHL-9 from perl-Error-0.15-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	21 Dec 2004 16:29:48 -0000	1.2
+++ import.log	2 Mar 2005 07:11:52 -0000	1.3
@@ -1 +1,2 @@
 perl-Error-0_15-0_fdr_1:HEAD:perl-Error-0.15-0.fdr.1.src.rpm:1103646600
+perl-Error-0_15-0_fdr_1_rh90:RHL-9:perl-Error-0.15-0.fdr.1.rh90.src.rpm:1109747504



From fedora-extras-commits at redhat.com  Wed Mar  2 07:11:54 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:11:54 -0500
Subject: rpms/perl-Error/RHL-9 perl-Error.spec,1.2,1.3
Message-ID: <200503020711.j227Bs4t032628@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Error/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32615/RHL-9

Modified Files:
	perl-Error.spec 
Log Message:
auto-import perl-Error-0.15-0.fdr.1.rh90 on branch RHL-9 from perl-Error-0.15-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/RHL-9/perl-Error.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Error.spec	21 Dec 2004 16:33:00 -0000	1.2
+++ perl-Error.spec	2 Mar 2005 07:11:52 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-Error
 Version:        0.15
-Release:        1
+Release:        0.fdr.1.rh90
 Epoch:          0
 Summary:        Error Perl module
 License:        GPL or Artistic
@@ -49,5 +49,5 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Jun 11 2004 Steven Pritchard <steve at kspei.com> 0:0.15-1
+* Fri Jun 11 2004 Steven Pritchard <steve at kspei.com> 0:0.15-0.fdr.1
 - Specfile autogenerated.



From fedora-extras-commits at redhat.com  Wed Mar  2 07:13:02 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:13:02 -0500
Subject: rpms/perl-FreezeThaw import.log,1.2,1.3
Message-ID: <200503020713.j227D2H5032749@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-FreezeThaw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32739

Modified Files:
	import.log 
Log Message:
auto-import perl-FreezeThaw-0.43-0.fdr.1.rh90 on branch RHL-9 from perl-FreezeThaw-0.43-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Dec 2004 17:41:54 -0000	1.2
+++ import.log	2 Mar 2005 07:13:00 -0000	1.3
@@ -1 +1,2 @@
 perl-FreezeThaw-0_43-0_fdr_1_2:HEAD:perl-FreezeThaw-0.43-0.fdr.1.2.src.rpm:1102527774
+perl-FreezeThaw-0_43-0_fdr_1_rh90:RHL-9:perl-FreezeThaw-0.43-0.fdr.1.rh90.src.rpm:1109747568



From fedora-extras-commits at redhat.com  Wed Mar  2 07:13:02 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:13:02 -0500
Subject: rpms/perl-FreezeThaw/RHL-9 perl-FreezeThaw.spec,1.2,1.3
Message-ID: <200503020713.j227D2YR032752@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-FreezeThaw/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32739/RHL-9

Modified Files:
	perl-FreezeThaw.spec 
Log Message:
auto-import perl-FreezeThaw-0.43-0.fdr.1.rh90 on branch RHL-9 from perl-FreezeThaw-0.43-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-FreezeThaw.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/RHL-9/perl-FreezeThaw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-FreezeThaw.spec	10 Dec 2004 22:03:08 -0000	1.2
+++ perl-FreezeThaw.spec	2 Mar 2005 07:13:00 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-FreezeThaw
 Version:        0.43
-Release:        1
+Release:        0.fdr.1.rh90
 Epoch:          0
 Summary:        Convert Perl structures to strings and back
 



From fedora-extras-commits at redhat.com  Wed Mar  2 07:14:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:14:31 -0500
Subject: rpms/perl-Gtk2 import.log,1.2,1.3
Message-ID: <200503020714.j227EVAx000402@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	import.log 
Log Message:
auto-import perl-Gtk2-1.061-0.fdr.2.rh90 on branch RHL-9 from perl-Gtk2-1.061-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Dec 2004 17:45:08 -0000	1.2
+++ import.log	2 Mar 2005 07:14:29 -0000	1.3
@@ -1 +1,2 @@
 perl-Gtk2-1_061-0_fdr_2_2:HEAD:perl-Gtk2-1.061-0.fdr.2.2.src.rpm:1102527968
+perl-Gtk2-1_061-0_fdr_2_rh90:RHL-9:perl-Gtk2-1.061-0.fdr.2.rh90.src.rpm:1109747662



From fedora-extras-commits at redhat.com  Wed Mar  2 07:14:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:14:31 -0500
Subject: rpms/perl-Gtk2/RHL-9 .cvsignore, 1.3, 1.4 perl-Gtk2.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200503020714.j227EVDS000405@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Gtk2/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv392/RHL-9

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
auto-import perl-Gtk2-1.061-0.fdr.2.rh90 on branch RHL-9 from perl-Gtk2-1.061-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/RHL-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2005 03:21:00 -0000	1.3
+++ .cvsignore	2 Mar 2005 07:14:29 -0000	1.4
@@ -1 +1 @@
-Gtk2-1.062.tar.gz
+Gtk2-1.061.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/RHL-9/perl-Gtk2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Gtk2.spec	15 Feb 2005 03:30:46 -0000	1.4
+++ perl-Gtk2.spec	2 Mar 2005 07:14:29 -0000	1.5
@@ -1,19 +1,19 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Gtk2
-Version:        1.062
-Release:        1
+Version:        1.061
+Release:        0.fdr.2.rh90
 Epoch:          0
 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.062.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.061.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.062
+BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.061
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -62,9 +62,6 @@
 
 
 %changelog
-* Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.062-1
-- Update to 1.062.
-
 * Mon Oct 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.061-0.fdr.2
 - Removed irrelevant or duplicated documentation files.
 - Description simplified (as suggested by Ville Skytt??).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/RHL-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 03:21:00 -0000	1.3
+++ sources	2 Mar 2005 07:14:29 -0000	1.4
@@ -1 +1 @@
-cbca72d71fa470157d139c2bf659c040  Gtk2-1.062.tar.gz
+f7a14ff2e86dc66c9a06539613b70576  Gtk2-1.061.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar  2 07:15:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:15:27 -0500
Subject: rpms/perl-HTML-Tree import.log,1.2,1.3
Message-ID: <200503020715.j227FRxq000513@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-HTML-Tree
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv504

Modified Files:
	import.log 
Log Message:
auto-import perl-HTML-Tree-3.18-0.fdr.2.rh90 on branch RHL-9 from perl-HTML-Tree-3.18-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	13 Feb 2005 19:36:38 -0000	1.2
+++ import.log	2 Mar 2005 07:15:25 -0000	1.3
@@ -1 +1,2 @@
 perl-HTML-Tree-3_18-2:HEAD:perl-HTML-Tree-3.18-2.src.rpm:1108323387
+perl-HTML-Tree-3_18-0_fdr_2_rh90:RHL-9:perl-HTML-Tree-3.18-0.fdr.2.rh90.src.rpm:1109747718



From fedora-extras-commits at redhat.com  Wed Mar  2 07:15:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:15:27 -0500
Subject: rpms/perl-HTML-Tree/RHL-9 perl-HTML-Tree.spec,1.1,1.2
Message-ID: <200503020715.j227FRfW000518@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-HTML-Tree/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv504/RHL-9

Modified Files:
	perl-HTML-Tree.spec 
Log Message:
auto-import perl-HTML-Tree-3.18-0.fdr.2.rh90 on branch RHL-9 from perl-HTML-Tree-3.18-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/RHL-9/perl-HTML-Tree.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Tree.spec	13 Feb 2005 19:36:38 -0000	1.1
+++ perl-HTML-Tree.spec	2 Mar 2005 07:15:25 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-HTML-Tree
 Version:        3.18
-Release:        2
+Release:        0.fdr.2.rh90
 Epoch:          0
 Summary:        HTML tree handling modules for Perl
 
@@ -58,7 +58,7 @@
 
 
 %changelog
-* Tue Jan  4 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-2
+* Tue Jan  4 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-0.fdr.2
 - Don't install htmltree into %%{_bindir} but include it in docs.
 
 * Sat Dec  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-0.fdr.1



From fedora-extras-commits at redhat.com  Wed Mar  2 07:16:28 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:16:28 -0500
Subject: rpms/perl-IO-Socket-SSL import.log,1.2,1.3
Message-ID: <200503020716.j227GS4P000631@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-IO-Socket-SSL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv622

Modified Files:
	import.log 
Log Message:
auto-import perl-IO-Socket-SSL-0.96-0.fdr.3.rh90 on branch RHL-9 from perl-IO-Socket-SSL-0.96-0.fdr.3.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	9 Jan 2005 11:59:30 -0000	1.2
+++ import.log	2 Mar 2005 07:16:26 -0000	1.3
@@ -1 +1,2 @@
 perl-IO-Socket-SSL-0_96-3:HEAD:perl-IO-Socket-SSL-0.96-3.src.rpm:1105271963
+perl-IO-Socket-SSL-0_96-0_fdr_3_rh90:RHL-9:perl-IO-Socket-SSL-0.96-0.fdr.3.rh90.src.rpm:1109747778



From fedora-extras-commits at redhat.com  Wed Mar  2 07:16:28 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:16:28 -0500
Subject: rpms/perl-IO-Socket-SSL/RHL-9 perl-IO-Socket-SSL.spec,1.1,1.2
Message-ID: <200503020716.j227GS6x000635@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-IO-Socket-SSL/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv622/RHL-9

Modified Files:
	perl-IO-Socket-SSL.spec 
Log Message:
auto-import perl-IO-Socket-SSL-0.96-0.fdr.3.rh90 on branch RHL-9 from perl-IO-Socket-SSL-0.96-0.fdr.3.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/RHL-9/perl-IO-Socket-SSL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-IO-Socket-SSL.spec	9 Jan 2005 11:59:30 -0000	1.1
+++ perl-IO-Socket-SSL.spec	2 Mar 2005 07:16:26 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-IO-Socket-SSL
 Version:        0.96
-Release:        3
+Release:        0.fdr.3.rh90
 Epoch:          0
 Summary:        Perl library for transparent SSL
 
@@ -62,7 +62,7 @@
 
 
 %changelog
-* Tue Oct 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-3
+* Tue Oct 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-0.fdr.3
 - Disable session test suite even if Net::SSLeay >= 1.26 is available.
 
 * Wed Jul  7 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-0.fdr.2



From fedora-extras-commits at redhat.com  Wed Mar  2 07:18:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:18:32 -0500
Subject: rpms/perl-MLDBM import.log,1.2,1.3
Message-ID: <200503020718.j227IWMK000783@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MLDBM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv772

Modified Files:
	import.log 
Log Message:
auto-import perl-MLDBM-2.01-0.fdr.1.rh90 on branch RHL-9 from perl-MLDBM-2.01-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	11 Dec 2004 16:03:28 -0000	1.2
+++ import.log	2 Mar 2005 07:18:30 -0000	1.3
@@ -1 +1,2 @@
 perl-MLDBM-2_01-0_fdr_1_2:HEAD:perl-MLDBM-2.01-0.fdr.1.2.src.rpm:1102781000
+perl-MLDBM-2_01-0_fdr_1_rh90:RHL-9:perl-MLDBM-2.01-0.fdr.1.rh90.src.rpm:1109747903



From fedora-extras-commits at redhat.com  Wed Mar  2 07:18:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:18:32 -0500
Subject: rpms/perl-MLDBM/RHL-9 perl-MLDBM.spec,1.2,1.3
Message-ID: <200503020718.j227IWlq000787@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MLDBM/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv772/RHL-9

Modified Files:
	perl-MLDBM.spec 
Log Message:
auto-import perl-MLDBM-2.01-0.fdr.1.rh90 on branch RHL-9 from perl-MLDBM-2.01-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-MLDBM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/RHL-9/perl-MLDBM.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-MLDBM.spec	28 Jan 2005 17:36:45 -0000	1.2
+++ perl-MLDBM.spec	2 Mar 2005 07:18:30 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-MLDBM
 Version:        2.01
-Release:        1
+Release:        0.fdr.1.rh90
 Epoch:          0
 Summary:        Store multi-level hash structure in single level tied hash
 



From fedora-extras-commits at redhat.com  Wed Mar  2 07:19:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:19:31 -0500
Subject: rpms/perl-Module-CoreList import.log,1.2,1.3
Message-ID: <200503020719.j227JVEH000896@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Module-CoreList
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv886

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-CoreList-1.98-0.fdr.2.rh90 on branch RHL-9 from perl-Module-CoreList-1.98-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	5 Jan 2005 19:33:24 -0000	1.2
+++ import.log	2 Mar 2005 07:19:29 -0000	1.3
@@ -1 +1,2 @@
 perl-Module-CoreList-1_98-2:HEAD:perl-Module-CoreList-1.98-2.src.rpm:1104953598
+perl-Module-CoreList-1_98-0_fdr_2_rh90:RHL-9:perl-Module-CoreList-1.98-0.fdr.2.rh90.src.rpm:1109747962



From fedora-extras-commits at redhat.com  Wed Mar  2 07:19:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:19:31 -0500
Subject: rpms/perl-Module-CoreList/RHL-9 perl-Module-CoreList.spec,1.1,1.2
Message-ID: <200503020719.j227JVGM000899@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Module-CoreList/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv886/RHL-9

Modified Files:
	perl-Module-CoreList.spec 
Log Message:
auto-import perl-Module-CoreList-1.98-0.fdr.2.rh90 on branch RHL-9 from perl-Module-CoreList-1.98-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-Module-CoreList.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/RHL-9/perl-Module-CoreList.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Module-CoreList.spec	5 Jan 2005 19:33:24 -0000	1.1
+++ perl-Module-CoreList.spec	2 Mar 2005 07:19:29 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Module-CoreList
 Version:        1.98
-Release:        2
+Release:        0.fdr.2.rh90
 Epoch:          0
 Summary:        Perl core modules indexed by perl versions
 
@@ -57,7 +57,7 @@
 
 
 %changelog
-* Tue Jan 04 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-2
+* Tue Jan 04 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-0.fdr.2
 - BuildRequires: perl(Module::Build) (#2362).
 
 * Mon Jan 03 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-0.fdr.1



From fedora-extras-commits at redhat.com  Wed Mar  2 07:20:29 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:20:29 -0500
Subject: rpms/perl-Net-SSLeay import.log,1.2,1.3
Message-ID: <200503020720.j227KTcI001009@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Net-SSLeay
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1000

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-SSLeay-1.26-0.fdr.2.rh90 on branch RHL-9 from perl-Net-SSLeay-1.26-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	20 Dec 2004 17:25:07 -0000	1.2
+++ import.log	2 Mar 2005 07:20:27 -0000	1.3
@@ -1 +1,2 @@
 perl-Net-SSLeay-1_26-1:HEAD:perl-Net-SSLeay-1.26-1.src.rpm:1103563499
+perl-Net-SSLeay-1_26-0_fdr_2_rh90:RHL-9:perl-Net-SSLeay-1.26-0.fdr.2.rh90.src.rpm:1109748019



From fedora-extras-commits at redhat.com  Wed Mar  2 07:20:29 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:20:29 -0500
Subject: rpms/perl-Net-SSLeay/RHL-9 perl-Net-SSLeay.spec,1.1,1.2
Message-ID: <200503020720.j227KTeV001013@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Net-SSLeay/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1000/RHL-9

Modified Files:
	perl-Net-SSLeay.spec 
Log Message:
auto-import perl-Net-SSLeay-1.26-0.fdr.2.rh90 on branch RHL-9 from perl-Net-SSLeay-1.26-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/RHL-9/perl-Net-SSLeay.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-SSLeay.spec	20 Dec 2004 17:25:07 -0000	1.1
+++ perl-Net-SSLeay.spec	2 Mar 2005 07:20:27 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Net-SSLeay
 Version:        1.26
-Release:        1
+Release:        0.fdr.2.rh90
 Epoch:          0
 Summary:        Perl extension for using OpenSSL
 
@@ -66,9 +66,6 @@
 
 
 %changelog
-* Mon Dec 20 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.26-1
-- Drop fedora.us release prefix and suffix.
-
 * Mon Oct 25 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.26-0.fdr.2
 - Convert manual page to UTF-8.
 



From fedora-extras-commits at redhat.com  Wed Mar  2 07:21:28 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:21:28 -0500
Subject: rpms/perl-Test-Pod-Coverage import.log,1.2,1.3
Message-ID: <200503020721.j227LSZv001131@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1122

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-Pod-Coverage-1.06-0.fdr.1.rh90 on branch RHL-9 from perl-Test-Pod-Coverage-1.06-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	13 Jan 2005 19:51:56 -0000	1.2
+++ import.log	2 Mar 2005 07:21:26 -0000	1.3
@@ -1 +1,2 @@
 perl-Test-Pod-Coverage-1_06-1:HEAD:perl-Test-Pod-Coverage-1.06-1.src.rpm:1105645910
+perl-Test-Pod-Coverage-1_06-0_fdr_1_rh90:RHL-9:perl-Test-Pod-Coverage-1.06-0.fdr.1.rh90.src.rpm:1109748079



From fedora-extras-commits at redhat.com  Wed Mar  2 07:21:28 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:21:28 -0500
Subject: rpms/perl-Test-Pod-Coverage/RHL-9 perl-Test-Pod-Coverage.spec, 1.1,
	1.2
Message-ID: <200503020721.j227LSnp001135@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1122/RHL-9

Modified Files:
	perl-Test-Pod-Coverage.spec 
Log Message:
auto-import perl-Test-Pod-Coverage-1.06-0.fdr.1.rh90 on branch RHL-9 from perl-Test-Pod-Coverage-1.06-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-Test-Pod-Coverage.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/RHL-9/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	2 Mar 2005 07:21:26 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Test-Pod-Coverage
 Version:        1.06
-Release:        1
+Release:        0.fdr.1.rh90
 Epoch:          0
 Summary:        Check for pod coverage in your distribution
 
@@ -55,7 +55,7 @@
 
 
 %changelog
-* Thu Jun 24 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.06-1
+* Thu Jun 24 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.06-0.fdr.1
 - Update to 1.06.
 
 * Wed Jun 02 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.04-0.fdr.1



From fedora-extras-commits at redhat.com  Wed Mar  2 07:22:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:22:26 -0500
Subject: rpms/perl-XML-RSS import.log,1.2,1.3
Message-ID: <200503020722.j227MQpO001247@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-RSS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1237

Modified Files:
	import.log 
Log Message:
auto-import perl-XML-RSS-1.05-0.fdr.1.rh90 on branch RHL-9 from perl-XML-RSS-1.05-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-RSS/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	1 Jan 2005 11:10:17 -0000	1.2
+++ import.log	2 Mar 2005 07:22:24 -0000	1.3
@@ -1 +1,2 @@
 perl-XML-RSS-1_05-1:HEAD:perl-XML-RSS-1.05-1.src.rpm:1104577827
+perl-XML-RSS-1_05-0_fdr_1_rh90:RHL-9:perl-XML-RSS-1.05-0.fdr.1.rh90.src.rpm:1109748137



From fedora-extras-commits at redhat.com  Wed Mar  2 07:22:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:22:26 -0500
Subject: rpms/perl-XML-RSS/RHL-9 perl-XML-RSS.spec,1.1,1.2
Message-ID: <200503020722.j227MQT3001252@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-RSS/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1237/RHL-9

Modified Files:
	perl-XML-RSS.spec 
Log Message:
auto-import perl-XML-RSS-1.05-0.fdr.1.rh90 on branch RHL-9 from perl-XML-RSS-1.05-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-XML-RSS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-RSS/RHL-9/perl-XML-RSS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-RSS.spec	1 Jan 2005 11:10:17 -0000	1.1
+++ perl-XML-RSS.spec	2 Mar 2005 07:22:24 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-XML-RSS
 Version:        1.05
-Release:        1
+Release:        0.fdr.1.rh90
 Epoch:          0
 Summary:        Perl module for managing RDF Site Summary (RSS) files
 



From fedora-extras-commits at redhat.com  Wed Mar  2 07:23:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:23:27 -0500
Subject: rpms/perl-XML-XPath import.log,1.2,1.3
Message-ID: <200503020723.j227NR5O001367@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-XPath
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1356

Modified Files:
	import.log 
Log Message:
auto-import perl-XML-XPath-1.13-0.fdr.2.rh90 on branch RHL-9 from perl-XML-XPath-1.13-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPath/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	10 Feb 2005 20:29:37 -0000	1.2
+++ import.log	2 Mar 2005 07:23:25 -0000	1.3
@@ -1 +1,2 @@
 perl-XML-XPath-1_13-2:HEAD:perl-XML-XPath-1.13-2.src.rpm:1108067370
+perl-XML-XPath-1_13-0_fdr_2_rh90:RHL-9:perl-XML-XPath-1.13-0.fdr.2.rh90.src.rpm:1109748197



From fedora-extras-commits at redhat.com  Wed Mar  2 07:23:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:23:27 -0500
Subject: rpms/perl-XML-XPath/RHL-9 perl-XML-XPath.spec,1.1,1.2
Message-ID: <200503020723.j227NR04001371@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-XPath/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1356/RHL-9

Modified Files:
	perl-XML-XPath.spec 
Log Message:
auto-import perl-XML-XPath-1.13-0.fdr.2.rh90 on branch RHL-9 from perl-XML-XPath-1.13-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-XML-XPath.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPath/RHL-9/perl-XML-XPath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-XPath.spec	10 Feb 2005 20:29:37 -0000	1.1
+++ perl-XML-XPath.spec	2 Mar 2005 07:23:25 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-XML-XPath
 Version:        1.13
-Release:        2
+Release:        0.fdr.2.rh90
 Epoch:          0
 Summary:        XPath parser and evaluator for Perl
 
@@ -57,7 +57,7 @@
 
 
 %changelog
-* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-2
+* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-0.fdr.2
 - Bring up to date with current fedora.us Perl spec template.
 
 * Sun Oct 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-0.fdr.1



From fedora-extras-commits at redhat.com  Wed Mar  2 07:24:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:24:25 -0500
Subject: rpms/proj import.log,1.2,1.3
Message-ID: <200503020724.j227OPuo001517@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	import.log 
Log Message:
auto-import proj-4.4.8-0.fdr.4.rh90 on branch RHL-9 from proj-4.4.8-0.fdr.4.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/proj/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	14 Jan 2005 09:45:21 -0000	1.2
+++ import.log	2 Mar 2005 07:24:23 -0000	1.3
@@ -1 +1,2 @@
 proj-4_4_8-4:HEAD:proj-4.4.8-4.src.rpm:1105695966
+proj-4_4_8-0_fdr_4_rh90:RHL-9:proj-4.4.8-0.fdr.4.rh90.src.rpm:1109748255



From fedora-extras-commits at redhat.com  Wed Mar  2 07:24:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:24:25 -0500
Subject: rpms/proj/RHL-9 proj.spec,1.1,1.2
Message-ID: <200503020724.j227OPN9001521@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/proj/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1508/RHL-9

Modified Files:
	proj.spec 
Log Message:
auto-import proj-4.4.8-0.fdr.4.rh90 on branch RHL-9 from proj-4.4.8-0.fdr.4.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: proj.spec
===================================================================
RCS file: /cvs/extras/rpms/proj/RHL-9/proj.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proj.spec	14 Jan 2005 09:45:21 -0000	1.1
+++ proj.spec	2 Mar 2005 07:24:23 -0000	1.2
@@ -1,6 +1,10 @@
-Name: proj
-Version: 4.4.8
-Release: 4
+%define name proj
+%define version 4.4.8
+%define release 0.fdr.4
+
+Name: %name
+Version: %version
+Release: %release.rh90
 Epoch: 0
 Summary: Cartographic projection software (PROJ.4)
 
@@ -89,13 +93,13 @@
 %{_datadir}/%{name}
 
 %changelog
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-4
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.4
 - Added testvarious to nad distribution
 
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-0.fdr.3
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.3
 - Added patch for test scripts so that they will work in installed rpm
 
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-0.fdr.2
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.2
 - Fixed permissions on nad27 and nad83
 - Included test27 and test83 in the nad rpm and made them executable
 



From fedora-extras-commits at redhat.com  Wed Mar  2 07:26:05 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:26:05 -0500
Subject: rpms/shapelib/RHL-9 shapelib-1.2.10.patch, 1.2, 1.3 shapelib.spec,
	1.2, 1.3 shapelib-1.2.10-endian.patch, 1.1, NONE
Message-ID: <200503020726.j227Q5SZ001701@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/shapelib/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1681/RHL-9

Modified Files:
	shapelib-1.2.10.patch shapelib.spec 
Removed Files:
	shapelib-1.2.10-endian.patch 
Log Message:
auto-import shapelib-1.2.10-0.fdr.5.rh90 on branch RHL-9 from shapelib-1.2.10-0.fdr.5.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.

shapelib-1.2.10.patch:

Index: shapelib-1.2.10.patch
===================================================================
RCS file: /cvs/extras/rpms/shapelib/RHL-9/shapelib-1.2.10.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib-1.2.10.patch	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib-1.2.10.patch	2 Mar 2005 07:25:43 -0000	1.3
@@ -91,8 +91,7 @@
  
  # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN
 +CC = gcc
--ENDIAN	=	-D_LITTLE_ENDIAN
-+#ENDIAN	=	-D_LITTLE_ENDIAN
+ ENDIAN	=	-D_LITTLE_ENDIAN
  
 -CFLAGS	=	-g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
 +EXTRACFLAGS   =      -g


Index: shapelib.spec
===================================================================
RCS file: /cvs/extras/rpms/shapelib/RHL-9/shapelib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib.spec	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib.spec	2 Mar 2005 07:25:43 -0000	1.3
@@ -2,12 +2,11 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.2.10
-Release: 6
+Release: 0.fdr.5.rh90
 Epoch: 0
 URL: http://shapelib.maptools.org/
 Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz
 Patch0: shapelib-%{version}.patch
-Patch1: shapelib-1.2.10-endian.patch
 License: LGPL/MIT
 Group: Development/Libraries
 Buildrequires: libtool
@@ -31,7 +30,6 @@
 %prep
 %setup -q -T -b 0
 %patch -p1 -b .buildroot 
-%patch1 -p1 -b .endian
 
 %build
 make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" lib
@@ -72,10 +70,7 @@
 %exclude %{_libdir}/libshp.la
 
 %changelog
-* Sun Feb 13 2005 David Woodhouse <dwmw2 at infradead.org> 0:1.2.10-6
-- Don't hard-code endianness; just use endian.h
-
-* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:1.2.10-5
+* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:1.2.10-0.fdr.5
 - Patched patch and spec file according to suggestions of Michael Schwendt
 - In particular, this separates the building from the installing in the rpm.
 


--- shapelib-1.2.10-endian.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar  2 07:26:05 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:26:05 -0500
Subject: rpms/shapelib import.log,1.2,1.3
Message-ID: <200503020726.j227Q5ur001697@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	import.log 
Log Message:
auto-import shapelib-1.2.10-0.fdr.5.rh90 on branch RHL-9 from shapelib-1.2.10-0.fdr.5.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/shapelib/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	14 Jan 2005 09:47:27 -0000	1.2
+++ import.log	2 Mar 2005 07:25:43 -0000	1.3
@@ -1 +1,2 @@
 shapelib-1_2_10-5:HEAD:shapelib-1.2.10-5.src.rpm:1105696087
+shapelib-1_2_10-0_fdr_5_rh90:RHL-9:shapelib-1.2.10-0.fdr.5.rh90.src.rpm:1109748327



From fedora-extras-commits at redhat.com  Wed Mar  2 07:28:08 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:28:08 -0500
Subject: rpms/qtparted import.log,1.3,1.4
Message-ID: <200503020728.j227S8Rh001881@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	import.log 
Log Message:
auto-import qtparted-0.4.4-0.fdr.1.2 on branch FC-2 from qtparted-0.4.4-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/unstable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qtparted/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 05:17:37 -0000	1.3
+++ import.log	2 Mar 2005 07:28:06 -0000	1.4
@@ -1,2 +1,3 @@
 qtparted-0_3_2-0_fdr_5_rh90:HEAD:qtparted-0.3.2-0.fdr.5.rh90.src.rpm:1099891051
 qtparted-0_3_2-0_fdr_5_1:HEAD:qtparted-0.3.2-0.fdr.5.1.src.rpm:1099891057
+qtparted-0_4_4-0_fdr_1_2:FC-2:qtparted-0.4.4-0.fdr.1.2.src.rpm:1109748478



From fedora-extras-commits at redhat.com  Wed Mar  2 07:28:08 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:28:08 -0500
Subject: rpms/qtparted/FC-2 qtparted.spec,1.4,1.5
Message-ID: <200503020728.j227S8Vo001885@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/qtparted/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1872/FC-2

Modified Files:
	qtparted.spec 
Log Message:
auto-import qtparted-0.4.4-0.fdr.1.2 on branch FC-2 from qtparted-0.4.4-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/unstable.


Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/FC-2/qtparted.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qtparted.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ qtparted.spec	2 Mar 2005 07:28:06 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.4
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 



From fedora-extras-commits at redhat.com  Wed Mar  2 08:47:15 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 03:47:15 -0500
Subject: rpms/grip - New directory
Message-ID: <200503020847.j228lFsj003255@cvs-int.fedora.redhat.com>

Author: adrian

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

Log Message:
Directory /cvs/extras/rpms/grip added to the repository




From fedora-extras-commits at redhat.com  Wed Mar  2 08:47:15 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 03:47:15 -0500
Subject: rpms/grip/devel - New directory
Message-ID: <200503020847.j228lFIl003258@cvs-int.fedora.redhat.com>

Author: adrian

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

Log Message:
Directory /cvs/extras/rpms/grip/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar  2 08:47:35 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 03:47:35 -0500
Subject: rpms/grip Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503020847.j228lZdK003319@cvs-int.fedora.redhat.com>

Author: adrian

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module grip


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

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

common : CVS/Root
	@cvs 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 Mar  2 08:47:35 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 03:47:35 -0500
Subject: rpms/grip/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503020847.j228lZJJ003322@cvs-int.fedora.redhat.com>

Author: adrian

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module grip


--- 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 Mar  2 08:48:42 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 03:48:42 -0500
Subject: rpms/grip import.log,1.1,1.2
Message-ID: <200503020848.j228mg7r003462@cvs-int.fedora.redhat.com>

Author: adrian

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/grip/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Mar 2005 08:47:33 -0000	1.1
+++ import.log	2 Mar 2005 08:48:40 -0000	1.2
@@ -0,0 +1 @@
+grip-3_2_0-3:HEAD:grip-3.2.0-3.src.rpm:1109753311



From fedora-extras-commits at redhat.com  Wed Mar  2 08:48:42 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 03:48:42 -0500
Subject: rpms/grip/devel grip-3.0.7-cdparanoia.patch, NONE,
	1.1 grip-3.0.7-locking.patch, NONE,
	1.1 grip-3.2.0-default.patch, NONE, 1.1 grip-3.2.0-rh1.patch,
	NONE, 1.1 grip.desktop, NONE, 1.1 grip.spec, NONE,
	1.1 gripicon.png, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503020848.j228mgNV003466@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	.cvsignore sources 
Added Files:
	grip-3.0.7-cdparanoia.patch grip-3.0.7-locking.patch 
	grip-3.2.0-default.patch grip-3.2.0-rh1.patch grip.desktop 
	grip.spec gripicon.png 
Log Message:
auto-import grip-3.2.0-3 on branch devel from grip-3.2.0-3.src.rpm

grip-3.0.7-cdparanoia.patch:

--- NEW FILE grip-3.0.7-cdparanoia.patch ---
diff -ru grip-3.0.7/config.h.in grip-3.0.7-fixed/config.h.in
--- grip-3.0.7/config.h.in	2003-01-04 14:04:06.000000000 -0500
+++ grip-3.0.7-fixed/config.h.in	2003-08-18 20:33:19.000000000 -0400
@@ -38,10 +38,10 @@
 #undef HAVE_ARGZ_H
 
 /* Define to 1 if you have the <cdda_interface.h> header file. */
-#undef HAVE_CDDA_INTERFACE_H
+#undef HAVE_CDDA_CDDA_INTERFACE_H
 
 /* Define to 1 if you have the <cdda_paranoia.h> header file. */
-#undef HAVE_CDDA_PARANOIA_H
+#undef HAVE_CDDA_CDDA_PARANOIA_H
 
 /* Define to 1 if you have the `dcgettext' function. */
 #undef HAVE_DCGETTEXT
diff -ru grip-3.0.7/configure.in grip-3.0.7-fixed/configure.in
--- grip-3.0.7/configure.in	2003-04-22 22:33:27.000000000 -0400
+++ grip-3.0.7-fixed/configure.in	2003-08-18 20:26:30.000000000 -0400
@@ -52,7 +52,7 @@
 if test "$enable_cdpar" = "yes"; then
   LIBS="$LIBS -lm"
 
-  AC_CHECK_HEADERS(cdda_interface.h cdda_paranoia.h)
+  AC_CHECK_HEADERS(cdda/cdda_interface.h cdda/cdda_paranoia.h)
   AC_CHECK_LIB(cdda_interface,main,
     if test "$enable_shared_cdpar" = "yes"; then
       echo "using shared cdparanoia libraries"
diff -ru grip-3.0.7/src/cdpar.c grip-3.0.7-fixed/src/cdpar.c
--- grip-3.0.7/src/cdpar.c	2003-01-04 14:04:08.000000000 -0500
+++ grip-3.0.7-fixed/src/cdpar.c	2003-08-18 20:34:33.000000000 -0400
@@ -25,7 +25,7 @@
 
 #include "grip.h"
 
-#ifdef HAVE_CDDA_INTERFACE_H
+#ifdef HAVE_CDDA_CDDA_INTERFACE_H
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -44,8 +44,8 @@
 #define size16 short
 #define size32 int
 
-#include <cdda_interface.h>
-#include <cdda_paranoia.h>
+#include <cdda/cdda_interface.h>
+#include <cdda/cdda_paranoia.h>
 
 static void PutNum(long num,int f,int endianness,int bytes);
 static void WriteWav(int f,long bytes);
diff -ru grip-3.0.7/src/grip.h grip-3.0.7-fixed/src/grip.h
--- grip-3.0.7/src/grip.h	2003-01-04 14:04:08.000000000 -0500
+++ grip-3.0.7-fixed/src/grip.h	2003-08-18 20:33:39.000000000 -0400
@@ -31,7 +31,7 @@
 #include "pthread.h"
 #include "launch.h"
 
-#ifdef HAVE_CDDA_INTERFACE_H
+#ifdef HAVE_CDDA_CDDA_INTERFACE_H
 #define CDPAR
 #endif
 
diff -ru grip-3.0.7/src/rip.c grip-3.0.7-fixed/src/rip.c
--- grip-3.0.7/src/rip.c	2003-01-11 18:00:00.000000000 -0500
+++ grip-3.0.7-fixed/src/rip.c	2003-08-18 20:43:11.000000000 -0400
@@ -50,8 +50,8 @@
 #include "gain_analysis.h"
 #define size32 gint32
 #define size16 gint16
-#include <cdda_interface.h>
-#include <cdda_paranoia.h>
+#include <cdda/cdda_interface.h>
+#include <cdda/cdda_paranoia.h>
 extern int rip_smile_level;
 #endif
 

grip-3.0.7-locking.patch:

--- NEW FILE grip-3.0.7-locking.patch ---
diff -ru grip-3.0.7/src/rip.c grip-3.0.7-fixed/src/rip.c
--- grip-3.0.7/src/rip.c	2003-01-11 18:00:00.000000000 -0500
+++ grip-3.0.7-fixed/src/rip.c	2003-08-18 20:43:11.000000000 -0400
@@ -1220,6 +1220,10 @@
 
   CDStop(&(ginfo->disc));
   ginfo->stopped=TRUE;
+  
+  /* Close the device so locking works sanely */
+  close(ginfo->disc.cd_desc);
+  ginfo->disc.cd_desc = -1;
     
   if(ginfo->ripping) {
     ginfo->doencode=FALSE;

grip-3.2.0-default.patch:

--- NEW FILE grip-3.2.0-default.patch ---
--- grip-3.2.0/src/gripcfg.c.rh-default-encoder	2004-04-15 20:20:15.000000000 +0200
+++ grip-3.2.0/src/gripcfg.c	2004-06-20 01:54:41.052531992 +0200
@@ -47,16 +47,16 @@
   {"",""}
 };
 
-static MP3Encoder encoder_defaults[]={{"bladeenc","-%b -QUIT %w %m","mp3"},
+static MP3Encoder encoder_defaults[]={{"oggenc",
+				       "-o %m -a %a -l %d -t %n -b %b %w -N %t -G %g -d %y",
+				       "ogg"},
+                                      {"bladeenc","-%b -QUIT %w %m"},
 				      {"lame","-h -b %b %w %m","mp3"},
 				      {"l3enc","-br %b %w %m","mp3"},
 				      {"xingmp3enc","-B %b -Q %w","mp3"},
 				      {"mp3encode","-p 2 -l 3 -b %b %w %m",
 				       "mp3"},
 				      {"gogo","-b %b %w %m","mp3"},
-				      {"oggenc",
-				       "-o %m -a %a -l %d -t %n -b %b %w -N %t -G %g -d %y",
-				       "ogg"},
 				      {"flac","-V -o %m %w","flac"},
 				      {"other","",""},
 				      {"",""}
--- grip-3.2.0/src/grip.c.rh-default-encoder	2004-04-15 20:23:54.000000000 +0200
+++ grip-3.2.0/src/grip.c	2004-06-20 01:51:47.994840760 +0200
@@ -832,7 +832,7 @@
   ginfo->using_builtin_cdp=FALSE;
 #endif
   ginfo->in_rip_thread=FALSE;
-  strcpy(ginfo->ripfileformat,"~/mp3/%A/%d/%n.wav");
+  strcpy(ginfo->ripfileformat,"~/ogg/%A/%d/%n.wav");
 #ifdef __linux__
   FindExeInPath("cdparanoia", ginfo->ripexename, sizeof(ginfo->ripexename));
   strcpy(ginfo->ripcmdline,"-d %c %t:[.%s]-%t:[.%e] %w");
@@ -856,9 +856,9 @@
   *ginfo->wav_filter_cmd='\0';
   *ginfo->disc_filter_cmd='\0';
   ginfo->selected_encoder=1;
-  strcpy(ginfo->mp3cmdline,"-h -b %b %w %m");
-  FindExeInPath("lame", ginfo->mp3exename, sizeof(ginfo->mp3exename));
-  strcpy(ginfo->mp3fileformat,"~/mp3/%A/%d/%n.%x");
+  strcpy(ginfo->mp3cmdline,"-o %m -a %a -l %d -t %n -N %t -G %G -d %y -q 4 %w");
+  FindExeInPath("oggenc", ginfo->mp3exename, sizeof(ginfo->mp3exename));
+  strcpy(ginfo->mp3fileformat,"~/ogg/%A/%d/%n.ogg");
   strcpy(ginfo->mp3extension,"mp3");
   ginfo->mp3nice=0;
   *ginfo->mp3_filter_cmd='\0';
@@ -866,7 +866,7 @@
   ginfo->add_to_db=FALSE;
   ginfo->add_m3u=TRUE;
   ginfo->rel_m3u=TRUE;
-  strcpy(ginfo->m3ufileformat,"~/mp3/%A-%d.m3u");
+  strcpy(ginfo->m3ufileformat,"~/ogg/%A-%d.m3u");
   ginfo->kbits_per_sec=128;
   ginfo->edit_num_cpu=1;
   ginfo->doid3=TRUE;

grip-3.2.0-rh1.patch:

--- NEW FILE grip-3.2.0-rh1.patch ---
--- grip-3.2.0/Makefile.in.rh1	2004-06-20 02:21:06.831456952 +0200
+++ grip-3.2.0/Makefile.in	2004-06-20 02:22:40.643195400 +0200
@@ -113,7 +113,7 @@
 	grip.spec.in
 
 
-Applicationsdir = $(datadir)/applications
+Applicationsdir = $(datadir)/gnome/apps/Multimedia
 Applications_DATA = grip.desktop
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4


--- NEW FILE grip.desktop ---
[Desktop Entry]
Name=Grip
Name[ca]=Grip
Name[es]=Grip
Comment=CD player/ripper
Comment[ca]=Reproductor/extractor de CD d'audio
Comment[es]=Reproductor/extractor de CDs de audio
Comment[fr]=Lecteur/extracteur de CD audio
Exec=grip
Icon=gripicon.png
Type=Application


--- NEW FILE grip.spec ---
Summary: A front-end for CD rippers and Ogg Vorbis encoders.
Name: grip
Version: 3.2.0
Release: 3
Serial: 1
Copyright: GPL
Group: Applications/Multimedia
Source: http://www.nostatic/grip/%{name}-%{version}.tar.gz
Source1: gripicon.png
Source2: grip.desktop
Patch1: grip-3.2.0-default.patch
Patch2: grip-3.0.7-cdparanoia.patch
Patch3: grip-3.0.7-locking.patch
Patch4: grip-3.2.0-rh1.patch
URL: http://www.nostatic.org/grip
Buildroot: %{_tmppath}/%{name}-root
Requires: vorbis-tools
BuildPrereq: vte-devel cdparanoia-devel autoconf >= 2.52
BuildPrereq: libgnomeui-devel, curl-devel, desktop-file-utils
ExcludeArch: s390 s390x

%description
Grip is a GTK+ based front-end for CD rippers (such as cdparanoia and
cdda2wav) and Ogg Vorbis encoders.  Grip allows you to rip entire tracks or
just a section of a track.  Grip supports the CDDB protocol for
accessing track information on disc database servers.

%prep
%setup -q
%patch1 -p1 -b .rh-default-encoder
#%patch2 -p1 -b .cdparanoia
#%patch3 -p1 -b .locking
%patch4 -p1 -b .rh1


%build
autoconf
%configure
make

%install
rm -rf %{buildroot}
cp -f %{SOURCE2} .

make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT install-am

install $RPM_SOURCE_DIR/gripicon.png %{buildroot}%{_datadir}/pixmaps

desktop-file-install \
	--vendor=net \
	--dir $RPM_BUILD_ROOT/%{_datadir}/applications \
	--delete-original \
	--add-category X-Red-Hat-Extra \
	--add-category Application \
	--add-category AudioVideo \
	%{buildroot}%{_datadir}/gnome/apps/Multimedia/grip.desktop
cat >> %{buildroot}%{_datadir}/applications/net-grip.desktop << EOF
StartupWMClass=Grip
EOF
%find_lang %{name}-2.2

%clean
rm -rf %{buildroot}


%files -f %{name}-2.2.lang
%defattr(-,root,root)
%doc README ChangeLog CREDITS COPYING INSTALL NEWS AUTHORS TODO
%{_bindir}/grip
%{_datadir}/pixmaps/gripicon.png
%{_datadir}/gnome/help/grip
%{_datadir}/applications/*

%changelog
* Fri Oct  8 2004 Bill Nottingham <notting at redhat.com> 3.2.0-3
- add a passel of buildreqs (#135045)

* Wed Jul 28 2004 Adrian Havill <havill at redhat.com> 3.2.0-2
- rebuilt
- add vte-devel to BuildRequires

* Sun Jun 20 2004 Karsten Hopp <karsten at redhat.de> 3.2.0-1 
- update to latest stable version
- remove obsolete locking and cdparanoia patches

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Aug 18 2003 Bill Nottingham <notting at redhat.com> 1:3.0.7-3
- fix it so it actually uses cdparanoia libraries
- close the cd device before ripping so locking works (#102051)

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 29 2003 Bill Nottingham <notting at redhat.com> 1:3.0.7-1
- update to 3.0.7

* Tue Feb 18 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-5
- fix default encoder (#83647)

* Wed Feb  5 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-4
- desktop file fixing

* Wed Jan 29 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-3
- fix debuginfo-induced desktop file weirdness (#82905)

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Tue Jan  7 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-1
- update to 3.0.4

* Mon Dec 23 2002 Tim Powers <timp at redhat.com> 1:3.0.1-5
- bump and rebuild

* Thu Dec 12 2002 Tim Powers <timp at redhat.com> 1:3.0.1-4
- rebuild on all arches

* Wed Aug 21 2002 Bill Nottingham <notting at redhat.com> 3.0.1-4
- fix encode options (#72156)

* Mon Aug 19 2002 Bill Nottingham <notting at redhat.com> 3.0.1-3
- rebuild (#71899)

* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 3.0.1-2
- build using gcc-3.2-0.1

* Mon Jun 24 2002 Bill Nottingham <notting at redhat.com> 3.0.1-1
- update to 3.0.1

* 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 Apr 10 2002 Bill Nottingham <notting at redhat.com>
- fix default encoder opts (#62551)

* Wed Jul 18 2001 Bill Nottingham <notting at redhat.com>
- update to 2.96

* Mon May 21 2001 Tim Powers <timp at redhat.com>
- applied patches from alane at geeksrus.net in bug #41490

* Mon May 14 2001 Tim Powers <timp at redhat.com>
- updated to 2.95
- requires vorbis
- patched to use oggenc by default (since we ship it)
- changed location of the desktop file

* Wed Aug 9 2000 Tim Powers <timp at redhat.com>
- added Serial so that we can upgrade from the Helix packages for 6.2

* Mon Jul 24 2000 Prospector <prospector at redhat.com>
- rebuilt

* Wed Jul 12 2000 Than Ngo <than at redhat.de>
- rebuilt

* Fri Jun 16 2000 Preston Brown <pbrown at redhat.com>
- include icon properly
- fix up man path patch

* Wed Jun 7 2000 Tim Powers <timp at redhat.com>
- fixed manpage location
- use %%makeinstall and other predefined macros wherever possible

* Fri May 12 2000 Tim Powers <timp at redhat.com>
- updated to 2.94

* Sun Feb 06 2000 Preston Brown <pbrown at redhat.com>
- fix more problems w/man page because of gzip

* Sun Jan 16 2000 Preston Brown <pbrown at redhat.com>
- 2.91
- fix man page symlink

* Thu Nov 11 1999 Tim Powers <timp at redhat.com>
- updated to 2.8
- no longer need separate cdparanoia source
- gzip man pages
- added desktop entry

* Mon Aug 30 1999 Bill Nottingham <notting at redhat.com>
- update to 2.6

* Thu Jul 15 1999 Tim Powers <timp at redhat.com>
- updated grip source
- included cdparanoia source, builds during the build routine so
  we can have a complete grip build
- and all were happy when it twas built for 6.1

* Sat Apr 18 1999 Michael Maher <mike at redhat.com>
- built package for 6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Mar 2005 08:47:33 -0000	1.1
+++ .cvsignore	2 Mar 2005 08:48:40 -0000	1.2
@@ -0,0 +1 @@
+grip-3.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Mar 2005 08:47:33 -0000	1.1
+++ sources	2 Mar 2005 08:48:40 -0000	1.2
@@ -0,0 +1 @@
+9b51933a03dd7d7ddfbb3643fc82c2d0  grip-3.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar  2 09:22:03 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 04:22:03 -0500
Subject: rpms/grip/devel grip.spec,1.1,1.2
Message-ID: <200503020922.j229M3uH005205@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	grip.spec 
Log Message:
first try to make grip.spec compliant with the package guidelines



Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grip.spec	2 Mar 2005 08:48:40 -0000	1.1
+++ grip.spec	2 Mar 2005 09:22:01 -0000	1.2
@@ -1,23 +1,19 @@
-Summary: A front-end for CD rippers and Ogg Vorbis encoders.
+Summary: A front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 3
-Serial: 1
-Copyright: GPL
+Release: 4
+Epoch: 1
+License: GPL
 Group: Applications/Multimedia
-Source: http://www.nostatic/grip/%{name}-%{version}.tar.gz
-Source1: gripicon.png
-Source2: grip.desktop
+Source: http://www.nostatic/grip/grip-%{version}.tar.gz
 Patch1: grip-3.2.0-default.patch
-Patch2: grip-3.0.7-cdparanoia.patch
-Patch3: grip-3.0.7-locking.patch
-Patch4: grip-3.2.0-rh1.patch
-URL: http://www.nostatic.org/grip
-Buildroot: %{_tmppath}/%{name}-root
+URL: http://www.nostatic.org/grip/
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: vorbis-tools
-BuildPrereq: vte-devel cdparanoia-devel autoconf >= 2.52
-BuildPrereq: libgnomeui-devel, curl-devel, desktop-file-utils
-ExcludeArch: s390 s390x
+BuildRequires: vte-devel cdparanoia-devel
+BuildRequires: libgnomeui-devel curl-devel
+BuildRequires: gettext id3lib-devel
+BuildRequires: desktop-file-utils
 
 %description
 Grip is a GTK+ based front-end for CD rippers (such as cdparanoia and
@@ -28,51 +24,66 @@
 %prep
 %setup -q
 %patch1 -p1 -b .rh-default-encoder
-#%patch2 -p1 -b .cdparanoia
-#%patch3 -p1 -b .locking
-%patch4 -p1 -b .rh1
-
 
 %build
-autoconf
 %configure
-make
+%{__make} %{_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-cp -f %{SOURCE2} .
+rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 make DESTDIR=$RPM_BUILD_ROOT install-am
 
-install $RPM_SOURCE_DIR/gripicon.png %{buildroot}%{_datadir}/pixmaps
+cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF
+StartupWMClass=Grip
+Encoding=UTF-8
+EOF
+iconv -f ISO-8859-1 -t UTF-8 \
+	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop > \
+	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new
+
+mv	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new \
+	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop
 
 desktop-file-install \
-	--vendor=net \
+	--vendor=fedora \
 	--dir $RPM_BUILD_ROOT/%{_datadir}/applications \
 	--delete-original \
-	--add-category X-Red-Hat-Extra \
+	--add-category X-Fedora \
 	--add-category Application \
 	--add-category AudioVideo \
-	%{buildroot}%{_datadir}/gnome/apps/Multimedia/grip.desktop
-cat >> %{buildroot}%{_datadir}/applications/net-grip.desktop << EOF
-StartupWMClass=Grip
-EOF
+	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop
 %find_lang %{name}-2.2
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %files -f %{name}-2.2.lang
 %defattr(-,root,root)
-%doc README ChangeLog CREDITS COPYING INSTALL NEWS AUTHORS TODO
+%doc README ChangeLog CREDITS COPYING AUTHORS TODO
 %{_bindir}/grip
 %{_datadir}/pixmaps/gripicon.png
 %{_datadir}/gnome/help/grip
 %{_datadir}/applications/*
 
 %changelog
+* Wed Mar 02 2005 Adrian Reber <adrian at lisas.de> - 1:3.2.0-4
+- s/Copyright/License/
+- s/Serial/Epoch/
+- cosmetic changes to quiet rpmlint
+- removed grip.png and grip.desktop (Source1 and Source2) as
+  it is already included in the tarball
+- removed unused patches
+- removed ExcludeArch: s390 s390x
+- renamed BuildPrereq to BuildRequires
+- added id3lib-devel to BuildRequires
+- use %%{_smp_mflags}
+- changed .desktop file creation and installation
+- removed INSTALL and NEWS from %%doc
+- delete changelog entries older than 2004
+
 * Fri Oct  8 2004 Bill Nottingham <notting at redhat.com> 3.2.0-3
 - add a passel of buildreqs (#135045)
 
@@ -89,112 +100,3 @@
 
 * Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
 - rebuilt
-
-* Mon Aug 18 2003 Bill Nottingham <notting at redhat.com> 1:3.0.7-3
-- fix it so it actually uses cdparanoia libraries
-- close the cd device before ripping so locking works (#102051)
-
-* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Thu May 29 2003 Bill Nottingham <notting at redhat.com> 1:3.0.7-1
-- update to 3.0.7
-
-* Tue Feb 18 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-5
-- fix default encoder (#83647)
-
-* Wed Feb  5 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-4
-- desktop file fixing
-
-* Wed Jan 29 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-3
-- fix debuginfo-induced desktop file weirdness (#82905)
-
-* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
-- rebuilt
-
-* Tue Jan  7 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-1
-- update to 3.0.4
-
-* Mon Dec 23 2002 Tim Powers <timp at redhat.com> 1:3.0.1-5
-- bump and rebuild
-
-* Thu Dec 12 2002 Tim Powers <timp at redhat.com> 1:3.0.1-4
-- rebuild on all arches
-
-* Wed Aug 21 2002 Bill Nottingham <notting at redhat.com> 3.0.1-4
-- fix encode options (#72156)
-
-* Mon Aug 19 2002 Bill Nottingham <notting at redhat.com> 3.0.1-3
-- rebuild (#71899)
-
-* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 3.0.1-2
-- build using gcc-3.2-0.1
-
-* Mon Jun 24 2002 Bill Nottingham <notting at redhat.com> 3.0.1-1
-- update to 3.0.1
-
-* 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 Apr 10 2002 Bill Nottingham <notting at redhat.com>
-- fix default encoder opts (#62551)
-
-* Wed Jul 18 2001 Bill Nottingham <notting at redhat.com>
-- update to 2.96
-
-* Mon May 21 2001 Tim Powers <timp at redhat.com>
-- applied patches from alane at geeksrus.net in bug #41490
-
-* Mon May 14 2001 Tim Powers <timp at redhat.com>
-- updated to 2.95
-- requires vorbis
-- patched to use oggenc by default (since we ship it)
-- changed location of the desktop file
-
-* Wed Aug 9 2000 Tim Powers <timp at redhat.com>
-- added Serial so that we can upgrade from the Helix packages for 6.2
-
-* Mon Jul 24 2000 Prospector <prospector at redhat.com>
-- rebuilt
-
-* Wed Jul 12 2000 Than Ngo <than at redhat.de>
-- rebuilt
-
-* Fri Jun 16 2000 Preston Brown <pbrown at redhat.com>
-- include icon properly
-- fix up man path patch
-
-* Wed Jun 7 2000 Tim Powers <timp at redhat.com>
-- fixed manpage location
-- use %%makeinstall and other predefined macros wherever possible
-
-* Fri May 12 2000 Tim Powers <timp at redhat.com>
-- updated to 2.94
-
-* Sun Feb 06 2000 Preston Brown <pbrown at redhat.com>
-- fix more problems w/man page because of gzip
-
-* Sun Jan 16 2000 Preston Brown <pbrown at redhat.com>
-- 2.91
-- fix man page symlink
-
-* Thu Nov 11 1999 Tim Powers <timp at redhat.com>
-- updated to 2.8
-- no longer need separate cdparanoia source
-- gzip man pages
-- added desktop entry
-
-* Mon Aug 30 1999 Bill Nottingham <notting at redhat.com>
-- update to 2.6
-
-* Thu Jul 15 1999 Tim Powers <timp at redhat.com>
-- updated grip source
-- included cdparanoia source, builds during the build routine so
-  we can have a complete grip build
-- and all were happy when it twas built for 6.1
-
-* Sat Apr 18 1999 Michael Maher <mike at redhat.com>
-- built package for 6.0



From fedora-extras-commits at redhat.com  Wed Mar  2 09:22:50 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 04:22:50 -0500
Subject: rpms/grip/devel grip-3.0.7-cdparanoia.patch, 1.1,
	NONE grip-3.0.7-locking.patch, 1.1, NONE grip-3.2.0-rh1.patch,
	1.1, NONE grip.desktop, 1.1, NONE gripicon.png, 1.1, NONE
Message-ID: <200503020922.j229MoiU005247@cvs-int.fedora.redhat.com>

Author: adrian

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

Removed Files:
	grip-3.0.7-cdparanoia.patch grip-3.0.7-locking.patch 
	grip-3.2.0-rh1.patch grip.desktop gripicon.png 
Log Message:
removed unneeded files



--- grip-3.0.7-cdparanoia.patch DELETED ---


--- grip-3.0.7-locking.patch DELETED ---


--- grip-3.2.0-rh1.patch DELETED ---


--- grip.desktop DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar  2 11:08:33 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:08:33 -0500
Subject: rpms/gnotime import.log,1.2,1.3
Message-ID: <200503021108.j22B8XZV009048@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import gnotime-2.2.1-0.fdr.5.1 on branch FC-1 from gnotime-2.2.1-0.fdr.5.1.src.rpm
Bring in stuff from fedora.us FC1/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnotime/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	16 Dec 2004 17:34:07 -0000	1.2
+++ import.log	2 Mar 2005 11:08:31 -0000	1.3
@@ -1 +1,2 @@
 gnotime-2_2_1-0_fdr_5_2:HEAD:gnotime-2.2.1-0.fdr.5.2.src.rpm:1103218431
+gnotime-2_2_1-0_fdr_5_1:FC-1:gnotime-2.2.1-0.fdr.5.1.src.rpm:1109761713



From fedora-extras-commits at redhat.com  Wed Mar  2 11:08:33 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:08:33 -0500
Subject: rpms/gnotime/FC-1 gnotime.spec,1.2,1.3
Message-ID: <200503021108.j22B8XhS009052@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnotime/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9039/FC-1

Modified Files:
	gnotime.spec 
Log Message:
auto-import gnotime-2.2.1-0.fdr.5.1 on branch FC-1 from gnotime-2.2.1-0.fdr.5.1.src.rpm
Bring in stuff from fedora.us FC1/testing


Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/FC-1/gnotime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnotime.spec	16 Dec 2004 18:07:34 -0000	1.2
+++ gnotime.spec	2 Mar 2005 11:08:31 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.2.1
-Release:        5
+Release:        0.fdr.5.1
 Epoch:          0
 Summary:        Tracks and reports time spent
 
@@ -129,7 +129,7 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
-* Sat Nov 27 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-5
+* Sat Nov 27 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-0.fdr.5
 - Patch to fix a crash when invoking gnome_help.
 - Patch to wordwrap diary notes.
   



From fedora-extras-commits at redhat.com  Wed Mar  2 11:09:29 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:09:29 -0500
Subject: rpms/gnotime import.log,1.3,1.4
Message-ID: <200503021109.j22B9TMH009156@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import gnotime-2.2.1-0.fdr.5.2 on branch FC-2 from gnotime-2.2.1-0.fdr.5.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnotime/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 11:08:31 -0000	1.3
+++ import.log	2 Mar 2005 11:09:27 -0000	1.4
@@ -1,2 +1,3 @@
 gnotime-2_2_1-0_fdr_5_2:HEAD:gnotime-2.2.1-0.fdr.5.2.src.rpm:1103218431
 gnotime-2_2_1-0_fdr_5_1:FC-1:gnotime-2.2.1-0.fdr.5.1.src.rpm:1109761713
+gnotime-2_2_1-0_fdr_5_2:FC-2:gnotime-2.2.1-0.fdr.5.2.src.rpm:1109761769



From fedora-extras-commits at redhat.com  Wed Mar  2 11:09:29 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:09:29 -0500
Subject: rpms/gnotime/FC-2 gnotime.spec,1.2,1.3
Message-ID: <200503021109.j22B9TbY009160@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnotime/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9147/FC-2

Modified Files:
	gnotime.spec 
Log Message:
auto-import gnotime-2.2.1-0.fdr.5.2 on branch FC-2 from gnotime-2.2.1-0.fdr.5.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/FC-2/gnotime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnotime.spec	16 Dec 2004 18:07:34 -0000	1.2
+++ gnotime.spec	2 Mar 2005 11:09:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.2.1
-Release:        5
+Release:        0.fdr.5.2
 Epoch:          0
 Summary:        Tracks and reports time spent
 
@@ -129,7 +129,7 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
-* Sat Nov 27 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-5
+* Sat Nov 27 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-0.fdr.5
 - Patch to fix a crash when invoking gnome_help.
 - Patch to wordwrap diary notes.
   



From fedora-extras-commits at redhat.com  Wed Mar  2 11:10:24 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:10:24 -0500
Subject: rpms/gai import.log,1.5,1.6
Message-ID: <200503021110.j22BAO3w009278@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import gai-0.5.8-0.fdr.2.2 on branch FC-2 from gai-0.5.8-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gai/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	27 Feb 2005 05:28:13 -0000	1.5
+++ import.log	2 Mar 2005 11:10:22 -0000	1.6
@@ -2,3 +2,4 @@
 gai-0_5_0-0_fdr_0_4_pre4_1:HEAD:gai-0.5.0-0.fdr.0.4.pre4.1.src.rpm:1099887672
 gai-0_5_0-0_fdr_0_4_pre4_2:HEAD:gai-0.5.0-0.fdr.0.4.pre4.2.src.rpm:1099887678
 gai-0_5_8-4:HEAD:gai-0.5.8-4.src.rpm:1109482089
+gai-0_5_8-0_fdr_2_2:FC-2:gai-0.5.8-0.fdr.2.2.src.rpm:1109761827



From fedora-extras-commits at redhat.com  Wed Mar  2 11:10:24 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:10:24 -0500
Subject: rpms/gai/FC-2 .cvsignore, 1.2, 1.3 gai.spec, 1.3, 1.4 sources, 1.2,
	1.3 gai-0.5.0pre4.patch, 1.1, NONE
Message-ID: <200503021110.j22BAOe3009282@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9269/FC-2

Modified Files:
	.cvsignore gai.spec sources 
Removed Files:
	gai-0.5.0pre4.patch 
Log Message:
auto-import gai-0.5.8-0.fdr.2.2 on branch FC-2 from gai-0.5.8-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gai/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:21:05 -0000	1.2
+++ .cvsignore	2 Mar 2005 11:10:22 -0000	1.3
@@ -1 +1 @@
-gai-0.5.0pre4.tar.bz2
+gai-0.5.8.tar.bz2


Index: gai.spec
===================================================================
RCS file: /cvs/extras/rpms/gai/FC-2/gai.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gai.spec	8 Nov 2004 04:21:18 -0000	1.3
+++ gai.spec	2 Mar 2005 11:10:22 -0000	1.4
@@ -1,25 +1,22 @@
-%define prerelease pre4
-
 Name:		gai
-Version:	0.5.0
-Release:	0.fdr.0.4.%{prerelease}.2
+Version:	0.5.8
+Release:	0.fdr.2.2
 Epoch:		0
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://gai.sourceforge.net
-Source0:	http://download.sf.net/gai/gai-0.5.0pre4.tar.bz2
-Patch0:		gai-0.5.0pre4.patch
+Source0:	http://download.sf.net/gai/gai-0.5.8.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libgnomeui-devel, gtk2-devel >= 0:2.2, gnome-panel
+BuildRequires:	libgnomeui-devel, gtk2-devel >= 0:2.2, gnome-panel-devel
 
 %package	devel
 Summary:	Library and headers for Generic Applet Interface
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel, libgnomeui-devel
+Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel-devel, libgnomeui-devel
 
 %description
 This library provides a generic interface for developing applets for Gnome 2
@@ -35,8 +32,7 @@
 GAI applets.
 
 %prep
-%setup -q -n %{name}-%{version}%{prerelease}
-%patch0 -p1
+%setup -q
 
 %build
 %configure
@@ -65,6 +61,12 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Mon Nov 22 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-0.fdr.2
+- s/gnome-panel/gnome-panel-devel/g for FC2.
+
+* Sat Nov  6 2004 Michel Alexandre Salim <michel.salim at gmail.com> - 0.5.8-0.fdr.1
+- Updated to latest release
+
 * Fri Oct 31 2003 Michel Alexandre Salim <salimma[AT]users.sf.net> - 0.5.0-0.fdr.0.4.pre4
 - BuildRequires: gnome-panel added
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gai/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:21:05 -0000	1.2
+++ sources	2 Mar 2005 11:10:22 -0000	1.3
@@ -1 +1 @@
-264f153ab232b2c8284e3d3240b0046e  gai-0.5.0pre4.tar.bz2
+29d90cb37fe5341009b27ffd09f871cb  gai-0.5.8.tar.bz2


--- gai-0.5.0pre4.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar  2 11:11:22 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:11:22 -0500
Subject: rpms/gai-pal import.log,1.4,1.5
Message-ID: <200503021111.j22BBMWd009409@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai-pal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9400

Modified Files:
	import.log 
Log Message:
auto-import gai-pal-0.7-0.fdr.1.2 on branch FC-2 from gai-pal-0.7-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gai-pal/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	27 Feb 2005 05:29:08 -0000	1.4
+++ import.log	2 Mar 2005 11:11:20 -0000	1.5
@@ -1,3 +1,4 @@
 gai-pal-0_4-0_fdr_1_rh90:HEAD:gai-pal-0.4-0.fdr.1.rh90.src.rpm:1099887662
 gai-pal-0_4-0_fdr_1_1:HEAD:gai-pal-0.4-0.fdr.1.1.src.rpm:1099887668
 gai-pal-0_7-4:HEAD:gai-pal-0.7-4.src.rpm:1109482145
+gai-pal-0_7-0_fdr_1_2:FC-2:gai-pal-0.7-0.fdr.1.2.src.rpm:1109761886



From fedora-extras-commits at redhat.com  Wed Mar  2 11:11:22 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:11:22 -0500
Subject: rpms/gai-pal/FC-2 gai-pal.spec, 1.6, 1.7 gai-pal-0.7-typo.patch, 1.1,
	NONE gai-pal-0.7-xosd-empty-msg.patch, 1.1, NONE
Message-ID: <200503021111.j22BBM7W009413@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai-pal/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9400/FC-2

Modified Files:
	gai-pal.spec 
Removed Files:
	gai-pal-0.7-typo.patch gai-pal-0.7-xosd-empty-msg.patch 
Log Message:
auto-import gai-pal-0.7-0.fdr.1.2 on branch FC-2 from gai-pal-0.7-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: gai-pal.spec
===================================================================
RCS file: /cvs/extras/rpms/gai-pal/FC-2/gai-pal.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gai-pal.spec	27 Feb 2005 05:29:08 -0000	1.6
+++ gai-pal.spec	2 Mar 2005 11:11:20 -0000	1.7
@@ -1,31 +1,28 @@
+%define name gai-pal
+%define version 0.7
+%define release 0.fdr.1
 %define gaiver 0:0.5.8
 
 Summary:	GAI Pal applet
-Name:		gai-pal
-Version:	0.7
-Release:	4
+Name:		%{name}
+Version:	%{version}
+Release:	%{release}.2
 Epoch:		0
 Source0:	%{name}-%{version}.tar.bz2
-Patch0:		gai-pal-0.7-xosd-empty-msg.patch
-Patch1:		gai-pal-0.7-typo.patch
+#Patch0:		%{name}-%{version}.patch
 URL:		http://gai.sourceforge.net
 License:	GPL
 Group:		User Interface/Desktops
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gai-devel >= %{gaiver}
-BuildRequires:	xosd-devel
 
 %description
 A GAI applet, providing a friend that always has something wise
-or funny to say.
+or funny to say
 
 %prep
 %setup -q
-%patch -p1 -b .xosd-empty-msg
-%patch1 -p1 -b .typo
-%ifarch x86_64
-sed -i 's!/lib/!/%{_lib}/!' Makefile.in
-%endif
+#%patch0 -p1
 
 %build
 %configure
@@ -46,18 +43,6 @@
 %{_datadir}/pixmaps/*
 
 %changelog
-* Sun Feb 27 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7-4
-- BR xosd-devel
-- fix xosd crash if fortune program missing or message is empty
-- fix message in fortune preferences window
-- drop confusing usage of macros in NVR (fixes release tag!)
-
-* Sat Feb 26 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-3
-- a "sed -i 's!/lib/!/%%{_lib}/!' Makefile.in" fixes x86_64
-
-* Sat Nov  6 2004 Michel Alexandre Salim <salimma[AT]users.sourceforge.net> - 0.7-1
-- Updated to 0.7, require gai 0.5.8
-
 * Mon Oct 27 2003 Michel Alexandre Salim <salimma[AT]users.sourceforge.net> - 0.4-0.fdr.1
 - Updated to 0.4, require gai 0.5
 


--- gai-pal-0.7-typo.patch DELETED ---


--- gai-pal-0.7-xosd-empty-msg.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar  2 11:12:15 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:12:15 -0500
Subject: rpms/hping2 import.log,1.3,1.4
Message-ID: <200503021112.j22BCFdB009527@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import hping2-2.0.0-0.fdr.0.2.rc3.2 on branch FC-2 from hping2-2.0.0-0.fdr.0.2.rc3.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/hping2/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 04:32:58 -0000	1.3
+++ import.log	2 Mar 2005 11:12:13 -0000	1.4
@@ -1,2 +1,3 @@
 hping2-2_0_0-0_fdr_0_2_rc2_rh90:HEAD:hping2-2.0.0-0.fdr.0.2.rc2.rh90.src.rpm:1099888372
 hping2-2_0_0-0_fdr_0_2_rc2_1:HEAD:hping2-2.0.0-0.fdr.0.2.rc2.1.src.rpm:1099888378
+hping2-2_0_0-0_fdr_0_2_rc3_2:FC-2:hping2-2.0.0-0.fdr.0.2.rc3.2.src.rpm:1109761939



From fedora-extras-commits at redhat.com  Wed Mar  2 11:12:15 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:12:15 -0500
Subject: rpms/hping2/FC-2 hping2.spec,1.4,1.5 hping2-x86_64.patch,1.1,NONE
Message-ID: <200503021112.j22BCFHF009531@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/hping2/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9518/FC-2

Modified Files:
	hping2.spec 
Removed Files:
	hping2-x86_64.patch 
Log Message:
auto-import hping2-2.0.0-0.fdr.0.2.rc3.2 on branch FC-2 from hping2-2.0.0-0.fdr.0.2.rc3.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: hping2.spec
===================================================================
RCS file: /cvs/extras/rpms/hping2/FC-2/hping2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hping2.spec	13 Feb 2005 11:49:15 -0000	1.4
+++ hping2.spec	2 Mar 2005 11:12:13 -0000	1.5
@@ -1,6 +1,6 @@
 Name:    hping2
 Version: 2.0.0
-Release: 0.3.rc3
+Release: 0.fdr.0.2.rc3.2
 Epoch:   0 
 Summary: A software to do TCP/IP stack auditing and much more
 
@@ -9,7 +9,6 @@
 URL: http://www.hping.org/	
 Source0: http://www.hping.org/hping2.0.0-rc3.tar.gz
 Patch0: hping2-include.patch
-Patch1: hping2-x86_64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libpcap
 
@@ -22,7 +21,6 @@
 %prep
 %setup -q -n hping2-rc3
 %patch0 -p0
-%patch1 -p0
 
 %build
 %configure --force-libpcap
@@ -50,10 +48,7 @@
 %doc docs/HPING2-IS-OPEN docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt
 
 %changelog
-* Sun Feb 13 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 2.0.0-0.3.rc3
-- Add patch to fix build on x86_64
-
-* Wed Dec 08 2004 Adrian Reber <adrian at lisas.de> - 0:2.0.0-0.2.rc3
+* Wed Dec 08 2004 Adrian Reber <adrian at lisas.de> - 0:2.0.0-0.fdr.0.2.rc3
 - fixed compile bug (fedora.us bug #1700)
 - updated to 2.0.0-rc3
 - changed buildroot


--- hping2-x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar  2 11:13:13 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:13:13 -0500
Subject: rpms/libkexif import.log,1.3,1.4
Message-ID: <200503021113.j22BDDsG009631@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import libkexif-0.2.1-0.fdr.1.2 on branch FC-2 from libkexif-0.2.1-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libkexif/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	29 Jan 2005 23:32:25 -0000	1.3
+++ import.log	2 Mar 2005 11:13:11 -0000	1.4
@@ -1,2 +1,3 @@
 libkexif-0_1-2:HEAD:libkexif-0.1-2.src.rpm:1105560811
 libkexif-0_2_1-1:HEAD:libkexif-0.2.1-1.src.rpm:1107041539
+libkexif-0_2_1-0_fdr_1_2:FC-2:libkexif-0.2.1-0.fdr.1.2.src.rpm:1109761996



From fedora-extras-commits at redhat.com  Wed Mar  2 11:13:13 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:13:13 -0500
Subject: rpms/libkexif/FC-2 libkexif.spec,1.2,1.3
Message-ID: <200503021113.j22BDD56009634@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libkexif/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9621/FC-2

Modified Files:
	libkexif.spec 
Log Message:
auto-import libkexif-0.2.1-0.fdr.1.2 on branch FC-2 from libkexif-0.2.1-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: libkexif.spec
===================================================================
RCS file: /cvs/extras/rpms/libkexif/FC-2/libkexif.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libkexif.spec	29 Jan 2005 23:32:25 -0000	1.2
+++ libkexif.spec	2 Mar 2005 11:13:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libkexif
 Version:        0.2.1
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Allow Kipi plugins to extract EXIF information
 
@@ -71,7 +71,7 @@
 
 
 %changelog
-* Mon Jan 24 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.2.1-1
+* Mon Jan 24 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.2.1-0.fdr.1
 - version 0.2.1
 - update URL tag
 



From fedora-extras-commits at redhat.com  Wed Mar  2 11:13:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:13:57 -0500
Subject: rpms/libkipi import.log,1.2,1.3
Message-ID: <200503021113.j22BDv1R009737@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import libkipi-0.1-0.fdr.2.2 on branch FC-2 from libkipi-0.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libkipi/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Jan 2005 20:09:34 -0000	1.2
+++ import.log	2 Mar 2005 11:13:55 -0000	1.3
@@ -1 +1,2 @@
 libkipi-0_1-2:HEAD:libkipi-0.1-2.src.rpm:1105560609
+libkipi-0_1-0_fdr_2_2:FC-2:libkipi-0.1-0.fdr.2.2.src.rpm:1109762041



From fedora-extras-commits at redhat.com  Wed Mar  2 11:13:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:13:57 -0500
Subject: rpms/libkipi/FC-2 libkipi.spec,1.1,1.2
Message-ID: <200503021113.j22BDvvE009741@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libkipi/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9728/FC-2

Modified Files:
	libkipi.spec 
Log Message:
auto-import libkipi-0.1-0.fdr.2.2 on branch FC-2 from libkipi-0.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: libkipi.spec
===================================================================
RCS file: /cvs/extras/rpms/libkipi/FC-2/libkipi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libkipi.spec	12 Jan 2005 20:09:34 -0000	1.1
+++ libkipi.spec	2 Mar 2005 11:13:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libkipi
 Version:        0.1
-Release:        2
+Release:        0.fdr.2.2
 Epoch:          0
 Summary:        Common plugin infrastructure for KDE image applications
 
@@ -77,7 +77,7 @@
 
 
 %changelog
-* Wed Jan 05 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.1-2
+* Wed Jan 05 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.1-0.fdr.2
 - Fix libkipi-devel requirements
 - Reduce hicolor icon directory ownership bloat
 - Switch group "System Environment/Libraries"



From fedora-extras-commits at redhat.com  Wed Mar  2 11:14:41 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:14:41 -0500
Subject: rpms/mail-notification import.log,1.3,1.4
Message-ID: <200503021114.j22BEfWw009843@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/mail-notification
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9834

Modified Files:
	import.log 
Log Message:
auto-import mail-notification-1.0-0.fdr.1.2 on branch FC-2 from mail-notification-1.0-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Dec 2004 18:43:31 -0000	1.3
+++ import.log	2 Mar 2005 11:14:39 -0000	1.4
@@ -1,2 +1,3 @@
 mail-notification-0_99-0_fdr_1_2:HEAD:mail-notification-0.99-0.fdr.1.2.src.rpm:1102521310
 mail-notification-1_0-0_fdr_1_2:HEAD:mail-notification-1.0-0.fdr.1.2.src.rpm:1102531471
+mail-notification-1_0-0_fdr_1_2:FC-2:mail-notification-1.0-0.fdr.1.2.src.rpm:1109762084



From fedora-extras-commits at redhat.com  Wed Mar  2 11:14:41 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:14:41 -0500
Subject: rpms/mail-notification/FC-2 mail-notification.spec,1.3,1.4
Message-ID: <200503021114.j22BEf2G009848@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/mail-notification/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9834/FC-2

Modified Files:
	mail-notification.spec 
Log Message:
auto-import mail-notification-1.0-0.fdr.1.2 on branch FC-2 from mail-notification-1.0-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/FC-2/mail-notification.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mail-notification.spec	10 Dec 2004 22:03:07 -0000	1.3
+++ mail-notification.spec	2 Mar 2005 11:14:39 -0000	1.4
@@ -3,7 +3,7 @@
 Name:           mail-notification
 Epoch:          0
 Version:        1.0
-Release:        1
+Release:        0.fdr.1.2
 Summary:        Mail Notification is a status icon that informs you if you have new mail.
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 11:15:41 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:15:41 -0500
Subject: rpms/p0f import.log,1.3,1.4
Message-ID: <200503021115.j22BFfjv009958@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import p0f-2.0.5-0.fdr.1.2 on branch FC-2 from p0f-2.0.5-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/p0f/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 04:56:50 -0000	1.3
+++ import.log	2 Mar 2005 11:15:39 -0000	1.4
@@ -1,2 +1,3 @@
 p0f-2_0_2-0_fdr_1_rh90:HEAD:p0f-2.0.2-0.fdr.1.rh90.src.rpm:1099889791
 p0f-2_0_2-0_fdr_1_1:HEAD:p0f-2.0.2-0.fdr.1.1.src.rpm:1099889810
+p0f-2_0_5-0_fdr_1_2:FC-2:p0f-2.0.5-0.fdr.1.2.src.rpm:1109762144



From fedora-extras-commits at redhat.com  Wed Mar  2 11:15:41 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:15:41 -0500
Subject: rpms/p0f/FC-2 p0f.spec,1.3,1.4
Message-ID: <200503021115.j22BFfbt009962@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/p0f/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9948/FC-2

Modified Files:
	p0f.spec 
Log Message:
auto-import p0f-2.0.5-0.fdr.1.2 on branch FC-2 from p0f-2.0.5-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: p0f.spec
===================================================================
RCS file: /cvs/extras/rpms/p0f/FC-2/p0f.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- p0f.spec	2 Dec 2004 01:10:15 -0000	1.3
+++ p0f.spec	2 Mar 2005 11:15:39 -0000	1.4
@@ -1,6 +1,6 @@
 Name: p0f
 Version: 2.0.5
-Release: 1
+Release: 0.fdr.1.2
 Epoch:	0
 Summary: A versatile passive OS fingerprinting tool.
 Group: Applications/Internet
@@ -52,7 +52,7 @@
 %{_mandir}/man1/p0f.1.gz
 
 %changelog
-* Tue Oct 26 2004 Adrian Reber <adrian at lisas.de> - 0:2.0.5-1
+* Tue Oct 26 2004 Adrian Reber <adrian at lisas.de> - 0:2.0.5-0.fdr.1
 - updated to 2.0.5
 - fixed build on FC2
 - bring specfile up to date with current spec templates



From fedora-extras-commits at redhat.com  Wed Mar  2 11:16:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:16:57 -0500
Subject: rpms/showimg import.log,1.2,1.3
Message-ID: <200503021116.j22BGvQj010068@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import showimg-0.9.4.1-0.fdr.2.2 on branch FC-2 from showimg-0.9.4.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/showimg/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	29 Jan 2005 23:49:56 -0000	1.2
+++ import.log	2 Mar 2005 11:16:54 -0000	1.3
@@ -1 +1,2 @@
 showimg-0_9_4_1-2:HEAD:showimg-0.9.4.1-2.src.rpm:1107042589
+showimg-0_9_4_1-0_fdr_2_2:FC-2:showimg-0.9.4.1-0.fdr.2.2.src.rpm:1109762219



From fedora-extras-commits at redhat.com  Wed Mar  2 11:16:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:16:57 -0500
Subject: rpms/showimg/FC-2 showimg.spec,1.1,1.2
Message-ID: <200503021116.j22BGv8D010072@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/showimg/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10059/FC-2

Modified Files:
	showimg.spec 
Log Message:
auto-import showimg-0.9.4.1-0.fdr.2.2 on branch FC-2 from showimg-0.9.4.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-2/showimg.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- showimg.spec	29 Jan 2005 23:49:56 -0000	1.1
+++ showimg.spec	2 Mar 2005 11:16:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.4.1
-Release:        2
+Release:        0.fdr.2.2
 Epoch:          0
 Summary:        Feature-rich image viewer for KDE.
 
@@ -83,7 +83,7 @@
 
 
 %changelog
-* Mon Jan 24 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.9.4.1-2
+* Mon Jan 24 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.9.4.1-0.fdr.2
 - rebuild for libkexif 0.2.1
 
 * Thu Jan 20 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.9.4.1-0.fdr.1



From fedora-extras-commits at redhat.com  Wed Mar  2 11:17:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:17:49 -0500
Subject: rpms/sylpheed-claws import.log,1.5,1.6
Message-ID: <200503021117.j22BHns1010181@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed-claws
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10172

Modified Files:
	import.log 
Log Message:
auto-import sylpheed-claws-0.9.12-0.fdr.1.2 on branch FC-2 from sylpheed-claws-0.9.12-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	4 Dec 2004 12:37:30 -0000	1.5
+++ import.log	2 Mar 2005 11:17:47 -0000	1.6
@@ -2,3 +2,4 @@
 sylpheed-claws-0_9_8-0_fdr_1_1:HEAD:sylpheed-claws-0.9.8-0.fdr.1.1.src.rpm:1099891455
 sylpheed-claws-0_9_12-0_fdr_1_1:FC-1:sylpheed-claws-0.9.12-0.fdr.1.1.src.rpm:1102163686
 sylpheed-claws-0_9_12-0_fdr_1_rh90:RHL-9:sylpheed-claws-0.9.12-0.fdr.1.rh90.src.rpm:1102163738
+sylpheed-claws-0_9_12-0_fdr_1_2:FC-2:sylpheed-claws-0.9.12-0.fdr.1.2.src.rpm:1109762271



From fedora-extras-commits at redhat.com  Wed Mar  2 11:17:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:17:49 -0500
Subject: rpms/sylpheed-claws/FC-2 .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 sylpheed-claws.spec, 1.4, 1.5
Message-ID: <200503021117.j22BHnrG010185@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed-claws/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10172/FC-2

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
auto-import sylpheed-claws-0.9.12-0.fdr.1.2 on branch FC-2 from sylpheed-claws-0.9.12-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-2/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Feb 2005 12:41:13 -0000	1.3
+++ .cvsignore	2 Mar 2005 11:17:47 -0000	1.4
@@ -1 +1 @@
-sylpheed-claws-1.0.1.tar.bz2
+sylpheed-claws-0.9.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-2/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2005 12:41:14 -0000	1.4
+++ sources	2 Mar 2005 11:17:47 -0000	1.5
@@ -1 +1 @@
-c297d397f99d97234df787dca61aa48e  sylpheed-claws-1.0.1.tar.bz2
+798f25bb5dae7fd4959fbcb38868bef0  sylpheed-claws-0.9.12.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-2/sylpheed-claws.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sylpheed-claws.spec	13 Feb 2005 12:41:14 -0000	1.4
+++ sylpheed-claws.spec	2 Mar 2005 11:17:47 -0000	1.5
@@ -4,31 +4,29 @@
 %define         aspellver     %(rpm -q --qf "%%{version}" aspell)
 
 Name:           sylpheed-claws
-Version:        1.0.1
-Release:        1
+Version:        0.9.12
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.1.tar.bz2
+Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-0.9.12.tar.bz2
 Source1:        sylpheed.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  flex, bison
 BuildRequires:  glib-devel
 BuildRequires:  gtk+-devel
+BuildRequires:  flex, bison
+BuildRequires:  gdk-pixbuf-devel, imlib-devel
 BuildRequires:  compface
 BuildRequires:  openssl-devel
-BuildRequires:  openldap-devel
-BuildRequires:  aspell-devel
-BuildRequires:  pilot-link-devel
-BuildRequires:  gdk-pixbuf-devel
+BuildRequires:  gnupg >= 0:1.2.0, gpgme03-devel >= 0:0.3.10
 BuildRequires:  clamav-devel
-BuildRequires:  gnupg >= 0:1.2.1, gpgme03-devel >= 0:0.3.12
+BuildRequires:  pilot-link-devel
+BuildRequires:  openldap-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig
-Requires:  spamassassin
-Requires:  dillo
+BuildRequires:  aspell-devel
 
 Conflicts: sylpheed
 
@@ -60,10 +58,11 @@
 MY_OPENSSL_CFLAGS=`pkg-config openssl --cflags`
 %endif
 CFLAGS="${MY_OPENSSL_CFLAGS} ${RPM_OPT_FLAGS}" \
-%configure --enable-openssl --enable-ipv6 \
+%configure --enable-openssl --enable-ipv6 --enable-gpgme \
            --enable-ldap --enable-jpilot \
-           --enable-spamassassin-plugin \
-           --disable-mathml-viewer-plugin \
+           --enable-trayicon-plugin --enable-spamassassin-plugin \
+           --enable-clamav-plugin --enable-dillo-viewer-plugin \
+           --enable-demo-plugin \
 %if "%{aspellver}" >= "0.50"
 	   --enable-aspell \
 %endif
@@ -101,9 +100,9 @@
 
 %files -f sylpheed-claws.lang
 %defattr(-,root,root,-)
-%doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws COPYING
-%doc NEWS README README.claws RELEASE_NOTES.claws 
-%doc TODO
+%doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws ChangeLog.jp COPYING
+%doc NEWS README README.claws README.jp RELEASE_NOTES.claws 
+%doc TODO TODO.claws TODO.jp
 %{_bindir}/*
 %dir %{_libdir}/sylpheed-claws/
 %dir %{_libdir}/sylpheed-claws/plugins/
@@ -123,19 +122,8 @@
 # -----------------------------------------------------------------------------
 
 %changelog
-* Wed Feb 09 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0:1.0.1-1
-- version upgrade
-- cleaned up BuildRequires/Requires and configure options
-
-* Tue Dec 21 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0:0.9.13-1
-- version upgrade
-- remove old configure options for GnuPG support (moved to a new plugin now)
-- enable new pgpmime-plugin
-
 * Tue Jul 20 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0:0.9.12-1
+0:0.9.12-0.fdr.1
 - version upgrade
 - lots of s/sylpheed/sylpheed-claws/
 



From fedora-extras-commits at redhat.com  Wed Mar  2 11:18:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:18:38 -0500
Subject: rpms/Macaulay2 import.log,1.2,1.3
Message-ID: <200503021118.j22BIcde010290@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import Macaulay2-0.9.2-0.fdr.13.2 on branch FC-2 from Macaulay2-0.9.2-0.fdr.13.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Dec 2004 16:15:35 -0000	1.2
+++ import.log	2 Mar 2005 11:18:36 -0000	1.3
@@ -1 +1,2 @@
 Macaulay2-0_9_2-0_fdr_13_2:HEAD:Macaulay2-0.9.2-0.fdr.13.2.src.rpm:1102522594
+Macaulay2-0_9_2-0_fdr_13_2:FC-2:Macaulay2-0.9.2-0.fdr.13.2.src.rpm:1109762320



From fedora-extras-commits at redhat.com  Wed Mar  2 11:18:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:18:38 -0500
Subject: rpms/Macaulay2/FC-2 Macaulay2.spec,1.2,1.3
Message-ID: <200503021118.j22BIcjh010293@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/Macaulay2/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10280/FC-2

Modified Files:
	Macaulay2.spec 
Log Message:
auto-import Macaulay2-0.9.2-0.fdr.13.2 on branch FC-2 from Macaulay2-0.9.2-0.fdr.13.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/FC-2/Macaulay2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Macaulay2.spec	10 Dec 2004 22:03:01 -0000	1.2
+++ Macaulay2.spec	2 Mar 2005 11:18:36 -0000	1.3
@@ -4,7 +4,7 @@
 Name:    Macaulay2 
 Epoch:	 0
 Version: 0.9.2
-Release: 13%{?dist_tag}
+Release: 0.fdr.13%{?dist_tag}.2
 License: GPL 
 Group:   Applications/Engineering
 URL:	 http://www.math.uiuc.edu/Macaulay2/



From fedora-extras-commits at redhat.com  Wed Mar  2 18:40:37 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 13:40:37 -0500
Subject: devel/grip grip.spec,1.2,1.3
Message-ID: <200503021840.j22IebVk016660@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/grip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16654

Modified Files:
	grip.spec 
Log Message:
* fixed "Source"
* removed some spaces
* updated changelog



Index: grip.spec
===================================================================
RCS file: /cvs/extras/devel/grip/grip.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grip.spec	2 Mar 2005 09:22:01 -0000	1.2
+++ grip.spec	2 Mar 2005 18:40:35 -0000	1.3
@@ -5,7 +5,7 @@
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
-Source: http://www.nostatic/grip/grip-%{version}.tar.gz
+Source: http://dl.sf.net/grip/grip-%{version}.tar.gz
 Patch1: grip-3.2.0-default.patch
 URL: http://www.nostatic.org/grip/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,8 +17,8 @@
 
 %description
 Grip is a GTK+ based front-end for CD rippers (such as cdparanoia and
-cdda2wav) and Ogg Vorbis encoders.  Grip allows you to rip entire tracks or
-just a section of a track.  Grip supports the CDDB protocol for
+cdda2wav) and Ogg Vorbis encoders. Grip allows you to rip entire tracks or
+just a section of a track. Grip supports the CDDB protocol for
 accessing track information on disc database servers.
 
 %prep
@@ -82,7 +82,8 @@
 - use %%{_smp_mflags}
 - changed .desktop file creation and installation
 - removed INSTALL and NEWS from %%doc
-- delete changelog entries older than 2004
+- deleted changelog entries older than 2004
+- changed Source line to be valid
 
 * Fri Oct  8 2004 Bill Nottingham <notting at redhat.com> 3.2.0-3
 - add a passel of buildreqs (#135045)



From fedora-extras-commits at redhat.com  Wed Mar  2 19:05:17 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 2 Mar 2005 14:05:17 -0500
Subject: rpms/revelation/FC-3 .cvsignore, 1.3, 1.4 revelation.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200503021905.j22J5H4M017426@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	.cvsignore revelation.spec sources 
Log Message:
Update to 0.4.0; heavy changes on BR and Req, use shared-mime-info and desktop-file-utils; x86_64 suboptimal for now, but working


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/revelation/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:17:52 -0000	1.3
+++ .cvsignore	2 Mar 2005 19:05:15 -0000	1.4
@@ -1 +1 @@
-revelation-0.3.4.tar.bz2
+revelation-0.4.0.tar.bz2


Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/FC-3/revelation.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- revelation.spec	10 Dec 2004 22:03:10 -0000	1.3
+++ revelation.spec	2 Mar 2005 19:05:15 -0000	1.4
@@ -1,30 +1,32 @@
-%define pyver %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")
 %{!?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)")}
 
 Summary:	Password manager for GNOME 2
 Name: 		revelation
-Version: 	0.3.4
+Version: 	0.4.0
 Epoch: 		0
 Release: 	1
 License: 	GPL
 Group: 		Applications/Productivity
-Source: 	ftp://oss.codepoet.no/revelation/revelation-0.3.4.tar.bz2
+Source: 	ftp://oss.codepoet.no/revelation/revelation-0.4.0.tar.bz2
 URL: 		http://oss.codepoet.no/revelation/
+Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	python-crypto >= 0:2.0
-Requires:	gtk2 >= 0:2.2
-Requires:	pygtk2 >= 0:2.2
-Requires:	gnome-python2 >= 0:2.0
+Requires:	pygtk2 >= 0:2.4
 Requires:	gnome-python2-gconf >= 0:2.0
-Requires:       python-abi = %{pyver}
+Requires:	gnome-python2-gnomevfs >= 0:2.6
 BuildRequires:  python >= 0:2.2
-BuildRequires:  python-devel >= 0:2.2
+BuildRequires:  python-devel >= 0:2.3
+BuildRequires:  pygtk2-devel >= 0:2.4
 BuildRequires:	gnome-python2-gconf >= 0:2.0
-BuildRequires:  desktop-file-utils
+BuildRequires:	libgnomeui-devel >= 0:2.8
+BuildRequires:	gnome-keyring-devel >= 0:0.4.0
+BuildRequires:	desktop-file-utils 
+BuildRequires:	python-crypto >= 0:2.0
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n)
-Requires(post):	GConf2
-Requires(preun):GConf2
-BuildArch:      noarch
+Requires(post):	 GConf2 shared-mime-info desktop-file-utils
+Requires(preun): GConf2
+Requires(postun):shared-mime-info desktop-file-utils
 
 %description
 Revelation is a password manager. It organizes accounts in
@@ -34,13 +36,14 @@
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%configure --disable-desktop-update --disable-mime-update 
+make %{?_smp_mflags}
+
 
 %install
 %{__rm} -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
   --vendor fedora \
@@ -53,12 +56,17 @@
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCES
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
  
 %preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCES
+
+%postun
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean
@@ -71,18 +79,34 @@
 %config %{_sysconfdir}/gconf/schemas/*.schemas
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*.png
 %{_datadir}/revelation/
+%{_datadir}/icons/hicolor/??x??/mimetypes/gnome-mime-application-x-revelation.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+#dir %{python_sitearch}/revelation/
+# the next entry should be python_sitearch, but the packages currently does it 
+# wrong on install and during execution. So leave it in {python_sitelib} for now
+%{python_sitelib}/revelation/authmanager.so
+%dir %{python_sitelib}/revelation/
+%dir %{python_sitelib}/revelation/datahandler/
+%{_datadir}/mime/packages/*
 %{python_sitelib}/revelation/*.py
 %{python_sitelib}/revelation/*.pyc
-%ghost %{python_sitelib}/revelation/*.pyo                                                                                             
+%ghost %{python_sitelib}/revelation/*.pyo
 %{python_sitelib}/revelation/datahandler/*.py
 %{python_sitelib}/revelation/datahandler/*.pyc
-%ghost %{python_sitelib}/revelation/datahandler/*.pyo                                                                                             
-%dir %{python_sitelib}/revelation/
-%dir %{python_sitelib}/revelation/datahandler/
+%ghost %{python_sitelib}/revelation/datahandler/*.pyo
 
 %changelog
+* Tue Mar 01 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.0-1
+- Update to 0.4.0 - depends on gtk 2.4 now
+- Uses configure now
+- add BR pygtk2-devel gnome-keyring-devel
+- use shared-mime-info and desktop-file-utils
+- Remove unneeded explicit Requires 
+- not a noarch package anymore
+- on x86_64 it currently installs and needs authmanager.so in %%{python_sitelib}
+  will report upstream
+
 * Wed Sep 29 2004 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.3.4-0.fdr.1
 - Update to 0.3.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/revelation/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:17:52 -0000	1.3
+++ sources	2 Mar 2005 19:05:15 -0000	1.4
@@ -1 +1 @@
-1b5d3b02bf5cce6568082c39cf74f9e6  revelation-0.3.4.tar.bz2
+d00dd223a1c35472e573fb11d758cd98  revelation-0.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar  2 19:05:17 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 2 Mar 2005 14:05:17 -0500
Subject: rpms/revelation/devel .cvsignore, 1.3, 1.4 revelation.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200503021905.j22J5HP8017432@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	.cvsignore revelation.spec sources 
Log Message:
Update to 0.4.0; heavy changes on BR and Req, use shared-mime-info and desktop-file-utils; x86_64 suboptimal for now, but working


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:17:52 -0000	1.3
+++ .cvsignore	2 Mar 2005 19:05:15 -0000	1.4
@@ -1 +1 @@
-revelation-0.3.4.tar.bz2
+revelation-0.4.0.tar.bz2


Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- revelation.spec	28 Feb 2005 21:12:57 -0000	1.4
+++ revelation.spec	2 Mar 2005 19:05:15 -0000	1.5
@@ -1,30 +1,32 @@
-%define pyver %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")
 %{!?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)")}
 
 Summary:	Password manager for GNOME 2
 Name: 		revelation
-Version: 	0.3.4
+Version: 	0.4.0
 Epoch: 		0
 Release: 	1
 License: 	GPL
 Group: 		Applications/Productivity
-Source: 	ftp://oss.codepoet.no/revelation/revelation-0.3.4.tar.bz2
+Source: 	ftp://oss.codepoet.no/revelation/revelation-0.4.0.tar.bz2
 URL: 		http://oss.codepoet.no/revelation/
+Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	python-crypto >= 0:2.0
-Requires:	gtk2 >= 0:2.2
-Requires:	pygtk2 >= 0:2.2
-Requires:	gnome-python2 >= 0:2.0
+Requires:	pygtk2 >= 0:2.4
 Requires:	gnome-python2-gconf >= 0:2.0
-Requires:       python-abi = %{pyver}
+Requires:	gnome-python2-gnomevfs >= 0:2.6
 BuildRequires:  python >= 0:2.2
-BuildRequires:  python-devel >= 0:2.2
+BuildRequires:  python-devel >= 0:2.3
+BuildRequires:  pygtk2-devel >= 0:2.4
 BuildRequires:	gnome-python2-gconf >= 0:2.0
-BuildRequires:  desktop-file-utils
+BuildRequires:	libgnomeui-devel >= 0:2.8
+BuildRequires:	gnome-keyring-devel >= 0:0.4.0
+BuildRequires:	desktop-file-utils 
+BuildRequires:	python-crypto >= 0:2.0
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n)
-Requires(post):	GConf2
-Requires(preun):GConf2
-BuildArch:      noarch
+Requires(post):	 GConf2 shared-mime-info desktop-file-utils
+Requires(preun): GConf2
+Requires(postun):shared-mime-info desktop-file-utils
 
 %description
 Revelation is a password manager. It organizes accounts in
@@ -34,13 +36,14 @@
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%configure --disable-desktop-update --disable-mime-update 
+make %{?_smp_mflags}
+
 
 %install
 %{__rm} -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
   --vendor fedora \
@@ -53,12 +56,17 @@
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCES
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
  
 %preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCES
+
+%postun
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean
@@ -71,18 +79,34 @@
 %config %{_sysconfdir}/gconf/schemas/*.schemas
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*.png
 %{_datadir}/revelation/
+%{_datadir}/icons/hicolor/??x??/mimetypes/gnome-mime-application-x-revelation.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+#dir %{python_sitearch}/revelation/
+# the next entry should be python_sitearch, but the packages currently does it 
+# wrong on install and during execution. So leave it in {python_sitelib} for now
+%{python_sitelib}/revelation/authmanager.so
+%dir %{python_sitelib}/revelation/
+%dir %{python_sitelib}/revelation/datahandler/
+%{_datadir}/mime/packages/*
 %{python_sitelib}/revelation/*.py
 %{python_sitelib}/revelation/*.pyc
 %ghost %{python_sitelib}/revelation/*.pyo
 %{python_sitelib}/revelation/datahandler/*.py
 %{python_sitelib}/revelation/datahandler/*.pyc
 %ghost %{python_sitelib}/revelation/datahandler/*.pyo
-%dir %{python_sitelib}/revelation/
-%dir %{python_sitelib}/revelation/datahandler/
 
 %changelog
+* Tue Mar 01 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.0-1
+- Update to 0.4.0 - depends on gtk 2.4 now
+- Uses configure now
+- add BR pygtk2-devel gnome-keyring-devel
+- use shared-mime-info and desktop-file-utils
+- Remove unneeded explicit Requires 
+- not a noarch package anymore
+- on x86_64 it currently installs and needs authmanager.so in %%{python_sitelib}
+  will report upstream
+
 * Wed Sep 29 2004 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.3.4-0.fdr.1
 - Update to 0.3.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:17:52 -0000	1.3
+++ sources	2 Mar 2005 19:05:15 -0000	1.4
@@ -1 +1 @@
-1b5d3b02bf5cce6568082c39cf74f9e6  revelation-0.3.4.tar.bz2
+d00dd223a1c35472e573fb11d758cd98  revelation-0.4.0.tar.bz2



From ville.skytta at iki.fi  Wed Mar  2 19:34:42 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Wed, 02 Mar 2005 21:34:42 +0200
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011704210.12801@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<1109706413.15077.126.camel@bobcat.mine.nu>
	<Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
	<1109713442.15077.181.camel@bobcat.mine.nu>
	<Pine.LNX.4.61.0503011704210.12801@alien.devel.redhat.com>
Message-ID: <1109792082.15077.236.camel@bobcat.mine.nu>

On Tue, 2005-03-01 at 17:06 -0500, Cristian Gafton wrote:

> For things like RHL-9 and FC-1 and whatnot, "devel/" might be too 
> comples/advanced/whatever. subsequent cvs-imports into those branches will 
> clear things out, so this is only a matter of pedantery as far as choosing 
> the initial branch point.

Right, got it.  Thanks again for creating the branches.



From fedora-extras-commits at redhat.com  Wed Mar  2 20:42:20 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 15:42:20 -0500
Subject: common Makefile,1.1,1.2
Message-ID: <200503022042.j22KgK1k018480@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18461/common

Modified Files:
	Makefile 
Log Message:


Test commit.



Index: Makefile
===================================================================
RCS file: /cvs/extras/common/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	24 Nov 2004 02:55:45 -0000	1.1
+++ Makefile	2 Mar 2005 20:42:18 -0000	1.2
@@ -1,4 +1,4 @@
-# lame duck Makefile that exists for the sole purpose of "make clean"
+# lame duck Makefile that exists for the sole purpose of "make clean" 
 
 all:
 



From fedora-extras-commits at redhat.com  Wed Mar  2 20:42:20 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 15:42:20 -0500
Subject: rpms/lft/devel lft.spec,1.6,1.7
Message-ID: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	lft.spec 
Log Message:


Test commit.



Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lft.spec	15 Jan 2005 11:10:43 -0000	1.6
+++ lft.spec	2 Mar 2005 20:42:18 -0000	1.7
@@ -1,7 +1,6 @@
 Name:           lft
 Version:        2.3
 Release:        1
-Epoch:          0
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 20:54:27 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 15:54:27 -0500
Subject: common Makefile,1.2,1.3
Message-ID: <200503022054.j22KsRNk018636@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18604/common

Modified Files:
	Makefile 
Log Message:
testing 123


Index: Makefile
===================================================================
RCS file: /cvs/extras/common/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	2 Mar 2005 20:42:18 -0000	1.2
+++ Makefile	2 Mar 2005 20:54:25 -0000	1.3
@@ -1,4 +1,4 @@
-# lame duck Makefile that exists for the sole purpose of "make clean" 
+# lame duck Makefile that exists for the sole purpose of "make clean"
 
 all:
 



From fedora-extras-commits at redhat.com  Wed Mar  2 20:54:28 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 15:54:28 -0500
Subject: rpms/lft/devel lft.spec,1.7,1.8
Message-ID: <200503022054.j22KsSKC018641@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	lft.spec 
Log Message:
testing 123


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lft.spec	2 Mar 2005 20:42:18 -0000	1.7
+++ lft.spec	2 Mar 2005 20:54:25 -0000	1.8
@@ -15,7 +15,7 @@
 Obsoletes:      fft
 
 %description
-LFT, short for Layer Four Traceroute, is a sort of 'traceroute' that
+LFT, short for Layer Four Traceroute, is a 'traceroute' utility that
 often works much faster (than the commonly-used Van Jacobson method)
 and goes through many configurations of packet-filter based
 firewalls. More importantly, LFT implements numerous other features



From ville.skytta at iki.fi  Wed Mar  2 20:57:24 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Wed, 02 Mar 2005 22:57:24 +0200
Subject: rpms/lft/devel lft.spec,1.6,1.7
In-Reply-To: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
Message-ID: <1109797044.15077.271.camel@bobcat.mine.nu>

On Wed, 2005-03-02 at 15:42 -0500, Elliot Lee wrote:

> Test commit.
[...]
> @@ -1,7 +1,6 @@
>  Name:           lft
>  Version:        2.3
>  Release:        1
> -Epoch:          0

Removal of "Epoch: 0" will break "rpm -F" updating from earlier
revisions, please revert.

https://bugzilla.redhat.com/beta/show_bug.cgi?id=143301
https://www.redhat.com/archives/fedora-packaging/2005-February/msg00134.html



From fedora-extras-commits at redhat.com  Wed Mar  2 20:59:23 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 15:59:23 -0500
Subject: rpms/lft/FC-2 lft.spec,1.4,1.5
Message-ID: <200503022059.j22KxNJH018753@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/lft/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18726/FC-2

Modified Files:
	lft.spec 
Log Message:
Testing again


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/FC-2/lft.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lft.spec	8 Nov 2004 04:41:18 -0000	1.4
+++ lft.spec	2 Mar 2005 20:59:21 -0000	1.5
@@ -1,7 +1,6 @@
 Name:           lft
 Version:        2.2
 Release:        0.fdr.2.2
-Epoch:          0
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 20:59:23 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 15:59:23 -0500
Subject: rpms/lft/FC-3 lft.spec,1.6,1.7
Message-ID: <200503022059.j22KxNaX018757@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	lft.spec 
Log Message:
Testing again


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/FC-3/lft.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lft.spec	15 Jan 2005 11:10:43 -0000	1.6
+++ lft.spec	2 Mar 2005 20:59:21 -0000	1.7
@@ -1,7 +1,6 @@
 Name:           lft
 Version:        2.3
 Release:        1
-Epoch:          0
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 21:21:07 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:21:07 -0500
Subject: rpms/lft/devel lft.spec,1.8,1.9
Message-ID: <200503022121.j22LL7Bd019614@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	lft.spec 
Log Message:
I have proved that people read commits list! Another excuse to test the log script.


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lft.spec	2 Mar 2005 20:54:25 -0000	1.8
+++ lft.spec	2 Mar 2005 21:21:05 -0000	1.9
@@ -1,6 +1,7 @@
 Name:           lft
 Version:        2.3
 Release:        1
+Epoch:		0
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 21:21:07 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:21:07 -0500
Subject: rpms/zope/FC-3 zope.spec,1.2,1.3
Message-ID: <200503022121.j22LL7qa019618@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	zope.spec 
Log Message:
I have proved that people read commits list! Another excuse to test the log script.


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/zope.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zope.spec	29 Jan 2005 22:57:17 -0000	1.2
+++ zope.spec	2 Mar 2005 21:21:05 -0000	1.3
@@ -14,6 +14,7 @@
 Summary: Web application server for flexible content management applications
 Version: 2.7.4
 Release: 1
+Epoch:	 0
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:	 http://www.zope.org/



From fedora-extras-commits at redhat.com  Wed Mar  2 21:21:07 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:21:07 -0500
Subject: rpms/lft/FC-3 lft.spec,1.7,1.8
Message-ID: <200503022121.j22LL7cC019609@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	lft.spec 
Log Message:
I have proved that people read commits list! Another excuse to test the log script.


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/FC-3/lft.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lft.spec	2 Mar 2005 20:59:21 -0000	1.7
+++ lft.spec	2 Mar 2005 21:21:04 -0000	1.8
@@ -1,6 +1,7 @@
 Name:           lft
 Version:        2.3
 Release:        1
+Epoch:		0
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 21:21:06 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:21:06 -0500
Subject: rpms/lft/FC-2 lft.spec,1.5,1.6
Message-ID: <200503022121.j22LL69B019606@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/lft/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19571/lft/FC-2

Modified Files:
	lft.spec 
Log Message:
I have proved that people read commits list! Another excuse to test the log script.


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/FC-2/lft.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lft.spec	2 Mar 2005 20:59:21 -0000	1.5
+++ lft.spec	2 Mar 2005 21:21:04 -0000	1.6
@@ -1,6 +1,7 @@
 Name:           lft
 Version:        2.2
 Release:        0.fdr.2.2
+Epoch:		0
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 21:21:07 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:21:07 -0500
Subject: rpms/zope/devel zope.spec,1.2,1.3
Message-ID: <200503022121.j22LL7co019621@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	zope.spec 
Log Message:
I have proved that people read commits list! Another excuse to test the log script.


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zope.spec	29 Jan 2005 22:57:17 -0000	1.2
+++ zope.spec	2 Mar 2005 21:21:05 -0000	1.3
@@ -14,6 +14,7 @@
 Summary: Web application server for flexible content management applications
 Version: 2.7.4
 Release: 1
+Epoch:	 0
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:	 http://www.zope.org/



From fedora-extras-commits at redhat.com  Wed Mar  2 21:27:39 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:27:39 -0500
Subject: rpms/lft/FC-3 lft.spec,1.8,1.9
Message-ID: <200503022127.j22LRdwt019800@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	lft.spec 
Log Message:
another test


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/FC-3/lft.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lft.spec	2 Mar 2005 21:21:04 -0000	1.8
+++ lft.spec	2 Mar 2005 21:27:35 -0000	1.9
@@ -1,3 +1,4 @@
+# Layer Four Traceroute
 Name:           lft
 Version:        2.3
 Release:        1



From fedora-extras-commits at redhat.com  Wed Mar  2 21:27:39 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:27:39 -0500
Subject: rpms/lft/devel lft.spec,1.9,1.10
Message-ID: <200503022127.j22LRdOW019803@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	lft.spec 
Log Message:
another test


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lft.spec	2 Mar 2005 21:21:05 -0000	1.9
+++ lft.spec	2 Mar 2005 21:27:36 -0000	1.10
@@ -1,3 +1,4 @@
+# lft = Layer Four Traceroute
 Name:           lft
 Version:        2.3
 Release:        1



From fedora-extras-commits at redhat.com  Wed Mar  2 21:27:39 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:27:39 -0500
Subject: rpms/zope/devel zope.spec,1.3,1.4
Message-ID: <200503022127.j22LRdJK019806@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	zope.spec 
Log Message:
another test


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zope.spec	2 Mar 2005 21:21:05 -0000	1.3
+++ zope.spec	2 Mar 2005 21:27:36 -0000	1.4
@@ -1,3 +1,5 @@
+# Zope application server
+
 %define python_minver 2.3.3
 
 %define zope_user      zope



From fedora-extras-commits at redhat.com  Wed Mar  2 21:36:07 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:36:07 -0500
Subject: rpms/zope/devel zope.spec,1.4,1.5
Message-ID: <200503022136.j22La7Rp020027@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	zope.spec 
Log Message:
yet another test 25930


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zope.spec	2 Mar 2005 21:27:36 -0000	1.4
+++ zope.spec	2 Mar 2005 21:36:05 -0000	1.5
@@ -1,5 +1,3 @@
-# Zope application server
-
 %define python_minver 2.3.3
 
 %define zope_user      zope



From fedora-extras-commits at redhat.com  Wed Mar  2 21:36:07 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:36:07 -0500
Subject: rpms/lft/devel lft.spec,1.10,1.11
Message-ID: <200503022136.j22La7Qr020023@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	lft.spec 
Log Message:
yet another test 25930


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lft.spec	2 Mar 2005 21:27:36 -0000	1.10
+++ lft.spec	2 Mar 2005 21:36:05 -0000	1.11
@@ -1,4 +1,3 @@
-# lft = Layer Four Traceroute
 Name:           lft
 Version:        2.3
 Release:        1



From fedora-extras-commits at redhat.com  Wed Mar  2 21:36:07 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:36:07 -0500
Subject: rpms/lft/FC-3 lft.spec,1.9,1.10
Message-ID: <200503022136.j22La792020019@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	lft.spec 
Log Message:
yet another test 25930


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/FC-3/lft.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lft.spec	2 Mar 2005 21:27:35 -0000	1.9
+++ lft.spec	2 Mar 2005 21:36:05 -0000	1.10
@@ -1,4 +1,3 @@
-# Layer Four Traceroute
 Name:           lft
 Version:        2.3
 Release:        1



From fedora-extras-commits at redhat.com  Wed Mar  2 21:39:59 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:39:59 -0500
Subject: rpms/lft/devel lft.spec,1.11,1.12
Message-ID: <200503022139.j22Ldxt6020164@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	lft.spec 
Log Message:
the final test?


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lft.spec	2 Mar 2005 21:36:05 -0000	1.11
+++ lft.spec	2 Mar 2005 21:39:57 -0000	1.12
@@ -1,7 +1,7 @@
 Name:           lft
+Epoch:		0
 Version:        2.3
 Release:        1
-Epoch:		0
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 21:39:59 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:39:59 -0500
Subject: rpms/zope/devel zope.spec,1.5,1.6
Message-ID: <200503022139.j22Ldx1a020168@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	zope.spec 
Log Message:
the final test?


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- zope.spec	2 Mar 2005 21:36:05 -0000	1.5
+++ zope.spec	2 Mar 2005 21:39:57 -0000	1.6
@@ -12,9 +12,9 @@
 
 Name: 	 zope
 Summary: Web application server for flexible content management applications
+Epoch:	 0
 Version: 2.7.4
 Release: 1
-Epoch:	 0
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:	 http://www.zope.org/



From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net  Wed Mar  2 22:53:25 2005
From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou)
Date: Wed, 2 Mar 2005 23:53:25 +0100
Subject: rpms/lft/devel lft.spec,1.6,1.7
In-Reply-To: <1109797044.15077.271.camel@bobcat.mine.nu>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
Message-ID: <20050302235325.2fc6a141@python2>

Ville Skytt? wrote :

> On Wed, 2005-03-02 at 15:42 -0500, Elliot Lee wrote:
> 
> > Test commit.
> [...]
> > @@ -1,7 +1,6 @@
> >  Name:           lft
> >  Version:        2.3
> >  Release:        1
> > -Epoch:          0
> 
> Removal of "Epoch: 0" will break "rpm -F" updating from earlier
> revisions, please revert.
> 
> https://bugzilla.redhat.com/beta/show_bug.cgi?id=143301
>
https://www.redhat.com/archives/fedora-packaging/2005-February/msg00134.html

Grrr... still, we seemed to have agreed to remove all zero epochs before
FC3 Extras build... but you and Michael seem to have opposed it enough...
now we're still stuck with issues... is this _never_ going to end? :-(

Matthias

-- 
Clean custom Red Hat Linux rpm packages : http://freshrpms.net/
Fedora Core release 3 (Heidelberg) - Linux kernel 2.6.10-1.770_FC3
Load : 0.18 0.72 1.00



From gafton at redhat.com  Wed Mar  2 23:15:16 2005
From: gafton at redhat.com (Cristian Gafton)
Date: Wed, 2 Mar 2005 18:15:16 -0500 (EST)
Subject: rpms/lft/devel lft.spec,1.6,1.7
In-Reply-To: <20050302235325.2fc6a141@python2>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
Message-ID: <Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>

On Wed, 2 Mar 2005, Matthias Saou wrote:

> Grrr... still, we seemed to have agreed to remove all zero epochs before
> FC3 Extras build... but you and Michael seem to have opposed it enough...
> now we're still stuck with issues... is this _never_ going to end? :-(

Frankly I could not give a damn about the fact that we break Freshen - 
these things are fed through yum from a yum repository, so I really
don't care that rpm -F might fail in some weird conditions.

Epoch: 0 is stupid, useless and moronic.

Cristian
-- 
----------------------------------------------------------------------
Cristian Gafton     --     gafton at redhat.com      --     Red Hat, Inc.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"Linux is a leprosy; and is having a deleterious effect on the U.S. IT
industry because it is steadily depreciating the value of the software
industry sector."
     -- Kenneth Brown, President, Alexis de Tocqueville Institution



From dgregor at redhat.com  Tue Mar  1 21:21:32 2005
From: dgregor at redhat.com (Dennis Gregorovic)
Date: Tue, 01 Mar 2005 16:21:32 -0500
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<1109706413.15077.126.camel@bobcat.mine.nu>
	<Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
Message-ID: <1109712093.24822.78.camel@localhost.localdomain>

I don't have write access to that page, but I would appreciate it if an
FC-3 branch could be created for perl-Class-MethodMaker.

-- Dennis

On Tue, 2005-03-01 at 16:09 -0500, Cristian Gafton wrote:
> On Tue, 1 Mar 2005, Ville [ISO-8859-1] Skytt wrote:
> 
> >> For now, please use cvs-import to import the new packages and once the
> >> import is done ask on this list for a branch to be created for your new
> >> import. We'll wade through this manual process until I adapt the scripts.
> >
> > Related: there's a pretty long list at
> > http://fedoraproject.org/wiki/Extras_2fCVSSyncNeeded , but all of those
> > are (for now) for < FC3 fedora.us updates, as far as I can tell.  These
> > can probably wait at least until the script can take care of things.
> 
> I can create the branches for all those. I assume that if the branch 
> source is devel/ everything would be fine?
> 
> Cristian
> -- 
> ----------------------------------------------------------------------
> Cristian Gafton     --     gafton at redhat.com      --     Red Hat, Inc.
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> "Linux is a leprosy; and is having a deleterious effect on the U.S. IT
> industry because it is steadily depreciating the value of the software
> industry sector."
>      -- Kenneth Brown, President, Alexis de Tocqueville Institution
> -- fedora-extras-commits mailing list fedora-extras-commits at redhat.com http://www.redhat.com/mailman/listinfo/fedora-extras-commits



From dag at wieers.com  Wed Mar  2 23:17:33 2005
From: dag at wieers.com (Dag Wieers)
Date: Thu, 3 Mar 2005 00:17:33 +0100 (CET)
Subject: rpms/lft/devel lft.spec,1.6,1.7
In-Reply-To: <Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
Message-ID: <Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>

On Wed, 2 Mar 2005, Cristian Gafton wrote:

> On Wed, 2 Mar 2005, Matthias Saou wrote:
> 
> > Grrr... still, we seemed to have agreed to remove all zero epochs before
> > FC3 Extras build... but you and Michael seem to have opposed it enough...
> > now we're still stuck with issues... is this _never_ going to end? :-(
> 
> Frankly I could not give a damn about the fact that we break Freshen - these
> things are fed through yum from a yum repository, so I really
> don't care that rpm -F might fail in some weird conditions.
> 
> Epoch: 0 is stupid, useless and moronic.

Where were you 2 years ago ? We needed you back then :)

--   dag wieers,  dag at wieers.com,  http://dag.wieers.com/   --
[all I want is a warm bed and a kind word and unlimited power]



From bugs.michael at gmx.net  Thu Mar  3 09:00:00 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 10:00:00 +0100
Subject: rpms/lft/devel lft.spec,1.6,1.7
In-Reply-To: <Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
Message-ID: <20050303100000.2268863a.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 00:17:33 +0100 (CET), Dag Wieers wrote:

> On Wed, 2 Mar 2005, Cristian Gafton wrote:
> 
> > On Wed, 2 Mar 2005, Matthias Saou wrote:
> > 
> > > Grrr... still, we seemed to have agreed to remove all zero epochs before
> > > FC3 Extras build... but you and Michael seem to have opposed it enough...
> > > now we're still stuck with issues... is this _never_ going to end? :-(

No, it's never going to end, because attempts at removing zero epochs have
been half-hearted so far. We sort of agreed on removing them, but package
owners was given enough freedom to choose whether to keep them. And with
the added -Fvh breakage, the topic died. Also, explicit epochs in
BuildRequires and Requires are still used, too.  

The Epoch indecision is going to end finally if somebody said: "Remove all
explicit zero epochs from CVS till March, 14th" or so. Then we all remove
them, and it won't be just individuals who break rpm -Fvh or who upset
users, who rebuild packages for older platforms and old RPM releases.

> > Frankly I could not give a damn about the fact that we break Freshen - these
> > things are fed through yum from a yum repository, so I really
> > don't care that rpm -F might fail in some weird conditions.
> > 
> > Epoch: 0 is stupid, useless and moronic.
> 
> Where were you 2 years ago ? We needed you back then :)

Two years ago, explicit Epoch 0 made sense.

Nowadays, the supported versions of RPM no longer require it.

-- 
Fedora Core release 3 (Heidelberg) - Linux 2.6.10-1.770_FC3
loadavg: 0.10 0.06 0.09



From dag at wieers.com  Thu Mar  3 12:17:44 2005
From: dag at wieers.com (Dag Wieers)
Date: Thu, 3 Mar 2005 13:17:44 +0100 (CET)
Subject: rpms/lft/devel lft.spec,1.6,1.7
In-Reply-To: <20050303100000.2268863a.bugs.michael@gmx.net>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
Message-ID: <Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>

On Thu, 3 Mar 2005, Michael Schwendt wrote:

> On Thu, 3 Mar 2005 00:17:33 +0100 (CET), Dag Wieers wrote:
> 
> > On Wed, 2 Mar 2005, Cristian Gafton wrote:
> > 
> > > Frankly I could not give a damn about the fact that we break Freshen - these
> > > things are fed through yum from a yum repository, so I really
> > > don't care that rpm -F might fail in some weird conditions.
> > > 
> > > Epoch: 0 is stupid, useless and moronic.
> > 
> > Where were you 2 years ago ? We needed you back then :)
> 
> Two years ago, explicit Epoch 0 made sense.
> 
> Nowadays, the supported versions of RPM no longer require it.

Explicit Epoch 0 never made sense, we never required it for anything, Red 
Hat never required it and JBJ admits he was misquoted on the subject.

But please do include your line of thought.

--   dag wieers,  dag at wieers.com,  http://dag.wieers.com/   --
[all I want is a warm bed and a kind word and unlimited power]



From bugs.michael at gmx.net  Thu Mar  3 13:15:32 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 14:15:32 +0100
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
Message-ID: <20050303141532.679168a7.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 13:17:44 +0100 (CET), Dag Wieers wrote:

> > > > Frankly I could not give a damn about the fact that we break Freshen - these
> > > > things are fed through yum from a yum repository, so I really
> > > > don't care that rpm -F might fail in some weird conditions.
> > > > 
> > > > Epoch: 0 is stupid, useless and moronic.
> > > 
> > > Where were you 2 years ago ? We needed you back then :)
> > 
> > Two years ago, explicit Epoch 0 made sense.
> > 
> > Nowadays, the supported versions of RPM no longer require it.
> 
> Explicit Epoch 0 never made sense, we never required it for anything, Red 
> Hat never required it and JBJ admits he was misquoted on the subject.
> 
> But please do include your line of thought.

My line of thought is the following:

I was not involved in making explicit Epoch 0 a policy. I understood the
problems with missing Epoch and RPM < 4.1.1. I didn't see the explicit
Epoch 0 rule as a burden. A burden so high that I would complain forever
and rather choose to boycott a community project than get productive.

There was at least one case (modplug is the one I remember) where the
explicit Epoch 0 rule avoided upgrade problems. Since I knew we would be
save, I didn't track any other corner-cases, which would be affected by
the Epoch problem. The good effect of the explicit Epoch 0 rule was, we
didn't need to care about related upgrade problems.

I don't remember that jbj was ever quoted on it. I didn't pursue some
of the controversial subjects as much as a few individuals did.
I only remember that jbj's comment on "%buildroot vs $RPM_BUILD_ROOT" was
misinterpreted.

And as a final comment on the subject, personal opinion is not what
counts.  Decisions are needed. You can evaluate personal opinions and
consider them in a decision. However, it's the final decision that
counts. How to arrive at a decision is another subject. And I hope the
Fedora Extras Steering Committee can bring about a decision in this
matter, too.



From fedora-extras-commits at redhat.com  Thu Mar  3 13:44:00 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 08:44:00 -0500
Subject: rpms/hunt/devel .cvsignore,1.2,1.3
Message-ID: <200503031344.j23Di07Z002991@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	.cvsignore 
Log Message:
updated



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hunt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:33:43 -0000	1.2
+++ .cvsignore	3 Mar 2005 13:43:58 -0000	1.3
@@ -1 +1,3 @@
+*.src.rpm
+*.i386.rpm
 hunt-1.5.tgz



From fedora-extras-commits at redhat.com  Thu Mar  3 13:44:46 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 08:44:46 -0500
Subject: rpms/hunt/devel hunt-1.5-signness.patch, NONE,
	1.1 hunt-1.5-listlen.patch, NONE, 1.1 hunt-1.5-cleanup.patch,
	NONE, 1.1 hunt-1.5-badcmp.patch, NONE,
	1.1 hunt-1.5-arridx.patch, NONE, 1.1 hunt.spec, 1.4, 1.5
Message-ID: <200503031344.j23DikL7003025@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	hunt.spec 
Added Files:
	hunt-1.5-signness.patch hunt-1.5-listlen.patch 
	hunt-1.5-cleanup.patch hunt-1.5-badcmp.patch 
	hunt-1.5-arridx.patch 
Log Message:
- fixed out-of-range array subscript (BZ #149777)
- fixed lots of warnings regarding different signedness
- fixed some minor compilation warnings
- fixed bad handling of hosts-lists when start-host > end-host


hunt-1.5-signness.patch:

--- NEW FILE hunt-1.5-signness.patch ---
--- hunt-1.5/addpolicy.c.signness	1999-02-13 13:23:15.000000000 +0100
+++ hunt-1.5/addpolicy.c	2005-03-03 14:36:18.000000000 +0100
@@ -105,7 +105,7 @@ void addpolicy_add_item(void)
 	struct add_policy_info *api;
 	unsigned int src_ip, dst_ip;
 	unsigned int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	int nr;
 
 
@@ -138,7 +138,7 @@ void addpolicy_mod_item(void)
 	struct add_policy_info *api;
 	unsigned int src_ip, dst_ip;
 	unsigned int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	int nr;
 	
 	addpolicy_list_items();
--- hunt-1.5/arphijack.c.signness	1999-06-13 16:53:20.000000000 +0200
+++ hunt-1.5/arphijack.c	2005-03-03 14:36:18.000000000 +0100
@@ -23,8 +23,8 @@
  *
  */
 
-int user_arp_hijack(struct user_conn_info *uci, char *src_fake_mac,
-		    char *dst_fake_mac, int input_mode)
+int user_arp_hijack(struct user_conn_info *uci, unsigned char *src_fake_mac,
+		    unsigned char *dst_fake_mac, int input_mode)
 {
 	struct conn_info *ci;
 	int retval;
@@ -44,7 +44,7 @@ int user_arp_hijack(struct user_conn_inf
  */
 
 struct watch_tty_data {
-	char *src_fake_mac;
+	unsigned char *src_fake_mac;
 	struct conn_info *ci;
 	int input_mode;
 };
@@ -100,7 +100,7 @@ static struct arp_spoof_info *asi_src; /
 static struct arp_spoof_info *asi_dst; /* dst in src host */
 static struct arp_dont_relay *dont_relay;
 
-int arp_hijack(struct conn_info *ci, char *src_fake_mac, char *dst_fake_mac,
+int arp_hijack(struct conn_info *ci, unsigned char *src_fake_mac, unsigned char *dst_fake_mac,
 	       int input_mode)
 {
 	struct iphdr *iph;
@@ -253,12 +253,12 @@ int arp_hijack(struct conn_info *ci, cha
 }
 
 
-void user_arp_hijack_done(char *src_fake_mac, char *dst_fake_mac)
+void user_arp_hijack_done(unsigned char *src_fake_mac, unsigned char *dst_fake_mac)
 {
 	arp_hijack_done(src_fake_mac, dst_fake_mac);
 }
 
-void arp_hijack_done(char *src_fake_mac, char *dst_fake_mac)
+void arp_hijack_done(unsigned char *src_fake_mac, unsigned char *dst_fake_mac)
 {
 	arp_dont_relay_remove(dont_relay);
 	if (asi_src && src_fake_mac) {
--- hunt-1.5/arpspoof.c.signness	2000-05-26 13:29:29.000000000 +0200
+++ hunt-1.5/arpspoof.c	2005-03-03 14:36:18.000000000 +0100
@@ -22,7 +22,7 @@ struct arp_spoof_range {
 	unsigned int 	dst_start_addr;
 	unsigned int 	dst_end_addr;
 	unsigned int	src_addr;
-	char 		src_fake_mac[ETH_ALEN];
+	unsigned char	src_fake_mac[ETH_ALEN];
 	int		refresh;
 	int		can_forward;
 	struct arp_spoof_range *next;
@@ -395,7 +395,7 @@ static void asi_wait_for_release(struct 
 
 struct arp_spoof_info *start_arp_spoof(unsigned int src_addr,
 				       unsigned int dst_addr,
-		char *src_mac, char *dst_mac, char *src_fake_mac,
+		unsigned char *src_mac, unsigned char *dst_mac, unsigned char *src_fake_mac,
 		int refresh, int can_forward, int in_range)
 {
 	struct arp_spoof_info *asi, *tmp;
--- hunt-1.5/hostup.c.signness	1999-06-03 12:10:35.000000000 +0200
+++ hunt-1.5/hostup.c	2005-03-03 14:36:18.000000000 +0100
@@ -118,7 +118,7 @@ static void perform_ping(struct host_up_
 	printf("\n");
 }
 
-static void send_arp_message(unsigned int ip, char *dst_mac)
+static void send_arp_message(unsigned int ip, unsigned char *dst_mac)
 {
 	struct arp_spec as;
 	
@@ -226,7 +226,8 @@ void host_up(void)
 	struct host_up_info *hui;
 	struct timespec ts;
 	unsigned int len;
-	unsigned char buf_mac[BUFSIZE], fake_mac[ETH_ALEN];
+	char buf_mac[BUFSIZE];
+	unsigned char fake_mac[ETH_ALEN];
 	
 	if ((start_ip = menu_choose_hostname("start ip addr", host_lookup(start_ip_def, HL_MODE_NR))) == -1)
 		return;
--- hunt-1.5/hunt.c.signness	2000-05-26 15:56:35.000000000 +0200
+++ hunt-1.5/hunt.c	2005-03-03 14:36:18.000000000 +0100
@@ -644,7 +644,7 @@ static inline void fast_tcp_process(stru
 	list_unlock(&l_ifunc_fast_tcp);
 }
 
-static void mac_table_update(unsigned int ip, char *mac)
+static void mac_table_update(unsigned int ip, unsigned char *mac)
 {
 	struct mac_info *mi;
 	
@@ -685,7 +685,7 @@ void mac_info_release(struct mac_info *m
 static void mac_arp_learn(struct packet *p)
 {
 	unsigned int ip;
-	char *mac;
+	unsigned char *mac;
 	struct arpeth_hdr *arpethh;
 
 	arpethh = (struct arpeth_hdr *)(p->p_arph + 1);
@@ -704,7 +704,7 @@ static void mac_arp_learn(struct packet 
 static void mac_ip_learn(struct packet *p)
 {
 	unsigned int ip;
-	char *mac;
+	unsigned char *mac;
 	
 	ip = p->p_iph->saddr;
 	mac = p->p_ethh->h_source;
--- hunt-1.5/hunt.h.signness	2005-03-03 14:36:18.000000000 +0100
+++ hunt-1.5/hunt.h	2005-03-03 14:36:32.000000000 +0100
@@ -235,7 +235,7 @@ struct arpeth_hdr {
 };
 
 struct mac_info {
-	char mac[ETH_ALEN];
+	unsigned char mac[ETH_ALEN];
 	pthread_mutex_t mutex;
 };
 
@@ -355,7 +355,7 @@ int menu_choose_string(char *label, char
 int menu(char *head, char *str_menu, char *label, char *opt, char dfl);
 void press_key(char *label);
 unsigned int menu_choose_hostname(char *label, char *dfl);
-int menu_choose_ports(char *label, int *ret_ports, char *dfl);
+int menu_choose_ports(char *label, unsigned int *ret_ports, char *dfl);
 int menu_choose_mac(char *label, unsigned char *mac_ret, char *dfl);
 int menu_choose_sdb(char *label, char dfl);
 
@@ -363,7 +363,7 @@ int menu_choose_host_mask_ports(char *la
 		unsigned int *ret_mask, unsigned int *ret_ports, char *dfl);
 int menu_choose_host_mask_ports_dfl(char *label, unsigned int *ret_ip,
 		unsigned int *ret_mask, unsigned int *ret_ports,
-		unsigned int dfl_ip, unsigned int dfl_mask, int *dfl_ports);
+		unsigned int dfl_ip, unsigned int dfl_mask, unsigned int *dfl_ports);
 
 void clear_new_conn_ind(void);
 void print_new_conn_ind(int add_new);
@@ -415,9 +415,9 @@ int print_eth_mac(unsigned char *mac);
 int sprintf_eth_mac(char *b, unsigned char *mac);
 int tap(char *device, int promisc_mode);
 int rawsock(void);
-int get_ifc_info(char *ifc_name, unsigned int *ip, char *mac);
+int get_ifc_info(char *ifc_name, unsigned int *ip, unsigned char *mac);
 
-int port_match(int port, unsigned int *db_ports);
+int port_match(unsigned int port, unsigned int *db_ports);
 void port_htons(unsigned int *db_ports);
 
 extern unsigned char __suggest_mac[ETH_ALEN];
@@ -493,11 +493,11 @@ void func_hijack_src(struct packet *p, s
 #define INPUT_MODE_RAW		0
 #define INPUT_MODE_LINEECHOR	1
 #define INPUT_MODE_LINEECHO	2
-int user_arp_hijack(struct user_conn_info *uci, char *src_fake_mac,
-		    char *dst_fake_mac, int input_mode);
-void user_arp_hijack_done(char *src_fake_mac, char *dst_fake_mac);
-int arp_hijack(struct conn_info *ci, char *src_fake_mac, char *dst_fake_mac, int input_mode);
-void arp_hijack_done(char *src_fake_mac, char *dst_fake_mac);
+int user_arp_hijack(struct user_conn_info *uci, unsigned char *src_fake_mac,
+		    unsigned char *dst_fake_mac, int input_mode);
+void user_arp_hijack_done(unsigned char *src_fake_mac, unsigned char *dst_fake_mac);
+int arp_hijack(struct conn_info *ci, unsigned char *src_fake_mac, unsigned char *dst_fake_mac, int input_mode);
+void arp_hijack_done(unsigned char *src_fake_mac, unsigned char *dst_fake_mac);
 
 /*
  * synchijack
@@ -512,7 +512,7 @@ extern unsigned char mac_broadcast[ETH_A
 extern unsigned char mac_zero[ETH_ALEN];
 struct arp_spoof_info *start_arp_spoof(unsigned int src_addr,
 				       unsigned int dst_addr,
-		char *src_mac, char *dst_mac, char *src_fake_mac,
+		unsigned char *src_mac, unsigned char *dst_mac, unsigned char *src_fake_mac,
 		int refresh, int can_forward, int in_range);
 struct arp_spoof_info *get_arp_spoof(unsigned int src_addr, unsigned int dst_addr);
 void stop_arp_spoof(struct arp_spoof_info *asi);
@@ -650,8 +650,8 @@ struct tcp_spec {
 	unsigned long daddr;
 	unsigned short sport;
 	unsigned short dport;
-	char *src_mac;
-	char *dst_mac;
+	unsigned char *src_mac;
+	unsigned char *dst_mac;
 	unsigned long seq;
 	unsigned long ack_seq;
 	unsigned short window;
@@ -669,8 +669,8 @@ int send_tcp_packet(struct tcp_spec *ts)
 struct icmp_spec {
 	unsigned int src_addr;
 	unsigned int dst_addr;
-	char *src_mac;
-	char *dst_mac;
+	unsigned char *src_mac;
+	unsigned char *dst_mac;
 	
 	short type;
 	short code;
@@ -688,19 +688,19 @@ struct icmp_spec {
 
 int send_icmp_packet(struct icmp_spec *is);
 void send_icmp_request(unsigned int src_addr, unsigned int dst_addr,
-		       char *src_mac, char *dst_mac, unsigned short seq);
+		       unsigned char *src_mac, unsigned char *dst_mac, unsigned short seq);
 int is_icmp_reply(struct packet *p, unsigned int src_addr, unsigned int dst_addr,
-		  char *src_mac, char *dst_mac);
+		  unsigned char *src_mac, unsigned char *dst_mac);
 
 
 struct arp_spec {
-	char *src_mac;
-	char *dst_mac;
+	unsigned char *src_mac;
+	unsigned char *dst_mac;
 	
 	int oper;
-	char *sender_mac;
+	unsigned char *sender_mac;
 	unsigned long sender_addr;
-	char *target_mac;
+	unsigned char *target_mac;
 	unsigned long target_addr;
 };
 
--- hunt-1.5/menu.c.signness	1999-06-06 18:04:00.000000000 +0200
+++ hunt-1.5/menu.c	2005-03-03 14:36:18.000000000 +0100
@@ -170,7 +170,7 @@ unsigned int parse_hostname(char *buf)
 	}
 }
 
-int parse_mac(char *buf, char *mac_ret)
+int parse_mac(char *buf, unsigned char *mac_ret)
 {
 	unsigned char mac[ETH_ALEN];
 	char *p, *tmp, *buf_p;
@@ -271,7 +271,7 @@ unsigned int menu_choose_hostname(char *
 }
 
 
-int menu_choose_ports(char *label, int *ret_ports, char *dfl)
+int menu_choose_ports(char *label, unsigned int *ret_ports, char *dfl)
 {
 	char buf[BUFSIZE];
 	
@@ -336,7 +336,7 @@ int menu_choose_host_mask_ports(char *la
 
 int menu_choose_host_mask_ports_dfl(char *label, unsigned int *ret_ip,
 		unsigned int *ret_mask, unsigned int *ret_ports,
-		unsigned int dfl_ip, unsigned int dfl_mask, int *dfl_ports)
+		unsigned int dfl_ip, unsigned int dfl_mask, unsigned int *dfl_ports)
 {
 	char dfl[256], *buf_p;
 	
--- hunt-1.5/net.c.signness	1999-06-08 14:18:42.000000000 +0200
+++ hunt-1.5/net.c	2005-03-03 14:36:18.000000000 +0100
@@ -162,7 +162,7 @@ int send_icmp_packet(struct icmp_spec *i
 }
 
 void send_icmp_request(unsigned int src_addr, unsigned int dst_addr,
-		       char *src_mac, char *dst_mac, unsigned short seq)
+		       unsigned char *src_mac, unsigned char *dst_mac, unsigned short seq)
 {
 	struct icmp_spec icmp;
 	
@@ -181,7 +181,7 @@ void send_icmp_request(unsigned int src_
 }
 
 int is_icmp_reply(struct packet *p, unsigned int src_addr, unsigned int dst_addr,
-		  char *src_mac, char *dst_mac)
+		  unsigned char *src_mac, unsigned char *dst_mac)
 {
 	struct iphdr *iph = p->p_iph;
 	struct icmphdr *icmph = p->p_hdr.p_icmph;
--- hunt-1.5/pktrelay.c.signness	1999-11-12 11:09:18.000000000 +0100
+++ hunt-1.5/pktrelay.c	2005-03-03 14:36:18.000000000 +0100
@@ -259,9 +259,9 @@ static void relay_add_item(void)
 	struct relay_item *ri;
 	unsigned int src_ip, dst_ip;
 	unsigned int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	char name_buf[128], name_buf2[256];
-	char ethtap_mac[ETH_ALEN];
+	unsigned char ethtap_mac[ETH_ALEN];
 	int flags_c;
 	int nr, ethtap_fd;
 
@@ -318,7 +318,7 @@ static void relay_mod_item(void)
 	struct relay_item *ri;
 	unsigned int src_ip, dst_ip;
 	unsigned int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	char name_buf[128], name_buf2[256];
 	int nr;
 	char flags_dfl;
--- hunt-1.5/rstd.c.signness	1999-07-13 09:22:57.000000000 +0200
+++ hunt-1.5/rstd.c	2005-03-03 14:36:18.000000000 +0100
@@ -256,7 +256,7 @@ static void rst_add_item(void)
 	struct rst_db_item *dbi;
 	unsigned int src_ip, dst_ip;
 	unsigned int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	int mode, syn_mode;
 	int nr;
 
@@ -301,7 +301,7 @@ static void rst_mod_item(void)
 	struct rst_db_item *dbi;
 	unsigned int src_ip, dst_ip;
 	unsigned int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	int mode, syn_mode;
 	int nr;
 	
--- hunt-1.5/sniff.c.signness	1999-04-02 13:58:48.000000000 +0200
+++ hunt-1.5/sniff.c	2005-03-03 14:36:18.000000000 +0100
@@ -42,8 +42,8 @@ struct sniff_info {
 	unsigned int dst_addr;
 	int src_mask;
 	int dst_mask;
-	int src_ports[MAX_PORTS + 1];
-	int dst_ports[MAX_PORTS + 1];
+	unsigned int src_ports[MAX_PORTS + 1];
+	unsigned int dst_ports[MAX_PORTS + 1];
 	
 	int srch_mode;
 	char *search;
@@ -653,8 +653,8 @@ static void sniff_add_item(void)
 	char file_name[BUFSIZE], file_name_buf[BUFSIZE];
 	struct sniff_info *si;
 	unsigned int src_ip, dst_ip;
-	int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_mask, dst_mask;
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	int srch_mode, len;
 	int log_mode, log_bytes;
 	int nr;
@@ -732,8 +732,8 @@ static void sniff_mod_item(void)
 	struct sniff_info *si;
 	struct sniff_log *slog;
 	unsigned int src_ip, dst_ip;
-	int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_mask, dst_mask;
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	int srch_mode, len;
 	int log_mode, log_bytes;
 	int nr;
--- hunt-1.5/tap.c.signness	1999-09-23 13:55:38.000000000 +0200
+++ hunt-1.5/tap.c	2005-03-03 14:36:18.000000000 +0100
@@ -107,7 +107,7 @@ int tap(char *device, int promisc_mode)
 	}
 }
 
-int get_ifc_info(char *ifc_name, unsigned int *ip, char *mac)
+int get_ifc_info(char *ifc_name, unsigned int *ip, unsigned char *mac)
 {
 	int fd;				
 	struct ifreq ifr;
--- hunt-1.5/util.c.signness	2005-03-03 14:36:18.000000000 +0100
+++ hunt-1.5/util.c	2005-03-03 14:37:23.000000000 +0100
@@ -286,7 +286,7 @@ int sprintf_db_ports(unsigned int *ports
 	return buf - buf_orig;
 }
 
-int port_match(int port, unsigned int *db_ports)
+int port_match(unsigned int port, unsigned int *db_ports)
 {
 	int start, end;
 	int pass;

hunt-1.5-listlen.patch:

--- NEW FILE hunt-1.5-listlen.patch ---
2005-03-03 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
	* hostup.c: make the len of the host-list to be checked signed;
	  else the 'len < 0' check would be always false

--- hunt-1.5/hostup.c.listlen	2005-03-03 14:07:54.000000000 +0100
+++ hunt-1.5/hostup.c	2005-03-03 14:13:38.000000000 +0100
@@ -225,7 +225,7 @@ void host_up(void)
 	struct ifunc_item ifunc_arp;
 	struct host_up_info *hui;
 	struct timespec ts;
-	unsigned int len;
+	int len;
 	char buf_mac[BUFSIZE];
 	unsigned char fake_mac[ETH_ALEN];
 	

hunt-1.5-cleanup.patch:

--- NEW FILE hunt-1.5-cleanup.patch ---
2005-03-03 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
	* util.c, hunt.h: remove unused log2() function as it conflicts
	  with the built-in log2(3) one
	* timer.c: include <stdlib.h> for declaration of exit(3)

--- hunt-1.5/util.c.cleanup	2000-05-30 15:02:27.000000000 +0200
+++ hunt-1.5/util.c	2005-03-03 13:35:26.000000000 +0100
@@ -70,23 +70,6 @@ int is_power2(unsigned int i)
 	return i ? 0 : 1;
 }
 
-int log2(unsigned int i)
-{
-	int l = 0;
-
-	if (!i)
-		return -1;
-	while (!(i & 1)) {
-		l++;
-		i >>= 1;
-	}
-	i >>= 1;
-	if (i)
-		return 0;
-	else
-		return l;
-}
-
 int count_mask(unsigned int mask)
 {
 	int retval;
--- hunt-1.5/hunt.h.cleanup	2000-05-30 14:54:54.000000000 +0200
+++ hunt-1.5/hunt.h	2005-03-03 13:35:26.000000000 +0100
@@ -401,7 +401,6 @@ void set_tty_color(enum TTY_COLOR color)
 void set_tty_color_bg(enum TTY_COLOR fg, enum TTY_COLOR bg);
 
 int is_power2(unsigned int i);
-int log2(unsigned int i);
 int count_mask(unsigned int mask);
 
 
--- hunt-1.5/timer.c.cleanup	1999-02-15 14:31:20.000000000 +0100
+++ hunt-1.5/timer.c	2005-03-03 13:36:16.000000000 +0100
@@ -8,6 +8,7 @@
  */
 #include <stdio.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include "hunt.h"
 
 struct list timejob_list = LIST_INIT(struct timejob, j_next);

hunt-1.5-badcmp.patch:

--- NEW FILE hunt-1.5-badcmp.patch ---
2005-03-03 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
	* fixed various places where signed and unsigned variables are
	  compared; most if them cause compiler warnings also, bad
	  other might cause buffer overflows also

diff -ur hunt-1.5badcmp/arphijack.c hunt-1.5/arphijack.c
--- hunt-1.5badcmp/arphijack.c	2005-03-03 14:21:00.000000000 +0100
+++ hunt-1.5/arphijack.c	2005-03-03 14:27:29.000000000 +0100
@@ -57,7 +57,7 @@
 
 	if (wtd->input_mode == INPUT_MODE_RAW)
 		tty_raw(0, 1, 0);
-	while ((nr = read(0, buf, sizeof(buf)))) {
+	while ((nr = read(0, buf, sizeof(buf)))>0) {
 		if (buf[0] == 29)	/* ^] */
 			break;
 		if (wtd->input_mode == INPUT_MODE_LINEECHO || 
@@ -67,7 +67,7 @@
 				break;
 			
 			if (wtd->input_mode == INPUT_MODE_LINEECHOR && 
-			    nr < sizeof(buf) && buf[nr - 1] == '\n') {
+			    (size_t)nr < sizeof(buf) && buf[nr - 1] == '\n') {
 				buf[nr - 1] = '\r';
 				buf[nr++] = '\n';
 			}
diff -ur hunt-1.5badcmp/arpspoof.c hunt-1.5/arpspoof.c
--- hunt-1.5badcmp/arpspoof.c	2005-03-03 14:21:00.000000000 +0100
+++ hunt-1.5/arpspoof.c	2005-03-03 14:31:43.000000000 +0100
@@ -970,7 +970,7 @@
 	char buf[BUFSIZE];
 	int refresh, can_forward;
 	
-	if ((src_ip = menu_choose_hostname("host to spoof", NULL)) == -1)
+	if ((src_ip = menu_choose_hostname("host to spoof", NULL)) == (unsigned int)(-1))
 		return;
 	sprintf_eth_mac(buf, suggest_mac());
 	if (menu_choose_mac("fake mac", src_fake_mac, buf) < 0)
@@ -980,7 +980,7 @@
 			return;
 	} else
 		can_forward = 1;
-	if ((dst_ip = menu_choose_hostname("target - where to insert the spoof", NULL)) == -1)
+	if ((dst_ip = menu_choose_hostname("target - where to insert the spoof", NULL)) == (unsigned int)(-1))
 		return;
 	if ((refresh = menu_choose_unr("refresh interval sec", 0, 100000, 0)) < 0)
 		return;
@@ -1024,7 +1024,7 @@
 	char buf[BUFSIZE];
 	int refresh, can_forward;
 	
-	if ((src_ip = menu_choose_hostname("host to spoof", NULL)) == -1)
+	if ((src_ip = menu_choose_hostname("host to spoof", NULL)) == (unsigned int)(-1))
 		return;
 	sprintf_eth_mac(buf, suggest_mac());
 	if (menu_choose_mac("fake mac", src_fake_mac, buf) < 0)
@@ -1034,9 +1034,9 @@
 			return;
 	} else
 		can_forward = 1;
-	if ((dst_start_ip = menu_choose_hostname("start target where to insert the spoof", NULL)) == -1)
+	if ((dst_start_ip = menu_choose_hostname("start target where to insert the spoof", NULL)) == (unsigned int)(-1))
 		return;
-	if ((dst_end_ip = menu_choose_hostname("end target where to insert the spoof", NULL)) == -1)
+	if ((dst_end_ip = menu_choose_hostname("end target where to insert the spoof", NULL)) == (unsigned int)(-1))
 		return;
 	if ((refresh = menu_choose_unr("refresh interval sec", 0, 100000, 0)) < 0)
 		return;
@@ -1120,7 +1120,7 @@
 	struct mac_info *mi_src, *mi_dst;
 	int refresh, src_can_forward, dst_can_forward;
 	
-	if ((src_ip = menu_choose_hostname("src/dst host1 to arp spoof", NULL)) == -1)
+	if ((src_ip = menu_choose_hostname("src/dst host1 to arp spoof", NULL)) == (unsigned int)(-1))
 		return;
 	sprintf_eth_mac(buf, suggest_mac());
 	if (menu_choose_mac("host1 fake mac", src_fake_mac, buf) < 0)
@@ -1130,7 +1130,7 @@
 			return;
 	} else
 		src_can_forward = 1;
-	if ((dst_ip = menu_choose_hostname("src/dst host2 to arp spoof", NULL)) == -1)
+	if ((dst_ip = menu_choose_hostname("src/dst host2 to arp spoof", NULL)) == (unsigned int)(-1))
 		return;
 	sprintf_eth_mac(buf, suggest_mac());
 	if (menu_choose_mac("host2 fake mac", dst_fake_mac, buf) < 0)
@@ -1183,9 +1183,9 @@
 	i = menu_choose_unr("item nr. with src/dst or [cr]", 0,
 			    arp_spoof_count() - 1, -1);
 	if (i < 0) {
-		if ((ip1 = menu_choose_hostname("src/dst host1 to remove", NULL)) == -1)
+		if ((ip1 = menu_choose_hostname("src/dst host1 to remove", NULL)) == (unsigned int)(-1))
 			return;
-		if ((ip2 = menu_choose_hostname("src/dst host2 to remove", NULL)) == -1)
+		if ((ip2 = menu_choose_hostname("src/dst host2 to remove", NULL)) == (unsigned int)(-1))
 			return;
 	} else {
 		asi = list_at(&l_arp_spoof, i);
@@ -1257,17 +1257,17 @@
 	if (range_test)
 		dst_addr = (unsigned int) -1;
 	else
-		if ((dst_addr = menu_choose_hostname("host to test", NULL)) == -1)
+		if ((dst_addr = menu_choose_hostname("host to test", NULL)) == (unsigned int)(-1))
 			return;
 	for (i = 0; i < asr->asi_count; i++) {
-		if (dst_addr == -1 && asr->asi[i]->dst_mac_valid)
+	  if (dst_addr == (unsigned int)(-1) && asr->asi[i]->dst_mac_valid)
 			do_test_or_refresh(asr->asi[i]);
 		else if (asr->asi[i]->dst_addr == dst_addr) {
 			do_test_or_refresh(asr->asi[i]);
 			break;
 		}
 	}
-	if (dst_addr != -1 && i >= asr->asi_count)
+	if (dst_addr != (unsigned int)(-1) && i >= asr->asi_count)
 		printf("host not found in range database\n");
 }
 
diff -ur hunt-1.5badcmp/hostup.c hunt-1.5/hostup.c
--- hunt-1.5badcmp/hostup.c	2005-03-03 14:21:00.000000000 +0100
+++ hunt-1.5/hostup.c	2005-03-03 14:24:44.000000000 +0100
@@ -229,9 +229,9 @@
 	char buf_mac[BUFSIZE];
 	unsigned char fake_mac[ETH_ALEN];
 	
-	if ((start_ip = menu_choose_hostname("start ip addr", host_lookup(start_ip_def, HL_MODE_NR))) == -1)
+	if ((start_ip = menu_choose_hostname("start ip addr", host_lookup(start_ip_def, HL_MODE_NR))) == (unsigned int)(-1))
 		return;
-	if ((end_ip = menu_choose_hostname("end ip addr", host_lookup(end_ip_def, HL_MODE_NR))) == -1)
+	if ((end_ip = menu_choose_hostname("end ip addr", host_lookup(end_ip_def, HL_MODE_NR))) == (unsigned int)(-1))
 		return;
 	if ((len = ntohl(end_ip) - ntohl(start_ip) + 1) < 0) {
 		printf("bad addresses\n");
diff -ur hunt-1.5badcmp/hunt.h hunt-1.5/hunt.h
--- hunt-1.5badcmp/hunt.h	2005-03-03 14:21:00.000000000 +0100
+++ hunt-1.5/hunt.h	2005-03-03 14:25:04.000000000 +0100
@@ -566,7 +566,7 @@
  * macdisc
  */
 void mac_discover(unsigned int ip, int count);
-void mac_discover_range(unsigned int start_ip, unsigned int end_ip, int count);
+void mac_discover_range(unsigned int start_ip, unsigned int end_ip, unsigned int count);
 void mac_disc_menu(void);
 void print_mac_daemon();
 
diff -ur hunt-1.5badcmp/macdisc.c hunt-1.5/macdisc.c
--- hunt-1.5badcmp/macdisc.c	1999-02-21 20:21:37.000000000 +0100
+++ hunt-1.5/macdisc.c	2005-03-03 14:24:44.000000000 +0100
@@ -14,7 +14,7 @@
 #include <assert.h>
 #include <errno.h>
 
-void mac_discover_range(unsigned int start_ip, unsigned int end_ip, int count)
+void mac_discover_range(unsigned int start_ip, unsigned int end_ip, unsigned int count)
 {
 	unsigned int addr, j;
 	struct timespec ts;
@@ -184,9 +184,9 @@
 	struct mac_disc_info *mdi;
 	unsigned int start_ip, end_ip;
 	
-	if ((start_ip = menu_choose_hostname("start ip addr", NULL)) == -1)
+	if ((start_ip = menu_choose_hostname("start ip addr", NULL)) == (unsigned int)(-1))
 		return;
-	if ((end_ip = menu_choose_hostname("end ip addr", NULL)) == -1)
+	if ((end_ip = menu_choose_hostname("end ip addr", NULL)) == (unsigned int)(-1))
 		return;
 	mdi = malloc(sizeof(struct mac_disc_info));
 	assert(mdi);
@@ -207,9 +207,9 @@
 	if (!(mdi = list_at(&l_mdi, nr)))
 		return;
 
-	if ((start_ip = menu_choose_hostname("start ip addr", host_lookup(mdi->start_addr, hl_mode))) == -1)
+	if ((start_ip = menu_choose_hostname("start ip addr", host_lookup(mdi->start_addr, hl_mode))) == (unsigned int)(-1))
 		return;
-	if ((end_ip = menu_choose_hostname("end ip addr", host_lookup(mdi->end_addr, hl_mode))) == -1)
+	if ((end_ip = menu_choose_hostname("end ip addr", host_lookup(mdi->end_addr, hl_mode))) == (unsigned int)(-1))
 		return;
 	mdi->start_addr = start_ip;
 	mdi->end_addr = end_ip;
diff -ur hunt-1.5badcmp/main.c hunt-1.5/main.c
--- hunt-1.5badcmp/main.c	2000-05-26 16:06:39.000000000 +0200
+++ hunt-1.5/main.c	2005-03-03 14:31:19.000000000 +0100
@@ -145,7 +145,7 @@
 		 * packet from source
 		 */
 		if (!dst_packet && p->p_data_len && !same_chars) {
-			pbuf_len = p->p_data_len < sizeof(pbuf) ? p->p_data_len : sizeof(pbuf);
+			pbuf_len = ((size_t)(p->p_data_len) < sizeof(pbuf)) ? (size_t)p->p_data_len : sizeof(pbuf);
 			memcpy(pbuf, p->p_data, pbuf_len);
 		} else
 			pbuf_len = 0;
diff -ur hunt-1.5badcmp/menu.c hunt-1.5/menu.c
--- hunt-1.5badcmp/menu.c	2005-03-03 14:21:00.000000000 +0100
+++ hunt-1.5/menu.c	2005-03-03 14:24:44.000000000 +0100
@@ -264,7 +264,7 @@
 	while (1) {
 		if (menu_prompt(label, buf, sizeof(buf), dfl) < 0)
 			return -1;
-		if ((ip = parse_hostname(buf)) != -1)
+		if ((ip = parse_hostname(buf)) != (unsigned int)(-1))
 			break;
 	}
 	return ip;
@@ -302,7 +302,7 @@
 		
 		if (!(host_name = strtok(buf, " /\t\n")))
 			continue;
-		if ((ip = parse_hostname(host_name)) == -1)
+		if ((ip = parse_hostname(host_name)) == (unsigned int)(-1))
 			continue;
 		if (with_mask) {
 			if (!(mask_str = strtok(NULL, " \t\n")))
diff -ur hunt-1.5badcmp/resolv.c hunt-1.5/resolv.c
--- hunt-1.5badcmp/resolv.c	1999-02-14 13:59:13.000000000 +0100
+++ hunt-1.5/resolv.c	2005-03-03 14:30:37.000000000 +0100
@@ -411,10 +411,10 @@
 char *host_lookup(unsigned int in, int use_mode)
 {
  	static char hostname_buf[BUFSIZE] = {0};
-	static int hostname_idx = 0;
+	static unsigned int hostname_idx = 0;
 	struct in_addr addr;
 	char *name, *retval;
-	int len;
+	size_t len;
 	struct hostent *host_ent;
 	struct resolv_item *r;
 	
@@ -495,10 +495,10 @@
 char *port_lookup(unsigned short serv, int use_mode)
 {
  	static char servname_buf[BUFSIZE] = {0};
-	static int servname_idx = 0;
+	static unsigned int servname_idx = 0;
 	char name_buf[64];
 	char *name, *retval;
-	int len;
+	size_t len;
 	struct servent *serv_ent;
 
 	if (serv == 0)
diff -ur hunt-1.5badcmp/synchijack.c hunt-1.5/synchijack.c
--- hunt-1.5badcmp/synchijack.c	1999-02-21 21:04:36.000000000 +0100
+++ hunt-1.5/synchijack.c	2005-03-03 14:30:37.000000000 +0100
@@ -197,7 +197,7 @@
 {
 	struct tcp_spec ts;
 	char buf[1400];
-	int len;
+	unsigned int len;
 
 	/*
 	 * well - after sending something we get usualy ack storm
@@ -257,7 +257,7 @@
 			memset(buf, ' ', len);
 #else
 		len = need_write;
-		if (len > sizeof(buf)) {
+		if ((size_t)len > sizeof(buf)) {
 			len = sizeof(buf);
 			memset(buf, ' ', len);
 		} else {
@@ -377,7 +377,7 @@
 			print_data_packet(p, p->p_data_len, 0, 0);
 		if (last_read_ack == p->p_hdr.p_tcph->ack_seq && p->p_data_len) {
 			len = p->p_data_len;
-			if (len > sizeof(buf))
+			if ((size_t)len > sizeof(buf))
 				len = sizeof(buf);
 			memcpy(buf, p->p_data, len);
 			w_data = buf;

hunt-1.5-arridx.patch:

--- NEW FILE hunt-1.5-arridx.patch ---
2005-03-03 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
	* c/hash.c: fixed out-of-range array subscript; reported in
	  https://bugzilla.redhat.com/beta/show_bug.cgi?id=149777

--- hunt-1.5/c/hash.c.arridx	2000-02-16 10:26:14.000000000 +0100
+++ hunt-1.5/c/hash.c	2005-03-03 13:26:09.000000000 +0100
@@ -26,7 +26,7 @@ static int __chose_table_size(int size)
 	int i;
 	
 	if (size >= ht_size[sizeof(ht_size) / sizeof(ht_size[0]) - 1])
-	    return ht_size[sizeof(ht_size) / sizeof(ht_size[0])];
+	    return ht_size[sizeof(ht_size) / sizeof(ht_size[0]) - 1];
 	for (i = 0; ht_size[i] < size; i++)
 	    ;
 	return ht_size[i];


Index: hunt.spec
===================================================================
RCS file: /cvs/extras/rpms/hunt/devel/hunt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hunt.spec	10 Dec 2004 22:03:03 -0000	1.4
+++ hunt.spec	3 Mar 2005 13:44:44 -0000	1.5
@@ -1,11 +1,20 @@
+## $Id$
+
+%{!?release_func:%define release_func() %1%{?disttag}}
+
 Summary:	A tool for demonstrating well known weaknesses in the TCP/IP protocol suite.
 Name:		hunt
 Version:	1.5
-Release:	2
+Release:	%release_func 3
 Epoch:		0
 License:	GPL
 Group:		Applications/Internet
 Source:		http://lin.fsid.cvut.cz/~kra/hunt/%{name}-%{version}.tgz
+Patch0:		hunt-1.5-arridx.patch
+Patch1:		hunt-1.5-cleanup.patch
+Patch2:		hunt-1.5-signness.patch
+Patch3:		hunt-1.5-listlen.patch
+Patch4:		hunt-1.5-badcmp.patch
 URL:		http://lin.fsid.cvut.cz/~kra/index.html
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -27,6 +36,11 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .arridx
+%patch1 -p1 -b .cleanup
+%patch2 -p1 -b .signness
+%patch3 -p1 -b .listlen
+%patch4 -p1 -b .badcmp
 
 
 %build
@@ -58,6 +72,12 @@
 
 
 %changelog
+* Thu Mar  3 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.5-3
+- fixed out-of-range array subscript (BZ #149777)
+- fixed lots of warnings regarding different signedness
+- fixed some minor compilation warnings
+- fixed bad handling of hosts-lists when start-host > end-host
+
 * Fri May  9 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:1.5-0.fdr.2
 - updated source-url
 



From fedora-extras-commits at redhat.com  Thu Mar  3 13:52:06 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 08:52:06 -0500
Subject: rpms/hunt/devel hunt-1.5-signness.patch,1.1,1.2
Message-ID: <200503031352.j23Dq6O9003217@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	hunt-1.5-signness.patch 
Log Message:
added doc


hunt-1.5-signness.patch:

Index: hunt-1.5-signness.patch
===================================================================
RCS file: /cvs/extras/rpms/hunt/devel/hunt-1.5-signness.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hunt-1.5-signness.patch	3 Mar 2005 13:44:44 -0000	1.1
+++ hunt-1.5-signness.patch	3 Mar 2005 13:52:04 -0000	1.2
@@ -1,3 +1,7 @@
+2005-03-03 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
+	* use consistently 'unsigned' for mac buffers and for port
+	  numbers
+
 --- hunt-1.5/addpolicy.c.signness	1999-02-13 13:23:15.000000000 +0100
 +++ hunt-1.5/addpolicy.c	2005-03-03 14:36:18.000000000 +0100
 @@ -105,7 +105,7 @@ void addpolicy_add_item(void)



From dag at wieers.com  Thu Mar  3 14:22:22 2005
From: dag at wieers.com (Dag Wieers)
Date: Thu, 3 Mar 2005 15:22:22 +0100 (CET)
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <20050303141532.679168a7.bugs.michael@gmx.net>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
	<20050303141532.679168a7.bugs.michael@gmx.net>
Message-ID: <Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>

On Thu, 3 Mar 2005, Michael Schwendt wrote:

> On Thu, 3 Mar 2005 13:17:44 +0100 (CET), Dag Wieers wrote:
> 
> > > > > Frankly I could not give a damn about the fact that we break Freshen - these
> > > > > things are fed through yum from a yum repository, so I really
> > > > > don't care that rpm -F might fail in some weird conditions.
> > > > > 
> > > > > Epoch: 0 is stupid, useless and moronic.
> > > > 
> > > > Where were you 2 years ago ? We needed you back then :)
> > > 
> > > Two years ago, explicit Epoch 0 made sense.
> > > 
> > > Nowadays, the supported versions of RPM no longer require it.
> > 
> > Explicit Epoch 0 never made sense, we never required it for anything, Red 
> > Hat never required it and JBJ admits he was misquoted on the subject.
> > 
> > But please do include your line of thought.
> 
> My line of thought is the following:
> 
> I was not involved in making explicit Epoch 0 a policy. I understood the
> problems with missing Epoch and RPM < 4.1.1. I didn't see the explicit
> Epoch 0 rule as a burden. A burden so high that I would complain forever
> and rather choose to boycott a community project than get productive.

It's funny how your interpretation differs from mine. The Epoch 0 problem 
is one of the several indications of how decisions were taken against the 
majority of the community and lack of arguments in favor, and those were 
enough for me to consider not being part of that community anylonger.
(Communication largely took place on IRC and bugzilla)

(And I'm only repeating this because you imply things about me that are 
incorrect or shortsighted.)

Decisions are seldom important in itself, but the consequences of 
decisions are important. So yes, I object to this and a few other 
decisions, not because of the decisions in itself, but how they came to 
exist. And what they resulted in.

I also fail to see how I have boycotted the aformentioned community 
project. Was it because I didn't join or because I voiced my opinion ? I 
hope I can still voice my opinion, even when it's not shared by you or the 
decision makers. You probably do not agree, but I consider that 
contributing too.

Ignoring things would have been much easier than arguing (believe me), 
still it affects me enough to try to prevent some of the decisions.


> There was at least one case (modplug is the one I remember) where the
> explicit Epoch 0 rule avoided upgrade problems. Since I knew we would be
> save, I didn't track any other corner-cases, which would be affected by
> the Epoch problem. The good effect of the explicit Epoch 0 rule was, we
> didn't need to care about related upgrade problems.

A missing epoch is considered to be 0 (implicit epoch 0), so an explicit 
epoch 0 is plain silly. We have iterated over this many times, there's no 
way to ratify this. Maybe there was a bug somewhere that should have been 
fixed, but we're not basing our policy on bugs ! And the aim was to be 
compatible with Red Hat all along, and they were not doing it...

--   dag wieers,  dag at wieers.com,  http://dag.wieers.com/   --
[all I want is a warm bed and a kind word and unlimited power]



From skvidal at phy.duke.edu  Thu Mar  3 14:29:19 2005
From: skvidal at phy.duke.edu (seth vidal)
Date: Thu, 03 Mar 2005 09:29:19 -0500
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
	<20050303141532.679168a7.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
Message-ID: <1109860159.21434.23.camel@cutter>

> Ignoring things would have been much easier than arguing (believe me), 
> still it affects me enough to try to prevent some of the decisions.
> 

Okay everyone, Stop it.

do not open this discussion again.

it's pointless.

I agree with gafton, screw rpm -Fvh and let's forget about all this
crap.

rehashing the past will do no one any good and let's just stop it.

-sv




From bugs.michael at gmx.net  Thu Mar  3 15:16:33 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 16:16:33 +0100
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
	<20050303141532.679168a7.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
Message-ID: <20050303161633.2c4603a3.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 15:22:22 +0100 (CET), Dag Wieers wrote:

> (And I'm only repeating this because you imply things about me that are 
> incorrect or shortsighted.)

I don't imply anything about you, I did not even refer to you
specifically.

> I hope I can still voice my opinion, even when it's not shared by you
> or the decision makers. You probably do not agree,

What's that assumption based on?

> but I consider that contributing too.



On Thu, 03 Mar 2005 09:29:19 -0500, seth vidal wrote:

> it's pointless.
>
> I agree with gafton, screw rpm -Fvh and let's forget about all this
> crap.

Earlier:

> Like I said before, I don't feel strongly about it.

Even earlier:

> but like I said - I don't have any strong feelings about it.
> 
> -sv



> rehashing the past will do no one any good and let's just stop it.

Oh, rehashing the past can be very valuable in avoiding repeating old
mistakes.

There has been an earlier thread about removal of Epoch zero (hint: Nov
10th), from which I quoted you above. I didn't participate in that quite
long thread. But the thread turned long because there was initial
disagreement and no mandatory action required by packagers. I now highly
recommend revisiting that thread and then to decide on the fate of
explicit Epoch zero, in an official way which is announced/documented
somewhere, so every packager will know about it.



From dag at wieers.com  Thu Mar  3 15:27:13 2005
From: dag at wieers.com (Dag Wieers)
Date: Thu, 3 Mar 2005 16:27:13 +0100 (CET)
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <20050303161633.2c4603a3.bugs.michael@gmx.net>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
	<20050303141532.679168a7.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
	<20050303161633.2c4603a3.bugs.michael@gmx.net>
Message-ID: <Pine.LNX.4.61.0503031623440.921@horsea.3ti.be>

On Thu, 3 Mar 2005, Michael Schwendt wrote:

> On Thu, 3 Mar 2005 15:22:22 +0100 (CET), Dag Wieers wrote:
> 
> > (And I'm only repeating this because you imply things about me that are 
> > incorrect or shortsighted.)
> 
> I don't imply anything about you, I did not even refer to you
> specifically.

Well, sorry Michael, but you did say:

	"A burden so high that I would complain forever and rather choose 
	to boycott a community project than get productive."

and I can't do anything else than interprete this as addressing me. If it 
wasn't, I have a hard time to put this into another context.

Kind regards,
--   dag wieers,  dag at wieers.com,  http://dag.wieers.com/   --
[all I want is a warm bed and a kind word and unlimited power]



From bugs.michael at gmx.net  Thu Mar  3 15:43:18 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 16:43:18 +0100
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <Pine.LNX.4.61.0503031623440.921@horsea.3ti.be>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
	<20050303141532.679168a7.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
	<20050303161633.2c4603a3.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031623440.921@horsea.3ti.be>
Message-ID: <20050303164318.6d5e4480.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 16:27:13 +0100 (CET), Dag Wieers wrote:

> On Thu, 3 Mar 2005, Michael Schwendt wrote:
> 
> > On Thu, 3 Mar 2005 15:22:22 +0100 (CET), Dag Wieers wrote:
> > 
> > > (And I'm only repeating this because you imply things about me that are 
> > > incorrect or shortsighted.)
> > 
> > I don't imply anything about you, I did not even refer to you
> > specifically.
> 
> Well, sorry Michael, but you did say:
> 
> 	"A burden so high that I would complain forever and rather choose 
> 	to boycott a community project than get productive."
> 
> and I can't do anything else than interprete this as addressing me. If it 
> wasn't, I have a hard time to put this into another context.

The hint is still in there (even after you had cut off the rest of the
context):

  [...] that _I_ would [...]

You asked for my "line of thought", I gave it. No idea why you feel the
need to take something personal.



From gemi at bluewin.ch  Thu Mar  3 15:54:27 2005
From: gemi at bluewin.ch (=?ISO-8859-1?Q?G=E9rard?= Milmeister)
Date: Thu, 03 Mar 2005 16:54:27 +0100
Subject: Branch FC-3 for graveman
Message-ID: <1109865268.11139.0.camel@scriabin.tannenrauch.ch>

Please create the FC-3 branch of graveman in devel
-- 
G?rard Milmeister
Langackerstrasse 49
CH-8057 Z?rich



From dag at wieers.com  Thu Mar  3 16:01:04 2005
From: dag at wieers.com (Dag Wieers)
Date: Thu, 3 Mar 2005 17:01:04 +0100 (CET)
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <20050303164318.6d5e4480.bugs.michael@gmx.net>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
	<20050303141532.679168a7.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
	<20050303161633.2c4603a3.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031623440.921@horsea.3ti.be>
	<20050303164318.6d5e4480.bugs.michael@gmx.net>
Message-ID: <Pine.LNX.4.61.0503031645530.921@horsea.3ti.be>

On Thu, 3 Mar 2005, Michael Schwendt wrote:

> On Thu, 3 Mar 2005 16:27:13 +0100 (CET), Dag Wieers wrote:
> 
> > On Thu, 3 Mar 2005, Michael Schwendt wrote:
> > 
> > > On Thu, 3 Mar 2005 15:22:22 +0100 (CET), Dag Wieers wrote:
> > > 
> > > > (And I'm only repeating this because you imply things about me that are 
> > > > incorrect or shortsighted.)
> > > 
> > > I don't imply anything about you, I did not even refer to you
> > > specifically.
> > 
> > Well, sorry Michael, but you did say:
> > 
> > 	"A burden so high that I would complain forever and rather choose 
> > 	to boycott a community project than get productive."
> > 
> > and I can't do anything else than interprete this as addressing me. If it 
> > wasn't, I have a hard time to put this into another context.
> 
> The hint is still in there (even after you had cut off the rest of the
> context):
> 
>   [...] that _I_ would [...]
> 
> You asked for my "line of thought", I gave it. No idea why you feel the
> need to take something personal.

Michael, a little honesty here. It served no other purpose than implying 
something. The context does not matter. In language it's a construct to 
say what you would (or would not) do to imply that someone else (in this 
case me) is doing. It can't be interpreted any other way. 'Implied' means 
that it is not explicitly said.

If this was not the intent, it has no purpose to even mention it. 
So of course I feel the need to defend myself. It's predictable.

Kind regards,
--   dag wieers,  dag at wieers.com,  http://dag.wieers.com/   --
[all I want is a warm bed and a kind word and unlimited power]



From notting at redhat.com  Thu Mar  3 16:25:41 2005
From: notting at redhat.com (Bill Nottingham)
Date: Thu, 3 Mar 2005 11:25:41 -0500
Subject: Branch FC-3 for graveman
In-Reply-To: <1109865268.11139.0.camel@scriabin.tannenrauch.ch>
References: <1109865268.11139.0.camel@scriabin.tannenrauch.ch>
Message-ID: <20050303162541.GD5992@nostromo.devel.redhat.com>

G?rard Milmeister (gemi at bluewin.ch) said: 
> Please create the FC-3 branch of graveman in devel

Done.

Bill



From fedora-extras-commits at redhat.com  Thu Mar  3 16:32:52 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:32:52 -0500
Subject: rpms/libassuan import.log,1.3,1.4
Message-ID: <200503031632.j23GWqas006136@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import libassuan-0.6.7-0.fdr.3.1 on branch FC-1 from libassuan-0.6.7-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libassuan/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	1 Feb 2005 19:30:20 -0000	1.3
+++ import.log	3 Mar 2005 16:32:50 -0000	1.4
@@ -1,2 +1,3 @@
 libassuan-0_6_7-0_fdr_3_2:HEAD:libassuan-0.6.7-0.fdr.3.2.src.rpm:1102524362
 libassuan-0_6_9-1:HEAD:libassuan-0.6.9-1.src.rpm:1107286225
+libassuan-0_6_7-0_fdr_3_1:FC-1:libassuan-0.6.7-0.fdr.3.1.src.rpm:1109867578



From fedora-extras-commits at redhat.com  Thu Mar  3 16:32:52 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:32:52 -0500
Subject: rpms/libassuan/FC-1 libassuan-0.6.7.tar.gz.sig, 1.2, 1.3 .cvsignore,
	1.3, 1.4 libassuan.spec, 1.4, 1.5 sources, 1.3,
	1.4 libassuan-0.6.9.tar.gz.sig, 1.1, NONE
Message-ID: <200503031632.j23GWqA8006140@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libassuan/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6127/FC-1

Modified Files:
	.cvsignore libassuan.spec sources 
Added Files:
	libassuan-0.6.7.tar.gz.sig 
Removed Files:
	libassuan-0.6.9.tar.gz.sig 
Log Message:
auto-import libassuan-0.6.7-0.fdr.3.1 on branch FC-1 from libassuan-0.6.7-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: libassuan-0.6.7.tar.gz.sig
===================================================================
RCS file: libassuan-0.6.7.tar.gz.sig
diff -N libassuan-0.6.7.tar.gz.sig
Binary files /dev/null and /tmp/cvsBU2Cr3 differ


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-1/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2005 19:30:20 -0000	1.3
+++ .cvsignore	3 Mar 2005 16:32:50 -0000	1.4
@@ -1 +1 @@
-libassuan-0.6.9.tar.gz
+libassuan-0.6.7.tar.gz


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-1/libassuan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libassuan.spec	3 Feb 2005 12:34:21 -0000	1.4
+++ libassuan.spec	3 Mar 2005 16:32:50 -0000	1.5
@@ -1,10 +1,10 @@
 
 Summary: GnuPG IPC library 
 Name:	 libassuan
-Version: 0.6.9
-Release: 2%{?dist_tag}
-Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz
-Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig
+Version: 0.6.7
+Release: 0.fdr.3%{?dist_tag}.1
+Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz
+Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz.sig
 URL:	 http://www.gnupg.org/
 License: GPL
 Group: 	 System Environment/Libraries
@@ -33,7 +33,7 @@
 %build
 %configure
 
-make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
@@ -79,12 +79,6 @@
 
 
 %changelog
-* Thu Feb  3 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.6.9-2
-- Build PIC to fix x86_64 linking.
-
-* Thu Jan 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.6.9-1
-- 0.6.9
-
 * Sat Oct 23 2004 Rex Dieter <rexdieter[AT]users.sf.net> - 0.6.7-0.fdr.3
 - *really* fix description this time.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-1/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2005 19:30:20 -0000	1.3
+++ sources	3 Mar 2005 16:32:50 -0000	1.4
@@ -1 +1 @@
-7f8aff75d034159b84faf2358263f444  libassuan-0.6.9.tar.gz
+db4e6939fafbaae80cab11a67f28771d  libassuan-0.6.7.tar.gz


--- libassuan-0.6.9.tar.gz.sig DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 16:33:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:33:50 -0500
Subject: rpms/shapelib import.log,1.3,1.4
Message-ID: <200503031633.j23GXotU006251@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import shapelib-1.2.10-0.fdr.5.1 on branch FC-1 from shapelib-1.2.10-0.fdr.5.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/shapelib/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:25:43 -0000	1.3
+++ import.log	3 Mar 2005 16:33:48 -0000	1.4
@@ -1,2 +1,3 @@
 shapelib-1_2_10-5:HEAD:shapelib-1.2.10-5.src.rpm:1105696087
 shapelib-1_2_10-0_fdr_5_rh90:RHL-9:shapelib-1.2.10-0.fdr.5.rh90.src.rpm:1109748327
+shapelib-1_2_10-0_fdr_5_1:FC-1:shapelib-1.2.10-0.fdr.5.1.src.rpm:1109867635



From fedora-extras-commits at redhat.com  Thu Mar  3 16:33:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:33:50 -0500
Subject: rpms/shapelib/FC-1 shapelib-1.2.10.patch, 1.2, 1.3 shapelib.spec,
	1.2, 1.3 shapelib-1.2.10-endian.patch, 1.1, NONE
Message-ID: <200503031633.j23GXoai006255@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/shapelib/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6242/FC-1

Modified Files:
	shapelib-1.2.10.patch shapelib.spec 
Removed Files:
	shapelib-1.2.10-endian.patch 
Log Message:
auto-import shapelib-1.2.10-0.fdr.5.1 on branch FC-1 from shapelib-1.2.10-0.fdr.5.1.src.rpm
Bring in stuff from fedora.us FC1/stable

shapelib-1.2.10.patch:

Index: shapelib-1.2.10.patch
===================================================================
RCS file: /cvs/extras/rpms/shapelib/FC-1/shapelib-1.2.10.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib-1.2.10.patch	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib-1.2.10.patch	3 Mar 2005 16:33:48 -0000	1.3
@@ -91,8 +91,7 @@
  
  # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN
 +CC = gcc
--ENDIAN	=	-D_LITTLE_ENDIAN
-+#ENDIAN	=	-D_LITTLE_ENDIAN
+ ENDIAN	=	-D_LITTLE_ENDIAN
  
 -CFLAGS	=	-g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
 +EXTRACFLAGS   =      -g


Index: shapelib.spec
===================================================================
RCS file: /cvs/extras/rpms/shapelib/FC-1/shapelib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib.spec	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib.spec	3 Mar 2005 16:33:48 -0000	1.3
@@ -2,12 +2,11 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.2.10
-Release: 6
+Release: 0.fdr.5.1
 Epoch: 0
 URL: http://shapelib.maptools.org/
 Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz
 Patch0: shapelib-%{version}.patch
-Patch1: shapelib-1.2.10-endian.patch
 License: LGPL/MIT
 Group: Development/Libraries
 Buildrequires: libtool
@@ -31,7 +30,6 @@
 %prep
 %setup -q -T -b 0
 %patch -p1 -b .buildroot 
-%patch1 -p1 -b .endian
 
 %build
 make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" lib
@@ -72,10 +70,7 @@
 %exclude %{_libdir}/libshp.la
 
 %changelog
-* Sun Feb 13 2005 David Woodhouse <dwmw2 at infradead.org> 0:1.2.10-6
-- Don't hard-code endianness; just use endian.h
-
-* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:1.2.10-5
+* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:1.2.10-0.fdr.5
 - Patched patch and spec file according to suggestions of Michael Schwendt
 - In particular, this separates the building from the installing in the rpm.
 


--- shapelib-1.2.10-endian.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 16:34:36 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:34:36 -0500
Subject: rpms/proj import.log,1.3,1.4
Message-ID: <200503031634.j23GYax0006361@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import proj-4.4.8-0.fdr.4.1 on branch FC-1 from proj-4.4.8-0.fdr.4.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/proj/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:24:23 -0000	1.3
+++ import.log	3 Mar 2005 16:34:34 -0000	1.4
@@ -1,2 +1,3 @@
 proj-4_4_8-4:HEAD:proj-4.4.8-4.src.rpm:1105695966
 proj-4_4_8-0_fdr_4_rh90:RHL-9:proj-4.4.8-0.fdr.4.rh90.src.rpm:1109748255
+proj-4_4_8-0_fdr_4_1:FC-1:proj-4.4.8-0.fdr.4.1.src.rpm:1109867681



From fedora-extras-commits at redhat.com  Thu Mar  3 16:34:36 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:34:36 -0500
Subject: rpms/proj/FC-1 proj.spec,1.1,1.2
Message-ID: <200503031634.j23GYa1t006365@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/proj/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6352/FC-1

Modified Files:
	proj.spec 
Log Message:
auto-import proj-4.4.8-0.fdr.4.1 on branch FC-1 from proj-4.4.8-0.fdr.4.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: proj.spec
===================================================================
RCS file: /cvs/extras/rpms/proj/FC-1/proj.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proj.spec	14 Jan 2005 09:45:21 -0000	1.1
+++ proj.spec	3 Mar 2005 16:34:34 -0000	1.2
@@ -1,6 +1,10 @@
-Name: proj
-Version: 4.4.8
-Release: 4
+%define name proj
+%define version 4.4.8
+%define release 0.fdr.4
+
+Name: %name
+Version: %version
+Release: %release.1
 Epoch: 0
 Summary: Cartographic projection software (PROJ.4)
 
@@ -89,13 +93,13 @@
 %{_datadir}/%{name}
 
 %changelog
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-4
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.4
 - Added testvarious to nad distribution
 
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-0.fdr.3
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.3
 - Added patch for test scripts so that they will work in installed rpm
 
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-0.fdr.2
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.2
 - Fixed permissions on nad27 and nad83
 - Included test27 and test83 in the nad rpm and made them executable
 



From fedora-extras-commits at redhat.com  Thu Mar  3 16:38:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:38:21 -0500
Subject: rpms/brightside import.log,1.2,1.3
Message-ID: <200503031638.j23GcLAU006467@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import brightside-1.4.0-0.fdr.3.2 on branch FC-2 from brightside-1.4.0-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/brightside/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Dec 2004 21:15:21 -0000	1.2
+++ import.log	3 Mar 2005 16:38:19 -0000	1.3
@@ -1 +1,2 @@
 brightside-1_4_0-0_fdr_3_2:HEAD:brightside-1.4.0-0.fdr.3.2.src.rpm:1102886113
+brightside-1_4_0-0_fdr_3_2:FC-2:brightside-1.4.0-0.fdr.3.2.src.rpm:1109867907



From fedora-extras-commits at redhat.com  Thu Mar  3 16:38:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:38:21 -0500
Subject: rpms/brightside/FC-2 brightside.spec,1.2,1.3
Message-ID: <200503031638.j23GcLYQ006471@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/brightside/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6458/FC-2

Modified Files:
	brightside.spec 
Log Message:
auto-import brightside-1.4.0-0.fdr.3.2 on branch FC-2 from brightside-1.4.0-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: brightside.spec
===================================================================
RCS file: /cvs/extras/rpms/brightside/FC-2/brightside.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- brightside.spec	12 Dec 2004 21:33:41 -0000	1.2
+++ brightside.spec	3 Mar 2005 16:38:19 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           brightside
 Version:        1.4.0
-Release:        3
+Release:        0.fdr.3.2
 Epoch:          0
 Summary:        Add reactivity to the corners and edges of your GNOME desktop.
 
@@ -80,7 +80,7 @@
 
 
 %changelog
-* Wed Dec 08 2004 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info> - 0:1.4.0-3
+* Wed Dec 08 2004 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info> - 0:1.4.0-0.fdr.3
 - BR intltool
 
 * Sun Dec 05 2004 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info> - 0:1.4.0-0.fdr.2



From fedora-extras-commits at redhat.com  Thu Mar  3 16:39:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:39:50 -0500
Subject: rpms/geomview import.log,1.2,1.3
Message-ID: <200503031639.j23GdoXS006580@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import geomview-1.8.1-0.fdr.10.2 on branch FC-2 from geomview-1.8.1-0.fdr.10.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geomview/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	24 Dec 2004 11:58:48 -0000	1.2
+++ import.log	3 Mar 2005 16:39:48 -0000	1.3
@@ -1 +1,2 @@
 geomview-1_8_1-10:HEAD:geomview-1.8.1-10.src.rpm:1103889514
+geomview-1_8_1-0_fdr_10_2:FC-2:geomview-1.8.1-0.fdr.10.2.src.rpm:1109867988



From fedora-extras-commits at redhat.com  Thu Mar  3 16:39:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:39:50 -0500
Subject: rpms/geomview/FC-2 geomview.spec,1.1,1.2
Message-ID: <200503031639.j23Gdohm006584@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	geomview.spec 
Log Message:
auto-import geomview-1.8.1-0.fdr.10.2 on branch FC-2 from geomview-1.8.1-0.fdr.10.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-2/geomview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview.spec	24 Dec 2004 11:58:48 -0000	1.1
+++ geomview.spec	3 Mar 2005 16:39:48 -0000	1.2
@@ -8,7 +8,7 @@
 Summary: An interactive 3D viewing program
 Epoch:	 0
 Version: 1.8.1
-Release: 10%{?dist_tag}
+Release: 0.fdr.10%{?dist_tag}.2
 License: LGPL
 Url:     http://www.geomview.org/
 #Url:	 http://sourceforge.net/projects/geomview/
@@ -227,7 +227,7 @@
 
 
 %changelog
-* Mon Sep 20 2004 Rex Dieter <rexdieter at sf.net> 0:1.8.1-10
+* Mon Sep 20 2004 Rex Dieter <rexdieter at sf.net> 0:1.8.1-0.fdr.10
 - update Source URL
 - fix un-owned /usr/share/geomview/modules
 - Requires(post,preun): /sbin-install-info



From fedora-extras-commits at redhat.com  Thu Mar  3 16:40:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:40:42 -0500
Subject: rpms/gmpc import.log,1.2,1.3
Message-ID: <200503031640.j23Geg6t006718@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import gmpc-0.11.2-0.fdr.1.2 on branch FC-2 from gmpc-0.11.2-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gmpc/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Dec 2004 16:35:27 -0000	1.2
+++ import.log	3 Mar 2005 16:40:40 -0000	1.3
@@ -1 +1,2 @@
 gmpc-0_11_2-0_fdr_1_2:HEAD:gmpc-0.11.2-0.fdr.1.2.src.rpm:1102523788
+gmpc-0_11_2-0_fdr_1_2:FC-2:gmpc-0.11.2-0.fdr.1.2.src.rpm:1109868048



From fedora-extras-commits at redhat.com  Thu Mar  3 16:40:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:40:42 -0500
Subject: rpms/gmpc/FC-2 gmpc.spec,1.2,1.3
Message-ID: <200503031640.j23Gegcu006722@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gmpc/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6709/FC-2

Modified Files:
	gmpc.spec 
Log Message:
auto-import gmpc-0.11.2-0.fdr.1.2 on branch FC-2 from gmpc-0.11.2-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: gmpc.spec
===================================================================
RCS file: /cvs/extras/rpms/gmpc/FC-2/gmpc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gmpc.spec	10 Dec 2004 22:03:03 -0000	1.2
+++ gmpc.spec	3 Mar 2005 16:40:40 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           gmpc
 Summary:        GNOME frontend for the MPD
 Version:        0.11.2
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 License:        GPL
 Group:          Applications/Multimedia



From fedora-extras-commits at redhat.com  Thu Mar  3 16:41:56 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:41:56 -0500
Subject: rpms/jasper import.log,1.2,1.3
Message-ID: <200503031641.j23GfuRU006865@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import jasper-1.701.0-0.fdr.3.2 on branch FC-2 from jasper-1.701.0-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/jasper/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Dec 2004 16:40:10 -0000	1.2
+++ import.log	3 Mar 2005 16:41:54 -0000	1.3
@@ -1 +1,2 @@
 jasper-1_701_0-0_fdr_3_2:HEAD:jasper-1.701.0-0.fdr.3.2.src.rpm:1102524071
+jasper-1_701_0-0_fdr_3_2:FC-2:jasper-1.701.0-0.fdr.3.2.src.rpm:1109868122



From fedora-extras-commits at redhat.com  Thu Mar  3 16:41:56 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:41:56 -0500
Subject: rpms/jasper/FC-2 jasper.spec,1.2,1.3
Message-ID: <200503031641.j23GfupQ006869@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/jasper/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6856/FC-2

Modified Files:
	jasper.spec 
Log Message:
auto-import jasper-1.701.0-0.fdr.3.2 on branch FC-2 from jasper-1.701.0-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-2/jasper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jasper.spec	10 Dec 2004 22:03:04 -0000	1.2
+++ jasper.spec	3 Mar 2005 16:41:54 -0000	1.3
@@ -12,7 +12,7 @@
 Group:	 System Environment/Libraries
 Epoch:	 0
 Version: 1.701.0
-Release: 3%{?dist_tag}
+Release: 0.fdr.3%{?dist_tag}.2
 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



From fedora-extras-commits at redhat.com  Thu Mar  3 16:43:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:43:05 -0500
Subject: rpms/kile-i18n import.log,1.2,1.3
Message-ID: <200503031643.j23Gh5Dw007016@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/kile-i18n
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7004

Modified Files:
	import.log 
Log Message:
auto-import kile-i18n-1.7-0.fdr.3.2 on branch FC-2 from kile-i18n-1.7-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kile-i18n/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	13 Jan 2005 15:39:01 -0000	1.2
+++ import.log	3 Mar 2005 16:43:03 -0000	1.3
@@ -1 +1,2 @@
 kile-i18n-1_7-3:HEAD:kile-i18n-1.7-3.src.rpm:1105630781
+kile-i18n-1_7-0_fdr_3_2:FC-2:kile-i18n-1.7-0.fdr.3.2.src.rpm:1109868191



From fedora-extras-commits at redhat.com  Thu Mar  3 16:43:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:43:05 -0500
Subject: rpms/kile-i18n/FC-2 kile-i18n.spec,1.1,1.2
Message-ID: <200503031643.j23Gh5gi007017@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/kile-i18n/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7004/FC-2

Modified Files:
	kile-i18n.spec 
Log Message:
auto-import kile-i18n-1.7-0.fdr.3.2 on branch FC-2 from kile-i18n-1.7-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: kile-i18n.spec
===================================================================
RCS file: /cvs/extras/rpms/kile-i18n/FC-2/kile-i18n.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kile-i18n.spec	13 Jan 2005 15:39:01 -0000	1.1
+++ kile-i18n.spec	3 Mar 2005 16:43:03 -0000	1.2
@@ -4,7 +4,7 @@
 Name: 	 kile-i18n 
 Group:	 Applications/Office
 Version: 1.7
-Release: 3
+Release: 0.fdr.3.2
 Source:  http://dl.sourceforge.net/sourceforge/kile/kile-i18n-1.7.tar.bz2 
 URL:     http://kile.sourceforge.net/
 License: GPL
@@ -73,7 +73,7 @@
 
 
 %changelog
-* Wed Nov 21 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.7-3
+* Wed Nov 21 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.7-0.fdr.3
 - BR: gettext
 
 * Tue Nov 20 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.7-0.fdr.2



From fedora-extras-commits at redhat.com  Thu Mar  3 16:44:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:44:05 -0500
Subject: rpms/libassuan import.log,1.4,1.5
Message-ID: <200503031644.j23Gi5sS007140@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import libassuan-0.6.7-0.fdr.3.2 on branch FC-2 from libassuan-0.6.7-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libassuan/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 16:32:50 -0000	1.4
+++ import.log	3 Mar 2005 16:44:03 -0000	1.5
@@ -1,3 +1,4 @@
 libassuan-0_6_7-0_fdr_3_2:HEAD:libassuan-0.6.7-0.fdr.3.2.src.rpm:1102524362
 libassuan-0_6_9-1:HEAD:libassuan-0.6.9-1.src.rpm:1107286225
 libassuan-0_6_7-0_fdr_3_1:FC-1:libassuan-0.6.7-0.fdr.3.1.src.rpm:1109867578
+libassuan-0_6_7-0_fdr_3_2:FC-2:libassuan-0.6.7-0.fdr.3.2.src.rpm:1109868252



From fedora-extras-commits at redhat.com  Thu Mar  3 16:44:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:44:05 -0500
Subject: rpms/libassuan/FC-2 libassuan-0.6.7.tar.gz.sig, 1.2, 1.3 .cvsignore,
	1.3, 1.4 libassuan.spec, 1.4, 1.5 sources, 1.3,
	1.4 libassuan-0.6.9.tar.gz.sig, 1.1, NONE
Message-ID: <200503031644.j23Gi5wK007144@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libassuan/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7131/FC-2

Modified Files:
	.cvsignore libassuan.spec sources 
Added Files:
	libassuan-0.6.7.tar.gz.sig 
Removed Files:
	libassuan-0.6.9.tar.gz.sig 
Log Message:
auto-import libassuan-0.6.7-0.fdr.3.2 on branch FC-2 from libassuan-0.6.7-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: libassuan-0.6.7.tar.gz.sig
===================================================================
RCS file: libassuan-0.6.7.tar.gz.sig
diff -N libassuan-0.6.7.tar.gz.sig
Binary files /dev/null and /tmp/cvsUo5yva differ


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-2/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2005 19:30:20 -0000	1.3
+++ .cvsignore	3 Mar 2005 16:44:03 -0000	1.4
@@ -1 +1 @@
-libassuan-0.6.9.tar.gz
+libassuan-0.6.7.tar.gz


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-2/libassuan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libassuan.spec	3 Feb 2005 12:34:21 -0000	1.4
+++ libassuan.spec	3 Mar 2005 16:44:03 -0000	1.5
@@ -1,10 +1,10 @@
 
 Summary: GnuPG IPC library 
 Name:	 libassuan
-Version: 0.6.9
-Release: 2%{?dist_tag}
-Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz
-Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig
+Version: 0.6.7
+Release: 0.fdr.3%{?dist_tag}.2
+Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz
+Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz.sig
 URL:	 http://www.gnupg.org/
 License: GPL
 Group: 	 System Environment/Libraries
@@ -33,7 +33,7 @@
 %build
 %configure
 
-make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
@@ -79,12 +79,6 @@
 
 
 %changelog
-* Thu Feb  3 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.6.9-2
-- Build PIC to fix x86_64 linking.
-
-* Thu Jan 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.6.9-1
-- 0.6.9
-
 * Sat Oct 23 2004 Rex Dieter <rexdieter[AT]users.sf.net> - 0.6.7-0.fdr.3
 - *really* fix description this time.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-2/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2005 19:30:20 -0000	1.3
+++ sources	3 Mar 2005 16:44:03 -0000	1.4
@@ -1 +1 @@
-7f8aff75d034159b84faf2358263f444  libassuan-0.6.9.tar.gz
+db4e6939fafbaae80cab11a67f28771d  libassuan-0.6.7.tar.gz


--- libassuan-0.6.9.tar.gz.sig DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 16:45:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:45:42 -0500
Subject: rpms/libsigsegv import.log,1.2,1.3
Message-ID: <200503031645.j23GjgaI007316@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import libsigsegv-2.1-0.fdr.2.2 on branch FC-2 from libsigsegv-2.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Dec 2004 16:49:10 -0000	1.2
+++ import.log	3 Mar 2005 16:45:40 -0000	1.3
@@ -1 +1,2 @@
 libsigsegv-2_1-0_fdr_2_2:HEAD:libsigsegv-2.1-0.fdr.2.2.src.rpm:1102524610
+libsigsegv-2_1-0_fdr_2_2:FC-2:libsigsegv-2.1-0.fdr.2.2.src.rpm:1109868348



From fedora-extras-commits at redhat.com  Thu Mar  3 16:45:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:45:42 -0500
Subject: rpms/libsigsegv/FC-2 libsigsegv.spec,1.2,1.3
Message-ID: <200503031645.j23Gjgoo007320@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsigsegv/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7307/FC-2

Modified Files:
	libsigsegv.spec 
Log Message:
auto-import libsigsegv-2.1-0.fdr.2.2 on branch FC-2 from libsigsegv-2.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-2/libsigsegv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libsigsegv.spec	10 Dec 2004 22:03:06 -0000	1.2
+++ libsigsegv.spec	3 Mar 2005 16:45:40 -0000	1.3
@@ -4,7 +4,7 @@
 Name:    libsigsegv
 Epoch:	 0
 Version: 2.1
-Release: 2%{?dist_tag}
+Release: 0.fdr.2%{?dist_tag}.2
 License: GPL	
 URL:	 http://libsigsegv.sourceforge.net/
 Source:  ftp://ftp.gnu.org/pub/gnu/libsigsegv/libsigsegv-2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 16:46:56 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:46:56 -0500
Subject: rpms/proj import.log,1.4,1.5
Message-ID: <200503031646.j23Gkuc3007460@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import proj-4.4.8-0.fdr.4.2 on branch FC-2 from proj-4.4.8-0.fdr.4.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/proj/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 16:34:34 -0000	1.4
+++ import.log	3 Mar 2005 16:46:54 -0000	1.5
@@ -1,3 +1,4 @@
 proj-4_4_8-4:HEAD:proj-4.4.8-4.src.rpm:1105695966
 proj-4_4_8-0_fdr_4_rh90:RHL-9:proj-4.4.8-0.fdr.4.rh90.src.rpm:1109748255
 proj-4_4_8-0_fdr_4_1:FC-1:proj-4.4.8-0.fdr.4.1.src.rpm:1109867681
+proj-4_4_8-0_fdr_4_2:FC-2:proj-4.4.8-0.fdr.4.2.src.rpm:1109868421



From fedora-extras-commits at redhat.com  Thu Mar  3 16:46:56 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:46:56 -0500
Subject: rpms/proj/FC-2 proj.spec,1.1,1.2
Message-ID: <200503031646.j23Gku2N007463@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/proj/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7450/FC-2

Modified Files:
	proj.spec 
Log Message:
auto-import proj-4.4.8-0.fdr.4.2 on branch FC-2 from proj-4.4.8-0.fdr.4.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: proj.spec
===================================================================
RCS file: /cvs/extras/rpms/proj/FC-2/proj.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proj.spec	14 Jan 2005 09:45:21 -0000	1.1
+++ proj.spec	3 Mar 2005 16:46:54 -0000	1.2
@@ -1,6 +1,10 @@
-Name: proj
-Version: 4.4.8
-Release: 4
+%define name proj
+%define version 4.4.8
+%define release 0.fdr.4
+
+Name: %name
+Version: %version
+Release: %release.2
 Epoch: 0
 Summary: Cartographic projection software (PROJ.4)
 
@@ -89,13 +93,13 @@
 %{_datadir}/%{name}
 
 %changelog
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-4
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.4
 - Added testvarious to nad distribution
 
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-0.fdr.3
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.3
 - Added patch for test scripts so that they will work in installed rpm
 
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-0.fdr.2
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.2
 - Fixed permissions on nad27 and nad83
 - Included test27 and test83 in the nad rpm and made them executable
 



From fedora-extras-commits at redhat.com  Thu Mar  3 16:47:40 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:47:40 -0500
Subject: rpms/qca import.log,1.2,1.3
Message-ID: <200503031647.j23Glen5007572@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import qca-1.0-0.fdr.3.2 on branch FC-2 from qca-1.0-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qca/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	13 Jan 2005 18:24:21 -0000	1.2
+++ import.log	3 Mar 2005 16:47:38 -0000	1.3
@@ -1 +1,2 @@
 qca-1_0-3:HEAD:qca-1.0-3.src.rpm:1105640702
+qca-1_0-0_fdr_3_2:FC-2:qca-1.0-0.fdr.3.2.src.rpm:1109868466



From fedora-extras-commits at redhat.com  Thu Mar  3 16:47:40 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:47:40 -0500
Subject: rpms/qca/FC-2 qca.spec,1.1,1.2
Message-ID: <200503031647.j23GleJ3007576@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/qca/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7563/FC-2

Modified Files:
	qca.spec 
Log Message:
auto-import qca-1.0-0.fdr.3.2 on branch FC-2 from qca-1.0-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: qca.spec
===================================================================
RCS file: /cvs/extras/rpms/qca/FC-2/qca.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qca.spec	13 Jan 2005 18:24:21 -0000	1.1
+++ qca.spec	3 Mar 2005 16:47:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           qca
 Version:        1.0
-Release:        3
+Release:        0.fdr.3.2
 Epoch:          0
 Summary:        Qt Cryptographic Architecture
 
@@ -68,7 +68,7 @@
 
 
 %changelog
-* Thu Jan 13 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0-3
+* Thu Jan 13 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0-0.fdr.3
 - fix Category
 - fix build on x86_64
 



From fedora-extras-commits at redhat.com  Thu Mar  3 16:48:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:48:42 -0500
Subject: rpms/shapelib import.log,1.4,1.5
Message-ID: <200503031648.j23GmgPE007689@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import shapelib-1.2.10-0.fdr.5.2 on branch FC-2 from shapelib-1.2.10-0.fdr.5.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/shapelib/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 16:33:48 -0000	1.4
+++ import.log	3 Mar 2005 16:48:40 -0000	1.5
@@ -1,3 +1,4 @@
 shapelib-1_2_10-5:HEAD:shapelib-1.2.10-5.src.rpm:1105696087
 shapelib-1_2_10-0_fdr_5_rh90:RHL-9:shapelib-1.2.10-0.fdr.5.rh90.src.rpm:1109748327
 shapelib-1_2_10-0_fdr_5_1:FC-1:shapelib-1.2.10-0.fdr.5.1.src.rpm:1109867635
+shapelib-1_2_10-0_fdr_5_2:FC-2:shapelib-1.2.10-0.fdr.5.2.src.rpm:1109868527



From fedora-extras-commits at redhat.com  Thu Mar  3 16:48:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:48:42 -0500
Subject: rpms/shapelib/FC-2 shapelib-1.2.10.patch, 1.2, 1.3 shapelib.spec,
	1.2, 1.3 shapelib-1.2.10-endian.patch, 1.1, NONE
Message-ID: <200503031648.j23GmgPT007692@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/shapelib/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7679/FC-2

Modified Files:
	shapelib-1.2.10.patch shapelib.spec 
Removed Files:
	shapelib-1.2.10-endian.patch 
Log Message:
auto-import shapelib-1.2.10-0.fdr.5.2 on branch FC-2 from shapelib-1.2.10-0.fdr.5.2.src.rpm
Bring in stuff from fedora.us FC2/stable

shapelib-1.2.10.patch:

Index: shapelib-1.2.10.patch
===================================================================
RCS file: /cvs/extras/rpms/shapelib/FC-2/shapelib-1.2.10.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib-1.2.10.patch	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib-1.2.10.patch	3 Mar 2005 16:48:40 -0000	1.3
@@ -91,8 +91,7 @@
  
  # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN
 +CC = gcc
--ENDIAN	=	-D_LITTLE_ENDIAN
-+#ENDIAN	=	-D_LITTLE_ENDIAN
+ ENDIAN	=	-D_LITTLE_ENDIAN
  
 -CFLAGS	=	-g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
 +EXTRACFLAGS   =      -g


Index: shapelib.spec
===================================================================
RCS file: /cvs/extras/rpms/shapelib/FC-2/shapelib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib.spec	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib.spec	3 Mar 2005 16:48:40 -0000	1.3
@@ -2,12 +2,11 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.2.10
-Release: 6
+Release: 0.fdr.5.2
 Epoch: 0
 URL: http://shapelib.maptools.org/
 Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz
 Patch0: shapelib-%{version}.patch
-Patch1: shapelib-1.2.10-endian.patch
 License: LGPL/MIT
 Group: Development/Libraries
 Buildrequires: libtool
@@ -31,7 +30,6 @@
 %prep
 %setup -q -T -b 0
 %patch -p1 -b .buildroot 
-%patch1 -p1 -b .endian
 
 %build
 make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" lib
@@ -72,10 +70,7 @@
 %exclude %{_libdir}/libshp.la
 
 %changelog
-* Sun Feb 13 2005 David Woodhouse <dwmw2 at infradead.org> 0:1.2.10-6
-- Don't hard-code endianness; just use endian.h
-
-* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:1.2.10-5
+* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:1.2.10-0.fdr.5
 - Patched patch and spec file according to suggestions of Michael Schwendt
 - In particular, this separates the building from the installing in the rpm.
 


--- shapelib-1.2.10-endian.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 16:49:27 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:49:27 -0500
Subject: rpms/zope import.log,1.3,1.4
Message-ID: <200503031649.j23GnRqd007800@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import zope-2.7.4-0.fdr.1.2 on branch FC-2 from zope-2.7.4-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/zope/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	29 Jan 2005 22:57:17 -0000	1.3
+++ import.log	3 Mar 2005 16:49:25 -0000	1.4
@@ -1,2 +1,3 @@
 zope-2_7_3-6:HEAD:zope-2.7.3-6.src.rpm:1105272558
 zope-2_7_4-1:HEAD:zope-2.7.4-1.src.rpm:1107039430
+zope-2_7_4-0_fdr_1_2:FC-2:zope-2.7.4-0.fdr.1.2.src.rpm:1109868572



From fedora-extras-commits at redhat.com  Thu Mar  3 16:49:27 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:49:27 -0500
Subject: rpms/zope/FC-2 zope.spec,1.2,1.3
Message-ID: <200503031649.j23GnRLF007805@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/zope/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7791/FC-2

Modified Files:
	zope.spec 
Log Message:
auto-import zope-2.7.4-0.fdr.1.2 on branch FC-2 from zope-2.7.4-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-2/zope.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zope.spec	29 Jan 2005 22:57:17 -0000	1.2
+++ zope.spec	3 Mar 2005 16:49:25 -0000	1.3
@@ -13,7 +13,7 @@
 Name: 	 zope
 Summary: Web application server for flexible content management applications
 Version: 2.7.4
-Release: 1
+Release: 0.fdr.1.2
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:	 http://www.zope.org/
@@ -180,7 +180,7 @@
 
 
 %changelog
-* Wed Jan 26 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.4-1
+* Wed Jan 26 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.4-0.fdr.1
 - version 2.7.4
 - flag the documentation as %%doc
 - make %%zope_home go+rx to allow users to create instances and to allow



From fedora-extras-commits at redhat.com  Thu Mar  3 17:53:12 2005
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Thu, 3 Mar 2005 12:53:12 -0500
Subject: rpms/libfwbuilder/FC-3 .cvsignore, 1.2, 1.3 libfwbuilder.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200503031753.j23HrCdA008849@cvs-int.fedora.redhat.com>

Author: sgrubb

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

Modified Files:
	.cvsignore libfwbuilder.spec sources 
Log Message:
* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jan 2005 05:37:37 -0000	1.2
+++ .cvsignore	3 Mar 2005 17:53:10 -0000	1.3
@@ -1 +1,2 @@
 libfwbuilder-2.0.5.tar.gz
+libfwbuilder-2.0.6.tar.gz


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/FC-3/libfwbuilder.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libfwbuilder.spec	9 Feb 2005 07:51:11 -0000	1.3
+++ libfwbuilder.spec	3 Mar 2005 17:53:10 -0000	1.4
@@ -1,7 +1,7 @@
 Name:           libfwbuilder
 Summary: 	Firewall Builder API
-Version:        2.0.5
-Release:        3
+Version:        2.0.6
+Release:        1
 License: 	GPL
 Group:  	System Environment/Libraries
 Url: 		http://www.fwbuilder.org/
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
+- New upstream version
+
 * Sun Feb  6 2005 Ville Skytt?? <ville.skytta at iki.fi> - 2.0.5-3
 - Remove extra quotes from Group tag in -devel.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jan 2005 05:37:37 -0000	1.2
+++ sources	3 Mar 2005 17:53:10 -0000	1.3
@@ -1 +1,2 @@
 7fe07b07e13d21e20d10185276c2318e  libfwbuilder-2.0.5.tar.gz
+d53a69f5774fc987779ac0df4e54beb6  libfwbuilder-2.0.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 17:55:28 2005
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Thu, 3 Mar 2005 12:55:28 -0500
Subject: rpms/fwbuilder/FC-3 .cvsignore, 1.2, 1.3 fwbuilder.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200503031755.j23HtS2m008956@cvs-int.fedora.redhat.com>

Author: sgrubb

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

Modified Files:
	.cvsignore fwbuilder.spec sources 
Log Message:
* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jan 2005 05:40:01 -0000	1.2
+++ .cvsignore	3 Mar 2005 17:55:26 -0000	1.3
@@ -1 +1,2 @@
 fwbuilder-2.0.5.tar.gz
+fwbuilder-2.0.6.tar.gz


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-3/fwbuilder.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fwbuilder.spec	23 Jan 2005 16:54:41 -0000	1.3
+++ fwbuilder.spec	3 Mar 2005 17:55:26 -0000	1.4
@@ -152,6 +152,9 @@
 %{_mandir}/man1/fwb_ipt.1*
 
 %changelog
+* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
+- New upstream version
+
 * Sun Jan 23 2005 Warren Togami <wtogami at redhat.com> 2.0.5-3
 - Typo fix (#145887 Stefan Hoelldampf) 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jan 2005 05:40:01 -0000	1.2
+++ sources	3 Mar 2005 17:55:26 -0000	1.3
@@ -1 +1,2 @@
 03fe6aaa6f8c7728bd3015a4df187c70  fwbuilder-2.0.5.tar.gz
+41554801c43e14a48b19ade91e5a14cd  fwbuilder-2.0.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 18:05:01 2005
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Thu, 3 Mar 2005 13:05:01 -0500
Subject: rpms/libfwbuilder/devel .cvsignore, 1.2, 1.3 libfwbuilder.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200503031805.j23I51fe009782@cvs-int.fedora.redhat.com>

Author: sgrubb

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

Modified Files:
	.cvsignore libfwbuilder.spec sources 
Log Message:
* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jan 2005 05:37:37 -0000	1.2
+++ .cvsignore	3 Mar 2005 18:04:58 -0000	1.3
@@ -1 +1,2 @@
 libfwbuilder-2.0.5.tar.gz
+libfwbuilder-2.0.6.tar.gz


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libfwbuilder.spec	9 Feb 2005 07:51:11 -0000	1.3
+++ libfwbuilder.spec	3 Mar 2005 18:04:58 -0000	1.4
@@ -1,7 +1,7 @@
 Name:           libfwbuilder
 Summary: 	Firewall Builder API
-Version:        2.0.5
-Release:        3
+Version:        2.0.6
+Release:        1
 License: 	GPL
 Group:  	System Environment/Libraries
 Url: 		http://www.fwbuilder.org/
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
+- New upstream version
+
 * Sun Feb  6 2005 Ville Skytt?? <ville.skytta at iki.fi> - 2.0.5-3
 - Remove extra quotes from Group tag in -devel.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jan 2005 05:37:37 -0000	1.2
+++ sources	3 Mar 2005 18:04:58 -0000	1.3
@@ -1 +1,2 @@
 7fe07b07e13d21e20d10185276c2318e  libfwbuilder-2.0.5.tar.gz
+d53a69f5774fc987779ac0df4e54beb6  libfwbuilder-2.0.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 18:05:59 2005
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Thu, 3 Mar 2005 13:05:59 -0500
Subject: rpms/fwbuilder/devel .cvsignore, 1.2, 1.3 fwbuilder.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200503031805.j23I5xQF009823@cvs-int.fedora.redhat.com>

Author: sgrubb

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

Modified Files:
	.cvsignore fwbuilder.spec sources 
Log Message:
* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jan 2005 05:40:01 -0000	1.2
+++ .cvsignore	3 Mar 2005 18:05:57 -0000	1.3
@@ -1 +1,2 @@
 fwbuilder-2.0.5.tar.gz
+fwbuilder-2.0.6.tar.gz


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fwbuilder.spec	23 Jan 2005 16:54:41 -0000	1.3
+++ fwbuilder.spec	3 Mar 2005 18:05:57 -0000	1.4
@@ -152,6 +152,9 @@
 %{_mandir}/man1/fwb_ipt.1*
 
 %changelog
+* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
+- New upstream version
+
 * Sun Jan 23 2005 Warren Togami <wtogami at redhat.com> 2.0.5-3
 - Typo fix (#145887 Stefan Hoelldampf) 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jan 2005 05:40:01 -0000	1.2
+++ sources	3 Mar 2005 18:05:57 -0000	1.3
@@ -1 +1,2 @@
 03fe6aaa6f8c7728bd3015a4df187c70  fwbuilder-2.0.5.tar.gz
+41554801c43e14a48b19ade91e5a14cd  fwbuilder-2.0.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 18:08:59 2005
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Thu, 3 Mar 2005 13:08:59 -0500
Subject: rpms/fwbuilder/devel fwbuilder.spec,1.4,1.5
Message-ID: <200503031808.j23I8x2N009866@cvs-int.fedora.redhat.com>

Author: sgrubb

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

Modified Files:
	fwbuilder.spec 
Log Message:
* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
- New upstream version



Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fwbuilder.spec	3 Mar 2005 18:05:57 -0000	1.4
+++ fwbuilder.spec	3 Mar 2005 18:08:57 -0000	1.5
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
-Version:        2.0.5
-Release:        3
+Version:        2.0.6
+Release:        1
 License:        GPL
 Group:          Applications/System
 URL:            http://www.fwbuilder.org/
@@ -10,7 +10,7 @@
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  qt-devel >= 1:3.0.0
 BuildRequires:	desktop-file-utils
-BuildRequires:  libfwbuilder-devel = 2.0.5
+BuildRequires:  libfwbuilder-devel = 2.0.6
 
 %description
 Firewall Builder consists of a GUI and set of policy compilers for



From bugs.michael at gmx.net  Thu Mar  3 18:34:06 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 19:34:06 +0100
Subject: rpms/proj/FC-2 proj.spec,1.1,1.2
In-Reply-To: <200503031646.j23Gku2N007463@cvs-int.fedora.redhat.com>
References: <200503031646.j23Gku2N007463@cvs-int.fedora.redhat.com>
Message-ID: <20050303193406.0d5262b6.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 11:46:56 -0500, Michael Schwendt (mschwendt) wrote:

>  %changelog
> -* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-4
> +* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.4
>  - Added testvarious to nad distribution

To those people who have been paying attention, above change is the result
of an auto-imported src.rpm. The 4.4.8-4 release for FC-3 was fixed after
initial import. The older packages from fedora.us still contain that crap
in the changelog.



From fedora-extras-commits at redhat.com  Thu Mar  3 18:46:55 2005
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Thu, 3 Mar 2005 13:46:55 -0500
Subject: rpms/fwbuilder/FC-3 fwbuilder.spec,1.4,1.5
Message-ID: <200503031846.j23IktI0009958@cvs-int.fedora.redhat.com>

Author: sgrubb

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

Modified Files:
	fwbuilder.spec 
Log Message:
Correct version number



Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-3/fwbuilder.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fwbuilder.spec	3 Mar 2005 17:55:26 -0000	1.4
+++ fwbuilder.spec	3 Mar 2005 18:46:53 -0000	1.5
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
-Version:        2.0.5
-Release:        3
+Version:        2.0.6
+Release:        1
 License:        GPL
 Group:          Applications/System
 URL:            http://www.fwbuilder.org/
@@ -10,7 +10,7 @@
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  qt-devel >= 1:3.0.0
 BuildRequires:	desktop-file-utils
-BuildRequires:  libfwbuilder-devel = 2.0.5
+BuildRequires:  libfwbuilder-devel = 2.0.6
 
 %description
 Firewall Builder consists of a GUI and set of policy compilers for



From fedora-extras-commits at redhat.com  Thu Mar  3 18:58:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 13:58:38 -0500
Subject: rpms/vice/RHL-9 .cvsignore, 1.2, NONE Makefile, 1.2, NONE branch,
	1.1, NONE sources, 1.2, NONE vice-1.14-mkstemp.patch, 1.1,
	NONE vice.spec, 1.1, NONE
Message-ID: <200503031858.j23IwcUW010109@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/vice/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10085/RHL-9

Removed Files:
	.cvsignore Makefile branch sources vice-1.14-mkstemp.patch 
	vice.spec 
Log Message:
Delete also the other branches because of legal concerns.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- vice-1.14-mkstemp.patch DELETED ---


--- vice.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 18:58:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 13:58:38 -0500
Subject: rpms/vice/FC-1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE branch, 1.1,
	NONE sources, 1.2, NONE vice-1.14-mkstemp.patch, 1.1,
	NONE vice.spec, 1.2, NONE
Message-ID: <200503031858.j23IwcRt010100@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/vice/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10085/FC-1

Removed Files:
	.cvsignore Makefile branch sources vice-1.14-mkstemp.patch 
	vice.spec 
Log Message:
Delete also the other branches because of legal concerns.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- vice-1.14-mkstemp.patch DELETED ---


--- vice.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 18:58:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 13:58:38 -0500
Subject: rpms/vice/FC-2 .cvsignore, 1.2, NONE Makefile, 1.2, NONE branch, 1.1,
	NONE sources, 1.2, NONE vice-1.14-mkstemp.patch, 1.1,
	NONE vice.spec, 1.3, NONE
Message-ID: <200503031858.j23IwcnI010103@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/vice/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10085/FC-2

Removed Files:
	.cvsignore Makefile branch sources vice-1.14-mkstemp.patch 
	vice.spec 
Log Message:
Delete also the other branches because of legal concerns.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- vice-1.14-mkstemp.patch DELETED ---


--- vice.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 18:58:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 13:58:38 -0500
Subject: rpms/vice/FC-3 branch,1.1,NONE
Message-ID: <200503031858.j23IwcwJ010106@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Removed Files:
	branch 
Log Message:
Delete also the other branches because of legal concerns.


--- branch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 18:59:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 13:59:21 -0500
Subject: rpms/k3b-ape/FC-1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE branch,
	1.1, NONE k3b-ape.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <200503031859.j23IxLts010191@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/k3b-ape/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10179/FC-1

Removed Files:
	.cvsignore Makefile branch k3b-ape.spec sources 
Log Message:
Removed also older branches due to licence conflicts and hence legal
concerns. Author of included SDK could not be reached after several
attempts at contacting him by e-mail and in his message board. Recent
mails bounced:

    /bin/sh: line 1: /dev/null: Permission denied
    I'm not going to try again; this message has been in the queue too long.

Plans on changing the licence of the SDK to either LGPL or GPL
don't seem to move forward either.



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- k3b-ape.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 18:59:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 13:59:21 -0500
Subject: rpms/k3b-ape/RHL-9 .cvsignore, 1.2, NONE Makefile, 1.2, NONE branch,
	1.1, NONE k3b-ape.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200503031859.j23IxLvC010197@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/k3b-ape/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10179/RHL-9

Removed Files:
	.cvsignore Makefile branch k3b-ape.spec sources 
Log Message:
Removed also older branches due to licence conflicts and hence legal
concerns. Author of included SDK could not be reached after several
attempts at contacting him by e-mail and in his message board. Recent
mails bounced:

    /bin/sh: line 1: /dev/null: Permission denied
    I'm not going to try again; this message has been in the queue too long.

Plans on changing the licence of the SDK to either LGPL or GPL
don't seem to move forward either.



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- k3b-ape.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 18:59:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 13:59:21 -0500
Subject: rpms/k3b-ape/FC-2 .cvsignore, 1.2, NONE Makefile, 1.2, NONE branch,
	1.1, NONE k3b-ape.spec, 1.3, NONE sources, 1.2, NONE
Message-ID: <200503031859.j23IxLps010194@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/k3b-ape/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10179/FC-2

Removed Files:
	.cvsignore Makefile branch k3b-ape.spec sources 
Log Message:
Removed also older branches due to licence conflicts and hence legal
concerns. Author of included SDK could not be reached after several
attempts at contacting him by e-mail and in his message board. Recent
mails bounced:

    /bin/sh: line 1: /dev/null: Permission denied
    I'm not going to try again; this message has been in the queue too long.

Plans on changing the licence of the SDK to either LGPL or GPL
don't seem to move forward either.



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- k3b-ape.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 19:01:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:01:05 -0500
Subject: rpms/ccid import.log,1.2,1.3
Message-ID: <200503031901.j23J15bT010898@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import ccid-0.4.1-0.fdr.4.2 on branch FC-2 from ccid-0.4.1-0.fdr.4.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ccid/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	25 Feb 2005 20:09:05 -0000	1.2
+++ import.log	3 Mar 2005 19:01:03 -0000	1.3
@@ -1 +1,2 @@
 ccid-0_4_1-4:HEAD:ccid-0.4.1-4.src.rpm:1109362138
+ccid-0_4_1-0_fdr_4_2:FC-2:ccid-0.4.1-0.fdr.4.2.src.rpm:1109876470



From fedora-extras-commits at redhat.com  Thu Mar  3 19:01:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:01:05 -0500
Subject: rpms/ccid/FC-2 ccid.spec,1.2,1.3
Message-ID: <200503031901.j23J15Ur010903@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/ccid/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10889/FC-2

Modified Files:
	ccid.spec 
Log Message:
auto-import ccid-0.4.1-0.fdr.4.2 on branch FC-2 from ccid-0.4.1-0.fdr.4.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: ccid.spec
===================================================================
RCS file: /cvs/extras/rpms/ccid/FC-2/ccid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ccid.spec	25 Feb 2005 20:22:00 -0000	1.2
+++ ccid.spec	3 Mar 2005 19:01:03 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           ccid
 Version:        0.4.1
-Release:        4
-Summary:        Generic USB CCID smart card reader driver
+Release:        0.fdr.4.2
+Summary:        Generic USB CCID driver
 
 Group:          System Environment/Libraries
 License:        GPL
@@ -24,7 +24,7 @@
 
 
 %build
-%configure --disable-dependency-tracking \
+%configure \
   --enable-usbdropdir=%{_libdir}/pcsc/drivers \
   --enable-ccidtwindir=%{_libdir}/pcsc/drivers/serial
 make %{?_smp_mflags}
@@ -57,10 +57,8 @@
 
 
 %changelog
-* Fri Feb 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.4.1-4
+* Fri Feb 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.4.1-0.fdr.4
 - Drop Epoch: 0.
-- Improve summary.
-- Build with dependency tracking disabled.
 
 * Thu Jul  1 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.4.1-0.fdr.3
 - Restart pcscd in post(un)install phase if it's available and running.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:01:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:01:55 -0500
Subject: rpms/i810switch import.log,1.3,1.4
Message-ID: <200503031901.j23J1tql011076@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import i810switch-0.6.2-0.fdr.3.2 on branch FC-2 from i810switch-0.6.2-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/i810switch/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:10:30 -0000	1.3
+++ import.log	3 Mar 2005 19:01:53 -0000	1.4
@@ -1,2 +1,3 @@
 i810switch-0_6_2-3:HEAD:i810switch-0.6.2-3.src.rpm:1106671753
 i810switch-0_6_2-0_fdr_3_rh90:RHL-9:i810switch-0.6.2-0.fdr.3.rh90.src.rpm:1109747422
+i810switch-0_6_2-0_fdr_3_2:FC-2:i810switch-0.6.2-0.fdr.3.2.src.rpm:1109876521



From fedora-extras-commits at redhat.com  Thu Mar  3 19:01:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:01:55 -0500
Subject: rpms/i810switch/FC-2 i810switch.spec,1.1,1.2
Message-ID: <200503031901.j23J1t4K011079@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/i810switch/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11066/FC-2

Modified Files:
	i810switch.spec 
Log Message:
auto-import i810switch-0.6.2-0.fdr.3.2 on branch FC-2 from i810switch-0.6.2-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/FC-2/i810switch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- i810switch.spec	25 Jan 2005 16:49:20 -0000	1.1
+++ i810switch.spec	3 Mar 2005 19:01:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.2
-Release: 3
+Release: 0.fdr.3.2
 Epoch: 0
 Summary: A utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -40,7 +40,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Tue Jan 18 2005 David Kaplan <dmk at localhost.localdomain> - 0:0.6.2-3
+* Tue Jan 18 2005 David Kaplan <dmk at localhost.localdomain> - 0:0.6.2-0.fdr.3
 - Added back INSTALL file to rpm because it explains how to SUID root
   the executable so that all users can use i810switch.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:02:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:02:42 -0500
Subject: rpms/mpc/FC-2 mpc.spec,1.2,1.3
Message-ID: <200503031902.j23J2gID011191@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/mpc/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11178/FC-2

Modified Files:
	mpc.spec 
Log Message:
auto-import mpc-0.11.1-0.fdr.2.2 on branch FC-2 from mpc-0.11.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: mpc.spec
===================================================================
RCS file: /cvs/extras/rpms/mpc/FC-2/mpc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mpc.spec	12 Dec 2004 21:23:43 -0000	1.2
+++ mpc.spec	3 Mar 2005 19:02:40 -0000	1.3
@@ -1,7 +1,7 @@
 Name:             mpc
 Summary:          Command-line client for MPD
 Version:          0.11.1
-Release:          2
+Release:          0.fdr.2.2
 Epoch:            0
 License:          GPL
 Group:            Applications/Multimedia
@@ -47,7 +47,7 @@
 
 
 %changelog
-* Wed Dec 08 2004 Aurelien Bompard <gauret[AT]free.fr> 0:0.11.1-2
+* Wed Dec 08 2004 Aurelien Bompard <gauret[AT]free.fr> 0:0.11.1-0.fdr.2
 - put the bash_completion file in %%_datadir instead of %%_docdir
 
 * Fri Nov 05 2004 Aurelien Bompard <gauret[AT]free.fr> 0:0.11.1-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:02:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:02:42 -0500
Subject: rpms/mpc import.log,1.2,1.3
Message-ID: <200503031902.j23J2gtB011187@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import mpc-0.11.1-0.fdr.2.2 on branch FC-2 from mpc-0.11.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mpc/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Dec 2004 21:12:03 -0000	1.2
+++ import.log	3 Mar 2005 19:02:40 -0000	1.3
@@ -1 +1,2 @@
 mpc-0_11_1-0_fdr_2_2:HEAD:mpc-0.11.1-0.fdr.2.2.src.rpm:1102885915
+mpc-0_11_1-0_fdr_2_2:FC-2:mpc-0.11.1-0.fdr.2.2.src.rpm:1109876568



From fedora-extras-commits at redhat.com  Thu Mar  3 19:03:59 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:03:59 -0500
Subject: rpms/pcsc-lite import.log,1.2,1.3
Message-ID: <200503031903.j23J3xwl011337@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-lite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11323

Modified Files:
	import.log 
Log Message:
auto-import pcsc-lite-1.2.0-0.fdr.10.2 on branch FC-2 from pcsc-lite-1.2.0-0.fdr.10.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	7 Jan 2005 19:57:18 -0000	1.2
+++ import.log	3 Mar 2005 19:03:57 -0000	1.3
@@ -1 +1,2 @@
 pcsc-lite-1_2_0-10:HEAD:pcsc-lite-1.2.0-10.src.rpm:1105127825
+pcsc-lite-1_2_0-0_fdr_10_2:FC-2:pcsc-lite-1.2.0-0.fdr.10.2.src.rpm:1109876644



From fedora-extras-commits at redhat.com  Thu Mar  3 19:03:59 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:03:59 -0500
Subject: rpms/pcsc-lite/FC-2 pcsc-lite.spec,1.1,1.2
Message-ID: <200503031903.j23J3xdt011341@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-lite/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11323/FC-2

Modified Files:
	pcsc-lite.spec 
Log Message:
auto-import pcsc-lite-1.2.0-0.fdr.10.2 on branch FC-2 from pcsc-lite-1.2.0-0.fdr.10.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/FC-2/pcsc-lite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcsc-lite.spec	7 Jan 2005 19:57:18 -0000	1.1
+++ pcsc-lite.spec	3 Mar 2005 19:03:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pcsc-lite
 Version:        1.2.0
-Release:        10
+Release:        0.fdr.10.2
 Epoch:          0
 Summary:        PC/SC Lite smart card framework and applications
 
@@ -138,7 +138,7 @@
 
 
 %changelog
-* Tue Aug 17 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2.0-10
+* Tue Aug 17 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2.0-0.fdr.10
 - Disable dependency tracking to speed up the build.
 - Drop reader.conf patch, it's not needed any more.
 - Rename update-reader-conf to update-reader.conf for consistency with Debian,



From fedora-extras-commits at redhat.com  Thu Mar  3 19:05:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:05:05 -0500
Subject: rpms/pcsc-perl import.log,1.2,1.3
Message-ID: <200503031905.j23J55PI011467@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11453

Modified Files:
	import.log 
Log Message:
auto-import pcsc-perl-1.3.1-0.fdr.3.2 on branch FC-2 from pcsc-perl-1.3.1-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pcsc-perl/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	7 Jan 2005 20:15:46 -0000	1.2
+++ import.log	3 Mar 2005 19:05:03 -0000	1.3
@@ -1 +1,2 @@
 pcsc-perl-1_3_1-4:HEAD:pcsc-perl-1.3.1-4.src.rpm:1105128940
+pcsc-perl-1_3_1-0_fdr_3_2:FC-2:pcsc-perl-1.3.1-0.fdr.3.2.src.rpm:1109876710



From fedora-extras-commits at redhat.com  Thu Mar  3 19:05:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:05:05 -0500
Subject: rpms/pcsc-perl/FC-2 pcsc-perl.spec,1.1,1.2
Message-ID: <200503031905.j23J55ZZ011471@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-perl/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11453/FC-2

Modified Files:
	pcsc-perl.spec 
Log Message:
auto-import pcsc-perl-1.3.1-0.fdr.3.2 on branch FC-2 from pcsc-perl-1.3.1-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: pcsc-perl.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-perl/FC-2/pcsc-perl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcsc-perl.spec	7 Jan 2005 20:15:46 -0000	1.1
+++ pcsc-perl.spec	3 Mar 2005 19:05:03 -0000	1.2
@@ -3,9 +3,9 @@
 
 Name:           pcsc-perl
 Version:        1.3.1
-Release:        4
+Release:        0.fdr.3.2
 Epoch:          0
-Summary:        Perl interface to the PC/SC smart card library
+Summary:        PC/SC library for Perl
 
 Group:          Development/Libraries
 License:        GPL
@@ -18,8 +18,8 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-This package contains a Perl interface to the PC/SC smart card
-library.
+This library allows to intercate with a smart card and pcsc-lite using
+the Perl language.
 
 
 %prep
@@ -28,16 +28,15 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor INC= \
-  DEFINE=-Wall
+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' -a -size 0 -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
+  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
@@ -59,10 +58,6 @@
 
 
 %changelog
-* Fri Jan  7 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.3.1-4
-- Honor $RPM_OPT_FLAGS, remove (some) extra include dirs from build (#1281).
-- Improve summary and description.
-
 * Wed May 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.3.1-0.fdr.3
 - BuildRequire perl >= 1:5.6.1 for vendor install dir support.
 - Use pure_install to avoid perllocal.pod workarounds.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:05:12 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:05:12 -0500
Subject: rpms/perl-Chart import.log,1.2,1.3
Message-ID: <200503031905.j23J5CH7011522@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Chart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11496

Modified Files:
	import.log 
Log Message:
auto-import perl-Chart-2.3-0.fdr.2.2 on branch FC-2 from perl-Chart-2.3-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Jan 2005 21:07:15 -0000	1.2
+++ import.log	3 Mar 2005 19:05:10 -0000	1.3
@@ -1 +1,2 @@
 perl-Chart-2_3-2:HEAD:perl-Chart-2.3-2.src.rpm:1105996029
+perl-Chart-2_3-0_fdr_2_2:FC-2:perl-Chart-2.3-0.fdr.2.2.src.rpm:1109876718



From fedora-extras-commits at redhat.com  Thu Mar  3 19:05:12 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:05:12 -0500
Subject: rpms/perl-Chart/FC-2 perl-Chart.spec,1.1,1.2
Message-ID: <200503031905.j23J5CL0011526@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Chart/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11496/FC-2

Modified Files:
	perl-Chart.spec 
Log Message:
auto-import perl-Chart-2.3-0.fdr.2.2 on branch FC-2 from perl-Chart-2.3-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-Chart.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/FC-2/perl-Chart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Chart.spec	17 Jan 2005 21:07:15 -0000	1.1
+++ perl-Chart.spec	3 Mar 2005 19:05:10 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Chart
 Version:        2.3
-Release:        2
+Release:        0.fdr.2.2
 Epoch:          0
 Summary:        Perl module for producing many types of charts
 
@@ -53,7 +53,7 @@
 
 
 %changelog
-* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.3-2
+* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.3-0.fdr.2
 - Bring up to date with current fedora.us Perl Spec template.
 
 * Thu Jan 15 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.3-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:05:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:05:55 -0500
Subject: rpms/perl-Error import.log,1.3,1.4
Message-ID: <200503031905.j23J5txv011673@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Error
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11661

Modified Files:
	import.log 
Log Message:
auto-import perl-Error-0.15-0.fdr.1.2 on branch FC-2 from perl-Error-0.15-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:11:52 -0000	1.3
+++ import.log	3 Mar 2005 19:05:53 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Error-0_15-0_fdr_1:HEAD:perl-Error-0.15-0.fdr.1.src.rpm:1103646600
 perl-Error-0_15-0_fdr_1_rh90:RHL-9:perl-Error-0.15-0.fdr.1.rh90.src.rpm:1109747504
+perl-Error-0_15-0_fdr_1_2:FC-2:perl-Error-0.15-0.fdr.1.2.src.rpm:1109876759



From fedora-extras-commits at redhat.com  Thu Mar  3 19:05:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:05:55 -0500
Subject: rpms/perl-Error/FC-2 perl-Error.spec,1.2,1.3
Message-ID: <200503031905.j23J5t3q011678@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Error/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11661/FC-2

Modified Files:
	perl-Error.spec 
Log Message:
auto-import perl-Error-0.15-0.fdr.1.2 on branch FC-2 from perl-Error-0.15-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-2/perl-Error.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Error.spec	21 Dec 2004 16:33:00 -0000	1.2
+++ perl-Error.spec	3 Mar 2005 19:05:53 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-Error
 Version:        0.15
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Error Perl module
 License:        GPL or Artistic
@@ -49,5 +49,5 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Jun 11 2004 Steven Pritchard <steve at kspei.com> 0:0.15-1
+* Fri Jun 11 2004 Steven Pritchard <steve at kspei.com> 0:0.15-0.fdr.1
 - Specfile autogenerated.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:06:09 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:06:09 -0500
Subject: rpms/perl-FreezeThaw import.log,1.3,1.4
Message-ID: <200503031906.j23J69Ng011762@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-FreezeThaw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11753

Modified Files:
	import.log 
Log Message:
auto-import perl-FreezeThaw-0.43-0.fdr.1.2 on branch FC-2 from perl-FreezeThaw-0.43-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:13:00 -0000	1.3
+++ import.log	3 Mar 2005 19:06:07 -0000	1.4
@@ -1,2 +1,3 @@
 perl-FreezeThaw-0_43-0_fdr_1_2:HEAD:perl-FreezeThaw-0.43-0.fdr.1.2.src.rpm:1102527774
 perl-FreezeThaw-0_43-0_fdr_1_rh90:RHL-9:perl-FreezeThaw-0.43-0.fdr.1.rh90.src.rpm:1109747568
+perl-FreezeThaw-0_43-0_fdr_1_2:FC-2:perl-FreezeThaw-0.43-0.fdr.1.2.src.rpm:1109876774



From fedora-extras-commits at redhat.com  Thu Mar  3 19:06:09 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:06:09 -0500
Subject: rpms/perl-FreezeThaw/FC-2 perl-FreezeThaw.spec,1.2,1.3
Message-ID: <200503031906.j23J69jK011766@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-FreezeThaw/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11753/FC-2

Modified Files:
	perl-FreezeThaw.spec 
Log Message:
auto-import perl-FreezeThaw-0.43-0.fdr.1.2 on branch FC-2 from perl-FreezeThaw-0.43-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-FreezeThaw.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/FC-2/perl-FreezeThaw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-FreezeThaw.spec	10 Dec 2004 22:03:08 -0000	1.2
+++ perl-FreezeThaw.spec	3 Mar 2005 19:06:07 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-FreezeThaw
 Version:        0.43
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Convert Perl structures to strings and back
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:06:51 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:06:51 -0500
Subject: rpms/perl-Gtk2 import.log,1.3,1.4
Message-ID: <200503031906.j23J6phY011882@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import perl-Gtk2-1.061-0.fdr.2.2 on branch FC-2 from perl-Gtk2-1.061-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:14:29 -0000	1.3
+++ import.log	3 Mar 2005 19:06:49 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Gtk2-1_061-0_fdr_2_2:HEAD:perl-Gtk2-1.061-0.fdr.2.2.src.rpm:1102527968
 perl-Gtk2-1_061-0_fdr_2_rh90:RHL-9:perl-Gtk2-1.061-0.fdr.2.rh90.src.rpm:1109747662
+perl-Gtk2-1_061-0_fdr_2_2:FC-2:perl-Gtk2-1.061-0.fdr.2.2.src.rpm:1109876816



From fedora-extras-commits at redhat.com  Thu Mar  3 19:06:51 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:06:51 -0500
Subject: rpms/perl-Gtk2/FC-2 .cvsignore, 1.3, 1.4 perl-Gtk2.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200503031906.j23J6pZr011886@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
auto-import perl-Gtk2-1.061-0.fdr.2.2 on branch FC-2 from perl-Gtk2-1.061-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-2/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2005 03:21:00 -0000	1.3
+++ .cvsignore	3 Mar 2005 19:06:49 -0000	1.4
@@ -1 +1 @@
-Gtk2-1.062.tar.gz
+Gtk2-1.061.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-2/perl-Gtk2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Gtk2.spec	15 Feb 2005 03:30:46 -0000	1.4
+++ perl-Gtk2.spec	3 Mar 2005 19:06:49 -0000	1.5
@@ -1,19 +1,19 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Gtk2
-Version:        1.062
-Release:        1
+Version:        1.061
+Release:        0.fdr.2.2
 Epoch:          0
 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.062.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.061.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.062
+BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.061
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -62,9 +62,6 @@
 
 
 %changelog
-* Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.062-1
-- Update to 1.062.
-
 * Mon Oct 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.061-0.fdr.2
 - Removed irrelevant or duplicated documentation files.
 - Description simplified (as suggested by Ville Skytt??).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-2/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 03:21:00 -0000	1.3
+++ sources	3 Mar 2005 19:06:49 -0000	1.4
@@ -1 +1 @@
-cbca72d71fa470157d139c2bf659c040  Gtk2-1.062.tar.gz
+f7a14ff2e86dc66c9a06539613b70576  Gtk2-1.061.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 19:07:54 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:07:54 -0500
Subject: rpms/perl-HTML-Tree import.log,1.3,1.4
Message-ID: <200503031907.j23J7spI012059@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-HTML-Tree
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12050

Modified Files:
	import.log 
Log Message:
auto-import perl-HTML-Tree-3.18-0.fdr.2.2 on branch FC-2 from perl-HTML-Tree-3.18-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:15:25 -0000	1.3
+++ import.log	3 Mar 2005 19:07:52 -0000	1.4
@@ -1,2 +1,3 @@
 perl-HTML-Tree-3_18-2:HEAD:perl-HTML-Tree-3.18-2.src.rpm:1108323387
 perl-HTML-Tree-3_18-0_fdr_2_rh90:RHL-9:perl-HTML-Tree-3.18-0.fdr.2.rh90.src.rpm:1109747718
+perl-HTML-Tree-3_18-0_fdr_2_2:FC-2:perl-HTML-Tree-3.18-0.fdr.2.2.src.rpm:1109876879



From fedora-extras-commits at redhat.com  Thu Mar  3 19:07:54 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:07:54 -0500
Subject: rpms/perl-HTML-Tree/FC-2 perl-HTML-Tree.spec,1.1,1.2
Message-ID: <200503031907.j23J7scg012063@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-HTML-Tree/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12050/FC-2

Modified Files:
	perl-HTML-Tree.spec 
Log Message:
auto-import perl-HTML-Tree-3.18-0.fdr.2.2 on branch FC-2 from perl-HTML-Tree-3.18-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/FC-2/perl-HTML-Tree.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Tree.spec	13 Feb 2005 19:36:38 -0000	1.1
+++ perl-HTML-Tree.spec	3 Mar 2005 19:07:52 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-HTML-Tree
 Version:        3.18
-Release:        2
+Release:        0.fdr.2.2
 Epoch:          0
 Summary:        HTML tree handling modules for Perl
 
@@ -58,7 +58,7 @@
 
 
 %changelog
-* Tue Jan  4 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-2
+* Tue Jan  4 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-0.fdr.2
 - Don't install htmltree into %%{_bindir} but include it in docs.
 
 * Sat Dec  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:08:54 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:08:54 -0500
Subject: rpms/python-imaging import.log,1.2,1.3
Message-ID: <200503031908.j23J8saH012170@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/python-imaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12160

Modified Files:
	import.log 
Log Message:
auto-import python-imaging-1.1.4-0.fdr.6.2 on branch FC-2 from python-imaging-1.1.4-0.fdr.6.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Nov 2004 05:15:21 -0000	1.2
+++ import.log	3 Mar 2005 19:08:52 -0000	1.3
@@ -1 +1,2 @@
 python-imaging-1_1_4-0_fdr_4_rh90:HEAD:python-imaging-1.1.4-0.fdr.4.rh90.src.rpm:1099890921
+python-imaging-1_1_4-0_fdr_6_2:FC-2:python-imaging-1.1.4-0.fdr.6.2.src.rpm:1109876937



From fedora-extras-commits at redhat.com  Thu Mar  3 19:08:54 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:08:54 -0500
Subject: rpms/python-imaging/FC-2 python-imaging.spec,1.3,1.4
Message-ID: <200503031908.j23J8ssO012173@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/python-imaging/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12160/FC-2

Modified Files:
	python-imaging.spec 
Log Message:
auto-import python-imaging-1.1.4-0.fdr.6.2 on branch FC-2 from python-imaging-1.1.4-0.fdr.6.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-2/python-imaging.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-imaging.spec	11 Feb 2005 13:17:58 -0000	1.3
+++ python-imaging.spec	3 Mar 2005 19:08:52 -0000	1.4
@@ -6,7 +6,7 @@
 Name: python-imaging
 Epoch: 0
 Version: 1.1.4
-Release: 7
+Release: 0.fdr.6.2
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-1.1.4.tar.gz
@@ -59,12 +59,7 @@
 %build
 cd libImaging
 %configure
-make \
-%ifarch x86_64
-   CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \
-%endif
-   %{?_smp_mflags}
-
+make %{?_smp_mflags}
 cd ..
 %{__python} setup.py build
 
@@ -104,10 +99,7 @@
 %doc Doc Scripts Images Sane
 
 %changelog
-* Mon Feb  7 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.1.4-7
-- Build PIC on x86_64 to fix x86_64 linking.
-
-* Sat Oct  9 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.1.4-6
+* Sat Oct  9 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.1.4-0.fdr.6
 - Borrow parts from patch in Debian's 1.1.4-3 to fix issues in bug 1038 as
   well as a bunch of others.
 - Bring up to date with current fedora.us Python spec template recommendations.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:09:48 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:09:48 -0500
Subject: rpms/perl-IO-Socket-SSL import.log,1.3,1.4
Message-ID: <200503031909.j23J9mJ8012274@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-IO-Socket-SSL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12265

Modified Files:
	import.log 
Log Message:
auto-import perl-IO-Socket-SSL-0.96-0.fdr.3.2 on branch FC-2 from perl-IO-Socket-SSL-0.96-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:16:26 -0000	1.3
+++ import.log	3 Mar 2005 19:09:46 -0000	1.4
@@ -1,2 +1,3 @@
 perl-IO-Socket-SSL-0_96-3:HEAD:perl-IO-Socket-SSL-0.96-3.src.rpm:1105271963
 perl-IO-Socket-SSL-0_96-0_fdr_3_rh90:RHL-9:perl-IO-Socket-SSL-0.96-0.fdr.3.rh90.src.rpm:1109747778
+perl-IO-Socket-SSL-0_96-0_fdr_3_2:FC-2:perl-IO-Socket-SSL-0.96-0.fdr.3.2.src.rpm:1109876993



From fedora-extras-commits at redhat.com  Thu Mar  3 19:09:48 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:09:48 -0500
Subject: rpms/perl-IO-Socket-SSL/FC-2 perl-IO-Socket-SSL.spec,1.1,1.2
Message-ID: <200503031909.j23J9m5h012278@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-IO-Socket-SSL/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12265/FC-2

Modified Files:
	perl-IO-Socket-SSL.spec 
Log Message:
auto-import perl-IO-Socket-SSL-0.96-0.fdr.3.2 on branch FC-2 from perl-IO-Socket-SSL-0.96-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/FC-2/perl-IO-Socket-SSL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-IO-Socket-SSL.spec	9 Jan 2005 11:59:30 -0000	1.1
+++ perl-IO-Socket-SSL.spec	3 Mar 2005 19:09:46 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-IO-Socket-SSL
 Version:        0.96
-Release:        3
+Release:        0.fdr.3.2
 Epoch:          0
 Summary:        Perl library for transparent SSL
 
@@ -62,7 +62,7 @@
 
 
 %changelog
-* Tue Oct 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-3
+* Tue Oct 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-0.fdr.3
 - Disable session test suite even if Net::SSLeay >= 1.26 is available.
 
 * Wed Jul  7 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-0.fdr.2



From fedora-extras-commits at redhat.com  Thu Mar  3 19:10:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:10:38 -0500
Subject: rpms/perl-MLDBM/FC-2 perl-MLDBM.spec,1.2,1.3
Message-ID: <200503031910.j23JAcXV012389@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-MLDBM/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12375/FC-2

Modified Files:
	perl-MLDBM.spec 
Log Message:
auto-import perl-MLDBM-2.01-0.fdr.1.2 on branch FC-2 from perl-MLDBM-2.01-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-MLDBM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/FC-2/perl-MLDBM.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-MLDBM.spec	28 Jan 2005 17:36:45 -0000	1.2
+++ perl-MLDBM.spec	3 Mar 2005 19:10:36 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-MLDBM
 Version:        2.01
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Store multi-level hash structure in single level tied hash
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:10:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:10:38 -0500
Subject: rpms/perl-MLDBM import.log,1.3,1.4
Message-ID: <200503031910.j23JAcrs012384@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-MLDBM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12375

Modified Files:
	import.log 
Log Message:
auto-import perl-MLDBM-2.01-0.fdr.1.2 on branch FC-2 from perl-MLDBM-2.01-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:18:30 -0000	1.3
+++ import.log	3 Mar 2005 19:10:36 -0000	1.4
@@ -1,2 +1,3 @@
 perl-MLDBM-2_01-0_fdr_1_2:HEAD:perl-MLDBM-2.01-0.fdr.1.2.src.rpm:1102781000
 perl-MLDBM-2_01-0_fdr_1_rh90:RHL-9:perl-MLDBM-2.01-0.fdr.1.rh90.src.rpm:1109747903
+perl-MLDBM-2_01-0_fdr_1_2:FC-2:perl-MLDBM-2.01-0.fdr.1.2.src.rpm:1109877043



From fedora-extras-commits at redhat.com  Thu Mar  3 19:11:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:11:49 -0500
Subject: rpms/perl-Module-CoreList import.log,1.3,1.4
Message-ID: <200503031911.j23JBn7t012537@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Module-CoreList
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12528

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-CoreList-1.98-0.fdr.2.2 on branch FC-2 from perl-Module-CoreList-1.98-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:19:29 -0000	1.3
+++ import.log	3 Mar 2005 19:11:47 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Module-CoreList-1_98-2:HEAD:perl-Module-CoreList-1.98-2.src.rpm:1104953598
 perl-Module-CoreList-1_98-0_fdr_2_rh90:RHL-9:perl-Module-CoreList-1.98-0.fdr.2.rh90.src.rpm:1109747962
+perl-Module-CoreList-1_98-0_fdr_2_2:FC-2:perl-Module-CoreList-1.98-0.fdr.2.2.src.rpm:1109877114



From fedora-extras-commits at redhat.com  Thu Mar  3 19:11:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:11:49 -0500
Subject: rpms/perl-Module-CoreList/FC-2 perl-Module-CoreList.spec,1.1,1.2
Message-ID: <200503031911.j23JBnWc012541@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Module-CoreList/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12528/FC-2

Modified Files:
	perl-Module-CoreList.spec 
Log Message:
auto-import perl-Module-CoreList-1.98-0.fdr.2.2 on branch FC-2 from perl-Module-CoreList-1.98-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-Module-CoreList.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-2/perl-Module-CoreList.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Module-CoreList.spec	5 Jan 2005 19:33:24 -0000	1.1
+++ perl-Module-CoreList.spec	3 Mar 2005 19:11:47 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Module-CoreList
 Version:        1.98
-Release:        2
+Release:        0.fdr.2.2
 Epoch:          0
 Summary:        Perl core modules indexed by perl versions
 
@@ -57,7 +57,7 @@
 
 
 %changelog
-* Tue Jan 04 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-2
+* Tue Jan 04 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-0.fdr.2
 - BuildRequires: perl(Module::Build) (#2362).
 
 * Mon Jan 03 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:12:48 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:12:48 -0500
Subject: rpms/perl-Net-SSLeay import.log,1.3,1.4
Message-ID: <200503031912.j23JCm7E012643@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Net-SSLeay
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12634

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-SSLeay-1.26-0.fdr.2.2 on branch FC-2 from perl-Net-SSLeay-1.26-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:20:27 -0000	1.3
+++ import.log	3 Mar 2005 19:12:46 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Net-SSLeay-1_26-1:HEAD:perl-Net-SSLeay-1.26-1.src.rpm:1103563499
 perl-Net-SSLeay-1_26-0_fdr_2_rh90:RHL-9:perl-Net-SSLeay-1.26-0.fdr.2.rh90.src.rpm:1109748019
+perl-Net-SSLeay-1_26-0_fdr_2_2:FC-2:perl-Net-SSLeay-1.26-0.fdr.2.2.src.rpm:1109877174



From fedora-extras-commits at redhat.com  Thu Mar  3 19:12:48 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:12:48 -0500
Subject: rpms/perl-Net-SSLeay/FC-2 perl-Net-SSLeay.spec,1.1,1.2
Message-ID: <200503031912.j23JCmKY012647@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Net-SSLeay/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12634/FC-2

Modified Files:
	perl-Net-SSLeay.spec 
Log Message:
auto-import perl-Net-SSLeay-1.26-0.fdr.2.2 on branch FC-2 from perl-Net-SSLeay-1.26-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/FC-2/perl-Net-SSLeay.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-SSLeay.spec	20 Dec 2004 17:25:07 -0000	1.1
+++ perl-Net-SSLeay.spec	3 Mar 2005 19:12:46 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Net-SSLeay
 Version:        1.26
-Release:        1
+Release:        0.fdr.2.2
 Epoch:          0
 Summary:        Perl extension for using OpenSSL
 
@@ -66,9 +66,6 @@
 
 
 %changelog
-* Mon Dec 20 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.26-1
-- Drop fedora.us release prefix and suffix.
-
 * Mon Oct 25 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.26-0.fdr.2
 - Convert manual page to UTF-8.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:13:44 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:13:44 -0500
Subject: rpms/perl-Test-Pod-Coverage import.log,1.3,1.4
Message-ID: <200503031913.j23JDipB012751@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12742

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-Pod-Coverage-1.06-0.fdr.1.2 on branch FC-2 from perl-Test-Pod-Coverage-1.06-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:21:26 -0000	1.3
+++ import.log	3 Mar 2005 19:13:42 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Test-Pod-Coverage-1_06-1:HEAD:perl-Test-Pod-Coverage-1.06-1.src.rpm:1105645910
 perl-Test-Pod-Coverage-1_06-0_fdr_1_rh90:RHL-9:perl-Test-Pod-Coverage-1.06-0.fdr.1.rh90.src.rpm:1109748079
+perl-Test-Pod-Coverage-1_06-0_fdr_1_2:FC-2:perl-Test-Pod-Coverage-1.06-0.fdr.1.2.src.rpm:1109877230



From fedora-extras-commits at redhat.com  Thu Mar  3 19:13:44 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:13:44 -0500
Subject: rpms/perl-Test-Pod-Coverage/FC-2 perl-Test-Pod-Coverage.spec, 1.1,
	1.2
Message-ID: <200503031913.j23JDikn012755@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12742/FC-2

Modified Files:
	perl-Test-Pod-Coverage.spec 
Log Message:
auto-import perl-Test-Pod-Coverage-1.06-0.fdr.1.2 on branch FC-2 from perl-Test-Pod-Coverage-1.06-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-Test-Pod-Coverage.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-2/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	3 Mar 2005 19:13:42 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Test-Pod-Coverage
 Version:        1.06
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Check for pod coverage in your distribution
 
@@ -55,7 +55,7 @@
 
 
 %changelog
-* Thu Jun 24 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.06-1
+* Thu Jun 24 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.06-0.fdr.1
 - Update to 1.06.
 
 * Wed Jun 02 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.04-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:14:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:14:49 -0500
Subject: rpms/perl-XML-RSS/FC-2 perl-XML-RSS.spec,1.1,1.2
Message-ID: <200503031914.j23JEnPR012865@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-RSS/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12852/FC-2

Modified Files:
	perl-XML-RSS.spec 
Log Message:
auto-import perl-XML-RSS-1.05-0.fdr.1.2 on branch FC-2 from perl-XML-RSS-1.05-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-XML-RSS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-RSS/FC-2/perl-XML-RSS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-RSS.spec	1 Jan 2005 11:10:17 -0000	1.1
+++ perl-XML-RSS.spec	3 Mar 2005 19:14:47 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-XML-RSS
 Version:        1.05
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Perl module for managing RDF Site Summary (RSS) files
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:14:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:14:49 -0500
Subject: rpms/perl-XML-RSS import.log,1.3,1.4
Message-ID: <200503031914.j23JEnxc012861@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-RSS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12852

Modified Files:
	import.log 
Log Message:
auto-import perl-XML-RSS-1.05-0.fdr.1.2 on branch FC-2 from perl-XML-RSS-1.05-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-RSS/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:22:24 -0000	1.3
+++ import.log	3 Mar 2005 19:14:47 -0000	1.4
@@ -1,2 +1,3 @@
 perl-XML-RSS-1_05-1:HEAD:perl-XML-RSS-1.05-1.src.rpm:1104577827
 perl-XML-RSS-1_05-0_fdr_1_rh90:RHL-9:perl-XML-RSS-1.05-0.fdr.1.rh90.src.rpm:1109748137
+perl-XML-RSS-1_05-0_fdr_1_2:FC-2:perl-XML-RSS-1.05-0.fdr.1.2.src.rpm:1109877294



From fedora-extras-commits at redhat.com  Thu Mar  3 19:16:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:16:55 -0500
Subject: rpms/perl-XML-XPath import.log,1.3,1.4
Message-ID: <200503031916.j23JGtUv012967@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-XPath
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12958

Modified Files:
	import.log 
Log Message:
auto-import perl-XML-XPath-1.13-0.fdr.2.2 on branch FC-2 from perl-XML-XPath-1.13-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPath/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:23:25 -0000	1.3
+++ import.log	3 Mar 2005 19:16:53 -0000	1.4
@@ -1,2 +1,3 @@
 perl-XML-XPath-1_13-2:HEAD:perl-XML-XPath-1.13-2.src.rpm:1108067370
 perl-XML-XPath-1_13-0_fdr_2_rh90:RHL-9:perl-XML-XPath-1.13-0.fdr.2.rh90.src.rpm:1109748197
+perl-XML-XPath-1_13-0_fdr_2_2:FC-2:perl-XML-XPath-1.13-0.fdr.2.2.src.rpm:1109877420



From fedora-extras-commits at redhat.com  Thu Mar  3 19:16:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:16:55 -0500
Subject: rpms/perl-XML-XPath/FC-2 perl-XML-XPath.spec,1.1,1.2
Message-ID: <200503031916.j23JGtVY012971@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-XPath/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12958/FC-2

Modified Files:
	perl-XML-XPath.spec 
Log Message:
auto-import perl-XML-XPath-1.13-0.fdr.2.2 on branch FC-2 from perl-XML-XPath-1.13-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-XML-XPath.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPath/FC-2/perl-XML-XPath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-XPath.spec	10 Feb 2005 20:29:37 -0000	1.1
+++ perl-XML-XPath.spec	3 Mar 2005 19:16:53 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-XML-XPath
 Version:        1.13
-Release:        2
+Release:        0.fdr.2.2
 Epoch:          0
 Summary:        XPath parser and evaluator for Perl
 
@@ -57,7 +57,7 @@
 
 
 %changelog
-* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-2
+* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-0.fdr.2
 - Bring up to date with current fedora.us Perl spec template.
 
 * Sun Oct 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/apg/devel apg.spec,1.4,1.5
Message-ID: <200503031930.j23JU1Vl013153@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	apg.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: apg.spec
===================================================================
RCS file: /cvs/extras/rpms/apg/devel/apg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apg.spec	11 Nov 2004 19:21:36 -0000	1.4
+++ apg.spec	3 Mar 2005 19:29:59 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           apg
 Version:        2.2.3
 Release:        3
-Epoch:          0
-Summary:        Automated Password Generator for random password generation.
+Summary:        Automated Password Generator for random password generation
 
 Group:          System Environment/Base
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/arc/devel arc.spec,1.4,1.5
Message-ID: <200503031930.j23JU1gV013161@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	arc.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: arc.spec
===================================================================
RCS file: /cvs/extras/rpms/arc/devel/arc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- arc.spec	10 Dec 2004 22:03:01 -0000	1.4
+++ arc.spec	3 Mar 2005 19:29:59 -0000	1.5
@@ -1,10 +1,9 @@
-Name:    arc
-Version: 5.21j
-Release: 1
-Epoch:   0
-Summary: Arc archiver 
+Name:      arc
+Version:   5.21j
+Release:   1
+Summary:   Arc archiver
 
-Group:     Applications/Archiving 
+Group:     Applications/Archiving
 License:   GPL
 URL:       ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/
 Source:    ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/%{name}-%{version}.tar.gz
@@ -15,7 +14,7 @@
 but useful if you have old .arc files you need to unpack.
 
 %prep
-%setup 
+%setup
 
 %build
 make %{?_smp_mflags}



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/alsa-tools/devel alsa-tools.spec,1.2,1.3
Message-ID: <200503031930.j23JU1TB013137@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/alsa-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/alsa-tools/devel

Modified Files:
	alsa-tools.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: alsa-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/alsa-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-tools.spec	2 Dec 2004 01:11:34 -0000	1.2
+++ alsa-tools.spec	3 Mar 2005 19:29:59 -0000	1.3
@@ -2,7 +2,6 @@
 Name: 		alsa-tools
 Version: 	1.0.4
 Release: 	1.1
-Epoch: 		0
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -10,7 +9,7 @@
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk+-devel alsa-driver fltk-devel automake
 BuildRequires:	alsa-lib-devel >= 0:1.0.4
-Buildrequires:  desktop-file-utils
+Buildrequires:	desktop-file-utils
 
 %package firmware
 Summary: 	Alsa-Tool to upload the firmware (needed for some soundcards)
@@ -18,8 +17,6 @@
 Requires:	hotplug alsa-firmware
 
 
-# -----------------------------------------------------------------------------
-
 %description
 This package contains several tools which can be used together with
 ALSA-Drivers and -Libs. Some of this tools are only needed for special
@@ -42,8 +39,6 @@
 usx2yloader  - Second Phase Firmware loader for Tascam USX2Y USB soundcards
 
 
-# -----------------------------------------------------------------------------
-
 %prep
 echo "
 --------------------------------------------------------------
@@ -51,9 +46,8 @@
 Needs decision on whether to drop it.
 --------------------------------------------------------------" > /dev/null
 exit 1
-%setup -q -n %{name}-%{version}
+%setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
 mv seq/sbiload . ; rmdir seq
@@ -64,7 +58,6 @@
   cd ..
 done
 
-# -----------------------------------------------------------------------------
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -72,20 +65,20 @@
 [ -f debugsources.list ] && rm debugsources.list
 
 for i in *
-do 
+do
    case $i in
       hdspconf)
-	(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+        (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
         ;;
       hdspmixer)
-	(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+        (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
         ;;
       usx2yloader)
-	(cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
+        (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
         ;;
       *) (cd $i ; %makeinstall) || exit 1
    esac
-   if [[ -s "${i}"/README ]] 
+   if [[ -s "${i}"/README ]]
    then
       if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]]
       then
@@ -93,7 +86,7 @@
       fi
       cp "${i}"/README "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
    fi
-   if [[ -s "${i}"/COPYING ]] 
+   if [[ -s "${i}"/COPYING ]]
    then
       if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]]
       then
@@ -102,7 +95,7 @@
       cp "${i}"/COPYING "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
    fi
 
-  
+
 done
 
 for f in ${RPM_BUILD_ROOT}%{_datadir}/applications/*.desktop; do
@@ -113,12 +106,10 @@
       $f
 done
 
-# -----------------------------------------------------------------------------
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
@@ -162,7 +153,6 @@
 %{_bindir}/usx2yloader
 %{_bindir}/vxloader
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Sat Apr 03 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.4-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/aide/devel aide.spec,1.5,1.6
Message-ID: <200503031930.j23JU1lU013125@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	aide.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aide.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ aide.spec	3 Mar 2005 19:29:59 -0000	1.6
@@ -1,8 +1,7 @@
-Summary: Intrusion detection environment.
+Summary: Intrusion detection environment
 Name: aide
 Version: 0.10
 Release: 1
-Epoch: 0
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System
@@ -12,13 +11,13 @@
 Patch1: aide-useless-includes.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Buildrequires: mhash-devel zlib-devel
-Buildrequires: flex bison 
+Buildrequires: flex bison
 # Red Hat bug #108655, bison requires m4
 Buildrequires: m4
 # Postgresql support doesn't build.
 Buildconflicts: postgresql-devel
 
-%description 
+%description
 AIDE (Advanced Intrusion Detection Environment) is a file integrity
 checker and intrusion detection program.
 
@@ -35,7 +34,7 @@
 
 %configure --with-config_file=%{_sysconfdir}/aide.conf \
            --with-zlib \
-           --with-mhash --enable-mhash 
+           --with-mhash --enable-mhash
 
 # Adjust default database paths.
 perl -pi -e 's!%{_sysconfdir}/aide.db!%{_localstatedir}/lib/aide.db!' config.h



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/atitvout/devel atitvout.spec,1.5,1.6
Message-ID: <200503031930.j23JU1fw013169@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	atitvout.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: atitvout.spec
===================================================================
RCS file: /cvs/extras/rpms/atitvout/devel/atitvout.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- atitvout.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ atitvout.spec	3 Mar 2005 19:29:59 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           atitvout
 Version:        0.4
 Release:        3
-Epoch:          0
 Summary:        ATI Rage/Radeon TV Out configuration program
 
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/alsa-firmware/devel alsa-firmware.spec,1.2,1.3
Message-ID: <200503031930.j23JU1SF013134@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/alsa-firmware/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/alsa-firmware/devel

Modified Files:
	alsa-firmware.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: alsa-firmware.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-firmware/devel/alsa-firmware.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-firmware.spec	2 Dec 2004 01:11:22 -0000	1.2
+++ alsa-firmware.spec	3 Mar 2005 19:29:59 -0000	1.3
@@ -2,7 +2,6 @@
 Name: 		alsa-firmware
 Version: 	1.0.4
 Release: 	1.1
-Epoch: 		0
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -10,14 +9,12 @@
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	alsa-tools-firmware >= 0:1.0.4
 
-# -----------------------------------------------------------------------------
 
 %description
-This package contains the firmware binaries for each ALSA-loader program 
-included in alsa-tools package.  
+This package contains the firmware binaries for each ALSA-loader program
+included in alsa-tools package.
 
 
-# -----------------------------------------------------------------------------
 
 %prep
 echo "
@@ -26,9 +23,8 @@
 Needs decision on whether to drop it.
 --------------------------------------------------------------" > /dev/null
 exit 1
-%setup -q -n %{name}-%{version}
+%setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure
@@ -38,25 +34,21 @@
   mv ${i}/README README.${i}
 done
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
-# -----------------------------------------------------------------------------
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING README README.hdsploader README.mixartloader README.usx2yloader README.vxloader
 %{_datadir}/alsa/firmware
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Sat Apr 03 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.4-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/aterm/devel aterm.spec,1.5,1.6
Message-ID: <200503031930.j23JU1AY013165@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	aterm.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: aterm.spec
===================================================================
RCS file: /cvs/extras/rpms/aterm/devel/aterm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aterm.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ aterm.spec	3 Mar 2005 19:29:59 -0000	1.6
@@ -1,8 +1,7 @@
 Name:           aterm
 Version:        0.4.2
 Release:        5
-Epoch:          0
-Summary:        Aterm (Afterstep XVT) - a VT102 emulator for the X window system
+Summary:        Afterstep XVT, VT102 emulator for the X Window system
 Group:          User Interface/X
 License:        GPL
 URL:            http://aterm.sourceforge.net
@@ -32,16 +31,16 @@
 %build
 %configure --enable-utmp \
            --enable-wtmp \
-			  --enable-background-image \
-			  --enable-transparency \
-			  --enable-fading \
-			  --enable-menubar \
-			  --enable-graphics \
-			  --enable-next-scroll \
-			  --enable-xgetdefault \
-			  --with-term=xterm \
-			  --with-x \
-			  --with-xpm
+           --enable-background-image \
+           --enable-transparency \
+           --enable-fading \
+           --enable-menubar \
+           --enable-graphics \
+           --enable-next-scroll \
+           --enable-xgetdefault \
+           --with-term=xterm \
+           --with-x \
+           --with-xpm
 make %{?_smp_mflags}
 
 
@@ -62,7 +61,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog doc/BUGS doc/FAQ doc/README.menu doc/README.Unix98PTY 
+%doc ChangeLog doc/BUGS doc/FAQ doc/README.menu doc/README.Unix98PTY
 %doc doc/README.xvt doc/TODO doc/ChangeLog.rxvt
 %doc doc/menu/*
 %doc doc/*.html



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/autotrace/devel autotrace.spec,1.3,1.4
Message-ID: <200503031930.j23JU1sY013177@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	autotrace.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/devel/autotrace.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autotrace.spec	28 Nov 2004 04:36:14 -0000	1.3
+++ autotrace.spec	3 Mar 2005 19:29:59 -0000	1.4
@@ -1,8 +1,7 @@
 Name:           autotrace
 Version:        0.31.1
 Release:        3
-Epoch:          0
-Summary:        A utility for converting bitmaps to vector graphics
+Summary:        Utility for converting bitmaps to vector graphics
 
 Group:          Applications/Multimedia
 License:        GPL/LGPL
@@ -27,12 +26,12 @@
 %package devel
 Summary:        Header files and static libraries for autotrace
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       ImageMagick-devel
 #Requires:       pstoedit-devel
 
- 
+
 %description devel
 This package contains header files and static libraries for autotrace.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/abe/devel abe.spec,1.4,1.5
Message-ID: <200503031930.j23JU19x013117@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	abe.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: abe.spec
===================================================================
RCS file: /cvs/extras/rpms/abe/devel/abe.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- abe.spec	10 Dec 2004 22:03:01 -0000	1.4
+++ abe.spec	3 Mar 2005 19:29:59 -0000	1.5
@@ -1,19 +1,18 @@
 Name:           abe
 Version:        1.0
 Release:        3
-Epoch:          0
 Summary:        A scrolling, platform-jumping, ancient pyramid exploring game.
 Group:          Amusements/Games
 License:        GPL
 URL:            http://abe.sourceforge.net/
 Source0:        http://download.sourceforge.net/abe/abe-1_0.tar.gz
-Source1:		%{name}.png
-Patch0:			%{name}-%{version}-datapath.patch
-Patch1:			%{name}-%{version}-tmppath.patch
+Source1:        %{name}.png
+Patch0:         %{name}-%{version}-datapath.patch
+Patch1:         %{name}-%{version}-tmppath.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 0:1.2.3, SDL_mixer-devel >= 0:1.2.3
-BuildRequires:	desktop-file-utils
+BuildRequires:  desktop-file-utils
 
 %description
 A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game,
@@ -62,7 +61,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README 
+%doc COPYING README
 %{_bindir}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/adns/devel adns.spec,1.4,1.5
Message-ID: <200503031930.j23JU1RZ013122@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	adns.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: adns.spec
===================================================================
RCS file: /cvs/extras/rpms/adns/devel/adns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- adns.spec	10 Dec 2004 22:03:01 -0000	1.4
+++ adns.spec	3 Mar 2005 19:29:59 -0000	1.5
@@ -1,7 +1,6 @@
 Name:		adns
 Version:	1.1
 Release:	4
-Epoch:		0
 Summary:	Advanced, easy to use, asynchronous-capable DNS client library
 
 Group:		System Environment/Libraries
@@ -13,7 +12,7 @@
 Patch2:		adns-1.1-semicolon.patch
 Patch3:		adns-1.1-parsedomain.patch
 BuildRequires:	autoconf213 automake15
-BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 adns is a resolver library for C (and C++) programs. In contrast with
@@ -47,7 +46,7 @@
 %package devel
 Summary:	Asynchronous-capable DNS client library - development files
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}
+Requires:	%{name} = %{version}
 
 %description devel
 Asynchronous-capable DNS client library - development files.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/apt/devel apt.spec,1.9,1.10
Message-ID: <200503031930.j23JU1oU013157@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	apt.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apt.spec	18 Feb 2005 22:14:10 -0000	1.9
+++ apt.spec	3 Mar 2005 19:29:59 -0000	1.10
@@ -18,7 +18,6 @@
 Name: apt
 Version: 0.5.15cnc6
 Release: 16.%{svnver}
-Epoch: 0
 Group: System Environment/Base
 URL: https://moin.conectiva.com.br/AptRpm
 License: GPL
@@ -92,7 +91,7 @@
 BuildRequires: python-devel >= 0:2.2
 BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext
 BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel
-# for version detection to work 
+# for version detection to work
 BuildRequires: fedora-release
 %if %{generate_rpmpriorities}
 BuildRequires: %{_bindir}/xsltproc, %{comps}
@@ -120,14 +119,14 @@
 
 %description
 A port of Debian's apt tools for RPM based distributions.
-It provides the apt-get utility that provides a simpler, safer way to 
-install and upgrade packages. APT features complete installation ordering, 
+It provides the apt-get utility that provides a simpler, safer way to
+install and upgrade packages. APT features complete installation ordering,
 multiple source capability and several other unique features.
 
 %package devel
 Summary: Development files and documentation for APT's libapt-pkg.
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: rpm-devel
 %description devel
 This package contains the header files and static libraries for developing
@@ -136,7 +135,7 @@
 %package python
 Summary: Python bindings for libapt-pkg
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 %description python
 The apt-python package contains a module which allows python programs
@@ -145,7 +144,7 @@
 %package groupinstall
 Summary: Add commands to install and remove package groups.
 Group: System Environment/Base
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: rhpl, comps
 %description groupinstall
 This package adds four new commands to apt for installing, removing and viewing
@@ -156,7 +155,7 @@
 apt-get groupremove <groupname> [<groupname2> ..]
 
 The group information is retrieved from comps.xml used by anaconda (the
-system installer) and other package management tools of RHL/RHEL/FC 
+system installer) and other package management tools of RHL/RHEL/FC
 distributions.
 
 
@@ -184,7 +183,7 @@
 %configure --disable-dependency-tracking
 
 SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 # prevent re-generation of the python wrapper, requires a patched swig :(
 #touch python/apt.py python/apt_wrap.cxx
@@ -285,10 +284,10 @@
 fi
 exit 0
 
-%post 
+%post
 /sbin/ldconfig
 if [ ! -f %{_sysconfdir}/apt/apt.conf ]; then
-	echo "// User customizable configuration goes here" > %{_sysconfdir}/apt/apt.conf
+ echo "// User customizable configuration goes here" > %{_sysconfdir}/apt/apt.conf
 fi
 /sbin/chkconfig --add apt
 
@@ -310,7 +309,7 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/apt
 %config(noreplace) %{_sysconfdir}/apt/rpmpriorities
 %config(noreplace) %{_sysconfdir}/apt/preferences
-%config(noreplace) %{_sysconfdir}/apt/apt.conf 
+%config(noreplace) %{_sysconfdir}/apt/apt.conf
 %config(noreplace) %{_sysconfdir}/apt/sources.list
 %config(noreplace) %{_sysconfdir}/apt/vendors.list
 # NOTE: no noreplace on these because we WANT to be able to change the defaults
@@ -399,7 +398,7 @@
 
 * Wed Aug 18 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r362
 - revision r362
-- add rpmprioties file for rawhide 
+- add rpmprioties file for rawhide
 
 * Sat Aug 14 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r361
 - update to revision r361
@@ -407,7 +406,7 @@
 - provide apt-mirrorselect so repo-configs can depend on it
 - preliminary fixes for x86_64:
   - put scripts to /usr/share/apt/scripts instead of /usr/lib
-  - build python bindings with -fPIC 
+  - build python bindings with -fPIC
 
 * Thu Aug 12 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r360
 - update to revision r360
@@ -433,7 +432,7 @@
 - add new subpackage for groupinstall (to avoid dependening on comps and rhpl
   for core apt)
 - update to revision 353 from upstream for various bugfixes and enhancements,
-  drop merged patches 
+  drop merged patches
 - remove NOISY=1 from make, hasn't done anything in ages..
 
 * Thu Jun 17 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.13
@@ -492,7 +491,7 @@
 - Ville's docbook building fix
 
 * Tue Mar 30 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.4
-- add upgrade-virtual=true back to default.conf 
+- add upgrade-virtual=true back to default.conf
 - updated version of upgradevirt.lua, fixed kernel-module package handling
 
 * Mon Mar 29 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.3
@@ -510,7 +509,7 @@
 - remember to set kernel::module-prefix in default.conf
 - add upgradevirt.lua to all the necessary new slot
 - move kernel from Essential priority to Important in rpmpriorities, allow-
-  duplicated packages don't behave well with Essential priority 
+  duplicated packages don't behave well with Essential priority
 
 * Mon Mar 22 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.1
 - update to 0.5.15cnc6
@@ -531,14 +530,14 @@
 
 * Fri Feb 13 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.8
 - Pull patch for revs 266-274 from upstream, containing various important
-  fixes (epoch handling, build system related etc) 
+  fixes (epoch handling, build system related etc)
 
 * Thu Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.7
 - Fix build on FC2-test1 (conditional libselinux-devel buildreq)
 
 * Mon Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.6
 - automatically handle fedora.us style kernel-module packages with kernel
-  updates 
+  updates
 - don't run mirror-selector if quiet mode set (== non-interactive)
 - don't trash sources.list on upgrade, only if user chooses to do so
 
@@ -557,7 +556,7 @@
 
 * Mon Jan 19 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.3
 - make rpm manifest usage configurable per Enricos request (patch 4)
-- use mirror lists on fedora.us 
+- use mirror lists on fedora.us
 - include Fedora Legacy gpg key
 
 * Tue Jan 06 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.2
@@ -581,7 +580,7 @@
 - drop patches merged upstream
 
 * Tue Dec 23 2003 Panu Matilainen <pmatilai at welho.com>
-- remove extranuous mirror-select configs from default.conf 
+- remove extranuous mirror-select configs from default.conf
 - updated mirror-select script
 
 * Fri Dec 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.4
@@ -650,7 +649,7 @@
 * Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.1
 - update rpmlib patch to -7 which has more sensible error reporting
 
-* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com> 
+* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com>
 - update to 0.5.15cnc2
 - remove patches 6-9, they're merged upstream now
 - use fedora-style buildroot
@@ -749,12 +748,12 @@
 - drop patches merged upstream
 
 * Tue Jun 10 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.9
-- patch from upstream to fix a security problem where lua-scripts can get 
+- patch from upstream to fix a security problem where lua-scripts can get
   accidentally executed from cwd
 
 * Mon Jun 09 2003 Panu Matilainen <pmatilai at welho.com>
 - apt doesn't like build deps on versioned virtual provides -> only RH7.3
-  package buildrequires python2-devel, newer ones have python-devel 
+  package buildrequires python2-devel, newer ones have python-devel
 
 * Thu Jun 05 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.8
 - fix the proxy template format in apt.conf
@@ -778,11 +777,11 @@
 - fix #259
 - add missing ncurses-devel buildreq (for apt-shell)
 
-* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com> 
+* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com>
 - add missing libelf-devel buildreq for RH8.0 (#254)
 - add missing readline-devel buildreq (for apt-shell)
 
-* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com> 
+* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com>
 - add /etc/apt/scripts directory (for Lua scripts)
 
 * Tue Apr 22 2003 Warren Togami <warren at togami.com> 0.5.5cnc5-0.fdr.5
@@ -802,7 +801,7 @@
 * Wed Apr 16 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.1
 - patch to speed up apt startup and genbasedir
 - drop "counting sheep" patch, not needed anymore
-- include current mirrors in sources.list 
+- include current mirrors in sources.list
 - autodetect RH version
 
 * Tue Apr 15 2003 Panu Matilainen <pmatilai at welho.com>
@@ -824,7 +823,7 @@
 - add epoch to requires =, >= too
 
 * Thu Apr 03 2003 Panu Matilainen <pmatilai at welho.com>
-- fix segfault if rpm-dir index is a broken symlink 
+- fix segfault if rpm-dir index is a broken symlink
 - rpmpriorities generated from comps.xml
 - dont tag the various keys as %dir :-/
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/anjuta/devel anjuta.spec,1.6,1.7
Message-ID: <200503031930.j23JU1ee013145@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	anjuta.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- anjuta.spec	10 Feb 2005 20:01:13 -0000	1.6
+++ anjuta.spec	3 Mar 2005 19:29:59 -0000	1.7
@@ -26,10 +26,10 @@
 Requires(postun): scrollkeeper
 
 %description
-Anjuta is a versatile Integrated Development Environment (IDE) for C and C++. 
-It has been written for GTK/GNOME, and features a number of advanced 
-programming facilities. It is basically a GUI interface for the collection 
-of command line programming utilities and tools available for the GNU system. 
+Anjuta is a versatile Integrated Development Environment (IDE) for C and C++.
+It has been written for GTK/GNOME, and features a number of advanced
+programming facilities. It is basically a GUI interface for the collection
+of command line programming utilities and tools available for the GNU system.
 These are usually run via a text console, and can be unfriendly to use.
 
 This package includes anjuta_create_global_tags.sh, which will allow you to
@@ -52,7 +52,7 @@
 
 
 %build
-# configure option --enable-final does not work corretly on x86_64; Use 
+# configure option --enable-final does not work corretly on x86_64; Use
 # -DNDEBUG in CFLAGS
 export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 %configure
@@ -123,7 +123,7 @@
 
 %changelog
 * Thu Feb 10 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.2.2-6
-- configure option --enable-final does not work correctly on x86_64; 
+- configure option --enable-final does not work correctly on x86_64;
   Use -DNDEBUG in CFLAGS as suggested my Michael Schwendt;
   Fixes x86_64 crash (#147010)
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/allegro/devel allegro.spec,1.7,1.8
Message-ID: <200503031930.j23JU12h013129@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	allegro.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- allegro.spec	13 Feb 2005 22:10:46 -0000	1.7
+++ allegro.spec	3 Mar 2005 19:29:59 -0000	1.8
@@ -1,7 +1,6 @@
 Name:           allegro
 Version:        4.0.3
 Release:        9
-Epoch:          0
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
 Summary(fr):    Une librairie de programmation de jeux
@@ -40,7 +39,7 @@
 Summary(fr):    Une librairie de programmation de jeux
 Summary(it):    Una libreria per la programmazione di videogiochi
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}, XFree86-devel
+Requires:       %{name} = %{version}-%{release}, XFree86-devel
 Requires(post,preun): /sbin/install-info
 
 %description devel



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/amaya/devel amaya.spec,1.3,1.4
Message-ID: <200503031930.j23JU1bZ013141@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	amaya.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- amaya.spec	10 Dec 2004 22:03:01 -0000	1.3
+++ amaya.spec	3 Mar 2005 19:29:59 -0000	1.4
@@ -1,18 +1,17 @@
 Name:		amaya
-Version: 	8.5
-Release: 	2
-Epoch:      0
-Summary: 	W3C's browser/web authoring tool
-Group:   	Applications/Internet
-Source0: 	http://www.w3.org/Amaya/Distribution/amaya-src-8.5.tgz
-Source1:    amaya.png
-License: 	W3C Software License
-Url:     	http://www.w3.org/Amaya
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: 	libungif-devel libjpeg-devel libpng-devel zlib-devel
-BuildRequires: 	gtk+-devel perl bison flex imlib-devel
+Version:	8.5
+Release:	2
+Summary:	W3C's browser/web authoring tool
+Group:		Applications/Internet
+Source0:	http://www.w3.org/Amaya/Distribution/amaya-src-8.5.tgz
+Source1:	amaya.png
+License:	W3C Software License
+Url:		http://www.w3.org/Amaya
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libungif-devel libjpeg-devel libpng-devel zlib-devel
+BuildRequires:	gtk+-devel perl bison flex imlib-devel
 BuildRequires:	XFree86-devel freetype-devel >= 2.0
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 
 %description
 Amaya is a WYSIWYG browser/web authoring tool from the W3C.
@@ -31,7 +30,7 @@
              --prefix=$RPM_BUILD_ROOT%_libdir \
              --exec-prefix=$RPM_BUILD_ROOT/%_prefix \
              --libdir=%_libdir
-make 
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/antiword/devel antiword.spec,1.6,1.7
Message-ID: <200503031930.j23JU1uj013149@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	antiword.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: antiword.spec
===================================================================
RCS file: /cvs/extras/rpms/antiword/devel/antiword.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- antiword.spec	11 Feb 2005 19:21:32 -0000	1.6
+++ antiword.spec	3 Mar 2005 19:29:59 -0000	1.7
@@ -4,34 +4,29 @@
 Name:       antiword
 Version:    0.36
 Release:    1
-Epoch:      0
 Source:     http://www.winfield.demon.nl/linux/%{name}-%{version}.tar.gz
 URL:        http://www.winfield.demon.nl/
 Patch0:     antiword-0.32-fix-flags.patch
-License:    GPL 
+License:    GPL
 Group:      Applications/Text
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#---------------------------------------------------------------------
 
 %description
 Antiword is a free MS-Word reader for Linux, BeOS and RISC OS. It converts
 the documets from Word 6, 7, 97 and 2000 to ASCII and Postscript. Antiword
 tries to keep the layout of the document intact.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
 %patch0 -p0
 %{__chmod} a+r * Resources/* Docs/*
 
-#---------------------------------------------------------------------
 
 %build
 OPT="$RPM_OPT_FLAGS" make all %{?_smp_mflags}
 
-#---------------------------------------------------------------------
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -42,23 +37,20 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/man1
 %{__cp} Docs/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root)
-%doc Docs/COPYING Docs/FAQ Docs/ReadMe Docs/Netscape Docs/ChangeLog 
+%doc Docs/COPYING Docs/FAQ Docs/ReadMe Docs/Netscape Docs/ChangeLog
 %doc Docs/Exmh Docs/Mozilla Docs/QandA Docs/Mutt Docs/antiword.php
-%doc Docs/Emacs Docs/History 
+%doc Docs/Emacs Docs/History
 %{_bindir}/*
 %{_mandir}/*/*
 %{_datadir}/%{name}
 
-#---------------------------------------------------------------------
 
 %changelog
 * Thu Feb 03 2005 Adrian Reber <adrian at lisas.de> - 0:0.36-1
@@ -78,7 +70,7 @@
 
 * Tue Feb 25 2003 Adrian Reber <adrian at lisas.de> - 0.33-0.fdr.1
 - applied fedora naming conventions
- 
+
 * Sun Dec 22 2002 Adrian Reber <adrian at lisas.de>
 - updated to 0.33
 - demandrakefied



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/audacity/devel audacity.spec,1.5,1.6
Message-ID: <200503031930.j23JU1IQ013173@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	audacity.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- audacity.spec	4 Dec 2004 16:24:36 -0000	1.5
+++ audacity.spec	3 Mar 2005 19:29:59 -0000	1.6
@@ -1,7 +1,6 @@
 Name:		audacity
 Version:	1.2.3
 Release:	1
-Epoch:		0
 Summary: 	A multitrack audio editor
 
 Group: 		Applications/Multimedia
@@ -10,16 +9,16 @@
 Source: 	http://dl.sf.net/sourceforge/audacity/audacity-src-1.2.3.tar.gz
 Source1:	audacity.png
 Patch1:		audacity-1.2.2-aboutdialog.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libogg-devel, libvorbis-devel, zlib-devel, perl
-BuildRequires: 	gettext, zip, flac-devel, ladspa-devel
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libogg-devel, libvorbis-devel, zlib-devel, perl
+BuildRequires:	gettext, zip, flac-devel, ladspa-devel
 BuildRequires:	libsamplerate-devel, libsndfile-devel
 BuildRequires:	libid3tag-devel, desktop-file-utils
 %{?_with_mp3:BuildRequires: libmad-devel}
 %{?_with_gtk2:BuildRequires: wxGTK2-devel}
 %{!?_with_gtk2:BuildRequires: wxGTK-devel}
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
+Requires(post):		desktop-file-utils
+Requires(postun):	desktop-file-utils
 
 # Compile options:
 # --with mp3          : enable mp3 support



From bugs.michael at gmx.net  Thu Mar  3 19:36:56 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 20:36:56 +0100
Subject: rpms/alsa-tools/devel alsa-tools.spec,1.2,1.3
In-Reply-To: <200503031930.j23JU1TB013137@cvs-int.fedora.redhat.com>
References: <200503031930.j23JU1TB013137@cvs-int.fedora.redhat.com>
Message-ID: <20050303203656.007e703c.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 14:30:01 -0500, Matthias Saou (thias) wrote:

> Author: thias
> 
> Update of /cvs/extras/rpms/alsa-tools/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/alsa-tools/devel
> 
> Modified Files:
> 	alsa-tools.spec 
> Log Message:
> Mass letter "a" update, one or more apply :
> - Drop epoch: 0
> - Remove %{epoch} requirements in sub-packages
> - Remove trailing white spaces
> - Keep consistent between spaces and tabs



>  BuildRequires:	alsa-lib-devel >= 0:1.0.4

What about that Epoch?


$ rpmepoch alsa-lib-devel
(none)



From fedora-extras-commits at redhat.com  Thu Mar  3 19:45:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:45:28 -0500
Subject: rpms/alsa-tools/devel alsa-tools.spec,1.3,1.4
Message-ID: <200503031945.j23JjS39013481@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/alsa-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13475/alsa-tools/devel

Modified Files:
	alsa-tools.spec 
Log Message:
Remove missed alsa-lib-devel zero epoch spotted by Michael.



Index: alsa-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/alsa-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alsa-tools.spec	3 Mar 2005 19:29:59 -0000	1.3
+++ alsa-tools.spec	3 Mar 2005 19:45:26 -0000	1.4
@@ -8,7 +8,7 @@
 Source0: 	%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk+-devel alsa-driver fltk-devel automake
-BuildRequires:	alsa-lib-devel >= 0:1.0.4
+BuildRequires:	alsa-lib-devel >= 1.0.4
 Buildrequires:	desktop-file-utils
 
 %package firmware



From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net  Thu Mar  3 19:46:00 2005
From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou)
Date: Thu, 3 Mar 2005 20:46:00 +0100
Subject: rpms/alsa-tools/devel alsa-tools.spec,1.2,1.3
In-Reply-To: <20050303203656.007e703c.bugs.michael@gmx.net>
References: <200503031930.j23JU1TB013137@cvs-int.fedora.redhat.com>
	<20050303203656.007e703c.bugs.michael@gmx.net>
Message-ID: <20050303204600.7c070358@python2>

Michael Schwendt wrote :

> >  BuildRequires:	alsa-lib-devel >= 0:1.0.4
> 
> What about that Epoch?
> 
> 
> $ rpmepoch alsa-lib-devel
> (none)

Fixed, thanks for spotting.

Matthias

-- 
Clean custom Red Hat Linux rpm packages : http://freshrpms.net/
Fedora Core release 3 (Heidelberg) - Linux kernel 2.6.10-1.770_FC3
Load : 0.81 0.38 0.38



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:46:21 -0500
Subject: rpms/ccid import.log,1.3,1.4
Message-ID: <200503031946.j23JkLd6013538@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import ccid-0.4.1-0.fdr.4.1 on branch FC-1 from ccid-0.4.1-0.fdr.4.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ccid/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Mar 2005 19:01:03 -0000	1.3
+++ import.log	3 Mar 2005 19:46:19 -0000	1.4
@@ -1,2 +1,3 @@
 ccid-0_4_1-4:HEAD:ccid-0.4.1-4.src.rpm:1109362138
 ccid-0_4_1-0_fdr_4_2:FC-2:ccid-0.4.1-0.fdr.4.2.src.rpm:1109876470
+ccid-0_4_1-0_fdr_4_1:FC-1:ccid-0.4.1-0.fdr.4.1.src.rpm:1109879187



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:46:21 -0500
Subject: rpms/ccid/FC-1 ccid.spec,1.2,1.3
Message-ID: <200503031946.j23JkL8t013543@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/ccid/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13528/FC-1

Modified Files:
	ccid.spec 
Log Message:
auto-import ccid-0.4.1-0.fdr.4.1 on branch FC-1 from ccid-0.4.1-0.fdr.4.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: ccid.spec
===================================================================
RCS file: /cvs/extras/rpms/ccid/FC-1/ccid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ccid.spec	25 Feb 2005 20:22:00 -0000	1.2
+++ ccid.spec	3 Mar 2005 19:46:19 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           ccid
 Version:        0.4.1
-Release:        4
-Summary:        Generic USB CCID smart card reader driver
+Release:        0.fdr.4.1
+Summary:        Generic USB CCID driver
 
 Group:          System Environment/Libraries
 License:        GPL
@@ -24,7 +24,7 @@
 
 
 %build
-%configure --disable-dependency-tracking \
+%configure \
   --enable-usbdropdir=%{_libdir}/pcsc/drivers \
   --enable-ccidtwindir=%{_libdir}/pcsc/drivers/serial
 make %{?_smp_mflags}
@@ -57,10 +57,8 @@
 
 
 %changelog
-* Fri Feb 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.4.1-4
+* Fri Feb 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.4.1-0.fdr.4
 - Drop Epoch: 0.
-- Improve summary.
-- Build with dependency tracking disabled.
 
 * Thu Jul  1 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.4.1-0.fdr.3
 - Restart pcscd in post(un)install phase if it's available and running.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bittorrent/devel bittorrent.spec,1.6,1.7
Message-ID: <200503031946.j23JkfAQ013664@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	bittorrent.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bittorrent.spec	14 Jan 2005 20:00:29 -0000	1.6
+++ bittorrent.spec	3 Mar 2005 19:46:39 -0000	1.7
@@ -3,7 +3,6 @@
 Name:           bittorrent
 Version:        3.4.1
 Release:        3.a
-Epoch:          0
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
@@ -14,7 +13,7 @@
 
 BuildRequires:  python-devel
 Requires:       python
-Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 BuildArch:      noarch
 
@@ -29,9 +28,9 @@
 Summary:        GUI versions of the BitTorrent file transfer tool
 Group:          Applications/Internet
 Requires:       wxPython
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
-%description    gui 
+%description    gui
 This package contains the GUI versions of the BitTorrent file transfer
 tool.
 
@@ -109,7 +108,7 @@
 - adapted to Doors Linux
 
 * Sun Mar 30 2003 G??tz Waschk <waschk at linux-mandrake.com> 3.2.1b-1mdk
-- split out gui tools to remove wxPythonGTK dep from the main package 
+- split out gui tools to remove wxPythonGTK dep from the main package
 - new version
 
 * Fri Mar 28 2003 Frederic Lepied <flepied at mandrakesoft.com> 3.2-1mdk



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bash-completion/devel bash-completion.spec,1.6,1.7
Message-ID: <200503031946.j23JkfHK013652@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/bash-completion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13565/bash-completion/devel

Modified Files:
	bash-completion.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bash-completion.spec	26 Feb 2005 18:50:09 -0000	1.6
+++ bash-completion.spec	3 Mar 2005 19:46:39 -0000	1.7
@@ -1,13 +1,12 @@
 Name:           bash-completion
 Version:        20050121
 Release:        2
-Epoch:          0
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
 License:        GPL
 URL:            http://www.caliban.org/bash/
-Source0:     http://www.caliban.org/files/bash/bash-completion-20050121.tar.bz2
+Source0:        http://www.caliban.org/files/bash/bash-completion-20050121.tar.bz2
 Source1:        %{name}.profile
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bchunk/devel bchunk.spec,1.5,1.6
Message-ID: <200503031946.j23Jkf1F013656@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	bchunk.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bchunk.spec
===================================================================
RCS file: /cvs/extras/rpms/bchunk/devel/bchunk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bchunk.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ bchunk.spec	3 Mar 2005 19:46:39 -0000	1.6
@@ -2,7 +2,6 @@
 Name: bchunk
 Version: 1.2.0
 Release: 1
-Epoch: 0
 URL: http://he.fi/bchunk/
 License: GPL
 Group: Applications/Archiving



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/blt/devel blt.spec,1.6,1.7
Message-ID: <200503031946.j23Jkf3X013672@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	blt.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: blt.spec
===================================================================
RCS file: /cvs/extras/rpms/blt/devel/blt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- blt.spec	17 Dec 2004 18:47:50 -0000	1.6
+++ blt.spec	3 Mar 2005 19:46:39 -0000	1.7
@@ -2,18 +2,17 @@
 Name: blt
 Version: 2.4
 Release: 10.z
-Epoch: 0
 License: MIT
 Group: Development/Libraries
 Source: http://download.sourceforge.net/blt/BLT2.4z.tar.gz
 Patch0: http://download.sourceforge.net/blt/blt2.4z-patch-2
 Patch1: http://jfontain.free.fr/blt2.4z-patch-64
 URL: http://sourceforge.net/projects/blt/
-BuildRequires: XFree86-devel >= 0:4, tk >= 0:8.3.1
+BuildRequires: XFree86-devel, tk >= 8.3.1
 # work around tcl-devel and tk-devel packages non existence in RH 8.0 and 9:
 BuildRequires: %{_includedir}/tk.h, %{_includedir}/tcl.h
-Requires: tk >= 0:8.3.1
-BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
+Requires: tk >= 8.3.1
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 
 %description
 BLT is a very powerful extension to Tk. It adds plotting widgets
@@ -25,18 +24,18 @@
 with Tcl/Tk versions after and including 8.3.1.
 
 %prep
-%setup -q -n %name%{version}z
+%setup -q -n %{name}%{version}z
 %patch0 -p1
 %patch1 -p1
 
 %build
-%configure --with-tcl=%_libdir --with-tk=%_libdir
+%configure --with-tcl=%{_libdir} --with-tk=%{_libdir}
 cd src/shared
 %__make SHLIB_LD_FLAGS=-shared # no _smp_mflags; race conditions.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-DIRECTORY=$RPM_BUILD_ROOT%_libdir/%name%version
+DIRECTORY=$RPM_BUILD_ROOT%{_libdir}/%{name}%{version}
 install -d $DIRECTORY
 install -m 755 -p src/shared/libBLT24.so src/shared/libBLTlite24.so $DIRECTORY
 install -m 644 -p library/*.{pro,tcl,xbm} library/tclIndex $DIRECTORY
@@ -48,9 +47,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,0755)
 %doc README INSTALL PROBLEMS html/
-%_libdir/%name%{version}
+%{_libdir}/%{name}%{version}/
 
 %changelog
 * Fri Nov 5 2004 Jean-Luc Fontaine <jfontain at free.fr> 0:2.4-10.z



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bochs/devel bochs.spec,1.4,1.5
Message-ID: <200503031946.j23JkfUX013680@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	bochs.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bochs.spec	5 Dec 2004 16:23:17 -0000	1.4
+++ bochs.spec	3 Mar 2005 19:46:39 -0000	1.5
@@ -1,7 +1,6 @@
 Name:           bochs
 Version:        2.1.1
 Release:        1
-Epoch:          0
 Summary:        Bochs Project x86 PC Emulator
 
 Group:          Applications/Emulators
@@ -30,7 +29,7 @@
 %package        dlxlinux
 Summary:        DLX Linux hard disk image for Bochs
 Group:          Applications/Emulators
-Requires:       %{name} >= 0:2.0
+Requires:       %{name} >= 2.0
 
 %description    dlxlinux
 DLX is a version of Linux which was small enough to distribute along



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bin2iso/devel bin2iso.spec,1.5,1.6
Message-ID: <200503031946.j23Jkfd6013660@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	bin2iso.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bin2iso.spec
===================================================================
RCS file: /cvs/extras/rpms/bin2iso/devel/bin2iso.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bin2iso.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ bin2iso.spec	3 Mar 2005 19:46:39 -0000	1.6
@@ -1,52 +1,44 @@
-Summary: 	Convert ".bin" files into ISO or WAV.
-Name: 		bin2iso
-Version: 	1.9
-Release: 	1.b
-Epoch: 		0
-License: 	Distributable (Unknown)
-Group: 		Applications/File
-URL: 		http://users.andara.com/~doiron/bin2iso/
-Source0: 	http://users.eastlink.ca/~doiron/bin2iso/linux/bin2iso19b_linux.c
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Summary:	Convert ".bin" files into ISO or WAV
+Name:		bin2iso
+Version:	1.9
+Release:	1.b
+License:	Distributable (Unknown)
+Group:		Applications/File
+URL:		http://users.andara.com/~doiron/bin2iso/
+Source0:	http://users.eastlink.ca/~doiron/bin2iso/linux/bin2iso19b_linux.c
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-# -----------------------------------------------------------------------------
 
 %description
 A program to convert ".bin" images into iso or wav files.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -c -T
 
-# -----------------------------------------------------------------------------
 
 %build
 %{__cc} $RPM_OPT_FLAGS -o %{name} %{SOURCE0}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
 %{__install} -m 0755 %{name} $RPM_BUILD_ROOT/%{_bindir}
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Tue Jul  8 2003 Dams <anvil[AT]livna.org> 0:1.9-0.fdr.1.b
 - Fixed typo in version
 
-* Fri Jul  4 2003 Dams <anvil[AT]livna.org> 
+* Fri Jul  4 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bonnie++/devel bonnie++.spec,1.6,1.7
Message-ID: <200503031946.j23Jkfm9013684@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/bonnie++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13565/bonnie++/devel

Modified Files:
	bonnie++.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bonnie++.spec
===================================================================
RCS file: /cvs/extras/rpms/bonnie++/devel/bonnie++.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bonnie++.spec	1 Jan 2005 12:15:07 -0000	1.6
+++ bonnie++.spec	3 Mar 2005 19:46:39 -0000	1.7
@@ -1,25 +1,24 @@
 Name:           bonnie++
 Version:        1.03a
 Release:        3
-Epoch:          0
-Summary:        Bonnie++ filesystem and disk benchmark & burn-in suite
+Summary:        Filesystem and disk benchmark & burn-in suite
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.coker.com.au/bonnie++/
 Source0:        http://www.coker.com.au/bonnie++/bonnie++-1.03a.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 Patch0:         bonnie++-1.03a-mandir.patch
 
 %description
-bonnie++ filesystem and disk benchmark suite aggressively reads & writes 
-in various ways on your filesystem then outputs useful benchmark performance 
-data.  bonnie++ is also useful as a hardware, disk, and filesystem stability 
+bonnie++ filesystem and disk benchmark suite aggressively reads & writes
+in various ways on your filesystem then outputs useful benchmark performance
+data.  bonnie++ is also useful as a hardware, disk, and filesystem stability
 test, exposing some types of hardware or kernel failures that would otherwise
 be difficult to detect.
 
-Do not leave bonnie++ installed on a production system.  Use only while you 
+Do not leave bonnie++ installed on a production system.  Use only while you
 test servers.
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bluefish/devel bluefish.spec,1.8,1.9
Message-ID: <200503031946.j23JkfKd013676@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	bluefish.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bluefish.spec
===================================================================
RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bluefish.spec	20 Feb 2005 16:45:59 -0000	1.8
+++ bluefish.spec	3 Mar 2005 19:46:39 -0000	1.9
@@ -1,7 +1,7 @@
 Name:           bluefish
 Version:        1.0
 Release:        2
-Summary:        A GTK2 web development application for experienced users.
+Summary:        GTK2 web development application for experienced users
 
 Group:          Development/Tools
 License:        GPL
@@ -10,11 +10,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  aspell-devel >= 0.5
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 BuildRequires:  gnome-vfs2-devel
-BuildRequires:	gtk2-devel >= 2.0.6
-BuildRequires:	pcre-devel >= 3.9
+BuildRequires:  gtk2-devel >= 2.0.6
+BuildRequires:  pcre-devel >= 3.9
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/blender/devel blender.spec,1.5,1.6
Message-ID: <200503031946.j23JkfKW013668@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	blender.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blender.spec	25 Nov 2004 16:49:43 -0000	1.5
+++ blender.spec	3 Mar 2005 19:46:39 -0000	1.6
@@ -1,26 +1,26 @@
 Name:           blender
 Version:        2.35
 Release:        1
-Summary:        3D modeling, animation, rendering and post-production.
+Summary:        3D modeling, animation, rendering and post-production
 
-Group: 	        Applications/Multimedia
+Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.blender.org
 Source0:        http://download.blender.org/source/blender-2.35.tar.bz2
 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
+Source3:        blender.png
+Source4:        blender.desktop
 Source5:        blender.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:	esound-devel
-BuildRequires:  freeglut-devel 
-BuildRequires:	gettext
-BuildRequires:  libjpeg-devel 
-BuildRequires:	libogg-devel
-BuildRequires:  libpng-devel 
+BuildRequires:  esound-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  gettext
+BuildRequires:  libjpeg-devel
+BuildRequires:  libogg-devel
+BuildRequires:  libpng-devel
 BuildRequires:	libtool
 BuildRequires:	libvorbis-devel
 BuildRequires:  openal-devel
@@ -28,7 +28,7 @@
 BuildRequires:  python-devel
 BuildRequires:  scons
 BuildRequires:	SDL-devel
-BuildRequires:	zlib-devel 
+BuildRequires:	zlib-devel
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
@@ -71,12 +71,12 @@
 
 
 %post
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : 
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %postun
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : 
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
@@ -135,7 +135,7 @@
 - enable-international.
 
 * Tue Nov 18 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:2.30-0.fdr.1
-- Updated to 2.30. 
+- Updated to 2.30.
 
 * Fri Oct 10 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:2.28-0.fdr.5.c
 - Updated to 2.28c.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/brightside/devel brightside.spec,1.2,1.3
Message-ID: <200503031946.j23JkfHV013688@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	brightside.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: brightside.spec
===================================================================
RCS file: /cvs/extras/rpms/brightside/devel/brightside.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- brightside.spec	12 Dec 2004 21:33:41 -0000	1.2
+++ brightside.spec	3 Mar 2005 19:46:39 -0000	1.3
@@ -1,17 +1,16 @@
 Name:           brightside
 Version:        1.4.0
 Release:        3
-Epoch:          0
-Summary:        Add reactivity to the corners and edges of your GNOME desktop.
+Summary:        Add reactivity to the corners and edges of your GNOME desktop
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://home.jesus.ox.ac.uk/~ecatmur/brightside/
 Source0:        http://home.jesus.ox.ac.uk/~ecatmur/brightside/download/brightside-1.4.0.tar.bz2
-Patch0:		%{name}-gconf-mouse-speed.patch
+Patch0:         %{name}-gconf-mouse-speed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(pre):  GConf2 
+Requires(pre):  GConf2
 Requires(post): GConf2
 BuildRequires:  intltool
 BuildRequires:  gettext
@@ -21,15 +20,15 @@
 
 
 %description
-Brightside provides "edge flipping" to allow you to switch to the adjacent 
+Brightside provides "edge flipping" to allow you to switch to the adjacent
 workspace simply by pressing your mouse against the edge of the screen.
 
-Besides that Brightside also allows you to assign configurable actions to 
+Besides that Brightside also allows you to assign configurable actions to
 occur while you rest the mouse in a corner of the screen.
 
 %prep
 %setup -q
-%patch0 -b .patch0 
+%patch0 -b .patch0
 
 
 %build
@@ -71,7 +70,7 @@
 
 %files -f Brightside.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README 
+%doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_sysconfdir}/gconf/schemas/brightside.schemas



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bwbar/devel bwbar.spec,1.3,1.4
Message-ID: <200503031946.j23Jkf96013693@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	bwbar.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bwbar.spec
===================================================================
RCS file: /cvs/extras/rpms/bwbar/devel/bwbar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bwbar.spec	10 Dec 2004 22:03:01 -0000	1.3
+++ bwbar.spec	3 Mar 2005 19:46:39 -0000	1.4
@@ -1,10 +1,9 @@
 # $Id$
 
-Summary:       A program that generates a readout of the current bandwidth use
+Summary:       Generate a readout of the current bandwidth use
 Name:          bwbar
 Version:       1.2.2
 Release:       2
-Epoch:         0
 License:       GPL
 Group:         System Environment/Base
 Source0:       http://www.kernel.org/pub/software/web/bwbar/bwbar-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 19:47:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:47:06 -0500
Subject: rpms/i810switch import.log,1.4,1.5
Message-ID: <200503031947.j23Jl6aj013902@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import i810switch-0.6.2-0.fdr.3.1 on branch FC-1 from i810switch-0.6.2-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/i810switch/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:01:53 -0000	1.4
+++ import.log	3 Mar 2005 19:47:04 -0000	1.5
@@ -1,3 +1,4 @@
 i810switch-0_6_2-3:HEAD:i810switch-0.6.2-3.src.rpm:1106671753
 i810switch-0_6_2-0_fdr_3_rh90:RHL-9:i810switch-0.6.2-0.fdr.3.rh90.src.rpm:1109747422
 i810switch-0_6_2-0_fdr_3_2:FC-2:i810switch-0.6.2-0.fdr.3.2.src.rpm:1109876521
+i810switch-0_6_2-0_fdr_3_1:FC-1:i810switch-0.6.2-0.fdr.3.1.src.rpm:1109879231



From fedora-extras-commits at redhat.com  Thu Mar  3 19:47:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:47:06 -0500
Subject: rpms/i810switch/FC-1 i810switch.spec,1.1,1.2
Message-ID: <200503031947.j23Jl68H013906@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/i810switch/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13893/FC-1

Modified Files:
	i810switch.spec 
Log Message:
auto-import i810switch-0.6.2-0.fdr.3.1 on branch FC-1 from i810switch-0.6.2-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/FC-1/i810switch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- i810switch.spec	25 Jan 2005 16:49:20 -0000	1.1
+++ i810switch.spec	3 Mar 2005 19:47:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.2
-Release: 3
+Release: 0.fdr.3.1
 Epoch: 0
 Summary: A utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -40,7 +40,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Tue Jan 18 2005 David Kaplan <dmk at localhost.localdomain> - 0:0.6.2-3
+* Tue Jan 18 2005 David Kaplan <dmk at localhost.localdomain> - 0:0.6.2-0.fdr.3
 - Added back INSTALL file to rpm because it explains how to SUID root
   the executable so that all users can use i810switch.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:49:20 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:49:20 -0500
Subject: rpms/pcsc-lite import.log,1.3,1.4
Message-ID: <200503031949.j23JnK9W014032@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-lite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14023

Modified Files:
	import.log 
Log Message:
auto-import pcsc-lite-1.2.0-0.fdr.10.1 on branch FC-1 from pcsc-lite-1.2.0-0.fdr.10.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Mar 2005 19:03:57 -0000	1.3
+++ import.log	3 Mar 2005 19:49:18 -0000	1.4
@@ -1,2 +1,3 @@
 pcsc-lite-1_2_0-10:HEAD:pcsc-lite-1.2.0-10.src.rpm:1105127825
 pcsc-lite-1_2_0-0_fdr_10_2:FC-2:pcsc-lite-1.2.0-0.fdr.10.2.src.rpm:1109876644
+pcsc-lite-1_2_0-0_fdr_10_1:FC-1:pcsc-lite-1.2.0-0.fdr.10.1.src.rpm:1109879364



From fedora-extras-commits at redhat.com  Thu Mar  3 19:49:20 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:49:20 -0500
Subject: rpms/pcsc-lite/FC-1 pcsc-lite.spec,1.1,1.2
Message-ID: <200503031949.j23JnK0X014036@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-lite/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14023/FC-1

Modified Files:
	pcsc-lite.spec 
Log Message:
auto-import pcsc-lite-1.2.0-0.fdr.10.1 on branch FC-1 from pcsc-lite-1.2.0-0.fdr.10.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/FC-1/pcsc-lite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcsc-lite.spec	7 Jan 2005 19:57:18 -0000	1.1
+++ pcsc-lite.spec	3 Mar 2005 19:49:18 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pcsc-lite
 Version:        1.2.0
-Release:        10
+Release:        0.fdr.10.1
 Epoch:          0
 Summary:        PC/SC Lite smart card framework and applications
 
@@ -138,7 +138,7 @@
 
 
 %changelog
-* Tue Aug 17 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2.0-10
+* Tue Aug 17 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2.0-0.fdr.10
 - Disable dependency tracking to speed up the build.
 - Drop reader.conf patch, it's not needed any more.
 - Rename update-reader-conf to update-reader.conf for consistency with Debian,



From fedora-extras-commits at redhat.com  Thu Mar  3 19:50:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:50:06 -0500
Subject: rpms/pcsc-perl import.log,1.3,1.4
Message-ID: <200503031950.j23Jo6Rl014138@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14129

Modified Files:
	import.log 
Log Message:
auto-import pcsc-perl-1.3.1-0.fdr.3.1 on branch FC-1 from pcsc-perl-1.3.1-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pcsc-perl/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Mar 2005 19:05:03 -0000	1.3
+++ import.log	3 Mar 2005 19:50:04 -0000	1.4
@@ -1,2 +1,3 @@
 pcsc-perl-1_3_1-4:HEAD:pcsc-perl-1.3.1-4.src.rpm:1105128940
 pcsc-perl-1_3_1-0_fdr_3_2:FC-2:pcsc-perl-1.3.1-0.fdr.3.2.src.rpm:1109876710
+pcsc-perl-1_3_1-0_fdr_3_1:FC-1:pcsc-perl-1.3.1-0.fdr.3.1.src.rpm:1109879411



From fedora-extras-commits at redhat.com  Thu Mar  3 19:50:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:50:06 -0500
Subject: rpms/pcsc-perl/FC-1 pcsc-perl.spec,1.1,1.2
Message-ID: <200503031950.j23Jo6V6014142@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-perl/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14129/FC-1

Modified Files:
	pcsc-perl.spec 
Log Message:
auto-import pcsc-perl-1.3.1-0.fdr.3.1 on branch FC-1 from pcsc-perl-1.3.1-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: pcsc-perl.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-perl/FC-1/pcsc-perl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcsc-perl.spec	7 Jan 2005 20:15:46 -0000	1.1
+++ pcsc-perl.spec	3 Mar 2005 19:50:04 -0000	1.2
@@ -3,9 +3,9 @@
 
 Name:           pcsc-perl
 Version:        1.3.1
-Release:        4
+Release:        0.fdr.3.1
 Epoch:          0
-Summary:        Perl interface to the PC/SC smart card library
+Summary:        PC/SC library for Perl
 
 Group:          Development/Libraries
 License:        GPL
@@ -18,8 +18,8 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-This package contains a Perl interface to the PC/SC smart card
-library.
+This library allows to intercate with a smart card and pcsc-lite using
+the Perl language.
 
 
 %prep
@@ -28,16 +28,15 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor INC= \
-  DEFINE=-Wall
+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' -a -size 0 -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
+  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
@@ -59,10 +58,6 @@
 
 
 %changelog
-* Fri Jan  7 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.3.1-4
-- Honor $RPM_OPT_FLAGS, remove (some) extra include dirs from build (#1281).
-- Improve summary and description.
-
 * Wed May 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.3.1-0.fdr.3
 - BuildRequire perl >= 1:5.6.1 for vendor install dir support.
 - Use pure_install to avoid perllocal.pod workarounds.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:50:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:50:55 -0500
Subject: rpms/perl-Chart import.log,1.3,1.4
Message-ID: <200503031950.j23Jot2Q014244@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Chart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14235

Modified Files:
	import.log 
Log Message:
auto-import perl-Chart-2.3-0.fdr.2.1 on branch FC-1 from perl-Chart-2.3-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Mar 2005 19:05:10 -0000	1.3
+++ import.log	3 Mar 2005 19:50:53 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Chart-2_3-2:HEAD:perl-Chart-2.3-2.src.rpm:1105996029
 perl-Chart-2_3-0_fdr_2_2:FC-2:perl-Chart-2.3-0.fdr.2.2.src.rpm:1109876718
+perl-Chart-2_3-0_fdr_2_1:FC-1:perl-Chart-2.3-0.fdr.2.1.src.rpm:1109879460



From fedora-extras-commits at redhat.com  Thu Mar  3 19:50:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:50:55 -0500
Subject: rpms/perl-Chart/FC-1 perl-Chart.spec,1.1,1.2
Message-ID: <200503031950.j23JotU6014248@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Chart/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14235/FC-1

Modified Files:
	perl-Chart.spec 
Log Message:
auto-import perl-Chart-2.3-0.fdr.2.1 on branch FC-1 from perl-Chart-2.3-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-Chart.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/FC-1/perl-Chart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Chart.spec	17 Jan 2005 21:07:15 -0000	1.1
+++ perl-Chart.spec	3 Mar 2005 19:50:53 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Chart
 Version:        2.3
-Release:        2
+Release:        0.fdr.2.1
 Epoch:          0
 Summary:        Perl module for producing many types of charts
 
@@ -53,7 +53,7 @@
 
 
 %changelog
-* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.3-2
+* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.3-0.fdr.2
 - Bring up to date with current fedora.us Perl Spec template.
 
 * Thu Jan 15 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.3-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:51:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:51:49 -0500
Subject: rpms/perl-Error import.log,1.4,1.5
Message-ID: <200503031951.j23JpnZ4014350@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Error
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14341

Modified Files:
	import.log 
Log Message:
auto-import perl-Error-0.15-0.fdr.1.1 on branch FC-1 from perl-Error-0.15-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:05:53 -0000	1.4
+++ import.log	3 Mar 2005 19:51:47 -0000	1.5
@@ -1,3 +1,4 @@
 perl-Error-0_15-0_fdr_1:HEAD:perl-Error-0.15-0.fdr.1.src.rpm:1103646600
 perl-Error-0_15-0_fdr_1_rh90:RHL-9:perl-Error-0.15-0.fdr.1.rh90.src.rpm:1109747504
 perl-Error-0_15-0_fdr_1_2:FC-2:perl-Error-0.15-0.fdr.1.2.src.rpm:1109876759
+perl-Error-0_15-0_fdr_1_1:FC-1:perl-Error-0.15-0.fdr.1.1.src.rpm:1109879514



From fedora-extras-commits at redhat.com  Thu Mar  3 19:51:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:51:49 -0500
Subject: rpms/perl-Error/FC-1 perl-Error.spec,1.2,1.3
Message-ID: <200503031951.j23JpnaP014355@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Error/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14341/FC-1

Modified Files:
	perl-Error.spec 
Log Message:
auto-import perl-Error-0.15-0.fdr.1.1 on branch FC-1 from perl-Error-0.15-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-1/perl-Error.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Error.spec	21 Dec 2004 16:33:00 -0000	1.2
+++ perl-Error.spec	3 Mar 2005 19:51:47 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-Error
 Version:        0.15
-Release:        1
+Release:        0.fdr.1.1
 Epoch:          0
 Summary:        Error Perl module
 License:        GPL or Artistic
@@ -49,5 +49,5 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Jun 11 2004 Steven Pritchard <steve at kspei.com> 0:0.15-1
+* Fri Jun 11 2004 Steven Pritchard <steve at kspei.com> 0:0.15-0.fdr.1
 - Specfile autogenerated.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:52:33 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:52:33 -0500
Subject: rpms/perl-FreezeThaw import.log,1.4,1.5
Message-ID: <200503031952.j23JqXg6014456@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-FreezeThaw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14447

Modified Files:
	import.log 
Log Message:
auto-import perl-FreezeThaw-0.43-0.fdr.1.1 on branch FC-1 from perl-FreezeThaw-0.43-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:06:07 -0000	1.4
+++ import.log	3 Mar 2005 19:52:31 -0000	1.5
@@ -1,3 +1,4 @@
 perl-FreezeThaw-0_43-0_fdr_1_2:HEAD:perl-FreezeThaw-0.43-0.fdr.1.2.src.rpm:1102527774
 perl-FreezeThaw-0_43-0_fdr_1_rh90:RHL-9:perl-FreezeThaw-0.43-0.fdr.1.rh90.src.rpm:1109747568
 perl-FreezeThaw-0_43-0_fdr_1_2:FC-2:perl-FreezeThaw-0.43-0.fdr.1.2.src.rpm:1109876774
+perl-FreezeThaw-0_43-0_fdr_1_1:FC-1:perl-FreezeThaw-0.43-0.fdr.1.1.src.rpm:1109879558



From fedora-extras-commits at redhat.com  Thu Mar  3 19:52:33 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:52:33 -0500
Subject: rpms/perl-FreezeThaw/FC-1 perl-FreezeThaw.spec,1.2,1.3
Message-ID: <200503031952.j23JqXWX014460@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-FreezeThaw/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14447/FC-1

Modified Files:
	perl-FreezeThaw.spec 
Log Message:
auto-import perl-FreezeThaw-0.43-0.fdr.1.1 on branch FC-1 from perl-FreezeThaw-0.43-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-FreezeThaw.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/FC-1/perl-FreezeThaw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-FreezeThaw.spec	10 Dec 2004 22:03:08 -0000	1.2
+++ perl-FreezeThaw.spec	3 Mar 2005 19:52:31 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-FreezeThaw
 Version:        0.43
-Release:        1
+Release:        0.fdr.1.1
 Epoch:          0
 Summary:        Convert Perl structures to strings and back
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:53:28 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:53:28 -0500
Subject: rpms/perl-Gtk2 import.log,1.4,1.5
Message-ID: <200503031953.j23JrS2D014569@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import perl-Gtk2-1.061-0.fdr.2.1 on branch FC-1 from perl-Gtk2-1.061-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:06:49 -0000	1.4
+++ import.log	3 Mar 2005 19:53:26 -0000	1.5
@@ -1,3 +1,4 @@
 perl-Gtk2-1_061-0_fdr_2_2:HEAD:perl-Gtk2-1.061-0.fdr.2.2.src.rpm:1102527968
 perl-Gtk2-1_061-0_fdr_2_rh90:RHL-9:perl-Gtk2-1.061-0.fdr.2.rh90.src.rpm:1109747662
 perl-Gtk2-1_061-0_fdr_2_2:FC-2:perl-Gtk2-1.061-0.fdr.2.2.src.rpm:1109876816
+perl-Gtk2-1_061-0_fdr_2_1:FC-1:perl-Gtk2-1.061-0.fdr.2.1.src.rpm:1109879614



From fedora-extras-commits at redhat.com  Thu Mar  3 19:53:28 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:53:28 -0500
Subject: rpms/perl-Gtk2/FC-1 .cvsignore, 1.3, 1.4 perl-Gtk2.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200503031953.j23JrSZO014573@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
auto-import perl-Gtk2-1.061-0.fdr.2.1 on branch FC-1 from perl-Gtk2-1.061-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-1/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2005 03:21:00 -0000	1.3
+++ .cvsignore	3 Mar 2005 19:53:26 -0000	1.4
@@ -1 +1 @@
-Gtk2-1.062.tar.gz
+Gtk2-1.061.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-1/perl-Gtk2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Gtk2.spec	15 Feb 2005 03:30:46 -0000	1.4
+++ perl-Gtk2.spec	3 Mar 2005 19:53:26 -0000	1.5
@@ -1,19 +1,19 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Gtk2
-Version:        1.062
-Release:        1
+Version:        1.061
+Release:        0.fdr.2.1
 Epoch:          0
 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.062.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.061.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.062
+BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.061
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -62,9 +62,6 @@
 
 
 %changelog
-* Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.062-1
-- Update to 1.062.
-
 * Mon Oct 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.061-0.fdr.2
 - Removed irrelevant or duplicated documentation files.
 - Description simplified (as suggested by Ville Skytt??).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-1/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 03:21:00 -0000	1.3
+++ sources	3 Mar 2005 19:53:26 -0000	1.4
@@ -1 +1 @@
-cbca72d71fa470157d139c2bf659c040  Gtk2-1.062.tar.gz
+f7a14ff2e86dc66c9a06539613b70576  Gtk2-1.061.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 19:54:16 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:54:16 -0500
Subject: rpms/perl-HTML-Tree import.log,1.4,1.5
Message-ID: <200503031954.j23JsGdq014679@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-HTML-Tree
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14669

Modified Files:
	import.log 
Log Message:
auto-import perl-HTML-Tree-3.18-0.fdr.2.1 on branch FC-1 from perl-HTML-Tree-3.18-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:07:52 -0000	1.4
+++ import.log	3 Mar 2005 19:54:14 -0000	1.5
@@ -1,3 +1,4 @@
 perl-HTML-Tree-3_18-2:HEAD:perl-HTML-Tree-3.18-2.src.rpm:1108323387
 perl-HTML-Tree-3_18-0_fdr_2_rh90:RHL-9:perl-HTML-Tree-3.18-0.fdr.2.rh90.src.rpm:1109747718
 perl-HTML-Tree-3_18-0_fdr_2_2:FC-2:perl-HTML-Tree-3.18-0.fdr.2.2.src.rpm:1109876879
+perl-HTML-Tree-3_18-0_fdr_2_1:FC-1:perl-HTML-Tree-3.18-0.fdr.2.1.src.rpm:1109879661



From fedora-extras-commits at redhat.com  Thu Mar  3 19:54:16 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:54:16 -0500
Subject: rpms/perl-HTML-Tree/FC-1 perl-HTML-Tree.spec,1.1,1.2
Message-ID: <200503031954.j23JsGLf014682@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-HTML-Tree/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14669/FC-1

Modified Files:
	perl-HTML-Tree.spec 
Log Message:
auto-import perl-HTML-Tree-3.18-0.fdr.2.1 on branch FC-1 from perl-HTML-Tree-3.18-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/FC-1/perl-HTML-Tree.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Tree.spec	13 Feb 2005 19:36:38 -0000	1.1
+++ perl-HTML-Tree.spec	3 Mar 2005 19:54:14 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-HTML-Tree
 Version:        3.18
-Release:        2
+Release:        0.fdr.2.1
 Epoch:          0
 Summary:        HTML tree handling modules for Perl
 
@@ -58,7 +58,7 @@
 
 
 %changelog
-* Tue Jan  4 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-2
+* Tue Jan  4 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-0.fdr.2
 - Don't install htmltree into %%{_bindir} but include it in docs.
 
 * Sat Dec  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:55:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:55:06 -0500
Subject: rpms/perl-IO-Socket-SSL import.log,1.4,1.5
Message-ID: <200503031955.j23Jt6lC014787@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-IO-Socket-SSL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14778

Modified Files:
	import.log 
Log Message:
auto-import perl-IO-Socket-SSL-0.96-0.fdr.3.1 on branch FC-1 from perl-IO-Socket-SSL-0.96-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:09:46 -0000	1.4
+++ import.log	3 Mar 2005 19:55:04 -0000	1.5
@@ -1,3 +1,4 @@
 perl-IO-Socket-SSL-0_96-3:HEAD:perl-IO-Socket-SSL-0.96-3.src.rpm:1105271963
 perl-IO-Socket-SSL-0_96-0_fdr_3_rh90:RHL-9:perl-IO-Socket-SSL-0.96-0.fdr.3.rh90.src.rpm:1109747778
 perl-IO-Socket-SSL-0_96-0_fdr_3_2:FC-2:perl-IO-Socket-SSL-0.96-0.fdr.3.2.src.rpm:1109876993
+perl-IO-Socket-SSL-0_96-0_fdr_3_1:FC-1:perl-IO-Socket-SSL-0.96-0.fdr.3.1.src.rpm:1109879710



From fedora-extras-commits at redhat.com  Thu Mar  3 19:55:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:55:06 -0500
Subject: rpms/perl-IO-Socket-SSL/FC-1 perl-IO-Socket-SSL.spec,1.1,1.2
Message-ID: <200503031955.j23Jt6Bw014791@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-IO-Socket-SSL/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14778/FC-1

Modified Files:
	perl-IO-Socket-SSL.spec 
Log Message:
auto-import perl-IO-Socket-SSL-0.96-0.fdr.3.1 on branch FC-1 from perl-IO-Socket-SSL-0.96-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/FC-1/perl-IO-Socket-SSL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-IO-Socket-SSL.spec	9 Jan 2005 11:59:30 -0000	1.1
+++ perl-IO-Socket-SSL.spec	3 Mar 2005 19:55:04 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-IO-Socket-SSL
 Version:        0.96
-Release:        3
+Release:        0.fdr.3.1
 Epoch:          0
 Summary:        Perl library for transparent SSL
 
@@ -62,7 +62,7 @@
 
 
 %changelog
-* Tue Oct 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-3
+* Tue Oct 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-0.fdr.3
 - Disable session test suite even if Net::SSLeay >= 1.26 is available.
 
 * Wed Jul  7 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-0.fdr.2



From fedora-extras-commits at redhat.com  Thu Mar  3 19:56:03 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:56:03 -0500
Subject: rpms/perl-MLDBM/FC-1 perl-MLDBM.spec,1.2,1.3
Message-ID: <200503031956.j23Ju3Ir014899@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-MLDBM/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14886/FC-1

Modified Files:
	perl-MLDBM.spec 
Log Message:
auto-import perl-MLDBM-2.01-0.fdr.1.1 on branch FC-1 from perl-MLDBM-2.01-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-MLDBM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/FC-1/perl-MLDBM.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-MLDBM.spec	28 Jan 2005 17:36:45 -0000	1.2
+++ perl-MLDBM.spec	3 Mar 2005 19:55:55 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-MLDBM
 Version:        2.01
-Release:        1
+Release:        0.fdr.1.1
 Epoch:          0
 Summary:        Store multi-level hash structure in single level tied hash
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:55:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:55:57 -0500
Subject: rpms/perl-MLDBM import.log,1.4,1.5
Message-ID: <200503031955.j23JtvUD014894@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-MLDBM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14886

Modified Files:
	import.log 
Log Message:
auto-import perl-MLDBM-2.01-0.fdr.1.1 on branch FC-1 from perl-MLDBM-2.01-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:10:36 -0000	1.4
+++ import.log	3 Mar 2005 19:55:54 -0000	1.5
@@ -1,3 +1,4 @@
 perl-MLDBM-2_01-0_fdr_1_2:HEAD:perl-MLDBM-2.01-0.fdr.1.2.src.rpm:1102781000
 perl-MLDBM-2_01-0_fdr_1_rh90:RHL-9:perl-MLDBM-2.01-0.fdr.1.rh90.src.rpm:1109747903
 perl-MLDBM-2_01-0_fdr_1_2:FC-2:perl-MLDBM-2.01-0.fdr.1.2.src.rpm:1109877043
+perl-MLDBM-2_01-0_fdr_1_1:FC-1:perl-MLDBM-2.01-0.fdr.1.1.src.rpm:1109879758



From fedora-extras-commits at redhat.com  Thu Mar  3 19:57:27 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:57:27 -0500
Subject: rpms/perl-Module-CoreList import.log,1.4,1.5
Message-ID: <200503031957.j23JvR1Q015004@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Module-CoreList
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14995

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-CoreList-1.98-0.fdr.2.1 on branch FC-1 from perl-Module-CoreList-1.98-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:11:47 -0000	1.4
+++ import.log	3 Mar 2005 19:57:25 -0000	1.5
@@ -1,3 +1,4 @@
 perl-Module-CoreList-1_98-2:HEAD:perl-Module-CoreList-1.98-2.src.rpm:1104953598
 perl-Module-CoreList-1_98-0_fdr_2_rh90:RHL-9:perl-Module-CoreList-1.98-0.fdr.2.rh90.src.rpm:1109747962
 perl-Module-CoreList-1_98-0_fdr_2_2:FC-2:perl-Module-CoreList-1.98-0.fdr.2.2.src.rpm:1109877114
+perl-Module-CoreList-1_98-0_fdr_2_1:FC-1:perl-Module-CoreList-1.98-0.fdr.2.1.src.rpm:1109879852



From fedora-extras-commits at redhat.com  Thu Mar  3 19:57:27 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:57:27 -0500
Subject: rpms/perl-Module-CoreList/FC-1 perl-Module-CoreList.spec,1.1,1.2
Message-ID: <200503031957.j23JvRjP015009@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Module-CoreList/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14995/FC-1

Modified Files:
	perl-Module-CoreList.spec 
Log Message:
auto-import perl-Module-CoreList-1.98-0.fdr.2.1 on branch FC-1 from perl-Module-CoreList-1.98-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-Module-CoreList.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-1/perl-Module-CoreList.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Module-CoreList.spec	5 Jan 2005 19:33:24 -0000	1.1
+++ perl-Module-CoreList.spec	3 Mar 2005 19:57:25 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Module-CoreList
 Version:        1.98
-Release:        2
+Release:        0.fdr.2.1
 Epoch:          0
 Summary:        Perl core modules indexed by perl versions
 
@@ -57,7 +57,7 @@
 
 
 %changelog
-* Tue Jan 04 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-2
+* Tue Jan 04 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-0.fdr.2
 - BuildRequires: perl(Module::Build) (#2362).
 
 * Mon Jan 03 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 20:02:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:02:21 -0500
Subject: rpms/perl-Net-SSLeay/FC-1 perl-Net-SSLeay.spec,1.1,1.2
Message-ID: <200503032002.j23K2LY1015816@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Net-SSLeay/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15803/FC-1

Modified Files:
	perl-Net-SSLeay.spec 
Log Message:
auto-import perl-Net-SSLeay-1.26-0.fdr.2.1 on branch FC-1 from perl-Net-SSLeay-1.26-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/FC-1/perl-Net-SSLeay.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-SSLeay.spec	20 Dec 2004 17:25:07 -0000	1.1
+++ perl-Net-SSLeay.spec	3 Mar 2005 20:02:19 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Net-SSLeay
 Version:        1.26
-Release:        1
+Release:        0.fdr.2.1
 Epoch:          0
 Summary:        Perl extension for using OpenSSL
 
@@ -66,9 +66,6 @@
 
 
 %changelog
-* Mon Dec 20 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.26-1
-- Drop fedora.us release prefix and suffix.
-
 * Mon Oct 25 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.26-0.fdr.2
 - Convert manual page to UTF-8.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:02:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:02:21 -0500
Subject: rpms/perl-Net-SSLeay import.log,1.4,1.5
Message-ID: <200503032002.j23K2LKc015813@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Net-SSLeay
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15803

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-SSLeay-1.26-0.fdr.2.1 on branch FC-1 from perl-Net-SSLeay-1.26-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:12:46 -0000	1.4
+++ import.log	3 Mar 2005 20:02:19 -0000	1.5
@@ -1,3 +1,4 @@
 perl-Net-SSLeay-1_26-1:HEAD:perl-Net-SSLeay-1.26-1.src.rpm:1103563499
 perl-Net-SSLeay-1_26-0_fdr_2_rh90:RHL-9:perl-Net-SSLeay-1.26-0.fdr.2.rh90.src.rpm:1109748019
 perl-Net-SSLeay-1_26-0_fdr_2_2:FC-2:perl-Net-SSLeay-1.26-0.fdr.2.2.src.rpm:1109877174
+perl-Net-SSLeay-1_26-0_fdr_2_1:FC-1:perl-Net-SSLeay-1.26-0.fdr.2.1.src.rpm:1109880145



From fedora-extras-commits at redhat.com  Thu Mar  3 20:02:54 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu, 3 Mar 2005 15:02:54 -0500
Subject: common Makefile.common,1.4,1.5 cvs-import.sh,1.5,1.6
Message-ID: <200503032002.j23K2sgd015906@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15774

Modified Files:
	Makefile.common cvs-import.sh 
Log Message:


Apply Makefile.common changes to have 
curl allow cached files, as per https://www.redhat.com/archives/fedora-extras-list/2005-February/msg00448.html

Apply Ville's cvs-import.sh patch to allow messages, http://home.arcor.de/ms2002sep/tmp/cvs-import.patch



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.common	24 Nov 2004 02:17:31 -0000	1.4
+++ Makefile.common	3 Mar 2005 20:02:52 -0000	1.5
@@ -63,7 +63,7 @@
 
 # We define CURL and WGET in a way that makes if possible to have them
 # overwritten from the module's Makefiles. Then CLIENT picks CURL, otherwise WGET
-CURL	?= $(shell if test -f /usr/bin/curl ; then echo "curl -O -R -S --fail --show-error" ; fi)
+CURL	?= $(shell if test -f /usr/bin/curl ; then echo "curl -H Pragma: -O -R -S --fail --show-error" ; fi)
 WGET	?= $(shell if test -f /usr/bin/wget ; then echo "wget -nd -m" ; fi)
 CLIENT	?= $(if $(CURL),$(CURL),$(if $(WGET),$(WGET)))
 


Index: cvs-import.sh
===================================================================
RCS file: /cvs/extras/common/cvs-import.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cvs-import.sh	3 Feb 2005 00:30:33 -0000	1.5
+++ cvs-import.sh	3 Mar 2005 20:02:52 -0000	1.6
@@ -28,7 +28,7 @@
     cat <<EOF
 Usage:
 
-    $0 [-b <branch>] <package>
+    $0 [-b <branch>] [-m <message>] <package>
 
 Imports a package into the cvs repository. Will use the following defaults:
 CVSROOT    = $CVSROOT
@@ -42,6 +42,7 @@
 
 # Parse arguments
 BRANCH=
+MESSAGE=
 while [ -n "$1" ] ; do
     case "$1" in 
 	# import the package on the given branch. If the branch does
@@ -61,6 +62,11 @@
 	    fi
 	    ;;
 
+	-m | --message )
+	    shift
+	    MESSAGE="$1"
+	    ;;
+
 	# the always helpful help message
 	-h | --help )
 	    Usage
@@ -344,7 +350,8 @@
 echo "$LOG_ENTRY:$(date +%s)" >> ./import.log
 
 # prepare the commit message
-MESSAGE="auto-import $NAME-$VERSION-$RELEASE ${BRANCH:+on branch $BRANCH} from $(basename $PACKAGE)"
+MESSAGE="auto-import $NAME-$VERSION-$RELEASE ${BRANCH:+on branch $BRANCH} from $(basename $PACKAGE)
+$MESSAGE"
 cvs -Q update && \
     echo "cvs commit..." && \
     cvs -Q commit -m "$MESSAGE" >/dev/null && echo "Commit Complete" && \



From fedora-extras-commits at redhat.com  Thu Mar  3 20:03:07 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:03:07 -0500
Subject: rpms/perl-Pod-Coverage import.log,1.4,1.5
Message-ID: <200503032003.j23K37Un015945@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Pod-Coverage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15936

Modified Files:
	import.log 
Log Message:
auto-import perl-Pod-Coverage-0.17-0.fdr.1.1 on branch FC-1 from perl-Pod-Coverage-0.17-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Coverage/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 05:07:08 -0000	1.4
+++ import.log	3 Mar 2005 20:03:05 -0000	1.5
@@ -1,3 +1,4 @@
 perl-Pod-Coverage-0_14-0_fdr_1_rh90:HEAD:perl-Pod-Coverage-0.14-0.fdr.1.rh90.src.rpm:1099890416
 perl-Pod-Coverage-0_14-0_fdr_1_1:HEAD:perl-Pod-Coverage-0.14-0.fdr.1.1.src.rpm:1099890422
 perl-Pod-Coverage-0_14-0_fdr_1_2:HEAD:perl-Pod-Coverage-0.14-0.fdr.1.2.src.rpm:1099890428
+perl-Pod-Coverage-0_17-0_fdr_1_1:FC-1:perl-Pod-Coverage-0.17-0.fdr.1.1.src.rpm:1109880192



From fedora-extras-commits at redhat.com  Thu Mar  3 20:03:07 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:03:07 -0500
Subject: rpms/perl-Pod-Coverage/FC-1 .cvsignore,1.3,1.4
Message-ID: <200503032003.j23K379g015949@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Pod-Coverage/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15936/FC-1

Modified Files:
	.cvsignore 
Log Message:
auto-import perl-Pod-Coverage-0.17-0.fdr.1.1 on branch FC-1 from perl-Pod-Coverage-0.17-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Coverage/FC-1/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Dec 2004 20:06:30 -0000	1.3
+++ .cvsignore	3 Mar 2005 20:03:05 -0000	1.4
@@ -1,2 +1 @@
-Pod-Coverage-0.14.tar.gz
 Pod-Coverage-0.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 20:04:04 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:04:04 -0500
Subject: rpms/perl-XML-RSS import.log,1.4,1.5
Message-ID: <200503032004.j23K44GC016054@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-RSS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16045

Modified Files:
	import.log 
Log Message:
auto-import perl-XML-RSS-1.05-0.fdr.1.1 on branch FC-1 from perl-XML-RSS-1.05-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-RSS/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:14:47 -0000	1.4
+++ import.log	3 Mar 2005 20:04:02 -0000	1.5
@@ -1,3 +1,4 @@
 perl-XML-RSS-1_05-1:HEAD:perl-XML-RSS-1.05-1.src.rpm:1104577827
 perl-XML-RSS-1_05-0_fdr_1_rh90:RHL-9:perl-XML-RSS-1.05-0.fdr.1.rh90.src.rpm:1109748137
 perl-XML-RSS-1_05-0_fdr_1_2:FC-2:perl-XML-RSS-1.05-0.fdr.1.2.src.rpm:1109877294
+perl-XML-RSS-1_05-0_fdr_1_1:FC-1:perl-XML-RSS-1.05-0.fdr.1.1.src.rpm:1109880247



From fedora-extras-commits at redhat.com  Thu Mar  3 20:04:04 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:04:04 -0500
Subject: rpms/perl-XML-RSS/FC-1 perl-XML-RSS.spec,1.1,1.2
Message-ID: <200503032004.j23K44aW016058@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-RSS/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16045/FC-1

Modified Files:
	perl-XML-RSS.spec 
Log Message:
auto-import perl-XML-RSS-1.05-0.fdr.1.1 on branch FC-1 from perl-XML-RSS-1.05-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-XML-RSS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-RSS/FC-1/perl-XML-RSS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-RSS.spec	1 Jan 2005 11:10:17 -0000	1.1
+++ perl-XML-RSS.spec	3 Mar 2005 20:04:02 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-XML-RSS
 Version:        1.05
-Release:        1
+Release:        0.fdr.1.1
 Epoch:          0
 Summary:        Perl module for managing RDF Site Summary (RSS) files
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:05:09 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:05:09 -0500
Subject: rpms/perl-XML-XPath import.log,1.4,1.5
Message-ID: <200503032005.j23K594J016162@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-XPath
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16151

Modified Files:
	import.log 
Log Message:
auto-import perl-XML-XPath-1.13-0.fdr.2.1 on branch FC-1 from perl-XML-XPath-1.13-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPath/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:16:53 -0000	1.4
+++ import.log	3 Mar 2005 20:05:07 -0000	1.5
@@ -1,3 +1,4 @@
 perl-XML-XPath-1_13-2:HEAD:perl-XML-XPath-1.13-2.src.rpm:1108067370
 perl-XML-XPath-1_13-0_fdr_2_rh90:RHL-9:perl-XML-XPath-1.13-0.fdr.2.rh90.src.rpm:1109748197
 perl-XML-XPath-1_13-0_fdr_2_2:FC-2:perl-XML-XPath-1.13-0.fdr.2.2.src.rpm:1109877420
+perl-XML-XPath-1_13-0_fdr_2_1:FC-1:perl-XML-XPath-1.13-0.fdr.2.1.src.rpm:1109880316



From fedora-extras-commits at redhat.com  Thu Mar  3 20:05:09 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:05:09 -0500
Subject: rpms/perl-XML-XPath/FC-1 perl-XML-XPath.spec,1.1,1.2
Message-ID: <200503032005.j23K59HK016165@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-XPath/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16151/FC-1

Modified Files:
	perl-XML-XPath.spec 
Log Message:
auto-import perl-XML-XPath-1.13-0.fdr.2.1 on branch FC-1 from perl-XML-XPath-1.13-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-XML-XPath.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPath/FC-1/perl-XML-XPath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-XPath.spec	10 Feb 2005 20:29:37 -0000	1.1
+++ perl-XML-XPath.spec	3 Mar 2005 20:05:07 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-XML-XPath
 Version:        1.13
-Release:        2
+Release:        0.fdr.2.1
 Epoch:          0
 Summary:        XPath parser and evaluator for Perl
 
@@ -57,7 +57,7 @@
 
 
 %changelog
-* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-2
+* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-0.fdr.2
 - Bring up to date with current fedora.us Perl spec template.
 
 * Sun Oct 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 20:07:15 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:07:15 -0500
Subject: rpms/python-imaging import.log,1.3,1.4
Message-ID: <200503032007.j23K7FUv016294@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/python-imaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16283

Modified Files:
	import.log 
Log Message:
auto-import python-imaging-1.1.4-0.fdr.6.1 on branch FC-1 from python-imaging-1.1.4-0.fdr.6.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Mar 2005 19:08:52 -0000	1.3
+++ import.log	3 Mar 2005 20:07:13 -0000	1.4
@@ -1,2 +1,3 @@
 python-imaging-1_1_4-0_fdr_4_rh90:HEAD:python-imaging-1.1.4-0.fdr.4.rh90.src.rpm:1099890921
 python-imaging-1_1_4-0_fdr_6_2:FC-2:python-imaging-1.1.4-0.fdr.6.2.src.rpm:1109876937
+python-imaging-1_1_4-0_fdr_6_1:FC-1:python-imaging-1.1.4-0.fdr.6.1.src.rpm:1109880440



From fedora-extras-commits at redhat.com  Thu Mar  3 20:07:15 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:07:15 -0500
Subject: rpms/python-imaging/FC-1 python-imaging.spec,1.3,1.4
Message-ID: <200503032007.j23K7FK7016298@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/python-imaging/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16283/FC-1

Modified Files:
	python-imaging.spec 
Log Message:
auto-import python-imaging-1.1.4-0.fdr.6.1 on branch FC-1 from python-imaging-1.1.4-0.fdr.6.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-1/python-imaging.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-imaging.spec	11 Feb 2005 13:17:58 -0000	1.3
+++ python-imaging.spec	3 Mar 2005 20:07:13 -0000	1.4
@@ -6,7 +6,7 @@
 Name: python-imaging
 Epoch: 0
 Version: 1.1.4
-Release: 7
+Release: 0.fdr.6.1
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-1.1.4.tar.gz
@@ -59,12 +59,7 @@
 %build
 cd libImaging
 %configure
-make \
-%ifarch x86_64
-   CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \
-%endif
-   %{?_smp_mflags}
-
+make %{?_smp_mflags}
 cd ..
 %{__python} setup.py build
 
@@ -104,10 +99,7 @@
 %doc Doc Scripts Images Sane
 
 %changelog
-* Mon Feb  7 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.1.4-7
-- Build PIC on x86_64 to fix x86_64 linking.
-
-* Sat Oct  9 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.1.4-6
+* Sat Oct  9 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.1.4-0.fdr.6
 - Borrow parts from patch in Debian's 1.1.4-3 to fix issues in bug 1038 as
   well as a bunch of others.
 - Bring up to date with current fedora.us Python spec template recommendations.



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/camstream/devel camstream.spec,1.5,1.6
Message-ID: <200503032008.j23K8cXd016444@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	camstream.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: camstream.spec
===================================================================
RCS file: /cvs/extras/rpms/camstream/devel/camstream.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- camstream.spec	10 Feb 2005 17:39:50 -0000	1.5
+++ camstream.spec	3 Mar 2005 20:08:36 -0000	1.6
@@ -1,17 +1,16 @@
 Name:           camstream
 Version:        0.26.3
 Release:        5
-Epoch:          0
-Summary:        CamStream - a set of programs to make use of your webcam
+Summary:        Set of programs to make use of your webcam
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.smcc.demon.nl/camstream/
 Source0:        http://www.smcc.demon.nl/camstream/download/camstream-0.26.3.tar.gz
 Source1:        %{name}.desktop
-Source2:	%{name}.png
+Source2:        %{name}.png
 Patch0:         %{name}-makefiles.patch
-Patch1:		%{name}-%{version}-x86_64-asm.patch
+Patch1:         %{name}-%{version}-x86_64-asm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, libjpeg-devel, libpng-devel, autoconf, XFree86-devel



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/blender/devel blender.spec,1.6,1.7
Message-ID: <200503032008.j23K8cNJ016440@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	blender.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- blender.spec	3 Mar 2005 19:46:39 -0000	1.6
+++ blender.spec	3 Mar 2005 20:08:36 -0000	1.7
@@ -21,14 +21,14 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  libogg-devel
 BuildRequires:  libpng-devel
-BuildRequires:	libtool
-BuildRequires:	libvorbis-devel
+BuildRequires:  libtool
+BuildRequires:  libvorbis-devel
 BuildRequires:  openal-devel
 BuildRequires:  openssl-devel
 BuildRequires:  python-devel
 BuildRequires:  scons
-BuildRequires:	SDL-devel
-BuildRequires:	zlib-devel
+BuildRequires:  SDL-devel
+BuildRequires:  zlib-devel
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
@@ -61,7 +61,7 @@
 install -p -D -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/blender.png
 install -p -D -m0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/blender.xml
 desktop-file-install --vendor fedora                    \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
   %{SOURCE4}
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/ccache/devel ccache.spec,1.6,1.7
Message-ID: <200503032008.j23K8ctj016448@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ccache.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ccache.spec
===================================================================
RCS file: /cvs/extras/rpms/ccache/devel/ccache.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ccache.spec	10 Dec 2004 22:03:01 -0000	1.6
+++ ccache.spec	3 Mar 2005 20:08:36 -0000	1.7
@@ -4,14 +4,13 @@
 Name:		ccache
 Version:	2.4
 Release:	1
-Epoch:          0
 Summary:	Compiler cache
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://ccache.samba.org/
 Source0:	http://ccache.samba.org/ftp/ccache/ccache-2.4.tar.gz
-Patch0:         %{name}-html-links.patch
+Patch0:		%{name}-html-links.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/chkrootkit/devel chkrootkit.spec,1.7,1.8
Message-ID: <200503032008.j23K8cR0016464@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	chkrootkit.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: chkrootkit.spec
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/devel/chkrootkit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- chkrootkit.spec	24 Feb 2005 15:13:53 -0000	1.7
+++ chkrootkit.spec	3 Mar 2005 20:08:36 -0000	1.8
@@ -1,8 +1,7 @@
 Name:           chkrootkit
 Version:        0.45
 Release:        1
-Epoch:          0
-Summary:        A tool to locally check for signs of a rootkit
+Summary:        Tool to locally check for signs of a rootkit
 
 Group:          Applications/System
 License:        BSD-like
@@ -32,7 +31,7 @@
  * chkwtmp: checks for wtmp deletions.
  * chkproc: checks for signs of LKM trojans.
  * chkdirs: checks for signs of LKM trojans.
- * strings: quick and dirty strings replacement. 
+ * strings: quick and dirty strings replacement.
  * chkutmp: checks for utmp deletions.
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:39 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:39 -0500
Subject: rpms/cvsup/devel cvsup.spec,1.6,1.7
Message-ID: <200503032008.j23K8dAE016514@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	cvsup.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cvsup.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsup/devel/cvsup.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cvsup.spec	13 Feb 2005 02:48:53 -0000	1.6
+++ cvsup.spec	3 Mar 2005 20:08:37 -0000	1.7
@@ -8,7 +8,6 @@
 Name: cvsup
 Version: 16.1
 Release: 7.h
-Epoch: 0
 URL: http://www.polstra.com/projects/freeware/CVSup/
 License: BSD
 Group: Applications/Internet



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/clamav/devel clamav.spec,1.8,1.9
Message-ID: <200503032008.j23K8cm7016477@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	clamav.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- clamav.spec	15 Feb 2005 08:40:51 -0000	1.8
+++ clamav.spec	3 Mar 2005 20:08:36 -0000	1.9
@@ -23,7 +23,6 @@
 Name:		clamav
 Version:	0.83
 Release:	%release_func 1
-Epoch:		0
 License:	GPL
 Group:		Applications/File
 URL:		http://www.clamav.net
@@ -40,7 +39,7 @@
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:	clamav-lib = %{epoch}:%{version}-%{release}
+Requires:	clamav-lib = %{version}-%{release}
 Requires:	data(clamav)
 BuildRequires:	zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel
 BuildRequires:	bc
@@ -51,44 +50,44 @@
 Requires:	data(clamav)
 
 %package devel
-Summary:	Headerfiles and libraries for the Clam Antivirus scanner
+Summary:	Header files and libraries for the Clam Antivirus scanner
 Group:		Development/Libraries
 Source100:	clamd-gen
-Requires:	clamav-lib = %{epoch}:%{version}-%{release}
+Requires:	clamav-lib = %{version}-%{release}
 Requires(pre):	%_libdir/pkgconfig
 
 %package data
-Summary:	The virus-signatures for clamav
+Summary:	Virus signature data for the Clam Antivirus scanner
 Group:		Applications/File
 Provides:	data(clamav)
 Requires(pre):		fedora-usermgmt >= 0:0.7
 Requires(postun):	fedora-usermgmt >= 0:0.7
 
 %package update
-Summary:	Auto-updater for clamav data-files
+Summary:	Auto-updater for the Clam Antivirus scanner data-files
 Group:		Applications/File
-Requires:	clamav-data = %epoch:%version-%release
+Requires:	clamav-data = %{version}-%{release}
 Requires(pre):		/etc/cron.d
 Requires(postun):	/etc/cron.d
 Requires(post):		%{__chown} %{__chmod}
 
 %package server
-Summary:	The clamav server
+Summary:	Clam Antivirus scanner server
 Group:		System Environment/Daemons
-Provides:	clamav-daemon = %epoch:%version-%release
-Obsoletes:	clamav-daemon < %epoch:%version-%release
-Conflicts:	clamav-daemon > %epoch:%version-%release
+Provides:	clamav-daemon = %{version}-%{release}
+Obsoletes:	clamav-daemon < %{version}-%{release}
+Conflicts:	clamav-daemon > %{version}-%{release}
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-server)
 Provides:	init(clamav-server)
 Requires:	data(clamav)
-Requires:	clamav-lib = %{epoch}:%{version}-%{release}
+Requires:	clamav-lib = %{version}-%{release}
 Requires(pre):		%_initrddir
 Requires(postun):	%_initrddir
 
 %package milter
-Summary:	A sendmail-milter for clamav
+Summary:	Sendmail-milter for the Clam Antivirus scanner
 Group:		System Environment/Daemons
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
@@ -626,5 +625,5 @@
 * Tue Oct 29 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0.52-1
 - updated to 0.52
 
-* Tue Sep 17 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 
+* Tue Sep 17 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/cfengine/devel cfengine.spec,1.6,1.7
Message-ID: <200503032008.j23K8cbe016457@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	cfengine.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cfengine.spec	15 Dec 2004 19:33:17 -0000	1.6
+++ cfengine.spec	3 Mar 2005 20:08:36 -0000	1.7
@@ -1,6 +1,5 @@
-Summary: GNU cfengine - a systems administration tool for networks
+Summary: Systems administration tool for networks
 Name: cfengine
-Epoch: 0
 Version: 2.1.9
 Release: 2
 License: GPL
@@ -22,12 +21,10 @@
 configurations. Cfengine is designed to be a part of a computer immune
 system.
 
-#---------------------------------------------------------------------
 
 %prep
-%setup -n %{name}-%{version}
+%setup
 
-#---------------------------------------------------------------------
 
 %build
 # Since /usr is managed by rpmdb, we can build stuff in there
@@ -38,7 +35,7 @@
 
 # Some of the example files have execute bit for some reason.
 chmod 644 inputs/*example
-#---------------------------------------------------------------------
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -50,7 +47,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name}
 for i in ppkeys inputs outputs
 do
- 	mkdir -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/%{name}/$i
+	mkdir -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/%{name}/$i
 done
 
 # It's ugly, but thats the way Mark wants to have it. :(
@@ -81,7 +78,7 @@
 # All this stuff is pushed into doc directory.
 #
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} 
-#---------------------------------------------------------------------
+
 
 %post
 # cfagent won't run nicely, unless your host has keys.
@@ -99,21 +96,19 @@
 fi
 %preun
 if [ "$1" = "0" ]; then
-        /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
+	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
 	chkconfig --del cfenvd
 	chkconfig --del cfexecd
 	chkconfig --del cfservd
 fi
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root, 0755)
 %doc AUTHORS ChangeLog COPYING README TODO
 %doc contrib
 %doc inputs
@@ -132,7 +127,6 @@
 %dir %{_localstatedir}/%{name}/outputs
 %dir %{_localstatedir}/%{name}/ppkeys
 
-#---------------------------------------------------------------------
 
 %changelog
 * Sun Aug 15 2004 Juha Ylitalo <jylitalo at iki.fi> - 0:2.1.9-2



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/compface/devel compface.spec,1.6,1.7
Message-ID: <200503032008.j23K8coP016481@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	compface.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: compface.spec
===================================================================
RCS file: /cvs/extras/rpms/compface/devel/compface.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- compface.spec	17 Dec 2004 17:23:02 -0000	1.6
+++ compface.spec	3 Mar 2005 20:08:36 -0000	1.7
@@ -1,7 +1,6 @@
 Name:           compface
 Version:        1.4
 Release:        4
-Epoch:          0
 Summary:        Library for handling X-Faces
 
 Group:          System Environment/Libraries
@@ -13,7 +12,7 @@
 Patch1:         %{name}-nostrip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Provides:       %{name}-devel = %{epoch}:%{version}-%{release}
+Provides:       %{name}-devel = %{version}-%{release}
 
 %description
 Library for handling X-Faces and Bitblit icons.



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/cook/devel cook.spec,1.5,1.6
Message-ID: <200503032008.j23K8ctK016489@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	cook.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cook.spec
===================================================================
RCS file: /cvs/extras/rpms/cook/devel/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	3 Mar 2005 20:08:36 -0000	1.6
@@ -1,15 +1,14 @@
 Name:		cook
 Version:	2.25
 Release:	1
-Epoch:		0
-Summary: 	A file construction tool
+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
 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



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:39 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:39 -0500
Subject: rpms/cvsgraph/devel cvsgraph.spec,1.6,1.7
Message-ID: <200503032008.j23K8cKq016506@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	cvsgraph.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cvsgraph.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsgraph/devel/cvsgraph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cvsgraph.spec	26 Jan 2005 20:08:42 -0000	1.6
+++ cvsgraph.spec	3 Mar 2005 20:08:36 -0000	1.7
@@ -1,8 +1,7 @@
 Name:           cvsgraph
 Version:        1.5.1
 Release:        1
-Epoch:          0
-Summary:        A CVS/RCS repository grapher
+Summary:        CVS/RCS repository grapher
 
 Group:          Development/Tools
 License:        GPL
@@ -14,7 +13,7 @@
 
 BuildRequires:  gd-devel, byacc, flex, freetype-devel, libpng-devel, zlib-devel
 BuildRequires:  libjpeg-devel, %{__perl}
-Obsoletes:      cvsgraph-web < 0:1.5.1
+Obsoletes:      cvsgraph-web < 1.5.1
 
 %description
 CvsGraph is a utility to make a graphical representation of all



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/cksfv/devel cksfv.spec,1.5,1.6
Message-ID: <200503032008.j23K8c8R016469@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	cksfv.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cksfv.spec
===================================================================
RCS file: /cvs/extras/rpms/cksfv/devel/cksfv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cksfv.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ cksfv.spec	3 Mar 2005 20:08:36 -0000	1.6
@@ -2,13 +2,12 @@
 Name:             cksfv
 Version:          1.3
 Release:          2
-Epoch:            0
 URL:              http://www.fodder.org/cksfv
 License:          GPL
 Group:            Applications/File
 Source0:          http://www.fodder.org/cksfv/cksfv-1.3.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
-Prefix:           %{_prefix} 
+Prefix:           %{_prefix}
 
 %description
 cksfv is a utility that can create and use SFV files. SFV (Simple File



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/cdiff/devel cdiff.spec,1.3,1.4
Message-ID: <200503032008.j23K8crh016452@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	cdiff.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cdiff.spec
===================================================================
RCS file: /cvs/extras/rpms/cdiff/devel/cdiff.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cdiff.spec	10 Dec 2004 22:03:01 -0000	1.3
+++ cdiff.spec	3 Mar 2005 20:08:36 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           cdiff
 Version:        1.4
 Release:        4
-Epoch:          0
 Summary:        Diff readability enhancer for color terminals
 
 Group:          Applications/Text



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/cfs/devel cfs.spec,1.4,1.5
Message-ID: <200503032008.j23K8cXY016460@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	cfs.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cfs.spec
===================================================================
RCS file: /cvs/extras/rpms/cfs/devel/cfs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cfs.spec	10 Dec 2004 22:03:01 -0000	1.4
+++ cfs.spec	3 Mar 2005 20:08:36 -0000	1.5
@@ -1,10 +1,9 @@
 %define debpatch_version	10
 
-Summary:	An userspace crypto-filesystem
+Summary:	Userspace crypto-filesystem
 Name:		cfs
 Version:	1.4.1
 Release:	3
-Epoch:		0
 License:	BSD like
 Group:		System Environment/Daemons
 URL:		http://www.crypto.com/software
@@ -30,7 +29,7 @@
 %package utils
 Summary:	Some (inofficial) utilities for cfs
 Group:		Applications/System
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	openssh-askpass procmail
 
 %description utils
@@ -72,8 +71,8 @@
 %{__install} -d $RPM_BUILD_ROOT{/.cfsfs,%{_bindir},%{_sbindir}} 	\
 		$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig			\
 		$RPM_BUILD_ROOT%{_initrddir}				\
-   	        $RPM_BUILD_ROOT%{_mandir}/man{1,8}/		      	\
-		$RPM_BUILD_ROOT%{_libdir}/%{name}		      	\
+		$RPM_BUILD_ROOT%{_mandir}/man{1,8}/			\
+		$RPM_BUILD_ROOT%{_libdir}/%{name}			\
 		$RPM_BUILD_ROOT/mnt/crypt
 
 D=$RPM_BUILD_ROOT
@@ -166,7 +165,7 @@
 * Sat Sep 15 2001 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 1.4.0.beta2-6
 - Prepared for rhcontrib
 - Added mcrypt-script + INSTALL file
- 
+
 * Tue Sep 12 2000 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - initial build
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/configure-thinkpad/devel configure-thinkpad.spec,1.7,1.8
Message-ID: <200503032008.j23K8c7O016485@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/configure-thinkpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/configure-thinkpad/devel

Modified Files:
	configure-thinkpad.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: configure-thinkpad.spec
===================================================================
RCS file: /cvs/extras/rpms/configure-thinkpad/devel/configure-thinkpad.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure-thinkpad.spec	12 Feb 2005 19:00:05 -0000	1.7
+++ configure-thinkpad.spec	3 Mar 2005 20:08:36 -0000	1.8
@@ -1,7 +1,6 @@
 Name:           configure-thinkpad
 Version:        0.9
 Release:        1
-Epoch:          0
 Summary:        Graphical ThinkPad configuration utility
 
 Group:          Applications/System
@@ -12,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
-BuildRequires:  libgnomeui-devel >= 0:2, gettext
+BuildRequires:  libgnomeui-devel >= 2, gettext
 Requires:       tpctl
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/cpan2rpm/devel cpan2rpm.spec,1.2,1.3
Message-ID: <200503032008.j23K8coK016495@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	cpan2rpm.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cpan2rpm.spec
===================================================================
RCS file: /cvs/extras/rpms/cpan2rpm/devel/cpan2rpm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cpan2rpm.spec	10 Dec 2004 22:03:02 -0000	1.2
+++ cpan2rpm.spec	3 Mar 2005 20:08:36 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           cpan2rpm
 Version:        2.026
 Release:        1
-Epoch:          0
 Summary:        Perl module packager
 
 Group:          Applications/System



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:39 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:39 -0500
Subject: rpms/cvsweb/devel cvsweb.spec,1.2,1.3
Message-ID: <200503032008.j23K8dXG016518@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	cvsweb.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cvsweb.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsweb/devel/cvsweb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cvsweb.spec	27 Nov 2004 16:30:31 -0000	1.2
+++ cvsweb.spec	3 Mar 2005 20:08:37 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           cvsweb
 Version:        3.0.4
 Release:        1
-Epoch:          0
 Summary:        Web interface for CVS repositories
 
 License:        BSD



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:39 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:39 -0500
Subject: rpms/cvsplot/devel cvsplot.spec,1.2,1.3
Message-ID: <200503032008.j23K8dxY016510@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	cvsplot.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cvsplot.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsplot/devel/cvsplot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cvsplot.spec	6 Dec 2004 20:48:26 -0000	1.2
+++ cvsplot.spec	3 Mar 2005 20:08:36 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           cvsplot
 Version:        1.7.4
 Release:        1
-Epoch:          0
-Summary:        Cvsplot collects statistics from CVS controlled files
+Summary:        Collect statistics from CVS controlled files
 
 License:        GPL
 Group:          Development/Tools
@@ -11,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Requires:       cvs >= 0:1.11.1, gnuplot, perl-DateManip >= 0:5.42
+Requires:       cvs >= 1.11.1, gnuplot, perl-DateManip >= 5.42
 Requires:       perl(String::ShellQuote)
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:39 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:39 -0500
Subject: rpms/cvs2cl/devel cvs2cl.spec,1.6,1.7
Message-ID: <200503032008.j23K8cfD016499@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	cvs2cl.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cvs2cl.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs2cl/devel/cvs2cl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cvs2cl.spec	23 Jan 2005 16:29:02 -0000	1.6
+++ cvs2cl.spec	3 Mar 2005 20:08:36 -0000	1.7
@@ -1,8 +1,7 @@
 Name:           cvs2cl
 Version:        2.58
 Release:        1
-Epoch:          0
-Summary:        Utility which generates ChangeLogs from CVS working copies
+Summary:        Generate ChangeLogs from CVS working copies
 
 Group:          Development/Tools
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:16 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:16 -0500
Subject: rpms/dhcp-forwarder/devel dhcp-forwarder.spec,1.5,1.6
Message-ID: <200503032020.j23KKGRP016939@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904/dhcp-forwarder/devel

Modified Files:
	dhcp-forwarder.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dhcp-forwarder.spec	2 Feb 2005 21:37:56 -0000	1.5
+++ dhcp-forwarder.spec	3 Mar 2005 20:20:14 -0000	1.6
@@ -24,18 +24,17 @@
 
 %{!?release_func:%define release_func() %1}
 
-Summary:	A DHCP relay agent
+Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.7
 Release:	%release_func 1
-Epoch:		0
 License:	GPL
 Group:		System Environment/Daemons
 URL:		http://www.tu-chemnitz.de/~ensc/dhcp-fwd
 Source0:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2
 Source1:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2.asc
 BuildRoot:	%_tmppath/%name-%version-%release-root
-Requires:		init(dhcp-forwarder)
+Requires:	init(dhcp-forwarder)
 
 %{!?_without_dietlibc:BuildRequires:	dietlibc}
 
@@ -50,7 +49,7 @@
 Summary:		SysV initscripts for dhcp-forwarder
 Group:			System Environment/Base
 Provides:		init(dhcp-forwarder) = sysv
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(preun):	%name initscripts
 Requires(postun):	%name initscripts
 Requires(post):		/sbin/chkconfig
@@ -61,7 +60,7 @@
 Summary:		minit initscripts for dhcp-forwarder
 Group:			System Environment/Base
 Provides:		init(dhcp-forwarder) = minit
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(pre):		minit-setup
 Requires(postun):	minit-setup
 
@@ -95,26 +94,20 @@
 with the minit initconcept.
 
 
-##---------------------------------------------
-
 
 %prep
 %setup -q
 
 
-##---------------------------------------------
-
 
 %build
 %configure \
 	--enable-release \
-        --with-initrddir=%_initrddir \
+	--with-initrddir=%_initrddir \
 	%{?_without_dietlibc:--disable-dietlibc}
 %__make %{?_smp_mflags}
 
 
-##---------------------------------------------
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -125,15 +118,11 @@
 %{?_without_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 
 
-##---------------------------------------------
-
 
 %check
 %__make check
 
 
-##---------------------------------------------
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -141,8 +130,8 @@
 
 %pre
 %groupadd -r %username &>/dev/null || :
-%useradd  -r -s /sbin/nologin -M -c 'DHCP Forwarder user'	\
-	  -d %homedir -g %username %username &>/dev/null || :
+%useradd  -r -s /sbin/nologin -M -c 'DHCP Forwarder user' \
+          -d %homedir -g %username %username &>/dev/null || :
 
 
 %postun
@@ -162,7 +151,7 @@
 fi
 
 %postun sysv
-test "$1" = 0 || %_initrddir/%service condrestart &>/dev/null
+test "$1" = "0" || %_initrddir/%service condrestart &>/dev/null
 
 
 %files



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:15 -0500
Subject: rpms/ddclient/devel ddclient.spec,1.3,1.4
Message-ID: <200503032020.j23KKFNK016931@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ddclient.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ddclient.spec
===================================================================
RCS file: /cvs/extras/rpms/ddclient/devel/ddclient.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ddclient.spec	10 Dec 2004 22:03:02 -0000	1.3
+++ ddclient.spec	3 Mar 2005 20:20:13 -0000	1.4
@@ -1,8 +1,7 @@
 Name:           ddclient
 Version:        3.6.3
 Release:        4
-Epoch:          0
-Summary:        A client to update dynamic DNS host entries.
+Summary:        Client to update dynamic DNS host entries
 
 Group:          System Environment/Daemons
 License:        GPL
@@ -20,17 +19,14 @@
 ddclient is a Perl client used to update dynamic DNS entries for accounts
 on many dynamic DNS services.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
 %patch -p1
 
-# -----------------------------------------------------------------------------
 
 %build
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -45,12 +41,10 @@
 mkdir -p $RPM_BUILD_ROOT/var/cache
 touch $RPM_BUILD_ROOT/var/cache/ddclient.cache
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %post
 /sbin/chkconfig --add ddclient
@@ -58,7 +52,7 @@
 chmod 0600 /var/cache/ddclient.cache
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
         /sbin/service ddclient stop > /dev/null 2>&1
         /sbin/chkconfig --del ddclient
 fi
@@ -74,7 +68,6 @@
 %ghost %attr(0600, root, root) /var/cache/ddclient.cache
 %{_initrddir}/ddclient
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Mon Apr 05 2004 Toshio Kuratomi <toshio[+]tiki-lounge.com> - 0:3.6.3-0.fdr.4.fc1



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:16 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:16 -0500
Subject: rpms/dillo/devel dillo.spec,1.6,1.7
Message-ID: <200503032020.j23KKGkf016943@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	dillo.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: dillo.spec
===================================================================
RCS file: /cvs/extras/rpms/dillo/devel/dillo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dillo.spec	9 Feb 2005 23:44:00 -0000	1.6
+++ dillo.spec	3 Mar 2005 20:20:14 -0000	1.7
@@ -1,7 +1,6 @@
 Name:           dillo
 Version:        0.8.4
 Release:        2
-Epoch:          0
 Summary:        Very small and fast GUI web browser
 
 Group:          Applications/Internet
@@ -10,29 +9,32 @@
 Source0:        http://www.dillo.org/download/dillo-0.8.4.tar.bz2
 Source1:        %{name}.desktop
 Source2:        %{name}.png
-Patch0:		dillo-0.8.0-nodebug.patch
+Patch0:         dillo-0.8.0-nodebug.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk+-devel 
+BuildRequires:  gtk+-devel
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  libpng-devel >= 0:1.2.0
-BuildRequires:  libjpeg-devel = 0:6b
-Requires:	wget
-Provides:	webclient
+BuildRequires:  libpng-devel >= 1.2.0
+BuildRequires:  libjpeg-devel = 6b
+Requires:       wget
+Provides:       webclient
 
 %description
 Dillo is a very small and fast web browser using GTK.
 Currently: no frames,https,javascript.
 
+
 %prep
 %setup -q
 %patch0
 
+
 %build
 %configure --disable-dependency-tracking --enable-ipv6
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -40,8 +42,8 @@
 rm -f doc/Makefile*
 
 %{__install} -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
-desktop-file-install --vendor fedora  \
-        --add-category X-Fedora				\
+desktop-file-install --vendor fedora \
+        --add-category X-Fedora \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications  \
         %{SOURCE1}
 %{__install} -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/dillo.png
@@ -51,10 +53,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog doc
-%config(noreplace) %{_sysconfdir}/*    
+%config(noreplace) %{_sysconfdir}/*
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/dillo.png



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:16 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:16 -0500
Subject: rpms/duplicity/devel duplicity.spec,1.4,1.5
Message-ID: <200503032020.j23KKGYw016955@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	duplicity.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/duplicity.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- duplicity.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ duplicity.spec	3 Mar 2005 20:20:14 -0000	1.5
@@ -5,14 +5,13 @@
 Summary: Untrusted/encrypted backup using rsync algorithm
 Name: duplicity
 Release: 3
-Epoch: 0
 URL: http://www.nongnu.org/duplicity/
 Source: http://savannah.nongnu.org/download/duplicity/%{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/Archiving
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: python >= 0:%{PYTHON_VERSION}, python < 0:%{NEXT_PYTHON_VERSION}, gnupg >= 0:1.0.6
-BuildRequires: python-devel >= 0:2.2, librsync-devel >= 0:0.9.6
+Requires: python >= %{PYTHON_VERSION}, python < %{NEXT_PYTHON_VERSION}, gnupg >= 1.0.6
+BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6
 
 %description
 Duplicity incrementally backs up files and directory by encrypting
@@ -55,7 +54,9 @@
 %changelog
 * Sun Oct 05 2003 Ben Escoto <bescoto at stanford.edu> - 0:0.4.1-0.fdr.3
 - More hints from Fedora QA (ville.skytta at iki.fi)
+
 * Sat Aug 09 2003 Ben Escoto <bescoto at stanford.edu> - 0:0.4.1-0.fdr.2
 - Repackaging for Fedora
+
 * Sun Aug 30 2002 Ben Escoto <bescoto at stanford.edu>
 - Initial RPM



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:16 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:16 -0500
Subject: rpms/dosbox/devel dosbox.spec,1.6,1.7
Message-ID: <200503032020.j23KKGdY016951@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	dosbox.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: dosbox.spec
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dosbox.spec	13 Feb 2005 11:56:55 -0000	1.6
+++ dosbox.spec	3 Mar 2005 20:20:14 -0000	1.7
@@ -1,15 +1,14 @@
 Name:           dosbox
 Version:        0.63
 Release:        1
-Epoch:          0
-Summary:        An x86/DOS emulator with sound/graphics
+Summary:        x86/DOS emulator with sound and graphics
 
 Group:          Applications/Emulators
 License:        GPL
 URL:            http://dosbox.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        dosbox.desktop
-Source2:	dosbox.png
+Source2:        dosbox.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  libpng-devel
@@ -37,6 +36,8 @@
 %configure --enable-shots
 %{__make}
 
+
+%check
 %{__make} check
 
 
@@ -53,6 +54,7 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 install -p -m 0644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -65,6 +67,7 @@
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/dosbox.png
 
+
 %changelog
 * Thu Nov 25 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0:0.63-1



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:16 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:16 -0500
Subject: rpms/ddrescue/devel ddrescue.spec,1.5,1.6
Message-ID: <200503032020.j23KKGqh016935@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ddrescue.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ddrescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/devel/ddrescue.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ddrescue.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ ddrescue.spec	3 Mar 2005 20:20:13 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           ddrescue
 Version:        1.10
 Release:        1
-Epoch:          0
 Summary:        Fault tolerant "dd" utility for rescuing data from bad media
 
 Group:          Applications/System
@@ -23,7 +22,7 @@
 
 %build
 #rm dd_rescue
-#EXTRA_CFLAGS="$RPM_OPT_FLAGS" 
+#EXTRA_CFLAGS="$RPM_OPT_FLAGS"
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 cp README.dd_rescue README
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:16 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:16 -0500
Subject: rpms/doctorj/devel doctorj.spec,1.7,1.8
Message-ID: <200503032020.j23KKGnK016947@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	doctorj.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/devel/doctorj.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- doctorj.spec	13 Feb 2005 17:07:40 -0000	1.7
+++ doctorj.spec	3 Mar 2005 20:20:14 -0000	1.8
@@ -1,7 +1,6 @@
 Name:           doctorj
 Version:        4.0.2
 Release:        4
-Epoch:          0
 Summary:        Java source code analyzer
 
 Group:          Development/Tools



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:16 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:16 -0500
Subject: rpms/dxpc/devel dxpc.spec,1.4,1.5
Message-ID: <200503032020.j23KKG0k016959@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	dxpc.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: dxpc.spec
===================================================================
RCS file: /cvs/extras/rpms/dxpc/devel/dxpc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dxpc.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ dxpc.spec	3 Mar 2005 20:20:14 -0000	1.5
@@ -1,20 +1,16 @@
-## kde-redhat macros
-%define rhversion %(perl -pe '/(\\d+)\\.?(\\d)?/; $_="$1".($2||0)' /etc/redhat-release)
-
-Summary: A Differential X Protocol Compressor
-Name:	 dxpc
-Epoch:	 0
+Summary: Differential X Protocol Compressor
+Name:    dxpc
 Version: 3.8.2
 Release: 1
-Source:	 http://www.vigor.nu/dxpc/%{version}/dxpc-%{version}.tar.gz
+Source:  http://www.vigor.nu/dxpc/%{version}/dxpc-%{version}.tar.gz
 License: BSD
 Group:   User Interface/X
-URL:	 http://www.vigor.nu/dxpc/
+URL:     http://www.vigor.nu/dxpc/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:	lzo-devel >= 0:1.08
-BuildRequires:	XFree86-devel
-Requires:	lzo >= 0:1.08
+BuildRequires: lzo-devel >= 1.08
+BuildRequires: XFree86-devel
+Requires:      lzo >= 1.08
 
 Patch1:  dxpc-3.8.2-mandir.patch
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:24:04 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:24:04 -0500
Subject: rpms/alsa-firmware/devel alsa-firmware.spec,1.3,1.4
Message-ID: <200503032024.j23KO4Tt017137@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/alsa-firmware/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17131

Modified Files:
	alsa-firmware.spec 
Log Message:
 


Index: alsa-firmware.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-firmware/devel/alsa-firmware.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alsa-firmware.spec	3 Mar 2005 19:29:59 -0000	1.3
+++ alsa-firmware.spec	3 Mar 2005 20:24:02 -0000	1.4
@@ -7,7 +7,7 @@
 URL: 		http://www.alsa-project.org/
 Source0: 	%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	alsa-tools-firmware >= 0:1.0.4
+Requires:	alsa-tools-firmware >= 1.0.4
 
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/firestarter/devel firestarter.spec,1.8,1.9
Message-ID: <200503032033.j23KXtPn017270@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	firestarter.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: firestarter.spec
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/firestarter.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- firestarter.spec	28 Feb 2005 21:12:57 -0000	1.8
+++ firestarter.spec	3 Mar 2005 20:33:53 -0000	1.9
@@ -1,27 +1,27 @@
-Name: 		firestarter
-Version: 	1.0.3
-Release: 	1
-Summary: 	The Firestarter firewall tool for GNOME
-
-Group: 		Applications/Internet
-License: 	GPL
-URL: 		http://firestarter.sourceforge.net
+Name:		firestarter
+Version:	1.0.3
+Release:	1
+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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	glib2-devel >= 2.4
 BuildRequires:	gnome-vfs2-devel >= 2.6.0
 BuildRequires:	gtk2-devel >= 2.4
 BuildRequires:	libglade2-devel >= 2.3.6
 BuildRequires:	libgnomeui-devel
-BuildRequires:  perl-XML-Parser
+BuildRequires:	perl(XML::Parser)
 
-Requires:       iptables
-Requires:       usermode-gtk
-Requires(post):  GConf2
-Requires(preun): GConf2
+Requires:	iptables
+Requires:	usermode-gtk
+Requires(post):		GConf2
+Requires(preun):	GConf2
 
 %description
 Firestarter is an easy-to-use, yet powerful, Linux firewall tool for GNOME.
@@ -31,7 +31,7 @@
 
 
 %prep
-%setup -q 
+%setup -q
 
 
 %build
@@ -74,7 +74,7 @@
 
 %find_lang %{name}
 
-install -p -D -m0644 firestarter.pam ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/firestarter 
+install -p -D -m0644 firestarter.pam ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/firestarter
 install -p -D -m0644 firestarter.console  ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/firestarter
 install -p -D -m0755 fedora.init ${RPM_BUILD_ROOT}%{_initrddir}/firestarter
 
@@ -246,7 +246,7 @@
 - Cleaned up spec
 
 * Wed Feb 26 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0.9.1-1.fedora.1
-- Initial Fedora release (0.9.1). 
+- Initial Fedora release (0.9.1).
 
 * Tue Aug 06 2002 Tomas Junnonen <majix at sci.fi>
 - Updated requirements to GNOME2 level
@@ -255,7 +255,7 @@
 * Tue Jun 25 2002 Paul Drain <pd at cipherfunk.org>
 - Merged some compatible cleanups from the FreshRPMS (http://freshrpms.net)
   specfile.
-  
+
 * Wed Apr 24 2002 Paul Drain <pd at cipherfunk.org>
 - build dependancy cleanups
 
@@ -276,7 +276,7 @@
 - preun now doesn't explicitly delete the init script,
   caused problem with package upgrades.
 - Moved the init scripts to external files
-  
+
 * Tue Oct 23 2001 Paul Drain <pd at cipherfunk.org>
 - Added sgmltools and openjade to build requirements
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fbdesk/devel fbdesk.spec,1.6,1.7
Message-ID: <200503032033.j23KXt0m017254@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	fbdesk.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fbdesk.spec
===================================================================
RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fbdesk.spec	13 Feb 2005 11:02:17 -0000	1.6
+++ fbdesk.spec	3 Mar 2005 20:33:52 -0000	1.7
@@ -1,11 +1,10 @@
 Name:           fbdesk
 Version:        1.2.1
 Release:        1
-Epoch:          0
 Summary:        Icon Manager for Fluxbox
 
-Group:          User Interface/Desktops 
-License:        MIT 
+Group:          User Interface/Desktops
+License:        MIT
 URL:            http://fluxbox.sourceforge.net/fbdesk/
 Source0:        http://fluxbox.sourceforge.net/download/fbdesk-1.2.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:54 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:54 -0500
Subject: rpms/elmo/devel elmo.spec,1.3,1.4
Message-ID: <200503032033.j23KXsog017242@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	elmo.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: elmo.spec
===================================================================
RCS file: /cvs/extras/rpms/elmo/devel/elmo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- elmo.spec	10 Dec 2004 22:03:02 -0000	1.3
+++ elmo.spec	3 Mar 2005 20:33:52 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           elmo
 Version:        1.2.0
 Release:        2
-Epoch:          0
 Summary:        Terminal-based mail client
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:54 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:54 -0500
Subject: rpms/factory/devel factory.spec,1.6,1.7
Message-ID: <200503032033.j23KXsLr017250@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	factory.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/devel/factory.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- factory.spec	4 Dec 2004 09:54:42 -0000	1.6
+++ factory.spec	3 Mar 2005 20:33:52 -0000	1.7
@@ -1,19 +1,18 @@
 # $Id$
 
-Summary: A C++ class library for multivariate polynomial data	
-Name:    factory	
-Epoch:	 0
+Summary: C++ class library for multivariate polynomial data
+Name:    factory
 Version: 2.0.5
-Release: 3%{?dist_tag}
-License: GPL	
-Url:   	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
-Source:	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz
-Group:   System Environment/Libraries	
+Release: 3
+License: GPL
+URL:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
+Source:  http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz
+Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Patch1: factory-2.0.5-gcc34.patch
 
-BuildRequires:	gmp-devel
+BuildRequires: gmp-devel
 
 %description
 Factory is a C++ class library that implements a recursive representation
@@ -24,8 +23,8 @@
 Summary: %{summary}
 Group:   Development/Libraries
 Requires: gmp-devel
-Obsoletes: %{name} < %{epoch}:%{version}-%{release}
-Provides:  %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name} < %{version}-%{release}
+Provides:  %{name} = %{version}-%{release}
 %description devel
 Factory is a C++ class library that implements a recursive representation
 of multivariate polynomial data.
@@ -43,7 +42,7 @@
 %configure --disable-streamio
 
 # smp broken?
-make 
+make
 
 
 %install
@@ -74,7 +73,7 @@
 
 %changelog
 * Wed Oct 06 2004 Rex Dieter <rexdieter at sf.net> 0:2.0.5-3
-- (2nd try at) gcc34 patch 
+- (2nd try at) gcc34 patch
 
 * Wed Oct 06 2004 Rex Dieter <rexdieter at sf.net> 0:2.0.5-0.fdr.2
 - gcc34 patch



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/freedroidrpg/devel freedroidrpg.spec,1.5,1.6
Message-ID: <200503032033.j23KXtdT017294@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	freedroidrpg.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: freedroidrpg.spec
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- freedroidrpg.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ freedroidrpg.spec	3 Mar 2005 20:33:53 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           freedroidrpg
 Version:        0.9.12
 Release:        1
-Epoch:          0
 Summary:        Role playing game with Freedroid theme and Tux as the hero
 
 Group:          Amusements/Games



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fslint/devel fslint.spec,1.4,1.5
Message-ID: <200503032033.j23KXtXS017298@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	fslint.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/fslint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fslint.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ fslint.spec	3 Mar 2005 20:33:53 -0000	1.5
@@ -4,8 +4,7 @@
 Name:           fslint
 Version:        2.02
 Release:        2
-Epoch:          0
-Summary:        FSlint - a utility to find and clean "lint" on a filesystem
+Summary:        Utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
 License:        GPL
@@ -16,7 +15,7 @@
 BuildArch:      noarch
 
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 0:%{pyver}, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= %{pyver}, pygtk2, pygtk2-libglade, cpio
 
 %description
 FSlint is a toolkit to find all redundant disk usage.  It includes a



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fontforge/devel fontforge.spec,1.7,1.8
Message-ID: <200503032033.j23KXtHh017282@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	fontforge.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fontforge.spec	29 Jan 2005 21:20:57 -0000	1.7
+++ fontforge.spec	3 Mar 2005 20:33:53 -0000	1.8
@@ -1,8 +1,7 @@
 Name:           fontforge
 Version:        0.0
 Release:        2.20041231
-Epoch:          0
-Summary:        An outline and bitmap font editor
+Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
 License:        BSD
@@ -25,7 +24,7 @@
 BuildRequires:  libuninameslist-devel
 Obsoletes:      pfaedit
 
-%description 
+%description
 FontForge (former PfaEdit) is a font editor for outline and bitmap
 fonts. It supports a range of font formats, including PostScript
 (ASCII and binary Type 1, some Type 3 and Type 0), TrueType, OpenType
@@ -42,7 +41,7 @@
 mkdir cidmaps
 tar xzf htdocs/cidmaps.tgz -C cidmaps
 
-find . -name "CVS" -type d -print | xargs rm -r 
+find . -name "CVS" -type d -print | xargs rm -r
 
 for i in fontforge/fontforge.1 fontforge/sfddiff.1 ; do
   iconv -f iso-8859-1 -t utf-8 $i -o $i.utf8 ; mv $i.utf8 $i
@@ -185,7 +184,7 @@
 - Updated to 031012.
 - Removed .so links.
 - Removed empty AUTHORS file.
-- Removed the samples subpackage. 
+- Removed the samples subpackage.
 
 * Mon Sep 22 2003 Marius L. J??hndal <mariuslj at ifi.uio.no> 0:0.0-0.fdr.1.030904
 - Updated to 030904.



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/foobillard/devel foobillard.spec,1.6,1.7
Message-ID: <200503032033.j23KXt05017286@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	foobillard.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: foobillard.spec
===================================================================
RCS file: /cvs/extras/rpms/foobillard/devel/foobillard.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- foobillard.spec	16 Feb 2005 17:19:10 -0000	1.6
+++ foobillard.spec	3 Mar 2005 20:33:53 -0000	1.7
@@ -1,22 +1,21 @@
 Name:           foobillard
 Version:        3.0a
 Release:        1
-Epoch:          0
-Summary:        A free OpenGL game of playing billard.
+Summary:        OpenGL billard game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://foobillard.sunsite.dk/
 Source0:        http://foobillard.sunsite.dk/dnl/foobillard-3.0a.tar.gz
-Source1:	foobillard.desktop
-Patch0:		foobillard-3.0a-nonv.patch
+Source1:        foobillard.desktop
+Patch0:         foobillard-3.0a-nonv.patch
 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
 
 %description
-FooBillard is an attempt to create a free OpenGL-billard for Linux. 
+FooBillard is an attempt to create a free OpenGL-billard for Linux.
 FooBillard is still under development but the main physics is implemented.
 
 
@@ -35,7 +34,7 @@
 %makeinstall
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 install -pm 644 %{_sourcedir}/foobillard.desktop \
-	$RPM_BUILD_ROOT%{_datadir}/applications/fedora-foobillard.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/fedora-foobillard.desktop
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
 install -pm 644 foobillard.6 $RPM_BUILD_ROOT%{_mandir}/man6
 install -D -p -m 644 foobillard.png \



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fluxconf/devel fluxconf.spec,1.3,1.4
Message-ID: <200503032033.j23KXtXb017279@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	fluxconf.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fluxconf.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/devel/fluxconf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fluxconf.spec	10 Dec 2004 22:03:02 -0000	1.3
+++ fluxconf.spec	3 Mar 2005 20:33:53 -0000	1.4
@@ -1,13 +1,11 @@
 Name:		fluxconf
 Version:	0.9.7
 Release:	1
-Epoch:		0
 Summary:	Configuration utility for fluxbox
 
-Group:          User Interface/Desktops 
+Group:		User Interface/Desktops 
 License:	GPL
-Url:		http://devaux.fabien.free.fr/flux
-
+URL:		http://devaux.fabien.free.fr/flux
 
 Source:		http://devaux.fabien.free.fr/flux/fluxconf-0.9.7.tar.gz
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fftw/devel fftw.spec,1.5,1.6
Message-ID: <200503032033.j23KXtLL017266@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	fftw.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fftw.spec
===================================================================
RCS file: /cvs/extras/rpms/fftw/devel/fftw.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fftw.spec	11 Nov 2004 19:21:36 -0000	1.5
+++ fftw.spec	3 Mar 2005 20:33:53 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           fftw
 Version:        2.1.5
 Release:        5
-Summary:        Fast Fourier Transform library.
+Summary:        Fast Fourier Transform library
 
 Group:          System Environment/Libraries
 License:        GPL
@@ -21,7 +21,7 @@
 
 
 %package        devel
-Summary:        Headers, libraries and docs for the FFTW library.
+Summary:        Headers, libraries and docs for the FFTW library
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:54 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:54 -0500
Subject: rpms/ez-ipupdate/devel ez-ipupdate.spec,1.5,1.6
Message-ID: <200503032033.j23KXsW0017246@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ez-ipupdate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/ez-ipupdate/devel

Modified Files:
	ez-ipupdate.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ez-ipupdate.spec
===================================================================
RCS file: /cvs/extras/rpms/ez-ipupdate/devel/ez-ipupdate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ez-ipupdate.spec	27 Nov 2004 11:21:02 -0000	1.5
+++ ez-ipupdate.spec	3 Mar 2005 20:33:52 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           ez-ipupdate
 Version:        3.0.11
 Release:        0.7.b8
-Epoch:          0
 Summary:        Client for Dynamic DNS Services
 
 Group:          Applications/Internet
@@ -20,7 +19,7 @@
 
 %description
 ez-ipupdate is a small utility for updating your host name for any of the
-dynamic DNS service offered at: 
+dynamic DNS service offered at:
   * http://www.ez-ip.net
   * http://www.justlinux.com
   * http://www.dhs.org



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fedora-usermgmt/devel fedora-usermgmt.spec,1.5,1.6
Message-ID: <200503032033.j23KXtX1017262@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	fedora-usermgmt.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/fedora-usermgmt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-usermgmt.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ fedora-usermgmt.spec	3 Mar 2005 20:33:53 -0000	1.6
@@ -8,7 +8,6 @@
 Name:		fedora-usermgmt
 Version:	0.7
 Release:	2
-Epoch:		0
 License:	GPL
 BuildArch:	noarch
 Group:		Applications/System
@@ -40,7 +39,7 @@
 Source20:	fedora-usermgmt-groupadd.legacy
 Source21:	fedora-usermgmt-useradd.legacy
 Provides:	instance(fedora-usermgmt)
-Requires:	%name = %epoch:%version-%release
+Requires:	%name = %version-%release
 Requires(pre):		%confdir
 Requires(postun):	%confdir
 Requires(post):		%alternatives
@@ -113,8 +112,8 @@
 
 
 %preun shadow-utils
-test "$1" != 0 || %alternatives --remove %name %confdir/scripts.shadow-utils
-test "$1" != 0 || %alternatives --remove %name %confdir/scripts.legacy
+test "$1" != "0" || %alternatives --remove %name %confdir/scripts.shadow-utils
+test "$1" != "0" || %alternatives --remove %name %confdir/scripts.legacy
 
 
 %clean



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fedora-rpmdevtools/devel fedora-rpmdevtools.spec,1.6,1.7
Message-ID: <200503032033.j23KXt8d017258@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	fedora-rpmdevtools.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-rpmdevtools.spec	9 Feb 2005 22:12:33 -0000	1.6
+++ fedora-rpmdevtools.spec	3 Mar 2005 20:33:52 -0000	1.7
@@ -4,7 +4,6 @@
 Name:           fedora-rpmdevtools
 Version:        0.3.1
 Release:        1
-Epoch:          0
 Summary:        Fedora RPM Development Tools
 
 Group:          Development/Tools
@@ -15,7 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Provides:       %{name}-emacs = %{epoch}:%{version}-%{release}
+Provides:       %{name}-emacs = %{version}-%{release}
 Obsoletes:      %{name}-emacs < 0:0.1.9
 # Required for tool operations
 Requires:       rpm-python, python, cpio, sed, perl



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/freedroid/devel freedroid.spec,1.4,1.5
Message-ID: <200503032033.j23KXt9m017290@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	freedroid.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: freedroid.spec
===================================================================
RCS file: /cvs/extras/rpms/freedroid/devel/freedroid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- freedroid.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ freedroid.spec	3 Mar 2005 20:33:53 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           freedroid
 Version:        1.0.2
 Release:        2
-Epoch:          0
-Summary:        Clone of the C64 Game Paradroid
+Summary:        Clone of the C64 game Paradroid
 
 Group:          Amusements/Games
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fltk/devel fltk.spec,1.5,1.6
Message-ID: <200503032033.j23KXtcG017274@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	fltk.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fltk.spec
===================================================================
RCS file: /cvs/extras/rpms/fltk/devel/fltk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fltk.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ fltk.spec	3 Mar 2005 20:33:53 -0000	1.6
@@ -1,29 +1,27 @@
-Summary: 	A C++ user interface toolkit for X11, Win32, and MacOS X
-Name: 		fltk
-Version: 	1.1.4
-Release: 	8
-Epoch: 		0
-License: 	LGPL with exceptions
-Group: 		System Environment/Libraries
-URL: 		http://www.fltk.org/
-Source0: 	%{name}-%{version}%{?extraversion}-source.tar.bz2
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Summary:	C++ user interface toolkit for X11, Win32, and MacOS X
+Name:		fltk
+Version:	1.1.4
+Release:	8
+License:	LGPL with exceptions
+Group:		System Environment/Libraries
+URL:		http://www.fltk.org/
+Source0:	%{name}-%{version}%{?extraversion}-source.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	libjpeg-devel zlib-devel libpng-devel XFree86-devel
 BuildRequires:	/usr/lib/pkgconfig/xft.pc pkgconfig
 BuildRequires:	ImageMagick desktop-file-utils man
 
 %package devel
-Summary: 	Development package for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
+Summary:	Development package for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 Requires:	XFree86-devel libstdc++-devel /usr/lib/pkgconfig/xft.pc
 
 %package fluid
-Summary: 	Fast Light User Interface Designer
-Group: 		Development/Tools
-Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Summary:	Fast Light User Interface Designer
+Group:		Development/Tools
+Requires:	%{name}-devel = %{version}-%{release}
 
-# -----------------------------------------------------------------------------
 
 %description
 FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
@@ -44,12 +42,10 @@
 fluid stands for the Fast Light User Interface Designer. It is an
 interactive GUI designer for FLTK. 
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 
-# -----------------------------------------------------------------------------
 
 %build
 perl -pi -e "s^\\\$prefix/share/doc/fltk^$RPM_DOC_DIR/%{name}-devel-%{version}^" configure
@@ -58,7 +54,6 @@
 %configure --enable-shared --enable-threads --enable-xdbe --enable-xft
 make %{?_smp_mflags} 
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT __documentation
@@ -85,14 +80,12 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 convert -resize 48x48 documentation/FL.gif \
-  $RPM_BUILD_ROOT%{_datadir}/pixmaps/fluid.png
+    $RPM_BUILD_ROOT%{_datadir}/pixmaps/fluid.png
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -129,7 +122,6 @@
 %{_datadir}/applications/*fluid.desktop
 %{_datadir}/pixmaps/fluid.png
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Thu Nov 20 2003 Dams <anvil[AT]livna.org> 0:1.1.4-0.fdr.8



From fedora-extras-commits at redhat.com  Thu Mar  3 21:23:43 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 16:23:43 -0500
Subject: rpms/clamav/devel clamav.spec,1.9,1.10
Message-ID: <200503032123.j23LNho7018298@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	clamav.spec 
Log Message:
 


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- clamav.spec	3 Mar 2005 20:08:36 -0000	1.9
+++ clamav.spec	3 Mar 2005 21:23:41 -0000	1.10
@@ -60,8 +60,8 @@
 Summary:	Virus signature data for the Clam Antivirus scanner
 Group:		Applications/File
 Provides:	data(clamav)
-Requires(pre):		fedora-usermgmt >= 0:0.7
-Requires(postun):	fedora-usermgmt >= 0:0.7
+Requires(pre):		fedora-usermgmt >= 0.7
+Requires(postun):	fedora-usermgmt >= 0.7
 
 %package update
 Summary:	Auto-updater for the Clam Antivirus scanner data-files
@@ -101,8 +101,8 @@
 Requires(preun):	chkconfig
 Requires(preun):	initscripts
 Requires(postun):	initscripts
-Requires(pre):		fedora-usermgmt >= 0:0.7
-Requires(postun):	fedora-usermgmt >= 0:0.7
+Requires(pre):		fedora-usermgmt >= 0.7
+Requires(postun):	fedora-usermgmt >= 0.7
 
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gkrellmms/devel gkrellmms.spec,1.3,1.4
Message-ID: <200503032126.j23LQ4Nt018556@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gkrellmms.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gkrellmms.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/devel/gkrellmms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gkrellmms.spec	10 Dec 2004 22:03:02 -0000	1.3
+++ gkrellmms.spec	3 Mar 2005 21:26:02 -0000	1.4
@@ -3,7 +3,6 @@
 Name:           gkrellmms
 Version:        2.1.19
 Release:        1
-Epoch:          0
 Summary:        GKrellM XMMS plugin
 
 Group:          Applications/Multimedia
@@ -12,24 +11,21 @@
 Source0:        http://gkrellm.luon.net/files/gkrellmms-2.1.19.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-BuildRequires:  gtk+-devel >= 1:1.2.10, gtk2-devel >= 0:2.0.1, xmms-devel >= 1:1.2.8
-BuildRequires:	gkrellm-devel, gettext
-Requires:       gkrellm >= 0:2.0, xmms >= 1:1.2.8
+BuildRequires:  gtk+-devel >= 1:1.2.10, gtk2-devel >= 2.0.1, xmms-devel >= 1:1.2.8
+BuildRequires:  gkrellm-devel, gettext
+Requires:       gkrellm >= 2.0, xmms >= 1:1.2.8
 
 %description
 GKrellM plugin for controlling XMMS.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}
 
-# -----------------------------------------------------------------------------
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} enable_nls=1
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -41,19 +37,16 @@
   enable_nls=1
 %find_lang %{name}
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc Changelog README Themes FAQ
 %{plugdir}/*
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Fri May  7 2004 Brian Pepple <bdpepple at ameritech.net> 0:2.1.19-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gkrellm-hddtemp/devel gkrellm-hddtemp.spec,1.4,1.5
Message-ID: <200503032126.j23LQ4Fk018552@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gkrellm-hddtemp/devel

Modified Files:
	gkrellm-hddtemp.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gkrellm-hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-hddtemp/devel/gkrellm-hddtemp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gkrellm-hddtemp.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ gkrellm-hddtemp.spec	3 Mar 2005 21:26:02 -0000	1.5
@@ -1,7 +1,6 @@
 Name:           gkrellm-hddtemp
 Version:        0.2
 Release:        0.2.beta
-Epoch:          0
 Summary:        Hard disk temperature plugin for GKrellM
 
 Group:          Applications/System
@@ -10,43 +9,37 @@
 Source:         http://coredump.free.fr/linux/gkrellm-hddtemp-0.2-beta.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel, gkrellm-devel >= 0:2
-Requires:       hddtemp >= 0:0.3, gkrellm >= 0:2
+BuildRequires:  gtk2-devel, gkrellm-devel >= 2
+Requires:       hddtemp >= 0.3, gkrellm >= 2
 
 %description
 %{summary}.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}-%{version}-beta
 perl -pi -e "s|^(CFLAGS=.+?)$|\$1 $RPM_OPT_FLAGS|" Makefile
 
-# -----------------------------------------------------------------------------
 
 %build
 make %{?_smp_mflags} gkrellm2
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gkrellm2/plugins
 cp -p *.so $RPM_BUILD_ROOT%{_libdir}/gkrellm2/plugins
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(0644,root,root,0755)
 %doc COPYING README
 %attr(0755,root,root) %{_libdir}/gkrellm2/plugins/*
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Fri May 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.2-0.fdr.0.2.beta



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gtkglext/devel gtkglext.spec,1.3,1.4
Message-ID: <200503032126.j23LQ53Y018655@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gtkglext.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gtkglext.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglext/devel/gtkglext.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkglext.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gtkglext.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -3,25 +3,24 @@
 %define base_version		1.0.6
 %define api_version		1.0
 
-Summary: 	OpenGL Extension to GTK
-Name: 		gtkglext
-Version: 	%{base_version}
-Epoch: 		0
-Release: 	1
-License: 	LGPL
-Group: 		System Environment/Libraries
-URL: 		http://gtkglext.sourceforge.net/
-Source0: 	ftp://dl.sourceforge.net/pub/sourceforge/gtkglext/gtkglext-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:	OpenGL Extension to GTK
+Name:		gtkglext
+Version:	%{base_version}
+Release:	1
+License:	LGPL
+Group:		System Environment/Libraries
+URL:		http://gtkglext.sourceforge.net/
+Source0:	ftp://dl.sourceforge.net/pub/sourceforge/gtkglext/gtkglext-%{version}.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtk2-devel
-BuildRequires: Mesa, libGL.so.1, libGLU.so.1
+BuildRequires:	gtk2-devel
+BuildRequires:	Mesa, libGL.so.1, libGLU.so.1
 
-Requires(postun): /sbin/ldconfig
-Requires(post):	/sbin/ldconfig
+Requires(postun):	/sbin/ldconfig
+Requires(post):		/sbin/ldconfig
 
 # Work around to the broken libtool being used
-BuildRequires: gcc-c++
+BuildRequires:	gcc-c++
 
 %description
 GtkGLExt is an OpenGL extension to GTK. It provides the GDK objects
@@ -29,11 +28,11 @@
 make GTK+ widgets OpenGL-capable.
 
 %package devel
-Summary: Development tools for GTK-based OpenGL applications
-Group: Development/Libraries
+Summary:	Development tools for GTK-based OpenGL applications
+Group:		Development/Libraries
 
-Requires: %{name} = %{epoch}:%{version}
-Requires: gtk2-devel
+Requires:	%{name} = %{version}
+Requires:	gtk2-devel
 
 %description devel
 The gtkglext-devel package contains the header files, static libraries,



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/global/devel global.spec,1.4,1.5
Message-ID: <200503032126.j23LQ5kJ018584@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	global.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: global.spec
===================================================================
RCS file: /cvs/extras/rpms/global/devel/global.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- global.spec	11 Feb 2005 23:27:42 -0000	1.4
+++ global.spec	3 Mar 2005 21:26:03 -0000	1.5
@@ -1,13 +1,12 @@
 Name:           global
 Version:        4.8.2
 Release:        1
-Epoch:          0
-Summary:        A source code tag system
+Summary:        Source code tag system
 
-Group:		Development/Tools
-License:	GPL/BSD
-URL:		http://www.gnu.org/software/global
-Source:		http://tamacom.com/global/global-4.8.2.tar.gz
+Group:          Development/Tools
+License:        GPL/BSD
+URL:            http://www.gnu.org/software/global
+Source:         http://tamacom.com/global/global-4.8.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -39,18 +38,18 @@
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info \
     %{_infodir}/dir 2>/dev/null || :
 fi
 
 %files
 %defattr(-,root,root,-)
+%doc README THANKS LICENSE AUTHORS COPYING FAQ globash.rc gtags.el
 %{_bindir}/*
 %{_infodir}/*
 %{_mandir}/man*/*
 %{_datadir}/gtags
-%doc README THANKS LICENSE AUTHORS COPYING FAQ globash.rc gtags.el
 
 %changelog
 * Mon Dec 27 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:4.8.2-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/amarok/devel amarok.spec,1.6,1.7
Message-ID: <200503032126.j23LQ4Q7018512@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	amarok.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- amarok.spec	14 Feb 2005 21:57:39 -0000	1.6
+++ amarok.spec	3 Mar 2005 21:26:02 -0000	1.7
@@ -16,10 +16,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
-BuildRequires:  taglib-devel >= 0:1.3, esound-devel
+BuildRequires:  taglib-devel >= 1.3, esound-devel
 BuildRequires:  desktop-file-utils, gettext
 BuildRequires:  xorg-x11-Mesa-libGL
-BuildRequires:  gstreamer-plugins-devel >= 0:0.8.4
+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
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/fedora-rpmdevtools/devel fedora-rpmdevtools.spec,1.7,1.8
Message-ID: <200503032126.j23LQ4UW018516@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	fedora-rpmdevtools.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-rpmdevtools.spec	3 Mar 2005 20:33:52 -0000	1.7
+++ fedora-rpmdevtools.spec	3 Mar 2005 21:26:02 -0000	1.8
@@ -15,7 +15,7 @@
 
 BuildArch:      noarch
 Provides:       %{name}-emacs = %{version}-%{release}
-Obsoletes:      %{name}-emacs < 0:0.1.9
+Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
 Requires:       rpm-python, python, cpio, sed, perl
 # Minimal RPM build requirements



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gconfmm26/devel gconfmm.spec,1.2,1.3
Message-ID: <200503032126.j23LQ43o018544@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gconfmm.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gconfmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gconfmm26/devel/gconfmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gconfmm.spec	10 Dec 2004 22:03:02 -0000	1.2
+++ gconfmm.spec	3 Mar 2005 21:26:02 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           gconfmm26
 Version:        2.6.1
 Release:        1
-Epoch:          0
-Summary:        A C++ wrapper for GConf2
+Summary:        C++ wrapper for GConf2
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -25,7 +24,7 @@
 %package devel
 Summary:        Headers for developing programs that will use gconfmm
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       glibmm24-devel
 Requires:       gtkmm24-devel
 Requires:       GConf2-devel



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/glibmm24/devel glibmm.spec,1.2,1.3
Message-ID: <200503032126.j23LQ5R7018580@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	glibmm.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: glibmm.spec
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glibmm.spec	7 Dec 2004 22:32:32 -0000	1.2
+++ glibmm.spec	3 Mar 2005 21:26:03 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           glibmm24
 Version:        2.4.5
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for GTK2 (a GUI library for X).
+Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -12,8 +11,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  libsigc++20-devel >= 0:2.0.0
-BuildRequires:  glib2-devel >= 0:2.4.0
+BuildRequires:  libsigc++20-devel >= 2.0.0
+BuildRequires:  glib2-devel >= 2.4.0
 
 %description
 gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2.
@@ -22,9 +21,9 @@
 quickly create complex user interfaces.
 
 %package devel
-Summary:        Headers for developing programs that will use %{name}.
+Summary:        Headers for developing programs that will use %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       glib2-devel
 Requires:       libsigc++20-devel
 
@@ -53,17 +52,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-
 %post
 /sbin/ldconfig
 
 
-
 %postun
 /sbin/ldconfig
 
 
-
 %files
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gnome-blog/devel gnome-blog.spec,1.3,1.4
Message-ID: <200503032126.j23LQ57R018600@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnome-blog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gnome-blog/devel

Modified Files:
	gnome-blog.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/gnome-blog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-blog.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gnome-blog.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -5,7 +5,6 @@
 Name:		gnome-blog
 Version:	0.7
 Release:	7
-Epoch:		0
 Summary:	GNOME panel object for posting blog entries
 
 Group:		User Interface/Desktops
@@ -15,36 +14,33 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-Requires:	gnome-python2-applet >= 0:%{gnome_python2_version}
-Requires:	gnome-python2-gconf  >= 0:%{gnome_python2_version}
-Requires:	pygtk2 >= 0:%{gnome_python2_version}
-Requires:	python >= 0:%{pyver}, python <= 0:%{pynext}
+Requires:	gnome-python2-applet >= %{gnome_python2_version}
+Requires:	gnome-python2-gconf  >= %{gnome_python2_version}
+Requires:	pygtk2 >= %{gnome_python2_version}
+Requires:	python >= %{pyver}, python <= %{pynext}
 
-Requires(post,preun): GConf2
+Requires(post,preun):	GConf2
 
-BuildRequires:  pygtk2-devel >= 0:%{gnome_python2_version}
+BuildRequires:	pygtk2-devel >= %{gnome_python2_version}
 BuildRequires:	glib2-devel
-BuildRequires: 	gettext
+BuildRequires:	gettext
 BuildRequires:	GConf2
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 
 %description
 GNOME panel object that allows convenient posting of blog entries to
 any blog that supports the bloggerAPI.
 
-# ---------------------------------------------------------------------------------------------
 
 %prep
 %setup -q
 %{__sed} -i 's|\(<oaf_server iid="OAFIID:GNOME_BlogApplet_Factory" type="exe" location="\)\(blog_applet.py">\)|\1%{_libexecdir}/\2|' GNOME_BlogApplet.server.in
 
-# ---------------------------------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-# ---------------------------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,24 +57,21 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
 %{__mv} $RPM_BUILD_ROOT%{_bindir}/blog_applet.py $RPM_BUILD_ROOT%{_libexecdir}
 
-# ---------------------------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# ---------------------------------------------------------------------------------------------
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
 unset GCONF_CONFIG_SOURCES
- 
+
 %preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
 unset GCONF_CONFIG_SOURCES
 
-# ---------------------------------------------------------------------------------------------
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -96,7 +89,6 @@
 %{_libdir}/python%{pyver}/site-packages/gnomeblog/*.pyc
 %ghost %{_libdir}/python*/site-packages/gnomeblog/*.pyo
 
-# ---------------------------------------------------------------------------------------------
 
 %changelog
 * Tue Feb  3 2004 Brian Pepple <bdpepple at ameritech.net> 0:0.7-0.fdr.7



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gai/devel gai.spec,1.7,1.8
Message-ID: <200503032126.j23LQ49k018520@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gai.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gai.spec
===================================================================
RCS file: /cvs/extras/rpms/gai/devel/gai.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gai.spec	27 Feb 2005 05:28:13 -0000	1.7
+++ gai.spec	3 Mar 2005 21:26:02 -0000	1.8
@@ -1,7 +1,6 @@
 Name:		gai
 Version:	0.5.8
 Release:	4
-Epoch:		0
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -11,13 +10,13 @@
 Patch0:		gai-0.5.8-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libgnomeui-devel, gtk2-devel >= 0:2.2, gnome-panel-devel
+BuildRequires:	libgnomeui-devel, gtk2-devel >= 2.2, gnome-panel-devel
 BuildRequires:	SDL-devel
 
 %package	devel
 Summary:	Library and headers for Generic Applet Interface
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel-devel, libgnomeui-devel
 
 %description
@@ -55,7 +54,7 @@
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING.LIB ChangeLog README* THANKS TODO WINDOWMANAGERS
 %{_libdir}/libgai.so.*
@@ -96,7 +95,7 @@
 
 * Tue Oct 28 2003 Michel Alexandre Salim <salimma[AT]users.sf.net> - 0.5.0-0.fdr.0.1.pre4
 - Fixed broken library naming (thanks Michael Schwendt)
- 
+
 * Mon Oct 27 2003 Michel Alexandre Salim <salimma[AT]users.sourceforge.net> - 0.5.0-0.fdr.0.pre4
 - Update to 0.5.0pre4; API change between 0.4.x and 0.5.0.
 - Most GAI applets now developed for 0.5.0, since 0.4.1 is not in Fedora yet one might as well move to 0.5.0 now.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/galeon/devel galeon.spec,1.3,1.4
Message-ID: <200503032126.j23LQ4pj018528@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	galeon.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- galeon.spec	23 Jan 2005 20:00:53 -0000	1.3
+++ galeon.spec	3 Mar 2005 21:26:02 -0000	1.4
@@ -1,23 +1,21 @@
-Summary:   	GNOME2 Web browser based on Mozilla
-Name:      	galeon
-Version:   	1.3.19
-Release:   	2
-Epoch:		0
-License: 	GPL
-Group:     	Applications/Internet
-URL:       	http://galeon.sourceforge.net/
-Source0:    	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
-BuildRoot:  	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Summary:	GNOME2 Web browser based on Mozilla
+Name:		galeon
+Version:	1.3.19
+Release:	2
+License:	GPL
+Group:		Applications/Internet
+URL:		http://galeon.sourceforge.net/
+Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Requires:	scrollkeeper 
 Requires:	mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null)
 BuildRequires:	gettext mozilla-nspr-devel desktop-file-utils
-BuildRequires:	gtk2-devel >= 0:2.4.0
+BuildRequires:	gtk2-devel >= 2.4.0
 BuildRequires:	mozilla-devel >= 37:1.7.2
-BuildRequires:	libxml2-devel >= 0:2.6.6
-BuildRequires:	libgnomeui-devel >= 0:2.5.2
+BuildRequires:	libxml2-devel >= 2.6.6
+BuildRequires:	libgnomeui-devel >= 2.5.2
 %{!?_without_nautilus:BuildRequires:	eel2-devel nautilus}
 
-# -----------------------------------------------------------------------------
 
 %description
 Galeon is a web browser built around Gecko (Mozilla's rendering
@@ -25,12 +23,10 @@
 browser, designed to take advantage of as many GNOME technologies as
 makes sense. Galeon was written to do just one thing - browse the web.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure \
@@ -39,7 +35,6 @@
 	--disable-schemas-install
 make %{?_smp_mflags}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -58,12 +53,10 @@
 
 find $RPM_BUILD_ROOT%{_libdir} -name \*.la -exec rm {} \;
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %post
 %{_bindir}/galeon-config-tool --fix-gconf-permissions
@@ -71,7 +64,7 @@
 scrollkeeper-update||:
 
 %preun
-if [ "$0" = 1 ] ; then
+if [ "$1" = "1" ] ; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
         %{_sysconfdir}/gconf/schemas/galeon.schemas >/dev/null
@@ -80,6 +73,7 @@
 %postun
 scrollkeeper-update||:
 
+
 %files -f galeon-2.0.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.README ChangeLog NEWS README INSTALL THANKS TODO FAQ FAQ.html README.ExtraPrefs
@@ -99,7 +93,6 @@
 %{_libdir}/bonobo/servers/GNOME_Galeon_NautilusView.server
 %{_datadir}/applications/*galeon.desktop
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Sun Jan 23 2005 Dams <anvil[AT]livna.org> - 0:1.3.19-2



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gai-pal/devel gai-pal.spec,1.6,1.7
Message-ID: <200503032126.j23LQ4Ii018524@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gai-pal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gai-pal/devel

Modified Files:
	gai-pal.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gai-pal.spec
===================================================================
RCS file: /cvs/extras/rpms/gai-pal/devel/gai-pal.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gai-pal.spec	27 Feb 2005 05:29:08 -0000	1.6
+++ gai-pal.spec	3 Mar 2005 21:26:02 -0000	1.7
@@ -1,10 +1,9 @@
-%define gaiver 0:0.5.8
+%define gaiver	0.5.8
 
 Summary:	GAI Pal applet
 Name:		gai-pal
 Version:	0.7
 Release:	4
-Epoch:		0
 Source0:	%{name}-%{version}.tar.bz2
 Patch0:		gai-pal-0.7-xosd-empty-msg.patch
 Patch1:		gai-pal-0.7-typo.patch
@@ -38,7 +37,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/gai-pal



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gc/devel gc.spec,1.6,1.7
Message-ID: <200503032126.j23LQ4Em018532@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gc.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gc.spec	29 Jan 2005 16:28:30 -0000	1.6
+++ gc.spec	3 Mar 2005 21:26:02 -0000	1.7
@@ -1,30 +1,29 @@
 # $Id$
 
-Summary: C++ Garbage Collector	
-Name:    gc	
-Epoch:	 0
+Summary: C++ Garbage Collector
+Name:    gc
 Version: 6.4
 # For Extras
-Release: 2 
+Release: 2
 # For kde-redhat
 #Release: 0.2%{?dist_tag}.kde
-Group:	 System Environment/Libraries
+Group:   System Environment/Libraries
 License: BSD
-Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
-Source:	 http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.4.tar.gz
+Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Patch1: gc6.4-opendl.patch
 
 
 %description
-The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage 
+The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage
 collecting replacement for C malloc or C++ new.
 
 %package devel
-Summary: Libraries and header files for gc development 
+Summary: Libraries and header files for gc development
 Group:   Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description devel
 Libraries and header files for gc development.
 
@@ -55,7 +54,7 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -p -D -m644 doc/gc.man	$RPM_BUILD_ROOT%{_mandir}/man3/gc.3
+install -p -D -m644 doc/gc.man $RPM_BUILD_ROOT%{_mandir}/man3/gc.3
 
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gc
@@ -63,14 +62,14 @@
 
 
 %clean
-rm -rf 	"$RPM_BUILD_ROOT"
+rm -rf "$RPM_BUILD_ROOT"
 
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
-%files 
+%files
 %defattr(-,root,root)
 %doc doc/README doc/README.changes doc/README.contributors
 %{_libdir}/lib*.so.*
@@ -114,16 +113,16 @@
 - OK, put manpage in man3.
 
 * Thu Oct 02 2003 Rex Dieter <rexdieter at sf.net> 0:6.2-0.fdr.2
-- drop manpage pending feedback from developer. 
+- drop manpage pending feedback from developer.
 
 * Tue Sep 30 2003 Rex Dieter <rexdieter at sf.net> 0:6.2-0.fdr.1
-- fix manpage location 
+- fix manpage location
 - remove .la file (it appears unnecessary after all, thanks to opendl patch)
 - remove cvs tag from description
 - touchup -devel desc/summary.
 - macro update to support Fedora Core
 
-* Thu Sep 11 2003 Rex Dieter <rexdieter at sf.net> 0:6.2-0.fdr.0 
+* Thu Sep 11 2003 Rex Dieter <rexdieter at sf.net> 0:6.2-0.fdr.0
 - 6.2 release.
 - update license (BSD)
 - Consider building with: --enable-parallel-mark



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gcombust/devel gcombust.spec,1.5,1.6
Message-ID: <200503032126.j23LQ4n1018536@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gcombust.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gcombust.spec
===================================================================
RCS file: /cvs/extras/rpms/gcombust/devel/gcombust.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gcombust.spec	24 Dec 2004 14:39:13 -0000	1.5
+++ gcombust.spec	3 Mar 2005 21:26:02 -0000	1.6
@@ -1,6 +1,3 @@
-# $Id$
-# Authority: matthias
-
 Summary: Powerful GTK+ front-end for mkisofs and cdrecord
 Name: gcombust
 Version: 0.1.55
@@ -29,7 +26,7 @@
 
 
 %build
-%configure 
+%configure
 %{__make} %{?_smp_mflags}
 
 
@@ -45,17 +42,17 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
-%doc AUTHORS COPYING ChangeLog FAQ.shtml NEWS README THANKS TODO README.ms  
+%doc AUTHORS COPYING ChangeLog FAQ.shtml NEWS README THANKS TODO README.ms
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.xpm
 
 
 %changelog
-* Fri Dec 24 2004 Thomas Vander Stichele <thomas at apestaart dot org> 1:0.1.55-4
-- Scrub release tag for extras
+* Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 1:0.1.55-3
+- Bump release to provide Extras upgrade path.
 
-* Tue May 18 2004 Matthias Saou <http://freshrpms.net/> 1:0.1.55-3
+* Tue May 18 2004 Matthias Saou <http://freshrpms.net/> 1:0.1.55-2
 - Rebuild for Fedora Core 2.
 
 * Fri Nov  7 2003 Matthias Saou <http://freshrpms.net/> 1:0.1.55-2



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gkrellm-volume/devel gkrellm-volume.spec,1.5,1.6
Message-ID: <200503032126.j23LQ4AA018564@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-volume/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gkrellm-volume/devel

Modified Files:
	gkrellm-volume.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gkrellm-volume.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-volume/devel/gkrellm-volume.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gkrellm-volume.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ gkrellm-volume.spec	3 Mar 2005 21:26:02 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           gkrellm-volume
 Version:        2.1.13
 Release:        1
-Epoch:          0
 Summary:        GKrellM volume plugin
 
 Group:          Applications/Multimedia
@@ -14,9 +13,9 @@
 Patch1:         %{name}-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-BuildRequires:  gkrellm-devel >= 0:2.0, gtk2-devel >= 0:2.0.1, gettext
+BuildRequires:  gkrellm-devel >= 2.0, gtk2-devel >= 2.0.1, gettext
 BuildRequires:  alsa-lib-devel
-Requires:       gkrellm >= 0:2.0
+Requires:       gkrellm >= 2.0
 
 %description
 GKrellM plugin for controlling mixer devices.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gtkmm24/devel gtkmm.spec,1.3,1.4
Message-ID: <200503032126.j23LQ50j018663@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gtkmm.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkmm.spec	26 Jan 2005 00:10:44 -0000	1.3
+++ gtkmm.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -1,8 +1,7 @@
-Name:           gtkmm24
+Name:
 Version:        2.4.8
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for GTK2 (a GUI library for X).
+Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -12,10 +11,10 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  glibmm24-devel >= 0:2.4.0
-BuildRequires:  atk-devel >= 0:1.6.0
-BuildRequires:  pango-devel >= 0:1.4.0
-BuildRequires:  gtk2-devel >= 0:2.4.0
+BuildRequires:  glibmm24-devel >= 2.4.0
+BuildRequires:  atk-devel >= 1.6.0
+BuildRequires:  pango-devel >= 1.4.0
+BuildRequires:  gtk2-devel >= 2.4.0
 
 %description
 gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2.
@@ -26,7 +25,7 @@
 %package        devel
 Summary:        Headers for developing programs that will use %{name}.
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtk2-devel
 Requires:       glib2-devel
 Requires:       glibmm24-devel
@@ -38,12 +37,12 @@
 developing gtkmm applications.
 
 %package        docs
-Summary:        Documentation for %{name}, includes full API docs.
+Summary:        Documentation for %{name}, includes full API docs
 Group:          Documentation
-Requires:       %{name}-devel = %{epoch}:%{version}-%{release}
+Requires:       %{name}-devel = %{version}-%{release}
 
 %description    docs
-This package contains the full API documentation for %{name}.  
+This package contains the full API documentation for %{name}.
 
 
 %prep



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gtkterm/devel gtkterm.spec,1.4,1.5
Message-ID: <200503032126.j23LQ5Ro018667@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gtkterm.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gtkterm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkterm/devel/gtkterm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtkterm.spec	10 Dec 2004 22:03:03 -0000	1.4
+++ gtkterm.spec	3 Mar 2005 21:26:03 -0000	1.5
@@ -1,7 +1,6 @@
 Name:           gtkterm
 Version:        0.99.4
 Release:        3
-Epoch:          0
 Summary:        Serial port terminal
 
 Group:          Applications/Communications
@@ -30,7 +29,7 @@
 %makeinstall
 install -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--add-category X-Fedora      \
+        --add-category X-Fedora      \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications  \
 %SOURCE1
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gsview/devel gsview.spec,1.4,1.5
Message-ID: <200503032126.j23LQ507018651@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gsview.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gsview.spec
===================================================================
RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gsview.spec	18 Feb 2005 18:00:34 -0000	1.4
+++ gsview.spec	3 Mar 2005 21:26:03 -0000	1.5
@@ -1,14 +1,13 @@
 # $Id$
 
 Summary: PostScript and PDF previewer
-Name: 	 gsview
-Epoch:	 0
+Name:    gsview
 Version: 4.6
 Release: 9
 License: Aladdin Free Public License, Ghostgum Software Pty Ltd
-Group: 	 Applications/Publishing
+Group:   Applications/Publishing
 Source:  ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.6.tar.gz
-URL: 	 http://www.cs.wisc.edu/~ghost/gsview/
+URL:     http://www.cs.wisc.edu/~ghost/gsview/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source1: gsview.desktop



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gtkmm20/devel gtkmm.spec,1.2,1.3
Message-ID: <200503032126.j23LQ5RI018659@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gtkmm.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm20/devel/gtkmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtkmm.spec	10 Dec 2004 22:03:03 -0000	1.2
+++ gtkmm.spec	3 Mar 2005 21:26:03 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           gtkmm20
 Version:        2.2.12
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for GTK2 (a GUI library for X).
+Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -12,11 +11,11 @@
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  libsigc++-devel >= 0:1.2.0
-BuildRequires:  glib2-devel >= 0:2.2.0
-BuildRequires:  atk-devel >= 0:1.2.0
-BuildRequires:  pango-devel >= 0:1.1.0
-BuildRequires:  gtk2-devel >= 0:2.2.0
+BuildRequires:  libsigc++-devel >= 1.2.0
+BuildRequires:  glib2-devel >= 2.2.0
+BuildRequires:  atk-devel >= 1.2.0
+BuildRequires:  pango-devel >= 1.1.0
+BuildRequires:  gtk2-devel >= 2.2.0
 BuildRequires:  m4
 Obsoletes:      gtkmm2
 
@@ -27,9 +26,9 @@
 quickly create complex user interfaces.
 
 %package        devel
-Summary:        Headers for developing programs that will use %{name}.
+Summary:        Headers for developing programs that will use %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       libsigc++-devel
 Requires:       glib2-devel
 Requires:       atk-devel
@@ -44,12 +43,12 @@
 developing gtkmm applications.
 
 %package        docs
-Summary:        Documentation for %{name}, includes full API docs.
+Summary:        Documentation for %{name}, includes full API docs
 Group:          Documentation
-Requires:       %{name}-devel = %{epoch}:%{version}-%{release}
+Requires:       %{name}-devel = %{version}-%{release}
 
 %description    docs
-This package contains the full API documentation for %{name}.  
+This package contains the full API documentation for %{name}.
 
 
 %prep
@@ -68,7 +67,7 @@
 %{__mkdir} docs-to-include
 %{__mv} ${RPM_BUILD_ROOT}%{_docdir}/gtkmm-2.0/* docs-to-include/
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/gtkmm-2.0/*
- 
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/graphviz/devel graphviz.spec,1.6,1.7
Message-ID: <200503032126.j23LQ5VL018647@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	graphviz.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: graphviz.spec
===================================================================
RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- graphviz.spec	23 Jan 2005 16:27:43 -0000	1.6
+++ graphviz.spec	3 Mar 2005 21:26:03 -0000	1.7
@@ -1,37 +1,36 @@
 # Note: graphviz requires gd with gif support (and other fixes), hence use
 # internal one for now.
 
-Summary: 	Graph Visualization Tools
-Name: 		graphviz
-Version: 	2.2
-Release: 	3
-Epoch:		0
-Group: 		Applications/Multimedia
-License: 	CPL
-URL:  		http://www.graphviz.org/
-Source: 	http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.2.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-root
+Summary:	Graph Visualization Tools
+Name:		graphviz
+Version:	2.2
+Release:	3
+Group:		Applications/Multimedia
+License:	CPL
+URL:		http://www.graphviz.org/
+Source:		http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.2.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-root
 BuildRequires:	zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel
-BuildRequires:	/bin/ksh bison m4 flex tk tcl >= 0:8.3
+BuildRequires:	/bin/ksh bison m4 flex tk tcl >= 8.3
 BuildRequires:	/usr/include/tcl.h /usr/include/tk.h
 
 %package tcl
-Group:          Applications/Multimedia
-Summary:        Tcl extension tools for %{name}
-Requires:       %{name} = %{epoch}:%{version}-%{release} tcl >= 0:8.3 tk
+Group:		Applications/Multimedia
+Summary:	Tcl extension tools for %{name}
+Requires:	%{name} = %{version}-%{release} tcl >= 8.3 tk
 
 %package devel
-Summary: 	Development package for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release} pkgconfig
+Summary:	Development package for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release} pkgconfig
 
 %package doc
-Group:          Documentation
-Summary:        PDF and HTML documents for %{name}
+Summary:	PDF and HTML documents for %{name}
+Group:		Documentation
 
 %package graphs
-Group:          Applications/Multimedia
-Summary:        Demo graphs for %{name}
+Summary:	Demo graphs for %{name}
+Group:		Applications/Multimedia
 
 
 %description
@@ -82,7 +81,7 @@
     DESTDIR=$RPM_BUILD_ROOT \
     pkgconfigdir=%{_libdir}/pkgconfig \
     transform='s,x,x,' \
-	install
+    install
 chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/lefty/*
 cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/doc __doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
@@ -154,7 +153,7 @@
 - Fix lefty/* permissions.
 
 * Sat Jan 22 2005 John Ellson <ellson at research.att.com> - 0:2.2-1
-- Updated to 2.2 
+- Updated to 2.2
 - split out:
     graphviz-docs    - optional and large
     graphviz-graphs  - optional demo graphs



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/geomview/devel geomview.spec,1.1,1.2
Message-ID: <200503032126.j23LQ48j018548@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	geomview.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview.spec	24 Dec 2004 11:58:48 -0000	1.1
+++ geomview.spec	3 Mar 2005 21:26:02 -0000	1.2
@@ -1,19 +1,18 @@
 # $Id$
 
-%define xforms_ver 0:1.0
+%define xforms_ver 1.0
 %define maniview_ver 2.0.0
 %define orrery_ver 0.9.3
 
-Name:    geomview	
-Summary: An interactive 3D viewing program
-Epoch:	 0
+Name:    geomview
+Summary: Interactive 3D viewing program
 Version: 1.8.1
 Release: 10%{?dist_tag}
 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
+Source:  http://dl.sourceforge.net/sourceforge/geomview/geomview-1.8.1.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source1: geomview.desktop
@@ -43,14 +42,14 @@
 %{!?_without_xforms:%{?!_with_xforms:%define _with_xforms --with-xforms}}
 ## plugins, default to yes, unless rpmbuild --without pluginname
 # default plugins
-#{?_without_xforms:Obsoletes: %{name}-plugins < %{epoch}:%{version}-%{release}}
+#{?_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 < %{epoch}:%{maniview_ver}-%{release}}
+#{?_without_maniview:Obsoletes: %{name}-maniview < %{maniview_ver}-%{release}}
 # orrery
 %{!?_without_orrery:%define _with_orrery --with-orrery}
-#{?_without_orrey:Obsoletes: %{name}-orrery < %{epoch}:%{orrery_ver}-%{release}}
+#{?_without_orrey:Obsoletes: %{name}-orrery < %{orrery_ver}-%{release}}
 
 %description
 Geomview is an interactive 3D viewing program for Unix. It lets you view and 
@@ -65,7 +64,7 @@
 %package plugins
 Group:   Applications/Engineering
 Summary: %{name} plugins
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
 BuildRequires: xforms-devel >= %{xforms_ver}
 %description plugins 
 Geomview default plugins
@@ -73,13 +72,13 @@
 
 %if "%{?_with_orrery:1}" == "1"
 %package orrery
-Group:	 Applications/Engineering
+Group:   Applications/Engineering
 Summary: Solar System Simulator for Geomview
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
 Requires: tk
-Obsoletes: orrery < %{epoch}:%{orrery_ver}-%{release}
-Provides:  orrery = %{epoch}:%{orrery_ver}-%{release}
-%description	orrery
+Obsoletes: orrery < %{orrery_ver}-%{release}
+Provides:  orrery = %{orrery_ver}-%{release}
+%description orrery
 The Orrery is Geomview module which is a digital model of the solar
 system, named for the mechanical models of the same name (often you'll
 see one with just the Sun, Earth and Moon, as little balls supported
@@ -90,12 +89,12 @@
 
 %if "%{?_with_maniview:1}" == "1"
 %package maniview
-Group:	 Applications/Engineering
-Summary: a Geomview module for viewing 3D manifolds	
-Requires: %{name} = %{epoch}:%{version}
+Group:   Applications/Engineering
+Summary: Geomview module for viewing 3D manifolds
+Requires: %{name} = %{version}
 BuildRequires: xforms-devel >= %{xforms_ver}
-Obsoletes: maniview < %{epoch}:%{maniview_ver}-%{release}
-Provides: maniview = %{epoch}:%{maniview_ver}-%{release}
+Obsoletes: maniview < %{maniview_ver}-%{release}
+Provides: maniview = %{maniview_ver}-%{release}
 %description maniview
 a Geomview module for viewing 3D manifolds.
 %endif
@@ -114,8 +113,8 @@
 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*	)}
+%{?_with_orrery:(  mv orrery* src/bin; ln -s src/bin/orrery*     ) }
+%{?_with_maniview:(mv maniview* src/bin; ln -s src/bin/maniview* )}
 
 
 %build



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gconfmm20/devel gconfmm.spec,1.2,1.3
Message-ID: <200503032126.j23LQ4Eq018540@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gconfmm.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gconfmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gconfmm20/devel/gconfmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gconfmm.spec	10 Dec 2004 22:03:02 -0000	1.2
+++ gconfmm.spec	3 Mar 2005 21:26:02 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           gconfmm20
 Version:        2.0.2
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for GTK2 (a GUI library for X).
+Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -12,8 +11,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  gtkmm20-devel >= 0:2.0.1
-BuildRequires:  GConf2-devel >= 0:2.0.0
+BuildRequires:  gtkmm20-devel >= 2.0.1
+BuildRequires:  GConf2-devel >= 2.0.0
 BuildRequires:  libtool
 Obsoletes:      gconfmm2
 
@@ -26,7 +25,7 @@
 %package devel
 Summary:        Headers for developing programs that will use gconfmm
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm20-devel
 Requires:       GConf2-devel
 Obsoletes:      gconfmm2-devel
@@ -83,7 +82,7 @@
 
 %changelog
 * Mon Aug 30 2004 Denis Leroy <denis at poolshark.org> - 0:2.0.2-0.fdr.1
-- Fix for x86_64 compile 
+- Fix for x86_64 compile
 - Upgrade to 2.0.2, switched to bz2
 - Changed suffix to 20, added Obsolete tag
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gputils/devel gputils.spec,1.3,1.4
Message-ID: <200503032126.j23LQ5IL018643@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gputils.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gputils.spec
===================================================================
RCS file: /cvs/extras/rpms/gputils/devel/gputils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gputils.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gputils.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -1,22 +1,21 @@
 Name:		gputils
 Version:	0.12.4
 Release:	2
-Epoch:		0
 Summary:	Development utilities for Microchip (TM) PIC (TM) microcontrollers
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://gputils.sourceforge.net
 Source:		http://prdownloads.sourceforge.net/gputils/gputils-0.12.4.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-This is a collection of development tools for Microchip (TM) PIC (TM) 
+This is a collection of development tools for Microchip (TM) PIC (TM)
 microcontrollers.
 
 This is ALPHA software: there may be serious bugs in it, and it's
 nowhere near complete.  gputils currently only implements a subset of
-the features available with Microchip's tools.  See the documentation for 
+the features available with Microchip's tools.  See the documentation for
 an up-to-date list of what gputils can do.
 
 %prep
@@ -48,5 +47,6 @@
   - Package should own full directory /usr/share/gputils
   - Remove usefulness generic file INSTALL
   - Remove doc source file gputils.lyx
+
 * Wed Oct 6 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:0.12.4-0.fdr.1
   - Initial Fedora RPM



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gtranslator/devel gtranslator.spec,1.3,1.4
Message-ID: <200503032126.j23LQ5n3018671@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gtranslator.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gtranslator.spec
===================================================================
RCS file: /cvs/extras/rpms/gtranslator/devel/gtranslator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtranslator.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gtranslator.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -1,8 +1,7 @@
 Name:		gtranslator
 Version:	1.1.5
 Release:	1
-Epoch:		0
-Summary:	A gettext po file editor for GNOME
+Summary:	Gettext po file editor for GNOME
 
 Group:		Development/Tools
 License:	GPL
@@ -11,13 +10,13 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	scrollkeeper
-BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
-BuildRequires:  libgnomeui-devel
-BuildRequires:  perl-XML-Parser
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+BuildRequires:	libgnomeui-devel
+BuildRequires:perl(XML::Parser)
 
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
+Requires(post):		scrollkeeper
+Requires(postun):	scrollkeeper
 
 %description
 gtranslator is an enhanced gettext po file editor for the GNOME
@@ -62,7 +61,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post 
+%post
 scrollkeeper-update -q || :
 
 %postun



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gktools/devel gktools.spec,1.3,1.4
Message-ID: <200503032126.j23LQ4pM018572@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gktools.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gktools.spec
===================================================================
RCS file: /cvs/extras/rpms/gktools/devel/gktools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gktools.spec	10 Dec 2004 22:03:02 -0000	1.3
+++ gktools.spec	3 Mar 2005 21:26:02 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           gktools
 Version:        0.9.1
 Release:        2
-Epoch:          0
 Summary:        GUI utilities for KerberosV tickets
 
 Group:          User Interface/X
@@ -19,7 +18,7 @@
 gktickets - GUI version of klist for listing and tracking kerberos tickets
 
 %prep
-%setup -q 
+%setup -q
 
 
 %build
@@ -32,17 +31,17 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-krb5.desktop
 desktop-file-install --vendor=fedora \
-		--add-category X-Fedora \
-                --add-category=Application \
-                --add-category=Utility \
-  		--dir $RPM_BUILD_ROOT/%{_datadir}/applications      \
-                krb5.desktop
+    --add-category X-Fedora \
+    --add-category=Application \
+    --add-category=Utility \
+    --dir $RPM_BUILD_ROOT/%{_datadir}/applications      \
+    krb5.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/*
@@ -53,7 +52,9 @@
 %changelog
 * Wed Sep 22 2004 Nils O. Sel??sdal <NOS[AT]Utel.no> - 0:0.9.1-0.fdr.2
 - install .desktop file per fedora guidelines
+
 * Tue Sep 21 2004 Nils O. Sel??sdal <NOS[AT]Utel.no> - 0:0.9.1-0.fdr.1
 - 0.9.1
+
 * Sat Sep 18 2004 Nils O. Sel??sdal <NOS[AT]Utel.no> - 0:0.9.0-0.fdr.1
 - Initial RPM release.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gnotime/devel gnotime.spec,1.2,1.3
Message-ID: <200503032126.j23LQ5nF018616@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gnotime.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnotime.spec	16 Dec 2004 18:07:34 -0000	1.2
+++ gnotime.spec	3 Mar 2005 21:26:03 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           gnotime
 Version:        2.2.1
 Release:        5
-Epoch:          0
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
@@ -9,37 +8,37 @@
 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
+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-qof.patch
 # Fixes includes of qof headers in source files.
-Patch2:		http://www.tiki-lounge.com/~toshio/fedora/gnotime-qof-include.patch
+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
+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
+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
+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
+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
+Patch7:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-wordwrap.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml3-devel
-BuildRequires:  guile-devel >= 0:1.6.0
+BuildRequires:  guile-devel >= 1.6.0
 BuildRequires:  scrollkeeper
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-BuildRequires:  qof-devel >= 0:0.5.0
-BuildRequires:  qof-devel < 0:0.6.0
+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:  libtool
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -132,7 +131,7 @@
 * Sat Nov 27 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-5
 - Patch to fix a crash when invoking gnome_help.
 - Patch to wordwrap diary notes.
-  
+
 * Thu Sep 30 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-0.fdr.4
 - New patch to fix the Activity entry in the popup menu.
 
@@ -184,6 +183,6 @@
 
 * Mon Dec 15 2003 Toshio Kuratomi <toshio[AT]tiki-lounge.com> - 0:2.1.7-0.fdr.1
 - Initial Fedora RPM release.
-- Partially adapted from the gnotime.spec.in by Eric Anderson 
+- Partially adapted from the gnotime.spec.in by Eric Anderson
   <eric.anderson[AT]cordata.net> from the Red Hat directory in the gnotime
   distribution.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gnome-vfsmm26/devel gnome-vfsmm.spec,1.3,1.4
Message-ID: <200503032126.j23LQ52k018612@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnome-vfsmm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gnome-vfsmm26/devel

Modified Files:
	gnome-vfsmm.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gnome-vfsmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-vfsmm.spec	28 Jan 2005 00:48:09 -0000	1.3
+++ gnome-vfsmm.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -1,14 +1,13 @@
 Name:           gnome-vfsmm26
 Version:        2.6.1
 Release:        2
-Epoch:          0
 Summary:        C++ wrapper for gnome-vfs
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-vfsmm/2.6/gnome-vfsmm-%{version}.tar.bz2
-Patch0:		gnome-vfsmm-2.6.1-autoreconf.patch.bz2
+Patch0:         gnome-vfsmm-2.6.1-autoreconf.patch.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/ldconfig
@@ -18,12 +17,12 @@
 
 %description
 This package is part of the gnomemm project and provides a C++ interface for
-gnome-vfs.  
+gnome-vfs.
 
 %package devel
-Summary:        Headers for developing programs that will use %{name}.
+Summary:        Headers for developing programs that will use %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       glibmm24-devel
 Requires:       gnome-vfs2-devel
 
@@ -36,7 +35,7 @@
 %setup -q -n gnome-vfsmm-%{version}
 %ifarch x86_64
 # Patch was build after: aclocal -I scripts && automake -c -f && autoconf && libtoolize --copy --force
-%patch0 -p1 
+%patch0 -p1
 %endif
 
 %build
@@ -75,6 +74,7 @@
 %{_libdir}/gnome-vfsmm-2.6
 %{_libdir}/pkgconfig/*.pc
 
+
 %changelog
 * Thu Jan 27 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.6.1-2
 - Add autoreconf patch; fixes build on x86_64
@@ -82,5 +82,5 @@
 * Mon Jun 27 2004 Denis Leroy <denis at poolshark.org> - 0:2.6.1-0.fdr.1
 - Upgrade to 2.6.1
 
-* Wed Jul 22 2003 Gerald Henriksen <ghenriks at rogers.com> 
+* Wed Jul 22 2003 Gerald Henriksen <ghenriks at rogers.com>
 - Initial release



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/glunarclock/devel glunarclock.spec,1.4,1.5
Message-ID: <200503032126.j23LQ5hj018588@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	glunarclock.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: glunarclock.spec
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/devel/glunarclock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glunarclock.spec	13 Feb 2005 16:42:01 -0000	1.4
+++ glunarclock.spec	3 Mar 2005 21:26:03 -0000	1.5
@@ -1,15 +1,14 @@
 Name:           glunarclock
 Version:        0.32.2
 Release:        2
-Epoch:          0
 Summary:        GNOME applet that displays the current lunar phase
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://glunarclock.sourceforge.net/
 Source0:        http://download.sourceforge.net/glunarclock/glunarclock-0.32.2.tar.gz
-Patch0:		glunarclock-configure.in.patch
-Patch1:		glunarclock-0.32.2-autoreconf.patch.bz2
+Patch0:         glunarclock-configure.in.patch
+Patch1:         glunarclock-0.32.2-autoreconf.patch.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel
@@ -81,7 +80,7 @@
 
 %files -f glunarclock-0.32.lang
 %defattr (-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README 
+%doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README
 %{_sysconfdir}/gconf/schemas/*
 %{_libexecdir}/*
 %{_datadir}/glunarclock
@@ -95,7 +94,7 @@
 
 %changelog
 * Sun Feb 13 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 0.32.2-2
-- Add autoreconf and configure.in patch to fix x86_64;  
+- Add autoreconf and configure.in patch to fix x86_64;
 
 * Sun Jan 16 2005 Marius L. J??hndal <mariuslj at ifi.uio.no> - 0:0.32.2-1
 - Updated to 0.32.2.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gmpc/devel gmpc.spec,1.2,1.3
Message-ID: <200503032126.j23LQ5aQ018595@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gmpc.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gmpc.spec
===================================================================
RCS file: /cvs/extras/rpms/gmpc/devel/gmpc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gmpc.spec	10 Dec 2004 22:03:03 -0000	1.2
+++ gmpc.spec	3 Mar 2005 21:26:03 -0000	1.3
@@ -2,7 +2,6 @@
 Summary:        GNOME frontend for the MPD
 Version:        0.11.2
 Release:        1
-Epoch:          0
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://musicpd.org/?page=gmpc
@@ -15,13 +14,13 @@
 %description
 Gmpc is a GNOME client for the Music Player Daemon
 Features :
- * Support for loading/saving playlists. 
- * File Browser 
- * Browser based on ID3 information. (on artist and albums) 
- * Search 
- * Current playlist viewer with search. 
- * ID3 information 
- * Lots more 
+ * Support for loading/saving playlists.
+ * File Browser
+ * Browser based on ID3 information. (on artist and albums)
+ * Search
+ * Current playlist viewer with search.
+ * ID3 information
+ * Lots more
 
 %prep
 %setup -q



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gweled/devel gweled.spec,1.4,1.5
Message-ID: <200503032126.j23LQ52O018675@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gweled.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gweled.spec
===================================================================
RCS file: /cvs/extras/rpms/gweled/devel/gweled.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gweled.spec	5 Dec 2004 14:44:31 -0000	1.4
+++ gweled.spec	3 Mar 2005 21:26:03 -0000	1.5
@@ -1,19 +1,18 @@
 Name:           gweled
 Version:        0.6
 Release:        1
-Epoch:          0
-Summary:        Swapping gem game.
+Summary:        Swapping gem game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://sebdelestaing.free.fr/gweled/
 Source0:        http://sebdelestaing.free.fr/gweled/Release/gweled-%{version}.tar.gz
-Patch0:		%{name}-Makefile.patch
+Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgnomeui-devel >= 0:2.0.0
-BuildRequires:  librsvg2-devel >= 0:2.0.0
-BuildRequires:  libcroco-devel >= 0:0.3.0
+BuildRequires:  libgnomeui-devel >= 2.0.0
+BuildRequires:  librsvg2-devel >= 2.0.0
+BuildRequires:  libcroco-devel >= 0.3.0
 BuildRequires:  desktop-file-utils 
 
 %description
@@ -39,9 +38,9 @@
 %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			        \
+desktop-file-install --vendor fedora --delete-original \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --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/



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gmime/devel gmime.spec,1.2,1.3
Message-ID: <200503032126.j23LQ5RX018592@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gmime.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gmime.spec
===================================================================
RCS file: /cvs/extras/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gmime.spec	10 Dec 2004 22:03:03 -0000	1.2
+++ gmime.spec	3 Mar 2005 21:26:03 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           gmime
 Version:        2.1.9
 Release:        3
-Epoch:          0
-Summary:        GMime library -- creation and parsing of MIME-messages   
+Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
 License:        GPL
@@ -10,23 +9,23 @@
 Source0:        http://spruce.sourceforge.net/gmime/sources/v2.1/gmime-2.1.9.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	glib2-devel >= 0:2.0.0
-BuildRequires:	zlib-devel >= 0:1.2.1.1
+BuildRequires:  glib2-devel >= 2.0.0
+BuildRequires:  zlib-devel >= 1.2.1.1
 
 %description
-The GMime suite provides a core library and set of utilities which may be 
-used for the creation and parsing of messages using the Multipurpose 
+The GMime suite provides a core library and set of utilities which may be
+used for the creation and parsing of messages using the Multipurpose
 Internet Mail Extension (MIME).
 
 
 %package        devel
 Summary:        Header files to develop libgmime applications
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
-The GMime suite provides a core library and set of utilities which may be 
-used for the creation and parsing of messages using the Multipurpose 
+The GMime suite provides a core library and set of utilities which may be
+used for the creation and parsing of messages using the Multipurpose
 Internet Mail Extension (MIME). The devel-package contains header files
 to develop applications that use libgmime.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gwenview/devel gwenview.spec,1.4,1.5
Message-ID: <200503032126.j23LQ54A018679@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gwenview.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gwenview.spec	29 Jan 2005 23:45:57 -0000	1.4
+++ gwenview.spec	3 Mar 2005 21:26:03 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           gwenview
 Version:        1.1.6
 Release:        2
-Epoch:          0
-Summary:        Simple image viewer for KDE.
+Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL
@@ -17,11 +16,11 @@
 #BuildRequires:  fam-devel glib2-devel
 
 %description
-Gwenview is an image viewer for KDE. 
+Gwenview is an image viewer for KDE.
 
-It features a folder tree window and a file list window to provide easy 
-navigation in your file hierarchy.  Image loading is done by the Qt library, 
-so it supports all image formats your Qt installation supports. 
+It features a folder tree window and a file list window to provide easy
+navigation in your file hierarchy.  Image loading is done by the Qt library,
+so it supports all image formats your Qt installation supports.
 
 
 %prep



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gwget/devel gwget.spec,1.3,1.4
Message-ID: <200503032126.j23LQ5oq018683@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gwget.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gwget.spec	26 Feb 2005 21:36:27 -0000	1.3
+++ gwget.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -1,25 +1,23 @@
 # use "--without epiphanye" as rpmbuildparameter to disable epiphany-extension (requires FC3 Core package)
 
-Summary: 	GUI Download manager using wget
-Name: 		gwget
-Epoch:		0
-Version: 	0.93
-Release: 	1
-License: 	GPL
-Group: 		Applications/Internet
-Source0: 	http://prdownloads.sourceforge.net/gwget/gwget-0.93.tar.gz
-# direct link:	http://mesh.dl.sourceforge.net/sourceforge/gwget/gwget-0.93.tar.gz
+Summary:	Graphical download manager that uses wget
+Name:		gwget
+Version:	0.93
+Release:	1
+License:	GPL
+Group:		Applications/Internet
+Source0:	http://dl.sf.net/gwget/gwget-0.93.tar.gz
 Source1:	gwget.desktop
-URL: 		http://gwget.sourceforge.net/
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Buildrequires:	libgnomeui-devel >= 0:2.0
-Buildrequires:	libglade2-devel >= 0:2.0
+URL:		http://gwget.sourceforge.net/
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildrequires:	libgnomeui-devel >= 2.0
+Buildrequires:	libglade2-devel >= 2.0
 BuildRequires:	perl-XML-Parser
-BuildRequires:	gettext >= 0:0.14.1
-BuildRequires:  desktop-file-utils
-Requires: 	wget >= 0:1.9
-Requires(post):  GConf2
-Requires(preun): GConf2
+BuildRequires:	gettext >= 0.14.1
+BuildRequires:	desktop-file-utils
+Requires:	wget >= 1.9
+Requires(post):		GConf2
+Requires(preun):	GConf2
 
 
 %description
@@ -30,15 +28,15 @@
 %if 0%{!?_without_epiphanye:1}
 
 %package epiphany-extension
-Summary: 	This Package contains extensions gwget2 extensions for epiphany.
-Group: 		Applications/Internet
-Requires:	%{name} = %{epoch}:%{version}
-Requires:	epiphany >= 0:1.4.4
-BuildRequires: 	epiphany-devel >= 0:1.4.4
+Summary:	This Package contains extensions gwget2 extensions for epiphany.
+Group:		Applications/Internet
+Requires:	%{name} = %{version}
+Requires:	epiphany >= 1.4.4
+BuildRequires:	epiphany-devel >= 1.4.4
 
-%description epiphany-extension 
+%description
 This Package contains extensions gwget2 extensions for epiphany.
-%endif 	# _without_epiphanye
+%endif # _without_epiphanye
 
 %prep
 %setup -q
@@ -94,7 +92,7 @@
 %defattr (-,root,root)
 %dir %{_libdir}/epiphany/extensions/
 %{_libdir}/epiphany/extensions/*
-%endif 	# _without_epiphanye
+%endif # _without_epiphanye
 
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gl-117/devel gl-117.spec,1.3,1.4
Message-ID: <200503032126.j23LQ59u018576@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gl-117/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gl-117/devel

Modified Files:
	gl-117.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gl-117.spec
===================================================================
RCS file: /cvs/extras/rpms/gl-117/devel/gl-117.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gl-117.spec	13 Jan 2005 11:14:36 -0000	1.3
+++ gl-117.spec	3 Mar 2005 21:26:02 -0000	1.4
@@ -1,26 +1,25 @@
 Name:           gl-117
 Version:        1.3.1
 Release:        1
-Epoch:          0
-Summary:        An action flight simulator
+Summary:        Action flight simulator
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.heptargon.de/
 Source0:        http://dl.sf.net/sourceforge/gl-117/gl-117-%{version}-src.tar.bz2
-Source1:	gl-117.desktop
-Source2:	gl-117.png
+Source1:        gl-117.desktop
+Source2:        gl-117.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, SDL_mixer-devel
-BuildRequires:	XFree86-devel, freeglut-devel
-BuildRequires:	desktop-file-utils
+BuildRequires:  XFree86-devel, freeglut-devel
+BuildRequires:  desktop-file-utils
 
 %description
-GL-117 is an action flight simulator for Linux/Unix and MSWindows. Enter the 
-Eagle Squadron and succeed in several challanging missions leading though 
-different landscapes. Five predefined levels of video quality and an amount of 
-viewing ranges let you perfectly adjust the game to the performance of your 
+GL-117 is an action flight simulator for Linux/Unix and MSWindows. Enter the
+Eagle Squadron and succeed in several challanging missions leading though
+different landscapes. Five predefined levels of video quality and an amount of
+viewing ranges let you perfectly adjust the game to the performance of your
 system. Joystick, mouse, sound effects, music...
 
 %prep
@@ -39,8 +38,8 @@
 install -m 644 doc/%{name}.6 $RPM_BUILD_ROOT/%{_mandir}/man6/
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-		     --add-category X-Fedora \
-		     --vendor fedora %{SOURCE1} 
+    --add-category X-Fedora \
+    --vendor fedora %{SOURCE1}
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gnome-common/devel gnome-common.spec,1.3,1.4
Message-ID: <200503032126.j23LQ50O018604@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnome-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gnome-common/devel

Modified Files:
	gnome-common.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gnome-common.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-common/devel/gnome-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-common.spec	27 Nov 2004 15:33:14 -0000	1.3
+++ gnome-common.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -1,8 +1,7 @@
 Name:           gnome-common
 Version:        2.8.0
 Release:        1
-Epoch:          0
-Summary:        Useful things common to building gnome packages from scratch.
+Summary:        Useful things common to building gnome packages from scratch
 
 Group:          Development/Tools
 BuildArch:      noarch
@@ -66,7 +65,7 @@
 - Removed Requires.  Although gnome-common still requires autoconf and
   friends, it doesn't require a specific version of them.  There's no virtual
   provides in the automake14,15,16,17 automake packages that could help here.
-  
+
 * Mon Mar 22 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.4.0-0.fdr.3
 - Add COPYING file to the docs
 - Add bin/Changelog to the docs as ChangeLog.bin



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gnome-telnet/devel gnome-telnet.spec,1.4,1.5
Message-ID: <200503032126.j23LQ5Qf018608@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnome-telnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gnome-telnet/devel

Modified Files:
	gnome-telnet.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gnome-telnet.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-telnet/devel/gnome-telnet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-telnet.spec	10 Dec 2004 22:03:03 -0000	1.4
+++ gnome-telnet.spec	3 Mar 2005 21:26:03 -0000	1.5
@@ -1,24 +1,21 @@
-Summary:	A fancy GNOME telnet client.
+Summary:	Fancy GNOME telnet client
 Name: 		gnome-telnet
 Version: 	2.5
 Release: 	4
-Epoch:		0
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.cyest.org/
 Source0: 	http://www.cyest.org/downloads/%{name}-%{version}.tar.bz2
 Patch1:		gnome-telnet-2.5-default-font.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Provides:	GTelnet = %{epoch}:%{version}-%{release}
+Provides:	GTelnet = %{version}-%{release}
 BuildRequires:	gnome-libs-devel gettext automake14 desktop-file-utils
 
-#---------------------------------------------------------------------
 
 %description
 GTelnet (gnome-telnet) is a pretty, powerful, and fancy 3-in-1 GNOME1
 client for telnet, ssh, and rlogin. It supports both SSH2 and OpenSSH.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
@@ -26,28 +23,26 @@
 rm config.{sub,guess,cache}
 automake-1.4 -a -c -i
 
-#---------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT  %{name}.desktop
 %makeinstall
 %find_lang %{name}
 
-grep -v en_US.ISO8859-1 share/GTelnet.desktop |	\
-	sed 's|/usr/bin/||g;s|/usr/share/pixmaps/||g' > %{name}.desktop
+grep -v en_US.ISO8859-1 share/GTelnet.desktop | \
+    sed 's|/usr/bin/||g;s|/usr/share/pixmaps/||g' > %{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications $RPM_BUILD_ROOT%{_datadir}/pixmaps
 desktop-file-install --vendor fedora            \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora                     \
     --add-category Application                  \
-    --add-category Network	                \
+    --add-category Network                      \
     %{name}.desktop
 
 cd share
@@ -56,12 +51,10 @@
   install -m 0644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps
 done
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -70,7 +63,6 @@
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/*
 
-#---------------------------------------------------------------------
 
 %changelog
 * Sun Aug 17 2003 Dams <anvil[AT]livna.org> 0:2.5-0.fdr.4
@@ -86,5 +78,5 @@
 - Added html doc
 - Fixed typo in Provides
 
-* Wed Apr 23 2003 Dams <anvil[AT]livna.org> 
+* Wed Apr 23 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gkrellm-weather/devel gkrellm-weather.spec,1.5,1.6
Message-ID: <200503032126.j23LQ4D2018568@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-weather/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gkrellm-weather/devel

Modified Files:
	gkrellm-weather.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gkrellm-weather.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-weather/devel/gkrellm-weather.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gkrellm-weather.spec	23 Nov 2004 23:16:21 -0000	1.5
+++ gkrellm-weather.spec	3 Mar 2005 21:26:02 -0000	1.6
@@ -1,19 +1,18 @@
 %define plugdir %{_libdir}/gkrellm2/plugins
 %define datadir %{_datadir}/gkrellm2
 
-Summary:        GKrellWeather is a weather plugin for GKrellM
+Summary:        Weather plugin for GKrellM
 Name:           gkrellm-weather
 Version:        2.0.6
 Release:        2
-Epoch:          0
 License:        GPL
 Group:          Applications/System
 URL:            http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
-Source0:  http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/gkrellweather-2.0.6.tgz
+Source:   http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/gkrellweather-2.0.6.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-BuildRequires:  perl, gtk2-devel, gkrellm-devel >= 0:2, gettext
-Requires:       gkrellm >= 0:2
+BuildRequires:  perl, gtk2-devel, gkrellm-devel >= 2, gettext
+Requires:       gkrellm >= 2
 
 %description
 %{summary}.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gpgme03/devel gpgme03.spec,1.7,1.8
Message-ID: <200503032126.j23LQ5s5018633@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gpgme03.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gpgme03.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme03/devel/gpgme03.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gpgme03.spec	17 Jan 2005 11:24:04 -0000	1.7
+++ gpgme03.spec	3 Mar 2005 21:26:03 -0000	1.8
@@ -2,7 +2,6 @@
 Name:           gpgme03
 Version:        0.3.16
 Release:        7
-Epoch:          0
 License:        GPL
 Group:          Applications/System
 Source:         ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-0.3.16.tar.gz
@@ -10,8 +9,8 @@
 Patch1:         gpgme-0.3.16-underquoted.patch
 URL:            http://www.gnupg.org/related_software/gpgme/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gnupg >= 0:1.2.0
-Requires:       gnupg >= 0:1.2.0
+BuildRequires:  gnupg >= 1.2.0
+Requires:       gnupg >= 1.2.0
 
 %description
 GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier
@@ -21,10 +20,10 @@
 %package        devel
 Summary:        Software development files for GnuPG Made Easy
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
-Conflicts:	gpgme-devel
+Conflicts:      gpgme-devel
 
 %description    devel
 Static library, object and header files for GnuPG Made Easy (GPGME).



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gpa/devel gpa.spec,1.3,1.4
Message-ID: <200503032126.j23LQ5Ci018624@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gpa.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gpa.spec
===================================================================
RCS file: /cvs/extras/rpms/gpa/devel/gpa.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gpa.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gpa.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           gpa
 Version:        0.7.0
 Release:        2
-Epoch:          0
 Summary:        Graphical user interface for GnuPG
 
 Group:          Applications/System
@@ -13,8 +12,8 @@
 Patch1:         %{name}-keytable-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 0:2.0.0, zlib-devel, desktop-file-utils
-BuildRequires:  gnupg >= 0:1.2.1-3, gpgme-devel >= 0:0.4.3, gettext
+BuildRequires:  gtk2-devel >= 2.0.0, zlib-devel, desktop-file-utils
+BuildRequires:  gnupg >= 1.2.1-3, gpgme-devel >= 0.4.3, gettext
 
 %description
 GNU Privacy Assistant (GPA) is a graphical frontend for the GNU



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gpgme/devel gpgme.spec,1.6,1.7
Message-ID: <200503032126.j23LQ5rY018629@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gpgme.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gpgme.spec	1 Feb 2005 19:52:10 -0000	1.6
+++ gpgme.spec	3 Mar 2005 21:26:03 -0000	1.7
@@ -1,6 +1,4 @@
-
-Name:	 gpgme
-Epoch:	 0
+Name:    gpgme
 Version: 1.0.2
 Release: 1%{?dist_tag}
 Summary: GnuPG Made Easy - high level crypto API
@@ -9,17 +7,17 @@
 URL:     http://www.gnupg.org/related_software/gpgme/
 Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2.sig
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gnupg >= 0:1.2.2
-BuildRequires: gnupg2 >= 0:1.9.6
+BuildRequires: gnupg >= 1.2.2
+BuildRequires: gnupg2 >= 1.9.6
 BuildRequires: pth-devel
-BuildRequires: libgpg-error-devel >= 0:0.5
+BuildRequires: libgpg-error-devel >= 0.5
 
-Requires: gnupg >= 0:1.2.2
-Requires: gnupg2 >= 0:1.9.6
+Requires: gnupg >= 1.2.2
+Requires: gnupg2 >= 1.9.6
 
-Obsoletes: cryptplug <= 0:0.3.16-2
+Obsoletes: cryptplug <= 0.3.16-2
 
 %description
 GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
@@ -30,7 +28,7 @@
 %package devel
 Summary:  Static libraries and header files from GPGME, GnuPG Made Easy
 Group:    Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: libgpg-error-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
@@ -58,7 +56,7 @@
 
 
 %check || :
-make check 
+make check
 
 
 %clean



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gnupg2/devel gnupg2.spec,1.2,1.3
Message-ID: <200503032126.j23LQ5dX018620@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gnupg2.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnupg2.spec	2 Feb 2005 17:20:20 -0000	1.2
+++ gnupg2.spec	3 Mar 2005 21:26:03 -0000	1.3
@@ -1,18 +1,17 @@
 # $Id$
 
 Summary: GNU utility for secure communication and data storage
-Name:	 gnupg2 
-Epoch:	 0 
+Name:    gnupg2
 Version: 1.9.15
 Release: 1%{?dist_tag}
 License: GPL
-Group: 	 Applications/System
+Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
-URL:	 http://www.gnupg.org/
+URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Obsoletes: newpg < 0:0.9.5
+Obsoletes: newpg < 0.9.5
 
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
@@ -24,11 +23,11 @@
 %define pie 1
 %endif
 
-BuildRequires: libgcrypt-devel => 0:1.2.0
+BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.0
 Requires: libgpg-error >= 1.0
 BuildRequires: libassuan-devel >= 0.6.9
-BuildRequires: libksba-devel >= 0:0.9.7
+BuildRequires: libksba-devel >= 0.9.7
 # to build without opensc support: --without opensc
 %{!?_without_opensc:BuildRequires: opensc-devel >= 0.9}
 %{!?_without_opensc:BuildRequires: pcsc-lite-devel }
@@ -43,11 +42,11 @@
 Buildrequires: libusb-devel
 BuildRequires: docbook-utils
 
-Requires: pinentry >= 0:0.7.1
+Requires: pinentry >= 0.7.1
 
 # Should these be versioned?  -- Rex
-Provides: gpg 
-Provides: openpgp 
+Provides: gpg
+Provides: openpgp
 
 %description
 GnuPG 1.9 is the future version of GnuPG; it is based on the gnupg-1.3
@@ -72,7 +71,7 @@
 
 %configure \
   --program-prefix="%{?_program_prefix}" \
-  --disable-rpath 
+  --disable-rpath
 
 make %{?_smp_mflags}
 
@@ -139,7 +138,7 @@
 - BR: libassuan-devel >= 0.6.9
 
 * Thu Oct 21 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.11-0.fdr.4
-- remove suid. 
+- remove suid.
 
 * Thu Oct 21 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.11-0.fdr.3
 - remove Provides: newpg
@@ -150,6 +149,6 @@
 - update description
 
 * Tue Oct 19 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.11-0.fdr.1
-- first try 
+- first try
 - leave out opensc support (for now), enable --with-opensc
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gkrellm-themes/devel gkrellm-themes.spec,1.4,1.5
Message-ID: <200503032126.j23LQ43a018560@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gkrellm-themes/devel

Modified Files:
	gkrellm-themes.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gkrellm-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-themes/devel/gkrellm-themes.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gkrellm-themes.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ gkrellm-themes.spec	3 Mar 2005 21:26:02 -0000	1.5
@@ -1,14 +1,13 @@
-Summary:        Some themes for the GNU Krell Monitor.
+Summary:        Some themes for the GNU Krell Monitor
 Name:           gkrellm-themes
 Version:        2.1.9
 Release:        1
-Epoch:          0
 License:        GPL
 Group:          Applications/System
 Source:         gkrellm-themes.tar.bz2
 URL:            http://muhri.net/gkrellm/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:       gkrellm >= 0:2.0.0
+Requires:       gkrellm >= 2.0.0
 BuildRequires:  /usr/bin/find
 BuildArch:      noarch
 
@@ -22,15 +21,14 @@
 This package contains various themes to use with GKrellM. You will of
 course have to install the main GKrellM package to use them.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}
 
-#---------------------------------------------------------------------
 
 %build
 
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_datadir}/gkrellm2/themes
@@ -39,18 +37,15 @@
 find . -name ".xvpics" | xargs rm -rf
 find . -type d -name "CVS" | xargs rm -rf
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf %{buildroot}
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(0644,root,root,0755)
 %{_datadir}/gkrellm2/themes/*
 
-#---------------------------------------------------------------------
 
 %changelog
 * Tue Apr  8 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.1.9-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:24 -0500
Subject: rpms/irssi/devel irssi.spec,1.5,1.6
Message-ID: <200503032146.j23LkOxj019540@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	irssi.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: irssi.spec
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- irssi.spec	29 Jan 2005 16:42:13 -0000	1.5
+++ irssi.spec	3 Mar 2005 21:46:22 -0000	1.6
@@ -1,51 +1,46 @@
 %define		perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
-Summary: 	Modular text mode IRC client with Perl scripting
-Name: 		irssi
-Version: 	0.8.9
-Release: 	5
-Epoch: 		0
-License: 	GPL
-Group: 		Applications/Communications
-URL: 		http://irssi.org/
-Source0: 	http://irssi.org/files/%{name}-%{version}.tar.bz2
+Summary:	Modular text mode IRC client with Perl scripting
+Name:		irssi
+Version:	0.8.9
+Release:	5
+License:	GPL
+Group:		Applications/Communications
+URL:		http://irssi.org/
+Source0:	http://irssi.org/files/%{name}-%{version}.tar.bz2
 Source1:	http://wouter.coekaerts.be/irssi/scripts/replace.pl
 Source2:	http://wouter.coekaerts.be/irssi/scripts/trigger.pl
 Source3:	http://wouter.coekaerts.be/irssi/scripts/convert-replace-trigger.pl
 Patch1:		convert-replace-trigger.pl-fixpath-patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel openssl-devel zlib-devel pkgconfig gc-devel
 %{?_with_glib1:BuildRequires:	glib-devel}
 %{!?_with_glib1:BuildRequires:	glib2-devel}
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# ----------------------------------------------------------------------------
 
 %description
 Irssi is a modular IRC client with Perl scripting. Only text-mode
 frontend is currently supported. The GTK/GNOME frontend is no longer
 being maintained.
 
-# ----------------------------------------------------------------------------
 
 %prep
 %setup -q
 install -m 0644 %{SOURCE3} .
 %patch1 -p0
 
-# ----------------------------------------------------------------------------
 
 %build
 %configure --enable-ipv6 --with-textui	\
-%{?_with_glib1:	 --with-glib1}		\
-	 --with-proxy			\
-	 --with-bot			\
-	 --with-perl=module		\
-	 --with-perl-lib=vendor --with-gc
+%{?_with_glib1:	--with-glib1}		\
+	--with-proxy			\
+	--with-bot			\
+	--with-perl=module		\
+	--with-perl-lib=vendor --with-gc
 make %{?_smp_mflags}
 
-# ----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,7 +51,7 @@
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
 
 # Clean up
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a 
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a
 rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
 find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name '*.bs' -a -empty -exec rm -f {} ';'
 find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name .packlist -exec rm {} ';'
@@ -64,12 +59,10 @@
 # Fix permissions
 chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch}
 
-# ----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# ----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
@@ -83,7 +76,6 @@
 %{perl_vendorarch}/Irssi*
 %{perl_vendorarch}/auto/Irssi
 
-# ----------------------------------------------------------------------------
 
 %changelog
 * Fri Dec 24 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.8.9-5
@@ -135,7 +127,7 @@
 - Added zlib-devel buildrequires
 
 * Sat Jul 12 2003 Dams <anvil[AT]livna.org> 0:0.8.6-0.fdr.6
-- Applied Patches from Ville Skytt?? (bug #277 comment #11 and 
+- Applied Patches from Ville Skytt?? (bug #277 comment #11 and
   comment #12)
 
 * Mon Jun 23 2003 Dams <anvil[AT]livna.org> 0:0.8.6-0.fdr.5
@@ -151,5 +143,5 @@
 - Exclude modules ".a" files
 - Include more files as doc
 
-* Sat May 10 2003 Dams <anvil[AT]livna.org> 
+* Sat May 10 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/http_ping/devel http_ping.spec,1.4,1.5
Message-ID: <200503032146.j23LkNYb019492@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	http_ping.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: http_ping.spec
===================================================================
RCS file: /cvs/extras/rpms/http_ping/devel/http_ping.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- http_ping.spec	10 Dec 2004 22:03:03 -0000	1.4
+++ http_ping.spec	3 Mar 2005 21:46:21 -0000	1.5
@@ -1,7 +1,6 @@
 Name:           http_ping
 Version:        0.0
 Release:        2.20020403
-Epoch:          0
 Summary:        HTTP latency measuring utility
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/i810switch/devel i810switch.spec,1.1,1.2
Message-ID: <200503032146.j23LkNjJ019500@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	i810switch.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/i810switch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- i810switch.spec	25 Jan 2005 16:49:20 -0000	1.1
+++ i810switch.spec	3 Mar 2005 21:46:21 -0000	1.2
@@ -1,8 +1,7 @@
 Name: i810switch
 Version: 0.6.2
 Release: 3
-Epoch: 0
-Summary: A utility for switching the LCD and external VGA displays on and off
+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/
@@ -11,23 +10,20 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pciutils
 
-%description 
+%description
 i810switch is a utility for switching the LCD and external VGA
 displays on and off under Linux. It was originally written by Antonino
 Daplas, and is now maintained by Ken Mano.
 
 %prep
 %setup -q
-%patch -p1 -b .buildroot 
+%patch -p1 -b .buildroot
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%{!?makeinstall: %define makeinstall make install DESTDIR=$RPM_BUILD_ROOT bindir=$RPM_BUILD_ROOT%{_bindir} mandir=$RPM_BUILD_ROOT%{_mandir} }
-
 %makeinstall
 
 %clean



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:24 -0500
Subject: rpms/ip-sentinel/devel ip-sentinel.spec,1.2,1.3
Message-ID: <200503032146.j23LkObC019536@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/ip-sentinel/devel

Modified Files:
	ip-sentinel.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ip-sentinel.spec
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ip-sentinel.spec	8 Feb 2005 23:25:24 -0000	1.2
+++ ip-sentinel.spec	3 Mar 2005 21:46:22 -0000	1.3
@@ -44,18 +44,17 @@
 
 %{!?release_func:%global release_func() %1}
 
-Summary:	A tool to prevent unauthorized usage of IPs
+Summary:	Tool to prevent unauthorized usage of IP addresses
 Name:		ip-sentinel
 Version:	0.11
 Release:	%release_func 1
-Epoch:		0
 License:	GPL
 Group:		System Environment/Daemons
 URL:		http://www.tu-chemnitz.de/~ensc/ip-sentinel
 Source0:	http://www.tu-chemnitz.de/~ensc/ip-sentinel/files/%name-%version.tar.bz2
 Source1:	http://www.tu-chemnitz.de/~ensc/ip-sentinel/files/%name-%version.tar.bz2.asc
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
-Requires:		init(ip-sentinel)
+Requires:	init(ip-sentinel)
 
 %{!?_without_dietlibc:BuildRequires:	dietlibc}
 
@@ -70,8 +69,8 @@
 Summary:		SysV initscripts for ip-sentinel
 Group:			System Environment/Base
 Provides:		init(ip-sentinel)
-Requires(preun):	%name = %epoch:%version-%release
-Requires(postun):	%name = %epoch:%version-%release
+Requires(preun):	%name = %version-%release
+Requires(postun):	%name = %version-%release
 Requires(preun):	initscripts
 Requires(postun):	initscripts
 Requires(post):		/sbin/chkconfig
@@ -112,14 +111,12 @@
 with the minit initconcept.
 
 
-##---------------------------------------------
 
 
 %prep
 %setup -q
 
 
-##---------------------------------------------
 
 
 %build
@@ -129,7 +126,6 @@
 %__make %{?_smp_mflags} all
 
 
-##---------------------------------------------
 
 
 %install
@@ -141,21 +137,18 @@
 %{?_without_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 
 
-##---------------------------------------------
 
 
 %check
 %__make check
 
 
-##---------------------------------------------
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-##---------------------------------------------
 
 
 %pre



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/htmltmpl/devel htmltmpl.spec,1.7,1.8
Message-ID: <200503032146.j23LkNZW019488@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	htmltmpl.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: htmltmpl.spec
===================================================================
RCS file: /cvs/extras/rpms/htmltmpl/devel/htmltmpl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- htmltmpl.spec	16 Dec 2004 17:36:24 -0000	1.7
+++ htmltmpl.spec	3 Mar 2005 21:46:21 -0000	1.8
@@ -3,7 +3,6 @@
 Name:           htmltmpl
 Version:        1.22
 Release:        5
-Epoch:          0
 Summary:        Templating engine for separation of code and HTML
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:24 -0500
Subject: rpms/inti/devel inti.spec,1.2,1.3
Message-ID: <200503032146.j23LkOgG019532@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	inti.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: inti.spec
===================================================================
RCS file: /cvs/extras/rpms/inti/devel/inti.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- inti.spec	8 Nov 2004 04:36:47 -0000	1.2
+++ inti.spec	3 Mar 2005 21:46:21 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           inti
 Version:        1.2
-Release:        0.fdr.5.1
-Epoch:          0
+Release:        1
 Summary:        Integrated Foundation Classes for GNOME and GTK+
 
 Group:          System Environment/Libraries
@@ -9,7 +8,7 @@
 URL:            http://inti.sourceforge.net
 Source:         http://download.sourceforge.net/inti/inti-1.2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gtk2-devel >= 0:2.2.1
+BuildRequires:  gtk2-devel >= 2.2.1
 
 %description
 The Integrated Foundation Classes are a set of C++ classes for
@@ -21,27 +20,27 @@
 %package        devel
 Summary:        Development tools for Inti applications
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:	gtk2-devel >= 0:2.2.1, pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       gtk2-devel >= 2.2.1, pkgconfig
 
 %description    devel
 Static libraries and header files needed for developing Inti
 applications.
 
-%package	docs
-Summary:	Documentation for Inti
-Group:		Documentation
-Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+%package        docs
+Summary:        Documentation for Inti
+Group:          Documentation
+Requires:       %{name}-devel = %{version}-%{release}
 
-%description	docs
+%description    docs
 Documentation for the Integrated Foundation Classes.
 
-%package	demo
-Summary:	Inti demo
-Group:		Documentation
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+%package        demo
+Summary:        Inti demo
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
 
-%description	demo
+%description    demo
 Demonstration program for Inti.
 
 %prep



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/id3-py/devel id3-py.spec,1.6,1.7
Message-ID: <200503032146.j23LkNMa019512@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/id3-py/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/id3-py/devel

Modified Files:
	id3-py.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: id3-py.spec
===================================================================
RCS file: /cvs/extras/rpms/id3-py/devel/id3-py.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- id3-py.spec	16 Dec 2004 18:13:17 -0000	1.6
+++ id3-py.spec	3 Mar 2005 21:46:21 -0000	1.7
@@ -3,7 +3,6 @@
 Name:           id3-py
 Version:        1.2
 Release:        6
-Epoch:          0
 Summary:        Python ID3 tag library
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/hunt/devel hunt.spec,1.5,1.6
Message-ID: <200503032146.j23LkN7K019496@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	hunt.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: hunt.spec
===================================================================
RCS file: /cvs/extras/rpms/hunt/devel/hunt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hunt.spec	3 Mar 2005 13:44:44 -0000	1.5
+++ hunt.spec	3 Mar 2005 21:46:21 -0000	1.6
@@ -1,12 +1,11 @@
-## $Id$
+# $Id$
 
 %{!?release_func:%define release_func() %1%{?disttag}}
 
-Summary:	A tool for demonstrating well known weaknesses in the TCP/IP protocol suite.
+Summary:	Tool for demonstrating well known weaknesses in the TCP/IP protocol suite
 Name:		hunt
 Version:	1.5
 Release:	%release_func 3
-Epoch:		0
 License:	GPL
 Group:		Applications/Internet
 Source:		http://lin.fsid.cvut.cz/~kra/hunt/%{name}-%{version}.tgz
@@ -44,7 +43,7 @@
 
 
 %build
-%{__make} %{?_smp_mflags} all CFLAGS="$RPM_OPT_FLAGS -D_REENTRANT" 
+%{__make} %{?_smp_mflags} all CFLAGS="$RPM_OPT_FLAGS -D_REENTRANT"
 
 
 %install
@@ -52,7 +51,7 @@
 
 %{__install} -d $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_mandir}/man1 \
                 $RPM_BUILD_ROOT%{_libdir}/%{name}
-		
+
 %{__install} -p hunt          $RPM_BUILD_ROOT%{_sbindir}/
 %{__install} -p tpsetup/*     $RPM_BUILD_ROOT%{_libdir}/%{name}/
 %{__install} -p -m644 man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -93,7 +92,7 @@
 
 * Wed Jun  6 2001 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - added %defattr(-,root,root)
- 
+
 * Fri Jun  1 2001 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - typo
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/id3lib/devel id3lib.spec,1.5,1.6
Message-ID: <200503032146.j23LkNNq019508@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	id3lib.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: id3lib.spec
===================================================================
RCS file: /cvs/extras/rpms/id3lib/devel/id3lib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- id3lib.spec	10 Dec 2004 22:03:03 -0000	1.5
+++ id3lib.spec	3 Mar 2005 21:46:21 -0000	1.6
@@ -1,23 +1,21 @@
-Summary: 	An Open-Source library for manipulating ID3v1 and ID3v2 tags.
-Name: 		id3lib
-Version: 	3.8.3
-Release: 	9
-Epoch:		0
-License: 	LGPL
-Group: 		System Environment/Libraries
-URL: 		http://id3lib.sourceforge.net/
-Source0: 	http://download.sf.net/id3lib/%{name}-%{version}.tar.gz
+Summary:	Library for manipulating ID3v1 and ID3v2 tags
+Name:		id3lib
+Version:	3.8.3
+Release:	9
+License:	LGPL
+Group:		System Environment/Libraries
+URL:		http://id3lib.sourceforge.net/
+Source0:	http://download.sf.net/id3lib/%{name}-%{version}.tar.gz
 Patch0:		id3lib-dox.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	zlib-devel doxygen
 
 %package devel
-Summary:	Development tools for the id3lib.
+Summary:	Development tools for the id3lib library
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	zlib-devel
 
-#---------------------------------------------------------------------
 
 %description
 This package provides a software library for manipulating ID3v1 and
@@ -31,40 +29,35 @@
 %description devel
 This package provides files needed to develop with the id3lib.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
 %patch0 -p0
 
-#---------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 make docs
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
-%exclude %{_libdir}/libid3.la
 %doc AUTHORS COPYING ChangeLog HISTORY NEWS README THANKS TODO
-%doc doc
+%doc doc/
 %{_libdir}/libid3-3.8.so.*
 %{_bindir}/id3convert
 %{_bindir}/id3cp
@@ -76,9 +69,9 @@
 %{_includedir}/id3.h
 %{_includedir}/id3/
 %{_libdir}/libid3.a
+%exclude %{_libdir}/libid3.la
 %{_libdir}/libid3.so
 
-#---------------------------------------------------------------------
 %changelog
 * Wed Oct 29 2003 Ville Skytta <ville.skytta at iki.fi> - 0:3.8.3-0.fdr.9
 - Rebuild.
@@ -105,5 +98,5 @@
 * Thu Apr  3 2003 Dams <anvil[AT]livna.org> 0:3.8.3-0.fdr.2
 - Added missing epoch requirement
 
-* Wed Apr  2 2003 Dams <anvil[AT]livna.org> 
+* Wed Apr  2 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/iftop/devel iftop.spec,1.5,1.6
Message-ID: <200503032146.j23LkNwN019524@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	iftop.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: iftop.spec
===================================================================
RCS file: /cvs/extras/rpms/iftop/devel/iftop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iftop.spec	10 Dec 2004 22:03:04 -0000	1.5
+++ iftop.spec	3 Mar 2005 21:46:21 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           iftop
 Version:        0.16
 Release:        3
-Epoch:          0
 Summary:        Command line tool that displays bandwidth usage on an interface
 
 Group:          Applications/Internet
@@ -37,7 +36,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc COPYING README TODO
 %{_sbindir}/*



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/ifplugd/devel ifplugd.spec,1.3,1.4
Message-ID: <200503032146.j23LkN39019520@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ifplugd.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ifplugd.spec
===================================================================
RCS file: /cvs/extras/rpms/ifplugd/devel/ifplugd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ifplugd.spec	10 Dec 2004 22:03:04 -0000	1.3
+++ ifplugd.spec	3 Mar 2005 21:46:21 -0000	1.4
@@ -1,15 +1,14 @@
-Summary:    Detect and take action when an ethernet cable is unplugged
+Summary: Detect and take action when an ethernet cable is unplugged
 Name: ifplugd
 Version: 0.24
 Release: 5
 License: GPL
-Epoch: 0
 Group: System Environment/Daemons
 URL: http://0pointer.de/lennart/projects/ifplugd
 Source0: http://0pointer.de/lennart/projects/ifplugd/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libdaemon >= 0:0.5
-BuildRequires: libdaemon >= 0:0.5, pkgconfig
+Requires: libdaemon >= 0.5
+BuildRequires: libdaemon >= 0.5, pkgconfig
 
 %description
 ifplugd is a Linux daemon which will automatically configure your
@@ -25,6 +24,7 @@
 %build
 %configure --prefix=/ --disable-lynx --disable-xmltoman --disable-subversion
 make %{?_smp_mflags} all
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -p -D -m755 src/ifplugd $RPM_BUILD_ROOT/%{_sbindir}/ifplugd
@@ -35,6 +35,7 @@
 install -p -D man/ifplugd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5/ifplugd.conf.5
 install -p -D man/ifplugd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ifplugd.8
 install -p -D man/ifplugstatus.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ifplugstatus.8
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -49,10 +50,10 @@
 %{_mandir}/man8/ifplugstatus.8*
 %doc README LICENSE
 
-%post 
+%post
 /sbin/chkconfig --add ifplugd
 
-%preun 
+%preun
 /sbin/chkconfig --del ifplugd
 
 %changelog
@@ -62,7 +63,7 @@
 
 * Thu Jun  3 2004  <aaron.bennett at olin.edu> - 0:0.24-0.fdr.4
 - renamed confpatches.patch to ifplugd-0.24-confpatches.patch
-- used %config for /etc/init.d/ifplugd 
+- used %config for /etc/init.d/ifplugd
 - added %config(noreplace) for /etc/ifplugd/*
 - removed patch
 
@@ -78,7 +79,7 @@
 * Mon May 3 2004 <aaron.bennett at olin.edu>
 - Revamped for Fedora.us packaging guidelines
 
-* Wed Mar 31 2004  <abennett at olin.edu> 
+* Wed Mar 31 2004  <abennett at olin.edu>
 - Initial build.
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:24 -0500
Subject: rpms/imlib2/devel imlib2.spec,1.9,1.10
Message-ID: <200503032146.j23LkNVC019529@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	imlib2.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- imlib2.spec	9 Feb 2005 22:06:39 -0000	1.9
+++ imlib2.spec	3 Mar 2005 21:46:21 -0000	1.10
@@ -1,24 +1,22 @@
-Summary: 	A graphic library for file loading, saving, rendering, and manipulation
-Name: 		imlib2
-Version: 	1.2.0
-Release: 	5
-Epoch:		0
-License: 	BSD
-Group: 		System Environment/Libraries
-URL: 		http://www.enlightenment.org/pages/imlib2.html
-Source0: 	http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
-Patch0:         imlib2-1.2.0-configure-xlib64.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Summary:	Graphic library for file loading, saving, rendering, and manipulation
+Name:		imlib2
+Version:	1.2.0
+Release:	5
+License:	BSD
+Group:		System Environment/Libraries
+URL:		http://www.enlightenment.org/pages/imlib2.html
+Source0:	http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
+Patch0:		imlib2-1.2.0-configure-xlib64.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	XFree86-devel libjpeg-devel libpng-devel libtiff-devel
 BuildRequires:	libungif-devel freetype-devel libtool bzip2-devel %{__perl}
 
 %package devel
-Summary: 	Development package for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
+Summary:	Development package for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 Requires:	XFree86-devel freetype-devel pkgconfig
 
-# -----------------------------------------------------------------------------
 
 %description
 Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is
@@ -36,7 +34,6 @@
 which have very similar functionality. Please see the homepage for the
 long description of the differences.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
@@ -48,7 +45,6 @@
   's|^(\w+_la_LDFLAGS .*)|$1 -L\$(top_builddir)/src/lib| ;
    s|^(\w+_la_LIBADD .*)|$1 -lImlib2|' src/modules/loaders/Makefile.*
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure \
@@ -68,7 +64,6 @@
 
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT __doc
@@ -84,16 +79,15 @@
 # ship .la files due to a bug in kdelibs (see changelog):
 #  $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig 
 
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS README ChangeLog TODO __doc/*
@@ -121,7 +115,6 @@
 %{_libdir}/libImlib2.so
 %{_libdir}/pkgconfig/imlib2.pc
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Wed Feb  9 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2.0-5



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/hping2/devel hping2.spec,1.4,1.5
Message-ID: <200503032146.j23LkNEo019480@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	hping2.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: hping2.spec
===================================================================
RCS file: /cvs/extras/rpms/hping2/devel/hping2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hping2.spec	13 Feb 2005 11:49:15 -0000	1.4
+++ hping2.spec	3 Mar 2005 21:46:21 -0000	1.5
@@ -1,12 +1,11 @@
 Name:    hping2
 Version: 2.0.0
 Release: 0.3.rc3
-Epoch:   0 
-Summary: A software to do TCP/IP stack auditing and much more
+Summary: TCP/IP stack auditing and much more
 
 Group: Applications/Internet
 License: GPL
-URL: http://www.hping.org/	
+URL: http://www.hping.org/
 Source0: http://www.hping.org/hping2.0.0-rc3.tar.gz
 Patch0: hping2-include.patch
 Patch1: hping2-x86_64.patch
@@ -43,12 +42,11 @@
 
 %files
 %defattr(0644,root,root,0755)
+%doc COPYING *BUGS CHANGES README TODO docs/AS-BACKDOOR docs/HPING2-HOWTO.txt
+%doc docs/HPING2-IS-OPEN docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man8/*
 
-%doc COPYING *BUGS CHANGES README TODO docs/AS-BACKDOOR docs/HPING2-HOWTO.txt 
-%doc docs/HPING2-IS-OPEN docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt
-
 %changelog
 * Sun Feb 13 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 2.0.0-0.3.rc3
 - Add patch to fix build on x86_64



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/id3v2/devel id3v2.spec,1.5,1.6
Message-ID: <200503032146.j23LkNEP019516@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	id3v2.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: id3v2.spec
===================================================================
RCS file: /cvs/extras/rpms/id3v2/devel/id3v2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- id3v2.spec	10 Dec 2004 22:03:04 -0000	1.5
+++ id3v2.spec	3 Mar 2005 21:46:21 -0000	1.6
@@ -1,8 +1,7 @@
 Name:           id3v2
 Version:        0.1.11
 Release:        1
-Epoch:          0
-Summary:        A command line id3v2 tag editor
+Summary:        Command line id3v2 tag editor
 
 Group:          Applications/Multimedia
 License:        LGPL



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/htb-util/devel htb-util.spec,1.4,1.5
Message-ID: <200503032146.j23LkNI8019484@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/htb-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/htb-util/devel

Modified Files:
	htb-util.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: htb-util.spec
===================================================================
RCS file: /cvs/extras/rpms/htb-util/devel/htb-util.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- htb-util.spec	10 Dec 2004 22:03:03 -0000	1.4
+++ htb-util.spec	3 Mar 2005 21:46:21 -0000	1.5
@@ -1,28 +1,27 @@
-%define         tartopdir      htb_util-0.2.4-pre1
+%define		tartopdir	htb_util-0.2.4-pre1
 
-Name: 		htb-util
-Version: 	0.2.4
-Release: 	0.3.pre1
-Epoch:		0
-Summary: 	Another tool to make your life easier with HTB
-Group: 		Applications/Internet
-License: 	GPL
-URL: 		http://SGI.rdscv.ro/~ionuts/C/htb-tools/
-Source0: 	http://SGI.rdscv.ro/~ionuts/C/htb_util-0.2.4-pre1.tar.gz
-Patch0: 	htb-util-0.2.4pre1-FC2.patch
-Patch1: 	htb-util-0.2.4pre1-init.d.patch
-Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Name:		htb-util
+Version:	0.2.4
+Release:	0.3.pre1
+Summary:	Another tool to make your life easier with HTB
+Group:		Applications/Internet
+License:	GPL
+URL:		http://SGI.rdscv.ro/~ionuts/C/htb-tools/
+Source0:	http://SGI.rdscv.ro/~ionuts/C/htb_util-0.2.4-pre1.tar.gz
+Patch0:		htb-util-0.2.4pre1-FC2.patch
+Patch1:		htb-util-0.2.4pre1-init.d.patch
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
-Requires: 	perl, sed, bash >= 2.00, iproute
+Requires:	perl, sed, bash >= 2.00, iproute
 
 BuildRequires:	flex
 
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
+Requires(post):		/sbin/chkconfig
+Requires(preun):	/sbin/chkconfig
 
 %description
 htb-util is a set of tools that generates scripts for bandwidth management
-using the HTB queueing discipline and lets you see the traffic passing 
+using the HTB queueing discipline and lets you see the traffic passing
 through each queue in real time.
 
 %prep
@@ -77,7 +76,7 @@
 - added iproute requires
 - rm -rf RPM_BUILD_ROOT upon install
 - corrected default file attributes
-- don't enable htb-util automatically for runlevels 3 and 5, just add the 
+- don't enable htb-util automatically for runlevels 3 and 5, just add the
 service and let the sysadmin do the job
 - added postun
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/ibmonitor/devel ibmonitor.spec,1.6,1.7
Message-ID: <200503032146.j23LkN2c019504@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ibmonitor.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ibmonitor.spec
===================================================================
RCS file: /cvs/extras/rpms/ibmonitor/devel/ibmonitor.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ibmonitor.spec	12 Feb 2005 12:42:46 -0000	1.6
+++ ibmonitor.spec	3 Mar 2005 21:46:21 -0000	1.7
@@ -1,7 +1,6 @@
 Name:           ibmonitor
 Version:        1.3
 Release:        1
-Epoch:          0
 Summary:        Interactive bandwidth monitor
 
 Group:          Applications/Internet
@@ -17,35 +16,29 @@
 The program ibmonitor is an interactive linux console application which shows
 bandwidth consumed and total data transferred on all interfaces.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n ibmonitor
 
-# -----------------------------------------------------------------------------
 
 %build
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 install -p -m 0755 ibmonitor $RPM_BUILD_ROOT%{_bindir}
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/ibmonitor
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Sat Feb 12 2005 Adrian Reber <adrian at lisas.de> - 0:1.3-1



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/hddtemp/devel hddtemp.spec,1.7,1.8
Message-ID: <200503032146.j23LkNG5019476@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	hddtemp.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hddtemp.spec	22 Jan 2005 13:39:06 -0000	1.7
+++ hddtemp.spec	3 Mar 2005 21:46:21 -0000	1.8
@@ -1,7 +1,6 @@
 Name:           hddtemp
 Version:        0.3
 Release:        0.2.beta12
-Epoch:          0
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/kickpim/devel kickpim.spec,1.5,1.6
Message-ID: <200503032156.j23LugEw019957@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	kickpim.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: kickpim.spec
===================================================================
RCS file: /cvs/extras/rpms/kickpim/devel/kickpim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kickpim.spec	10 Feb 2005 16:50:58 -0000	1.5
+++ kickpim.spec	3 Mar 2005 21:56:40 -0000	1.6
@@ -1,14 +1,13 @@
 # $Id$
 
-Name:	 kickpim
+Name:    kickpim
 Summary: KDE kicker applet to access addressbook
-Epoch:	 0
 Version: 0.5.3
 Release: 5%{?dist_tag}
 License: GPL
-Group:	 Applications/Productivity
-URL:	 http://kickpim.sourceforge.net/
-Source:	 http://dl.sourceforge.net/sourceforge/kickpim/kickpim-0.5.3.tar.bz2
+Group:   Applications/Productivity
+URL:     http://kickpim.sourceforge.net/
+Source:  http://dl.sourceforge.net/sourceforge/kickpim/kickpim-0.5.3.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 # remove build dep on qt-3.2
@@ -25,7 +24,7 @@
 BuildRequires: kdepim-devel >= 6:3.1
 Requires: kdebase
 
-# Dynamically determine qt,kdelibs dependancies, depending on 
+# Dynamically determine qt,kdelibs dependancies, depending on
 # what we're built against.
 BuildRequires: qt-devel >= 1:3.1
 %define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f-2)
@@ -83,7 +82,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-
 %changelog
 * Mon Feb 07 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.5.3-5
 - fix x86_64 build (#147332)



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/jasper/devel jasper.spec,1.2,1.3
Message-ID: <200503032156.j23Lugso019933@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	jasper.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jasper.spec	10 Dec 2004 22:03:04 -0000	1.2
+++ jasper.spec	3 Mar 2005 21:56:40 -0000	1.3
@@ -7,13 +7,12 @@
 # netpbm
 
 Summary: Implementation of the JPEG-2000 standard, Part 1
-Name:	 jasper
+Name:    jasper
 License: JasPer License Version 2.0
-Group:	 System Environment/Libraries
-Epoch:	 0
+Group:   System Environment/Libraries
 Version: 1.701.0
 Release: 3%{?dist_tag}
-URL: 	 http://www.ece.uvic.ca/~mdadams/jasper/
+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
 
@@ -28,9 +27,10 @@
 %package devel
 Summary: JPEG-2000 library developer files
 Group:   Development/Libraries
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
 Requires: libjpeg-devel
-%description devel 
+
+%description devel
 JPEG-2000 library developer files.
 
 
@@ -42,14 +42,14 @@
 %configure \
   --program-prefix="%{?_program_prefix}" \
   --disable-dependency-tracking \
-  --enable-shared --disable-static 
+  --enable-shared --disable-static
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT  
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # Unpackaged files
 rm -f doc/README
@@ -64,11 +64,11 @@
 
 %files
 %defattr(-,root,root)
-%doc COPYRIGHT LICENSE NEWS README 
+%doc COPYRIGHT LICENSE NEWS README
 %{_bindir}/*
 %{_libdir}/lib*.so.*
 
-%files devel 
+%files devel
 %defattr(-,root,root)
 %doc doc/*
 %{_includedir}/*
@@ -84,7 +84,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%changelog 
+%changelog
 * Sat Oct 23 2004 Rex Dieter <rexdieter at sf.net> 0:1.701.0-0.fdr.3
 - Capitalize summary
 - remove 0-length ChangeLog



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/kover/devel kover.spec,1.6,1.7
Message-ID: <200503032156.j23LugZv019969@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	kover.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: kover.spec
===================================================================
RCS file: /cvs/extras/rpms/kover/devel/kover.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kover.spec	13 Feb 2005 11:39:12 -0000	1.6
+++ kover.spec	3 Mar 2005 21:56:40 -0000	1.7
@@ -2,7 +2,6 @@
 Summary: WYSIWYG CD cover printer with CDDB support
 Version: 2.9.6
 Release: 1
-Epoch: 0
 License: GPL
 Group: Applications/Publishing
 Source0 http://lisas.de/kover/kover-2.9.6.tar.gz
@@ -14,7 +13,7 @@
 BuildRequires: libart_lgpl-devel, libpng-devel
 
 %description
-Kover is an easy to use WYSIWYG CD cover printer with CDDB support. 
+Kover is an easy to use WYSIWYG CD cover printer with CDDB support.
 
 %prep
 %setup -q
@@ -45,7 +44,7 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS README COPYING TODO NEWS THANKS ChangeLog  
+%doc AUTHORS README COPYING TODO NEWS THANKS ChangeLog
 %{_datadir}/apps/kover/koverui.rc
 %{_datadir}/icons/*/*/*/*
 %dir %{_datadir}/apps/kover
@@ -54,7 +53,7 @@
 %{_datadir}/mimelnk/application/x-kover.desktop
 %{_mandir}/man1/*
 %{_datadir}/applications/*
-%attr(755,root,root)%{_bindir}/kover 
+%attr(755,root,root)%{_bindir}/kover
 %attr(755,root,root)%{_bindir}/cddb-id
 %attr(755,root,root)%{_bindir}/cd-text
 
@@ -71,7 +70,7 @@
 - removed the INSTALL file from package and added the NEWS file
 
 * Sat Apr 26 2003 Adrian Reber <adrian at lisas.de> - 0:2.9.3-0.fdr.5
-- added the directories %{_datadir}/apps/kover and 
+- added the directories %{_datadir}/apps/kover and
   %{_datadir}/apps/kover/pics to the file list
 
 * Wed Apr 23 2003 Adrian Reber <adrian at lisas.de> - 0:2.9.3-0.fdr.4



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/kid3/devel kid3.spec,1.4,1.5
Message-ID: <200503032156.j23Lugee019962@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	kid3.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/devel/kid3.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kid3.spec	19 Dec 2004 16:36:05 -0000	1.4
+++ kid3.spec	3 Mar 2005 21:56:40 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           kid3
 Version:        0.5
 Release:        2
-Epoch:          0
-Summary:        Efficient ID3 tagger
+Summary:        Efficient ID3 tag editor for KDE
 
 Group:          Applications/Multimedia
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/kile/devel kile.spec,1.5,1.6
Message-ID: <200503032156.j23LugBi019965@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	kile.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kile.spec	13 Jan 2005 15:32:49 -0000	1.5
+++ kile.spec	3 Mar 2005 21:56:40 -0000	1.6
@@ -3,14 +3,13 @@
 # for optionally using destkop-file-install (for fc2 mostly)
 %define desktop_file 1
 
-Name:	 kile
+Name:    kile
 Summary: (La)TeX source editor and TeX shell
-Epoch:	 0
 Version: 1.7.1
 Release: 3%{?dist_tag}
-Group: 	 Applications/Publishing
-URL:	 http://kile.sourceforge.net/
-Source:	 http://dl.sourceforge.net/sourceforge/kile/kile-1.7.1.tar.bz2
+Group:   Applications/Publishing
+URL:     http://kile.sourceforge.net/
+Source:  http://dl.sourceforge.net/sourceforge/kile/kile-1.7.1.tar.bz2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -66,7 +65,7 @@
   --program-prefix="%{?_program_prefix}" \
   --disable-rpath \
   %{?debug:  --enable-debug --enable-warnings } \
-  %{!?debug: --disable-debug --disable-warnings --enable-final } 
+  %{!?debug: --disable-debug --disable-warnings --enable-final }
 
 make %{?_smp_mflags}
 
@@ -102,7 +101,7 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/katepart
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README TODO
 %lang(en) %doc %{_datadir}/doc/HTML/en/*
@@ -189,7 +188,7 @@
 - fix missing latexhelp.html
 
 * Thu Sep 11 2003 Rex Dieter <rexdieter at sf.net> 0:1.5.2-0.fdr.3
-- patch1 
+- patch1
 
 * Wed Aug 20 2003 Rex Dieter <rexdieter at sf.net> 0:1.5.2-0.fdr.2
 - 1.5.2
@@ -210,7 +209,7 @@
 * Fri Apr 25 2003 Rex Dieter <rexdieter at sf.net> 1.40-1.3
 - remove %%doc NEWS
 
-* Mon Mar 03 2003 Rex Dieter <rexdieter at sf.net> 1.40-1.2 
+* Mon Mar 03 2003 Rex Dieter <rexdieter at sf.net> 1.40-1.2
 - version: 1.4 -> 1.40 so silly rpm knows that 1.40 is newer than 1.32
 - use epochs in Obsoletes/Provides/Requires.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/john/devel john.spec,1.5,1.6
Message-ID: <200503032156.j23LugwU019945@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	john.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: john.spec
===================================================================
RCS file: /cvs/extras/rpms/john/devel/john.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- john.spec	10 Dec 2004 22:03:04 -0000	1.5
+++ john.spec	3 Mar 2005 21:56:40 -0000	1.6
@@ -2,10 +2,9 @@
 Name:             john
 Version:          1.6
 Release:          2
-Epoch:            0
 URL:              http://www.openwall.com/john
 License:          GPL
-Group:            Applications/System 
+Group:            Applications/System
 Source0:          http://www.openwall.com/john/dl/john-1.6.tar.gz
 Patch0:           john-1.6-rh.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/jikes/devel jikes.spec,1.7,1.8
Message-ID: <200503032156.j23LugFf019937@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	jikes.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: jikes.spec
===================================================================
RCS file: /cvs/extras/rpms/jikes/devel/jikes.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jikes.spec	10 Dec 2004 22:03:04 -0000	1.7
+++ jikes.spec	3 Mar 2005 21:56:40 -0000	1.8
@@ -1,8 +1,7 @@
 Name:           jikes
 Version:        1.22
 Release:        1
-Epoch:          0
-Summary:        A Java source file to bytecode compiler
+Summary:        Java source file to bytecode compiler
 
 License:        IBM Public License
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad.spec, 1.4,
	1.5
Message-ID: <200503032156.j23Lug00019953@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kernel-module-thinkpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19897/kernel-module-thinkpad/devel

Modified Files:
	kernel-module-thinkpad.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: kernel-module-thinkpad.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kernel-module-thinkpad.spec	8 Nov 2004 04:39:54 -0000	1.4
+++ kernel-module-thinkpad.spec	3 Mar 2005 21:56:40 -0000	1.5
@@ -13,8 +13,7 @@
 
 Name:           kernel-module-thinkpad
 Version:        5.0
-Release:        0.fdr.4.1
-Epoch:          0
+Release:        1
 Summary:        IBM ThinkPad support kernel modules
 
 License:        GPL
@@ -52,7 +51,7 @@
 Summary:        %{summary}
 Group:          System Environment/Kernel
 Provides:       kernel-module
-Provides:       %{name} = %{epoch}:%{version}-%{release}
+Provides:       %{name} = %{version}-%{release}
 Obsoletes:      kernel-mod-thinkpad
 Requires(pre):  modutils
 %if 0%(%kmh -- rhkernel)



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/jpgraph/devel jpgraph.spec,1.2,1.3
Message-ID: <200503032156.j23LugTR019949@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	jpgraph.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: jpgraph.spec
===================================================================
RCS file: /cvs/extras/rpms/jpgraph/devel/jpgraph.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jpgraph.spec	10 Dec 2004 22:03:04 -0000	1.2
+++ jpgraph.spec	3 Mar 2005 21:56:40 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           jpgraph
-Summary:        An OO graph drawing class library for PHP
+Summary:        Object oriented graph drawing class library for PHP
 Version:        1.16
 Release:        2
-Epoch:          0
 Source0:        http://members.chello.se/jpgraph/jpgdownloads/jpgraph-1.16.tar.gz
 License:        QPL
 URL:            http://www.aditus.nu/jpgraph/
@@ -24,11 +23,11 @@
 Extensive documentations are availible at:
 http://www.aditus.nu/jpgraph/
 
-%package	doc
-Summary:	Documenation for %{name}
-Group:		Documentation
+%package        doc
+Summary:        Documenation for %{name}
+Group:          Documentation
 
-%description	doc
+%description    doc
 JpGraph is a OO Graph drawing library for PHP 4.0.2 and above.
 Highlights of the available features are: text, linear, and log
 scales for both the X and Y axes, anti-aliasing of lines,
@@ -42,7 +41,7 @@
 
 %prep
 
-%setup -q 
+%setup -q
 
 mv src/Changelog .
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:43 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:43 -0500
Subject: rpms/ksensors/devel ksensors.spec,1.6,1.7
Message-ID: <200503032156.j23LuhC7019973@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ksensors.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ksensors.spec
===================================================================
RCS file: /cvs/extras/rpms/ksensors/devel/ksensors.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ksensors.spec	10 Dec 2004 22:03:04 -0000	1.6
+++ ksensors.spec	3 Mar 2005 21:56:40 -0000	1.7
@@ -1,8 +1,7 @@
 Name:           ksensors
 Version:        0.7.3
 Release:        1
-Epoch:          0
-Summary:        An lm_sensors frontend for KDE
+Summary:        KDE frontend to lm_sensors
 
 Group:          Applications/System
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/jlint/devel jlint.spec,1.4,1.5
Message-ID: <200503032156.j23Lugnk019941@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	jlint.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: jlint.spec
===================================================================
RCS file: /cvs/extras/rpms/jlint/devel/jlint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jlint.spec	10 Dec 2004 22:03:04 -0000	1.4
+++ jlint.spec	3 Mar 2005 21:56:40 -0000	1.5
@@ -1,7 +1,6 @@
 Name:           jlint
 Version:        1.21
 Release:        1
-Epoch:          0
 Summary:        Java program checker
 
 Group:          Development/Tools



From bugs.michael at gmx.net  Thu Mar  3 21:57:54 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 22:57:54 +0100
Subject: rpms/inti/devel inti.spec,1.2,1.3
In-Reply-To: <200503032146.j23LkOgG019532@cvs-int.fedora.redhat.com>
References: <200503032146.j23LkOgG019532@cvs-int.fedora.redhat.com>
Message-ID: <20050303225754.509a1171.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 16:46:24 -0500, Matthias Saou (thias) wrote:

>  Name:           inti
>  Version:        1.2
> -Release:        0.fdr.5.1
> -Epoch:          0
> +Release:        1

Release change is pointless here. Please don't mix such changes with the
other documented mass-changes. inti package is broken for quite some
time (GTK incompatibility) and has not been updated since then. Release
should stay to reflect that. Also on the other packages with 0.fdr
prefix, please.



From bugs.michael at gmx.net  Thu Mar  3 22:19:10 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 23:19:10 +0100
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <Pine.LNX.4.61.0503031645530.921@horsea.3ti.be>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
	<20050303141532.679168a7.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
	<20050303161633.2c4603a3.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031623440.921@horsea.3ti.be>
	<20050303164318.6d5e4480.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031645530.921@horsea.3ti.be>
Message-ID: <20050303231910.2f2e7526.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 17:01:04 +0100 (CET), Dag Wieers wrote:

> > You asked for my "line of thought", I gave it. No idea why you feel the
> > need to take something personal.
> 
> Michael, a little honesty here. It served [...]

I disagree. I could expand on how I meant it, how I want it to be
understood, whether and why I accepted a given framework at fedora.us and
whether I agreed with every policy or procedure. But I refrain from doing
so, since it serves no purpose if you're not really interested in
believing me. Further, this is thread is getting off-topic anyway.



From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net  Thu Mar  3 22:34:47 2005
From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou)
Date: Thu, 3 Mar 2005 23:34:47 +0100
Subject: rpms/inti/devel inti.spec,1.2,1.3
In-Reply-To: <20050303225754.509a1171.bugs.michael@gmx.net>
References: <200503032146.j23LkOgG019532@cvs-int.fedora.redhat.com>
	<20050303225754.509a1171.bugs.michael@gmx.net>
Message-ID: <20050303233447.14081067@python2>

Michael Schwendt wrote :

> On Thu, 3 Mar 2005 16:46:24 -0500, Matthias Saou (thias) wrote:
> 
> >  Name:           inti
> >  Version:        1.2
> > -Release:        0.fdr.5.1
> > -Epoch:          0
> > +Release:        1
> 
> Release change is pointless here. Please don't mix such changes with the
> other documented mass-changes. inti package is broken for quite some
> time (GTK incompatibility) and has not been updated since then. Release
> should stay to reflect that. Also on the other packages with 0.fdr
> prefix, please.

Second time I make that "mistake" IIRC.
For me, a *.fdr.* release has nothing to do in the devel branch... so
either it should be fixed (what I unconsciously and repeatedly seem to want
to do) with the building disabled, or it shouldn't have a devel branch at
all.

Matthias

-- 
Clean custom Red Hat Linux rpm packages : http://freshrpms.net/
Fedora Core release 3 (Heidelberg) - Linux kernel 2.6.10-1.770_FC3
Load : 0.34 0.38 0.36



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/ladspa/devel ladspa.spec,1.6,1.7
Message-ID: <200503032241.j23MfXnO021150@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ladspa.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ladspa.spec
===================================================================
RCS file: /cvs/extras/rpms/ladspa/devel/ladspa.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ladspa.spec	28 Feb 2005 21:12:57 -0000	1.6
+++ ladspa.spec	3 Mar 2005 22:41:31 -0000	1.7
@@ -1,8 +1,7 @@
 Name:           ladspa
 Version:        1.12
 Release:        3
-Epoch:		0
-Summary:        LADSPA SDK, example plug-ins and tools.
+Summary:        LADSPA SDK, example plug-ins and tools
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -23,9 +22,9 @@
 This package contains the example plug-ins and tools from the LADSPA SDK.
 
 %package        devel
-Summary:        Linux Audio Developer's Simple Plug-in API 
+Summary:        Linux Audio Developer's Simple Plug-in API
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 ladspa-devel contains the ladspa.h header file.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/libcddb/devel libcddb.spec,1.5,1.6
Message-ID: <200503032241.j23MfXpv021166@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libcddb.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libcddb.spec	10 Dec 2004 22:03:04 -0000	1.5
+++ libcddb.spec	3 Mar 2005 22:41:31 -0000	1.6
@@ -1,13 +1,12 @@
-Summary: 	A library (C API) for accessing a CDDB server
-Name: 		libcddb
-Version: 	0.9.4
-Release: 	2
-Epoch: 		0
-License: 	LGPL
-Group: 		System Environment/Libraries
-URL: 		http://libcddb.sourceforge.net/
-Source0: 	http://download.sf.net/libcddb/%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Summary:	Library (C API) for accessing CDDB servers
+Name:		libcddb
+Version:	0.9.4
+Release:	2
+License:	LGPL
+Group:		System Environment/Libraries
+URL:		http://libcddb.sourceforge.net/
+Source0:	http://download.sf.net/libcddb/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 %description
 Libcddb is a library that implements the different protocols (CDDBP,
@@ -16,7 +15,7 @@
 %package devel
 Summary:	Development files for libcddb
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 Libcddb is a library that implements the different protocols (CDDBP,
@@ -24,18 +23,15 @@
 This package contains development files (static libraries, headers)
 for libcddb.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -43,16 +39,15 @@
 
 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 NEWS README THANKS ChangeLog TODO
@@ -66,7 +61,6 @@
 %{_includedir}/cddb
 %{_libdir}/pkgconfig/libcddb.pc
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Sat Jul  3 2004 Dams <anvil[AT]livna.org> 0:0.9.4-0.fdr.2



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/lft/devel lft.spec,1.12,1.13
Message-ID: <200503032241.j23MfXhl021158@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	lft.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lft.spec	2 Mar 2005 21:39:57 -0000	1.12
+++ lft.spec	3 Mar 2005 22:41:31 -0000	1.13
@@ -1,5 +1,4 @@
 Name:           lft
-Epoch:		0
 Version:        2.3
 Release:        1
 Summary:        Alternate traceroute tool
@@ -13,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpcap
-Obsoletes:      fft
+Obsoletes:      fft <= 2.3
 
 %description
 LFT, short for Layer Four Traceroute, is a 'traceroute' utility that



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libtar/devel libtar.spec,1.5,1.6
Message-ID: <200503032241.j23MfYCX021261@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libtar.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libtar.spec
===================================================================
RCS file: /cvs/extras/rpms/libtar/devel/libtar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libtar.spec	10 Dec 2004 22:03:06 -0000	1.5
+++ libtar.spec	3 Mar 2005 22:41:32 -0000	1.6
@@ -1,14 +1,13 @@
-Summary: 	Tar file manipulation API
-Name: 		libtar
-Version: 	1.2.11
-Release: 	3
-Epoch: 		0
-License: 	BSD
-Group: 		System Environment/Libraries
-URL: 		http://www-dev.cites.uiuc.edu/libtar/
-Source0: 	%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Provides:	libtar-devel = %{epoch}:%{name}-%{version}
+Summary:	Tar file manipulation API
+Name:		libtar
+Version:	1.2.11
+Release:	3
+License:	BSD
+Group:		System Environment/Libraries
+URL:		http://www-dev.cites.uiuc.edu/libtar/
+Source0:	%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Provides:	libtar-devel = %{name}-%{version}
 BuildRequires:	zlib-devel
 
 
@@ -51,5 +50,5 @@
 - Merged devel and main packages
 - Package provide now libtar-devel
 
-* Tue Jul  8 2003 Dams <anvil[AT]livna.org> 
+* Tue Jul  8 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/lablgl/devel lablgl.spec,1.4,1.5
Message-ID: <200503032241.j23MfXZf021142@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	lablgl.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lablgl.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgl/devel/lablgl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lablgl.spec	13 Feb 2005 09:17:45 -0000	1.4
+++ lablgl.spec	3 Mar 2005 22:41:31 -0000	1.5
@@ -1,18 +1,17 @@
 Name:           lablgl
 Version:        1.01
 Release:        2
-Epoch:          0
-Summary:        LablGL is an OpenGL interface for Objective Caml
+Summary:        OpenGL interface for Objective Caml
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-1.01.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  XFree86-devel, freeglut-devel 
-BuildRequires:	ocaml >= 0:3.08, labltk >= 0:3.08, camlp4 >= 0:3.08
-BuildRequires:	tcl-devel, tk-devel
-Requires:       ocaml >= 0:3.08, labltk >= 0:3.08
+BuildRequires:  XFree86-devel, freeglut-devel
+BuildRequires:  ocaml >= 3.08, labltk >= 3.08, camlp4 >= 3.08
+BuildRequires:  tcl-devel, tk-devel
+Requires:       ocaml >= 3.08, labltk >= 3.08
 
 %description
 LablGL is is an Objective Caml interface to OpenGL. Support is



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libgnomemm20/devel libgnomemm.spec,1.2,1.3
Message-ID: <200503032241.j23MfYkc021198@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libgnomemm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libgnomemm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomemm20/devel/libgnomemm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgnomemm.spec	10 Dec 2004 22:03:05 -0000	1.2
+++ libgnomemm.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           libgnomemm20
 Version:        2.0.1
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for Gnome libs (a GUI library for X).
+Summary:        C++ interface for Gnome libs (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -20,20 +19,20 @@
 %description
 This package provides a C++ interface for GnomeUI.  It is a subpackage
 of the Gtk-- project.  The interface provides a convenient interface for C++
-programmers to create Gnome GUIs with GTK+'s flexible object-oriented 
+programmers to create Gnome GUIs with GTK+'s flexible object-oriented
 framework.
 
 %package devel
-Summary:        Headers for developing programs that will use Gnome--.
+Summary:        Headers for developing programs that will use Gnome--
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm20-devel
 Requires:       libgnome-devel
 Obsoletes:      libgnomemm2-devel
 
 %description devel
 This package contains the headers that programmers will need to develop
-applications which will use Gnome--, part of Gtk-- the C++ interface to 
+applications which will use Gnome--, part of Gtk-- the C++ interface to
 the GTK+ (the Gimp ToolKit) GUI library.
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/lib3ds/devel lib3ds.spec,1.3,1.4
Message-ID: <200503032241.j23MfXOQ021162@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	lib3ds.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/devel/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	3 Mar 2005 22:41:31 -0000	1.4
@@ -1,14 +1,13 @@
 Name:           lib3ds
 Version:        1.2.0
 Release:        3
-Epoch:          0
-Summary:        The 3D Studio File Format Library
+Summary:        3D Studio file format library
 
-Group: 		System Environment/Libraries
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -23,14 +22,14 @@
 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



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/libcdio/devel libcdio.spec,1.4,1.5
Message-ID: <200503032241.j23MfXbg021170@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libcdio.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libcdio.spec
===================================================================
RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libcdio.spec	10 Dec 2004 22:03:04 -0000	1.4
+++ libcdio.spec	3 Mar 2005 22:41:31 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           libcdio
 Version:        0.70
 Release:        1
-Epoch:          0
-Summary:        A CD-ROM input and control library
+Summary:        CD-ROM input and control library
 
 Group:          Applications/Multimedia
 License:        GPL
@@ -25,7 +24,7 @@
 %package        devel
 Summary:        Header files and static libraries for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
 %description    devel



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libtasn1/devel libtasn1.spec,1.5,1.6
Message-ID: <200503032241.j23MfY9f021266@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libtasn1.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libtasn1.spec	28 Feb 2005 21:12:57 -0000	1.5
+++ libtasn1.spec	3 Mar 2005 22:41:32 -0000	1.6
@@ -2,13 +2,12 @@
 Name:		libtasn1
 Version:	0.2.6
 Release:	1
-Epoch:		0
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://www.gnu.org/software/gnutls/download.html
 Source0:	ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Provides:	%{name}-devel = %{epoch}:%{version}-%{release}
+Provides:	%{name}-devel = %{version}-%{release}
 BuildRequires:	bison
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/liferea/devel liferea.spec,1.7,1.8
Message-ID: <200503032241.j23MfYFO021286@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	liferea.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- liferea.spec	23 Jan 2005 00:58:10 -0000	1.7
+++ liferea.spec	3 Mar 2005 22:41:32 -0000	1.8
@@ -1,8 +1,7 @@
 Name:           liferea
 Version:        0.9.0
 Release:        1.b
-Epoch:          0
-Summary:        An RSS/RDF feed reader.
+Summary:        RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
@@ -22,10 +21,10 @@
 
 
 %description
-Liferea (Linux Feed Reader) is an RSS/RDF feed reader. 
-It's intended to be a clone of the Windows-only FeedReader. 
-It can be used to maintain a list of subscribed feeds, 
-browse through their items, and show their contents 
+Liferea (Linux Feed Reader) is an RSS/RDF feed reader.
+It's intended to be a clone of the Windows-only FeedReader.
+It can be used to maintain a list of subscribed feeds,
+browse through their items, and show their contents
 using GtkHTML.
 
 
@@ -44,9 +43,9 @@
 %find_lang %{name}
 
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-desktop-file-install --vendor fedora                    \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
-  --add-category X-Fedora			        \
+desktop-file-install --vendor fedora              \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+  --add-category X-Fedora                         \
   %{name}.desktop
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libgnomecanvasmm20/devel libgnomecanvasmm.spec,1.2,1.3
Message-ID: <200503032241.j23MfY3v021190@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libgnomecanvasmm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomecanvasmm20/devel/libgnomecanvasmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgnomecanvasmm.spec	10 Dec 2004 22:03:05 -0000	1.2
+++ libgnomecanvasmm.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           libgnomecanvasmm20
 Version:        2.0.1
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for Gnome libs (a GUI library for X).
+Summary:        C++ interface for Gnome libs (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -21,13 +20,13 @@
 %description
 This package provides a C++ interface for GnomeUI.  It is a subpackage
 of the gnomemm project.  The interface provides a convenient interface for C++
-programmers to create Gnome GUIs with GTK+'s flexible object-oriented 
+programmers to create Gnome GUIs with GTK+'s flexible object-oriented
 framework.
 
 %package devel
 Summary:        Headers for developing programs that will use libgnomecanvasmm.
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm20-devel
 Requires:       libgnomecanvas-devel
 Obsoletes:      libgnomecanvasmm2-devel



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/librsync/devel librsync.spec,1.6,1.7
Message-ID: <200503032241.j23MfYkP021238@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	librsync.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: librsync.spec
===================================================================
RCS file: /cvs/extras/rpms/librsync/devel/librsync.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- librsync.spec	23 Jan 2005 13:59:37 -0000	1.6
+++ librsync.spec	3 Mar 2005 22:41:32 -0000	1.7
@@ -1,13 +1,12 @@
-Summary:  	Rsync libraries
-Name:     	librsync
-Version:  	0.9.7
-Release:  	2
-Epoch: 		0
-License:	LGPL
-Group:    	System Environment/Libraries
-Source:  	http://dl.sf.net/sourceforge/librsync/librsync-0.9.7.tar.gz
-URL:       	http://librsync.sf.net/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:        Rsync libraries
+Name:           librsync
+Version:        0.9.7
+Release:        2
+License:        LGPL
+Group:          System Environment/Libraries
+Source:         http://dl.sf.net/sourceforge/librsync/librsync-0.9.7.tar.gz
+URL:            http://librsync.sf.net/
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  zlib-devel, bzip2-devel, popt
 Buildrequires:  libtool
 
@@ -26,7 +25,7 @@
 %package devel
 Summary: Headers and development libraries for librsync
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 librsync implements the "rsync" algorithm, which allows remote
@@ -43,7 +42,7 @@
 This package contains header files necessary for developing programs
 based on librsync.
 
-%prep 
+%prep
 %setup -q
 
 %build



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:35 -0500
Subject: rpms/lvcool/devel lvcool.spec,1.6,1.7
Message-ID: <200503032241.j23MfZBG021299@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	lvcool.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lvcool.spec
===================================================================
RCS file: /cvs/extras/rpms/lvcool/devel/lvcool.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lvcool.spec	12 Feb 2005 18:44:42 -0000	1.6
+++ lvcool.spec	3 Mar 2005 22:41:32 -0000	1.7
@@ -1,57 +1,50 @@
-Summary:          Utility to cool Athlon processor during idle on Via KT133 or KX133 chipsets 
+Summary:          Utility to cool down Athlon CPUs when idle on Via KT133 or KX133 chipsets
 Name:             lvcool
-Epoch:            0
 # Upstream has no version, tarball repacked
 Version:          1.0.0
 Release:          1
 URL:              http://vcool.occludo.net/VC_Linux.html
 License:          GPL
-Group:            System Environment/Daemons 
+Group:            System Environment/Daemons
 Source0:          lvcool-1.0.0.tar.gz
-Patch0:           lvcool-g++.patch 
+Patch0:           lvcool-g++.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 
-ExclusiveArch:    %ix86
+ExclusiveArch:    %{ix86}
 BuildArch: athlon
 
 %description
 
 LVCool dramatically reduces the processor temperature during idle for
-Athlon processors running on VIA KT133 or similar chipsets. It sets 
-the Northbridge's "enable bus disconnect on STPGNT" bit and enters an 
+Athlon processors running on VIA KT133 or similar chipsets. It sets
+the Northbridge's "enable bus disconnect on STPGNT" bit and enters an
 idle loop that puts the CPU into STPGNT state.  This approach to
 temperature reduction is a hack, it is better to use an ACPI kernel.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup
 %patch0 -p1
 
-#---------------------------------------------------------------------
 
 %build
 make
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_bindir}
 install -m 755 lvcool %{buildroot}%{_bindir}/lvcool
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf %{buildroot}
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 
-#---------------------------------------------------------------------
 
 %changelog
 * Sun Mar 30 2003 Warren Togami <warren at togami.com> - 1.0.0-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libfac/devel libfac.spec,1.4,1.5
Message-ID: <200503032241.j23MfYol021178@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libfac.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libfac.spec
===================================================================
RCS file: /cvs/extras/rpms/libfac/devel/libfac.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libfac.spec	4 Dec 2004 09:46:44 -0000	1.4
+++ libfac.spec	3 Mar 2005 22:41:31 -0000	1.5
@@ -1,18 +1,17 @@
 # $Id$
 
-Summary: An extension to Singular-factory
-Name:    libfac	
-Epoch:	 0
+Summary: Extension to Singular-factory
+Name:    libfac
 Version: 2.0.5
 Release: 1%{?dist_tag}
 License: GPL
-Url:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/	
+Url:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/
 # http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/libfac-2-0-5.tar,gz
-Source:	 libfac-2-0-5.tar.gz
-Group:   System Environment/Libraries	
+Source:  libfac-2-0-5.tar.gz
+Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: factory-devel >= 0:2.0.5
+BuildRequires: factory-devel >= 2.0.5
 #BuildRequires: autoconf >= 2.53
 
 %description
@@ -28,10 +27,10 @@
 Provides:  %{name} = %{epoch}:%{version}-%{release}
 Group:   Development/Libraries
 %description devel
-Singular-libfac is an extension to Singular-factory which implements 
-factorization of polynomials over finite fields and algorithms for 
+Singular-libfac is an extension to Singular-factory which implements
+factorization of polynomials over finite fields and algorithms for
 manipulation of polynomial ideals via the characteristic set methods
-(e.g., calculating the characteristic set and the irreducible 
+(e.g., calculating the characteristic set and the irreducible
 characteristic series).
 
 
@@ -43,9 +42,9 @@
 
 
 %build
-%configure --with-NOSTREAMIO 
+%configure --with-NOSTREAMIO
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -72,7 +71,7 @@
 
 %changelog
 * Fri Oct 1 2004 Rex Dieter <rexdieter at sf.net> 0:2.0.5-1
-- 2.0.5 
+- 2.0.5
 
 * Mon Nov 17 2003 Rex Dieter <rexdieter at sf.net> 0:2.0.4-0.fdr.3.b
 - update macros



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libgnomeuimm26/devel libgnomeuimm.spec,1.3,1.4
Message-ID: <200503032241.j23MfYJS021210@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libgnomeuimm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgnomeuimm.spec	28 Jan 2005 17:38:28 -0000	1.3
+++ libgnomeuimm.spec	3 Mar 2005 22:41:32 -0000	1.4
@@ -1,14 +1,13 @@
 Name:           libgnomeuimm26
 Version:        2.6.0
 Release:        2
-Epoch:          0
-Summary:        A C++ interface for Gnome libs (a GUI library for X).
+Summary:        C++ interface for Gnome libs (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomeuimm/2.6/libgnomeuimm-%{version}.tar.bz2
-Patch0:		libgnomeuimm-2.6.0-autoreconf.patch.bz2
+Patch0:         libgnomeuimm-2.6.0-autoreconf.patch.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/ldconfig
@@ -27,9 +26,9 @@
 framework.
 
 %package devel
-Summary:        Headers for developing programs that will use Gnome--.
+Summary:        Headers for developing programs that will use Gnome--
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       libgnomeui-devel
 Requires:       libgnomemm26-devel
 Requires:       libgnomecanvasmm26-devel
@@ -46,9 +45,9 @@
 %prep
 %setup -q -n libgnomeuimm-%{version}
 %ifarch x86_64
-# Patch was build after: 
+# Patch was build after:
 #aclocal -I scripts && automake -c -f && autoconf && libtoolize --copy --force
-%patch0 -p1 
+%patch0 -p1
 %endif
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libzvt/devel libzvt.spec,1.4,1.5
Message-ID: <200503032241.j23MfYHE021282@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libzvt.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libzvt.spec
===================================================================
RCS file: /cvs/extras/rpms/libzvt/devel/libzvt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libzvt.spec	10 Dec 2004 22:03:06 -0000	1.4
+++ libzvt.spec	3 Mar 2005 22:41:32 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           libzvt
 Version:        2.0.1
 Release:        5
-Epoch:          0
-Summary:        ZVT - Zed's Virtual Terminal
+Summary:        Zed's Virtual Terminal library
 
 Group:          System Environment/Libraries
 License:        GPL
@@ -11,10 +10,10 @@
 Source0:        http://anjuta.org/libzvt/libzvt-2.0.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pkgconfig >= 0:0.8
-BuildRequires:  glib2-devel >= 0:2.0
-BuildRequires:  gtk2-devel >= 0:2.0
-BuildRequires:  libart_lgpl-devel >= 0:2.0
+BuildRequires:  pkgconfig >= 0.8
+BuildRequires:  glib2-devel >= 2.0
+BuildRequires:  gtk2-devel >= 2.0
+BuildRequires:  libart_lgpl-devel >= 2.0
 
 
 %description
@@ -24,17 +23,17 @@
 %package devel
 Summary:        Development libraries and header files for libzvt.
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       glib2-devel >= 0:2.0
-Requires:       gtk2-devel >= 0:2.0
-Requires:       libart_lgpl-devel > 0:2.0
+Requires:       %{name} = %{version}-%{release}
+Requires:       glib2-devel >= 2.0
+Requires:       gtk2-devel >= 2.0
+Requires:       libart_lgpl-devel > 2.0
 Requires:       pkgconfig
 
 %description devel
 
 Yet another VT emulation library used by some GNOME programs.
 
-This package contains the header files and libraries needed to write 
+This package contains the header files and libraries needed to write
 or compile programs that use libzvt.
 
 
@@ -97,7 +96,7 @@
 * Sat May 17 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:2.0.1-0.fdr.3
 - Fixed file permissions.
 
-* Fri May 16 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:2.0.1-0.fdr.2 
+* Fri May 16 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:2.0.1-0.fdr.2
 - Added URL.
 - Excluded .la files.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:35 -0500
Subject: rpms/logjam/devel logjam.spec,1.8,1.9
Message-ID: <200503032241.j23MfZgN021290@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	logjam.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- logjam.spec	28 Feb 2005 21:12:57 -0000	1.8
+++ logjam.spec	3 Mar 2005 22:41:32 -0000	1.9
@@ -4,7 +4,7 @@
 Version: 4.4.1
 Release: 4
 Epoch: 1
-Summary: The GTK2-client for LiveJournal
+Summary: GTK2 client for LiveJournal
 License: GPL
 Group: User Interface/Desktops
 URL: http://logjam.danga.com/



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libid3tag/devel libid3tag.spec,1.5,1.6
Message-ID: <200503032241.j23MfYCC021214@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libid3tag.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libid3tag.spec
===================================================================
RCS file: /cvs/extras/rpms/libid3tag/devel/libid3tag.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libid3tag.spec	10 Dec 2004 22:03:05 -0000	1.5
+++ libid3tag.spec	3 Mar 2005 22:41:32 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           libid3tag
 Version:        0.15.1
 Release:        1.b
-Epoch:          0
 Summary:        ID3 tag manipulation library
 
 Group:          System Environment/Libraries
@@ -21,7 +20,7 @@
 %package        devel
 Summary:        libid3tag development files
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}, pkgconfig, zlib-devel
+Requires:       %{name} = %{version}-%{release}, pkgconfig, zlib-devel
 
 %description    devel
 ID3 tag library development files.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libsamplerate/devel libsamplerate.spec,1.5,1.6
Message-ID: <200503032241.j23MfYLi021242@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libsamplerate.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libsamplerate.spec
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/devel/libsamplerate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsamplerate.spec	10 Dec 2004 22:03:05 -0000	1.5
+++ libsamplerate.spec	3 Mar 2005 22:41:32 -0000	1.6
@@ -1,22 +1,20 @@
-Summary: 	A library for performing sample rate conversion on audio.
-Name: 		libsamplerate
-Version: 	0.0.15
-Release: 	5
-Epoch: 		0
-License: 	GPL
-Group: 		System Environment/Libraries
-URL: 		http://www.mega-nerd.com/SRC/
-Source0: 	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Summary:	Library for performing sample rate conversion on audio
+Name:		libsamplerate
+Version:	0.0.15
+Release:	5
+License:	GPL
+Group:		System Environment/Libraries
+URL:		http://www.mega-nerd.com/SRC/
+Source0:	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	libsndfile-devel >= 0:1.0.2
 BuildRequires:	pkgconfig fftw-devel
 
 %package devel
-Summary: 	Development package for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
+Summary:	Development package for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
-# -----------------------------------------------------------------------------
 
 %description
 Secret Rabbit Code is a sample rate converter for audio. It is capable
@@ -33,38 +31,32 @@
 also vary with time for speeding up and slowing down effects.
 This package contains development files for %{name}
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT _doc
 %makeinstall
-mkdir _doc 
+mkdir _doc
 cp -a doc _doc
 rm _doc/doc/Makefile* _doc/doc/NEWS _doc/doc/ChangeLog
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog _doc/doc/*
@@ -79,7 +71,6 @@
 %{_libdir}/lib*.a
 %{_libdir}/pkgconfig/samplerate.pc
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Tue Jul 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.0.15-0.fdr.5
@@ -94,5 +85,5 @@
 * Wed Jun 25 2003 Dams <anvil[AT]livna.org> 0:0.0.15-0.fdr.2
 - Added some more doc
 
-* Thu May 22 2003 Dams <anvil[AT]livna.org> 
+* Thu May 22 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/lablgtk/devel lablgtk.spec,1.5,1.6
Message-ID: <200503032241.j23MfX7e021146@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	lablgtk.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/devel/lablgtk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lablgtk.spec	12 Feb 2005 11:03:42 -0000	1.5
+++ lablgtk.spec	3 Mar 2005 22:41:31 -0000	1.6
@@ -1,20 +1,19 @@
 Name:           lablgtk
 Version:        2.4.0
 Release:        2
-Epoch:          0
-Summary:        An Objective Caml interface to gtk+
+Summary:        Objective Caml interface to gtk+
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ocaml >= 0:3.08
-%{?_with_gl:Requires: lablgl >= 0:1.00}
-BuildRequires:  ocaml >= 0:3.08, camlp4 >= 0:3.08
-%{?_with_gl:BuildRequires: lablgl >= 0:1.00, gtkglarea2-devel}
+Requires:       ocaml >= 3.08
+%{?_with_gl:Requires: lablgl >= 1.00}
+BuildRequires:  ocaml >= 3.08, camlp4 >= 3.08
+%{?_with_gl:BuildRequires: lablgl >= 1.00, gtkglarea2-devel}
 BuildRequires:  gtk2-devel, libglade-devel, gdk-pixbuf-devel
-BuildRequires:	librsvg2-devel, libcroco-devel
+BuildRequires:  librsvg2-devel, libcroco-devel
 BuildRequires:  libbonobo-devel, bonobo-activation-devel, GConf2-devel
 BuildRequires:  libgnomeui-devel, libgnomecanvas-devel, gnome-panel-devel
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libgnomeuimm20/devel libgnomeuimm.spec,1.2,1.3
Message-ID: <200503032241.j23MfYxi021206@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libgnomeuimm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeuimm20/devel/libgnomeuimm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgnomeuimm.spec	10 Dec 2004 22:03:05 -0000	1.2
+++ libgnomeuimm.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           libgnomeuimm20
 Version:        2.0.0
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for Gnome libs (a GUI library for X).
+Summary:        C++ interface for Gnome libs (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -12,24 +11,24 @@
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:	libgnomemm20-devel
-BuildRequires:	libgnomecanvasmm20-devel 
-BuildRequires:	gconfmm20-devel 
-BuildRequires:	libglademm20-devel 
-BuildRequires:	libgnomeui-devel
+BuildRequires:  libgnomemm20-devel
+BuildRequires:  libgnomecanvasmm20-devel
+BuildRequires:  gconfmm20-devel
+BuildRequires:  libglademm20-devel
+BuildRequires:  libgnomeui-devel
 BuildRequires:  libtool
 Obsoletes:      libgnomeuimm2
 
 %description
 This package provides a C++ interface for GnomeUI.  It is a subpackage
 of the Gtk-- project.  The interface provides a convenient interface for C++
-programmers to create Gnome GUIs with GTK+'s flexible object-oriented 
+programmers to create Gnome GUIs with GTK+'s flexible object-oriented
 framework.
 
 %package devel
-Summary:        Headers for developing programs that will use Gnome--.
+Summary:        Headers for developing programs that will use Gnome--
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       libgnomeui-devel
 Requires:       libgnomemm20-devel
 Requires:       libgnomecanvasmm20-devel
@@ -39,7 +38,7 @@
 
 %description devel
 This package contains the headers that programmers will need to develop
-applications which will use Gnome--, part of Gtk-- the C++ interface to 
+applications which will use Gnome--, part of Gtk-- the C++ interface to
 the GTK+ (the Gimp ToolKit) GUI library.
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libglademm24/devel libglademm.spec,1.2,1.3
Message-ID: <200503032241.j23MfYhX021186@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libglademm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/devel/libglademm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libglademm.spec	10 Dec 2004 22:03:05 -0000	1.2
+++ libglademm.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           libglademm24
 Version:        2.4.1
 Release:        1
-Epoch:          0
-Summary:        A C++ wrapper for libglade
+Summary:        C++ wrapper for libglade
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -24,7 +23,7 @@
 %package devel
 Summary:        Headers for developing programs that will use libglademm.
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
 Requires:       libglade2-devel
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/libdaemon/devel libdaemon.spec,1.3,1.4
Message-ID: <200503032241.j23MfXgi021174@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libdaemon.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libdaemon.spec
===================================================================
RCS file: /cvs/extras/rpms/libdaemon/devel/libdaemon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libdaemon.spec	10 Dec 2004 22:03:04 -0000	1.3
+++ libdaemon.spec	3 Mar 2005 22:41:31 -0000	1.4
@@ -1,27 +1,26 @@
-Summary: libdaemon is a lightweight C library that eases the writing of UNIX daemons
+Summary: Lightweight C library that eases the writing of UNIX daemons
 Name: libdaemon
 Version: 0.6
 Release: 4
-Epoch: 0
 License: GPL
 URL: http://0pointer.de/lennart/projects/libdaemon
 Group: System Environment/Libraries
 Source: http://0pointer.de/lennart/projects/libdaemon/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides: libdaemon-devel = %{epoch}:%{version}-%{release} 
+Provides: libdaemon-devel = %{version}-%{release}
 
 %description
-   libdaemon is a lightweight C library that eases the writing of UNIX
-   daemons. It consists of the following parts:
-     * A wrapper around fork() which does the correct daemonization
-       procedure of a process
-     * A wrapper around syslog() for simpler and compatible log output to
-       Syslog or STDERR
-     * An API for writing PID files
-     * An API for serializing UNIX signals into a pipe for usage with
-       select() or poll()
-     * An API for running subprocesses with STDOUT and STDERR redirected
-       to syslog.
+libdaemon is a lightweight C library that eases the writing of UNIX
+daemons. It consists of the following parts:
+* A wrapper around fork() which does the correct daemonization
+  procedure of a process
+* A wrapper around syslog() for simpler and compatible log output to
+  Syslog or STDERR
+* An API for writing PID files
+* An API for serializing UNIX signals into a pipe for usage with
+  select() or poll()
+* An API for running subprocesses with STDOUT and STDERR redirected
+  to syslog.
 
 %prep
 %setup -q
@@ -39,10 +38,10 @@
 
 %files
 %defattr(-,root,root,-)
+%doc README LICENSE
 %{_libdir}/pkgconfig/libdaemon.pc
 %{_libdir}/libdaemon.*
 %{_includedir}/libdaemon
-%doc README LICENSE
 
 %post -p /sbin/ldconfig
 
@@ -52,7 +51,7 @@
 * Thu May 13 2004 <aaron.bennett at olin.edu> 0:0.6-0.fdr.4
 - Added post and postun scripts to run ldconfig
 - changed group to standard System/Libraries group
-- removed libtool *.la files  
+- removed libtool *.la files
 
 * Tue May 4 2004 <aaron.bennett at olin.edu> 0:0.6.-0.fdr.3
 - Signed packaged with GPG key
@@ -64,7 +63,7 @@
 * Thu Apr 29 2004  <abennett at olin.edu> - 0:0.6-1
 - Changed to version 0.6 of libdaemon
 
-* Wed Mar 31 2004  <abennett at olin.edu> 
+* Wed Mar 31 2004  <abennett at olin.edu>
 - Initial build.
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:35 -0500
Subject: rpms/lrmi/devel lrmi.spec,1.3,1.4
Message-ID: <200503032241.j23MfZ7F021294@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	lrmi.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lrmi.spec
===================================================================
RCS file: /cvs/extras/rpms/lrmi/devel/lrmi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lrmi.spec	10 Dec 2004 22:03:06 -0000	1.3
+++ lrmi.spec	3 Mar 2005 22:41:32 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           lrmi
 Version:        0.8
 Release:        1
-Epoch:          0
 Summary:        Library for calling real mode BIOS routines
 
 Group:          System Environment/Libraries
@@ -15,7 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
-Provides:       lib%{name} = %{epoch}:%{version}-%{release}
+Provides:       lib%{name} = %{version}-%{release}
 
 %description
 LRMI is a library for calling real mode BIOS routines.
@@ -23,8 +22,8 @@
 %package        devel
 Summary:        Development files for LRMI
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Provides:       lib%{name}-devel = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
+Provides:       lib%{name}-devel = %{version}-%{release}
 
 %description    devel
 %{summary}.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:35 -0500
Subject: rpms/lzop/devel lzop.spec,1.4,1.5
Message-ID: <200503032241.j23MfZ0h021318@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	lzop.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lzop.spec
===================================================================
RCS file: /cvs/extras/rpms/lzop/devel/lzop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lzop.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ lzop.spec	3 Mar 2005 22:41:33 -0000	1.5
@@ -1,8 +1,7 @@
 Name: lzop
 Version: 1.01
 Release: 1
-Epoch: 0
-Summary: A real-time file compressor.
+Summary: Real-time file compressor
 
 Group: Applications/Archiving
 License: GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libglademm20/devel libglademm.spec,1.2,1.3
Message-ID: <200503032241.j23MfYHO021182@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libglademm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm20/devel/libglademm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libglademm.spec	10 Dec 2004 22:03:05 -0000	1.2
+++ libglademm.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           libglademm20
 Version:        2.2.0
 Release:        1
-Epoch:          0
-Summary:        A C++ wrapper for libglade
+Summary:        C++ wrapper for libglade
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -27,7 +26,7 @@
 %package devel
 Summary:        Headers for developing programs that will use libglademm
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm20-devel
 Requires:       libglade2-devel
 Obsoletes:      libglademm2-devel
@@ -98,14 +97,14 @@
 - Leave out the ChangeLog etc.
 
 * Thu Oct 30 2003 Michael Koziarski <michael at koziarski.org> - 2.0.1-0.fdr.4
-- Remove libgnomemm2 from the requirements 
+- Remove libgnomemm2 from the requirements
 
 * Wed Oct 22 2003 Michael Koziarski <michael at koziarski.org> - 2.0.1-0.fdr.3
 - Add Epochs to the requirements
 
 * Wed Oct 22 2003 Michael Koziarski <michael at koziarski.org> - 2.0.1-0.fdr.2
 - Fix -devel Requires
-- Fix -devel Description 
+- Fix -devel Description
 - Remove empty DOC files
 - Fixed package description
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libgnomecanvasmm26/devel libgnomecanvasmm.spec,1.2,1.3
Message-ID: <200503032241.j23MfYm5021194@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libgnomecanvasmm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgnomecanvasmm.spec	10 Dec 2004 22:03:05 -0000	1.2
+++ libgnomecanvasmm.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           libgnomecanvasmm26
 Version:        2.6.1
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for Gnome libs (a GUI library for X).
+Summary:        C++ interface for Gnome libs (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -24,7 +23,7 @@
 %package devel
 Summary:        Headers for developing programs that will use libgnomecanvasmm.
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
 Requires:       libgnomecanvas-devel
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:35 -0500
Subject: rpms/lzo/devel lzo.spec,1.5,1.6
Message-ID: <200503032241.j23MfZSV021314@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	lzo.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lzo.spec
===================================================================
RCS file: /cvs/extras/rpms/lzo/devel/lzo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lzo.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ lzo.spec	3 Mar 2005 22:41:33 -0000	1.6
@@ -1,19 +1,18 @@
-Summary: 	A data compression library with very fast (de)compression.
-Name: 		lzo
-Version: 	1.08
-Release: 	2
-Epoch: 		0
-License: 	GPL
-Group: 		System Environment/Libraries
-URL: 		http://www.oberhumer.com/opensource/lzo/
-Source0: 	http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Summary:	Data compression library with very fast (de)compression
+Name:		lzo
+Version:	1.08
+Release:	2
+License:	GPL
+Group:		System Environment/Libraries
+URL:		http://www.oberhumer.com/opensource/lzo/
+Source0:	http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	nasm zlib-devel
 
 %package devel
-Summary:	Development files for the lzo library.
+Summary:	Development files for the lzo library
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	zlib-devel
 
 %description
@@ -64,5 +63,5 @@
 - Added post and postun scriptlets
 - Added URL in Source0
 
-* Fri Apr 25 2003 Dams <anvil[AT]livna.org> 
+* Fri Apr 25 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libkipi/devel libkipi.spec,1.1,1.2
Message-ID: <200503032241.j23MfYIk021222@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libkipi.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libkipi.spec
===================================================================
RCS file: /cvs/extras/rpms/libkipi/devel/libkipi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libkipi.spec	12 Jan 2005 20:09:34 -0000	1.1
+++ libkipi.spec	3 Mar 2005 22:41:32 -0000	1.2
@@ -1,7 +1,6 @@
 Name:           libkipi
 Version:        0.1
 Release:        2
-Epoch:          0
 Summary:        Common plugin infrastructure for KDE image applications
 
 Group:          System Environment/Libraries
@@ -21,7 +20,7 @@
 %package        devel
 Summary:        Common plugin infrastructure for KDE image applications
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       kdelibs-devel
 
 %description    devel



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libgnomemm26/devel libgnomemm.spec,1.3,1.4
Message-ID: <200503032241.j23MfYCR021202@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libgnomemm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libgnomemm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomemm26/devel/libgnomemm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgnomemm.spec	28 Jan 2005 17:21:41 -0000	1.3
+++ libgnomemm.spec	3 Mar 2005 22:41:32 -0000	1.4
@@ -1,14 +1,13 @@
 Name:           libgnomemm26
 Version:        2.6.0
 Release:        2
-Epoch:          0
-Summary:        A C++ interface for Gnome libs (a GUI library for X).
+Summary:        C++ interface for Gnome libs (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.6/libgnomemm-%{version}.tar.bz2
-Patch0:		libgnomemm-2.6.0-autoreconf.patch.bz2
+Patch0:         libgnomemm-2.6.0-autoreconf.patch.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/ldconfig
@@ -25,7 +24,7 @@
 %package devel
 Summary:        Headers for developing programs that will use Gnome--.
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
 Requires:       libgnome-devel
 
@@ -39,7 +38,7 @@
 %setup -q -n libgnomemm-%{version}
 %ifarch x86_64
 # Patch was build after: aclocal -I scripts && automake -c -f && autoconf && libtoolize --copy --force
-%patch0 -p1 
+%patch0 -p1
 %endif
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libsigc++20/devel libsigc++.spec,1.3,1.4
Message-ID: <200503032241.j23MfYUd021254@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libsigc++20/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libsigc++20/devel

Modified Files:
	libsigc++.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libsigc++.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigc++20/devel/libsigc++.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsigc++.spec	26 Jan 2005 00:10:37 -0000	1.3
+++ libsigc++.spec	3 Mar 2005 22:41:32 -0000	1.4
@@ -1,8 +1,7 @@
 Name:           libsigc++20
 Version:        2.0.6
 Release:        1
-Epoch:          0
-Summary:        The Typesafe Signal Framework for C++
+Summary:        Typesafe signal framework for C++
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -27,9 +26,9 @@
 starting with version 1.1.2, uses %name.
 
 %package devel
-Summary:        development tools for the Typesafe Signal Framework for C++ 
+Summary:        Development tools for the typesafe signal framework for C++
 Group:          Development/Libraries
-Requires:       %name = %{epoch}:%version-%{release}
+Requires:       %name = %{version}-%{release}
 Requires:       pkgconfig
 
 %description devel
@@ -68,8 +67,8 @@
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/*.so.*
 %doc AUTHORS README NEWS ChangeLog TODO
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -132,7 +131,7 @@
 - Added autoconf macro for sigc.
 
 * Fri Jun 11 1999 Karl Nelson <kenelson at ece.ucdavis.edu>
-- Made into a .in to keep version field up to date 
+- Made into a .in to keep version field up to date
 - Still need to do release by hand
 
 * Mon Jun  7 1999 Dmitry V. Levin <ldv at fandra.org>



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libkexif/devel libkexif.spec,1.2,1.3
Message-ID: <200503032241.j23MfYB1021218@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libkexif.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libkexif.spec
===================================================================
RCS file: /cvs/extras/rpms/libkexif/devel/libkexif.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libkexif.spec	29 Jan 2005 23:32:25 -0000	1.2
+++ libkexif.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           libkexif
 Version:        0.2.1
 Release:        1
-Epoch:          0
 Summary:        Allow Kipi plugins to extract EXIF information
 
 Group:          System Environment/Libraries
@@ -20,7 +19,7 @@
 %package        devel
 Summary:        Allow Kipi plugins to extract EXIF information
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       kdelibs-devel
 
 %description    devel



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libsigsegv/devel libsigsegv.spec,1.2,1.3
Message-ID: <200503032241.j23MfYXS021258@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libsigsegv.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libsigsegv.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/devel/libsigsegv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libsigsegv.spec	10 Dec 2004 22:03:06 -0000	1.2
+++ libsigsegv.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,14 +1,13 @@
 # $Id$
 
-Summary: Handling page faults in user mode 
+Summary: Library for handling page faults in user mode
 Name:    libsigsegv
-Epoch:	 0
 Version: 2.1
 Release: 2%{?dist_tag}
-License: GPL	
-URL:	 http://libsigsegv.sourceforge.net/
+License: GPL
+URL:     http://libsigsegv.sourceforge.net/
 Source:  ftp://ftp.gnu.org/pub/gnu/libsigsegv/libsigsegv-2.1.tar.gz
-Group:   System Environment/Libraries	
+Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -24,22 +23,22 @@
 
 
 %package devel
-Summary: libraries and header files
+Summary: Development libraries and header files for libsigsegv
 Group:   Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description devel
 Libraries and header files for %{name} development.
 
 
 %prep
-%setup -q 
+%setup -q
 
 
 %build
 %configure \
-  --enable-shared 
+  --enable-shared
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -75,7 +74,7 @@
 %changelog
 * Thu Jul 22 2004 Rex Dieter <rexdieter at sf.net> 0:2.1-0.fdr.2
 - add URL: tag
-- make check 
+- make check
 
 * Mon Apr 12 2004 Rex Dieter <rexdieter at sf.net> 0:2.1-0.fdr.1
 - 2.1



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libuninameslist/devel libuninameslist.spec,1.5,1.6
Message-ID: <200503032241.j23MfYp0021270@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libuninameslist.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libuninameslist.spec
===================================================================
RCS file: /cvs/extras/rpms/libuninameslist/devel/libuninameslist.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libuninameslist.spec	10 Dec 2004 22:03:06 -0000	1.5
+++ libuninameslist.spec	3 Mar 2005 22:41:32 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           libuninameslist
 Version:        0.0
 Release:        2.040707
-Epoch:          0
 Summary:        Library that provides Unicode names and annotations
 
 Group:          System Environment/Libraries
@@ -18,7 +17,7 @@
 %package        devel
 Summary:        Header files and static libraries for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 This package contains header files and static libraries for %{name}.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:35 -0500
Subject: rpms/lyx/devel lyx.spec,1.5,1.6
Message-ID: <200503032241.j23MfZvU021303@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	lyx.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lyx.spec	4 Dec 2004 12:21:23 -0000	1.5
+++ lyx.spec	3 Mar 2005 22:41:33 -0000	1.6
@@ -1,17 +1,16 @@
 # $Id$
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
-Name:	 lyx
-Epoch:	 0
-Version: 1.3.5 
+Name:    lyx
+Version: 1.3.5
 Release: 3%{?dist_tag}
 License: GPL
-Group: 	 Applications/Publishing
-Url: 	 http://www.lyx.org/
-Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.5.tar.bz2
+Group:   Applications/Publishing
+URL:     http://www.lyx.org/
+Source:  ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.5.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Patch1: lyx-1.3.5-helpers.patch
+Patch1:  lyx-1.3.5-helpers.patch
 
 Source1: lyx.desktop
 # "borrow" kde's crystal icon for lyx
@@ -42,8 +41,8 @@
 %define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2)
 Requires: qt >= 1:%{qt_ver}
 
-## gcc version in use? 
-# I *still* build for some rh73 boxes (not sure why (-: ), 
+## gcc version in use?
+# I *still* build for some rh73 boxes (not sure why (-: ),
 # so I need this -- Rex
 BuildRequires: gcc-c++
 %define gcc_ver %(rpm -q --qf '%%{version}' gcc-c++ )
@@ -78,7 +77,7 @@
 
 
 %build
-unset LINGUAS ||: 
+unset LINGUAS ||:
 unset QTDIR ||: ; . /etc/profile.d/qt.sh
 
 export CXXFLAGS="$RPM_OPT_FLAGS %{?cxxflags}"
@@ -145,10 +144,10 @@
 %{_datadir}/texmf/tex/latex/%{name}
 
 
-%changelog 
+%changelog
 * Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-3
 - BR: htmlview
-- Requires: htmlview, gsview (so build-time-detected helper apps are 
+- Requires: htmlview, gsview (so build-time-detected helper apps are
   available at runtime)
 
 * Wed Oct 20 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.2
@@ -190,7 +189,7 @@
 - Categories=Office
 
 * Mon Nov 24 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.3
-- Requires: tetex-latex 
+- Requires: tetex-latex
 - support MimeType(s): application/x-lyx;text/x-lyx
 
 * Sat Nov 22 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.2



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libksba/devel libksba.spec,1.6,1.7
Message-ID: <200503032241.j23MfYXP021226@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libksba.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libksba.spec
===================================================================
RCS file: /cvs/extras/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libksba.spec	1 Feb 2005 19:32:51 -0000	1.6
+++ libksba.spec	3 Mar 2005 22:41:32 -0000	1.7
@@ -1,7 +1,5 @@
-
 Summary: X.509 library
-Name:  	 libksba 
-Epoch: 	 0
+Name:    libksba
 Version: 0.9.9
 Release: 1%{?dist_tag}
 License: GPL
@@ -22,7 +20,7 @@
 %package devel
 Summary:  Development headers and libraries for %{name}
 Group:    Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 %description devel
@@ -38,7 +36,7 @@
 %configure
 
 # not smp safe
-make 
+make
 
 make check
 
@@ -67,7 +65,7 @@
 fi
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README* THANKS TODO VERSION
 %{_libdir}/*.so.*



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libxml++/devel libxml++.spec,1.4,1.5
Message-ID: <200503032241.j23MfYAk021278@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libxml++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libxml++/devel

Modified Files:
	libxml++.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libxml++.spec	10 Dec 2004 22:03:06 -0000	1.4
+++ libxml++.spec	3 Mar 2005 22:41:32 -0000	1.5
@@ -1,8 +1,7 @@
 Name: libxml++
 Version: 0.26.0
 Release: 3
-Epoch: 0
-Summary: libxml++ is a C++ wrapper for the libxml2 XML parser library.
+Summary: C++ wrapper for the libxml2 XML parser library
 Group: System Environment/Libraries
 License: LGPL
 URL: http://libxmlplusplus.sourceforge.net/
@@ -11,19 +10,19 @@
 BuildRequires: libxml2-devel >= 0:2.5.1, doxygen, graphviz
 
 %description
-libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original 
-author is Ari Johnson and it is currently maintained by Christophe de Vienne 
+libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
+author is Ari Johnson and it is currently maintained by Christophe de Vienne
 and Murray Cumming.
 
 %package devel
 Summary: %{summary}
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
 %description devel
-libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original 
-author is Ari Johnson and it is currently maintained by Christophe de Vienne 
+libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
+author is Ari Johnson and it is currently maintained by Christophe de Vienne
 and Murray Cumming.
 
 This package contains the headers and libraries for libxml++ development.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/leafnode/devel leafnode.spec,1.5,1.6
Message-ID: <200503032241.j23MfXbf021154@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	leafnode.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: leafnode.spec
===================================================================
RCS file: /cvs/extras/rpms/leafnode/devel/leafnode.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- leafnode.spec	10 Dec 2004 22:03:04 -0000	1.5
+++ leafnode.spec	3 Mar 2005 22:41:31 -0000	1.6
@@ -1,17 +1,15 @@
 Name: leafnode
 Version: 1.9.53
 Release: 1
-Epoch:          0
-Summary:	Leafnode - a leafsite NNTP server (Version %version)
-Summary(de): 	Leafnode - ein offline-Newsserver (Version %version)
-License: 	MIT, GPL, LGPL
-Group: 		Applications/Internet
-Url: 		http://www.leafnode.org
-Source0: 	http://download.sf.net/leafnode/leafnode-%{version}.rel.tar.bz2
-Source1:        leafnode.xinetd
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: 	pcre-devel
-Requires:	xinetd
+Summary: Leaf site offline NNTP server
+License: MIT, GPL, LGPL
+Group: Applications/Internet
+URL: http://www.leafnode.org
+Source0: http://download.sf.net/leafnode/leafnode-%{version}.rel.tar.bz2
+Source1: leafnode.xinetd
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: pcre-devel
+Requires: xinetd
 
 %define confdir  %{_sysconfdir}/leafnode
 %define spooldir %{_localstatedir}/spool/news
@@ -111,7 +109,7 @@
 * Fri Jan 09 2004 Andreas Pfaffeneder <fedora at zuhause-local.de> 0:1.9.49-0.fdr.1
 - Update to 1.9.49.rel
 - bugfix update
-- little more detailed changelog 
+- little more detailed changelog
 
 * Fri Jan 09 2004 Andreas Pfaffeneder <fedora at zuhause-local.de> 0:1.9.48-0.fdr.1
 - Update to 1.9.48.rel



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libnet10/devel libnet10.spec,1.4,1.5
Message-ID: <200503032241.j23MfYgi021230@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libnet10.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libnet10.spec
===================================================================
RCS file: /cvs/extras/rpms/libnet10/devel/libnet10.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libnet10.spec	10 Dec 2004 22:03:05 -0000	1.4
+++ libnet10.spec	3 Mar 2005 22:41:32 -0000	1.5
@@ -1,8 +1,7 @@
-Summary:        High-level API (toolkit) allowing the application programmer to construct and inject network packets.
+Summary:        High-level API (toolkit) to construct and inject network packets
 Name:           libnet10
 Version:        1.0.2a
 Release:        5
-Epoch:          0
 URL:            http://www.packetfactory.net/libnet/
 License:        BSD
 Group:          System Environment/Libraries
@@ -10,11 +9,11 @@
 Patch0:         gcc33.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      libnet < 1.1.0
-Provides:       libnet = %{epoch}:%{version}-%{release}
+Provides:       libnet = %{version}-%{release}
 
 %description
 Libnet is a high-level API (toolkit) allowing the application programmer to
-construct and inject network packets. It provides a portable and simplified 
+construct and inject network packets. It provides a portable and simplified
 interface for low-level network packet shaping, handling and injection. Libnet
 hides much of the tedium of packet creation from the application programmer
 such as multiplexing, buffer management, arcane packet header information,



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libol/devel libol.spec,1.6,1.7
Message-ID: <200503032241.j23MfYgs021234@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libol.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/devel/libol.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libol.spec	1 Mar 2005 21:12:43 -0000	1.6
+++ libol.spec	3 Mar 2005 22:41:32 -0000	1.7
@@ -7,7 +7,6 @@
 Name:           libol
 Version:        0.3.15
 Release:        2
-Epoch:          0
 Summary:        Support library for syslog-ng
 
 Group:          Development/Libraries
@@ -26,7 +25,7 @@
 %package devel
 Summary:        Support library for syslog-ng: headers and libraries
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 Support library for syslog-ng: headers and libraries.
@@ -55,8 +54,7 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING
-%{_libdir}/libol.so.0
-%{_libdir}/libol.so.0.0.0
+%{_libdir}/libol.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -108,9 +106,9 @@
 
 * Tue Apr 15 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - included missing file: /usr/bin/make_class (caused problems in RH9)
- 
+
 * Thu Apr 10 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
-- specfile reformated 
+- specfile reformated
 - replaced hard coded values by RPM macros
 
 * Sun Jul 30 2000 Hollis Blanchard <hollis at penguinppc.org>



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libvisual/devel libvisual.spec,1.4,1.5
Message-ID: <200503032241.j23MfY6Y021274@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libvisual.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libvisual.spec
===================================================================
RCS file: /cvs/extras/rpms/libvisual/devel/libvisual.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libvisual.spec	14 Feb 2005 00:12:16 -0000	1.4
+++ libvisual.spec	3 Mar 2005 22:41:32 -0000	1.5
@@ -1,14 +1,13 @@
 Name:           libvisual
 Version:        0.2.0
 Release:        2
-Epoch:          0
-Summary:        An abstraction library for audio visualisation plugins
+Summary:        Abstraction library for audio visualisation plugins
 
 Group:          Applications/Multimedia
 License:        LGPL
 URL:            http://libvisual.sf.net
 Source0:        http://dl.sf.net/libvisual/libvisual-0.2.0.tar.gz
-Patch0:		libvisual-0.2.0-ifdef.patch
+Patch0:         libvisual-0.2.0-ifdef.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  xorg-x11-devel
 
@@ -24,12 +23,12 @@
 an interface towards plugins and applications, through this easy to use
 interface applications can easily access plugins and since the drawing is
 done by the application it also enables the developer to draw the visual
-anywhere he wants. 
+anywhere he wants.
 
 %package        devel
 Summary:        Development files for libvisual
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 Libvisual is an abstraction library that comes between applications and
@@ -62,7 +61,7 @@
 %postun -p /sbin/ldconfig
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_libdir}/*.so.*



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libsigc++/devel libsigc++.spec,1.4,1.5
Message-ID: <200503032241.j23MfYmx021250@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libsigc++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libsigc++/devel

Modified Files:
	libsigc++.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libsigc++.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigc++/devel/libsigc++.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsigc++.spec	10 Dec 2004 22:03:05 -0000	1.4
+++ libsigc++.spec	3 Mar 2005 22:41:32 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           libsigc++
 Version:        1.2.5
 Release:        5
-Epoch:          0
-Summary:        Typesafe Signal Framework for C++.
+Summary:        Typesafe signal framework for C++
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -29,9 +28,9 @@
 library, starting with version 1.1.2, uses %name.
 
 %package        devel
-Summary:        development tools for the Typesafe Signal Framework for C++.
+Summary:        Development tools for the typesafe signal framework for C++
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
 %description devel
@@ -173,7 +172,7 @@
 - Added autoconf macro for sigc.
 
 * Fri Jun 11 1999 Karl Nelson <kenelson at ece.ucdavis.edu>
-- Made into a .in to keep version field up to date 
+- Made into a .in to keep version field up to date
 - Still need to do release by hand
 
 * Mon Jun  7 1999 Dmitry V. Levin <ldv at fandra.org>



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libsidplay/devel libsidplay.spec,1.6,1.7
Message-ID: <200503032241.j23MfY09021246@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libsidplay.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libsidplay.spec
===================================================================
RCS file: /cvs/extras/rpms/libsidplay/devel/libsidplay.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsidplay.spec	16 Dec 2004 16:32:46 -0000	1.6
+++ libsidplay.spec	3 Mar 2005 22:41:32 -0000	1.7
@@ -1,8 +1,7 @@
 Name: libsidplay
-Summary: A Commodore 64 music player and SID chip emulator library.
+Summary: Commodore 64 music player and SID chip emulator library
 Version: 1.36.57
 Release: 6
-Epoch: 0
 Source: http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/%{name}-%{version}.tgz
 Patch: libsidplay-post57fixes.patch
 Icon: sidplay.xpm
@@ -18,9 +17,9 @@
 you can play musics from Commodore 64 (or compatible) programs.
 
 %package devel
-Summary: Header files for compiling apps that use libsidplay.
+Summary: Header files for compiling apps that use libsidplay
 Group: System Environment/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 This package contains the header files for compiling applications



From bugs.michael at gmx.net  Thu Mar  3 22:57:40 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 23:57:40 +0100
Subject: rpms/inti/devel inti.spec,1.2,1.3
In-Reply-To: <20050303233447.14081067@python2>
References: <200503032146.j23LkOgG019532@cvs-int.fedora.redhat.com>
	<20050303225754.509a1171.bugs.michael@gmx.net>
	<20050303233447.14081067@python2>
Message-ID: <20050303235740.6ee29f33.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 23:34:47 +0100, Matthias Saou wrote:

> Michael Schwendt wrote :
> 
> > On Thu, 3 Mar 2005 16:46:24 -0500, Matthias Saou (thias) wrote:
> > 
> > >  Name:           inti
> > >  Version:        1.2
> > > -Release:        0.fdr.5.1
> > > -Epoch:          0
> > > +Release:        1
> > 
> > Release change is pointless here. Please don't mix such changes with the
> > other documented mass-changes. inti package is broken for quite some
> > time (GTK incompatibility) and has not been updated since then. Release
> > should stay to reflect that. Also on the other packages with 0.fdr
> > prefix, please.
> 
> Second time I make that "mistake" IIRC.
> For me, a *.fdr.* release has nothing to do in the devel branch... so
> either it should be fixed (what I unconsciously and repeatedly seem to want
> to do) with the building disabled, or it shouldn't have a devel branch at
> all.

+1

And I'd say this time we get rid of these few packages before first FC4
Test rebuild. They could be resurrected anytime.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/monkey-bubble/devel monkey-bubble.spec,1.1,1.2
Message-ID: <200503032301.j23N1QBQ022824@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/monkey-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/monkey-bubble/devel

Modified Files:
	monkey-bubble.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: monkey-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/monkey-bubble.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monkey-bubble.spec	8 Nov 2004 04:52:25 -0000	1.1
+++ monkey-bubble.spec	3 Mar 2005 23:01:24 -0000	1.2
@@ -1,8 +1,7 @@
 Name:           monkey-bubble
 Version:        0.1.6
-Release:        0.fdr.4.1
-Epoch:          0
-Summary:        Game in the spirit of Frozen Bubble.
+Release:        1
+Summary:        Game in the spirit of Frozen Bubble
 
 Group:          Amusements/Games
 License:        GPL
@@ -17,7 +16,7 @@
 BuildRequires:  pkgconfig
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-Requires(post):  GConf2
+Requires(post): GConf2
 
 %description
 Monkey Bubble is a bust'a'move clone built using Gnometechnologies. It



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:25 -0500
Subject: rpms/mail-notification/devel mail-notification.spec,1.3,1.4
Message-ID: <200503032301.j23N1P5Y022785@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/mail-notification/devel

Modified Files:
	mail-notification.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mail-notification.spec	10 Dec 2004 22:03:07 -0000	1.3
+++ mail-notification.spec	3 Mar 2005 23:01:23 -0000	1.4
@@ -1,10 +1,9 @@
-# use "--with gmail" as rpmbuildparameter to add gmail Support (requires FC3 Core package) 
+# use "--with gmail" as rpmbuildparameter to add gmail Support (requires FC3 Core package)
 
 Name:           mail-notification
-Epoch:          0
 Version:        1.0
 Release:        1
-Summary:        Mail Notification is a status icon that informs you if you have new mail.
+Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
 License:        GPL
@@ -13,17 +12,17 @@
 Source1:        mail-notification-README.FEDORA
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gettext >= 0:0.14.1
-BuildRequires:  eel2-devel >= 0:2.0
+BuildRequires:  gettext >= 0.14.1
+BuildRequires:  eel2-devel >= 2.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  scrollkeeper
-BuildRequires:	openssl-devel  >= 0:0.9.5b
-BuildRequires:	cyrus-sasl-devel >= 0:2.0
-BuildRequires:	gmime-devel >= 0:2.1
+BuildRequires:  openssl-devel  >= 0.9.5b
+BuildRequires:  cyrus-sasl-devel >= 2.0
+BuildRequires:  gmime-devel >= 2.1
 %if 0%{?_with_gmail:1}
-BuildRequires:	libsoup-devel >= 0:2.2.1
-BuildRequires:	gnutls-devel >= 0:1.0.20
-BuildRequires:	libgcrypt-devel >= 0:1.2.0
+BuildRequires:  libsoup-devel >= 2.2.1
+BuildRequires:  gnutls-devel >= 1.0.20
+BuildRequires:  libgcrypt-devel >= 1.2.0
 %endif
 
 Requires(post):   GConf2
@@ -32,21 +31,21 @@
 Requires(postun): scrollkeeper
 
 %description
-Mail Notification is a status icon (aka tray icon) that informs you if you 
+Mail Notification is a status icon (aka tray icon) that informs you if you
 have new mail. It works with system trays implementing the freedesktop.org
-System Tray Specification, such as the GNOME Panel Notification Area, the 
+System Tray Specification, such as the GNOME Panel Notification Area, the
 Xfce Notification Area and the KDE System Tray.
 
 
 %prep
 %setup -q
 cp %{SOURCE1} ./README.FEDORA
- 
+
 
 
 %build
-%configure %{?!_with_gmail:--disable-gmail} 
-make %{?_smp_mflags} 
+%configure %{?!_with_gmail:--disable-gmail}
+make %{?_smp_mflags}
 
 
 %install
@@ -115,13 +114,13 @@
 
 * Tue Nov 09 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.8.1-0.fdr.3
 - trim build comment
-- own _datadir/gnome/help/mail-notification/ 
+- own _datadir/gnome/help/mail-notification/
 - rename SOURCE1 from README.FEDORA to mail-notfication-README.FEDORA
 
 
 * Sat Nov 06 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.8.1-0.fdr.2
-- Really remove "killall bonobo-activation-server"; Add a README.FEDORA 
-  which descibes the problem. 
+- Really remove "killall bonobo-activation-server"; Add a README.FEDORA
+  which descibes the problem.
 - Spilt post,preun,postun sections
 - Use --with gmail to build for FC3 with gmail-support
 
@@ -143,7 +142,7 @@
 
 * Tue Sep 14 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.6.2-0.fdr.1
 - Update to 0.6.2
-- After talkback with program author added "killall bonobo-activation-server" 
+- After talkback with program author added "killall bonobo-activation-server"
   to post section
 
 * Sun Aug 29 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.6.1-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/mknbi/devel mknbi.spec,1.4,1.5
Message-ID: <200503032301.j23N1Q2Q022820@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	mknbi.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: mknbi.spec
===================================================================
RCS file: /cvs/extras/rpms/mknbi/devel/mknbi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mknbi.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ mknbi.spec	3 Mar 2005 23:01:24 -0000	1.5
@@ -2,7 +2,6 @@
 Name: 		mknbi
 Version:	1.4.0
 Release: 	3
-Epoch: 		0
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://etherboot.sourceforge.net/
@@ -61,7 +60,7 @@
 
 * Tue May 20 2003 Dams <anvil[AT]livna.org> 0:1.4.0-0.fdr.1
 - nasm BuildRequires now arch dependent
-- Changed URL in Source0 
+- Changed URL in Source0
 - buildroot -> RPM_BUILD_ROOT
 - Modifed doc files
 
@@ -69,5 +68,5 @@
 - Updated to 1.4.0
 - Replaced /usr with %{_prefix} in sed
 
-* Sat Apr 26 2003 Dams <anvil[AT]livna.org> 
+* Sat Apr 26 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/most/devel most.spec,1.4,1.5
Message-ID: <200503032301.j23N1QqB022834@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	most.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: most.spec
===================================================================
RCS file: /cvs/extras/rpms/most/devel/most.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- most.spec	12 Feb 2005 14:00:37 -0000	1.4
+++ most.spec	3 Mar 2005 23:01:24 -0000	1.5
@@ -4,7 +4,6 @@
 Name:		most
 Version:	4.9.5
 Release:	3
-Epoch:          0
 License:	GPL
 URL:		ftp://space.mit.edu/pub/davis/most/
 Group:		Applications/Text
@@ -47,7 +46,7 @@
 
 %changelog
 * Sat Feb 12 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 4.9.5-3
-- sed -i 's|/usr/lib|%%{_libdir}|g' configure fixes x86_64 build; 
+- sed -i 's|/usr/lib|%%{_libdir}|g' configure fixes x86_64 build;
 
 * Mon Jul 19 2004 Adrian Reber <adrian at lisas.de> - 0:4.9.5-0.fdr.2
 - removed chrpath dependency



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/milter-greylist/devel milter-greylist.spec,1.1,1.2
Message-ID: <200503032301.j23N1Q03022816@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/milter-greylist/devel

Modified Files:
	milter-greylist.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- milter-greylist.spec	3 Feb 2005 10:13:34 -0000	1.1
+++ milter-greylist.spec	3 Mar 2005 23:01:24 -0000	1.2
@@ -15,11 +15,10 @@
 %define rundir		%vardir/run
 %define __chkconfig	/sbin/chkconfig
 
-Summary:	A milter for greylisting, the Next Step in the Spam Control War 
+Summary:	Milter for greylisting, the next step in the spam control war 
 Name:		milter-greylist
 Version:	1.6
 Release:	%release_func 1
-Epoch:		0
 License:	BSD w/ advertising
 Group:		System Environment/Daemon
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -35,21 +34,21 @@
 BuildRequires:		sendmail-devel %{?_with_spf:libspf-devel}
 
 %package sysv
-Summary:	The sysv-initscripts for %name
+Summary:	Sysv initscripts for %name
 Group:		System Environment/Daemon
 Provides:	init(%name) = sysv
-Requires(preun):	%name = %epoch:%version-%release
-Requires(postun):	%name = %epoch:%version-%release
+Requires(preun):	%name = %version-%release
+Requires(postun):	%name = %version-%release
 Requires(preun):	initscripts
 Requires(postun):	initscripts
 Requires(post):		%__chkconfig
 Requires(preun):	%__chkconfig
 
 %package minit
-Summary:	The minit-initscripts for %name
+Summary:	Minit initscripts for %name
 Group:		System Environment/Daemon
 Provides:	init(%name) = minit
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires:		%_sbindir/setuidgid
 Requires(pre):		minit-setup
 Requires(postun):	minit-setup
@@ -97,7 +96,7 @@
 for i in `find -type f`; do
     sed -e 's!/var/milter-greylist/milter-greylist.sock!%rundir/milter-greylist.sock!g;
             s!/var/milter-greylist/greylist.db!%dbdir/greylist.db!g;
-	   ' "$i" >"$i.tmp"
+           ' "$i" >"$i.tmp"
     cmp -s "$i" "$i.tmp" || cat "$i.tmp" >"$i"
     rm -f "$i".tmp
 done



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/moodss/devel moodss.spec,1.4,1.5
Message-ID: <200503032301.j23N1QJh022830@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	moodss.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moodss.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ moodss.spec	3 Mar 2005 23:01:24 -0000	1.5
@@ -2,15 +2,14 @@
 Name: moodss
 Version: 17.17
 Release: 1
-Epoch: 0
 Group: Applications/System
 Source: http://jfontain.free.fr/moodss-17.17.tar.bz2
 URL: http://jfontain.free.fr/moodss/
 License: GPL
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 # work around tcl-devel and tk-devel packages non existence in RH 8.0 and 9:
-BuildRequires: tcl >= 0:8.3.1, %{_includedir}/tcl.h
-Requires: tk >= 0:8.3.1, blt >= 0:2.4-0.fdr.0.z, tktable >= 0:2.7
+BuildRequires: tcl >= 8.3.1, %{_includedir}/tcl.h
+Requires: tk >= 8.3.1, blt >= 2.4, tktable >= 2.7
 
 %description
 A multi-purpose monitoring tool with table, graphical, textual data



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/netmask/devel netmask.spec,1.5,1.6
Message-ID: <200503032301.j23N1Q2W022859@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	netmask.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: netmask.spec
===================================================================
RCS file: /cvs/extras/rpms/netmask/devel/netmask.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- netmask.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ netmask.spec	3 Mar 2005 23:01:24 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           netmask
 Version:        2.3.7
 Release:        2
-Epoch:          0
 Summary:        Utility for determining network masks
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/mathml-fonts/devel mathml-fonts.spec,1.2,1.3
Message-ID: <200503032301.j23N1QCT022798@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/mathml-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/mathml-fonts/devel

Modified Files:
	mathml-fonts.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/mathml-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mathml-fonts.spec	10 Dec 2004 22:03:07 -0000	1.2
+++ mathml-fonts.spec	3 Mar 2005 23:01:24 -0000	1.3
@@ -4,11 +4,10 @@
 %define fontdir       %{_datadir}/fonts/mathml
 
 Summary: Mathematical symbol fonts
-Name:	 mathml-fonts 
-Epoch:	 0
+Name:    mathml-fonts
 Version: 1.0
 Release: 14
-URL:	 http://www.mozilla.org/projects/mathml/fonts/
+URL:     http://www.mozilla.org/projects/mathml/fonts/
 License: Distributable
 Group:   User Interface/X
 BuildArch: noarch
@@ -25,7 +24,7 @@
 ## Design Science fonts
 #  License: http://www.dessci.com/en/support/eula/mtextralic.htm
 #  URL: http://www.dessci.com/en/dl/fonts/
-# extracted from MTW_Truetype.exe 
+# extracted from MTW_Truetype.exe
 # (couldn't figure out how extract at build-time -- Rex)
 Source30: mtextra.ttf
 
@@ -38,7 +37,7 @@
 # in scriptlets
 Prereq: fontconfig
 
-# Not *strictly* required, for Adobe (PS)  Symbol font, expects 
+# Not *strictly* required, for Adobe (PS)  Symbol font, expects
 # /usr/lib/acroread/Resource/Fonts
 # Prereq: acroread
 # BuildRequires: acroread
@@ -47,20 +46,20 @@
 
 %description
 This package contains fonts required to display mathematical
-symbols.  Applications supported include: 
+symbols.  Applications supported include:
 * mozilla (and netscape >= 7) to display MathML
 * lyx
 * kformula (koffice)
 
 
 %prep
-%setup -T -c -n %{name} 
+%setup -T -c -n %{name}
 
 ## Math'ca
 unzip %{SOURCE10}
 
 ## TeX fonts
-#setup -T -D -n %{name} -a 20 
+#setup -T -D -n %{name} -a 20
 cp -a %{SOURCE20} .
 %setup -T -D -n %{name} -a 21
 
@@ -84,7 +83,7 @@
   cmbx10.ttf mtextra.ttf \
   $RPM_BUILD_ROOT%{fontdir}/
 
-# Generate fonts.scale, etc... 
+# Generate fonts.scale, etc...
 # don't really *need* this step, as we're Xft only...
 %{x11bindir}/mkfontscale $RPM_BUILD_ROOT%{fontdir}
 %{x11bindir}/mkfontdir   $RPM_BUILD_ROOT%{fontdir}
@@ -100,7 +99,7 @@
   ## Rebuild fontcache for now available Symbol.pfa
   fc-cache -f %{fontdir} ||:
 fi
- 
+
 %triggerun -- acroread
 [ $2 -eq 0 ] && rm -f %{fontdir}/Symbol.pfa
 ## Rebuild fontcache for now missing (or possibly changed) Symbol.pfa
@@ -144,7 +143,7 @@
 - add comment regarding lyx fonts
 - remove use of mkfontdir -e which causes build failure on FC2.
 - remove deprecated Xft1 bits
-- add %%trigger for acroread, to rebuild font.cache-1 when/if 
+- add %%trigger for acroread, to rebuild font.cache-1 when/if
   Symbol.pfa becomes available/unavailable.
 
 * Tue Jan 13 2004 Rex Dieter <rexdieter at sf.net> 0:1.0-0.fdr.10
@@ -187,6 +186,6 @@
 * Mon Nov 11 2002 Rex Dieter <rdieter at unl.edu> 1.0-0
 - include latest Mathematica 4.1 fonts + CMSY10,CMEX10
 - Require type1inst with added/fixed ams/wri font foundries
-- prefer Math*.pfa over Math*.pfb as type1inst seems to 
+- prefer Math*.pfa over Math*.pfb as type1inst seems to
   incorrectly identify some of the pfb versions.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:12:26 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 18:12:26 -0500
Subject: rpms/gtkglarea2/devel gtkglarea2.spec,1.6,1.7
Message-ID: <200503032312.j23NCQ4Z023222@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	gtkglarea2.spec 
Log Message:
Remove undefined %{epoch} usage in sub-package.


Index: gtkglarea2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglarea2/devel/gtkglarea2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkglarea2.spec	14 Feb 2005 18:06:47 -0000	1.6
+++ gtkglarea2.spec	3 Mar 2005 23:12:24 -0000	1.7
@@ -14,7 +14,7 @@
 %package devel
 Summary:	Development package for gtkglarea2
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	xorg-x11-devel
 Requires:	gtk2-devel
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:14:30 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 18:14:30 -0500
Subject: rpms/gtkglarea2/FC-3 gtkglarea2.spec,1.6,1.7
Message-ID: <200503032314.j23NEU66023267@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	gtkglarea2.spec 
Log Message:
Remove undefined %{epoch} usage in sub-package.


Index: gtkglarea2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglarea2/FC-3/gtkglarea2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkglarea2.spec	14 Feb 2005 18:06:47 -0000	1.6
+++ gtkglarea2.spec	3 Mar 2005 23:13:54 -0000	1.7
@@ -14,7 +14,7 @@
 %package devel
 Summary:	Development package for gtkglarea2
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	xorg-x11-devel
 Requires:	gtk2-devel
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/mpc/devel mpc.spec,1.2,1.3
Message-ID: <200503032301.j23N1Qhv022838@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	mpc.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: mpc.spec
===================================================================
RCS file: /cvs/extras/rpms/mpc/devel/mpc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mpc.spec	12 Dec 2004 21:23:43 -0000	1.2
+++ mpc.spec	3 Mar 2005 23:01:24 -0000	1.3
@@ -2,7 +2,6 @@
 Summary:          Command-line client for MPD
 Version:          0.11.1
 Release:          2
-Epoch:            0
 License:          GPL
 Group:            Applications/Multimedia
 URL:              http://www.musicpd.org/?page=mpc



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/nget/devel nget.spec,1.4,1.5
Message-ID: <200503032301.j23N1QmO022869@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	nget.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: nget.spec
===================================================================
RCS file: /cvs/extras/rpms/nget/devel/nget.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nget.spec	23 Jan 2005 16:31:56 -0000	1.4
+++ nget.spec	3 Mar 2005 23:01:24 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           nget
 Version:        0.27.1
 Release:        2
-Epoch:          0
-Summary:        A utility for retrieving files using the NNTP protocol
+Summary:        Utility for retrieving files using the NNTP protocol
 
 Group:          Applications/Internet
 License:        GPL
@@ -29,7 +28,7 @@
 %configure --with-pcre --with-popt
 make %{?_smp_mflags}
 cp .ngetrc ngetrc.example
-	        
+
 
 %install
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/ninja/devel ninja.spec,1.5,1.6
Message-ID: <200503032301.j23N1Q6v022873@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ninja.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ninja.spec
===================================================================
RCS file: /cvs/extras/rpms/ninja/devel/ninja.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ninja.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ ninja.spec	3 Mar 2005 23:01:24 -0000	1.6
@@ -1,10 +1,9 @@
 Name: ninja
 Version: 1.5.8.1
 Release: 2
-Epoch: 0
 License: GPL
-Summary: A text based Internet Relay Chat (IRC) client.
-Group: Applications/Internet 
+Summary: Text based Internet Relay Chat (IRC) client
+Group: Applications/Internet
 URL: http://ninja.qoop.org/
 Source0: ftp://ninja.qoop.org/ninja/sources/%{name}-%{version}.tar.gz
 Patch0: %{name}-%{version}-doc.patch
@@ -29,7 +28,7 @@
 
 %build
 %configure
-make 
+make
 
 %install
 rm -rf %{buildroot}
@@ -57,8 +56,6 @@
 %defattr(644,root,root, 755)
 %doc README ChangeLog BUGS+TODO
 
-
-
 %changelog
 * Tue Feb 25 2003 Adrian Reber <adrian at lisas.de> - 1.5.8.1-0.fdr.1
 - applied fedora naming conventions



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/nethack-falconseye/devel nethack-falconseye.spec,1.6,1.7
Message-ID: <200503032301.j23N1QIN022855@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/nethack-falconseye/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/nethack-falconseye/devel

Modified Files:
	nethack-falconseye.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: nethack-falconseye.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-falconseye/devel/nethack-falconseye.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nethack-falconseye.spec	10 Dec 2004 22:03:07 -0000	1.6
+++ nethack-falconseye.spec	3 Mar 2005 23:01:24 -0000	1.7
@@ -5,8 +5,7 @@
 Name:           nethack-falconseye
 Version:        1.9.4
 Release:        4.a
-Epoch:          0
-Summary:        NetHack - Falcon's Eye
+Summary:        NetHack - Falcon's Eye game
 
 Group:          Amusements/Games
 License:        NetHack General Public License
@@ -28,7 +27,7 @@
 BuildRequires:  ncurses-devel
 %endif
 Requires:       /usr/bin/timidity, /usr/bin/bzip2
-Provides:       nethack = %{epoch}:3.4.1
+Provides:       nethack = 3.4.1
 
 %description
 Falcon's Eye is a mouse-driven interface for NetHack that enhances the



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/netdiag/devel netdiag.spec,1.5,1.6
Message-ID: <200503032301.j23N1QxU022851@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	netdiag.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: netdiag.spec
===================================================================
RCS file: /cvs/extras/rpms/netdiag/devel/netdiag.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- netdiag.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ netdiag.spec	3 Mar 2005 23:01:24 -0000	1.6
@@ -1,8 +1,7 @@
-Summary:	Diagnostic program for Ethernet adapters under Linux.
+Summary:	Diagnostic program for Ethernet adapters under Linux
 Name:		netdiag
 Version:	2.4
 Release:	4
-Epoch:		0
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.scyld.com/diag/index.html
@@ -12,7 +11,7 @@
 Patch1:		netdiag-2.4-weak-declarations.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Obsoletes:	diag-ether < 0:2.4
-Provides:	diag-ether = %{epoch}:%{version}-%{release}
+Provides:	diag-ether = %{version}-%{release}
 
 
 %description
@@ -21,7 +20,7 @@
 
 
 %prep
-%setup -q -c 
+%setup -q -c
 %patch0 -p1 -b .multilined-strings
 %patch1 -p0 -b .weak-decl
 
@@ -76,5 +75,5 @@
 - updated to 2.3
 - modify whole spec file for according to fedora template
 
-* Mon Feb 24 2003 Dams <anvil[AT]livna.org> 
+* Mon Feb 24 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/meld/devel meld.spec,1.6,1.7
Message-ID: <200503032301.j23N1Qh0022802@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	meld.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/devel/meld.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- meld.spec	9 Feb 2005 02:29:21 -0000	1.6
+++ meld.spec	3 Mar 2005 23:01:24 -0000	1.7
@@ -1,9 +1,9 @@
 Name:             meld
 Version:          0.9.5
 Release:          1
-Summary:          Visual diff and merge tool.
+Summary:          Visual diff and merge tool
 
-Group:            Development/Tools  
+Group:            Development/Tools
 License:          GPL
 URL:              http://meld.sourceforge.net/
 Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/0.9/meld-0.9.5.tar.bz2
@@ -12,8 +12,8 @@
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    desktop-file-utils
-BuildRequires:	  gettext
-BuildRequires:	  intltool
+BuildRequires:    gettext
+BuildRequires:    intltool
 Requires:         gnome-python2 >= 1.99.14
 Requires:         gnome-python2-canvas
 Requires:         gnome-python2-gconf
@@ -64,7 +64,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING 
+%doc AUTHORS COPYING
 %{_bindir}/meld
 %{_datadir}/meld
 %{_datadir}/applications/fedora-meld.desktop



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/mhash/devel mhash.spec,1.7,1.8
Message-ID: <200503032301.j23N1Qfa022807@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	mhash.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: mhash.spec
===================================================================
RCS file: /cvs/extras/rpms/mhash/devel/mhash.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mhash.spec	9 Feb 2005 03:27:13 -0000	1.7
+++ mhash.spec	3 Mar 2005 23:01:24 -0000	1.8
@@ -2,17 +2,16 @@
 Name: mhash
 Version: 0.9.2
 Release: 1
-Epoch: 0
 URL: http://mhash.sourceforge.net/
 License: LGPL
 Group: System Environment/Libraries
 Source: http://download.sourceforge.net/mhash/mhash-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-Provides: libmhash = %{epoch}:%{version}-%{release}
+Provides: libmhash = %{version}-%{release}
 
 %description
 Mhash is a free library which provides a uniform interface to a
-large number of hash algorithms. 
+large number of hash algorithms.
 
 These algorithms can be used to compute checksums, message digests,
 and other signatures. The HMAC support implements the basics for
@@ -27,8 +26,8 @@
 %package -n %{name}-devel
 Summary: Header files and libraries for developing apps which use mhash
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Provides: libmhash-devel = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Provides: libmhash-devel = %{version}-%{release}
 
 %description -n %{name}-devel
 This package contains the header files and libraries needed to



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/netcdf/devel netcdf.spec,1.3,1.4
Message-ID: <200503032301.j23N1QVU022845@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	netcdf.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- netcdf.spec	14 Jan 2005 10:10:03 -0000	1.3
+++ netcdf.spec	3 Mar 2005 23:01:24 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           netcdf
 Version:        3.6.0
 Release:        0.2.beta6
-Epoch:          0
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
@@ -15,7 +14,7 @@
 %package devel
 Summary:        Development files for netcdf-3
 Group:          Development/Libraries
-#Requires:       %{name} = %{epoch}:%{version}-%{release}
+#Requires:       %{name} = %{version}-%{release}
 
 %description
 NetCDF-3 (network Common Data Form ver3) is an interface for
@@ -27,7 +26,7 @@
 sharing of scientific data. The NetCDF software was developed at the
 Unidata Program Center in Boulder, Colorado.
 
-NetCDF data is: 
+NetCDF data is:
 
    o Self-Describing: A NetCDF file includes information about the
      data it contains.
@@ -109,8 +108,8 @@
 
 * Sat Dec  4 2004 Ed Hill <eh3 at mit.edu> - 0:3.6.0beta6-0.fdr.0
 - upgrade to 3.6.0beta6
-- create separate devel package that does *not* depend upon 
-  the non-devel package and put the headers/libs in "netcdf-3" 
+- create separate devel package that does *not* depend upon
+  the non-devel package and put the headers/libs in "netcdf-3"
   subdirs for easy co-existance with upcoming netcdf-4
 
 * Thu Dec  2 2004 Ed Hill <eh3 at mit.edu> - 0:3.5.1-0.fdr.12
@@ -120,7 +119,7 @@
 - headers in /usr/include/netcdf, libs in /usr/lib/netcdf
 
 * Mon Oct  4 2004 Ed Hill <eh3 at mit.edu> - 0:3.5.1-0.fdr.10
-- Put headers in their own directory but leave the libraries in the 
+- Put headers in their own directory but leave the libraries in the
   %{_libdir} -- there are only two libs and the majority of other
   "*-devel" packages follow this pattern
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/notemeister/devel notemeister.spec,1.2,1.3
Message-ID: <200503032301.j23N1Qjv022881@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	notemeister.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: notemeister.spec
===================================================================
RCS file: /cvs/extras/rpms/notemeister/devel/notemeister.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- notemeister.spec	10 Dec 2004 22:03:07 -0000	1.2
+++ notemeister.spec	3 Mar 2005 23:01:24 -0000	1.3
@@ -4,23 +4,22 @@
 Name:           notemeister
 Version:        0.1.7
 Release:        2
-Epoch:          0
-Summary:        Notemeister is a small, simple note organizer made for the GNOME2 desktop.
+Summary:        Small, simple note organizer made for the GNOME2 desktop
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://notemeister.sourceforge.net
-Source0:	http://dl.sf.net/sourceforge/notemeister/notemeister-0.1.7.tar.gz
+Source0:        http://dl.sf.net/sourceforge/notemeister/notemeister-0.1.7.tar.gz
 #wgetable URL:  http://mesh.dl.sourceforge.net/sourceforge/notemeister/notemeister-0.1.7.tar.gz (german sf mirror)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch: 	noarch     
+BuildArch:      noarch
 BuildRequires:  python-devel >= 2.3.3
-BuildRequires:	gnome-python2-gconf >= 2.0
+BuildRequires:  gnome-python2-gconf >= 2.0
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:  	pygtk2 >= 2.4.0
-Requires:  	pyorbit >= 2.0.0
-Requires:  	gnome-python2 >= 2.0.2
+Requires:       pygtk2 >= 2.4.0
+Requires:       pyorbit >= 2.0.0
+Requires:       gnome-python2 >= 2.0.2
 
 
 
@@ -32,7 +31,7 @@
     * Simple text formatting by highlighted bounds
     * Auto-save feature
     * Import/Export to/from text files
-    * Link notes to a file on disk 
+    * Link notes to a file on disk
 
 
 %prep
@@ -55,7 +54,7 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 rm -rf $RPM_BUILD_ROOT/usr/doc/%{name}-%{version}
- 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:25 -0500
Subject: rpms/manedit/devel manedit.spec,1.8,1.9
Message-ID: <200503032301.j23N1PgQ022788@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	manedit.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: manedit.spec
===================================================================
RCS file: /cvs/extras/rpms/manedit/devel/manedit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- manedit.spec	28 Feb 2005 21:12:57 -0000	1.8
+++ manedit.spec	3 Mar 2005 23:01:23 -0000	1.9
@@ -1,7 +1,6 @@
 Name:           manedit
 Version:        0.5.11
 Release:        3
-Epoch:          0
 Summary:        GUI editor for creating man pages
 
 Group:          Development/Tools
@@ -15,7 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel zlib-devel desktop-file-utils bzip2-devel
-Requires:	groff
+Requires:       groff
 
 %description
 ManEdit is a UNIX Manual Page Integrated Development Environment.
@@ -37,7 +36,7 @@
 # --disable=bzip2 to build without Bzip2 support
 CFLAGS=$RPM_OPT_FLAGS ./configure Linux --prefix=%{_prefix}  --mandir=%{_mandir} \
 --disable=arch-i486 --disable=arch-i586 --disable=arch-i686 --disable=arch-pentiumpro
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -46,25 +45,25 @@
 
 %{__install} -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
 desktop-file-install --vendor fedora                   \
-	--add-category X-Fedora                        \
-	--add-category Application                     \
-	--add-category Development                     \
-	--dir $RPM_BUILD_ROOT/%{_datadir}/applications \
+        --add-category X-Fedora                        \
+        --add-category Application                     \
+        --add-category Development                     \
+        --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
 %SOURCE1
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE  README 
+%doc AUTHORS LICENSE README
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_datadir}/icons/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*
- 
+
 %changelog
 * Wed Feb  9 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.5.11-3
 - Add patch for multilib and substitute hardcoded 'lib' in %%prep.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/neXtaw/devel neXtaw.spec,1.5,1.6
Message-ID: <200503032301.j23N1Qqx022865@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	neXtaw.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: neXtaw.spec
===================================================================
RCS file: /cvs/extras/rpms/neXtaw/devel/neXtaw.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- neXtaw.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ neXtaw.spec	3 Mar 2005 23:01:24 -0000	1.6
@@ -1,21 +1,19 @@
-Summary:	A modified version of the Athena Widgets with a N*XTSTEP appearance. 
+Summary:	Modified version of the Athena Widgets with a N*XTSTEP appearance
 Name:		neXtaw
-Version: 	0.15.1
-Release: 	1
-Epoch:		0
-URL: 		http://siag.nu/neXtaw/
-Source0: 	http://siag.nu/pub/neXtaw/%{name}-%{version}.tar.gz
-License: 	MIT/X Consortium License
-Group: 		System Environment/Libraries
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Version:	0.15.1
+Release:	1
+URL:		http://siag.nu/neXtaw/
+Source0:	http://siag.nu/pub/neXtaw/%{name}-%{version}.tar.gz
+License:	MIT/X Consortium License
+Group:		System Environment/Libraries
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	XFree86-devel
 
 %package devel
 Summary:	Development files for the neXtaw library
-Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
-#---------------------------------------------------------------------
 
 %description
 neXtaw is a replacement library for the Athena (libXaw) widget set. It
@@ -30,29 +28,24 @@
 the N*XTSTEP GUI. This package contains the development files of the
 neXtaw library.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
 
-#---------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall 
+%makeinstall
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -69,7 +62,6 @@
 %{_libdir}/libneXtaw.so
 %{_libdir}/libneXtaw.a
 
-#---------------------------------------------------------------------
 
 %changelog
 * Thu Oct  2 2003 Dams <anvil[AT]livna.org> 0:0.15.1-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/nomarch/devel nomarch.spec,1.4,1.5
Message-ID: <200503032301.j23N1Qwo022877@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	nomarch.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: nomarch.spec
===================================================================
RCS file: /cvs/extras/rpms/nomarch/devel/nomarch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nomarch.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ nomarch.spec	3 Mar 2005 23:01:24 -0000	1.5
@@ -1,8 +1,7 @@
-Name:    nomarch
-Version: 1.3
-Release: 1
-Epoch:   0
-Summary: GPLed Arc de-archiver 
+Name:      nomarch
+Version:   1.3
+Release:   1
+Summary:   GPLed Arc de-archiver
 
 Group:     Applications/Archiving
 License:   GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/mantis/devel mantis.spec,1.3,1.4
Message-ID: <200503032301.j23N1Q5e022794@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	mantis.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mantis.spec	10 Dec 2004 22:03:07 -0000	1.3
+++ mantis.spec	3 Mar 2005 23:01:24 -0000	1.4
@@ -1,14 +1,13 @@
-## $Id$
+# $Id$
 
 %define pkgdir		%{_datadir}/%{name}
 %define cfgdir		%{_sysconfdir}/%{name}
 %define httpconfdir	%{_sysconfdir}/httpd/conf.d
 
-Summary:	A web-based bugtracking system
+Summary:	Web-based bugtracking system
 Name:		mantis
 Version:	0.18.3
 Release:	2
-Epoch:		0
 License:	GPL
 Group:		Applications/Internet
 URL:		http://mantisbt.sourceforge.net/
@@ -27,7 +26,7 @@
 Group:		Applications/Internet
 Source10:	mantis-httpd.conf
 Provides:	mantis-config = httpd
-Requires:	mantis = %{epoch}:%{version}-%{release}
+Requires:	mantis = %{version}-%{release}
 Requires:	%{httpconfdir}
 Requires:	mod_ssl
 Requires(post):		httpd
@@ -50,7 +49,6 @@
 
 This package contains configuration-files for Apache httpd 2.
 
-#-------------------------------------------------
 
 %prep
 %setup -q -n %{name}bt-%{version}%{?alpha}
@@ -62,7 +60,6 @@
 find -name '.cvsignore' -exec rm -f {} \;
 rm -rf packages
 
-#-------------------------------------------------
 
 %install
 rm -rf "$RPM_BUILD_ROOT"
@@ -93,13 +90,10 @@
 %__install -p -m644 %SOURCE10 $RPM_BUILD_ROOT%httpconfdir/mantis.conf
 subst %httpconfdir/mantis.conf
 
-#-------------------------------------------------
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
-#-------------------------------------------------
-
 
 %post config-httpd
 ! /sbin/pidof httpd &>/dev/null || /usr/sbin/apachectl graceful || :



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/mhonarc/devel mhonarc.spec,1.4,1.5
Message-ID: <200503032301.j23N1QU5022812@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	mhonarc.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: mhonarc.spec
===================================================================
RCS file: /cvs/extras/rpms/mhonarc/devel/mhonarc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mhonarc.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ mhonarc.spec	3 Mar 2005 23:01:24 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           mhonarc
 Version:        2.6.10
 Release:        1
-Epoch:          0
-Summary:        A Perl mail-to-HTML converter
+Summary:        Perl mail-to-HTML converter
 
 Group:          Applications/Internet
 License:        GPL
@@ -11,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Provides:       MHonArc = %{epoch}:%{version}-%{release}
+Provides:       MHonArc = %{version}-%{release}
 
 %description
 MHonArc is a Perl mail-to-HTML converter. MHonArc provides HTML mail



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-GDGraph/devel perl-GDGraph.spec,1.3,1.4
Message-ID: <200503032346.j23NkSYl023711@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-GDGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-GDGraph/devel

Modified Files:
	perl-GDGraph.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-GDGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph/devel/perl-GDGraph.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-GDGraph.spec	10 Dec 2004 22:03:08 -0000	1.3
+++ perl-GDGraph.spec	3 Mar 2005 23:46:26 -0000	1.4
@@ -3,7 +3,6 @@
 Name:           perl-GDGraph
 Version:        1.43
 Release:        3
-Epoch:          0
 Summary:        Graph generation package for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Image-Xpm/devel perl-Image-Xpm.spec,1.4,1.5
Message-ID: <200503032346.j23NkTpt023755@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Image-Xpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Image-Xpm/devel

Modified Files:
	perl-Image-Xpm.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Image-Xpm.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Xpm/devel/perl-Image-Xpm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Image-Xpm.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-Image-Xpm.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Image-Xpm
 Version:        1.09
 Release:        2
-Epoch:          0
 Summary:        Load, create, manipulate and save xpm image files in Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-ExtUtils-Depends/devel perl-ExtUtils-Depends.spec, 1.5,
	1.6
Message-ID: <200503032346.j23NkS03023677@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-ExtUtils-Depends/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-ExtUtils-Depends/devel

Modified Files:
	perl-ExtUtils-Depends.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-ExtUtils-Depends.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-Depends/devel/perl-ExtUtils-Depends.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-ExtUtils-Depends.spec	15 Feb 2005 02:49:20 -0000	1.5
+++ perl-ExtUtils-Depends.spec	3 Mar 2005 23:46:26 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-ExtUtils-Depends
 Version:        0.205
 Release:        1
-Epoch:          0
 Summary:        Easily build XS extensions that depend on XS extensions
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Jcode/devel perl-Jcode.spec,1.5,1.6
Message-ID: <200503032346.j23NkTIB023791@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Jcode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Jcode/devel

Modified Files:
	perl-Jcode.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Jcode.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Jcode/devel/perl-Jcode.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Jcode.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-Jcode.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Jcode
 Version:        0.88
 Release:        1
-Epoch:          0
 Summary:        Perl extension interface for converting Japanese text
 
 License:        GPL or Artistic



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Image-Size/devel perl-Image-Size.spec,1.4,1.5
Message-ID: <200503032346.j23NkTmi023747@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Image-Size/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Image-Size/devel

Modified Files:
	perl-Image-Size.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Image-Size.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Size/devel/perl-Image-Size.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Image-Size.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-Image-Size.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Image-Size
 Version:        2.992
 Release:        2
-Epoch:          0
 Summary:        Determine the size of images in several common formats in Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Image-Info/devel perl-Image-Info.spec,1.4,1.5
Message-ID: <200503032346.j23NkTte023743@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Image-Info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Image-Info/devel

Modified Files:
	perl-Image-Info.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Image-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Info/devel/perl-Image-Info.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Image-Info.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-Image-Info.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Image-Info
 Version:        1.16
 Release:        3
-Epoch:          0
 Summary:        Image meta information extraction module for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Pod-Simple/devel perl-Pod-Simple.spec,1.4,1.5
Message-ID: <200503032346.j23NkTgf023870@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Pod-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Pod-Simple/devel

Modified Files:
	perl-Pod-Simple.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Pod-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/devel/perl-Pod-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Pod-Simple.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Pod-Simple.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Pod-Simple
 Version:        3.02
 Release:        1
-Epoch:          0
 Summary:        Framework for parsing POD documentation
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Pod-Coverage/devel perl-Pod-Coverage.spec,1.4,1.5
Message-ID: <200503032346.j23NkTaU023862@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Pod-Coverage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Pod-Coverage/devel

Modified Files:
	perl-Pod-Coverage.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Pod-Coverage.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Coverage/devel/perl-Pod-Coverage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Pod-Coverage.spec	2 Dec 2004 20:06:30 -0000	1.4
+++ perl-Pod-Coverage.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Pod-Coverage
 Version:        0.17
 Release:        1
-Epoch:          0
 Summary:        Checks if the documentation of a module is comprehensive
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-HTML-Tree/devel perl-HTML-Tree.spec,1.1,1.2
Message-ID: <200503032346.j23NkS1q023736@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-HTML-Tree/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-HTML-Tree/devel

Modified Files:
	perl-HTML-Tree.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/devel/perl-HTML-Tree.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Tree.spec	13 Feb 2005 19:36:38 -0000	1.1
+++ perl-HTML-Tree.spec	3 Mar 2005 23:46:26 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-HTML-Tree
 Version:        3.18
 Release:        2
-Epoch:          0
 Summary:        HTML tree handling modules for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-ExtUtils-PkgConfig/devel perl-ExtUtils-PkgConfig.spec, 1.5,
	1.6
Message-ID: <200503032346.j23NkSgT023689@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-ExtUtils-PkgConfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-ExtUtils-PkgConfig/devel

Modified Files:
	perl-ExtUtils-PkgConfig.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-ExtUtils-PkgConfig.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-PkgConfig/devel/perl-ExtUtils-PkgConfig.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-ExtUtils-PkgConfig.spec	15 Feb 2005 02:57:17 -0000	1.5
+++ perl-ExtUtils-PkgConfig.spec	3 Mar 2005 23:46:26 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-ExtUtils-PkgConfig
 Version:        1.07
 Release:        1
-Epoch:          0
 Summary:        Simplistic interface to pkg-config
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IPC-ShareLite/devel perl-IPC-ShareLite.spec,1.4,1.5
Message-ID: <200503032346.j23NkTT0023787@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IPC-ShareLite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IPC-ShareLite/devel

Modified Files:
	perl-IPC-ShareLite.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IPC-ShareLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-ShareLite/devel/perl-IPC-ShareLite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-IPC-ShareLite.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-IPC-ShareLite.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-IPC-ShareLite
 Version:        0.09
 Release:        4
-Epoch:          0
 Summary:        Light-weight Perl interface to shared memory
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-GDGraph3d/devel perl-GDGraph3d.spec,1.4,1.5
Message-ID: <200503032346.j23NkSBo023715@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-GDGraph3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-GDGraph3d/devel

Modified Files:
	perl-GDGraph3d.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-GDGraph3d.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph3d/devel/perl-GDGraph3d.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-GDGraph3d.spec	17 Jan 2005 21:14:52 -0000	1.4
+++ perl-GDGraph3d.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-GDGraph3d
 Version:        0.63
 Release:        2
-Epoch:          0
 Summary:        3D graph generation package for Perl
 
 Group:          Development/Libraries
@@ -16,7 +15,7 @@
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(GD), perl(GD::Text), perl(GD::Graph)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Provides:       perl-GD-Graph3d = %{epoch}:%{version}-%{release}
+Provides:       perl-GD-Graph3d = %{version}-%{release}
 
 %description
 This is the GD::Graph3d extensions module. It provides 3D graphs for



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-ExtUtils-ParseXS/devel perl-ExtUtils-ParseXS.spec, 1.4,
	1.5
Message-ID: <200503032346.j23NkSE1023684@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-ExtUtils-ParseXS/devel

Modified Files:
	perl-ExtUtils-ParseXS.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-ExtUtils-ParseXS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/perl-ExtUtils-ParseXS.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-ExtUtils-ParseXS.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-ExtUtils-ParseXS.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-ExtUtils-ParseXS
 Version:        2.08
 Release:        2
-Epoch:          0
 Summary:        Module and a script for converting Perl XS code into C code
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Razor-Agent/devel perl-Razor-Agent.spec,1.4,1.5
Message-ID: <200503032346.j23NkTwb023874@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Razor-Agent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Razor-Agent/devel

Modified Files:
	perl-Razor-Agent.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Razor-Agent.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Razor-Agent/devel/perl-Razor-Agent.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Razor-Agent.spec	9 Feb 2005 06:49:01 -0000	1.4
+++ perl-Razor-Agent.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,8 +3,7 @@
 
 Name:           perl-Razor-Agent
 Version:        2.67
-Release:        0.FC3
-Epoch:          0
+Release:        1
 Summary:        Use a Razor catalogue server to filter spam messages
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Net-SSLeay/devel perl-Net-SSLeay.spec,1.1,1.2
Message-ID: <200503032346.j23NkTMw023854@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-SSLeay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Net-SSLeay/devel

Modified Files:
	perl-Net-SSLeay.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/devel/perl-Net-SSLeay.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-SSLeay.spec	20 Dec 2004 17:25:07 -0000	1.1
+++ perl-Net-SSLeay.spec	3 Mar 2005 23:46:27 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-Net-SSLeay
 Version:        1.26
 Release:        1
-Epoch:          0
 Summary:        Perl extension for using OpenSSL
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Image-Base/devel perl-Image-Base.spec,1.4,1.5
Message-ID: <200503032346.j23NkSXe023739@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Image-Base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Image-Base/devel

Modified Files:
	perl-Image-Base.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Image-Base.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Base/devel/perl-Image-Base.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Image-Base.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-Image-Base.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Image-Base
 Version:        1.07
 Release:        3
-Epoch:          0
 Summary:        Base class for loading, manipulating and saving images in Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/pgadmin3/devel pgadmin3.spec,1.2,1.3
Message-ID: <200503032353.j23NrFYG024638@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	pgadmin3.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: pgadmin3.spec
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/pgadmin3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pgadmin3.spec	10 Dec 2004 22:03:09 -0000	1.2
+++ pgadmin3.spec	3 Mar 2005 23:53:13 -0000	1.3
@@ -1,24 +1,23 @@
-Summary: 	Graphical client for PostgreSQL.
-Name: 		pgadmin3
+Summary:	Graphical client for PostgreSQL
+Name:		pgadmin3
 Version:	1.0.2
 Release:	3
 License:	Artistic
-Epoch:		0
 Group:		Applications/Databases
-Source:  	ftp://ftp.postgresql.org/pub/pgadmin3/release/src/pgadmin3-1.0.2.tar.gz
-URL: 	 	http://www.pgadmin.org/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: 	wxGTK2-devel wxGTK2-stc wxGTK2-xrc postgresql-devel desktop-file-utils openssl-devel
+Source: 	ftp://ftp.postgresql.org/pub/pgadmin3/release/src/pgadmin3-1.0.2.tar.gz
+URL:		http://www.pgadmin.org/
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	wxGTK2-devel wxGTK2-stc wxGTK2-xrc postgresql-devel desktop-file-utils openssl-devel
 
 %description
-pgAdmin III is a comprehensive PostgreSQL database design 
+pgAdmin III is a comprehensive PostgreSQL database design
 and management system for *nix and Windows systems.
 
 %prep
 %setup -q
 
 %build
-%configure 
+%configure
 #Somehow doesn't link in these..
 make %{?_smp_mflags} LDFLAGS="-lwx_gtk2-2.4 -lwx_gtk2_stc-2.4 -lwx_gtk2_xrc-2.4" all
 
@@ -33,14 +32,14 @@
 desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
 	--add-category X-Fedora\
 	--add-category Application\
-	 --add-category System\
-	 ./pkg/%{name}.desktop 
+	--add-category System\
+	./pkg/%{name}.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(-, root, root)
 %doc LICENCE.txt BUGS.txt README.txt
 %{_bindir}/*



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/php-adodb/devel php-adodb.spec,1.2,1.3
Message-ID: <200503032353.j23NrFk2024642@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-adodb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/php-adodb/devel

Modified Files:
	php-adodb.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: php-adodb.spec
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/php-adodb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-adodb.spec	10 Dec 2004 22:03:09 -0000	1.2
+++ php-adodb.spec	3 Mar 2005 23:53:13 -0000	1.3
@@ -2,7 +2,6 @@
 Summary:        Active Data Objects Data Base
 Version:        4.52
 Release:        1
-Epoch:          0
 Source0:        http://dl.sf.net/adodb/adodb452.tgz
 License:        BSD
 URL:            http://adodb.sf.net
@@ -17,7 +16,7 @@
 standardised. Every database extension uses a different and
 incompatibile API. This creates a need for a database class
 library to hide the differences between the different databases
-(encapsulate the differences) so we can easily switch databases. 
+(encapsulate the differences) so we can easily switch databases.
 
 %prep
 %setup -q -n adodb



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/python-adns/devel python-adns.spec,1.4,1.5
Message-ID: <200503032353.j23NrF5m024674@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-adns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/python-adns/devel

Modified Files:
	python-adns.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: python-adns.spec
===================================================================
RCS file: /cvs/extras/rpms/python-adns/devel/python-adns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-adns.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ python-adns.spec	3 Mar 2005 23:53:13 -0000	1.5
@@ -5,16 +5,15 @@
 Name:           python-adns
 Version:        1.0.0
 Release:        3
-Epoch:          0
-Summary:	Python interface for the GNU adns library
-Group:		Development/Languages
-License:	GPL
-URL:		http://dustman.net/andy/python/adns-python
-Source0:	http://dustman.net/andy/python/adns-python/1.0.0/adns-python-1.0.0.tar.gz
+Summary:        Python interface for the GNU adns library
+Group:          Development/Languages
+License:        GPL
+URL:            http://dustman.net/andy/python/adns-python
+Source0:        http://dustman.net/andy/python/adns-python/1.0.0/adns-python-1.0.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	python-devel, adns-devel
-Requires:	python >= 0:%{pyver}, python < 0:%{pynext}
+BuildRequires:  python-devel, adns-devel
+Requires:       python >= %{pyver}, python < %{pynext}
 
 %description
 The adns module provides an interface to the GNU ADNS asynchronous DNS



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/openslp/devel openslp.spec,1.4,1.5
Message-ID: <200503032353.j23NrFrg024610@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	openslp.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: openslp.spec
===================================================================
RCS file: /cvs/extras/rpms/openslp/devel/openslp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openslp.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ openslp.spec	3 Mar 2005 23:53:13 -0000	1.5
@@ -2,20 +2,19 @@
 
 %define pie 1
 
-Summary: OpenSLP implementation of Service Location Protocol V2
-Name:	 openslp
-Epoch:	 0
+Summary: Open implementation of Service Location Protocol V2
+Name:    openslp
 Version: 1.2.0
 Release: 4%{?dist_tag}
-Group:	 System Environment/Libraries
+Group:   System Environment/Libraries
 License: BSD
-#URL: 	 http://www.openslp.org/
-URL:	 http://sourceforge.net/projects/openslp/
+#URL:     http://www.openslp.org/
+URL:     http://sourceforge.net/projects/openslp/
 Source:  http://dl.sourceforge.net/sourceforge/openslp/openslp-1.2.0.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source1: slpd.init
-Patch1:	 openslp-1.2.0-optflags.patch
+Patch1:  openslp-1.2.0-optflags.patch
 
 BuildRequires: autoconf automake libtool
 BuildRequires: bison flex
@@ -28,20 +27,20 @@
 existence, location, and configuration of networked services in
 enterprise networks.
 
-OpenSLP is an open source implementation of the SLPv2 protocol as defined 
-by RFC 2608 and RFC 2614.   
+OpenSLP is an open source implementation of the SLPv2 protocol as defined
+by RFC 2608 and RFC 2614.
 
 %package devel
 Summary: OpenSLP headers and libraries
-Group:	Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
 %description devel
 OpenSLP header files and libraries.
 
 %package server
 Summary: OpenSLP server daemon
-Group:	 System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Group:   System Environment/Daemons
+Requires: %{name} = %{version}-%{release}
 Requires(preun): chkconfig /sbin/service
 Requires(post): chkconfig
 Requires(postun): /sbin/service
@@ -50,7 +49,7 @@
 
 
 %prep
-%setup -q 
+%setup -q
 
 %patch1 -p1 -b .optflags
 
@@ -87,8 +86,8 @@
 install -p -D -m755  %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/slpd
 
 # nuke unpackaged/unwanted files
-rm -rf	$RPM_BUILD_ROOT/usr/doc
-rm -f 	$RPM_BUILD_ROOT%{_libdir}/*.la	
+rm -rf $RPM_BUILD_ROOT/usr/doc
+rm -f  $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %clean
@@ -113,7 +112,7 @@
 fi
 
 
-%files 
+%files
 %defattr(-,root,root)
 %doc AUTHORS COPYING FAQ NEWS README THANKS
 %doc doc/html/IntroductionToSLP
@@ -132,7 +131,7 @@
 
 %files devel
 %defattr(-,root,root)
-%doc doc/html/ProgrammersGuide 
+%doc doc/html/ProgrammersGuide
 %doc doc/rfc
 %{_includedir}/*
 %{_libdir}/lib*.so
@@ -150,7 +149,7 @@
 
 * Thu Jul 15 2004 Rex Dieter <rexdieter at sf.net> 0:1.2.0-0.fdr.1
 - 1.2.0
-- use -pie 
+- use -pie
 - don't use Requires(post,postun)
 
 * Fri Oct 24 2003 Rex Dieter <rexdieter af sf.net> 0:1.0.11-0.fdr.7
@@ -176,7 +175,7 @@
 * Thu May 1 2003 Rex Dieter <rexdieter at sf.net> 0:1.0.11-0.fdr.2
 - docs: remove CVS files, include rfc, move ProgrammersGuide to -devel.
 - improve sub-pkg descriptions.
-- improve server %%preun,%%postun scripts: condrestart on upgrade, 
+- improve server %%preun,%%postun scripts: condrestart on upgrade,
   suppress output of server shutdown,restarts.
 
 * Thu May 1 2003 Rex Dieter <rexdieter at sf.net> 0:1.0.11-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/perltidy/devel perltidy.spec,1.7,1.8
Message-ID: <200503032353.j23NrFlg024634@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	perltidy.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perltidy.spec
===================================================================
RCS file: /cvs/extras/rpms/perltidy/devel/perltidy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perltidy.spec	16 Dec 2004 19:39:28 -0000	1.7
+++ perltidy.spec	3 Mar 2005 23:53:13 -0000	1.8
@@ -3,7 +3,6 @@
 Name:           perltidy
 Version:        20031021
 Release:        1
-Epoch:          0
 Summary:        Tool for indenting and reformatting Perl scripts
 
 Group:          Development/Tools



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/openbox/devel openbox.spec,1.5,1.6
Message-ID: <200503032353.j23NrFqc024602@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	openbox.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: openbox.spec
===================================================================
RCS file: /cvs/extras/rpms/openbox/devel/openbox.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openbox.spec	13 Nov 2004 02:04:50 -0000	1.5
+++ openbox.spec	3 Mar 2005 23:53:13 -0000	1.6
@@ -1,8 +1,7 @@
 Summary: Openbox window manager
 Name: openbox
 Version: 2.3.1
-Release: 0.fdr.5.2
-Epoch: 0
+Release: 1
 URL: http://www.icculus.org/openbox/
 Source0: http://www.icculus.org/openbox/releases/%{name}-%{version}.tar.gz
 Source1: openbox-switchdesk.Xclients
@@ -13,7 +12,7 @@
 Group: User Interface/X
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: XFree86-devel, fontconfig-devel, bison
-Conflicts: fluxbox <= 0:0.1.14
+Conflicts: fluxbox <= 0.1.14
 
 %description
 Openbox is a window manager for the X11 windowing system. It currently



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/pdftohtml/devel pdftohtml.spec,1.5,1.6
Message-ID: <200503032353.j23NrFXE024630@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	pdftohtml.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: pdftohtml.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftohtml/devel/pdftohtml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pdftohtml.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ pdftohtml.spec	3 Mar 2005 23:53:13 -0000	1.6
@@ -1,13 +1,12 @@
 Name:		pdftohtml
 Version:	0.36
 Release:	3
-Epoch:      0
-Summary:	A PDF to HTML converter.
+Summary:	PDF to HTML converter
 Url:		http://pdftohtml.sourceforge.net/
 Source0:	http://dl.sf.net/pdftohtml/pdftohtml-0.36.tar.gz
 License:	GPL
 Group:		Applications/Text
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 PDFTOHTML converts Portable Document Format (PDF) files to HTML



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/python-crypto/devel python-crypto.spec,1.5,1.6
Message-ID: <200503032353.j23NrFiX024682@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-crypto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/python-crypto/devel

Modified Files:
	python-crypto.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: python-crypto.spec
===================================================================
RCS file: /cvs/extras/rpms/python-crypto/devel/python-crypto.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-crypto.spec	18 Dec 2004 14:40:32 -0000	1.5
+++ python-crypto.spec	3 Mar 2005 23:53:13 -0000	1.6
@@ -1,20 +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)")}
 
-Summary: 	A cryptography library for Python.
-Name: 		python-crypto
-Version: 	2.0
-Epoch:		0
-Release: 	2
-License: 	Python License (CNRI Python License)
-Group: 		Development/Libraries
-URL: 		http://www.amk.ca/python/code/crypto.html
+Summary:	Cryptography library for Python
+Name:		python-crypto
+Version:	2.0
+Release:	2
+License:	Python License (CNRI Python License)
+Group:		Development/Libraries
+URL:		http://www.amk.ca/python/code/crypto.html
 Source:		http://www.amk.ca/files/python/crypto/pycrypto-2.0.tar.gz
 Patch0:		%{name}-x86_64-buildfix.patch
-BuildRequires:	python >= 0:2.2
-BuildRequires:	python-devel >= 0:2.2
-BuildRequires:	gmp-devel >= 0:4.1
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n)
+BuildRequires:	python >= 2.2
+BuildRequires:	python-devel >= 2.2
+BuildRequires:	gmp-devel >= 4.1
+BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n)
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
@@ -24,10 +23,10 @@
 
 # The pre section.
 %prep
-%setup -n pycrypto-2.0 -q 
+%setup -n pycrypto-2.0 -q
 %ifarch x86_64
 %patch0 -b .patch0
-%endif 
+%endif
 
 # The build section.
 %build
@@ -45,7 +44,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 # The files section.
-%files 
+%files
 %defattr(-,root,root,-)
 %doc README TODO ACKS ChangeLog LICENSE Doc Demo
 %{python_sitearch}/Crypto/*.py
@@ -79,7 +78,7 @@
 %changelog
 * Sat Dec 18 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:2.0-2
 - Fix build on x86_64: use python_sitearch for files and patch source
-  to find gmp 
+  to find gmp
 
 * Thu Aug 26 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:2.0-0.fdr.1
 - Update to 2.00



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/parchive/devel parchive.spec,1.5,1.6
Message-ID: <200503032353.j23NrFvp024618@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	parchive.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: parchive.spec
===================================================================
RCS file: /cvs/extras/rpms/parchive/devel/parchive.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- parchive.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ parchive.spec	3 Mar 2005 23:53:13 -0000	1.6
@@ -1,11 +1,10 @@
 Summary:          Parity archive command line client
 Name:             parchive
-Version:          1.1 
+Version:          1.1
 Release:          2
-Epoch:            0
 URL:              http://parchive.sourceforge.net/
 License:          GPL
-Group:            Applications/Archiving 
+Group:            Applications/Archiving
 Source0:          http://download.sourceforge.net/parchive/par-v1.1.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -14,10 +13,10 @@
 data-recovery capability concepts of RAID-like systems to the posting
 and recovery of multi-part archives on Usenet. Current filespec and
 clients support the 'Reed-Soloman Code' implementation that allows for
-recovery of any 'X' volumes for 'X' parity volumes present. 
-                       
+recovery of any 'X' volumes for 'X' parity volumes present.
+
 %prep
-%setup -q -n par-cmdline 
+%setup -q -n par-cmdline
 
 %build
 make %{?_smp_mflags} "CFLAGS=-Wall %{optflags}"
@@ -28,7 +27,7 @@
 install -m 755 par %{buildroot}%{_bindir}/par
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/psi/devel psi.spec,1.7,1.8
Message-ID: <200503032353.j23NrFoh024658@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	psi.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/psi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- psi.spec	12 Jan 2005 21:11:58 -0000	1.7
+++ psi.spec	3 Mar 2005 23:53:13 -0000	1.8
@@ -5,7 +5,6 @@
 Version:    0.9.3
 Release:    1
 Summary:    Jabber client using QT3
-Epoch:      0
 License:    GPL
 Group:      Applications/Internet
 URL:        http://psi.affinix.com/
@@ -16,7 +15,7 @@
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	qt-devel >= 1:3.1.1
+BuildRequires:  qt-devel >= 1:3.1.1
 BuildRequires:  XFree86-devel
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
@@ -25,31 +24,31 @@
 BuildRequires:  kdelibs-devel
 %endif
 
-Requires:   sox
-Requires:   gnupg
+Requires:    sox
+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
+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
@@ -83,9 +82,9 @@
 provides gateways to other protocols as AIM, ICQ, MSN and Yahoo!.
 
 %package -n %name-i18n
-Summary:	Language packs for Psi
-Group:		Applications/Internet
-Requires:	psi = 0:%version
+Summary:    Language packs for Psi
+Group:      Applications/Internet
+Requires:   psi = %version
 
 %description -n %name-i18n
 This package adds internationalization to Psi.
@@ -96,7 +95,7 @@
 %package -n %name-icons
 Summary:    Additional icons for Psi
 Group:      Applications/Internet
-Requires:   psi >= 0:0.9.1
+Requires:   psi >= 0.9.1
 
 %description -n %name-icons
 This package contains additional icons for Psi
@@ -121,11 +120,11 @@
 export KDEDIR=%(kde-config --prefix)
 %endif
 
-./configure                     \
-	--prefix=%{_prefix}     \
-	--bindir=%{_bindir}     \
-	--libdir=%{_datadir}/%name  \
-	--qtdir=$QTDIR
+./configure                        \
+        --prefix=%{_prefix}        \
+        --bindir=%{_bindir}        \
+        --libdir=%{_datadir}/%name \
+        --qtdir=$QTDIR
 
 # Fix build for FC1
 make qmake
@@ -205,7 +204,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(0644,root,root,0755)
 #%doc README COPYING libpsi/iconset/ICONSET-HOWTO
 %attr(0755,root,root) %{_bindir}/psi
@@ -216,7 +215,7 @@
 %exclude %{_datadir}/%{name}/*.qm
 %exclude %{_datadir}/%{name}/iconsets/*/*.jisp
 
-%files -n %name-i18n 
+%files -n %name-i18n
 %defattr(0644,root,root,0755)
 %{_datadir}/%name/%{name}_*.qm
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/python-imaging/devel python-imaging.spec,1.3,1.4
Message-ID: <200503032353.j23NrFFw024690@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-imaging/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/python-imaging/devel

Modified Files:
	python-imaging.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/devel/python-imaging.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-imaging.spec	11 Feb 2005 13:17:58 -0000	1.3
+++ python-imaging.spec	3 Mar 2005 23:53:13 -0000	1.4
@@ -2,9 +2,8 @@
 %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 %define py_incdir %{_includedir}/python%{pyver}
 
-Summary: Python's own image processing library 
+Summary: Python's own image processing library
 Name: python-imaging
-Epoch: 0
 Version: 1.1.4
 Release: 7
 License: Distributable
@@ -24,9 +23,9 @@
 Requires: python-abi = %{pyver}
 
 %description
-Python Imaging Library 
-   
-The Python Imaging Library (PIL) adds image processing capabilities 
+Python Imaging Library
+
+The Python Imaging Library (PIL) adds image processing capabilities
 to your Python interpreter.
 
 This library provides extensive file format support, an efficient
@@ -37,12 +36,11 @@
 %package devel
 Summary: Development files for python-imaging.
 Group: Development/Languages
-Requires: %{name} = %{epoch}:%{version}-%{release}, python-devel, %{py_incdir}
+Requires: %{name} = %{version}-%{release}, python-devel, %{py_incdir}
 
 %description devel
 Development files for python-imaging.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q -n Imaging-%{version}
@@ -54,7 +52,6 @@
 %patch5 -p1
 %patch6 -p1
 
-#---------------------------------------------------------------------
 
 %build
 cd libImaging
@@ -68,7 +65,6 @@
 cd ..
 %{__python} setup.py build
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -76,17 +72,14 @@
 install -m 644 libImaging/*.h $RPM_BUILD_ROOT/%{py_incdir}/Imaging
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %check || :
 PYTHONPATH=$(ls -1d build/lib.linux*) %{__python} selftest.py
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files
 %defattr (-,root,root)
@@ -103,6 +96,7 @@
 %{py_incdir}/Imaging
 %doc Doc Scripts Images Sane
 
+
 %changelog
 * Mon Feb  7 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.1.4-7
 - Build PIC on x86_64 to fix x86_64 linking.
@@ -115,7 +109,7 @@
 
 * Sun Nov 30 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.4-0.fdr.5
 - added -devel package (thanks to patch from pmatilai at welho.com)
-- FC1 requires dependency to tcl-devel and tk-devel package 
+- FC1 requires dependency to tcl-devel and tk-devel package
 
 * Wed Jul 16 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.4-0.fdr.4
 - bumped release
@@ -126,7 +120,7 @@
 
 * Sat Jul 12 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.4-0.fdr.3
 - fixed source0 to point into effbot.org instead of pythonware.com
-- changed references from python2 to python, since python in RH9 is 
+- changed references from python2 to python, since python in RH9 is
   python 2.2.
 - removed percent signs from changelog.
 
@@ -140,7 +134,7 @@
 
 * Tue May 20 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.3-0.fdr.5
 - added python2-devel into buildrequires.
-- added versionm variable into setup macro instead of hard coded 
+- added versionm variable into setup macro instead of hard coded
   version number.
 
 * Mon May 12 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.3-0.fdr.4
@@ -168,7 +162,7 @@
 - switched from python 1.5.2 to python 2.2
 - other modifications to make it build at minimal effort
 
-* Tue Sep 12 2000 Ray Garcia <rayg at ssec.wisc.edu> 
+* Tue Sep 12 2000 Ray Garcia <rayg at ssec.wisc.edu>
 - update to 1.1
 
 * Thu Mar 30 2000 Frederic Lepied <flepied at mandrakesoft.com> 1.0b1-3mdk
@@ -187,11 +181,11 @@
 
 * Sun Dec 27 1998 Oliver Andrich <oli at andrich.net>
 - changed Setup file so that the tkinter module is compiled with Tix and BLT
-	support
+  support
 
 * Mon Jul 20 1998 Oliver Andrich <oli at andrich.net>
 - had to recompile and update the package to support the uptodate graphics
-	libs
+  libs
 
 * Sat Jun 07 1998 Oliver Andrich <oli at andrich.net>
 - updated package to version 0.3a4



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/p0f/devel p0f.spec,1.3,1.4
Message-ID: <200503032353.j23NrF3S024614@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	p0f.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: p0f.spec
===================================================================
RCS file: /cvs/extras/rpms/p0f/devel/p0f.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- p0f.spec	2 Dec 2004 01:10:15 -0000	1.3
+++ p0f.spec	3 Mar 2005 23:53:13 -0000	1.4
@@ -1,8 +1,7 @@
 Name: p0f
 Version: 2.0.5
 Release: 1
-Epoch:	0
-Summary: A versatile passive OS fingerprinting tool.
+Summary: Versatile passive OS fingerprinting tool
 Group: Applications/Internet
 License: GPL
 URL: http://lcamtuf.coredump.cx/p0f.shtml
@@ -51,6 +50,7 @@
 %config %{_sysconfdir}/p0f/p0fo.fp
 %{_mandir}/man1/p0f.1.gz
 
+
 %changelog
 * Tue Oct 26 2004 Adrian Reber <adrian at lisas.de> - 0:2.0.5-1
 - updated to 2.0.5



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/pcsc-perl/devel pcsc-perl.spec,1.1,1.2
Message-ID: <200503032353.j23NrFDK024626@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pcsc-perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/pcsc-perl/devel

Modified Files:
	pcsc-perl.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: pcsc-perl.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-perl/devel/pcsc-perl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcsc-perl.spec	7 Jan 2005 20:15:46 -0000	1.1
+++ pcsc-perl.spec	3 Mar 2005 23:53:13 -0000	1.2
@@ -1,10 +1,9 @@
-%define pcscver %(rpm -q --qf %%{epoch}:%%{version} pcsc-lite-libs)
+%define pcscver %(rpm -q --qf %%{version} pcsc-lite-libs)
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           pcsc-perl
 Version:        1.3.1
 Release:        4
-Epoch:          0
 Summary:        Perl interface to the PC/SC smart card library
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/pth/devel pth.spec,1.7,1.8
Message-ID: <200503032353.j23NrFXJ024662@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	pth.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: pth.spec
===================================================================
RCS file: /cvs/extras/rpms/pth/devel/pth.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pth.spec	27 Feb 2005 20:00:29 -0000	1.7
+++ pth.spec	3 Mar 2005 23:53:13 -0000	1.8
@@ -1,8 +1,7 @@
-Summary:        GNU Pth - The GNU Portable Threads
+Summary:        The GNU Portable Threads
 Name:           pth
 Version:        2.0.4
 Release:        1
-Epoch:          0
 License:        LGPL
 Group:          System Environment/Libraries
 URL:            http://www.gnu.org/software/pth/
@@ -21,7 +20,7 @@
 %package devel
 Summary:        Development headers and libraries for GNU Pth
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 Development headers and libraries for GNU Pth.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/pcsc-lite/devel pcsc-lite.spec,1.1,1.2
Message-ID: <200503032353.j23NrF4G024622@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pcsc-lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/pcsc-lite/devel

Modified Files:
	pcsc-lite.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcsc-lite.spec	7 Jan 2005 19:57:18 -0000	1.1
+++ pcsc-lite.spec	3 Mar 2005 23:53:13 -0000	1.2
@@ -1,7 +1,6 @@
 Name:           pcsc-lite
 Version:        1.2.0
 Release:        10
-Epoch:          0
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
@@ -28,8 +27,8 @@
 %package        libs
 Summary:        PC/SC Lite libraries
 Group:          System Environment/Libraries
-Provides:       libpcsc-lite = %{epoch}:%{version}-%{release}
-Provides:       libmusclecard = %{epoch}:%{version}-%{release}
+Provides:       libpcsc-lite = %{version}-%{release}
+Provides:       libmusclecard = %{version}-%{release}
 
 %description    libs
 PC/SC Lite libraries.
@@ -37,9 +36,9 @@
 %package        devel
 Summary:        PC/SC Lite development files
 Group:          Development/Libraries
-Requires:       %{name}-libs = %{epoch}:%{version}-%{release}, pkgconfig
-Provides:       libpcsc-lite-devel = %{epoch}:%{version}-%{release}
-Provides:       libmusclecard-devel = %{epoch}:%{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}, pkgconfig
+Provides:       libpcsc-lite-devel = %{version}-%{release}
+Provides:       libmusclecard-devel = %{version}-%{release}
 
 %description    devel
 PC/SC Lite development files.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/pinentry/devel pinentry.spec,1.5,1.6
Message-ID: <200503032353.j23NrFxd024646@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	pinentry.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: pinentry.spec
===================================================================
RCS file: /cvs/extras/rpms/pinentry/devel/pinentry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pinentry.spec	10 Dec 2004 22:03:09 -0000	1.5
+++ pinentry.spec	3 Mar 2005 23:53:13 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           pinentry
 Version:        0.7.1
 Release:        3
-Epoch:          0
 Summary:        Collection of simple PIN or passphrase entry dialogs
 
 Group:          Applications/System
@@ -18,7 +17,7 @@
 # texinfo needed because of patch0
 BuildRequires:  texinfo
 Requires:       %{_sbindir}/update-alternatives, /sbin/install-info
-Provides:       %{name}-curses = %{epoch}:%{version}-%{release}
+Provides:       %{name}-curses = %{version}-%{release}
 
 %description
 Pinentry is a collection of simple PIN or passphrase entry dialogs which
@@ -29,9 +28,9 @@
 %package        gtk
 Summary:        Passphrase/PIN entry dialog based on GTK+
 Group:          Applications/System
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       %{_sbindir}/update-alternatives
-Provides:       %{name}-gui = %{epoch}:%{version}-%{release}
+Provides:       %{name}-gui = %{version}-%{release}
 
 %description    gtk
 Pinentry is a collection of simple PIN or passphrase entry dialogs which
@@ -42,9 +41,9 @@
 %package        qt
 Summary:        Passphrase/PIN entry dialog based on Qt
 Group:          Applications/System
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       %{_sbindir}/update-alternatives
-Provides:       %{name}-gui = %{epoch}:%{version}-%{release}
+Provides:       %{name}-gui = %{version}-%{release}
 
 %description    qt
 Pinentry is a collection of simple PIN or passphrase entry dialogs which



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/prozilla/devel prozilla.spec,1.7,1.8
Message-ID: <200503032353.j23NrFxm024654@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	prozilla.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/devel/prozilla.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- prozilla.spec	9 Feb 2005 20:12:15 -0000	1.7
+++ prozilla.spec	3 Mar 2005 23:53:13 -0000	1.8
@@ -1,13 +1,12 @@
-Summary:	An advanced Linux download manager
+Summary:	Advanced Linux download manager
 Name:		prozilla
-Version: 	1.3.7.3
+Version:	1.3.7.3
 Release:	1
-Epoch:		0
 License:	GPL
 Group:		Applications/Internet
-Source0:	http://prozilla.genesys.ro/downloads/prozilla/tarballs/%{name}-%{version}.tar.gz 
+Source0:	http://prozilla.genesys.ro/downloads/prozilla/tarballs/%{name}-%{version}.tar.gz
 URL:		http://prozilla.genesys.ro/
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel
 
 
@@ -15,7 +14,7 @@
 ProZilla is a download accellerator program written for Linux to speed
 up the normal file download process. It often gives speed increases of
 around 200% to 300%. It supports both FTP and HTTP protocols, and the
-theory behind it is very simple. 
+theory behind it is very simple.
 
 The program opens multiple connections to a server, and each of the
 connections downloads a part of the file, thus defeating existing
@@ -42,7 +41,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ANNOUNCE AUTHORS ChangeLog COPYING CREDITS FAQ INSTALL NEWS README TODO 
+%doc ANNOUNCE AUTHORS ChangeLog COPYING CREDITS FAQ INSTALL NEWS README TODO
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf-sample
 %{_prefix}/bin/proz



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/proj/devel proj.spec,1.1,1.2
Message-ID: <200503032353.j23NrF4O024650@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	proj.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: proj.spec
===================================================================
RCS file: /cvs/extras/rpms/proj/devel/proj.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proj.spec	14 Jan 2005 09:45:21 -0000	1.1
+++ proj.spec	3 Mar 2005 23:53:13 -0000	1.2
@@ -1,7 +1,6 @@
 Name: proj
 Version: 4.4.8
 Release: 4
-Epoch: 0
 Summary: Cartographic projection software (PROJ.4)
 
 Group: Applications/Engineering
@@ -15,18 +14,18 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %package devel
-Summary:	Development files for PROJ.4
-Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Summary: Development files for PROJ.4
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %package nad
-Summary:	US and Canadian datum shift grids for PROJ.4
-Group:		Applications/Engineering
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Summary: US and Canadian datum shift grids for PROJ.4
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
 
 %description
-Proj and invproj perform respective forward and inverse transformation of 
-cartographic data to or from cartesian data with a wide range of selectable 
+Proj and invproj perform respective forward and inverse transformation of
+cartographic data to or from cartesian data with a wide range of selectable
 projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/
 
 %description devel



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/ocaml/devel ocaml.spec,1.9,1.10
Message-ID: <200503032353.j23NrFYe024598@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ocaml.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ocaml.spec	12 Feb 2005 16:39:53 -0000	1.9
+++ ocaml.spec	3 Mar 2005 23:53:13 -0000	1.10
@@ -1,22 +1,22 @@
-Name: 		ocaml
-Version: 	3.08.2
+Name:		ocaml
+Version:	3.08.2
 Release:	2
-Epoch:		0
-Summary: 	The Objective Caml compiler and programming environment
+Summary:	Objective Caml compiler and programming environment
 
-Group: 		Development/Languages
-License: 	QPL/LGPL
+Group:		Development/Languages
+License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0: 	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.2.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
-Patch:	 	ocaml-rpath.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.2.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
+Patch:		ocaml-rpath.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
-Requires(post,preun): /sbin/install-info
+Requires(post):	/sbin/install-info
+Requires(preun):	/sbin/install-info
 
 %description
 Objective Caml is a high-level, strongly-typed, functional and
@@ -30,7 +30,7 @@
 %package -n labltk
 Group:		Development/Languages
 Summary:	Tk bindings for Objective Caml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 
 %description -n labltk
 A library for interfacing Objective Caml with the scripting language
@@ -38,8 +38,8 @@
 
 %package -n camlp4
 Group:		Development/Languages
-Summary:	A Pre-Processor-Pretty-Printer for OCaml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Summary:	Pre-Processor-Pretty-Printer for OCaml
+Requires:	ocaml = %{version}-%{release}
 
 %description -n camlp4
 Camlp4 is a Pre-Processor-Pretty-Printer for OCaml, parsing a source
@@ -48,7 +48,7 @@
 %package ocamldoc
 Group:		Development/Languages
 Summary:	Documentation generator for OCaml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 
 %description ocamldoc
 Documentation generator for Objective Caml.
@@ -56,7 +56,7 @@
 %package emacs
 Group:		Development/Languages
 Summary:	Emacs mode for Objective Caml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 Requires:	emacs
 
 %description emacs
@@ -65,7 +65,7 @@
 %package docs
 Group:		Development/Languages
 Summary:	Documentation for OCaml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 
 %description docs
 Documentation for Objective Caml.
@@ -113,7 +113,7 @@
     %{_infodir}/dir 2>/dev/null || :
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 fi
 
@@ -183,7 +183,7 @@
 - New Version 3.08.2
 
 * Thu Dec 30 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:3.07-6
-- add -x11lib %%{_prefix}/X11R6/%%{_lib} to configure; fixes labltk build 
+- add -x11lib %%{_prefix}/X11R6/%%{_lib} to configure; fixes labltk build
   on x86_64
 
 * Tue Dec  2 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:3.07-0.fdr.5



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/pybliographer/devel pybliographer.spec,1.4,1.5
Message-ID: <200503032353.j23NrFgq024670@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	pybliographer.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pybliographer.spec	22 Feb 2005 22:46:02 -0000	1.4
+++ pybliographer.spec	3 Mar 2005 23:53:13 -0000	1.5
@@ -1,8 +1,7 @@
-Summary: A framework for working with bibliographic databases.
+Summary: Framework for working with bibliographic databases
 Name: pybliographer
 Version: 1.2.6.2
 Release: 1
-Epoch: 0
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.6.2.tar.gz
@@ -30,15 +29,15 @@
 
 
 %description
-Pybliographer is a tool for managing bibliographic databases. It can be 
-used for searching, editing, reformatting, etc. In fact, it's a simple 
-framework that provides easy to use python classes and functions, and 
+Pybliographer is a tool for managing bibliographic databases. It can be
+used for searching, editing, reformatting, etc. In fact, it's a simple
+framework that provides easy to use python classes and functions, and
 therefore can be extended to many uses (generating HTML pages according
 to bibliographic searches, etc).
-In addition to the scripting environment, a graphical Gnome interface 
-is available. It provides powerful editing capabilities, a nice 
-hierarchical search mechanism, direct insertion of references into LyX, 
-direct queries on Medline, and more. It currently supports the following 
+In addition to the scripting environment, a graphical Gnome interface
+is available. It provides powerful editing capabilities, a nice
+hierarchical search mechanism, direct insertion of references into LyX,
+direct queries on Medline, and more. It currently supports the following
 file formats: BibTeX, ISI, Medline, Ovid, Refer.
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/python-dialog/devel python-dialog.spec,1.3,1.4
Message-ID: <200503032353.j23NrFtt024686@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-dialog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/python-dialog/devel

Modified Files:
	python-dialog.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: python-dialog.spec
===================================================================
RCS file: /cvs/extras/rpms/python-dialog/devel/python-dialog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-dialog.spec	10 Feb 2005 18:25:12 -0000	1.3
+++ python-dialog.spec	3 Mar 2005 23:53:13 -0000	1.4
@@ -5,7 +5,6 @@
 Name:           python-dialog
 Version:        2.7
 Release:        1
-Epoch:          0
 Summary:        Python interface to the Unix dialog utility
 
 Group:          Development/Languages
@@ -36,7 +35,7 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --prefix=%{_prefix}
 
- 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -57,6 +56,6 @@
 * Sat Feb 05 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 0:2.0.6-2
 - Change %%python_sitearch to %%python_sitelib as sitearch references
   /usr/lib64 on x86_64 multilib and the python files install to /usr/lib.
-  
+
 * Sat Jul 24 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.06-0.fdr.1
 - Initial Fedora Package



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/openct/devel openct.spec,1.2,1.3
Message-ID: <200503032353.j23NrFpH024606@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	openct.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openct.spec	25 Feb 2005 20:24:55 -0000	1.2
+++ openct.spec	3 Mar 2005 23:53:13 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           openct
 Version:        0.6.2
 Release:        2
-Epoch:          0
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -31,7 +30,7 @@
 %package        devel
 Summary:        OpenCT development files
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}, pkgconfig
+Requires:       %{name} = %{version}-%{release}, pkgconfig
 
 %description    devel
 %{summary}.
@@ -39,9 +38,9 @@
 %package     -n pcsc-lite-%{name}
 Summary:        OpenCT PC/SC Lite driver
 Group:          System Environment/Daemons
-Requires:       pcsc-lite >= 0:1.2.0
+Requires:       pcsc-lite >= 1.2.0
 Provides:       pcsc-ifd-handler
-Provides:       %{name}-pcsc-lite = %{epoch}:%{version}-%{release}
+Provides:       %{name}-pcsc-lite = %{version}-%{release}
 
 %description -n pcsc-lite-%{name}
 The OpenCT PC/SC Lite driver makes smart card readers supported by



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/putty/devel putty.spec,1.7,1.8
Message-ID: <200503032353.j23NrFTl024666@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	putty.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: putty.spec
===================================================================
RCS file: /cvs/extras/rpms/putty/devel/putty.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- putty.spec	21 Feb 2005 13:18:35 -0000	1.7
+++ putty.spec	3 Mar 2005 23:53:13 -0000	1.8
@@ -1,29 +1,24 @@
-Name: 		putty
-Version: 	0.57
-Release: 	1
-Epoch:          0
-Summary:	Putty - a SSH, Telnet & Rlogin client
-License: 	MIT
-Group: 		Applications/Internet
-Url: 		http://www.chiark.greenend.org.uk/~sgtatham/putty/
-Source0: 	http://the.earth.li/~sgtatham/putty/latest/putty-0.57.tar.gz
+Name:		putty
+Version:	0.57
+Release:	1
+Summary:	SSH, Telnet and Rlogin client
+License:	MIT
+Group:		Applications/Internet
+URL:		http://www.chiark.greenend.org.uk/~sgtatham/putty/
+Source0:	http://the.earth.li/~sgtatham/putty/latest/putty-0.57.tar.gz
 Source1:	putty.desktop
-Source2:        putty.png
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: 	gtk+-devel desktop-file-utils
+Source2:	putty.png
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	gtk+-devel desktop-file-utils
 
 
-#---------------------------------------------------------------------
-
 %description
 Putty is a SSH, Telnet & Rlogin client - this time for Linux.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
 
-#---------------------------------------------------------------------
 
 %build
 ./mkfiles.pl
@@ -33,7 +28,6 @@
 make %{?_smp_mflags}
 popd
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,7 +47,6 @@
 
 install -m644 -D -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/putty.png
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root)
@@ -63,9 +56,11 @@
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/putty.png
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %changelog
 * Mon Feb 21 2005 Adrian Reber <adrian at lisas.de> - 0.57-1
 - Updated to 0.57



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/python-bibtex/devel python-bibtex.spec,1.4,1.5
Message-ID: <200503032353.j23NrFW2024678@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-bibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/python-bibtex/devel

Modified Files:
	python-bibtex.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: python-bibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/python-bibtex/devel/python-bibtex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-bibtex.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ python-bibtex.spec	3 Mar 2005 23:53:13 -0000	1.5
@@ -2,31 +2,29 @@
 %{!?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)")}
 
-Summary: Python extension to parse BibTeX files.
+Summary: Python extension to parse BibTeX files
 Name: python-bibtex
 Version: 1.2.1
 Release: 1
-Epoch: 0
 License: GPL
 Group: Development/Libraries
 Source: http://dl.sf.net/pybliographer/python-bibtex-1.2.1.tar.gz
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: python >= 0:2.2
-BuildRequires: python-devel >= 0:2.2
-BuildRequires: glib2-devel >= 0:2.0
-BuildRequires: recode-devel >= 0:3.6-11
+BuildRequires: python >= 2.2
+BuildRequires: python-devel >= 2.2
+BuildRequires: glib2-devel >= 2.0
+BuildRequires: recode-devel >= 3.6-11
 
-Requires: python >= 0:2.2
-Requires: recode >= 0:3.6-11
+Requires: python >= 2.2
+Requires: recode >= 3.6-11
 
 %description
 This module contains two extensions needed for pybliographer:
-         
-	- a bibtex parser
-	- a simple binding to GNU Recode
-         
+- a bibtex parser
+- a simple binding to GNU Recode
+
 %prep
 %setup -q
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/python-reportlab/devel python-reportlab.spec,1.3,1.4
Message-ID: <200503032353.j23NrFXB024698@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-reportlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/python-reportlab/devel

Modified Files:
	python-reportlab.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: python-reportlab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/devel/python-reportlab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-reportlab.spec	10 Dec 2004 22:03:10 -0000	1.3
+++ python-reportlab.spec	3 Mar 2005 23:53:13 -0000	1.4
@@ -4,18 +4,17 @@
 Name:           python-reportlab
 Version:        1.19
 Release:        2
-Epoch:          0
 Summary:        Python PDF generation library
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.reportlab.org/
 Source0:        http://www.reportlab.org/ftp/ReportLab_1_19.tgz
-         
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel >= 0:2.2  
-Requires:       python >= 0:%{pyver}, python < 0:%{pynext}
+BuildRequires:  python-devel >= 2.2
+Requires:       python >= %{pyver}, python < %{pynext}
 
 %description
 Python PDF generation library.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/python-numeric/devel python-numeric.spec,1.3,1.4
Message-ID: <200503032353.j23NrFM4024694@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-numeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/python-numeric/devel

Modified Files:
	python-numeric.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: python-numeric.spec
===================================================================
RCS file: /cvs/extras/rpms/python-numeric/devel/python-numeric.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-numeric.spec	10 Dec 2004 22:03:10 -0000	1.3
+++ python-numeric.spec	3 Mar 2005 23:53:13 -0000	1.4
@@ -3,7 +3,6 @@
 Name:           python-numeric
 Version:        23.3
 Release:        2
-Epoch:          0
 Summary:        Fast multidimensional array functions for Python
 
 Group:          Development/Languages
@@ -16,7 +15,7 @@
 BuildRequires:  python-devel
 BuildRequires:  lapack
 Requires:       python, %{python_sitearch}
-Provides:       python-numeric-devel = %{epoch}:%{version}-%{release}
+Provides:       python-numeric-devel = %{version}-%{release}
 
 
 %description



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/rdiff-backup/devel rdiff-backup.spec,1.5,1.6
Message-ID: <200503040005.j2405iCk025914@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/rdiff-backup/devel

Modified Files:
	rdiff-backup.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rdiff-backup.spec	22 Jan 2005 20:27:02 -0000	1.5
+++ rdiff-backup.spec	4 Mar 2005 00:05:42 -0000	1.6
@@ -4,15 +4,14 @@
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1
-Epoch: 0
 URL: http://www.nongnu.org/rdiff-backup/
 Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/Archiving
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python-devel >= 0:2.2, librsync-devel >= 0:0.9.6
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6
 
-Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
 rdiff-backup is a script, written in Python, that backs up one
@@ -43,6 +42,7 @@
 
 %files
 %defattr(-,root,root)
+%doc CHANGELOG COPYING FAQ.html README
 %{_bindir}/rdiff-backup
 %{_mandir}/man1/rdiff-backup*
 %dir %{python_sitearch}/rdiff_backup
@@ -50,7 +50,6 @@
 %{python_sitearch}/rdiff_backup/*.pyc
 %{python_sitearch}/rdiff_backup/*.so
 %ghost %{python_sitearch}/rdiff_backup/*.pyo
-%doc CHANGELOG COPYING FAQ.html README
 
 %changelog
 * Sat Jan 22 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.12.7-1



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/qof/devel qof.spec,1.3,1.4
Message-ID: <200503040005.j2405ifs025906@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	qof.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qof.spec	10 Dec 2004 22:03:10 -0000	1.3
+++ qof.spec	4 Mar 2005 00:05:42 -0000	1.4
@@ -1,17 +1,16 @@
 Name:           qof
 Version:        0.5.0
 Release:        2
-Epoch:          0
-Summary:        QOF provides a query engine library for C objects.
+Summary:        QOF provides a 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
+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
+Patch1:         http://www.tiki-lounge.com/~toshio/fedora/qof-linker-dependency.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -36,12 +35,12 @@
 of local objects can act as a 'cache' to a much larger SQL database.
 
 %package        devel
-Summary:        Development tools for programs which will use the qof library.
+Summary:        Development tools for programs which will use the qof library
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       libxml2-devel
-Requires:	glib2-devel
-Requires:	pkgconfig
+Requires:       glib2-devel
+Requires:       pkgconfig
 
 %description    devel
 QOF - The Query Object Framework is a C library that provides a query engine



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/qiv/devel qiv.spec,1.5,1.6
Message-ID: <200503040005.j2405i7R025902@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	qiv.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: qiv.spec
===================================================================
RCS file: /cvs/extras/rpms/qiv/devel/qiv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qiv.spec	10 Dec 2004 22:03:10 -0000	1.5
+++ qiv.spec	4 Mar 2005 00:05:42 -0000	1.6
@@ -1,10 +1,9 @@
 Name:           qiv
 Version:        2.0
 Release:        1
-Epoch:          0
 Summary:        Quick Image Viewer
 
-Group:          Applications/Multimedia 
+Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.klografx.net/qiv/
 Source0:        http://www.klografx.net/qiv/download/qiv-2.0-src.tgz



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/qca-tls/devel qca-tls.spec,1.4,1.5
Message-ID: <200503040005.j2405ioU025898@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/qca-tls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/qca-tls/devel

Modified Files:
	qca-tls.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: qca-tls.spec
===================================================================
RCS file: /cvs/extras/rpms/qca-tls/devel/qca-tls.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qca-tls.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ qca-tls.spec	4 Mar 2005 00:05:42 -0000	1.5
@@ -2,12 +2,11 @@
 Version:	1.0
 Release:	2
 Summary:	Qt Cryptographic Architecture, TLS plugin
-Epoch:      0
 License:	LGPL
 Group:		Applications/Internet
 URL:		http://delta.affinix.com/qca/
 Source0:	http://delta.affinix.com/qca/qca-tls-1.0.tar.bz2
-Patch0:     qca-tls-1.0-mach.patch
+Patch0:		qca-tls-1.0-mach.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	qt-devel >= 1:3.1.1, XFree86-devel
@@ -18,11 +17,11 @@
 This is a plugin to provide SSL/TLS capability to programs that use
 the Qt Cryptographic Architecture (QCA).
 QCA is a library providing an easy API for several cryptographic
-algorithmns to Qt programs. 
+algorithmns to Qt programs.
 This package only contains the TLS plugin.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p0 -b .mach
 
 
@@ -45,7 +44,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(0644,root,root,0755)
 %doc README COPYING
 %attr(755,root,root) %{_libdir}/qt-*/plugins/crypto



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/qa-assistant/devel qa-assistant.spec,1.2,1.3
Message-ID: <200503040005.j2405iZi025886@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/qa-assistant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/qa-assistant/devel

Modified Files:
	qa-assistant.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: qa-assistant.spec
===================================================================
RCS file: /cvs/extras/rpms/qa-assistant/devel/qa-assistant.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qa-assistant.spec	29 Nov 2004 19:11:46 -0000	1.2
+++ qa-assistant.spec	4 Mar 2005 00:05:42 -0000	1.3
@@ -5,7 +5,6 @@
 Name:           qa-assistant
 Version:        0.4.1
 Release:        1
-Epoch:          0
 Summary:        Graphical quality assurance report generator
 Group:          Development/Tools
 License:        GPL
@@ -13,10 +12,10 @@
 Source0:        http://dl.sourceforge.net/qa-assistant/qa-assistant-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:	noarch
+BuildArch:      noarch
 BuildRequires:  python-devel
-BuildRequires:	sed
-BuildRequires:	desktop-file-utils
+BuildRequires:  sed
+BuildRequires:  desktop-file-utils
 # Needed to get xmlcatalog
 BuildRequires:  libxml2
 BuildRequires:	pygtk2-devel >= 0:2.2.0
@@ -91,7 +90,7 @@
 #
 # On removal, unregister the xmlcatalog from the supercatalog
 #
-if [ "$1" = 0 ]; then
+if [ "$1" = "0" ]; then
     ROOTCATALOG=%{_sysconfdir}/xml/catalog
 
     if [ -w $ROOTCATALOG ]
@@ -126,6 +125,6 @@
 
 * Sun Aug 8 2004 Toshio Kuratomi <toshio{here}tiki-lounge.com> - 0:0.4-0.fdr.3
 - Substitute macros for file paths in the install/uninstall scriptlets
- 
+
 * Tue Apr 20 2004 Toshio Kuratomi <toshio[in]tiki-lounge.com> - 0:0.4-0.fdr.2
 - Initial Fedora Release.



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:45 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:45 -0500
Subject: rpms/rpmDirectoryCheck/devel rpmDirectoryCheck.spec,1.4,1.5
Message-ID: <200503040005.j2405j2M025926@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	rpmDirectoryCheck.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: rpmDirectoryCheck.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmDirectoryCheck/devel/rpmDirectoryCheck.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmDirectoryCheck.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ rpmDirectoryCheck.spec	4 Mar 2005 00:05:42 -0000	1.5
@@ -1,4 +1,4 @@
-### {{{@ad.common@	Common part; some helper macros shared between .spec files 
+### {{{@ad.common@	Common part; some helper macros shared between .spec files
 %define __isDirectoryShared	f() { rpm --eval '%%{_netsharedpath}' | awk -v y="$1" '{ split($1, x, ":"); for (i in x) if (index(y,x[i])==1) exit 0; exit 1; }'; }; f
 %define __install_info		( %{__isDirectoryShared} %{_infodir} ) || /sbin/install-info --info-dir=%{_infodir}
 %define __install_info_post	g() { %{__install_info} "$@" || :; }; g
@@ -9,7 +9,6 @@
 Name:		rpmDirectoryCheck
 Version:	0.8
 Release:	1
-Epoch:		0
 URL:		http://www.tu-chemnitz.de/~ensc/rpmDirectoryCheck
 Source0:	http://www.tu-chemnitz.de/~ensc/rpmDirectoryCheck/%{name}-%{version}.tar.bz2
 License:	GPL



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/rkhunter/devel rkhunter.spec,1.3,1.4
Message-ID: <200503040005.j2405iom025922@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	rkhunter.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/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	4 Mar 2005 00:05:42 -0000	1.4
@@ -6,8 +6,7 @@
 Name:           rkhunter
 Version:        1.1.9
 Release:        1
-Epoch:          0
-Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits.
+Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPL
@@ -50,7 +49,7 @@
 # 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;
+#       s|../SOURCES|%{_sourcedir}|g;
 #     ' %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5
 #md5sum --check %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5 || exit $?
 
@@ -65,7 +64,7 @@
 	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
 	s|\@RKEXE\@|%{_bindir}/%{name}|g;
     ' rkhunter-scan_on_boot \
-        rkhunter-scan_on_boot-rc.local
+      rkhunter-scan_on_boot-rc.local
 
 %{__perl} -pi.orig -e '
 	s|^#$|INSTALLDIR=%{_prefix}|;
@@ -249,7 +248,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



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:45 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:45 -0500
Subject: rpms/rpmproc/devel rpmproc.spec,1.2,1.3
Message-ID: <200503040005.j2405jP7025936@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	rpmproc.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: rpmproc.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmproc/devel/rpmproc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpmproc.spec	10 Dec 2004 22:03:10 -0000	1.2
+++ rpmproc.spec	4 Mar 2005 00:05:43 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           rpmproc
 Version:        2.1.4
 Release:        3
-Epoch:          0
 Summary:        Perl script to help manage and build RPM packages
 
 License:        GPL



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/qascade/devel qascade.spec,1.4,1.5
Message-ID: <200503040005.j2405i6Z025890@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	qascade.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: qascade.spec
===================================================================
RCS file: /cvs/extras/rpms/qascade/devel/qascade.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qascade.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ qascade.spec	4 Mar 2005 00:05:42 -0000	1.5
@@ -1,7 +1,6 @@
 Name:           qascade
 Version:        0.1
 Release:        2
-Epoch:          0
 Summary:        QT port of classic puzzle game
 
 Group:          Amusements/Games



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:45 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:45 -0500
Subject: rpms/rpmlint/devel rpmlint.spec,1.8,1.9
Message-ID: <200503040005.j2405jmM025932@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	rpmlint.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpmlint.spec	13 Feb 2005 19:28:58 -0000	1.8
+++ rpmlint.spec	4 Mar 2005 00:05:43 -0000	1.9
@@ -1,7 +1,6 @@
 Name:           rpmlint
 Version:        0.67
 Release:        1
-Epoch:          0
 Summary:        RPM correctness checker
 
 Group:          Development/Tools
@@ -13,8 +12,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python >= 0:1.5.2, rpm-python, make, %{__perl}
-Requires:       rpm-python, python >= 0:1.5.2, cpio
+BuildRequires:  python >= 1.5.2, rpm-python, make, %{__perl}
+Requires:       rpm-python, python >= 1.5.2, cpio
 
 %description
 rpmlint is a tool for checking common errors in RPM packages.  Binary
@@ -213,7 +212,7 @@
 
 * Mon Jun  3 2002 Gwenole Beauchesne <gbeauchesne at mandrakesoft.com> 0.45-1mdk
  o SpecCheck.py: - Add configure-without-libdir-spec check
-	         - Add hardcoded-library-path check
+                 - Add hardcoded-library-path check
 
 * Wed May 29 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.44-1mdk
  o added non-ghost-file check
@@ -273,15 +272,15 @@
                  Added the new check invalid-dependency.
 
  o InitScriptCheck.py: Added incoherent-init-script-name check.
-	               Expand shell variable in incoherent-subsys check.
+                       Expand shell variable in incoherent-subsys check.
 
  o FilesCheck.py: Use list imported from the setup package for users
    and groups (from setuplist.py).
 
  o PostCheck.py: Don't print error about percent if post-script has a
                  %%. (Chmouel)
-	         Check that RPM_BUILD_ROOT or RPM_BUILD_DIR isn't
-	         used.
+                 Check that RPM_BUILD_ROOT or RPM_BUILD_DIR isn't
+                 used.
 
  o SpecCheck.py: Check also %_sourcedir.
                  Check that the BuildRoot tag doesn't contain a
@@ -345,8 +344,8 @@
 - TagsCheck.py: added the bugzilla https address as a valid one.
 
 - PostCheck.py: o ghost-files-without-postun => ghost-files-without-postin
-		o check if /tmp or /var/tmp is used.
-		o check if update-menus is called without a menu file.
+                o check if /tmp or /var/tmp is used.
+                o check if update-menus is called without a menu file.
 
 - FilesCheck.py: added /etc/logrotate.d entry check.
 
@@ -360,7 +359,7 @@
                     o libc doesn't need to be linked against libc,
   and the dynamic linker doesn't need dependeny information. (Bill Nottingham)
 
-	            o Fix some of the library checks to be more correct. (Bill
+                    o Fix some of the library checks to be more correct. (Bill
   Nottingham)
 
 - TagsCheck.py: added a check on obsoleted packages not provided.
@@ -412,20 +411,20 @@
 - MenuCheck.py: added new Office sub menus.
 
 - FilesCheck.py: o added /usr/X11R6/man subdirs to the list of
-	          STANDARD_DIRS.
-	         o warn for .so file only if they are in a lib dir.
+                   STANDARD_DIRS.
+                 o warn for .so file only if they are in a lib dir.
                  o warn for source files in a non devel package only if they are not
                   doc files.
 
 - TagsCheck.py: corrected description-line-too-long check.
 
 - FilesCheck.py: add the rpm user and group per request of Jeff
-	         Johnson for the future version of rpm.
+                 Johnson for the future version of rpm.
 
 * Fri May 18 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.31-1mdk
 - PostCheck.py: check that a script isn't only one command.
                 check postin and prein instead of postun and preun
-	        for ghost files creation.
+                for ghost files creation.
 
 - MenuCheck.py: don't check NO_XALF in menu command.
 
@@ -489,7 +488,7 @@
 
 - Config.py: various exceptions added.
 
-- BinariesCheck.py: o report the file location on objdump errors. 
+- BinariesCheck.py: o report the file location on objdump errors.
                     o new error: executable in library package.
 
 - I18NCheck.py: fuzzy check on packages without dependency on
@@ -549,7 +548,7 @@
 
 * Fri Sep 29 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.23-1mdk
 - MenuCheck.py: added Applications/Accessibility.
-                check that menu	files are readable by everyone.
+                check that menu files are readable by everyone.
 - Config.py: removed exception for /home.
              added exceptions for vixie-cron.
 - FilesCheck.py: check cvs internal files.
@@ -565,7 +564,7 @@
 - TagsCheck.py: check packager field compliance to a regexp.
 - Config.py: imported default exceptions.
 - TagsCheck.py: added Apache License, PHP Licence and BSD-Style.
-- MenuCheck.py: check hardcoded path in icon field and large, mini, 
+- MenuCheck.py: check hardcoded path in icon field and large, mini,
   normal icon files.
 - PostCheck.py: Fix typo in check of /usr/bin/perl.
 - PostCheck.py: Check perl script like we do for bash script.
@@ -664,7 +663,7 @@
        * check release extension.
        * check non executable in bin directories.
        * new options: ValidGroups, ReleaseExtension and
-	UseVersionInChangelog.
+         UseVersionInChangelog.
 
 * Thu Dec 30 1999 Frederic Lepied <flepied at mandrakesoft.com> 0.8-1mdk
 



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/revelation/devel revelation.spec,1.5,1.6
Message-ID: <200503040005.j2405ix6025918@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	revelation.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- revelation.spec	2 Mar 2005 19:05:15 -0000	1.5
+++ revelation.spec	4 Mar 2005 00:05:42 -0000	1.6
@@ -2,31 +2,30 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary:	Password manager for GNOME 2
-Name: 		revelation
-Version: 	0.4.0
-Epoch: 		0
-Release: 	1
-License: 	GPL
-Group: 		Applications/Productivity
-Source: 	ftp://oss.codepoet.no/revelation/revelation-0.4.0.tar.bz2
-URL: 		http://oss.codepoet.no/revelation/
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:	python-crypto >= 0:2.0
-Requires:	pygtk2 >= 0:2.4
-Requires:	gnome-python2-gconf >= 0:2.0
-Requires:	gnome-python2-gnomevfs >= 0:2.6
-BuildRequires:  python >= 0:2.2
-BuildRequires:  python-devel >= 0:2.3
-BuildRequires:  pygtk2-devel >= 0:2.4
-BuildRequires:	gnome-python2-gconf >= 0:2.0
-BuildRequires:	libgnomeui-devel >= 0:2.8
-BuildRequires:	gnome-keyring-devel >= 0:0.4.0
-BuildRequires:	desktop-file-utils 
-BuildRequires:	python-crypto >= 0:2.0
+Name:		revelation
+Version:	0.4.0
+Release:	1
+License:	GPL
+Group:		Applications/Productivity
+Source:		ftp://oss.codepoet.no/revelation/revelation-0.4.0.tar.bz2
+URL:		http://oss.codepoet.no/revelation/
+Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:	python-crypto >= 2.0
+Requires:	pygtk2 >= 2.4
+Requires:	gnome-python2-gconf >= 2.0
+Requires:	gnome-python2-gnomevfs >= 2.6
+BuildRequires:	python >= 2.2
+BuildRequires:	python-devel >= 2.3
+BuildRequires:	pygtk2-devel >= 2.4
+BuildRequires:	gnome-python2-gconf >= 2.0
+BuildRequires:	libgnomeui-devel >= 2.8
+BuildRequires:	gnome-keyring-devel >= 0.4.0
+BuildRequires:	desktop-file-utils
+BuildRequires:	python-crypto >= 2.0
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n)
-Requires(post):	 GConf2 shared-mime-info desktop-file-utils
-Requires(preun): GConf2
-Requires(postun):shared-mime-info desktop-file-utils
+Requires(post):		GConf2 shared-mime-info desktop-file-utils
+Requires(preun):	GConf2
+Requires(postun):	shared-mime-info desktop-file-utils
 
 %description
 Revelation is a password manager. It organizes accounts in
@@ -36,7 +35,7 @@
 %setup -q
 
 %build
-%configure --disable-desktop-update --disable-mime-update 
+%configure --disable-desktop-update --disable-mime-update
 make %{?_smp_mflags}
 
 
@@ -59,7 +58,7 @@
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
- 
+
 %preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
@@ -83,7 +82,7 @@
 %{_datadir}/icons/hicolor/??x??/mimetypes/gnome-mime-application-x-revelation.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 #dir %{python_sitearch}/revelation/
-# the next entry should be python_sitearch, but the packages currently does it 
+# the next entry should be python_sitearch, but the packages currently does it
 # wrong on install and during execution. So leave it in {python_sitelib} for now
 %{python_sitelib}/revelation/authmanager.so
 %dir %{python_sitelib}/revelation/
@@ -102,7 +101,7 @@
 - Uses configure now
 - add BR pygtk2-devel gnome-keyring-devel
 - use shared-mime-info and desktop-file-utils
-- Remove unneeded explicit Requires 
+- Remove unneeded explicit Requires
 - not a noarch package anymore
 - on x86_64 it currently installs and needs authmanager.so in %%{python_sitelib}
   will report upstream



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/qtparted/devel qtparted.spec,1.4,1.5
Message-ID: <200503040005.j2405iaF025910@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	qtparted.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qtparted.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ qtparted.spec	4 Mar 2005 00:05:42 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           qtparted
 Version:        0.4.4
 Release:        1
-Epoch:          0
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:45 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:45 -0500
Subject: rpms/rxvt/devel rxvt.spec,1.5,1.6
Message-ID: <200503040005.j2405juL025940@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	rxvt.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: rxvt.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt/devel/rxvt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rxvt.spec	10 Dec 2004 22:03:10 -0000	1.5
+++ rxvt.spec	4 Mar 2005 00:05:43 -0000	1.6
@@ -1,8 +1,7 @@
 Name:           rxvt
 Version:        2.7.10
 Release:        5
-Epoch:          0
-Summary:        Rxvt (ouR XVT) - a VT102 emulator for the X window system
+Summary:        ouR XVT, a VT102 emulator for the X window system
 Group:          User Interface/X
 License:        GPL
 URL:            http://www.rxvt.org
@@ -22,18 +21,15 @@
 much  less  swap  space  --  a  significant advantage on a
 machine serving many X sessions.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure --enable-everything --enable-xgetdefault --enable-256-color
 make %{?_smp_mflags}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -51,24 +47,20 @@
   --add-category=X-Fedora \
   %{SOURCE2}
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
 %doc doc/BUGS doc/FAQ doc/README.menu doc/README.xvt doc/TODO
 %doc doc/*.html
 %doc doc/menu/*
-
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Thu Dec 18 2003 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
@@ -84,5 +76,5 @@
 - added menu entry
 - removed -n from setup
 
-* Fri Jun 20 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> 
+* Fri Jun 20 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de>
 - Initial RPM release.



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/qca/devel qca.spec,1.1,1.2
Message-ID: <200503040005.j2405igE025894@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	qca.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: qca.spec
===================================================================
RCS file: /cvs/extras/rpms/qca/devel/qca.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qca.spec	13 Jan 2005 18:24:21 -0000	1.1
+++ qca.spec	4 Mar 2005 00:05:42 -0000	1.2
@@ -1,7 +1,6 @@
 Name:           qca
 Version:        1.0
 Release:        3
-Epoch:          0
 Summary:        Qt Cryptographic Architecture
 
 Group:          System Environment/Libraries
@@ -16,7 +15,7 @@
 %description
 Taking a hint from the similarly-named Java Cryptography Architecture,
 QCA aims to provide a straightforward and cross-platform crypto API,
-using Qt datatypes and conventions. QCA separates the API from the 
+using Qt datatypes and conventions. QCA separates the API from the
 implementation, using plugins known as Providers. The advantage of this
 model is to allow applications to avoid linking to or explicitly depending
 on any particular cryptographic library. This allows one to easily change
@@ -24,9 +23,9 @@
 application!
 
 %package        devel
-Summary:        Qt Cryptographic Architecture - development files
+Summary:        Qt Cryptographic Architecture development files
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 This packages contains the development files for QCA



From fedora-extras-commits at redhat.com  Fri Mar  4 00:14:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 19:14:38 -0500
Subject: rpms/cone/FC-3 cone-0.64.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 cone.spec, 1.4,
	1.5 cone-0.63.tar.bz2.sig, 1.1, NONE
Message-ID: <200503040014.j240Ectv026220@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore sources cone.spec 
Added Files:
	cone-0.64.tar.bz2.sig 
Removed Files:
	cone-0.63.tar.bz2.sig 
Log Message:
Update from Steven Pritchard.


--- NEW FILE cone-0.64.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cone/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Feb 2005 01:17:42 -0000	1.3
+++ .cvsignore	4 Mar 2005 00:14:36 -0000	1.4
@@ -1 +1 @@
-cone-0.63.tar.bz2
+cone-0.64.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cone/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Feb 2005 01:17:42 -0000	1.3
+++ sources	4 Mar 2005 00:14:36 -0000	1.4
@@ -1 +1 @@
-d77f9bfe50ae796c70bb18a7ae59e44c  cone-0.63.tar.bz2
+0375a938da6347e42afd76135f334a6d  cone-0.64.tar.bz2


Index: cone.spec
===================================================================
RCS file: /cvs/extras/rpms/cone/FC-3/cone.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cone.spec	25 Feb 2005 01:17:42 -0000	1.4
+++ cone.spec	4 Mar 2005 00:14:36 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: CONE mail reader
 Name: cone
-Version: 0.63
+Version: 0.64
 Release: 1
 URL: http://www.courier-mta.org/cone/
 Source0: http://dl.sf.net/sourceforge/courier/%{name}-%{version}.tar.bz2
@@ -97,6 +97,9 @@
 %doc cone/html
 
 %changelog
+* Wed Mar 02 2005 Steven Pritchard <steve at kspei.com> 0.64-1
+- Update to 0.64
+
 * Wed Feb 23 2005 Steven Pritchard <steve at kspei.com> 0.63-1
 - Update to 0.63
 - Include signature file with the source rpm


--- cone-0.63.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar  4 00:16:00 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 19:16:00 -0500
Subject: rpms/cone/devel cone-0.64.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 cone.spec, 1.4,
	1.5 cone-0.63.tar.bz2.sig, 1.1, NONE
Message-ID: <200503040016.j240G0sF026265@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore sources cone.spec 
Added Files:
	cone-0.64.tar.bz2.sig 
Removed Files:
	cone-0.63.tar.bz2.sig 
Log Message:
Update from Steven Pritchard. Copy of FC-3 branch. No release bump yet.


--- NEW FILE cone-0.64.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Feb 2005 01:17:42 -0000	1.3
+++ .cvsignore	4 Mar 2005 00:15:58 -0000	1.4
@@ -1 +1 @@
-cone-0.63.tar.bz2
+cone-0.64.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Feb 2005 01:17:42 -0000	1.3
+++ sources	4 Mar 2005 00:15:58 -0000	1.4
@@ -1 +1 @@
-d77f9bfe50ae796c70bb18a7ae59e44c  cone-0.63.tar.bz2
+0375a938da6347e42afd76135f334a6d  cone-0.64.tar.bz2


Index: cone.spec
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/cone.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cone.spec	25 Feb 2005 01:17:42 -0000	1.4
+++ cone.spec	4 Mar 2005 00:15:58 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: CONE mail reader
 Name: cone
-Version: 0.63
+Version: 0.64
 Release: 1
 URL: http://www.courier-mta.org/cone/
 Source0: http://dl.sf.net/sourceforge/courier/%{name}-%{version}.tar.bz2
@@ -97,6 +97,9 @@
 %doc cone/html
 
 %changelog
+* Wed Mar 02 2005 Steven Pritchard <steve at kspei.com> 0.64-1
+- Update to 0.64
+
 * Wed Feb 23 2005 Steven Pritchard <steve at kspei.com> 0.63-1
 - Update to 0.63
 - Include signature file with the source rpm


--- cone-0.63.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-YAML/devel perl-YAML.spec,1.4,1.5
Message-ID: <200503032346.j23NkUAi023958@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-YAML/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-YAML/devel

Modified Files:
	perl-YAML.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-YAML.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML/devel/perl-YAML.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-YAML.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-YAML.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-YAML
 Version:        0.35
 Release:        5
-Epoch:          0
 Summary:        YAML Ain't Markup Language (tm)
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-MLDBM/devel perl-MLDBM.spec,1.2,1.3
Message-ID: <200503032346.j23NkTKE023815@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-MLDBM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-MLDBM/devel

Modified Files:
	perl-MLDBM.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-MLDBM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/devel/perl-MLDBM.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-MLDBM.spec	28 Jan 2005 17:36:45 -0000	1.2
+++ perl-MLDBM.spec	3 Mar 2005 23:46:27 -0000	1.3
@@ -3,7 +3,6 @@
 Name:           perl-MLDBM
 Version:        2.01
 Release:        1
-Epoch:          0
 Summary:        Store multi-level hash structure in single level tied hash
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-XML-RSS/devel perl-XML-RSS.spec,1.1,1.2
Message-ID: <200503032346.j23NkUUk023946@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-XML-RSS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-XML-RSS/devel

Modified Files:
	perl-XML-RSS.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-XML-RSS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-RSS/devel/perl-XML-RSS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-RSS.spec	1 Jan 2005 11:10:17 -0000	1.1
+++ perl-XML-RSS.spec	3 Mar 2005 23:46:28 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-XML-RSS
 Version:        1.05
 Release:        1
-Epoch:          0
 Summary:        Perl module for managing RDF Site Summary (RSS) files
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-XML-XPath/devel perl-XML-XPath.spec,1.1,1.2
Message-ID: <200503032346.j23NkU3o023954@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-XML-XPath/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-XML-XPath/devel

Modified Files:
	perl-XML-XPath.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-XML-XPath.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPath/devel/perl-XML-XPath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-XPath.spec	10 Feb 2005 20:29:37 -0000	1.1
+++ perl-XML-XPath.spec	3 Mar 2005 23:46:28 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-XML-XPath
 Version:        1.13
 Release:        2
-Epoch:          0
 Summary:        XPath parser and evaluator for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IO-String/devel perl-IO-String.spec,1.4,1.5
Message-ID: <200503032346.j23NkTpA023763@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IO-String/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IO-String/devel

Modified Files:
	perl-IO-String.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IO-String.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-String/devel/perl-IO-String.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-IO-String.spec	2 Dec 2004 20:14:16 -0000	1.4
+++ perl-IO-String.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-IO-String
 Version:        1.06
 Release:        1
-Epoch:          0
 Summary:        Emulate file interface for in-core strings
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-XML-Simple/devel perl-XML-Simple.spec,1.4,1.5
Message-ID: <200503032346.j23NkUPk023950@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-XML-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-XML-Simple/devel

Modified Files:
	perl-XML-Simple.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/devel/perl-XML-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-XML-Simple.spec	4 Dec 2004 13:23:25 -0000	1.4
+++ perl-XML-Simple.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-XML-Simple
 Version:        2.13
 Release:        1
-Epoch:          0
 Summary:        Easy API to maintain XML in Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Text-Reform/devel perl-Text-Reform.spec,1.4,1.5
Message-ID: <200503032346.j23NkU3i023918@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Text-Reform/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Text-Reform/devel

Modified Files:
	perl-Text-Reform.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Text-Reform.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Reform/devel/perl-Text-Reform.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Text-Reform.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Text-Reform.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Text-Reform
 Version:        1.11
 Release:        3
-Epoch:          0
 Summary:        Manual text wrapping and reformatting
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Error/devel perl-Error.spec,1.2,1.3
Message-ID: <200503032346.j23NkSRP023666@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Error/devel

Modified Files:
	perl-Error.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Error.spec	21 Dec 2004 16:33:00 -0000	1.2
+++ perl-Error.spec	3 Mar 2005 23:46:26 -0000	1.3
@@ -3,7 +3,6 @@
 Name:           perl-Error
 Version:        0.15
 Release:        1
-Epoch:          0
 Summary:        Error Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Archive-Zip/devel perl-Archive-Zip.spec,1.5,1.6
Message-ID: <200503032346.j23NkSA4023616@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Archive-Zip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Archive-Zip/devel

Modified Files:
	perl-Archive-Zip.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Archive-Zip.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Archive-Zip/devel/perl-Archive-Zip.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Archive-Zip.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ perl-Archive-Zip.spec	3 Mar 2005 23:46:26 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Archive-Zip
 Version:        1.12
 Release:        1
-Epoch:          0
 Summary:        Perl library for accessing Zip archives
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Text-Iconv/devel perl-Text-Iconv.spec,1.3,1.4
Message-ID: <200503032346.j23NkUM5023914@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Text-Iconv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Text-Iconv/devel

Modified Files:
	perl-Text-Iconv.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Text-Iconv.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Iconv/devel/perl-Text-Iconv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Text-Iconv.spec	10 Dec 2004 22:03:09 -0000	1.3
+++ perl-Text-Iconv.spec	3 Mar 2005 23:46:28 -0000	1.4
@@ -3,7 +3,6 @@
 Name:           perl-Text-Iconv
 Version:        1.4
 Release:        1
-Epoch:          0
 Summary:        Perl interface to iconv() codeset conversion function
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Set-IntSpan/devel perl-Set-IntSpan.spec,1.3,1.4
Message-ID: <200503032346.j23NkUEs023878@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Set-IntSpan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Set-IntSpan/devel

Modified Files:
	perl-Set-IntSpan.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Set-IntSpan.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-IntSpan/devel/perl-Set-IntSpan.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Set-IntSpan.spec	10 Dec 2004 22:03:09 -0000	1.3
+++ perl-Set-IntSpan.spec	3 Mar 2005 23:46:27 -0000	1.4
@@ -3,7 +3,6 @@
 Name:           perl-Set-IntSpan
 Version:        1.07
 Release:        5
-Epoch:          0
 Summary:        Perl module for managing sets of integers
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-MIME-Types/devel perl-MIME-Types.spec,1.5,1.6
Message-ID: <200503032346.j23NkT47023811@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-MIME-Types/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-MIME-Types/devel

Modified Files:
	perl-MIME-Types.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-MIME-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/devel/perl-MIME-Types.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-MIME-Types.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-MIME-Types.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-MIME-Types
 Version:        1.13
 Release:        3
-Epoch:          0
 Summary:        MIME types module for Perl
 
 License:        GPL or Artistic



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IO-Socket-SSL/devel perl-IO-Socket-SSL.spec,1.1,1.2
Message-ID: <200503032346.j23NkTk3023759@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IO-Socket-SSL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IO-Socket-SSL/devel

Modified Files:
	perl-IO-Socket-SSL.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/devel/perl-IO-Socket-SSL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-IO-Socket-SSL.spec	9 Jan 2005 11:59:30 -0000	1.1
+++ perl-IO-Socket-SSL.spec	3 Mar 2005 23:46:27 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-IO-Socket-SSL
 Version:        0.96
 Release:        3
-Epoch:          0
 Summary:        Perl library for transparent SSL
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Test-Pod/devel perl-Test-Pod.spec,1.4,1.5
Message-ID: <200503032346.j23NkUH2023902@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Test-Pod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Test-Pod/devel

Modified Files:
	perl-Test-Pod.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Test-Pod.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod/devel/perl-Test-Pod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-Pod.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Test-Pod.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Test-Pod
 Version:        1.20
 Release:        1
-Epoch:          0
 Summary:        Perl module for checking for POD errors in files
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Unicode-Map/devel perl-Unicode-Map.spec,1.4,1.5
Message-ID: <200503032346.j23NkUbT023926@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Unicode-Map/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Unicode-Map/devel

Modified Files:
	perl-Unicode-Map.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Unicode-Map.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map/devel/perl-Unicode-Map.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Unicode-Map.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Unicode-Map.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Unicode-Map
 Version:        0.112
 Release:        5
-Epoch:          0
 Summary:        Perl module for mapping charsets from and to utf16 unicode
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-AppConfig/devel perl-AppConfig.spec,1.5,1.6
Message-ID: <200503032346.j23NkSLo023608@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-AppConfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-AppConfig/devel

Modified Files:
	perl-AppConfig.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-AppConfig.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AppConfig/devel/perl-AppConfig.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-AppConfig.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ perl-AppConfig.spec	3 Mar 2005 23:46:25 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-AppConfig
 Version:        1.56
 Release:        1
-Epoch:          0
 Summary:        Perl module for reading configuration files
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Config-Tiny/devel perl-Config-Tiny.spec,1.4,1.5
Message-ID: <200503032346.j23NkScr023633@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Config-Tiny/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Config-Tiny/devel

Modified Files:
	perl-Config-Tiny.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Config-Tiny.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ perl-Config-Tiny.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Config-Tiny
 Version:        2.00
 Release:        1
-Epoch:          0
 Summary:        Perl module for reading and writing .ini style configuration files
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Module-Build/devel perl-Module-Build.spec,1.7,1.8
Message-ID: <200503032346.j23NkTXd023820@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	perl-Module-Build.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Module-Build.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Module-Build.spec	27 Jan 2005 17:50:59 -0000	1.7
+++ perl-Module-Build.spec	3 Mar 2005 23:46:27 -0000	1.8
@@ -3,7 +3,6 @@
 Name:           perl-Module-Build
 Version:        0.2608
 Release:        1
-Epoch:          0
 Summary:        Perl module for building and installing Perl modules
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Tie-IxHash/devel perl-Tie-IxHash.spec,1.4,1.5
Message-ID: <200503032346.j23NkUDQ023922@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Tie-IxHash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Tie-IxHash/devel

Modified Files:
	perl-Tie-IxHash.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Tie-IxHash.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Tie-IxHash/devel/perl-Tie-IxHash.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Tie-IxHash.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Tie-IxHash.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Tie-IxHash
 Version:        1.21
 Release:        2
-Epoch:          0
 Summary:        Ordered associative arrays for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Unicode-Map8/devel perl-Unicode-Map8.spec,1.4,1.5
Message-ID: <200503032346.j23NkU2T023930@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Unicode-Map8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Unicode-Map8/devel

Modified Files:
	perl-Unicode-Map8.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map8/devel/perl-Unicode-Map8.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Unicode-Map8.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Unicode-Map8.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Unicode-Map8
 Version:        0.12
 Release:        4
-Epoch:          0
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Unix-Syslog/devel perl-Unix-Syslog.spec,1.5,1.6
Message-ID: <200503032346.j23NkUSP023942@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Unix-Syslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Unix-Syslog/devel

Modified Files:
	perl-Unix-Syslog.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Unix-Syslog.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unix-Syslog/devel/perl-Unix-Syslog.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Unix-Syslog.spec	10 Dec 2004 22:03:09 -0000	1.5
+++ perl-Unix-Syslog.spec	3 Mar 2005 23:46:28 -0000	1.6
@@ -4,7 +4,6 @@
 Name:           perl-Unix-Syslog
 Version:        0.100
 Release:        4
-Epoch:          0
 License:        Artistic
 Group:          System Environment/Libraries
 URL:            http://search.cpan.org/dist/Unix-Syslog/



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-MailTools/devel perl-MailTools.spec,1.6,1.7
Message-ID: <200503032346.j23NkTE3023803@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-MailTools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-MailTools/devel

Modified Files:
	perl-MailTools.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-MailTools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MailTools.spec	22 Jan 2005 11:50:32 -0000	1.6
+++ perl-MailTools.spec	3 Mar 2005 23:46:27 -0000	1.7
@@ -4,7 +4,6 @@
 Name:           perl-MailTools
 Version:        1.66
 Release:        1
-Epoch:          0
 License:        Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/MailTools/



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Config-General/devel perl-Config-General.spec,1.4,1.5
Message-ID: <200503032346.j23NkSeS023629@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Config-General/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Config-General/devel

Modified Files:
	perl-Config-General.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Config-General.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/devel/perl-Config-General.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Config-General.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ perl-Config-General.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Config-General
 Version:        2.27
 Release:        1
-Epoch:          0
 Summary:        Generic configuration module for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Unicode-String/devel perl-Unicode-String.spec,1.4,1.5
Message-ID: <200503032346.j23NkUKg023938@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Unicode-String/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Unicode-String/devel

Modified Files:
	perl-Unicode-String.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Unicode-String.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-String/devel/perl-Unicode-String.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Unicode-String.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Unicode-String.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Unicode-String
 Version:        2.07
 Release:        4
-Epoch:          0
 Summary:        Perl modules to handle various Unicode issues
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-MIME-tools/devel perl-MIME-tools.spec,1.6,1.7
Message-ID: <200503032346.j23NkTEs023807@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-MIME-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-MIME-tools/devel

Modified Files:
	perl-MIME-tools.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/perl-MIME-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MIME-tools.spec	22 Jan 2005 11:53:15 -0000	1.6
+++ perl-MIME-tools.spec	3 Mar 2005 23:46:27 -0000	1.7
@@ -3,7 +3,6 @@
 Name:           perl-MIME-tools
 Version:        5.417
 Release:        1
-Epoch:          0
 Summary:        Modules for parsing and creating MIME entities in Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IO-Zlib/devel perl-IO-Zlib.spec,1.5,1.6
Message-ID: <200503032346.j23NkT5m023775@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IO-Zlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IO-Zlib/devel

Modified Files:
	perl-IO-Zlib.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IO-Zlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Zlib/devel/perl-IO-Zlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-IO-Zlib.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-IO-Zlib.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,8 +3,7 @@
 Name:           perl-IO-Zlib
 Version:        1.04
 Release:        1
-Epoch:          0
-Summary:        IO:: style interface to Compress::Zlib
+Summary:        Perl IO:: style interface to Compress::Zlib
 
 Group:          Development/Libraries
 License:        GPL or Artistic



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-ExtUtils-CBuilder/devel perl-ExtUtils-CBuilder.spec, 1.8,
	1.9
Message-ID: <200503032346.j23NkSXh023672@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-ExtUtils-CBuilder/devel

Modified Files:
	perl-ExtUtils-CBuilder.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-ExtUtils-CBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-ExtUtils-CBuilder.spec	15 Feb 2005 02:35:09 -0000	1.8
+++ perl-ExtUtils-CBuilder.spec	3 Mar 2005 23:46:26 -0000	1.9
@@ -3,7 +3,6 @@
 Name:           perl-ExtUtils-CBuilder
 Version:        0.09
 Release:        1
-Epoch:          0
 Summary:        Compile and link C code for Perl modules
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Mail-Sendmail/devel perl-Mail-Sendmail.spec,1.5,1.6
Message-ID: <200503032346.j23NkTQv023799@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Mail-Sendmail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Mail-Sendmail/devel

Modified Files:
	perl-Mail-Sendmail.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Mail-Sendmail.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Sendmail/devel/perl-Mail-Sendmail.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Mail-Sendmail.spec	16 Dec 2004 19:07:05 -0000	1.5
+++ perl-Mail-Sendmail.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Mail-Sendmail
 Version:        0.79
 Release:        6
-Epoch:          0
 Summary:        Simple platform independent mailer for Perl
 
 License:        Distributable



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Test-Builder-Tester/devel perl-Test-Builder-Tester.spec,
	1.5, 1.6
Message-ID: <200503032346.j23NkUAn023890@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Test-Builder-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Test-Builder-Tester/devel

Modified Files:
	perl-Test-Builder-Tester.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Test-Builder-Tester.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Builder-Tester/devel/perl-Test-Builder-Tester.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-Builder-Tester.spec	10 Dec 2004 22:03:09 -0000	1.5
+++ perl-Test-Builder-Tester.spec	3 Mar 2005 23:46:28 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Test-Builder-Tester
 Version:        1.01
 Release:        1
-Epoch:          0
 Summary:        Test runner for Test::Builder testsuites
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Digest-Nilsimsa/devel perl-Digest-Nilsimsa.spec,1.5,1.6
Message-ID: <200503032346.j23NkSAv023660@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	perl-Digest-Nilsimsa.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Digest-Nilsimsa.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-Nilsimsa/devel/perl-Digest-Nilsimsa.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Digest-Nilsimsa.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-Digest-Nilsimsa.spec	3 Mar 2005 23:46:26 -0000	1.6
@@ -1,8 +1,7 @@
 Name:           perl-Digest-Nilsimsa
 Version:        0.06
 Release:        4
-Epoch:          0
-Summary:        Perl interface to the Nilsima Algorithm 
+Summary:        Perl interface to the Nilsima Algorithm
 
 Group:          Development/Libraries
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Chart/devel perl-Chart.spec,1.1,1.2
Message-ID: <200503032346.j23NkSp3023622@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Chart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Chart/devel

Modified Files:
	perl-Chart.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Chart.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/devel/perl-Chart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Chart.spec	17 Jan 2005 21:07:15 -0000	1.1
+++ perl-Chart.spec	3 Mar 2005 23:46:26 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-Chart
 Version:        2.3
 Release:        2
-Epoch:          0
 Summary:        Perl module for producing many types of charts
 
 Group:          Development/Libraries
@@ -13,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(GD) >= 0:1.20
+BuildRequires:  perl >= 1:5.6.1, perl(GD) >= 1.20
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Gtk2/devel perl-Gtk2.spec,1.4,1.5
Message-ID: <200503032346.j23NkSuZ023727@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Gtk2/devel

Modified Files:
	perl-Gtk2.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Gtk2.spec	15 Feb 2005 03:30:46 -0000	1.4
+++ perl-Gtk2.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Gtk2
 Version:        1.062
 Release:        1
-Epoch:          0
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
 Group:          Development/Libraries
@@ -13,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.062
+BuildRequires:  gtk2-devel, perl(Glib) >= 1.062
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IPC-SharedCache/devel perl-IPC-SharedCache.spec,1.4,1.5
Message-ID: <200503032346.j23NkTH7023783@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IPC-SharedCache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IPC-SharedCache/devel

Modified Files:
	perl-IPC-SharedCache.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IPC-SharedCache.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-SharedCache/devel/perl-IPC-SharedCache.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-IPC-SharedCache.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-IPC-SharedCache.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-IPC-SharedCache
 Version:        1.3
 Release:        4
-Epoch:          0
 Summary:        Perl module to manage a cache in SysV IPC shared memory
 
 Group:          Development/Libraries
@@ -13,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(IPC::ShareLite) >= 0:0.06, perl(Storable)
+BuildRequires:  perl >= 1:5.6.1, perl(IPC::ShareLite) >= 0.06, perl(Storable)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Glib/devel perl-Glib.spec,1.5,1.6
Message-ID: <200503032346.j23NkS7t023723@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Glib/devel

Modified Files:
	perl-Glib.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Glib.spec	15 Feb 2005 03:09:08 -0000	1.5
+++ perl-Glib.spec	3 Mar 2005 23:46:26 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Glib
 Version:        1.062
 Release:        1
-Epoch:          0
 Summary:        Perl interface to GLib
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Convert-TNEF/devel perl-Convert-TNEF.spec,1.5,1.6
Message-ID: <200503032346.j23NkSUf023648@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Convert-TNEF/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Convert-TNEF/devel

Modified Files:
	perl-Convert-TNEF.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Convert-TNEF.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-TNEF/devel/perl-Convert-TNEF.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Convert-TNEF.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-Convert-TNEF.spec	3 Mar 2005 23:46:26 -0000	1.6
@@ -1,10 +1,9 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
-Summary:        Perl module to read TNEF files 
+Summary:        Perl module to read TNEF files
 Name:           perl-Convert-TNEF
 Version:        0.17
 Release:        3
-Epoch:          0
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Convert-TNEF/
@@ -66,5 +65,5 @@
 - Added "make test" in build section
 - Added missing directory
 
-* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 
+* Sun Jun 15 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Convert-BinHex/devel perl-Convert-BinHex.spec,1.1,1.2
Message-ID: <200503032346.j23NkSlh023639@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Convert-BinHex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Convert-BinHex/devel

Modified Files:
	perl-Convert-BinHex.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Convert-BinHex.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-BinHex/devel/perl-Convert-BinHex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Convert-BinHex.spec	25 Jan 2005 16:51:47 -0000	1.1
+++ perl-Convert-BinHex.spec	3 Mar 2005 23:46:26 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-Convert-BinHex
 Version:        1.119
 Release:        1
-Epoch:          0
 Summary:        Macintosh BinHex extractor library for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IO-Tty/devel perl-IO-Tty.spec,1.5,1.6
Message-ID: <200503032346.j23NkT8P023771@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IO-Tty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IO-Tty/devel

Modified Files:
	perl-IO-Tty.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IO-Tty.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/perl-IO-Tty.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-IO-Tty.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-IO-Tty.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-IO-Tty
 Version:        1.02
 Release:        2
-Epoch:          0
 Summary:        Perl interface to pseudo tty's
 
 License:        GPL or Artistic



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Net-SSH/devel perl-Net-SSH.spec,1.5,1.6
Message-ID: <200503032346.j23NkTWM023850@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-SSH/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Net-SSH/devel

Modified Files:
	perl-Net-SSH.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Net-SSH.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSH/devel/perl-Net-SSH.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Net-SSH.spec	16 Dec 2004 19:16:32 -0000	1.5
+++ perl-Net-SSH.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Net-SSH
 Version:        0.08
 Release:        1
-Epoch:          0
 Summary:        Perl extension for secure shell
 
 License:        GPL or Artistic



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Unicode-MapUTF8/devel perl-Unicode-MapUTF8.spec,1.4,1.5
Message-ID: <200503032346.j23NkU5A023934@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Unicode-MapUTF8/devel

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/devel/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Unicode-MapUTF8.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Unicode-MapUTF8.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Unicode-MapUTF8
 Version:        1.09
 Release:        4
-Epoch:          0
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Net-SCP/devel perl-Net-SCP.spec,1.4,1.5
Message-ID: <200503032346.j23NkT9K023842@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-SCP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Net-SCP/devel

Modified Files:
	perl-Net-SCP.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Net-SCP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SCP/devel/perl-Net-SCP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Net-SCP.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-Net-SCP.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Net-SCP
 Version:        0.07
 Release:        1
-Epoch:          0
 Summary:        Perl extension for secure copy protocol
 
 License:        GPL or Artistic



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Net-IP/devel perl-Net-IP.spec,1.3,1.4
Message-ID: <200503032346.j23NkTTi023834@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-IP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Net-IP/devel

Modified Files:
	perl-Net-IP.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Net-IP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-IP/devel/perl-Net-IP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Net-IP.spec	6 Dec 2004 08:17:41 -0000	1.3
+++ perl-Net-IP.spec	3 Mar 2005 23:46:27 -0000	1.4
@@ -3,7 +3,6 @@
 Name:           perl-Net-IP
 Version:        1.21
 Release:        1
-Epoch:          0
 Summary:        Perl module for manipulation of IPv4 and IPv6 addresses
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:33 -0500
Subject: rpms/perl-GDTextUtil/devel perl-GDTextUtil.spec,1.3,1.4
Message-ID: <200503032346.j23NkXZm023719@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-GDTextUtil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-GDTextUtil/devel

Modified Files:
	perl-GDTextUtil.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-GDTextUtil.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GDTextUtil/devel/perl-GDTextUtil.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-GDTextUtil.spec	10 Dec 2004 22:03:08 -0000	1.3
+++ perl-GDTextUtil.spec	3 Mar 2005 23:46:26 -0000	1.4
@@ -5,7 +5,6 @@
 Name:           perl-GDTextUtil
 Version:        0.86
 Release:        4
-Epoch:          0
 Summary:        Text utilities for use with GD
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-PAR-Dist/devel perl-PAR-Dist.spec,1.4,1.5
Message-ID: <200503032346.j23NkTrB023858@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-PAR-Dist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-PAR-Dist/devel

Modified Files:
	perl-PAR-Dist.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/perl-PAR-Dist.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-PAR-Dist.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-PAR-Dist.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-PAR-Dist
 Version:        0.07
 Release:        2
-Epoch:          0
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-FreezeThaw/devel perl-FreezeThaw.spec,1.2,1.3
Message-ID: <200503032346.j23NkSO4023701@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-FreezeThaw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-FreezeThaw/devel

Modified Files:
	perl-FreezeThaw.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-FreezeThaw.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/devel/perl-FreezeThaw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-FreezeThaw.spec	10 Dec 2004 22:03:08 -0000	1.2
+++ perl-FreezeThaw.spec	3 Mar 2005 23:46:26 -0000	1.3
@@ -3,7 +3,6 @@
 Name:           perl-FreezeThaw
 Version:        0.43
 Release:        1
-Epoch:          0
 Summary:        Convert Perl structures to strings and back
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-File-Tail/devel perl-File-Tail.spec,1.4,1.5
Message-ID: <200503032346.j23NkSIV023694@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-File-Tail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-File-Tail/devel

Modified Files:
	perl-File-Tail.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-File-Tail.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/devel/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	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-File-Tail
 Version:        0.98
 Release:        3
-Epoch:          0
 Summary:        Perl extension for reading from continously updated files
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IPC-Run/devel perl-IPC-Run.spec,1.5,1.6
Message-ID: <200503032346.j23NkTpJ023779@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IPC-Run/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IPC-Run/devel

Modified Files:
	perl-IPC-Run.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IPC-Run.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Run/devel/perl-IPC-Run.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-IPC-Run.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-IPC-Run.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-IPC-Run
 Version:        0.78
 Release:        1
-Epoch:          0
 Summary:        Perl module for interacting with child processes
 
 License:        GPL or Artistic
@@ -13,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl-IO-Tty
+BuildRequires:  perl(IO::Tty)
 
 %description
 IPC::Run allows you run and interact with child processes using files,



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Pod-Escapes/devel perl-Pod-Escapes.spec,1.4,1.5
Message-ID: <200503032346.j23NkTFx023866@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Pod-Escapes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Pod-Escapes/devel

Modified Files:
	perl-Pod-Escapes.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Pod-Escapes.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Escapes/devel/perl-Pod-Escapes.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Pod-Escapes.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Pod-Escapes.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Pod-Escapes
 Version:        1.04
 Release:        1
-Epoch:          0
 Summary:        Perl module for resolving POD escape sequences
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-HTML-Template/devel perl-HTML-Template.spec,1.4,1.5
Message-ID: <200503032346.j23NkSuG023731@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-HTML-Template/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-HTML-Template/devel

Modified Files:
	perl-HTML-Template.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-HTML-Template.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template/devel/perl-HTML-Template.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Template.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-HTML-Template.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-HTML-Template
 Version:        2.7
 Release:        2
-Epoch:          0
 Summary:        Perl module to use HTML Templates
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Convert-UUlib/devel perl-Convert-UUlib.spec,1.5,1.6
Message-ID: <200503032346.j23NkSYi023655@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Convert-UUlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Convert-UUlib/devel

Modified Files:
	perl-Convert-UUlib.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/perl-Convert-UUlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Convert-UUlib.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-Convert-UUlib.spec	3 Mar 2005 23:46:26 -0000	1.6
@@ -1,11 +1,10 @@
 %define rname Convert-UUlib
 %define perl_vendorarch %(eval "$(perl -V:installvendorarch)"; echo $installvendorarch)
 
-Name:    perl-%{rname}
-Version: 1.03
-Release: 1
-Epoch:   0
-Summary: A perl interface to the uulib library
+Name:      perl-%{rname}
+Version:   1.03
+Release:   1
+Summary:   Perl interface to the uulib library
 
 Group:     Development/Libraries
 License:   GPL
@@ -44,7 +43,7 @@
 %check || :
 make test
 
-%clean 
+%clean
 rm -fr %{buildroot}
 
 %files



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Net-Netmask/devel perl-Net-Netmask.spec,1.5,1.6
Message-ID: <200503032346.j23NkTU2023838@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-Netmask/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Net-Netmask/devel

Modified Files:
	perl-Net-Netmask.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Net-Netmask.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Netmask/devel/perl-Net-Netmask.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Net-Netmask.spec	26 Dec 2004 20:25:06 -0000	1.5
+++ perl-Net-Netmask.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Net-Netmask
 Version:        1.9011
 Release:        1
-Epoch:          0
 Summary:        Perl module for manipulation and lookup of IP network blocks
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Test-MockObject/devel perl-Test-MockObject.spec,1.5,1.6
Message-ID: <200503032346.j23NkU8t023898@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Test-MockObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Test-MockObject/devel

Modified Files:
	perl-Test-MockObject.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Test-MockObject.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-MockObject.spec	1 Jan 2005 13:17:37 -0000	1.5
+++ perl-Test-MockObject.spec	3 Mar 2005 23:46:28 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Test-MockObject
 Version:        0.15
 Release:        2
-Epoch:          0
 Summary:        Perl extension for emulating troublesome interfaces
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-String-ShellQuote/devel perl-String-ShellQuote.spec, 1.7,
	1.8
Message-ID: <200503032346.j23NkUdu023886@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-String-ShellQuote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-String-ShellQuote/devel

Modified Files:
	perl-String-ShellQuote.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-String-ShellQuote.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-ShellQuote/devel/perl-String-ShellQuote.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-String-ShellQuote.spec	10 Feb 2005 20:52:36 -0000	1.7
+++ perl-String-ShellQuote.spec	3 Mar 2005 23:46:28 -0000	1.8
@@ -3,7 +3,6 @@
 Name:           perl-String-ShellQuote
 Version:        1.02
 Release:        1
-Epoch:          0
 Summary:        Perl module for quoting strings for passing through the shell
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Mail-Alias/devel perl-Mail-Alias.spec,1.5,1.6
Message-ID: <200503032346.j23NkTEE023795@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Mail-Alias/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Mail-Alias/devel

Modified Files:
	perl-Mail-Alias.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Mail-Alias.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Alias/devel/perl-Mail-Alias.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Mail-Alias.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-Mail-Alias.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -2,18 +2,17 @@
 
 %define		tarname	Mail-Alias
 
-Summary: 	Mail::Alias perl module.
-Name: 		perl-%{tarname}
-Version: 	1.12
-Release: 	3
-Epoch: 		0
-License: 	Artistic
-Group: 		Development/Libraries
-URL: 		http://www.cpan.org/
+Summary:	Mail::Alias perl module
+Name:		perl-%{tarname}
+Version:	1.12
+Release:	3
+License:	Artistic
+Group:		Development/Libraries
+URL:		http://www.cpan.org/
 # Tarball grabbed with perl -MCPAN -e shell -> get Mail::Alias.
-Source0: 	%{tarname}-%{version}.tar.gz
+Source0:	%{tarname}-%{version}.tar.gz
 BuildArch:	noarch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 # -----------------------------------------------------------------------------
 
@@ -73,5 +72,5 @@
 - Added make test in build section
 - Added missing directory
 
-* Tue Jun 17 2003 Dams <anvil[AT]livna.org> 
+* Tue Jun 17 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-GD/devel perl-GD.spec,1.3,1.4
Message-ID: <200503032346.j23NkSYZ023708@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-GD/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-GD/devel

Modified Files:
	perl-GD.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-GD.spec	10 Dec 2004 07:44:01 -0000	1.3
+++ perl-GD.spec	3 Mar 2005 23:46:26 -0000	1.4
@@ -3,7 +3,6 @@
 Name:           perl-GD
 Version:        2.19
 Release:        1
-Epoch:          0
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
@@ -13,10 +12,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  gd-devel >= 0:2.0.28
+BuildRequires:  gd-devel >= 2.0.28
 BuildRequires:  %{_bindir}/gdlib-config
 BuildRequires:  libpng-devel, libjpeg-devel, freetype-devel, XFree86-devel
-Requires:       gd >= 0:2.0.28
+Requires:       gd >= 2.0.28
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Net-Server/devel perl-Net-Server.spec,1.5,1.6
Message-ID: <200503032346.j23NkT7L023846@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-Server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Net-Server/devel

Modified Files:
	perl-Net-Server.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/perl-Net-Server.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Net-Server.spec	11 Feb 2005 18:59:31 -0000	1.5
+++ perl-Net-Server.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -5,7 +5,6 @@
 Name:    perl-%{rname}
 Version: 0.87
 Release: 3
-Epoch:   0
 Summary: Extensible, general Perl server engine
 
 Group:     Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IO-stringy/devel perl-IO-stringy.spec,1.6,1.7
Message-ID: <200503032346.j23NkT86023767@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IO-stringy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IO-stringy/devel

Modified Files:
	perl-IO-stringy.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IO-stringy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-stringy/devel/perl-IO-stringy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-IO-stringy.spec	15 Feb 2005 17:15:52 -0000	1.6
+++ perl-IO-stringy.spec	3 Mar 2005 23:46:27 -0000	1.7
@@ -6,7 +6,6 @@
 Name: 		perl-%{tarname}
 Version: 	2.110
 Release: 	1
-Epoch: 		0
 License: 	Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/IO-stringy/
@@ -14,25 +13,21 @@
 BuildArch:	noarch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-# -----------------------------------------------------------------------------
 
 %description
 This toolkit primarily provides Perl modules for performing both
 traditional and object-oriented i/o) on things *other* than normal
 filehandles; in particular, IO::Scalar, IO::ScalarArray, and IO::Lines.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{tarname}-%{version}
 
-# -----------------------------------------------------------------------------
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -41,17 +36,14 @@
 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,-)
@@ -59,7 +51,6 @@
 %{perl_vendorlib}/IO/
 %{_mandir}/man3/IO::*.3pm*
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Tue Feb 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.110-1



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-TeX-Hyphen/devel perl-TeX-Hyphen.spec,1.4,1.5
Message-ID: <200503032346.j23NkU2J023911@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-TeX-Hyphen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-TeX-Hyphen/devel

Modified Files:
	perl-TeX-Hyphen.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-TeX-Hyphen.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-TeX-Hyphen/devel/perl-TeX-Hyphen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-TeX-Hyphen.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-TeX-Hyphen.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-TeX-Hyphen
 Version:        0.140
 Release:        1
-Epoch:          0
 Summary:        Hyphenate words using TeX's patterns
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Test-Manifest/devel perl-Test-Manifest.spec,1.4,1.5
Message-ID: <200503032346.j23NkUvB023894@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Test-Manifest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Test-Manifest/devel

Modified Files:
	perl-Test-Manifest.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Test-Manifest.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/perl-Test-Manifest.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-Manifest.spec	1 Dec 2004 15:25:16 -0000	1.4
+++ perl-Test-Manifest.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Test-Manifest
 Version:        1.11
 Release:        1
-Epoch:          0
 Summary:        Test case module for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-String-Ediff/devel perl-String-Ediff.spec,1.6,1.7
Message-ID: <200503032346.j23NkUDo023882@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-String-Ediff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-String-Ediff/devel

Modified Files:
	perl-String-Ediff.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-String-Ediff.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-Ediff/devel/perl-String-Ediff.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-String-Ediff.spec	18 Feb 2005 22:09:00 -0000	1.6
+++ perl-String-Ediff.spec	3 Mar 2005 23:46:28 -0000	1.7
@@ -3,7 +3,6 @@
 Name:           perl-String-Ediff
 Version:        0.04
 Release:        1
-Epoch:          0
 Summary:        Produce common sub-string indices for two strings
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Module-CoreList/devel perl-Module-CoreList.spec,1.1,1.2
Message-ID: <200503032346.j23NkTDE023824@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	perl-Module-CoreList.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Module-CoreList.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/perl-Module-CoreList.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Module-CoreList.spec	5 Jan 2005 19:33:24 -0000	1.1
+++ perl-Module-CoreList.spec	3 Mar 2005 23:46:27 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-Module-CoreList
 Version:        1.98
 Release:        2
-Epoch:          0
 Summary:        Perl core modules indexed by perl versions
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Image-Xbm/devel perl-Image-Xbm.spec,1.4,1.5
Message-ID: <200503032346.j23NkTKx023751@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Image-Xbm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Image-Xbm/devel

Modified Files:
	perl-Image-Xbm.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Image-Xbm.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Xbm/devel/perl-Image-Xbm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Image-Xbm.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-Image-Xbm.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Image-Xbm
 Version:        1.08
 Release:        2
-Epoch:          0
 Summary:        Load, create, manipulate and save xbm image files in Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Test-Pod-Coverage/devel perl-Test-Pod-Coverage.spec, 1.1,
	1.2
Message-ID: <200503032346.j23NkUPT023906@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Test-Pod-Coverage/devel

Modified Files:
	perl-Test-Pod-Coverage.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



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.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	3 Mar 2005 23:46:28 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-Test-Pod-Coverage
 Version:        1.06
 Release:        1
-Epoch:          0
 Summary:        Check for pod coverage in your distribution
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Fri Mar  4 00:30:03 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 19:30:03 -0500
Subject: rpms/openbox/devel .cvsignore, 1.2, NONE Makefile, 1.2,
	NONE openbox-2.3.1-gcc33.patch, 1.1,
	NONE openbox-2.3.1-nls.patch, 1.1, NONE openbox-dm.sessions,
	1.1, NONE openbox-switchdesk.Xclients, 1.1, NONE openbox.spec,
	1.6, NONE sources, 1.2, NONE
Message-ID: <200503040030.j240U3nT026999@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Removed Files:
	.cvsignore Makefile openbox-2.3.1-gcc33.patch 
	openbox-2.3.1-nls.patch openbox-dm.sessions 
	openbox-switchdesk.Xclients openbox.spec sources 
Log Message:
REMOVED from devel tree. Broken, out-of-date and build disabled long enough. If ever picked up again, old version could be resurrected or fresh package imported from scratch.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- openbox-2.3.1-gcc33.patch DELETED ---


--- openbox-2.3.1-nls.patch DELETED ---


--- openbox-dm.sessions DELETED ---


--- openbox-switchdesk.Xclients DELETED ---


--- openbox.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar  4 00:32:13 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 19:32:13 -0500
Subject: rpms/wine/devel .cvsignore, 1.2, NONE Makefile, 1.2, NONE sources,
	1.2, NONE 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 wine.init,
	1.1, NONE wine.spec, 1.2, NONE
Message-ID: <200503040032.j240WD2H027050@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Removed Files:
	.cvsignore Makefile sources wine-20030408-defaultcfg.patch 
	wine-20030408-initial.patch wine-20030408-kde2.patch 
	wine-20030408-winelauncher.patch wine.init wine.spec 
Log Message:
REMOVED from devel tree. Broken and out-of-date long enough. If ever picked up again, old version could be resurrected or fresh package imported from scratch.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


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


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


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


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


--- wine.init DELETED ---


--- wine.spec DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar  4 00:36:28 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 19:36:28 -0500
Subject: rpms/inti/devel .cvsignore, 1.2, NONE Makefile, 1.2, NONE inti.spec,
	1.3, NONE sources, 1.2, NONE
Message-ID: <200503040036.j240aSZ6027134@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Removed Files:
	.cvsignore Makefile inti.spec sources 
Log Message:
REMOVED from devel tree. Broken long enough. No upstream update available. If ever fixed or picked up again, old version could be resurrected or fresh package imported from scratch.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- inti.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar  4 00:52:01 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 19:52:01 -0500
Subject: rpms/dietlibc - New directory
Message-ID: <200503040052.j240q1qg027225@cvs-int.fedora.redhat.com>

Author: ensc

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

Log Message:
Directory /cvs/extras/rpms/dietlibc added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 00:52:01 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 19:52:01 -0500
Subject: rpms/dietlibc/devel - New directory
Message-ID: <200503040052.j240q1CH027228@cvs-int.fedora.redhat.com>

Author: ensc

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

Log Message:
Directory /cvs/extras/rpms/dietlibc/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 00:52:24 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 19:52:24 -0500
Subject: rpms/dietlibc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503040052.j240qOBc027293@cvs-int.fedora.redhat.com>

Author: ensc

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module dietlibc


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

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

common : CVS/Root
	@cvs 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 Mar  4 00:52:24 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 19:52:24 -0500
Subject: rpms/dietlibc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503040052.j240qOBi027296@cvs-int.fedora.redhat.com>

Author: ensc

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dietlibc


--- 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 Mar  4 00:53:19 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 19:53:19 -0500
Subject: rpms/dietlibc import.log,1.1,1.2
Message-ID: <200503040053.j240rJN4027395@cvs-int.fedora.redhat.com>

Author: ensc

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

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



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Mar 2005 00:52:22 -0000	1.1
+++ import.log	4 Mar 2005 00:53:17 -0000	1.2
@@ -0,0 +1 @@
+dietlibc-0_28-4:HEAD:dietlibc-0.28-4.src.rpm:1109897587



From fedora-extras-commits at redhat.com  Fri Mar  4 00:53:19 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 19:53:19 -0500
Subject: rpms/dietlibc/devel dietlibc-0.28-gcc4.patch, NONE,
	1.1 dietlibc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503040053.j240rJOO027399@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	.cvsignore sources 
Added Files:
	dietlibc-0.28-gcc4.patch dietlibc.spec 
Log Message:
auto-import dietlibc-0.28-4 on branch devel from dietlibc-0.28-4.src.rpm


dietlibc-0.28-gcc4.patch:

--- NEW FILE dietlibc-0.28-gcc4.patch ---
--- dietlibc-0.28/libdl/_dl_int.h.gcc4	2005-01-29 03:29:16.000000000 +0100
+++ dietlibc-0.28/libdl/_dl_int.h	2005-03-04 01:39:26.336802965 +0100
@@ -102,7 +102,7 @@ struct r_debug {
   Elf_Addr r_ldbase;
 };
 #ifdef WANT_LD_SO_GDB_SUPPORT
-extern struct r_debug _r_debug;
+  //extern struct r_debug _r_debug;
 #endif
 
 #define HASH_BUCKET_LEN(p)	(*((p)))
@@ -112,9 +112,9 @@ extern struct r_debug _r_debug;
 #define HASH_CHAIN(p)		((p)+2+HASH_BUCKET_LEN(p))
 
 /* _dl_alloc.c */
-extern struct _dl_handle* _dl_root_handle;
-extern struct _dl_handle* _dl_top_handle;
-extern struct _dl_handle* _dl_free_list;
+//extern struct _dl_handle* _dl_root_handle;
+//extern struct _dl_handle* _dl_top_handle;
+//extern struct _dl_handle* _dl_free_list;
 #ifndef __DIET_LD_SO__
 void _dl_free_handle(struct _dl_handle* dh);
 struct _dl_handle* _dl_get_handle();
--- dietlibc-0.28/libdl/_dl_main.c.gcc4	2005-01-29 03:29:16.000000000 +0100
+++ dietlibc-0.28/libdl/_dl_main.c	2005-03-04 01:40:41.886679465 +0100
@@ -168,9 +168,11 @@ static inline unsigned long* get_got(voi
   return got;
 }
 
+/* declare _dl_jump static otherwise we have a GOT access BEFOR we have the resolver */
+static void _dl_jump(void);
+
 static inline int work_on_pltgot(struct _dl_handle*dh) {
-  /* declare _dl_jump static otherwise we have a GOT access BEFOR we have the resolver */
-  static void _dl_jump(void);
+  
   if ((dh->plt_rel)&&(!(dh->flags&RTLD_NOW))) {
     unsigned long*tmp=dh->pltgot;
     /* GOT */
--- dietlibc-0.28/dyn_start.c.gcc4	2004-11-30 23:35:14.000000000 +0100
+++ dietlibc-0.28/dyn_start.c	2005-03-04 01:44:23.346109645 +0100
@@ -29,10 +29,10 @@ int stackgap(int argc,char* argv[],char*
 
 #ifndef __DYN_LIB_SHARED
 /* pre main, post _start */
+static __attribute__((section(".init"))) void _init(void);
 int _dyn_start(int argc, char **argv, char **envp, structor dl_init);
 int _dyn_start(int argc, char **argv, char **envp, structor dl_init)
 {
-  static __attribute__((section(".init"))) void _init(void);
   int main(int argc, char **argv, char **envp);
 
   if (dl_init) atexit(dl_init);


--- NEW FILE dietlibc.spec ---
## $Id: dietlibc.spec,v 1.3 2005/02/01 12:03:17 ensc Exp $

## This package understands the following switches:
## --with cross                 ...  enable crossbuild
## --define crossarch <arch>    ...  set cross-architecture (only valid with
##                                   '--with cross'; defaults to 'arm-linux')

## Fedora Extras specific customization below...
%global	crossarch	%{!?crossarch:arm-linux}%{?crossarch}
##

%global NAME		dietlibc
%global do_crossbuild	%{?_with_cross:1}%{!?_with_cross:0}

%{!?release_func:%define release_func() %1%{?disttag}}

Summary:	A small libc implementation
Name:		%{?_with_cross:cross-%crossarch-}%NAME
Version:	0.28
Release:	%release_func 4
License:	GPL
Group:		Development/Libraries
URL:		http://www.fefe.de/dietlibc/
Source0:	http://www.fefe.de/dietlibc/%NAME-%version.tar.bz2
Patch0:		dietlibc-0.28-gcc4.patch
BuildRoot:	%_tmppath/%name-%version-buildroot
Requires:	dietlibc-lib = %version-%release

%if %do_crossbuild
BuildRequires:  dietlibc
Requires:       dietlibc = %version-%release
%endif


%package lib
Summary:	Dynamic libraries for dietlibc
Group:		System Environment/Libraries

%description
The diet libc is a libc that is optimized for small size. It can be
used to create small statically linked binaries for Linux on alpha,
arm, hppa, ia64, i386, mips, s390, sparc, sparc64, ppc and x86_64.


%description lib
The diet libc is a libc that is optimized for small size. It can be
used to create small statically linked binaries for Linux on alpha,
arm, hppa, ia64, i386, mips, s390, sparc, sparc64, ppc and x86_64.

This package contains the dynamic libraries for dietlibc.


%prep
%setup -q -n %NAME-%version
%patch0 -p1 -b .gcc4

## only for 0.28; remove it in 0.29
sed -i -e 's!LD_RUN_PATH= !env -u LD_RUN_PATH !' Makefile


%define basemakeflags   prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: %{!?_with_cross:CFLAGS="$RPM_OPT_FLAGS"}
%define xtraflags	%(echo CROSS=%{crossarch}- ARCH=$(echo %crossarch | sed -e 's!-.*!!'))
%define makeflags	%basemakeflags %{?_with_cross:%xtraflags}


%build
%if %do_crossbuild
  mkdir bin-%_arch
  diet gcc diet.c -DDIETHOME=\"`pwd`\" -DVERSION=\"X\" -o bin-%_arch/diet
%endif

%__make %makeflags all dyn %_smp_mflags



%install
rm -rf $RPM_BUILD_ROOT
%__install -d -m755 $RPM_BUILD_ROOT/etc
%__make %makeflags DESTDIR=$RPM_BUILD_ROOT install

%if !%do_crossbuild
  ln -s lib-%_arch ${RPM_BUILD_ROOT}%_libdir/dietlibc/lib-%_arch-%_vendor
%endif

%if %do_crossbuild
  rm -rf ${RPM_BUILD_ROOT}%_libdir/dietlibc/include	\
  	 ${RPM_BUILD_ROOT}%_mandir
%endif


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%exclude %_libdir/dietlibc/*/*.so

%if %do_crossbuild
%_libdir/dietlibc/lib-*
%else
%doc AUTHOR BUGS CAVEAT CHANGES COPYING FAQ PORTING README
%doc THANKS TODO
%doc %_mandir/*/*
%_bindir/*
%_libdir/dietlibc
%endif


%files lib
%defattr(-,root,root,-)
%config(noreplace) %_sysconfdir/*
%dir %_libdir/dietlibc
%dir %_libdir/dietlibc/lib-*
%_libdir/dietlibc/lib-%_arch/*.so


%changelog
* Fri Mar  4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-4
- rebuild
- fixed compilation with gcc4

* Tue Feb  1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-1
- updated to 0.28
- unset LD_RUN_PATH which would result in empty rpaths else
- removed the waitpid patch; it is solved upstream

* Tue Aug 17 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.27-1
- updated to 0.27

* Fri Jun 11 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.26-1
- updated to 0.26

* Fri Apr  9 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.25-1
- updated to 0.25

* Sat Jan 17 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:%VERSION.90.%DATE}-5
- renewed -snprintf patch

* Tue Jan  6 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:%VERSION.90.%DATE}-4
- applied -snprintf patch (from fedora dietlibc-0.24-2 package)

* Tue Dec 30 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:%VERSION.90.%DATE}-2
- added C99 patch

* Thu Dec  4 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.24-1
- updated to 0.24

* Tue Sep 16 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.23-1
- updated to 0.23

* Fri Nov  8 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 1:0.21-1
- updated to 0.21
- removed unpackaged files in %%install-stage

* Thu Jul 11 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 1:0.18-1
- updated to 0.18

* Thu Jul  4 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Mar 2005 00:52:22 -0000	1.1
+++ .cvsignore	4 Mar 2005 00:53:17 -0000	1.2
@@ -0,0 +1 @@
+dietlibc-0.28.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Mar 2005 00:52:22 -0000	1.1
+++ sources	4 Mar 2005 00:53:17 -0000	1.2
@@ -0,0 +1 @@
+5be8e221a438817f83f73d09ce655883  dietlibc-0.28.tar.bz2



From fedora-extras-commits at redhat.com  Fri Mar  4 00:55:53 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 19:55:53 -0500
Subject: rpms/qca-tls/devel qca-tls.spec,1.5,1.6
Message-ID: <200503040055.j240trQL027504@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/qca-tls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27498

Modified Files:
	qca-tls.spec 
Log Message:
Fixed spelling mistake spotted in commits-list diff, and took the chance to pseudo-block-test the description. ;)


Index: qca-tls.spec
===================================================================
RCS file: /cvs/extras/rpms/qca-tls/devel/qca-tls.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qca-tls.spec	4 Mar 2005 00:05:42 -0000	1.5
+++ qca-tls.spec	4 Mar 2005 00:55:51 -0000	1.6
@@ -1,7 +1,7 @@
 Name:		qca-tls
 Version:	1.0
 Release:	2
-Summary:	Qt Cryptographic Architecture, TLS plugin
+Summary:	TLS plugin for the Qt Cryptographic Architecture
 License:	LGPL
 Group:		Applications/Internet
 URL:		http://delta.affinix.com/qca/
@@ -14,11 +14,10 @@
 
 
 %description
-This is a plugin to provide SSL/TLS capability to programs that use
-the Qt Cryptographic Architecture (QCA).
-QCA is a library providing an easy API for several cryptographic
-algorithmns to Qt programs.
-This package only contains the TLS plugin.
+This is a plugin to provide SSL/TLS capability to programs that use the Qt
+Cryptographic Architecture (QCA).  QCA is a library providing an easy API
+for several cryptographic algorithms to Qt programs.  This package only
+contains the TLS plugin.
 
 %prep
 %setup -q



From bugs.michael at gmx.net  Fri Mar  4 01:09:20 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 4 Mar 2005 02:09:20 +0100
Subject: rpms/qca-tls/devel qca-tls.spec,1.5,1.6
In-Reply-To: <200503040055.j240trQL027504@cvs-int.fedora.redhat.com>
References: <200503040055.j240trQL027504@cvs-int.fedora.redhat.com>
Message-ID: <20050304020920.0a50b47e.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 19:55:53 -0500, Michael Schwendt (mschwendt) wrote:

> Log Message:
> Fixed spelling mistake spotted in commits-list diff, and took the chance to pseudo-block-test the description. ;)
> 

should have read: ... pseudo-block-text...



From fedora-extras-commits at redhat.com  Fri Mar  4 01:26:55 2005
From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton))
Date: Thu, 3 Mar 2005 20:26:55 -0500
Subject: rpms/sodipodi/devel .cvsignore, 1.3, NONE Makefile, 1.2,
	NONE sodipodi.spec, 1.4, NONE sources, 1.3, NONE
Message-ID: <200503040126.j241Qt5X028351@cvs-int.fedora.redhat.com>

Author: pcompton

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

Removed Files:
	.cvsignore Makefile sodipodi.spec sources 
Log Message:
Removing sodipodi (was replaced by inkscape)



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sodipodi.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar  4 03:04:34 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:04:34 -0500
Subject: rpms/perl-Sub-Uplevel - New directory
Message-ID: <200503040304.j2434Y2f029964@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29957/perl-Sub-Uplevel

Log Message:
Directory /cvs/extras/rpms/perl-Sub-Uplevel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 03:04:34 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:04:34 -0500
Subject: rpms/perl-Sub-Uplevel/devel - New directory
Message-ID: <200503040304.j2434YZL029967@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29957/perl-Sub-Uplevel/devel

Log Message:
Directory /cvs/extras/rpms/perl-Sub-Uplevel/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 03:04:52 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:04:52 -0500
Subject: rpms/perl-Sub-Uplevel Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503040304.j2434qrS030026@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30017

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Sub-Uplevel


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

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

common : CVS/Root
	@cvs 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 Mar  4 03:04:52 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:04:52 -0500
Subject: rpms/perl-Sub-Uplevel/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503040304.j2434qtS030029@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30017/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Sub-Uplevel


--- 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 Mar  4 03:05:25 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:05:25 -0500
Subject: rpms/perl-Sub-Uplevel import.log,1.1,1.2
Message-ID: <200503040305.j2435P4G030125@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30116

Modified Files:
	import.log 
Log Message:
auto-import perl-Sub-Uplevel-0.09-0.fdr.1 on branch devel from perl-Sub-Uplevel-0.09-0.fdr.1.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Mar 2005 03:04:50 -0000	1.1
+++ import.log	4 Mar 2005 03:05:23 -0000	1.2
@@ -0,0 +1 @@
+perl-Sub-Uplevel-0_09-0_fdr_1:HEAD:perl-Sub-Uplevel-0.09-0.fdr.1.src.rpm:1109905576



From fedora-extras-commits at redhat.com  Fri Mar  4 03:05:25 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:05:25 -0500
Subject: rpms/perl-Sub-Uplevel/devel perl-Sub-Uplevel.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503040305.j2435PVm030131@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30116/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Sub-Uplevel.spec 
Log Message:
auto-import perl-Sub-Uplevel-0.09-0.fdr.1 on branch devel from perl-Sub-Uplevel-0.09-0.fdr.1.src.rpm



--- NEW FILE perl-Sub-Uplevel.spec ---
%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:           perl-Sub-Uplevel
Version:        0.09
Release:        0.fdr.1
Epoch:          0
Summary:        Apparently run a function in a higher stack frame

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Sub-Uplevel/
Source0:   http://www.cpan.org/authors/id/M/MS/MSCHWERN/Sub-Uplevel-0.09.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Like Tcl's uplevel() function, but not quite so dangerous.  The
idea is just to fool caller().  All the really naughty bits of
Tcl's uplevel() are avoided.


%prep
%setup -q -n Sub-Uplevel-%{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+w $RPM_BUILD_ROOT/*


%check || :
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/Sub/
%{_mandir}/man3/*.3*


%changelog
* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.09-0.fdr.1
- Update to 0.09 (with license info).

* Sun Jul  4 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.08-0.fdr.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Mar 2005 03:04:50 -0000	1.1
+++ .cvsignore	4 Mar 2005 03:05:23 -0000	1.2
@@ -0,0 +1 @@
+Sub-Uplevel-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Mar 2005 03:04:50 -0000	1.1
+++ sources	4 Mar 2005 03:05:23 -0000	1.2
@@ -0,0 +1 @@
+eb09cb38cd7a9b7bc9d3e85e61fe09dd  Sub-Uplevel-0.09.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar  4 03:06:42 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:06:42 -0500
Subject: rpms/perl-Test-Exception - New directory
Message-ID: <200503040306.j2436ggV030252@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30245/perl-Test-Exception

Log Message:
Directory /cvs/extras/rpms/perl-Test-Exception added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 03:06:42 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:06:42 -0500
Subject: rpms/perl-Test-Exception/devel - New directory
Message-ID: <200503040306.j2436gM3030255@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30245/perl-Test-Exception/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-Exception/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 03:07:01 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:07:01 -0500
Subject: rpms/perl-Test-Exception Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503040307.j24371en030314@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30305

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Test-Exception


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

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

common : CVS/Root
	@cvs 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 Mar  4 03:07:01 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:07:01 -0500
Subject: rpms/perl-Test-Exception/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503040307.j24371eD030317@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30305/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-Exception


--- 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 Mar  4 03:07:33 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:07:33 -0500
Subject: rpms/perl-Test-Exception import.log,1.1,1.2
Message-ID: <200503040307.j2437XJw030410@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30401

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-Exception-0.20-0.fdr.1 on branch devel from perl-Test-Exception-0.20-0.fdr.1.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Exception/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Mar 2005 03:06:59 -0000	1.1
+++ import.log	4 Mar 2005 03:07:31 -0000	1.2
@@ -0,0 +1 @@
+perl-Test-Exception-0_20-0_fdr_1:HEAD:perl-Test-Exception-0.20-0.fdr.1.src.rpm:1109905704



From fedora-extras-commits at redhat.com  Fri Mar  4 03:07:33 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:07:33 -0500
Subject: rpms/perl-Test-Exception/devel perl-Test-Exception.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503040307.j2437Xd3030415@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30401/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Exception.spec 
Log Message:
auto-import perl-Test-Exception-0.20-0.fdr.1 on branch devel from perl-Test-Exception-0.20-0.fdr.1.src.rpm



--- NEW FILE perl-Test-Exception.spec ---
%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:           perl-Test-Exception
Version:        0.20
Release:        0.fdr.1
Epoch:          0
Summary:        Test functions for exception based code

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Test-Exception/
Source0:    http://www.cpan.org/authors/id/A/AD/ADIE/Test-Exception-0.20.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
BuildRequires:  perl(Module::Build), perl(Test::More)
BuildRequires:  perl(Test::Builder), perl(Test::Builder::Tester)
BuildRequires:  perl(Sub::Uplevel), perl(Pod::Coverage), perl(Test::Pod)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides a few convenience methods for testing exception
based code. It is built with Test::Builder and plays happily with
Test::More and friends.


%prep
%setup -q -n Test-Exception-%{version}


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
rm -rf $RPM_BUILD_ROOT
./Build install destdir=$RPM_BUILD_ROOT
chmod -R u+w $RPM_BUILD_ROOT/*


%check || :
./Build test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/Test/
%{_mandir}/man3/*.3*


%changelog
* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.20-0.fdr.1
- Update to 0.20.

* Sun Jul 04 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.15-0.fdr.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Exception/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Mar 2005 03:06:59 -0000	1.1
+++ .cvsignore	4 Mar 2005 03:07:31 -0000	1.2
@@ -0,0 +1 @@
+Test-Exception-0.20.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Exception/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Mar 2005 03:06:59 -0000	1.1
+++ sources	4 Mar 2005 03:07:31 -0000	1.2
@@ -0,0 +1 @@
+820941e2373ecc9a17716550357dc6c6  Test-Exception-0.20.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar  4 03:18:49 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:18:49 -0500
Subject: rpms/perl-Sub-Uplevel/devel perl-Sub-Uplevel.spec,1.1,1.2
Message-ID: <200503040318.j243Inkv030498@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30492

Modified Files:
	perl-Sub-Uplevel.spec 
Log Message:
Removing Epoch


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/perl-Sub-Uplevel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Sub-Uplevel.spec	4 Mar 2005 03:05:23 -0000	1.1
+++ perl-Sub-Uplevel.spec	4 Mar 2005 03:18:47 -0000	1.2
@@ -2,8 +2,7 @@
 
 Name:           perl-Sub-Uplevel
 Version:        0.09
-Release:        0.fdr.1
-Epoch:          0
+Release:        1
 Summary:        Apparently run a function in a higher stack frame
 
 Group:          Development/Libraries
@@ -55,7 +54,7 @@
 
 
 %changelog
-* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.09-0.fdr.1
+* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-1
 - Update to 0.09 (with license info).
 
 * Sun Jul  4 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.08-0.fdr.1



From fedora-extras-commits at redhat.com  Fri Mar  4 03:33:59 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:33:59 -0500
Subject: rpms/perl-Sub-Uplevel/devel perl-Sub-Uplevel.spec,1.2,1.3
Message-ID: <200503040333.j243Xx4C030589@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30583

Modified Files:
	perl-Sub-Uplevel.spec 
Log Message:
New Summary text


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/perl-Sub-Uplevel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Sub-Uplevel.spec	4 Mar 2005 03:18:47 -0000	1.2
+++ perl-Sub-Uplevel.spec	4 Mar 2005 03:33:57 -0000	1.3
@@ -3,7 +3,7 @@
 Name:           perl-Sub-Uplevel
 Version:        0.09
 Release:        1
-Summary:        Apparently run a function in a higher stack frame
+Summary:        Run a perl function in an upper stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic



From fedora-extras-commits at redhat.com  Fri Mar  4 03:48:46 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:48:46 -0500
Subject: rpms/perl-Test-Exception/devel perl-Test-Exception.spec,1.1,1.2
Message-ID: <200503040348.j243mkDG030696@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30690

Modified Files:
	perl-Test-Exception.spec 
Log Message:
Removed Epoch.
Modified Summary text.



Index: perl-Test-Exception.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Exception/devel/perl-Test-Exception.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Exception.spec	4 Mar 2005 03:07:31 -0000	1.1
+++ perl-Test-Exception.spec	4 Mar 2005 03:48:44 -0000	1.2
@@ -2,9 +2,8 @@
 
 Name:           perl-Test-Exception
 Version:        0.20
-Release:        0.fdr.1
-Epoch:          0
-Summary:        Test functions for exception based code
+Release:        1
+Summary:        Library of test functions for exception based Perl code
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -56,7 +55,7 @@
 
 
 %changelog
-* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.20-0.fdr.1
+* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.20-1
 - Update to 0.20.
 
 * Sun Jul 04 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.15-0.fdr.1



From ville.skytta at iki.fi  Fri Mar  4 07:29:46 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Fri, 04 Mar 2005 09:29:46 +0200
Subject: APPROVED: perl-Sub-Uplevel, perl-Test-Exception
Message-ID: <1109921386.15077.340.camel@bobcat.mine.nu>

New packages approved by yours truly, maintained by Jos? Pedro Oliveira:

perl-Sub-Uplevel - http://bugzilla.fedora.us/show_bug.cgi?id=1826
perl-Test-Exception - http://bugzilla.fedora.us/show_bug.cgi?id=1827
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050304/0681a4ed/attachment.sig>

From fedora-extras-commits at redhat.com  Fri Mar  4 13:20:28 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 08:20:28 -0500
Subject: rpms/bzflag/devel - New directory
Message-ID: <200503041320.j24DKSpp008147@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Log Message:
Directory /cvs/extras/rpms/bzflag/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 13:20:28 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 08:20:28 -0500
Subject: rpms/bzflag - New directory
Message-ID: <200503041320.j24DKSal008145@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Log Message:
Directory /cvs/extras/rpms/bzflag added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 13:20:48 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 08:20:48 -0500
Subject: rpms/bzflag Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503041320.j24DKmAM008207@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module bzflag


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

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

common : CVS/Root
	@cvs 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 Mar  4 13:20:48 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 08:20:48 -0500
Subject: rpms/bzflag/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503041320.j24DKmdV008210@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bzflag


--- 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 Mar  4 14:10:28 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 09:10:28 -0500
Subject: rpms/bzflag/devel bzflag.desktop, NONE, 1.1 bzflag.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503041410.j24EASfc009142@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources 
Added Files:
	bzflag.desktop bzflag.spec 
Log Message:
initial import (cvs-import.sh failed to upload source file)



--- NEW FILE bzflag.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;X-Fedora-Extra;
Name=BZFlag
Comment=3D multi-player tank battle game
GenericName=3D multi-player tank battle game
Exec=bzflag
Icon=bzflag.xpm
Terminal=false
Type=Application
Encoding=UTF-8
EOF


--- NEW FILE bzflag.spec ---
%define desktop_vendor redhat
%define date           20050117

Summary: 3D multi-player tank battle game
Name: bzflag
Version: 2.0.0
Release: 4
License: GPL
Group: Amusements/Games
URL: http://bzflag.org
Source: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
Source1: bzflag.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: xorg-x11-devel gcc-c++ desktop-file-utils SDL-devel ncurses-devel

%description
BZFlag is a 3D multi-player tank battle game  that  allows users to play
against each other in a networked environment.  There are five teams: red,
green, blue, purple and rogue (rogue tanks are black).  Destroying a player
on another team  scores a win, while being destroyed or destroying a teammate
scores a loss.  Rogues have no teammates (not even other rogues), so they
cannot shoot teammates and they do not have a team score.
There are two main styles of play: capture-the-flag and free-for-all.

%prep
%setup -q -n %{name}-%{version}%{?date:.%{date}}

%build
# Use PIE because bzflag/bzfs are networked server applications
CFLAGS='-fPIE -pie %optflags'
CXXFLAGS='-fPIE -pie %optflags'
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%makeinstall
install -D -m 644 package/rpm/bzflag-m.xpm \
    %{buildroot}%{_datadir}/pixmaps/bzflag.xpm

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor %{desktop_vendor} --dir %{buildroot}%{_datadir}/applications \
    %{SOURCE1}

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, 0755)
%doc AUTHORS BUGS COPYING ChangeLog NEWS README README.Linux
%{_bindir}/bzadmin
%{_bindir}/bzflag
#%{_bindir}/bzfrelay
%{_bindir}/bzfs
%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
%{_datadir}/bzflag
%{_datadir}/pixmaps/bzflag.xpm
%{_mandir}/man*/*

%changelog
* Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-4
- move package over to Extras
- make desktop file a file, don't generate it in %%install

* Mon Feb 21 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-3
- fix dates in %%changelog

* Fri Feb 18 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-2
- build as PIE

* Fri Feb 18 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-1
- correct source URL
- buildrequire ncurses-devel

* Tue Jan 18 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-0.1
- version 2.0.0.20050117
- buildrequire xorg-x11-devel, not XFree86-devel

* Tue Aug 10 2004 Alan Cox <alan at redhat.com> 1.10.6-2
- Adopted for FC3 core from Matthias Saou's freshrpms package. Thanks
  to Matthias for doing all the work.

* Tue May 18 2004 Matthias Saou <http://freshrpms.net/> 1.10.6-1
- Update to 1.10.6.
- First rebuild for Fedora Core 2.

* Thu Mar 25 2004 Matthias Saou <http://freshrpms.net/> 1.10.4-2
- Removed explicit XFree86 dependency.

* Mon Feb 16 2004 Matthias Saou <http://freshrpms.net/> 1.10.4-1
- Update to 1.10.4.20040125, update the included docs.
- Removed no longer existing bzfls file and added bzadmin.

* Fri Nov  7 2003 Matthias Saou <http://freshrpms.net/> 1.7g2-2
- Rebuild for Fedora Core 1.
- Added missing gcc-c++ build dependency.

* Sun Jun 22 2003 Matthias Saou <http://freshrpms.net/>
- Update to 1.7g2.
- Major spec changes for the new build method.

* Tue Apr  1 2003 Matthias Saou <http://freshrpms.net/>
- Fix the Xfree86 dependency, doh!
- Clean up the confusing build.
- Add a system menu entry.

* Mon Mar 31 2003 Matthias Saou <http://freshrpms.net/>
- Update to 1.7g0.
- Rebuilt for Red Hat Linux 9.

* Mon Nov  4 2002 Matthias Saou <http://freshrpms.net/>
- Rebuilt for Red Hat Linux 8.0.

* Wed Jun 19 2002 Matthias Saou <http://freshrpms.net/>
- Update to 1.7e6.

* Wed Feb 13 2002 Matthias Saou <http://freshrpms.net/>
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Mar 2005 13:20:46 -0000	1.1
+++ .cvsignore	4 Mar 2005 14:10:26 -0000	1.2
@@ -0,0 +1 @@
+bzflag-2.0.0.20050117.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Mar 2005 13:20:46 -0000	1.1
+++ sources	4 Mar 2005 14:10:26 -0000	1.2
@@ -0,0 +1 @@
+16da32cfaac130bf68ca156d0dec2b2e  bzflag-2.0.0.20050117.tar.bz2



From fedora-extras-commits at redhat.com  Fri Mar  4 14:50:03 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 09:50:03 -0500
Subject: rpms/bzflag/devel bzflag.desktop,1.1,1.2
Message-ID: <200503041450.j24Eo3dR009383@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	bzflag.desktop 
Log Message:
remove EOF from end of file



Index: bzflag.desktop
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzflag.desktop	4 Mar 2005 14:10:26 -0000	1.1
+++ bzflag.desktop	4 Mar 2005 14:50:01 -0000	1.2
@@ -8,4 +8,3 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-EOF



From fedora-extras-commits at redhat.com  Fri Mar  4 15:20:26 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 10:20:26 -0500
Subject: rpms/bzflag/devel bzflag.spec,1.1,1.2
Message-ID: <200503041520.j24FKQ0M010178@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	bzflag.spec 
Log Message:
change desktop_vendor from "redhat" to "fedora"



Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzflag.spec	4 Mar 2005 14:10:26 -0000	1.1
+++ bzflag.spec	4 Mar 2005 15:20:24 -0000	1.2
@@ -1,4 +1,4 @@
-%define desktop_vendor redhat
+%define desktop_vendor fedora
 %define date           20050117
 
 Summary: 3D multi-player tank battle game



From fedora-extras-commits at redhat.com  Fri Mar  4 16:21:13 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:21:13 -0500
Subject: rpms/ppracer - New directory
Message-ID: <200503041621.j24GLDip011182@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Log Message:
Directory /cvs/extras/rpms/ppracer added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 16:21:13 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:21:13 -0500
Subject: rpms/ppracer/devel - New directory
Message-ID: <200503041621.j24GLD0o011185@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Log Message:
Directory /cvs/extras/rpms/ppracer/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 16:21:32 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:21:32 -0500
Subject: rpms/ppracer Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503041621.j24GLWUZ011244@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module ppracer


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

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

common : CVS/Root
	@cvs 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 Mar  4 16:21:32 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:21:32 -0500
Subject: rpms/ppracer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503041621.j24GLW33011247@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ppracer


--- 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 Mar  4 16:24:55 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:24:55 -0500
Subject: rpms/ppracer/devel PPRacer-0.1.9-ia64.patch, NONE,
	1.1 ppracer-0.3.1-optflags.patch, NONE, 1.1 ppracer.desktop,
	NONE, 1.1 ppracer.png, NONE, 1.1 ppracer.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503041624.j24GOtLP011391@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources 
Added Files:
	PPRacer-0.1.9-ia64.patch ppracer-0.3.1-optflags.patch 
	ppracer.desktop ppracer.png ppracer.spec 
Log Message:
auto-import ppracer-0.3.1-1 on branch devel from ppracer-0.3.1-1.src.rpm


PPRacer-0.1.9-ia64.patch:

--- NEW FILE PPRacer-0.1.9-ia64.patch ---
--- PPRacer-0.1.9/src/view.cpp.ia64	2004-10-25 17:40:36.000000000 +0200
+++ PPRacer-0.1.9/src/view.cpp	2004-10-31 17:16:23.718797164 +0100
@@ -359,7 +359,7 @@
 		  ( speed - NO_INTERPOLATION_SPEED ) /
 		  ( BASELINE_INTERPOLATION_SPEED - NO_INTERPOLATION_SPEED )));
 
-    up_dir = pp::Vec3d( 0, 1, 0 );
+    up_dir = pp::Vec3d( 0.0, 1.0, 0.0 );
 
     vel_dir = plyr.vel;
     vel_dir.normalize();
@@ -373,7 +373,7 @@
 	/* Camera-on-a-string mode */
 
 	/* Construct vector from player to camera */
-	view_vec = pp::Vec3d( 0, 
+	view_vec = pp::Vec3d( 0.0, 
 				sin( ANGLES_TO_RADIANS( 
 				    course_angle -
 				    CAMERA_ANGLE_ABOVE_SLOPE + 
@@ -408,6 +408,7 @@
         } 
 
 	/* Interpolate view point */
+#if ! defined (__ia64__)
 	if ( plyr.view.initialized ) {
 	    /* Interpolate twice to get a second-order filter */
 	    int i;
@@ -420,6 +421,7 @@
 					  time_constant_mult );
 	    }
 	}
+#endif
 
 	/* Make sure interpolated view point is above terrain */
         ycoord = find_y_coord( view_pt.x, view_pt.z );
@@ -439,6 +441,7 @@
 	view_dir = -1.0*rot_mat.transformVector( view_vec );
 
 	/* Interpolate orientation of camera */
+#if ! defined (__ia64__)
 	if ( plyr.view.initialized ) {
 	    /* Interpolate twice to get a second-order filter */
 	    int i;
@@ -449,6 +452,7 @@
 		up_dir = pp::Vec3d( 0.0, 1.0, 0.0 );
 	    }
 	}
+#endif
 
         break;
     }
@@ -457,10 +461,10 @@
     {
 	/* Camera follows player (above and behind) */
 
-	up_dir = pp::Vec3d( 0, 1, 0 );
+	up_dir = pp::Vec3d( 0.0, 1.0, 0.0 );
 
 	/* Construct vector from player to camera */
-	view_vec = pp::Vec3d( 0, 
+	view_vec = pp::Vec3d( 0.0, 
 				sin( ANGLES_TO_RADIANS( 
 				    course_angle -
 				    CAMERA_ANGLE_ABOVE_SLOPE +
@@ -494,6 +498,7 @@
             view_pt.y = ycoord + MIN_CAMERA_HEIGHT;
 	}
 
+#if ! defined (__ia64__)
 	/* Interpolate view point */
 	if ( plyr.view.initialized ) {
 	    /* Interpolate twice to get a second-order filter */
@@ -507,6 +512,7 @@
 					  time_constant_mult );
 	    }
 	}
+#endif
 
 	/* Make sure interpolate view point is above terrain */
         ycoord = find_y_coord( view_pt.x, view_pt.z );
@@ -525,6 +531,7 @@
 	view_dir = -1.0*rot_mat.transformVector( view_vec );
 
 	/* Interpolate orientation of camera */
+#if ! defined (__ia64__)
 	if ( plyr.view.initialized ) {
 	    /* Interpolate twice to get a second-order filter */
 	    int i;
@@ -535,6 +542,7 @@
 		up_dir = pp::Vec3d( 0.0, 1.0, 0.0 );
 	    }
 	}
+#endif
 
         break;
     }
@@ -543,11 +551,11 @@
     {
 	/* Camera always uphill of player */
 
-	up_dir = pp::Vec3d( 0, 1, 0 );
+	up_dir = pp::Vec3d( 0.0, 1.0, 0.0 );
 
 
 	/* Construct vector from player to camera */
-	view_vec = pp::Vec3d( 0, 
+	view_vec = pp::Vec3d( 0.0, 
 				sin( ANGLES_TO_RADIANS( 
 				    course_angle - 
 				    CAMERA_ANGLE_ABOVE_SLOPE+

ppracer-0.3.1-optflags.patch:

--- NEW FILE ppracer-0.3.1-optflags.patch ---
--- ppracer-0.3.1/configure.in.optflags	2005-02-27 19:43:18.000000000 +0100
+++ ppracer-0.3.1/configure.in	2005-03-04 17:07:37.482468102 +0100
@@ -35,8 +35,8 @@
 dnl General options
 dnl --------------------------------------------------------------------------
 TR_CPPFLAGS=""
-TR_CFLAGS=""
-TR_CXXFLAGS=""
+TR_CFLAGS="$RPM_OPT_FLAGS"
+TR_CXXFLAGS="$RPM_OPT_FLAGS"
 TR_LIBS=""
 
 case "$host" in
@@ -55,8 +55,8 @@
 AC_ARG_ENABLE(debug,     [  --enable-debug          Produce an executable with debugging symbols])
 
 if test "x$enable_debug" = "xyes" ; then
-	TR_CFLAGS="-g -Wall"
-	TR_CXXFLAGS="-g -Wall"
+	TR_CFLAGS="$RPM_OPT_FLAGS -g -Wall"
+	TR_CXXFLAGS="$RPM_OPT_FLAGS -g -Wall"
 else
 	TR_CPPFLAGS="$TR_CPPFLAGS -DTUXRACER_NO_ASSERT=1"
 fi


--- NEW FILE ppracer.desktop ---
[Desktop Entry]
Encoding=UTF-8
Categories=Application;Game;X-Red-Hat-Extra;
X-Desktop-File-Install-Version=0.2
Name=PPRacer
Description=Race your penguin down an alpine slope
Exec=ppracer
Terminal=0
Type=Application
Icon=/usr/share/ppracer/ppracer.png


--- NEW FILE ppracer.spec ---
%define desktop_file_utils_version 0.2.90

#define srcextraversion -2

Summary: A 3D racing game featuring Tux.
Name: ppracer
Version: 0.3.1
Release: 1
License: GPL
Group: Amusements/Games
URL: http://racer.planetpenguin.de
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Source: http://download.berlios.de/ppracer/ppracer-%{version}%{?srcextraversion}.tar.bz2
Source2: ppracer.png
Source3: ppracer.desktop

Patch1: ppracer-0.3.1-optflags.patch
Patch2: PPRacer-0.1.9-ia64.patch

BuildRequires: grep
BuildRequires: xorg-x11-devel
BuildRequires: SDL-devel >= 1.2
BuildRequires: SDL_mixer-devel >= 1.2
BuildRequires: tcl-devel >= 8.0
BuildRequires: autoconf
BuildRequires: freetype-devel

BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}

%description
PPRacer is a simple OpenGL-based racing game featuring Tux. The
objective of the game is to slide down a snow- and ice-covered mountain
as quickly as possible, avoiding the trees and rocks that will slow
you down.

%prep
%setup -q
%patch1 -p1 -b .optflags
%patch2 -p1 -b .ia64

%build
autoconf
%configure --with-data-dir=%{_datadir}/ppracer
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%makeinstall ppdatadir=%{buildroot}%{_datadir}/ppracer

mkdir -p %{buildroot}%{_datadir}/applications/
install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/applications/net-ppracer.desktop

%clean
rm -rf %{buildroot}

%files
%defattr (-, root, root, 755)
%{_bindir}/ppracer
%{_datadir}/ppracer
%{_datadir}/applications/*
%doc AUTHORS COPYING ChangeLog README contrib

%changelog
* Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com>
- version 0.3.1

* Thu Feb 03 2005 Nils Philippsen <nphilipp at redhat.com>
- version 0.3

* Wed Jan 19 2005 Nils Philippsen <nphilipp at redhat.com>
- version 0.2.3

* Thu Dec 30 2004 Nils Philippsen <nphilipp at redhat.com>
- version 0.2.2

* Wed Dec 08 2004 Nils Philippsen <nphilipp at redhat.com>
- version 0.2.1

* Tue Nov 16 2004 Nils Philippsen <nphilipp at redhat.com>
- version 0.2

* Sun Oct 31 2004 Nils Philippsen <nphilipp at redhat.com>
- version 0.1.9
- initial build based on tuxracer spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Mar 2005 16:21:30 -0000	1.1
+++ .cvsignore	4 Mar 2005 16:24:53 -0000	1.2
@@ -0,0 +1 @@
+ppracer-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Mar 2005 16:21:30 -0000	1.1
+++ sources	4 Mar 2005 16:24:53 -0000	1.2
@@ -0,0 +1 @@
+fa80d5dc1e4b63edf05d27b2e86637ec  ppracer-0.3.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Mar  4 16:24:55 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:24:55 -0500
Subject: rpms/ppracer import.log,1.1,1.2
Message-ID: <200503041624.j24GOti7011388@cvs-int.fedora.redhat.com>

Author: nphilipp

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

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



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ppracer/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Mar 2005 16:21:30 -0000	1.1
+++ import.log	4 Mar 2005 16:24:53 -0000	1.2
@@ -0,0 +1 @@
+ppracer-0_3_1-1:HEAD:ppracer-0.3.1-1.src.rpm:1109953485



From fedora-extras-commits at redhat.com  Fri Mar  4 16:33:23 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:33:23 -0500
Subject: rpms/ppracer/devel ppracer.desktop,1.1,1.2
Message-ID: <200503041633.j24GXNSD011491@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.desktop 
Log Message:
fix Categories
add GenericName
"Description" -> "Comment"



Index: ppracer.desktop
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppracer.desktop	4 Mar 2005 16:24:53 -0000	1.1
+++ ppracer.desktop	4 Mar 2005 16:33:21 -0000	1.2
@@ -1,9 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Categories=Application;Game;X-Red-Hat-Extra;
+Categories=Game;ArcadeGame;X-Fedora-Extra;
 X-Desktop-File-Install-Version=0.2
 Name=PPRacer
-Description=Race your penguin down an alpine slope
+GenericName=A 3D downhill racing game
+Comment=Race your penguin down an alpine slope
 Exec=ppracer
 Terminal=0
 Type=Application



From fedora-extras-commits at redhat.com  Fri Mar  4 16:34:17 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:34:17 -0500
Subject: rpms/bzflag/devel bzflag.desktop,1.2,1.3
Message-ID: <200503041634.j24GYHx1011519@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	bzflag.desktop 
Log Message:
make Comment a (non-redundant) comment



Index: bzflag.desktop
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bzflag.desktop	4 Mar 2005 14:50:01 -0000	1.2
+++ bzflag.desktop	4 Mar 2005 16:34:15 -0000	1.3
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Categories=Game;ArcadeGame;X-Fedora-Extra;
 Name=BZFlag
-Comment=3D multi-player tank battle game
 GenericName=3D multi-player tank battle game
+Comment=Drive around in your tank and shoot others
 Exec=bzflag
 Icon=bzflag.xpm
 Terminal=false



From fedora-extras-commits at redhat.com  Fri Mar  4 16:56:39 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 4 Mar 2005 11:56:39 -0500
Subject: rpms/gwget/devel .cvsignore, 1.3, 1.4 gwget.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200503041656.j24Gud6b011651@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	.cvsignore gwget.spec sources 
Log Message:
fix x86_64


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Feb 2005 21:36:27 -0000	1.3
+++ .cvsignore	4 Mar 2005 16:56:22 -0000	1.4
@@ -1 +1,2 @@
 gwget-0.93.tar.gz
+gwget-autoreconf.patch.bz2


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gwget.spec	3 Mar 2005 21:26:03 -0000	1.4
+++ gwget.spec	4 Mar 2005 16:56:37 -0000	1.5
@@ -3,11 +3,12 @@
 Summary:	Graphical download manager that uses wget
 Name:		gwget
 Version:	0.93
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://dl.sf.net/gwget/gwget-0.93.tar.gz
 Source1:	gwget.desktop
+Patch0: 	gwget-autoreconf.patch.bz2
 URL:		http://gwget.sourceforge.net/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:	libgnomeui-devel >= 2.0
@@ -34,12 +35,13 @@
 Requires:	epiphany >= 1.4.4
 BuildRequires:	epiphany-devel >= 1.4.4
 
-%description
+%description epiphany-extension 
 This Package contains extensions gwget2 extensions for epiphany.
 %endif # _without_epiphanye
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure %{?_without_epiphanye:--disable-epiphany-extension}
@@ -97,6 +99,9 @@
 
 
 %changelog
+* Tue Mar 01 2005 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0:0.93-2
+- Add gwget-autoreconf.patch.bz2 ; fixes x86_64
+
 * Tue Jan 25 2005 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0:0.93-1
 - Update to 0.93
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Feb 2005 21:36:27 -0000	1.3
+++ sources	4 Mar 2005 16:56:37 -0000	1.4
@@ -1 +1,2 @@
 79a3625ef99a5a417164e0d97020fcc5  gwget-0.93.tar.gz
+159d5d2c94c0bb88a82cdfdb2ecbe0d2  gwget-autoreconf.patch.bz2



From fedora-extras-commits at redhat.com  Fri Mar  4 16:56:24 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 4 Mar 2005 11:56:24 -0500
Subject: rpms/gwget/FC-3 .cvsignore, 1.3, 1.4 gwget.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200503041656.j24GuOKv011645@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	.cvsignore gwget.spec sources 
Log Message:
fix x86_64


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Feb 2005 21:36:27 -0000	1.3
+++ .cvsignore	4 Mar 2005 16:56:21 -0000	1.4
@@ -1 +1,2 @@
 gwget-0.93.tar.gz
+gwget-autoreconf.patch.bz2


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-3/gwget.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gwget.spec	26 Feb 2005 21:36:27 -0000	1.3
+++ gwget.spec	4 Mar 2005 16:56:21 -0000	1.4
@@ -1,25 +1,24 @@
 # use "--without epiphanye" as rpmbuildparameter to disable epiphany-extension (requires FC3 Core package)
 
-Summary: 	GUI Download manager using wget
-Name: 		gwget
-Epoch:		0
-Version: 	0.93
-Release: 	1
-License: 	GPL
-Group: 		Applications/Internet
-Source0: 	http://prdownloads.sourceforge.net/gwget/gwget-0.93.tar.gz
-# direct link:	http://mesh.dl.sourceforge.net/sourceforge/gwget/gwget-0.93.tar.gz
+Summary:	Graphical download manager that uses wget
+Name:		gwget
+Version:	0.93
+Release:	1
+License:	GPL
+Group:		Applications/Internet
+Source0:	http://dl.sf.net/gwget/gwget-0.93.tar.gz
 Source1:	gwget.desktop
-URL: 		http://gwget.sourceforge.net/
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Buildrequires:	libgnomeui-devel >= 0:2.0
-Buildrequires:	libglade2-devel >= 0:2.0
+Patch0: 	gwget-autoreconf.patch.bz2
+URL:		http://gwget.sourceforge.net/
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildrequires:	libgnomeui-devel >= 2.0
+Buildrequires:	libglade2-devel >= 2.0
 BuildRequires:	perl-XML-Parser
-BuildRequires:	gettext >= 0:0.14.1
-BuildRequires:  desktop-file-utils
-Requires: 	wget >= 0:1.9
-Requires(post):  GConf2
-Requires(preun): GConf2
+BuildRequires:	gettext >= 0.14.1
+BuildRequires:	desktop-file-utils
+Requires:	wget >= 1.9
+Requires(post):		GConf2
+Requires(preun):	GConf2
 
 
 %description
@@ -30,18 +29,19 @@
 %if 0%{!?_without_epiphanye:1}
 
 %package epiphany-extension
-Summary: 	This Package contains extensions gwget2 extensions for epiphany.
-Group: 		Applications/Internet
-Requires:	%{name} = %{epoch}:%{version}
-Requires:	epiphany >= 0:1.4.4
-BuildRequires: 	epiphany-devel >= 0:1.4.4
+Summary:	This Package contains extensions gwget2 extensions for epiphany.
+Group:		Applications/Internet
+Requires:	%{name} = %{version}
+Requires:	epiphany >= 1.4.4
+BuildRequires:	epiphany-devel >= 1.4.4
 
 %description epiphany-extension 
 This Package contains extensions gwget2 extensions for epiphany.
-%endif 	# _without_epiphanye
+%endif # _without_epiphanye
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure %{?_without_epiphanye:--disable-epiphany-extension}
@@ -94,11 +94,14 @@
 %defattr (-,root,root)
 %dir %{_libdir}/epiphany/extensions/
 %{_libdir}/epiphany/extensions/*
-%endif 	# _without_epiphanye
+%endif # _without_epiphanye
 
 
 
 %changelog
+* Tue Mar 01 2005 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0:0.93-2
+- Add gwget-autoreconf.patch.bz2 ; fixes x86_64
+
 * Tue Jan 25 2005 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0:0.93-1
 - Update to 0.93
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Feb 2005 21:36:27 -0000	1.3
+++ sources	4 Mar 2005 16:56:21 -0000	1.4
@@ -1 +1,2 @@
 79a3625ef99a5a417164e0d97020fcc5  gwget-0.93.tar.gz
+159d5d2c94c0bb88a82cdfdb2ecbe0d2  gwget-autoreconf.patch.bz2



From fedora-extras-commits at redhat.com  Fri Mar  4 16:56:59 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:56:59 -0500
Subject: rpms/ppracer/devel ppracer.desktop,1.2,1.3
Message-ID: <200503041656.j24GuxGa011700@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.desktop 
Log Message:
add 3DGraphics to Categories



Index: ppracer.desktop
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppracer.desktop	4 Mar 2005 16:33:21 -0000	1.2
+++ ppracer.desktop	4 Mar 2005 16:56:57 -0000	1.3
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Categories=Game;ArcadeGame;X-Fedora-Extra;
+Categories=Game;ArcadeGame;3DGraphics;X-Fedora-Extra;
 X-Desktop-File-Install-Version=0.2
 Name=PPRacer
 GenericName=A 3D downhill racing game



From fedora-extras-commits at redhat.com  Fri Mar  4 18:45:19 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 13:45:19 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.1,1.2
Message-ID: <200503041845.j24IjJKb013554@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.spec 
Log Message:
use desktop_file_install to install desktop file
actually package icon file
clean up summary
don't buildrequire grep
move up %doc files in %files



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppracer.spec	4 Mar 2005 16:24:53 -0000	1.1
+++ ppracer.spec	4 Mar 2005 18:45:17 -0000	1.2
@@ -1,8 +1,9 @@
 %define desktop_file_utils_version 0.2.90
+%define desktop_vendor fedora
 
 #define srcextraversion -2
 
-Summary: A 3D racing game featuring Tux.
+Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
 Release: 1
@@ -17,7 +18,6 @@
 Patch1: ppracer-0.3.1-optflags.patch
 Patch2: PPRacer-0.1.9-ia64.patch
 
-BuildRequires: grep
 BuildRequires: xorg-x11-devel
 BuildRequires: SDL-devel >= 1.2
 BuildRequires: SDL_mixer-devel >= 1.2
@@ -47,22 +47,32 @@
 rm -rf %{buildroot}
 %makeinstall ppdatadir=%{buildroot}%{_datadir}/ppracer
 
+mkdir -p %{buildroot}%{_datadir}/pixmaps/
+install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/
+
 mkdir -p %{buildroot}%{_datadir}/applications/
-install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/applications/net-ppracer.desktop
+desktop-file-install --vendor %{desktop_vendor} --dir %{buildroot}%{_datadir}/applications \
+    %{SOURCE3}
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr (-, root, root, 755)
+%doc AUTHORS COPYING ChangeLog README contrib
 %{_bindir}/ppracer
 %{_datadir}/ppracer
-%{_datadir}/applications/*
-%doc AUTHORS COPYING ChangeLog README contrib
+%{_datadir}/pixmaps/ppracer.png
+%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
 * Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 0.3.1
+- use desktop_file_install to install desktop file
+- actually package icon file
+- clean up summary
+- don't buildrequire grep
+- move up %%doc files in %%files
 
 * Thu Feb 03 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 0.3



From fedora-extras-commits at redhat.com  Fri Mar  4 18:46:03 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 13:46:03 -0500
Subject: rpms/ppracer/devel ppracer.desktop,1.3,1.4
Message-ID: <200503041846.j24Ik3i2013583@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.desktop 
Log Message:
only use basename for icon file



Index: ppracer.desktop
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ppracer.desktop	4 Mar 2005 16:56:57 -0000	1.3
+++ ppracer.desktop	4 Mar 2005 18:46:01 -0000	1.4
@@ -8,4 +8,4 @@
 Exec=ppracer
 Terminal=0
 Type=Application
-Icon=/usr/share/ppracer/ppracer.png
+Icon=ppracer.png



From fedora-extras-commits at redhat.com  Fri Mar  4 19:39:16 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 14:39:16 -0500
Subject: rpms/bzflag/devel bzflag.spec,1.2,1.3
Message-ID: <200503041939.j24JdG81014545@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	bzflag.spec 
Log Message:
use an a bit more individual build root



Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bzflag.spec	4 Mar 2005 15:20:24 -0000	1.2
+++ bzflag.spec	4 Mar 2005 19:39:14 -0000	1.3
@@ -10,7 +10,7 @@
 URL: http://bzflag.org
 Source: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
 Source1: bzflag.desktop
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: xorg-x11-devel gcc-c++ desktop-file-utils SDL-devel ncurses-devel
 
 %description
@@ -61,6 +61,7 @@
 * Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-4
 - move package over to Extras
 - make desktop file a file, don't generate it in %%install
+- use an a bit more individual build root
 
 * Mon Feb 21 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-3
 - fix dates in %%changelog



From fedora-extras-commits at redhat.com  Fri Mar  4 19:39:19 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 14:39:19 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.2,1.3
Message-ID: <200503041939.j24JdJwR014568@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.spec 
Log Message:
use an a bit more individual build root
obsolete tuxracer
buildrequire libpng-devel



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppracer.spec	4 Mar 2005 18:45:17 -0000	1.2
+++ ppracer.spec	4 Mar 2005 19:39:17 -0000	1.3
@@ -10,7 +10,7 @@
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: http://download.berlios.de/ppracer/ppracer-%{version}%{?srcextraversion}.tar.bz2
 Source2: ppracer.png
 Source3: ppracer.desktop
@@ -24,9 +24,12 @@
 BuildRequires: tcl-devel >= 8.0
 BuildRequires: autoconf
 BuildRequires: freetype-devel
+BuildRequires: libpng-devel
 
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 
+Obsoletes: tuxracer
+
 %description
 PPRacer is a simple OpenGL-based racing game featuring Tux. The
 objective of the game is to slide down a snow- and ice-covered mountain
@@ -73,6 +76,9 @@
 - clean up summary
 - don't buildrequire grep
 - move up %%doc files in %%files
+- use an a bit more individual build root
+- obsolete tuxracer
+- buildrequire libpng-devel
 
 * Thu Feb 03 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 0.3



From fedora-extras-commits at redhat.com  Fri Mar  4 19:44:04 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 14:44:04 -0500
Subject: rpms/bzflag/devel bzflag.spec,1.3,1.4
Message-ID: <200503041944.j24Ji4nV014612@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	bzflag.spec 
Log Message:
buildrequire curl-devel



Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bzflag.spec	4 Mar 2005 19:39:14 -0000	1.3
+++ bzflag.spec	4 Mar 2005 19:44:02 -0000	1.4
@@ -11,7 +11,12 @@
 Source: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
 Source1: bzflag.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-devel gcc-c++ desktop-file-utils SDL-devel ncurses-devel
+BuildRequires: xorg-x11-devel
+BuildRequires: gcc-c++
+BuildRequires: desktop-file-utils
+BuildRequires: SDL-devel
+BuildRequires: ncurses-devel
+BuildRequires: curl-devel
 
 %description
 BZFlag is a 3D multi-player tank battle game  that  allows users to play
@@ -62,6 +67,7 @@
 - move package over to Extras
 - make desktop file a file, don't generate it in %%install
 - use an a bit more individual build root
+- buildrequire curl-devel
 
 * Mon Feb 21 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-3
 - fix dates in %%changelog



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:25 -0500
Subject: devel/rpmDirectoryCheck rpmDirectoryCheck.spec,1.5,1.6
Message-ID: <200503042100.j24L0PoO015813@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/rpmDirectoryCheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/rpmDirectoryCheck

Modified Files:
	rpmDirectoryCheck.spec 
Log Message:
#118773 avoidance sweep.


Index: rpmDirectoryCheck.spec
===================================================================
RCS file: /cvs/extras/devel/rpmDirectoryCheck/rpmDirectoryCheck.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmDirectoryCheck.spec	4 Mar 2005 00:05:42 -0000	1.5
+++ rpmDirectoryCheck.spec	4 Mar 2005 21:00:23 -0000	1.6
@@ -17,7 +17,8 @@
 BuildArch:	noarch
 Requires:	rpm-python libxslt graphviz
 BuildRequires:	python2 texinfo tetex-dvips libxslt graphviz
-Requires(post,preun):	gawk rpm /sbin/install-info
+Requires(post):	gawk rpm /sbin/install-info
+Requires(preun): gawk rpm /sbin/install-info
 
 %description
 Various RPMS are creating files although the basedir is not owned by
@@ -71,6 +72,9 @@
 
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Tue Jul 29 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:0.8-0.fdr.1
 - updated to 0.8
 - added 'graphviz' to the list of requirements



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:25 -0500
Subject: devel/allegro allegro.spec,1.8,1.9
Message-ID: <200503042100.j24L0PcB015801@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/allegro
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/allegro

Modified Files:
	allegro.spec 
Log Message:
#118773 avoidance sweep.


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/devel/allegro/allegro.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- allegro.spec	3 Mar 2005 19:29:59 -0000	1.8
+++ allegro.spec	4 Mar 2005 21:00:23 -0000	1.9
@@ -40,7 +40,8 @@
 Summary(it):    Una libreria per la programmazione di videogiochi
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}, XFree86-devel
-Requires(post,preun): /sbin/install-info
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description devel
 Allegro is a cross-platform library intended for use in computer games
@@ -182,6 +183,9 @@
 
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.3-9
 - Disable vga and vbeaf on all non-%%{ix86}.
 - Fix lib paths in allegro-config for 64-bit archs.



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:26 -0500
Subject: devel/tetex-lgrind tetex-lgrind.spec,1.5,1.6
Message-ID: <200503042100.j24L0Q9e015835@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/tetex-lgrind
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/tetex-lgrind

Modified Files:
	tetex-lgrind.spec 
Log Message:
#118773 avoidance sweep.


Index: tetex-lgrind.spec
===================================================================
RCS file: /cvs/extras/devel/tetex-lgrind/tetex-lgrind.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tetex-lgrind.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ tetex-lgrind.spec	4 Mar 2005 21:00:24 -0000	1.6
@@ -16,7 +16,8 @@
 # file contained in the tarballs have to be verified one by one.
 Source0:          ftp://ftp.dante.de/tex-archive/support/lgrind.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires(post,postun): tetex
+Requires(post):   tetex
+Requires(postun): tetex
 Requires:         tetex-latex
 BuildRequires:    tetex-latex, perl
 Prefix:           %{_prefix}
@@ -77,6 +78,9 @@
 %{texmf}/tex/latex/%{tdsname}
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Fri May  2 2003 Marius Johndal <mariuslj at ifi.uio.no> 0:3.67-0.fdr.4
 - Invoke make with %{?_smp_mflags} and from top-level directory to get
   defines right.



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:26 -0500
Subject: devel/uim uim.spec,1.4,1.5
Message-ID: <200503042100.j24L0Q5T015839@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/uim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/uim

Modified Files:
	uim.spec 
Log Message:
#118773 avoidance sweep.


Index: uim.spec
===================================================================
RCS file: /cvs/extras/devel/uim/uim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- uim.spec	24 Feb 2005 05:39:46 -0000	1.4
+++ uim.spec	4 Mar 2005 21:00:24 -0000	1.5
@@ -14,7 +14,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	gtk2-devel
 BuildRequires:	gnome-panel-devel
-Requires(post,postun): %{_sbindir}/alternatives
+Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
+Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
 
 %package	devel
 Summary:	Development files for the Uim library
@@ -25,34 +26,39 @@
 Summary:	GTK+2 support for Uim
 Group:		User Interface/Desktops
 Requires:	uim = %{version}-%{release}
-Requires(post,postun): gtk2
+Requires(post):	gtk2
+Requires(postun): gtk2
 
 %package	gnome
 Summary:	GNOME Applet for Uim
 Group:		User Interface/Desktops
 Requires:	uim = %{version}-%{release}
-Requires(post,postun): %{_sbindir}/bonobo-activation-sysconf
+Requires(post):	%{_sbindir}/bonobo-activation-sysconf
+Requires(postun): %{_sbindir}/bonobo-activation-sysconf
 
 %package	anthy
 Summary:	Anthy support for Uim
 Group:		System Environment/Libraries
 Requires:	anthy
 Requires:	uim = %{version}-%{release}
-Requires(post,postun): gtk2
+Requires(post):	gtk2
+Requires(postun): gtk2
 
 %package	canna
 Summary:	Canna support for Uim
 Group:		System Environment/Libraries
 Requires:	Canna Canna-devel
 Requires:	uim = %{version}-%{release}
-Requires(post,postun): gtk2
+Requires(post):	gtk2
+Requires(postun): gtk2
 
 %package	skk
 Summary:	SKK support for Uim
 Group:		System Environment/Libraries
 Requires:	skkdic
 Requires:	uim = %{version}-%{release}
-Requires(post,postun): gtk2
+Requires(post):	gtk2
+Requires(postun): gtk2
 
 %description
 Uim is a multilingual input method library. Uim aims to
@@ -248,12 +254,16 @@
 %{_datadir}/uim/skk*.scm
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+- Add ldconfig scriptlet dependencies.
+
 * Thu Feb 24 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.5.1-1
 - New upstream release.
   - security fix.
 - support xinput script.
 
-* Sun Feb 20 2005 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info 0.4.5-2
+* Sun Feb 20 2005 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info> 0.4.5-2
 - Added autoreconf-patch; fixes build on x86_64
 
 * Wed Jan 12 2005 Akira TAGOH <tagoh at redhat.com> 0.4.5-1



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:25 -0500
Subject: devel/gnome-blog gnome-blog.spec,1.4,1.5
Message-ID: <200503042100.j24L0Pr5015810@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/gnome-blog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/gnome-blog

Modified Files:
	gnome-blog.spec 
Log Message:
#118773 avoidance sweep.


Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/devel/gnome-blog/gnome-blog.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-blog.spec	3 Mar 2005 21:26:03 -0000	1.4
+++ gnome-blog.spec	4 Mar 2005 21:00:23 -0000	1.5
@@ -19,7 +19,8 @@
 Requires:	pygtk2 >= %{gnome_python2_version}
 Requires:	python >= %{pyver}, python <= %{pynext}
 
-Requires(post,preun):	GConf2
+Requires(post):	GConf2
+Requires(preun): GConf2
 
 BuildRequires:	pygtk2-devel >= %{gnome_python2_version}
 BuildRequires:	glib2-devel
@@ -91,6 +92,9 @@
 
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Tue Feb  3 2004 Brian Pepple <bdpepple at ameritech.net> 0:0.7-0.fdr.7
 - Removed Requires: GConf2, and replaced with Requires(post,preun).
 



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:25 -0500
Subject: devel/seahorse seahorse.spec,1.4,1.5
Message-ID: <200503042100.j24L0PqM015817@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/seahorse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/seahorse

Modified Files:
	seahorse.spec 
Log Message:
#118773 avoidance sweep.


Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/devel/seahorse/seahorse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- seahorse.spec	10 Dec 2004 22:03:11 -0000	1.4
+++ seahorse.spec	4 Mar 2005 21:00:23 -0000	1.5
@@ -16,8 +16,8 @@
 BuildRequires:  scrollkeeper
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-Requires(post): GConf2
-Requires(post,postun): scrollkeeper
+Requires(post): GConf2 scrollkeeper
+Requires(postun): scrollkeeper
 
 %description
 Seahorse is a gnome2 interface for gnupg.
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Mon Nov 09 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:0.7.3-0.fdr.5
 - BuildReq scrollkeeper.
 



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:25 -0500
Subject: devel/cfs cfs.spec,1.5,1.6
Message-ID: <200503042100.j24L0PYn015805@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/cfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/cfs

Modified Files:
	cfs.spec 
Log Message:
#118773 avoidance sweep.


Index: cfs.spec
===================================================================
RCS file: /cvs/extras/devel/cfs/cfs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cfs.spec	3 Mar 2005 20:08:36 -0000	1.5
+++ cfs.spec	4 Mar 2005 21:00:23 -0000	1.6
@@ -18,8 +18,8 @@
 Patch4:		cfs-1.4.1-rpm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	nfs-utils
-Requires(post,preun):	/sbin/chkconfig
-Requires(post):		%{__mkdir}
+Requires(post):		%{__mkdir} /sbin/chkconfig
+Requires(preun):	/sbin/chkconfig
 
 %description
 CFS is an encrypting file system for Unix-like OSs. It uses NFS as its
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Tue Jul 15 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:1.4.1-0.fdr.3
 - s!%%optflags!$RPM_OPT_FLAGS!
 - require nfs-utils



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:26 -0500
Subject: devel/tdl tdl.spec,1.5,1.6
Message-ID: <200503042100.j24L0QFk015830@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/tdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/tdl

Modified Files:
	tdl.spec 
Log Message:
#118773 avoidance sweep.


Index: tdl.spec
===================================================================
RCS file: /cvs/extras/devel/tdl/tdl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tdl.spec	10 Dec 2004 22:03:11 -0000	1.5
+++ tdl.spec	4 Mar 2005 21:00:23 -0000	1.6
@@ -11,7 +11,8 @@
 Source0:		http://www.rpcurnow.force9.co.uk/tdl/tdl-1.5.2.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	libtermcap-devel, readline-devel, texinfo
-Requires(post,preun): /sbin/install-info
+Requires(post):		/sbin/install-info
+Requires(preun):	/sbin/install-info
 
 %description
 tdl is a console to-do list manager.  You can run its subcommands direct from
@@ -56,6 +57,9 @@
 %{_infodir}/*
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Sun Feb 29 2004 Laurent Papier <papier[AT]tuxfan.net> - 0:1.5.2-0.fdr.1
 - update to 1.5.2.
 



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:25 -0500
Subject: devel/synaptic synaptic.spec,1.8,1.9
Message-ID: <200503042100.j24L0Pwc015821@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/synaptic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/synaptic

Modified Files:
	synaptic.spec 
Log Message:
#118773 avoidance sweep.


Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/devel/synaptic/synaptic.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- synaptic.spec	29 Jan 2005 21:20:56 -0000	1.8
+++ synaptic.spec	4 Mar 2005 21:00:23 -0000	1.9
@@ -14,7 +14,8 @@
 # This isn't really a requirement mozilla works as well for a help browser,
 # however konqueror and firefox don't apparently work so...
 Requires: yelp
-Requires(post,postun): scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 BuildRequires: apt-devel >= 0:0.5.4, rpm-devel >= 0:4.0
 BuildRequires: gtk2-devel, libglade2-devel, desktop-file-utils
 BuildRequires: libstdc++-devel, gettext
@@ -103,6 +104,9 @@
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Sat Jan 29 2005 Warren Togami <wtogami at redhat.com> 0.55.3-2
 - ExcludeArch: x86_64 ppc64
 



From fedora-extras-commits at redhat.com  Fri Mar  4 21:43:58 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Fri, 4 Mar 2005 16:43:58 -0500
Subject: rpms/dietlibc/devel .cvsignore,1.2,1.3
Message-ID: <200503042143.j24Lhw7G017630@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	.cvsignore 
Log Message:
updated



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Mar 2005 00:53:17 -0000	1.2
+++ .cvsignore	4 Mar 2005 21:43:56 -0000	1.3
@@ -1 +1,4 @@
-dietlibc-0.28.tar.bz2
+dietlibc-[0-9].[0-9][0-9]
+dietlibc*.tar.bz2*
+dietlibc*.rpm
+i386



From fedora-extras-commits at redhat.com  Fri Mar  4 21:44:15 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Fri, 4 Mar 2005 16:44:15 -0500
Subject: rpms/dietlibc/devel sources,1.2,1.3
Message-ID: <200503042144.j24LiF74017667@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	sources 
Log Message:
updated



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 00:53:17 -0000	1.2
+++ sources	4 Mar 2005 21:44:13 -0000	1.3
@@ -1 +1,2 @@
 5be8e221a438817f83f73d09ce655883  dietlibc-0.28.tar.bz2
+7eb62b549930f3a6c5abbbe01c34b787  dietlibc-0.28.tar.bz2.sig



From fedora-extras-commits at redhat.com  Fri Mar  4 21:44:46 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Fri, 4 Mar 2005 16:44:46 -0500
Subject: rpms/dietlibc/devel dietlibc-0.28-setpriority.patch, NONE,
	1.1 dietlibc.spec, 1.1, 1.2
Message-ID: <200503042144.j24LikHW017700@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	dietlibc.spec 
Added Files:
	dietlibc-0.28-setpriority.patch 
Log Message:
made nice(2) SUSv3 compliantly on x86_64 and other platforms (patch provided by Colin Hill)
added *.sig signature


dietlibc-0.28-setpriority.patch:

--- NEW FILE dietlibc-0.28-setpriority.patch ---
--- dietlibc-0.28-unpatched/lib/__nice.c	2005-02-13 18:01:18.966469056 -0500
+++ dietlibc-0.28/lib/__nice.c	2005-02-13 18:17:04.381744088 -0500
@@ -1,9 +1,13 @@
 #include "syscalls.h"
-#include <sys/time.h>
+#include <errno.h>
 #include <sys/resource.h>
 
 #ifndef __NR_nice
 int nice(int i) {
-  return setpriority(PRIO_PROCESS,0,getpriority(PRIO_PROCESS,0)+i);
+  if (setpriority(PRIO_PROCESS,0,getpriority(PRIO_PROCESS,0)+i) == -1) {
+    errno=EPERM;
+    return -1;
+  }
+  return getpriority(PRIO_PROCESS,0);
 }
 #endif


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dietlibc.spec	4 Mar 2005 00:53:17 -0000	1.1
+++ dietlibc.spec	4 Mar 2005 21:44:44 -0000	1.2
@@ -22,7 +22,9 @@
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
 Source0:	http://www.fefe.de/dietlibc/%NAME-%version.tar.bz2
+Source1:	http://www.fefe.de/dietlibc/%NAME-%version.tar.bz2.sig
 Patch0:		dietlibc-0.28-gcc4.patch
+Patch1:		dietlibc-0.28-setpriority.patch
 BuildRoot:	%_tmppath/%name-%version-buildroot
 Requires:	dietlibc-lib = %version-%release
 
@@ -53,6 +55,7 @@
 %prep
 %setup -q -n %NAME-%version
 %patch0 -p1 -b .gcc4
+%patch1 -p1 -b .nice
 
 ## only for 0.28; remove it in 0.29
 sed -i -e 's!LD_RUN_PATH= !env -u LD_RUN_PATH !' Makefile
@@ -115,9 +118,11 @@
 
 
 %changelog
-* Fri Mar  4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-4
+* Fri Mar  4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.28-4
 - rebuild
 - fixed compilation with gcc4
+- made nice(2) SUSv3 compliantly on x86_64 and other platforms (patch
+  provided by Colin Hill)
 
 * Tue Feb  1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-1
 - updated to 0.28



From fedora-extras-commits at redhat.com  Fri Mar  4 22:37:10 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 4 Mar 2005 17:37:10 -0500
Subject: rpms/jed - New directory
Message-ID: <200503042237.j24MbA3h018818@cvs-int.fedora.redhat.com>

Author: notting

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

Log Message:
Directory /cvs/extras/rpms/jed added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 22:37:10 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 4 Mar 2005 17:37:10 -0500
Subject: rpms/jed/devel - New directory
Message-ID: <200503042237.j24MbACT018821@cvs-int.fedora.redhat.com>

Author: notting

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

Log Message:
Directory /cvs/extras/rpms/jed/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 22:37:22 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 4 Mar 2005 17:37:22 -0500
Subject: rpms/jed Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503042237.j24MbMtc018898@cvs-int.fedora.redhat.com>

Author: notting

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module jed


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

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

common : CVS/Root
	@cvs 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 Mar  4 22:37:22 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 4 Mar 2005 17:37:22 -0500
Subject: rpms/jed/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503042237.j24MbMrH018901@cvs-int.fedora.redhat.com>

Author: notting

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jed


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jed
# $Id$
NAME := jed
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Mar  4 22:37:57 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 4 Mar 2005 17:37:57 -0500
Subject: rpms/jed import.log,1.1,1.2
Message-ID: <200503042237.j24MbvoH019079@cvs-int.fedora.redhat.com>

Author: notting

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

Modified Files:
	import.log 
Log Message:
auto-import jed-0.99.16-7 on branch devel from jed-0.99.16-7.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/jed/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Mar 2005 22:37:20 -0000	1.1
+++ import.log	4 Mar 2005 22:37:55 -0000	1.2
@@ -0,0 +1 @@
+jed-0_99_16-7:HEAD:jed-0.99.16-7.src.rpm:1109975872



From fedora-extras-commits at redhat.com  Fri Mar  4 22:37:57 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 4 Mar 2005 17:37:57 -0500
Subject: rpms/jed/devel jed-0.99.12-xkeys.patch, NONE, 1.1 jed-info.patch,
	NONE, 1.1 jed-multilib.patch, NONE, 1.1 jed-selinux.patch,
	NONE, 1.1 jed.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503042237.j24Mbvjs019083@cvs-int.fedora.redhat.com>

Author: notting

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

Modified Files:
	.cvsignore sources 
Added Files:
	jed-0.99.12-xkeys.patch jed-info.patch jed-multilib.patch 
	jed-selinux.patch jed.spec 
Log Message:
auto-import jed-0.99.16-7 on branch devel from jed-0.99.16-7.src.rpm


jed-0.99.12-xkeys.patch:

--- NEW FILE jed-0.99.12-xkeys.patch ---
--- jed-B0.99-12/src/xkeys.c.xkeys	Sat Oct 21 23:15:58 2000
+++ jed-B0.99-12/src/xkeys.c	Thu Dec 28 12:24:21 2000
@@ -943,17 +943,17 @@
    "\003\033OQ",	/* 0xFF92 	 XK_KP_F2        PF2 */
    "\003\033OR",	/* 0xFF93 	 XK_KP_F3        PF3 */
    "\003\033OS",	/* 0xFF94 	 XK_KP_F4        PF4 */
-   "",			/* 0xFF95 */
-   "",			/* 0xFF96 */
-   "",			/* 0xFF97 */
-   "",			/* 0xFF98 */
-   "",			/* 0xFF99 */
-   "",			/* 0xFF9A */
-   "",			/* 0xFF9B */
-   "",			/* 0xFF9C */
-   "",			/* 0xFF9D */
-   "",			/* 0xFF9E */
-   "",			/* 0xFF9F */
+   "\003\033Ow",	/* 0xFF95 	 XK_KP_Home */
+   "\003\033Ot",	/* 0xFF96 	 XK_KP_Left */
+   "\003\033Ox",	/* 0xFF97 	 XK_KP_Up */
+   "\003\033Ov",	/* 0xFF98 	 XK_KP_Right */
+   "\003\033Or",	/* 0xFF99 	 XK_KP_Down */
+   "\003\033Oy",	/* 0xFF9A 	 XK_KP_Prior */
+   "\003\033Os",	/* 0xFF9B 	 XK_KP_Next */
+   "\003\033Oq",	/* 0xFF9C 	 XK_KP_End */
+   "\003\033Ou",	/* 0xFF9D 	 XK_KP_Begin */
+   "\003\033Op",	/* 0xFF9E 	 XK_KP_Insert */
+   "\003\033On",	/* 0xFF9F 	 XK_KP_Delete */
    "",			/* 0xFFA0 */
    "",			/* 0xFFA1 */
    "",			/* 0xFFA2 */

jed-info.patch:

--- NEW FILE jed-info.patch ---
--- jed/info/jed.info.entry	Sat Feb  5 11:10:19 2000
+++ jed/info/jed.info	Sat Feb  5 11:11:11 2000
@@ -1,6 +1,10 @@
 This is Info file jed.info, produced by Makeinfo-1.55 from the input
 file jed.ti.
 
+START-INFO-DIR-ENTRY
+* JED: (jed).         The JED editor
+END-INFO-DIR-ENTRY
+
 
 Indirect:
 jed.1in: 83

jed-multilib.patch:

--- NEW FILE jed-multilib.patch ---
--- jed-B0.99-15/autoconf/aclocal.m4.sopwith	2003-01-10 15:20:04.000000000 -0500
+++ jed-B0.99-15/autoconf/aclocal.m4	2003-01-10 15:21:24.000000000 -0500
@@ -158,6 +158,7 @@
                 $JD_Above_Dir/$1/libsrc,$JD_Above_Dir/$1/libsrc/"$ARCH"objs \
 		$JD_Above_Dir2/$1/src,$JD_Above_Dir2/$1/src/"$ARCH"objs \
                 $JD_Above_Dir/$1/src,$JD_Above_Dir/$1/src/"$ARCH"objs \
+		$HOME/include,$HOME/lib64 \
 		$HOME/include,$HOME/lib"
 
 if test -n "$ARCH"
@@ -174,6 +175,7 @@
 test "x$exec_prefix" = "xNONE" && exec_prefix="$prefix"
 JD_Search_Dirs="$JD_Search_Dirs \
                 $includedir,$libdir \
+                $includedir/$1,$libdir \
                 /usr/local/include,/usr/local/lib \
 		/usr/include,/usr/lib \
 		/usr/include/$1,/usr/lib \

jed-selinux.patch:

--- NEW FILE jed-selinux.patch ---
--- jed-0.99-16/autoconf/configure.in.selinux	2004-09-25 01:33:25.000000000 -0400
+++ jed-0.99-16/autoconf/configure.in	2004-09-25 01:40:05.000000000 -0400
@@ -38,6 +38,8 @@
 
 AC_CHECK_LIB(util,openpty)
 
+AC_CHECK_LIB(selinux, is_selinux_enabled)
+
 AC_CHECK_FUNCS(\
 memset \
 memcpy \
--- jed-0.99-16/src/file.c.selinux	2002-10-20 02:55:31.000000000 -0400
+++ jed-0.99-16/src/file.c	2004-09-25 01:40:42.000000000 -0400
@@ -107,6 +107,11 @@
 # define O_BINARY	0
 #endif
 
+#ifdef HAVE_LIBSELINUX
+int copy_security_context(const char *from_file, const char *to_file);
+int set_default_security_context(const char *file);
+#endif
+
 /*}}}*/
 /*{{{ local inclue files */
 
@@ -1047,6 +1052,10 @@
    (void) utime (to, &ut);
 #endif
 
+#ifdef HAVE_LIBSELINUX
+   copy_security_context(from,to);
+#endif
+	
    return ret;
 }
 /*}}}*/
@@ -1192,6 +1201,9 @@
 #endif
 	  }
 	
+#ifdef HAVE_LIBSELINUX
+	set_default_security_context(dirfile);
+#endif
 	/* Since we wrote the buffer to the file, it is not modified. */
 	if (CBuf == find_file_buffer (dirfile))
 	  CBuf->flags &= ~FILE_MODIFIED;
@@ -1250,6 +1262,7 @@
 	     flush_message("autosaving..."); 
 	     (void) sys_delete_file(tmp);
 	     (void) write_file_internal (tmp, _JED_OPEN_CREATE_EXCL);
+	     copy_security_context(b->dirfile,tmp);
 	     message("autosaving...done");
 	  }
       }
--- /dev/null	2004-09-24 19:41:07.393180112 -0400
+++ jed-0.99-16/src/selinux.c	2004-09-25 01:40:32.000000000 -0400
@@ -0,0 +1,208 @@
+/*
+ * Example code to show how to copy the security context from one file to
+ * another.
+ */
+#include "config.h"
+#ifdef HAVE_LIBSELINUX
+#include <selinux/selinux.h>
+static int selinux_enabled = -1;
+#endif
+#include <string.h>
+#include "misc.h"
+#include <errno.h>
+
+int
+copy_security_context(const char *from_file, const char *to_file)
+{
+	int status = 0;
+#ifdef HAVE_LIBSELINUX
+	security_context_t from_context;
+	security_context_t to_context;
+
+	if (selinux_enabled == -1)
+		selinux_enabled = (is_selinux_enabled() > 0);
+
+	if (!selinux_enabled)
+		return 0;
+
+	if (getfilecon(from_file, &from_context) < 0) {
+		/*
+		 * If the filesystem doesn't support extended
+		 * attributes, the original had no special security
+		 * context and the target cannot have one either.
+		 */
+		if (errno == EOPNOTSUPP)
+			return 0;
+
+		jed_verror("Could not get security context for %s",
+		      from_file);
+		return 1;
+	}
+
+	if (getfilecon(to_file, &to_context) < 0) {
+		jed_verror("Could not get security context for %s",
+			   to_file);
+		freecon(from_context);
+		return 1;
+	}
+
+	if (strcmp(from_context, to_context) != 0) {
+		if (setfilecon(to_file, from_context) < 0) {
+			jed_verror("Could not set security context for %s",
+			      to_file);
+			status = 1;
+		}
+	}
+
+	freecon(to_context);
+	freecon(from_context);
+#endif
+	return status;
+}
+
+int
+set_default_security_context(const char *file)
+{
+	int status = 0;
+	
+#ifdef HAVE_LIBSELINUX
+	security_context_t scontext;
+
+	if (selinux_enabled == -1)
+		selinux_enabled = (is_selinux_enabled() > 0);
+
+	if (!selinux_enabled)
+		return 0;
+
+	set_matchpathcon_printf(jed_verror);
+	
+	if (matchpathcon(file,0,&scontext)) {
+		return 1;
+	}
+	
+	if (setfilecon(file, scontext) < 0) {
+		status = match_default_security_context(file);
+	}
+	freecon(scontext);
+#endif
+	return status;
+}
+	
+int
+match_default_security_context(const char *from_file)
+{
+#ifdef HAVE_LIBSELINUX
+	security_context_t scontext;
+
+	if (selinux_enabled == -1)
+		selinux_enabled = (is_selinux_enabled() > 0);
+
+	if (!selinux_enabled)
+		return 0;
+
+	if (getfilecon(from_file, &scontext) < 0) {
+		/*
+		 * If the filesystem doesn't support extended
+		 * attributes, the original had no special security
+		 * context and the target cannot have one either.
+		 */
+		if (errno == EOPNOTSUPP)
+			return 0;
+
+		jed_verror("Could not get security context for %s",
+		      from_file);
+		return 1;
+	}
+
+	if (setfscreatecon(scontext) < 0) {
+		jed_verror("Could not set default security context for %s",
+		      from_file);
+		freecon(scontext);
+		return 1;
+	}
+	freecon(scontext);
+#endif
+	return 0;
+}
+
+
+int
+reset_default_security_context()
+{
+#ifdef HAVE_LIBSELINUX
+	if (selinux_enabled == -1)
+		selinux_enabled = (is_selinux_enabled() > 0);
+
+	if (!selinux_enabled)
+		return 0;
+
+	if (setfscreatecon(0) < 0) {
+	        jed_verror("Could not reset default security context");
+		return 1;
+	}
+#endif
+	return 0;
+}
+
+
+int
+output_security_context(char *from_file)
+{
+#ifdef HAVE_LIBSELINUX
+	security_context_t scontext;
+
+	if (selinux_enabled == -1)
+		selinux_enabled = (is_selinux_enabled() > 0);
+	if (!selinux_enabled)
+		return 0;
+
+	if (getfilecon(from_file, &scontext) < 0) {
+		/*
+		 * If the filesystem doesn't support extended
+		 * attributes, the original had no special security
+		 * context and the target cannot have one either.
+		 */
+		if (errno == EOPNOTSUPP)
+			return 0;
+		
+	        jed_verror("Could not get security context for %s",
+		      from_file);
+		return 1;
+	}
+
+	jed_verror("%s Security Context %s", from_file, scontext);
+	freecon(scontext);
+#endif
+	return 0;
+}
+
+#if 0
+
+/*
+  Test program compile using the following command
+  cc -o t t.c -DHAVE_LIBSELINUX -DTEST -lselinux
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+main(int argc, char **argv)
+{
+
+	printf("%d: %s\n", argc, argv[1]);
+	if (argc == 3) {
+		copy_security_context(argv[1], argv[2]);
+		output_security_context(argv[2]);
+	}
+	if (argc == 2) {
+		FILE *fd;
+		char *temp;
+		match_default_security_context(argv[1]);
+		mkstemp(temp);
+		printf("temp=%s", temp);
+		fd = fopen(temp, "w");
+		fclose(fd);
+		output_security_context(temp);
+		reset_default_security_context();
+	}
+}
+#endif
--- jed-0.99-16/src/config.hin.selinux	2004-09-25 01:42:56.000000000 -0400
+++ jed-0.99-16/src/config.hin	2004-09-25 01:43:21.000000000 -0400
@@ -80,6 +80,8 @@
 /* Undefine this to disable floating point support. */
 #define FLOAT_TYPE
 
+#undef HAVE_LIBSELINUX
+
 #if defined(ultrix) && !defined(__GNUC__)
 # ifndef NO_PROTOTYPES
 #  define NO_PROTOTYPES
--- jed-0.99-16/src/modules.unx.foo	2004-09-25 01:51:55.000000000 -0400
+++ jed-0.99-16/src/modules.unx	2004-09-25 01:52:33.000000000 -0400
@@ -31,3 +31,4 @@
 version		vterm.h      
 hooks		window.h     
 colors
+selinux


--- NEW FILE jed.spec ---
Summary: A fast, compact editor based on the S-Lang screen library.
Name: jed
Version: 0.99.16
Release: 7
License: GPL
Group: Applications/Editors
Source0: ftp://space.mit.edu/pub/davis/jed/jed-0.99-16.tar.bz2
Patch1: jed-0.99.12-xkeys.patch
Patch2: jed-info.patch
Patch3: jed-multilib.patch
Patch4: jed-selinux.patch
Prereq: /sbin/install-info
Obsoletes: jed-common jed-xjed
BuildPrereq: slang-devel /usr/bin/autoconf-2.13
BuildRoot: /var/tmp/jed-root

%description
Jed is a fast, compact editor based on the S-lang screen library.  Jed
features include emulation of the Emacs, EDT, WordStar and Brief
editors; support for extensive customization with slang macros,
colors, keybindings; and a variety of programming modes with syntax
highlighting.

You should install jed if you've used it before and you like it, or if
you haven't used any text editors before and you're still deciding
what you'd like to use.  You'll also need to have jed-common
installed.

%prep
%setup -q -n jed-0.99-16
%patch1 -p1 -b .xkeys
%patch2 -p1
%patch3 -p1
%patch4 -p1 -b .selinux
autoconf-2.13 -l autoconf autoconf/configure.in > configure
chmod +x configure

%build
export JED_ROOT="%{_datadir}/jed" 
%configure
make

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/jed
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1

cp -r lib $RPM_BUILD_ROOT%{_datadir}/jed

cd src/objs
install -m 0755 -s jed $RPM_BUILD_ROOT%{_bindir}
JED_ROOT=$RPM_BUILD_ROOT%{_datadir}/jed $RPM_BUILD_ROOT%{_bindir}/jed -batch -n -l preparse.sl

cd ../../doc
install -m 644 manual/jed.1 $RPM_BUILD_ROOT%{_mandir}/man1

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc COPYING COPYRIGHT doc INSTALL INSTALL.unx README changes.txt
%{_bindir}/jed
%{_mandir}/man1/jed.*
%{_datadir}/jed

%changelog
* Sun Feb 27 2005 Florian La Roche <laroche at redhat.com>
- Copyright: -> License

* Sat Sep 25 2004 Bill Nottingham <notting at redhat.com> 0.99.16-6
- add SELinux support

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue May  4 2004 Bill Nottingham <notting at redhat.com> 0.99.16-4
- remove info page (#115826)

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 22 2003 Bill Nottingham <notting at redhat.com> 0.99.16-1
- update to 0.99.16

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Thu Dec 12 2002 Tim Powers <timp at redhat.com> 0.99.15-4
- rebuild on all arches

* Thu Jul 25 2002 Bill Nottingham <notting at redhat.com> 0.99.15-3
- obsolete xjed subpackage to help upgrades (ick)

* Wed Jul 24 2002 Bill Nottingham <notting at redhat.com> 0.99.15-2
- remove xjed subpackage, collapse -common into main package

* Mon Jun 24 2002 Bill Nottingham <notting at redhat.com> 0.99.15-1
- update to 0.99.15

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Fri Jun 14 2002 Bill Nottingham <notting at redhat.com> 0.99.14-5
- rebuild against new slang

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Fri Jul 20 2001 Bill Nottingham <notting at redhat.com>
- add buildprereq (#49505)

* Thu Jun 21 2001 Bill Nottingham <notting at redhat.com>
- update to 0.99.14

* Mon May 14 2001 Preston Brown <pbrown at redhat.com>
- rgrep is obsolete, package removed.

* Thu Dec 28 2000 Bill Nottingham <notting at redhat.com>
- do the long-needed update to 0.99 series

* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Sat Jun 10 2000 Bill Nottingham <notting at redhat.com>
- rebuild, move the man pages, etc.

* Mon Feb 07 2000 Preston Brown <pbrown at redhat.com>
- wmconfig -> desktop

* Sat Feb 05 2000 Cristian Gafton <gafton at redhat.com>
- add info entry

* Thu Feb  3 2000 Bill Nottingham <notting at redhat.com>
- handle compressed man pages
- add install-info scripts

* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
- auto rebuild in the new build environment (release 2)

* Thu Oct 29 1998 Bill Nottingham <notting at redhat.com>
- update to 0.98.7 for Raw Hide
- split off lib stuff into jed-common

* Mon Oct  5 1998 Jeff Johnson <jbj at redhat.com>
- change rgep group tag, same as grep.

* Sat Aug 15 1998 Jeff Johnson <jbj at redhat.com>
- build root

* Thu May 07 1998 Prospector System <bugs at redhat.com>
- translations modified for de, fr, tr

* Wed Apr 15 1998 Erik Troan <ewt at redhat.com>
- built against new ncurses

* Mon Nov  3 1997 Michael Fulbright <msf at redhat.com>
- added wmconfig entry for xjed

* Tue Oct 21 1997 Michael Fulbright <msf at redhat.com>
- updated to 0.98.4
- included man pages in file lists

* Thu Jul 10 1997 Erik Troan <ewt at redhat.com>
- built against glibc


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Mar 2005 22:37:20 -0000	1.1
+++ .cvsignore	4 Mar 2005 22:37:55 -0000	1.2
@@ -0,0 +1 @@
+jed-0.99-16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Mar 2005 22:37:20 -0000	1.1
+++ sources	4 Mar 2005 22:37:55 -0000	1.2
@@ -0,0 +1 @@
+c2bcd89c92a120559865a539c2705999  jed-0.99-16.tar.bz2



From fedora-extras-commits at redhat.com  Fri Mar  4 22:39:37 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 4 Mar 2005 17:39:37 -0500
Subject: rpms/jed/devel jed.spec,1.1,1.2
Message-ID: <200503042239.j24MdboL019204@cvs-int.fedora.redhat.com>

Author: notting

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

Modified Files:
	jed.spec 
Log Message:
minor cleanups



Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/jed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jed.spec	4 Mar 2005 22:37:55 -0000	1.1
+++ jed.spec	4 Mar 2005 22:39:35 -0000	1.2
@@ -1,7 +1,7 @@
-Summary: A fast, compact editor based on the S-Lang screen library.
+Summary: A fast, compact editor based on the S-Lang screen library
 Name: jed
 Version: 0.99.16
-Release: 7
+Release: 8
 License: GPL
 Group: Applications/Editors
 Source0: ftp://space.mit.edu/pub/davis/jed/jed-0.99-16.tar.bz2
@@ -23,8 +23,7 @@
 
 You should install jed if you've used it before and you like it, or if
 you haven't used any text editors before and you're still deciding
-what you'd like to use.  You'll also need to have jed-common
-installed.
+what you'd like to use.
 
 %prep
 %setup -q -n jed-0.99-16
@@ -66,6 +65,9 @@
 %{_datadir}/jed
 
 %changelog
+* Fri Mar  4 2005 Bill Nottingham <notting at redhat.com> 0.99.16-8
+- bump release
+
 * Sun Feb 27 2005 Florian La Roche <laroche at redhat.com>
 - Copyright: -> License
 



From fedora-extras-commits at redhat.com  Fri Mar  4 23:40:44 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:40:44 -0500
Subject: rpms/sylpheed - New directory
Message-ID: <200503042340.j24NeihF020097@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Log Message:
Directory /cvs/extras/rpms/sylpheed added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 23:40:44 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:40:44 -0500
Subject: rpms/sylpheed/devel - New directory
Message-ID: <200503042340.j24Neix2020100@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Log Message:
Directory /cvs/extras/rpms/sylpheed/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 23:41:07 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:41:07 -0500
Subject: rpms/sylpheed Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503042341.j24Nf7Zt020159@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module sylpheed


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

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

common : CVS/Root
	@cvs 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 Mar  4 23:41:07 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:41:07 -0500
Subject: rpms/sylpheed/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503042341.j24Nf7hA020162@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sylpheed


--- 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 Mar  4 23:46:13 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:46:13 -0500
Subject: rpms/sylpheed import.log,1.1,1.2
Message-ID: <200503042346.j24NkDT6020291@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import sylpheed-1.0.0-1 on branch devel from sylpheed-1.0.0-1.src.rpm
(last version from Fedora Core Development)


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Mar 2005 23:41:05 -0000	1.1
+++ import.log	4 Mar 2005 23:46:11 -0000	1.2
@@ -0,0 +1 @@
+sylpheed-1_0_0-1:HEAD:sylpheed-1.0.0-1.src.rpm:1109979981



From fedora-extras-commits at redhat.com  Fri Mar  4 23:46:13 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:46:13 -0500
Subject: rpms/sylpheed/devel sylpheed-0.8.9-ck.patch, NONE,
	1.1 sylpheed-0.8.9-ssl.patch, NONE,
	1.1 sylpheed-default-browser.patch, NONE, 1.1 sylpheed.1, NONE,
	1.1 sylpheed.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503042346.j24NkDVu020295@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore sources 
Added Files:
	sylpheed-0.8.9-ck.patch sylpheed-0.8.9-ssl.patch 
	sylpheed-default-browser.patch sylpheed.1 sylpheed.spec 
Log Message:
auto-import sylpheed-1.0.0-1 on branch devel from sylpheed-1.0.0-1.src.rpm
(last version from Fedora Core Development)

sylpheed-0.8.9-ck.patch:

--- NEW FILE sylpheed-0.8.9-ck.patch ---
--- sylpheed-0.8.9/po/zh_CN.po.ck	2002-11-15 16:48:18.000000000 +0900
+++ sylpheed-0.8.9/po/zh_CN.po	2002-12-12 17:03:23.000000000 +0900
@@ -5938,5 +5938,8 @@
 msgid "Open URI command line is invalid: `%s'"
 msgstr "????URL?????????????? `%s'"
 
+msgid "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"
+msgstr "-*-*-medium-r-normal--16-*-*-*-*-*-*-*"
+
 #~ msgid "Done"
 #~ msgstr "????"
--- sylpheed-0.8.9/po/ko.po.ck	2002-12-25 16:32:26.000000000 +0900
+++ sylpheed-0.8.9/po/ko.po	2003-01-07 17:30:57.000000000 +0900
@@ -5881,6 +5881,9 @@
 msgid "Open URI command line is invalid: `%s'"
 msgstr "URI???? ???????? ????????????????: `%s'"
 
+msgid "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"
+msgstr "-*-*-medium-r-normal--16-*-*-*-*-*-*-*"
+
 #~ msgid "\tSearching uncached messages... "
 #~ msgstr "\t???????????? ???????? ????????... "
 
--- sylpheed-0.8.9/src/prefs.c.orig	2003-01-20 18:22:54.000000000 +0900
+++ sylpheed-0.8.9/src/prefs.c	2003-01-20 18:23:46.000000000 +0900
@@ -372,7 +372,7 @@
 							    NULL);
 				else if (param[i].defval[0] != '\0')
 					*((gchar **)param[i].data) =
-						g_strdup(param[i].defval);
+						g_strdup(_(param[i].defval));
 				else
 					*((gchar **)param[i].data) = NULL;
 			} else
--- sylpheed-0.8.9/src/prefs_common.c.orig	2003-01-20 18:27:42.000000000 +0900
+++ sylpheed-0.8.9/src/prefs_common.c	2003-01-20 18:27:51.000000000 +0900
@@ -337,7 +337,7 @@
 	/* Display */
 	{"widget_font", NULL, &prefs_common.widgetfont, P_STRING,
 	 NULL, NULL, NULL},
-	{"message_font", "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*",
+	{"message_font", N_("-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"),
 	 &prefs_common.textfont, P_STRING,
 	 &display.entry_textfont,
 	 prefs_set_data_from_entry, prefs_set_entry},

sylpheed-0.8.9-ssl.patch:

--- NEW FILE sylpheed-0.8.9-ssl.patch ---
diff -ruN sylpheed-0.8.9.orig/aclocal.m4 sylpheed-0.8.9/aclocal.m4
--- sylpheed-0.8.9.orig/aclocal.m4	2003-03-17 22:36:29.000000000 +0900
+++ sylpheed-0.8.9/aclocal.m4	2003-03-17 22:36:39.000000000 +0900
@@ -6825,3 +6825,60 @@
     fi
   ])
 
+
+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+dnl also defines GSTUFF_PKG_ERRORS on error
+AC_DEFUN(PKG_CHECK_MODULES, [
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        AC_MSG_CHECKING(for $2)
+
+        if $PKG_CONFIG --exists "$2" ; then
+            AC_MSG_RESULT(yes)
+            succeeded=yes
+
+            AC_MSG_CHECKING($1_CFLAGS)
+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+            AC_MSG_RESULT($$1_CFLAGS)
+
+            AC_MSG_CHECKING($1_LIBS)
+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
+            AC_MSG_RESULT($$1_LIBS)
+        else
+            $1_CFLAGS=""
+            $1_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
+        fi
+
+        AC_SUBST($1_CFLAGS)
+        AC_SUBST($1_LIBS)
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     ifelse([$3], , :, [$3])
+  else
+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+  fi
+])
+
+
diff -ruN sylpheed-0.8.9.orig/configure.in sylpheed-0.8.9/configure.in
--- sylpheed-0.8.9.orig/configure.in	2003-03-17 22:36:29.000000000 +0900
+++ sylpheed-0.8.9/configure.in	2003-03-17 22:36:58.000000000 +0900
@@ -208,16 +208,15 @@
 AC_MSG_CHECKING([whether to use OpenSSL])
 if test $ac_cv_enable_ssl = yes; then
 	AC_MSG_RESULT(yes)
-	AC_MSG_CHECKING([if openssl is available])
-	LIBS="$LIBS -lssl -lcrypto"
-	AC_TRY_LINK([
-#include <openssl/opensslv.h>
-],	[ return OPENSSL_VERSION_NUMBER; ],
-	[ AC_MSG_RESULT(yes)
-	  AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.) ],
-	[ AC_MSG_RESULT(no)
-	  LIBS="$ac_save_LIBS"
-	  ac_cv_enable_ssl=no ])
+	PKG_CHECK_MODULES(OPENSSL, openssl)
+	if test "x$OPENSSL_LIBS" != "x"; then
+		CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+		LIBS="$LIBS $OPENSSL_LIBS"
+		AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.)
+	else
+		LIBS="$ac_save_LIBS"
+		ac_cv_enable_ssl=no
+	fi
 else
 	AC_MSG_RESULT(no)
 fi

sylpheed-default-browser.patch:

--- NEW FILE sylpheed-default-browser.patch ---
diff -ruN sylpheed-1.0.0beta3.orig/src/defs.h sylpheed-1.0.0beta3/src/defs.h
--- sylpheed-1.0.0beta3.orig/src/defs.h	2004-11-22 19:54:58.940918000 +0900
+++ sylpheed-1.0.0beta3/src/defs.h	2004-11-22 19:55:52.459857552 +0900
@@ -70,7 +70,7 @@
 /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
 /* #define DEFAULT_INC_PROGRAM	"imget" */
 #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t -i"
-#define DEFAULT_BROWSER_CMD	"mozilla-firefox -remote 'openURL(%s,new-window)'"
+#define DEFAULT_BROWSER_CMD	"gnome-open '%s'"
 
 #ifdef _PATH_MAILDIR
 #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR


--- NEW FILE sylpheed.1 ---
.TH SYLPHEED 1 "Nov 22 2004"
.SH NAME
.B sylpheed
\- a GTK+ based, lightweight, and fast email client

.SH SYNOPSIS
.B sylpheed [options]...

.SH DESCRIPTION
\fIsylpheed\fP is an X based fast email client.

.SH OPTIONS
.TP
.B \-\-compose [ADDRESS]
Open the composition window.
.TP
.B \-\-attach [FILE [FILE]...]
Open the composition window with FILE attached.
.TP
.B \-\-receive
Receive the new messages from the server.
.TP
.B \-\-receive-all
Receive the new messages of all accounts from the servers.
.TP
.B \-\-send
Send all queued messages.
.TP
.B \-\-status [FOLDER]
Show the total number of the message.
.TP
.B \-\-status\-full [FOLDER]
Show the status of each folder
.TP
.B \-\-debug
Enter the debug mode.
.TP
.B \-\-help
Show this message.
.TP
.B \-\-version
Show the version.

.SH SEE ALSO
more documentations are available on /usr/share/sylpheed/manual/ and /usr/share/sylpheed/faq/.

.SH AUTHOR
This manual page was written by Akira TAGOH <tagoh at redhat.com>.


--- NEW FILE sylpheed.spec ---
Name: sylpheed
Version: 1.0.0
Release: 1
License: GPL
URL: http://sylpheed.good-day.net/
Group: Applications/Internet
Buildroot: %{_tmppath}/%{name}-root
BuildPreReq: openssl-devel pkgconfig gtk+-devel gdk-pixbuf-devel desktop-file-utils
%{?_with_gpgme:BuildRequires: gpgme-devel}
Source: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2
Source1: sylpheed.1

Patch: %{name}-0.8.9-ck.patch
Patch1: %{name}-0.8.9-ssl.patch
Patch2: sylpheed-default-browser.patch

Summary: A GTK+ based, lightweight, and fast email client.
%description
This program is an X based fast email client which has features
like:
o user-friendly and intuitive interface
o integrated NetNews client (partially implemented)
o ability of keyboard-only operation
o Mew/Wanderlust-like key bind
o multipart MIME
o unlimited multiple account handling
o message queueing
o assortment function
o XML-based address book

See /usr/share/doc/sylpheed*/README for more information.

%prep
%setup -q -n %{name}-%{version}
%patch -p1 -b .ck
%patch1 -p1 -b .ssl
%patch2 -p1 -b .default-browser

%build
autoconf
%configure --enable-ssl %{?_with_gpgme:--enable-gpgme}
make

%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT

%makeinstall
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
install -m 644 sylpheed-64x64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/sylpheed.png
desktop-file-install --vendor redhat --dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--add-category Application \
	--add-category Network \
	--add-category X-Red-Hat-Extra \
	sylpheed.desktop
install -d $RPM_BUILD_ROOT%{_mandir}/man1/
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
gzip -9 $RPM_BUILD_ROOT%{_mandir}/man1/sylpheed.1
%find_lang %{name}

%clean
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,0755)
%doc COPYING ChangeLog ChangeLog.jp README README.jp INSTALL INSTALL.jp TODO.jp
%{_bindir}/sylpheed
%{_datadir}/sylpheed
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_mandir}/man1

%changelog
* Wed Jan  5 2005 Akira TAGOH <tagoh at redhat.com> - 1.0.0-1
- New upstream release.

* Mon Dec 20 2004 Akira TAGOH <tagoh at redhat.com> - 1.0.0-0.1.rc
- New upstream release.

* Mon Nov 22 2004 Akira TAGOH <tagoh at redhat.com> - 1.0.0-0.1.beta3
- New upstream release.
- sylpheed-default-browser.patch: updated to apply cleanly.
- sylpheed.1: added a simple man page. (#129387)

* Wed Jun 23 2004 Akira TAGOH <tagoh at redhat.com> 0.9.12-1
- New upstream release.

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon May 31 2004 Akira TAGOH <tagoh at redhat.com> 0.9.11-1
- New upstream release.

* Wed Mar 24 2004 Akira TAGOH <tagoh at redhat.com> 0.9.10-2
- sylpheed-default-browser.patch: applied to change the default browser to
  gnome-open. (#119007, Michael Schwendt)

* Wed Mar 10 2004 Akira TAGOH <tagoh at redhat.com> 0.9.10-1
- New upstream release.

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Akira TAGOH <tagoh at redhat.com> 0.9.9-1
- New upstream release.

* Fri Jan 30 2004 Akira TAGOH <tagoh at redhat.com> 0.9.8a-3
- don't strip the binary. Thanks to Michael Schwendt
- use upstream's icon for the desktop file.
- install the desktop file using desktop-install-file

* Thu Jan 29 2004 Akira TAGOH <tagoh at redhat.com> 0.9.8a-2
- add _with_gpgme to build enabled gpgme support.
  NOTE: it's disabled as default. just define _with_gpgme to enable it.

* Tue Dec 16 2003 Akira TAGOH <tagoh at redhat.com> 0.9.8a-1
- New upstream release.

* Thu Oct 16 2003 Akira TAGOH <tagoh at redhat.com> 0.9.7-1
- New upstream release.

* Thu Jul 31 2003 Akira TAGOH <tagoh at redhat.com> 0.9.4-1
- New upstream release.

* Tue Jul 22 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.3-2
- rebuild

* Wed Jul 09 2003 Akira TAGOH <tagoh at redhat.com> 0.9.3-1
- New upstream release.

* Mon Jun 09 2003 Akira TAGOH <tagoh at redhat.com> 0.9.2-1
- New upstream release.

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Apr 09 2003 Akira TAGOH <tagoh at redhat.com> 0.8.11-1
- New upstream release.
- use the appropriate macros.

* Mon Mar 17 2003 Akira TAGOH <tagoh at redhat.com> 0.8.9-3
- enabled ssl support.
- sylpheed-0.8.9-ssl.patch: applied to fix the include path and links the correct libraries.

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Mon Jan 20 2003 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.9

* Tue Jan  7 2003 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.8

* Thu Dec 12 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.6

* Wed Nov 20 2002 Tim Powers <timp at redhat.com>
- rebuild in current collinst

* Thu Aug 29 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.2 to fix gpg fatal bug
- Fix desktop file (#72882)

* Sat Aug  3 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.1, a bug fix release

* Mon Jul 15 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.0

* Fri Jul 12 2002 Yukihiro Nakai <ynakai at redhat.com>
- Apply Japanese utf8 mail patch

* Wed Jul 10 2002 Yukihiro Nakai <ynakai at redhat.com>
- strip the binary
- fix .desktop file (#66460)

* Wed Jun 26 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.7.8

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu Feb 28 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.7.2
- Install .desktop

* Thu Jan 31 2002 Yukihiro Nakai <ynakai at redhat.com>
- Rebuild on new environment.

* Sun Dec 16 2001 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.6.6

* Fri Nov 30 2001 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.6.5

* Thu Aug  2 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add Chinese and Korean fix.
- Use %%find_lang

* Wed Jul 11 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add %%lang

* Mon Jul  9 2001 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.5.0

* Tue Feb  6 2001 Tim Powers <timp at redhat.com>
- updated to 0.4.61, bug fixes

* Fri Jan 12 2001 Tim Powers <timp at redhat.com>
- updated to 0.4.52
 
* Thu Nov 16 2000 Tim Powers <timp at redhat.com>
- update to 0.4.4
- built for Powertools 7.1
- quiet setup
- minor specfile cleanup
- snipped some of the really old changelog, was very very long
- include the manual in the file list
- use %%configure and %%makeinstall as well as other predefined RPM
  macros whenever possible

* Wed Aug 30 2000 Yukihiro Nakai <ynakai at redhat.com> 
- Rebuild on Red Hat Linux 7.0 
 
* Tue Aug 29 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.28 
 
* Fri Aug 25 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.27 
 
* Sat Aug 19 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.26, and modified URL 
 
* Thu Aug 10 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.25 
 
* Fri Aug 4 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.24 
 
* Sat Jul 24 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.23 
 
* Sat Jul 20 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.22 
 
* Sun Jul 4 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.21, and modified Summary 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Mar 2005 23:41:05 -0000	1.1
+++ .cvsignore	4 Mar 2005 23:46:11 -0000	1.2
@@ -0,0 +1 @@
+sylpheed-1.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Mar 2005 23:41:05 -0000	1.1
+++ sources	4 Mar 2005 23:46:11 -0000	1.2
@@ -0,0 +1 @@
+864c4fc581a5ab1c7af5e06153c76769  sylpheed-1.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Mar  4 23:51:12 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:51:12 -0500
Subject: rpms/sylpheed import.log,1.2,1.3
Message-ID: <200503042351.j24NpCmE020409@cvs-int.fedora.redhat.com>

Author: mschwendt

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

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



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	4 Mar 2005 23:46:11 -0000	1.2
+++ import.log	4 Mar 2005 23:51:10 -0000	1.3
@@ -1 +1,2 @@
 sylpheed-1_0_0-1:HEAD:sylpheed-1.0.0-1.src.rpm:1109979981
+sylpheed-1_0_3-1:HEAD:sylpheed-1.0.3-1.src.rpm:1109980279



From fedora-extras-commits at redhat.com  Fri Mar  4 23:51:12 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:51:12 -0500
Subject: rpms/sylpheed/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sylpheed.spec, 1.1, 1.2
Message-ID: <200503042351.j24NpC4j020413@cvs-int.fedora.redhat.com>

Author: mschwendt

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Mar 2005 23:46:11 -0000	1.2
+++ .cvsignore	4 Mar 2005 23:51:10 -0000	1.3
@@ -1 +1 @@
-sylpheed-1.0.0.tar.bz2
+sylpheed-1.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 23:46:11 -0000	1.2
+++ sources	4 Mar 2005 23:51:10 -0000	1.3
@@ -1 +1 @@
-864c4fc581a5ab1c7af5e06153c76769  sylpheed-1.0.0.tar.bz2
+9e2733a0ea903c3fb29f537b67a6f15a  sylpheed-1.0.3.tar.bz2


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sylpheed.spec	4 Mar 2005 23:46:11 -0000	1.1
+++ sylpheed.spec	4 Mar 2005 23:51:10 -0000	1.2
@@ -1,20 +1,26 @@
+# should be vendor 'fedora', but that would break upgrades for
+# people who have linked the desktop icon
+%define desktopvendor redhat
+
+Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 1.0.0
+Version: 1.0.3
 Release: 1
 License: GPL
 URL: http://sylpheed.good-day.net/
 Group: Applications/Internet
-Buildroot: %{_tmppath}/%{name}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 BuildPreReq: openssl-devel pkgconfig gtk+-devel gdk-pixbuf-devel desktop-file-utils
-%{?_with_gpgme:BuildRequires: gpgme-devel}
-Source: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2
+%{!?_without_gpgme:BuildRequires: gpgme-devel >= 1.0.0}
+%{!?_without_compface:BuildRequires: compface-devel}
+BuildRequires: autoconf gettext
+Source0: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2
 Source1: sylpheed.1
 
-Patch: %{name}-0.8.9-ck.patch
+Patch0: %{name}-0.8.9-ck.patch
 Patch1: %{name}-0.8.9-ssl.patch
 Patch2: sylpheed-default-browser.patch
 
-Summary: A GTK+ based, lightweight, and fast email client.
 %description
 This program is an X based fast email client which has features
 like:
@@ -32,26 +38,29 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch -p1 -b .ck
+%patch0 -p1 -b .ck
 %patch1 -p1 -b .ssl
 %patch2 -p1 -b .default-browser
 
 %build
 autoconf
-%configure --enable-ssl %{?_with_gpgme:--enable-gpgme}
-make
+%configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \
+	%{?_without_compface:--disable-compface}
+make %{?_smp_mflags}
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 install -m 644 sylpheed-64x64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/sylpheed.png
-desktop-file-install --vendor redhat --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+desktop-file-install --vendor %{desktopvendor} \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category Application \
 	--add-category Network \
 	--add-category X-Red-Hat-Extra \
+	--add-category X-Fedora-Extra \
 	sylpheed.desktop
 install -d $RPM_BUILD_ROOT%{_mandir}/man1/
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -59,7 +68,7 @@
 %find_lang %{name}
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
@@ -71,6 +80,11 @@
 %{_mandir}/man1
 
 %changelog
+* Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-1
+- Update to 1.0.3.
+- Enable support for GPGME 1.0 and compface.
+- Apply common spec cleanup.
+
 * Wed Jan  5 2005 Akira TAGOH <tagoh at redhat.com> - 1.0.0-1
 - New upstream release.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 00:55:18 2005
From: fedora-extras-commits at redhat.com (Cristian Gafton (gafton))
Date: Fri, 4 Mar 2005 19:55:18 -0500
Subject: common cvs-import.sh,1.6,1.7
Message-ID: <200503050055.j250tIEu021278@cvs-int.fedora.redhat.com>

Author: gafton

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21266

Modified Files:
	cvs-import.sh 
Log Message:
pedantery



Index: cvs-import.sh
===================================================================
RCS file: /cvs/extras/common/cvs-import.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cvs-import.sh	3 Mar 2005 20:02:52 -0000	1.6
+++ cvs-import.sh	5 Mar 2005 00:55:16 -0000	1.7
@@ -350,8 +350,11 @@
 echo "$LOG_ENTRY:$(date +%s)" >> ./import.log
 
 # prepare the commit message
-MESSAGE="auto-import $NAME-$VERSION-$RELEASE ${BRANCH:+on branch $BRANCH} from $(basename $PACKAGE)
-$MESSAGE"
+MESSAGE=$(cat <<EOF
+auto-import $NAME-$VERSION-$RELEASE ${BRANCH:+on branch $BRANCH} from $(basename $PACKAGE)
+$MESSAGE
+EOF
+)
 cvs -Q update && \
     echo "cvs commit..." && \
     cvs -Q commit -m "$MESSAGE" >/dev/null && echo "Commit Complete" && \



From fedora-extras-commits at redhat.com  Sat Mar  5 01:13:45 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Fri, 4 Mar 2005 20:13:45 -0500
Subject: rpms/dietlibc/devel dietlibc.spec,1.2,1.3
Message-ID: <200503050113.j251DjDa022015@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	dietlibc.spec 
Log Message:
conditionalized usage of %_smp_mflags



Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dietlibc.spec	4 Mar 2005 21:44:44 -0000	1.2
+++ dietlibc.spec	5 Mar 2005 01:13:43 -0000	1.3
@@ -72,7 +72,7 @@
   diet gcc diet.c -DDIETHOME=\"`pwd`\" -DVERSION=\"X\" -o bin-%_arch/diet
 %endif
 
-%__make %makeflags all dyn %_smp_mflags
+%__make %makeflags all dyn %{?_smp_mflags}
 
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 01:43:44 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:43:44 -0500
Subject: rpms/libsndfile import.log,1.5,1.6
Message-ID: <200503050143.j251hiYq022137@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import libsndfile-1.0.11-1 on branch FC-3 from libsndfile-1.0.11-1.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	8 Nov 2004 04:47:58 -0000	1.5
+++ import.log	5 Mar 2005 01:43:42 -0000	1.6
@@ -2,3 +2,4 @@
 libsndfile-1_0_4-0_fdr_1_rh90:HEAD:libsndfile-1.0.4-0.fdr.1.rh90.src.rpm:1099889266
 libsndfile-1_0_4-0_fdr_1_1:HEAD:libsndfile-1.0.4-0.fdr.1.1.src.rpm:1099889272
 libsndfile-1_0_4-0_fdr_1_2:HEAD:libsndfile-1.0.4-0.fdr.1.2.src.rpm:1099889278
+libsndfile-1_0_11-1:FC-3:libsndfile-1.0.11-1.src.rpm:1109987031



From fedora-extras-commits at redhat.com  Sat Mar  5 01:43:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:43:45 -0500
Subject: rpms/libsndfile/FC-3 libsndfile-1.0.11-svx-channels.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 libsndfile.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200503050143.j251hjo4022141@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore libsndfile.spec sources 
Added Files:
	libsndfile-1.0.11-svx-channels.patch 
Log Message:
auto-import libsndfile-1.0.11-1 on branch FC-3 from libsndfile-1.0.11-1.src.rpm


libsndfile-1.0.11-svx-channels.patch:

--- NEW FILE libsndfile-1.0.11-svx-channels.patch ---
diff -Nur libsndfile-1.0.11-orig/src/svx.c libsndfile-1.0.11/src/svx.c
--- libsndfile-1.0.11-orig/src/svx.c	2004-10-17 02:46:34.000000000 +0200
+++ libsndfile-1.0.11/src/svx.c	2005-03-05 02:08:14.094919120 +0100
@@ -280,7 +280,7 @@
 
 					bytecount += psf_binheader_readf (psf, "E4", &channels) ;
 
-					psf_log_printf (psf, "  Channels : %d => %d\n", channels) ;
+					psf_log_printf (psf, "  Channels : %d\n", channels) ;
 
 					psf_binheader_readf (psf, "j", dword - bytecount) ;
 					break ;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:47:40 -0000	1.2
+++ .cvsignore	5 Mar 2005 01:43:42 -0000	1.3
@@ -1 +1 @@
-libsndfile-1.0.4.tar.gz
+libsndfile-1.0.11.tar.gz


Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-3/libsndfile.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsndfile.spec	11 Nov 2004 19:21:37 -0000	1.5
+++ libsndfile.spec	5 Mar 2005 01:43:42 -0000	1.6
@@ -1,18 +1,21 @@
-Summary:	A library for reading and writing sound files.
-Name:		libsndfile
-Version:	1.0.4
-Release:	2
-License:	LGPL
-Group:		System Environment/Libraries
-URL:		http://www.zip.com.au/~erikd/libsndfile/
-Source0:	http://www.zip.com.au/~erikd/libsndfile/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	pkgconfig
+Summary: 	Library for reading and writing sound files
+Name: 		libsndfile
+Version: 	1.0.11
+Release: 	1
+License: 	LGPL
+Group: 		System Environment/Libraries
+URL: 		http://www.mega-nerd.com/libsndfile/
+Source0: 	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:		libsndfile-1.0.11-svx-channels.patch
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+
+BuildRequires:  alsa-lib-devel
+Provides:       %{name}-octave = %{version}-%{release}
 
 %package devel
-Summary:	Development files for libsndfile.
+Summary:	Development files for libsndfile
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release} pkgconfig
 
 %description
 libsndfile is a C library for reading and writing sound files such as
@@ -26,19 +29,32 @@
 AIFF, AU, WAV, and others through one standard interface. 
 This package contains files needed to develop with libsndfile.
 
+
 %prep
 %setup -q
+%patch0 -p1 -b .svx-channels
+
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
+
 %install
-rm -rf %{buildroot}
-%makeinstall
+rm -rf $RPM_BUILD_ROOT __docs
+make install DESTDIR=$RPM_BUILD_ROOT
+cp -pR $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev/html __docs
+rm -rf $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -50,23 +66,34 @@
 %{_mandir}/man1/sndfile-play.1*
 %{_mandir}/man1/sndfile-convert.1*
 %{_libdir}/%{name}.so.*
-%{_datadir}/octave/site/m/sndfile_load.m
-%{_datadir}/octave/site/m/sndfile_play.m
-%{_datadir}/octave/site/m/sndfile_save.m
+%{_datadir}/octave
 
 %files devel
 %defattr(-,root,root,-)
+%doc __docs/*
 %exclude %{_libdir}/%{name}.la
 %{_includedir}/sndfile.h
 %{_libdir}/%{name}.so
 %{_libdir}/%{name}.a
 %{_libdir}/pkgconfig/sndfile.pc
 
+
 %changelog
-* Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 1.0.4-2
-- Bump release to provide Extras upgrade path.
-- Fix spaces/tabs uglyness.
+* Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.11-2
+- Fix format string bug (#149863).
+- Drop explicit Epoch 0.
+
+* Sat Dec  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.11-0.fdr.1
+- Update to 1.0.11.
+
+* Wed Oct 13 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.10-0.fdr.1
+- Update to 1.0.10, update URLs, include ALSA support.
+- Disable dependency tracking to speed up the build.
+- Add missing ldconfig invocations.
+- Make -devel require pkgconfig.
+- Include developer docs in -devel.
+- Provide -octave in main package, own more related dirs.
+- Bring specfile up to date with current spec templates.
 
 * Sat Apr 12 2003 Dams <anvil[AT]livna.org> 
 - Initial build.
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:47:40 -0000	1.2
+++ sources	5 Mar 2005 01:43:42 -0000	1.3
@@ -1 +1 @@
-33929011f48fa2a4b72baf54c69196c5  libsndfile-1.0.4.tar.gz
+9ec0b3610041423a57387f284849f2fc  libsndfile-1.0.11.tar.gz



From fedora-extras-commits at redhat.com  Sat Mar  5 01:44:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:44:42 -0500
Subject: rpms/libsndfile import.log,1.6,1.7
Message-ID: <200503050144.j251igDI022257@cvs-int.fedora.redhat.com>

Author: mschwendt

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

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



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	5 Mar 2005 01:43:42 -0000	1.6
+++ import.log	5 Mar 2005 01:44:40 -0000	1.7
@@ -3,3 +3,4 @@
 libsndfile-1_0_4-0_fdr_1_1:HEAD:libsndfile-1.0.4-0.fdr.1.1.src.rpm:1099889272
 libsndfile-1_0_4-0_fdr_1_2:HEAD:libsndfile-1.0.4-0.fdr.1.2.src.rpm:1099889278
 libsndfile-1_0_11-1:FC-3:libsndfile-1.0.11-1.src.rpm:1109987031
+libsndfile-1_0_11-2:HEAD:libsndfile-1.0.11-2.src.rpm:1109987091



From fedora-extras-commits at redhat.com  Sat Mar  5 01:44:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:44:42 -0500
Subject: rpms/libsndfile/devel libsndfile-1.0.11-svx-channels.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 libsndfile.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200503050144.j251igiN022261@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore libsndfile.spec sources 
Added Files:
	libsndfile-1.0.11-svx-channels.patch 
Log Message:
auto-import libsndfile-1.0.11-2 on branch devel from libsndfile-1.0.11-2.src.rpm


libsndfile-1.0.11-svx-channels.patch:

--- NEW FILE libsndfile-1.0.11-svx-channels.patch ---
diff -Nur libsndfile-1.0.11-orig/src/svx.c libsndfile-1.0.11/src/svx.c
--- libsndfile-1.0.11-orig/src/svx.c	2004-10-17 02:46:34.000000000 +0200
+++ libsndfile-1.0.11/src/svx.c	2005-03-05 02:08:14.094919120 +0100
@@ -280,7 +280,7 @@
 
 					bytecount += psf_binheader_readf (psf, "E4", &channels) ;
 
-					psf_log_printf (psf, "  Channels : %d => %d\n", channels) ;
+					psf_log_printf (psf, "  Channels : %d\n", channels) ;
 
 					psf_binheader_readf (psf, "j", dword - bytecount) ;
 					break ;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:47:40 -0000	1.2
+++ .cvsignore	5 Mar 2005 01:44:40 -0000	1.3
@@ -1 +1 @@
-libsndfile-1.0.4.tar.gz
+libsndfile-1.0.11.tar.gz


Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/libsndfile.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsndfile.spec	11 Nov 2004 19:21:37 -0000	1.5
+++ libsndfile.spec	5 Mar 2005 01:44:40 -0000	1.6
@@ -1,18 +1,21 @@
-Summary:	A library for reading and writing sound files.
-Name:		libsndfile
-Version:	1.0.4
-Release:	2
-License:	LGPL
-Group:		System Environment/Libraries
-URL:		http://www.zip.com.au/~erikd/libsndfile/
-Source0:	http://www.zip.com.au/~erikd/libsndfile/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	pkgconfig
+Summary: 	Library for reading and writing sound files
+Name: 		libsndfile
+Version: 	1.0.11
+Release: 	2
+License: 	LGPL
+Group: 		System Environment/Libraries
+URL: 		http://www.mega-nerd.com/libsndfile/
+Source0: 	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:		libsndfile-1.0.11-svx-channels.patch
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+
+BuildRequires:  alsa-lib-devel
+Provides:       %{name}-octave = %{version}-%{release}
 
 %package devel
-Summary:	Development files for libsndfile.
+Summary:	Development files for libsndfile
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release} pkgconfig
 
 %description
 libsndfile is a C library for reading and writing sound files such as
@@ -26,19 +29,32 @@
 AIFF, AU, WAV, and others through one standard interface. 
 This package contains files needed to develop with libsndfile.
 
+
 %prep
 %setup -q
+%patch0 -p1 -b .svx-channels
+
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
+
 %install
-rm -rf %{buildroot}
-%makeinstall
+rm -rf $RPM_BUILD_ROOT __docs
+make install DESTDIR=$RPM_BUILD_ROOT
+cp -pR $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev/html __docs
+rm -rf $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -50,23 +66,34 @@
 %{_mandir}/man1/sndfile-play.1*
 %{_mandir}/man1/sndfile-convert.1*
 %{_libdir}/%{name}.so.*
-%{_datadir}/octave/site/m/sndfile_load.m
-%{_datadir}/octave/site/m/sndfile_play.m
-%{_datadir}/octave/site/m/sndfile_save.m
+%{_datadir}/octave
 
 %files devel
 %defattr(-,root,root,-)
+%doc __docs/*
 %exclude %{_libdir}/%{name}.la
 %{_includedir}/sndfile.h
 %{_libdir}/%{name}.so
 %{_libdir}/%{name}.a
 %{_libdir}/pkgconfig/sndfile.pc
 
+
 %changelog
-* Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 1.0.4-2
-- Bump release to provide Extras upgrade path.
-- Fix spaces/tabs uglyness.
+* Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.11-2
+- Fix format string bug (#149863).
+- Drop explicit Epoch 0.
+
+* Sat Dec  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.11-0.fdr.1
+- Update to 1.0.11.
+
+* Wed Oct 13 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.10-0.fdr.1
+- Update to 1.0.10, update URLs, include ALSA support.
+- Disable dependency tracking to speed up the build.
+- Add missing ldconfig invocations.
+- Make -devel require pkgconfig.
+- Include developer docs in -devel.
+- Provide -octave in main package, own more related dirs.
+- Bring specfile up to date with current spec templates.
 
 * Sat Apr 12 2003 Dams <anvil[AT]livna.org> 
 - Initial build.
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:47:40 -0000	1.2
+++ sources	5 Mar 2005 01:44:40 -0000	1.3
@@ -1 +1 @@
-33929011f48fa2a4b72baf54c69196c5  libsndfile-1.0.4.tar.gz
+9ec0b3610041423a57387f284849f2fc  libsndfile-1.0.11.tar.gz



From fedora-extras-commits at redhat.com  Sat Mar  5 01:47:18 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:47:18 -0500
Subject: rpms/libsamplerate import.log,1.5,1.6
Message-ID: <200503050147.j251lIOI022388@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import libsamplerate-0.1.2-1 on branch FC-3 from libsamplerate-0.1.2-1.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	8 Nov 2004 04:46:46 -0000	1.5
+++ import.log	5 Mar 2005 01:47:16 -0000	1.6
@@ -2,3 +2,4 @@
 libsamplerate-0_0_15-0_fdr_5_rh90:HEAD:libsamplerate-0.0.15-0.fdr.5.rh90.src.rpm:1099889194
 libsamplerate-0_0_15-0_fdr_5_1:HEAD:libsamplerate-0.0.15-0.fdr.5.1.src.rpm:1099889200
 libsamplerate-0_0_15-0_fdr_5_2:HEAD:libsamplerate-0.0.15-0.fdr.5.2.src.rpm:1099889206
+libsamplerate-0_1_2-1:FC-3:libsamplerate-0.1.2-1.src.rpm:1109987246



From fedora-extras-commits at redhat.com  Sat Mar  5 01:47:18 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:47:18 -0500
Subject: rpms/libsamplerate/FC-3 .cvsignore, 1.2, 1.3 libsamplerate.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200503050147.j251lIsN022392@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore libsamplerate.spec sources 
Log Message:
auto-import libsamplerate-0.1.2-1 on branch FC-3 from libsamplerate-0.1.2-1.src.rpm



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:28 -0000	1.2
+++ .cvsignore	5 Mar 2005 01:47:16 -0000	1.3
@@ -1 +1 @@
-libsamplerate-0.0.15.tar.gz
+libsamplerate-0.1.2.tar.gz


Index: libsamplerate.spec
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/FC-3/libsamplerate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsamplerate.spec	10 Dec 2004 22:03:05 -0000	1.5
+++ libsamplerate.spec	5 Mar 2005 01:47:16 -0000	1.6
@@ -1,22 +1,19 @@
-Summary: 	A library for performing sample rate conversion on audio.
+Summary: 	Sample rate conversion library for audio data
 Name: 		libsamplerate
-Version: 	0.0.15
-Release: 	5
-Epoch: 		0
+Version: 	0.1.2
+Release: 	1
 License: 	GPL
 Group: 		System Environment/Libraries
 URL: 		http://www.mega-nerd.com/SRC/
 Source0: 	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	libsndfile-devel >= 0:1.0.2
-BuildRequires:	pkgconfig fftw-devel
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+BuildRequires:	libsndfile-devel >= 1.0.6 pkgconfig
 
 %package devel
-Summary: 	Development package for %{name}
+Summary: 	Development related files for %{name}
 Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
+Requires: 	%{name} = %{version}-%{release} pkgconfig
 
-# -----------------------------------------------------------------------------
 
 %description
 Secret Rabbit Code is a sample rate converter for audio. It is capable
@@ -33,41 +30,38 @@
 also vary with time for speeding up and slowing down effects.
 This package contains development files for %{name}
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
-%configure
+%configure --disable-dependency-tracking --disable-fftw
 make %{?_smp_mflags} 
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT _doc
-%makeinstall
-mkdir _doc 
+make install DESTDIR=$RPM_BUILD_ROOT
 cp -a doc _doc
-rm _doc/doc/Makefile* _doc/doc/NEWS _doc/doc/ChangeLog
+rm _doc/Makefile* _doc/NEWS _doc/ChangeLog
+
+
+%check || :
+make check
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
-
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog _doc/doc/*
+%doc AUTHORS COPYING ChangeLog NEWS README _doc/*
 %{_bindir}/sndfile-resample
 %{_libdir}/%{name}.so.*
 
@@ -79,9 +73,14 @@
 %{_libdir}/lib*.a
 %{_libdir}/pkgconfig/samplerate.pc
 
-# -----------------------------------------------------------------------------
 
 %changelog
+* Mon Oct 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.1.2-0.fdr.1
+- Update to 0.1.2.
+- Use "make install DESTDIR=...", disable dependency tracking.
+- Run tests during build.
+- Drop fftw-devel build dep, it's only for an optional part of the test suite.
+
 * Tue Jul 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.0.15-0.fdr.5
 - Fix %%postun (#1665).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:28 -0000	1.2
+++ sources	5 Mar 2005 01:47:16 -0000	1.3
@@ -1 +1 @@
-6b15cc39d1275f1118de4d57f89544eb  libsamplerate-0.0.15.tar.gz
+06861c2c6b8e5273c9b80cf736b9fd0e  libsamplerate-0.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Mar  5 01:48:11 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:48:11 -0500
Subject: rpms/libsamplerate import.log,1.6,1.7
Message-ID: <200503050148.j251mBO6022517@cvs-int.fedora.redhat.com>

Author: mschwendt

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

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



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	5 Mar 2005 01:47:16 -0000	1.6
+++ import.log	5 Mar 2005 01:48:09 -0000	1.7
@@ -3,3 +3,4 @@
 libsamplerate-0_0_15-0_fdr_5_1:HEAD:libsamplerate-0.0.15-0.fdr.5.1.src.rpm:1099889200
 libsamplerate-0_0_15-0_fdr_5_2:HEAD:libsamplerate-0.0.15-0.fdr.5.2.src.rpm:1099889206
 libsamplerate-0_1_2-1:FC-3:libsamplerate-0.1.2-1.src.rpm:1109987246
+libsamplerate-0_1_2-2:HEAD:libsamplerate-0.1.2-2.src.rpm:1109987299



From fedora-extras-commits at redhat.com  Sat Mar  5 01:48:11 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:48:11 -0500
Subject: rpms/libsamplerate/devel .cvsignore, 1.2, 1.3 libsamplerate.spec,
	1.6, 1.7 sources, 1.2, 1.3
Message-ID: <200503050148.j251mBMt022521@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore libsamplerate.spec sources 
Log Message:
auto-import libsamplerate-0.1.2-2 on branch devel from libsamplerate-0.1.2-2.src.rpm



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:28 -0000	1.2
+++ .cvsignore	5 Mar 2005 01:48:09 -0000	1.3
@@ -1 +1 @@
-libsamplerate-0.0.15.tar.gz
+libsamplerate-0.1.2.tar.gz


Index: libsamplerate.spec
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/devel/libsamplerate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsamplerate.spec	3 Mar 2005 22:41:32 -0000	1.6
+++ libsamplerate.spec	5 Mar 2005 01:48:09 -0000	1.7
@@ -1,19 +1,18 @@
-Summary:	Library for performing sample rate conversion on audio
-Name:		libsamplerate
-Version:	0.0.15
-Release:	5
-License:	GPL
-Group:		System Environment/Libraries
-URL:		http://www.mega-nerd.com/SRC/
-Source0:	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	libsndfile-devel >= 0:1.0.2
-BuildRequires:	pkgconfig fftw-devel
+Summary: 	Sample rate conversion library for audio data
+Name: 		libsamplerate
+Version: 	0.1.2
+Release: 	2
+License: 	GPL
+Group: 		System Environment/Libraries
+URL: 		http://www.mega-nerd.com/SRC/
+Source0: 	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+BuildRequires:	libsndfile-devel >= 1.0.6 pkgconfig
 
 %package devel
-Summary:	Development package for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Summary: 	Development related files for %{name}
+Group: 		Development/Libraries
+Requires: 	%{name} = %{version}-%{release} pkgconfig
 
 
 %description
@@ -37,16 +36,19 @@
 
 
 %build
-%configure
-make %{?_smp_mflags}
+%configure --disable-dependency-tracking --disable-fftw
+make %{?_smp_mflags} 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT _doc
-%makeinstall
-mkdir _doc
+make install DESTDIR=$RPM_BUILD_ROOT
 cp -a doc _doc
-rm _doc/doc/Makefile* _doc/doc/NEWS _doc/doc/ChangeLog
+rm _doc/Makefile* _doc/NEWS _doc/ChangeLog
+
+
+%check || :
+make check
 
 
 %clean
@@ -59,7 +61,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog _doc/doc/*
+%doc AUTHORS COPYING ChangeLog NEWS README _doc/*
 %{_bindir}/sndfile-resample
 %{_libdir}/%{name}.so.*
 
@@ -73,6 +75,12 @@
 
 
 %changelog
+* Mon Oct 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.1.2-0.fdr.1
+- Update to 0.1.2.
+- Use "make install DESTDIR=...", disable dependency tracking.
+- Run tests during build.
+- Drop fftw-devel build dep, it's only for an optional part of the test suite.
+
 * Tue Jul 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.0.15-0.fdr.5
 - Fix %%postun (#1665).
 
@@ -85,5 +93,5 @@
 * Wed Jun 25 2003 Dams <anvil[AT]livna.org> 0:0.0.15-0.fdr.2
 - Added some more doc
 
-* Thu May 22 2003 Dams <anvil[AT]livna.org>
+* Thu May 22 2003 Dams <anvil[AT]livna.org> 
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:28 -0000	1.2
+++ sources	5 Mar 2005 01:48:09 -0000	1.3
@@ -1 +1 @@
-6b15cc39d1275f1118de4d57f89544eb  libsamplerate-0.0.15.tar.gz
+06861c2c6b8e5273c9b80cf736b9fd0e  libsamplerate-0.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Mar  5 07:08:23 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 5 Mar 2005 02:08:23 -0500
Subject: devel/sylpheed-claws sylpheed-claws.desktop, NONE,
	1.1 sylpheed-claws.spec, 1.4, 1.5 sylpheed.desktop, 1.1, NONE
Message-ID: <200503050708.j2578NhR027291@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/devel/sylpheed-claws
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27281

Modified Files:
	sylpheed-claws.spec 
Added Files:
	sylpheed-claws.desktop 
Removed Files:
	sylpheed.desktop 
Log Message:
- more s/sylpheed/sylpheed-claws/ so we don't have to conflict with
  sylpheed anymore



--- NEW FILE sylpheed-claws.desktop ---
[Desktop Entry]
Name=Sylpheed Claws
Name[ja]=Sylpheed Claws
Comment=E-Mail client
Comment[ja]=??????????????????????
Exec=sylpheed-claws
Icon=sylpheed-claws.png
Terminal=false
Type=Application
Categories=Application;Network;


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/sylpheed-claws.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sylpheed-claws.spec	13 Feb 2005 12:41:14 -0000	1.4
+++ sylpheed-claws.spec	5 Mar 2005 07:08:21 -0000	1.5
@@ -5,14 +5,14 @@
 
 Name:           sylpheed-claws
 Version:        1.0.1
-Release:        1
+Release:        2
 Epoch:          0
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
 Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.1.tar.bz2
-Source1:        sylpheed.desktop
+Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
 BuildRequires:  glib-devel
@@ -30,8 +30,6 @@
 Requires:  spamassassin
 Requires:  dillo
 
-Conflicts: sylpheed
-
 %description
 The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast 
 e-mail client.
@@ -48,13 +46,9 @@
 The %{name}-devel package contains the header files  and pkgconfig file needed
 for development with %{name}.
 
-# -----------------------------------------------------------------------------
-
 %prep
 %setup
 
-# -----------------------------------------------------------------------------
-
 %build
 %if %openssl_pc
 MY_OPENSSL_CFLAGS=`pkg-config openssl --cflags`
@@ -67,15 +61,14 @@
 %if "%{aspellver}" >= "0.50"
 	   --enable-aspell \
 %endif
-           --disable-dependency-tracking
+           --disable-dependency-tracking \
+	   --program-suffix="-claws"
 
 %{__make} %{?_smp_mflags}
 
 %{__make} check
 
 
-# -----------------------------------------------------------------------------
-
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %makeinstall gnomedatadir=${RPM_BUILD_ROOT}/%{_datadir}
@@ -92,13 +85,11 @@
 %{__rm} -f ${RPM_BUILD_ROOT}%{_libdir}/sylpheed/plugins/*.a
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
-# -----------------------------------------------------------------------------
+%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/sylpheed{,-claws}.png
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-# -----------------------------------------------------------------------------
-
 %files -f sylpheed-claws.lang
 %defattr(-,root,root,-)
 %doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws COPYING
@@ -120,9 +111,12 @@
 %{_includedir}/sylpheed-claws/*
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 
-# -----------------------------------------------------------------------------
-
 %changelog
+* Sat Mar 05 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.0.1-2
+- fixed some sylpheed/sylpheed-claws
+- removed Conflictes sylpheed
+
 * Wed Feb 09 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0:1.0.1-1
 - version upgrade


--- sylpheed.desktop DELETED ---



From fedora-extras-commits at redhat.com  Sat Mar  5 09:05:59 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 04:05:59 -0500
Subject: devel/allegro allegro.spec,1.9,1.10
Message-ID: <200503050905.j2595xTm030242@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/allegro
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30196/allegro

Modified Files:
	allegro.spec 
Log Message:
Fix fallout from "Epoch: 0" removal.


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/devel/allegro/allegro.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- allegro.spec	4 Mar 2005 21:00:23 -0000	1.9
+++ allegro.spec	5 Mar 2005 09:05:52 -0000	1.10
@@ -69,7 +69,7 @@
 Summary(fr):  Outils suppl??mentaires pour la librairie de programmation Allegro
 Summary(it):    Programmi di utilit?? aggiuntivi per la libreria Allegro
 Group:          Development/Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description tools
 Allegro is a cross-platform library intended for use in computer games



From fedora-extras-commits at redhat.com  Sat Mar  5 09:05:59 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 04:05:59 -0500
Subject: devel/perl-Net-SSLeay perl-Net-SSLeay.spec,1.2,1.3
Message-ID: <200503050905.j2595xHV030249@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/perl-Net-SSLeay
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30196/perl-Net-SSLeay

Modified Files:
	perl-Net-SSLeay.spec 
Log Message:
Fix fallout from "Epoch: 0" removal.


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/devel/perl-Net-SSLeay/perl-Net-SSLeay.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Net-SSLeay.spec	3 Mar 2005 23:46:27 -0000	1.2
+++ perl-Net-SSLeay.spec	5 Mar 2005 09:05:52 -0000	1.3
@@ -14,7 +14,7 @@
 
 BuildRequires:  perl >= 1:5.6.1, openssl-devel
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Provides:       perl-Net_SSLeay = %{epoch}:%{version}-%{release}
+Provides:       perl-Net_SSLeay = %{version}-%{release}
 
 %description
 This module offers some high level convinience functions for accessing



From fedora-extras-commits at redhat.com  Sat Mar  5 09:05:59 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 04:05:59 -0500
Subject: devel/libfac libfac.spec,1.5,1.6
Message-ID: <200503050905.j2595xiP030245@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/libfac
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30196/libfac

Modified Files:
	libfac.spec 
Log Message:
Fix fallout from "Epoch: 0" removal.


Index: libfac.spec
===================================================================
RCS file: /cvs/extras/devel/libfac/libfac.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libfac.spec	3 Mar 2005 22:41:31 -0000	1.5
+++ libfac.spec	5 Mar 2005 09:05:52 -0000	1.6
@@ -23,8 +23,8 @@
 
 %package devel
 Summary: An extension to Singular-factory
-Obsoletes: %{name} < %{epoch}:%{version}-%{release}
-Provides:  %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name} < %{version}-%{release}
+Provides:  %{name} = %{version}-%{release}
 Group:   Development/Libraries
 %description devel
 Singular-libfac is an extension to Singular-factory which implements



From adrian at lisas.de  Sat Mar  5 11:13:49 2005
From: adrian at lisas.de (Adrian Reber)
Date: Sat, 5 Mar 2005 12:13:49 +0100
Subject: FC-3 branch for vnstat
Message-ID: <20050305111349.GA29757@lisas.de>


Please create the FC-3 branch of vnstat.

		Adrian



From fedora-extras-commits at redhat.com  Sat Mar  5 11:17:41 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 06:17:41 -0500
Subject: rpms/perl-XML-LibXSLT - New directory
Message-ID: <200503051117.j25BHf2C032260@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-LibXSLT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32253/perl-XML-LibXSLT

Log Message:
Directory /cvs/extras/rpms/perl-XML-LibXSLT added to the repository




From fedora-extras-commits at redhat.com  Sat Mar  5 11:17:41 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 06:17:41 -0500
Subject: rpms/perl-XML-LibXSLT/devel - New directory
Message-ID: <200503051117.j25BHf2s032263@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-LibXSLT/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32253/perl-XML-LibXSLT/devel

Log Message:
Directory /cvs/extras/rpms/perl-XML-LibXSLT/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar  5 11:18:02 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 06:18:02 -0500
Subject: rpms/perl-XML-LibXSLT Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503051118.j25BI2NH032322@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-LibXSLT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32313

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-XML-LibXSLT


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

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

common : CVS/Root
	@cvs 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 Mar  5 11:18:02 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 06:18:02 -0500
Subject: rpms/perl-XML-LibXSLT/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503051118.j25BI28a032325@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-LibXSLT/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32313/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-XML-LibXSLT


--- 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 Mar  5 11:18:49 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 06:18:49 -0500
Subject: rpms/perl-XML-LibXSLT import.log,1.1,1.2
Message-ID: <200503051118.j25BInl6032421@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-LibXSLT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32412

Modified Files:
	import.log 
Log Message:
auto-import perl-XML-LibXSLT-1.57-3 on branch devel from perl-XML-LibXSLT-1.57-3.src.rpm
https://bugzilla.redhat.com/149766


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-LibXSLT/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Mar 2005 11:18:00 -0000	1.1
+++ import.log	5 Mar 2005 11:18:47 -0000	1.2
@@ -0,0 +1 @@
+perl-XML-LibXSLT-1_57-3:HEAD:perl-XML-LibXSLT-1.57-3.src.rpm:1110021516



From fedora-extras-commits at redhat.com  Sat Mar  5 11:18:49 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 06:18:49 -0500
Subject: rpms/perl-XML-LibXSLT/devel perl-XML-LibXSLT.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503051118.j25BInBq032425@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-LibXSLT/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32412/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-XML-LibXSLT.spec 
Log Message:
auto-import perl-XML-LibXSLT-1.57-3 on branch devel from perl-XML-LibXSLT-1.57-3.src.rpm
https://bugzilla.redhat.com/149766


--- NEW FILE perl-XML-LibXSLT.spec ---
%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}

Name:		perl-XML-LibXSLT
Version:	1.57
Release:	3
Summary:        Perl module for interfacing to GNOME's libxslt

Group:		Development/Libraries
License:	GPL or Artistic
URL:		http://search.cpan.org/dist/XML-LibXSLT/
Source0:	http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-LibXSLT-1.57.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl >= 1:5.6.1, perl(XML::LibXML) >= 1.57
BuildRequires:	libxslt-devel >= 1.0.6 
Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module is a fast XSLT library, based on the Gnome libxslt engine
that you can find at http://www.xmlsoft.org/XSLT/

%prep
%setup -q -n XML-LibXSLT-%{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' -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 benchmark.pl example
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/XML
%exclude %{perl_vendorarch}/XML/benchmark.pl
%{_mandir}/man3/*.3*

%changelog
* Sat Mar  5 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.57-3
- Drop pre-FC2 LD_RUN_PATH hack.
- Install benchmark.pl only as %%doc.

* Fri Feb 26 2005 Zing <shishz at hotpop.com> - 1.57-2
- QA from Ville Skytt??
-	BuildRequires XML::LibXML >= 1.57
-	BuildRequires libxslt-devel
-	put benchmark.pl in %%doc

* Fri Feb 25 2005 Zing <shishz at hotpop.com> - 1.57-1
- First build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-LibXSLT/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Mar 2005 11:18:00 -0000	1.1
+++ .cvsignore	5 Mar 2005 11:18:47 -0000	1.2
@@ -0,0 +1 @@
+XML-LibXSLT-1.57.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-LibXSLT/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Mar 2005 11:18:00 -0000	1.1
+++ sources	5 Mar 2005 11:18:47 -0000	1.2
@@ -0,0 +1 @@
+9b831bc5a97444103f345105f0f6fced  XML-LibXSLT-1.57.tar.gz



From ville.skytta at iki.fi  Sat Mar  5 11:20:44 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Sat, 05 Mar 2005 13:20:44 +0200
Subject: APPROVED: perl-XML-LibXSLT
Message-ID: <1110021644.9070.15.camel@bobcat.mine.nu>

perl-XML-LibXSLT is a Perl module for interfacing to GNOME's libxslt.

Approved by: yours truly
Maintainer: Zing <shishz at hotpop.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050305/555ddd4b/attachment.sig>

From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/shapelib/devel shapelib.spec,1.2,1.3
Message-ID: <200503051928.j25JSUd8007032@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	shapelib.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: shapelib.spec
===================================================================
RCS file: /cvs/extras/rpms/shapelib/devel/shapelib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib.spec	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib.spec	5 Mar 2005 19:28:28 -0000	1.3
@@ -3,7 +3,6 @@
 Name: shapelib
 Version: 1.2.10
 Release: 6
-Epoch: 0
 URL: http://shapelib.maptools.org/
 Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz
 Patch0: shapelib-%{version}.patch
@@ -15,9 +14,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %package devel
-Summary:	Development files for shapelib
-Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Summary: Development files for shapelib
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description
 The Shapefile C Library provides the ability to write
@@ -30,7 +29,7 @@
 
 %prep
 %setup -q -T -b 0
-%patch -p1 -b .buildroot 
+%patch -p1 -b .buildroot
 %patch1 -p1 -b .endian
 
 %build
@@ -60,8 +59,8 @@
 %{_bindir}/*
 %{_libdir}/*.so.*
 
-%doc LICENSE.LGPL README README.tree dbf_api.html shapelib.html shp_api.html 
-%doc contrib/doc/shpproj.txt stream1.sh stream1.out stream2.sh 
+%doc LICENSE.LGPL README README.tree dbf_api.html shapelib.html shp_api.html
+%doc contrib/doc/shpproj.txt stream1.sh stream1.out stream2.sh
 %doc stream2.out makeshape.sh stream3.out ChangeLog
 
 %files devel
@@ -92,7 +91,7 @@
 - Removed proj requirement as it is automatically detected.
 - Added epoch to proj-devel requirement
 - Fixed %post and %postun
-- Changed group to Development/Libraries, although this appears to be only 
+- Changed group to Development/Libraries, although this appears to be only
   somewhat satisfactory.
 - Removed "which make"
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/stow/devel stow.spec,1.2,1.3
Message-ID: <200503051928.j25JSUa8007083@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	stow.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: stow.spec
===================================================================
RCS file: /cvs/extras/rpms/stow/devel/stow.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stow.spec	10 Dec 2004 22:03:11 -0000	1.2
+++ stow.spec	5 Mar 2005 19:28:28 -0000	1.3
@@ -1,7 +1,6 @@
 Name:         stow
 Version:      1.3.3
 Release:      1
-Epoch:        0   
 License:      GPL
 Group:        Development/Tools
 URL:          http://www.gnu.org/software/stow/stow.html
@@ -34,7 +33,7 @@
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info \
     %{_infodir}/dir 2>/dev/null || :
 fi
@@ -44,11 +43,11 @@
 
 %files
 %defattr(-,root,root)
-%doc COPYING README AUTHORS INSTALL ChangeLog NEWS THANKS TODO 
-%doc %{_mandir}/man8/stow* 
+%doc COPYING README AUTHORS INSTALL ChangeLog NEWS THANKS TODO
+%doc %{_mandir}/man8/stow*
 %doc %{_infodir}/stow*
 %{_bindir}/*
 
-%changelog 
+%changelog
 * Sat May 15 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.3.3-0.fdr.1
 - initial RPM



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/scribus/devel scribus.spec,1.8,1.9
Message-ID: <200503051928.j25JSUHY007024@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	scribus.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scribus.spec	9 Feb 2005 01:54:43 -0000	1.8
+++ scribus.spec	5 Mar 2005 19:28:28 -0000	1.9
@@ -88,12 +88,12 @@
 
 
 %post
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : 
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %postun
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : 
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.5,1.6
Message-ID: <200503051928.j25JSUtZ007106@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/sylpheed-claws/devel

Modified Files:
	sylpheed-claws.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sylpheed-claws.spec	5 Mar 2005 07:08:21 -0000	1.5
+++ sylpheed-claws.spec	5 Mar 2005 19:28:28 -0000	1.6
@@ -6,7 +6,6 @@
 Name:           sylpheed-claws
 Version:        1.0.1
 Release:        2
-Epoch:          0
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
@@ -24,14 +23,14 @@
 BuildRequires:  pilot-link-devel
 BuildRequires:  gdk-pixbuf-devel
 BuildRequires:  clamav-devel
-BuildRequires:  gnupg >= 0:1.2.1, gpgme03-devel >= 0:0.3.12
+BuildRequires:  gnupg >= 1.2.1, gpgme03-devel >= 0.3.12
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig
 Requires:  spamassassin
 Requires:  dillo
 
 %description
-The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast 
+The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast
 e-mail client.
 The main reason for this bleeding edge branch is to lift some of the burden
 from the shoulders of Hiroyuki Yamamoto, Sylpheed's creator. The idea is that
@@ -59,10 +58,10 @@
            --enable-spamassassin-plugin \
            --disable-mathml-viewer-plugin \
 %if "%{aspellver}" >= "0.50"
-	   --enable-aspell \
+           --enable-aspell \
 %endif
            --disable-dependency-tracking \
-	   --program-suffix="-claws"
+           --program-suffix="-claws"
 
 %{__make} %{?_smp_mflags}
 
@@ -93,7 +92,7 @@
 %files -f sylpheed-claws.lang
 %defattr(-,root,root,-)
 %doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws COPYING
-%doc NEWS README README.claws RELEASE_NOTES.claws 
+%doc NEWS README README.claws RELEASE_NOTES.claws
 %doc TODO
 %{_bindir}/*
 %dir %{_libdir}/sylpheed-claws/



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/suck/devel suck.spec,1.3,1.4
Message-ID: <200503051928.j25JSUJG007093@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	suck.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: suck.spec
===================================================================
RCS file: /cvs/extras/rpms/suck/devel/suck.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- suck.spec	11 Dec 2004 12:49:45 -0000	1.3
+++ suck.spec	5 Mar 2005 19:28:28 -0000	1.4
@@ -1,13 +1,7 @@
-%define version 4.3.2
-%define name suck
-%define release 9
-%define epoch 0
-
-Name: %{name}
-Summary: Suck - download news from remote NNTP server
-Version: %{version}
-Release: %{release}
-Epoch: %{epoch}
+Name: suck
+Summary: Download news from remote NNTP server
+Version: 4.3.2
+Release: 9
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -19,9 +13,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 License: Public Domain
 Group: System Environment/Daemons
-BuildRequires: inn-devel >= 0:2.3, perl >= 3:5.8
-BuildRequires: openssl-devel, autoconf 
-Requires: inn >= 0:2.3
+BuildRequires: inn-devel >= 2.3, perl >= 3:5.8
+BuildRequires: openssl-devel, autoconf
+Requires: inn >= 2.3
 Conflicts: leafnode
 
 %description
@@ -117,7 +111,7 @@
 - Some changes becouse messages of rpmlint
 
 * Thu Mar 09 2004 Jochen Schmitt <Jochen at herr-schmitt.de>
-- Adapt getnews-script for using with INN 2.4.1 
+- Adapt getnews-script for using with INN 2.4.1
 - Configuration file in /etc/sysconfig/suck
 
 * Thu Mar 08 2004 Jochen Schmitt <Jochen at herr-schmitt.de>



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/soundtracker/devel soundtracker.spec,1.6,1.7
Message-ID: <200503051928.j25JSU5W007066@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	soundtracker.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: soundtracker.spec
===================================================================
RCS file: /cvs/extras/rpms/soundtracker/devel/soundtracker.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- soundtracker.spec	28 Feb 2005 21:12:57 -0000	1.6
+++ soundtracker.spec	5 Mar 2005 19:28:28 -0000	1.7
@@ -1,14 +1,13 @@
 Name:           soundtracker
 Version:        0.6.7
 Release:        3
-Epoch:          0
 Summary:        Sound module composer/player
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.soundtracker.org/
 Source0:        http://www.soundtracker.org/dl/v0.6/soundtracker-0.6.7.tar.gz
-Source1:	soundtracker.desktop
+Source1:        soundtracker.desktop
 Patch0:         soundtracker-automake.patch
 Patch1:         soundtracker-mkinstalldirs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +21,7 @@
 format.  The user interface makes use of GTK+.
 
 %prep
-%setup -q 
+%setup -q
 %patch0
 %patch1 -p1
 
@@ -81,6 +80,6 @@
 
 * Wed Aug 27 2003 Nils O. Sel??sdal <NOS at Utel.no> - 0:0.6.7-0.fdr.1.pre6
 - Initial RPM release for Fedora
-- Rework Makefile.am's to work with recent autotools and to not 
+- Rework Makefile.am's to work with recent autotools and to not
   install setuid root
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/shorewall/devel shorewall.spec,1.5,1.6
Message-ID: <200503051928.j25JSUpU007036@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	shorewall.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- shorewall.spec	10 Dec 2004 22:03:11 -0000	1.5
+++ shorewall.spec	5 Mar 2005 19:28:28 -0000	1.6
@@ -1,8 +1,7 @@
 Name: shorewall
 Version: 1.4.8
 Release: 2
-Epoch: 0
-Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
+Summary: Iptables-based firewall for Linux systems
 
 Group: Applications/System
 License: GPL
@@ -32,7 +31,7 @@
 
 %prep
 
-%setup -q 
+%setup -q
 
 # Clean backup doc files
 rm -rf documentation/*~
@@ -56,7 +55,7 @@
 %post
 
 if [ $1 -eq 1 ]; then
-    	echo \
+	echo \
 "########################################################################
 #      REMOVE THIS FILE AFTER YOU HAVE CONFIGURED SHOREWALL            #
 ########################################################################" \
@@ -66,9 +65,9 @@
 
 %preun
 
-if [ $1 = 0 ]; then
-        /sbin/chkconfig --del shorewall
-        rm -f %{_sysconfdir}/shorewall/startup_disabled
+if [ $1 -eq 0 ]; then
+	/sbin/chkconfig --del shorewall
+	rm -f %{_sysconfdir}/shorewall/startup_disabled
 fi
 
 %files
@@ -94,15 +93,19 @@
 * Tue Nov 11 2003 Miguel Armas <kuko at maarmas.com> - 1.4.8-1.fdr.2
 - Clean backup doc files
 - Fix some entries in files section
+
 * Mon Nov 10 2003 Miguel Armas <kuko at maarmas.com> - 1.4.8-1.fdr.1
 - Upgraded to shorewall 1.4.8
+
 * Fri Oct 31 2003 Miguel Armas <kuko at maarmas.com> - 1.4.7-1.fdr.3.a
 - Start shorewall *before* network for better security.
 - Added clear command to shorewall init script to run "shorewall clear"
 - Changed status command in shorewall init script to run "shorewall status"
+
 * Thu Oct 30 2003 Miguel Armas <kuko at maarmas.com> - 1.4.7-1.fdr.2.a
 - Lots of bugfixes in spec file (Thanks to Michael Schwendt)
+
 * Sat Oct 25 2003 Miguel Armas <kuko at maarmas.com> - 1.4.7-1.fdr.1.a
 - Fedorized package
 - Split documentation in a subpackage (we don't need de docs in a production
-firewall) 
+firewall)



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/sirius/devel sirius.spec,1.6,1.7
Message-ID: <200503051928.j25JSUxo007052@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	sirius.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: sirius.spec
===================================================================
RCS file: /cvs/extras/rpms/sirius/devel/sirius.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sirius.spec	11 Feb 2005 19:59:30 -0000	1.6
+++ sirius.spec	5 Mar 2005 19:28:28 -0000	1.7
@@ -1,17 +1,17 @@
-Name: 		sirius
-Version: 	0.8.0
-Release: 	3
-Summary: 	Othello for Gnome.
-
-Group: 		Amusements/Games
-License:        GPL
-URL: 		http://sirius.bitvis.nu/
+Name:		sirius
+Version:	0.8.0
+Release:	3
+Summary:	Othello for Gnome
+
+Group:		Amusements/Games
+License:	GPL
+URL:		http://sirius.bitvis.nu/
 Source0:	http://sirius.bitvis.nu/files/sirius-0.8.0.tar.gz
 Patch0:		sirius-0.8.0-autoreconf.patch.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:	libgnomeui-devel
 
 %description
@@ -33,7 +33,7 @@
 
 %prep
 %setup -q
-%ifarch x86_64 
+%ifarch x86_64
 # patch was created after autoreconf -f -i and after removing autom4te.cache/
 %patch0 -p 1 -b .autoreconf
 %endif



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/snort/devel snort.spec,1.3,1.4
Message-ID: <200503051928.j25JSUbK007056@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	snort.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- snort.spec	2 Dec 2004 01:37:21 -0000	1.3
+++ snort.spec	5 Mar 2005 19:28:28 -0000	1.4
@@ -1,8 +1,7 @@
-Summary:        An intrusion detection system
+Summary:        Intrusion detection system
 Name:           snort
 Version:        2.0.0
-Release:        0.fdr.1.rh90
-Epoch:          0
+Release:        1
 License:        GPL
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/snort-2.0.0.tar.gz
@@ -10,8 +9,8 @@
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Prefix:         /usr
-Requires:       libpcap >= 0:0.4
-BuildRequires:  libpcap >= 0.4 
+Requires:       libpcap >= 0.4
+BuildRequires:  libpcap >= 0.4
 BuildRequires:  perl
 
 %package        plain+flexresp
@@ -25,7 +24,7 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  mysql-devel 
+BuildRequires:  mysql-devel
 
 %package        mysql+flexresp
 Summary:        Snort with Flexible Response
@@ -33,13 +32,13 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       libnet
 BuildRequires:  libnet
-BuildRequires:  mysql-devel 
+BuildRequires:  mysql-devel
 
 %package        postgresql
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  postgresql-devel 
+BuildRequires:  postgresql-devel
 
 %package        postgresql+flexresp
 Summary:        Snort with Flexible Response
@@ -47,14 +46,14 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       libnet
 BuildRequires:  libnet
-BuildRequires:  postgresql-devel 
+BuildRequires:  postgresql-devel
 
 %package        snmp
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  net-snmp-devel 
-BuildRequires:  openssl-devel 
+BuildRequires:  net-snmp-devel
+BuildRequires:  openssl-devel
 
 %package        snmp+flexresp
 Summary:        Snort with Flexible Response
@@ -62,8 +61,8 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       libnet
 BuildRequires:  libnet
-BuildRequires:  net-snmp-devel 
-BuildRequires:  openssl-devel 
+BuildRequires:  net-snmp-devel
+BuildRequires:  openssl-devel
 
 %package        bloat
 Summary:        Snort with Flexible Response
@@ -71,21 +70,20 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       libnet
 BuildRequires:  libnet
-BuildRequires:  net-snmp-devel 
-BuildRequires:  postgresql-devel 
-BuildRequires:  mysql-devel 
-BuildRequires:  openssl-devel 
+BuildRequires:  net-snmp-devel
+BuildRequires:  postgresql-devel
+BuildRequires:  mysql-devel
+BuildRequires:  openssl-devel
 
-#---------------------------------------------------------------------
 
 %description
-Snort is a libpcap-based packet sniffer/logger which 
-can be used as a lightweight network intrusion detection system. 
-It features rules based logging and can perform protocol analysis, 
-content searching/matching and can be used to detect a variety of 
-attacks and probes, such as buffer overflows, stealth port scans, 
-CGI attacks, SMB probes, OS fingerprinting attempts, and much more. 
-Snort has a real-time alerting capabilty, with alerts being sent to syslog, 
+Snort is a libpcap-based packet sniffer/logger which
+can be used as a lightweight network intrusion detection system.
+It features rules based logging and can perform protocol analysis,
+content searching/matching and can be used to detect a variety of
+attacks and probes, such as buffer overflows, stealth port scans,
+CGI attacks, SMB probes, OS fingerprinting attempts, and much more.
+Snort has a real-time alerting capabilty, with alerts being sent to syslog,
 a seperate "alert" file, or as a WinPopup message via Samba's smbclient
 
 This version is compiled without database support. Edit the spec file
@@ -122,7 +120,7 @@
 Snort compiled with mysql+flexresp support.  Requires libnet rpm.
 
 %description    postgresql
-Snort compiled with postgresql support. 
+Snort compiled with postgresql support.
 
 %description    postgresql+flexresp
 Snort compiled with postgresql+flexresp support.  Requires snort rpm.
@@ -143,7 +141,6 @@
 Snort compiled with snmp+flexresp+mysql+postgresql support.
 Requires libnet rpm.
 
-#---------------------------------------------------------------------
 
 %prep
 echo "
@@ -152,9 +149,8 @@
 Has not been rebuilt or updated since rh9.
 --------------------------------------------------------------" > /dev/null
 exit 1
-%setup -q 
+%setup -q
 
-#---------------------------------------------------------------------
 
 %build
 
@@ -166,12 +162,12 @@
 export AM_CFLAGS="-g -O2"
 SNORT_BASE_CONFIG="--prefix=%{_prefix} \
                    --sysconfdir=%{_sysconfdir} \
-		   --with-libpcap-includes=/usr/include/pcap"
+                   --with-libpcap-includes=/usr/include/pcap"
 
 # there are some strange configure errors
 # when not doing a distclean between major builds.
 
-# plain 
+# plain
 {
 mkdir plain
 cd plain
@@ -181,7 +177,7 @@
                                    --with-odbc=no
 make -j3
 mv src/snort ../snort-plain
-# make distclean 
+# make distclean
 cd ..
 }
 
@@ -196,7 +192,7 @@
                                    --enable-flexresp
 make -j3
 mv src/snort ../snort-plain+flexresp
-# make distclean 
+# make distclean
 
 cd ..
 }
@@ -212,7 +208,7 @@
                                    --enable-flexresp
 make -j3
 mv src/snort ../snort-mysql+flexresp
-# make distclean 
+# make distclean
 cd ..
 }
 
@@ -223,10 +219,10 @@
 ../../configure $SNORT_BASE_CONFIG --with-mysql=yes \
                                    --with-postgresql=no \
                                    --with-oracle=no \
-                                   --with-odbc=no 
+                                   --with-odbc=no
 make -j3
 mv src/snort ../snort-mysql
-# make distclean 
+# make distclean
 
 cd ..
 }
@@ -244,7 +240,7 @@
                                    --enable-flexresp
 make -j3
 mv src/snort ../snort-postgresql+flexresp
-# make distclean 
+# make distclean
 cd ..
 }
 
@@ -255,10 +251,10 @@
 ../../configure $SNORT_BASE_CONFIG --with-mysql=no \
                                    --with-postgresql=yes \
                                    --with-oracle=no \
-                                   --with-odbc=no 
+                                   --with-odbc=no
 make -j3
 mv src/snort ../snort-postgresql
-# make distclean 
+# make distclean
 cd ..
 }
 
@@ -275,7 +271,7 @@
 
 make -j3
 mv src/snort ../snort-snmp
-# make distclean 
+# make distclean
 cd ..
 }
 
@@ -293,7 +289,7 @@
                                    --with-openssl
 make -j3
 mv src/snort ../snort-snmp+flexresp
-# make distclean 
+# make distclean
 cd ..
 }
 
@@ -314,7 +310,6 @@
 cd ..
 }
 
-#---------------------------------------------------------------------
 
 %install
 if [ -d %{buildroot} ]; then
@@ -347,21 +342,18 @@
 
 perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!'  %{buildroot}%{_sysconfdir}/snort.conf
 
-#---------------------------------------------------------------------
 
 %clean
 if [ -d %{buildroot} ]; then
 	rm -rf %{buildroot}
 fi
 
-#---------------------------------------------------------------------
-						
+
 %post
 # make a symlink if there is no link
 ln -sf %{_sbindir}/snort-plain %{_sbindir}/snort
 /sbin/chkconfig --add snortd
 
-#---------------------------------------------------------------------
 
 %preun
 /etc/rc.d/init.d/snortd stop
@@ -370,47 +362,38 @@
    if [ -L %{_sbindir}/snort ]; then rm %{_sbindir}/snort; fi
 fi
 
-#---------------------------------------------------------------------
 
 %post plain+flexresp
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-plain+flexresp %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %post mysql
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-mysql %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %post mysql+flexresp
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-mysql+flexresp %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %post postgresql
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-postgresql %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %post postgresql+flexresp
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-postgresql+flexresp %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %post snmp
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-snmp %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %post snmp+flexresp
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-sfnmp+flexresp %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %post bloat
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-bloat %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root)
@@ -447,7 +430,6 @@
 %files bloat
 %attr(755,root,root) %{_sbindir}/snort-bloat
 
-#---------------------------------------------------------------------
 
 %changelog
 * Tue Apr 01 2003 Phillip Compton <pcompton AT proteinmedia.com> 0:2.0.0-0.fdr.0.1.rc4



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/straw/devel straw.spec,1.5,1.6
Message-ID: <200503051928.j25JSUFU007089@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	straw.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: straw.spec
===================================================================
RCS file: /cvs/extras/rpms/straw/devel/straw.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- straw.spec	28 Feb 2005 21:12:57 -0000	1.5
+++ straw.spec	5 Mar 2005 19:28:28 -0000	1.6
@@ -5,34 +5,33 @@
 Name:           straw
 Version:        0.22.1
 Release:        5
-Epoch:          0
 Summary:        GNOME desktop news aggregator
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.nongnu.org/straw
-Source0:	http://savannah.nongnu.org/download/straw/straw-0.22.1.tar.bz2
+Source0:        http://savannah.nongnu.org/download/straw/straw-0.22.1.tar.bz2
 Patch1:         straw-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+BuildArch:      noarch
 
 BuildRequires:  python-devel, pygtk2-libglade, pyorbit
-BuildRequires:	desktop-file-utils
-BuildRequires:	gnome-python2, gnome-python2-gconf, gnome-python2-gnomevfs, gnome-python2-gtkhtml2
+BuildRequires:  desktop-file-utils
+BuildRequires:  gnome-python2, gnome-python2-gconf, gnome-python2-gnomevfs, gnome-python2-gtkhtml2
 # FC2 does not need python-bsddb as this is part of python >= 2.3
 %if "%{pyver}" < "2.3"
-BuildRequires:	python-bsddb >= 0:4.1
-Requires:	python-bsddb >= 0:4.1
+BuildRequires:  python-bsddb >= 4.1
+Requires:       python-bsddb >= 4.1
 %endif
-Requires:	python-abi = %{pyver}
-Requires:	gnome-python2-gconf, gnome-python2-gnomevfs, gnome-python2-gtkhtml2
+Requires:       python-abi = %{pyver}
+Requires:       gnome-python2-gconf, gnome-python2-gnomevfs, gnome-python2-gtkhtml2
 # Note: python-adns optional but recommended
-Requires:	python-adns
+Requires:       python-adns
 Requires:       pygtk2-libglade, gnome-python2, gnome-python2-gnomevfs, pyorbit
 # Dropped for versions >= 0.22
-# Requires:	mx
-Requires(post):		GConf2
-Requires(preun):	GConf2
+# Requires:     mx
+Requires(post):  GConf2
+Requires(preun): GConf2
 
 %description
 Straw is a desktop news aggregator for the GNOME environment.



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/stellarium/devel stellarium.spec,1.4,1.5
Message-ID: <200503051928.j25JSU05007079@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	stellarium.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- stellarium.spec	27 Jan 2005 18:29:15 -0000	1.4
+++ stellarium.spec	5 Mar 2005 19:28:28 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           stellarium
 Version:        0.6.2
 Release:        2
-Epoch:          0
-Summary:        A photo-realistic nightsky renderer
+Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
 License:        GPL
@@ -16,7 +15,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  ImageMagick
 
-%description 
+%description
 Stellarium is a real-time 3D photo-realistic nightsky renderer. It can
 generate images of the sky as seen through the Earth's atmosphere with
 more than one hundred thousand stars from the Hipparcos Catalogue,



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/s3switch/devel s3switch.spec,1.5,1.6
Message-ID: <200503051928.j25JSUmr007016@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	s3switch.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: s3switch.spec
===================================================================
RCS file: /cvs/extras/rpms/s3switch/devel/s3switch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- s3switch.spec	10 Dec 2004 22:03:11 -0000	1.5
+++ s3switch.spec	5 Mar 2005 19:28:28 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           s3switch
 Version:        0.0
 Release:        5.20020912
-Epoch:          0
 Summary:        Manage the output device on S3 Savage chips
 
 Group:          Applications/System



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/scorched3d/devel scorched3d.spec,1.2,1.3
Message-ID: <200503051928.j25JSU9f007020@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	scorched3d.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scorched3d.spec	10 Dec 2004 22:03:11 -0000	1.2
+++ scorched3d.spec	5 Mar 2005 19:28:28 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           scorched3d
 Version:        37.2
 Release:        1
-Epoch:          0
-Summary:        A game based loosely on the classic DOS game Scorched Earth
+Summary:        Game based loosely on the classic DOS game Scorched Earth
 
 Group:          Amusements/Games
 License:        GPL
@@ -18,7 +17,7 @@
 BuildRequires:  ImageMagick, %{_libdir}/libGLU.so.1, desktop-file-utils
 BuildRequires:  expat-devel, autoconf, automake
 # Upstream naming compatibility
-Provides:       Scorched3D = %{epoch}:%{version}-%{release}
+Provides:       Scorched3D = %{version}-%{release}
 
 %description
 Scorched 3D is a game based on the classic DOS game Scorched Earth



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/seahorse/devel seahorse.spec,1.5,1.6
Message-ID: <200503051928.j25JSUIL007028@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	seahorse.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- seahorse.spec	4 Mar 2005 21:00:23 -0000	1.5
+++ seahorse.spec	5 Mar 2005 19:28:28 -0000	1.6
@@ -1,23 +1,22 @@
-Name: 		seahorse
-Version: 	0.7.3
-Release: 	5
-Epoch:		0
+Name:		seahorse
+Version:	0.7.3
+Release:	5
 Summary:	GNOME2 interface for gnupg
 
-Group: 		User Interface/Desktops
-License: 	GPL
-URL:            http://seahorse.sourceforge.net/
-Source: 	http://download.sourceforge.net/seahorse/seahorse-0.7.3.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  libgnomeui-devel
-BuildRequires:  eel2-devel
-BuildRequires:  gpgme03-devel
-BuildRequires:  scrollkeeper
-BuildRequires:  gettext
-BuildRequires:  desktop-file-utils
-Requires(post): GConf2 scrollkeeper
-Requires(postun): scrollkeeper
+Group:		User Interface/Desktops
+License:	GPL
+URL:		http://seahorse.sourceforge.net/
+Source:		http://download.sourceforge.net/seahorse/seahorse-0.7.3.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	libgnomeui-devel
+BuildRequires:	eel2-devel
+BuildRequires:	gpgme03-devel
+BuildRequires:	scrollkeeper
+BuildRequires:	gettext
+BuildRequires:	desktop-file-utils
+Requires(post):		GConf2 scrollkeeper
+Requires(postun):	scrollkeeper
 
 %description
 Seahorse is a gnome2 interface for gnupg.
@@ -47,7 +46,7 @@
 rm -rf ${RPM_BUILD_ROOT}/var/scrollkeeper
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
 desktop-file-install --vendor fedora --delete-original  \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
   --add-category Application                            \
   --add-category Utility                                \



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/sqlite/devel sqlite.spec,1.8,1.9
Message-ID: <200503051928.j25JSUgv007074@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	sqlite.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sqlite.spec	16 Feb 2005 20:20:44 -0000	1.8
+++ sqlite.spec	5 Mar 2005 19:28:28 -0000	1.9
@@ -1,17 +1,16 @@
 Name:           sqlite
 Version:        2.8.16
 Release:        1
-Epoch:          0
-Summary:        An embeddable SQL engine in a C library
+Summary:        Embeddable SQL engine in a C library
 Group:          System Environment/Libraries
 License:        Public Domain
 URL:            http://www.sqlite.org/
 Source0:        http://www.sqlite.org/sqlite-%{version}.tar.gz
-Patch1:         sqlite-2.8.15.rpath.patch      
+Patch1:         sqlite-2.8.15.rpath.patch
 Patch2:         sqlite-2.8.15-makefile.patch
 Patch3:         sqlite-2.8.3.test.rh9.patch
-Patch4:		sqlite-64bit-fixes.patch
-Patch5:		sqlite-2.8.15-arch-double-differences.patch
+Patch4:         sqlite-64bit-fixes.patch
+Patch5:         sqlite-2.8.15-arch-double-differences.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel readline-devel %{_includedir}/tcl.h
@@ -27,20 +26,20 @@
 %package        devel
 Summary:        Development files for SQLite
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:	pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 
 %description    devel
 SQLite is a small, fast, embeddable SQL database engine that supports
 most of SQL92, including transactions with atomic commit and rollback,
 subqueries, compound queries, triggers, and views.
-This package contains static library and header files for developing 
+This package contains static library and header files for developing
 applications using sqlite.
 
 %package        tcl
 Summary:        Tcl bindings for sqlite
 Group:          System Environment/Libraries
-Requires:       tcl >= 0:8.3.3, %{name} = %{epoch}:%{version}-%{release}
+Requires:       tcl >= 8.3.3, %{name} = %{version}-%{release}
 
 %description    tcl
 SQLite is a small, fast, embeddable SQL database engine that supports
@@ -85,7 +84,7 @@
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files 
+%files
 %defattr(-,root,root,-)
 %{_bindir}/sql*
 %{_libdir}/libsql*.so.*
@@ -103,7 +102,7 @@
 %defattr(-,root,root,-)
 %doc doc/tclsqlite.html
 %exclude %_bindir/tclsqlite
-%exclude %_libdir/%{name}-%{version}/libtclsqlite.a 
+%exclude %_libdir/%{name}-%{version}/libtclsqlite.a
 %exclude %{_bindir}/tclsqlite
 %_libdir/sqlite-%version
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/sopwith/devel sopwith.spec,1.4,1.5
Message-ID: <200503051928.j25JSUVD007061@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	sopwith.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: sopwith.spec
===================================================================
RCS file: /cvs/extras/rpms/sopwith/devel/sopwith.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sopwith.spec	10 Dec 2004 22:03:11 -0000	1.4
+++ sopwith.spec	5 Mar 2005 19:28:28 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           sopwith
 Version:        1.7.1
 Release:        1
-Epoch:          0
-Summary:        SDL port of sopwith
+Summary:        SDL port of the sopwith game
 
 Group:          Amusements/Games
 License:        GPL
@@ -11,26 +10,22 @@
 Source1:        sopwith.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# -----------------------------------------------------------------------------
 
 BuildRequires:  gtk2-devel, SDL-devel, desktop-file-utils
 
 %description
-This is a port of the classic computer game "Sopwith" to run on modern 
-computers and operating systems. 
+This is a port of the classic computer game "Sopwith" to run on modern
+computers and operating systems.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n sdl_sopwith-%{version}
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,14 +52,12 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING FAQ NEWS README TODO doc/keys.txt doc/origdoc.txt doc/readme.txt
 %{_bindir}/sopwith
@@ -73,7 +66,6 @@
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Wed Jun 18 2003 Adrian Reber <adrian at lisas.de> - 0:1.7.1-0.fdr.1



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/source-highlight/devel source-highlight.spec,1.3,1.4
Message-ID: <200503051928.j25JSUjc007070@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/source-highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/source-highlight/devel

Modified Files:
	source-highlight.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: source-highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/source-highlight/devel/source-highlight.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- source-highlight.spec	10 Dec 2004 22:03:11 -0000	1.3
+++ source-highlight.spec	5 Mar 2005 19:28:28 -0000	1.4
@@ -1,17 +1,16 @@
-Summary: 	Produces a document with syntax highlighting
-Name: 		source-highlight
-Version: 	1.9
+Summary:	Produces a document with syntax highlighting
+Name:		source-highlight
+Version:	1.9
 Release:	2
-Epoch:		0
-Group: 		Development/Tools
-License: 	GPL
-Source: 	ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
-URL: 		http://www.gnu.org/software/src-highlite/
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Group:		Development/Tools
+License:	GPL
+Source:		ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
+URL:		http://www.gnu.org/software/src-highlite/
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	bison, flex
 
 %description
-This program, given a source file, produces a document with syntax 
+This program, given a source file, produces a document with syntax
 highlighting. At the moment this package can handle :
 * Java
 * C/C++
@@ -19,10 +18,10 @@
 * Perl
 * Php3 new
 as source languages, and HTML as output format.
-NOTICE: now the name of the program is source-highlight: there are no two 
-separate programs, namely java2html and cpp2html, anymore.  However there 
-are two shell scripts with the same name in order to facilitate the 
-migration (however their use is not advised). 
+NOTICE: now the name of the program is source-highlight: there are no two
+separate programs, namely java2html and cpp2html, anymore.  However there
+are two shell scripts with the same name in order to facilitate the
+migration (however their use is not advised).
 
 %prep
 %setup -q



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/silky/devel silky.spec,1.4,1.5
Message-ID: <200503051928.j25JSUR0007045@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	silky.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: silky.spec
===================================================================
RCS file: /cvs/extras/rpms/silky/devel/silky.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- silky.spec	10 Dec 2004 22:03:11 -0000	1.4
+++ silky.spec	5 Mar 2005 19:28:28 -0000	1.5
@@ -1,4 +1,4 @@
-Summary: Silky is an easy-to-use graphical SILC client.
+Summary: Easy-to-use graphical SILC client
 Name: silky
 Version: 0.5.2
 Release: 1
@@ -8,15 +8,14 @@
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Patch: silky-0.5.1-desktop.patch
-Epoch: 0
 
 # mailcap is needed for /etc/mime.types
 
 Requires: mailcap
-Requires: libsilc >= 0:0.9.12
+Requires: libsilc >= 0.9.12
 
 BuildRequires: gtk2-devel libxml2-devel libglade2-devel
-BuildRequires: libsilc-devel >= 0:0.9.12
+BuildRequires: libsilc-devel >= 0.9.12
 
 %description
 Silky is a graphical SILC client.
@@ -27,7 +26,8 @@
 
 %build
 %configure --with-silc-libs=%{_libdir}/silc \
- --with-silc-includes=%{_includedir}/silc --with-docdir=%{_docdir}/silky-%{version}
+ --with-silc-includes=%{_includedir}/silc \
+ --with-docdir=%{_docdir}/silky-%{version}
 make %{?_smp_mflags}
 
 %install



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/swatch/devel swatch.spec,1.5,1.6
Message-ID: <200503051928.j25JSUBc007102@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	swatch.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: swatch.spec
===================================================================
RCS file: /cvs/extras/rpms/swatch/devel/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 Mar 2005 19:28:28 -0000	1.6
@@ -3,8 +3,7 @@
 Name:           swatch
 Version:        3.1.1
 Release:        1
-Epoch:          0
-Summary:        A tool for actively monitoring log files.
+Summary:        Tool for actively monitoring log files
 
 Group:          Applications/File
 License:        GPL
@@ -19,9 +18,9 @@
 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.
 
 
@@ -46,7 +45,7 @@
 make test
 
 
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/supertux/devel supertux.spec,1.4,1.5
Message-ID: <200503051928.j25JSU6n007099@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	supertux.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: supertux.spec
===================================================================
RCS file: /cvs/extras/rpms/supertux/devel/supertux.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- supertux.spec	13 Jan 2005 13:30:45 -0000	1.4
+++ supertux.spec	5 Mar 2005 19:28:28 -0000	1.5
@@ -1,23 +1,22 @@
 Name:           supertux
 Version:        0.1.2
 Release:        1
-Epoch:          0
-Summary:        A jump'n run like game similar to Mario Bros
+Summary:        Jump'n run like game similar to Mario Bros
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://super-tux.sourceforge.net/
 Source0:        http://dl.sf.net/super-tux/supertux-0.1.2.tar.bz2
-Source1:	%{name}.desktop
+Source1:        %{name}.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  SDL-devel >= 0:1.2.4, SDL_image-devel, SDL_mixer-devel
-BuildRequires:	zlib-devel, desktop-file-utils
+BuildRequires:  SDL-devel >= 1.2.4, SDL_image-devel, SDL_mixer-devel
+BuildRequires:  zlib-devel, desktop-file-utils
 
 %description
 SuperTux is a jump'n run like game, with strong inspiration from the
 Super Mario Bros games for Nintendo.
-     
+
 Run and jump through multiple worlds, fighting off enemies by jumping
 on them or bumping them from below.  Grabbing power-ups and other stuff
 on the way.
@@ -47,7 +46,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO LEVELDESIGN
 %{_bindir}/*



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/showimg/devel showimg.spec,1.1,1.2
Message-ID: <200503051928.j25JSU0q007041@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	showimg.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- showimg.spec	29 Jan 2005 23:49:56 -0000	1.1
+++ showimg.spec	5 Mar 2005 19:28:28 -0000	1.2
@@ -1,8 +1,7 @@
 Name:           showimg
 Version:        0.9.4.1
 Release:        2
-Epoch:          0
-Summary:        Feature-rich image viewer for KDE.
+Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tla/devel tla.spec,1.5,1.6
Message-ID: <200503051943.j25JhJhR007608@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	tla.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tla.spec	9 Feb 2005 22:50:04 -0000	1.5
+++ tla.spec	5 Mar 2005 19:43:17 -0000	1.6
@@ -1,8 +1,7 @@
 Name:           tla
 Version:        1.3
 Release:        1
-Epoch:          0
-Summary:        The Low-Budget arch Revision Control System
+Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
 License:        GPL



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tktable/devel tktable.spec,1.6,1.7
Message-ID: <200503051943.j25JhJ2e007604@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	tktable.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tktable.spec
===================================================================
RCS file: /cvs/extras/rpms/tktable/devel/tktable.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tktable.spec	10 Dec 2004 22:03:12 -0000	1.6
+++ tktable.spec	5 Mar 2005 19:43:17 -0000	1.7
@@ -1,8 +1,7 @@
-Summary: Table/matrix widget extension to Tcl/Tk.
+Summary: Table/matrix widget extension to Tcl/Tk
 Name: tktable
 Version: 2.9
 Release: 1
-Epoch: 0
 License: BSD-like
 Group: Development/Libraries
 Source: http://download.sourceforge.net/tktable/Tktable2.9.tar.gz
@@ -10,7 +9,7 @@
 BuildRequires: XFree86-devel >= 0:4, tk >= 0:8.3.1
 # work around tcl-devel and tk-devel packages non existence in RH 8.0 and 9:
 BuildRequires: %{_includedir}/tk.h, %{_includedir}/tcl.h
-Requires: tk >= 0:8.3.1
+Requires: tk >= 8.3.1
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/taglib/devel taglib.spec,1.6,1.7
Message-ID: <200503051943.j25JhJ3g007540@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	taglib.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: taglib.spec
===================================================================
RCS file: /cvs/extras/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- taglib.spec	18 Jan 2005 19:13:31 -0000	1.6
+++ taglib.spec	5 Mar 2005 19:43:17 -0000	1.7
@@ -1,13 +1,12 @@
 Name:       taglib	
 Version:    1.3.1
 Release:    1
-Epoch:      0 
-Summary:    Audio Meta-Data Library 
+Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
 License:    LGPL
 URL:	    http://ktown.kde.org/~wheeler/taglib/
-Source:	    http://developer.kde.org/~wheeler/files/src/taglib-1.3.1.tar.gz 
+Source:	    http://developer.kde.org/~wheeler/files/src/taglib-1.3.1.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/ldconfig
@@ -16,15 +15,15 @@
 BuildRequires: doxygen, graphviz
 
 %description
-TagLib is a library for reading and editing the meta-data of several 
-popular audio formats. Currently it supports both ID3v1 and ID3v2 for 
-MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in 
+TagLib is a library for reading and editing the meta-data of several
+popular audio formats. Currently it supports both ID3v1 and ID3v2 for
+MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in
 FLAC files.
 
 %package devel
-Summary: Development tools for taglib 
+Summary: Development tools for taglib
 Group:	 Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description devel
 Development tools for taglib
 
@@ -66,7 +65,7 @@
 %doc examples
 
 
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 
@@ -117,4 +116,4 @@
 - fix for rh73
 
 * Fri Feb 06 2004 Rex Dieter <rexdieter at sf.net> 0:1.0-0.fdr.0
-- first try 
+- first try



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-arabtex/devel tetex-arabtex.spec,1.3,1.4
Message-ID: <200503051943.j25JhJff007548@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-arabtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-arabtex/devel

Modified Files:
	tetex-arabtex.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-arabtex.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-arabtex/devel/tetex-arabtex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tetex-arabtex.spec	10 Dec 2004 22:03:11 -0000	1.3
+++ tetex-arabtex.spec	5 Mar 2005 19:43:17 -0000	1.4
@@ -5,8 +5,7 @@
 Name:           tetex-arabtex
 Version:        3.11
 Release:        1.l
-Epoch:          0
-Summary:        The ArabTeX package for TeX/LaTeX
+Summary:        ArabTeX package for TeX/LaTeX
 
 Group:          Applications/Publishing
 License:        LaTeX Project Public License
@@ -23,7 +22,7 @@
 Requires(postun): tetex
 BuildArch:      noarch
 
-%description 
+%description
 ArabTeX is a macro package for typesetting text using the Arabic
 script, including Naskh style fonts, using TeX or LaTeX. It supports a
 range of encodings and an ASCII translitteration.



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tuxtype2/devel tuxtype2.spec,1.4,1.5
Message-ID: <200503051943.j25JhJ0E007640@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	tuxtype2.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tuxtype2.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxtype2/devel/tuxtype2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tuxtype2.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ tuxtype2.spec	5 Mar 2005 19:43:17 -0000	1.5
@@ -1,25 +1,24 @@
 Name:           tuxtype2
 Version:        1.5.2
 Release:        1
-Epoch:          0
-Summary:        Tux Typing is an educational typing tutor for children.
+Summary:        Tux Typing, an educational typing tutor for children
 Group:          Amusements/Games
 License:        GPL
 URL:            http://tuxtype.sourceforge.net/
 Source0:        http://dl.sf.net/tuxtype/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel >= 0:1.2.5, SDL_image-devel, SDL_mixer-devel
+BuildRequires:  SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel
 BuildRequires:  SDL_ttf-devel, ImageMagick, desktop-file-utils
-BuildRequires:	automake, autoconf
+BuildRequires:  automake, autoconf
 
 %description
-Tux Typing is an educational typing tutor for children. It features several 
+Tux Typing is an educational typing tutor for children. It features several
 different types of gameplay, at a variety of difficulty levels.
 
 
 %prep
-%setup -q 
+%setup -q
 
 
 %build



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/ttf2pt1/devel ttf2pt1.spec,1.2,1.3
Message-ID: <200503051943.j25JhJwV007629@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ttf2pt1.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ttf2pt1.spec
===================================================================
RCS file: /cvs/extras/rpms/ttf2pt1/devel/ttf2pt1.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ttf2pt1.spec	10 Dec 2004 22:03:12 -0000	1.2
+++ ttf2pt1.spec	5 Mar 2005 19:43:17 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           ttf2pt1
 Version:        3.4.4
 Release:        2
-Epoch:          0
 Summary:        TrueType to Adobe Type 1 converter
 
 Group:          Applications/Publishing
@@ -13,7 +12,7 @@
 Patch1:         ttf2pt1-3.4.3-manpages.patch
 Patch2:         ttf2pt1-3.4.4-ft2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  freetype-devel > 0:2
+BuildRequires:  freetype-devel > 2
 BuildRequires:  t1lib-devel
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tkcvs/devel tkcvs.spec,1.7,1.8
Message-ID: <200503051943.j25JhJ45007600@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	tkcvs.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tkcvs.spec	14 Feb 2005 21:33:30 -0000	1.7
+++ tkcvs.spec	5 Mar 2005 19:43:17 -0000	1.8
@@ -1,7 +1,6 @@
 Name:		tkcvs
 Version:	7.2.2
 Release:	2
-Epoch:		0
 Summary:	TkCVS and TkDiff
 
 Group:		Development/Tools
@@ -45,10 +44,10 @@
 
 %files
 %defattr(-,root,root)
+%doc CHANGELOG COPYING FAQ vendor5readme.pdf vendorcode.sh
 %{_datadir}/tkcvs
 %{_bindir}/*
 %{_mandir}/man1/*
-%doc CHANGELOG COPYING FAQ vendor5readme.pdf vendorcode.sh
 
 %changelog
 * Mon Feb 14 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:7.2.2-2



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-armtex/devel tetex-armtex.spec,1.2,1.3
Message-ID: <200503051943.j25JhJkg007552@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-armtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-armtex/devel

Modified Files:
	tetex-armtex.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-armtex.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-armtex/devel/tetex-armtex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tetex-armtex.spec	10 Dec 2004 22:03:11 -0000	1.2
+++ tetex-armtex.spec	5 Mar 2005 19:43:17 -0000	1.3
@@ -5,7 +5,6 @@
 Name:           tetex-armtex
 Version:        2.0
 Release:        1
-Epoch:          0
 Summary:        Support for typesetting Armenian with TeX and LaTeX
 
 Group:          Applications/Publishing
@@ -23,7 +22,7 @@
 Requires(postun): tetex
 BuildArch:      noarch
 
-%description 
+%description
 ArmTeX adds support to TeX and LaTeX for typesetting text using the
 Armenian script. It can be used with both OT6 and ArmSCII8 encodings.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/themes-backgrounds-gnome/devel themes-backgrounds-gnome.spec,
	1.4, 1.5
Message-ID: <200503051943.j25JhJPg007584@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/themes-backgrounds-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/themes-backgrounds-gnome/devel

Modified Files:
	themes-backgrounds-gnome.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: themes-backgrounds-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/devel/themes-backgrounds-gnome.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- themes-backgrounds-gnome.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ themes-backgrounds-gnome.spec	5 Mar 2005 19:43:17 -0000	1.5
@@ -1,8 +1,7 @@
-Summary:        Assorted Backgrounds from art.gnome.org.
+Summary:        Assorted Backgrounds from art.gnome.org
 Name:           themes-backgrounds-gnome
 Version:        0.3
 Release:        2
-Epoch:          0
 License:        GPL
 Group:          User Interface/Desktops
 URL:            http://art.gnome.org
@@ -12,28 +11,24 @@
 
 %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/
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
@@ -41,7 +36,6 @@
 %dir %{_datadir}/backgrounds/images/
 %{_datadir}/backgrounds/images/art.gnome.org/
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Thu Aug 14 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.3-0.fdr.2



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-lgrind/devel tetex-lgrind.spec,1.6,1.7
Message-ID: <200503051943.j25JhJ14007574@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-lgrind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-lgrind/devel

Modified Files:
	tetex-lgrind.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-lgrind.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-lgrind/devel/tetex-lgrind.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tetex-lgrind.spec	4 Mar 2005 21:00:24 -0000	1.6
+++ tetex-lgrind.spec	5 Mar 2005 19:43:17 -0000	1.7
@@ -1,5 +1,5 @@
 %define texmf       %{_datadir}/texmf
-%define tdsname     lgrind 
+%define tdsname     lgrind
 %define itexhash    $RPM_INSTALL_PREFIX/bin/texhash
 %define itexmf      $RPM_INSTALL_PREFIX/share/texmf
 
@@ -7,7 +7,6 @@
 Name:             tetex-lgrind
 Version:          3.67
 Release:          4
-Epoch:            0
 URL:              http://www.ctan.org/tex-archive/support/lgrind
 License:          BSD
 Group:            Applications/Publishing
@@ -45,7 +44,7 @@
 
 %install
 rm -rf %{buildroot}
- 
+
 # Install TeX files.
 mkdir -p %{buildroot}%{texmf}/tex/latex/%{tdsname}/
 install -m 644 lgrind.sty %{buildroot}%{texmf}/tex/latex/%{tdsname}/



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/t1utils/devel t1utils.spec,1.5,1.6
Message-ID: <200503051943.j25JhJQU007536@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	t1utils.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: t1utils.spec
===================================================================
RCS file: /cvs/extras/rpms/t1utils/devel/t1utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- t1utils.spec	10 Dec 2004 22:03:11 -0000	1.5
+++ t1utils.spec	5 Mar 2005 19:43:17 -0000	1.6
@@ -1,20 +1,19 @@
 Name:		t1utils
 Version:	1.32
 Release:	1
-Epoch:          0
 Summary:	Collection of Type 1 and 2 font manipulation utilities
 
 Group:		Applications/Publishing
 License:	Freely modifiable and 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)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 t1utils is a collection of programs for manipulating PostScript type 1
 and type 2 fonts containing programs to convert between PFA (ASCII)
 format, PFB (binary) format, a human-readable and editable ASCII
-format, and Macintosh resource forks. 
+format, and Macintosh resource forks.
 
 
 %prep



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-eurofont/devel tetex-eurofont.spec,1.2,1.3
Message-ID: <200503051943.j25JhJxZ007556@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-eurofont/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-eurofont/devel

Modified Files:
	tetex-eurofont.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-eurofont.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-eurofont/devel/tetex-eurofont.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tetex-eurofont.spec	10 Dec 2004 22:03:12 -0000	1.2
+++ tetex-eurofont.spec	5 Mar 2005 19:43:17 -0000	1.3
@@ -1,14 +1,13 @@
-Name: 		tetex-eurofont
-Version:	1.1.3
-Release: 	2
-Epoch:		0
-Summary: 	Provides a command that prints a euro symbol.
+Name:           tetex-eurofont
+Version:        1.1.3
+Release:        2
+Summary:        Provides a command that prints a euro symbol
 
-Group: 		Applications/Publishing
+Group:          Applications/Publishing
 License:        LaTeX Project Public License
-Url: 		http://tug.ctan.org/tex-archive/macros/latex/contrib/eurofont
-Source:		ftp://ftp.dante.de/tex-archive/macros/latex/contrib/eurofont.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:            http://tug.ctan.org/tex-archive/macros/latex/contrib/eurofont
+Source:         ftp://ftp.dante.de/tex-archive/macros/latex/contrib/eurofont.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 Requires:       tetex-latex
@@ -46,7 +45,7 @@
 latex eurofont.dtx
 
 %install
-rm -rf $RPM_BUILD_ROOT 
+rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{eurofontpath}
 install -m 644 *.fd $RPM_BUILD_ROOT%{eurofontpath}
@@ -77,9 +76,11 @@
 %changelog
 * Tue Sep 14 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:1.1.3-0.fdr.2
 - Use the good source tarball
+
 * Tue Sep 14 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:1.1.3-0.fdr.1
 - Add BuildRequires tetex-latex
 - Remove Provides tetex-eurofont
 - Directory /usr/share/texmf/fonts/tfm/adobe should not be owned by this package
+
 * Thu Jul 22 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:1.1.3-0.fdr.0
 - Initial Fedora RPM



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/t1lib/devel t1lib.spec,1.3,1.4
Message-ID: <200503051943.j25JhJ0e007532@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	t1lib.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- t1lib.spec	10 Dec 2004 22:03:11 -0000	1.3
+++ t1lib.spec	5 Mar 2005 19:43:17 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           t1lib
 Version:        5.0.2
 Release:        1
-Epoch:          0
 Summary:        PostScript Type 1 font rasterizer
 
 Group:          Applications/Publishing
@@ -26,7 +25,7 @@
 T1lib is a rasterizer library for Adobe Type 1 Fonts. It supports
 rotation and transformation, kerning underlining and antialiasing. It
 does not depend on X11, but does provides some special functions for
-X11. 
+X11.
 
 AFM-files can be generated from Type 1 font files and font subsetting
 is possible.
@@ -34,7 +33,7 @@
 %package        devel
 Summary:        Header files and static libraries for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 This package contains header files and static libraries for %{name}.



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc.spec,1.2,1.3
Message-ID: <200503051943.j25JhJHm007560@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-font-cm-lgc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-font-cm-lgc/devel

Modified Files:
	tetex-font-cm-lgc.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-font-cm-lgc.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-cm-lgc/devel/tetex-font-cm-lgc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tetex-font-cm-lgc.spec	28 Nov 2004 05:20:14 -0000	1.2
+++ tetex-font-cm-lgc.spec	5 Mar 2005 19:43:17 -0000	1.3
@@ -5,8 +5,7 @@
 Name:           tetex-font-cm-lgc
 Version:        0.3.1
 Release:        1
-Epoch:          0
-Summary:        The CM-LGC Type1 fonts for LaTeX
+Summary:        CM-LGC Type1 fonts for LaTeX
 
 Group:          Applications/Publishing
 License:        GPL
@@ -43,7 +42,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
- 
+
 mkdir -p $RPM_BUILD_ROOT%{texmf}/tex/latex/%{tdsname}
 install -p -m 644 tex/latex/cm-lgc/* $RPM_BUILD_ROOT%{texmf}/tex/latex/%{tdsname}/
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tidy/devel tidy.spec,1.6,1.7
Message-ID: <200503051943.j25JhJBW007591@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	tidy.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tidy.spec
===================================================================
RCS file: /cvs/extras/rpms/tidy/devel/tidy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tidy.spec	17 Dec 2004 19:22:39 -0000	1.6
+++ tidy.spec	5 Mar 2005 19:43:17 -0000	1.7
@@ -1,7 +1,6 @@
 Name:           tidy
 Version:        0.99.0
 Release:        2.20041214
-Epoch:          0
 Summary:        Utility to clean up and pretty print HTML/XHTML/XML
 
 Group:          Applications/Text
@@ -33,7 +32,7 @@
 %package     -n lib%{name}-devel
 Summary:        Development files for tidy
 Group:          Development/Libraries
-Requires:       lib%{name} = %{epoch}:%{version}-%{release}
+Requires:       lib%{name} = %{version}-%{release}
 
 %description -n lib%{name}-devel
 %{summary}.



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-font-tipa/devel tetex-font-tipa.spec,1.2,1.3
Message-ID: <200503051943.j25JhJgJ007570@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-font-tipa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-font-tipa/devel

Modified Files:
	tetex-font-tipa.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-font-tipa.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-tipa/devel/tetex-font-tipa.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tetex-font-tipa.spec	10 Dec 2004 22:03:12 -0000	1.2
+++ tetex-font-tipa.spec	5 Mar 2005 19:43:17 -0000	1.3
@@ -5,8 +5,7 @@
 Name:           tetex-font-tipa
 Version:        1.3
 Release:        1
-Epoch:          0
-Summary:        The TIPA fonts for LaTeX
+Summary:        TIPA fonts for LaTeX
 
 Group:          Applications/Publishing
 License:        LaTeX Project Public License
@@ -42,7 +41,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
- 
+
 mkdir -p $RPM_BUILD_ROOT%{texmf}/tex/latex/%{tdsname}
 install -p -m 644 sty/{*.sty,*.fd,*.def} $RPM_BUILD_ROOT%{texmf}/tex/latex/%{tdsname}/
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tpctl/devel tpctl.spec,1.7,1.8
Message-ID: <200503051943.j25JhJdT007617@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	tpctl.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tpctl.spec
===================================================================
RCS file: /cvs/extras/rpms/tpctl/devel/tpctl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tpctl.spec	12 Feb 2005 18:47:27 -0000	1.7
+++ tpctl.spec	5 Mar 2005 19:43:17 -0000	1.8
@@ -1,7 +1,6 @@
 Name:           tpctl
 Version:        4.17
 Release:        1
-Epoch:          0
 Summary:        IBM ThinkPad configuration tools
 
 Group:          System Environment/Base
@@ -15,7 +14,7 @@
 
 ExclusiveArch:  %{ix86}
 BuildRequires:  ncurses-devel, libtool
-Requires:       kernel-module-thinkpad >= 0:3.2
+Requires:       kernel-module-thinkpad >= 3.2
 
 %description
 tpctl is a package of IBM ThinkPad configuration tools for Linux.
@@ -23,7 +22,7 @@
 %package     -n apmiser
 Summary:        IBM ThinkPad APM settings daemon
 Group:          System Environment/Daemons
-Requires:       %{name} = %{epoch}:%{version}
+Requires:       %{name} = %{version}
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tpb/devel tpb.spec,1.5,1.6
Message-ID: <200503051943.j25JhJ5b007612@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	tpb.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tpb.spec
===================================================================
RCS file: /cvs/extras/rpms/tpb/devel/tpb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tpb.spec	9 Feb 2005 22:01:51 -0000	1.5
+++ tpb.spec	5 Mar 2005 19:43:17 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           tpb
 Version:        0.6.3
 Release:        2
-Epoch:          0
 Summary:        IBM ThinkPad button support utility
 
 Group:          System Environment/Base
@@ -13,7 +12,7 @@
 Patch0:         %{name}-defaultconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xosd-devel >= 0:2.0.0, XFree86-devel, gettext, /sbin/MAKEDEV
+BuildRequires:  xosd-devel >= 2.0.0, XFree86-devel, gettext, /sbin/MAKEDEV
 Requires:       udev
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/treecc/devel treecc.spec,1.6,1.7
Message-ID: <200503051943.j25JhJ6Y007621@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	treecc.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: treecc.spec
===================================================================
RCS file: /cvs/extras/rpms/treecc/devel/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	5 Mar 2005 19:43:17 -0000	1.7
@@ -1,7 +1,7 @@
 Name:           treecc
 Version:        0.3.4
 Release:        2
-Summary:        Tree Compiler Compiler.
+Summary:        Tree Compiler Compiler
 
 Group:          Development/Tools
 License:        GPL
@@ -47,7 +47,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
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tripwire/devel tripwire.spec,1.4,1.5
Message-ID: <200503051943.j25JhJNw007625@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	tripwire.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tripwire.spec
===================================================================
RCS file: /cvs/extras/rpms/tripwire/devel/tripwire.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tripwire.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ tripwire.spec	5 Mar 2005 19:43:17 -0000	1.5
@@ -1,10 +1,9 @@
 %define		path_to_vi /bin/vi
 %define		path_to_sendmail /usr/sbin/sendmail
-Summary:	An IDS (Intrusion Detection System)
+Summary:	IDS (Intrusion Detection System)
 Name:		tripwire
 Version:	2.3.1
 Release:	21
-Epoch:		0
 License:	GPL
 Group:		Applications/System
 Source0:	http://download.sourceforge.net/tripwire/tripwire-2.3.1-2.tar.gz
@@ -207,7 +206,7 @@
 * Fri Nov 28 2003 Keith G. Robertson-Turner <tripwire-devel[AT]genesis-x.nildram.co.uk> 0:2.3.1-18.fdr.3
 - Thanks to Michael Schwendt for really cleaning up the Spec file
 - The remaining parts of the  original  tripwire-2.3.1-gcc3.patch  have
-  now been implemented 
+  now been implemented
 - Debuginfo fully builds now
 
 * Thu Nov 27 2003 Keith G. Robertson-Turner <tripwire-devel[AT]genesis-x.nildram.co.uk> 0:2.3.1-18.fdr.2
@@ -269,7 +268,7 @@
 
 * Tue Jul 10 2001 Mike A. Harris <mharris at redhat.com> 2.3.1-3
 - Made package own dir /var/lib/tripwire
- 
+
 * Mon Jun 25 2001 Nalin Dahyabhai <nalin at redhat.com>
 - update to 2.3.1-2
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tuxpaint/devel tuxpaint.spec,1.4,1.5
Message-ID: <200503051943.j25JhJYg007636@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	tuxpaint.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tuxpaint.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/tuxpaint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tuxpaint.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ tuxpaint.spec	5 Mar 2005 19:43:17 -0000	1.5
@@ -2,23 +2,23 @@
 Version:        0.9.13
 Release:        1
 Epoch:          1
-Summary:        Drawing program designed for young children.
+Summary:        Drawing program designed for young children
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.newbreedsoftware.com/tuxpaint/
 Source0:        http://dl.sf.net/tuxpaint/tuxpaint-0.9.13.tar.gz
-Source1:	%{name}.desktop
-Patch0:		%{name}-%{version}-destdir.patch
+Source1:        %{name}.desktop
+Patch0:         %{name}-%{version}-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel >= 0:1.2.4, SDL_image-devel, SDL_ttf-devel
-BuildRequires:	SDL_mixer-devel, libpng-devel, freetype-devel >= 0:2.0, gettext
-BuildRequires:	netpbm-devel, gnome-libs-devel, kdelibs, desktop-file-utils
+BuildRequires:  SDL-devel >= 1.2.4, SDL_image-devel, SDL_ttf-devel
+BuildRequires:  SDL_mixer-devel, libpng-devel, freetype-devel >= 2.0, gettext
+BuildRequires:  netpbm-devel, gnome-libs-devel, kdelibs, desktop-file-utils
 
 %description
-"Tux Paint" is a free drawing program designed for young children 
-(kids ages 3 and up). It has a simple, easy-to-use interface, 
+"Tux Paint" is a free drawing program designed for young children
+(kids ages 3 and up). It has a simple, easy-to-use interface,
 fun sound effects, and a cartoon mascot who helps you along.
 
 %prep
@@ -35,14 +35,14 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applnk/Graphics
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/{16x16,32x32,48x48}/apps/
 make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_usr} \
-			 X11_ICON_PREFIX=%{_datadir}/pixmaps/
+	X11_ICON_PREFIX=%{_datadir}/pixmaps/
 find $RPM_BUILD_ROOT -type d|xargs chmod 0755
 %find_lang %{name}
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-			 --vendor fedora \
-			 --add-category X-Fedora \
-			 %{SOURCE1}
+	--vendor fedora \
+	--add-category X-Fedora \
+	%{SOURCE1}
 
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/gnome/
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/applnk/



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tdl/devel tdl.spec,1.6,1.7
Message-ID: <200503051943.j25JhJFD007544@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	tdl.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tdl.spec
===================================================================
RCS file: /cvs/extras/rpms/tdl/devel/tdl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tdl.spec	4 Mar 2005 21:00:23 -0000	1.6
+++ tdl.spec	5 Mar 2005 19:43:17 -0000	1.7
@@ -1,15 +1,14 @@
 # $Id$
 
-Summary:		A to-do list manager
-Name:			tdl
-Version:		1.5.2
-Release:		1
-Epoch:			0
-URL:			http://www.rc0.org.uk/tdl/index.html
-License:		GPL
-Group:			Applications/Productivity
-Source0:		http://www.rpcurnow.force9.co.uk/tdl/tdl-1.5.2.tar.gz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
+Summary:	To-do list manager
+Name:		tdl
+Version:	1.5.2
+Release:	1
+URL:		http://www.rc0.org.uk/tdl/index.html
+License:	GPL
+Group:		Applications/Productivity
+Source0:	http://www.rpcurnow.force9.co.uk/tdl/tdl-1.5.2.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	libtermcap-devel, readline-devel, texinfo
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
@@ -44,7 +43,7 @@
 /sbin/install-info %{_infodir}/tdl.info %{_infodir}/dir 2>/dev/null || :
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
     /sbin/install-info --delete %{_infodir}/tdl.info \
       %{_infodir}/dir 2>/dev/null || :
 fi



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-font-kerkis/devel tetex-font-kerkis.spec,1.2,1.3
Message-ID: <200503051943.j25JhJxG007565@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-font-kerkis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-font-kerkis/devel

Modified Files:
	tetex-font-kerkis.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-font-kerkis.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-kerkis/devel/tetex-font-kerkis.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tetex-font-kerkis.spec	10 Dec 2004 22:03:12 -0000	1.2
+++ tetex-font-kerkis.spec	5 Mar 2005 19:43:17 -0000	1.3
@@ -5,8 +5,7 @@
 Name:           tetex-font-kerkis
 Version:        2.0
 Release:        2
-Epoch:          0
-Summary:        The Kerkis type 1 fonts for LaTeX
+Summary:        Kerkis type 1 fonts for LaTeX
 
 Group:          Applications/Publishing
 License:        Distributable
@@ -21,7 +20,7 @@
 BuildArch:      noarch
 
 %description
-This package contains the Kerkis type 1 fonts for LaTeX. 
+This package contains the Kerkis type 1 fonts for LaTeX.
 
 These fonts are particularly useful for typesetting Greek. The
 Greek repertoire includes full support for polytonic Greek, Greek
@@ -44,7 +43,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
- 
+
 mkdir -p $RPM_BUILD_ROOT%{texmf}/tex/latex/%{tdsname}
 install -p -m 644 tex/{*.sty,*.fd} $RPM_BUILD_ROOT%{texmf}/tex/latex/%{tdsname}/
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-unicode/devel tetex-unicode.spec,1.3,1.4
Message-ID: <200503051943.j25JhJN8007578@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	tetex-unicode.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-unicode/devel/tetex-unicode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tetex-unicode.spec	10 Dec 2004 22:03:12 -0000	1.3
+++ tetex-unicode.spec	5 Mar 2005 19:43:17 -0000	1.4
@@ -1,7 +1,6 @@
-Name:           tetex-unicode
+Name:
 Version:        0
 Release:        2.20040307
-Epoch:          0
 Summary:        Unicode support for LaTeX
 
 Group:          Applications/Publishing
@@ -15,7 +14,7 @@
 Requires(post): tetex
 Requires(postun):  tetex
 
-Provides:       tetex-ucs = %{epoch}:%{version}-%{release}
+Provides:       tetex-ucs = %{version}-%{release}
 
 %define unicodepath %{_datadir}/texmf/tex/latex/unicode
 
@@ -51,7 +50,7 @@
 texhash %{_datadir}/texmf >/dev/null 2>&1
 
 
-%files 
+%files
 %defattr(644,root,root,755)
 %doc LICENSE VERSION README FAQ ucs.ps.gz languages.ps.gz
 %unicodepath



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tin/devel tin.spec,1.7,1.8
Message-ID: <200503051943.j25JhJ5o007595@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	tin.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tin.spec
===================================================================
RCS file: /cvs/extras/rpms/tin/devel/tin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tin.spec	10 Dec 2004 22:03:12 -0000	1.7
+++ tin.spec	5 Mar 2005 19:43:17 -0000	1.8
@@ -1,8 +1,7 @@
 Name: tin
 Version: 1.6.2
 Release: 2
-Epoch: 0
-Summary: A basic Internet news reader.
+Summary: Basic Internet news reader
 Group: Applications/Internet
 License: Distributable
 URL: http://www.tin.org/
@@ -10,7 +9,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel, byacc, desktop-file-utils, pcre-devel
 
-#---------------------------------------------------------------------
 
 %description
 Tin is a basic, easy to use Internet news reader.  Tin can read news
@@ -19,12 +17,10 @@
 
 Install tin if you need a basic news reader.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
 
-#---------------------------------------------------------------------
 
 %build
 %configure \
@@ -44,7 +40,6 @@
 %{__make} clean %{?_smp_mflags}
 %{__make} build %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/pcre"
 
-#---------------------------------------------------------------------
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -69,12 +64,10 @@
 # url_handler.sh conflicts with mutt
 %{__rm} -f $RPM_BUILD_ROOT/%{_bindir}/url_handler.sh
 
-#---------------------------------------------------------------------
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root)
@@ -89,7 +82,6 @@
 /usr/share/locale/*/*/*
 %{_datadir}/applications/*%{name}.desktop
 
-#---------------------------------------------------------------------
 
 %changelog
 * Thu Jun 24 2004 Adrian Reber <adrian at lisas.de> - 0:1.6.2-0.fdr.2
@@ -150,7 +142,7 @@
 - fix libdir=/var/lib/news (#7).
 - fix spooldir=/var/spool/news.
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
 - auto rebuild in the new build environment (release 3)
 
 * Tue Mar 09 1999 Preston Brown <pbrown at redhat.com>



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/wxPythonGTK2/devel wxPython.spec,1.5,1.6
Message-ID: <200503051955.j25JtulN008157@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	wxPython.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/wxPythonGTK2/devel/wxPython.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wxPython.spec	10 Feb 2005 19:02:14 -0000	1.5
+++ wxPython.spec	5 Mar 2005 19:55:54 -0000	1.6
@@ -5,8 +5,7 @@
 Name:           wxPythonGTK2
 Version:        2.4.2.4
 Release:        4
-Epoch:          0
-Summary:        wxPython is a GUI toolkit for the Python programming language.
+Summary:        GUI toolkit for the Python programming language
 
 Group:          Development/Languages
 License:        LGPL
@@ -14,19 +13,19 @@
 Source0:        http://dl.sf.net/wxpython/wxPythonSrc-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  wxGTK2-devel >= 0:2.4.2, pkgconfig
-BuildRequires:	zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
-BuildRequires:	python-devel, wxGTK2-gl
+BuildRequires:  wxGTK2-devel >= 2.4.2, pkgconfig
+BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
+BuildRequires:  python-devel, wxGTK2-gl
 Requires:       %{_bindir}/python%{pyver}
 
 # This is what other packages should depend on, NOT the package name!
-Provides:	wxPython = %{epoch}:%{version}-%{release}
+Provides:       wxPython = %{version}-%{release}
 
 %description
-wxPython is a GUI toolkit for the Python programming language. It allows 
+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 
+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
@@ -55,7 +54,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples 
+%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples
 %{_bindir}/*
 %{_libdir}/python%{pyver}/site-packages/wxPython
 %{_libdir}/python%{pyver}/site-packages/wx



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/ucl/devel ucl.spec,1.3,1.4
Message-ID: <200503051955.j25Jtuvp008106@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ucl.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ucl.spec
===================================================================
RCS file: /cvs/extras/rpms/ucl/devel/ucl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ucl.spec	10 Dec 2004 22:03:12 -0000	1.3
+++ ucl.spec	5 Mar 2005 19:55:54 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           ucl
 Version:        1.03
 Release:        1
-Epoch:          0
 Summary:        Portable lossless data compression library
 
 Group:          System Environment/Libraries
@@ -19,7 +18,7 @@
 %package        devel
 Summary:        UCL development files
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 %{summary}.



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/uqm/devel uqm.spec,1.4,1.5
Message-ID: <200503051955.j25Jtu6X008122@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	uqm.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: uqm.spec
===================================================================
RCS file: /cvs/extras/rpms/uqm/devel/uqm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- uqm.spec	11 Dec 2004 15:54:10 -0000	1.4
+++ uqm.spec	5 Mar 2005 19:55:54 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           uqm
 Version:        0.3
 Release:        3
-Epoch:          0
-Summary:        The Ur-Quan Masters
+Summary:        The Ur-Quan Masters, a port of the classic game Star Control II
 
 Group:          Amusements/Games
 License:        GPL
@@ -17,10 +16,10 @@
 Patch3:         %{name}-gcc34MM.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel >= 0:1.2.3, SDL_image-devel, SDL_mixer-devel
+BuildRequires:  SDL-devel >= 1.2.3, SDL_image-devel, SDL_mixer-devel
 BuildRequires:  libvorbis-devel, zlib-devel, perl, desktop-file-utils
 BuildRequires:  ImageMagick
-Requires:       %{name}-content >= 0:0.3
+Requires:       %{name}-content >= 0.3
 
 %description
 The Ur-Quan Masters is a port of the classic game Star Control II to



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/w3c-markup-validator/devel w3c-markup-validator.spec,1.2,1.3
Message-ID: <200503051955.j25Jtu6m008137@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/w3c-markup-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/w3c-markup-validator/devel

Modified Files:
	w3c-markup-validator.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- w3c-markup-validator.spec	10 Dec 2004 22:03:12 -0000	1.2
+++ w3c-markup-validator.spec	5 Mar 2005 19:55:54 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           w3c-markup-validator
 Version:        0.6.7
 Release:        1
-Epoch:          0
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -13,7 +12,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl
-Requires:       httpd, openjade >= 0:1.3.2, %{name}-libs = %{epoch}:%{version}
+Requires:       httpd, openjade >= 1.3.2, %{name}-libs = %{version}
 Obsoletes:      w3c-validator
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/vnc-ltsp-config/devel vnc-ltsp-config.spec,1.2,1.3
Message-ID: <200503051955.j25JtuE3008133@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/vnc-ltsp-config/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/vnc-ltsp-config/devel

Modified Files:
	vnc-ltsp-config.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: vnc-ltsp-config.spec
===================================================================
RCS file: /cvs/extras/rpms/vnc-ltsp-config/devel/vnc-ltsp-config.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vnc-ltsp-config.spec	10 Dec 2004 22:03:12 -0000	1.2
+++ vnc-ltsp-config.spec	5 Mar 2005 19:55:54 -0000	1.3
@@ -1,8 +1,6 @@
-
 Summary: Easy Enabler of VNC remote LTSP desktops
 Name:	 vnc-ltsp-config
-Epoch:	 0
-Version: 4.0 
+Version: 4.0
 Release: 2
 License: GPL
 Group: 	 User Interface/X
@@ -18,16 +16,16 @@
 # Xvnc default options
 Source3: vncts.sysconfig
 
-Requires: vnc-server >= 0:%{version}
+Requires: vnc-server >= %{version}
 Requires: xinetd
 
 Requires(preun): chkconfig
-Requires(post): perl 
-Requires(postun): perl 
+Requires(post): perl
+Requires(postun): perl
 
 %description
-Easy Enabler of VNC remote LTSP desktops.  This package contains xinetd.d 
-configurations that allow incoming VNC clients to open a new desktop session 
+Easy Enabler of VNC remote LTSP desktops.  This package contains xinetd.d
+configurations that allow incoming VNC clients to open a new desktop session
 with each connection.  Xvnc connects to the local server using XDMCP.
 
 
@@ -57,18 +55,18 @@
   cat %{_datadir}/vnc/vncts.services >> %{_sysconfdir}/services ||:
 fi
 
-%preun 
+%preun
 if [ $1 -eq 0 ]; then
   # turn off now, to avoid running in middle of uninstall
   /sbin/chkconfig vncts off ||:
 fi
 
-%postun 
+%postun
 if [ $1 -eq 0 ]; then
   ## cleanup services
   # method1: grep
   # grep -v -e '^vnc-............59../tcp' %{_sysconfdir}/services > %{_sysconfdir}/services.%{name} && \
-  #mv -f %{_sysconfdir}/services.%{name} %{_sysconfdir}/services 
+  #mv -f %{_sysconfdir}/services.%{name} %{_sysconfdir}/services
   # method2: perl
   perl -ni -e 'print if ! /^vnc-............59..\/tcp/' %{_sysconfdir}/services ||:
   # method3: sed ??



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/upx/devel upx.spec,1.4,1.5
Message-ID: <200503051955.j25JtuCe008117@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	upx.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: upx.spec
===================================================================
RCS file: /cvs/extras/rpms/upx/devel/upx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- upx.spec	17 Dec 2004 17:58:40 -0000	1.4
+++ upx.spec	5 Mar 2005 19:55:54 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           upx
 Version:        1.25
 Release:        2
-Epoch:          0
-Summary:        The Ultimate Packer for eXecutables
+Summary:        Ultimate Packer for eXecutables
 
 Group:          Applications/Archiving
 License:        GPL
@@ -12,7 +11,7 @@
 Patch1:         %{name}-nostrip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ucl-devel >= 0:1.01, perl
+BuildRequires:  ucl-devel >= 1.01, perl
 
 %description
 UPX is a free, portable, extendable, high-performance executable



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/util-vserver/devel util-vserver.spec,1.2,1.3
Message-ID: <200503051955.j25JtuDS008126@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/util-vserver/devel

Modified Files:
	util-vserver.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util-vserver.spec	3 Feb 2005 00:53:33 -0000	1.2
+++ util-vserver.spec	5 Mar 2005 19:55:54 -0000	1.3
@@ -21,7 +21,6 @@
 Name:		util-vserver
 Version:	0.30.203
 Release:	%release_func 1
-Epoch:		0
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -29,11 +28,11 @@
 Source1:	http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%name-%version.tar.bz2.asc
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
-Requires:	%name-core = %epoch:%version-%release
-Requires:	%name-lib  = %epoch:%version-%release
+Requires:	%name-core = %version-%release
+Requires:	%name-lib  = %version-%release
 Requires:	diffutils mktemp sed
-Provides:	vserver = %epoch:%version-%release
-Obsoletes:	vserver < %epoch:%version
+Provides:	vserver = %version-%release
+Obsoletes:	vserver < %version
 BuildRequires:	mount vconfig gawk iproute iptables
 BuildRequires:	gcc-c++ wget
 BuildRequires:	e2fsprogs-devel
@@ -57,7 +56,7 @@
 Summary:		Tools which can be used to build vservers
 Group:			Applications/System
 Requires:		rpm apt wget binutils tar e2fsprogs
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(pre):		%confdir
 Requires(postun):	%confdir
 
@@ -67,7 +66,7 @@
 Provides:		init(%name) = sysv
 Requires:		make diffutils
 Requires:		initscripts
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(post):		%chkconfig
 Requires(preun):	%chkconfig
 Requires(pre):		%_initrddir %pkglibdir
@@ -76,14 +75,14 @@
 %package legacy
 Summary:		Legacy utilities for util-vserver
 Group:			Applications/System
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(post):		%chkconfig
 Requires(preun):	%chkconfig
 Requires(pre):		%_initrddir %pkglibdir
 requires(postun):	%_initrddir %pkglibdir
 
 %package devel
-Summary:		Header-files and libraries which are needed to develop vserver based applications
+Summary:		Header-files and libraries needed to develop vserver based applications
 Group:			Development/Libraries
 Requires:		pkgconfig
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/wbxml2/devel wbxml2.spec,1.3,1.4
Message-ID: <200503051955.j25JtujZ008142@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	wbxml2.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/devel/wbxml2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wbxml2.spec	10 Dec 2004 22:03:12 -0000	1.3
+++ wbxml2.spec	5 Mar 2005 19:55:54 -0000	1.4
@@ -1,21 +1,20 @@
 Name:           wbxml2
 Version:        0.9.0
 Release:        2
-Epoch:          0
-Summary:        Library and tools to parse, encode and handle WBXML documents.
+Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://libwbxml.aymerick.com/
 Source0:        http://dl.sf.net/sourceforge/wbxmllib/wbxml2-0.9.0-src.tar.gz
-Patch0:		wbxml2-0.9.0-am_cflags.patch
+Patch0:         wbxml2-0.9.0-am_cflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  popt, expat-devel, zlib-devel
-BuildRequires:	libtool, automake, autoconf
+BuildRequires:  libtool, automake, autoconf
 
 %description
-The WBXML Library (aka libwbxml) contains a library and its associated tools 
+The WBXML Library (aka libwbxml) contains a library and its associated tools
 to Parse, Encode and Handle WBXML documents.
 
 The WBXML format is a binary representation of XML, defined by the Wap Forum,
@@ -26,7 +25,7 @@
 %package        devel
 Summary:        %{summary}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 This package contains the libraries, include files and documentation



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/wv/devel wv.spec,1.5,1.6
Message-ID: <200503051955.j25JtufA008153@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	wv.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/wv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wv.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ wv.spec	5 Mar 2005 19:55:54 -0000	1.6
@@ -2,7 +2,6 @@
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
 Version:    1.0.0
 Release:    3
-Epoch:      0
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
@@ -11,13 +10,13 @@
 Patch1:     wv-wvdvi-copy.patch
 Patch2:     wv-docbook-filename.patch
 # patch3: deal with filenames containing spaces
-Patch3:     wv-wvmime-tmp-filename.patch 
+Patch3:     wv-wvmime-tmp-filename.patch
 Patch4:     wv-field.c.patch
 
 #BuildRequires: XFree86-devel
 BuildRequires: glib2-devel
 BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel 
+BuildRequires: libpng-devel
 BuildRequires: libxml2-devel
 BuildRequires: ImageMagick-devel
 BuildRequires: pkgconfig
@@ -42,7 +41,7 @@
 
 %build
 %configure --with-exporter \
-           --with-libxml2 
+           --with-libxml2
 
 make %{?_smp_mflags}
 
@@ -51,7 +50,7 @@
 %makeinstall
 
 #ln -sf wvConvert $RPM_BUILD_ROOT/%{_bindir}/wvText
-mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_datadir} 
+mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_datadir}
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -exec rm -f {} \;
 
 %clean
@@ -64,7 +63,7 @@
 
 %files
 %defattr(-,root,root)
-%doc COPYING  README 
+%doc COPYING README
 %{_bindir}/wv*
 %{_datadir}/wv
 %{_includedir}/wv



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/ulogd/devel ulogd.spec,1.6,1.7
Message-ID: <200503051955.j25Jtuke008110@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ulogd.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ulogd.spec	28 Feb 2005 21:12:57 -0000	1.6
+++ ulogd.spec	5 Mar 2005 19:55:54 -0000	1.7
@@ -12,12 +12,12 @@
 Patch2:         ulogd-1.02-init.patch
 Patch3:         ulogd-1.02-pgsql.patch
 Patch4:         ulogd-1.21-x86_64.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(post):	initscripts, chkconfig
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(post): initscripts, chkconfig
 Requires(postun): initscripts, chkconfig
 BuildRequires:  mysql-devel
 BuildRequires:  postgresql-devel
-#BuildRequires:	libpcap-devel
+#BuildRequires:  libpcap-devel
 
 %description
 Ulogd is an universal logging daemon for the ULOG target of netfilter, the
@@ -53,7 +53,7 @@
 %build
 %configure --with-mysql --with-pgsql
 # Does not support parallel builds
-make 
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -78,14 +78,14 @@
 %post
 /sbin/chkconfig --add ulogd
 
-%preun 
-if [ "$1" = 0 ]; then 
+%preun
+if [ $1 -eq 0 ]; then
   /sbin/service ulogd stop > /dev/null 2>&1 ||:
-  /sbin/chkconfig --del ulogd 
+  /sbin/chkconfig --del ulogd
 fi
 
-%postun 
-if [ "$1" -ge "1" ]; then 
+%postun
+if [ $1 -ge 1 ]; then
   /sbin/service ulogd reload > /dev/null 2>&1 ||:
 fi
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/unison/devel unison.spec,1.4,1.5
Message-ID: <200503051955.j25Jtugu008113@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	unison.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: unison.spec
===================================================================
RCS file: /cvs/extras/rpms/unison/devel/unison.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unison.spec	24 Feb 2005 21:59:42 -0000	1.4
+++ unison.spec	5 Mar 2005 19:55:54 -0000	1.5
@@ -2,18 +2,17 @@
 Name:           unison
 Version:        2.10.2
 Release:        2
-Epoch:          0
 Summary:        Unison is a file-synchronization tool
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.cis.upenn.edu/~bcpierce/unison
 Source:         http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/unison-2.10.2/unison-2.10.2.tar.gz
-Source1:	unison.png
+Source1:        unison.png
 #Patch:          unison-uigtk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ocaml >= 0:3.08, lablgtk >= 0:2.4.0, tetex-latex
-BuildRequires:	desktop-file-utils
+BuildRequires:  ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex
+BuildRequires:  desktop-file-utils
 # for lablgtk
 BuildRequires:  gtk2-devel
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/whowatch/devel whowatch.spec,1.5,1.6
Message-ID: <200503051955.j25JtuJX008149@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	whowatch.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: whowatch.spec
===================================================================
RCS file: /cvs/extras/rpms/whowatch/devel/whowatch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- whowatch.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ whowatch.spec	5 Mar 2005 19:55:54 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           whowatch
 Version:        1.4
 Release:        2
-Epoch:          0
 Summary:        Displays informations about the users currently logged in
 
 Group:          Applications/System
@@ -9,7 +8,7 @@
 URL:            http://wizard.ae.krakow.pl/~mike/
 Source0:        http://wizard.ae.krakow.pl/~mike/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ncurses-devel 
+BuildRequires:  ncurses-devel
 
 %description
 Whowatch is an interactive console utility that displays informations about
@@ -38,7 +37,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO KEYS
 %{_bindir}/*
@@ -47,6 +46,7 @@
 %changelog
 * Mon Aug 25 2003 Nils O. Sel?sdal <NOS at Utel.no> - 0:1.4-0.fdr.1
 - Remove libncurses dependency, and libncurses-devel version dependency
+
 * Wed Aug 20 2003 Nils O. Sel?sdal <NOS at Utel.no> - 0:1.4-0.fdr.1
 - Initial release.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/uudeview/devel uudeview.spec,1.5,1.6
Message-ID: <200503051955.j25JtuEA008129@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	uudeview.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: uudeview.spec
===================================================================
RCS file: /cvs/extras/rpms/uudeview/devel/uudeview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- uudeview.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ uudeview.spec	5 Mar 2005 19:55:54 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           uudeview
 Version:        0.5.20
 Release:        4
-Epoch:          0
 License:        GPL
 Group:          Applications/File
 Source:         http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
@@ -24,7 +23,7 @@
 %package        -n uulib
 Summary:        Binary news message decoding library
 Group:          Development/Libraries
-Provides:       uulib-devel = %{epoch}:%{version}-%{release}
+Provides:       uulib-devel = %{version}-%{release}
 
 %description    -n uulib
 uulib is a library of functions for decoding uuencoded, xxencoded,
@@ -100,7 +99,7 @@
 
 * Tue May 06 2003 Adrian Reber <adrian at lisas.de> - 0:0.5.18-0.fdr.5
 - extended the patch uudeview-tempname.patch to fix and remove
-  all the remaining security warnings 
+  all the remaining security warnings
 
 * Tue May 06 2003 Adrian Reber <adrian at lisas.de> - 0:0.5.18-0.fdr.4
 - applied tempnam patch from Michael Schwendt to fix security
@@ -119,7 +118,7 @@
   ghostscript, transfig
 - changed Group to an official rpm group
 - added rm -rf RPM_BUILD_ROOT in install section and removed it from
-  prep section 
+  prep section
 - added _smp_mflags to make
 - removed directory doc from package
 - doc/library.tex is transformed to ps and pdf and added to package



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/wesnoth/devel wesnoth.spec,1.4,1.5
Message-ID: <200503051955.j25JtuVP008145@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	wesnoth.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wesnoth.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ wesnoth.spec	5 Mar 2005 19:55:54 -0000	1.5
@@ -1,25 +1,24 @@
 Name:           wesnoth
 Version:        0.8
 Release:        2
-Epoch:          0
-Summary:        Battle for Wesnoth is a fantasy turn-based strategy game.
+Summary:        Battle for Wesnoth, a fantasy turn-based strategy game
 
-Group:         	Amusements/Games
+Group:          Amusements/Games
 License:        GPL
 URL:            http://www.wesnoth.org
 Source0:        http://www.wesnoth.org/files/wesnoth-0.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, SDL_image-devel, SDL_mixer-devel
-BuildRequires:	SDL_ttf-devel, SDL_net-devel, freetype-devel
-BuildRequires:	desktop-file-utils
+BuildRequires:  SDL_ttf-devel, SDL_net-devel, freetype-devel
+BuildRequires:  desktop-file-utils
 
 %description
-%{summary}
+%{summary}.
 
-Battle for control of villages, using variety of units which have advantages 
-and disadvantages in different types of terrains and against different types 
-of attacks. Units gain experience and advance levels, and are carried over 
+Battle for control of villages, using variety of units which have advantages
+and disadvantages in different types of terrains and against different types
+of attacks. Units gain experience and advance levels, and are carried over
 from one scenario to the next campaign.
 
 %prep
@@ -28,10 +27,10 @@
 
 %build
 %configure --disable-dependency-tracking \
-	   --enable-server \
-	   --enable-editor
+           --enable-server \
+           --enable-editor
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -39,9 +38,9 @@
 %makeinstall
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-		     --mode="0644" --vendor fedora \
-		     --add-category="X-Fedora" icons/%{name}.desktop
-# add icon for menus		     
+                     --mode="0644" --vendor fedora \
+                     --add-category="X-Fedora" icons/%{name}.desktop
+# add icon for menus
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 install -m 644 images/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xmms-modplug/devel xmms-modplug.spec,1.4,1.5
Message-ID: <200503052007.j25K7BuF009214@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-modplug/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/xmms-modplug/devel

Modified Files:
	xmms-modplug.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xmms-modplug.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-modplug/devel/xmms-modplug.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmms-modplug.spec	10 Dec 2004 22:03:13 -0000	1.4
+++ xmms-modplug.spec	5 Mar 2005 20:07:09 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           xmms-modplug
 Version:        2.05
 Release:        1
-Epoch:          0
 Summary:        Modplug Plugin for XMMS
 
 License:        Public Domain
@@ -13,9 +12,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xmms-devel, gtk+-devel, gettext, libmodplug-devel >= 1:0.7
-BuildConflicts: %{name} < 0:2.0
+BuildConflicts: %{name} < 2.0
 Requires:       xmms
-Provides:       modplug-xmms = %{epoch}:%{version}-%{release}
+Provides:       modplug-xmms = %{version}-%{release}
 
 %description
 Modplug-XMMS is a fully featured, complete input plugin for XMMS which



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xca/devel xca.spec,1.4,1.5
Message-ID: <200503052007.j25K7BDc009190@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	xca.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xca.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ xca.spec	5 Mar 2005 20:07:09 -0000	1.5
@@ -4,7 +4,6 @@
 Name:		xca
 Version:	0.4.6
 Release:	1
-Epoch:		0
 License:	BSD
 Group:		Applications/Productivity
 URL:		http://www.hohnstaedt.de/xca.html
@@ -28,13 +27,11 @@
 can be imported and exported in several formats like PKCS#7, PKCS#12,
 PEM, DER, PKCS#8.
 
-#-----------------------
 
 %prep
 %setup -q
 %patch0 -p2 -b .gcc3
 
-#-----------------------
 
 %build
 test -n "$QTDIR" || . %{_sysconfdir}/profile.d/qt.sh
@@ -54,7 +51,6 @@
 ./configure
 %__make
 
-#-----------------------
 
 %install
 rm -rf "$RPM_BUILD_ROOT" _doc
@@ -70,12 +66,10 @@
   $RPM_BUILD_ROOT%{_datadir}/applications/xca.desktop
 %endif
 
-#-----------------------
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
-#-----------------------
 
 %files
 %defattr(-,root,root,-)
@@ -92,7 +86,6 @@
 %{_datadir}/applications/*
 %endif
 
-#-----------------------
 
 %changelog
 * Sat Dec 13 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.4.6-0.fdr.1
@@ -104,7 +97,7 @@
 - removed desktop patch which went upstream
 
 * Fri Aug 15 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:0.4.5-0.fdr.2
-- applied Ville Skytt??'s patch to add categories and to fix encoding of desktop-file 
+- applied Ville Skytt??'s patch to add categories and to fix encoding of desktop-file
   (http://sourceforge.net/tracker/index.php?func=detail&aid=789374&group_id=62274&atid=500027)
 - removed '--add-category ...' options which become obsoleted by this
   patch
@@ -150,5 +143,5 @@
 - added dbpriv patch
 - added desktop entry
 
-* Fri Jun  6 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 
+* Fri Jun  6 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xmms-alarm/devel xmms-alarm.spec,1.5,1.6
Message-ID: <200503052007.j25K7BNR009206@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-alarm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/xmms-alarm/devel

Modified Files:
	xmms-alarm.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xmms-alarm.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-alarm/devel/xmms-alarm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmms-alarm.spec	10 Dec 2004 22:03:13 -0000	1.5
+++ xmms-alarm.spec	5 Mar 2005 20:07:09 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           xmms-alarm
 Version:        0.3.6
 Release:        1
-Epoch:          0
 Summary:        xmms General plugin for using xmms as an alarm clock
 
 License:        GPL



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xmms-sid/devel xmms-sid.spec,1.5,1.6
Message-ID: <200503052007.j25K7BWS009218@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-sid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/xmms-sid/devel

Modified Files:
	xmms-sid.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xmms-sid.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-sid/devel/xmms-sid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmms-sid.spec	10 Nov 2004 04:05:42 -0000	1.5
+++ xmms-sid.spec	5 Mar 2005 20:07:09 -0000	1.6
@@ -4,7 +4,6 @@
 Name: xmms-sid
 Version: 0.7.4
 Release: 4
-Epoch: 0
 URL: http://www.tnsp.org/xmms-sid.php
 License: GPL
 Group: Applications/Multimedia
@@ -12,18 +11,18 @@
 Patch0: xmms-sid-0.7.4-cflags.patch
 Patch1: xmms-sid-0.7.4-gcc34.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: xmms >= 0:1.2.7
-BuildRequires: xmms-devel >= 0:1.2, libsidplay-devel >= 0:1.36.57
-BuildRequires: gtk+-devel >= 0:1.2.2, glib-devel >= 0:1.2.2
+Requires: xmms >= 1.2.7
+BuildRequires: xmms-devel >= 1.2, libsidplay-devel >= 1.36.57
+BuildRequires: gtk+-devel >= 1.2.2, glib-devel >= 1.2.2
 
 %description
 XMMS-SID is a plugin for XMMS (X MultiMedia System) which provides
 support for playing the so-called "SID tunes". For the actual playing,
 XMMS-SID uses the excellent libsidplay SID-chip/6502 emulator engine.
- 
+
 If you are not familiar with the term "SID tune" or "SID" concept at
 all, a short (yes it is! ;-) explanation follows:
- 
+
 SID is the sound chip that was used in many of the old 8-bit home
 computers manufactured by Commodore Inc. in 1980's. Best known of
 those was the Commodore 64 home computer (aka C64 or CBM64, also
@@ -35,33 +34,26 @@
 %patch1 -p1 -b .gcc34
 
 
-#---------------------------------------------------------------------
-
 %build
 %configure --libdir=%{xmms_inputdir}
 make %{?_smp_mflags}
-  
-#---------------------------------------------------------------------
+
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 rm -f %{buildroot}/%{xmms_inputdir}/*.la
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf %{buildroot}
 
-#---------------------------------------------------------------------
-
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO README.*
 %{xmms_inputdir}/*.so
 
-#---------------------------------------------------------------------
 
 %changelog
 * Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.7.4-4
@@ -74,5 +66,5 @@
 * Mon Apr 28 2003 Panu Matilainen <pmatilai at welho.com> 0:0.7.4-0.fdr.2
 - add missing Epoch's
 
-* Mon Mar 24 2003 Panu Matilainen <pmatilai at welho.com> 
+* Mon Mar 24 2003 Panu Matilainen <pmatilai at welho.com>
 - Initial Fedora packaging.



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:12 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:12 -0500
Subject: rpms/zoo/devel zoo.spec,1.4,1.5
Message-ID: <200503052007.j25K7CW8009244@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	zoo.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: zoo.spec
===================================================================
RCS file: /cvs/extras/rpms/zoo/devel/zoo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zoo.spec	10 Dec 2004 22:03:13 -0000	1.4
+++ zoo.spec	5 Mar 2005 20:07:10 -0000	1.5
@@ -1,8 +1,7 @@
-Name:    zoo
-Version: 2.10
-Release: 2
-Epoch:   0
-Summary: File archiving utility with compression
+Name:      zoo
+Version:   2.10
+Release:   2
+Summary:   File archiving utility with compression
 
 Group:     Applications/Archiving
 License:   Distributable
@@ -12,9 +11,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-zoo is a file archiving utility for maintaining collections of files. 
-It uses Lempel-Ziv compression to provide space savings in the 
-range of 20 to 80 percent depending on the type of data. Written by 
+zoo is a file archiving utility for maintaining collections of files.
+It uses Lempel-Ziv compression to provide space savings in the
+range of 20 to 80 percent depending on the type of data. Written by
 Rahul Dhesi, and posted to the USENET newsgroup comp.sources.misc.
 
 %prep



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xmlindent/devel xmlindent.spec,1.1,1.2
Message-ID: <200503052007.j25K7B5i009202@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	xmlindent.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xmlindent.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlindent/devel/xmlindent.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmlindent.spec	19 Feb 2005 11:53:53 -0000	1.1
+++ xmlindent.spec	5 Mar 2005 20:07:09 -0000	1.2
@@ -1,9 +1,9 @@
 # $Id$
+
 Name:           xmlindent
 Version:        0.2.17
 Release:        2
-Epoch:          0
-Summary:        A XML stream reformatter
+Summary:        XML stream reformatter
 
 Group:          Applications/Text
 License:        GPL



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xforms/devel xforms.spec,1.5,1.6
Message-ID: <200503052007.j25K7BWH009194@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	xforms.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xforms.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ xforms.spec	5 Mar 2005 20:07:09 -0000	1.6
@@ -1,19 +1,18 @@
 # $Id$
 
 # Since we're using xmkmf, we must match XFree86's notion of these
-%define _x11dir	/usr/X11R6
+%define _x11dir /usr/X11R6
 %define _prefix %{_x11dir}
 %define _mandir %{_prefix}/man
 
-Name:	 xforms
-Summary: An X11 toolkit library.
-Epoch:	 0
+Name:    xforms
+Summary: X11 toolkit library
 Version: 1.0
 Release: 2%{?dist_tag}
 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 
+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
 
 BuildRequires: XFree86-devel
@@ -31,14 +30,14 @@
 It has now gone Open Source (LGPL).
 
 %package devel
-Summary: Development files for the xforms toolkit.
+Summary: Development files for the xforms toolkit
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 # legacy versions included -designer/-static subpkgs
-Obsoletes: %{name}-designer < %{epoch}:%{version}-%{release}
-Provides:  %{name}-designer = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-static < %{epoch}:%{version}-%{release}
-Provides:  %{name}-static = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-designer < %{version}-%{release}
+Provides:  %{name}-designer = %{version}-%{release}
+Obsoletes: %{name}-static < %{version}-%{release}
+Provides:  %{name}-static = %{version}-%{release}
 %description devel
 This package contains development headers and libraries for %{name}.
 
@@ -47,7 +46,7 @@
 
 %prep
 
-%setup -q 
+%setup -q
 
 
 %build
@@ -55,14 +54,14 @@
 (unset RPM_OPT_FLAGS; xmkmf -a)
 
 make %{?_smp_mflags} \
-	CDEBUGFLAGS="$RPM_OPT_FLAGS" 
+    CDEBUGFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # makeinstall macro doesn't work for this pkg.
-make install install.man DESTDIR="$RPM_BUILD_ROOT" 
+make install install.man DESTDIR="$RPM_BUILD_ROOT"
 
 
 %clean
@@ -73,7 +72,7 @@
 %postun -p /sbin/ldconfig
 
 
-%files 
+%files
 %defattr(-,root,root)
 %doc *README Changes Copyright COPYING
 %{_libdir}/lib*.so.*



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xlhtml/devel xlhtml.spec,1.5,1.6
Message-ID: <200503052007.j25K7BUL009198@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	xlhtml.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xlhtml.spec
===================================================================
RCS file: /cvs/extras/rpms/xlhtml/devel/xlhtml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xlhtml.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ xlhtml.spec	5 Mar 2005 20:07:09 -0000	1.6
@@ -2,13 +2,12 @@
 Summary:        Excel 95/97 and PowerPoint to HTML converter
 Version:        0.5
 Release:        2
-Epoch:          0
 License:        GPL
 Group:          Applications/Text
 Source0:        http://dl.sf.net/chicago/xlhtml-%{version}.tgz
-URL:		http://chicago.sourceforge.net/xlhtml/
-BuildRequires:	autoconf
-BuildRequires:	automake
+URL:            http://chicago.sourceforge.net/xlhtml/
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -19,7 +18,7 @@
 
 
 %prep
-%setup -q 
+%setup -q
 
 %build
 aclocal



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xplanet/devel xplanet.spec,1.5,1.6
Message-ID: <200503052007.j25K7BGS009222@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	xplanet.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xplanet.spec
===================================================================
RCS file: /cvs/extras/rpms/xplanet/devel/xplanet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xplanet.spec	11 Dec 2004 12:49:45 -0000	1.5
+++ xplanet.spec	5 Mar 2005 20:07:09 -0000	1.6
@@ -1,8 +1,5 @@
-# %define _unpackaged_files_terminate_build	1
-
 Summary: Render a planetary image into an X window
 Name: xplanet
-Epoch: 0
 Version: 1.0.1
 Release: 5
 License: GPL
@@ -23,30 +20,25 @@
 planets may also be displayed. The Xplanet home page has links to
 locations with map files.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup
 %patch -p0
 
-#---------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install 
+make DESTDIR=%{buildroot} install
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf %{buildroot}
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root)
@@ -55,7 +47,6 @@
 %{_mandir}/man1/*
 %{_datadir}/xplanet
 
-#---------------------------------------------------------------------
 
 %changelog
 * Sun May 11 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.0.1-0.fdr.5



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/yap/devel yap.spec,1.2,1.3
Message-ID: <200503052007.j25K7B3w009231@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	yap.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: yap.spec
===================================================================
RCS file: /cvs/extras/rpms/yap/devel/yap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yap.spec	23 Feb 2005 03:27:57 -0000	1.2
+++ yap.spec	5 Mar 2005 20:07:09 -0000	1.3
@@ -1,18 +1,16 @@
-### Package needs review + approval.
 Name:		yap
 Version:	4.5.5
 Release:	1
-Epoch:		0
 Summary:	High-performance Prolog Compiler
 
 Group:		Development/Languages
 License:	Artistic/LGPL
 Source:		http://download.sourceforge.net/yap/Yap-4.5.5.tar.gz
-URL: 		http://www.ncc.up.pt/~vsc/Yap
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:		http://www.ncc.up.pt/~vsc/Yap
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gmp-devel
-Requires(post):	  /sbin/install-info
-Requires(postun): /sbin/install-info
+Requires(post):		/sbin/install-info
+Requires(postun):	/sbin/install-info
 
 %description
 A high-performance Prolog compiler developed at LIACC, Universidade do
@@ -43,7 +41,7 @@
 /sbin/install-info %{_infodir}/pillow_doc.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || :
 
 %postun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/yap.info %{_infodir}/dir 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/pillow_doc.info %{_infodir}/dir 2>/dev/null || :
 fi



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xmms-cdread/devel xmms-cdread.spec,1.4,1.5
Message-ID: <200503052007.j25K7B9U009210@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-cdread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/xmms-cdread/devel

Modified Files:
	xmms-cdread.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xmms-cdread.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-cdread/devel/xmms-cdread.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmms-cdread.spec	10 Dec 2004 22:03:13 -0000	1.4
+++ xmms-cdread.spec	5 Mar 2005 20:07:09 -0000	1.5
@@ -5,7 +5,6 @@
 Name:		xmms-cdread
 Version:	0.14
 Release: 	4.a
-Epoch:		0
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
@@ -15,44 +14,44 @@
 BuildRequires:	gtk+-devel glib-devel xmms-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
-#---------------------------------------------------------------------
+
 %description
 XMMS is a multimedia (Ogg Vorbis, CDs) player for the X Window System
 with an interface similar to Winamp's. XMMS supports playlists and
-streaming content and has a configurable interface. 
+streaming content and has a configurable interface.
 
 This is the input plugin needed to play audio CDs digitally, i.e. without a
 connecting cable between the CD drive and sound card.
 
-#---------------------------------------------------------------------
+
 %prep
 %setup -q -n %{name}-%{version}a
 %patch1 -p1 -b .shuffle
 
-#---------------------------------------------------------------------
+
 %build
 %configure --libdir=%{xmmsinputdir}
 perl -pi -e 's/^(CFLAGS.*)-O2(.*)/$1\$\(RPM_OPT_FLAGS\)$2/' Makefile
 make %{?_smp_mflags}
 
-#---------------------------------------------------------------------
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
-%files 
+
+%files
 %defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README TODO
 %{xmmsinputdir}/libcdread.so
 %exclude %{xmmsinputdir}/libcdread.la
 
-#---------------------------------------------------------------------
+
 %changelog
 * Mon Nov 24 2003 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.14-0.fdr.4.a
 - Add XMMS 1.2.8 compat.patch from Mandrake Contrib,



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xtide/devel xtide.spec,1.6,1.7
Message-ID: <200503052007.j25K7BQo009226@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	xtide.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xtide.spec	8 Jan 2005 23:07:00 -0000	1.6
+++ xtide.spec	5 Mar 2005 20:07:09 -0000	1.7
@@ -1,8 +1,7 @@
-Summary: A program for calculating tide all over the world
+Summary: Calculate tide all over the world
 Name: xtide
 Version: 2.8
 Release: 2
-Epoch: 0
 URL: http://www.flaterco.com/xtide/
 Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz
 Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz
@@ -17,9 +16,9 @@
 Buildrequires: desktop-file-utils
 Buildrequires: flex
 Buildrequires: bison
-Provides: xttpd = %{epoch}:%{version}-%{release}
+Provides: xttpd = %{version}-%{release}
 
-%description 
+%description
 XTide is a package that provides tide and current
 predictions in a wide variety of formats.  Graphs, text listings, and
 calendars can be generated, or a tide clock can be provided on your
@@ -129,7 +128,7 @@
 
 * Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:2.8-1
 - Updated to version 2.8
-- Cleaned up spec file because much of the tricks to get it to work 
+- Cleaned up spec file because much of the tricks to get it to work
   are no longer necessary.
 
 * Mon Dec  8 2003 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:2.6.4-0.fdr.4



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:12 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:12 -0500
Subject: rpms/zope/devel zope.spec,1.6,1.7
Message-ID: <200503052007.j25K7C7Q009252@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	zope.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- zope.spec	2 Mar 2005 21:39:57 -0000	1.6
+++ zope.spec	5 Mar 2005 20:07:10 -0000	1.7
@@ -10,15 +10,14 @@
 %define zopectl        %{_bindir}/zopectl
 %define runzope        %{_bindir}/runzope
 
-Name: 	 zope
+Name:    zope
 Summary: Web application server for flexible content management applications
-Epoch:	 0
 Version: 2.7.4
 Release: 1
 License: ZPL
-Group: 	 System Environment/Daemons
-URL:	 http://www.zope.org/
-Source:	 http://zope.org/Products/Zope/2.7.4/Zope-2.7.4-0.tgz
+Group:   System Environment/Daemons
+URL:     http://www.zope.org/
+Source:  http://zope.org/Products/Zope/2.7.4/Zope-2.7.4-0.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -29,8 +28,8 @@
 Source6: zope.logrotate.cron.in
 Patch0:  zope-2.7.3-config.patch
 
-BuildRequires: python-devel >= %{python_minver} 
-BuildRequires: python >= %{python_minver} 
+BuildRequires: python-devel >= %{python_minver}
+BuildRequires: python >= %{python_minver}
 Requires:      python >= %{python_minver}
 
 Requires(pre): /usr/sbin/useradd
@@ -59,7 +58,7 @@
   --with-python=%{__python} \
   --prefix=$RPM_BUILD_ROOT%{zope_home} \
   --optimize
-  
+
 #    --no-compile
 
 make %{?_smp_mflags}
@@ -147,7 +146,7 @@
 
 
 
-%files 
+%files
 %defattr(-, root, root, -)
 %doc %{zope_home}/doc
 %doc docs README.Fedora
@@ -218,7 +217,7 @@
 - drop patch 1, fixed upstream
 
 * Tue Aug 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.3
-- add hotfix from Zope.org: 
+- add hotfix from Zope.org:
   http://zope.org/Products/Zope/Hotfix-200400807/Hotfix-20040807-alert
 
 * Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.2
@@ -234,8 +233,8 @@
 - 2.7.1
 - move files created in %%post back into rpm.  Unowned files are bad.
 - make (theoretically) buildable for all rh73-rh90,fc1/2,el3
-  NOTE: lowerred python_minver to 2.2.2 to test builds, though (most) 
-  docs claim 2.3.3 is required.  (??) 
+  NOTE: lowerred python_minver to 2.2.2 to test builds, though (most)
+  docs claim 2.3.3 is required.  (??)
 - don't use Requires(preun,postun)
 - use %%_smp_mflags
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/plone/devel plone.spec,1.2,1.3
Message-ID: <200503052110.j25LAPbb011321@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	plone.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plone.spec	11 Feb 2005 12:06:21 -0000	1.2
+++ plone.spec	5 Mar 2005 21:10:23 -0000	1.3
@@ -11,7 +11,7 @@
 
 License:        GPL
 Group:          System Environment/Daemons
-URL:		http://www.plone.org/
+URL:            http://www.plone.org/
 Source0:        http://dl.sf.net/plone/Plone-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,7 +51,7 @@
 
 %files
 %defattr(644,root,root,755)
-%{software_home}/Products/* 
+%{software_home}/Products/*
 
 
 %changelog



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/php-mmcache/devel php-mmcache.spec,1.4,1.5
Message-ID: <200503052110.j25LAPHc011304@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-mmcache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/php-mmcache/devel

Modified Files:
	php-mmcache.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: php-mmcache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-mmcache/devel/php-mmcache.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-mmcache.spec	13 Jan 2005 18:19:10 -0000	1.4
+++ php-mmcache.spec	5 Mar 2005 21:10:23 -0000	1.5
@@ -24,10 +24,10 @@
 caching them in compiled state, so that the overhead of compiling is almost
 completely eliminated. Also it uses some optimizations to speed up execution
 of PHP scripts. Turck MMCache typically reduces server load and increases the
-speed of your PHP code by 1-10 times. 
+speed of your PHP code by 1-10 times.
 
 
-%prep 
+%prep
 %setup -n turck-mmcache-%{module_version}
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:26 -0500
Subject: rpms/pyzor/devel pyzor.spec,1.8,1.9
Message-ID: <200503052110.j25LAQvA011339@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	pyzor.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: pyzor.spec
===================================================================
RCS file: /cvs/extras/rpms/pyzor/devel/pyzor.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pyzor.spec	10 Feb 2005 03:09:32 -0000	1.8
+++ pyzor.spec	5 Mar 2005 21:10:24 -0000	1.9
@@ -18,17 +18,17 @@
 Requires:      python-abi = %{pyver}
 
 %description
-Pyzor is a collaborative, networked system to detect 
-and block spam using identifying digests of messages. 
-Pyzor is similar to Vipul's Razor except implemented 
+Pyzor is a collaborative, networked system to detect
+and block spam using identifying digests of messages.
+Pyzor is similar to Vipul's Razor except implemented
 in python, and using fully open source servers.
 
-Pyzor can be used either standalone, or to augment the 
-spam filtering ability of spamassassin.  spamassassin 
+Pyzor can be used either standalone, or to augment the
+spam filtering ability of spamassassin.  spamassassin
 is highly recommended.
 
 %prep
-%setup -q 
+%setup -q
 
 %build
 %__python setup.py build
@@ -41,7 +41,7 @@
 install -p -m755 build/scripts-%{pyver}/* $RPM_BUILD_ROOT%{_bindir}
 %__python -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'/%{python_sitelib}",10,"%{python_sitelib}")'
 %__python -O -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'/%{python_sitelib}",10,"%{python_sitelib}")'
-chmod -R a+rX $RPM_BUILD_ROOT/%{python_sitelib}/pyzor $RPM_BUILD_ROOT%{_bindir}/pyzor* 
+chmod -R a+rX $RPM_BUILD_ROOT/%{python_sitelib}/pyzor $RPM_BUILD_ROOT%{_bindir}/pyzor*
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:26 -0500
Subject: rpms/qcad/devel qcad.spec,1.4,1.5
Message-ID: <200503052110.j25LAQor011347@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	qcad.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: qcad.spec
===================================================================
RCS file: /cvs/extras/rpms/qcad/devel/qcad.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qcad.spec	14 Feb 2005 23:16:46 -0000	1.4
+++ qcad.spec	5 Mar 2005 21:10:24 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		qcad
 Version:	2.0.4.0
 Release:	2
-Summary:	A simple 2D CAD program
+Summary:	Simple 2D CAD program
 
 Group:		Applications/Engineering
 License:	GPL
@@ -12,7 +12,7 @@
 Patch2:		qcad-manual-bugs.patch
 URL:		http://www.ribbonsoft.com/qcad.html
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{subversion}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	qt-devel >= 0:3.1.2, python-devel, desktop-file-utils, xorg-x11-devel
+BuildRequires:	qt-devel >= 3.1.2, python-devel, desktop-file-utils, xorg-x11-devel
 # Help viewer is Qt Assistant in qt-devel package.
 #Requires:       /usr/bin/assistant
 Requires(post): desktop-file-utils



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/rrdtool/devel rrdtool.spec,1.6,1.7
Message-ID: <200503052110.j25LAQTD011359@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	rrdtool.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rrdtool.spec	31 Jan 2005 17:17:30 -0000	1.6
+++ rrdtool.spec	5 Mar 2005 21:10:24 -0000	1.7
@@ -14,12 +14,12 @@
 BuildRequires: libpng-devel, zlib-devel
 
 %description
-RRD is the Acronym for Round Robin Database. RRD is a system to store and 
-display time-series data (i.e. network bandwidth, machine-room temperature, 
-server load average). It stores the data in a very compact way that will not 
-expand over time, and it presents useful graphs by processing the data to 
-enforce a certain data density. It can be used either via simple wrapper 
-scripts (from shell or Perl) or via frontends that poll network devices and 
+RRD is the Acronym for Round Robin Database. RRD is a system to store and
+display time-series data (i.e. network bandwidth, machine-room temperature,
+server load average). It stores the data in a very compact way that will not
+expand over time, and it presents useful graphs by processing the data to
+enforce a certain data density. It can be used either via simple wrapper
+scripts (from shell or Perl) or via frontends that poll network devices and
 put a friendly user interface on it.
 
 
@@ -67,7 +67,7 @@
 %{__make} install DESTDIR="%{rrdtmpdir}"
 pushd contrib/php4
     ./configure \
-	--with-rrdtool="%{rrdtmpdir}%{_prefix}"
+        --with-rrdtool="%{rrdtmpdir}%{_prefix}"
     %{__make} %{?_smp_mflags}
 popd
 %{__rm} -rf %{rrdtmpdir}
@@ -116,7 +116,7 @@
 %clean
 %{__rm} -rf %{buildroot}
 
- 
+
 %files
 %defattr(-, root, root, 0755)
 %doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO doc2/doc



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:26 -0500
Subject: rpms/pybliographer/devel pybliographer.spec,1.5,1.6
Message-ID: <200503052110.j25LAQC0011331@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	pybliographer.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pybliographer.spec	3 Mar 2005 23:53:13 -0000	1.5
+++ pybliographer.spec	5 Mar 2005 21:10:24 -0000	1.6
@@ -9,18 +9,18 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-BuildRequires: pygtk2-libglade >= 0:2.0.0
-BuildRequires: gnome-python2 >= 0:2.0.0
-BuildRequires: gnome-python2-gconf >= 0:2.0.0
-BuildRequires: python-bibtex >= 0:1.1.93.1
+BuildRequires: pygtk2-libglade >= 2.0.0
+BuildRequires: gnome-python2 >= 2.0.0
+BuildRequires: gnome-python2-gconf >= 2.0.0
+BuildRequires: python-bibtex >= 1.1.93.1
 BuildRequires: gettext
 BuildRequires: scrollkeeper
 BuildRequires: desktop-file-utils
 
-Requires: pygtk2-libglade >= 0:2.0.0
-Requires: gnome-python2 >= 0:2.0.0
-Requires: gnome-python2-gconf >= 0:2.0.0
-Requires: python-bibtex >= 0:1.1.93.1
+Requires: pygtk2-libglade >= 2.0.0
+Requires: gnome-python2 >= 2.0.0
+Requires: gnome-python2-gconf >= 2.0.0
+Requires: python-bibtex >= 1.1.93.1
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/xemacs/devel xemacs.spec,1.1,1.2
Message-ID: <200503052110.j25LARmb011423@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	xemacs.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xemacs.spec	1 Mar 2005 22:11:36 -0000	1.1
+++ xemacs.spec	5 Mar 2005 21:10:25 -0000	1.2
@@ -1,4 +1,4 @@
-Summary: A different version of Emacs.
+Summary: Different version of Emacs
 Name: xemacs
 Version: 21.4.17
 Release: 2
@@ -35,7 +35,7 @@
 Requires: xemacs-sumo >= 20050118-2, xemacs-common = %{version}-%{release}
 Obsoletes: xemacs-extras xemacs-noX xemacs-X11 xemacs-mule xemacs-static
 
-%description 
+%description
 XEmacs is a highly customizable open source text editor and
 application development system. It is protected under the
 GNU General Public License and related to other versions of Emacs,
@@ -113,7 +113,7 @@
 %prep
 %setup -q
 
-## Lisp patches ## 
+## Lisp patches ##
 # make find-paths.el look in datadir
 rm lisp/find-paths.elc
 %patch10 -p1
@@ -312,7 +312,7 @@
 for file in xemacs cl internals lispref new-users-guide; do
   /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir
 done
- 
+
 %preun info
 if [ "$1" = "0" ]; then
   for file in xemacs cl internals lispref new-users-guide; do
@@ -378,7 +378,7 @@
 - Some specfile maintainablity improvements and cleanups.
 
 * Fri Feb 25 2005 Jens Petersen <petersen at redhat.com>
-- use PreReq not Requires(post,preun) for install and uninstall script 
+- use PreReq not Requires(post,preun) for install and uninstall script
   requirements (Axel Thimm, 147791)
 - use sed instead of perl to fixup filelists
 
@@ -607,7 +607,7 @@
 - update to 21.4.12 bugfix release (21.4 series now declared stable branch)
 - renumbered sumo package patches to be greater than 100
 - install sumo packages by copying rather than moving
-- patch sh-script.el to append m?spec entry to auto-mode-alist 
+- patch sh-script.el to append m?spec entry to auto-mode-alist
 - avoid ppc.ldscript and build on ppc
 - remove games that we shouldn't ship
 - update to latest rcs2log
@@ -706,7 +706,7 @@
 - uncomment deactivate-mark in simple.el (#77696)
 
 * Mon Aug 26 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-16
-- some cleanups - and remove the info tarball, it's now part 
+- some cleanups - and remove the info tarball, it's now part
   of the base tarball. Wow, the package gets smaller. (#72480)
 
 * Mon Aug 19 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-15
@@ -717,7 +717,7 @@
 - Make it not segfault when handling utf-8 (#71589)
 
 * Wed Aug  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-13
-- Add openmotif-devel to buildrequires, as it will use it for widgets 
+- Add openmotif-devel to buildrequires, as it will use it for widgets
   if it finds it
 
 * Fri Aug  2 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-12
@@ -758,7 +758,7 @@
 - 21.4.8
 
 * Tue May  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-9
-- Rebuild... chmod -x pstogif to work around an rpm bug until 
+- Rebuild... chmod -x pstogif to work around an rpm bug until
   it's fixed (#64320)
 
 * Tue Apr 23 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-8



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/vpnc/devel vpnc.spec,1.3,1.4
Message-ID: <200503052110.j25LARtp011411@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	vpnc.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vpnc.spec	6 Jan 2005 09:07:08 -0000	1.3
+++ vpnc.spec	5 Mar 2005 21:10:25 -0000	1.4
@@ -12,8 +12,8 @@
 Patch1:         vpnc-0.3.2-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgcrypt-devel > 0:1.1.90
-Requires:       kernel >= 0:2.4
+BuildRequires:  libgcrypt-devel > 1.1.90
+Requires:       kernel >= 2.4
 
 %description
 A VPN client compatible with Cisco's EasyVPN equipment.
@@ -22,7 +22,7 @@
 shared-secret IPSec authentication, 3DES, MD5, and IP tunneling.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
 %patch1 -p1
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/vnstat/devel vnstat.spec,1.1,1.2
Message-ID: <200503052110.j25LARBs011407@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	vnstat.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: vnstat.spec
===================================================================
RCS file: /cvs/extras/rpms/vnstat/devel/vnstat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vnstat.spec	1 Mar 2005 18:37:42 -0000	1.1
+++ vnstat.spec	5 Mar 2005 21:10:25 -0000	1.2
@@ -1,13 +1,13 @@
-Summary: 	Console-based network traffic monitor
-Name: 		vnstat
-Version: 	1.4
-Release: 	3
-License: 	GPL
-Group: 		System Environment/Daemons
-URL: 		http://humdi.net/vnstat/
-Source0: 	http://humdi.net/vnstat/vnstat-%{version}.tar.gz
-Source1: 	FAQ.vnstat
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:	Console-based network traffic monitor
+Name:		vnstat
+Version:	1.4
+Release:	3
+License:	GPL
+Group:		System Environment/Daemons
+URL:		http://humdi.net/vnstat/
+Source0:	http://humdi.net/vnstat/vnstat-%{version}.tar.gz
+Source1:	FAQ.vnstat
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 vnStat is a console-based network traffic monitor that uses the



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:26 -0500
Subject: rpms/python-sqlite/devel python-sqlite.spec,1.2,1.3
Message-ID: <200503052110.j25LAQsQ011335@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-sqlite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/python-sqlite/devel

Modified Files:
	python-sqlite.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: python-sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite/devel/python-sqlite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-sqlite.spec	14 Jan 2005 20:15:08 -0000	1.2
+++ python-sqlite.spec	5 Mar 2005 21:10:24 -0000	1.3
@@ -14,7 +14,7 @@
 
 BuildRequires:  python
 BuildRequires:  python-devel
-BuildRequires:  sqlite-devel 
+BuildRequires:  sqlite-devel
 
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/qtparted/devel qtparted.spec,1.5,1.6
Message-ID: <200503052110.j25LAQID011355@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	qtparted.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qtparted.spec	4 Mar 2005 00:05:42 -0000	1.5
+++ qtparted.spec	5 Mar 2005 21:10:24 -0000	1.6
@@ -15,7 +15,7 @@
 Patch0:         %{name}-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel >= 1:3.1.0, parted-devel >= 0:1.6.6, XFree86-devel
+BuildRequires:  qt-devel >= 1:3.1.0, parted-devel >= 1.6.6, XFree86-devel
 BuildRequires:  desktop-file-utils, qt-designer, e2fsprogs-devel, jfsutils
 BuildRequires:  zlib-devel, libjpeg-devel, xfsprogs
 Requires:       usermode-gtk, e2fsprogs, jfsutils, xfsprogs



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/udftools/devel udftools.spec,1.1,1.2
Message-ID: <200503052110.j25LARBE011399@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	udftools.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: udftools.spec
===================================================================
RCS file: /cvs/extras/rpms/udftools/devel/udftools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udftools.spec	9 Feb 2005 10:20:01 -0000	1.1
+++ udftools.spec	5 Mar 2005 21:10:25 -0000	1.2
@@ -20,7 +20,7 @@
 
 
 %build
-%configure 
+%configure
 %{__make} %{_smp_mflags}
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/synaptic/devel synaptic.spec,1.9,1.10
Message-ID: <200503052110.j25LAQhs011383@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	synaptic.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- synaptic.spec	4 Mar 2005 21:00:23 -0000	1.9
+++ synaptic.spec	5 Mar 2005 21:10:24 -0000	1.10
@@ -1,5 +1,4 @@
-
-%define	desktop_vendor	fedora
+%define desktop_vendor fedora
 
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
@@ -16,7 +15,7 @@
 Requires: yelp
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
-BuildRequires: apt-devel >= 0:0.5.4, rpm-devel >= 0:4.0
+BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0
 BuildRequires: gtk2-devel, libglade2-devel, desktop-file-utils
 BuildRequires: libstdc++-devel, gettext
 BuildRequires: xmlto, perl-XML-Parser
@@ -25,14 +24,14 @@
 
 %description
 Synaptic is a graphical package management
-program for apt. It provides the same features as the apt-get command line 
+program for apt. It provides the same features as the apt-get command line
 utility with a GUI front-end based on Gtk+
 
 %prep
 %setup -q
 
 %build
-%configure 
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -176,7 +175,7 @@
 
 * Thu Oct 23 2003 Panu Matilainen <pmatilai at welho.com> 0.45-0.fdr.1
 - update to 0.45
-- support FC release naming 
+- support FC release naming
 
 * Thu Sep 25 2003 Panu Matilainen <pmatilai at welho.com> 0.44-0.fdr.1
 - update to 0.44
@@ -195,7 +194,7 @@
 * Sat Aug 02 2003 Panu Matilainen <pmatilai at welho.com> 0.40-0.fdr.1
 - address issues in #313 / 13
 
-* Wed Jul 30 2003 Panu Matilainen <pmatilai at welho.com> 
+* Wed Jul 30 2003 Panu Matilainen <pmatilai at welho.com>
 - update to 0.40
 - drop gtk requirement from 2.2 to 2.0
 
@@ -207,7 +206,7 @@
 - automatically pick up rh version
 - drop patches (merged upstream)
 
-* Tue May 27 2003 Panu Matilainen <pmatilai at welho.com> 
+* Tue May 27 2003 Panu Matilainen <pmatilai at welho.com>
 - patch to make it build with GTK 2.0
 
 * Sat May 24 2003 Panu Matilainen <pmatilai at welho.com> 0.36.1-0.fdr.3
@@ -216,7 +215,7 @@
 * Fri May 16 2003 Panu Matilainen <pmatilai at welho.com> 0.36.1-0.fdr.2
 - missing buildrequires: gettext
 
-* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com> 
+* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com>
 - add sources.list.d support
 
 * Tue Apr 22 2003 Panu Matilainen <pmatilai at welho.com> 0.36.1-0.fdr.1



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:26 -0500
Subject: rpms/portaudio/devel portaudio.spec,1.2,1.3
Message-ID: <200503052110.j25LAQ52011325@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	portaudio.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: portaudio.spec
===================================================================
RCS file: /cvs/extras/rpms/portaudio/devel/portaudio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- portaudio.spec	16 Nov 2004 18:04:28 -0000	1.2
+++ portaudio.spec	5 Mar 2005 21:10:23 -0000	1.3
@@ -1,6 +1,3 @@
-# $Id$
-# Upstream: <portaudio$techweb,rfa,org>
-
 %define real_version v18_1
 
 Summary: Free, cross platform, open-source, audio I/O library
@@ -22,7 +19,7 @@
 
 
 %prep
-%setup -n %{name}_%{real_version} 
+%setup -n %{name}_%{real_version}
 %{__perl} -pi.orig -e 's|^(LIBINST) = /usr/local/lib|$1 = %{_libdir}|' \
     Makefile.linux
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/skencil/devel skencil.spec,1.2,1.3
Message-ID: <200503052110.j25LAQf9011371@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	skencil.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: skencil.spec
===================================================================
RCS file: /cvs/extras/rpms/skencil/devel/skencil.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- skencil.spec	22 Feb 2005 22:19:14 -0000	1.2
+++ skencil.spec	5 Mar 2005 21:10:24 -0000	1.3
@@ -1,13 +1,13 @@
 Name:           skencil
 Version:        0.6.16
 Release:        2
-Summary:        A vector drawing program
+Summary:        Vector drawing program
 
 Group:          Applications/Multimedia
 License:        LGPL, GPL, Historical Permission Notice and Disclaimer
 URL:            http://www.skencil.org
 Source0:        http://dl.sf.net/sketch/skencil-0.6.16.tar.gz
-Source1:	skencil-logo.png
+Source1:        skencil-logo.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, python-imaging-devel, PyXML
@@ -118,6 +118,6 @@
 - Add mkfontdb.py.
 - Remove --imaging-include switch, folder is autodetected.
 
-* Sun Feb 29 2004 Axel Thimm <Axel.Thimm at physik.fu-berlin.de> 
+* Sun Feb 29 2004 Axel Thimm <Axel.Thimm at physik.fu-berlin.de>
 - Initial build.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/xemacs-sumo/devel xemacs-sumo.spec,1.1,1.2
Message-ID: <200503052110.j25LASgv011428@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/xemacs-sumo/devel

Modified Files:
	xemacs-sumo.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xemacs-sumo.spec	1 Mar 2005 22:31:04 -0000	1.1
+++ xemacs-sumo.spec	5 Mar 2005 21:10:26 -0000	1.2
@@ -7,7 +7,7 @@
 License: GPL
 Group: Applications/Editors
 Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2
-Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo_ver}.tar.bz2 
+Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo_ver}.tar.bz2
 Source10: Emacs.ad.ja_JP.eucJP
 Source11: Emacs.ad.ko_KR.eucKR
 Source12: Emacs.ad.zh_CN.GB2312
@@ -329,7 +329,7 @@
 - update to 21.4.12 bugfix release (21.4 series now declared stable branch)
 - renumbered sumo package patches to be greater than 100
 - install sumo packages by copying rather than moving
-- patch sh-script.el to append m?spec entry to auto-mode-alist 
+- patch sh-script.el to append m?spec entry to auto-mode-alist
 - avoid ppc.ldscript and build on ppc
 - remove games that we shouldn't ship
 - update to latest rcs2log
@@ -428,7 +428,7 @@
 - uncomment deactivate-mark in simple.el (#77696)
 
 * Mon Aug 26 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-16
-- some cleanups - and remove the info tarball, it's now part 
+- some cleanups - and remove the info tarball, it's now part
   of the base tarball. Wow, the package gets smaller. (#72480)
 
 * Mon Aug 19 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-15
@@ -439,7 +439,7 @@
 - Make it not segfault when handling utf-8 (#71589)
 
 * Wed Aug  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-13
-- Add openmotif-devel to buildrequires, as it will use it for widgets 
+- Add openmotif-devel to buildrequires, as it will use it for widgets
   if it finds it
 
 * Fri Aug  2 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-12
@@ -480,7 +480,7 @@
 - 21.4.8
 
 * Tue May  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-9
-- Rebuild... chmod -x pstogif to work around an rpm bug until 
+- Rebuild... chmod -x pstogif to work around an rpm bug until
   it's fixed (#64320)
 
 * Tue Apr 23 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-8



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:26 -0500
Subject: rpms/qemu/devel qemu.spec,1.2,1.3
Message-ID: <200503052110.j25LAQVn011351@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	qemu.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qemu.spec	13 Feb 2005 16:08:11 -0000	1.2
+++ qemu.spec	5 Mar 2005 21:10:24 -0000	1.3
@@ -26,7 +26,7 @@
    a processor and various peripherials. Currently, it is only used to launch
    an x86 Linux kernel on an x86 Linux system. It enables easier testing and
    debugging of system code. It can also be used to provide virtual hosting
-   of several virtual PC on a single server. 
+   of several virtual PC on a single server.
 
 As QEMU requires no host kernel patches to run, it is very safe and easy to use.
 
@@ -47,8 +47,8 @@
 	mandir="${RPM_BUILD_ROOT}%{_mandir}" \
 	docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \
 	datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install
-	
-install -D $RPM_SOURCE_DIR/qemu.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu 
+
+install -D $RPM_SOURCE_DIR/qemu.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,7 +65,7 @@
 %files
 %defattr(-,root,root)
 %doc Changelog README README.distrib TODO
-%doc qemu-tech.texi qemu-doc.texi 
+%doc qemu-tech.texi qemu-doc.texi
 %doc linux-2.6-qemu-fast.patch *.html
 %{_bindir}/qemu*
 %{_prefix}/share/qemu



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:26 -0500
Subject: rpms/qa-assistant/devel qa-assistant.spec,1.3,1.4
Message-ID: <200503052110.j25LAQnq011343@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/qa-assistant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/qa-assistant/devel

Modified Files:
	qa-assistant.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: qa-assistant.spec
===================================================================
RCS file: /cvs/extras/rpms/qa-assistant/devel/qa-assistant.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qa-assistant.spec	4 Mar 2005 00:05:42 -0000	1.3
+++ qa-assistant.spec	5 Mar 2005 21:10:24 -0000	1.4
@@ -18,7 +18,7 @@
 BuildRequires:  desktop-file-utils
 # Needed to get xmlcatalog
 BuildRequires:  libxml2
-BuildRequires:	pygtk2-devel >= 0:2.2.0
+BuildRequires:	pygtk2-devel >= 2.2.0
 BuildRequires:	pkgconfig
 BuildRequires:	gtk2-devel
 BuildRequires:	gnome-python2
@@ -28,7 +28,7 @@
 Requires:	python-abi = %{pyver}
 Requires:	libxml2-python
 Requires:	gnome-python2
-Requires:	pygtk2 >= 0:2.2.0
+Requires:	pygtk2 >= 2.2.0
 Requires:	rpm-python
 Requires(post): /usr/bin/xmlcatalog
 Requires(postun): /usr/bin/xmlcatalog



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/shapelib/devel shapelib.spec,1.3,1.4
Message-ID: <200503052110.j25LAQts011367@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	shapelib.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: shapelib.spec
===================================================================
RCS file: /cvs/extras/rpms/shapelib/devel/shapelib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- shapelib.spec	5 Mar 2005 19:28:28 -0000	1.3
+++ shapelib.spec	5 Mar 2005 21:10:24 -0000	1.4
@@ -10,7 +10,7 @@
 License: LGPL/MIT
 Group: Development/Libraries
 Buildrequires: libtool
-BuildRequires: proj-devel >= 0:4.4.1
+BuildRequires: proj-devel >= 4.4.1
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %package devel



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/wv/devel wv.spec,1.6,1.7
Message-ID: <200503052110.j25LARlZ011415@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	wv.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/wv.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wv.spec	5 Mar 2005 19:55:54 -0000	1.6
+++ wv.spec	5 Mar 2005 21:10:25 -0000	1.7
@@ -21,8 +21,8 @@
 BuildRequires: ImageMagick-devel
 BuildRequires: pkgconfig
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:   wvware = %{epoch}:%{version}-%{release}
-Provides:   wv-devel = %{epoch}:%{version}-%{release}
+Provides:   wvware = %{version}-%{release}
+Provides:   wv-devel = %{version}-%{release}
 
 %description
 Wv is a program that understands the Microsoft Word 6/7/8/9



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/php-pecl-sqlite/devel php-pecl-sqlite.spec,1.3,1.4
Message-ID: <200503052110.j25LAPI0011316@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-pecl-sqlite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/php-pecl-sqlite/devel

Modified Files:
	php-pecl-sqlite.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: php-pecl-sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-sqlite/devel/php-pecl-sqlite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pecl-sqlite.spec	16 Feb 2005 12:42:07 -0000	1.3
+++ php-pecl-sqlite.spec	5 Mar 2005 21:10:23 -0000	1.4
@@ -21,7 +21,7 @@
 This extension allows you to access SQLite databases from within PHP.
 
 
-%prep 
+%prep
 %setup -n SQLite-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/php-pecl-mailparse/devel php-pecl-mailparse.spec,1.4,1.5
Message-ID: <200503052110.j25LAPkJ011311@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-pecl-mailparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/php-pecl-mailparse/devel

Modified Files:
	php-pecl-mailparse.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: php-pecl-mailparse.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-mailparse/devel/php-pecl-mailparse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pecl-mailparse.spec	16 Feb 2005 13:49:36 -0000	1.4
+++ php-pecl-mailparse.spec	5 Mar 2005 21:10:23 -0000	1.5
@@ -20,7 +20,7 @@
 It can deal with rfc822 and rfc2045 (MIME) compliant messages.
 
 
-%prep 
+%prep
 %setup -a 1 -n mailparse-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/unrtf/devel unrtf.spec,1.4,1.5
Message-ID: <200503052110.j25LARcO011403@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	unrtf.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: unrtf.spec
===================================================================
RCS file: /cvs/extras/rpms/unrtf/devel/unrtf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unrtf.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ unrtf.spec	5 Mar 2005 21:10:25 -0000	1.5
@@ -11,7 +11,7 @@
 %description
 UnRTF is a moderately complicated converter from RTF to other
 formats, including HTML, LaTeX, text, and PostScript. Converting
-to HTML, it supports tables, fonts, colors, embedded images, 
+to HTML, it supports tables, fonts, colors, embedded images,
 hyperlinks, paragraph alignment among other things. All other
 conversions are "alpha"--just begun.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/sylpheed/devel sylpheed.spec,1.2,1.3
Message-ID: <200503052110.j25LAQxQ011379@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	sylpheed.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sylpheed.spec	4 Mar 2005 23:51:10 -0000	1.2
+++ sylpheed.spec	5 Mar 2005 21:10:24 -0000	1.3
@@ -225,7 +225,7 @@
 
 * Fri Jan 12 2001 Tim Powers <timp at redhat.com>
 - updated to 0.4.52
- 
+
 * Thu Nov 16 2000 Tim Powers <timp at redhat.com>
 - update to 0.4.4
 - built for Powertools 7.1
@@ -236,30 +236,30 @@
 - use %%configure and %%makeinstall as well as other predefined RPM
   macros whenever possible
 
-* Wed Aug 30 2000 Yukihiro Nakai <ynakai at redhat.com> 
-- Rebuild on Red Hat Linux 7.0 
- 
-* Tue Aug 29 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.28 
- 
-* Fri Aug 25 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.27 
- 
-* Sat Aug 19 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.26, and modified URL 
- 
-* Thu Aug 10 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.25 
- 
-* Fri Aug 4 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.24 
- 
-* Sat Jul 24 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.23 
- 
-* Sat Jul 20 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.22 
- 
-* Sun Jul 4 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.21, and modified Summary 
+* Wed Aug 30 2000 Yukihiro Nakai <ynakai at redhat.com>
+- Rebuild on Red Hat Linux 7.0
+
+* Tue Aug 29 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.28
+
+* Fri Aug 25 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.27
+
+* Sat Aug 19 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.26, and modified URL
+
+* Thu Aug 10 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.25
+
+* Fri Aug 4 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.24
+
+* Sat Jul 24 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.23
+
+* Sat Jul 20 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.22
+
+* Sun Jul 4 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.21, and modified Summary
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/scribus-templates/devel scribus-templates.spec,1.4,1.5
Message-ID: <200503052110.j25LAQcu011363@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/scribus-templates/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/scribus-templates/devel

Modified Files:
	scribus-templates.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: scribus-templates.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus-templates/devel/scribus-templates.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scribus-templates.spec	9 Feb 2005 02:03:15 -0000	1.4
+++ scribus-templates.spec	5 Mar 2005 21:10:24 -0000	1.5
@@ -1,7 +1,7 @@
 Name:           scribus-templates
 Version:        1.2.1
 Release:        1
-Summary:        This package includes additional templates for Scribus.
+Summary:        Additional templates for Scribus
 
 Group:          Applications/Productivity
 License:        GPL
@@ -19,7 +19,7 @@
 
 
 %prep
-%setup -q 
+%setup -q
 
 
 %build



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/synce/devel synce.spec,1.1,1.2
Message-ID: <200503052110.j25LARXa011387@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	synce.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: synce.spec
===================================================================
RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synce.spec	8 Dec 2004 15:47:19 -0000	1.1
+++ synce.spec	5 Mar 2005 21:10:24 -0000	1.2
@@ -1,4 +1,4 @@
-Summary: SynCE: Serial connection support for Pocket PC devices
+Summary: Serial connection support for Pocket PC devices
 Name: synce
 Version: 0.9.0
 Release: 1
@@ -12,9 +12,8 @@
 Source5: libmimedir-0.3.tar.gz
 Patch0: synce-rra-0.9.0-ambiguous.patch
 URL: http://synce.sourceforge.net/
-Distribution: Fedora Core
 Requires: ppp
-BuildRoot: /var/tmp/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 The purpose of the SynCE project is to provide a means of
@@ -89,7 +88,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for module in libsynce dccm librapi2 rra serial ; do 
+for module in libsynce dccm librapi2 rra serial ; do
     cd synce-${module}-%{version}
     %makeinstall
     cd ..



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/torcs/devel torcs.spec,1.4,1.5
Message-ID: <200503052110.j25LARn2011395@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	torcs.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- torcs.spec	10 Feb 2005 00:04:29 -0000	1.4
+++ torcs.spec	5 Mar 2005 21:10:25 -0000	1.5
@@ -22,7 +22,7 @@
 %description
 TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
 programmed robots drivers racing against each others.  You can also drive
-yourself with either a wheel, keyboard or mouse. 
+yourself with either a wheel, keyboard or mouse.
 
 
 %package robots



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/wxGTK/devel wxGTK.spec,1.8,1.9
Message-ID: <200503052110.j25LARHY011419@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	wxGTK.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wxGTK.spec	23 Jan 2005 19:36:58 -0000	1.8
+++ wxGTK.spec	5 Mar 2005 21:10:25 -0000	1.9
@@ -352,7 +352,7 @@
 - Now build/include both gtk/gtk2 libs
 - buildroot -> RPM_BUILD_ROOT
 
-* Mon Mar  3 2003 Dams <anvil at livna.org> 
+* Mon Mar  3 2003 Dams <anvil at livna.org>
 - Initial build.
 - Disable unicode as it breaks lmule
 - use the %find_lang macro for locale



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/tktable/devel tktable.spec,1.7,1.8
Message-ID: <200503052110.j25LARKe011391@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	tktable.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: tktable.spec
===================================================================
RCS file: /cvs/extras/rpms/tktable/devel/tktable.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tktable.spec	5 Mar 2005 19:43:17 -0000	1.7
+++ tktable.spec	5 Mar 2005 21:10:25 -0000	1.8
@@ -6,7 +6,7 @@
 Group: Development/Libraries
 Source: http://download.sourceforge.net/tktable/Tktable2.9.tar.gz
 URL: http://tktable.sourceforge.net/
-BuildRequires: XFree86-devel >= 0:4, tk >= 0:8.3.1
+BuildRequires: XFree86-devel >= 4, tk >= 8.3.1
 # work around tcl-devel and tk-devel packages non existence in RH 8.0 and 9:
 BuildRequires: %{_includedir}/tk.h, %{_includedir}/tcl.h
 Requires: tk >= 8.3.1



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/Hermes/devel Hermes.spec,1.6,1.7
Message-ID: <200503052110.j25LAM1K010699@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	Hermes.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: Hermes.spec
===================================================================
RCS file: /cvs/extras/rpms/Hermes/devel/Hermes.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Hermes.spec	28 Feb 2005 21:12:57 -0000	1.6
+++ Hermes.spec	5 Mar 2005 21:10:20 -0000	1.7
@@ -1,8 +1,7 @@
 Name:           Hermes
 Version:        1.3.3
 Release:        6
-Epoch:		0
-Summary:        HERMES pixel format conversion library.
+Summary:        Pixel format conversion library
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -12,9 +11,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # we need depcomp, it's symlinked instead of copied
-BuildRequires:	automake
+BuildRequires:  automake
 # sigh, it's in maintainer mode
-BuildRequires:	autoconf
+BuildRequires:  autoconf
 
 %description
 HERMES is a library designed to convert a source buffer with a specified pixel
@@ -33,7 +32,7 @@
 %package        devel
 Summary:        Static libraries and header files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains the static libraries and header files



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/amarok/devel amarok.spec,1.7,1.8
Message-ID: <200503052110.j25LAMYE010766@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	amarok.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- amarok.spec	3 Mar 2005 21:26:02 -0000	1.7
+++ amarok.spec	5 Mar 2005 21:10:20 -0000	1.8
@@ -1,4 +1,4 @@
-# Rebuild switch: 
+# Rebuild switch:
 #  --with xine    Enables xine engine
 #
 
@@ -9,7 +9,7 @@
 Version:    1.2
 Release:    2
 
-Group: 	    Applications/Multimedia
+Group:      Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 Source0:    http://dl.sf.net/amarok/amarok-1.2.tar.bz2
@@ -24,7 +24,7 @@
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 
 %if  0%{?use_xine}
-BuildRequires:  xine-lib-devel >= 0:1.0.0
+BuildRequires:  xine-lib-devel >= 1.0.0
 BuildRequires:  libmad-devel
 %endif
 
@@ -95,7 +95,7 @@
 
 %install
 rm -fr $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT 
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # desktop files
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/SDL_ttf/devel SDL_ttf.spec,1.4,1.5
Message-ID: <200503052110.j25LAMX6010720@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	SDL_ttf.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: SDL_ttf.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_ttf/devel/SDL_ttf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SDL_ttf.spec	10 Dec 2004 22:03:01 -0000	1.4
+++ SDL_ttf.spec	5 Mar 2005 21:10:20 -0000	1.5
@@ -1,8 +1,7 @@
-Summary: Simple DirectMedia Layer - Sample TrueType Font Library
+Summary: Simple DirectMedia Layer TrueType Font library
 Name: SDL_ttf
 Version: 2.0.6
 Release: 4
-Epoch: 0
 URL: http://www.libsdl.org/projects/SDL_ttf/
 Source0: http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.6.tar.gz
 Patch0: %{name}-%{version}-openstream.patch
@@ -10,8 +9,8 @@
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: SDL-devel >= 0:1.2.4
-BuildRequires: freetype-devel >= 0:2.0
+BuildRequires: SDL-devel >= 1.2.4
+BuildRequires: freetype-devel >= 2.0
 BuildRequires: zlib-devel
 
 %description
@@ -19,9 +18,9 @@
 applications.
 
 %package devel
-Summary: Libraries, includes and more to develop SDL applications.
+Summary: Files to develop SDL applications which use TrueType fonts
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 This library allows you to use TrueType fonts to render text in SDL
@@ -77,7 +76,7 @@
 - Fedoraize
 - patch to compile on RH9
 
-* Wed Jan 19 2000 Sam Lantinga 
+* Wed Jan 19 2000 Sam Lantinga
 - converted to get package information from configure
 * Sun Jan 16 2000 Hakan Tandogan <hakan at iconsult.com>
 - initial spec file



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/easytag/devel easytag.spec,1.6,1.7
Message-ID: <200503052110.j25LANrW010897@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	easytag.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/easytag.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- easytag.spec	10 Dec 2004 20:20:47 -0000	1.6
+++ easytag.spec	5 Mar 2005 21:10:21 -0000	1.7
@@ -10,8 +10,8 @@
 Patch0:         easytag-0.30.2-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk+-devel, id3lib-devel >= 0:3.7.12
-BuildRequires:  libvorbis-devel >= 0:1.0, flac-devel, gettext
+BuildRequires:  gtk+-devel, id3lib-devel >= 3.7.12
+BuildRequires:  libvorbis-devel >= 1.0, flac-devel, gettext
 BuildRequires:  desktop-file-utils
 
 %description
@@ -87,7 +87,7 @@
 - Updated to 0.28.
 
 * Sat May 24 2003 Marius J??hndal <mariuslj at ifi.uio.no> 0:0.27-0.fdr.3.a
-- Removed version from BuildRequires: gtk+-devel (RH 7.0 and newer ship with 
+- Removed version from BuildRequires: gtk+-devel (RH 7.0 and newer ship with
   gtk+-devel >= 1.2.8).
 
 * Mon May 19 2003 Marius J??hndal <mariuslj at ifi.uio.no> 0:0.27-0.fdr.2.a



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/apt/devel apt.spec,1.10,1.11
Message-ID: <200503052110.j25LAMKm010794@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	apt.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apt.spec	3 Mar 2005 19:29:59 -0000	1.10
+++ apt.spec	5 Mar 2005 21:10:20 -0000	1.11
@@ -14,7 +14,7 @@
 # we need to work around various missing builddeps in rpm :-/
 %{!?rpmver:%define rpmver %(rpm --version | cut -d' ' -f3 | cut -d. -f1-2)}
 
-Summary: Debian's Advanced Packaging Tool with RPM support.
+Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
 Version: 0.5.15cnc6
 Release: 16.%{svnver}
@@ -88,7 +88,7 @@
 BuildRequires: beecrypt-devel
 BuildRequires: elfutils-devel
 # TODO: verify the required minimum version
-BuildRequires: python-devel >= 0:2.2
+BuildRequires: python-devel >= 2.2
 BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext
 BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel
 # for version detection to work



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/Gtk-Perl/devel Gtk-Perl.spec,1.1,1.2
Message-ID: <200503052110.j25LAMlM010688@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/Gtk-Perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/Gtk-Perl/devel

Modified Files:
	Gtk-Perl.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: Gtk-Perl.spec
===================================================================
RCS file: /cvs/extras/rpms/Gtk-Perl/devel/Gtk-Perl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Gtk-Perl.spec	28 Jan 2005 16:40:15 -0000	1.1
+++ Gtk-Perl.spec	5 Mar 2005 21:10:19 -0000	1.2
@@ -78,11 +78,11 @@
     -name .packlist -o -name '*.bs'`
 
 
-%clean 
+%clean
 %{__rm} -rf %{buildroot}
 
 
-%files 
+%files
 %defattr(-, root, root, 0755)
 %doc ChangeLog NOTES README VERSIONS
 %{_libdir}/perl5/vendor_perl/*/*-linux*/Gnome/



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/abe/devel abe.spec,1.5,1.6
Message-ID: <200503052110.j25LAM5P010750@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	abe.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: abe.spec
===================================================================
RCS file: /cvs/extras/rpms/abe/devel/abe.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- abe.spec	3 Mar 2005 19:29:59 -0000	1.5
+++ abe.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           abe
 Version:        1.0
 Release:        3
-Summary:        A scrolling, platform-jumping, ancient pyramid exploring game.
+Summary:        Scrolling, platform-jumping, ancient pyramid exploring game
 Group:          Amusements/Games
 License:        GPL
 URL:            http://abe.sourceforge.net/
@@ -11,7 +11,7 @@
 Patch1:         %{name}-%{version}-tmppath.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  SDL-devel >= 0:1.2.3, SDL_mixer-devel >= 0:1.2.3
+BuildRequires:  SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3
 BuildRequires:  desktop-file-utils
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.2,1.3
Message-ID: <200503052110.j25LAMrn010710@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	Macaulay2.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Macaulay2.spec	10 Dec 2004 22:03:01 -0000	1.2
+++ Macaulay2.spec	5 Mar 2005 21:10:20 -0000	1.3
@@ -1,14 +1,13 @@
 # $Id$
 
-Summary: A system for algebraic geometry and commutative algebra	
-Name:    Macaulay2 
-Epoch:	 0
+Summary: System for algebraic geometry and commutative algebra
+Name:    Macaulay2
 Version: 0.9.2
 Release: 13%{?dist_tag}
-License: GPL 
+License: GPL
 Group:   Applications/Engineering
-URL:	 http://www.math.uiuc.edu/Macaulay2/
-Source:	 http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.2-src.tar.gz
+URL:     http://www.math.uiuc.edu/Macaulay2/
+Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.2-src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source1: Macaulay2.png
@@ -22,31 +21,31 @@
 Patch4: Macaulay2-0.9.2-gcc34.patch
 
 BuildRequires: desktop-file-utils
-BuildRequires: gc-devel >= 0:6.3
-BuildRequires: factory-devel >= 0:2.0.5
-BuildRequires: libfac-devel >= 0:2.0.5
-BuildRequires: gdbm-devel 
+BuildRequires: gc-devel >= 6.3
+BuildRequires: factory-devel >= 2.0.5
+BuildRequires: libfac-devel >= 2.0.5
+BuildRequires: gdbm-devel
 BuildRequires: time
 
 %description
-Macaulay 2 is a new software system devoted to supporting research in 
-algebraic geometry and commutative algebra written by Daniel R. Grayson 
+Macaulay 2 is a new software system devoted to supporting research in
+algebraic geometry and commutative algebra written by Daniel R. Grayson
 and Michael E. Stillman
 
-%package doc 
+%package doc
 Summary: Macaulay2 documentation
-Group: Documentation 
-Requires: %{name} = %{epoch}:%{version}
+Group: Documentation
+Requires: %{name} = %{version}
 Requires: htmlview
-Summary: Macaulay2 documentation 
+Summary: Macaulay2 documentation
 %description doc
-Macaulay2 documentation. 
+Macaulay2 documentation.
 
 %package emacs
 Summary: Macaulay2 emacs mode
 Group: Applications/Editors
 Requires: emacs
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
 %description emacs
 Macaulay2 emacs mode.
 
@@ -73,9 +72,9 @@
   %{?debug_package:--disable-strip}
 
 # not smp-safe
-make 
+make
 
-# Takes a *long* time, default off 
+# Takes a *long* time, default off
 %check || :
 %{?_with_check:make check }
 
@@ -85,7 +84,7 @@
 
 # Fix locations
 perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
-	$RPM_BUILD_ROOT%{_bindir}/M2 
+	$RPM_BUILD_ROOT%{_bindir}/M2
 perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
 	$RPM_BUILD_ROOT%{_bindir}/M2-help
 perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/emacs/*
@@ -171,9 +170,9 @@
 
 * Mon Oct 18 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.12
 - actually *apply* gcc34 patch this time.
- 
+
 * Mon Oct 18 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.11
-- gcc34 patch 
+- gcc34 patch
 
 * Fri Oct 1 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.10
 - explicit BR versions for gc-devel, libfac-devel, factory-devel
@@ -184,7 +183,7 @@
 * Thu Jun 03 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.8
 - .desktop: remove Terminaloptions to be desktop agnostic
 - .desktop: Categories += Education;Math;Development (Devel only
-  added so it shows *somewhere* in gnome menus) 
+  added so it shows *somewhere* in gnome menus)
 
 * Tue Jun 01 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.7
 - disable default 'make check' (util/screen fails on fc2)
@@ -200,7 +199,7 @@
 - fix desktop-file-install --add-cateagories usage
 
 * Tue Dec 23 2003 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.4
-- -emacs: use %%defattr 
+- -emacs: use %%defattr
 - -emacs: fix M2-init.el
 
 * Mon Nov 17 2003 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.3



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/snownews/devel snownews.spec,1.2,1.3
Message-ID: <200503052110.j25LAQdR011375@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	snownews.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: snownews.spec
===================================================================
RCS file: /cvs/extras/rpms/snownews/devel/snownews.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- snownews.spec	10 Dec 2004 22:03:11 -0000	1.2
+++ snownews.spec	5 Mar 2005 21:10:24 -0000	1.3
@@ -1,16 +1,16 @@
-Name: 		snownews
-Version: 	1.5.3
-Release: 	4
-Summary: 	A RSS/RDF news aggregator.
-Group: 		Applications/Internet
-License: 	GPL
-Url:		http://home.kcore.de/~kiza/software/snownews
-Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.3.tar.gz
+Name:		snownews
+Version:	1.5.3
+Release:	4
+Summary:	RSS/RDF news aggregator
+Group:		Applications/Internet
+License:	GPL
+URL:		http://home.kcore.de/~kiza/software/snownews
+Source0:	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.3.tar.gz
 Patch0:		snownews-1.5.3-nocheck.patch
 Patch1:		snownews-1.5.3-manpath.patch
 Patch2:		snownews-1.5.3-nostrip.patch
 Patch3:		snownews-1.5.3-buildroot.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	gettext
@@ -19,7 +19,7 @@
 Snownews  is  a text mode RSS/RDF newsreader. It supports all versions
 of RSS natively and supports other formats via plugins.
 
-The program depends on ncurses for the user interface and uses libxml2 
+The program depends on ncurses for the user interface and uses libxml2
 for XML parsing. ncurses must be at least version 5.0. It should work
 with any version of libxml2.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/brightside/devel brightside.spec,1.3,1.4
Message-ID: <200503052110.j25LAMxA010823@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	brightside.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: brightside.spec
===================================================================
RCS file: /cvs/extras/rpms/brightside/devel/brightside.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- brightside.spec	3 Mar 2005 19:46:39 -0000	1.3
+++ brightside.spec	5 Mar 2005 21:10:20 -0000	1.4
@@ -14,9 +14,9 @@
 Requires(post): GConf2
 BuildRequires:  intltool
 BuildRequires:  gettext
-BuildRequires:  libwnck-devel >= 0:2.6.0
-BuildRequires:  libgnomeui-devel >= 0:2.6.0
-BuildRequires:  libglade2-devel >= 0:2.2.0
+BuildRequires:  libwnck-devel >= 2.6.0
+BuildRequires:  libgnomeui-devel >= 2.6.0
+BuildRequires:  libglade2-devel >= 2.2.0
 
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gconfmm26/devel gconfmm.spec,1.3,1.4
Message-ID: <200503052110.j25LAN0c010947@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gconfmm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gconfmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gconfmm26/devel/gconfmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gconfmm.spec	3 Mar 2005 21:26:02 -0000	1.3
+++ gconfmm.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -11,9 +11,9 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  glibmm24-devel >= 0:2.4.0
-BuildRequires:  gtkmm24-devel >= 0:2.4.0
-BuildRequires:  GConf2-devel >= 0:2.4.0
+BuildRequires:  glibmm24-devel >= 2.4.0
+BuildRequires:  gtkmm24-devel >= 2.4.0
+BuildRequires:  GConf2-devel >= 2.4.0
 
 %description
 This package provides a C++ interface for GConf2. It is a subpackage



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/anthy/devel anthy.spec,1.2,1.3
Message-ID: <200503052110.j25LAMsK010778@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	anthy.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- anthy.spec	24 Feb 2005 14:31:31 -0000	1.2
+++ anthy.spec	5 Mar 2005 21:10:20 -0000	1.3
@@ -12,7 +12,7 @@
 Source0:	http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 
-Summary:	A Japanese character set input library
+Summary:	Japanese character set input library
 %description
 Anthy provides the library to input Japanese on the applications, such as
 X applications and emacs. and the user dictionaries and the users information



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libksba/devel libksba.spec,1.7,1.8
Message-ID: <200503052110.j25LAOmb011171@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libksba.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libksba.spec
===================================================================
RCS file: /cvs/extras/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libksba.spec	3 Mar 2005 22:41:32 -0000	1.7
+++ libksba.spec	5 Mar 2005 21:10:22 -0000	1.8
@@ -10,8 +10,8 @@
 Patch0:  libksba-0.9.9-underquoted.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: libgpg-error >= 0:0.7
-BuildRequires: libgcrypt-devel >= 0:1.2.0
+BuildRequires: libgpg-error >= 0.7
+BuildRequires: libgcrypt-devel >= 1.2.0
 
 %description
 KSBA is a library designed to build software based on the X.509 and



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libgnomeuimm26/devel libgnomeuimm.spec,1.4,1.5
Message-ID: <200503052110.j25LAObL011160@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libgnomeuimm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgnomeuimm.spec	3 Mar 2005 22:41:32 -0000	1.4
+++ libgnomeuimm.spec	5 Mar 2005 21:10:22 -0000	1.5
@@ -12,12 +12,12 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  libgnomeui-devel >= 0:2.0.0
-BuildRequires:  libgnomemm26-devel >= 0:2.6.0
-BuildRequires:  libgnomecanvasmm26-devel >= 0:2.6.0
-BuildRequires:  gconfmm26-devel >= 0:2.6.0
-BuildRequires:  libglademm24-devel >= 0:2.4.0
-BuildRequires:  gnome-vfsmm26-devel >= 0:2.6.0
+BuildRequires:  libgnomeui-devel >= 2.0.0
+BuildRequires:  libgnomemm26-devel >= 2.6.0
+BuildRequires:  libgnomecanvasmm26-devel >= 2.6.0
+BuildRequires:  gconfmm26-devel >= 2.6.0
+BuildRequires:  libglademm24-devel >= 2.4.0
+BuildRequires:  gnome-vfsmm26-devel >= 2.6.0
 
 %description
 This package provides a C++ interface for GnomeUI.  It is a subpackage



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/apmud/devel apmud.spec,1.1,1.2
Message-ID: <200503052110.j25LAMK7010789@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	apmud.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: apmud.spec
===================================================================
RCS file: /cvs/extras/rpms/apmud/devel/apmud.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apmud.spec	15 Feb 2005 17:14:23 -0000	1.1
+++ apmud.spec	5 Mar 2005 21:10:20 -0000	1.2
@@ -1,9 +1,9 @@
 %define _prefix /usr
 
-Name: apmud 
+Name: apmud
 Version: 1.0.0
 Release: 1
-Summary: Power management daemon for Apple laptops.
+Summary: Power management daemon for Apple laptops
 Source0: http://linuxppc.jvc.nl/apmud-%{version}.tgz
 Source1: trackpad.init
 Source2: trackpad.sysconfig
@@ -18,9 +18,9 @@
 Obsoletes: trackpad, pmud
 ExclusiveArch: ppc
 
-%description 
-pmud is a daemon which periodically polls the PMU (power manager) and performs 
-functions such as enabling or disabling devices appropriately when the power 
+%description
+pmud is a daemon which periodically polls the PMU (power manager) and performs
+functions such as enabling or disabling devices appropriately when the power
 source changes. It can also be instructed to signal init(8) that a power-
 failure has occured.  pmud works on Apple PowerBooks and iBooks.
 
@@ -29,7 +29,7 @@
 
 Tools for enabling video mirroring for ATI Rage 128 Mobility (m3mirror)
 and ATI Radeon Mobility (m6mirror) enabled PowerBooks are also included.
- 
+
 %prep
 %setup -q -n apmud
 %patch0 -p1
@@ -55,7 +55,7 @@
 make PREFIX=$RPM_BUILD_ROOT install
 make PREFIX=$RPM_BUILD_ROOT -C contrib/ install
 
-cd $RPM_BUILD_ROOT/usr/bin; ln -s ../../sbin/snooze apm 
+cd $RPM_BUILD_ROOT/usr/bin; ln -s ../../sbin/snooze apm
 
 install -m755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/trackpad
 install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/trackpad
@@ -63,7 +63,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post 
+%post
 /sbin/chkconfig --add pmud
 /sbin/chkconfig --add trackpad
 
@@ -86,7 +86,7 @@
 %{_prefix}/X11R6/bin/xmouse
 %config %attr(0755,root,root) /etc/power/pwrctl
 %config(noreplace) %attr(0755,root,root) /etc/power/pwrctl-local
-/etc/init.d/pmud 
+/etc/init.d/pmud
 /etc/init.d/trackpad
 %config(noreplace) /etc/sysconfig/power
 %config(noreplace) /etc/sysconfig/trackpad



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/ogmtools/devel ogmtools.spec,1.5,1.6
Message-ID: <200503052110.j25LAPfm011223@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ogmtools.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: ogmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/ogmtools/devel/ogmtools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ogmtools.spec	16 Nov 2004 18:05:31 -0000	1.5
+++ ogmtools.spec	5 Mar 2005 21:10:23 -0000	1.6
@@ -1,6 +1,3 @@
-# $Id$
-# Upstream: Moritz Bunkus <moritz$bunkus,org>
-
 Summary: Tools for Ogg media streams
 Name: ogmtools
 Version: 1.5
@@ -15,7 +12,7 @@
 %description
 These tools allow information about (ogminfo) or extraction from (ogmdemux) or
 creation of (ogmmerge) OGG media streams. Note that OGM is used for "OGG media
-streams". 
+streams".
 
 
 %prep
@@ -38,7 +35,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc README ChangeLog TODO COPYING 
+%doc README ChangeLog TODO COPYING
 %{_bindir}/*
 %{_mandir}/man1/*
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libassuan/devel libassuan.spec,1.4,1.5
Message-ID: <200503052110.j25LAO76011108@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libassuan.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libassuan.spec	3 Feb 2005 12:34:21 -0000	1.4
+++ libassuan.spec	5 Mar 2005 21:10:22 -0000	1.5
@@ -1,13 +1,12 @@
-
-Summary: GnuPG IPC library 
-Name:	 libassuan
+Summary: GnuPG IPC library
+Name:    libassuan
 Version: 0.6.9
 Release: 2%{?dist_tag}
 Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz
 Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig
-URL:	 http://www.gnupg.org/
+URL:     http://www.gnupg.org/
 License: GPL
-Group: 	 System Environment/Libraries
+Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -15,19 +14,19 @@
 packages.
 
 %package devel
-Summary: Development files for the %{name} package.
+Summary: Development files for the %{name} package
 Group: Development/Libraries
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 %description devel
 This is the IPC library used by GnuPG 1.9, GPGME and a few other
-packages.  
+packages.
 
 This package contains files needed to develop applications using %{name}.
 
 
 %prep
-%setup -q 
+%setup -q
 
 
 %build



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/dietlibc/devel dietlibc.spec,1.3,1.4
Message-ID: <200503052110.j25LANcb010880@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	dietlibc.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dietlibc.spec	5 Mar 2005 01:13:43 -0000	1.3
+++ dietlibc.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -14,7 +14,7 @@
 
 %{!?release_func:%define release_func() %1%{?disttag}}
 
-Summary:	A small libc implementation
+Summary:	Small libc implementation
 Name:		%{?_with_cross:cross-%crossarch-}%NAME
 Version:	0.28
 Release:	%release_func 4
@@ -160,5 +160,5 @@
 * Thu Jul 11 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 1:0.18-1
 - updated to 0.18
 
-* Thu Jul  4 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 
+* Thu Jul  4 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gsview/devel gsview.spec,1.5,1.6
Message-ID: <200503052110.j25LANDv011025@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gsview.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gsview.spec
===================================================================
RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gsview.spec	3 Mar 2005 21:26:03 -0000	1.5
+++ gsview.spec	5 Mar 2005 21:10:21 -0000	1.6
@@ -30,14 +30,14 @@
 
 %description
 GSview is a graphical interface for Ghostscript.
-Ghostscript is an interpreter for the PostScript page 
+Ghostscript is an interpreter for the PostScript page
 description language used by laser printers.
-For documents following the Adobe PostScript Document Structuring 
+For documents following the Adobe PostScript Document Structuring
 Conventions, GSview allows selected pages to be viewed or printed.
 
 
 %prep
-%setup -q 
+%setup -q
 
 %patch1 -p1 -b .htmlview
 %patch2 -p1 -b .libgs7
@@ -70,7 +70,7 @@
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  %{SOURCE1} 
+  %{SOURCE1}
 
 ## Unpackaged files
 # nuke depcrecated epstool
@@ -85,7 +85,7 @@
 %{_mandir}/man*/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
-%doc %{_docdir}/* 
+%doc %{_docdir}/*
 
 
 %clean
@@ -120,8 +120,8 @@
 
 * Sat Apr 24 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.3
 - don't include old epstool (to be packaged separately)
-- gsview.desktop: 
-  MimeType=image/x-eps;application/postscript;application/pdf; 
+- gsview.desktop:
+  MimeType=image/x-eps;application/postscript;application/pdf;
   Categories=Application;GTK;Graphics;Viewer;Publishing;
 
 * Thu Apr 01 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.2



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libgnomecanvasmm20/devel libgnomecanvasmm.spec,1.3,1.4
Message-ID: <200503052110.j25LAOqm011143@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libgnomecanvasmm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomecanvasmm20/devel/libgnomecanvasmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgnomecanvasmm.spec	3 Mar 2005 22:41:32 -0000	1.3
+++ libgnomecanvasmm.spec	5 Mar 2005 21:10:22 -0000	1.4
@@ -11,8 +11,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  gtkmm20-devel >= 0:2.2.5
-BuildRequires:  libgnomecanvas-devel >= 0:1.113.0
+BuildRequires:  gtkmm20-devel >= 2.2.5
+BuildRequires:  libgnomecanvas-devel >= 1.113.0
 Buildrequires:  libtool
 Obsoletes:      libgnomecanvasmm2
 Patch0:         libgnomecanvasmm-2.0.1-gcc34.patch



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/SDL_gfx/devel SDL_gfx.spec,1.1,1.2
Message-ID: <200503052110.j25LAM9m010714@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	SDL_gfx.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: SDL_gfx.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_gfx/devel/SDL_gfx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SDL_gfx.spec	28 Jan 2005 16:30:08 -0000	1.1
+++ SDL_gfx.spec	5 Mar 2005 21:10:20 -0000	1.2
@@ -77,14 +77,14 @@
 - Initial Extras import, minor spec tweaks.
 
 * Tue Dec 21 2004 Dries Verachtert <dries at ulyssis.org> 2.0.13-1
-- Updated to release 2.0.13 and removed the patch (has been 
+- Updated to release 2.0.13 and removed the patch (has been
   applied upstream)
 
 * Thu Nov 11 2004 Matthias Saou <http://freshrpms.net/> 2.0.12-3
 - Explicitly disable mmx for non-ix86 to fix build on x86_64.
 
 * Fri Oct 22 2004 Dries Verachtert <dries at ulyssis.org> 2.0.12-3
-- fixed some buildrequirements so the correct version of libSDL_gfx.so 
+- fixed some buildrequirements so the correct version of libSDL_gfx.so
   can be found in the list of provides.
 
 * Fri Oct 22 2004 Dries Verachtert <dries at ulyssis.org> 2.0.12-2



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/advancecomp/devel advancecomp.spec,1.4,1.5
Message-ID: <200503052110.j25LAM1B010760@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	advancecomp.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: advancecomp.spec
===================================================================
RCS file: /cvs/extras/rpms/advancecomp/devel/advancecomp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- advancecomp.spec	23 Feb 2005 10:40:08 -0000	1.4
+++ advancecomp.spec	5 Mar 2005 21:10:20 -0000	1.5
@@ -13,7 +13,7 @@
 AdvanceCOMP is a set of recompression utilities for .PNG, .MNG and .ZIP files.
 The main features are :
 * Recompress ZIP, PNG and MNG files using the Deflate 7-Zip implementation.
-* Recompress MNG files using Delta and Move optimization. 
+* Recompress MNG files using Delta and Move optimization.
 
 
 %prep



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/aqhbci-qt-tools/devel aqhbci-qt-tools.spec,1.3,1.4
Message-ID: <200503052110.j25LAMMf010800@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/aqhbci-qt-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/aqhbci-qt-tools/devel

Modified Files:
	aqhbci-qt-tools.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: aqhbci-qt-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/aqhbci-qt-tools/devel/aqhbci-qt-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aqhbci-qt-tools.spec	28 Feb 2005 21:54:32 -0000	1.3
+++ aqhbci-qt-tools.spec	5 Mar 2005 21:10:20 -0000	1.4
@@ -9,9 +9,9 @@
 BuildRequires: gwenhywfar-devel aqbanking-devel aqhbci-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-%description 
+%description
 This package contains the QT setup wizard and a debugger for the HBCI backend
-for the Aqbanking library which implements a client for the German HBCI 
+for the Aqbanking library which implements a client for the German HBCI
 (Home Banking Computer Interface) protocol.
 
 %prep



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-MIME-tools/devel perl-MIME-tools.spec,1.7,1.8
Message-ID: <200503052110.j25LAP9N011252@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-MIME-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-MIME-tools/devel

Modified Files:
	perl-MIME-tools.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/perl-MIME-tools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-MIME-tools.spec	3 Mar 2005 23:46:27 -0000	1.7
+++ perl-MIME-tools.spec	5 Mar 2005 21:10:23 -0000	1.8
@@ -99,5 +99,5 @@
 * Wed Jun 25 2003 Dams <anvil[AT]livna.org> 0:5.411-0.fdr.2.a
 - Now using roaringpenguin tarball
 
-* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 
+* Sun Jun 15 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/openal/devel openal.spec,1.6,1.7
Message-ID: <200503052110.j25LAPmu011227@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	openal.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/devel/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	5 Mar 2005 21:10:23 -0000	1.7
@@ -97,7 +97,7 @@
        ${RPM_BUILD_ROOT}%{_libdir}/openal/Makefile* \
        ${RPM_BUILD_ROOT}%{_libdir}/openal/CVS
 #
-# info 
+# info
 install -m0755 -d ${RPM_BUILD_ROOT}%{_infodir}
 install -m0644 linux/doc/openal.info ${RPM_BUILD_ROOT}%{_infodir}
 #
@@ -118,7 +118,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
 
@@ -128,7 +128,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES COPYING CREDITS README 
+%doc CHANGES COPYING CREDITS README
 %config %{_sysconfdir}/openalrc
 %attr(0644,root,root)%{_libdir}/libopenal.so.*
 %attr(0644,root,root)%{_infodir}/*.info*



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.5,1.6
Message-ID: <200503052110.j25LAMMB010704@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	Inventor.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Inventor.spec	16 Feb 2005 18:45:21 -0000	1.5
+++ Inventor.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -314,5 +314,5 @@
 
 * Wed Jun 30 2004 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-0.fdr.1
 - Initial Fedora Extras RPM.
-- Adopt Debian/Testing patches (Thanks to Steve M. Robbins for keeping 
+- Adopt Debian/Testing patches (Thanks to Steve M. Robbins for keeping
   Inventor alive).



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/awstats/devel awstats.spec,1.5,1.6
Message-ID: <200503052110.j25LAM49010806@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	awstats.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- awstats.spec	15 Feb 2005 17:35:38 -0000	1.5
+++ awstats.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -11,8 +11,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	httpd
 Requires:	perl
-Requires(post): perl
-Requires(postun): /sbin/service
+Requires(post):		perl
+Requires(postun):	/sbin/service
 
 %description
 Advanced Web Statistics is a powerful and featureful tool that generates
@@ -91,7 +91,7 @@
                 s|^SkipHosts=.*$|SkipHosts="127.0.0.1"|;
                 s|^Expires=.*$|Expires=3600|;
         ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf
-install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf 
+install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf
 
 # Fix scripts
 %{__perl} -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \
@@ -208,7 +208,7 @@
 - only restart apache if we are upgrading
 - install and cp use the "-p" switch
 - use %%_datadir in /etc/httpd/conf.d/awstats.conf
-- improve cron job 
+- improve cron job
 - don't brutally recode HTML pages
 - the scan is now done hourly instead of daily
 - *.pm files are not executable any more



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/neverball/devel neverball.spec,1.6,1.7
Message-ID: <200503052110.j25LAPcD011219@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	neverball.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: neverball.spec
===================================================================
RCS file: /cvs/extras/rpms/neverball/devel/neverball.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- neverball.spec	14 Nov 2004 17:50:10 -0000	1.6
+++ neverball.spec	5 Mar 2005 21:10:23 -0000	1.7
@@ -17,7 +17,7 @@
 %description
 Tilt the  floor to roll a  ball through an obstacle  course within the
 given time.  If the ball falls or time expires, a ball is lost.
- 
+
 Collect 100 coins  to save your progress and earn  an extra ball.  Red
 coins are worth 5.  Blue coins are worth 10.
 
@@ -50,7 +50,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc CHANGES COPYING README
 %{_bindir}/*



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-Net-IP/devel perl-Net-IP.spec,1.4,1.5
Message-ID: <200503052110.j25LAPlj011260@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-IP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-Net-IP/devel

Modified Files:
	perl-Net-IP.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-Net-IP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-IP/devel/perl-Net-IP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Net-IP.spec	3 Mar 2005 23:46:27 -0000	1.4
+++ perl-Net-IP.spec	5 Mar 2005 21:10:23 -0000	1.5
@@ -30,7 +30,7 @@
 # http://rt.cpan.org/NoAuth/Bug.html?id=7528
 %patch0 -p0
 # http://rt.cpan.org/NoAuth/Bug.html?id=3844
-%{__perl} -pi -e 's/^use 5\.008;$//' Makefile.PL # 
+%{__perl} -pi -e 's/^use 5\.008;$//' Makefile.PL
 
 
 %build



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/GtkAda/devel GtkAda.spec,1.6,1.7
Message-ID: <200503052110.j25LAMtT010694@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	GtkAda.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/devel/GtkAda.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GtkAda.spec	13 Feb 2005 13:24:39 -0000	1.6
+++ GtkAda.spec	5 Mar 2005 21:10:20 -0000	1.7
@@ -1,8 +1,7 @@
 Name:		GtkAda
 Version:	2.4.0
 Release:	3
-Epoch:		0
-Summary:	An Ada95 graphical toolkit based on Gtk+
+Summary:	Ada95 graphical toolkit based on Gtk+
 
 Group:		System Environment/Libraries
 License:	GPL
@@ -21,7 +20,7 @@
 %package devel
 Summary:	Development files for GtkAda
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}, perl
+Requires:	%{name} = %{version}-%{release}, perl
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/logjam/devel logjam.spec,1.9,1.10
Message-ID: <200503052110.j25LAP7u011203@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	logjam.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- logjam.spec	3 Mar 2005 22:41:32 -0000	1.9
+++ logjam.spec	5 Mar 2005 21:10:23 -0000	1.10
@@ -65,11 +65,11 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
+%doc doc/README COPYING doc/TODO
 %{_bindir}/logjam
 %{_mandir}/man1/logjam.1.gz
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/logjam*
-%doc doc/README COPYING doc/TODO 
 
 %if %{use_xmms}
 %files xmms
@@ -167,7 +167,7 @@
 * Mon Jan 07 2002 Tom "spot" Callaway <tcallawa at redhat.com>
  - 3.0.2 release, spec cleanups
 * Mon Nov 12 2001 Tom "spot" Callaway <tcallawa at redhat.com>
- - 3.0.1 release, lots of new features/bugfixes. 
+ - 3.0.1 release, lots of new features/bugfixes.
 * Fri Sep 07 2001 Tom "spot" Callaway <tcallawa at redhat.com>
  - Rebuild without ssl for compat. :~(
 * Thu Sep 06 2001 Tom "spot" Callaway <tcallawa at redhat.com>



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/Coin2/devel Coin2.spec,1.3,1.4
Message-ID: <200503052110.j25LAM2j010682@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	Coin2.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Coin2.spec	10 Dec 2004 22:03:00 -0000	1.3
+++ Coin2.spec	5 Mar 2005 21:10:19 -0000	1.4
@@ -7,10 +7,9 @@
 %define libsimage_SONAME libsimage.so.20
 %define libfreetype_SONAME libfreetype.so.6
 
-Summary: A high-level 3D visualization library.
+Summary: High-level 3D visualization library
 Name: %{name}
 Version: %{srcvers}
-Epoch: 0
 Release: 4
 
 License: GPL
@@ -37,7 +36,7 @@
 
 %package devel
 Summary: Development files for Coin
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: XFree86-devel zlib-devel bzip2-devel
 Group: Development/Libraries
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libglademm20/devel libglademm.spec,1.3,1.4
Message-ID: <200503052110.j25LAOQ8011132@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libglademm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm20/devel/libglademm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libglademm.spec	3 Mar 2005 22:41:32 -0000	1.3
+++ libglademm.spec	5 Mar 2005 21:10:22 -0000	1.4
@@ -11,8 +11,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  gtkmm20-devel >= 0:2.0.2
-BuildRequires:  libglade2-devel >= 0:2.0.0
+BuildRequires:  gtkmm20-devel >= 2.0.2
+BuildRequires:  libglade2-devel >= 2.0.0
 BuildRequires:  libtool
 Obsoletes:      libglademm2
 Patch0:         libglademm-2.2.0-gcc34.patch



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libglademm24/devel libglademm.spec,1.3,1.4
Message-ID: <200503052110.j25LAOiw011138@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libglademm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/devel/libglademm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libglademm.spec	3 Mar 2005 22:41:32 -0000	1.3
+++ libglademm.spec	5 Mar 2005 21:10:22 -0000	1.4
@@ -11,8 +11,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  gtkmm24-devel >= 0:2.4.0
-BuildRequires:  libglade2-devel >= 0:2.3.6
+BuildRequires:  gtkmm24-devel >= 2.4.0
+BuildRequires:  libglade2-devel >= 2.3.6
 
 %description
 This package provides a C++ interface for libglademm. It is a



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/aalib/devel aalib.spec,1.6,1.7
Message-ID: <200503052110.j25LAM5r010744@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	aalib.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: aalib.spec
===================================================================
RCS file: /cvs/extras/rpms/aalib/devel/aalib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aalib.spec	16 Dec 2004 20:40:23 -0000	1.6
+++ aalib.spec	5 Mar 2005 21:10:20 -0000	1.7
@@ -132,5 +132,5 @@
 * Wed Apr  2 2003 Dams <anvil[AT]livna.org> 0:1.4.0-0.fdr.0.2.rc5
 - Applied spec modifications from Adrian Reber
 
-* Tue Apr  1 2003 Dams <anvil[AT]livna.org> 
+* Tue Apr  1 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libkexif/devel libkexif.spec,1.3,1.4
Message-ID: <200503052110.j25LAOM6011167@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libkexif.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libkexif.spec
===================================================================
RCS file: /cvs/extras/rpms/libkexif/devel/libkexif.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libkexif.spec	3 Mar 2005 22:41:32 -0000	1.3
+++ libkexif.spec	5 Mar 2005 21:10:22 -0000	1.4
@@ -9,7 +9,7 @@
 Source0:        http://dl.sf.net/digikam/libkexif-0.2.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libexif-devel >= 0:0.5.7, kdelibs-devel >= 6:3.0
+BuildRequires:  libexif-devel >= 0.5.7, kdelibs-devel >= 6:3.0
 BuildRequires:  gettext
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libsndfile/devel libsndfile.spec,1.6,1.7
Message-ID: <200503052110.j25LAONf011191@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libsndfile.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/libsndfile.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsndfile.spec	5 Mar 2005 01:44:40 -0000	1.6
+++ libsndfile.spec	5 Mar 2005 21:10:22 -0000	1.7
@@ -1,16 +1,16 @@
-Summary: 	Library for reading and writing sound files
-Name: 		libsndfile
-Version: 	1.0.11
-Release: 	2
-License: 	LGPL
-Group: 		System Environment/Libraries
-URL: 		http://www.mega-nerd.com/libsndfile/
-Source0: 	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Summary:	Library for reading and writing sound files
+Name:		libsndfile
+Version:	1.0.11
+Release:	2
+License:	LGPL
+Group:		System Environment/Libraries
+URL:		http://www.mega-nerd.com/libsndfile/
+Source0:	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
 Patch0:		libsndfile-1.0.11-svx-channels.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
-BuildRequires:  alsa-lib-devel
-Provides:       %{name}-octave = %{version}-%{release}
+BuildRequires:	alsa-lib-devel
+Provides:	%{name}-octave = %{version}-%{release}
 
 %package devel
 Summary:	Development files for libsndfile
@@ -26,7 +26,7 @@
 
 %description devel
 libsndfile is a C library for reading and writing sound files such as
-AIFF, AU, WAV, and others through one standard interface. 
+AIFF, AU, WAV, and others through one standard interface.
 This package contains files needed to develop with libsndfile.
 
 
@@ -95,5 +95,5 @@
 - Provide -octave in main package, own more related dirs.
 - Bring specfile up to date with current spec templates.
 
-* Sat Apr 12 2003 Dams <anvil[AT]livna.org> 
+* Sat Apr 12 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libmatroska/devel libmatroska.spec,1.7,1.8
Message-ID: <200503052110.j25LAOac011175@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libmatroska.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libmatroska.spec
===================================================================
RCS file: /cvs/extras/rpms/libmatroska/devel/libmatroska.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libmatroska.spec	27 Feb 2005 18:29:38 -0000	1.7
+++ libmatroska.spec	5 Mar 2005 21:10:22 -0000	1.8
@@ -1,4 +1,4 @@
-Summary:	An open Audio/Video container format
+Summary:	Open Audio/Video container format
 Name:		libmatroska
 Version:	0.7.5
 Release:	2
@@ -71,6 +71,6 @@
 - Added license files as doc
 - Requires libebml-devel (headers needed)
 
-* Sat Feb 28 2004 Dams <anvil[AT]livna.org> 
+* Sat Feb 28 2004 Dams <anvil[AT]livna.org>
 - Initial build.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/gwget/devel gwget.spec,1.5,1.6
Message-ID: <200503052110.j25LANbb011052@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gwget.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gwget.spec	4 Mar 2005 16:56:37 -0000	1.5
+++ gwget.spec	5 Mar 2005 21:10:21 -0000	1.6
@@ -35,7 +35,7 @@
 Requires:	epiphany >= 1.4.4
 BuildRequires:	epiphany-devel >= 1.4.4
 
-%description epiphany-extension 
+%description epiphany-extension
 This Package contains extensions gwget2 extensions for epiphany.
 %endif # _without_epiphanye
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libgnomemm20/devel libgnomemm.spec,1.3,1.4
Message-ID: <200503052110.j25LAOMQ011151@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libgnomemm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libgnomemm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomemm20/devel/libgnomemm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgnomemm.spec	3 Mar 2005 22:41:32 -0000	1.3
+++ libgnomemm.spec	5 Mar 2005 21:10:22 -0000	1.4
@@ -11,8 +11,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  gtkmm20-devel >= 0:2.0
-BuildRequires:  libgnome-devel >= 0:2.0
+BuildRequires:  gtkmm20-devel >= 2.0
+BuildRequires:  libgnome-devel >= 2.0
 BuildRequires:  libtool
 Obsoletes:      libgnomemm2
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/kile-i18n/devel kile-i18n.spec,1.1,1.2
Message-ID: <200503052110.j25LAOki011096@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kile-i18n/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/kile-i18n/devel

Modified Files:
	kile-i18n.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: kile-i18n.spec
===================================================================
RCS file: /cvs/extras/rpms/kile-i18n/devel/kile-i18n.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kile-i18n.spec	13 Jan 2005 15:39:01 -0000	1.1
+++ kile-i18n.spec	5 Mar 2005 21:10:22 -0000	1.2
@@ -1,11 +1,11 @@
 # $Id$
 
 Summary: i18n support for Kile
-Name: 	 kile-i18n 
-Group:	 Applications/Office
+Name:    kile-i18n
+Group:   Applications/Office
 Version: 1.7
 Release: 3
-Source:  http://dl.sourceforge.net/sourceforge/kile/kile-i18n-1.7.tar.bz2 
+Source:  http://dl.sourceforge.net/sourceforge/kile/kile-i18n-1.7.tar.bz2
 URL:     http://kile.sourceforge.net/
 License: GPL
 # Should be noarch, but doesn't currently work -- Rex
@@ -13,10 +13,10 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libtool
-BuildRequires: kdelibs-devel >= 6:3.2 
+BuildRequires: kdelibs-devel >= 6:3.2
 BuildRequires: gettext
 
-Requires: kile >= 0:1.7 
+Requires: kile >= 1.7
 
 
 %description
@@ -24,21 +24,21 @@
 
 
 %prep
-%setup -q 
+%setup -q
 
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure 
+%configure
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT 
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # Replace absolute symlinks with relative ones
 pushd $RPM_BUILD_ROOT%{_docdir}/HTML
@@ -55,7 +55,7 @@
 
 ## File lists
 # locale's
-%find_lang kile 
+%find_lang kile
 # HTML
 for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
   lang=$(basename $lang_dir)
@@ -79,6 +79,6 @@
 * Tue Nov 20 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.7-0.fdr.2
 - cleanup file lists
 
-* Mon Oct 18 2004 Rex Dieter <rexdieter at sf.net> 1.7-0.fdr.1 
+* Mon Oct 18 2004 Rex Dieter <rexdieter at sf.net> 1.7-0.fdr.1
 - 1.7
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/imlib2/devel imlib2.spec,1.10,1.11
Message-ID: <200503052110.j25LAO7E011058@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	imlib2.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- imlib2.spec	3 Mar 2005 21:46:21 -0000	1.10
+++ imlib2.spec	5 Mar 2005 21:10:21 -0000	1.11
@@ -85,7 +85,7 @@
 
 
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig 
+%postun -p /sbin/ldconfig
 
 
 %files
@@ -111,7 +111,7 @@
 %{_bindir}/imlib2-config
 %{_includedir}/Imlib2.h
 %{_libdir}/libImlib2.a
-%{_libdir}/libImlib2.la 
+%{_libdir}/libImlib2.la
 %{_libdir}/libImlib2.so
 %{_libdir}/pkgconfig/imlib2.pc
 
@@ -124,7 +124,7 @@
 - Really include libtool archives to fix fedora.us bug #2284.
 
 * Fri Jan 14 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.2.0-3
-- Move filters and loaders back into main package where they belong 
+- Move filters and loaders back into main package where they belong
 
 * Mon Jan 10 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.2.0-2
 - Don't ship *.?.a in {_libdir}/imlib/filters/ and loaders/
@@ -134,12 +134,12 @@
   https://bugzilla.fedora.us/show_bug.cgi?id=2284
   http://bugzilla.redhat.com/bugzilla/142244
   http://bugs.kde.org/93359
-- Use make param LIBTOOL=/usr/bin/libtool - fixes hardcoded rpath on x86_64 
+- Use make param LIBTOOL=/usr/bin/libtool - fixes hardcoded rpath on x86_64
 - fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs
   returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz"
-- Update to 1.2.0 -- fixes several security issues 
+- Update to 1.2.0 -- fixes several security issues
 - remove explicit libdir=_libdir - 1.2.9 does not need it anymore
-- removeddemo compile/install; 
+- removeddemo compile/install;
 - use configure param --x-libraries={_prefix}/X11R6/{_lib} and patch to fix
   "cannot find -lX11"
 
@@ -160,5 +160,5 @@
 - Moved some binaries and loaders into main package
 - Added missing Requires and BuildRequires
 
-* Sun Oct 26 2003 Dams <anvil[AT]livna.org> 
+* Sun Oct 26 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libid3tag/devel libid3tag.spec,1.6,1.7
Message-ID: <200503052110.j25LAOu8011163@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libid3tag.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libid3tag.spec
===================================================================
RCS file: /cvs/extras/rpms/libid3tag/devel/libid3tag.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libid3tag.spec	3 Mar 2005 22:41:32 -0000	1.6
+++ libid3tag.spec	5 Mar 2005 21:10:22 -0000	1.7
@@ -11,7 +11,7 @@
 Source1:        %{name}.pc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:  zlib-devel >= 0:1.1.4
+BuildRequires:  zlib-devel >= 1.1.4
 
 %description
 libid3tag is a library for reading and (eventually) writing ID3 tags,



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/jed/devel jed.spec,1.2,1.3
Message-ID: <200503052110.j25LAOcp011070@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	jed.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/jed.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jed.spec	4 Mar 2005 22:39:35 -0000	1.2
+++ jed.spec	5 Mar 2005 21:10:22 -0000	1.3
@@ -1,4 +1,4 @@
-Summary: A fast, compact editor based on the S-Lang screen library
+Summary: Fast, compact editor based on the S-Lang screen library
 Name: jed
 Version: 0.99.16
 Release: 8
@@ -35,7 +35,7 @@
 chmod +x configure
 
 %build
-export JED_ROOT="%{_datadir}/jed" 
+export JED_ROOT="%{_datadir}/jed"
 %configure
 make
 
@@ -144,7 +144,7 @@
 - handle compressed man pages
 - add install-info scripts
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
 - auto rebuild in the new build environment (release 2)
 
 * Thu Oct 29 1998 Bill Nottingham <notting at redhat.com>



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libmodplug/devel libmodplug.spec,1.4,1.5
Message-ID: <200503052110.j25LAOix011179@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libmodplug.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libmodplug.spec
===================================================================
RCS file: /cvs/extras/rpms/libmodplug/devel/libmodplug.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libmodplug.spec	10 Dec 2004 22:03:05 -0000	1.4
+++ libmodplug.spec	5 Mar 2005 21:10:22 -0000	1.5
@@ -16,7 +16,7 @@
 %package        devel
 Summary:        Development files for the Modplug mod music file format library
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}, pkgconfig
+Requires:       %{name} = %{version}-%{release}, pkgconfig
 
 %description    devel
 %{summary}.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libsafe/devel libsafe-2.0-16.spec,1.4,1.5
Message-ID: <200503052110.j25LAO8m011183@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libsafe-2.0-16.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libsafe-2.0-16.spec
===================================================================
RCS file: /cvs/extras/rpms/libsafe/devel/libsafe-2.0-16.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsafe-2.0-16.spec	2 Feb 2005 14:02:59 -0000	1.4
+++ libsafe-2.0-16.spec	5 Mar 2005 21:10:22 -0000	1.5
@@ -1,4 +1,4 @@
-Summary: Libsafe: Protecting Critical Elements of Stacks
+Summary: Protect critical elements of stacks
 Name: libsafe
 Version: 2.0
 Release: 16c
@@ -23,8 +23,8 @@
 potentially prevent yet unknown attacks. Experiments indicate that the
 performance overhead of libsafe is negligible.
 
-Be aware that any RPMS built while libsafe is installed will require libsafe 
-in order to install because of RPM's autodeps. You are encouraged to use a 
+Be aware that any RPMS built while libsafe is installed will require libsafe
+in order to install because of RPM's autodeps. You are encouraged to use a
 chroot for RPM builds rather than a libsafe protected system.
 
 This libsafe is modified from upstream's 2002 release by Steve Grubb's
@@ -47,7 +47,7 @@
 %doc README EMAIL_NOTIFICATION LIBPRELUDE COPYING ChangeLog doc tools
 /lib/libsafe.so.2.0.16c
 
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
@@ -87,7 +87,7 @@
 rm -f /etc/ld.so.preload.tmp
 
 %changelog
-* Sat Jan 29 2005 Warren Togami <wtogami at redhat.com> 
+* Sat Jan 29 2005 Warren Togami <wtogami at redhat.com>
 
 * Thu Dec 16 2004 Warren Togami <wtogami at redhat.com> 2.0-16c
 - Patch with Steve Grubb's libsafe-2.0-16c improvements



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-XML-LibXSLT/devel perl-XML-LibXSLT.spec,1.1,1.2
Message-ID: <200503052110.j25LAP1b011286@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-XML-LibXSLT/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-XML-LibXSLT/devel

Modified Files:
	perl-XML-LibXSLT.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-XML-LibXSLT.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-LibXSLT/devel/perl-XML-LibXSLT.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-LibXSLT.spec	5 Mar 2005 11:18:47 -0000	1.1
+++ perl-XML-LibXSLT.spec	5 Mar 2005 21:10:23 -0000	1.2
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1, perl(XML::LibXML) >= 1.57
-BuildRequires:	libxslt-devel >= 1.0.6 
+BuildRequires:	libxslt-devel >= 1.0.6
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/lincvs/devel lincvs.spec,1.4,1.5
Message-ID: <200503052110.j25LAPCd011199@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	lincvs.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: lincvs.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/devel/lincvs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lincvs.spec	12 Feb 2005 21:24:23 -0000	1.4
+++ lincvs.spec	5 Mar 2005 21:10:23 -0000	1.5
@@ -1,7 +1,7 @@
 Name:             lincvs
 Version:          1.4.0
 Release:          0.rc2
-Summary:          Graphical CVS Client.
+Summary:          Graphical CVS client
 
 Group:            Development/Tools
 License:          GPL
@@ -11,14 +11,22 @@
 Source2:          lincvs.desktop
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:    cvs >= 0:1.9.0
+BuildRequires:    cvs >= 1.9.0
 BuildRequires:    qt-devel >= 1:3.3
-Requires:         cvs >= 0:1.9.0
+Requires:         cvs >= 1.9.0
 
 %description
-LinCVS is a graphical Interface for the cvs client commandline tool on the Unix and Windows platform. It allows ato load modules from a server (checkout), create modules on the server (import), as well as checking the state of directories and individual files or updating them. Basic operations like add, remove and commit are supported as matter of course, just like showing the actual differences between the server version and the local sandbox, graphical display of the version tree, and manifoldy graphical support of project maintenance. All actions are logged on the cvs server (configurable via history), and are therewith comprehensible.
+LinCVS is a graphical Interface for the cvs client commandline tool. It allows
+ato load modules from a server (checkout), create modules on the server
+(import), as well as checking the state of directories and individual files or
+updating them. Basic operations like add, remove and commit are supported as
+matter of course, just like showing the actual differences between the server
+version and the local sandbox, graphical display of the version tree, and
+manifoldy graphical support of project maintenance. All actions are logged on
+the cvs server (configurable via history), and are therewith comprehensible.
 
-To keep LinCVS independant of the cvs version, LinCVS uses the local but separat installed cvs and therewith always should work with the latest version.
+To keep LinCVS independant of the cvs version, LinCVS uses the local but
+separately installed cvs and should always work with the latest version.
 
 
 %prep
@@ -29,7 +37,7 @@
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 qmake -o Makefile lincvs.pro
 make %{?_smp_mflags}
-  
+
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -45,7 +53,7 @@
 
 desktop-file-install --vendor fedora                \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   \
-  --add-category X-Fedora-Extra	                    \
+  --add-category X-Fedora-Extra                     \
   %{SOURCE2}
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/apachetop/devel apachetop.spec,1.5,1.6
Message-ID: <200503052110.j25LAM8o010784@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	apachetop.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: apachetop.spec
===================================================================
RCS file: /cvs/extras/rpms/apachetop/devel/apachetop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apachetop.spec	11 Nov 2004 11:14:06 -0000	1.5
+++ apachetop.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           apachetop
 Version:        0.12
 Release:        2
-Summary:        A top-like display of Apache logs
+Summary:        Top-like display of Apache logs
 
 Group:          Applications/Internet
 License:        BSD
@@ -38,7 +38,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE ChangeLog README TODO
 %{_sbindir}/*



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/libxml++/devel libxml++.spec,1.5,1.6
Message-ID: <200503052110.j25LAPgb011195@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libxml++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libxml++/devel

Modified Files:
	libxml++.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libxml++.spec	3 Mar 2005 22:41:32 -0000	1.5
+++ libxml++.spec	5 Mar 2005 21:10:22 -0000	1.6
@@ -7,7 +7,7 @@
 URL: http://libxmlplusplus.sourceforge.net/
 Source: http://dl.sf.net/libxmlplusplus/libxml++-0.26.0.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libxml2-devel >= 0:2.5.1, doxygen, graphviz
+BuildRequires: libxml2-devel >= 2.5.1, doxygen, graphviz
 
 %description
 libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-MailTools/devel perl-MailTools.spec,1.7,1.8
Message-ID: <200503052110.j25LAPFf011256@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-MailTools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-MailTools/devel

Modified Files:
	perl-MailTools.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-MailTools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-MailTools.spec	3 Mar 2005 23:46:27 -0000	1.7
+++ perl-MailTools.spec	5 Mar 2005 21:10:23 -0000	1.8
@@ -86,5 +86,5 @@
 - Modified Summary according to Michael Schwendt suggestion
 - Modified tarball permissions to 0644
 
-* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 
+* Sun Jun 15 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libsamplerate/devel libsamplerate.spec,1.7,1.8
Message-ID: <200503052110.j25LAOLO011187@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libsamplerate.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libsamplerate.spec
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/devel/libsamplerate.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libsamplerate.spec	5 Mar 2005 01:48:09 -0000	1.7
+++ libsamplerate.spec	5 Mar 2005 21:10:22 -0000	1.8
@@ -1,18 +1,18 @@
-Summary: 	Sample rate conversion library for audio data
-Name: 		libsamplerate
-Version: 	0.1.2
-Release: 	2
-License: 	GPL
-Group: 		System Environment/Libraries
-URL: 		http://www.mega-nerd.com/SRC/
-Source0: 	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Summary:	Sample rate conversion library for audio data
+Name:		libsamplerate
+Version:	0.1.2
+Release:	2
+License:	GPL
+Group:		System Environment/Libraries
+URL:		http://www.mega-nerd.com/SRC/
+Source0:	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 BuildRequires:	libsndfile-devel >= 1.0.6 pkgconfig
 
 %package devel
-Summary: 	Development related files for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{version}-%{release} pkgconfig
+Summary:	Development related files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release} pkgconfig
 
 
 %description
@@ -37,7 +37,7 @@
 
 %build
 %configure --disable-dependency-tracking --disable-fftw
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -93,5 +93,5 @@
 * Wed Jun 25 2003 Dams <anvil[AT]livna.org> 0:0.0.15-0.fdr.2
 - Added some more doc
 
-* Thu May 22 2003 Dams <anvil[AT]livna.org> 
+* Thu May 22 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/bbkeys/devel bbkeys.spec,1.5,1.6
Message-ID: <200503052110.j25LAMD9010812@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	bbkeys.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: bbkeys.spec
===================================================================
RCS file: /cvs/extras/rpms/bbkeys/devel/bbkeys.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bbkeys.spec	16 Nov 2004 17:10:21 -0000	1.5
+++ bbkeys.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -1,6 +1,3 @@
-# $Id$
-# Authority: matthias
-
 Summary: Completely configurable key-combo grabber for blackbox
 Name: bbkeys
 Version: 0.8.6
@@ -40,16 +37,16 @@
 %{__rm} -rf %{buildroot}
 
 
-%files 
-%defattr(-, root, root, 0755) 
+%files
+%defattr(-, root, root, 0755)
 %doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 %{_bindir}/*
 %dir %{_datadir}/bbtools
 %config %{_datadir}/bbtools/*
 %{_mandir}/man?/*
 
- 
-%changelog 
+
+%changelog
 * Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 0.8.6-4
 - Bump release to provide Extras upgrade path.
 
@@ -84,8 +81,8 @@
 - added to file list for newly included files (docs and man pages)
 - install to %{prefix} instead of /usr
 
-* Sun May 6 2001 Hollis Blanchard <hollis at terraplex.com> 
-- removed file list in favor of explicit %files section 
-- install to /usr instead of /usr/local 
+* Sun May 6 2001 Hollis Blanchard <hollis at terraplex.com>
+- removed file list in favor of explicit %files section
+- install to /usr instead of /usr/local
 - buildroot = /var/tmp/bbkeys-buildroot instead of /tmp/buildroot
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/directfb/devel directfb.spec,1.1,1.2
Message-ID: <200503052110.j25LAN0m010886@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	directfb.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: directfb.spec
===================================================================
RCS file: /cvs/extras/rpms/directfb/devel/directfb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- directfb.spec	31 Dec 2004 17:36:32 -0000	1.1
+++ directfb.spec	5 Mar 2005 21:10:21 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           directfb
 Version:        0.9.21
-Release:        0.fdr.1.3
-Summary:        Graphics abstraction library for the Linux Framebuffer Device.
+Release:        1
+Summary:        Graphics abstraction library for the Linux Framebuffer Device
 
 Group:          System/Libraries
 License:        GPL
@@ -13,11 +13,11 @@
 BuildRequires:  zlib-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  freetype-devel
-BuildRequires:	SDL-devel
+BuildRequires:  SDL-devel
 # libtool
-BuildRequires:	gcc-c++
+BuildRequires:  gcc-c++
 
-%define oname	DirectFB
+%define oname   DirectFB
 
 %description
 DirectFB is a thin library that provides hardware graphics acceleration,
@@ -25,10 +25,10 @@
 support for translucent windows and multiple display layers on top of the
 Linux Framebuffer Device.
 
-It is a complete hardware abstraction layer with software fallbacks for 
+It is a complete hardware abstraction layer with software fallbacks for
 every graphics operation that is not supported by the underlying hardware.
-DirectFB adds graphical power to embedded systems and sets a new standard 
-for graphics under Linux. 
+DirectFB adds graphical power to embedded systems and sets a new standard
+for graphics under Linux.
 
 %package        devel
 Summary:        Development package for %{name}
@@ -51,12 +51,12 @@
 %else
 	--disable-mmx \
 %endif
-        --disable-maintainer-mode \
-        --enable-shared \
-        --enable-static \
-        --enable-fast-install \
-        --disable-avifile \
-        --disable-debug \
+	--disable-maintainer-mode \
+	--enable-shared \
+	--enable-static \
+	--enable-fast-install \
+	--disable-avifile \
+	--disable-debug \
 	--with-gfxdrivers=\
 ati128,cle266,cyber5k,i810,mach64,matrox,\
 neomagic,nsc,nvidia,radeon,savage,\



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/inkscape/devel inkscape.spec,1.5,1.6
Message-ID: <200503052110.j25LAOof011065@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	inkscape.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- inkscape.spec	10 Feb 2005 04:14:11 -0000	1.5
+++ inkscape.spec	5 Mar 2005 21:10:22 -0000	1.6
@@ -43,7 +43,7 @@
 
 It has a relatively modern display engine, giving you finely antialiased
 display, alpha transparencies, vector fonts and so on. Inkscape is written in
-C and C++, using the Gtk+ toolkit and optionally some Gnome libraries. 
+C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
 
 
 %prep
@@ -110,7 +110,7 @@
 
 * Thu Nov 11 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.39-0.fdr.2
 - post/postun for new mime system.
-- Dropped redundant BR XFree86-devel. 
+- Dropped redundant BR XFree86-devel.
 
 * Sun Aug 29 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.39-0.fdr.1
 - 0.39.
@@ -128,9 +128,9 @@
 - version upgrade with many improvements and bug fixes
 
 * Fri Mar 19 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.7
-- repsin - sourceforge does not allow reloading files with same name 
+- repsin - sourceforge does not allow reloading files with same name
 * Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.6
-- fix typo in provides 
+- fix typo in provides
 * Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.5
 - add %{release} to provides perl(SpSVG) = %{epoch}:%{version}:%{release} only
 * Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.4
@@ -146,10 +146,10 @@
 - enable inkjar
 * Tue Feb 10  2004 P Linnell <scribusdocs at atlantictechsolutions.com>   0:0.37.0.fdr.1
 - pgp'd tarball from inkscape.org
-- clean out the cvs tweaks in spec file 
+- clean out the cvs tweaks in spec file
 - enable gnome-print
 - add the new tutorial files
-- make sure .mo file gets packaged 
+- make sure .mo file gets packaged
 - add provides: perlSVG
 - submit to Fedora QA
 * Sat Feb 7  2004 P Linnell <scribusdocs at atlantictechsolutions.com>



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/pcsc-lite/devel pcsc-lite.spec,1.2,1.3
Message-ID: <200503052110.j25LAPBE011240@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pcsc-lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/pcsc-lite/devel

Modified Files:
	pcsc-lite.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcsc-lite.spec	3 Mar 2005 23:53:13 -0000	1.2
+++ pcsc-lite.spec	5 Mar 2005 21:10:23 -0000	1.3
@@ -12,7 +12,7 @@
 Patch0:         %{name}-docinst.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{__perl}, flex, libusb-devel >= 0:0.1.6
+BuildRequires:  %{__perl}, flex, libusb-devel >= 0.1.6
 Requires:       chkconfig, pcsc-ifd-handler
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libfwbuilder/devel libfwbuilder.spec,1.4,1.5
Message-ID: <200503052110.j25LAOuu011126@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libfwbuilder.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libfwbuilder.spec	3 Mar 2005 18:04:58 -0000	1.4
+++ libfwbuilder.spec	5 Mar 2005 21:10:22 -0000	1.5
@@ -1,21 +1,21 @@
 Name:           libfwbuilder
-Summary: 	Firewall Builder API
+Summary:        Firewall Builder API
 Version:        2.0.6
 Release:        1
-License: 	GPL
-Group:  	System Environment/Libraries
-Url: 		http://www.fwbuilder.org/
-Source: 	%{name}-%{version}.tar.gz
+License:        GPL
+Group:          System Environment/Libraries
+URL:            http://www.fwbuilder.org/
+Source:         %{name}-%{version}.tar.gz
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  qt-devel >= 1:3.0.0
-BuildRequires:	libxslt-devel
+BuildRequires:  libxslt-devel
 BuildRequires:  openssl-devel
 #BuildRequires:  net-snmp-devel
 
-%description 
+%description
 Firewall Builder API library and compiler framework
 
-%files 
+%files
 %defattr(-,root,root)
 %doc doc/AUTHORS doc/COPYING doc/ChangeLog doc/Credits doc/README doc/PatchAcceptancePolicy.txt
 %dir %{_datadir}/libfwbuilder
@@ -26,7 +26,7 @@
 
 %package devel
 Summary:   Firewall Builder API Libraries and Header Files
-Group: 	   Development/Libraries
+Group:     Development/Libraries
 Requires:  %{name} = %{version}-%{release}
 Requires: libxslt-devel
 Requires: openssl-devel
@@ -42,7 +42,7 @@
 %{_includedir}/fwb-2.0/fwcompiler
 
 
-%prep 
+%prep
 %setup -q
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libgnomecanvasmm26/devel libgnomecanvasmm.spec,1.3,1.4
Message-ID: <200503052110.j25LAOic011147@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libgnomecanvasmm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgnomecanvasmm.spec	3 Mar 2005 22:41:32 -0000	1.3
+++ libgnomecanvasmm.spec	5 Mar 2005 21:10:22 -0000	1.4
@@ -11,8 +11,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  gtkmm24-devel >= 0:2.4.0
-BuildRequires:  libgnomecanvas-devel >= 0:2.6.0
+BuildRequires:  gtkmm24-devel >= 2.4.0
+BuildRequires:  libgnomecanvas-devel >= 2.6.0
 
 %description
 This package provides a C++ interface for GnomeUI.  It is a subpackage



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-Net-Server/devel perl-Net-Server.spec,1.6,1.7
Message-ID: <200503052110.j25LAPip011269@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-Server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-Net-Server/devel

Modified Files:
	perl-Net-Server.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/perl-Net-Server.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Net-Server.spec	3 Mar 2005 23:46:27 -0000	1.6
+++ perl-Net-Server.spec	5 Mar 2005 21:10:23 -0000	1.7
@@ -22,7 +22,7 @@
 end layer of internet protocol servers.
 
 %prep
-%setup -n %{rname}-%{version} 
+%setup -n %{rname}-%{version}
 
 %build
 CFLAGS="%{optflags}" %{__perl} Makefile.PL \
@@ -41,7 +41,7 @@
 %check || :
 make test
 
-%clean 
+%clean
 rm -fr %{buildroot}
 
 %files



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/fluxconf/devel fluxconf.spec,1.4,1.5
Message-ID: <200503052110.j25LANaG010926@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	fluxconf.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: fluxconf.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/devel/fluxconf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fluxconf.spec	3 Mar 2005 20:33:53 -0000	1.4
+++ fluxconf.spec	5 Mar 2005 21:10:21 -0000	1.5
@@ -3,7 +3,7 @@
 Release:	1
 Summary:	Configuration utility for fluxbox
 
-Group:		User Interface/Desktops 
+Group:		User Interface/Desktops
 License:	GPL
 URL:		http://devaux.fabien.free.fr/flux
 
@@ -20,7 +20,7 @@
 
 Fluxbox graphical configuration utilities:
 fluxconf: a general configuration tool
-fluxkeys: keyboard shortcut configuration tool  
+fluxkeys: keyboard shortcut configuration tool
 fluxmenu: menu configuration tool using drag & drop
 
 %prep
@@ -40,7 +40,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %makeinstall     bindir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/bin \
-                 mandir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/man 
+                 mandir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/man
 
 cd $RPM_BUILD_ROOT/%{_prefix}/X11R6/bin
 rm -f fluxkeys fluxmenu fluxbare
@@ -62,5 +62,5 @@
 %{_prefix}/share/locale/fr/LC_MESSAGES/%{name}.mo
 
 %changelog
-* Tue Jan 13 2004 Arnaud Ab?lard <arny at arny.org> 
+* Tue Jan 13 2004 Arnaud Ab?lard <arny at arny.org>
 - Initial release



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gnofract4d/devel gnofract4d.spec,1.4,1.5
Message-ID: <200503052110.j25LANv4010975@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gnofract4d.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gnofract4d.spec
===================================================================
RCS file: /cvs/extras/rpms/gnofract4d/devel/gnofract4d.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnofract4d.spec	13 Feb 2005 17:33:51 -0000	1.4
+++ gnofract4d.spec	5 Mar 2005 21:10:21 -0000	1.5
@@ -11,16 +11,16 @@
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 # This *really* requires gcc at runtime!
-Requires:	gcc
+Requires:       gcc
 BuildRequires:  desktop-file-utils, python-devel
-BuildRequires:	scrollkeeper, libgnomeui-devel
+BuildRequires:  scrollkeeper, libgnomeui-devel
 
 %description
-Gnofract 4D is a Gnome-based program to draw fractals. What sets it apart from 
-other fractal programs (and makes it "4D") is the way that it treats the 
-Mandelbrot and Julia sets as different views of the same four-dimensional 
-fractal object. This allows you to generate images which are a cross between 
-the two sets and explore their inter-relationships. 
+Gnofract 4D is a Gnome-based program to draw fractals. What sets it apart from
+other fractal programs (and makes it "4D") is the way that it treats the
+Mandelbrot and Julia sets as different views of the same four-dimensional
+fractal object. This allows you to generate images which are a cross between
+the two sets and explore their inter-relationships.
 
 %prep
 %setup -q
@@ -61,7 +61,7 @@
 /usr/bin/scrollkeeper-update 2> /dev/null
 /usr/bin/update-desktop-database %{_datadir}/applications
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/*



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-Convert-UUlib/devel perl-Convert-UUlib.spec,1.6,1.7
Message-ID: <200503052110.j25LAP5L011244@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Convert-UUlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-Convert-UUlib/devel

Modified Files:
	perl-Convert-UUlib.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/perl-Convert-UUlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Convert-UUlib.spec	3 Mar 2005 23:46:26 -0000	1.6
+++ perl-Convert-UUlib.spec	5 Mar 2005 21:10:23 -0000	1.7
@@ -12,8 +12,8 @@
 Source:    http://www.cpan.org/authors/id/M/ML/MLEHMANN/%{rname}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: perl >= 0:5.8.0
-Requires:      perl >= 0:5.8.0
+BuildRequires: perl >= 5.8.0
+Requires:      perl >= 5.8.0
 
 %description
 A perl interface to the uulib library (a.k.a. uudeview/uuenview)



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/convmv/devel convmv.spec,1.2,1.3
Message-ID: <200503052110.j25LAMKi010862@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	convmv.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: convmv.spec
===================================================================
RCS file: /cvs/extras/rpms/convmv/devel/convmv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- convmv.spec	15 Jan 2005 09:22:40 -0000	1.2
+++ convmv.spec	5 Mar 2005 21:10:20 -0000	1.3
@@ -1,4 +1,4 @@
-Summary: Convert filename encodings.
+Summary: Convert filename encodings
 Name: convmv
 Version: 1.08
 Release: 2



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/anjuta/devel anjuta.spec,1.7,1.8
Message-ID: <200503052110.j25LAM2O010772@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	anjuta.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- anjuta.spec	3 Mar 2005 19:29:59 -0000	1.7
+++ anjuta.spec	5 Mar 2005 21:10:20 -0000	1.8
@@ -10,11 +10,11 @@
 Source0:        http://download.sourceforge.net/anjuta/anjuta-1.2.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgnomeui-devel >= 0:2.0.2
-BuildRequires:  libbonoboui-devel >= 0:2.0.1
+BuildRequires:  libgnomeui-devel >= 2.0.2
+BuildRequires:  libbonoboui-devel >= 2.0.1
 BuildRequires:  libgnomeprintui22-devel
-BuildRequires:  ncurses-devel >= 0:5.0
-BuildRequires:  pcre-devel >= 0:3.9
+BuildRequires:  ncurses-devel >= 5.0
+BuildRequires:  pcre-devel >= 3.9
 BuildRequires:  vte-devel
 BuildRequires:  scrollkeeper
 BuildRequires:  libtool
@@ -37,9 +37,9 @@
 
 
 %package        docs
-Summary:        Anjuta documentations package.
+Summary:        Anjuta documentation
 Group:          Development/Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description docs
 Anjuta documentations.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gtkglarea2/devel gtkglarea2.spec,1.7,1.8
Message-ID: <200503052110.j25LANrS011036@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gtkglarea2.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gtkglarea2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglarea2/devel/gtkglarea2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkglarea2.spec	3 Mar 2005 23:12:24 -0000	1.7
+++ gtkglarea2.spec	5 Mar 2005 21:10:21 -0000	1.8
@@ -1,13 +1,13 @@
-Summary:	An OpenGL GTK widget
-Name: 		gtkglarea2
+Summary:	OpenGL GTK widget
+Name:		gtkglarea2
 Version:	1.99.0
-Release: 	1
+Release:	1
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea
 # ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/
-Source0: 	ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/1.99/gtkglarea-1.99.0.tar.bz2
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/1.99/gtkglarea-1.99.0.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	pkgconfig, xorg-x11-devel
 BuildRequires:	gtk2-devel
 
@@ -74,5 +74,5 @@
 * Tue May  6 2003 Dams <anvil[AT]livna.org> 0:1.99.0-0.fdr.2
 - buildroot -> RPM_BUILD_ROOT
 
-* Wed Apr 23 2003 Dams <anvil[AT]livna.org> 
+* Wed Apr 23 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/opensc/devel opensc.spec,1.3,1.4
Message-ID: <200503052110.j25LAPW6011232@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	opensc.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- opensc.spec	9 Feb 2005 02:35:04 -0000	1.3
+++ opensc.spec	5 Mar 2005 21:10:23 -0000	1.4
@@ -69,7 +69,7 @@
   iconv -f iso-8859-1 -t utf-8 $file > $file.utf-8 ; mv $file.utf-8 $file
 done
 sh ./bootstrap # for patch0
-# Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms. 
+# Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms.
 sed -i -e 's!/lib/libcrypto!/%{_lib}/libcrypto!g' configure
 sed -i -e 's!openssldir/lib !openssldir/%{_lib} !g' configure
 
@@ -180,7 +180,7 @@
 
 %changelog
 * Wed Feb  9 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.4-2
-- Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms. 
+- Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms.
 - Use --with-plugin-dir instead of --with-plugin-path (fixes x86_64).
 
 * Thu Feb  3 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.4-1



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/galculator/devel galculator.spec,1.3,1.4
Message-ID: <200503052110.j25LANhF010937@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	galculator.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: galculator.spec
===================================================================
RCS file: /cvs/extras/rpms/galculator/devel/galculator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- galculator.spec	29 Nov 2004 00:42:15 -0000	1.3
+++ galculator.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -1,7 +1,7 @@
 Name:           galculator
 Version:        1.2.4
 Release:        2
-Summary:        GTK 2 based scientific calculator.
+Summary:        GTK 2 based scientific calculator
 
 Group:          Applications/Engineering
 License:        GPL
@@ -13,10 +13,10 @@
 BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  libglade2-devel
-BuildRequires:	perl-XML-Parser
+BuildRequires:  perl(XML::Parser)
 
 %description
-galculator is a GTK 2 based scientific calculator with "ordinary" and reverse 
+galculator is a GTK 2 based scientific calculator with "ordinary" and reverse
 polish notation.
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/pam_mount/devel pam_mount.spec,1.2,1.3
Message-ID: <200503052110.j25LAPUm011236@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	pam_mount.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: pam_mount.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam_mount.spec	2 Feb 2005 14:10:19 -0000	1.2
+++ pam_mount.spec	5 Mar 2005 21:10:23 -0000	1.3
@@ -1,4 +1,4 @@
-Summary: A PAM module that can mount volumes for a user session
+Summary: PAM module that can mount volumes for a user session
 Name: pam_mount
 Version: 0.9.16
 Release: 1
@@ -11,12 +11,12 @@
 BuildRequires: glib2-devel pam-devel openssl-devel zlib-devel
 
 %description
-This module is aimed at environments with SMB (Samba or Windows NT) 
-or NCP (Netware or Mars-NWE) servers that Unix users wish to access 
-transparently. It facilitates access to private volumes of these types 
-well. The module also supports mounting home directories using 
-loopback encrypted filesystems. The module was originally written for 
-use on the GNU/Linux operating system but has since been modified to 
+This module is aimed at environments with SMB (Samba or Windows NT)
+or NCP (Netware or Mars-NWE) servers that Unix users wish to access
+transparently. It facilitates access to private volumes of these types
+well. The module also supports mounting home directories using
+loopback encrypted filesystems. The module was originally written for
+use on the GNU/Linux operating system but has since been modified to
 work on several flavors of BSD.
 
  o Every user can access his own volumes
@@ -27,21 +27,21 @@
 
  o There is no need to keep the login passwords in any additional file
 
- o The volumes are unmounted upon logout, so it saves system resources, 
- avoiding the need of listing every every possibly useful remote 
- volume in /etc/fstab or in an automount/supermount config file. This 
+ o The volumes are unmounted upon logout, so it saves system resources,
+ avoiding the need of listing every every possibly useful remote
+ volume in /etc/fstab or in an automount/supermount config file. This
  is also necessary for securing encrypted filesystems.
 
-Pam_mount "understands" SMB, NCP, and any type of filesystem that can 
-be mounted using the standard mount command. If someone has a 
-particular need for a different filesystem, feel free to ask me to 
+Pam_mount "understands" SMB, NCP, and any type of filesystem that can
+be mounted using the standard mount command. If someone has a
+particular need for a different filesystem, feel free to ask me to
 include it and send me patches.
 
-If you intend to use pam_mount to protect volumes on your computer 
-using an encrypted filesystem system, please know that there are many 
-other issues you need to consider in order to protect your data. 
-For example, you probably want to disable or encrypt your swap 
-partition (the cryptoswap can help you do this). Don't assume a 
+If you intend to use pam_mount to protect volumes on your computer
+using an encrypted filesystem system, please know that there are many
+other issues you need to consider in order to protect your data.
+For example, you probably want to disable or encrypt your swap
+partition (the cryptoswap can help you do this). Don't assume a
 system is secure without carefully considering potential threats.
 
 
@@ -70,6 +70,7 @@
 
 %files
 %defattr(-, root, root)
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README FAQ
 /%{_lib}/security/pam_mount.so
 /%{_lib}/security/pam_mount_auth.so
 /%{_lib}/security/pam_mount_session.so
@@ -81,9 +82,6 @@
 %config(noreplace) %{_sysconfdir}/security/pam_mount.conf
 
 
-%doc	AUTHORS COPYING ChangeLog INSTALL NEWS README FAQ
-
-
 %changelog
 * Tue Mar 23 2004 W. Michael Petullo <mike[@]flyn.org> - 0.9.16-0.fdr.1
    - Updated to pam_mount 0.9.16.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-Test-Manifest/devel perl-Test-Manifest.spec,1.5,1.6
Message-ID: <200503052110.j25LAPDP011274@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Test-Manifest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-Test-Manifest/devel

Modified Files:
	perl-Test-Manifest.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-Test-Manifest.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/perl-Test-Manifest.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-Manifest.spec	3 Mar 2005 23:46:28 -0000	1.5
+++ perl-Test-Manifest.spec	5 Mar 2005 21:10:23 -0000	1.6
@@ -55,7 +55,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes 
+%doc Changes
 %{perl_vendorlib}/Test/
 %{_mandir}/man3/*.3*
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/jhead/devel jhead.spec,1.7,1.8
Message-ID: <200503052110.j25LAO73011076@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	jhead.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: jhead.spec
===================================================================
RCS file: /cvs/extras/rpms/jhead/devel/jhead.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jhead.spec	13 Feb 2005 11:16:18 -0000	1.7
+++ jhead.spec	5 Mar 2005 21:10:22 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: Tool for displaying EXIF data embedded in JPEG images
 Group: Applications/Multimedia
 License: Public Domain
-URL: http://www.sentex.net/~mwandel/jhead/           
+URL: http://www.sentex.net/~mwandel/jhead/
 Source0: http://www.sentex.net/~mwandel/jhead/jhead-2.3.tar.gz
 Patch0: jhead-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gweled/devel gweled.spec,1.5,1.6
Message-ID: <200503052110.j25LANlX011046@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gweled.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gweled.spec
===================================================================
RCS file: /cvs/extras/rpms/gweled/devel/gweled.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gweled.spec	3 Mar 2005 21:26:03 -0000	1.5
+++ gweled.spec	5 Mar 2005 21:10:21 -0000	1.6
@@ -13,7 +13,7 @@
 BuildRequires:  libgnomeui-devel >= 2.0.0
 BuildRequires:  librsvg2-devel >= 2.0.0
 BuildRequires:  libcroco-devel >= 0.3.0
-BuildRequires:  desktop-file-utils 
+BuildRequires:  desktop-file-utils
 
 %description
 Gweled is a Gnome version of a popular PalmOS/Windows/Java game called
@@ -24,7 +24,7 @@
 
 %prep
 %setup -q
-%patch0  -p0 -b .patch0 
+%patch0  -p0 -b .patch0
 
 %build
 %configure
@@ -73,7 +73,7 @@
 
 * Thu Jan 15 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:0.4-0.fdr.2
 - Own dirs correctly
-- BuildRequires desktop-file-utils 
+- BuildRequires desktop-file-utils
 
 * Fri Jan 09 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:0.4-0.fdr.1
 - Update to 0.4



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/fwbuilder/devel fwbuilder.spec,1.5,1.6
Message-ID: <200503052110.j25LANvH010931@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	fwbuilder.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fwbuilder.spec	3 Mar 2005 18:08:57 -0000	1.5
+++ fwbuilder.spec	5 Mar 2005 21:10:21 -0000	1.6
@@ -21,14 +21,14 @@
 code. Several algorithms are provided for automated network objects
 discovery and bulk import of data. The GUI and policy compilers are
 completely independent, this provides for a consistent abstract model
-and the same GUI for different firewall platforms. 
+and the same GUI for different firewall platforms.
 
 %prep
-%setup -q 
+%setup -q
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-./configure --prefix=%{_prefix}	--with-templatedir=%{_datadir}/fwbuilder 
+./configure --prefix=%{_prefix}	--with-templatedir=%{_datadir}/fwbuilder
 make all
 
 %install
@@ -156,7 +156,7 @@
 - New upstream version
 
 * Sun Jan 23 2005 Warren Togami <wtogami at redhat.com> 2.0.5-3
-- Typo fix (#145887 Stefan Hoelldampf) 
+- Typo fix (#145887 Stefan Hoelldampf)
 
 * Sat Jan 22 2005 Warren Togami <wtogami at redhat.com> 2.0.5-2
 - minor spec cleanup



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/dhcp-forwarder/devel dhcp-forwarder.spec,1.6,1.7
Message-ID: <200503052110.j25LANHY010875@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/dhcp-forwarder/devel

Modified Files:
	dhcp-forwarder.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dhcp-forwarder.spec	3 Mar 2005 20:20:14 -0000	1.6
+++ dhcp-forwarder.spec	5 Mar 2005 21:10:21 -0000	1.7
@@ -243,5 +243,5 @@
 * Thu Jun 13 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0.1-0.3
 - Added --without dietlibc option
 
-* Sat Jun  1 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 
+* Sat Jun  1 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/djvulibre/devel djvulibre.spec,1.6,1.7
Message-ID: <200503052110.j25LANBY010892@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	djvulibre.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: djvulibre.spec
===================================================================
RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- djvulibre.spec	14 Feb 2005 11:31:45 -0000	1.6
+++ djvulibre.spec	5 Mar 2005 21:10:21 -0000	1.7
@@ -1,6 +1,3 @@
-# $Id$
-# Authority: matthias
-
 Summary: DjVu viewers, encoders and utilities
 Name: djvulibre
 Version: 3.5.14
@@ -16,7 +13,7 @@
 Provides: mozilla-djvulibre = %{version}-%{release}
 Provides: djvulibre-devel = %{version}-%{release}
 
-%description 
+%description
 DjVu is a web-centric format and software platform for distributing documents
 and images.  DjVu content downloads faster, displays and renders faster, looks
 nicer on a screen, and consume less client resources than competing formats.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/csmash/devel csmash.spec,1.4,1.5
Message-ID: <200503052110.j25LANC2010869@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	csmash.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: csmash.spec
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- csmash.spec	16 Nov 2004 17:29:28 -0000	1.4
+++ csmash.spec	5 Mar 2005 21:10:20 -0000	1.5
@@ -1,6 +1,3 @@
-# $Id$
-# Authority: matthias
-
 Summary: 3D tabletennis game
 Name: csmash
 Version: 0.6.6
@@ -16,8 +13,8 @@
 BuildRequires: gcc-c++, desktop-file-utils
 
 %description
-CannonSmash is a 3D tabletennis game. The goal of this project is to 
-represent various strategy of tabletennis on computer game. 
+CannonSmash is a 3D tabletennis game. The goal of this project is to
+represent various strategy of tabletennis on computer game.
 This program requires OpenGL and SDL. If your machine doesn't have 3D
 accelaration video card, this program runs very slowly.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/celestia/devel celestia.spec,1.5,1.6
Message-ID: <200503052110.j25LAMbW010829@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	celestia.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- celestia.spec	13 Nov 2004 22:10:04 -0000	1.5
+++ celestia.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           celestia
 Version:        1.3.2
 Release:        2
-Summary:        An OpenGL real-time visual space simulation
+Summary:        OpenGL real-time visual space simulation
 
 Group:          Amusements/Graphics
 License:        GPL
@@ -22,11 +22,11 @@
 Requires(preun): GConf2
 
 
-%description 
+%description
 Celestia is a real-time space simulation which lets you experience the
 universe in three dimensions. Celestia does not confine you to the
 surface of the Earth, it allows you to travel throughout the solar
-system, to any of over 100,000 stars, or even beyond the galaxy. 
+system, to any of over 100,000 stars, or even beyond the galaxy.
 
 Travel in Celestia is seamless; the exponential zoom feature lets
 you explore space across a huge range of scales, from galaxy clusters



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/fluxbox/devel fluxbox.spec,1.6,1.7
Message-ID: <200503052110.j25LANS6010920@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	fluxbox.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fluxbox.spec	13 Nov 2004 00:10:24 -0000	1.6
+++ fluxbox.spec	5 Mar 2005 21:10:21 -0000	1.7
@@ -1,13 +1,13 @@
 Name:		fluxbox
 Version:	0.9.9
 Release:	2
-Summary:	Fluxbox is a windowmanager that is based on Blackbox.
+Summary:	Window Manager based on Blackbox
 
-Group:          User Interface/Desktops 
+Group:		User Interface/Desktops
 License:	MIT
 URL:		http://fluxbox.sourceforge.net
 
-Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.9.tar.bz2 
+Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.9.tar.bz2
 Source1: Xclients.%{name}
 Source2: FluxBox
 Source3: fluxbox.desktop
@@ -18,8 +18,8 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:	XFree86-devel
-Buildrequires: zlib-devel
-Requires(post): chkfontpath
+Buildrequires:	zlib-devel
+Requires(post):   chkfontpath
 Requires(postun): chkfontpath
 
 
@@ -87,7 +87,7 @@
 
 tmp=`fgrep "<dir>%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka</dir>" %{_sysconfdir}/fonts/local.conf`
 if [ -z "$tmp" ];
-	then sed -i "s,</fontconfig>,<dir>%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka</dir>\n</fontconfig>," %{_sysconfdir}/fonts/local.conf 
+	then sed -i "s,</fontconfig>,<dir>%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka</dir>\n</fontconfig>," %{_sysconfdir}/fonts/local.conf
 fi
 
 %postun



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/galeon/devel galeon.spec,1.4,1.5
Message-ID: <200503052110.j25LANEo010942@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	galeon.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- galeon.spec	3 Mar 2005 21:26:02 -0000	1.4
+++ galeon.spec	5 Mar 2005 21:10:21 -0000	1.5
@@ -7,7 +7,7 @@
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-Requires:	scrollkeeper 
+Requires:	scrollkeeper
 Requires:	mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null)
 BuildRequires:	gettext mozilla-nspr-devel desktop-file-utils
 BuildRequires:	gtk2-devel >= 2.4.0



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/fbida/devel fbida.spec,1.5,1.6
Message-ID: <200503052110.j25LANRh010908@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	fbida.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fbida.spec	21 Feb 2005 17:19:10 -0000	1.5
+++ fbida.spec	5 Mar 2005 21:10:21 -0000	1.6
@@ -18,7 +18,7 @@
 %description
 fbi displays the specified file(s) on the linux console using the
 framebuffer device. PhotoCD, jpeg, ppm, gif, tiff, xwd, bmp and png
-are supported directly. For other formats fbi tries to use 
+are supported directly. For other formats fbi tries to use
 ImageMagick's convert.
 
 %package ida
@@ -26,7 +26,7 @@
 Summary: Motif based Imageviewer
 
 %description ida
-This is a X11 application (Motif based) for viewing images. Some basic 
+This is a X11 application (Motif based) for viewing images. Some basic
 editing functions are available too.
 
 %package fbgs
@@ -50,9 +50,9 @@
 iconv -t UTF-8 -f ISO-8859-1 ida.man > ida.man.new
 iconv -t UTF-8 -f ISO-8859-1 fbgs.man > fbgs.man.new
 %{__mv} fbi.man.new fbi.man
-%{__mv} exiftran.man.new exiftran.man 
-%{__mv} ida.man.new ida.man 
-%{__mv} fbgs.man.new fbgs.man 
+%{__mv} exiftran.man.new exiftran.man
+%{__mv} ida.man.new ida.man
+%{__mv} fbgs.man.new fbgs.man
 lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
 
 %clean
@@ -60,7 +60,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc Changes COPYING README TODO 
+%doc Changes COPYING README TODO
 %doc %{_mandir}/man1/fbi*
 %doc %{_mandir}/man1/exiftran*
 %{_bindir}/fbi



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gdeskcal/devel gdeskcal.spec,1.5,1.6
Message-ID: <200503052110.j25LANu6010952@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gdeskcal.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gdeskcal.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ gdeskcal.spec	5 Mar 2005 21:10:21 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           gdeskcal
 Version:        0.57.1
 Release:        3
-Summary:        Eye-candy calendar for your desktop. 
+Summary:        Eye-candy calendar for your desktop
 
 Group:          User Interface/Desktops
 License:        GPL



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gqview/devel gqview.spec,1.4,1.5
Message-ID: <200503052110.j25LANkx011008@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gqview.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gqview.spec	26 Feb 2005 23:00:44 -0000	1.4
+++ gqview.spec	5 Mar 2005 21:10:21 -0000	1.5
@@ -1,18 +1,18 @@
-Summary: 	Image browser and viewer
-Name: 		gqview
-Version: 	2.0.0
+Summary:	Image browser and viewer
+Name:		gqview
+Version:	2.0.0
 Release:	1
-License: 	GPL
-Group: 		User Interface/X
-Source: 	http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
+License:	GPL
+Group:		User Interface/X
+Source:		http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
 Patch1:		gqview-2.0.0-desktop.patch
 Patch2:		gqview-2.0.0-editors.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-URL: 		http://gqview.sourceforge.net/
-BuildRequires: 	gtk2-devel >= 0:2.4.0
-BuildRequires: 	gettext desktop-file-utils
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+URL:		http://gqview.sourceforge.net/
+BuildRequires:	gtk2-devel >= 2.4.0
+BuildRequires:	gettext desktop-file-utils
+Requires(post):		desktop-file-utils
+Requires(postun):	desktop-file-utils
 
 %description
 GQview is an image viewer for browsing through graphics files. GQview
@@ -149,7 +149,7 @@
 - use makeinstall macro
 
 * Mon Jul 29 2002 Karsten Hopp <karsten at redhat.de> 1.0.2-2
-- remove --add-only-show-in GNOME 
+- remove --add-only-show-in GNOME
 
 * Tue Jul 16 2002 Karsten Hopp <karsten at redhat.de> 1.0.2-1
 - update (#68838)
@@ -190,19 +190,24 @@
 * Wed Jul 7 1999 Michael Fulbright <drmike at redhat.com>
 - version 0.7.0
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
 - auto rebuild in the new build environment (release 3)
 
 * Fri Mar 19 1999 Michael Fulbright <drmike at redhat.com>
 - strip binaries
+
 * Sat Mar 6 1999 Michael Fulbright <drmike at redhat.com>
 - version 0.6.0
+
 * Wed Oct 7 1998 John Ellis <gqview at geocities.com>
 - updated for version 0.4.2
+
 * Fri Sep 11 1998 John Ellis <gqview at geocities.com>
 - updated for version 0.4.1
+
 * Sat Aug 15 1998 John Ellis <gqview at geocities.com>
 - updated for version 0.4.0
+
 * Wed Aug 5 1998 Joel Young <jyoung at erols.com>
 - enhanced rpm .spec file
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gnome-cpufreq-applet/devel gnome-cpufreq-applet.spec,1.1,1.2
Message-ID: <200503052110.j25LANlD010980@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnome-cpufreq-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gnome-cpufreq-applet/devel

Modified Files:
	gnome-cpufreq-applet.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gnome-cpufreq-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-cpufreq-applet/devel/gnome-cpufreq-applet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-cpufreq-applet.spec	15 Feb 2005 13:14:09 -0000	1.1
+++ gnome-cpufreq-applet.spec	5 Mar 2005 21:10:21 -0000	1.2
@@ -38,7 +38,7 @@
 %find_lang %{name}
 
 ### Clean up buildroot
-%{__rm} -rf %{buildroot}%{_localstatedir}/scrollkeeper/ 
+%{__rm} -rf %{buildroot}%{_localstatedir}/scrollkeeper/
 
 %post
 scrollkeeper-update -q || :
@@ -46,7 +46,7 @@
 gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas &>/dev/null
 
-%preun 
+%preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
 	%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas >/dev/null || :



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/cfengine/devel cfengine.spec,1.7,1.8
Message-ID: <200503052110.j25LAM7b010840@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	cfengine.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cfengine.spec	3 Mar 2005 20:08:36 -0000	1.7
+++ cfengine.spec	5 Mar 2005 21:10:20 -0000	1.8
@@ -52,7 +52,7 @@
 
 # It's ugly, but thats the way Mark wants to have it. :(
 # If we don't create this link, cfexecd will not be able to start
-# (hardcoded) /var/sbin/cfagent in scheduled intervals. Other option 
+# (hardcoded) /var/sbin/cfagent in scheduled intervals. Other option
 # would be to patch cfengine to use %{_sbindir}/cfagent
 mkdir -p $RPM_BUILD_ROOT/var/cfengine/bin
 ln -sf %{_sbindir}/cfagent $RPM_BUILD_ROOT/var/cfengine/bin/
@@ -77,7 +77,7 @@
 #
 # All this stuff is pushed into doc directory.
 #
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} 
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 
 %post
@@ -187,7 +187,7 @@
 * Wed Apr 09 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:2.0.6-0.fdr.2
 - fixed URL
 - removed Requires as redundant
-- remove %{_infodir}/dir from package, if it would exist 
+- remove %{_infodir}/dir from package, if it would exist
   (which is not the case in RH8)
 
 * Wed Apr 09 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:2.0.6-0.fdr.1
@@ -207,14 +207,14 @@
 - new upstream version.
 
 * Thu Jun 20 2002 Juha Ylitalo <juha.ylitalo at iki.fi> - 2.0.2-4
-- added check that if we are doing initial install 
+- added check that if we are doing initial install
   (meaning that /mnt/sysimage is mounted), there is no point at
   running cfkey until system boots up with correct root directory
 
 * Thu Jun 13 2002 Juha Ylitalo <juha.ylitalo at iki.fi> - 2.0.2-3
 - fixed revision numberings to go on in sensible way
 - added missing man page
-- changed cfexecd and cfservd to start later 
+- changed cfexecd and cfservd to start later
   (assuming your using chkconfig for setting things)
 - additional check in cfexecd start() for making sure that local cfkeys
   have been created.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/kernel-module-devel-2.6.8-1.521/devel kernel-module-devel.spec,
	1.1, 1.2
Message-ID: <200503052110.j25LAOg2011084@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kernel-module-devel-2.6.8-1.521/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/kernel-module-devel-2.6.8-1.521/devel

Modified Files:
	kernel-module-devel.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: kernel-module-devel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel-module-devel-2.6.8-1.521/devel/kernel-module-devel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kernel-module-devel.spec	8 Nov 2004 04:39:33 -0000	1.1
+++ kernel-module-devel.spec	5 Mar 2005 21:10:22 -0000	1.2
@@ -5,8 +5,8 @@
 
 Name:           kernel-module-devel-%{krel}
 Version:        0.5
-Release:        0.fdr.1
-Summary:        Build files for all kernel arch/types for %{krel} 
+Release:        1
+Summary:        Build files for all kernel arch/types for %{krel}
 
 Group:          System Environment/Kernel
 License:        GPL



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad.spec, 1.5,
	1.6
Message-ID: <200503052110.j25LAO8q011090@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kernel-module-thinkpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/kernel-module-thinkpad/devel

Modified Files:
	kernel-module-thinkpad.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: kernel-module-thinkpad.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kernel-module-thinkpad.spec	3 Mar 2005 21:56:40 -0000	1.5
+++ kernel-module-thinkpad.spec	5 Mar 2005 21:10:22 -0000	1.6
@@ -28,7 +28,7 @@
 ExclusiveArch:  i586 i686
 BuildRequires:  bash, %{__perl}, MAKEDEV
 %if ! %{ksrcprv}
-BuildRequires:  kernel-source = 0:%(%kmh -- verrel)
+BuildRequires:  kernel-source = %(%kmh -- verrel)
 %endif
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/SoQt/devel SoQt.spec,1.3,1.4
Message-ID: <200503052110.j25LAMhn010726@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	SoQt.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: SoQt.spec
===================================================================
RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SoQt.spec	10 Dec 2004 22:03:01 -0000	1.3
+++ SoQt.spec	5 Mar 2005 21:10:20 -0000	1.4
@@ -1,8 +1,7 @@
-%define _includedir		%{expand:%%(coin-config --includedir)}
+%define _includedir %{expand:%%(coin-config --includedir)}
 
-Summary: A high-level 3D visualization library.
+Summary: High-level 3D visualization library
 Name: SoQt
-Epoch: 0
 Version: 1.2.0
 Release: 1
 
@@ -27,7 +26,7 @@
 
 %package devel
 Summary: Development files for SoQt
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: autoconf
 Requires: Coin2-devel qt-devel
 Group: Development/Libraries



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/lib3ds/devel lib3ds.spec,1.4,1.5
Message-ID: <200503052110.j25LAOsS011102@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	lib3ds.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/devel/lib3ds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lib3ds.spec	3 Mar 2005 22:41:31 -0000	1.4
+++ lib3ds.spec	5 Mar 2005 21:10:22 -0000	1.5
@@ -14,13 +14,13 @@
 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
 Summary:        %summary



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gtweakui/devel gtweakui.spec,1.3,1.4
Message-ID: <200503052110.j25LANOh011041@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gtweakui.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gtweakui.spec
===================================================================
RCS file: /cvs/extras/rpms/gtweakui/devel/gtweakui.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtweakui.spec	16 Nov 2004 17:44:40 -0000	1.3
+++ gtweakui.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -66,7 +66,7 @@
 %build
 %configure
 %{__make} %{?_smp_mflags}
-  
+
 
 %install
 %{__rm} -rf %{buildroot}



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/grip/devel grip.spec,1.3,1.4
Message-ID: <200503052110.j25LANrf011014@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	grip.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grip.spec	2 Mar 2005 18:40:35 -0000	1.3
+++ grip.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -1,4 +1,4 @@
-Summary: A front-end for CD rippers and Ogg Vorbis encoders
+Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
 Release: 4
@@ -92,7 +92,7 @@
 - rebuilt
 - add vte-devel to BuildRequires
 
-* Sun Jun 20 2004 Karsten Hopp <karsten at redhat.de> 3.2.0-1 
+* Sun Jun 20 2004 Karsten Hopp <karsten at redhat.de> 3.2.0-1
 - update to latest stable version
 - remove obsolete locking and cdparanoia patches
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libcddb/devel libcddb.spec,1.6,1.7
Message-ID: <200503052110.j25LAOIK011114@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libcddb.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libcddb.spec	3 Mar 2005 22:41:31 -0000	1.6
+++ libcddb.spec	5 Mar 2005 21:10:22 -0000	1.7
@@ -68,6 +68,6 @@
 - Added URL in Source0
 - Added additionnal files as doc
 
-* Tue Mar  9 2004 Dams <anvil[AT]livna.org> 
+* Tue Mar  9 2004 Dams <anvil[AT]livna.org>
 - Initial build.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/grisbi/devel grisbi.spec,1.4,1.5
Message-ID: <200503052110.j25LANvw011019@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	grisbi.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: grisbi.spec
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/grisbi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grisbi.spec	26 Feb 2005 16:59:55 -0000	1.4
+++ grisbi.spec	5 Mar 2005 21:10:21 -0000	1.5
@@ -1,16 +1,16 @@
 %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help
-Name: 		grisbi
+Name:		grisbi
 Version:	0.5.5
-Release: 	2
-Summary: 	Personal finances manager
+Release:	2
+Summary:	Personal finances manager
 
-Group: 		Applications/Productivity
-License: 	GPL
-Url: 		http://www.grisbi.org
+Group:		Applications/Productivity
+License:	GPL
+URL:		http://www.grisbi.org
 Source0:	http://dl.sf.net/grisbi/%{name}-%{version}.tar.bz2
 Source1:	%{name}.desktop
 Patch0:		%{name}-%{version}-htmlview.diff
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel, libxml2-devel, glib2-devel, gettext
 BuildRequires:	desktop-file-utils, libofx-devel
@@ -31,7 +31,7 @@
 party, nice and easy user interface, user manual, QIF import/export.
 
 %prep
-%setup -q 
+%setup -q
 %patch0
 
 %build
@@ -39,7 +39,7 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT 
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 for lang in C de fr



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libebml/devel libebml.spec,1.7,1.8
Message-ID: <200503052110.j25LAObG011120@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libebml.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libebml.spec
===================================================================
RCS file: /cvs/extras/rpms/libebml/devel/libebml.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libebml.spec	27 Feb 2005 18:28:52 -0000	1.7
+++ libebml.spec	5 Mar 2005 21:10:22 -0000	1.8
@@ -65,7 +65,7 @@
 * Sun Feb 29 2004 Dams <anvil[AT]livna.org> 0:0.6.4-0.fdr.2
 - Added licenses file as doc
 
-* Thu Sep  4 2003 Dams <anvil[AT]livna.org> 
+* Thu Sep  4 2003 Dams <anvil[AT]livna.org>
 - Initial build.
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/giblib/devel giblib.spec,1.5,1.6
Message-ID: <200503052110.j25LANYk010970@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	giblib.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: giblib.spec
===================================================================
RCS file: /cvs/extras/rpms/giblib/devel/giblib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- giblib.spec	16 Nov 2004 17:11:57 -0000	1.5
+++ giblib.spec	5 Mar 2005 21:10:21 -0000	1.6
@@ -1,6 +1,3 @@
-# $Id$
-# Authority: matthias
-
 Summary: Simple library and a wrapper for imlib2
 Name: giblib
 Version: 1.2.4



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.1,1.2
Message-ID: <200503052110.j25LAP6C011298@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/php-eaccelerator/devel

Modified Files:
	php-eaccelerator.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-eaccelerator.spec	28 Jan 2005 16:22:52 -0000	1.1
+++ php-eaccelerator.spec	5 Mar 2005 21:10:23 -0000	1.2
@@ -25,7 +25,7 @@
 that the overhead of compiling is almost completely eliminated.
 
 
-%prep 
+%prep
 %setup -n eaccelerator
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gnugo/devel gnugo.spec,1.7,1.8
Message-ID: <200503052110.j25LANTF010996@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gnugo.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gnugo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnugo/devel/gnugo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnugo.spec	14 Feb 2005 10:14:52 -0000	1.7
+++ gnugo.spec	5 Mar 2005 21:10:21 -0000	1.8
@@ -27,13 +27,13 @@
 
 
 %build
-%configure --enable-color 
+%configure --enable-color
 make %{?_smp_mflags}
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make DESTDIR=${RPM_BUILD_ROOT} install 
+make DESTDIR=${RPM_BUILD_ROOT} install
 rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
 
 %clean



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/nethack-falconseye/devel nethack-falconseye.spec,1.7,1.8
Message-ID: <200503052110.j25LAP8N011215@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/nethack-falconseye/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/nethack-falconseye/devel

Modified Files:
	nethack-falconseye.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: nethack-falconseye.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-falconseye/devel/nethack-falconseye.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nethack-falconseye.spec	3 Mar 2005 23:01:24 -0000	1.7
+++ nethack-falconseye.spec	5 Mar 2005 21:10:23 -0000	1.8
@@ -21,7 +21,7 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel >= 0:1.2.2, byacc, flex, desktop-file-utils
+BuildRequires:  SDL-devel >= 1.2.2, byacc, flex, desktop-file-utils
 BuildRequires:  ImageMagick
 %if %{with_tty}
 BuildRequires:  ncurses-devel



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libgnomemm26/devel libgnomemm.spec,1.4,1.5
Message-ID: <200503052110.j25LAOFo011155@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libgnomemm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libgnomemm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomemm26/devel/libgnomemm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgnomemm.spec	3 Mar 2005 22:41:32 -0000	1.4
+++ libgnomemm.spec	5 Mar 2005 21:10:22 -0000	1.5
@@ -12,8 +12,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  gtkmm24-devel >= 0:2.4.0
-BuildRequires:  libgnome-devel >= 0:2.6.0
+BuildRequires:  gtkmm24-devel >= 2.4.0
+BuildRequires:  libgnome-devel >= 2.6.0
 
 %description
 This package provides a C++ interface for GnomeUI.  It is a subpackage



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/conglomerate/devel conglomerate.spec,1.4,1.5
Message-ID: <200503052110.j25LAMST010857@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	conglomerate.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: conglomerate.spec
===================================================================
RCS file: /cvs/extras/rpms/conglomerate/devel/conglomerate.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- conglomerate.spec	21 Feb 2005 04:02:18 -0000	1.4
+++ conglomerate.spec	5 Mar 2005 21:10:20 -0000	1.5
@@ -132,7 +132,7 @@
 - Require yelp so help will work (#1203).
 
 * Wed Apr 14 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.7.12-0.fdr.3
-- Using ln -s so conglomerate and yelp can both find help files (#1203). 
+- Using ln -s so conglomerate and yelp can both find help files (#1203).
 
 * Tue Apr 13 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.7.12-0.fdr.2
 - BuildReq perl-XML-Parser.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/blackbox/devel blackbox.spec,1.5,1.6
Message-ID: <200503052110.j25LAM3X010818@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	blackbox.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: blackbox.spec
===================================================================
RCS file: /cvs/extras/rpms/blackbox/devel/blackbox.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blackbox.spec	16 Nov 2004 17:08:40 -0000	1.5
+++ blackbox.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -1,6 +1,3 @@
-# $Id$
-# Authority: matthias
-
 Summary: Very small and fast Window Manager
 Name: blackbox
 Version: 0.65.0
@@ -85,7 +82,7 @@
 
 * 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. :-) 
+- Fixed nls problem, left in --disable just in case. Smile, Matthias. :-)
 
 * Fri Nov 14 2003 Mattthias Saou <http://freshrpms.net/> 0.65.0-5
 - Rebuild for Fedora Core 1.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/milter-greylist/devel milter-greylist.spec,1.2,1.3
Message-ID: <200503052110.j25LAPM2011211@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/milter-greylist/devel

Modified Files:
	milter-greylist.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- milter-greylist.spec	3 Mar 2005 23:01:24 -0000	1.2
+++ milter-greylist.spec	5 Mar 2005 21:10:23 -0000	1.3
@@ -15,7 +15,7 @@
 %define rundir		%vardir/run
 %define __chkconfig	/sbin/chkconfig
 
-Summary:	Milter for greylisting, the next step in the spam control war 
+Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	1.6
 Release:	%release_func 1
@@ -144,7 +144,7 @@
                             -c 'Greylist-milter user' -g %username %username &>/dev/null || :
 
 
-%postun 
+%postun
 test "$1" != 0 || /usr/sbin/fedora-userdel  %username &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %username &>/dev/null || :
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/fltk/devel fltk.spec,1.6,1.7
Message-ID: <200503052110.j25LANmW010914@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	fltk.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: fltk.spec
===================================================================
RCS file: /cvs/extras/rpms/fltk/devel/fltk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fltk.spec	3 Mar 2005 20:33:53 -0000	1.6
+++ fltk.spec	5 Mar 2005 21:10:21 -0000	1.7
@@ -29,7 +29,7 @@
 GUI functionality without the bloat, and supports 3D graphics via
 OpenGL and its built-in GLUT emulation. FLTK is designed to be small
 and modular enough to be statically linked, and also works fine as a
-shared library. 
+shared library.
 
 %description devel
 This package contains development files for %{name}
@@ -40,7 +40,7 @@
 
 %description fluid
 fluid stands for the Fast Light User Interface Designer. It is an
-interactive GUI designer for FLTK. 
+interactive GUI designer for FLTK.
 
 
 %prep
@@ -52,7 +52,7 @@
 export CPPFLAGS="$(pkg-config xft --cflags)"
 export LDFLAGS="$(pkg-config xft --libs)"
 %configure --enable-shared --enable-threads --enable-xdbe --enable-xft
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -158,5 +158,5 @@
 - Moved fluid to its own package
 - Added missing Requires for devel package
 
-* Sat Aug 16 2003 Dams <anvil[AT]livna.org> 
+* Sat Aug 16 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-IO-stringy/devel perl-IO-stringy.spec,1.7,1.8
Message-ID: <200503052110.j25LAP4K011248@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IO-stringy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-IO-stringy/devel

Modified Files:
	perl-IO-stringy.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-IO-stringy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-stringy/devel/perl-IO-stringy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-IO-stringy.spec	3 Mar 2005 23:46:27 -0000	1.7
+++ perl-IO-stringy.spec	5 Mar 2005 21:10:23 -0000	1.8
@@ -2,16 +2,16 @@
 
 %define		tarname	IO-stringy
 
-Summary: 	I/O on in-core objects like strings and arrays for Perl
-Name: 		perl-%{tarname}
-Version: 	2.110
-Release: 	1
-License: 	Artistic
-Group: 		Development/Libraries
-URL: 		http://search.cpan.org/dist/IO-stringy/
-Source0: 	http://www.cpan.org/authors/id/D/DS/DSKOLL/%{tarname}-%{version}.tar.gz
+Summary:	I/O on in-core objects like strings and arrays for Perl
+Name:		perl-%{tarname}
+Version:	2.110
+Release:	1
+License:	Artistic
+Group:		Development/Libraries
+URL:		http://search.cpan.org/dist/IO-stringy/
+Source0:	http://www.cpan.org/authors/id/D/DS/DSKOLL/%{tarname}-%{version}.tar.gz
 BuildArch:	noarch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 
 %description
@@ -72,5 +72,5 @@
 - "make test" in build section
 - Added missing directory
 
-* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 
+* Sun Jun 15 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/pexpect/devel pexpect.spec,1.5,1.6
Message-ID: <200503052110.j25LAPRJ011293@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	pexpect.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: pexpect.spec
===================================================================
RCS file: /cvs/extras/rpms/pexpect/devel/pexpect.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pexpect.spec	10 Feb 2005 20:19:03 -0000	1.5
+++ pexpect.spec	5 Mar 2005 21:10:23 -0000	1.6
@@ -14,14 +14,14 @@
 Source2: http://download.sourceforge.net/pexpect/pexpect-examples.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-abi = %{pyver}
-BuildRequires: python-devel >= 0:2.2
+BuildRequires: python-devel >= 2.2
 
 %description
 Pexpect is a pure Python module for spawning child applications; controlling
 them; and responding to expected patterns in their output. Pexpect works like
 Don Libes' Expect. Pexpect allows your script to spawn a child application and
 control it as if a human were typing commands.
- 
+
 Pexpect can be used for automating interactive applications such as ssh, ftp,
 passwd, telnet, etc. It can be used to a automate setup scripts for
 duplicating software package installations on different servers. It can be
@@ -72,7 +72,7 @@
 * Thu Feb 03 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 0.999-2
 - Use python_sitelib macro to resolve build issues on x86_64.
 - %%ghost *.pyo
-- Install ANSI.py, screen.py, and FSM.py into the examples.  These are intended 
+- Install ANSI.py, screen.py, and FSM.py into the examples.  These are intended
   to suplement pexpect eventually but they are currently much less robust and
   not installed to by default.  But they are needed by some examples.
 - Use __python macro in build/install for consistency.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/enigma/devel enigma.spec,1.3,1.4
Message-ID: <200503052110.j25LANTk010903@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	enigma.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: enigma.spec
===================================================================
RCS file: /cvs/extras/rpms/enigma/devel/enigma.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- enigma.spec	10 Nov 2004 23:18:39 -0000	1.3
+++ enigma.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -10,16 +10,16 @@
 Patch:          enigma-0.81-gcc34.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	SDL-devel >= 0:1.2  SDL_image-devel >= 0:1.2 SDL_mixer-devel >= 0:1.2
-BuildRequires:  desktop-file-utils zlib-devel >= 0:1.2.0 tetex >= 0:2.0.2
+BuildRequires:  SDL-devel >= 1.2  SDL_image-devel >= 1.2 SDL_mixer-devel >= 1.2
+BuildRequires:  desktop-file-utils zlib-devel >= 1.2.0 tetex >= 2.0.2
 
 %description
-Enigma is a tribute to and a re-implementation of one of the most               
-original and intriguing computer games of the 1990's: Oxyd.  Your               
-objective is easily explained: find and uncover all pairs of identical          
-Oxyd stones in each landscape.  Sounds simple?  It would be, if it              
-weren't for hidden traps, vast mazes, insurmountable obstacles and              
-innumerable puzzles blocking your direct way to the Oxyd stones...      
+Enigma is a tribute to and a re-implementation of one of the most
+original and intriguing computer games of the 1990's: Oxyd.  Your
+objective is easily explained: find and uncover all pairs of identical
+Oxyd stones in each landscape.  Sounds simple?  It would be, if it
+weren't for hidden traps, vast mazes, insurmountable obstacles and
+innumerable puzzles blocking your direct way to the Oxyd stones...
 
 %prep
 %setup -q



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/abicheck/devel abicheck.spec,1.6,1.7
Message-ID: <200503052110.j25LAMXm010756@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	abicheck.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: abicheck.spec
===================================================================
RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- abicheck.spec	13 Dec 2004 12:04:36 -0000	1.6
+++ abicheck.spec	5 Mar 2005 21:10:20 -0000	1.7
@@ -11,27 +11,23 @@
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires:	binutils perl
 
-# -----------------------------------------------------------------------------
 
 %description
 abicheck is a tool that checks application binary executables and
 shared libraries for conformance to the (or an) ABI (Application
 Binary Interface).
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
 %patch -p1 -b .fc3
 %patch1 -p1 -b .test-static
 
-# -----------------------------------------------------------------------------
 
 %build
-make 
+make
 make test
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -39,12 +35,10 @@
 install -m 0755 abicheck $RPM_BUILD_ROOT%{_bindir}
 install -m 0644 abicheck.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
@@ -52,7 +46,6 @@
 %{_bindir}/abicheck
 %{_mandir}/man1/abicheck.1*
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Mon Dec 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2-3
@@ -70,5 +63,5 @@
 * Sat Aug 23 2003 Dams <anvil[AT]livna.org> 0:1.1-0.fdr.2
 - Aplied patch from Michael Schwendt (bug #605 comment #1)
 
-* Sat Aug 16 2003 Dams <anvil[AT]livna.org> 
+* Sat Aug 16 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/geomview/devel geomview.spec,1.2,1.3
Message-ID: <200503052110.j25LANJ6010958@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	geomview.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geomview.spec	3 Mar 2005 21:26:02 -0000	1.2
+++ geomview.spec	5 Mar 2005 21:10:21 -0000	1.3
@@ -21,7 +21,7 @@
 # Other plugins
 Source10: http://dl.sourceforge.net/geomview/orrery-%{orrery_ver}.tar.gz
 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
@@ -52,11 +52,11 @@
 #{?_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, 
-etc. It can be used as a standalone viewer for static objects or as a display 
-engine for other programs which produce dynamically changing geometry. It can 
-display objects described in a variety of file formats. It comes with a wide 
+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,
+etc. It can be used as a standalone viewer for static objects or as a display
+engine for other programs which produce dynamically changing geometry. It can
+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.
 
 
@@ -66,7 +66,7 @@
 Summary: %{name} plugins
 Requires: %{name} = %{version}
 BuildRequires: xforms-devel >= %{xforms_ver}
-%description plugins 
+%description plugins
 Geomview default plugins
 %endif
 
@@ -139,7 +139,7 @@
   --add-category X-Fedora \
   %{SOURCE1}
 
-# app icon 
+# app icon
 install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
 # move the html manual for inclusion later
@@ -186,7 +186,7 @@
 %{_libexecdir}/%{name}/.geomview-drawbdy
 
 %if "%{?_with_xforms:1}" == "1"
-%files plugins 
+%files plugins
 %defattr(-,root,root)
 %{_libexecdir}/%{name}/example
 %{_libexecdir}/%{name}/.geomview-example
@@ -206,9 +206,9 @@
 %endif
 
 %if "%{?_with_orrery:1}" == "1"
-%files orrery 
+%files orrery
 %defattr(-,root,root)
-%doc orrery*/README orrery*/NEWS orrery*/AUTHORS orrery*/ChangeLog 
+%doc orrery*/README orrery*/NEWS orrery*/AUTHORS orrery*/ChangeLog
 %dir %{_datadir}/geomview/modules
 %{_datadir}/geomview/modules/orrery
 %{_libexecdir}/%{name}/.geomview-orrery
@@ -258,7 +258,7 @@
 - .desktop: Categories += Graphics
 
 * Tue Mar 16 2004 Rex Dieter <rexdieter at sf.net> 0:1.8.1-0.fdr.3
-- use patch from geomview sf site to allow gcc3. 
+- use patch from geomview sf site to allow gcc3.
 - use desktop-file-install
 
 * Wed Sep 24 2003 Rex Dieter <rexdieter at sf.net> 0:1.8.1-0.fdr.2
@@ -268,7 +268,7 @@
 - Build against openmotif.
 
 * Mon May 12 2003 Rex Dieter <rexdieter at users.sf.net> 0:1.8.1-0.fdr.0
-- fedora'ize 
+- fedora'ize
 - rh73: link xforms static (for now, so rh80+ users could use if they
   want/need plugins/maniview subpkgs).
 - rh80+: use g++296, no xforms.
@@ -308,6 +308,6 @@
 - include option to link xforms-static (untested)
 
 * Fri Sep 28 2001 Rex Dieter <rexdieter at users.sf.net> 1.8.1-0
-- first try. 
+- first try.
 - TODO: make subpkgs manual(html), modules, modules-xforms
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/cgoban/devel cgoban.spec,1.5,1.6
Message-ID: <200503052110.j25LAMgo010846@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	cgoban.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: cgoban.spec
===================================================================
RCS file: /cvs/extras/rpms/cgoban/devel/cgoban.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cgoban.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ cgoban.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -33,7 +33,7 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall 
+%makeinstall
 install -p -D -m644 cgoban_icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/cgoban.png
 
 desktop-file-install --vendor fedora               \



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-Unix-Syslog/devel perl-Unix-Syslog.spec,1.6,1.7
Message-ID: <200503052110.j25LAPDW011280@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Unix-Syslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-Unix-Syslog/devel

Modified Files:
	perl-Unix-Syslog.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-Unix-Syslog.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unix-Syslog/devel/perl-Unix-Syslog.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Unix-Syslog.spec	3 Mar 2005 23:46:28 -0000	1.6
+++ perl-Unix-Syslog.spec	5 Mar 2005 21:10:23 -0000	1.7
@@ -71,5 +71,5 @@
 - Changed Group tag value
 - Added missing unowned directories
 
-* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 
+* Sun Jun 15 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/centericq/devel centericq.spec,1.7,1.8
Message-ID: <200503052110.j25LAMW4010834@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	centericq.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- centericq.spec	25 Feb 2005 19:40:27 -0000	1.7
+++ centericq.spec	5 Mar 2005 21:10:20 -0000	1.8
@@ -1,9 +1,9 @@
 Name:           centericq
-Version:        4.20.0 
+Version:        4.20.0
 Release:        1
 Summary:        Text mode menu- and window-driven IM
 
-Group:          Applications/Internet 
+Group:          Applications/Internet
 License:        GPL
 URL:            http://konst.org.ua/centericq/
 Source0:        http://konst.org.ua/download/centericq-4.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gnome-themes-extras/devel gnome-themes-extras.spec,1.6,1.7
Message-ID: <200503052110.j25LAN5O010986@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnome-themes-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gnome-themes-extras/devel

Modified Files:
	gnome-themes-extras.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/gnome-themes-extras.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-themes-extras.spec	28 Feb 2005 19:56:57 -0000	1.6
+++ gnome-themes-extras.spec	5 Mar 2005 21:10:21 -0000	1.7
@@ -63,7 +63,7 @@
 * Fri Nov 26 2004 Adrian Reber <adrian at lisas.de> - 0:0.8.0-0.fdr.1
 - updated to 0.8.0
 - changed gtk-2.0/2.2 to gtk-2.0/2.4
-- libsmooth.so is deleted during installation as it is 
+- libsmooth.so is deleted during installation as it is
   provided by gnome-themes
 - removed empty NEWS file from doc
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/ghex/devel ghex.spec,1.7,1.8
Message-ID: <200503052110.j25LANcQ010964@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ghex.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: ghex.spec
===================================================================
RCS file: /cvs/extras/rpms/ghex/devel/ghex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ghex.spec	9 Jan 2005 16:28:55 -0000	1.7
+++ ghex.spec	5 Mar 2005 21:10:21 -0000	1.8
@@ -1,7 +1,7 @@
 Name:           ghex
 Version:        2.8.1
 Release:        2
-Summary:        A binary editor for GNOME
+Summary:        Binary editor for GNOME
 
 Group:          Applications/Editors
 License:        GPL
@@ -16,7 +16,7 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  scrollkeeper
-BuildRequires:  libtool 
+BuildRequires:  libtool
 Requires(post): GConf2
 Requires(post): scrollkeeper
 Requires(post): /sbin/ldconfig
@@ -110,7 +110,7 @@
 
 %changelog
 * Sun Jan 09 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.8.1-2
-- Use make param LIBTOOL=/usr/bin/libtool instead autoreconf -- fixes x86_64 
+- Use make param LIBTOOL=/usr/bin/libtool instead autoreconf -- fixes x86_64
   build
 
 * Mon Dec 27 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.8.1-1



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/TeXmacs/devel TeXmacs.spec,1.6,1.7
Message-ID: <200503052110.j25LAMUF010732@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	TeXmacs.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TeXmacs.spec	21 Feb 2005 19:27:31 -0000	1.6
+++ TeXmacs.spec	5 Mar 2005 21:10:20 -0000	1.7
@@ -1,18 +1,17 @@
 Name:		TeXmacs
 Version:	1.0.4.6
 Release:	1
-Epoch:		0
-Summary:	A structured wysiwyg scientific text editor
+Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.texmacs.org
 Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.4.6-src.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex, tetex-fonts, ghostscript
 Buildrequires:	guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel
-Requires(post):   shared-mime-info, desktop-file-utils
-Requires(postun): shared-mime-info, desktop-file-utils
+Requires(post):		shared-mime-info, desktop-file-utils
+Requires(postun):	shared-mime-info, desktop-file-utils
 
 %description
 GNU TeXmacs is a free scientific text editor, which was both inspired
@@ -109,6 +108,7 @@
 
 %files
 %defattr(-,root,root,-)
+%doc LICENSE COPYING TeXmacs/README TeXmacs/TEX_FONTS
 %{_bindir}/*
 %{_includedir}/*
 %{_mandir}/man*/*
@@ -120,7 +120,6 @@
 %{_datadir}/mime/packages/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-text-texmacs.xpm
-%doc LICENSE COPYING TeXmacs/README TeXmacs/TEX_FONTS
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.3,1.4
Message-ID: <200503052110.j25LANc3011031@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gtk-qt-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gtk-qt-engine/devel

Modified Files:
	gtk-qt-engine.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk-qt-engine.spec	12 Feb 2005 17:01:20 -0000	1.3
+++ gtk-qt-engine.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -1,14 +1,14 @@
 # $Id$
 
-Summary: a project allowing GTK to use Qt widget styles.
-Name: 	 gtk-qt-engine 
-Group:	 User Interface/Desktops
+Summary: Allow GTK to use Qt widget styles
+Name:    gtk-qt-engine
+Group:   User Interface/Desktops
 Version: 0.41
 Release: 5%{?dist_tag}
 License: GPL
 Source:  http://www.freedesktop.org/Software/gtk-qt/gtk-qt-engine-0.41.tar.bz2
 Patch0:  %{name}-x86_64.patch
-URL:	 http://www.freedesktop.org/Software/gtk-qt
+URL:     http://www.freedesktop.org/Software/gtk-qt
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gtk2-devel >= 2.2
@@ -31,14 +31,14 @@
 %description
 The GTK-Qt Theme Engine is a project allowing GTK to use Qt widget styles.
 
-It behaves like a normal GTK theme engine, but calls functions from Qt 
-instead of doing the drawing itself. 
+It behaves like a normal GTK theme engine, but calls functions from Qt
+instead of doing the drawing itself.
 
 
 %prep
-%setup -q 
+%setup -q
 %ifarch x86_64
-%patch0 
+%patch0
 %endif
 
 %build
@@ -74,7 +74,7 @@
 %{_datadir}/applnk/Settings/LookNFeel/kcmgtk.desktop
 
 
-%changelog 
+%changelog
 * Sat Feb 12 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0.41-5
 - Add patch to fix compile-error on x86_64; Patch was found in a suse srpm
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gonvert/devel gonvert.spec,1.4,1.5
Message-ID: <200503052110.j25LANj1011002@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gonvert.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gonvert.spec
===================================================================
RCS file: /cvs/extras/rpms/gonvert/devel/gonvert.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gonvert.spec	27 Nov 2004 18:35:05 -0000	1.4
+++ gonvert.spec	5 Mar 2005 21:10:21 -0000	1.5
@@ -1,7 +1,7 @@
 Name:           gonvert
 Version:        0.2.11
 Release:        1
-Summary:        Units conversion utility.
+Summary:        Units conversion utility
 
 Group:          Applications/Engineering
 License:        GPL
@@ -17,21 +17,21 @@
 BuildArch:      noarch
 
 %description
-gonvert is a conversion utility that allows conversion between many units 
-like CGS, Ancient, Imperial with many categories like length, mass, numbers, 
-etc. All units converted values shown at once as you type. Easy to add/change 
-your own units. Written in Python,pygtk,libgade. 
+gonvert is a conversion utility that allows conversion between many units
+like CGS, Ancient, Imperial with many categories like length, mass, numbers,
+etc. All units converted values shown at once as you type. Easy to add/change
+your own units. Written in Python,pygtk,libgade.
 
 
-%prep 
+%prep
 %setup -q
 
 
-%build 
+%build
 make %{?_smp_mflags}
 
 
-%install 
+%install
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall
 
@@ -45,12 +45,12 @@
   gonvert.desktop
 
 
-%clean 
+%clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
-%files 
-%defattr(-,root,root,-) 
+%files
+%defattr(-,root,root,-)
 %doc doc/CHANGELOG doc/COPYING doc/FAQ doc/THANKS doc/TODO
 %{_bindir}/*
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -62,7 +62,7 @@
 %changelog
 * Sat Nov 27 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.2.11-1
 - Bump release/Spec Cleanup.
- 
+
 * Thu Oct 21 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.2.11-0.fdr.1
 - 2.11.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/WindowMaker/devel WindowMaker.spec,1.4,1.5
Message-ID: <200503052110.j25LAMA1010738@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	WindowMaker.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: WindowMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WindowMaker.spec	10 Dec 2004 22:03:01 -0000	1.4
+++ WindowMaker.spec	5 Mar 2005 21:10:20 -0000	1.5
@@ -1,26 +1,24 @@
-Summary: 	A fast, feature rich Window manager.
-Name: 		WindowMaker
+Summary:	A fast, feature rich Window Manager
+Name:		WindowMaker
 Version:	0.80.2
 Release:	6
-Epoch:		0
 License:	GPL
-Group: 		User Interface/Desktops
-URL: 		http://www.windowmaker.org/
-Source0: 	%{name}-%{version}.tar.bz2
+Group:		User Interface/Desktops
+URL:		http://www.windowmaker.org/
+Source0:	%{name}-%{version}.tar.bz2
 Patch0:		windowmaker-src_actions_c.patch
 Patch1:		windowmaker-src_event_c.patch
 Patch2:		windowmaker-src_workspace_c.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	XFree86-devel libpng-devel libjpeg-devel libungif-devel 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires:	XFree86-devel libpng-devel libjpeg-devel libungif-devel
 BuildRequires:	libtiff-devel zlib-devel gettext
 Obsoletes:	WindowMaker-libs
 
 %package devel
 Summary:	libraries needed for WindowMaker.
 Group:		System Environment/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
-#---------------------------------------------------------------------
 
 %description
 Window Maker is an X11 window manager designed to give additional
@@ -36,7 +34,6 @@
 possible, it reproduces the elegant look and feel of the NeXTSTEP[tm]
 GUI. This package contains development files for WindowMaker libraries
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
@@ -44,7 +41,6 @@
 %patch1 -p0 -b .gtk2
 %patch2 -p0 -b .focus
 
-#---------------------------------------------------------------------
 
 %build
 LINGUAS=`(cd po ; echo *.po|sed 's/zh_TW.Big5.po//g;s/.po//g')`
@@ -55,7 +51,6 @@
 # Dont use _smp_mflags. Race condition.
 make
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -65,12 +60,10 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libwraster.la
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files -f '\(WPrefs\|%{name}\|WINGs\)'.lang
 %defattr(-,root,root,-)
@@ -96,7 +89,6 @@
 %{_libdir}/lib*.a
 %{_libdir}/libwraster.so
 
-#---------------------------------------------------------------------
 
 %changelog
 * Fri Nov 28 2003 Dams <anvil[AT]livna.org> - 0:0.80.2-0.fdr.6
@@ -120,5 +112,5 @@
 * Thu Apr 10 2003 Dams <anvil[AT]livna.org> 0:0.80.2-0.fdr.2
 - Added missing Require: for gettext
 
-* Tue Apr  8 2003 Dams <anvil[AT]livna.org> 
+* Tue Apr  8 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gnotime/devel gnotime.spec,1.3,1.4
Message-ID: <200503052110.j25LANIU010991@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gnotime.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnotime.spec	3 Mar 2005 21:26:03 -0000	1.3
+++ gnotime.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -44,9 +44,6 @@
 Requires(postun): scrollkeeper
 Requires(post): GConf2
 Requires(preun): GConf2
-#Conflicts:      
-#Obsoletes:      
-#BuildConflicts: 
 
 %description
 A combination of stop-watch, diary, consultant billing system, and project



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/cone/devel cone.spec,1.5,1.6
Message-ID: <200503052110.j25LAMXu010851@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	cone.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: cone.spec
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/cone.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cone.spec	4 Mar 2005 00:15:58 -0000	1.5
+++ cone.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -15,7 +15,7 @@
 BuildRequires: zlib-devel openssl-devel fam-devel perl
 BuildRequires: libstdc++-devel gcc-c++
 BuildRequires: openssl-perl
-BuildRequires: ncurses-devel >= 0:5.3
+BuildRequires: ncurses-devel >= 5.3
 
 Requires(post): %{__perl}
 
@@ -25,7 +25,7 @@
 %package devel
 Group: Development/Libraries
 Summary: LibMAIL mail client development library.
-Requires: %{name} = 0:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 The %{name}-devel package the header files and library files for developing



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/mach/devel mach.spec,1.4,1.5
Message-ID: <200503052110.j25LAPhs011207@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	mach.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/devel/mach.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mach.spec	26 Nov 2004 13:22:50 -0000	1.4
+++ mach.spec	5 Mar 2005 21:10:23 -0000	1.5
@@ -1,22 +1,22 @@
 Name:           mach
 Version:        0.4.5
-Release:        0.fdr.1.1
+Release:        1
 Summary:        make a chroot
 
 Group:          Applications/System
-License:	GPL
+License:        GPL
 URL:            http://thomas.apestaart.org/projects/mach/
 Source:         http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Requires:	python
-Requires:	rpm
-Requires:	rpm-python
-Requires:	apt
-Requires:	sed
-Requires:	cpio
+Requires:       python
+Requires:       rpm
+Requires:       rpm-python
+Requires:       apt
+Requires:       sed
+Requires:       cpio
 
-BuildRequires:	python
+BuildRequires:  python
 
 %{!?builduser:  %define builduser  machbuild}
 %{!?buildgroup: %define buildgroup machbuild}
@@ -83,10 +83,10 @@
 fi
 
 %postun
-if [ "$1" == 0 ];
+if [ "$1" = "0" ];
 then
   # last removal
-  userdel mach > /dev/null 2>&1 || : 
+  userdel mach > /dev/null 2>&1 || :
   groupdel mach > /dev/null 2>&1 || :
 fi
 



From fedora-extras-commits at redhat.com  Sat Mar  5 22:25:54 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 5 Mar 2005 17:25:54 -0500
Subject: rpms/pdfjam - New directory
Message-ID: <200503052225.j25MPs60014913@cvs-int.fedora.redhat.com>

Author: jpo

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

Log Message:
Directory /cvs/extras/rpms/pdfjam added to the repository




From fedora-extras-commits at redhat.com  Sat Mar  5 22:25:54 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 5 Mar 2005 17:25:54 -0500
Subject: rpms/pdfjam/devel - New directory
Message-ID: <200503052225.j25MPsZa014916@cvs-int.fedora.redhat.com>

Author: jpo

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

Log Message:
Directory /cvs/extras/rpms/pdfjam/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar  5 22:26:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 17:26:24 -0500
Subject: rpms/ncftp - New directory
Message-ID: <200503052226.j25MQOBF015006@cvs-int.fedora.redhat.com>

Author: thias

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

Log Message:
Directory /cvs/extras/rpms/ncftp added to the repository




From fedora-extras-commits at redhat.com  Sat Mar  5 22:26:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 17:26:24 -0500
Subject: rpms/ncftp/devel - New directory
Message-ID: <200503052226.j25MQOuo015009@cvs-int.fedora.redhat.com>

Author: thias

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

Log Message:
Directory /cvs/extras/rpms/ncftp/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar  5 22:26:39 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 5 Mar 2005 17:26:39 -0500
Subject: rpms/pdfjam Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503052226.j25MQdK3015072@cvs-int.fedora.redhat.com>

Author: jpo

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module pdfjam


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

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

common : CVS/Root
	@cvs 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 Mar  5 22:26:50 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 17:26:50 -0500
Subject: rpms/ncftp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503052226.j25MQoOR015111@cvs-int.fedora.redhat.com>

Author: thias

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module ncftp


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

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

common : CVS/Root
	@cvs 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 Mar  5 22:26:39 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 5 Mar 2005 17:26:39 -0500
Subject: rpms/pdfjam/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503052226.j25MQdMS015074@cvs-int.fedora.redhat.com>

Author: jpo

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pdfjam


--- 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 Mar  5 22:26:50 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 17:26:50 -0500
Subject: rpms/ncftp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503052226.j25MQolx015114@cvs-int.fedora.redhat.com>

Author: thias

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ncftp


--- 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 Mar  5 22:28:24 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 5 Mar 2005 17:28:24 -0500
Subject: rpms/pdfjam import.log,1.1,1.2
Message-ID: <200503052228.j25MSO6N015324@cvs-int.fedora.redhat.com>

Author: jpo

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pdfjam/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Mar 2005 22:26:37 -0000	1.1
+++ import.log	5 Mar 2005 22:28:22 -0000	1.2
@@ -0,0 +1 @@
+pdfjam-1_20-1:HEAD:pdfjam-1.20-1.src.rpm:1110061744



From fedora-extras-commits at redhat.com  Sat Mar  5 22:28:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 17:28:26 -0500
Subject: rpms/ncftp import.log,1.1,1.2
Message-ID: <200503052228.j25MSQAW015357@cvs-int.fedora.redhat.com>

Author: thias

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ncftp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Mar 2005 22:26:48 -0000	1.1
+++ import.log	5 Mar 2005 22:28:24 -0000	1.2
@@ -0,0 +1 @@
+ncftp-3_1_8-4:HEAD:ncftp-3.1.8-4.src.rpm:1110061549



From fedora-extras-commits at redhat.com  Sat Mar  5 22:28:24 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 5 Mar 2005 17:28:24 -0500
Subject: rpms/pdfjam/devel pdfjam.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503052228.j25MSO8L015328@cvs-int.fedora.redhat.com>

Author: jpo

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

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


--- NEW FILE pdfjam.spec ---
Name:           pdfjam
Version:        1.20
Release:        1
Summary:        Utilities for join, rotate and align PDFs

Group:          Applications/Publishing
License:        GPL
URL:            http://www.warwick.ac.uk/go/pdfjam
Source0:        http://www.warwick.ac.uk/go/pdfjam/pdfjam_1.20.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       tetex-latex

%description
PDFjam is a small collection of shell scripts which provide a simple
interface to some of the functionality of the excellent pdfpages
package (by Andreas Matthias) for pdfLaTeX.  At present the utilities
available are:

  * pdfnup, which allows PDF files to be "n-upped" in roughly the way
    that psnup does for PostScript files;
  * pdfjoin, which concatenates the pages of multiple PDF files
    together into a single file;
  * pdf90, which rotates the pages of one or more PDF files through 90
    degrees (anti-clockwise).

In every case, source files are left unchanged.

A potential drawback of these utilities is that any hyperlinks in the
source PDF are lost. On the positive side, there is no appreciable
degradation of image quality in processing PDF files with these
programs, unlike some other indirect methods such as "pdf2ps | psnup |
ps2pdf" (in the author's experience).


%prep
%setup -q -n pdfjam

%build

%install
rm -rf $RPM_BUILD_ROOT

install -d -m 755 $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
install -p -m 755 scripts/* $RPM_BUILD_ROOT%{_bindir}/
install -p -m 644 man1/* $RPM_BUILD_ROOT%{_mandir}/man1/

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING PDFjam-README.html pdfdroplets.png
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Thu Feb 24 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.20-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pdfjam/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Mar 2005 22:26:37 -0000	1.1
+++ .cvsignore	5 Mar 2005 22:28:22 -0000	1.2
@@ -0,0 +1 @@
+pdfjam_1.20.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pdfjam/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Mar 2005 22:26:37 -0000	1.1
+++ sources	5 Mar 2005 22:28:22 -0000	1.2
@@ -0,0 +1 @@
+3e443fd2c0063330313c1c079053e622  pdfjam_1.20.tgz



From fedora-extras-commits at redhat.com  Sat Mar  5 22:28:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 17:28:26 -0500
Subject: rpms/ncftp/devel ncftp-3.0.1-pref.patch, NONE,
	1.1 ncftp-3.0.3-resume.patch, NONE,
	1.1 ncftp-3.1.5-ncursesw.patch, NONE,
	1.1 ncftp-3.1.5-pmeter.patch, NONE, 1.1 ncftp-3.1.6-rh1.patch,
	NONE, 1.1 ncftp-3.1.7-shell.patch, NONE, 1.1 ncftp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503052228.j25MSQVP015361@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore sources 
Added Files:
	ncftp-3.0.1-pref.patch ncftp-3.0.3-resume.patch 
	ncftp-3.1.5-ncursesw.patch ncftp-3.1.5-pmeter.patch 
	ncftp-3.1.6-rh1.patch ncftp-3.1.7-shell.patch ncftp.spec 
Log Message:
auto-import ncftp-3.1.8-4 on branch devel from ncftp-3.1.8-4.src.rpm

ncftp-3.0.1-pref.patch:

--- NEW FILE ncftp-3.0.1-pref.patch ---
--- ncftp/pref.c	2000/07/30 07:01:37	1.1
+++ ncftp/pref.c	2000/07/30 07:01:55
@@ -552,7 +552,7 @@
 	gAutoResume = 0;
 	gSOBufsize = 0;
 	gMaxLogSize = 10240;
-	gConfirmClose = 1;
+	gConfirmClose = 0;
 	gAutoSaveChangesToExistingBookmarks = 0;
 	gRedialDelay = kDefaultRedialDelay;
 

ncftp-3.0.3-resume.patch:

--- NEW FILE ncftp-3.0.3-resume.patch ---
--- ncftp-3.0.3/ncftp/pref.c.resume	Tue May 22 21:56:21 2001
+++ ncftp-3.0.3/ncftp/pref.c	Tue May 22 21:57:07 2001
@@ -625,7 +625,7 @@
 	gCtrlTimeout = 135;
 	gDataPortMode = kFallBackToSendPortMode;
 	gConn.dataPortMode = gDataPortMode;
-	gAutoResume = 0;
+	gAutoResume = 1;
 	gSOBufsize = 0;
 	gMaxLogSize = 10240;
 	gConfirmClose = 0;

ncftp-3.1.5-ncursesw.patch:

--- NEW FILE ncftp-3.1.5-ncursesw.patch ---
--- ncftp-3.1.5/autoconf/aclocal.m4.ncursesw	2003-08-12 12:17:43.000000000 +0200
+++ ncftp-3.1.5/autoconf/aclocal.m4	2003-08-12 12:25:39.000000000 +0200
@@ -3704,7 +3704,7 @@
 wi_cv_lib_curses=no
 wi_cv_lib_curses_result=no
 ac_save_LIBS="$LIBS"
-for LIBCURSES in "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
+for LIBCURSES in "-lncursesw" "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
 do
 	if test "x$LIBCURSES-$wi_cv_ncurses" = "x-lncurses-no" ; then
 		# This should never work
@@ -3752,7 +3752,7 @@
 
 if test "$wi_cv_lib_curses_result" != "no" ; then
 	case "$LIBCURSES" in
-		"-lncurses")
+		"-lncurses*")
 			AC_DEFINE(HAVE_LIBNCURSES)
 			;;
 		"-lcurses")
--- ncftp-3.1.5/configure.ncursesw	2003-08-12 12:28:43.000000000 +0200
+++ ncftp-3.1.5/configure	2003-08-12 12:28:47.000000000 +0200
@@ -3452,7 +3452,7 @@
 wi_cv_lib_curses=no
 wi_cv_lib_curses_result=no
 ac_save_LIBS="$LIBS"
-for LIBCURSES in "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
+for LIBCURSES in "-lncursesw" "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
 do
 	if test "x$LIBCURSES-$wi_cv_ncurses" = "x-lncurses-no" ; then
 		# This should never work

ncftp-3.1.5-pmeter.patch:

--- NEW FILE ncftp-3.1.5-pmeter.patch ---
--- ncftp-3.1.5/sh_util/gpshare.c.pmeter	Thu Dec  5 19:04:42 2002
+++ ncftp-3.1.5/sh_util/gpshare.c	Thu Dec  5 19:06:36 2002
@@ -436,8 +436,8 @@
 #else
 	gIsAtty1 = isatty(1);
 	gIsAtty2 = isatty(2);
-	/* progmeters = ((isatty(2) != 0) && (getppid() > 1)) ? 1 : 0; */
-	progmeters = (getppid() > 1) ? 1 : 0;
+	progmeters = ((gIsAtty2 != 0) && (getppid() > 1)) ? 1 : 0;
+	/* progmeters = (getppid() > 1) ? 1 : 0; */
 #endif
 	return (progmeters);
 }	/* GetDefaultProgressMeterSetting */

ncftp-3.1.6-rh1.patch:

--- NEW FILE ncftp-3.1.6-rh1.patch ---
--- ncftp-3.1.6/ncftp/cmds.c.rh1	2003-10-27 15:10:52.000000000 +0100
+++ ncftp-3.1.6/ncftp/cmds.c	2003-10-27 16:18:48.000000000 +0100
@@ -267,7 +267,7 @@
 	FillBookmarkInfo(&gBm);
 
 	saveBmPassword = gSavePasswords;
-	if ((saveBmPassword < 0) && (gBm.pass[0] != '\0')) {
+	if ((saveBmPassword < 0) && (gBm.pass[0] == '\0') && (gLoadedBm == 0)) {
 		if (gIsTTYr == 0) {
 			saveBmPassword = 0;
 		} else {
@@ -280,7 +280,10 @@
 				(void) printf("\nNot saving the password.\n");
 			}
 		}
+	} else if ((saveBmPassword < 0) && (gBm.pass[0] != '\0')) {
+		saveBmPassword = 1;
 	}
+
 	if (PutBookmark(&gBm, saveBmPassword) < 0) {
 		(void) fprintf(stderr, "Could not save bookmark.\n");
 	} else {

ncftp-3.1.7-shell.patch:

--- NEW FILE ncftp-3.1.7-shell.patch ---
--- ncftp-3.1.7/ncftp/shell.c.shell	2004-01-14 16:17:04.243105318 +0100
+++ ncftp-3.1.7/ncftp/shell.c	2004-01-14 16:17:31.502130388 +0100
@@ -225,7 +225,6 @@
 	char *dcp;
 	char *scp;
 	char *arg;
-	static char xclam[4];
 
 	*cargc = 0;
 	scp = line;
@@ -257,9 +256,7 @@
 			if (scp[1] == '!') {
 				scp[1] = '\0';
 			} else if ((scp[1] != '\0') && (!isspace((int) scp[1]))) {
-				xclam[0] = '!';
-				xclam[1] = '\0';
-				cargv[0] = xclam;
+				cargv[0] = "!";
 				scp++;
 				arg = dcp;
 				cargv[*cargc] = arg;


--- NEW FILE ncftp.spec ---
Summary: An improved FTP client.
Name: ncftp
Version: 3.1.8
Epoch: 2
Release: 4
Prefix: %{_prefix}
License: Distributable
Group: Applications/Internet
Source0: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2
Patch1: ncftp-3.0.1-pref.patch
Patch2: ncftp-3.1.7-shell.patch
Patch3: ftp://ftp.kame.net/pub/kame/misc/ncftp-3181-v6-20040826.diff.gz
Patch4: ncftp-3.0.3-resume.patch
Patch5: ncftp-3.1.5-pmeter.patch
Patch6: ncftp-3.1.5-ncursesw.patch
Patch7: ncftp-3.1.6-rh1.patch
BuildRoot: /var/tmp/%{name}-root
BuildRequires: ncurses-devel glibc-devel gcc
URL: http://www.ncftp.com/ncftp/

%description
Ncftp is an improved FTP client. Ncftp's improvements include support
for command line editing, command histories, recursive gets, automatic
anonymous logins, and more.

%prep
%setup -q
%patch1 -p0 -b .pref
%patch2 -p1
%patch3 -p1 -b .ipv6
%patch4 -p1 -b .res
%patch5 -p1 -b .pmeter
%patch6 -p1 -b .ncursesw
#%patch7 -p1 -b .ask_save

%build
#aclocal -I autoconf
#cp -f autoconf/aclocal.m4 .
%configure --enable-signals --enable-ipv6
make STRIPFLAG=""
rm -f README.v6.ipv6

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{/usr/bin,%{_mandir}/man1}

%makeinstall BINDIR=$RPM_BUILD_ROOT/usr/bin

mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Internet

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README* doc
%{_bindir}/ncftp
%{_bindir}/ncftpget
%{_bindir}/ncftpput
%{_bindir}/ncftpbatch
%{_bindir}/ncftpls
%{_bindir}/ncftpbookmarks
%{_bindir}/ncftpspooler
%{_mandir}/man1/ncftp.1*
%{_mandir}/man1/ncftpget.1*
%{_mandir}/man1/ncftpput.1*
%{_mandir}/man1/ncftpbatch.1*
%{_mandir}/man1/ncftpls.1*
%{_mandir}/man1/ncftpspooler.1*

%changelog
* Wed Mar 02 2005 Karsten Hopp <karsten at redhat.de> 2:3.1.8-4
- build with gcc-4

* Wed Feb 09 2005 Karsten Hopp <karsten at redhat.de> 2:3.1.8-3
- rebuilt

* Thu Aug 26 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-2 
- new upstream ipv6 patch, enable ipv6 again

* Mon Aug 09 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-1 
- update to version 3.1.8
- new ipv6 patch, but currently disabled due to problems with active-ftp
  (#127553)

* Wed Jul 07 2004 Karsten Hopp <karsten at redhat.de> 2:3.1.7-5
- rebuild with new gcc

* Mon Jul 05 2004 Karsten Hopp <karsten at redhat.de> 3.1.7-4 
- add new ipv6 patch (#124232)

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Jan 14 2004 Karsten Hopp <karsten at redhat.de> 3.1.7-1
- update to 3.1.7

* Mon Oct 27 2003 Karsten Hopp <karsten at redhat.de> 2:3.1.6-2
- don't ask again if the password should be saved when it already is in the
  bookmarks file (#62177)

* Fri Oct 03 2003 Florian La Roche <Florian.LaRoche at redhat.de>
- 3.1.6
- disabled patch6, seems not necessary

* Tue Aug 12 2003 Karsten Hopp <karsten at redhat.de> 2:3.1.5-7
- don't terminate when 8bit characters are entered (#83107)
- link ncursesw if available

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Sun Feb 23 2003 Tim Powers <timp at redhat.com>
- rebuild to try and fix a missing dep on libresolv.so.2

* Tue Feb 04 2003 Karsten Hopp <karsten at redhat.de> 3.1.5-4
- updated ipv6 patch (#83186)

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Wed Dec 04 2002 Karsten Hopp <karsten at redhat.de> 3.1.5-2
- don't enable progressbar when called from a script (#78905)

* Mon Nov 18 2002 Karsten Hopp <karsten at redhat.de> 3.1.5-1
- update to 3.1.5
- fix #75253
- disable patch3
- fix filelist

* Mon Jul  1 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.1.3-6
- Bring back IPv6 support (#67322)

* 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 Apr 10 2002 Florian La Roche <Florian.LaRoche at redhat.de>
- add new patch from Jakub as given in #61961
  select his second patch, that seems a very clean solution

* Wed Mar 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.1.3-2
- Add workaround for glibc bug #61961 (should-fix)

* Sat Feb  9 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.1.3-1
- 3.1.3

* Mon Jan 21 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.1.1-1
- Update to 3.1.1
- Temporarily disable the IPv6 patch as it breaks IPv4 connecting
  to machines with both an IPv6 and an IPv4 address

* Tue Nov 20 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.4-2
- Update IPv6 patch

* Wed Oct 31 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.4-1
- 3.0.4
- Add URL tag to spec file (RFE #54622)
- Update and port IPv6 patches
- Fix build with gcc 3.1

* Sat Aug  4 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-6
- Fix suspend (#44101, #50846)

* Sun Jul 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-5
- Add build requirements (#49541)

* Sat Jul 21 2001 Tim Powers <timp at redhat.com>
- no ncftp applnk entry, it's cluttering the menus

* Wed Jul 18 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-3
- Fix ipv6 crash (Patch from Pekka Savola, #47763)

* Tue May 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-2
- Default to auto-resume=yes (REF #28705)

* Tue Apr 24 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-1
- Update to 3.0.3

* Sun Apr 15 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- Add PLD's IPv6 patches (#35645)

* Fri Oct 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 3.0.2

* Thu Aug 24 2000 Philipp Knirsch <pknirsch at redhat.com>
- Fixed bug in ncftp/cmds.c in LocalListCmd where the use of the popen/pclose
  was simply wrong and ocasionally resulted in a SIGSEGV (#16315)

* Fri Aug  4 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Add Swedish and German translations to .desktop file, Bug #15325

* Sun Jul 30 2000 Florian La Roche <Florian.LaRoche at redhat.de>
- small changes to spec file and redo prev patch

* Sun Jul 30 2000 Florian La Roche <Florian.LaRoche at redhat.de>
- set "confirm-close no" per default

* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Mon Jun 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- FHSify

* Sun Apr 02 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 3.0.1

* Fri Mar 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 3.0.0 final

* Mon Mar  6 2000 Jeff Johnson <jbj at redhat.com>
- permit 8-bit input chars to be returned without exiting (#9981),

* Sat Feb  5 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Deal with rpm compressing man pages
- remove wmconfig stuff

* Thu Jan  6 2000 Jeff Johnson <jbj at redhat.com>
- add missing docs.
- y2k wartlet (#8225)

* Tue Nov  9 1999 Bernhard Rosenkraenzer <bero at redhat.com>
- 3.0b21
- enable signal usage

* Sat Jun 12 1999 Jeff Johnson <jbj at redhat.com>
- 3.0b19

* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
- auto rebuild in the new build environment (release 3)

* Wed Feb 24 1999 Bill Nottingham <notting at redhat.com>
- return of wmconfig

* Tue Feb 23 1999 Bill Nottingham <notting at redhat.com>
- 3.0b18

* Fri Feb 12 1999 Bill Nottingham <notting at redhat.com>
- 3.0b17

* Wed Dec  2 1998 Bill Nottingham <notting at redhat.com>
- 3.0b16

* Wed Nov 18 1998 Bill Nottingham <notting at redhat.com>
- add docs

* Thu Nov  5 1998 Bill Nottingham <notting at redhat.com>
- update to 3.0beta15

* Thu Aug 13 1998 Jeff Johnson <jbj at redhat.com>
- build root

* Fri Apr 24 1998 Prospector System <bugs at redhat.com>
- translations modified for de, fr, tr

* Wed Apr 08 1998 Cristian Gafton <gafton at redhat.com>
- compiled for Manhattan

* Fri Mar 20 1998 Cristian Gafton <gafton at redhat.com>
- updated to 2.4.3 for security reasons

* Wed Nov 05 1997 Donnie Barnes <djb at redhat.com>
- added wmconfig entry

* Wed Oct 21 1997 Cristian Gafton <gafton at redhat.com>
- fixed the spec file

* Fri Oct 10 1997 Erik Troan <ewt at redhat.com>
- updated to ncftp 2.4.2

* Thu Jul 10 1997 Erik Troan <ewt at redhat.com>
- built against glibc

* Tue Mar 25 1997 Donnie Barnes <djb at redhat.com>
- Rebuild as Sun version didn't work.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Mar 2005 22:26:48 -0000	1.1
+++ .cvsignore	5 Mar 2005 22:28:24 -0000	1.2
@@ -0,0 +1,2 @@
+ncftp-3.1.8-src.tar.bz2
+ncftp-3181-v6-20040826.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Mar 2005 22:26:48 -0000	1.1
+++ sources	5 Mar 2005 22:28:24 -0000	1.2
@@ -0,0 +1,2 @@
+dd5f47c72b6958fdb652355fb9bdb70c  ncftp-3.1.8-src.tar.bz2
+ade187726693f5c6c6415e41832f514d  ncftp-3181-v6-20040826.diff.gz



From fedora-extras-commits at redhat.com  Sat Mar  5 22:58:37 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 17:58:37 -0500
Subject: rpms/ncftp/devel ncftp.spec,1.1,1.2
Message-ID: <200503052258.j25Mwb3M015641@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ncftp.spec 
Log Message:
Post initial import cleanup and changes.



Index: ncftp.spec
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/ncftp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ncftp.spec	5 Mar 2005 22:28:24 -0000	1.1
+++ ncftp.spec	5 Mar 2005 22:58:35 -0000	1.2
@@ -1,12 +1,12 @@
-Summary: An improved FTP client.
+Summary: Improved console FTP client
 Name: ncftp
 Version: 3.1.8
+Release: 5
 Epoch: 2
-Release: 4
-Prefix: %{_prefix}
 License: Distributable
 Group: Applications/Internet
-Source0: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2
+URL: http://www.ncftp.com/ncftp/
+Source: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2
 Patch1: ncftp-3.0.1-pref.patch
 Patch2: ncftp-3.1.7-shell.patch
 Patch3: ftp://ftp.kame.net/pub/kame/misc/ncftp-3181-v6-20040826.diff.gz
@@ -14,46 +14,45 @@
 Patch5: ncftp-3.1.5-pmeter.patch
 Patch6: ncftp-3.1.5-ncursesw.patch
 Patch7: ncftp-3.1.6-rh1.patch
-BuildRoot: /var/tmp/%{name}-root
-BuildRequires: ncurses-devel glibc-devel gcc
-URL: http://www.ncftp.com/ncftp/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: ncurses-devel
 
 %description
 Ncftp is an improved FTP client. Ncftp's improvements include support
 for command line editing, command histories, recursive gets, automatic
 anonymous logins, and more.
 
+
 %prep
 %setup -q
 %patch1 -p0 -b .pref
-%patch2 -p1
+%patch2 -p1 -b .shell
 %patch3 -p1 -b .ipv6
 %patch4 -p1 -b .res
 %patch5 -p1 -b .pmeter
 %patch6 -p1 -b .ncursesw
 #%patch7 -p1 -b .ask_save
 
+
 %build
-#aclocal -I autoconf
-#cp -f autoconf/aclocal.m4 .
 %configure --enable-signals --enable-ipv6
 make STRIPFLAG=""
 rm -f README.v6.ipv6
 
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{/usr/bin,%{_mandir}/man1}
 
-%makeinstall BINDIR=$RPM_BUILD_ROOT/usr/bin
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}{%{_bindir},%{_mandir}/man1}
+%makeinstall BINDIR=%{buildroot}%{_bindir}
 
-mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Internet
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %files
-%defattr(-,root,root)
-%doc README* doc
+%defattr(-,root,root,0755)
+%doc README* doc/*.txt doc/html/
 %{_bindir}/ncftp
 %{_bindir}/ncftpget
 %{_bindir}/ncftpput
@@ -68,17 +67,23 @@
 %{_mandir}/man1/ncftpls.1*
 %{_mandir}/man1/ncftpspooler.1*
 
+
 %changelog
+* Sat Mar  5 2005 Matthias Saou <http://freshrpms.net/> 2:3.1.8-5
+- Spec file cleanup.
+- Remove man pages from docs.
+- Update summary.
+
 * Wed Mar 02 2005 Karsten Hopp <karsten at redhat.de> 2:3.1.8-4
 - build with gcc-4
 
 * Wed Feb 09 2005 Karsten Hopp <karsten at redhat.de> 2:3.1.8-3
 - rebuilt
 
-* Thu Aug 26 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-2 
+* Thu Aug 26 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-2
 - new upstream ipv6 patch, enable ipv6 again
 
-* Mon Aug 09 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-1 
+* Mon Aug 09 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-1
 - update to version 3.1.8
 - new ipv6 patch, but currently disabled due to problems with active-ftp
   (#127553)
@@ -86,7 +91,7 @@
 * Wed Jul 07 2004 Karsten Hopp <karsten at redhat.de> 2:3.1.7-5
 - rebuild with new gcc
 
-* Mon Jul 05 2004 Karsten Hopp <karsten at redhat.de> 3.1.7-4 
+* Mon Jul 05 2004 Karsten Hopp <karsten at redhat.de> 3.1.7-4
 - add new ipv6 patch (#124232)
 
 * Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
@@ -231,7 +236,7 @@
 * Sat Jun 12 1999 Jeff Johnson <jbj at redhat.com>
 - 3.0b19
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
 - auto rebuild in the new build environment (release 3)
 
 * Wed Feb 24 1999 Bill Nottingham <notting at redhat.com>



From fedora-extras-commits at redhat.com  Sat Mar  5 23:39:56 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 5 Mar 2005 18:39:56 -0500
Subject: rpms/graveman import.log,1.2,1.3
Message-ID: <200503052339.j25Ndusc016537@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	import.log 
Log Message:
auto-import graveman-0.3.8-2 on branch FC-3 from graveman-0.3.8-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/graveman/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	26 Feb 2005 21:39:05 -0000	1.2
+++ import.log	5 Mar 2005 23:39:54 -0000	1.3
@@ -1 +1,2 @@
 graveman-0_3_8-1:HEAD:graveman-0.3.8-1.src.rpm:1109453936
+graveman-0_3_8-2:FC-3:graveman-0.3.8-2.src.rpm:1110065985



From fedora-extras-commits at redhat.com  Sun Mar  6 02:10:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 5 Mar 2005 21:10:45 -0500
Subject: rpms/sqlite import.log,1.5,1.6
Message-ID: <200503060210.j262Ajcc019216@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import sqlite-2.8.16-0.fdr.1.2 on branch FC-2 from sqlite-2.8.16-0.fdr.1.2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sqlite/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	8 Nov 2004 05:23:02 -0000	1.5
+++ import.log	6 Mar 2005 02:10:43 -0000	1.6
@@ -2,3 +2,4 @@
 sqlite-2_8_6-0_fdr_6_rh90:HEAD:sqlite-2.8.6-0.fdr.6.rh90.src.rpm:1099891358
 sqlite-2_8_6-0_fdr_6_1:HEAD:sqlite-2.8.6-0.fdr.6.1.src.rpm:1099891373
 sqlite-2_8_6-0_fdr_6_2:HEAD:sqlite-2.8.6-0.fdr.6.2.src.rpm:1099891382
+sqlite-2_8_16-0_fdr_1_2:FC-2:sqlite-2.8.16-0.fdr.1.2.src.rpm:1110075055



From fedora-extras-commits at redhat.com  Sun Mar  6 02:10:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 5 Mar 2005 21:10:45 -0500
Subject: rpms/sqlite/FC-2 sqlite-2.8.15-arch-double-differences.patch, NONE,
	1.1 sqlite-2.8.15-makefile.patch, NONE,
	1.1 sqlite-2.8.15.rpath.patch, NONE,
	1.1 sqlite-64bit-fixes.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 sqlite.spec, 1.4,
	1.5 sqlite-2.8.3.makefile.tclsqlite.patch, 1.1,
	NONE sqlite-2.8.6.norpath.patch, 1.1, NONE
Message-ID: <200503060210.j262Aj8U019220@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sqlite/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19203/FC-2

Modified Files:
	.cvsignore sources sqlite.spec 
Added Files:
	sqlite-2.8.15-arch-double-differences.patch 
	sqlite-2.8.15-makefile.patch sqlite-2.8.15.rpath.patch 
	sqlite-64bit-fixes.patch 
Removed Files:
	sqlite-2.8.3.makefile.tclsqlite.patch 
	sqlite-2.8.6.norpath.patch 
Log Message:
auto-import sqlite-2.8.16-0.fdr.1.2 on branch FC-2 from sqlite-2.8.16-0.fdr.1.2.src.rpm

sqlite-2.8.15-arch-double-differences.patch:

--- NEW FILE sqlite-2.8.15-arch-double-differences.patch ---
--- sqlite/test/format3.test.bak	2003-12-23 03:17:35.000000000 +0100
+++ sqlite/test/format3.test	2005-01-28 18:06:35.066538463 +0100
@@ -686,7 +686,7 @@
   execsql {SELECT '0'==0.0}
 } {1}
 do_test format3-11.3 {
-  execsql {SELECT '123456789012345678901'=='123456789012345678900'}
+  execsql {SELECT '1234567890123456789012'=='1234567890123456789011'}
 } {1}
 do_test format3-11.4 {
   execsql {
--- sqlite/test/misc1.test.bak	2003-08-05 15:13:39.000000000 +0200
+++ sqlite/test/misc1.test	2005-01-28 18:07:26.976971054 +0100
@@ -335,7 +335,7 @@
   execsql {SELECT '0'==0.0}
 } {1}
 do_test misc1-12.3 {
-  execsql {SELECT '12345678901234567890'=='12345678901234567891'}
+  execsql {SELECT '1234567890123456789012'=='1234567890123456789011'}
 } {0}
 do_test misc1-12.4 {
   execsql {

sqlite-2.8.15-makefile.patch:

--- NEW FILE sqlite-2.8.15-makefile.patch ---
diff -Nur sqlite-2.8.15-orig/Makefile.in sqlite-2.8.15/Makefile.in
--- sqlite-2.8.15-orig/Makefile.in	2004-03-27 00:16:32.000000000 +0100
+++ sqlite-2.8.15/Makefile.in	2005-01-23 18:20:37.034194768 +0100
@@ -465,14 +465,16 @@
 	mv $(DOC) doc
 
 install:	sqlite libsqlite.la sqlite.h
-	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib
-	$(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib
+	$(INSTALL) -d $(DESTDIR)$(libdir)
+	$(LTINSTALL) libsqlite.la $(DESTDIR)$(libdir)
+	$(LTINSTALL) libtclsqlite.la $(DESTDIR)$(libdir)/sqlite-__VERSION__
 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
 	$(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin
+	$(LTINSTALL) tclsqlite $(DESTDIR)$(exec_prefix)/bin
 	$(INSTALL) -d $(DESTDIR)$(prefix)/include
 	$(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
-	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
-	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
+	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig; 
+	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(libdir)/pkgconfig; 
 
 clean:	
 	rm -f *.lo *.la *.o sqlite at TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.*

sqlite-2.8.15.rpath.patch:

--- NEW FILE sqlite-2.8.15.rpath.patch ---
--- sqlite/Makefile.in.nos	2004-06-18 14:13:40.127066236 +0200
+++ sqlite/Makefile.in	2004-06-18 14:13:56.241098295 +0200
@@ -192,7 +192,7 @@
 
 libtclsqlite.la:	tclsqlite.lo libsqlite.la
 	$(LTLINK) -o libtclsqlite.la tclsqlite.lo \
-		libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite \
+		libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite-__VERSION__ \
 		-version-info "8:6:8"
 
 sqlite at TARGET_EXEEXT@:	$(TOP)/src/shell.c libsqlite.la sqlite.h

sqlite-64bit-fixes.patch:

--- NEW FILE sqlite-64bit-fixes.patch ---
--- sqlite/src/test3.c.64bit-fixes	2004-09-29 10:09:56.249551000 -0400
+++ sqlite/src/test3.c	2004-09-29 11:34:51.314336091 -0400
@@ -19,9 +19,11 @@
 #include "pager.h"
 #include "btree.h"
 #include "tcl.h"
+#include "test-util.h"
 #include <stdlib.h>
 #include <string.h>
 
+
 /*
 ** Interpret an SQLite error number
 */
@@ -98,7 +100,7 @@ static int btree_close(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeClose(pBt);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -125,7 +127,7 @@ static int btree_begin_transaction(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeBeginTrans(pBt);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -152,7 +154,7 @@ static int btree_rollback(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeRollback(pBt);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -179,7 +181,7 @@ static int btree_commit(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeCommit(pBt);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -207,7 +209,7 @@ static int btree_create_table(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeCreateTable(pBt, &iTable);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -237,7 +239,7 @@ static int btree_drop_table(
        " ID TABLENUM\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR;
   rc = sqliteBtreeDropTable(pBt, iTable);
   if( rc!=SQLITE_OK ){
@@ -266,7 +268,7 @@ static int btree_clear_table(
        " ID TABLENUM\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR;
   rc = sqliteBtreeClearTable(pBt, iTable);
   if( rc!=SQLITE_OK ){
@@ -296,7 +298,7 @@ static int btree_get_meta(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeGetMeta(pBt, aMeta);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -333,7 +335,7 @@ static int btree_update_meta(
        " ID METADATA...\" (METADATA is ", zBuf, " integers)", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   for(i=0; i<SQLITE_N_BTREE_META; i++){
     if( Tcl_GetInt(interp, argv[i+2], &aMeta[i]) ) return TCL_ERROR;
   }
@@ -365,7 +367,7 @@ static int btree_page_dump(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &iPage) ) return TCL_ERROR;
   rc = sqliteBtreePageDump(pBt, iPage, 0);
   if( rc!=SQLITE_OK ){
@@ -395,7 +397,7 @@ static int btree_tree_dump(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &iPage) ) return TCL_ERROR;
   rc = sqliteBtreePageDump(pBt, iPage, 1);
   if( rc!=SQLITE_OK ){
@@ -425,7 +427,7 @@ static int btree_pager_stats(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   a = sqlitepager_stats(sqliteBtreePager(pBt));
   for(i=0; i<9; i++){
     static char *zName[] = {
@@ -458,7 +460,7 @@ static int btree_pager_ref_dump(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   sqlitepager_refdump(sqliteBtreePager(pBt));
   return TCL_OK;
 }
@@ -487,7 +489,7 @@ static int btree_integrity_check(
        " ID ROOT ...\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   nRoot = argc-2;
   aRoot = malloc( sizeof(int)*(argc-2) );
   for(i=0; i<argc-2; i++){
@@ -524,7 +526,7 @@ static int btree_cursor(
        " ID TABLENUM WRITEABLE\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR;
   if( Tcl_GetBoolean(interp, argv[3], &wrFlag) ) return TCL_ERROR;
   rc = sqliteBtreeCursor(pBt, iTable, wrFlag, &pCur);
@@ -556,7 +558,7 @@ static int btree_close_cursor(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeCloseCursor(pCur);
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -586,7 +588,7 @@ static int btree_move_to(
        " ID KEY\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeMoveto(pCur, argv[2], strlen(argv[2]), &res);  
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -618,7 +620,7 @@ static int btree_delete(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeDelete(pCur);
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -647,7 +649,7 @@ static int btree_insert(
        " ID KEY DATA\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeInsert(pCur, argv[2], strlen(argv[2]),
                          argv[3], strlen(argv[3]));
   if( rc ){
@@ -680,7 +682,7 @@ static int btree_next(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeNext(pCur, &res);
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -714,7 +716,7 @@ static int btree_prev(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreePrevious(pCur, &res);
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -747,7 +749,7 @@ static int btree_first(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeFirst(pCur, &res);
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -780,7 +782,7 @@ static int btree_last(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeLast(pCur, &res);
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -812,7 +814,7 @@ static int btree_key(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   sqliteBtreeKeySize(pCur, &n);
   zBuf = malloc( n+1 );
   rc = sqliteBtreeKey(pCur, 0, n, zBuf);
@@ -850,7 +852,7 @@ static int btree_data(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   sqliteBtreeDataSize(pCur, &n);
   zBuf = malloc( n+1 );
   rc = sqliteBtreeData(pCur, 0, n, zBuf);
@@ -887,7 +889,7 @@ static int btree_payload_size(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   sqliteBtreeKeySize(pCur, &n1);
   sqliteBtreeDataSize(pCur, &n2);
   sprintf(zBuf, "%d", n1+n2);
@@ -927,7 +929,7 @@ static int btree_cursor_dump(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeCursorDump(pCur, aResult);
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
--- sqlite/src/test2.c.64bit-fixes	2004-02-09 20:54:28.000000000 -0500
+++ sqlite/src/test2.c	2004-09-29 11:35:00.840257674 -0400
@@ -19,6 +19,7 @@
 #include "sqliteInt.h"
 #include "pager.h"
 #include "tcl.h"
+#include "test-util.h"
 #include <stdlib.h>
 #include <string.h>
 
@@ -104,7 +105,7 @@ static int pager_close(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_close(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -131,7 +132,7 @@ static int pager_rollback(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_rollback(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -158,7 +159,7 @@ static int pager_commit(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_commit(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -185,7 +186,7 @@ static int pager_ckpt_begin(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_ckpt_begin(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -212,7 +213,7 @@ static int pager_ckpt_rollback(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_ckpt_rollback(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -239,7 +240,7 @@ static int pager_ckpt_commit(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_ckpt_commit(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -266,7 +267,7 @@ static int pager_stats(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   a = sqlitepager_stats(pPager);
   for(i=0; i<9; i++){
     static char *zName[] = {
@@ -299,7 +300,7 @@ static int pager_pagecount(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   sprintf(zBuf,"%d",sqlitepager_pagecount(pPager));
   Tcl_AppendResult(interp, zBuf, 0);
   return TCL_OK;
@@ -326,7 +327,7 @@ static int page_get(
        " ID PGNO\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &pgno) ) return TCL_ERROR;
   rc = sqlitepager_get(pPager, pgno, &pPage);
   if( rc!=SQLITE_OK ){
@@ -359,7 +360,7 @@ static int page_lookup(
        " ID PGNO\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &pgno) ) return TCL_ERROR;
   pPage = sqlitepager_lookup(pPager, pgno);
   if( pPage ){
@@ -387,7 +388,7 @@ static int page_unref(
        " PAGE\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR;
+  pPage = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_unref(pPage);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -414,7 +415,7 @@ static int page_read(
        " PAGE\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR;
+  pPage = sqliteTextToPtr(argv[1]);
   memcpy(zBuf, pPage, sizeof(zBuf));
   Tcl_AppendResult(interp, zBuf, 0);
   return TCL_OK;
@@ -438,7 +439,7 @@ static int page_number(
        " PAGE\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR;
+  pPage = sqliteTextToPtr(argv[1]);
   sprintf(zBuf, "%d", sqlitepager_pagenumber(pPage));
   Tcl_AppendResult(interp, zBuf, 0);
   return TCL_OK;
@@ -462,7 +463,7 @@ static int page_write(
        " PAGE DATA\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR;
+  pPage = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_write(pPage);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
--- sqlite/src/test-util.c.64bit-fixes	2004-09-29 11:33:18.838681763 -0400
+++ sqlite/src/test-util.c	2004-09-29 11:35:32.332610359 -0400
@@ -0,0 +1,47 @@
+#include <stdint.h>
+#include <assert.h>
+#include "test-util.h"
+
+/*
+** Translate a single byte of Hex into an integer.
+*/
+static int hexToInt(int h){
+  if( h>='0' && h<='9' ){
+    return h - '0';
+  }else if( h>='a' && h<='f' ){
+    return h - 'a' + 10;
+  }else if( h>='A' && h<='F' ){
+    return h - 'A' + 10;
+  }else{
+    return 0;
+  }
+}
+
+#if defined(SQLITE_TEST)
+/*
+** Convert text generated by the "%p" conversion format back into
+** a pointer.
+*/
+void *sqliteTextToPtr(const char *z){
+  void *p;
+  uint64_t v;
+  uint32_t v2;
+  if( z[0]=='0' && z[1]=='x' ){
+    z += 2;
+  }
+  v = 0;
+  while( *z ){
+    v = (v<<4) + hexToInt(*z);
+    z++;
+  }
+  if( sizeof(p)==sizeof(v) ){
+    p = *(void**)&v;
+  }else{
+    assert( sizeof(p)==sizeof(v2) );
+    v2 = (uint32_t)v;
+    p = *(void**)&v2;
+  }
+  return p;
+}
+#endif
+
--- sqlite/src/test-util.h.64bit-fixes	2004-09-29 11:33:23.513624799 -0400
+++ sqlite/src/test-util.h	2004-09-29 11:34:35.012047569 -0400
@@ -0,0 +1,6 @@
+#ifndef TEST_UTIL_H
+#define TEST_UTIL_H
+
+extern void *sqliteTextToPtr(const char *z);
+
+#endif /* TEST_UTIL_H */
--- sqlite/Makefile.in.64bit-fixes	2004-09-29 09:41:08.011929000 -0400
+++ sqlite/Makefile.in	2004-09-29 11:32:59.441768988 -0400
@@ -142,6 +142,7 @@ SRC = \
 # Source code to the test files.
 #
 TESTSRC = \
+  $(TOP)/src/test-util.c \
   $(TOP)/src/btree.c \
   $(TOP)/src/func.c \
   $(TOP)/src/os.c \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sqlite/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:22:32 -0000	1.2
+++ .cvsignore	6 Mar 2005 02:10:43 -0000	1.3
@@ -1 +1 @@
-sqlite-2.8.6.tar.gz
+sqlite-2.8.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sqlite/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:22:32 -0000	1.2
+++ sources	6 Mar 2005 02:10:43 -0000	1.3
@@ -1 +1 @@
-3047e24370d7e49d7bfd9728addf76cf  sqlite-2.8.6.tar.gz
+9c79b461ff30240a6f9d70dd67f8faea  sqlite-2.8.16.tar.gz


Index: sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/sqlite/FC-2/sqlite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sqlite.spec	8 Nov 2004 05:23:02 -0000	1.4
+++ sqlite.spec	6 Mar 2005 02:10:43 -0000	1.5
@@ -1,15 +1,17 @@
 Name:           sqlite
-Version:        2.8.6
-Release:        0.fdr.6.2
+Version:        2.8.16
+Release:        0.fdr.1.2
 Epoch:          0
-Summary:        An embeddable SQL engine in a C library.
+Summary:        An embeddable SQL engine in a C library
 Group:          System Environment/Libraries
 License:        Public Domain
 URL:            http://www.sqlite.org/
-Source0:        http://www.sqlite.org/sqlite-2.8.6.tar.gz
-Patch1:		sqlite-2.8.6.norpath.patch
-Patch2:		sqlite-2.8.3.makefile.tclsqlite.patch
-Patch3:		sqlite-2.8.3.test.rh9.patch
+Source0:        http://www.sqlite.org/sqlite-%{version}.tar.gz
+Patch1:         sqlite-2.8.15.rpath.patch      
+Patch2:         sqlite-2.8.15-makefile.patch
+Patch3:         sqlite-2.8.3.test.rh9.patch
+Patch4:		sqlite-64bit-fixes.patch
+Patch5:		sqlite-2.8.15-arch-double-differences.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel readline-devel %{_includedir}/tcl.h
@@ -47,25 +49,33 @@
 This package contains tcl bindings for sqlite.
 
 %prep
-%setup -q -n %{name}
-%patch1 -p1
-%patch2 -p0
+%setup -q
+%patch1 -p1 -b .rpath
+%patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+sed -i.rpath 's!__VERSION__!%{version}!g' Makefile.in
+# Patch additional /usr/lib locations where we don't have $(libdir)
+# to substitute with.
+sed -i.lib 's!@exec_prefix@/lib!%_libdir!g' Makefile.in
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -DNDEBUG=1"
 %configure --enable-utf8
-make all tclsqlite doc test
+make
+make tclsqlite libtclsqlite.la doc
+#obs. make test doesn't like root
+make test
 
 %install
 rm -rf $RPM_BUILD_ROOT
 DIRECTORY=$RPM_BUILD_ROOT%_libdir/sqlite-%version
 install -d $DIRECTORY
-cp -d -p .libs/libtclsqlite.so* $DIRECTORY
 echo 'package ifneeded sqlite 2 [list load [file join $dir libtclsqlite.so]]' > $DIRECTORY/pkgIndex.tcl
 
 %makeinstall
-install -D -m 0644 sqlite.1 $RPM_BUILD_ROOT/%{_mandir}/man1/sqlite.1
+install -D -m 0644 sqlite.1 $RPM_BUILD_ROOT%{_mandir}/man1/sqlite.1
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
@@ -93,10 +103,35 @@
 %defattr(-,root,root,-)
 %doc doc/tclsqlite.html
 %exclude %_bindir/tclsqlite
-%exclude %_libdir/libtclsqlite.*
+%exclude %_libdir/%{name}-%{version}/libtclsqlite.a 
+%exclude %{_bindir}/tclsqlite
 %_libdir/sqlite-%version
 
 %changelog
+* Wed Feb 16 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:2.8.16-1
+- Update to 2.8.16 bug-fix release + update patches.
+
+* Tue Feb 15 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.8.15-2
+- add sqlite-64bit-fixes.patch and sqlite-2.8.15-arch-double-differences.patch
+  fixes x86_64; Both were found in a mandrake srpm
+- remove exclusive arch ix86; hopefully this fixes ppc also
+
+* Sun Jan 23 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:2.8.15-1
+- Add exclusive arch ix86 for now (make test segfaults on x86_64).
+- Update makefile patch, $(exec_prefix)/lib -> $(libdir), and
+  substitute additional /usr/lib locations in %%prep for multilib
+  people to play with.
+
+* Sun Sep 26 2004 Adrian Reber <adrian at lisas.de> - 0:2.8.15-0.fdr.1
+- Update to 2.8.15
+- Update patches
+
+* Fri Jun 19 2004 Nils O. Sel??sdal <NOS at Utel.no> - 0:2.8.14-0.fdr.1
+- Update to 2.8.14
+- Update patches
+- --enable-releasemode
+- small spec file tweaks
+
 * Sat Dec 27 2003 Jean-Luc Fontaine <jfontain at free.fr> - 0:2.8.6-0.fdr.6
 - in tcl rpm, removed tclsqlite, moved shared library in own sqlite
   sub-directory add added pkgIndex.tcl file to make package dynamically
@@ -105,13 +140,17 @@
   existence in RH 8.0 and 9
 - in tcl rpm, added tcl package requirement
 - in tcl rpm, post ldconfig is not necessary
+
 * Wed Nov 12 2003 Nils O. Sel??sdal <NOS at Utel.no> -  0:2.8.6-0.fdr.5
 - BuildRequires tcl-devel
 - small .spec tweaks
+
 * Tue Oct 28 2003 Nils O. Sel??sdal <NOS at Utel.no> - 0:2.8.6-0.fdr.4
 - exclude libtclsqlite.a
+
 * Mon Oct 27 2003 Nils O. Sel??sdal <NOS at Utel.no> - 0:2.8.6-0.fdr.3
 - Fix readme -> README
+
 * Mon Oct 27 2003 Nils O. Sel??sdal <NOS at Utel.no> - 0:2.8.6-0.fdr.2
 - Better summary/description
 - Add patch for not using rpath


--- sqlite-2.8.3.makefile.tclsqlite.patch DELETED ---


--- sqlite-2.8.6.norpath.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar  6 03:48:17 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sat, 5 Mar 2005 22:48:17 -0500
Subject: rpms/netcdf/FC-3 .cvsignore, 1.3, 1.4 netcdf.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200503060348.j263mHqm020163@cvs-int.fedora.redhat.com>

Author: edhill

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

Modified Files:
	.cvsignore netcdf.spec sources 
Log Message:
update for 3.6.0-p1 large-files-bug fix and remove the Epoch



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Jan 2005 09:52:44 -0000	1.3
+++ .cvsignore	6 Mar 2005 03:48:15 -0000	1.4
@@ -1 +1 @@
-netcdf-3_6_0-beta6.tar.gz
+netcdf-3.6.0-p1.tar.gz


Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-3/netcdf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- netcdf.spec	14 Jan 2005 10:10:03 -0000	1.3
+++ netcdf.spec	6 Mar 2005 03:48:15 -0000	1.4
@@ -1,13 +1,12 @@
 Name:           netcdf
 Version:        3.6.0
-Release:        0.2.beta6
-Epoch:          0
+Release:        1.p1
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
 License:        NetCDF
 URL:            http://my.unidata.ucar.edu/content/software/netcdf/index.html
-Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3_6_0-beta6.tar.gz
+Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.0-p1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-g77
@@ -54,11 +53,11 @@
 
 
 %prep
-%setup -q -n netcdf-3_6_0-beta6
+%setup -q -n netcdf-3.6.0-p1
 
 
 %build
-cd $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src
+cd $RPM_BUILD_DIR/netcdf-3.6.0-p1/src
 export FC="g77"
 export CPPFLAGS="-fPIC"
 %configure
@@ -74,7 +73,7 @@
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/netcdf-3
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}
-cd $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src
+cd $RPM_BUILD_DIR/netcdf-3.6.0-p1/src
 %makeinstall INCDIR=${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 \
   LIBDIR=${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 \
   MANDIR=$RPM_BUILD_ROOT/%{_mandir}
@@ -86,7 +85,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src/COPYRIGHT $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src/README $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src/COMPATIBILITY
+%doc $RPM_BUILD_DIR/netcdf-3.6.0-p1/src/COPYRIGHT $RPM_BUILD_DIR/netcdf-3.6.0-p1/src/README
 %{_bindir}/*
 %{_mandir}/man1/*
 
@@ -98,6 +97,9 @@
 
 
 %changelog
+* Sat Mar  5 2005 Ed Hill <ed at eh3.com> - 0:3.6.0-1.p1
+- update for 3.6.0-p1 large-files-bug fix and remove the Epoch
+
 * Sun Dec 12 2004 Ed Hill <eh3 at mit.edu> - 0:3.6.0-0.2.beta6
 - fix naming scheme for pre-releases (per Michael Schwendt)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Jan 2005 09:52:44 -0000	1.3
+++ sources	6 Mar 2005 03:48:15 -0000	1.4
@@ -1 +1 @@
-6c914f05c3327dd91d05322b143f7e9b  netcdf-3_6_0-beta6.tar.gz
+27c193e0462d9979406d167a01a5ee95  netcdf-3.6.0-p1.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar  6 04:37:03 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sat, 5 Mar 2005 23:37:03 -0500
Subject: rpms/netcdf/FC-3 netcdf.spec,1.4,1.5
Message-ID: <200503060437.j264b3Nr020991@cvs-int.fedora.redhat.com>

Author: edhill

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

Modified Files:
	netcdf.spec 
Log Message:
remove unnecessary $RPM_BUILD_DIR entries (per Michael Schwendt)



Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-3/netcdf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netcdf.spec	6 Mar 2005 03:48:15 -0000	1.4
+++ netcdf.spec	6 Mar 2005 04:37:01 -0000	1.5
@@ -14,7 +14,7 @@
 %package devel
 Summary:        Development files for netcdf-3
 Group:          Development/Libraries
-#Requires:       %{name} = %{epoch}:%{version}-%{release}
+#Requires:       %{name} = %{version}-%{release}
 
 %description
 NetCDF-3 (network Common Data Form ver3) is an interface for
@@ -57,7 +57,7 @@
 
 
 %build
-cd $RPM_BUILD_DIR/netcdf-3.6.0-p1/src
+cd src
 export FC="g77"
 export CPPFLAGS="-fPIC"
 %configure
@@ -73,7 +73,7 @@
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/netcdf-3
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}
-cd $RPM_BUILD_DIR/netcdf-3.6.0-p1/src
+cd src
 %makeinstall INCDIR=${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 \
   LIBDIR=${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 \
   MANDIR=$RPM_BUILD_ROOT/%{_mandir}
@@ -85,7 +85,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc $RPM_BUILD_DIR/netcdf-3.6.0-p1/src/COPYRIGHT $RPM_BUILD_DIR/netcdf-3.6.0-p1/src/README
+%doc src/COPYRIGHT src/README
 %{_bindir}/*
 %{_mandir}/man1/*
 



From adrian at lisas.de  Sun Mar  6 10:31:46 2005
From: adrian at lisas.de (Adrian Reber)
Date: Sun, 6 Mar 2005 11:31:46 +0100
Subject: APPROVED: pdfjam
Message-ID: <20050306103146.GB25771@lisas.de>


pdfjam: Utilities for join, rotate and align PDFs

Approved by: me
Maintainer: Jose Pedro Oliveira <jpo at di.uminho.pt> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050306/dc06efa5/attachment.sig>

From fedora-extras-commits at redhat.com  Sun Mar  6 10:39:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 6 Mar 2005 05:39:50 -0500
Subject: rpms/pth import.log,1.8,1.9
Message-ID: <200503061039.j26AdoTV030740@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	import.log 
Log Message:
auto-import pth-2.0.4-0.fdr.1.2 on branch FC-2 from pth-2.0.4-0.fdr.1.2.src.rpm
http://bugzilla.fedora.us/show_bug.cgi?id=133


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pth/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	27 Feb 2005 19:58:36 -0000	1.8
+++ import.log	6 Mar 2005 10:39:48 -0000	1.9
@@ -5,3 +5,4 @@
 pth-2_0_3-1:HEAD:pth-2.0.3-1.src.rpm:1108270503
 pth-2_0_4-1:FC-3:pth-2.0.4-1.src.rpm:1109534233
 pth-2_0_4-0_fdr_1:FC-2:pth-2.0.4-0.fdr.1.src.rpm:1109534307
+pth-2_0_4-0_fdr_1_2:FC-2:pth-2.0.4-0.fdr.1.2.src.rpm:1110105580



From fedora-extras-commits at redhat.com  Sun Mar  6 10:39:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 6 Mar 2005 05:39:50 -0500
Subject: rpms/pth/FC-2 pth.spec,1.5,1.6
Message-ID: <200503061039.j26AdoN7030743@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pth/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30730/FC-2

Modified Files:
	pth.spec 
Log Message:
auto-import pth-2.0.4-0.fdr.1.2 on branch FC-2 from pth-2.0.4-0.fdr.1.2.src.rpm
http://bugzilla.fedora.us/show_bug.cgi?id=133


Index: pth.spec
===================================================================
RCS file: /cvs/extras/rpms/pth/FC-2/pth.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pth.spec	27 Feb 2005 19:58:36 -0000	1.5
+++ pth.spec	6 Mar 2005 10:39:48 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:        GNU Pth - The GNU Portable Threads
 Name:           pth
 Version:        2.0.4
-Release:        0.fdr.1
+Release:        0.fdr.1.2
 Epoch:          0
 License:        LGPL
 Group:          System Environment/Libraries



From fedora-extras-commits at redhat.com  Sun Mar  6 16:57:57 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 6 Mar 2005 11:57:57 -0500
Subject: rpms/dietlibc/devel dietlibc.spec,1.4,1.5
Message-ID: <200503061657.j26Gvv82009532@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	dietlibc.spec 
Log Message:
build the dynamic libs for x86, x86_64 and arm only
tabifyied the file



Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dietlibc.spec	5 Mar 2005 21:10:21 -0000	1.4
+++ dietlibc.spec	6 Mar 2005 16:57:55 -0000	1.5
@@ -1,9 +1,9 @@
 ## $Id$
 
 ## This package understands the following switches:
-## --with cross                 ...  enable crossbuild
-## --define crossarch <arch>    ...  set cross-architecture (only valid with
-##                                   '--with cross'; defaults to 'arm-linux')
+## --with cross			...  enable crossbuild
+## --define crossarch <arch>	...  set cross-architecture (only valid with
+##				     '--with cross'; defaults to 'arm-linux')
 
 ## Fedora Extras specific customization below...
 %global	crossarch	%{!?crossarch:arm-linux}%{?crossarch}
@@ -12,7 +12,26 @@
 %global NAME		dietlibc
 %global do_crossbuild	%{?_with_cross:1}%{!?_with_cross:0}
 
-%{!?release_func:%define release_func() %1%{?disttag}}
+%ifarch %ix86 x86_64 arm
+%global noncross_do_dyn	1
+%else
+%global noncross_do_dyn 0
+%endif
+
+%ifarch %ix86
+%global target_cpu	i386
+%else
+%global target_cpu	%_target_cpu
+%endif
+
+%global target_cpu	%(test "%do_crossbuild" = 1 && echo %crossarch | sed -e 's!-.*!!' || echo %target_cpu)
+%global do_dyn		%(test "%do_crossbuild" = 1 && case "%target_cpu" in (x86_86|arm|i?86) echo 1;; (*) echo 0;; esac || echo %noncross_do_dyn)
+%if %do_dyn
+%global with_dyn	1
+%endif
+
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	Small libc implementation
 Name:		%{?_with_cross:cross-%crossarch-}%NAME
@@ -26,11 +45,11 @@
 Patch0:		dietlibc-0.28-gcc4.patch
 Patch1:		dietlibc-0.28-setpriority.patch
 BuildRoot:	%_tmppath/%name-%version-buildroot
-Requires:	dietlibc-lib = %version-%release
+%{?with_dyn:Requires:	dietlibc-lib = %version-%release}
 
 %if %do_crossbuild
-BuildRequires:  dietlibc
-Requires:       dietlibc = %version-%release
+BuildRequires:	dietlibc
+Requires:	dietlibc = %version-%release
 %endif
 
 
@@ -61,18 +80,17 @@
 sed -i -e 's!LD_RUN_PATH= !env -u LD_RUN_PATH !' Makefile
 
 
-%define basemakeflags   prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: %{!?_with_cross:CFLAGS="$RPM_OPT_FLAGS"}
-%define xtraflags	%(echo CROSS=%{crossarch}- ARCH=$(echo %crossarch | sed -e 's!-.*!!'))
-%define makeflags	%basemakeflags %{?_with_cross:%xtraflags}
+%define basemakeflags	prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: %{!?_with_cross:CFLAGS="$RPM_OPT_FLAGS"}
+%define makeflags	%basemakeflags %{?_with_cross:CROSS=%crossarch- ARCH=%target_cpu}
 
 
 %build
 %if %do_crossbuild
-  mkdir bin-%_arch
+  mkdir -p bin-%_arch
   diet gcc diet.c -DDIETHOME=\"`pwd`\" -DVERSION=\"X\" -o bin-%_arch/diet
 %endif
 
-%__make %makeflags all dyn %{?_smp_mflags}
+%__make %makeflags all %{?with_dyn:dyn} %{?_smp_mflags}
 
 
 
@@ -81,13 +99,14 @@
 %__install -d -m755 $RPM_BUILD_ROOT/etc
 %__make %makeflags DESTDIR=$RPM_BUILD_ROOT install
 
+
 %if !%do_crossbuild
   ln -s lib-%_arch ${RPM_BUILD_ROOT}%_libdir/dietlibc/lib-%_arch-%_vendor
 %endif
 
 %if %do_crossbuild
   rm -rf ${RPM_BUILD_ROOT}%_libdir/dietlibc/include	\
-  	 ${RPM_BUILD_ROOT}%_mandir
+	 ${RPM_BUILD_ROOT}%_mandir
 %endif
 
 
@@ -96,7 +115,7 @@
 
 %files
 %defattr(-,root,root,-)
-%exclude %_libdir/dietlibc/*/*.so
+%{?with_dyn:%exclude %_libdir/dietlibc/*/*.so}
 
 %if %do_crossbuild
 %_libdir/dietlibc/lib-*
@@ -108,14 +127,14 @@
 %_libdir/dietlibc
 %endif
 
-
+%if %do_dyn
 %files lib
 %defattr(-,root,root,-)
 %config(noreplace) %_sysconfdir/*
 %dir %_libdir/dietlibc
 %dir %_libdir/dietlibc/lib-*
-%_libdir/dietlibc/lib-%_arch/*.so
-
+%_libdir/dietlibc/lib-%target_cpu/*.so
+%endif
 
 %changelog
 * Fri Mar  4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.28-4
@@ -123,6 +142,7 @@
 - fixed compilation with gcc4
 - made nice(2) SUSv3 compliantly on x86_64 and other platforms (patch
   provided by Colin Hill)
+- build the dynamic libs for x86, x86_64 and arm only
 
 * Tue Feb  1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-1
 - updated to 0.28



From fedora-extras-commits at redhat.com  Sun Mar  6 17:56:40 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 6 Mar 2005 12:56:40 -0500
Subject: devel/libsidplay libsidplay.spec,1.7,1.8 sidplay.xpm,1.1,NONE
Message-ID: <200503061756.j26HuecB010426@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/libsidplay
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10419

Modified Files:
	libsidplay.spec 
Removed Files:
	sidplay.xpm 
Log Message:
* Sun Mar  6 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.36.57-7
- Remove "Icon:". This was the only package in Fedora Extras, which
  used such an icon, and it breaks --specfile queries.




Index: libsidplay.spec
===================================================================
RCS file: /cvs/extras/devel/libsidplay/libsidplay.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libsidplay.spec	3 Mar 2005 22:41:32 -0000	1.7
+++ libsidplay.spec	6 Mar 2005 17:56:38 -0000	1.8
@@ -1,10 +1,9 @@
 Name: libsidplay
 Summary: Commodore 64 music player and SID chip emulator library
 Version: 1.36.57
-Release: 6
+Release: 7
 Source: http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/%{name}-%{version}.tgz
 Patch: libsidplay-post57fixes.patch
-Icon: sidplay.xpm
 Group: System Environment/Libraries
 URL: http://www.geocities.com/SiliconValley/Lakes/5147/
 License: GPL
@@ -63,6 +62,10 @@
 %{_includedir}/sidplay
 
 %changelog
+* Sun Mar  6 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.36.57-7
+- Remove "Icon:". This was the only package in Fedora Extras, which
+  used such an icon, and it breaks --specfile queries.
+
 * Thu Dec 16 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.36.57-6
 - Use %%configure macro, so %%_libdir and friends get set for x86_64.
 


--- sidplay.xpm DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar  6 18:46:39 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 6 Mar 2005 13:46:39 -0500
Subject: devel/gtkmm24 gtkmm.spec,1.4,1.5
Message-ID: <200503061846.j26IkduR011415@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gtkmm24
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11409

Modified Files:
	gtkmm.spec 
Log Message:
Restore package name, which was deleted during the recent mass-cleanup attempts.


Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/devel/gtkmm24/gtkmm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtkmm.spec	3 Mar 2005 21:26:03 -0000	1.4
+++ gtkmm.spec	6 Mar 2005 18:46:37 -0000	1.5
@@ -1,4 +1,4 @@
-Name:
+Name:           gtkmm24
 Version:        2.4.8
 Release:        1
 Summary:        C++ interface for GTK2 (a GUI library for X)



From fedora-extras-commits at redhat.com  Sun Mar  6 18:48:58 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 6 Mar 2005 13:48:58 -0500
Subject: devel/tetex-unicode tetex-unicode.spec,1.4,1.5
Message-ID: <200503061848.j26ImwtY011444@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/tetex-unicode
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11438

Modified Files:
	tetex-unicode.spec 
Log Message:
Restore package name, which was deleted during the recent mass-cleanup attempts.


Index: tetex-unicode.spec
===================================================================
RCS file: /cvs/extras/devel/tetex-unicode/tetex-unicode.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tetex-unicode.spec	5 Mar 2005 19:43:17 -0000	1.4
+++ tetex-unicode.spec	6 Mar 2005 18:48:56 -0000	1.5
@@ -1,4 +1,4 @@
-Name:
+Name:           tetex-unicode
 Version:        0
 Release:        2.20040307
 Summary:        Unicode support for LaTeX



From jpo at di.uminho.pt  Sun Mar  6 01:07:35 2005
From: jpo at di.uminho.pt (Jose Pedro Oliveira)
Date: Sun, 06 Mar 2005 01:07:35 +0000
Subject: Request: Pre-devel branches creation for pdfjam, perl-Sub-Uplevel, 
 and perl-Test-Exception
Message-ID: <422A57D7.2080804@di.uminho.pt>


I would like to have the following pre-devel branches:

Component             Branches needed
-------------------------------------------------
pdfjam              : FC-3
perl-Sub-Uplevel    : RHL-9, FC-1, FC-2, and FC-3
perl-Test-Exception : RHL-9, FC-1, FC-2, and FC-3
-------------------------------------------------

Thanks,
jpo
-- 
Jos? Pedro Oliveira
* mailto: jpo at di.uminho.pt * http://gsd.di.uminho.pt/~jpo *
* gpg fingerprint = F9B6 8D87 859D 1C94 48F0 84C0 9749 9EB5 91BD 851B *



From fedora-extras-commits at redhat.com  Sun Mar  6 21:39:20 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 6 Mar 2005 16:39:20 -0500
Subject: rpms/dietlibc/devel dietlibc-0.28-ppc.patch, NONE, 1.1 dietlibc.spec,
	1.5, 1.6
Message-ID: <200503062139.j26LdKna014333@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	dietlibc.spec 
Added Files:
	dietlibc-0.28-ppc.patch 
Log Message:
fixed PPC issues in ISO mode (do not use the 'powerpc' macro but the '__powerpc__' one)


dietlibc-0.28-ppc.patch:

--- NEW FILE dietlibc-0.28-ppc.patch ---
diff -rup dietlibc-0.28.ppc/include/asm/sigcontext.h dietlibc-0.28/include/asm/sigcontext.h
--- dietlibc-0.28.ppc/include/asm/sigcontext.h	2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/asm/sigcontext.h	2005-03-06 22:21:43.000000000 +0100
@@ -21,7 +21,7 @@ __BEGIN_DECLS
 #include <asm/mips-sigcontext.h>
 #endif
 
-#if defined(powerpc) || defined(__powerpc64__)
+#if defined(__powerpc__) || defined(__powerpc64__)
 #include <asm/ppc-sigcontext.h>
 #endif
 
diff -rup dietlibc-0.28.ppc/include/fcntl.h dietlibc-0.28/include/fcntl.h
--- dietlibc-0.28.ppc/include/fcntl.h	2004-01-03 03:10:02.000000000 +0100
+++ dietlibc-0.28/include/fcntl.h	2005-03-06 22:21:43.000000000 +0100
@@ -322,7 +322,7 @@ struct flock64 {
 };
 #endif
 
-#elif defined(powerpc) || defined(__powerpc64__)
+#elif defined(__powerpc__) || defined(__powerpc64__)
 
 /* open/fcntl - O_SYNC is only implemented on blocks devices and on files
    located on an ext2 file system */
diff -rup dietlibc-0.28.ppc/include/setjmp.h dietlibc-0.28/include/setjmp.h
--- dietlibc-0.28.ppc/include/setjmp.h	2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/setjmp.h	2005-03-06 22:21:43.000000000 +0100
@@ -170,7 +170,7 @@ typedef int __jmp_buf[24];
 #endif
 #endif
 
-#if defined(powerpc) || defined(__powerpc64__)
+#if defined(__powerpc__) || defined(__powerpc64__)
 # define JB_GPR1   0  /* Also known as the stack pointer */
 # define JB_GPR2   1
 # define JB_LR     2  /* The address we will return to */
diff -rup dietlibc-0.28.ppc/include/signal.h dietlibc-0.28/include/signal.h
--- dietlibc-0.28.ppc/include/signal.h	2004-12-17 20:14:49.000000000 +0100
+++ dietlibc-0.28/include/signal.h	2005-03-06 22:21:43.000000000 +0100
@@ -31,7 +31,7 @@ __BEGIN_DECLS
 #define SIGALRM		14
 #define SIGTERM		15
 #define SIGUNUSED	31
-#if defined(__i386__) || defined(__x86_64__) || defined(powerpc) || defined(__arm__) \
+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__arm__) \
 	|| defined(__s390__) || defined(__ia64__) || defined(__powerpc64__)
 #define SIGBUS		 7
 #define SIGUSR1		10
diff -rup dietlibc-0.28.ppc/include/stdarg-cruft.h dietlibc-0.28/include/stdarg-cruft.h
--- dietlibc-0.28.ppc/include/stdarg-cruft.h	2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/stdarg-cruft.h	2005-03-06 22:21:43.000000000 +0100
@@ -109,7 +109,7 @@ typedef char * va_list;
 #endif
 #endif
 
-#elif defined(powerpc)
+#elif defined(__powerpc__)
 
 typedef struct __va_list_tag {
   unsigned char gpr;		/* index into the array of 8 GPRs stored in the
diff -rup dietlibc-0.28.ppc/include/sys/ioctl.h dietlibc-0.28/include/sys/ioctl.h
--- dietlibc-0.28.ppc/include/sys/ioctl.h	2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/sys/ioctl.h	2005-03-06 22:21:43.000000000 +0100
@@ -15,7 +15,7 @@ __BEGIN_DECLS
 #include <sys/sparc-ioctl.h>
 #elif defined(__mips__)
 #include <sys/mips-ioctl.h>
-#elif defined(powerpc) || defined(__powerpc64__)
+#elif defined(__powerpc__) || defined(__powerpc64__)
 #include <sys/ppc-ioctl.h>
 #elif defined(__s390__)
 #include <sys/s390-ioctl.h>
diff -rup dietlibc-0.28.ppc/include/sys/mman.h dietlibc-0.28/include/sys/mman.h
--- dietlibc-0.28.ppc/include/sys/mman.h	2004-11-30 16:37:29.000000000 +0100
+++ dietlibc-0.28/include/sys/mman.h	2005-03-06 22:21:43.000000000 +0100
@@ -73,7 +73,7 @@ __BEGIN_DECLS
 #define MADV_SEQUENTIAL	0x2		/* read-ahead aggressively */
 #define MADV_WILLNEED	0x3		/* pre-fault pages */
 #define MADV_DONTNEED	0x4		/* discard these pages */
-#elif defined(__sparc__) || defined (powerpc) || defined (__powerpc64__)
+#elif defined(__sparc__) || defined (__powerpc__) || defined (__powerpc64__)
 #define MAP_FIXED	0x10		/* Interpret addr exactly */
 #define MAP_ANONYMOUS	0x20		/* don't use a file */
 #define MAP_RENAME	MAP_ANONYMOUS	/* In SunOS terminology */
diff -rup dietlibc-0.28.ppc/include/sys/ptrace.h dietlibc-0.28/include/sys/ptrace.h
--- dietlibc-0.28.ppc/include/sys/ptrace.h	2004-11-18 17:44:39.000000000 +0100
+++ dietlibc-0.28/include/sys/ptrace.h	2005-03-06 22:21:43.000000000 +0100
@@ -637,7 +637,7 @@ struct sparc_stackf {
 
 #define PTRACE_GETUCODE           29  /* stupid bsd-ism */
 
-#elif defined(powerpc) || defined (__powerpc64__)
+#elif defined(__powerpc__) || defined (__powerpc64__)
 
 #include <asm/sigcontext.h>
 
diff -rup dietlibc-0.28.ppc/include/sys/shm.h dietlibc-0.28/include/sys/shm.h
--- dietlibc-0.28.ppc/include/sys/shm.h	2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/sys/shm.h	2005-03-06 22:21:43.000000000 +0100
@@ -60,7 +60,7 @@ struct shm_info {
   unsigned long swap_successes;
 };
 
-#if defined(__i386__) || defined(__mips__) || defined(__arm__) || defined(powerpc) || defined (__powerpc64__) || defined(__s390__) || defined(__hppa__) || defined(__x86_64__) || defined(__ia64__)
+#if defined(__i386__) || defined(__mips__) || defined(__arm__) || defined(__powerpc__) || defined (__powerpc64__) || defined(__s390__) || defined(__hppa__) || defined(__x86_64__) || defined(__ia64__)
 #define PAGE_SIZE 4096UL
 #define PAGE_SHIFT 12
 #elif defined(__alpha__) || defined(__sparc__)
diff -rup dietlibc-0.28.ppc/include/sys/stat.h dietlibc-0.28/include/sys/stat.h
--- dietlibc-0.28.ppc/include/sys/stat.h	2004-03-26 16:25:15.000000000 +0100
+++ dietlibc-0.28/include/sys/stat.h	2005-03-06 22:21:43.000000000 +0100
@@ -248,8 +248,8 @@ __extension__ long long	st_size;
 	unsigned long	st_pad2;
 __extension__ long long	st_blocks;
 };
-#elif defined(powerpc) || defined(__powerpc64__)
-#if defined(powerpc)
+#elif defined(__powerpc__) || defined(__powerpc64__)
+#if defined(__powerpc__)
 struct stat {
 	dev_t		st_dev;
 	ino_t		st_ino;
diff -rup dietlibc-0.28.ppc/include/sys/types.h dietlibc-0.28/include/sys/types.h
--- dietlibc-0.28.ppc/include/sys/types.h	2004-04-14 15:33:41.000000000 +0200
+++ dietlibc-0.28/include/sys/types.h	2005-03-06 22:21:43.000000000 +0100
@@ -67,7 +67,7 @@ typedef unsigned long int clock_t;	/* Us
     typedef unsigned int mode_t;
     typedef int nlink_t;
     typedef int uid_t;
-#elif defined(powerpc)
+#elif defined(__powerpc__)
     typedef unsigned int dev_t;
     typedef unsigned int gid_t;
     typedef unsigned int mode_t;
diff -rup dietlibc-0.28.ppc/include/sys/ucontext.h dietlibc-0.28/include/sys/ucontext.h
--- dietlibc-0.28.ppc/include/sys/ucontext.h	2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/sys/ucontext.h	2005-03-06 22:21:43.000000000 +0100
@@ -10,7 +10,7 @@ __BEGIN_DECLS
 typedef struct sigcontext mcontext_t;
 #endif
 
-#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__mips64__) || defined(powerpc) || defined(__powerpc64__) || defined(__hppa__)
+#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__mips64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(__hppa__)
 struct ucontext {
   unsigned long		uc_flags;
   struct ucontext	*uc_link;
diff -rup dietlibc-0.28.ppc/include/termios.h dietlibc-0.28/include/termios.h
--- dietlibc-0.28.ppc/include/termios.h	2004-08-04 00:28:46.000000000 +0200
+++ dietlibc-0.28/include/termios.h	2005-03-06 22:21:43.000000000 +0100
@@ -103,7 +103,7 @@ struct termios {
 	cc_t c_line;			/* line discipline */
 	cc_t c_cc[NCCS];		/* control characters */
 };
-#elif defined(powerpc) || defined(__powerpc64__) || defined(__alpha__)
+#elif defined(__powerpc__) || defined(__powerpc64__) || defined(__alpha__)
 #define NCCS	19
 struct termios {
 	tcflag_t c_iflag;		/* input mode flags */
@@ -167,7 +167,7 @@ struct termios {
 #define VLNEXT	15
 #define VEOF	16
 #define VEOL	17
-#elif defined(powerpc) || defined(__powerpc64__)
+#elif defined(__powerpc__) || defined(__powerpc64__)
 #define VINTR	0
 #define VQUIT	1
 #define VERASE	2
diff -rup dietlibc-0.28.ppc/syscalls.h dietlibc-0.28/syscalls.h
--- dietlibc-0.28.ppc/syscalls.h	2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/syscalls.h	2005-03-06 22:21:43.000000000 +0100
@@ -11,7 +11,7 @@
 #include "sparc/syscalls.h"
 #endif
 
-#elif defined(powerpc)
+#elif defined(__powerpc__)
 #include "ppc/syscalls.h"
 
 #elif defined(__powerpc64__)


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dietlibc.spec	6 Mar 2005 16:57:55 -0000	1.5
+++ dietlibc.spec	6 Mar 2005 21:39:18 -0000	1.6
@@ -2,7 +2,7 @@
 
 ## This package understands the following switches:
 ## --with cross			...  enable crossbuild
-## --define crossarch <arch>	...  set cross-architecture (only valid with
+## --define 'crossarch <arch>'	...  set cross-architecture (only valid with
 ##				     '--with cross'; defaults to 'arm-linux')
 
 ## Fedora Extras specific customization below...
@@ -44,6 +44,7 @@
 Source1:	http://www.fefe.de/dietlibc/%NAME-%version.tar.bz2.sig
 Patch0:		dietlibc-0.28-gcc4.patch
 Patch1:		dietlibc-0.28-setpriority.patch
+Patch2:		dietlibc-0.28-ppc.patch
 BuildRoot:	%_tmppath/%name-%version-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
 
@@ -75,6 +76,7 @@
 %setup -q -n %NAME-%version
 %patch0 -p1 -b .gcc4
 %patch1 -p1 -b .nice
+%patch2 -p1 -b .ppc
 
 ## only for 0.28; remove it in 0.29
 sed -i -e 's!LD_RUN_PATH= !env -u LD_RUN_PATH !' Makefile
@@ -143,6 +145,8 @@
 - made nice(2) SUSv3 compliantly on x86_64 and other platforms (patch
   provided by Colin Hill)
 - build the dynamic libs for x86, x86_64 and arm only
+- fixed PPC issues in ISO mode (do not use the 'powerpc' macro but the
+  '__powerpc__' one)
 
 * Tue Feb  1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-1
 - updated to 0.28



From fedora-extras-commits at redhat.com  Sun Mar  6 21:55:25 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 6 Mar 2005 16:55:25 -0500
Subject: rpms/dhcp-forwarder/devel dhcp-forwarder-0.7-bigend.patch, NONE,
	1.1 dhcp-forwarder.spec, 1.7, 1.8
Message-ID: <200503062155.j26LtP0d014469@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14461

Modified Files:
	dhcp-forwarder.spec 
Added Files:
	dhcp-forwarder-0.7-bigend.patch 
Log Message:
fixed bigendian builds (backported from 0.8)
s!%%define!%%global! to workaround bugs in rpm's macro-engine


dhcp-forwarder-0.7-bigend.patch:

--- NEW FILE dhcp-forwarder-0.7-bigend.patch ---
Index: dhcp.h
===================================================================
RCS file: /home/cvs/dhcpfwd/src/dhcp.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- src/dhcp.h	22 Jun 2004 10:46:56 -0000	1.14
+++ src/dhcp.h	23 Dec 2004 00:49:01 -0000	1.15
@@ -1,4 +1,4 @@
-// $Id: dhcp.h,v 1.14 2004/06/22 10:46:56 ensc Exp $    --*- c++ -*--
+// $Id: dhcp.h,v 1.15 2004/12/23 00:49:01 ensc Exp $    --*- c++ -*--
 
 // Copyright (C) 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 //  
@@ -89,7 +89,7 @@ enum {
   optDHCP_COOKIE = 0x63538263u,
   flgDHCP_BCAST	 = 0x0080u
 #else
-  DHCP_COOKIE  	 = 0x63825363u,
+  optDHCP_COOKIE = 0x63825363u,
   flgDHCP_BCAST	 = 0x8000u
 #endif
 };


Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dhcp-forwarder.spec	5 Mar 2005 21:10:21 -0000	1.7
+++ dhcp-forwarder.spec	6 Mar 2005 21:55:23 -0000	1.8
@@ -5,34 +5,38 @@
 ## --without minit      ...   disable creation of 'minit' subpackage
 ## --with    fedora     ...   enable fedora.us specific parts
 
-%define _with_fedora	1
-%define _without_minit	1
+## Fedora Extras specific customization below...
+%{!?_without_fedora:%global	_with_fedora	--with fedora}
+%{!?_with_minit:%global		_without_minit	--without minit}
+##
 
 
-%define uid		11
-%define useradd		/usr/sbin/%{?_with_fedora:fedora-}useradd  %{?_with_fedora:%uid}
-%define groupadd	/usr/sbin/%{?_with_fedora:fedora-}groupadd %{?_with_fedora:%uid}
-%define userdel		/usr/sbin/%{?_with_fedora:fedora-}userdel
-%define groupdel	/usr/sbin/%{?_with_fedora:fedora-}groupdel
+%global uid		11
+%global useradd		/usr/sbin/%{?_with_fedora:fedora-}useradd  %{?_with_fedora:%uid}
+%global groupadd	/usr/sbin/%{?_with_fedora:fedora-}groupadd %{?_with_fedora:%uid}
+%global userdel		/usr/sbin/%{?_with_fedora:fedora-}userdel
+%global groupdel	/usr/sbin/%{?_with_fedora:fedora-}groupdel
 
 
-%define	username	dhcp-fwd
-%define homedir		%_var/lib/%username
-%define minitdir	%_sysconfdir/minit
-%define minitsvcdir	%minitdir/services/dhcp-fwd
-%define service		dhcp-fwd
+%global	username	dhcp-fwd
+%global homedir		%_var/lib/%username
+%global minitdir	%_sysconfdir/minit
+%global minitsvcdir	%minitdir/services/dhcp-fwd
+%global service		dhcp-fwd
 
-%{!?release_func:%define release_func() %1}
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.7
-Release:	%release_func 1
+Release:	%release_func 2
 License:	GPL
 Group:		System Environment/Daemons
 URL:		http://www.tu-chemnitz.de/~ensc/dhcp-fwd
 Source0:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2
 Source1:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2.asc
+Patch0:		dhcp-forwarder-0.7-bigend.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(dhcp-forwarder)
 
@@ -97,7 +101,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p0
 
 
 %build
@@ -186,6 +190,10 @@
 
 
 %changelog
+* Sun Mar  6 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.7-2
+- fixed bigendian builds (backported from 0.8)
+- s!%%define!%%global! to workaround bugs in rpm's macro-engine
+
 * Thu Nov 11 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.7-0.fdr.1
 - fedora'ized it
 



From fedora-extras-commits at redhat.com  Sun Mar  6 23:28:34 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 6 Mar 2005 18:28:34 -0500
Subject: rpms/dietlibc/devel dietlibc-0.28-ppc.patch,1.1,1.2
Message-ID: <200503062328.j26NSYWj016069@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	dietlibc-0.28-ppc.patch 
Log Message:
added a 'defined(__powerpc__)' in libdl/_dl_rel.h


dietlibc-0.28-ppc.patch:

Index: dietlibc-0.28-ppc.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.28-ppc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dietlibc-0.28-ppc.patch	6 Mar 2005 21:39:18 -0000	1.1
+++ dietlibc-0.28-ppc.patch	6 Mar 2005 23:28:32 -0000	1.2
@@ -1,6 +1,6 @@
 diff -rup dietlibc-0.28.ppc/include/asm/sigcontext.h dietlibc-0.28/include/asm/sigcontext.h
 --- dietlibc-0.28.ppc/include/asm/sigcontext.h	2003-10-10 15:37:34.000000000 +0200
-+++ dietlibc-0.28/include/asm/sigcontext.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/asm/sigcontext.h	2005-03-06 22:46:45.000000000 +0100
 @@ -21,7 +21,7 @@ __BEGIN_DECLS
  #include <asm/mips-sigcontext.h>
  #endif
@@ -12,7 +12,7 @@
  
 diff -rup dietlibc-0.28.ppc/include/fcntl.h dietlibc-0.28/include/fcntl.h
 --- dietlibc-0.28.ppc/include/fcntl.h	2004-01-03 03:10:02.000000000 +0100
-+++ dietlibc-0.28/include/fcntl.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/fcntl.h	2005-03-06 22:46:45.000000000 +0100
 @@ -322,7 +322,7 @@ struct flock64 {
  };
  #endif
@@ -24,7 +24,7 @@
     located on an ext2 file system */
 diff -rup dietlibc-0.28.ppc/include/setjmp.h dietlibc-0.28/include/setjmp.h
 --- dietlibc-0.28.ppc/include/setjmp.h	2003-10-10 15:37:34.000000000 +0200
-+++ dietlibc-0.28/include/setjmp.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/setjmp.h	2005-03-06 22:46:45.000000000 +0100
 @@ -170,7 +170,7 @@ typedef int __jmp_buf[24];
  #endif
  #endif
@@ -36,7 +36,7 @@
  # define JB_LR     2  /* The address we will return to */
 diff -rup dietlibc-0.28.ppc/include/signal.h dietlibc-0.28/include/signal.h
 --- dietlibc-0.28.ppc/include/signal.h	2004-12-17 20:14:49.000000000 +0100
-+++ dietlibc-0.28/include/signal.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/signal.h	2005-03-06 22:46:45.000000000 +0100
 @@ -31,7 +31,7 @@ __BEGIN_DECLS
  #define SIGALRM		14
  #define SIGTERM		15
@@ -48,7 +48,7 @@
  #define SIGUSR1		10
 diff -rup dietlibc-0.28.ppc/include/stdarg-cruft.h dietlibc-0.28/include/stdarg-cruft.h
 --- dietlibc-0.28.ppc/include/stdarg-cruft.h	2003-10-10 15:37:34.000000000 +0200
-+++ dietlibc-0.28/include/stdarg-cruft.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/stdarg-cruft.h	2005-03-06 22:46:45.000000000 +0100
 @@ -109,7 +109,7 @@ typedef char * va_list;
  #endif
  #endif
@@ -60,7 +60,7 @@
    unsigned char gpr;		/* index into the array of 8 GPRs stored in the
 diff -rup dietlibc-0.28.ppc/include/sys/ioctl.h dietlibc-0.28/include/sys/ioctl.h
 --- dietlibc-0.28.ppc/include/sys/ioctl.h	2003-10-10 15:37:34.000000000 +0200
-+++ dietlibc-0.28/include/sys/ioctl.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/sys/ioctl.h	2005-03-06 22:46:45.000000000 +0100
 @@ -15,7 +15,7 @@ __BEGIN_DECLS
  #include <sys/sparc-ioctl.h>
  #elif defined(__mips__)
@@ -72,7 +72,7 @@
  #include <sys/s390-ioctl.h>
 diff -rup dietlibc-0.28.ppc/include/sys/mman.h dietlibc-0.28/include/sys/mman.h
 --- dietlibc-0.28.ppc/include/sys/mman.h	2004-11-30 16:37:29.000000000 +0100
-+++ dietlibc-0.28/include/sys/mman.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/sys/mman.h	2005-03-06 22:46:45.000000000 +0100
 @@ -73,7 +73,7 @@ __BEGIN_DECLS
  #define MADV_SEQUENTIAL	0x2		/* read-ahead aggressively */
  #define MADV_WILLNEED	0x3		/* pre-fault pages */
@@ -84,7 +84,7 @@
  #define MAP_RENAME	MAP_ANONYMOUS	/* In SunOS terminology */
 diff -rup dietlibc-0.28.ppc/include/sys/ptrace.h dietlibc-0.28/include/sys/ptrace.h
 --- dietlibc-0.28.ppc/include/sys/ptrace.h	2004-11-18 17:44:39.000000000 +0100
-+++ dietlibc-0.28/include/sys/ptrace.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/sys/ptrace.h	2005-03-06 22:46:45.000000000 +0100
 @@ -637,7 +637,7 @@ struct sparc_stackf {
  
  #define PTRACE_GETUCODE           29  /* stupid bsd-ism */
@@ -96,7 +96,7 @@
  
 diff -rup dietlibc-0.28.ppc/include/sys/shm.h dietlibc-0.28/include/sys/shm.h
 --- dietlibc-0.28.ppc/include/sys/shm.h	2003-10-10 15:37:34.000000000 +0200
-+++ dietlibc-0.28/include/sys/shm.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/sys/shm.h	2005-03-06 22:46:45.000000000 +0100
 @@ -60,7 +60,7 @@ struct shm_info {
    unsigned long swap_successes;
  };
@@ -108,7 +108,7 @@
  #elif defined(__alpha__) || defined(__sparc__)
 diff -rup dietlibc-0.28.ppc/include/sys/stat.h dietlibc-0.28/include/sys/stat.h
 --- dietlibc-0.28.ppc/include/sys/stat.h	2004-03-26 16:25:15.000000000 +0100
-+++ dietlibc-0.28/include/sys/stat.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/sys/stat.h	2005-03-06 22:46:45.000000000 +0100
 @@ -248,8 +248,8 @@ __extension__ long long	st_size;
  	unsigned long	st_pad2;
  __extension__ long long	st_blocks;
@@ -122,7 +122,7 @@
  	ino_t		st_ino;
 diff -rup dietlibc-0.28.ppc/include/sys/types.h dietlibc-0.28/include/sys/types.h
 --- dietlibc-0.28.ppc/include/sys/types.h	2004-04-14 15:33:41.000000000 +0200
-+++ dietlibc-0.28/include/sys/types.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/sys/types.h	2005-03-06 22:46:45.000000000 +0100
 @@ -67,7 +67,7 @@ typedef unsigned long int clock_t;	/* Us
      typedef unsigned int mode_t;
      typedef int nlink_t;
@@ -134,7 +134,7 @@
      typedef unsigned int mode_t;
 diff -rup dietlibc-0.28.ppc/include/sys/ucontext.h dietlibc-0.28/include/sys/ucontext.h
 --- dietlibc-0.28.ppc/include/sys/ucontext.h	2003-10-10 15:37:34.000000000 +0200
-+++ dietlibc-0.28/include/sys/ucontext.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/sys/ucontext.h	2005-03-06 22:46:45.000000000 +0100
 @@ -10,7 +10,7 @@ __BEGIN_DECLS
  typedef struct sigcontext mcontext_t;
  #endif
@@ -146,7 +146,7 @@
    struct ucontext	*uc_link;
 diff -rup dietlibc-0.28.ppc/include/termios.h dietlibc-0.28/include/termios.h
 --- dietlibc-0.28.ppc/include/termios.h	2004-08-04 00:28:46.000000000 +0200
-+++ dietlibc-0.28/include/termios.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/termios.h	2005-03-06 22:46:45.000000000 +0100
 @@ -103,7 +103,7 @@ struct termios {
  	cc_t c_line;			/* line discipline */
  	cc_t c_cc[NCCS];		/* control characters */
@@ -165,9 +165,21 @@
  #define VINTR	0
  #define VQUIT	1
  #define VERASE	2
+diff -rup dietlibc-0.28.ppc/libdl/_dl_rel.h dietlibc-0.28/libdl/_dl_rel.h
+--- dietlibc-0.28.ppc/libdl/_dl_rel.h	2005-01-29 03:34:22.000000000 +0100
++++ dietlibc-0.28/libdl/_dl_rel.h	2005-03-07 00:25:56.000000000 +0100
+@@ -10,7 +10,7 @@
+ #define _DL_REL_PLT(b,r)	(*(unsigned long*)((b)+(r)->r_offset)+=(unsigned long)(b))
+ 
+ #elif defined(__alpha__) || defined(__hppa__) || defined(__ppc__) || defined(__sparc__) || defined(__s390__) \
+-  || defined(__x86_64__)
++  || defined(__x86_64__) || defined(__powerpc__)
+ /* this are RELA only archs: alpha, chris, hppa, ia64, m68k, ppc, sparc, sparc64, sh, s390, x86_64 */
+ 
+ #define _dl_rel_t	Elf_Rela
 diff -rup dietlibc-0.28.ppc/syscalls.h dietlibc-0.28/syscalls.h
 --- dietlibc-0.28.ppc/syscalls.h	2003-10-10 15:37:34.000000000 +0200
-+++ dietlibc-0.28/syscalls.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/syscalls.h	2005-03-06 22:46:45.000000000 +0100
 @@ -11,7 +11,7 @@
  #include "sparc/syscalls.h"
  #endif



From fedora-extras-commits at redhat.com  Mon Mar  7 00:26:01 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 6 Mar 2005 19:26:01 -0500
Subject: rpms/dietlibc/devel dietlibc-0.28-hppa.patch, NONE,
	1.1 dietlibc.spec, 1.6, 1.7
Message-ID: <200503070026.j270Q113017008@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	dietlibc.spec 
Added Files:
	dietlibc-0.28-hppa.patch 
Log Message:
synced hppa's <fcntl.h> with recent kernel


dietlibc-0.28-hppa.patch:

--- NEW FILE dietlibc-0.28-hppa.patch ---
diff -rup dietlibc-0.28.hppa/include/fcntl.h dietlibc-0.28/include/fcntl.h
--- dietlibc-0.28.hppa/include/fcntl.h	2005-03-07 01:11:46.000000000 +0100
+++ dietlibc-0.28/include/fcntl.h	2005-03-07 01:21:07.000000000 +0100
@@ -501,13 +501,21 @@ struct flock64 {
 #define O_CREAT     00000400 /* not fcntl */
 #define O_TRUNC     00001000 /* not fcntl */
 #define O_EXCL      00002000 /* not fcntl */
+#define O_LARGEFILE 00004000
 #define O_ASYNC     00020000
 #define O_SYNC      00100000
 #define O_NONBLOCK  00200004 /* HPUX has separate NDELAY & NONBLOCK */
 #define O_NDELAY    O_NONBLOCK
 #define O_NOCTTY    00400000 /* not fcntl */
+#define O_DSYNC     01000000 /* HPUX only */
+#define O_RSYNC     02000000 /* HPUX only */
+#define O_NOATIME   04000000
 #define O_DIRECTORY  00010000
 
+#define O_DIRECT    00040000 /* direct disk access hint - currently ignored */
+#define O_NOFOLLOW  00000200 /* don't follow links */
+#define O_INVISIBLE 04000000 /* invisible I/O, for DMAPI/XDSM */
+
 #define F_DUPFD     0   /* Duplicate file descriptor.  */
 #define F_GETFD     1   /* Get file descriptor flags.  */
 #define F_SETFD     2   /* Set file descriptor flags.  */
@@ -521,6 +529,11 @@ struct flock64 {
 #define F_SETLK64   9   /* Set record locking info (non-blocking).  */
 #define F_SETLKW64  10  /* Set record locking info (blocking).  */
 
+#define F_GETOWN    11	/*  for sockets. */
+#define F_SETOWN    12	/*  for sockets. */
+#define F_SETSIG    13	/*  for sockets. */
+#define F_GETSIG    14	/*  for sockets. */
+
 #define FD_CLOEXEC  1   /* actually anything with low bit set goes */
 
 #define F_RDLCK     1   /* Read lock.  */
@@ -530,6 +543,21 @@ struct flock64 {
 #define F_EXLCK     4   /* or 3 */
 #define F_SHLCK     8   /* or 4 */
 
+/* for leases */
+#define F_INPROGRESS	16
+
+/* operations for bsd flock(), also used by the kernel implementation */
+#define LOCK_SH		1	/* shared lock */
+#define LOCK_EX		2	/* exclusive lock */
+#define LOCK_NB		4	/* or'd with one of the above to prevent
+				   blocking */
+#define LOCK_UN		8	/* remove lock */
+
+#define LOCK_MAND	32	/* This is a mandatory flock */
+#define LOCK_READ	64	/* ... Which allows concurrent read operations */
+#define LOCK_WRITE	128	/* ... Which allows concurrent write operations */
+#define LOCK_RW		192	/* ... Which allows concurrent read & write ops */
+
 struct flock
 {
     short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dietlibc.spec	6 Mar 2005 21:39:18 -0000	1.6
+++ dietlibc.spec	7 Mar 2005 00:25:59 -0000	1.7
@@ -45,6 +45,7 @@
 Patch0:		dietlibc-0.28-gcc4.patch
 Patch1:		dietlibc-0.28-setpriority.patch
 Patch2:		dietlibc-0.28-ppc.patch
+Patch3:		dietlibc-0.28-hppa.patch
 BuildRoot:	%_tmppath/%name-%version-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
 
@@ -77,6 +78,7 @@
 %patch0 -p1 -b .gcc4
 %patch1 -p1 -b .nice
 %patch2 -p1 -b .ppc
+%patch3 -p1 -b .hppa
 
 ## only for 0.28; remove it in 0.29
 sed -i -e 's!LD_RUN_PATH= !env -u LD_RUN_PATH !' Makefile



From fedora-extras-commits at redhat.com  Mon Mar  7 07:12:29 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 7 Mar 2005 02:12:29 -0500
Subject: rpms/vnstat import.log,1.2,1.3
Message-ID: <200503070712.j277CTUs023834@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	import.log 
Log Message:
auto-import vnstat-1.4-3 on branch FC-3 from vnstat-1.4-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vnstat/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	1 Mar 2005 18:37:42 -0000	1.2
+++ import.log	7 Mar 2005 07:12:27 -0000	1.3
@@ -1 +1,2 @@
 vnstat-1_4-3:HEAD:vnstat-1.4-3.src.rpm:1109702252
+vnstat-1_4-3:FC-3:vnstat-1.4-3.src.rpm:1110179538



From fedora-extras-commits at redhat.com  Mon Mar  7 08:22:33 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 7 Mar 2005 03:22:33 -0500
Subject: rpms/jabberd - New directory
Message-ID: <200503070822.j278MXfk024816@cvs-int.fedora.redhat.com>

Author: adrian

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

Log Message:
Directory /cvs/extras/rpms/jabberd added to the repository




From fedora-extras-commits at redhat.com  Mon Mar  7 08:22:33 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 7 Mar 2005 03:22:33 -0500
Subject: rpms/jabberd/devel - New directory
Message-ID: <200503070822.j278MXhP024819@cvs-int.fedora.redhat.com>

Author: adrian

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

Log Message:
Directory /cvs/extras/rpms/jabberd/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar  7 08:22:54 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 7 Mar 2005 03:22:54 -0500
Subject: rpms/jabberd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503070822.j278MsHw024884@cvs-int.fedora.redhat.com>

Author: adrian

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module jabberd


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

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

common : CVS/Root
	@cvs 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 Mar  7 08:22:54 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 7 Mar 2005 03:22:54 -0500
Subject: rpms/jabberd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503070822.j278Msmi024887@cvs-int.fedora.redhat.com>

Author: adrian

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jabberd


--- 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 Mar  7 08:23:37 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 7 Mar 2005 03:23:37 -0500
Subject: rpms/jabberd/devel jabberd, NONE, 1.1 jabberd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503070823.j278Nbmn024994@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	.cvsignore sources 
Added Files:
	jabberd jabberd.spec 
Log Message:
auto-import jabberd-2.0-0.s6.3 on branch devel from jabberd-2.0-0.s6.3.src.rpm


--- NEW FILE jabberd ---
#!/bin/bash
#
# Based on script from Raymond 25DEC2003 support at bigriverinfotech.com
# Changed by Adrian Reber <adrian at lisas.de>
#
# processname: jabberd2
# description: jabberd2 is the next generation of the jabberd server
# chkconfig: 2345 85 15
#

if [ -f /etc/init.d/functions ]; then
	. /etc/init.d/functions
elif [ -f /etc/rc.d/init.d/functions ]; then
	. /etc/rc.d/init.d/functions
else
	echo "jabberd2: unable to locate functions lib. Cannot continue."
	exit -1
fi
#
progs="router resolver sm c2s s2s"
progsPath="__BINDIR__"
confPath="__ETCDIR__"
pidPath="__PIDDIR__"
retval=0
#
ReqBins ( ) {
	for prog in ${progs}; do
		if [ ! -x ${progsPath}/${prog} ]; then
			echo "jabberd2 binary [${prog}] not found."
			echo "Cannot continue."
			return -1
		fi
	done
	return 0
}
#
ReqConfs ( ) {
	for prog in ${progs}; do
		if [ ! -f ${confPath}/${prog}.xml ]; then
			echo "jabberd2 configuration [${prog}.xml] not found."
			echo "Cannot continue."
			return -1
		fi
	done
	return 0
}
#
ReqDirs ( ) {
	if [ ! -d ${pidPath} ]; then
		echo "jabberd2 PID directory not found. Cannot continue."
		return -1
	fi
	return 0
}
#
Start ( ) {
	for req in ReqBins ReqConfs ReqDirs; do
		${req}
		retval=$?
		[ ${retval} == 0 ] || return ${retval}
	done
	echo "Initializing jabberd2 processes ..."
	for prog in ${progs}; do
		if [ $( pidof -s ${prog} ) ]; then
			echo "process [${prog}] already running"
			continue
		fi
		echo -n "Starting ${prog}: "
		rm -f /var/lock/subsys/${prog}
		rm -f ${pidPath}/${prog}.pid
		args="-c ${confPath}/${prog}.xml"
		daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
		retval=$?
		echo
		if [ ${retval} == 0 ]; then
			touch /var/lock/subsys/${prog}
		else
			let retval=-1
			break
		fi
	done
	return ${retval}
}
#
Stop ( ) {
	echo "Terminating jabberd2 processes ..."
	for prog in ${progs}; do
		echo -n "Stopping ${prog}: "
		killproc ${prog}
		retval=$?
		if [ ${retval} == 0 ]; then
			rm -f /var/lock/subsys/${prog}
			rm -f ${pidPath}/${prog}.pid
		fi
		echo
		sleep 1
	done
	return ${retval}
}
#
reload()
{
	echo "Reloading jabberd2 processes ..."
	for prog in ${progs}; do
		killproc ${prog} -HUP
		retval=$?
	done
	return ${retval}
}

rhstatus()
{
        for prog in ${progs}; do
                status ${prog}
        done
}

case "$1" in
	start)
		Start
		;;
	stop)
		Stop
		;;
	reload)
		reload
		;;
	status)
		rhstatus
		;;
	restart)
		Stop
		Start
		;;
	condrestart)
        	for prog in ${progs}; do
			if [ ! -f /var/lock/subsys/${prog} ]; then
				exit -1
			fi
		done
		Stop
		sleep 3
		Start
		;;
	*)
		echo "Usage: $0 {start|stop|restart|condrestart|reload|status}"
		let retval=-1
esac
exit ${retval}


--- NEW FILE jabberd.spec ---
Summary:        OpenSource server implementation of the Jabber protocols
Name:           jabberd
Version:        2.0
Release:        0.s6.3
Epoch:          0
License:        GPL
Group:          System Environment/Daemons
Source0:        http://files.jabberstudio.org/jabberd2/jabberd-2.0s6.tar.gz
Source1:        jabberd
URL:            http://jabberd.jabberstudio.org/2/
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  openssl-devel, db4-devel, libidn-devel, pam-devel
Requires(post): openssl

%description
The jabberd project aims to provide an open-source server implementation of the
Jabber protocols for instant messaging and XML routing. The goal of this
project is to provide a scalable, reliable, efficient and extensible server
that provides a complete set of features and is up to date with the latest
protocol revisions.
jabberd 2 is the next generation of the jabberd server. It has been rewritten
from the ground up to be scalable, architecturally sound, and to support the
latest protocol extensions coming out of the JSF.

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

%build
%define _sysconfdir /etc/jabberd
%define sysconfdir /etc/jabberd
%{__perl} -pi -e 's,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g' configure
%configure --enable-db --disable-mysql --enable-pam
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
%makeinstall
%define _sysconfdir /etc
%{__mkdir_p} $RPM_BUILD_ROOT/%{_var}/jabberd/{log,pid,db}
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__install} -m 644 tools/db-setup.mysql $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__install} -m 644 tools/db-setup.pgsql $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__install} -m 644 tools/migrate.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__install} -m 644 tools/pipe-auth.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
%{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}

%{__perl} -pi -e 's,__BINDIR__,%{_bindir},g; \
                  s,__ETCDIR__,%{sysconfdir},g; \
                  s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g;' \
          $RPM_BUILD_ROOT%{_initrddir}/%{name}

%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
%{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/jabberd << END
#%PAM-1.0
auth       required     pam_nologin.so
auth       required     pam_stack.so service=system-auth
account    required     pam_stack.so service=system-auth
session    required     pam_stack.so service=system-auth
END

%{__sed} -i -e "s,<driver>mysql</driver>,<driver>db</driver>,g" \
	$RPM_BUILD_ROOT%{sysconfdir}/sm.xml

#ghost file
touch $RPM_BUILD_ROOT%{sysconfdir}/server.pem

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%pre
#creating jabber user
useradd -r -d %{_localstatedir}/%{name} -m -c "Jabber Server" -s /bin/bash jabber >/dev/null 2>&1 ||:


%post
if [ "$1" -eq "1" ]; then
	#register %{name} service
	/sbin/chkconfig --add %{name}
	#replace default passwords, yet another hack 
	export NEWPASS="$RANDOM-newpass-$RANDOM"
	cd %{sysconfdir}
	%{__perl} -pi -e "s,<secret>secret</secret>,<secret>$NEWPASS</secret>,g" router-users.xml
	%{__perl} -pi -e "s,<secret>secret</secret>,<secret>$NEWPASS</secret>,g" router.xml
	%{__perl} -pi -e "s,<pass>secret</pass>,<pass>$NEWPASS</pass>,g" *.xml
fi

#create ssl certificate
cd %{sysconfdir}
if [ ! -e server.pem ]; then
 %{___build_shell} %{_datadir}/ssl/certs/make-dummy-cert server.pem
 %{__chown} root.jabber server.pem
 %{__chmod} 640 server.pem
fi

%preun
if [ "$1" -eq "0" ]; then
	/sbin/service %{name} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{name}
	userdel jabber
	#should %{_localstatedir}/jabberd be deleted???
	#%{__rm} -rf %{_localstatedir}/jabberd
fi

%postun
if [ "$1" -eq "1" ]; then
	/sbin/service %{name} condrestart > /dev/null 2>&1
fi

%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README PROTOCOL TODO
%{_bindir}/*
%config(noreplace) %{sysconfdir}/
%{_datadir}/man/man8/*
%{_datadir}/%{name}/
%config(noreplace) %{_initrddir}/%{name}
%config(noreplace) %{_sysconfdir}/pam.d/jabberd
%attr(-,jabber,jabber) %{_var}/jabberd
%ghost %{_sysconfdir}/jabberd/server.pem

%changelog
* Mon Mar 07 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.3
- changed startscript again

* Mon Mar 07 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.2
- changed startscript to support condrestart

* Mon Mar 07 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.1
- updated to 2.0s6

* Wed Nov 24 2004 Adrian Reber <adrian at lisas.de> - 0:2.0-0.fdr.16.s4
- updated to 2.0s4
- added jabberd-c2s-buffers.patch 
  (http://jabberstudio.org/projects/jabberd2/bugs/view.php?id=4528)
- replace <driver>mysql</driver> with <driver>db</driver> in sm.xml

* Mon Jul 19 2004 Adrian Reber <adrian at lisas.de> - 0:2.0-0.fdr.15.s3
- add ||: at the end of the useradd line

* Mon Jul 19 2004 Adrian Reber <adrian at lisas.de> - 0:2.0-0.fdr.14.s3
- create jabber user in %%pre instead of in %%post
- remove -r from userdel

* Mon Jul 19 2004 Adrian Reber <adrian at lisas.de> - 0:2.0-0.fdr.13.s3
- s/jabberd2/%%{name}/
- replace another default password

* Fri Jul 16 2004 Adrian Reber <adrian at lisas.de> - 0:2.0-0.fdr.12.s3
- %%{_var}/jabberd is now owned be the package
- %%ghost-ing server.pem
- disable rm-ing %%{_var}/jabberd on uninstall

* Fri Jul 16 2004 Adrian Reber <adrian at lisas.de> - 0:2.0-0.fdr.11.s3
- using %%{_datadir}/ssl/certs/make-dummy-cert to
  create the certificate
- added -r to useradd
- added openssl to post-requires
- added libidn-devel and pam-devel as BuildRequires

* Mon Jul 12 2004 Adrian Reber <adrian at lisas.de> - 0:2.0-0.fdr.10.s3
- complete rewrite for fedora (I mean it)

* Tue May 18 2004 Tim Niemueller <tim at niemueller.de>
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Mar 2005 08:22:52 -0000	1.1
+++ .cvsignore	7 Mar 2005 08:23:35 -0000	1.2
@@ -0,0 +1 @@
+jabberd-2.0s6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Mar 2005 08:22:52 -0000	1.1
+++ sources	7 Mar 2005 08:23:35 -0000	1.2
@@ -0,0 +1 @@
+ca2818885e126181e002949c71603df3  jabberd-2.0s6.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar  7 08:23:37 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 7 Mar 2005 03:23:37 -0500
Subject: rpms/jabberd import.log,1.1,1.2
Message-ID: <200503070823.j278Nbeq024990@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	import.log 
Log Message:
auto-import jabberd-2.0-0.s6.3 on branch devel from jabberd-2.0-0.s6.3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/jabberd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Mar 2005 08:22:52 -0000	1.1
+++ import.log	7 Mar 2005 08:23:35 -0000	1.2
@@ -0,0 +1 @@
+jabberd-2_0-0_s6_3:HEAD:jabberd-2.0-0.s6.3.src.rpm:1110183806



From fedora-extras-commits at redhat.com  Mon Mar  7 09:15:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 7 Mar 2005 04:15:25 -0500
Subject: rpms/lighttpd/FC-3 .cvsignore, 1.2, 1.3 lighttpd.spec, 1.2,
	1.3 sources, 1.2, 1.3 lighttpd-1.3.11-empty_cgi_handler.patch,
	1.1, NONE
Message-ID: <200503070915.j279FPJr026553@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore lighttpd.spec sources 
Removed Files:
	lighttpd-1.3.11-empty_cgi_handler.patch 
Log Message:
Update to 1.3.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Feb 2005 00:12:23 -0000	1.2
+++ .cvsignore	7 Mar 2005 09:15:23 -0000	1.3
@@ -1 +1 @@
-lighttpd-1.3.11.tar.gz
+lighttpd-1.3.13.tar.gz


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-3/lighttpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lighttpd.spec	1 Mar 2005 18:26:10 -0000	1.2
+++ lighttpd.spec	7 Mar 2005 09:15:23 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.3.11
-Release: 2
+Version: 1.3.13
+Release: 1
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -14,7 +14,6 @@
 Source11: lighttpd.png
 Source12: powered_by_fedora.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
-Patch1: lighttpd-1.3.11-empty_cgi_handler.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -62,7 +61,6 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
-%patch1 -p1 -b .empty_cgi_handler
 
 
 %build
@@ -159,9 +157,17 @@
 %{_bindir}/spawn-fcgi
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_fastcgi.so
+%{_mandir}/man1/spawn-fcgi.1*
 
 
 %changelog
+* Sun Mar  6 2005 Matthias Saou <http://freshrpms.net/> 1.3.13-1
+- Update to 1.3.13.
+
+* Wed Mar  2 2005 Matthias Saou <http://freshrpms.net/> 1.3.12-1
+- Update to 1.3.12.
+- Remove obsolete empty_cgi_handler patch.
+
 * Tue Mar  1 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-2
 - Add missing defattr to sub-packages (#150018).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Feb 2005 00:12:23 -0000	1.2
+++ sources	7 Mar 2005 09:15:23 -0000	1.3
@@ -1 +1 @@
-730c9b9d743360d23e523968ab4fe7c5  lighttpd-1.3.11.tar.gz
+2f017b936be376ad6f6c2ee26db93467  lighttpd-1.3.13.tar.gz


--- lighttpd-1.3.11-empty_cgi_handler.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar  7 09:15:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 7 Mar 2005 04:15:25 -0500
Subject: rpms/lighttpd/devel .cvsignore, 1.2, 1.3 lighttpd.spec, 1.2,
	1.3 sources, 1.2, 1.3 lighttpd-1.3.11-empty_cgi_handler.patch,
	1.1, NONE
Message-ID: <200503070915.j279FP0t026559@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore lighttpd.spec sources 
Removed Files:
	lighttpd-1.3.11-empty_cgi_handler.patch 
Log Message:
Update to 1.3.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Feb 2005 00:12:23 -0000	1.2
+++ .cvsignore	7 Mar 2005 09:15:23 -0000	1.3
@@ -1 +1 @@
-lighttpd-1.3.11.tar.gz
+lighttpd-1.3.13.tar.gz


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lighttpd.spec	1 Mar 2005 18:26:10 -0000	1.2
+++ lighttpd.spec	7 Mar 2005 09:15:23 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.3.11
-Release: 2
+Version: 1.3.13
+Release: 1
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -14,7 +14,6 @@
 Source11: lighttpd.png
 Source12: powered_by_fedora.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
-Patch1: lighttpd-1.3.11-empty_cgi_handler.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -62,7 +61,6 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
-%patch1 -p1 -b .empty_cgi_handler
 
 
 %build
@@ -159,9 +157,17 @@
 %{_bindir}/spawn-fcgi
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_fastcgi.so
+%{_mandir}/man1/spawn-fcgi.1*
 
 
 %changelog
+* Sun Mar  6 2005 Matthias Saou <http://freshrpms.net/> 1.3.13-1
+- Update to 1.3.13.
+
+* Wed Mar  2 2005 Matthias Saou <http://freshrpms.net/> 1.3.12-1
+- Update to 1.3.12.
+- Remove obsolete empty_cgi_handler patch.
+
 * Tue Mar  1 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-2
 - Add missing defattr to sub-packages (#150018).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Feb 2005 00:12:23 -0000	1.2
+++ sources	7 Mar 2005 09:15:23 -0000	1.3
@@ -1 +1 @@
-730c9b9d743360d23e523968ab4fe7c5  lighttpd-1.3.11.tar.gz
+2f017b936be376ad6f6c2ee26db93467  lighttpd-1.3.13.tar.gz


--- lighttpd-1.3.11-empty_cgi_handler.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar  7 11:03:46 2005
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 7 Mar 2005 06:03:46 -0500
Subject: rpms/cdlabelgen - New directory
Message-ID: <200503071103.j27B3kOn029319@cvs-int.fedora.redhat.com>

Author: harald

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

Log Message:
Directory /cvs/extras/rpms/cdlabelgen added to the repository




From fedora-extras-commits at redhat.com  Mon Mar  7 11:03:47 2005
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 7 Mar 2005 06:03:47 -0500
Subject: rpms/cdlabelgen/devel - New directory
Message-ID: <200503071103.j27B3lcE029322@cvs-int.fedora.redhat.com>

Author: harald

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

Log Message:
Directory /cvs/extras/rpms/cdlabelgen/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar  7 11:04:06 2005
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 7 Mar 2005 06:04:06 -0500
Subject: rpms/cdlabelgen Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503071104.j27B46Rb029381@cvs-int.fedora.redhat.com>

Author: harald

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module cdlabelgen


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

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

common : CVS/Root
	@cvs 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 Mar  7 11:04:06 2005
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 7 Mar 2005 06:04:06 -0500
Subject: rpms/cdlabelgen/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503071104.j27B46OZ029384@cvs-int.fedora.redhat.com>

Author: harald

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cdlabelgen


--- 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 Mar  7 11:04:47 2005
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 7 Mar 2005 06:04:47 -0500
Subject: rpms/cdlabelgen import.log,1.1,1.2
Message-ID: <200503071104.j27B4laG029487@cvs-int.fedora.redhat.com>

Author: harald

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Mar 2005 11:04:04 -0000	1.1
+++ import.log	7 Mar 2005 11:04:45 -0000	1.2
@@ -0,0 +1 @@
+cdlabelgen-3_0_0-1:HEAD:cdlabelgen-3.0.0-1.src.rpm:1110193474



From fedora-extras-commits at redhat.com  Mon Mar  7 11:04:47 2005
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 7 Mar 2005 06:04:47 -0500
Subject: rpms/cdlabelgen/devel cdlabelgen.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503071104.j27B4lm5029490@cvs-int.fedora.redhat.com>

Author: harald

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

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


--- NEW FILE cdlabelgen.spec ---
Name: cdlabelgen
Summary: Generates frontcards and traycards for inserting in CD jewelcases.
Version: 3.0.0
Release: 1
#Source: http://www.red-bean.com/~bwf/software/cdlabelgen/cdlabelgen-1.5.0.tar.gz
#URL: http://www.red-bean.com/~bwf/software/cdlabelgen
Source: http://www.aczone.com/pub/tools/cdlabelgen-%{version}.tgz
URL: http://www.aczone.com/tools/cdinsert/
BuildRoot: %{_tmppath}/%{name}-root
License: GPL
Group: Applications/Publishing
BuildArch: noarch

%description
Cdlabelgen is a utility which generates frontcards and traycards (in
PostScript(TM) format) for CD jewelcases.

%prep
%setup -q

%build
make
#pod2man cdlabelgen > cdlabelgen.1

%install
mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/cdlabelgen,%{_mandir}/man1}
install -m 755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}
install -m 644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen
install -m 644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog README cdlabelgen.html
%{_bindir}/cdlabelgen
%{_datadir}/cdlabelgen
%{_mandir}/*/*

%changelog
* Tue Sep 21 2004 Harald Hoyer <harald at redhat.com> 3.0.0
- Updated to new version 3.0.0

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Oct 08 2003 Harald Hoyer <harald at redhat.com> 2.6.1-1
- Updated to new version 2.6.1

* Thu May 22 2003 Harald Hoyer <harald at redhat.com> 2.6.0-1
- Updated to new version 2.6.0

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Mon Oct  7 2002 Mike A. Harris <mharris at redhat.com> 2.3.0-4
- All-arch rebuild

* Fri Jun 21 2002 Tim Powers <timp at redhat.com> 2.3.0-3
- automated rebuild

* Sun May 26 2002 Tim Powers <timp at redhat.com> 2.3.0-2
- automated rebuild

* Tue Feb 26 2002 Mike A. Harris <mharris at redhat.com> 2.3.0-1
- Updated to new version 2.3.0 by different author

* Tue Feb 26 2002 Mike A. Harris <mharris at redhat.com> 1.5.0-11
- s/Copyright/License/ tag
- fixed buildroot tag to point to _tmppath
- Rebuilt in new environment

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Mon May 21 2001 Tim Powers <timp at redhat.com>
- built for the distro

* Mon Jul 24 2000 Prospector <prospector at redhat.com>
- rebuilt

* Mon Jul 10 2000 Tim Powers <timp at redhat.com>
- rebuilt

* Mon Jun 5 2000 Tim Powers <timp at redhat.com>
- fix man page location

* Mon May 8 2000 Tim Powers <timp at redhat.com>
- rebuilt for 7.0
* Tue Jan 4 2000 Tim Powers <timp at redhat.com>
- removed unneeded defines
- rebuilt for 6.2
* Mon Aug 23 1999 Preston Brown <pbrown at redhat.com>
- adopted for Powertools 6.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Mar 2005 11:04:04 -0000	1.1
+++ .cvsignore	7 Mar 2005 11:04:45 -0000	1.2
@@ -0,0 +1 @@
+cdlabelgen-3.0.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Mar 2005 11:04:04 -0000	1.1
+++ sources	7 Mar 2005 11:04:45 -0000	1.2
@@ -0,0 +1 @@
+7e5c5464c168dffa2fadfb6d0d36cdb7  cdlabelgen-3.0.0.tgz



From fedora-extras-commits at redhat.com  Mon Mar  7 13:47:21 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 7 Mar 2005 08:47:21 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.3,1.4
Message-ID: <200503071347.j27DlL7M031447@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.spec 
Log Message:
don't package zero size README file



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ppracer.spec	4 Mar 2005 19:39:17 -0000	1.3
+++ ppracer.spec	7 Mar 2005 13:47:19 -0000	1.4
@@ -62,13 +62,16 @@
 
 %files
 %defattr (-, root, root, 755)
-%doc AUTHORS COPYING ChangeLog README contrib
+%doc AUTHORS COPYING ChangeLog contrib
 %{_bindir}/ppracer
 %{_datadir}/ppracer
 %{_datadir}/pixmaps/ppracer.png
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Mon Mar 07 2005 Nils Philippsen <nphilipp at redhat.com>
+- don't package zero size README file
+
 * Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 0.3.1
 - use desktop_file_install to install desktop file



From fedora-extras-commits at redhat.com  Mon Mar  7 13:51:14 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 7 Mar 2005 08:51:14 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.4,1.5
Message-ID: <200503071351.j27DpESA031488@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.spec 
Log Message:
obsolete tuxracer <= 0.61



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ppracer.spec	7 Mar 2005 13:47:19 -0000	1.4
+++ ppracer.spec	7 Mar 2005 13:51:12 -0000	1.5
@@ -28,7 +28,7 @@
 
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 
-Obsoletes: tuxracer
+Obsoletes: tuxracer <= 0.61
 
 %description
 PPRacer is a simple OpenGL-based racing game featuring Tux. The
@@ -71,6 +71,7 @@
 %changelog
 * Mon Mar 07 2005 Nils Philippsen <nphilipp at redhat.com>
 - don't package zero size README file
+- obsolete tuxracer <= 0.61
 
 * Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 0.3.1



From fedora-extras-commits at redhat.com  Mon Mar  7 13:55:11 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 7 Mar 2005 08:55:11 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.5,1.6
Message-ID: <200503071355.j27DtBYm031539@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.spec 
Log Message:
bump release



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ppracer.spec	7 Mar 2005 13:51:12 -0000	1.5
+++ ppracer.spec	7 Mar 2005 13:55:09 -0000	1.6
@@ -6,7 +6,7 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 1
+Release: 2
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de



From fedora-extras-commits at redhat.com  Mon Mar  7 16:47:08 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 7 Mar 2005 11:47:08 -0500
Subject: rpms/ipython - New directory
Message-ID: <200503071647.j27Gl8Bi001857@cvs-int.fedora.redhat.com>

Author: shahms

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

Log Message:
Directory /cvs/extras/rpms/ipython added to the repository




From fedora-extras-commits at redhat.com  Mon Mar  7 16:47:08 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 7 Mar 2005 11:47:08 -0500
Subject: rpms/ipython/devel - New directory
Message-ID: <200503071647.j27Gl8Oa001860@cvs-int.fedora.redhat.com>

Author: shahms

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

Log Message:
Directory /cvs/extras/rpms/ipython/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar  7 16:47:20 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 7 Mar 2005 11:47:20 -0500
Subject: rpms/ipython Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503071647.j27GlKb7001919@cvs-int.fedora.redhat.com>

Author: shahms

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module ipython


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

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

common : CVS/Root
	@cvs 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 Mar  7 16:47:20 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 7 Mar 2005 11:47:20 -0500
Subject: rpms/ipython/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503071647.j27GlKJE001922@cvs-int.fedora.redhat.com>

Author: shahms

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ipython


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From bugs.michael at gmx.net  Mon Mar  7 17:30:54 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Mon, 7 Mar 2005 18:30:54 +0100
Subject: rpms/jabberd/devel jabberd, NONE, 1.1 jabberd.spec, NONE, 1.1
 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503070823.j278Nbmn024994@cvs-int.fedora.redhat.com>
References: <200503070823.j278Nbmn024994@cvs-int.fedora.redhat.com>
Message-ID: <20050307183054.3ce04956.bugs.michael@gmx.net>

On Mon, 7 Mar 2005 03:23:37 -0500, Adrian Reber (adrian) wrote:

> 	condrestart)
>         	for prog in ${progs}; do
> 			if [ ! -f /var/lock/subsys/${prog} ]; then
> 				exit -1
> 			fi
> 		done
> 		Stop
> 		sleep 3
> 		Start
> 		;;
> 	*)
> 		echo "Usage: $0 {start|stop|restart|condrestart|reload|status}"
> 		let retval=-1
> esac
> exit ${retval}

LSB return code for "Usage" is 2.



From fedora at wir-sind-cool.org  Mon Mar  7 17:32:51 2005
From: fedora at wir-sind-cool.org (Michael Schwendt)
Date: Mon, 7 Mar 2005 18:32:51 +0100
Subject: rpms/cdlabelgen/devel cdlabelgen.spec, NONE, 1.1 .cvsignore,
 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503071104.j27B4lm5029490@cvs-int.fedora.redhat.com>
References: <200503071104.j27B4lm5029490@cvs-int.fedora.redhat.com>
Message-ID: <20050307183251.31c31eda.fedora@wir-sind-cool.org>

On Mon, 7 Mar 2005 06:04:47 -0500, Harald Hoyer (harald) wrote:

> %install
> mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/cdlabelgen,%{_mandir}/man1}

"rm -rf $RPM_BUILD_ROOT" directly after %install would be good, in
particular for short-circuit installs.



From fedora-extras-commits at redhat.com  Mon Mar  7 19:54:08 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 7 Mar 2005 14:54:08 -0500
Subject: devel/unison unison.spec,1.5,1.6
Message-ID: <200503071954.j27Js80J005583@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/unison
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5577

Modified Files:
	unison.spec 
Log Message:
Some minor adjustments.


Index: unison.spec
===================================================================
RCS file: /cvs/extras/devel/unison/unison.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- unison.spec	5 Mar 2005 19:55:54 -0000	1.5
+++ unison.spec	7 Mar 2005 19:54:06 -0000	1.6
@@ -1,8 +1,7 @@
-### Package needs review + approval.
 Name:           unison
 Version:        2.10.2
 Release:        2
-Summary:        Unison is a file-synchronization tool
+Summary:        File-synchronization tool
 
 Group:          Applications/File
 License:        GPL
@@ -42,16 +41,17 @@
 [Desktop Entry]
 Type=Application
 Exec=unison
-Name=Unison
+Name=Unison File Synchronizer
+GenericName=File Synchronizer
+Comment=Replicate files over different hosts or disks
 Terminal=false
 Icon=unison.png
-Comment=Unison file synchronizer
 Encoding=UTF-8
 StartupNotify=true
 EOF
 
 desktop-file-install --vendor fedora \
-    --add-category X-Fedora \
+    --add-category X-Fedora-Extra \
     --add-category Application \
     --add-category Accessories \
     --add-category Utility \



From bugs.michael at gmx.net  Mon Mar  7 19:54:12 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Mon, 7 Mar 2005 20:54:12 +0100
Subject: APPROVED: unison
Message-ID: <20050307205412.43de7645.bugs.michael@gmx.net>

Name: unison
Version: 2.10.2-2

Unison is a file-synchronization tool. It allows two replicas of a
collection of files and directories to be stored on different hosts (or
different disks on the same host), modified separately, and then brought
up to date by propagating the changes in each replica to the other.

[...]

Since it is a beta-release (and the last stable release is three years old
and not as feature-rich), I would recommend giving this a "testing"
release first.  One issue with the GUI I ran into is that a bad profile
cannot be deleted/edited within the GUI.

Package approved for adding to Fedora Extras.

G?rard Milmeister <gemi at bluewin.ch> will be responsible for this
package. (mschwendt)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050307/74e6a03f/attachment.sig>

From fedora-extras-commits at redhat.com  Mon Mar  7 21:09:04 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 7 Mar 2005 16:09:04 -0500
Subject: rpms/unison//FC-3 unison.spec,1.4,1.5
Message-ID: <200503072109.j27L94J8007278@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	unison.spec 
Log Message:
sync with devel



Index: unison.spec
===================================================================
RCS file: /cvs/extras/rpms/unison//FC-3/unison.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unison.spec	24 Feb 2005 21:59:42 -0000	1.4
+++ unison.spec	7 Mar 2005 21:09:02 -0000	1.5
@@ -1,19 +1,17 @@
-### Package needs review + approval.
 Name:           unison
 Version:        2.10.2
 Release:        2
-Epoch:          0
-Summary:        Unison is a file-synchronization tool
+Summary:        File-synchronization tool
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.cis.upenn.edu/~bcpierce/unison
 Source:         http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/unison-2.10.2/unison-2.10.2.tar.gz
-Source1:	unison.png
+Source1:        unison.png
 #Patch:          unison-uigtk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ocaml >= 0:3.08, lablgtk >= 0:2.4.0, tetex-latex
-BuildRequires:	desktop-file-utils
+BuildRequires:  ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex
+BuildRequires:  desktop-file-utils
 # for lablgtk
 BuildRequires:  gtk2-devel
 
@@ -43,16 +41,17 @@
 [Desktop Entry]
 Type=Application
 Exec=unison
-Name=Unison
+Name=Unison File Synchronizer
+GenericName=File Synchronizer
+Comment=Replicate files over different hosts or disks
 Terminal=false
 Icon=unison.png
-Comment=Unison file synchronizer
 Encoding=UTF-8
 StartupNotify=true
 EOF
 
 desktop-file-install --vendor fedora \
-    --add-category X-Fedora \
+    --add-category X-Fedora-Extra \
     --add-category Application \
     --add-category Accessories \
     --add-category Utility \



From fedora-extras-commits at redhat.com  Mon Mar  7 21:36:21 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 7 Mar 2005 16:36:21 -0500
Subject: rpms/global//FC-3 .cvsignore, 1.3, 1.4 global.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200503072136.j27LaLcg007527@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore global.spec sources 
Log Message:
New Version 4.8.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/global//FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:27:42 -0000	1.3
+++ .cvsignore	7 Mar 2005 21:36:19 -0000	1.4
@@ -1 +1 @@
-global-4.8.2.tar.gz
+global-4.8.4.tar.gz


Index: global.spec
===================================================================
RCS file: /cvs/extras/rpms/global//FC-3/global.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- global.spec	11 Feb 2005 23:27:42 -0000	1.4
+++ global.spec	7 Mar 2005 21:36:19 -0000	1.5
@@ -1,13 +1,12 @@
 Name:           global
-Version:        4.8.2
+Version:        4.8.4
 Release:        1
-Epoch:          0
-Summary:        A source code tag system
+Summary:        Source code tag system
 
-Group:		Development/Tools
-License:	GPL/BSD
-URL:		http://www.gnu.org/software/global
-Source:		http://tamacom.com/global/global-4.8.2.tar.gz
+Group:          Development/Tools
+License:        GPL/BSD
+URL:            http://www.gnu.org/software/global
+Source:         http://tamacom.com/global/global-4.8.4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -17,10 +16,6 @@
 
 %prep
 %setup -q
-perl -pi -e 's|gctags|global-gctags|g' gtags/gtags.c
-perl -pi -e 's|gctags|global-gctags|g' libutil/conf.c
-perl -pi -e 's|gctags|global-gctags|g' libutil/gtagsop.c
-perl -pi -e 's|gctags|global-gctags|g' gctags/const.h
 
 %build
 %configure
@@ -29,8 +24,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{_bindir}/gctags $RPM_BUILD_ROOT%{_bindir}/global-gctags
-mv $RPM_BUILD_ROOT%{_mandir}/man1/gctags.1 $RPM_BUILD_ROOT%{_mandir}/man1/global-gctags.1
+rm -fr $RPM_BUILD_ROOT%{_datadir}/emacs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -39,20 +33,23 @@
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info \
     %{_infodir}/dir 2>/dev/null || :
 fi
 
 %files
 %defattr(-,root,root,-)
+%doc README THANKS LICENSE AUTHORS COPYING FAQ globash.rc gtags.el
 %{_bindir}/*
 %{_infodir}/*
 %{_mandir}/man*/*
 %{_datadir}/gtags
-%doc README THANKS LICENSE AUTHORS COPYING FAQ globash.rc gtags.el
 
 %changelog
+* Mon Mar  7 2005 Gerard Milmeister <gemi at bluewin.ch> - 4.8.4-1
+- New Version 4.8.4
+
 * Mon Dec 27 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:4.8.2-0.fdr.1
 - New Version 4.8.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/global//FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:27:42 -0000	1.3
+++ sources	7 Mar 2005 21:36:19 -0000	1.4
@@ -1 +1 @@
-ec0b03ea8042ed84b6d9f607e24f6360  global-4.8.2.tar.gz
+060d43cf74e297c154a5a53ba43c52fb  global-4.8.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar  7 21:36:40 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 7 Mar 2005 16:36:40 -0500
Subject: devel/global .cvsignore, 1.3, 1.4 global.spec, 1.5, 1.6 sources, 1.3,
	1.4
Message-ID: <200503072136.j27LaeJH007558@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/devel/global
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7552

Modified Files:
	.cvsignore global.spec sources 
Log Message:
New Version 4.8.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/global/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:27:42 -0000	1.3
+++ .cvsignore	7 Mar 2005 21:36:38 -0000	1.4
@@ -1 +1 @@
-global-4.8.2.tar.gz
+global-4.8.4.tar.gz


Index: global.spec
===================================================================
RCS file: /cvs/extras/devel/global/global.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- global.spec	3 Mar 2005 21:26:03 -0000	1.5
+++ global.spec	7 Mar 2005 21:36:38 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           global
-Version:        4.8.2
+Version:        4.8.4
 Release:        1
 Summary:        Source code tag system
 
 Group:          Development/Tools
 License:        GPL/BSD
 URL:            http://www.gnu.org/software/global
-Source:         http://tamacom.com/global/global-4.8.2.tar.gz
+Source:         http://tamacom.com/global/global-4.8.4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -16,10 +16,6 @@
 
 %prep
 %setup -q
-perl -pi -e 's|gctags|global-gctags|g' gtags/gtags.c
-perl -pi -e 's|gctags|global-gctags|g' libutil/conf.c
-perl -pi -e 's|gctags|global-gctags|g' libutil/gtagsop.c
-perl -pi -e 's|gctags|global-gctags|g' gctags/const.h
 
 %build
 %configure
@@ -28,8 +24,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{_bindir}/gctags $RPM_BUILD_ROOT%{_bindir}/global-gctags
-mv $RPM_BUILD_ROOT%{_mandir}/man1/gctags.1 $RPM_BUILD_ROOT%{_mandir}/man1/global-gctags.1
+rm -fr $RPM_BUILD_ROOT%{_datadir}/emacs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,6 +47,9 @@
 %{_datadir}/gtags
 
 %changelog
+* Mon Mar  7 2005 Gerard Milmeister <gemi at bluewin.ch> - 4.8.4-1
+- New Version 4.8.4
+
 * Mon Dec 27 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:4.8.2-0.fdr.1
 - New Version 4.8.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/global/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:27:42 -0000	1.3
+++ sources	7 Mar 2005 21:36:38 -0000	1.4
@@ -1 +1 @@
-ec0b03ea8042ed84b6d9f607e24f6360  global-4.8.2.tar.gz
+060d43cf74e297c154a5a53ba43c52fb  global-4.8.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar  7 22:09:30 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 7 Mar 2005 17:09:30 -0500
Subject: rpms/amarok/FC-3 .cvsignore, 1.5, 1.6 amarok.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200503072209.j27M9Usx008703@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- update to version 1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Feb 2005 16:07:32 -0000	1.5
+++ .cvsignore	7 Mar 2005 22:09:28 -0000	1.6
@@ -1 +1 @@
-amarok-1.2.tar.bz2
+amarok-1.2.1.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/amarok.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- amarok.spec	14 Feb 2005 21:57:39 -0000	1.6
+++ amarok.spec	7 Mar 2005 22:09:28 -0000	1.7
@@ -6,20 +6,20 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.2
-Release:    2
+Version:    1.2.1
+Release:    1
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.2.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.2.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
-BuildRequires:  taglib-devel >= 0:1.3, esound-devel
+BuildRequires:  taglib-devel >= 1.3, esound-devel
 BuildRequires:  desktop-file-utils, gettext
 BuildRequires:  xorg-x11-Mesa-libGL
-BuildRequires:  gstreamer-plugins-devel >= 0:0.8.4
+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
 
@@ -145,7 +145,7 @@
 %{_libdir}/kde3/libamarok_gstengine_plugin.*
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
 %{_libdir}/kde3/konqsidebar_universalamarok.*
-%{_datadir}/apps/konqsidebartng/add/amarok.desktop
+%{_datadir}/apps/konqsidebartng/*/amarok.desktop
 %{_datadir}/apps/profiles/amarok.profile.xml
 
 %{_libdir}/mcop/Amarok
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Sat Mar 05 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.1-1
+- version 1.2.1 (bugfixes)
+
 * Mon Feb 14 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2-2
 - show in the GNOME menus too
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Feb 2005 16:07:32 -0000	1.5
+++ sources	7 Mar 2005 22:09:28 -0000	1.6
@@ -1 +1 @@
-8db7d8985152ff29e8fb7377ada74527  amarok-1.2.tar.bz2
+90a8cce693a31e4d6ff552508c31aed3  amarok-1.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar  7 22:09:30 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 7 Mar 2005 17:09:30 -0500
Subject: rpms/amarok/devel .cvsignore, 1.5, 1.6 amarok.spec, 1.8, 1.9 sources,
	1.5, 1.6
Message-ID: <200503072209.j27M9UBU008709@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- update to version 1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Feb 2005 16:07:32 -0000	1.5
+++ .cvsignore	7 Mar 2005 22:09:28 -0000	1.6
@@ -1 +1 @@
-amarok-1.2.tar.bz2
+amarok-1.2.1.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- amarok.spec	5 Mar 2005 21:10:20 -0000	1.8
+++ amarok.spec	7 Mar 2005 22:09:28 -0000	1.9
@@ -6,13 +6,13 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.2
-Release:    2
+Version:    1.2.1
+Release:    1
 
 Group:      Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.2.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.2.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -145,7 +145,7 @@
 %{_libdir}/kde3/libamarok_gstengine_plugin.*
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
 %{_libdir}/kde3/konqsidebar_universalamarok.*
-%{_datadir}/apps/konqsidebartng/add/amarok.desktop
+%{_datadir}/apps/konqsidebartng/*/amarok.desktop
 %{_datadir}/apps/profiles/amarok.profile.xml
 
 %{_libdir}/mcop/Amarok
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Sat Mar 05 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.1-1
+- version 1.2.1 (bugfixes)
+
 * Mon Feb 14 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2-2
 - show in the GNOME menus too
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Feb 2005 16:07:32 -0000	1.5
+++ sources	7 Mar 2005 22:09:28 -0000	1.6
@@ -1 +1 @@
-8db7d8985152ff29e8fb7377ada74527  amarok-1.2.tar.bz2
+90a8cce693a31e4d6ff552508c31aed3  amarok-1.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar  8 01:51:30 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 20:51:30 -0500
Subject: rpms/perl-Sub-Uplevel/FC-2 perl-Sub-Uplevel.spec,1.3,1.4
Message-ID: <200503080151.j281pUcM011931@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11911/FC-2

Modified Files:
	perl-Sub-Uplevel.spec 
Log Message:
Sync with Fedora.us specfiles


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-2/perl-Sub-Uplevel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Sub-Uplevel.spec	4 Mar 2005 03:33:57 -0000	1.3
+++ perl-Sub-Uplevel.spec	8 Mar 2005 01:51:28 -0000	1.4
@@ -2,8 +2,9 @@
 
 Name:           perl-Sub-Uplevel
 Version:        0.09
-Release:        1
-Summary:        Run a perl function in an upper stack frame
+Release:        0.fdr.1.2
+Epoch:          0
+Summary:        Apparently run a function in a higher stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -54,7 +55,7 @@
 
 
 %changelog
-* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-1
+* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.09-0.fdr.1
 - Update to 0.09 (with license info).
 
 * Sun Jul  4 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.08-0.fdr.1



From fedora-extras-commits at redhat.com  Tue Mar  8 01:51:30 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 20:51:30 -0500
Subject: rpms/perl-Sub-Uplevel/FC-1 perl-Sub-Uplevel.spec,1.3,1.4
Message-ID: <200503080151.j281pUrY011927@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11911/FC-1

Modified Files:
	perl-Sub-Uplevel.spec 
Log Message:
Sync with Fedora.us specfiles


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-1/perl-Sub-Uplevel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Sub-Uplevel.spec	4 Mar 2005 03:33:57 -0000	1.3
+++ perl-Sub-Uplevel.spec	8 Mar 2005 01:51:28 -0000	1.4
@@ -2,8 +2,9 @@
 
 Name:           perl-Sub-Uplevel
 Version:        0.09
-Release:        1
-Summary:        Run a perl function in an upper stack frame
+Release:        0.fdr.1.1
+Epoch:          0
+Summary:        Apparently run a function in a higher stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -54,7 +55,7 @@
 
 
 %changelog
-* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-1
+* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.09-0.fdr.1
 - Update to 0.09 (with license info).
 
 * Sun Jul  4 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.08-0.fdr.1



From fedora-extras-commits at redhat.com  Tue Mar  8 01:51:30 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 20:51:30 -0500
Subject: rpms/perl-Sub-Uplevel/RHL-9 perl-Sub-Uplevel.spec,1.3,1.4
Message-ID: <200503080151.j281pUZ6011924@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11911/RHL-9

Modified Files:
	perl-Sub-Uplevel.spec 
Log Message:
Sync with Fedora.us specfiles


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/RHL-9/perl-Sub-Uplevel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Sub-Uplevel.spec	4 Mar 2005 03:33:57 -0000	1.3
+++ perl-Sub-Uplevel.spec	8 Mar 2005 01:51:28 -0000	1.4
@@ -2,8 +2,9 @@
 
 Name:           perl-Sub-Uplevel
 Version:        0.09
-Release:        1
-Summary:        Run a perl function in an upper stack frame
+Release:        0.fdr.1.rh90
+Epoch:          0
+Summary:        Apparently run a function in a higher stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -54,7 +55,7 @@
 
 
 %changelog
-* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-1
+* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.09-0.fdr.1
 - Update to 0.09 (with license info).
 
 * Sun Jul  4 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.08-0.fdr.1



From fedora-extras-commits at redhat.com  Tue Mar  8 01:56:58 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 20:56:58 -0500
Subject: rpms/perl-Test-Exception/FC-2 perl-Test-Exception.spec,1.2,1.3
Message-ID: <200503080156.j281uwhx012062@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12040/FC-2

Modified Files:
	perl-Test-Exception.spec 
Log Message:
Sync with Fedora.us specfiles


Index: perl-Test-Exception.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Exception/FC-2/perl-Test-Exception.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Test-Exception.spec	4 Mar 2005 03:48:44 -0000	1.2
+++ perl-Test-Exception.spec	8 Mar 2005 01:56:56 -0000	1.3
@@ -2,8 +2,9 @@
 
 Name:           perl-Test-Exception
 Version:        0.20
-Release:        1
-Summary:        Library of test functions for exception based Perl code
+Release:        0.fdr.1.2
+Epoch:          0
+Summary:        Test functions for exception based code
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -55,7 +56,7 @@
 
 
 %changelog
-* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.20-1
+* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.20-0.fdr.1
 - Update to 0.20.
 
 * Sun Jul 04 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.15-0.fdr.1



From fedora-extras-commits at redhat.com  Tue Mar  8 01:56:58 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 20:56:58 -0500
Subject: rpms/perl-Test-Exception/FC-1 perl-Test-Exception.spec,1.2,1.3
Message-ID: <200503080156.j281uwBM012058@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12040/FC-1

Modified Files:
	perl-Test-Exception.spec 
Log Message:
Sync with Fedora.us specfiles


Index: perl-Test-Exception.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Exception/FC-1/perl-Test-Exception.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Test-Exception.spec	4 Mar 2005 03:48:44 -0000	1.2
+++ perl-Test-Exception.spec	8 Mar 2005 01:56:56 -0000	1.3
@@ -2,8 +2,9 @@
 
 Name:           perl-Test-Exception
 Version:        0.20
-Release:        1
-Summary:        Library of test functions for exception based Perl code
+Release:        0.fdr.1.1
+Epoch:          0
+Summary:        Test functions for exception based code
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -55,7 +56,7 @@
 
 
 %changelog
-* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.20-1
+* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.20-0.fdr.1
 - Update to 0.20.
 
 * Sun Jul 04 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.15-0.fdr.1



From fedora-extras-commits at redhat.com  Tue Mar  8 01:56:58 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 20:56:58 -0500
Subject: rpms/perl-Test-Exception/RHL-9 perl-Test-Exception.spec,1.2,1.3
Message-ID: <200503080156.j281uwJn012054@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12040/RHL-9

Modified Files:
	perl-Test-Exception.spec 
Log Message:
Sync with Fedora.us specfiles


Index: perl-Test-Exception.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Exception/RHL-9/perl-Test-Exception.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Test-Exception.spec	4 Mar 2005 03:48:44 -0000	1.2
+++ perl-Test-Exception.spec	8 Mar 2005 01:56:56 -0000	1.3
@@ -2,8 +2,9 @@
 
 Name:           perl-Test-Exception
 Version:        0.20
-Release:        1
-Summary:        Library of test functions for exception based Perl code
+Release:        0.fdr.1.rh90
+Epoch:          0
+Summary:        Test functions for exception based code
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -55,7 +56,7 @@
 
 
 %changelog
-* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.20-1
+* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.20-0.fdr.1
 - Update to 0.20.
 
 * Sun Jul 04 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.15-0.fdr.1



From fedora-extras-commits at redhat.com  Tue Mar  8 02:13:38 2005
From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton))
Date: Mon, 7 Mar 2005 21:13:38 -0500
Subject: devel/lincvs lincvs.spec,1.5,1.6
Message-ID: <200503080213.j282DcnB012889@cvs-int.fedora.redhat.com>

Author: pcompton

Update of /cvs/extras/devel/lincvs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12882

Modified Files:
	lincvs.spec 
Log Message:
sync lincvs dev w/ FC-3



Index: lincvs.spec
===================================================================
RCS file: /cvs/extras/devel/lincvs/lincvs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lincvs.spec	5 Mar 2005 21:10:23 -0000	1.5
+++ lincvs.spec	8 Mar 2005 02:13:36 -0000	1.6
@@ -1,43 +1,38 @@
 Name:             lincvs
 Version:          1.4.0
-Release:          0.rc2
-Summary:          Graphical CVS client
+Release:          0.1.rc2
+Summary:          Graphical CVS Client
 
 Group:            Development/Tools
 License:          GPL
 URL:              http://www.lincvs.org
 Source0:          http://lincvs.com/download/lincvs-1.4.0-rc2-1-generic-src.tgz
-Source1:          lincvs
-Source2:          lincvs.desktop
+Source1:          lincvs.desktop
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:    cvs >= 1.9.0
+BuildRequires:    cvs >= 0:1.9.0
 BuildRequires:    qt-devel >= 1:3.3
-Requires:         cvs >= 1.9.0
+Requires:         cvs >= 0:1.9.0
 
 %description
-LinCVS is a graphical Interface for the cvs client commandline tool. It allows
-ato load modules from a server (checkout), create modules on the server
-(import), as well as checking the state of directories and individual files or
-updating them. Basic operations like add, remove and commit are supported as
-matter of course, just like showing the actual differences between the server
-version and the local sandbox, graphical display of the version tree, and
-manifoldy graphical support of project maintenance. All actions are logged on
-the cvs server (configurable via history), and are therewith comprehensible.
+LinCVS is a graphical Interface for the cvs client commandline tool on the Unix and Windows platform. It allows ato load modules from a server (checkout), create modules on the server (import), as well as checking the state of directories and individual files or updating them. Basic operations like add, remove and commit are supported as matter of course, just like showing the actual differences between the server version and the local sandbox, graphical display of the version tree, and manifoldy graphical support of project maintenance. All actions are logged on the cvs server (configurable via history), and are therewith comprehensible.
 
-To keep LinCVS independant of the cvs version, LinCVS uses the local but
-separately installed cvs and should always work with the latest version.
+To keep LinCVS independant of the cvs version, LinCVS uses the local but separat installed cvs and therewith always should work with the latest version.
 
 
 %prep
 %setup -q -n %{name}-1.4.0-rc2
 
+cat <<'EOF' >lincvs.sh
+#!/bin/sh
+exec %{_libdir}/LinCVS/AppRun $@
+EOF
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 qmake -o Makefile lincvs.pro
 make %{?_smp_mflags}
-
+  
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -49,12 +44,12 @@
 cp -Rpa LinCVS ${RPM_BUILD_ROOT}%{_libdir}
 cp -p LinCVS/AppIcon.xpm ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/lincvs.xpm
 
-install -p -D %{SOURCE1} ${RPM_BUILD_ROOT}%{_bindir}/lincvs
+install -p -D -m0755 lincvs.sh ${RPM_BUILD_ROOT}%{_bindir}/lincvs
 
 desktop-file-install --vendor fedora                \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   \
-  --add-category X-Fedora-Extra                     \
-  %{SOURCE2}
+  --add-category X-Fedora-Extra	                    \
+  %{SOURCE1}
 
 
 %clean
@@ -71,6 +66,9 @@
 
 
 %changelog
+* Fri Feb 25 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.4.0-0.1.rc2
+- Fix for x86_64.
+
 * Sat Feb 12 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.4.0-0.rc2
 - 1.4.0-rc2.
 



From fedora-extras-commits at redhat.com  Tue Mar  8 02:16:05 2005
From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton))
Date: Mon, 7 Mar 2005 21:16:05 -0500
Subject: devel/seahorse .cvsignore, 1.2, 1.3 seahorse.spec, 1.6, 1.7 sources,
	1.2, 1.3
Message-ID: <200503080216.j282G5T1012925@cvs-int.fedora.redhat.com>

Author: pcompton

Update of /cvs/extras/devel/seahorse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12919

Modified Files:
	.cvsignore seahorse.spec sources 
Log Message:
sync dev with FC3 seahorse



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/seahorse/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:20:20 -0000	1.2
+++ .cvsignore	8 Mar 2005 02:16:03 -0000	1.3
@@ -1 +1 @@
-seahorse-0.7.3.tar.gz
+seahorse-0.7.6.tar.bz2


Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/devel/seahorse/seahorse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- seahorse.spec	5 Mar 2005 19:28:28 -0000	1.6
+++ seahorse.spec	8 Mar 2005 02:16:03 -0000	1.7
@@ -1,79 +1,99 @@
-Name:		seahorse
-Version:	0.7.3
-Release:	5
+Name: 		seahorse
+Version: 	0.7.6
+Release: 	2
 Summary:	GNOME2 interface for gnupg
 
-Group:		User Interface/Desktops
-License:	GPL
-URL:		http://seahorse.sourceforge.net/
-Source:		http://download.sourceforge.net/seahorse/seahorse-0.7.3.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	libgnomeui-devel
-BuildRequires:	eel2-devel
-BuildRequires:	gpgme03-devel
-BuildRequires:	scrollkeeper
-BuildRequires:	gettext
-BuildRequires:	desktop-file-utils
-Requires(post):		GConf2 scrollkeeper
-Requires(postun):	scrollkeeper
+Group: 		User Interface/Desktops
+License: 	GPL
+URL:            http://seahorse.sourceforge.net/
+Source: 	http://ftp.gnome.org/pub/GNOME/sources/seahorse/0.7/seahorse-0.7.6.tar.bz2
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  eel2-devel
+BuildRequires:  gedit-devel
+BuildRequires:  gettext
+BuildRequires:  gpgme-devel >= 1.0
+BuildRequires:  libgnomeui-devel
+BuildRequires:  libgnomeprintui22-devel
+BuildRequires:  perl-XML-Parser
+BuildRequires:  scrollkeeper
+Requires(post): desktop-file-utils
+Requires(post): GConf2
+Requires(post): scrollkeeper
+Requires(post): shared-mime-info
+Requires(postun): desktop-file-utils
+Requires(postun): scrollkeeper
+Requires(postun): shared-mime-info
 
 %description
 Seahorse is a gnome2 interface for gnupg.
 It uses gpgme as the backend.
 
 
-
 %prep
 %setup -q
-
+sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.in
+sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.am
 
 
 %build
-%configure
+%configure --disable-schemas-install 
 make %{?_smp_mflags}
 
 
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=${RPM_BUILD_ROOT}
+%makeinstall
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 %find_lang seahorse
 
 rm -rf ${RPM_BUILD_ROOT}/var/scrollkeeper
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
 desktop-file-install --vendor fedora --delete-original  \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
+  --add-category X-Fedora                               \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-encrypted.desktop
+
+desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
-  --add-category Application                            \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-signature.desktop
+
+desktop-file-install --vendor fedora --delete-original  \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
+  --add-category GNOME                                  \
   --add-category Utility                                \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+  --add-category X-Fedora                               \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse.desktop
+
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
 
 
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
-
 %post
+/sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 \
      --makefile-install-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 scrollkeeper-update -q ||:
-
+update-mime-database %{_datadir}/mime/ > /dev/null
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %postun
+/sbin/ldconfig
 scrollkeeper-update -q ||:
-
+update-mime-database %{_datadir}/mime/ > /dev/null
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %files -f %{name}.lang
@@ -81,22 +101,27 @@
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_datadir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/*.desktop
+%{_datadir}/control-center-2.0/capplets/*.desktop
+%{_datadir}/gnome/help/%{name}
+%{_datadir}/mime-info/seahorse.keys
+%{_datadir}/mime-info/seahorse.mime
+%{_datadir}/mime/packages/*
 %{_datadir}/omf/%{name}
 %{_datadir}/pixmaps/*
-%{_datadir}/gnome/help/%{name}
-%{_sysconfdir}/gconf/schemas/*
+%{_libdir}/libseahorse-internal.so.0.0.0
 %{_libdir}/bonobo/*.*
 %{_libdir}/bonobo/servers/Seahorse_PGP_File_Listener.server
-%{_datadir}/control-center-2.0/capplets/*.desktop
-%{_datadir}/mime-info/seahorse.keys
-%{_datadir}/mime-info/seahorse.mime
-
+%{_libdir}/gedit-2/plugins/*
+%{_sysconfdir}/gconf/schemas/*
 
 
 %changelog
-* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
-- Split context marked dependency syntax to work around #118773.
+* Fri Feb 25 2005 Phillip Compton <pcompton[AT]proteinmedia.com> 0.7.6-2
+- desktop entry fixes.
+
+* Fri Feb 25 2005 Phillip Compton <pcompton[AT]proteinmedia.com> 0.7.6-1
+- 0.7.6.
 
 * Mon Nov 09 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:0.7.3-0.fdr.5
 - BuildReq scrollkeeper.


Index: sources
===================================================================
RCS file: /cvs/extras/devel/seahorse/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:20:20 -0000	1.2
+++ sources	8 Mar 2005 02:16:03 -0000	1.3
@@ -1 +1 @@
-8f77822212a8dff24a56f2855913fc29  seahorse-0.7.3.tar.gz
+b0a0942faabc1dd9367b4bea9cdd9c4a  seahorse-0.7.6.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar  8 02:20:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 21:20:35 -0500
Subject: rpms/libol/FC-1 .cvsignore, 1.2, 1.3 libol.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200503080220.j282KZTd013031@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libol/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13019/FC-1

Modified Files:
	.cvsignore libol.spec sources 
Log Message:
Sync with Fedora.us


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-1/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:55 -0000	1.2
+++ .cvsignore	8 Mar 2005 02:20:33 -0000	1.3
@@ -1 +1 @@
-libol-0.3.13.tar.gz
+libol-0.3.15.tar.gz


Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-1/libol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libol.spec	8 Nov 2004 04:47:01 -0000	1.2
+++ libol.spec	8 Mar 2005 02:20:33 -0000	1.3
@@ -1,31 +1,36 @@
-Summary:   Support library for syslog-ng
-Name:      libol
-Version:   0.3.13
-Release:   0.fdr.2.1
-Epoch:     0
-License:   GPL
-Group:     System Environment/Libraries
-Url:       http://www.balabit.hu/products/syslog-ng/
-Source:    http://www.balabit.hu/downloads/syslog-ng/libol/0.3/libol-0.3.13.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
-Requires(post,postun): /sbin/ldconfig
+#
+# Before changing the macro below see the README file included in
+# the syslog-ng package.
+#
+%define with_scheme_preprocessor 0
+
+Summary:          Support library for syslog-ng
+Name:             libol
+Version:          0.3.15
+Release:          0.fdr.1.1
+Epoch:            0
+Group:            System Environment/Libraries
+License:          GPL
+Url:              http://www.balabit.com/products/syslog-ng/
+Source:           http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.15.tar.gz
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{with_scheme_preprocessor}
+BuildRequires:    scsh
+%endif
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 Support library for syslog-ng.
 
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
 
 %package devel
-Summary: Support library libol for syslog-ng headers and libraries
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary:          Support library for syslog-ng: headers and libraries
+Group:            Development/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
-Support library libol for syslog-ng headers and libraries
-
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
+Support library for syslog-ng: headers and libraries.
 
 
 %prep
@@ -33,21 +38,14 @@
 
 %build
 %configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-#
-# make_class
-#   -- this file is installed without an interpreter
-#   -- doesn't appear to be required to build syslog-ng
-#   -> file manually removed
-#
-rm ${RPM_BUILD_ROOT}%{_bindir}/make_class
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -56,13 +54,18 @@
 
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING
 %{_libdir}/libol.so.0
 %{_libdir}/libol.so.0.0.0
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%if %{with_scheme_preprocessor}
+%{_bindir}/make_class
+%else
+%exclude %{_bindir}/make_class
+%endif
 %{_bindir}/libol-config
 %{_libdir}/libol.a
 %{_libdir}/libol.la
@@ -71,6 +74,14 @@
 
 
 %changelog
+* Sat Feb 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.15-0.fdr.1
+- Update to 0.3.15.
+
+* Wed Aug 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.14-0.fdr.1
+- Update to 0.3.14.
+- Merged upstream specfile changes.
+- Upstream configure.in has been patched (make CFLAGS no longer needed).
+
 * Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
 - building with CFLAGS="$RPM_OPT_FLAGS"
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-1/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:55 -0000	1.2
+++ sources	8 Mar 2005 02:20:33 -0000	1.3
@@ -1 +1 @@
-b66e21769e21ac9b953cbafe517630fd  libol-0.3.13.tar.gz
+1c8d6a9c72a9200738a04d68e5a7b439  libol-0.3.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 02:20:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 21:20:35 -0500
Subject: rpms/libol/RHL-9 .cvsignore, 1.2, 1.3 libol.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200503080220.j282KZEP013043@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libol/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13019/RHL-9

Modified Files:
	.cvsignore libol.spec sources 
Log Message:
Sync with Fedora.us


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libol/RHL-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:55 -0000	1.2
+++ .cvsignore	8 Mar 2005 02:20:33 -0000	1.3
@@ -1 +1 @@
-libol-0.3.13.tar.gz
+libol-0.3.15.tar.gz


Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/RHL-9/libol.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libol.spec	8 Nov 2004 04:46:55 -0000	1.1
+++ libol.spec	8 Mar 2005 02:20:33 -0000	1.2
@@ -1,31 +1,36 @@
-Summary:   Support library for syslog-ng
-Name:      libol
-Version:   0.3.13
-Release:   0.fdr.2.rh90
-Epoch:     0
-License:   GPL
-Group:     System Environment/Libraries
-Url:       http://www.balabit.hu/products/syslog-ng/
-Source:    http://www.balabit.hu/downloads/syslog-ng/libol/0.3/libol-0.3.13.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
-Requires(post,postun): /sbin/ldconfig
+#
+# Before changing the macro below see the README file included in
+# the syslog-ng package.
+#
+%define with_scheme_preprocessor 0
+
+Summary:          Support library for syslog-ng
+Name:             libol
+Version:          0.3.15
+Release:          0.fdr.1.rh90
+Epoch:            0
+Group:            System Environment/Libraries
+License:          GPL
+Url:              http://www.balabit.com/products/syslog-ng/
+Source:           http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.15.tar.gz
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{with_scheme_preprocessor}
+BuildRequires:    scsh
+%endif
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 Support library for syslog-ng.
 
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
 
 %package devel
-Summary: Support library libol for syslog-ng headers and libraries
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary:          Support library for syslog-ng: headers and libraries
+Group:            Development/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
-Support library libol for syslog-ng headers and libraries
-
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
+Support library for syslog-ng: headers and libraries.
 
 
 %prep
@@ -33,21 +38,14 @@
 
 %build
 %configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-#
-# make_class
-#   -- this file is installed without an interpreter
-#   -- doesn't appear to be required to build syslog-ng
-#   -> file manually removed
-#
-rm ${RPM_BUILD_ROOT}%{_bindir}/make_class
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -56,13 +54,18 @@
 
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING
 %{_libdir}/libol.so.0
 %{_libdir}/libol.so.0.0.0
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%if %{with_scheme_preprocessor}
+%{_bindir}/make_class
+%else
+%exclude %{_bindir}/make_class
+%endif
 %{_bindir}/libol-config
 %{_libdir}/libol.a
 %{_libdir}/libol.la
@@ -71,6 +74,14 @@
 
 
 %changelog
+* Sat Feb 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.15-0.fdr.1
+- Update to 0.3.15.
+
+* Wed Aug 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.14-0.fdr.1
+- Update to 0.3.14.
+- Merged upstream specfile changes.
+- Upstream configure.in has been patched (make CFLAGS no longer needed).
+
 * Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
 - building with CFLAGS="$RPM_OPT_FLAGS"
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libol/RHL-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:55 -0000	1.2
+++ sources	8 Mar 2005 02:20:33 -0000	1.3
@@ -1 +1 @@
-b66e21769e21ac9b953cbafe517630fd  libol-0.3.13.tar.gz
+1c8d6a9c72a9200738a04d68e5a7b439  libol-0.3.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 02:20:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 21:20:35 -0500
Subject: rpms/libol/FC-2 .cvsignore, 1.2, 1.3 libol.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200503080220.j282KZPw013037@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libol/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13019/FC-2

Modified Files:
	.cvsignore libol.spec sources 
Log Message:
Sync with Fedora.us


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:55 -0000	1.2
+++ .cvsignore	8 Mar 2005 02:20:33 -0000	1.3
@@ -1 +1 @@
-libol-0.3.13.tar.gz
+libol-0.3.15.tar.gz


Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-2/libol.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libol.spec	8 Nov 2004 04:47:07 -0000	1.3
+++ libol.spec	8 Mar 2005 02:20:33 -0000	1.4
@@ -1,31 +1,36 @@
-Summary:   Support library for syslog-ng
-Name:      libol
-Version:   0.3.13
-Release:   0.fdr.2.2
-Epoch:     0
-License:   GPL
-Group:     System Environment/Libraries
-Url:       http://www.balabit.hu/products/syslog-ng/
-Source:    http://www.balabit.hu/downloads/syslog-ng/libol/0.3/libol-0.3.13.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
-Requires(post,postun): /sbin/ldconfig
+#
+# Before changing the macro below see the README file included in
+# the syslog-ng package.
+#
+%define with_scheme_preprocessor 0
+
+Summary:          Support library for syslog-ng
+Name:             libol
+Version:          0.3.15
+Release:          0.fdr.1.2
+Epoch:            0
+Group:            System Environment/Libraries
+License:          GPL
+Url:              http://www.balabit.com/products/syslog-ng/
+Source:           http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.15.tar.gz
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{with_scheme_preprocessor}
+BuildRequires:    scsh
+%endif
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 Support library for syslog-ng.
 
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
 
 %package devel
-Summary: Support library libol for syslog-ng headers and libraries
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary:          Support library for syslog-ng: headers and libraries
+Group:            Development/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
-Support library libol for syslog-ng headers and libraries
-
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
+Support library for syslog-ng: headers and libraries.
 
 
 %prep
@@ -33,21 +38,14 @@
 
 %build
 %configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-#
-# make_class
-#   -- this file is installed without an interpreter
-#   -- doesn't appear to be required to build syslog-ng
-#   -> file manually removed
-#
-rm ${RPM_BUILD_ROOT}%{_bindir}/make_class
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -56,13 +54,18 @@
 
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING
 %{_libdir}/libol.so.0
 %{_libdir}/libol.so.0.0.0
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%if %{with_scheme_preprocessor}
+%{_bindir}/make_class
+%else
+%exclude %{_bindir}/make_class
+%endif
 %{_bindir}/libol-config
 %{_libdir}/libol.a
 %{_libdir}/libol.la
@@ -71,6 +74,14 @@
 
 
 %changelog
+* Sat Feb 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.15-0.fdr.1
+- Update to 0.3.15.
+
+* Wed Aug 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.14-0.fdr.1
+- Update to 0.3.14.
+- Merged upstream specfile changes.
+- Upstream configure.in has been patched (make CFLAGS no longer needed).
+
 * Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
 - building with CFLAGS="$RPM_OPT_FLAGS"
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:55 -0000	1.2
+++ sources	8 Mar 2005 02:20:33 -0000	1.3
@@ -1 +1 @@
-b66e21769e21ac9b953cbafe517630fd  libol-0.3.13.tar.gz
+1c8d6a9c72a9200738a04d68e5a7b439  libol-0.3.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 07:44:58 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 8 Mar 2005 02:44:58 -0500
Subject: devel/jabberd jabberd,1.1,1.2
Message-ID: <200503080744.j287iwcs019277@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19268

Modified Files:
	jabberd 
Log Message:
LSB return code for "Usage" is 2



Index: jabberd
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jabberd	7 Mar 2005 08:23:35 -0000	1.1
+++ jabberd	8 Mar 2005 07:44:56 -0000	1.2
@@ -144,6 +144,6 @@
 		;;
 	*)
 		echo "Usage: $0 {start|stop|restart|condrestart|reload|status}"
-		let retval=-1
+		let retval=2
 esac
 exit ${retval}



From fedora-extras-commits at redhat.com  Tue Mar  8 13:45:03 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 8 Mar 2005 08:45:03 -0500
Subject: rpms/ppracer/devel ppracer.desktop,1.4,1.5
Message-ID: <200503081345.j28Dj3kf025295@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.desktop 
Log Message:
use Terminal=false, not Terminal=0



Index: ppracer.desktop
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ppracer.desktop	4 Mar 2005 18:46:01 -0000	1.4
+++ ppracer.desktop	8 Mar 2005 13:45:01 -0000	1.5
@@ -6,6 +6,6 @@
 GenericName=A 3D downhill racing game
 Comment=Race your penguin down an alpine slope
 Exec=ppracer
-Terminal=0
+Terminal=false
 Type=Application
 Icon=ppracer.png



From fedora-extras-commits at redhat.com  Tue Mar  8 13:46:36 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 8 Mar 2005 08:46:36 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.6,1.7
Message-ID: <200503081346.j28DkaLf025373@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.spec 
Log Message:
don't use integer for boolean value in desktop file



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ppracer.spec	7 Mar 2005 13:55:09 -0000	1.6
+++ ppracer.spec	8 Mar 2005 13:46:34 -0000	1.7
@@ -69,6 +69,9 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Tue Mar 08 2005 Nils Philippsen <nphilipp at redhat.com>
+- don't use integer for boolean value in desktop file
+
 * Mon Mar 07 2005 Nils Philippsen <nphilipp at redhat.com>
 - don't package zero size README file
 - obsolete tuxracer <= 0.61



From fedora-extras-commits at redhat.com  Tue Mar  8 13:48:33 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 08:48:33 -0500
Subject: rpms/dietlibc/devel dietlibc-0.28-cflags.patch, NONE,
	1.1 dietlibc.spec, 1.7, 1.8
Message-ID: <200503081348.j28DmX8K025434@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	dietlibc.spec 
Added Files:
	dietlibc-0.28-cflags.patch 
Log Message:
use more modern flags for '-Os'


dietlibc-0.28-cflags.patch:

--- NEW FILE dietlibc-0.28-cflags.patch ---
2005-03-08 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* diet.c: use more modern compiler-flags with '-Os'; the new
	  ones are having the same effect as the old ones but do not
	  produce warnings

--- dietlibc-0.28/diet.c.cflags	2004-12-17 19:47:58.000000000 +0100
+++ dietlibc-0.28/diet.c	2005-03-08 14:37:03.000000000 +0100
@@ -26,8 +26,8 @@ static void error(const char *message) {
 
 static const char* Os[] = {
   "i386","-Os","-mpreferred-stack-boundary=2",
-	 "-malign-functions=1","-malign-jumps=1",
-	 "-malign-loops=1","-fomit-frame-pointer",0,
+	 "-falign-functions=1","-falign-jumps=1",
+	 "-falign-loops=1","-fomit-frame-pointer",0,
   "x86_64","-Os","-fno-omit-frame-pointer",0,
   "sparc","-Os","-mcpu=supersparc",0,
   "sparc64","-Os","-m64","-mhard-quad-float",0,


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dietlibc.spec	7 Mar 2005 00:25:59 -0000	1.7
+++ dietlibc.spec	8 Mar 2005 13:48:31 -0000	1.8
@@ -36,7 +36,7 @@
 Summary:	Small libc implementation
 Name:		%{?_with_cross:cross-%crossarch-}%NAME
 Version:	0.28
-Release:	%release_func 4
+Release:	%release_func 4.1
 License:	GPL
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
@@ -46,6 +46,7 @@
 Patch1:		dietlibc-0.28-setpriority.patch
 Patch2:		dietlibc-0.28-ppc.patch
 Patch3:		dietlibc-0.28-hppa.patch
+Patch4:		dietlibc-0.28-cflags.patch
 BuildRoot:	%_tmppath/%name-%version-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
 
@@ -79,6 +80,7 @@
 %patch1 -p1 -b .nice
 %patch2 -p1 -b .ppc
 %patch3 -p1 -b .hppa
+%patch4 -p1 -b .cflags
 
 ## only for 0.28; remove it in 0.29
 sed -i -e 's!LD_RUN_PATH= !env -u LD_RUN_PATH !' Makefile
@@ -149,6 +151,7 @@
 - build the dynamic libs for x86, x86_64 and arm only
 - fixed PPC issues in ISO mode (do not use the 'powerpc' macro but the
   '__powerpc__' one)
+- use more modern flags for '-Os'
 
 * Tue Feb  1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-1
 - updated to 0.28



From fedora-extras-commits at redhat.com  Tue Mar  8 16:21:49 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 8 Mar 2005 11:21:49 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.7,1.8
Message-ID: <200503081621.j28GLnbX028071@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.spec 
Log Message:
remove optflags patch as it isn't necessary anymore
reorder sources and patches



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ppracer.spec	8 Mar 2005 13:46:34 -0000	1.7
+++ ppracer.spec	8 Mar 2005 16:21:47 -0000	1.8
@@ -11,12 +11,11 @@
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: http://download.berlios.de/ppracer/ppracer-%{version}%{?srcextraversion}.tar.bz2
-Source2: ppracer.png
-Source3: ppracer.desktop
+Source0: http://download.berlios.de/ppracer/ppracer-%{version}%{?srcextraversion}.tar.bz2
+Source1: ppracer.png
+Source2: ppracer.desktop
 
-Patch1: ppracer-0.3.1-optflags.patch
-Patch2: PPRacer-0.1.9-ia64.patch
+Patch0: PPRacer-0.1.9-ia64.patch
 
 BuildRequires: xorg-x11-devel
 BuildRequires: SDL-devel >= 1.2
@@ -38,8 +37,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .optflags
-%patch2 -p1 -b .ia64
+%patch0 -p1 -b .ia64
 
 %build
 autoconf
@@ -51,11 +49,11 @@
 %makeinstall ppdatadir=%{buildroot}%{_datadir}/ppracer
 
 mkdir -p %{buildroot}%{_datadir}/pixmaps/
-install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/
+install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/
 
 mkdir -p %{buildroot}%{_datadir}/applications/
 desktop-file-install --vendor %{desktop_vendor} --dir %{buildroot}%{_datadir}/applications \
-    %{SOURCE3}
+    %{SOURCE2}
 
 %clean
 rm -rf %{buildroot}
@@ -71,6 +69,8 @@
 %changelog
 * Tue Mar 08 2005 Nils Philippsen <nphilipp at redhat.com>
 - don't use integer for boolean value in desktop file
+- remove optflags patch as it isn't necessary anymore
+- reorder sources and patches
 
 * Mon Mar 07 2005 Nils Philippsen <nphilipp at redhat.com>
 - don't package zero size README file



From fedora-extras-commits at redhat.com  Tue Mar  8 17:17:00 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 12:17:00 -0500
Subject: rpms/xca/devel .cvsignore,1.2,1.3
Message-ID: <200503081717.j28HH0RX029035@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	.cvsignore 
Log Message:
updated



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:33:36 -0000	1.2
+++ .cvsignore	8 Mar 2005 17:16:58 -0000	1.3
@@ -1 +1,3 @@
-xca-0.4.6.tar.gz
+xca-*.tar.gz
+xca-*.*.rpm
+i386



From fedora-extras-commits at redhat.com  Tue Mar  8 17:17:23 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 12:17:23 -0500
Subject: rpms/xca/devel xca-0.5.1-langinst.patch, NONE,
	1.1 xca-0.5.1-gcc4.patch, NONE, 1.1 xca-0.5.1-db43.patch, NONE,
	1.1 xca.spec, 1.5, 1.6 xca-0.4.6-gcc3.patch, 1.1,
	NONE cxx_except.h, 1.1, NONE cxx_common.h, 1.1, NONE
Message-ID: <200503081717.j28HHNDW029063@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	xca.spec 
Added Files:
	xca-0.5.1-langinst.patch xca-0.5.1-gcc4.patch 
	xca-0.5.1-db43.patch 
Removed Files:
	xca-0.4.6-gcc3.patch cxx_except.h cxx_common.h 
Log Message:
- updated to 0.5.1
- (re)enabled parallel build
- applied -langinst patch and other ideas from
  https://bugzilla.fedora.us/show_bug.cgi?id=2019 (Ville Skytt?)
- fixed build with gcc4 and db43
- removed old cruft from the specfile


xca-0.5.1-langinst.patch:

--- NEW FILE xca-0.5.1-langinst.patch ---
--- lang/Makefile~	2004-02-18 19:29:50.000000000 +0200
+++ lang/Makefile	2004-08-27 20:09:02.910204474 +0300
@@ -3,7 +3,7 @@
 
 install:
 	install -m 755 -d $(destdir)$(prefix)/share/xca
-	install -m 644 lang/xca_??.qm $(destdir)$(prefix)/share/xca || true
+	install -m 644 xca_??.qm $(destdir)$(prefix)/share/xca || true
 
 include $(TOPDIR)/Local.mak
 

xca-0.5.1-gcc4.patch:

--- NEW FILE xca-0.5.1-gcc4.patch ---
===================================================================
RCS file: /cvsroot/xca/xca/widgets/clicklabel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xca/xca/widgets/clicklabel.cpp	2003/11/26 22:03:18	1.3
+++ xca/xca/widgets/clicklabel.cpp	2005/02/07 21:56:27	1.4
@@ -45,7 +45,7 @@
  * http://www.hohnstaedt.de/xca
  * email: christian at hohnstaedt.de
  *
- * $Id: clicklabel.cpp,v 1.3 2003/11/26 22:03:18 chris2511 Exp $ 
+ * $Id: clicklabel.cpp,v 1.4 2005/02/07 21:56:27 chris2511 Exp $ 
  *
  */                           
 
@@ -58,9 +58,9 @@
 ClickLabel::ClickLabel( QWidget* parent,  const char* name, WFlags f )
 	:QLabel( parent, name, f )
 {
-	QFont font( font() );
-	font.setBold(true);
-	setFont( font );
+	QFont fnt( font() );
+	fnt.setBold(true);
+	setFont( fnt );
 	setFrameShape( QLabel::Panel );
 	setFrameShadow( QLabel::Sunken );
 	setAlignment( int( QLabel::AlignCenter ) );

xca-0.5.1-db43.patch:

--- NEW FILE xca-0.5.1-db43.patch ---
--- xca-0.5.1/widgets/MainWindow.h.db43	2004-04-15 01:36:56.000000000 +0200
+++ xca-0.5.1/widgets/MainWindow.h	2005-03-08 17:36:26.000000000 +0100
@@ -105,6 +105,10 @@ class MainWindow: public MainWindow_UI
 	static int passRead(char *buf, int size, int rwflag, void *userdata);
 	static int passWrite(char *buf, int size, int rwflag, void *userdata);
 	static void dberr(const char *errpfx, char *msg);
+	static void dberr(DbEnv const *, const char *errpfx, char const *msg)
+	{
+	  dberr(errpfx, const_cast<char *>(msg));
+	}
 	static NewX509 *newX509();
 	static QString md5passwd(const char *pass);
 	static void Error(errorEx &err);


Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xca.spec	5 Mar 2005 20:07:09 -0000	1.5
+++ xca.spec	8 Mar 2005 17:17:21 -0000	1.6
@@ -1,23 +1,24 @@
-## For RHL7.3 compile with '--without desktop' flag
+## $Id$
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
-Version:	0.4.6
-Release:	1
+Version:	0.5.1
+Release:	%release_func 0
 License:	BSD
 Group:		Applications/Productivity
 URL:		http://www.hohnstaedt.de/xca.html
-Source0:	http://download.sourceforge.net/sourceforge/xca/%{name}-%{version}.tar.gz
-Source1:	http://www.hohnstaedt.de/xca/cxx_common.h
-Source2:	http://www.hohnstaedt.de/xca/cxx_except.h
-# http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/MainWindow.cpp?r1=1.33&r2=1.34&diff_format=u
-Patch0:		xca-0.4.6-gcc3.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source0:	http://download.sourceforge.net/sourceforge/xca/%name-%version.tar.gz
+Patch0:		%name-0.5.1-langinst.patch
+# http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/clicklabel.cpp?r1=1.3&r2=1.4&diff_format=u
+Patch1:		%name-0.5.1-gcc4.patch
+Patch2:		%name-0.5.1-db43.patch
+BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt-devel openssl-devel
 BuildRequires:	/usr/include/db.h
-%if 0%{!?_without_desktop:1}
 BuildRequires:	desktop-file-utils
-%endif
+
 
 %description
 The Program uses a Berkeley db for storage and supports RSA keys.
@@ -30,41 +31,31 @@
 
 %prep
 %setup -q
-%patch0 -p2 -b .gcc3
+%patch0 -p0 -b .langinst
+%patch1 -p2 -b .gcc4
+%patch2 -p1 -b .db43
 
+sed -i 's! db_cxx-4 ! db_cxx-4 db_cxx-4.3 !g' configure
 
-%build
-test -n "$QTDIR" || . %{_sysconfdir}/profile.d/qt.sh
-
-db_inc=/usr/include/db
-rpm -q db3-devel && db_inc=/usr/include/db3 || :
-rpm -q db4-devel && db_inc=/usr/include/db4 || :
-
-## Hacky workaround for broken db[34]-devel package:
-## https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=59759
-echo '#include "db_cxx.h"' | g++ -x c++ -E -I $db_inc - &>/dev/null || {
-	cp -a %{SOURCE1} %{SOURCE2} .
-	export CPPFLAGS="-I`pwd`"
-}
 
+%build
+test -n "$QTDIR" || . %_sysconfdir/profile.d/qt.sh
 CC='%__cc' LD='%__ld' CFLAGS="$RPM_OPT_FLAGS" STRIP=: prefix=%_prefix \
 ./configure
-%__make
+%__make %{?_smp_mflags}
+lrelease xca.pro
 
 
 %install
 rm -rf "$RPM_BUILD_ROOT" _doc
-%{__make} destdir="$RPM_BUILD_ROOT" install
+%__make destdir="$RPM_BUILD_ROOT" mandir=share/man install
 
-%{__install} -d -m755 _doc/html $RPM_BUILD_ROOT%{_datadir}/applications
-%{__install} -p -m644 doc/*.html _doc/html/
+%__install -d -m755 _doc/html $RPM_BUILD_ROOT%_datadir/applications
 
-%if 0%{!?_without_desktop:1}
 desktop-file-install --vendor fedora -m644 --delete-original	\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
+  --dir $RPM_BUILD_ROOT%_datadir/applications			\
   --add-category X-Fedora					\
-  $RPM_BUILD_ROOT%{_datadir}/applications/xca.desktop
-%endif
+  $RPM_BUILD_ROOT%_datadir/applications/xca.desktop
 
 
 %clean
@@ -73,21 +64,30 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYRIGHT _doc/html
+%doc AUTHORS COPYRIGHT
 %doc debian/changelog
-%{_bindir}/*
+%_bindir/*
+%_mandir/*/*
 %dir %{_datadir}/xca
-%{_datadir}/xca/*.png
-%{_datadir}/pixmaps/*.xpm
-%lang(de) %{_datadir}/xca/xca_de.qm
-%lang(es) %{_datadir}/xca/xca_es.qm
-
-%if 0%{!?_without_desktop:1}
-%{_datadir}/applications/*
-%endif
+%_datadir/xca/*.png
+%_datadir/xca/*.txt
+%_datadir/xca/*.html
+%_datadir/pixmaps/*.xpm
+%lang(de) %_datadir/xca/xca_de.qm
+%lang(es) %_datadir/xca/xca_es.qm
+
+%_datadir/applications/*
 
 
 %changelog
+* Tue Mar  8 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.1
+- updated to 0.5.1
+- (re)enabled parallel build
+- applied -langinst patch and other ideas from
+  https://bugzilla.fedora.us/show_bug.cgi?id=2019 (Ville Skytt??)
+- fixed build with gcc4 and db43
+- removed old cruft from the specfile
+
 * Sat Dec 13 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.4.6-0.fdr.1
 - changed compile/install commands to work with the new, yet-another configure system
 - removed libpthread test since it went upstream


--- xca-0.4.6-gcc3.patch DELETED ---


--- cxx_except.h DELETED ---


--- cxx_common.h DELETED ---



From fedora-extras-commits at redhat.com  Tue Mar  8 17:18:38 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 12:18:38 -0500
Subject: rpms/xca/devel sources,1.2,1.3
Message-ID: <200503081718.j28HIcSk029138@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	sources 
Log Message:
updated to 0.5.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:33:36 -0000	1.2
+++ sources	8 Mar 2005 17:18:36 -0000	1.3
@@ -1 +1,2 @@
 3defe69788b9e0eb738f374143be6e12  xca-0.4.6.tar.gz
+24e0289c189b8db2f1f15a4ddac1b1c3  xca-0.5.1.tar.gz



From nphilipp at redhat.com  Tue Mar  8 17:47:06 2005
From: nphilipp at redhat.com (Nils Philippsen)
Date: Tue, 08 Mar 2005 18:47:06 +0100
Subject: APPROVED: ppracer
Message-ID: <1110304026.14945.47.camel@wombat.tiptoe.de>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Name: PPRacer
PPRacer is a simple OpenGL-based racing game featuring Tux. The
objective of the game is to slide down a snow- and ice-covered mountain
as quickly as possible, avoiding the trees and rocks that will slow
you down.

Maintainer: Nils Philippsen
Reviewed by: Adrian Reber, Matthias Saou
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)

iD8DBQFCLs8LR9ibZWlRMBERAruPAJ0RHE65bEjQsmoC+VHQQKwT42WCdQCgqIMG
3OfvV6naC3kQz072jFl7Zzo=
=2QWK
-----END PGP SIGNATURE-----


-- 
     Nils Philippsen    /    Red Hat    /    nphilipp at redhat.com
"They that can give up essential liberty to obtain a little temporary
 safety deserve neither liberty nor safety."     -- B. Franklin, 1759
 PGP fingerprint:  C4A8 9474 5C4C ADE3 2B8F  656D 47D8 9B65 6951 3011



From fedora-extras-commits at redhat.com  Tue Mar  8 18:00:47 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 8 Mar 2005 13:00:47 -0500
Subject: rpms/perl-Glib/FC-3 .cvsignore, 1.3, 1.4 perl-Glib.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200503081800.j28I0lDb029439@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-serv29429/FC-3

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
Update to 1.080


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2005 03:09:08 -0000	1.3
+++ .cvsignore	8 Mar 2005 18:00:45 -0000	1.4
@@ -1 +1 @@
-Glib-1.062.tar.gz
+Glib-1.080.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-3/perl-Glib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Glib.spec	15 Feb 2005 03:09:08 -0000	1.5
+++ perl-Glib.spec	8 Mar 2005 18:00:45 -0000	1.6
@@ -1,15 +1,14 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Glib
-Version:        1.062
+Version:        1.080
 Release:        1
-Epoch:          0
 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.062.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-1.080.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
@@ -61,6 +60,9 @@
 
 
 %changelog
+* Tue Mar  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-1
+- Update to 1.080.
+
 * Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.062-1
 - Update to 1.062.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 03:09:08 -0000	1.3
+++ sources	8 Mar 2005 18:00:45 -0000	1.4
@@ -1 +1 @@
-ddbe549636215eaa1710937b2c723622  Glib-1.062.tar.gz
+b6cb2978519fc3ee882c2c4aa27cbdd1  Glib-1.080.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 18:00:47 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 8 Mar 2005 13:00:47 -0500
Subject: rpms/perl-Glib/devel .cvsignore, 1.3, 1.4 perl-Glib.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200503081800.j28I0ldn029444@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29429/devel

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
Update to 1.080


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2005 03:09:08 -0000	1.3
+++ .cvsignore	8 Mar 2005 18:00:45 -0000	1.4
@@ -1 +1 @@
-Glib-1.062.tar.gz
+Glib-1.080.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Glib.spec	3 Mar 2005 23:46:26 -0000	1.6
+++ perl-Glib.spec	8 Mar 2005 18:00:45 -0000	1.7
@@ -1,14 +1,14 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Glib
-Version:        1.062
+Version:        1.080
 Release:        1
 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.062.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-1.080.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Tue Mar  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-1
+- Update to 1.080.
+
 * Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.062-1
 - Update to 1.062.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 03:09:08 -0000	1.3
+++ sources	8 Mar 2005 18:00:45 -0000	1.4
@@ -1 +1 @@
-ddbe549636215eaa1710937b2c723622  Glib-1.062.tar.gz
+b6cb2978519fc3ee882c2c4aa27cbdd1  Glib-1.080.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 18:10:57 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 13:10:57 -0500
Subject: rpms/xca/devel sources,1.3,1.4
Message-ID: <200503081810.j28IAvUV030234@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	sources 
Log Message:
removed old tarball



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Mar 2005 17:18:36 -0000	1.3
+++ sources	8 Mar 2005 18:10:55 -0000	1.4
@@ -1,2 +1 @@
-3defe69788b9e0eb738f374143be6e12  xca-0.4.6.tar.gz
 24e0289c189b8db2f1f15a4ddac1b1c3  xca-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 18:11:46 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 13:11:46 -0500
Subject: rpms/xca/devel xca.spec,1.6,1.7
Message-ID: <200503081811.j28IBkOk030280@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	xca.spec 
Log Message:
removed all traces of _doc in %install; it is not used anymore



Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xca.spec	8 Mar 2005 17:17:21 -0000	1.6
+++ xca.spec	8 Mar 2005 18:11:44 -0000	1.7
@@ -47,10 +47,10 @@
 
 
 %install
-rm -rf "$RPM_BUILD_ROOT" _doc
+rm -rf "$RPM_BUILD_ROOT"
 %__make destdir="$RPM_BUILD_ROOT" mandir=share/man install
 
-%__install -d -m755 _doc/html $RPM_BUILD_ROOT%_datadir/applications
+%__install -d -m755 $RPM_BUILD_ROOT%_datadir/applications
 
 desktop-file-install --vendor fedora -m644 --delete-original	\
   --dir $RPM_BUILD_ROOT%_datadir/applications			\



From fedora-extras-commits at redhat.com  Tue Mar  8 18:21:22 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 13:21:22 -0500
Subject: rpms/mantis/devel .cvsignore,1.2,1.3
Message-ID: <200503081821.j28ILMCd030391@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	.cvsignore 
Log Message:
updated



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:50:58 -0000	1.2
+++ .cvsignore	8 Mar 2005 18:21:20 -0000	1.3
@@ -1 +1,2 @@
-mantisbt-0.18.3.tar.gz
+mantis-*.tar.gz
+mantis-*.*.rpm



From fedora-extras-commits at redhat.com  Tue Mar  8 18:24:18 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 13:24:18 -0500
Subject: rpms/mantis/devel mantis-0.19.2-noexamplecom.patch, NONE,
	1.1 mantis-0.19.2-noadmin.patch, NONE,
	1.1 mantis-0.19.2-iis.patch, NONE, 1.1 sources, 1.2,
	1.3 mantis.spec, 1.4, 1.5 mantis-0.18.3-noadmin.patch, 1.1,
	NONE mantis-0.18.3-iis.patch, 1.1,
	NONE mantis-0.18.3-email.patch, 1.1, NONE
Message-ID: <200503081824.j28IOIHu030460@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	sources mantis.spec 
Added Files:
	mantis-0.19.2-noexamplecom.patch mantis-0.19.2-noadmin.patch 
	mantis-0.19.2-iis.patch 
Removed Files:
	mantis-0.18.3-noadmin.patch mantis-0.18.3-iis.patch 
	mantis-0.18.3-email.patch 
Log Message:
- updated to 0.19.2
- rediffed patches
- removed dependency on php-mysql as it supports PostgreSQL also
- added inline-hack to generate a PostgreSQL database creation script


mantis-0.19.2-noexamplecom.patch:

--- NEW FILE mantis-0.19.2-noexamplecom.patch ---
--- mantis-0.19.2/config_inc.php.sample.email	2004-09-12 14:23:36.000000000 +0200
+++ mantis-0.19.2/config_inc.php.sample	2005-03-07 17:52:02.000000000 +0100
@@ -34,14 +34,14 @@
 	$g_database_name = "bugtracker";
 
 	# --- email variables -------------
-	$g_administrator_email  = 'administrator at example.com';
-	$g_webmaster_email      = 'webmaster at example.com';
+	$g_administrator_email  = 'administrator at localhost';
+	$g_webmaster_email      = 'webmaster at localhost';
 
 	# the "From: " field in emails
-	$g_from_email           = 'noreply at example.com';
+	$g_from_email           = 'noreply at localhost';
 
 	# the return address for bounced mail
-	$g_return_path_email    = 'admin at example.com';
+	$g_return_path_email    = 'admin at localhost';
 
 	# --- file upload settings --------
 	# This is the master setting to disable *all* file uploading functionality
@@ -49,4 +49,4 @@
 	# The default value is ON but you must make sure file uploading is enabled
 	#  in PHP as well.  You may need to add "file_uploads = TRUE" to your php.ini.
 	$g_allow_file_upload	= ON;
-?>
\ No newline at end of file
+?>
--- mantis-0.19.2/config_defaults_inc.php.email	2005-03-07 17:49:31.000000000 +0100
+++ mantis-0.19.2/config_defaults_inc.php	2005-03-07 17:51:24.000000000 +0100
@@ -75,7 +75,7 @@
 		} else if ( isset( $_SERVER['SERVER_ADDR'] ) ) {
 			$t_host = $_SERVER['SERVER_ADDR'] . $t_port;
 		} else {
-			$t_host = 'www.example.com';
+			$t_host = 'localhost';
 		}
 
 		$t_path = dirname( $_SERVER['PHP_SELF'] );
@@ -85,7 +85,7 @@
 
 		$g_path	= $t_protocol . '://' . $t_host . $t_path.'/';
 	} else {
-		$g_path	= 'http://www.example.com/mantis/';
+		$g_path	= 'http://localhost/mantis/';
 	}
 
 	# path to your images directory (for icons)
@@ -170,14 +170,14 @@
 	#############################
 
 	# --- email variables -------------
-	$g_administrator_email	= 'administrator at example.com';
-	$g_webmaster_email		= 'webmaster at example.com';
+	$g_administrator_email	= 'administrator at localhost';
+	$g_webmaster_email		= 'webmaster at localhost';
 
 	# the 'From: ' field in emails
-	$g_from_email			= 'noreply at example.com';
+	$g_from_email			= 'noreply at localhost';
 
 	# the return address for bounced mail
-	$g_return_path_email	= 'admin at example.com';
+	$g_return_path_email	= 'admin at localhost';
 
 	# allow email notification
 	#  note that if this is disabled, sign-up and password reset messages will
@@ -711,7 +711,7 @@
 	# look in README.LDAP for details
 
 	# --- using openldap -------------
-	$g_ldap_server			= 'ldaps://ldap.example.com.au/';
+	$g_ldap_server			= 'ldaps://localhost/';
 	$g_ldap_port			= '636';
 	$g_ldap_root_dn			= 'dc=example,dc=com,dc=au';
 	$g_ldap_organization		= '';    # e.g. '(organizationname=*Traffic)'

mantis-0.19.2-noadmin.patch:

--- NEW FILE mantis-0.19.2-noadmin.patch ---
--- mantis-0.19.2/login_page.php.noadmin	2004-08-14 17:26:20.000000000 +0200
+++ mantis-0.19.2/login_page.php	2005-03-07 17:54:15.000000000 +0100
@@ -141,7 +141,7 @@
 
 	# Check if the admin directory is available and is readable.
 	$t_admin_dir = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR;
-	if ( is_dir( $t_admin_dir ) && is_readable( $t_admin_dir ) ) {
+	if ( 0 && is_dir( $t_admin_dir ) && is_readable( $t_admin_dir ) ) {
 			echo '<div class="warning" align="center">', "\n";
 			echo '<p><font color="red"><strong>WARNING:</strong> Admin directory should be removed.</font></p>', "\n";
 			echo '</div>', "\n";

mantis-0.19.2-iis.patch:

--- NEW FILE mantis-0.19.2-iis.patch ---
--- mantis-0.19.2/config_defaults_inc.php.iss	2004-12-11 08:21:52.000000000 +0100
+++ mantis-0.19.2/config_defaults_inc.php	2005-03-07 17:47:41.000000000 +0100
@@ -245,7 +245,7 @@
 
 	# set to OFF to disable email check
 	$g_validate_email		= ON;
-	$g_check_mx_record		= OFF;	# Not supported under Windows.
+	$g_check_mx_record		= ON;	# Not supported under Windows.
 
 	# if ON, allow the user to omit an email field
 	# note if you allow users to create their own accounts, they
@@ -1474,4 +1474,4 @@
 	# NOTE: These are meaningless under Windows! Just ignore them!
 	$g_dot_tool							= '/usr/bin/dot';
 	$g_neato_tool						= '/usr/bin/neato';
-?>
\ No newline at end of file
+?>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:50:58 -0000	1.2
+++ sources	8 Mar 2005 18:24:16 -0000	1.3
@@ -1 +1 @@
-a0695e6d562778f8728d8f7ac963d8dd  mantisbt-0.18.3.tar.gz
+042c42c6de3bc536181391c1e9b25db3  mantis-0.19.2.tar.gz


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mantis.spec	3 Mar 2005 23:01:24 -0000	1.4
+++ mantis.spec	8 Mar 2005 18:24:16 -0000	1.5
@@ -1,24 +1,26 @@
 # $Id$
 
-%define pkgdir		%{_datadir}/%{name}
-%define cfgdir		%{_sysconfdir}/%{name}
-%define httpconfdir	%{_sysconfdir}/httpd/conf.d
+%global pkgdir		%{_datadir}/%{name}
+%global cfgdir		%{_sysconfdir}/%{name}
+%global httpconfdir	%{_sysconfdir}/httpd/conf.d
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	Web-based bugtracking system
 Name:		mantis
-Version:	0.18.3
-Release:	2
+Version:	0.19.2
+Release:	%release_func 0
 License:	GPL
 Group:		Applications/Internet
 URL:		http://mantisbt.sourceforge.net/
 BuildArch:	noarch
-Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}bt-%{version}%{?alpha}.tar.gz
-Patch0:		mantis-0.18.3-iis.patch
-Patch1:		mantis-0.18.3-email.patch
-Patch2:		mantis-0.18.3-noadmin.patch
+Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}-%{version}%{?alpha}.tar.gz
+Patch0:		mantis-0.19.2-iis.patch
+Patch1:		mantis-0.19.2-noexamplecom.patch
+Patch2:		mantis-0.19.2-noadmin.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	diffutils
-Requires:	php php-mysql
+Requires:	php
 Requires:	mantis-config
 
 %package config-httpd
@@ -51,15 +53,27 @@
 
 
 %prep
-%setup -q -n %{name}bt-%{version}%{?alpha}
+%setup -q
 %patch0 -p1 -b .iis
-%patch1 -p1 -b .email
+%patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
 
 chmod -x *.php
-find -name '.cvsignore' -exec rm -f {} \;
 rm -rf packages
 
+sed -e '$s!CONCAT.*!md5(random()*random())||md5(now()));!;
+	s! COMMENT=.*;!;!;
+	s! UNIQUE KEY [^ ]* ! UNIQUE !g;
+	s!^\( *\)KEY .*[^,]\(,\?\)$!\1CHECK (TRUE)\2!;
+	s! tinyint! int!;
+	s! unsigned ! !g;
+	s! longblob ! text !g;
+	s! datetime ! timestamp with time zone !g;
+	s!TYPE=MyISAM!WITHOUT OIDS!g;
+	s!^#!-- !;
+	s! int.*auto_increment! SERIAL!;
+	s! int([0-9]*) ! int !' sql/db_generate.sql >sql/db_generate-psql.sql
+
 
 %install
 rm -rf "$RPM_BUILD_ROOT"
@@ -69,12 +83,18 @@
 
 tar cf - . | tar xf - -C $RPM_BUILD_ROOT%{pkgdir}
 
+
+find $RPM_BUILD_ROOT \( \
+	-name '*.noexamplecom' -o -name '*.iis' -o -name '*.noadmin' -o -name '*.#.*' -o \
+	-name '.cvsignore' \
+	\) -print0 | xargs -0 rm -f
+
 ## Do not rename; the *existence* of this file will be checked to
 ## determine if mantis is offline
 mv $RPM_BUILD_ROOT%{pkgdir}/mantis_offline.php.sample $RPM_BUILD_ROOT%{cfgdir}/
 mv $RPM_BUILD_ROOT%{pkgdir}/config_inc.php.sample     $RPM_BUILD_ROOT%{cfgdir}/config_inc.php
 
-ln -s %{cfgdir}/config_inc.php     $RPM_BUILD_ROOT%{pkgdir}/config_inc.php
+ln -s %{cfgdir}/config_inc.php	   $RPM_BUILD_ROOT%{pkgdir}/config_inc.php
 ln -s %{cfgdir}/mantis_offline.php $RPM_BUILD_ROOT%{pkgdir}/mantis_offline.php
 
 
@@ -117,6 +137,12 @@
 
 
 %changelog
+* Mon Mar  7 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.19.2-1
+- updated to 0.19.2
+- rediffed patches
+- removed dependency on php-mysql as it supports PostgreSQL also
+- added inline-hack to generate a PostgreSQL database creation script
+
 * Thu May 27 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.18.3-0.fdr.2
 - ship doc/ in the program-directory instead of copying it into %%docdir
 - modified shipped httpd configuration to disable admin/ directory


--- mantis-0.18.3-noadmin.patch DELETED ---


--- mantis-0.18.3-iis.patch DELETED ---


--- mantis-0.18.3-email.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Mar  8 18:28:39 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 8 Mar 2005 13:28:39 -0500
Subject: rpms/perl-Gtk2/devel .cvsignore, 1.3, 1.4 perl-Gtk2.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200503081828.j28ISdsn030587@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30569/devel

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Update to 1.080


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2005 03:21:00 -0000	1.3
+++ .cvsignore	8 Mar 2005 18:28:36 -0000	1.4
@@ -1 +1 @@
-Gtk2-1.062.tar.gz
+Gtk2-1.080.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Gtk2.spec	3 Mar 2005 23:46:26 -0000	1.5
+++ perl-Gtk2.spec	8 Mar 2005 18:28:36 -0000	1.6
@@ -1,18 +1,18 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Gtk2
-Version:        1.062
+Version:        1.080
 Release:        1
 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.062.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.080.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl(Glib) >= 1.062
+BuildRequires:  gtk2-devel, perl(Glib) >= 1.080
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Mar  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-1
+- Update to 1.080.
+
 * Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.062-1
 - Update to 1.062.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 03:21:00 -0000	1.3
+++ sources	8 Mar 2005 18:28:36 -0000	1.4
@@ -1 +1 @@
-cbca72d71fa470157d139c2bf659c040  Gtk2-1.062.tar.gz
+fa9bf175f72291ae7d843912fed4651a  Gtk2-1.080.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 18:28:39 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 8 Mar 2005 13:28:39 -0500
Subject: rpms/perl-Gtk2/FC-3 .cvsignore, 1.3, 1.4 perl-Gtk2.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200503081828.j28ISdZ3030583@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-serv30569/FC-3

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Update to 1.080


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2005 03:21:00 -0000	1.3
+++ .cvsignore	8 Mar 2005 18:28:36 -0000	1.4
@@ -1 +1 @@
-Gtk2-1.062.tar.gz
+Gtk2-1.080.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-3/perl-Gtk2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Gtk2.spec	15 Feb 2005 03:30:46 -0000	1.4
+++ perl-Gtk2.spec	8 Mar 2005 18:28:36 -0000	1.5
@@ -1,19 +1,18 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Gtk2
-Version:        1.062
+Version:        1.080
 Release:        1
-Epoch:          0
 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.062.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.080.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.062
+BuildRequires:  gtk2-devel, perl(Glib) >= 1.080
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -62,6 +61,9 @@
 
 
 %changelog
+* Tue Mar  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-1
+- Update to 1.080.
+
 * Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.062-1
 - Update to 1.062.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 03:21:00 -0000	1.3
+++ sources	8 Mar 2005 18:28:36 -0000	1.4
@@ -1 +1 @@
-cbca72d71fa470157d139c2bf659c040  Gtk2-1.062.tar.gz
+fa9bf175f72291ae7d843912fed4651a  Gtk2-1.080.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 19:18:02 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 8 Mar 2005 14:18:02 -0500
Subject: devel/sylpheed sylpheed.spec,1.3,1.4
Message-ID: <200503081918.j28JI2cQ031531@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/sylpheed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31525

Modified Files:
	sylpheed.spec 
Log Message:
 


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sylpheed.spec	5 Mar 2005 21:10:24 -0000	1.3
+++ sylpheed.spec	8 Mar 2005 19:18:00 -0000	1.4
@@ -59,7 +59,6 @@
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category Application \
 	--add-category Network \
-	--add-category X-Red-Hat-Extra \
 	--add-category X-Fedora-Extra \
 	sylpheed.desktop
 install -d $RPM_BUILD_ROOT%{_mandir}/man1/



From fedora-extras-commits at redhat.com  Tue Mar  8 19:28:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 8 Mar 2005 14:28:50 -0500
Subject: rpms/libsamplerate import.log,1.7,1.8
Message-ID: <200503081928.j28JSoUt031642@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	import.log 
Log Message:
auto-import libsamplerate-0.1.2-0.fdr.1.2 on branch FC-2 from libsamplerate-0.1.2-0.fdr.1.2.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=2242


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	5 Mar 2005 01:48:09 -0000	1.7
+++ import.log	8 Mar 2005 19:28:47 -0000	1.8
@@ -4,3 +4,4 @@
 libsamplerate-0_0_15-0_fdr_5_2:HEAD:libsamplerate-0.0.15-0.fdr.5.2.src.rpm:1099889206
 libsamplerate-0_1_2-1:FC-3:libsamplerate-0.1.2-1.src.rpm:1109987246
 libsamplerate-0_1_2-2:HEAD:libsamplerate-0.1.2-2.src.rpm:1109987299
+libsamplerate-0_1_2-0_fdr_1_2:FC-2:libsamplerate-0.1.2-0.fdr.1.2.src.rpm:1110310118



From fedora-extras-commits at redhat.com  Tue Mar  8 19:28:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 8 Mar 2005 14:28:50 -0500
Subject: rpms/libsamplerate/FC-2 .cvsignore, 1.2, 1.3 libsamplerate.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200503081928.j28JSoLs031646@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libsamplerate/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31633/FC-2

Modified Files:
	.cvsignore libsamplerate.spec sources 
Log Message:
auto-import libsamplerate-0.1.2-0.fdr.1.2 on branch FC-2 from libsamplerate-0.1.2-0.fdr.1.2.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=2242


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:28 -0000	1.2
+++ .cvsignore	8 Mar 2005 19:28:48 -0000	1.3
@@ -1 +1 @@
-libsamplerate-0.0.15.tar.gz
+libsamplerate-0.1.2.tar.gz


Index: libsamplerate.spec
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/FC-2/libsamplerate.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsamplerate.spec	8 Nov 2004 04:46:46 -0000	1.4
+++ libsamplerate.spec	8 Mar 2005 19:28:48 -0000	1.5
@@ -1,20 +1,19 @@
 Summary: 	A library for performing sample rate conversion on audio.
 Name: 		libsamplerate
-Version: 	0.0.15
-Release: 	0.fdr.5.2
+Version: 	0.1.2
+Release: 	0.fdr.1.2
 Epoch: 		0
 License: 	GPL
 Group: 		System Environment/Libraries
 URL: 		http://www.mega-nerd.com/SRC/
 Source0: 	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	libsndfile-devel >= 0:1.0.2
-BuildRequires:	pkgconfig fftw-devel
+BuildRequires:	libsndfile-devel >= 0:1.0.6 pkgconfig
 
 %package devel
 Summary: 	Development package for %{name}
 Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
+Requires: 	%{name} = %{epoch}:%{version}-%{release} pkgconfig
 
 # -----------------------------------------------------------------------------
 
@@ -41,17 +40,21 @@
 # -----------------------------------------------------------------------------
 
 %build
-%configure
+%configure --disable-dependency-tracking --disable-fftw
 make %{?_smp_mflags} 
 
 # -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT _doc
-%makeinstall
-mkdir _doc 
+make install DESTDIR=$RPM_BUILD_ROOT
 cp -a doc _doc
-rm _doc/doc/Makefile* _doc/doc/NEWS _doc/doc/ChangeLog
+rm _doc/Makefile* _doc/NEWS _doc/ChangeLog
+
+
+%check || :
+make check
+
 
 # -----------------------------------------------------------------------------
 
@@ -64,10 +67,9 @@
 %postun -p /sbin/ldconfig
 
 
-
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog _doc/doc/*
+%doc AUTHORS COPYING ChangeLog NEWS README _doc/*
 %{_bindir}/sndfile-resample
 %{_libdir}/%{name}.so.*
 
@@ -82,6 +84,12 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Oct 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.1.2-0.fdr.1
+- Update to 0.1.2.
+- Use "make install DESTDIR=...", disable dependency tracking.
+- Run tests during build.
+- Drop fftw-devel build dep, it's only for an optional part of the test suite.
+
 * Tue Jul 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.0.15-0.fdr.5
 - Fix %%postun (#1665).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:28 -0000	1.2
+++ sources	8 Mar 2005 19:28:48 -0000	1.3
@@ -1 +1 @@
-6b15cc39d1275f1118de4d57f89544eb  libsamplerate-0.0.15.tar.gz
+06861c2c6b8e5273c9b80cf736b9fd0e  libsamplerate-0.1.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 19:30:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 8 Mar 2005 14:30:11 -0500
Subject: rpms/libsndfile import.log,1.7,1.8
Message-ID: <200503081930.j28JUBp8031771@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	import.log 
Log Message:
auto-import libsndfile-1.0.11-0.fdr.2.1 on branch FC-1 from libsndfile-1.0.11-0.fdr.2.1.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=2156


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	5 Mar 2005 01:44:40 -0000	1.7
+++ import.log	8 Mar 2005 19:30:09 -0000	1.8
@@ -4,3 +4,4 @@
 libsndfile-1_0_4-0_fdr_1_2:HEAD:libsndfile-1.0.4-0.fdr.1.2.src.rpm:1099889278
 libsndfile-1_0_11-1:FC-3:libsndfile-1.0.11-1.src.rpm:1109987031
 libsndfile-1_0_11-2:HEAD:libsndfile-1.0.11-2.src.rpm:1109987091
+libsndfile-1_0_11-0_fdr_2_1:FC-1:libsndfile-1.0.11-0.fdr.2.1.src.rpm:1110310200



From fedora-extras-commits at redhat.com  Tue Mar  8 19:30:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 8 Mar 2005 14:30:11 -0500
Subject: rpms/libsndfile/FC-1 libsndfile-1.0.11-svx-channels.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 libsndfile.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200503081930.j28JUBJn031779@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libsndfile/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31762/FC-1

Modified Files:
	.cvsignore libsndfile.spec sources 
Added Files:
	libsndfile-1.0.11-svx-channels.patch 
Log Message:
auto-import libsndfile-1.0.11-0.fdr.2.1 on branch FC-1 from libsndfile-1.0.11-0.fdr.2.1.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=2156

libsndfile-1.0.11-svx-channels.patch:

--- NEW FILE libsndfile-1.0.11-svx-channels.patch ---
diff -Nur libsndfile-1.0.11-orig/src/svx.c libsndfile-1.0.11/src/svx.c
--- libsndfile-1.0.11-orig/src/svx.c	2004-10-17 02:46:34.000000000 +0200
+++ libsndfile-1.0.11/src/svx.c	2005-03-05 02:08:14.094919120 +0100
@@ -280,7 +280,7 @@
 
 					bytecount += psf_binheader_readf (psf, "E4", &channels) ;
 
-					psf_log_printf (psf, "  Channels : %d => %d\n", channels) ;
+					psf_log_printf (psf, "  Channels : %d\n", channels) ;
 
 					psf_binheader_readf (psf, "j", dword - bytecount) ;
 					break ;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-1/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:47:40 -0000	1.2
+++ .cvsignore	8 Mar 2005 19:30:09 -0000	1.3
@@ -1 +1 @@
-libsndfile-1.0.4.tar.gz
+libsndfile-1.0.11.tar.gz


Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-1/libsndfile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsndfile.spec	8 Nov 2004 04:47:52 -0000	1.3
+++ libsndfile.spec	8 Mar 2005 19:30:09 -0000	1.4
@@ -1,19 +1,21 @@
-Summary: 	A library for reading and writing sound files.
+Summary: 	Library for reading and writing sound files
 Name: 		libsndfile
-Version: 	1.0.4
-Release: 	0.fdr.1.1
-Epoch:		0
+Version: 	1.0.11
+Release: 	0.fdr.2.1
 License: 	LGPL
 Group: 		System Environment/Libraries
-URL: 		http://www.zip.com.au/~erikd/libsndfile/
-Source0: 	http://www.zip.com.au/~erikd/libsndfile/%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	pkgconfig
+URL: 		http://www.mega-nerd.com/libsndfile/
+Source0: 	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:		libsndfile-1.0.11-svx-channels.patch
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+
+BuildRequires:  alsa-lib-devel
+Provides:       %{name}-octave = %{version}-%{release}
 
 %package devel
-Summary:	Development files for libsndfile.
+Summary:	Development files for libsndfile
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release} pkgconfig
 
 %description
 libsndfile is a C library for reading and writing sound files such as
@@ -27,19 +29,32 @@
 AIFF, AU, WAV, and others through one standard interface. 
 This package contains files needed to develop with libsndfile.
 
+
 %prep
 %setup -q
+%patch0 -p1 -b .svx-channels
+
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
+
 %install
-rm -rf %{buildroot}
-%makeinstall
+rm -rf $RPM_BUILD_ROOT __docs
+make install DESTDIR=$RPM_BUILD_ROOT
+cp -pR $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev/html __docs
+rm -rf $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -51,18 +66,34 @@
 %{_mandir}/man1/sndfile-play.1*
 %{_mandir}/man1/sndfile-convert.1*
 %{_libdir}/%{name}.so.*
-%{_datadir}/octave/site/m/sndfile_load.m
-%{_datadir}/octave/site/m/sndfile_play.m
-%{_datadir}/octave/site/m/sndfile_save.m
+%{_datadir}/octave
 
 %files devel
 %defattr(-,root,root,-)
+%doc __docs/*
 %exclude %{_libdir}/%{name}.la
 %{_includedir}/sndfile.h
 %{_libdir}/%{name}.so
 %{_libdir}/%{name}.a
 %{_libdir}/pkgconfig/sndfile.pc
 
+
 %changelog
+* Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.11-0.fdr.2
+- Fix format string bug (#149863).
+- Drop explicit Epoch 0.
+
+* Sat Dec  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.11-0.fdr.1
+- Update to 1.0.11.
+
+* Wed Oct 13 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.10-0.fdr.1
+- Update to 1.0.10, update URLs, include ALSA support.
+- Disable dependency tracking to speed up the build.
+- Add missing ldconfig invocations.
+- Make -devel require pkgconfig.
+- Include developer docs in -devel.
+- Provide -octave in main package, own more related dirs.
+- Bring specfile up to date with current spec templates.
+
 * Sat Apr 12 2003 Dams <anvil[AT]livna.org> 
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-1/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:47:40 -0000	1.2
+++ sources	8 Mar 2005 19:30:09 -0000	1.3
@@ -1 +1 @@
-33929011f48fa2a4b72baf54c69196c5  libsndfile-1.0.4.tar.gz
+9ec0b3610041423a57387f284849f2fc  libsndfile-1.0.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 19:31:09 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 8 Mar 2005 14:31:09 -0500
Subject: rpms/libsndfile import.log,1.8,1.9
Message-ID: <200503081931.j28JV9RJ031901@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	import.log 
Log Message:
auto-import libsndfile-1.0.11-0.fdr.2.2 on branch FC-2 from libsndfile-1.0.11-0.fdr.2.2.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=2156


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	8 Mar 2005 19:30:09 -0000	1.8
+++ import.log	8 Mar 2005 19:31:07 -0000	1.9
@@ -5,3 +5,4 @@
 libsndfile-1_0_11-1:FC-3:libsndfile-1.0.11-1.src.rpm:1109987031
 libsndfile-1_0_11-2:HEAD:libsndfile-1.0.11-2.src.rpm:1109987091
 libsndfile-1_0_11-0_fdr_2_1:FC-1:libsndfile-1.0.11-0.fdr.2.1.src.rpm:1110310200
+libsndfile-1_0_11-0_fdr_2_2:FC-2:libsndfile-1.0.11-0.fdr.2.2.src.rpm:1110310259



From fedora-extras-commits at redhat.com  Tue Mar  8 19:31:09 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 8 Mar 2005 14:31:09 -0500
Subject: rpms/libsndfile/FC-2 libsndfile-1.0.11-svx-channels.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 libsndfile.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200503081931.j28JV9WY031905@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libsndfile/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31892/FC-2

Modified Files:
	.cvsignore libsndfile.spec sources 
Added Files:
	libsndfile-1.0.11-svx-channels.patch 
Log Message:
auto-import libsndfile-1.0.11-0.fdr.2.2 on branch FC-2 from libsndfile-1.0.11-0.fdr.2.2.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=2156

libsndfile-1.0.11-svx-channels.patch:

--- NEW FILE libsndfile-1.0.11-svx-channels.patch ---
diff -Nur libsndfile-1.0.11-orig/src/svx.c libsndfile-1.0.11/src/svx.c
--- libsndfile-1.0.11-orig/src/svx.c	2004-10-17 02:46:34.000000000 +0200
+++ libsndfile-1.0.11/src/svx.c	2005-03-05 02:08:14.094919120 +0100
@@ -280,7 +280,7 @@
 
 					bytecount += psf_binheader_readf (psf, "E4", &channels) ;
 
-					psf_log_printf (psf, "  Channels : %d => %d\n", channels) ;
+					psf_log_printf (psf, "  Channels : %d\n", channels) ;
 
 					psf_binheader_readf (psf, "j", dword - bytecount) ;
 					break ;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:47:40 -0000	1.2
+++ .cvsignore	8 Mar 2005 19:31:07 -0000	1.3
@@ -1 +1 @@
-libsndfile-1.0.4.tar.gz
+libsndfile-1.0.11.tar.gz


Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-2/libsndfile.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsndfile.spec	8 Nov 2004 04:47:58 -0000	1.4
+++ libsndfile.spec	8 Mar 2005 19:31:07 -0000	1.5
@@ -1,19 +1,21 @@
-Summary: 	A library for reading and writing sound files.
+Summary: 	Library for reading and writing sound files
 Name: 		libsndfile
-Version: 	1.0.4
-Release: 	0.fdr.1.2
-Epoch:		0
+Version: 	1.0.11
+Release: 	0.fdr.2.2
 License: 	LGPL
 Group: 		System Environment/Libraries
-URL: 		http://www.zip.com.au/~erikd/libsndfile/
-Source0: 	http://www.zip.com.au/~erikd/libsndfile/%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	pkgconfig
+URL: 		http://www.mega-nerd.com/libsndfile/
+Source0: 	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:		libsndfile-1.0.11-svx-channels.patch
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+
+BuildRequires:  alsa-lib-devel
+Provides:       %{name}-octave = %{version}-%{release}
 
 %package devel
-Summary:	Development files for libsndfile.
+Summary:	Development files for libsndfile
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release} pkgconfig
 
 %description
 libsndfile is a C library for reading and writing sound files such as
@@ -27,19 +29,32 @@
 AIFF, AU, WAV, and others through one standard interface. 
 This package contains files needed to develop with libsndfile.
 
+
 %prep
 %setup -q
+%patch0 -p1 -b .svx-channels
+
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
+
 %install
-rm -rf %{buildroot}
-%makeinstall
+rm -rf $RPM_BUILD_ROOT __docs
+make install DESTDIR=$RPM_BUILD_ROOT
+cp -pR $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev/html __docs
+rm -rf $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -51,18 +66,34 @@
 %{_mandir}/man1/sndfile-play.1*
 %{_mandir}/man1/sndfile-convert.1*
 %{_libdir}/%{name}.so.*
-%{_datadir}/octave/site/m/sndfile_load.m
-%{_datadir}/octave/site/m/sndfile_play.m
-%{_datadir}/octave/site/m/sndfile_save.m
+%{_datadir}/octave
 
 %files devel
 %defattr(-,root,root,-)
+%doc __docs/*
 %exclude %{_libdir}/%{name}.la
 %{_includedir}/sndfile.h
 %{_libdir}/%{name}.so
 %{_libdir}/%{name}.a
 %{_libdir}/pkgconfig/sndfile.pc
 
+
 %changelog
+* Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.11-0.fdr.2
+- Fix format string bug (#149863).
+- Drop explicit Epoch 0.
+
+* Sat Dec  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.11-0.fdr.1
+- Update to 1.0.11.
+
+* Wed Oct 13 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.10-0.fdr.1
+- Update to 1.0.10, update URLs, include ALSA support.
+- Disable dependency tracking to speed up the build.
+- Add missing ldconfig invocations.
+- Make -devel require pkgconfig.
+- Include developer docs in -devel.
+- Provide -octave in main package, own more related dirs.
+- Bring specfile up to date with current spec templates.
+
 * Sat Apr 12 2003 Dams <anvil[AT]livna.org> 
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:47:40 -0000	1.2
+++ sources	8 Mar 2005 19:31:07 -0000	1.3
@@ -1 +1 @@
-33929011f48fa2a4b72baf54c69196c5  libsndfile-1.0.4.tar.gz
+9ec0b3610041423a57387f284849f2fc  libsndfile-1.0.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 21:49:52 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 8 Mar 2005 16:49:52 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.8,1.9
Message-ID: <200503082149.j28Lnqhx001657@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.spec 
Log Message:
bump release



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ppracer.spec	8 Mar 2005 16:21:47 -0000	1.8
+++ ppracer.spec	8 Mar 2005 21:49:50 -0000	1.9
@@ -6,7 +6,7 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 2
+Release: 3
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de



From dgregor at redhat.com  Tue Mar  8 19:31:08 2005
From: dgregor at redhat.com (Dennis Gregorovic)
Date: Tue, 08 Mar 2005 14:31:08 -0500
Subject: perl-Class-MethodMaker FC3 branch
Message-ID: <1110310269.7290.0.camel@localhost.localdomain>

Please create the FC-3 branch of perl-Class-MethodMaker.

Thanks
-- Dennis



From fedora-extras-commits at redhat.com  Wed Mar  9 08:00:03 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 9 Mar 2005 03:00:03 -0500
Subject: devel/jabberd jabberd.spec,1.1,1.2
Message-ID: <200503090800.j29803oH010739@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730

Modified Files:
	jabberd.spec 
Log Message:
* made password more random (/dev/random)
* replace password in the config without making it visible in ps
* enable ldap, mysql, postgresql backends
* remove dependency on perl during build
* make pam default authentication backend in c2s.xml
* make files in etc (640, jabber, jabber)
* enabled SSL certificate in c2s.xml
* enabled auto creation of accounts in sm.xml (necessary for usage with PAM)
* enabled require-startls



Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jabberd.spec	7 Mar 2005 08:23:35 -0000	1.1
+++ jabberd.spec	9 Mar 2005 08:00:01 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:        OpenSource server implementation of the Jabber protocols
 Name:           jabberd
 Version:        2.0
-Release:        0.s6.3
+Release:        0.s6.4
 Epoch:          0
 License:        GPL
 Group:          System Environment/Daemons
@@ -9,7 +9,8 @@
 Source1:        jabberd
 URL:            http://jabberd.jabberstudio.org/2/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  openssl-devel, db4-devel, libidn-devel, pam-devel
+BuildRequires:  openssl-devel db4-devel libidn-devel pam-devel
+BuildRequires:  openldap-devel postgresql-devel mysql-devel
 Requires(post): openssl
 
 %description
@@ -22,14 +23,19 @@
 from the ground up to be scalable, architecturally sound, and to support the
 latest protocol extensions coming out of the JSF.
 
+This packages defaults to use pam and the Berkeley DB.
+
 %prep
 %setup -q -n %{name}-%{version}s6
 
 %build
 %define _sysconfdir /etc/jabberd
 %define sysconfdir /etc/jabberd
-%{__perl} -pi -e 's,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g' configure
-%configure --enable-db --disable-mysql --enable-pam
+%{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g" \
+		configure
+%configure --enable-db --enable-mysql --enable-pam --enable-ldap \
+		--enable-pgsql --with-extra-library-path=%{_libdir}/mysql \
+		--enable-debug
 %{__make} %{?_smp_mflags}
 
 %install
@@ -45,9 +51,11 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
 %{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
-%{__perl} -pi -e 's,__BINDIR__,%{_bindir},g; \
-                  s,__ETCDIR__,%{sysconfdir},g; \
-                  s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g;' \
+%{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
+          $RPM_BUILD_ROOT%{_initrddir}/%{name}
+%{__sed} -i -e "s,__ETCDIR__,%{sysconfdir},g" \
+          $RPM_BUILD_ROOT%{_initrddir}/%{name}
+%{__sed} -i -e "s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g" \
           $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
@@ -59,9 +67,25 @@
 session    required     pam_stack.so service=system-auth
 END
 
+#default driver for storage
 %{__sed} -i -e "s,<driver>mysql</driver>,<driver>db</driver>,g" \
 	$RPM_BUILD_ROOT%{sysconfdir}/sm.xml
 
+#default authentication backend
+%{__sed} -i -e "s,<module>mysql</module>,<module>pam</module>,g" \
+	$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
+
+#enable SSL certificate
+%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <pemfile>/etc/jabberd/server.pem</pemfile>\n    -->,<pemfile>/etc/jAbberd/server.pem</pemfile>,g' $RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
+
+#the default pam backend needs auto creation of accounts
+%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <auto-create/>\n    -->,<auto-create/>,g' \
+	$RPM_BUILD_ROOT%{sysconfdir}/sm.xml
+
+#clients must do STARTTLS
+%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <require-startls/>\n    -->,<require-startls/>,g' \
+	$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
+
 #ghost file
 touch $RPM_BUILD_ROOT%{sysconfdir}/server.pem
 
@@ -78,11 +102,16 @@
 	#register %{name} service
 	/sbin/chkconfig --add %{name}
 	#replace default passwords, yet another hack 
-	export NEWPASS="$RANDOM-newpass-$RANDOM"
+	export NEWPASS=$( dd if=/dev/urandom bs=20 count=1 2>/dev/null \
+				| sha1sum | awk '{print $1}' )
 	cd %{sysconfdir}
-	%{__perl} -pi -e "s,<secret>secret</secret>,<secret>$NEWPASS</secret>,g" router-users.xml
-	%{__perl} -pi -e "s,<secret>secret</secret>,<secret>$NEWPASS</secret>,g" router.xml
-	%{__perl} -pi -e "s,<pass>secret</pass>,<pass>$NEWPASS</pass>,g" *.xml
+	%{__sed} -i -f- router-users.xml router.xml <<END
+s,<secret>secret</secret>,<secret>$NEWPASS</secret>,g
+END
+	%{__sed} -i -f- *.xml <<END
+s,<pass>secret</pass>,<pass>$NEWPASS</pass>,g
+END
+
 fi
 
 #create ssl certificate
@@ -111,7 +140,8 @@
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README PROTOCOL TODO
 %{_bindir}/*
-%config(noreplace) %{sysconfdir}/
+%attr(750, jabber, jabber) %dir %{sysconfdir}/
+%attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/*
 %{_datadir}/man/man8/*
 %{_datadir}/%{name}/
 %config(noreplace) %{_initrddir}/%{name}
@@ -120,6 +150,17 @@
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
+- made password more random (/dev/random)
+- replace password in the config without making it visible in ps
+- enable ldap, mysql, postgresql backends
+- remove dependency on perl during build
+- make pam default authentication backend in c2s.xml
+- make files in etc (640, jabber, jabber)
+- enabled SSL certificate in c2s.xml
+- enabled auto creation of accounts in sm.xml (necessary for usage with PAM)
+- enabled require-startls
+
 * Mon Mar 07 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.3
 - changed startscript again
 



From nphilipp at redhat.com  Wed Mar  9 08:15:05 2005
From: nphilipp at redhat.com (Nils Philippsen)
Date: Wed, 09 Mar 2005 09:15:05 +0100
Subject: APPROVED: bzflag
Message-ID: <1110356105.8121.2.camel@gibraltar.stuttgart.redhat.com>

Name: BZFlag
BZFlag is a 3D multi-player tank battle game  that  allows users to play
against each other in a networked environment.  There are five teams: red,
green, blue, purple and rogue (rogue tanks are black).  Destroying a player
on another team  scores a win, while being destroyed or destroying a teammate
scores a loss.  Rogues have no teammates (not even other rogues), so they
cannot shoot teammates and they do not have a team score.
There are two main styles of play: capture-the-flag and free-for-all.

Maintainer: Nils Philippsen
Reviewed by: Adrian Reber
-- 
     Nils Philippsen    /    Red Hat    /    nphilipp at redhat.com
"They that can give up essential liberty to obtain a little temporary
 safety deserve neither liberty nor safety."     -- B. Franklin, 1759
 PGP fingerprint:  C4A8 9474 5C4C ADE3 2B8F  656D 47D8 9B65 6951 3011
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050309/1cec2fbf/attachment.sig>

From wtogami at redhat.com  Wed Mar  9 08:35:22 2005
From: wtogami at redhat.com (Warren Togami)
Date: Tue, 08 Mar 2005 22:35:22 -1000
Subject: devel/jabberd jabberd.spec,1.1,1.2
In-Reply-To: <200503090800.j29803oH010739@cvs-int.fedora.redhat.com>
References: <200503090800.j29803oH010739@cvs-int.fedora.redhat.com>
Message-ID: <422EB54A.3030701@redhat.com>

Adrian Reber (adrian) wrote:
>  
>  %changelog
> +* Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
> +- made password more random (/dev/random)

If /dev/random is used instead of /dev/urandom, is it possible that it 
will totally fail in the (extremely) unlikely case of there being no 
entropy?  Or will it just wait until it has enough entropy before returning?

Warren Togami
wtogami at redhat.com



From rc040203 at freenet.de  Wed Mar  9 10:34:54 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Wed, 09 Mar 2005 11:34:54 +0100
Subject: devel/jabberd jabberd.spec,1.1,1.2
In-Reply-To: <200503090800.j29803oH010739@cvs-int.fedora.redhat.com>
References: <200503090800.j29803oH010739@cvs-int.fedora.redhat.com>
Message-ID: <1110364494.7140.307.camel@mccallum.corsepiu.local>

On Wed, 2005-03-09 at 03:00 -0500, Adrian Reber wrote:
> Author: adrian
> 
> Update of /cvs/extras/devel/jabberd
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730


> @@ -45,9 +51,11 @@
>  %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
>  %{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
>  
> -%{__perl} -pi -e 's,__BINDIR__,%{_bindir},g; \
> -                  s,__ETCDIR__,%{sysconfdir},g; \
> -                  s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g;' \
> +%{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
> +          $RPM_BUILD_ROOT%{_initrddir}/%{name}
> +%{__sed} -i -e "s,__ETCDIR__,%{sysconfdir},g" \
> +          $RPM_BUILD_ROOT%{_initrddir}/%{name}
> +%{__sed} -i -e "s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g" \
>            $RPM_BUILD_ROOT%{_initrddir}/%{name}
>  
>  %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/

Any particular reason to use several sed-calls? 

One sed-call should be sufficient:

%{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
            -e "s,__ETCDIR__,%{sysconfdir},g" \
            -e "s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g" \
             $RPM_BUILD_ROOT%{_initrddir}/%{name}

Ralf




From fedora-extras-commits at redhat.com  Wed Mar  9 12:18:39 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 9 Mar 2005 07:18:39 -0500
Subject: rpms/ulogd/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ulogd.spec,
	1.5, 1.6
Message-ID: <200503091218.j29CIdAm016656@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore sources ulogd.spec 
Log Message:
- version 1.22



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ulogd/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Feb 2005 15:52:15 -0000	1.3
+++ .cvsignore	9 Mar 2005 12:18:37 -0000	1.4
@@ -1 +1,2 @@
-ulogd-1.21.tar.bz2
+ulogd-1.22.tar.bz2
+ulogd-1.22.tar.bz2.sig


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ulogd/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Feb 2005 15:52:15 -0000	1.3
+++ sources	9 Mar 2005 12:18:37 -0000	1.4
@@ -1 +1,2 @@
-32e94a9336c10a4cb8ab3745bc2abbdb  ulogd-1.21.tar.bz2
+2593dfc51c0bc1d8f86519fb13dd5f34  ulogd-1.22.tar.bz2
+b0efa8912871bff9d88e156e0de7366d  ulogd-1.22.tar.bz2.sig


Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/FC-3/ulogd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ulogd.spec	20 Feb 2005 16:30:17 -0000	1.5
+++ ulogd.spec	9 Mar 2005 12:18:37 -0000	1.6
@@ -1,13 +1,14 @@
 Name:           ulogd
-Version:        1.21
+Version:        1.22
 Release:        1
 Summary:        The userspace logging daemon for netfilter
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://gnumonks.org/projects/ulogd
-Source:         http://ftp.netfilter.org/pub/ulogd/ulogd-%{version}.tar.bz2
+Source0:         http://ftp.netfilter.org/pub/ulogd/ulogd-%{version}.tar.bz2
 Source1:        ulogd.logrotate
 Source2:        ulogd.8
+Source3:         http://ftp.netfilter.org/pub/ulogd/ulogd-%{version}.tar.bz2.sig
 Patch1:         ulogd-1.21-logdir.patch
 Patch2:         ulogd-1.02-init.patch
 Patch3:         ulogd-1.02-pgsql.patch
@@ -117,6 +118,10 @@
 %{_libdir}/ulogd/ulogd_PGSQL.so
 
 %changelog
+* Wed Mar 09 2005 Aurelien Bompard <gauret[AT]free.fr> 1.22-1
+- version 1.22
+- add gpg signature to sources
+
 * Sun Feb 20 2005 Aurelien Bompard <gauret[AT]free.fr> 1.21-1
 - version 1.21
 



From fedora-extras-commits at redhat.com  Wed Mar  9 17:06:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 9 Mar 2005 12:06:27 -0500
Subject: devel/xemacs-sumo .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xemacs-sumo.spec, 1.2, 1.3
Message-ID: <200503091706.j29H6Rd2021511@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/xemacs-sumo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21505

Modified Files:
	.cvsignore sources xemacs-sumo.spec 
Log Message:
Update to 2005-03-07, remove some unneeded executable bits.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/xemacs-sumo/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Mar 2005 22:31:04 -0000	1.2
+++ .cvsignore	9 Mar 2005 17:06:25 -0000	1.3
@@ -1,2 +1,2 @@
-xemacs-mule-sumo-2005-01-18.tar.bz2
-xemacs-sumo-2005-01-18.tar.bz2
+xemacs-mule-sumo-2005-03-07.tar.bz2
+xemacs-sumo-2005-03-07.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/devel/xemacs-sumo/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Mar 2005 22:31:04 -0000	1.2
+++ sources	9 Mar 2005 17:06:25 -0000	1.3
@@ -1,2 +1,2 @@
-8c902131842ecaafeba6682ae956e554  xemacs-mule-sumo-2005-01-18.tar.bz2
-d30cbe9069121e035a42e73e4133ccee  xemacs-sumo-2005-01-18.tar.bz2
+09c6c1b8b39b7460329c522db2a08abf  xemacs-mule-sumo-2005-03-07.tar.bz2
+dd937961bbbb5851be9b4d0ea22e6d8c  xemacs-sumo-2005-03-07.tar.bz2


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/devel/xemacs-sumo/xemacs-sumo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xemacs-sumo.spec	5 Mar 2005 21:10:26 -0000	1.2
+++ xemacs-sumo.spec	9 Mar 2005 17:06:25 -0000	1.3
@@ -1,9 +1,9 @@
-%define sumo_ver 2005-01-18
+%define sumo_ver 2005-03-07
 
 Summary: XEmacs Lisp packages
 Name: xemacs-sumo
 Version: %(echo %{sumo_ver} | tr -d -)
-Release: 2
+Release: 1
 License: GPL
 Group: Applications/Editors
 Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2
@@ -101,18 +101,26 @@
 # fix toolbar specifier error
 %patch16 -p0
 
-# avoid spurious dependencies
-chmod -x xemacs-packages/lisp/erc/*ChangeLog*
+# avoid spurious dependencies and bad file modes
+find . -type f -name "*.el" -perm +111 | xargs chmod 644
+chmod 644 \
+  xemacs-packages/lisp/erc/{*ChangeLog*,HACKING.upstream} \
+  xemacs-packages/etc/xwem/logo.xpm \
+  xemacs-packages/etc/ess/BACKBUGS.BAT
+perl -pi -e "s|/usr/local/bin/perl5?|/usr/bin/perl|g" \
+  xemacs-packages/{lisp/hyperbole/file-newer,etc/bbdb/*.pl}
+
+# remove game we shouldn't ship
+rm xemacs-packages/lisp/games/tetris.el*
 
 
 %build
 %define _xemacs_batch xemacs-nox -batch -vanilla
 
-# remove game we shouldn't ship
-rm xemacs-packages/lisp/games/tetris.el*
-
-%_xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/*
-%_xemacs_batch -f batch-byte-recompile-directory xemacs-packages/lisp mule-packages/lisp
+%_xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \
+  -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/*
+%_xemacs_batch -f batch-byte-recompile-directory \
+  xemacs-packages/lisp mule-packages/lisp
 
 
 %install
@@ -145,13 +153,6 @@
 #  ln -s zh_TW.Big5 zh_TW
 )
 
-# so as not to require /usr/local/bin/perl[5]
-( cd %buildroot%{pkgdir}/xemacs-packages
-  perl -pi -e "s|/usr/local/bin/perl5|/usr/bin/perl|g; s|/usr/local/bin/perl|/usr/bin/perl|g;" \
-	lisp/hyperbole/file-newer \
-	etc/bbdb/*.pl
-)
-
 # the header of this file is weird... and confuses dependency checking
 chmod 0644 %buildroot%{pkgdir}/xemacs-packages/lib-src/pstogif
 
@@ -190,6 +191,10 @@
 
 
 %changelog
+* Tue Mar  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 20050307-1
+- Update to 2005-03-07.
+- Fix up unneeded executable bits on some files.
+
 * Tue Mar  1 2005 Ville Skytt?? <scop at xemacs.org> - 20050118-2
 - Revert back to bundled apel, mew and skk in the sumo.
 - Drop xemacs-packages* Obsoletes.



From fedora-extras-commits at redhat.com  Wed Mar  9 17:33:54 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 12:33:54 -0500
Subject: rpms/ipython import.log,1.1,1.2
Message-ID: <200503091733.j29HXsxe021769@cvs-int.fedora.redhat.com>

Author: shahms

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ipython/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Mar 2005 16:47:18 -0000	1.1
+++ import.log	9 Mar 2005 17:33:52 -0000	1.2
@@ -0,0 +1 @@
+ipython-0_6_11-2:HEAD:ipython-0.6.11-2.src.rpm:1110389629



From fedora-extras-commits at redhat.com  Wed Mar  9 17:33:54 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 12:33:54 -0500
Subject: rpms/ipython/devel ipython.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503091733.j29HXsih021773@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	.cvsignore sources 
Added Files:
	ipython.spec 
Log Message:
auto-import ipython-0.6.11-2 on branch devel from ipython-0.6.11-2.src.rpm


--- NEW FILE ipython.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:           ipython
Version:        0.6.11
Release:        2
Summary:        An enhanced interactive Python shell

Group:          Development/Libraries
License:        BSD
URL:            http://ipython.scipy.org/
Source0:        http://ipython.scipy.org/dist/ipython-0.6.11.tar.gz
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

IPython provides a replacement for the interactive Python interpreter with
extra functionality.

Main features:

 * Comprehensive object introspection.

 * Input history, persistent across sessions.

 * Caching of output results during a session with automatically generated
   references.

 * Readline based name completion.

 * Extensible system of 'magic' commands for controlling the environment and
   performing many tasks related either to IPython or the operating system.

 * Configuration system with easy switching between different setups (simpler
   than changing $PYTHONSTARTUP environment variables every time).

 * Session logging and reloading.

 * Extensible syntax processing for special purpose situations.

 * Access to the system shell with user-extensible alias system.

 * Easily embeddable in other Python programs.

 * Integrated access to the pdb debugger and the Python profiler. 

%prep
%setup -q


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# ipython installs its own documentation, but we need to own the directory
%{_datadir}/doc/%{name}-%{version}/
%{_mandir}/man*/*
%{_bindir}/ipython
%{_bindir}/pycolor
%dir %{python_sitelib}/IPython
%{python_sitelib}/IPython/*.py
%{python_sitelib}/IPython/Extensions/*.py
%{python_sitelib}/IPython/*.pyc
%{python_sitelib}/IPython/Extensions/*.pyc
%{python_sitelib}/IPython/UserConfig/*
%ghost %{python_sitelib}/IPython/*.pyo
%ghost %{python_sitelib}/IPython/Extensions/*.pyo

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 0.6.11-2
- Fix up %doc file specifications
- Use offical .tar.gz, not upstream .src.rpm .tar.gz

* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 0.6.11-1
- Initial release to meet Fedora packaging guidelines


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Mar 2005 16:47:18 -0000	1.1
+++ .cvsignore	9 Mar 2005 17:33:52 -0000	1.2
@@ -0,0 +1 @@
+ipython-0.6.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Mar 2005 16:47:18 -0000	1.1
+++ sources	9 Mar 2005 17:33:52 -0000	1.2
@@ -0,0 +1 @@
+cf4bdd4a89d71e497e76f0473cbe02f7  ipython-0.6.11.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar  9 20:16:34 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 9 Mar 2005 15:16:34 -0500
Subject: rpms/mail-notification/FC-3 .cvsignore, 1.3,
	1.4 mail-notification.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200503092016.j29KGX5u024604@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24593/FC-3

Modified Files:
	.cvsignore mail-notification.spec sources 
Log Message:
Update to 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Dec 2004 18:43:31 -0000	1.3
+++ .cvsignore	9 Mar 2005 20:16:31 -0000	1.4
@@ -1 +1 @@
-mail-notification-1.0.tar.gz
+mail-notification-1.1.tar.gz


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/FC-3/mail-notification.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mail-notification.spec	10 Dec 2004 22:03:07 -0000	1.3
+++ mail-notification.spec	9 Mar 2005 20:16:31 -0000	1.4
@@ -1,30 +1,26 @@
-# use "--with gmail" as rpmbuildparameter to add gmail Support (requires FC3 Core package) 
-
 Name:           mail-notification
-Epoch:          0
-Version:        1.0
+Version:        1.1
 Release:        1
-Summary:        Mail Notification is a status icon that informs you if you have new mail.
+Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.nongnu.org/mailnotify/
-Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-1.0.tar.gz
+Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-1.1.tar.gz
 Source1:        mail-notification-README.FEDORA
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gettext >= 0:0.14.1
-BuildRequires:  eel2-devel >= 0:2.0
+BuildRequires:  gettext >= 0.14.1
+BuildRequires:  eel2-devel >= 2.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  scrollkeeper
-BuildRequires:	openssl-devel  >= 0:0.9.5b
-BuildRequires:	cyrus-sasl-devel >= 0:2.0
-BuildRequires:	gmime-devel >= 0:2.1
-%if 0%{?_with_gmail:1}
-BuildRequires:	libsoup-devel >= 0:2.2.1
-BuildRequires:	gnutls-devel >= 0:1.0.20
-BuildRequires:	libgcrypt-devel >= 0:1.2.0
-%endif
+BuildRequires:  openssl-devel  >= 0.9.5b
+BuildRequires:  cyrus-sasl-devel >= 2.0
+BuildRequires:  gmime-devel >= 2.1
+BuildRequires:  libsoup-devel >= 2.2.1
+BuildRequires:  gnutls-devel >= 1.0.20
+BuildRequires:  libgcrypt-devel >= 1.2.0
+BuildRequires:  libicu-devel >= 2.6
 
 Requires(post):   GConf2
 Requires(post):   scrollkeeper
@@ -32,21 +28,21 @@
 Requires(postun): scrollkeeper
 
 %description
-Mail Notification is a status icon (aka tray icon) that informs you if you 
+Mail Notification is a status icon (aka tray icon) that informs you if you
 have new mail. It works with system trays implementing the freedesktop.org
-System Tray Specification, such as the GNOME Panel Notification Area, the 
+System Tray Specification, such as the GNOME Panel Notification Area, the
 Xfce Notification Area and the KDE System Tray.
 
 
 %prep
 %setup -q
 cp %{SOURCE1} ./README.FEDORA
- 
+
 
 
 %build
-%configure %{?!_with_gmail:--disable-gmail} 
-make %{?_smp_mflags} 
+%configure
+make %{?_smp_mflags}
 
 
 %install
@@ -105,6 +101,10 @@
 
 
 %changelog
+* Mon Mar 07 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.1-1
+- update to 1.1
+- remove gmail build option and add new BR libicu-devel
+
 * Tue Nov 25 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.0-0.fdr.1
 - update to 1.0
 
@@ -115,13 +115,13 @@
 
 * Tue Nov 09 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.8.1-0.fdr.3
 - trim build comment
-- own _datadir/gnome/help/mail-notification/ 
+- own _datadir/gnome/help/mail-notification/
 - rename SOURCE1 from README.FEDORA to mail-notfication-README.FEDORA
 
 
 * Sat Nov 06 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.8.1-0.fdr.2
-- Really remove "killall bonobo-activation-server"; Add a README.FEDORA 
-  which descibes the problem. 
+- Really remove "killall bonobo-activation-server"; Add a README.FEDORA
+  which descibes the problem.
 - Spilt post,preun,postun sections
 - Use --with gmail to build for FC3 with gmail-support
 
@@ -143,7 +143,7 @@
 
 * Tue Sep 14 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.6.2-0.fdr.1
 - Update to 0.6.2
-- After talkback with program author added "killall bonobo-activation-server" 
+- After talkback with program author added "killall bonobo-activation-server"
   to post section
 
 * Sun Aug 29 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.6.1-0.fdr.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Dec 2004 18:43:31 -0000	1.3
+++ sources	9 Mar 2005 20:16:31 -0000	1.4
@@ -1 +1 @@
-9f458da2a222490330ed93d3298ced75  mail-notification-1.0.tar.gz
+2359fb53128b12cf295bdf8553e5869b  mail-notification-1.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar  9 20:16:34 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 9 Mar 2005 15:16:34 -0500
Subject: rpms/mail-notification/devel .cvsignore, 1.3,
	1.4 mail-notification.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200503092016.j29KGYe4024610@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24593/devel

Modified Files:
	.cvsignore mail-notification.spec sources 
Log Message:
Update to 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Dec 2004 18:43:31 -0000	1.3
+++ .cvsignore	9 Mar 2005 20:16:31 -0000	1.4
@@ -1 +1 @@
-mail-notification-1.0.tar.gz
+mail-notification-1.1.tar.gz


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mail-notification.spec	3 Mar 2005 23:01:23 -0000	1.4
+++ mail-notification.spec	9 Mar 2005 20:16:31 -0000	1.5
@@ -1,14 +1,12 @@
-# use "--with gmail" as rpmbuildparameter to add gmail Support (requires FC3 Core package)
-
 Name:           mail-notification
-Version:        1.0
+Version:        1.1
 Release:        1
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.nongnu.org/mailnotify/
-Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-1.0.tar.gz
+Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-1.1.tar.gz
 Source1:        mail-notification-README.FEDORA
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -19,11 +17,10 @@
 BuildRequires:  openssl-devel  >= 0.9.5b
 BuildRequires:  cyrus-sasl-devel >= 2.0
 BuildRequires:  gmime-devel >= 2.1
-%if 0%{?_with_gmail:1}
 BuildRequires:  libsoup-devel >= 2.2.1
 BuildRequires:  gnutls-devel >= 1.0.20
 BuildRequires:  libgcrypt-devel >= 1.2.0
-%endif
+BuildRequires:  libicu-devel >= 2.6
 
 Requires(post):   GConf2
 Requires(post):   scrollkeeper
@@ -44,7 +41,7 @@
 
 
 %build
-%configure %{?!_with_gmail:--disable-gmail}
+%configure
 make %{?_smp_mflags}
 
 
@@ -104,6 +101,10 @@
 
 
 %changelog
+* Mon Mar 07 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.1-1
+- update to 1.1
+- remove gmail build option and add new BR libicu-devel
+
 * Tue Nov 25 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.0-0.fdr.1
 - update to 1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Dec 2004 18:43:31 -0000	1.3
+++ sources	9 Mar 2005 20:16:31 -0000	1.4
@@ -1 +1 @@
-9f458da2a222490330ed93d3298ced75  mail-notification-1.0.tar.gz
+2359fb53128b12cf295bdf8553e5869b  mail-notification-1.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar  9 23:02:14 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:02:14 -0500
Subject: rpms/python-quixote - New directory
Message-ID: <200503092302.j29N2E8p027854@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27847/python-quixote

Log Message:
Directory /cvs/extras/rpms/python-quixote added to the repository




From fedora-extras-commits at redhat.com  Wed Mar  9 23:02:14 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:02:14 -0500
Subject: rpms/python-quixote/devel - New directory
Message-ID: <200503092302.j29N2ED8027857@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27847/python-quixote/devel

Log Message:
Directory /cvs/extras/rpms/python-quixote/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar  9 23:02:26 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:02:26 -0500
Subject: rpms/python-quixote Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503092302.j29N2Qb2027926@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27909

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-quixote


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

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

common : CVS/Root
	@cvs 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 Mar  9 23:02:26 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:02:26 -0500
Subject: rpms/python-quixote/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503092302.j29N2QqZ027929@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27909/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-quixote


--- 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 Mar  9 23:02:46 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:02:46 -0500
Subject: rpms/python-quixote import.log,1.1,1.2
Message-ID: <200503092302.j29N2kRM028025@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28014

Modified Files:
	import.log 
Log Message:
auto-import python-quixote-1.2-2 on branch devel from python-quixote-1.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Mar 2005 23:02:24 -0000	1.1
+++ import.log	9 Mar 2005 23:02:44 -0000	1.2
@@ -0,0 +1 @@
+python-quixote-1_2-2:HEAD:python-quixote-1.2-2.src.rpm:1110409361



From fedora-extras-commits at redhat.com  Wed Mar  9 23:02:46 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:02:46 -0500
Subject: rpms/python-quixote/devel python-quixote.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503092302.j29N2ksd028028@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28014/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-quixote.spec 
Log Message:
auto-import python-quixote-1.2-2 on branch devel from python-quixote-1.2-2.src.rpm


--- NEW FILE python-quixote.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)")}

%define srcname Quixote
%define srcver  1.2

Name:           python-quixote
Version:        1.2
Release:        2
Summary:        A highly Pythonic Web application framework

Group:          Development/Libraries
License:        CNRI
URL:            http://www.mems-exchange.org/software/quixote/
Source0:        http://www.mems-exchange.org/software/files/quixote/Quixote-1.2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
Quixote is a framework for developing Web applications in Python. Quixote is
based on a simple, flexible design, making it possible to write applications
quickly and to benefit from the wide range of available third-party Python
modules. Deployed appropriately, Quixote has excellent performance that allows
you to put Quixote-based applications into large-scale production use.

%prep
%setup -q -n %{srcname}-%{srcver}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc doc/ CHANGES README TODO LICENSE
%dir %{python_sitearch}/quixote
%{python_sitearch}/quixote/*.py
%{python_sitearch}/quixote/*.pyc
%{python_sitearch}/quixote/*.so
%ghost %{python_sitearch}/quixote/*.pyo
%{python_sitearch}/quixote/demo/*.py
%{python_sitearch}/quixote/demo/*.pyc
%{python_sitearch}/quixote/demo/*.ptl
%ghost %{python_sitearch}/quixote/demo/*.pyo
%{python_sitearch}/quixote/form/*.py
%{python_sitearch}/quixote/form/*.pyc
%ghost %{python_sitearch}/quixote/form/*.pyo
%{python_sitearch}/quixote/server/*.py
%{python_sitearch}/quixote/server/*.pyc
%ghost %{python_sitearch}/quixote/server/*.pyo
# remove the form2 lines for Quixote 2
%{python_sitearch}/quixote/form2/*.py
%{python_sitearch}/quixote/form2/*.pyc
%ghost %{python_sitearch}/quixote/form2/*.pyo

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 1.2-2
- Fix up specfile for FC3
- Change python_sitelib -> python_sitearch for multi-lib builds

* Thu Oct 28 2004 Shahms E. King <shahms at shahms.com> -
- Update to 1.2

* Wed May 26 2004 Shahms King <shahms at shahms.com> -
- Initial Relase


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Mar 2005 23:02:24 -0000	1.1
+++ .cvsignore	9 Mar 2005 23:02:44 -0000	1.2
@@ -0,0 +1 @@
+Quixote-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Mar 2005 23:02:24 -0000	1.1
+++ sources	9 Mar 2005 23:02:44 -0000	1.2
@@ -0,0 +1 @@
+f39e6627fba8266996bff3a494053db7  Quixote-1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar  9 23:04:46 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:04:46 -0500
Subject: rpms/python-durus/devel - New directory
Message-ID: <200503092304.j29N4khx028157@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28145/python-durus/devel

Log Message:
Directory /cvs/extras/rpms/python-durus/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar  9 23:04:46 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:04:46 -0500
Subject: rpms/python-durus - New directory
Message-ID: <200503092304.j29N4k5D028154@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28145/python-durus

Log Message:
Directory /cvs/extras/rpms/python-durus added to the repository




From fedora-extras-commits at redhat.com  Wed Mar  9 23:05:14 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:05:14 -0500
Subject: rpms/python-durus/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503092305.j29N5EpQ028218@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28206/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-durus


--- 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 Mar  9 23:05:25 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:05:25 -0500
Subject: rpms/python-durus Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503092305.j29N5PbJ028220@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28206

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-durus


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

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

common : CVS/Root
	@cvs 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 Mar  9 23:05:53 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:05:53 -0500
Subject: rpms/python-durus import.log,1.1,1.2
Message-ID: <200503092305.j29N5rYm028316@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28306

Modified Files:
	import.log 
Log Message:
auto-import python-durus-1.4-1 on branch devel from python-durus-1.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-durus/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Mar 2005 23:05:08 -0000	1.1
+++ import.log	9 Mar 2005 23:05:50 -0000	1.2
@@ -0,0 +1 @@
+python-durus-1_4-1:HEAD:python-durus-1.4-1.src.rpm:1110409538



From fedora-extras-commits at redhat.com  Wed Mar  9 23:05:54 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:05:54 -0500
Subject: rpms/python-durus/devel python-durus.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503092305.j29N5rpl028318@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28306/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-durus.spec 
Log Message:
auto-import python-durus-1.4-1 on branch devel from python-durus-1.4-1.src.rpm


--- NEW FILE python-durus.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)")}

%define srcname Durus

Name:           python-durus
Version:        1.4
Release:        1
Summary:        A Python Object Database

Group:          Development/Libraries
License:        CNRI
URL:            http://www.mems-exchange.org/software/durus/
Source0:        http://www.mems-exchange.org/software/files/durus/Durus-1.4.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
Durus is a persistent object system for applications written in the Python
programming language. It offers an easy way to use and maintain a consistent
collection of object instances used by one or more processes. Access and change
of a persistent instances is managed through a cached Connection instance which
includes commit() and abort() methods so that changes are transactional.
Durus is best suited to collections of less than a million instances with
relatively stable state.

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


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc doc/ *.txt
%dir %{python_sitearch}/durus
%{python_sitearch}/durus/*.so
%{python_sitearch}/durus/*.py
%{python_sitearch}/durus/*.pyc
%ghost %{python_sitearch}/durus/*.pyo
%{_bindir}/durus

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 1.4-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-durus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Mar 2005 23:05:08 -0000	1.1
+++ .cvsignore	9 Mar 2005 23:05:50 -0000	1.2
@@ -0,0 +1 @@
+Durus-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-durus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Mar 2005 23:05:08 -0000	1.1
+++ sources	9 Mar 2005 23:05:50 -0000	1.2
@@ -0,0 +1 @@
+e79aed3bfa1dea3020507082f147600b  Durus-1.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 10 07:03:43 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Thu, 10 Mar 2005 02:03:43 -0500
Subject: devel/jabberd jabberd.spec,1.2,1.3
Message-ID: <200503100703.j2A73hia004755@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4749

Modified Files:
	jabberd.spec 
Log Message:
* removed Epoch: 0
* more Requires(...)
* typo 
* changed db location to %%{_var}/lib/jabberd
* removed noreplace for start script



Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jabberd.spec	9 Mar 2005 08:00:01 -0000	1.2
+++ jabberd.spec	10 Mar 2005 07:03:41 -0000	1.3
@@ -1,17 +1,19 @@
-Summary:        OpenSource server implementation of the Jabber protocols
-Name:           jabberd
-Version:        2.0
-Release:        0.s6.4
-Epoch:          0
-License:        GPL
-Group:          System Environment/Daemons
-Source0:        http://files.jabberstudio.org/jabberd2/jabberd-2.0s6.tar.gz
-Source1:        jabberd
-URL:            http://jabberd.jabberstudio.org/2/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  openssl-devel db4-devel libidn-devel pam-devel
-BuildRequires:  openldap-devel postgresql-devel mysql-devel
-Requires(post): openssl
+Summary: OpenSource server implementation of the Jabber protocols
+Name: jabberd
+Version: 2.0
+Release: 0.s6.5
+License: GPL
+Group: System Environment/Daemons
+Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s6.tar.gz
+Source1: jabberd
+URL: http://jabberd.jabberstudio.org/2/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: openssl-devel db4-devel libidn-devel pam-devel
+BuildRequires: openldap-devel postgresql-devel mysql-devel
+Requires(post): openssl chkconfig
+Requires(pre): shadow-utils
+Requires(preun): chkconfig shadow-utils
+Requires(postun): chkconfig
 
 %description
 The jabberd project aims to provide an open-source server implementation of the
@@ -33,16 +35,21 @@
 %define sysconfdir /etc/jabberd
 %{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g" \
 		configure
-%configure --enable-db --enable-mysql --enable-pam --enable-ldap \
-		--enable-pgsql --with-extra-library-path=%{_libdir}/mysql \
-		--enable-debug
+%configure	--enable-db \
+		--enable-mysql \
+		--enable-pam \
+		--enable-ldap \
+		--enable-pgsql \
+		--with-extra-library-path=%{_libdir}/mysql \
+		--localstatedir=%{_var}/lib
+
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %makeinstall
 %define _sysconfdir /etc
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_var}/jabberd/{log,pid,db}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_var}/lib/jabberd/{log,pid,db}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -m 644 tools/db-setup.mysql $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -m 644 tools/db-setup.pgsql $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -52,11 +59,9 @@
 %{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 %{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
-          $RPM_BUILD_ROOT%{_initrddir}/%{name}
-%{__sed} -i -e "s,__ETCDIR__,%{sysconfdir},g" \
-          $RPM_BUILD_ROOT%{_initrddir}/%{name}
-%{__sed} -i -e "s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g" \
-          $RPM_BUILD_ROOT%{_initrddir}/%{name}
+            -e "s,__ETCDIR__,%{sysconfdir},g" \
+            -e "s,__PIDDIR__,%{_var}/lib/jabberd/pid,g" \
+		$RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
 %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/jabberd << END
@@ -76,7 +81,7 @@
 	$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
 
 #enable SSL certificate
-%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <pemfile>/etc/jabberd/server.pem</pemfile>\n    -->,<pemfile>/etc/jAbberd/server.pem</pemfile>,g' $RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
+%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <pemfile>/etc/jabberd/server.pem</pemfile>\n    -->,<pemfile>/etc/jabberd/server.pem</pemfile>,g' $RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
 
 #the default pam backend needs auto creation of accounts
 %{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <auto-create/>\n    -->,<auto-create/>,g' \
@@ -94,7 +99,7 @@
 
 %pre
 #creating jabber user
-useradd -r -d %{_localstatedir}/%{name} -m -c "Jabber Server" -s /bin/bash jabber >/dev/null 2>&1 ||:
+useradd -r -d %{_var}/lib/%{name} -m -c "Jabber Server" -s /bin/bash jabber >/dev/null 2>&1 ||:
 
 
 %post
@@ -127,8 +132,8 @@
 	/sbin/service %{name} stop > /dev/null 2>&1
 	/sbin/chkconfig --del %{name}
 	userdel jabber
-	#should %{_localstatedir}/jabberd be deleted???
-	#%{__rm} -rf %{_localstatedir}/jabberd
+	#should %{_var}/lib/jabberd be deleted???
+	#%{__rm} -rf %{_var}/lib/jabberd
 fi
 
 %postun
@@ -144,12 +149,19 @@
 %attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/*
 %{_datadir}/man/man8/*
 %{_datadir}/%{name}/
-%config(noreplace) %{_initrddir}/%{name}
+%config %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/pam.d/jabberd
-%attr(-,jabber,jabber) %{_var}/jabberd
+%attr(-,jabber,jabber) %{_var}/lib/jabberd
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Wed Mar 09 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.5
+- removed Epoch: 0
+- more Requires(...)
+- typo 
+- changed db location to %%{_var}/lib/jabberd
+- removed noreplace for start script
+
 * Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
 - made password more random (/dev/random)
 - replace password in the config without making it visible in ps



From adrian at lisas.de  Thu Mar 10 07:17:37 2005
From: adrian at lisas.de (Adrian Reber)
Date: Thu, 10 Mar 2005 08:17:37 +0100
Subject: devel/jabberd jabberd.spec,1.1,1.2
In-Reply-To: <1110364494.7140.307.camel@mccallum.corsepiu.local>
References: <200503090800.j29803oH010739@cvs-int.fedora.redhat.com>
	<1110364494.7140.307.camel@mccallum.corsepiu.local>
Message-ID: <20050310071737.GB30432@lisas.de>

On Wed, Mar 09, 2005 at 11:34:54AM +0100, Ralf Corsepius wrote:
> > +%{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
> > +          $RPM_BUILD_ROOT%{_initrddir}/%{name}
> > +%{__sed} -i -e "s,__ETCDIR__,%{sysconfdir},g" \
> > +          $RPM_BUILD_ROOT%{_initrddir}/%{name}
> > +%{__sed} -i -e "s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g" \
> >            $RPM_BUILD_ROOT%{_initrddir}/%{name}
> 
> Any particular reason to use several sed-calls? 

No.

> One sed-call should be sufficient:
> 
> %{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
>             -e "s,__ETCDIR__,%{sysconfdir},g" \
>             -e "s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g" \
>              $RPM_BUILD_ROOT%{_initrddir}/%{name}

Changed it.

		Adrian



From fedora-extras-commits at redhat.com  Thu Mar 10 15:19:22 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 10 Mar 2005 10:19:22 -0500
Subject: rpms/perl-GD/FC-3 .cvsignore, 1.3, 1.4 perl-GD.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200503101519.j2AFJMbe014744@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	.cvsignore perl-GD.spec sources 
Log Message:
Update to 2.23


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Dec 2004 07:44:01 -0000	1.3
+++ .cvsignore	10 Mar 2005 15:19:20 -0000	1.4
@@ -1 +1 @@
-GD-2.19.tar.gz
+GD-2.23.tar.gz


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/FC-3/perl-GD.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-GD.spec	10 Dec 2004 07:44:01 -0000	1.3
+++ perl-GD.spec	10 Mar 2005 15:19:20 -0000	1.4
@@ -1,22 +1,21 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-GD
-Version:        2.19
+Version:        2.23
 Release:        1
-Epoch:          0
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
 License:        Artistic
 URL:            http://search.cpan.org/dist/GD/
-Source0:        http://www.cpan.org/authors/id/L/LD/LDS/GD-2.19.tar.gz
+Source0:        http://www.cpan.org/authors/id/L/LD/LDS/GD-2.23.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  gd-devel >= 0:2.0.28
+BuildRequires:  gd-devel >= 2.0.28
 BuildRequires:  %{_bindir}/gdlib-config
 BuildRequires:  libpng-devel, libjpeg-devel, freetype-devel, XFree86-devel
-Requires:       gd >= 0:2.0.28
+Requires:       gd >= 2.0.28
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -56,16 +55,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README README.QUICKDRAW demos/ bdf_scripts/
+%doc ChangeLog README README.QUICKDRAW qd.pl demos/ bdf_scripts/
 %{_bindir}/*
 %{perl_vendorarch}/auto/GD
 %{perl_vendorarch}/GD*
-%{perl_vendorarch}/qd.pl
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Wed Mar  9 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.23-1
+- Update to 2.23.
+
 * Thu Dec 09 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:2.19-1
 - Update to 2.19.
 - GIF support has been restored in gd 2.0.28.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Dec 2004 07:44:01 -0000	1.3
+++ sources	10 Mar 2005 15:19:20 -0000	1.4
@@ -1 +1 @@
-c340ab955aca622df1dcc28f8e5419aa  GD-2.19.tar.gz
+131a84d37921a18c87e7d994d72165b2  GD-2.23.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 10 15:19:22 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 10 Mar 2005 10:19:22 -0500
Subject: rpms/perl-GD/devel .cvsignore, 1.3, 1.4 perl-GD.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200503101519.j2AFJMZE014751@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GD/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14735/devel

Modified Files:
	.cvsignore perl-GD.spec sources 
Log Message:
Update to 2.23


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Dec 2004 07:44:01 -0000	1.3
+++ .cvsignore	10 Mar 2005 15:19:20 -0000	1.4
@@ -1 +1 @@
-GD-2.19.tar.gz
+GD-2.23.tar.gz


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-GD.spec	3 Mar 2005 23:46:26 -0000	1.4
+++ perl-GD.spec	10 Mar 2005 15:19:20 -0000	1.5
@@ -1,14 +1,14 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-GD
-Version:        2.19
+Version:        2.23
 Release:        1
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
 License:        Artistic
 URL:            http://search.cpan.org/dist/GD/
-Source0:        http://www.cpan.org/authors/id/L/LD/LDS/GD-2.19.tar.gz
+Source0:        http://www.cpan.org/authors/id/L/LD/LDS/GD-2.23.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
@@ -55,16 +55,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README README.QUICKDRAW demos/ bdf_scripts/
+%doc ChangeLog README README.QUICKDRAW qd.pl demos/ bdf_scripts/
 %{_bindir}/*
 %{perl_vendorarch}/auto/GD
 %{perl_vendorarch}/GD*
-%{perl_vendorarch}/qd.pl
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Wed Mar  9 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.23-1
+- Update to 2.23.
+
 * Thu Dec 09 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:2.19-1
 - Update to 2.19.
 - GIF support has been restored in gd 2.0.28.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Dec 2004 07:44:01 -0000	1.3
+++ sources	10 Mar 2005 15:19:20 -0000	1.4
@@ -1 +1 @@
-c340ab955aca622df1dcc28f8e5419aa  GD-2.19.tar.gz
+131a84d37921a18c87e7d994d72165b2  GD-2.23.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 10 16:04:55 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 10 Mar 2005 11:04:55 -0500
Subject: devel/perl-String-Ediff .cvsignore, 1.3, 1.4 perl-String-Ediff.spec,
	1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200503101604.j2AG4twu015811@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/perl-String-Ediff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15805

Modified Files:
	.cvsignore perl-String-Ediff.spec sources 
Log Message:
0.05, should fix #150012.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/perl-String-Ediff/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Feb 2005 22:09:00 -0000	1.3
+++ .cvsignore	10 Mar 2005 16:04:53 -0000	1.4
@@ -1 +1 @@
-String-Ediff-0.04.tar.gz
+String-Ediff-0.05.tar.gz


Index: perl-String-Ediff.spec
===================================================================
RCS file: /cvs/extras/devel/perl-String-Ediff/perl-String-Ediff.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-String-Ediff.spec	3 Mar 2005 23:46:28 -0000	1.7
+++ perl-String-Ediff.spec	10 Mar 2005 16:04:53 -0000	1.8
@@ -1,14 +1,14 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-String-Ediff
-Version:        0.04
+Version:        0.05
 Release:        1
 Summary:        Produce common sub-string indices for two strings
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/String-Ediff/
-Source0:    http://www.cpan.org/authors/id/B/BO/BOXZOU/String-Ediff-0.04.tar.gz
+Source0:    http://www.cpan.org/authors/id/B/BO/BOXZOU/String-Ediff-0.05.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Mar 10 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.05-1
+- 0.05, should fix #150012.
+
 * Fri Feb 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.04-1
 - 0.04.
 - Add perl(:MODULE_COMPAT_*) dependency, install with pure_install.


Index: sources
===================================================================
RCS file: /cvs/extras/devel/perl-String-Ediff/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Feb 2005 22:09:00 -0000	1.3
+++ sources	10 Mar 2005 16:04:53 -0000	1.4
@@ -1 +1 @@
-ba79c1986303f7c36929d7478374800b  String-Ediff-0.04.tar.gz
+6415c056b2a9e3380637477b9fadd34e  String-Ediff-0.05.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 10 22:22:33 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 10 Mar 2005 17:22:33 -0500
Subject: rpms/python-quixote/devel python-quixote.spec,1.1,1.2
Message-ID: <200503102222.j2AMMX6E022876@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22867/devel

Modified Files:
	python-quixote.spec 
Log Message:
Remove unnecessary '%define srcver 1.2' from the spec file




Index: python-quixote.spec
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/python-quixote.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-quixote.spec	9 Mar 2005 23:02:44 -0000	1.1
+++ python-quixote.spec	10 Mar 2005 22:22:31 -0000	1.2
@@ -2,11 +2,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define srcname Quixote
-%define srcver  1.2
 
 Name:           python-quixote
 Version:        1.2
-Release:        2
+Release:        3
 Summary:        A highly Pythonic Web application framework
 
 Group:          Development/Libraries
@@ -26,7 +25,7 @@
 you to put Quixote-based applications into large-scale production use.
 
 %prep
-%setup -q -n %{srcname}-%{srcver}
+%setup -q -n %{srcname}-%{version}
 
 
 %build
@@ -66,6 +65,9 @@
 %ghost %{python_sitearch}/quixote/form2/*.pyo
 
 %changelog
+* Thu Mar 10 2005 Shahms E. King <shahms at shahms.com> 1.2-3 -
+- remove 'srcver' from specfile
+
 * Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 1.2-2
 - Fix up specfile for FC3
 - Change python_sitelib -> python_sitearch for multi-lib builds



From fedora-extras-commits at redhat.com  Thu Mar 10 22:51:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 10 Mar 2005 17:51:35 -0500
Subject: rpms/perl-Gtk2/FC-3 perl-Gtk2.spec,1.5,1.6
Message-ID: <200503102251.j2AMpZb1023349@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-serv23340/FC-3

Modified Files:
	perl-Gtk2.spec 
Log Message:
Use perl-Glib for versioning control


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-3/perl-Gtk2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Gtk2.spec	8 Mar 2005 18:28:36 -0000	1.5
+++ perl-Gtk2.spec	10 Mar 2005 22:51:33 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           perl-Gtk2
 Version:        1.080
-Release:        1
+Release:        2
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
 Group:          Development/Libraries
@@ -12,8 +12,9 @@
 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.080
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
+Requires:       perl-Glib >= 1.080
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -44,7 +45,7 @@
 
 %check || :
 # Testing requires X
-#make test
+%{?_with_tests:make test}
 
 
 %clean
@@ -61,6 +62,9 @@
 
 
 %changelog
+* 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??).
+
 * Tue Mar  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-1
 - Update to 1.080.
 



From fedora-extras-commits at redhat.com  Thu Mar 10 22:51:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 10 Mar 2005 17:51:35 -0500
Subject: rpms/perl-Gtk2/devel perl-Gtk2.spec,1.6,1.7
Message-ID: <200503102251.j2AMpZ4X023353@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23340/devel

Modified Files:
	perl-Gtk2.spec 
Log Message:
Use perl-Glib for versioning control


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Gtk2.spec	8 Mar 2005 18:28:36 -0000	1.6
+++ perl-Gtk2.spec	10 Mar 2005 22:51:33 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           perl-Gtk2
 Version:        1.080
-Release:        1
+Release:        2
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
 Group:          Development/Libraries
@@ -12,8 +12,9 @@
 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.080
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
+Requires:       perl-Glib >= 1.080
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -44,7 +45,7 @@
 
 %check || :
 # Testing requires X
-#make test
+%{?_with_tests:make test}
 
 
 %clean
@@ -61,6 +62,9 @@
 
 
 %changelog
+* 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??).
+
 * Tue Mar  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-1
 - Update to 1.080.
 



From shahms at shahms.com  Thu Mar 10 22:30:17 2005
From: shahms at shahms.com (Shahms King)
Date: Thu, 10 Mar 2005 14:30:17 -0800
Subject: APPROVED: ipython, python-durus, python-quixote
Message-ID: <1110493817.4713.51.camel@shahms.mesd.k12.or.us>

Name: ipython
IPython provides a replacement for the interactive Python interpreter
with extra functionality to make experimenting with python code easier
and more pleasant.

Maintainer: Shahms King
Reviewed by: Seth Vidal

------------------
Name: python-durus
python-durus is a persistent object system for applications written in
the Python programming language. It offers an easy way to use and
maintain a consistent collection of object instances used by one or more
processes. Access and change of a persistent instances is managed
through a cached Connection instance which includes commit() and abort()
methods so that changes are transactional. Durus is best suited to
collections of less than a million instances with relatively stable
state.

Maintainer: Shahms King
Reviewed by: Seth Vidal

--------------------
Name: python-quixote
python-quixote is a framework for developing Web applications in Python.
Quixote is based on a simple, flexible design, making it possible to
write applications quickly and to benefit from the wide range of
available third-party Python modules. Deployed appropriately, Quixote
has excellent performance that allows you to put Quixote-based
applications into large-scale production use.

Maintainer: Shahms King
Reviewed by: Seth Vidal


-- 
Shahms E. King <shahms at shahms.com>
Multnomah ESD

Public Key:
http://shahms.mesd.k12.or.us/~sking/shahms.asc
Fingerprint:
1612 054B CE92 8770 F1EA  AB1B FEAB 3636 45B2 D75B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050310/74192ca8/attachment.sig>

From fedora-extras-commits at redhat.com  Sat Mar 12 08:38:57 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 12 Mar 2005 03:38:57 -0500
Subject: rpms/mpc/FC-3 .cvsignore,1.2,1.3 mpc.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200503120838.j2C8cvpR012729@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore mpc.spec sources 
Log Message:
- version 0.11.2
- drop Epoch
- update URL




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mpc/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2004 21:12:03 -0000	1.2
+++ .cvsignore	12 Mar 2005 08:38:55 -0000	1.3
@@ -1 +1 @@
-mpc-0.11.1.tar.gz
+mpc-0.11.2.tar.gz


Index: mpc.spec
===================================================================
RCS file: /cvs/extras/rpms/mpc/FC-3/mpc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mpc.spec	12 Dec 2004 21:23:43 -0000	1.2
+++ mpc.spec	12 Mar 2005 08:38:55 -0000	1.3
@@ -1,12 +1,11 @@
 Name:             mpc
 Summary:          Command-line client for MPD
-Version:          0.11.1
-Release:          2
-Epoch:            0
+Version:          0.11.2
+Release:          1
 License:          GPL
 Group:            Applications/Multimedia
-URL:              http://www.musicpd.org/?page=mpc
-Source0:          http://mercury.chem.pitt.edu/~shank/mpc-0.11.1.tar.gz
+URL:              http://www.musicpd.org/mpc.shtml
+Source0:          http://mercury.chem.pitt.edu/~shank/mpc-0.11.2.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -47,6 +46,11 @@
 
 
 %changelog
+* Sat Mar 12 2005 Aurelien Bompard <gauret[AT]free.fr> 0.11.2-1
+- version 0.11.2
+- drop Epoch
+- update URL
+
 * Wed Dec 08 2004 Aurelien Bompard <gauret[AT]free.fr> 0:0.11.1-2
 - put the bash_completion file in %%_datadir instead of %%_docdir
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mpc/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2004 21:12:03 -0000	1.2
+++ sources	12 Mar 2005 08:38:55 -0000	1.3
@@ -1 +1 @@
-5c9887159915164e070cd0230da621fd  mpc-0.11.1.tar.gz
+c8411da7936662312cf9483f3490e285  mpc-0.11.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Mar 12 08:38:57 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 12 Mar 2005 03:38:57 -0500
Subject: rpms/mpc/devel .cvsignore,1.2,1.3 mpc.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <200503120838.j2C8cv68012735@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore mpc.spec sources 
Log Message:
- version 0.11.2
- drop Epoch
- update URL




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mpc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2004 21:12:03 -0000	1.2
+++ .cvsignore	12 Mar 2005 08:38:55 -0000	1.3
@@ -1 +1 @@
-mpc-0.11.1.tar.gz
+mpc-0.11.2.tar.gz


Index: mpc.spec
===================================================================
RCS file: /cvs/extras/rpms/mpc/devel/mpc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mpc.spec	3 Mar 2005 23:01:24 -0000	1.3
+++ mpc.spec	12 Mar 2005 08:38:55 -0000	1.4
@@ -1,11 +1,11 @@
 Name:             mpc
 Summary:          Command-line client for MPD
-Version:          0.11.1
-Release:          2
+Version:          0.11.2
+Release:          1
 License:          GPL
 Group:            Applications/Multimedia
-URL:              http://www.musicpd.org/?page=mpc
-Source0:          http://mercury.chem.pitt.edu/~shank/mpc-0.11.1.tar.gz
+URL:              http://www.musicpd.org/mpc.shtml
+Source0:          http://mercury.chem.pitt.edu/~shank/mpc-0.11.2.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -46,6 +46,11 @@
 
 
 %changelog
+* Sat Mar 12 2005 Aurelien Bompard <gauret[AT]free.fr> 0.11.2-1
+- version 0.11.2
+- drop Epoch
+- update URL
+
 * Wed Dec 08 2004 Aurelien Bompard <gauret[AT]free.fr> 0:0.11.1-2
 - put the bash_completion file in %%_datadir instead of %%_docdir
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mpc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2004 21:12:03 -0000	1.2
+++ sources	12 Mar 2005 08:38:55 -0000	1.3
@@ -1 +1 @@
-5c9887159915164e070cd0230da621fd  mpc-0.11.1.tar.gz
+c8411da7936662312cf9483f3490e285  mpc-0.11.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Mar 12 08:43:33 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 12 Mar 2005 03:43:33 -0500
Subject: rpms/ulogd/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ulogd.spec,
	1.7, 1.8
Message-ID: <200503120843.j2C8hXgZ012890@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore sources ulogd.spec 
Log Message:
- sync FC3 and devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Feb 2005 15:52:15 -0000	1.3
+++ .cvsignore	12 Mar 2005 08:43:31 -0000	1.4
@@ -1 +1,2 @@
-ulogd-1.21.tar.bz2
+ulogd-1.22.tar.bz2
+ulogd-1.22.tar.bz2.sig


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Feb 2005 15:52:15 -0000	1.3
+++ sources	12 Mar 2005 08:43:31 -0000	1.4
@@ -1 +1,2 @@
-32e94a9336c10a4cb8ab3745bc2abbdb  ulogd-1.21.tar.bz2
+2593dfc51c0bc1d8f86519fb13dd5f34  ulogd-1.22.tar.bz2
+b0efa8912871bff9d88e156e0de7366d  ulogd-1.22.tar.bz2.sig


Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ulogd.spec	5 Mar 2005 19:55:54 -0000	1.7
+++ ulogd.spec	12 Mar 2005 08:43:31 -0000	1.8
@@ -1,23 +1,24 @@
 Name:           ulogd
-Version:        1.21
+Version:        1.22
 Release:        1
 Summary:        The userspace logging daemon for netfilter
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://gnumonks.org/projects/ulogd
-Source:         http://ftp.netfilter.org/pub/ulogd/ulogd-%{version}.tar.bz2
+Source0:         http://ftp.netfilter.org/pub/ulogd/ulogd-%{version}.tar.bz2
 Source1:        ulogd.logrotate
 Source2:        ulogd.8
+Source3:         http://ftp.netfilter.org/pub/ulogd/ulogd-%{version}.tar.bz2.sig
 Patch1:         ulogd-1.21-logdir.patch
 Patch2:         ulogd-1.02-init.patch
 Patch3:         ulogd-1.02-pgsql.patch
 Patch4:         ulogd-1.21-x86_64.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(post): initscripts, chkconfig
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(post):	initscripts, chkconfig
 Requires(postun): initscripts, chkconfig
 BuildRequires:  mysql-devel
 BuildRequires:  postgresql-devel
-#BuildRequires:  libpcap-devel
+#BuildRequires:	libpcap-devel
 
 %description
 Ulogd is an universal logging daemon for the ULOG target of netfilter, the
@@ -33,7 +34,7 @@
 %description mysql
 Ulogd-mysql is a MySQL output plugin for ulogd. It enables logging of
 firewall information into a MySQL database.
-
+                                                                                
 %package pgsql
 Summary:        PostgreSQL output plugin for ulogd
 Group:          System Environment/Daemons
@@ -53,7 +54,7 @@
 %build
 %configure --with-mysql --with-pgsql
 # Does not support parallel builds
-make
+make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -78,14 +79,14 @@
 %post
 /sbin/chkconfig --add ulogd
 
-%preun
-if [ $1 -eq 0 ]; then
+%preun 
+if [ "$1" = 0 ]; then 
   /sbin/service ulogd stop > /dev/null 2>&1 ||:
-  /sbin/chkconfig --del ulogd
+  /sbin/chkconfig --del ulogd 
 fi
 
-%postun
-if [ $1 -ge 1 ]; then
+%postun 
+if [ "$1" -ge "1" ]; then 
   /sbin/service ulogd reload > /dev/null 2>&1 ||:
 fi
 
@@ -117,6 +118,10 @@
 %{_libdir}/ulogd/ulogd_PGSQL.so
 
 %changelog
+* Wed Mar 09 2005 Aurelien Bompard <gauret[AT]free.fr> 1.22-1
+- version 1.22
+- add gpg signature to sources
+
 * Sun Feb 20 2005 Aurelien Bompard <gauret[AT]free.fr> 1.21-1
 - version 1.21
 



From fedora-extras-commits at redhat.com  Sat Mar 12 08:44:16 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 12 Mar 2005 03:44:16 -0500
Subject: rpms/amarok/FC-3 amarok.spec,1.7,1.8
Message-ID: <200503120844.j2C8iGMZ012936@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amarok.spec 
Log Message:
- drop workaround for QT packaging bug. It's fixed.



Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/amarok.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- amarok.spec	7 Mar 2005 22:09:28 -0000	1.7
+++ amarok.spec	12 Mar 2005 08:44:14 -0000	1.8
@@ -29,8 +29,6 @@
 %endif
 
 Requires:   kdemultimedia >= 6:3.2
-# Fix OpenGL analyzers because of a qt packaging bug (#126422)
-Requires:   xorg-x11-devel
 
 %description
 Amarok is a KDE multimedia player with:



From fedora-extras-commits at redhat.com  Sat Mar 12 08:44:16 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 12 Mar 2005 03:44:16 -0500
Subject: rpms/amarok/devel amarok.spec,1.9,1.10
Message-ID: <200503120844.j2C8iGGj012940@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amarok.spec 
Log Message:
- drop workaround for QT packaging bug. It's fixed.



Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- amarok.spec	7 Mar 2005 22:09:28 -0000	1.9
+++ amarok.spec	12 Mar 2005 08:44:14 -0000	1.10
@@ -29,8 +29,6 @@
 %endif
 
 Requires:   kdemultimedia >= 6:3.2
-# Fix OpenGL analyzers because of a qt packaging bug (#126422)
-Requires:   xorg-x11-devel
 
 %description
 Amarok is a KDE multimedia player with:



From fedora-extras-commits at redhat.com  Sat Mar 12 08:45:15 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 12 Mar 2005 03:45:15 -0500
Subject: rpms/zope/FC-3 zope.init.in,1.1,1.2
Message-ID: <200503120845.j2C8jFkW013004@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	zope.init.in 
Log Message:
- fix return value in initscript



Index: zope.init.in
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/zope.init.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zope.init.in	9 Jan 2005 12:09:24 -0000	1.1
+++ zope.init.in	12 Mar 2005 08:45:13 -0000	1.2
@@ -39,11 +39,11 @@
             # success
             action $"Stopping $prog:  " /bin/true
             rm -f /var/lock/subsys/$prog
-            RETVAL=1
+            RETVAL=0
         else
             # failed
             action $"Stopping $prog:  " /bin/false
-            RETVAL=0
+            RETVAL=1
         fi
         return $RETVAL
 }



From fedora-extras-commits at redhat.com  Sat Mar 12 08:45:15 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 12 Mar 2005 03:45:15 -0500
Subject: rpms/zope/devel zope.init.in,1.1,1.2
Message-ID: <200503120845.j2C8jFqW013008@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	zope.init.in 
Log Message:
- fix return value in initscript



Index: zope.init.in
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.init.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zope.init.in	9 Jan 2005 12:09:24 -0000	1.1
+++ zope.init.in	12 Mar 2005 08:45:13 -0000	1.2
@@ -39,11 +39,11 @@
             # success
             action $"Stopping $prog:  " /bin/true
             rm -f /var/lock/subsys/$prog
-            RETVAL=1
+            RETVAL=0
         else
             # failed
             action $"Stopping $prog:  " /bin/false
-            RETVAL=0
+            RETVAL=1
         fi
         return $RETVAL
 }



From fedora-extras-commits at redhat.com  Sun Mar 13 02:02:35 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 12 Mar 2005 21:02:35 -0500
Subject: rpms/gnome-blog import.log,1.3,1.4
Message-ID: <200503130202.j2D22Z00012106@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12094

Modified Files:
	import.log 
Log Message:
auto-import gnome-blog-0.8-5 on branch devel from gnome-blog-0.8-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 04:27:34 -0000	1.3
+++ import.log	13 Mar 2005 02:02:33 -0000	1.4
@@ -1,2 +1,3 @@
 gnome-blog-0_7-0_fdr_7_1:HEAD:gnome-blog-0.7-0.fdr.7.1.src.rpm:1099888039
 gnome-blog-0_7-0_fdr_7_2:HEAD:gnome-blog-0.7-0.fdr.7.2.src.rpm:1099888054
+gnome-blog-0_8-5:HEAD:gnome-blog-0.8-5.src.rpm:1110679349



From fedora-extras-commits at redhat.com  Sun Mar 13 02:02:35 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 12 Mar 2005 21:02:35 -0500
Subject: rpms/gnome-blog/devel gnome-blog-poster.patch, NONE,
	1.1 gnome-blog_makefile.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 gnome-blog.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200503130202.j2D22Zra012110@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12094/devel

Modified Files:
	.cvsignore gnome-blog.spec sources 
Added Files:
	gnome-blog-poster.patch gnome-blog_makefile.patch 
Log Message:
auto-import gnome-blog-0.8-5 on branch devel from gnome-blog-0.8-5.src.rpm

gnome-blog-poster.patch:

--- NEW FILE gnome-blog-poster.patch ---
--- gnome-blog-0.8/gnome-blog-poster.init	2005-02-06 10:31:26.777409742 -0500
+++ gnome-blog-0.8/gnome-blog-poster	2005-02-06 10:32:16.018009917 -0500
@@ -26,12 +26,6 @@
     def __init__(self):
         self.prefs_key = "/apps/gnome-blog"
 
-        client = gconf.client_get_default()
-        value = client.get_bool(self.prefs_key + "/initialized")
-        if (value == None or value == gtk.FALSE):
-            poster._showPrefDialog()
-            client.set_bool(self.prefs_key + "/initialized", gtk.TRUE)
-        
         poster_window = gtk.Window(gtk.WINDOW_TOPLEVEL)
         poster_window.set_title(_("Post Blog Entry"))
         poster_window.connect('destroy', lambda w: gtk.main_quit())
@@ -42,6 +36,12 @@
                                         accel_group=accel_group,
                                         on_entry_posted=self._onEntryPosted)
         
+        client = gconf.client_get_default()
+        value = client.get_bool(self.prefs_key + "/initialized")
+        if (value == None or value == gtk.FALSE):
+            poster._showPrefDialog()
+            client.set_bool(self.prefs_key + "/initialized", gtk.TRUE)
+        
         poster_window.add(poster)
         poster_window.show_all()
 

gnome-blog_makefile.patch:

--- NEW FILE gnome-blog_makefile.patch ---
--- gnome-blog-0.8/Makefile.in.bytec	2005-01-02 02:29:50.000000000 -0500
+++ gnome-blog-0.8/Makefile.in	2005-01-13 09:18:25.993552717 -0500
@@ -397,7 +397,7 @@
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(gnomeblogdir)" $$dlist
+	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(gnomeblogdir)" $$dlist
 
 uninstall-gnomeblogPYTHON:
 	@$(NORMAL_UNINSTALL)
--- gnome-blog-0.8/py-compile.bytec	2004-11-01 12:26:10.000000000 -0500
+++ gnome-blog-0.8/py-compile	2005-01-13 09:15:53.949455705 -0500
@@ -1,7 +1,7 @@
 #!/bin/sh
 # py-compile - Compile a Python program
 
-scriptversion=2004-01-12.23
+scriptversion=2004-12-05.17
 
 # Copyright (C) 2000, 2001, 2003, 2004  Free Software Foundation, Inc.
 
@@ -34,34 +34,54 @@
 fi
 
 basedir=
+destdir=
+files=
+while test $# -ne 0; do
+  case "$1" in
+    --basedir)
+      basedir=$2
+      if test -z "$basedir"; then
+        echo "$0: Missing argument to --basedir." 1>&2
+        exit 1
+      fi
+      shift
+      ;;
+    --destdir)
+      destdir=$2
+      if test -z "$destdir"; then
+        echo "$0: Missing argument to --destdir." 1>&2
+        exit 1
+      fi
+      shift
+      ;;
+    -h|--h*)
+      cat <<\EOF
+Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..."
+
+Byte compile some python scripts FILES.  Use --destdir to specify any
+leading directory path to the FILES that you don't want to include in the
+byte compiled file.  Specify --basedir for any additional path information you
+do want to be shown in the byte compiled file.
 
-case "$1" in
-  --basedir)
-    basedir=$2
-    if test -z "$basedir"; then
-      echo "$0: Missing argument to --basedir." 1>&2
-      exit 1
-    fi
-    shift 2
-    ;;
-  -h|--h*)
-    cat <<\EOF
-Usage: py-compile [--help] [--version] [--basedir DIR] FILES..."
-
-Byte compile some python scripts FILES.  This should be performed
-after they have been moved to the final installation location
+Example:
+  py-compile --destdir /tmp/pkg-root --basedir /usr/share/test test.py test2.py
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit 0
-    ;;
-  -v|--v*)
-    echo "py-compile $scriptversion"
-    exit 0
-    ;;
-esac
+      exit 0
+      ;;
+    -v|--v*)
+      echo "py-compile $scriptversion"
+      exit 0
+      ;;
+    *)
+      files="$files $1"
+      ;;
+  esac
+  shift
+done
 
-if [ $# = 0 ]; then
+if test -z "$files"; then
     echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
     exit 1
 fi
@@ -69,38 +89,51 @@
 # if basedir was given, then it should be prepended to filenames before
 # byte compilation.
 if [ -z "$basedir" ]; then
-    trans="path = file"
+    pathtrans="path = file"
 else
-    trans="path = os.path.join('$basedir', file)"
+    pathtrans="path = os.path.join('$basedir', file)"
+fi
+
+# if destdir was given, then it needs to be prepended to the filename to
+# byte compile but not go into the compiled file.
+if [ -z "$destdir" ]; then
+    filetrans="filepath = path"
+else
+    filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
 fi
 
 $PYTHON -c "
 import sys, os, string, py_compile
 
-files = '''$*'''
+files = '''$files'''
+
 print 'Byte-compiling python modules...'
 for file in string.split(files):
-    $trans
-    if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+    $pathtrans
+    $filetrans
+    if not os.path.exists(filepath) or not (len(filepath) >= 3
+                                            and filepath[-3:] == '.py'):
 	continue
     print file,
     sys.stdout.flush()
-    py_compile.compile(path)
+    py_compile.compile(filepath, filepath + 'c', path)
 print" || exit $?
 
 # this will fail for python < 1.5, but that doesn't matter ...
 $PYTHON -O -c "
 import sys, os, string, py_compile
 
-files = '''$*'''
+files = '''$files'''
 print 'Byte-compiling python modules (optimized versions) ...'
 for file in string.split(files):
-    $trans
-    if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+    $pathtrans
+    $filetrans
+    if not os.path.exists(filepath) or not (len(filepath) >= 3
+                                            and filepath[-3:] == '.py'):
 	continue
     print file,
     sys.stdout.flush()
-    py_compile.compile(path)
+    py_compile.compile(filepath, filepath + 'o', path)
 print" 2>/dev/null || :
 
 # Local Variables:
--- gnome-blog-0.8/protocols/Makefile.in.bytec	2005-01-13 09:16:10.365997809 -0500
+++ gnome-blog-0.8/protocols/Makefile.in	2005-01-13 09:16:44.221928753 -0500
@@ -237,7 +237,7 @@
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(gnomeblogdir)" $$dlist
+	PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(gnomeblogdir)" $$dlist
 
 uninstall-gnomeblogPYTHON:
 	@$(NORMAL_UNINSTALL)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:27:19 -0000	1.2
+++ .cvsignore	13 Mar 2005 02:02:33 -0000	1.3
@@ -1 +1 @@
-gnome-blog-0.7.tar.gz
+gnome-blog-0.8.tar.gz


Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/gnome-blog.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-blog.spec	4 Mar 2005 21:00:23 -0000	1.5
+++ gnome-blog.spec	13 Mar 2005 02:02:33 -0000	1.6
@@ -1,23 +1,27 @@
 %define gnome_python2_version 1.99.13
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pynext %(python -c 'print %{pyver} + 0.1')
+%{!?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:		gnome-blog
-Version:	0.7
-Release:	7
+Version:	0.8
+Release:	5
 Summary:	GNOME panel object for posting blog entries
 
-Group:		User Interface/Desktops
+Group:		Applications/Internet
 License:	GPL
 URL:		http://www.gnome.org/~seth/gnome-blog/		
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-blog/0.7/gnome-blog-0.7.tar.gz
+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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 Requires:	gnome-python2-applet >= %{gnome_python2_version}
 Requires:	gnome-python2-gconf  >= %{gnome_python2_version}
+Requires:	gnome-python2-gnomevfs >= %{gnome_python2_version}
 Requires:	pygtk2 >= %{gnome_python2_version}
-Requires:	python >= %{pyver}, python <= %{pynext}
+Requires:	python-abi = %{pyver}
 
 Requires(post):	GConf2
 Requires(preun): GConf2
@@ -27,42 +31,42 @@
 BuildRequires:	gettext
 BuildRequires:	GConf2
 BuildRequires:	desktop-file-utils
+BuildRequires:	intltool
 
 %description
 GNOME panel object that allows convenient posting of blog entries to
 any blog that supports the bloggerAPI.
 
-
 %prep
 %setup -q
-%{__sed} -i 's|\(<oaf_server iid="OAFIID:GNOME_BlogApplet_Factory" type="exe" location="\)\(blog_applet.py">\)|\1%{_libexecdir}/\2|' GNOME_BlogApplet.server.in
-
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
 # 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
-desktop-file-install --vendor=fedora --dir=$RPM_BUILD_ROOT%{_datadir}/applications --add-category=X-Fedora --add-category=Network gnome-blog.desktop
-
-# Panel applets belong in /usr/libexec rather than /usr/bin
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/blog_applet.py $RPM_BUILD_ROOT%{_libexecdir}
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
@@ -73,27 +77,44 @@
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
 unset GCONF_CONFIG_SOURCES
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/*
 %{_libexecdir}/*
 %{_sysconfdir}/gconf/schemas/gnomeblog.schemas
-%{_datadir}/pixmaps/gnome-blog.png
+%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/applications/*.desktop
 %{_libdir}/bonobo/servers/*.server
-%dir %{_libdir}/python%{pyver}/site-packages/gnomeblog
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/*.py
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/gnome-blog-poster
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/*.pyc
-%ghost %{_libdir}/python*/site-packages/gnomeblog/*.pyo
-
+%dir %{python_sitelib}/gnomeblog
+%{python_sitelib}/gnomeblog/*.py
+%{python_sitelib}/gnomeblog/*.pyc
+%ghost %{python_sitelib}/gnomeblog/*.pyo
 
 %changelog
-* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
-- Split context marked dependency syntax to work around #118773.
+* Tue Mar  1 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-5
+- Add build requires: intltool
+- Drop epoch: 0.
+
+* Mon Feb  7 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-4
+- Added patch to correct blog-poster bug.(#2377c5)
+
+* Thu Feb 03 2005 Toshio Kuratomi <toshio at tiki-lounge.com> - 0:0.8-0.fdr.3
+- No longer include gnome-blog-poster in the library path.  It only belongs
+  in the bindir.
+- Switch to the new python macros for python-abi.
+- Switch to python_sitelib in the files section.  Makes gnome-blog build on
+  x86_64.
+- Change group to Applications/Internet.
+
+* Thu Jan 13 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-0.fdr.2
+- Added makefile patch to fix python byte compiling from Toshio Kuratomi (#2377).
+
+* Wed Jan 12 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-0.fdr.1
+- Updated to 0.8.
+- Removed code from spec file that fixed location of blog_applet.py, since this was corrected upstream.
+- Added requires for gnome-python2-gnomevfs.
 
 * Tue Feb  3 2004 Brian Pepple <bdpepple at ameritech.net> 0:0.7-0.fdr.7
 - Removed Requires: GConf2, and replaced with Requires(post,preun).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:27:19 -0000	1.2
+++ sources	13 Mar 2005 02:02:33 -0000	1.3
@@ -1 +1 @@
-0aad0b5b0b3c59bb70ca6f5f9f81c170  gnome-blog-0.7.tar.gz
+d8e8a451f8e7fd4b1af49a6346301e2a  gnome-blog-0.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar 13 02:58:19 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 12 Mar 2005 21:58:19 -0500
Subject: rpms/gnome-blog import.log,1.4,1.5
Message-ID: <200503130258.j2D2wJeA013131@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13116

Modified Files:
	import.log 
Log Message:
auto-import gnome-blog-0.8-5 on branch FC-3 from gnome-blog-0.8-5.src.rpm
Update to 0.8


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	13 Mar 2005 02:02:33 -0000	1.4
+++ import.log	13 Mar 2005 02:58:17 -0000	1.5
@@ -1,3 +1,4 @@
 gnome-blog-0_7-0_fdr_7_1:HEAD:gnome-blog-0.7-0.fdr.7.1.src.rpm:1099888039
 gnome-blog-0_7-0_fdr_7_2:HEAD:gnome-blog-0.7-0.fdr.7.2.src.rpm:1099888054
 gnome-blog-0_8-5:HEAD:gnome-blog-0.8-5.src.rpm:1110679349
+gnome-blog-0_8-5:FC-3:gnome-blog-0.8-5.src.rpm:1110682693



From fedora-extras-commits at redhat.com  Sun Mar 13 02:58:19 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 12 Mar 2005 21:58:19 -0500
Subject: rpms/gnome-blog/FC-3 gnome-blog-poster.patch, NONE,
	1.1 gnome-blog_makefile.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 gnome-blog.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200503130258.j2D2wJjA013135@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13116/FC-3

Modified Files:
	.cvsignore gnome-blog.spec sources 
Added Files:
	gnome-blog-poster.patch gnome-blog_makefile.patch 
Log Message:
auto-import gnome-blog-0.8-5 on branch FC-3 from gnome-blog-0.8-5.src.rpm
Update to 0.8

gnome-blog-poster.patch:

--- NEW FILE gnome-blog-poster.patch ---
--- gnome-blog-0.8/gnome-blog-poster.init	2005-02-06 10:31:26.777409742 -0500
+++ gnome-blog-0.8/gnome-blog-poster	2005-02-06 10:32:16.018009917 -0500
@@ -26,12 +26,6 @@
     def __init__(self):
         self.prefs_key = "/apps/gnome-blog"
 
-        client = gconf.client_get_default()
-        value = client.get_bool(self.prefs_key + "/initialized")
-        if (value == None or value == gtk.FALSE):
-            poster._showPrefDialog()
-            client.set_bool(self.prefs_key + "/initialized", gtk.TRUE)
-        
         poster_window = gtk.Window(gtk.WINDOW_TOPLEVEL)
         poster_window.set_title(_("Post Blog Entry"))
         poster_window.connect('destroy', lambda w: gtk.main_quit())
@@ -42,6 +36,12 @@
                                         accel_group=accel_group,
                                         on_entry_posted=self._onEntryPosted)
         
+        client = gconf.client_get_default()
+        value = client.get_bool(self.prefs_key + "/initialized")
+        if (value == None or value == gtk.FALSE):
+            poster._showPrefDialog()
+            client.set_bool(self.prefs_key + "/initialized", gtk.TRUE)
+        
         poster_window.add(poster)
         poster_window.show_all()
 

gnome-blog_makefile.patch:

--- NEW FILE gnome-blog_makefile.patch ---
--- gnome-blog-0.8/Makefile.in.bytec	2005-01-02 02:29:50.000000000 -0500
+++ gnome-blog-0.8/Makefile.in	2005-01-13 09:18:25.993552717 -0500
@@ -397,7 +397,7 @@
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(gnomeblogdir)" $$dlist
+	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(gnomeblogdir)" $$dlist
 
 uninstall-gnomeblogPYTHON:
 	@$(NORMAL_UNINSTALL)
--- gnome-blog-0.8/py-compile.bytec	2004-11-01 12:26:10.000000000 -0500
+++ gnome-blog-0.8/py-compile	2005-01-13 09:15:53.949455705 -0500
@@ -1,7 +1,7 @@
 #!/bin/sh
 # py-compile - Compile a Python program
 
-scriptversion=2004-01-12.23
+scriptversion=2004-12-05.17
 
 # Copyright (C) 2000, 2001, 2003, 2004  Free Software Foundation, Inc.
 
@@ -34,34 +34,54 @@
 fi
 
 basedir=
+destdir=
+files=
+while test $# -ne 0; do
+  case "$1" in
+    --basedir)
+      basedir=$2
+      if test -z "$basedir"; then
+        echo "$0: Missing argument to --basedir." 1>&2
+        exit 1
+      fi
+      shift
+      ;;
+    --destdir)
+      destdir=$2
+      if test -z "$destdir"; then
+        echo "$0: Missing argument to --destdir." 1>&2
+        exit 1
+      fi
+      shift
+      ;;
+    -h|--h*)
+      cat <<\EOF
+Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..."
+
+Byte compile some python scripts FILES.  Use --destdir to specify any
+leading directory path to the FILES that you don't want to include in the
+byte compiled file.  Specify --basedir for any additional path information you
+do want to be shown in the byte compiled file.
 
-case "$1" in
-  --basedir)
-    basedir=$2
-    if test -z "$basedir"; then
-      echo "$0: Missing argument to --basedir." 1>&2
-      exit 1
-    fi
-    shift 2
-    ;;
-  -h|--h*)
-    cat <<\EOF
-Usage: py-compile [--help] [--version] [--basedir DIR] FILES..."
-
-Byte compile some python scripts FILES.  This should be performed
-after they have been moved to the final installation location
+Example:
+  py-compile --destdir /tmp/pkg-root --basedir /usr/share/test test.py test2.py
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit 0
-    ;;
-  -v|--v*)
-    echo "py-compile $scriptversion"
-    exit 0
-    ;;
-esac
+      exit 0
+      ;;
+    -v|--v*)
+      echo "py-compile $scriptversion"
+      exit 0
+      ;;
+    *)
+      files="$files $1"
+      ;;
+  esac
+  shift
+done
 
-if [ $# = 0 ]; then
+if test -z "$files"; then
     echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
     exit 1
 fi
@@ -69,38 +89,51 @@
 # if basedir was given, then it should be prepended to filenames before
 # byte compilation.
 if [ -z "$basedir" ]; then
-    trans="path = file"
+    pathtrans="path = file"
 else
-    trans="path = os.path.join('$basedir', file)"
+    pathtrans="path = os.path.join('$basedir', file)"
+fi
+
+# if destdir was given, then it needs to be prepended to the filename to
+# byte compile but not go into the compiled file.
+if [ -z "$destdir" ]; then
+    filetrans="filepath = path"
+else
+    filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
 fi
 
 $PYTHON -c "
 import sys, os, string, py_compile
 
-files = '''$*'''
+files = '''$files'''
+
 print 'Byte-compiling python modules...'
 for file in string.split(files):
-    $trans
-    if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+    $pathtrans
+    $filetrans
+    if not os.path.exists(filepath) or not (len(filepath) >= 3
+                                            and filepath[-3:] == '.py'):
 	continue
     print file,
     sys.stdout.flush()
-    py_compile.compile(path)
+    py_compile.compile(filepath, filepath + 'c', path)
 print" || exit $?
 
 # this will fail for python < 1.5, but that doesn't matter ...
 $PYTHON -O -c "
 import sys, os, string, py_compile
 
-files = '''$*'''
+files = '''$files'''
 print 'Byte-compiling python modules (optimized versions) ...'
 for file in string.split(files):
-    $trans
-    if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+    $pathtrans
+    $filetrans
+    if not os.path.exists(filepath) or not (len(filepath) >= 3
+                                            and filepath[-3:] == '.py'):
 	continue
     print file,
     sys.stdout.flush()
-    py_compile.compile(path)
+    py_compile.compile(filepath, filepath + 'o', path)
 print" 2>/dev/null || :
 
 # Local Variables:
--- gnome-blog-0.8/protocols/Makefile.in.bytec	2005-01-13 09:16:10.365997809 -0500
+++ gnome-blog-0.8/protocols/Makefile.in	2005-01-13 09:16:44.221928753 -0500
@@ -237,7 +237,7 @@
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(gnomeblogdir)" $$dlist
+	PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(gnomeblogdir)" $$dlist
 
 uninstall-gnomeblogPYTHON:
 	@$(NORMAL_UNINSTALL)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:27:19 -0000	1.2
+++ .cvsignore	13 Mar 2005 02:58:17 -0000	1.3
@@ -1 +1 @@
-gnome-blog-0.7.tar.gz
+gnome-blog-0.8.tar.gz


Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/FC-3/gnome-blog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-blog.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gnome-blog.spec	13 Mar 2005 02:58:17 -0000	1.4
@@ -1,104 +1,121 @@
 %define gnome_python2_version 1.99.13
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pynext %(python -c 'print %{pyver} + 0.1')
+%{!?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:		gnome-blog
-Version:	0.7
-Release:	7
-Epoch:		0
+Version:	0.8
+Release:	5
 Summary:	GNOME panel object for posting blog entries
 
-Group:		User Interface/Desktops
+Group:		Applications/Internet
 License:	GPL
 URL:		http://www.gnome.org/~seth/gnome-blog/		
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-blog/0.7/gnome-blog-0.7.tar.gz
+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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-Requires:	gnome-python2-applet >= 0:%{gnome_python2_version}
-Requires:	gnome-python2-gconf  >= 0:%{gnome_python2_version}
-Requires:	pygtk2 >= 0:%{gnome_python2_version}
-Requires:	python >= 0:%{pyver}, python <= 0:%{pynext}
+Requires:	gnome-python2-applet >= %{gnome_python2_version}
+Requires:	gnome-python2-gconf  >= %{gnome_python2_version}
+Requires:	gnome-python2-gnomevfs >= %{gnome_python2_version}
+Requires:	pygtk2 >= %{gnome_python2_version}
+Requires:	python-abi = %{pyver}
 
-Requires(post,preun): GConf2
+Requires(post):	GConf2
+Requires(preun): GConf2
 
-BuildRequires:  pygtk2-devel >= 0:%{gnome_python2_version}
+BuildRequires:	pygtk2-devel >= %{gnome_python2_version}
 BuildRequires:	glib2-devel
-BuildRequires: 	gettext
+BuildRequires:	gettext
 BuildRequires:	GConf2
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
+BuildRequires:	intltool
 
 %description
 GNOME panel object that allows convenient posting of blog entries to
 any blog that supports the bloggerAPI.
 
-# ---------------------------------------------------------------------------------------------
-
 %prep
 %setup -q
-%{__sed} -i 's|\(<oaf_server iid="OAFIID:GNOME_BlogApplet_Factory" type="exe" location="\)\(blog_applet.py">\)|\1%{_libexecdir}/\2|' GNOME_BlogApplet.server.in
-
-# ---------------------------------------------------------------------------------------------
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure
 make %{?_smp_mflags}
 
-# ---------------------------------------------------------------------------------------------
-
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
 # 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
-desktop-file-install --vendor=fedora --dir=$RPM_BUILD_ROOT%{_datadir}/applications --add-category=X-Fedora --add-category=Network gnome-blog.desktop
-
-# Panel applets belong in /usr/libexec rather than /usr/bin
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/blog_applet.py $RPM_BUILD_ROOT%{_libexecdir}
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# ---------------------------------------------------------------------------------------------
-
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
 unset GCONF_CONFIG_SOURCES
- 
+
 %preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
 unset GCONF_CONFIG_SOURCES
 
-# ---------------------------------------------------------------------------------------------
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/*
 %{_libexecdir}/*
 %{_sysconfdir}/gconf/schemas/gnomeblog.schemas
-%{_datadir}/pixmaps/gnome-blog.png
+%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/applications/*.desktop
 %{_libdir}/bonobo/servers/*.server
-%dir %{_libdir}/python%{pyver}/site-packages/gnomeblog
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/*.py
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/gnome-blog-poster
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/*.pyc
-%ghost %{_libdir}/python*/site-packages/gnomeblog/*.pyo
-
-# ---------------------------------------------------------------------------------------------
+%dir %{python_sitelib}/gnomeblog
+%{python_sitelib}/gnomeblog/*.py
+%{python_sitelib}/gnomeblog/*.pyc
+%ghost %{python_sitelib}/gnomeblog/*.pyo
 
 %changelog
+* Tue Mar  1 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-5
+- Add build requires: intltool
+- Drop epoch: 0.
+
+* Mon Feb  7 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-4
+- Added patch to correct blog-poster bug.(#2377c5)
+
+* Thu Feb 03 2005 Toshio Kuratomi <toshio at tiki-lounge.com> - 0:0.8-0.fdr.3
+- No longer include gnome-blog-poster in the library path.  It only belongs
+  in the bindir.
+- Switch to the new python macros for python-abi.
+- Switch to python_sitelib in the files section.  Makes gnome-blog build on
+  x86_64.
+- Change group to Applications/Internet.
+
+* Thu Jan 13 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-0.fdr.2
+- Added makefile patch to fix python byte compiling from Toshio Kuratomi (#2377).
+
+* Wed Jan 12 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-0.fdr.1
+- Updated to 0.8.
+- Removed code from spec file that fixed location of blog_applet.py, since this was corrected upstream.
+- Added requires for gnome-python2-gnomevfs.
+
 * Tue Feb  3 2004 Brian Pepple <bdpepple at ameritech.net> 0:0.7-0.fdr.7
 - Removed Requires: GConf2, and replaced with Requires(post,preun).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:27:19 -0000	1.2
+++ sources	13 Mar 2005 02:58:17 -0000	1.3
@@ -1 +1 @@
-0aad0b5b0b3c59bb70ca6f5f9f81c170  gnome-blog-0.7.tar.gz
+d8e8a451f8e7fd4b1af49a6346301e2a  gnome-blog-0.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar 13 05:25:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 13 Mar 2005 00:25:45 -0500
Subject: rpms/gai/FC-3 gai.spec,1.7,1.8
Message-ID: <200503130525.j2D5Pj4B018528@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	gai.spec 
Log Message:
Add missing deps on gtkglext-devel as spotted by Fabrice Colin.
FC3 builds were fine though, because gtkglext-devel was present
in build system.



Index: gai.spec
===================================================================
RCS file: /cvs/extras/rpms/gai/FC-3/gai.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gai.spec	27 Feb 2005 05:31:34 -0000	1.7
+++ gai.spec	13 Mar 2005 05:25:43 -0000	1.8
@@ -1,7 +1,6 @@
 Name:		gai
 Version:	0.5.8
-Release:	4
-Epoch:		0
+Release:	5
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -11,14 +10,15 @@
 Patch0:		gai-0.5.8-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libgnomeui-devel, gtk2-devel >= 0:2.2, gnome-panel-devel
-BuildRequires:	SDL-devel
+BuildRequires:	libgnomeui-devel, gtk2-devel >= 2.2, gnome-panel-devel
+BuildRequires:	SDL-devel gtkglext-devel
 
 %package	devel
 Summary:	Library and headers for Generic Applet Interface
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel-devel, libgnomeui-devel
+Requires:	%{name} = %{version}-%{release}
+Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel-devel
+Requires:	libgnomeui-devel gtkglext-devel
 
 %description
 This library provides a generic interface for developing applets for Gnome 2
@@ -55,7 +55,7 @@
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING.LIB ChangeLog README* THANKS TODO WINDOWMANAGERS
 %{_libdir}/libgai.so.*
@@ -68,6 +68,9 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Sun Mar 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-5
+- Really add gtkglext-devel dependencies (Fabrice Colin).
+
 * Sun Feb 27 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-4
 - licence LGPL
 - BR SDL-devel gtkglext-devel
@@ -96,7 +99,7 @@
 
 * Tue Oct 28 2003 Michel Alexandre Salim <salimma[AT]users.sf.net> - 0.5.0-0.fdr.0.1.pre4
 - Fixed broken library naming (thanks Michael Schwendt)
- 
+
 * Mon Oct 27 2003 Michel Alexandre Salim <salimma[AT]users.sourceforge.net> - 0.5.0-0.fdr.0.pre4
 - Update to 0.5.0pre4; API change between 0.4.x and 0.5.0.
 - Most GAI applets now developed for 0.5.0, since 0.4.1 is not in Fedora yet one might as well move to 0.5.0 now.



From fedora-extras-commits at redhat.com  Sun Mar 13 05:25:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 13 Mar 2005 00:25:45 -0500
Subject: devel/gai gai.spec,1.8,1.9
Message-ID: <200503130525.j2D5Pjtk018525@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gai
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18503/d/d

Modified Files:
	gai.spec 
Log Message:
Add missing deps on gtkglext-devel as spotted by Fabrice Colin.
FC3 builds were fine though, because gtkglext-devel was present
in build system.



Index: gai.spec
===================================================================
RCS file: /cvs/extras/devel/gai/gai.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gai.spec	3 Mar 2005 21:26:02 -0000	1.8
+++ gai.spec	13 Mar 2005 05:25:43 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		gai
 Version:	0.5.8
-Release:	4
+Release:	5
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -11,13 +11,14 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel, gtk2-devel >= 2.2, gnome-panel-devel
-BuildRequires:	SDL-devel
+BuildRequires:	SDL-devel gtkglext-devel
 
 %package	devel
 Summary:	Library and headers for Generic Applet Interface
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel-devel, libgnomeui-devel
+Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel-devel
+Requires:	libgnomeui-devel gtkglext-devel
 
 %description
 This library provides a generic interface for developing applets for Gnome 2
@@ -67,6 +68,9 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Sun Mar 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-5
+- Really add gtkglext-devel dependencies (Fabrice Colin).
+
 * Sun Feb 27 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-4
 - licence LGPL
 - BR SDL-devel gtkglext-devel



From fedora-extras-commits at redhat.com  Sun Mar 13 20:52:22 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 13 Mar 2005 15:52:22 -0500
Subject: rpms/rpmlint/FC-3 .cvsignore, 1.5, 1.6 rpmlint-fedora-config, 1.3,
	1.4 rpmlint.spec, 1.8, 1.9 sources, 1.5,
	1.6 rpmlint-siteperl.patch, 1.1, NONE
Message-ID: <200503132052.j2DKqMqY018645@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint.spec sources 
Removed Files:
	rpmlint-siteperl.patch 
Log Message:
0.68, some default config improvements.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Feb 2005 19:28:58 -0000	1.5
+++ .cvsignore	13 Mar 2005 20:52:19 -0000	1.6
@@ -1 +1 @@
-rpmlint-0.67.tar.bz2
+rpmlint-0.68.tar.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-3/rpmlint-fedora-config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmlint-fedora-config	13 Feb 2005 19:28:58 -0000	1.3
+++ rpmlint-fedora-config	13 Mar 2005 20:52:20 -0000	1.4
@@ -55,6 +55,7 @@
     "Freeware",
     "GPL",
     "IBM Public License",
+    "LaTeX Project Public License",
     "LGPL",
     "MIT",
     "MPL",
@@ -78,7 +79,7 @@
 # Output filters
 addFilter("W: .* source-or-patch-not-[bg]zipped .*")
 addFilter("E: .* lib-package-without-%mklibname")
-addFilter("E: .* no-dependency (perl|python)-base.*")
+addFilter("E: .* no-dependency-on (perl|python)-base.*")
 addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
 addFilter("W: .* invalid-distribution .*")
 addFilter("W: .* invalid-vendor .*")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-3/rpmlint.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpmlint.spec	13 Feb 2005 19:28:58 -0000	1.8
+++ rpmlint.spec	13 Mar 2005 20:52:20 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           rpmlint
-Version:        0.67
+Version:        0.68
 Release:        1
 Epoch:          0
 Summary:        RPM correctness checker
@@ -7,9 +7,8 @@
 Group:          Development/Tools
 License:        GPL
 URL:            http://people.mandrakesoft.com/~flepied/projects/rpmlint/
-Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.67.tar.bz2
+Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.68.tar.bz2
 Source1:        %{name}-fedora-config
-Patch0:         %{name}-siteperl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,7 +22,6 @@
 
 %prep
 %setup -q
-%patch0
 %{__perl} -pi -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
 
@@ -77,12 +75,19 @@
 %{_bindir}/rpm*
 %dir %{_datadir}/rpmlint
 %{_datadir}/rpmlint/rpmlint.bash-completion
+%exclude %{_datadir}/rpmlint/compile.pyo
 %dir %{_sysconfdir}/rpmlint
 %config(noreplace) %{_sysconfdir}/rpmlint/config
 %ghost %{_sysconfdir}/bash_completion.d/rpmlint
 
 
 %changelog
+* Sun Mar 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.68-1
+- 0.68, siteperl patch applied upstream.
+- Fix "no-dependency-on" filtering in default config.
+- Add LaTeX Project Public License to default config.
+- Remove upstream-only %%changelog entries.
+
 * Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.67-1
 - 0.67.
 - Patch to catch more site_perl directories.
@@ -173,535 +178,3 @@
 
 * Sun Mar 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030330
 - First Fedora release, based on upstream spec.
-
-* Fri Jan 17 2003 Gwenole Beauchesne <gbeauchesne at mandrakesoft.com> 0.48-2mdk
-- BinariesCheck.py: Add lib64 paths
-- FilesCheck.py: Errour out about outside-libdir-files only if it
-  concerns a library package.  This is heuristically determined on the
-  package name as '^(lib|.+-libs)'.
-
-* Fri Jan 17 2003 Frederic Lepied <flepied at mandrakesoft.com> 0.48-1mdk
- o rpmlint.py: added a way to load an alternative config file (using -f).
- o SpecCheck.py: * added lib-package-without-%%mklibname
-                 * don't parse changelog section to find errors and
-                 correct source_dir_regex.
- o FilesCheck.py: added outside-libdir-files
- o I18NCheck.py: * Added 'en_US' as valid locale name
-                 * Added "lug" (Luganda) language as a valid code for
-                 translations
-                 * Added recognition of some more language codes
-                 (Gnome includes some translations in those languages now)
- o various exceptions
-
-* Thu Aug  8 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.47-1mdk
- o BinariesCheck.py: added /usr/lib/bonobo to no binary in /usr/lib exceptions
-                     corrected wrong loop for /usr/lib check
- o Config.py: added handling of default values.
- o FHSCheck.py: Add lib64 as standard subdir in /usr (that's the /lib<qual> part of FHS)
- o FilesCheck.py: Add lib64 directories
-                  use default values from Config.
- o I18NCheck.py: Added 'zh_HK' recognition
- o InitScriptCheck.py: allow to add/del service with rpm-helper scripts.
- o MenuCheck.py: add default values from Config.
- o PostCheck.py: added perl to dangerous command check trigger scripts too
-                 check rpm-helper prereq.
-                 corrected prereq test
- o SpecCheck.py: Also check for \{?_prefix}?/lib references
-
-* Tue Jun  4 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.46-1mdk
- o BinariesCheck.py: added no-binary and only-non-binary-in-usr-lib
-
-* Mon Jun  3 2002 Gwenole Beauchesne <gbeauchesne at mandrakesoft.com> 0.45-1mdk
- o SpecCheck.py: - Add configure-without-libdir-spec check
-	         - Add hardcoded-library-path check
-
-* Wed May 29 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.44-1mdk
- o added non-ghost-file check
- o added non-root-user-log-file and non-root-group-log-file.
-
-* Wed May  1 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.43-1mdk
- o added no-prereq-on check.
-
- o check that the package tags are coherent with the file name.
-
- o added a --policy option.
-
- o build only one regexp for all exception and correct the broken ones.
-
-* Fri Mar  8 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.42-2mdk
-- corrected rpmdiff location
-
-* Sun Mar  3 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.42-1mdk
- o  FilesCheck.py: allow perl and python dependencies to be on
-perl-base and python-base. Manage Mandrake perl versionning.
-
- o I18NCheck.py: Added 'mt' to recognized locales
-
- o various exceptions.
-
-* Sat Feb  9 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.41-1mdk
- o SpecCheck.py: report missing %clean section.
-
- o FilesCheck.py: check dependency on the right version of the
-interpreter for python and perl modules.
-
- o various exceptions.
-
-* Thu Jan 10 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.40-1mdk
-
- o MenuCheck.py: new check: invalid-menu-icon-type
-
- o TagsCheck.py: added libsafe.so as an invalid Requires.
-
- o sync with setup 2.2.0-18mdk (Chmouel).
-
- o various exceptions.
-
- o build the package in a way that rpm -V doesn't report warnings.
-
-* Fri Nov 30 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.39-2mdk
-
- o BinariesCheck.py: search references to home or tmp in /usr/lib/pkgconfig/ files.
-
- o FilesCheck.py: .nosearch files are allowed to have a zero length.
-
- o Config.py: added some exceptions.
-
-* Sun Nov 25 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.39-1mdk
-
- o TagsCheck.py: Corrected regexp to check devel provides.
-                 Added the new check invalid-dependency.
-
- o InitScriptCheck.py: Added incoherent-init-script-name check.
-	               Expand shell variable in incoherent-subsys check.
-
- o FilesCheck.py: Use list imported from the setup package for users
-   and groups (from setuplist.py).
-
- o PostCheck.py: Don't print error about percent if post-script has a
-                 %%. (Chmouel)
-	         Check that RPM_BUILD_ROOT or RPM_BUILD_DIR isn't
-	         used.
-
- o SpecCheck.py: Check also %_sourcedir.
-                 Check that the BuildRoot tag doesn't contain a
-                 hardcoded path.
-
- o BinariesCheck.py: Check if .la files contain tmp or home
-   references.
-
-* Tue Oct 30 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.38-1mdk
-
- o BinariesCheck.py: check that major version is present in package
-name.
-
- o FilesCheck.py: check that regular files haven't a zero size.
-
- o I18NCheck.py: only check binary packages.
-
- o SpecCheck.py: don't allow space before tag name.
-
- o TagsCheck.py: * allow space after the release in a changelog entry.
-                 * updated list of licenses from opensource.org and added non
-                 opensource ones.
-                * report a warning if no url tag is defined.
-
- o Config.py: various exceptions.
-
- o SourceCheck.py: correct boolean expression for strange-permission
-
-
-* Tue Oct 16 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.37-1mdk
-
- o SourceCheck.py: allow 0755 as a valid mode for source.
-
- o Config.py: various exceptions
-
- o TagsCheck.py: added invalid-word check in description and summary.
-                 added invalid-buildhost check.
-
- o FilesCheck.py: added .cvsignore to the list of cvs-internal-file.
-
- o BinariesCheck.py: check for new style of pic sections.
-
- o FilesCheck.py: Check if kernel modules are in the kernel package. (Chmouel)
-
- o PostCheck.py: track command with full path too.
-
- o FilesCheck.py: added squid group and user.
-
- o BinariesCheck.py: Warn for man pages without version in library packages.
-
- o DistributionCheck.py: More explicit path regexp check for info files. (Chmouel)
-
-
-* Fri Sep 28 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.36-1mdk
-
-- MenuCheck.py: check if a menu file is executable.
-
-- rpmlint.py: added -n/--noexception option to display all the errors/warnings
-without exceptions from Config.
-
-- TagsCheck.py: added the bugzilla https address as a valid one.
-
-- PostCheck.py: o ghost-files-without-postun => ghost-files-without-postin
-		o check if /tmp or /var/tmp is used.
-		o check if update-menus is called without a menu file.
-
-- FilesCheck.py: added /etc/logrotate.d entry check.
-
-- Config.py: various exceptions
-
-* Tue Aug 21 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.35-1mdk
-
-- BinariesCheck.py: o Make libraries not linked against libc errors
-  and not warnings. (Bill Nottingham)
-
-                    o libc doesn't need to be linked against libc,
-  and the dynamic linker doesn't need dependeny information. (Bill Nottingham)
-
-	            o Fix some of the library checks to be more correct. (Bill
-  Nottingham)
-
-- TagsCheck.py: added a check on obsoleted packages not provided.
-
-- FilesCheck.py: check non readable files.
-
-- PostCheck.py: check ~/ instead of ~ to allow awk scripts not to
-  give false reports.
-
-- MenuCheck.py: o added a check for / in menu titles.
-
-                o Add missing menu entries. (FredC)
-
-- I18NCheck.py: Added 'bs' as a valid language code name. (Pablo)
-
-- Config.py: added a few exceptions.
-
-* Sun Jul 15 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.34-1mdk
-- added missing descriptions.
-- added -a option to check all the installed packages.
-- TagsCheck.py: handle the libbzip2_1-devel case.
-
-* Fri Jul  6 2001 Christian Belisle <cbelisle at mandrakesoft.com> 0.33-2mdk
-- Added descriptions for the -i option.
-
-* Mon Jul  2 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.33-1mdk
-- more descriptions from Christian Belisle.
-
-- BinariesCheck.py: new check for files which can cause upgrade
- problems in the library packages.
-
-- TagsCheck.py: try to check alpha/beta/pre version improper use.
-
-- Filter.py: print description only if they aren't empty.
-
-- SpecCheck.py: added a check for obsolete tags.
-
-- FilesCheck.py: added named user and group to the exception list.
-
-* Mon Jun 18 2001 Christian Belisle <cbelisle at mandrakesoft.com> 0.32-2mdk
-- Added descriptions for the -i option.
-
-* Wed Jun 13 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.32-1mdk
-- rpmlint.py: o If the file given on the command line doesn't exist,
-               try to use the name as an installed package to check.
-              o new -i option to give explanation on the errors/warnings (not too much
-               descriptions have been added ;-)
-
-- MenuCheck.py: added new Office sub menus.
-
-- FilesCheck.py: o added /usr/X11R6/man subdirs to the list of
-	          STANDARD_DIRS.
-	         o warn for .so file only if they are in a lib dir.
-                 o warn for source files in a non devel package only if they are not
-                  doc files.
-
-- TagsCheck.py: corrected description-line-too-long check.
-
-- FilesCheck.py: add the rpm user and group per request of Jeff
-	         Johnson for the future version of rpm.
-
-* Fri May 18 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.31-1mdk
-- PostCheck.py: check that a script isn't only one command.
-                check postin and prein instead of postun and preun
-	        for ghost files creation.
-
-- MenuCheck.py: don't check NO_XALF in menu command.
-
-- FilesCheck.py: Add rpcuser.
-
-- Config.py: Expections for ldconfig, initscripts, netkit-base and iputils.
-
-- TagsCheck.py: check length of summary and description lines.
-
-* Fri Feb 16 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.30-1mdk
-
-- InitScriptCheck.py: check if runlevels are set
-
-- MenuCheck.py: added support to check launchers.
-
-- I18NCheck.py: check subdirs of /sur/share/man.
-
-- PostCheck.py: check that the postun creates the ghost files
-                added install to dangerous commands
-
-- LSBCheck.py: first version
-
-- TagsCheck.py: changed Window Maker to WindowMaker
-                Add https as valid url.
-                Used list of licenses from www.opensource.org/licenses
-                Check the full license before splitting in it
-                multiple parts.
-
-
-* Thu Dec  7 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.29-1mdk
-
-- PostCheck.py: Add /sbin/sash as VALID_SHELLS.
-
-- Config.py: added exceptions for dev.
-
-- FilesCheck.py: check dangling-symlink in the file index too to
-avoid missing special files that aren't created when extracted as a
-user.
-
-- FilesCheck.py: added a generic way to avoid dangling-symlink
-warnings.
-
-- TagsCheck.py: for devel packages, check dependency on lib package
-only when a .so file is present.
-
-- Config.py: add some execptions for pam (0750 dir for /etc/default
-is normal as weel to have gpasswd and chage as suid).
-
-- Config.py: Don't check info-file-with-install-info for bash since
-it's by default in the dir file.
-
-* Fri Nov 24 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.28-1mdk
-- TagsCheck.py: o check -devel package naming scheme only on binary
-                packages.
-                o report a warning if a -devel package comes with no
-                major in its name.
-                o added python licence and public domain.
-                o check syntax of url tag.
-
-- SourceCheck.py: only check compression on tar or diff files.
-
-- Config.py: various exceptions added.
-
-- BinariesCheck.py: o report the file location on objdump errors. 
-                    o new error: executable in library package.
-
-- I18NCheck.py: fuzzy check on packages without dependency on
-locales
-
-- FilesCheck.py: check if a package provides sources.
-
-- PostCheck.py: force a separator before dangerous command.
-
-
-* Mon Nov 13 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.27-1mdk
-- FilesCheck.py: don't warn if a games is setgid games.
-- README: RpmGamesGroup added to the list of available options.
-- Config.py: added exception for xman.
-- BinariesCheck.py: check ldconfig symlinks.
-- TagsCheck.py: don't check no-version-in-changelog for source rpm.
-
-* Fri Nov 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.26-1mdk
-
-- Config.py: added various exceptions.
-
-- TagsCheck.py: o allow multiple licenses.
-                o don't report anymore the package-provides-itself warning because
-                it's the default in rpm 4.
-                o try to not report incoherent-version-in-changelog for sub-packages.
-
-- MenuCheck.py: correct the non-transparent-xpm check.
-
-- FilesCheck.py: don't report buggy length-symlink anymore.
-
-* Thu Oct 12 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.25-1mdk
-
-- Config.py: added exception for sympa, rpm and bcast.
-
-- TagsCheck.py: o check that devel package depends on the base
-                  package with the same version.
-                o check that summary begins with a
-
-- PostCheck.py: o check dangerous commands.
-                ocheck reference to ~ or $HOME.
-
-- MenuCheck.py: o check that titles and longtitles begin by a capital
-                  letter.
-                o check that no version is included in title and longtitle.
-                o /lib/cpp errors to /dev/null for new cpp.
-
-- FilesCheck.py: check package owning system dirs.
-
-- SpecCheck.py: o new check.
-                o check name of spec file.
-                o check use of $RPM_SOURCE_DIR.
-                o warn if a patch is not applied.
-
-* Mon Oct  2 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.24-1mdk
-- FilesCheck.py: added apache and postgres to standard groups.
-- TagsCheck.py: spell check a la Debian.
-
-* Fri Sep 29 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.23-1mdk
-- MenuCheck.py: added Applications/Accessibility.
-                check that menu	files are readable by everyone.
-- Config.py: removed exception for /home.
-             added exceptions for vixie-cron.
-- FilesCheck.py: check cvs internal files.
-
-* Tue Sep 12 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.22-1mdk
-- PostCheck.py: print a warning on empty script.
-- FilesCheck.py: added postgres and apache to default users.
-- TagsCheck.py: added bugs at linux-mandrake.com as a valid packager address.
-- I18NCheck.py: check *.mo for file-not-in-%lang, not only in /usr/share/locale
-- TagsCheck.py, MenuCheck.py: replaced Networking/ICQ group with Networking/Instant messaging.
-
-* Thu Aug 31 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.21-1mdk
-- TagsCheck.py: check packager field compliance to a regexp.
-- Config.py: imported default exceptions.
-- TagsCheck.py: added Apache License, PHP Licence and BSD-Style.
-- MenuCheck.py: check hardcoded path in icon field and large, mini, 
-  normal icon files.
-- PostCheck.py: Fix typo in check of /usr/bin/perl.
-- PostCheck.py: Check perl script like we do for bash script.
-- I18NCheck.py: updated locales list
-- FilesCheck.py: Only check perl_temp_file in a /perl/ directory.
-
-* Fri Aug 25 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.20-1mdk
-- InitScriptCheck.py: new check for /etc/rc.d/init.d scripts.
-- PostCheck.py: check when a script is present that the shell is valid.
-- ConfigCheck.py: report warnings for app-defaults only
-in /usr/X11R6/lib/X11/app-defaults.
-- BinariesCheck.py: report the rpath warning if the directory isn't a
-sub-directory of /usr/lib/.
-
-* Fri Aug 18 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.19-1mdk
-- BinariesCheck.py: check rpath only on system lib paths (ie /lib,
-/usr/lib and /usr/X11R6/lib).  This can be configured with the
-SystemLibPaths option.
-- I18NCheck.py: warn if .mo is not registered in %%lang.
-- MenuCheck.py: protected kdesu check.
-- FilesCheck.py: check perl temporary files.
-- rpmlint.py: added ExtractDir option usable in the config
-file.
-- PostCheck.py: check ] in if statement.  report warning for a
-percent.
-
-* Thu Aug 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.18-1mdk
-- TagsCheck: check licence file.
-- ConfigCheck: check files without no-replace flag.
-- MenuCheck: allow depency on kdesu to point directly to /usr/bin/kdesu.
-- FHSCheck: allow ftp and www in var (from upcoming FHS 2.2).
-
-* Tue Aug  8 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.17-1mdk
-- PostCheck: check bourne shell syntax (Chmouel).
-- FileCheck: o check chkconfig calls for packages with a file in
-             /etc/rc.d/init.d.
-             o allow the call to install-info to be in %%preun.
-- MenuCheck: o take care of kdesu (Chmouel).
-- various exceptions added.
-
-* Wed Jul 19 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.16-1mdk
-- FHSCheck activated by default.
-- FileCheck: o check dangling symlinks.
-             o check info/dir.
-
-* Tue Jun 27 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.15-1mdk
-- 0.15:
- o check non transparent pixmaps in icon path
- o added a check for soname
- o added a warning for packages that provide themselves (for Pixel)
- o corrected check for needs in menu files.
- o various exceptions added.
-
-* Mon Apr 17 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.14-1mdk
-- 0.14:
- o MenuCheck: check old entries from KDE and GNOME and allow entries
-for sections.
- o config: exceptions for urpmi, sash, octave, ghc, procmail, rsh.
- o extract temp files in <tmppath>/<pkgname>.<pid>
-
-* Mon Apr 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.13-1mdk
-- 0.13:
- o MenuCheck: issue a warning if no icon specified (Chmouel).
-              corrected list of correct sections (Chmouel).
- o FilesCheck: check ldconfig calls in %%post and %%postun if the package
-provide a library.
- o config: new exceptions added.
- o BinariesCheck: check non sparc32 binaries in sparc packages.
-
-* Fri Mar 31 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.12-1mdk
-- 0.12:
- o MenuCheck: check binaries launched by menus and
-              check update-menus %%post and %%postun.
- o BinariesCheck: check for non sparc32 binaries in sparc rpms.
-
-* Mon Mar 27 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.11-1mdk
-- 0.11:
- o check menu files.
-
-* Tue Mar 14 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.10-1mdk
-- 1.10:
- o check .h, .a and .so in non devel package.
- o check files in /home.
- o corrected lists of groups.
-
-* Mon Feb 28 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.9.2-1mdk
-- added a dependency on rpm-python.
-- corrected rpm 3.0.4 support.
-
-* Wed Feb 23 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.9.1-1mdk
-- updated to support the way rpm 3.0.4 stores file names.
-
-* Thu Feb 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.9-1mdk
-
-- 0.9: * gpg support.
-       * check release extension.
-       * check non executable in bin directories.
-       * new options: ValidGroups, ReleaseExtension and
-	UseVersionInChangelog.
-
-* Thu Dec 30 1999 Frederic Lepied <flepied at mandrakesoft.com> 0.8-1mdk
-
-- 0.8: I18N checks, some exceptions added.
-
-* Mon Nov 15 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.7: more robust cleanup, filters are regexp now and added
-exception for /var/catman subirs beeing setgid.
-
-* Sat Oct 23 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.6.1: corrected compilation step.
-
-* Sat Oct 23 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.6: filter output, documentation checks.
-
-* Fri Oct 15 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.5: FHS check, configuration files.
-
-* Fri Oct  8 1999 Chmouel Boudjnah <chmouel at mandrakesoft.com>
-- Add Doc.
-
-* Thu Oct  7 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- version 0.4: pgp check and group name check.
-
-* Wed Oct  6 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- version 0.3.
-
-* Mon Oct  4 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- version 0.2.
-
-* Fri Oct  1 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- First spec file for Mandrake distribution.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Feb 2005 19:28:58 -0000	1.5
+++ sources	13 Mar 2005 20:52:20 -0000	1.6
@@ -1 +1 @@
-5b3e0d8eb10b6013d8987ce5a180c7ae  rpmlint-0.67.tar.bz2
+e321c9868b403366d314c77e637e09b9  rpmlint-0.68.tar.bz2


--- rpmlint-siteperl.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar 13 20:52:22 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 13 Mar 2005 15:52:22 -0500
Subject: rpms/rpmlint/devel .cvsignore, 1.5, 1.6 rpmlint-fedora-config, 1.3,
	1.4 rpmlint.spec, 1.9, 1.10 sources, 1.5,
	1.6 rpmlint-siteperl.patch, 1.1, NONE
Message-ID: <200503132052.j2DKqMm9018653@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint.spec sources 
Removed Files:
	rpmlint-siteperl.patch 
Log Message:
0.68, some default config improvements.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Feb 2005 19:28:58 -0000	1.5
+++ .cvsignore	13 Mar 2005 20:52:20 -0000	1.6
@@ -1 +1 @@
-rpmlint-0.67.tar.bz2
+rpmlint-0.68.tar.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint-fedora-config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmlint-fedora-config	13 Feb 2005 19:28:58 -0000	1.3
+++ rpmlint-fedora-config	13 Mar 2005 20:52:20 -0000	1.4
@@ -55,6 +55,7 @@
     "Freeware",
     "GPL",
     "IBM Public License",
+    "LaTeX Project Public License",
     "LGPL",
     "MIT",
     "MPL",
@@ -78,7 +79,7 @@
 # Output filters
 addFilter("W: .* source-or-patch-not-[bg]zipped .*")
 addFilter("E: .* lib-package-without-%mklibname")
-addFilter("E: .* no-dependency (perl|python)-base.*")
+addFilter("E: .* no-dependency-on (perl|python)-base.*")
 addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
 addFilter("W: .* invalid-distribution .*")
 addFilter("W: .* invalid-vendor .*")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmlint.spec	4 Mar 2005 00:05:43 -0000	1.9
+++ rpmlint.spec	13 Mar 2005 20:52:20 -0000	1.10
@@ -1,14 +1,13 @@
 Name:           rpmlint
-Version:        0.67
-Release:        1
+Version:        0.68
+Release:        2
 Summary:        RPM correctness checker
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://people.mandrakesoft.com/~flepied/projects/rpmlint/
-Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.67.tar.bz2
+Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.68.tar.bz2
 Source1:        %{name}-fedora-config
-Patch0:         %{name}-siteperl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0
 %{__perl} -pi -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
 
@@ -76,12 +74,19 @@
 %{_bindir}/rpm*
 %dir %{_datadir}/rpmlint
 %{_datadir}/rpmlint/rpmlint.bash-completion
+%exclude %{_datadir}/rpmlint/compile.pyo
 %dir %{_sysconfdir}/rpmlint
 %config(noreplace) %{_sysconfdir}/rpmlint/config
 %ghost %{_sysconfdir}/bash_completion.d/rpmlint
 
 
 %changelog
+* Sun Mar 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.68-2
+- 0.68, siteperl patch applied upstream.
+- Fix "no-dependency-on" filtering in default config.
+- Add LaTeX Project Public License to default config.
+- Remove upstream-only %%changelog entries.
+
 * Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.67-1
 - 0.67.
 - Patch to catch more site_perl directories.
@@ -172,535 +177,3 @@
 
 * Sun Mar 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030330
 - First Fedora release, based on upstream spec.
-
-* Fri Jan 17 2003 Gwenole Beauchesne <gbeauchesne at mandrakesoft.com> 0.48-2mdk
-- BinariesCheck.py: Add lib64 paths
-- FilesCheck.py: Errour out about outside-libdir-files only if it
-  concerns a library package.  This is heuristically determined on the
-  package name as '^(lib|.+-libs)'.
-
-* Fri Jan 17 2003 Frederic Lepied <flepied at mandrakesoft.com> 0.48-1mdk
- o rpmlint.py: added a way to load an alternative config file (using -f).
- o SpecCheck.py: * added lib-package-without-%%mklibname
-                 * don't parse changelog section to find errors and
-                 correct source_dir_regex.
- o FilesCheck.py: added outside-libdir-files
- o I18NCheck.py: * Added 'en_US' as valid locale name
-                 * Added "lug" (Luganda) language as a valid code for
-                 translations
-                 * Added recognition of some more language codes
-                 (Gnome includes some translations in those languages now)
- o various exceptions
-
-* Thu Aug  8 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.47-1mdk
- o BinariesCheck.py: added /usr/lib/bonobo to no binary in /usr/lib exceptions
-                     corrected wrong loop for /usr/lib check
- o Config.py: added handling of default values.
- o FHSCheck.py: Add lib64 as standard subdir in /usr (that's the /lib<qual> part of FHS)
- o FilesCheck.py: Add lib64 directories
-                  use default values from Config.
- o I18NCheck.py: Added 'zh_HK' recognition
- o InitScriptCheck.py: allow to add/del service with rpm-helper scripts.
- o MenuCheck.py: add default values from Config.
- o PostCheck.py: added perl to dangerous command check trigger scripts too
-                 check rpm-helper prereq.
-                 corrected prereq test
- o SpecCheck.py: Also check for \{?_prefix}?/lib references
-
-* Tue Jun  4 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.46-1mdk
- o BinariesCheck.py: added no-binary and only-non-binary-in-usr-lib
-
-* Mon Jun  3 2002 Gwenole Beauchesne <gbeauchesne at mandrakesoft.com> 0.45-1mdk
- o SpecCheck.py: - Add configure-without-libdir-spec check
-                 - Add hardcoded-library-path check
-
-* Wed May 29 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.44-1mdk
- o added non-ghost-file check
- o added non-root-user-log-file and non-root-group-log-file.
-
-* Wed May  1 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.43-1mdk
- o added no-prereq-on check.
-
- o check that the package tags are coherent with the file name.
-
- o added a --policy option.
-
- o build only one regexp for all exception and correct the broken ones.
-
-* Fri Mar  8 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.42-2mdk
-- corrected rpmdiff location
-
-* Sun Mar  3 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.42-1mdk
- o  FilesCheck.py: allow perl and python dependencies to be on
-perl-base and python-base. Manage Mandrake perl versionning.
-
- o I18NCheck.py: Added 'mt' to recognized locales
-
- o various exceptions.
-
-* Sat Feb  9 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.41-1mdk
- o SpecCheck.py: report missing %clean section.
-
- o FilesCheck.py: check dependency on the right version of the
-interpreter for python and perl modules.
-
- o various exceptions.
-
-* Thu Jan 10 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.40-1mdk
-
- o MenuCheck.py: new check: invalid-menu-icon-type
-
- o TagsCheck.py: added libsafe.so as an invalid Requires.
-
- o sync with setup 2.2.0-18mdk (Chmouel).
-
- o various exceptions.
-
- o build the package in a way that rpm -V doesn't report warnings.
-
-* Fri Nov 30 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.39-2mdk
-
- o BinariesCheck.py: search references to home or tmp in /usr/lib/pkgconfig/ files.
-
- o FilesCheck.py: .nosearch files are allowed to have a zero length.
-
- o Config.py: added some exceptions.
-
-* Sun Nov 25 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.39-1mdk
-
- o TagsCheck.py: Corrected regexp to check devel provides.
-                 Added the new check invalid-dependency.
-
- o InitScriptCheck.py: Added incoherent-init-script-name check.
-                       Expand shell variable in incoherent-subsys check.
-
- o FilesCheck.py: Use list imported from the setup package for users
-   and groups (from setuplist.py).
-
- o PostCheck.py: Don't print error about percent if post-script has a
-                 %%. (Chmouel)
-                 Check that RPM_BUILD_ROOT or RPM_BUILD_DIR isn't
-                 used.
-
- o SpecCheck.py: Check also %_sourcedir.
-                 Check that the BuildRoot tag doesn't contain a
-                 hardcoded path.
-
- o BinariesCheck.py: Check if .la files contain tmp or home
-   references.
-
-* Tue Oct 30 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.38-1mdk
-
- o BinariesCheck.py: check that major version is present in package
-name.
-
- o FilesCheck.py: check that regular files haven't a zero size.
-
- o I18NCheck.py: only check binary packages.
-
- o SpecCheck.py: don't allow space before tag name.
-
- o TagsCheck.py: * allow space after the release in a changelog entry.
-                 * updated list of licenses from opensource.org and added non
-                 opensource ones.
-                * report a warning if no url tag is defined.
-
- o Config.py: various exceptions.
-
- o SourceCheck.py: correct boolean expression for strange-permission
-
-
-* Tue Oct 16 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.37-1mdk
-
- o SourceCheck.py: allow 0755 as a valid mode for source.
-
- o Config.py: various exceptions
-
- o TagsCheck.py: added invalid-word check in description and summary.
-                 added invalid-buildhost check.
-
- o FilesCheck.py: added .cvsignore to the list of cvs-internal-file.
-
- o BinariesCheck.py: check for new style of pic sections.
-
- o FilesCheck.py: Check if kernel modules are in the kernel package. (Chmouel)
-
- o PostCheck.py: track command with full path too.
-
- o FilesCheck.py: added squid group and user.
-
- o BinariesCheck.py: Warn for man pages without version in library packages.
-
- o DistributionCheck.py: More explicit path regexp check for info files. (Chmouel)
-
-
-* Fri Sep 28 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.36-1mdk
-
-- MenuCheck.py: check if a menu file is executable.
-
-- rpmlint.py: added -n/--noexception option to display all the errors/warnings
-without exceptions from Config.
-
-- TagsCheck.py: added the bugzilla https address as a valid one.
-
-- PostCheck.py: o ghost-files-without-postun => ghost-files-without-postin
-                o check if /tmp or /var/tmp is used.
-                o check if update-menus is called without a menu file.
-
-- FilesCheck.py: added /etc/logrotate.d entry check.
-
-- Config.py: various exceptions
-
-* Tue Aug 21 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.35-1mdk
-
-- BinariesCheck.py: o Make libraries not linked against libc errors
-  and not warnings. (Bill Nottingham)
-
-                    o libc doesn't need to be linked against libc,
-  and the dynamic linker doesn't need dependeny information. (Bill Nottingham)
-
-                    o Fix some of the library checks to be more correct. (Bill
-  Nottingham)
-
-- TagsCheck.py: added a check on obsoleted packages not provided.
-
-- FilesCheck.py: check non readable files.
-
-- PostCheck.py: check ~/ instead of ~ to allow awk scripts not to
-  give false reports.
-
-- MenuCheck.py: o added a check for / in menu titles.
-
-                o Add missing menu entries. (FredC)
-
-- I18NCheck.py: Added 'bs' as a valid language code name. (Pablo)
-
-- Config.py: added a few exceptions.
-
-* Sun Jul 15 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.34-1mdk
-- added missing descriptions.
-- added -a option to check all the installed packages.
-- TagsCheck.py: handle the libbzip2_1-devel case.
-
-* Fri Jul  6 2001 Christian Belisle <cbelisle at mandrakesoft.com> 0.33-2mdk
-- Added descriptions for the -i option.
-
-* Mon Jul  2 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.33-1mdk
-- more descriptions from Christian Belisle.
-
-- BinariesCheck.py: new check for files which can cause upgrade
- problems in the library packages.
-
-- TagsCheck.py: try to check alpha/beta/pre version improper use.
-
-- Filter.py: print description only if they aren't empty.
-
-- SpecCheck.py: added a check for obsolete tags.
-
-- FilesCheck.py: added named user and group to the exception list.
-
-* Mon Jun 18 2001 Christian Belisle <cbelisle at mandrakesoft.com> 0.32-2mdk
-- Added descriptions for the -i option.
-
-* Wed Jun 13 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.32-1mdk
-- rpmlint.py: o If the file given on the command line doesn't exist,
-               try to use the name as an installed package to check.
-              o new -i option to give explanation on the errors/warnings (not too much
-               descriptions have been added ;-)
-
-- MenuCheck.py: added new Office sub menus.
-
-- FilesCheck.py: o added /usr/X11R6/man subdirs to the list of
-                   STANDARD_DIRS.
-                 o warn for .so file only if they are in a lib dir.
-                 o warn for source files in a non devel package only if they are not
-                  doc files.
-
-- TagsCheck.py: corrected description-line-too-long check.
-
-- FilesCheck.py: add the rpm user and group per request of Jeff
-                 Johnson for the future version of rpm.
-
-* Fri May 18 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.31-1mdk
-- PostCheck.py: check that a script isn't only one command.
-                check postin and prein instead of postun and preun
-                for ghost files creation.
-
-- MenuCheck.py: don't check NO_XALF in menu command.
-
-- FilesCheck.py: Add rpcuser.
-
-- Config.py: Expections for ldconfig, initscripts, netkit-base and iputils.
-
-- TagsCheck.py: check length of summary and description lines.
-
-* Fri Feb 16 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.30-1mdk
-
-- InitScriptCheck.py: check if runlevels are set
-
-- MenuCheck.py: added support to check launchers.
-
-- I18NCheck.py: check subdirs of /sur/share/man.
-
-- PostCheck.py: check that the postun creates the ghost files
-                added install to dangerous commands
-
-- LSBCheck.py: first version
-
-- TagsCheck.py: changed Window Maker to WindowMaker
-                Add https as valid url.
-                Used list of licenses from www.opensource.org/licenses
-                Check the full license before splitting in it
-                multiple parts.
-
-
-* Thu Dec  7 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.29-1mdk
-
-- PostCheck.py: Add /sbin/sash as VALID_SHELLS.
-
-- Config.py: added exceptions for dev.
-
-- FilesCheck.py: check dangling-symlink in the file index too to
-avoid missing special files that aren't created when extracted as a
-user.
-
-- FilesCheck.py: added a generic way to avoid dangling-symlink
-warnings.
-
-- TagsCheck.py: for devel packages, check dependency on lib package
-only when a .so file is present.
-
-- Config.py: add some execptions for pam (0750 dir for /etc/default
-is normal as weel to have gpasswd and chage as suid).
-
-- Config.py: Don't check info-file-with-install-info for bash since
-it's by default in the dir file.
-
-* Fri Nov 24 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.28-1mdk
-- TagsCheck.py: o check -devel package naming scheme only on binary
-                packages.
-                o report a warning if a -devel package comes with no
-                major in its name.
-                o added python licence and public domain.
-                o check syntax of url tag.
-
-- SourceCheck.py: only check compression on tar or diff files.
-
-- Config.py: various exceptions added.
-
-- BinariesCheck.py: o report the file location on objdump errors.
-                    o new error: executable in library package.
-
-- I18NCheck.py: fuzzy check on packages without dependency on
-locales
-
-- FilesCheck.py: check if a package provides sources.
-
-- PostCheck.py: force a separator before dangerous command.
-
-
-* Mon Nov 13 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.27-1mdk
-- FilesCheck.py: don't warn if a games is setgid games.
-- README: RpmGamesGroup added to the list of available options.
-- Config.py: added exception for xman.
-- BinariesCheck.py: check ldconfig symlinks.
-- TagsCheck.py: don't check no-version-in-changelog for source rpm.
-
-* Fri Nov 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.26-1mdk
-
-- Config.py: added various exceptions.
-
-- TagsCheck.py: o allow multiple licenses.
-                o don't report anymore the package-provides-itself warning because
-                it's the default in rpm 4.
-                o try to not report incoherent-version-in-changelog for sub-packages.
-
-- MenuCheck.py: correct the non-transparent-xpm check.
-
-- FilesCheck.py: don't report buggy length-symlink anymore.
-
-* Thu Oct 12 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.25-1mdk
-
-- Config.py: added exception for sympa, rpm and bcast.
-
-- TagsCheck.py: o check that devel package depends on the base
-                  package with the same version.
-                o check that summary begins with a
-
-- PostCheck.py: o check dangerous commands.
-                ocheck reference to ~ or $HOME.
-
-- MenuCheck.py: o check that titles and longtitles begin by a capital
-                  letter.
-                o check that no version is included in title and longtitle.
-                o /lib/cpp errors to /dev/null for new cpp.
-
-- FilesCheck.py: check package owning system dirs.
-
-- SpecCheck.py: o new check.
-                o check name of spec file.
-                o check use of $RPM_SOURCE_DIR.
-                o warn if a patch is not applied.
-
-* Mon Oct  2 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.24-1mdk
-- FilesCheck.py: added apache and postgres to standard groups.
-- TagsCheck.py: spell check a la Debian.
-
-* Fri Sep 29 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.23-1mdk
-- MenuCheck.py: added Applications/Accessibility.
-                check that menu files are readable by everyone.
-- Config.py: removed exception for /home.
-             added exceptions for vixie-cron.
-- FilesCheck.py: check cvs internal files.
-
-* Tue Sep 12 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.22-1mdk
-- PostCheck.py: print a warning on empty script.
-- FilesCheck.py: added postgres and apache to default users.
-- TagsCheck.py: added bugs at linux-mandrake.com as a valid packager address.
-- I18NCheck.py: check *.mo for file-not-in-%lang, not only in /usr/share/locale
-- TagsCheck.py, MenuCheck.py: replaced Networking/ICQ group with Networking/Instant messaging.
-
-* Thu Aug 31 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.21-1mdk
-- TagsCheck.py: check packager field compliance to a regexp.
-- Config.py: imported default exceptions.
-- TagsCheck.py: added Apache License, PHP Licence and BSD-Style.
-- MenuCheck.py: check hardcoded path in icon field and large, mini,
-  normal icon files.
-- PostCheck.py: Fix typo in check of /usr/bin/perl.
-- PostCheck.py: Check perl script like we do for bash script.
-- I18NCheck.py: updated locales list
-- FilesCheck.py: Only check perl_temp_file in a /perl/ directory.
-
-* Fri Aug 25 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.20-1mdk
-- InitScriptCheck.py: new check for /etc/rc.d/init.d scripts.
-- PostCheck.py: check when a script is present that the shell is valid.
-- ConfigCheck.py: report warnings for app-defaults only
-in /usr/X11R6/lib/X11/app-defaults.
-- BinariesCheck.py: report the rpath warning if the directory isn't a
-sub-directory of /usr/lib/.
-
-* Fri Aug 18 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.19-1mdk
-- BinariesCheck.py: check rpath only on system lib paths (ie /lib,
-/usr/lib and /usr/X11R6/lib).  This can be configured with the
-SystemLibPaths option.
-- I18NCheck.py: warn if .mo is not registered in %%lang.
-- MenuCheck.py: protected kdesu check.
-- FilesCheck.py: check perl temporary files.
-- rpmlint.py: added ExtractDir option usable in the config
-file.
-- PostCheck.py: check ] in if statement.  report warning for a
-percent.
-
-* Thu Aug 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.18-1mdk
-- TagsCheck: check licence file.
-- ConfigCheck: check files without no-replace flag.
-- MenuCheck: allow depency on kdesu to point directly to /usr/bin/kdesu.
-- FHSCheck: allow ftp and www in var (from upcoming FHS 2.2).
-
-* Tue Aug  8 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.17-1mdk
-- PostCheck: check bourne shell syntax (Chmouel).
-- FileCheck: o check chkconfig calls for packages with a file in
-             /etc/rc.d/init.d.
-             o allow the call to install-info to be in %%preun.
-- MenuCheck: o take care of kdesu (Chmouel).
-- various exceptions added.
-
-* Wed Jul 19 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.16-1mdk
-- FHSCheck activated by default.
-- FileCheck: o check dangling symlinks.
-             o check info/dir.
-
-* Tue Jun 27 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.15-1mdk
-- 0.15:
- o check non transparent pixmaps in icon path
- o added a check for soname
- o added a warning for packages that provide themselves (for Pixel)
- o corrected check for needs in menu files.
- o various exceptions added.
-
-* Mon Apr 17 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.14-1mdk
-- 0.14:
- o MenuCheck: check old entries from KDE and GNOME and allow entries
-for sections.
- o config: exceptions for urpmi, sash, octave, ghc, procmail, rsh.
- o extract temp files in <tmppath>/<pkgname>.<pid>
-
-* Mon Apr 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.13-1mdk
-- 0.13:
- o MenuCheck: issue a warning if no icon specified (Chmouel).
-              corrected list of correct sections (Chmouel).
- o FilesCheck: check ldconfig calls in %%post and %%postun if the package
-provide a library.
- o config: new exceptions added.
- o BinariesCheck: check non sparc32 binaries in sparc packages.
-
-* Fri Mar 31 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.12-1mdk
-- 0.12:
- o MenuCheck: check binaries launched by menus and
-              check update-menus %%post and %%postun.
- o BinariesCheck: check for non sparc32 binaries in sparc rpms.
-
-* Mon Mar 27 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.11-1mdk
-- 0.11:
- o check menu files.
-
-* Tue Mar 14 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.10-1mdk
-- 1.10:
- o check .h, .a and .so in non devel package.
- o check files in /home.
- o corrected lists of groups.
-
-* Mon Feb 28 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.9.2-1mdk
-- added a dependency on rpm-python.
-- corrected rpm 3.0.4 support.
-
-* Wed Feb 23 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.9.1-1mdk
-- updated to support the way rpm 3.0.4 stores file names.
-
-* Thu Feb 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.9-1mdk
-
-- 0.9: * gpg support.
-       * check release extension.
-       * check non executable in bin directories.
-       * new options: ValidGroups, ReleaseExtension and
-         UseVersionInChangelog.
-
-* Thu Dec 30 1999 Frederic Lepied <flepied at mandrakesoft.com> 0.8-1mdk
-
-- 0.8: I18N checks, some exceptions added.
-
-* Mon Nov 15 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.7: more robust cleanup, filters are regexp now and added
-exception for /var/catman subirs beeing setgid.
-
-* Sat Oct 23 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.6.1: corrected compilation step.
-
-* Sat Oct 23 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.6: filter output, documentation checks.
-
-* Fri Oct 15 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.5: FHS check, configuration files.
-
-* Fri Oct  8 1999 Chmouel Boudjnah <chmouel at mandrakesoft.com>
-- Add Doc.
-
-* Thu Oct  7 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- version 0.4: pgp check and group name check.
-
-* Wed Oct  6 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- version 0.3.
-
-* Mon Oct  4 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- version 0.2.
-
-* Fri Oct  1 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- First spec file for Mandrake distribution.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Feb 2005 19:28:58 -0000	1.5
+++ sources	13 Mar 2005 20:52:20 -0000	1.6
@@ -1 +1 @@
-5b3e0d8eb10b6013d8987ce5a180c7ae  rpmlint-0.67.tar.bz2
+e321c9868b403366d314c77e637e09b9  rpmlint-0.68.tar.bz2


--- rpmlint-siteperl.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar 13 21:09:16 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 13 Mar 2005 16:09:16 -0500
Subject: rpms/liferea import.log,1.8,1.9
Message-ID: <200503132109.j2DL9Gn8019729@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	import.log 
Log Message:
auto-import liferea-0.9.1-1 on branch devel from liferea-0.9.1-1.src.rpm
update to 0.9.1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/liferea/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	13 Jan 2005 19:33:01 -0000	1.8
+++ import.log	13 Mar 2005 21:09:14 -0000	1.9
@@ -5,3 +5,4 @@
 liferea-0_5_3-0_fdr_4_c_2:HEAD:liferea-0.5.3-0.fdr.4.c.2.src.rpm:1099889386
 liferea-0_6_4-1_b:HEAD:liferea-0.6.4-1.b.src.rpm:1105560383
 liferea-0_6_4-0_fdr_1_b_2:FC-2:liferea-0.6.4-0.fdr.1.b.2.src.rpm:1105644774
+liferea-0_9_1-1:HEAD:liferea-0.9.1-1.src.rpm:1110748150



From fedora-extras-commits at redhat.com  Sun Mar 13 21:09:16 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 13 Mar 2005 16:09:16 -0500
Subject: rpms/liferea/devel .cvsignore, 1.4, 1.5 liferea.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200503132109.j2DL9Ghf019733@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
auto-import liferea-0.9.1-1 on branch devel from liferea-0.9.1-1.src.rpm
update to 0.9.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Jan 2005 20:05:46 -0000	1.4
+++ .cvsignore	13 Mar 2005 21:09:14 -0000	1.5
@@ -1 +1 @@
-liferea-0.6.4b.tar.gz
+liferea-0.9.1.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- liferea.spec	3 Mar 2005 22:41:32 -0000	1.8
+++ liferea.spec	13 Mar 2005 21:09:14 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           liferea
-Version:        0.9.0
-Release:        1.b
-Summary:        RSS/RDF feed reader
+Version:        0.9.1
+Release:        1
+Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
-Source0:        http://download.sourceforge.net/liferea/liferea-0.9.0b.tar.gz
+Source0:        http://download.sourceforge.net/liferea/liferea-0.9.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel
@@ -21,15 +21,15 @@
 
 
 %description
-Liferea (Linux Feed Reader) is an RSS/RDF feed reader.
-It's intended to be a clone of the Windows-only FeedReader.
-It can be used to maintain a list of subscribed feeds,
-browse through their items, and show their contents
+Liferea (Linux Feed Reader) is an RSS/RDF feed reader. 
+It's intended to be a clone of the Windows-only FeedReader. 
+It can be used to maintain a list of subscribed feeds, 
+browse through their items, and show their contents 
 using GtkHTML.
 
 
 %prep
-%setup -q -n %{name}-%{version}b
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -42,10 +42,10 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 %find_lang %{name}
 
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-desktop-file-install --vendor fedora              \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-  --add-category X-Fedora                         \
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-install --vendor fedora			\
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
+  --add-category X-Fedora			        \
   %{name}.desktop
 
 
@@ -81,14 +81,18 @@
 
 
 %changelog
-* Tue Jan 18 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-1.b
+* Sat Mar 12 2005 Brian Pepple <bdpepple at ameritech.net> - 0.9.1-1
+- Updated to 0.9.1.
+- Drop epoch: 0.
+
+* Tue Jan 18 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-0.1.b
 - Updated to 0.9.0b.
 - Remove seperate desktop file.
 
-* Fri Jan 14 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-1
+* Fri Jan 14 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-0.fdr.1
 - Updated to 0.9.0.
 
-* Wed Jan 12 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.6.4-1.b
+* Wed Jan 12 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.6.4-0.fdr.1.b
 - Updated to 0.6.4b.
 
 * Mon Nov  1 2004 Brian Pepple <bdpepple at ameritech.net> - 0:0.6.1-0.fdr.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jan 2005 00:58:10 -0000	1.5
+++ sources	13 Mar 2005 21:09:14 -0000	1.6
@@ -1 +1 @@
-2781b3ae500e089497fcbee97bf73441  liferea-0.9.0b.tar.gz
+f0d5f184034697522e68e92909897043  liferea-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar 13 21:18:17 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 13 Mar 2005 16:18:17 -0500
Subject: rpms/liferea import.log,1.9,1.10
Message-ID: <200503132118.j2DLIHqs020033@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	import.log 
Log Message:
auto-import liferea-0.9.1-1 on branch FC-3 from liferea-0.9.1-1.src.rpm
update to 0.9.1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/liferea/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	13 Mar 2005 21:09:14 -0000	1.9
+++ import.log	13 Mar 2005 21:18:15 -0000	1.10
@@ -6,3 +6,4 @@
 liferea-0_6_4-1_b:HEAD:liferea-0.6.4-1.b.src.rpm:1105560383
 liferea-0_6_4-0_fdr_1_b_2:FC-2:liferea-0.6.4-0.fdr.1.b.2.src.rpm:1105644774
 liferea-0_9_1-1:HEAD:liferea-0.9.1-1.src.rpm:1110748150
+liferea-0_9_1-1:FC-3:liferea-0.9.1-1.src.rpm:1110748691



From fedora-extras-commits at redhat.com  Sun Mar 13 21:18:17 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 13 Mar 2005 16:18:17 -0500
Subject: rpms/liferea/FC-3 .cvsignore, 1.4, 1.5 liferea.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200503132118.j2DLIHDg020037@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
auto-import liferea-0.9.1-1 on branch FC-3 from liferea-0.9.1-1.src.rpm
update to 0.9.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Jan 2005 20:05:46 -0000	1.4
+++ .cvsignore	13 Mar 2005 21:18:15 -0000	1.5
@@ -1 +1 @@
-liferea-0.6.4b.tar.gz
+liferea-0.9.1.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-3/liferea.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- liferea.spec	23 Jan 2005 00:58:10 -0000	1.7
+++ liferea.spec	13 Mar 2005 21:18:15 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           liferea
-Version:        0.9.0
-Release:        1.b
-Epoch:          0
-Summary:        An RSS/RDF feed reader.
+Version:        0.9.1
+Release:        1
+Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
-Source0:        http://download.sourceforge.net/liferea/liferea-0.9.0b.tar.gz
+Source0:        http://download.sourceforge.net/liferea/liferea-0.9.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel
@@ -30,7 +29,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}b
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -43,8 +42,8 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 %find_lang %{name}
 
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-desktop-file-install --vendor fedora                    \
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-install --vendor fedora			\
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
   --add-category X-Fedora			        \
   %{name}.desktop
@@ -82,14 +81,18 @@
 
 
 %changelog
-* Tue Jan 18 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-1.b
+* Sat Mar 12 2005 Brian Pepple <bdpepple at ameritech.net> - 0.9.1-1
+- Updated to 0.9.1.
+- Drop epoch: 0.
+
+* Tue Jan 18 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-0.1.b
 - Updated to 0.9.0b.
 - Remove seperate desktop file.
 
-* Fri Jan 14 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-1
+* Fri Jan 14 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-0.fdr.1
 - Updated to 0.9.0.
 
-* Wed Jan 12 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.6.4-1.b
+* Wed Jan 12 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.6.4-0.fdr.1.b
 - Updated to 0.6.4b.
 
 * Mon Nov  1 2004 Brian Pepple <bdpepple at ameritech.net> - 0:0.6.1-0.fdr.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jan 2005 00:58:10 -0000	1.5
+++ sources	13 Mar 2005 21:18:15 -0000	1.6
@@ -1 +1 @@
-2781b3ae500e089497fcbee97bf73441  liferea-0.9.0b.tar.gz
+f0d5f184034697522e68e92909897043  liferea-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar 13 21:43:45 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 13 Mar 2005 16:43:45 -0500
Subject: rpms/pure-ftpd - New directory
Message-ID: <200503132143.j2DLhj4q020650@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20643/pure-ftpd

Log Message:
Directory /cvs/extras/rpms/pure-ftpd added to the repository




From fedora-extras-commits at redhat.com  Sun Mar 13 21:43:45 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 13 Mar 2005 16:43:45 -0500
Subject: rpms/pure-ftpd/devel - New directory
Message-ID: <200503132143.j2DLhj1B020653@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20643/pure-ftpd/devel

Log Message:
Directory /cvs/extras/rpms/pure-ftpd/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Mar 13 21:44:18 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 13 Mar 2005 16:44:18 -0500
Subject: rpms/pure-ftpd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503132144.j2DLiIuF020721@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20712

Added Files:
	Makefile import.log 
Log Message:
Setup of module pure-ftpd


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

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

common : CVS/Root
	@cvs 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 Mar 13 21:44:18 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 13 Mar 2005 16:44:18 -0500
Subject: rpms/pure-ftpd/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503132144.j2DLiI7Z020724@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20712/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pure-ftpd


--- 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 Mar 13 21:45:56 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 13 Mar 2005 16:45:56 -0500
Subject: rpms/pure-ftpd/devel pure-ftpd-1.0.20-config.patch, NONE,
	1.1 pure-ftpd-1.0.20-libdir.patch, NONE, 1.1 pure-ftpd.init,
	NONE, 1.1 pure-ftpd.logrotate, NONE, 1.1 pure-ftpd.spec, NONE,
	1.1 pure-ftpd.xinetd, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200503132145.j2DLjus1020890@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20878/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pure-ftpd-1.0.20-config.patch pure-ftpd-1.0.20-libdir.patch 
	pure-ftpd.init pure-ftpd.logrotate pure-ftpd.spec 
	pure-ftpd.xinetd 
Log Message:
auto-import pure-ftpd-1.0.20-0.fdr.9 on branch devel from pure-ftpd-1.0.20-0.fdr.9.src.rpm

pure-ftpd-1.0.20-config.patch:

--- NEW FILE pure-ftpd-1.0.20-config.patch ---
--- ./configuration-file/pure-ftpd.conf.in.config	2004-05-15 22:34:54.000000000 +0200
+++ ./configuration-file/pure-ftpd.conf.in	2005-02-11 20:26:35.209063248 +0100
@@ -9,7 +9,7 @@
 # instead of command-line options, please run the
 # following command :
 #
-# @prefix@/sbin/pure-config.pl @prefix@/etc/pure-ftpd.conf
+# @sbindir@/pure-config.pl @sysconfdir@/pure-ftpd.conf
 #
 # Please don't forget to have a look at documentation at
 # http://www.pureftpd.org/documentation.shtml for a complete list of
@@ -107,23 +107,23 @@
 
 # LDAP configuration file (see README.LDAP)
 
-# LDAPConfigFile                /etc/pureftpd-ldap.conf
+# LDAPConfigFile                @sysconfdir@/pureftpd-ldap.conf
 
 
 
 # MySQL configuration file (see README.MySQL)
 
-# MySQLConfigFile               /etc/pureftpd-mysql.conf
+# MySQLConfigFile               @sysconfdir@/pureftpd-mysql.conf
 
 
 # Postgres configuration file (see README.PGSQL)
 
-# PGSQLConfigFile               /etc/pureftpd-pgsql.conf
+# PGSQLConfigFile               @sysconfdir@/pureftpd-pgsql.conf
 
 
 # PureDB user database (see README.Virtual-Users)
 
-# PureDB                        /etc/pureftpd.pdb
+# PureDB                        @sysconfdir@/pureftpd.pdb
 
 
 # Path to pure-authd socket (see README.Authentication-Modules)
@@ -134,7 +134,7 @@
 
 # If you want to enable PAM authentication, uncomment the following line
 
-# PAMAuthentication             yes
+PAMAuthentication             yes
 
 
 
@@ -158,7 +158,7 @@
 # 'ls' recursion limits. The first argument is the maximum number of
 # files to be displayed. The second one is the max subdirectories depth
 
-LimitRecursion              2000 8
+LimitRecursion              7500 8
 
 
 
@@ -237,7 +237,7 @@
 
 # Minimum UID for an authenticated user to log in.
 
-MinUID                      100
+MinUID                      500
 
 
 
@@ -276,7 +276,7 @@
 
 # Disallow anonymous users to upload new files (no = upload is allowed)
 
-AnonymousCantUpload         no
+AnonymousCantUpload         yes
 
 
 
@@ -301,7 +301,7 @@
 # fw.c9x.org - jedi [13/Dec/1975:19:36:39] "GET /ftp/linux.tar.bz2" 200 21809338
 # This log file can then be processed by www traffic analyzers.
 
-# AltLog                     clf:/var/log/pureftpd.log
+AltLog                     clf:/var/log/pureftpd.log
 
 
 
@@ -434,3 +434,10 @@
 # By default, both IPv4 and IPv6 are enabled.
 
 # IPV6Only                 yes
+
+
+
+# Do not use the /etc/ftpusers file to disable accounts. We're already
+# using MinUID to block users with uid < 500
+
+UseFtpUsers no

pure-ftpd-1.0.20-libdir.patch:

--- NEW FILE pure-ftpd-1.0.20-libdir.patch ---
--- ./configure.libdir	2004-06-20 19:41:54.000000000 +0200
+++ ./configure	2005-01-31 12:33:03.901660331 +0100
@@ -19781,8 +19781,8 @@
       LDFLAGS="$LDFLAGS -L${withval}/lib -L${withval}/lib/mysql -L${withval}/mysql/lib"
       CPPFLAGS="$CPPFLAGS -I${withval}/include -I${withval}/include/mysql -I${withval}/mysql/include"
     else
-      LD_RUN_PATH="/usr/local/mysql/lib:/usr/local/mysql/lib/mysql:/usr/lib/mysql:/usr/mysql/lib:/usr/mysql/lib/mysql:/usr/local/lib/mysql:${LD_RUN_PATH:+:}${LD_RUN_PATH}"
-      LDFLAGS="$LDFLAGS -L/usr/local/mysql/lib -L/usr/lib/mysql -L/usr/mysql/lib -L/usr/local/lib/mysql -L/usr/local/mysql/lib/mysql -L/usr/mysql/lib/mysql"
+      LD_RUN_PATH="/usr/local/mysql/lib:/usr/local/mysql/lib/mysql:${libdir}/mysql:/usr/mysql/lib:/usr/mysql/lib/mysql:/usr/local/lib/mysql:${LD_RUN_PATH:+:}${LD_RUN_PATH}"
+      LDFLAGS="$LDFLAGS -L/usr/local/mysql/lib -L${libdir}/mysql -L/usr/mysql/lib -L/usr/local/lib/mysql -L/usr/local/mysql/lib/mysql -L/usr/mysql/lib/mysql"
       CPPFLAGS="$CPPFLAGS -I/usr/local/mysql/include -I/usr/include/mysql -I/usr/mysql/include -I/usr/local/include/mysql -I/usr/local/mysql/include/mysql -I/usr/mysql/include/mysql"
     fi
 


--- NEW FILE pure-ftpd.init ---
#!/bin/bash
#
# Startup script for the pure-ftpd FTP Server  $Revision: 1.1 $
#
# chkconfig: - 85 15
# description: Pure-FTPd is an FTP server daemon based upon Troll-FTPd
# processname: pure-ftpd
# pidfile: /var/run/pure-ftpd.pid
# config: /etc/pure-ftpd/pure-ftpd.conf

# Source function library.
. /etc/init.d/functions
. /etc/sysconfig/network

# Check that networking is configured.
[ ${NETWORKING} = "no" ] && exit 0

RETVAL=0

# Path to the pure-ftp binaries.
fullpath=/usr/sbin/pure-ftpd
pureftpwho=/usr/sbin/pure-ftpwho
pure_config=/etc/pure-ftpd/pure-ftpd.conf
pure_launch_script=/usr/sbin/pure-config.pl


start() {
	echo -n $"Starting Pure-ftpd: "
	daemon $pure_launch_script $pure_config  --daemonize
	RETVAL=$?
	[ $RETVAL = 0 ] && touch /var/lock/subsys/pure-ftpd
	echo
}

stop() {
	echo -n $"Stopping Pure-ftpd: "
	killproc pure-ftpd
	RETVAL=$?
	[ $RETVAL = 0 ] && rm -f /var/lock/subsys/pure-ftpd
	echo
}

# See how we were called.
case "$1" in
	start)
		start
		;;
	stop)
		stop
		;;
	restart)
		stop
		start
		;;
	reload)
		echo -n "Re-reading Pure-ftpd config: "
		killproc pure-ftpd -HUP
		RETVAL=$?
		echo
		;;
	condrestart)
		if [ -f /var/lock/subsys/pure-ftpd ] ; then
			stop
			# avoid race
			sleep 3
			start
		fi
		;;
	status)
		status pure-ftpd
		RETVAL=$?
		if [ -f $pureftpwho ] && [ $RETVAL -eq 0 ] ; then
			$pureftpwho
		fi
		;;
	*)
		echo $"Usage: pure-ftpd {start|stop|restart|reload|condrestart|status}"
		RETVAL=1
esac
exit $RETVAL


--- NEW FILE pure-ftpd.logrotate ---
/var/log/pureftpd.log {
    weekly
    notifempty
    missingok
}


--- NEW FILE pure-ftpd.spec ---
Name:       pure-ftpd
Version:    1.0.20
Release:    0.fdr.9
Epoch:      0
Summary:    Lightweight, fast and secure FTP server

Group:      System Environment/Daemons
License:    BSD
URL:        http://www.pureftpd.org
Source0:    ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.20.tar.bz2
Source1:    pure-ftpd.init 
Source2:    pure-ftpd.logrotate
Source3:    pure-ftpd.xinetd
Patch0:     pure-ftpd-1.0.20-config.patch
Patch1:     pure-ftpd-1.0.20-libdir.patch
Provides:   ftpserver
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pam-devel, perl, python, libcap-devel
#BuildRequires: openssl-devel
%{?_with_ldap:BuildRequires:  openldap-devel}
%{?_with_mysql:BuildRequires: mysql-devel}
%{?_with_pgsql:BuildRequires: postgresql-devel}

Requires(post):   chkconfig
Requires(preun):  chkconfig, initscripts
Requires(postun): initscripts
Requires:   logrotate


%description
Pure-FTPd is a fast, production-quality, standard-comformant FTP server,
based upon Troll-FTPd. Unlike other popular FTP servers, it has no known
security flaw, it is really trivial to set up and it is especially designed
for modern Linux and FreeBSD kernels (setfsuid, sendfile, capabilities) .
Features include PAM support, IPv6, chroot()ed home directories, virtual
domains, built-in LS, anti-warez system, bandwidth throttling, FXP, bounded
ports for passive downloads, UL/DL ratios, native LDAP and SQL support,
Apache log files and more.
Rebuild switches:
--with ldap     enable ldap support
--with mysql    enable mysql support
--with pgsql    enable postgresql support
--with extauth  enable external authentication


%prep
%setup -q 
%patch0 -p0 -b .config
%patch1 -p0 -b .libdir


%build
%configure  --with-paranoidmsg \
            --with-capabilities \
            --with-privsep \
            --with-pam \
            --with-puredb \
            --with-sendfile \
            --with-altlog \
            --with-cookie \
            --with-diraliases \
            --with-throttling \
            --with-ratios \
            --with-quotas \
            --with-ftpwho \
            --with-welcomemsg \
            --with-uploadscript \
            --with-peruserlimits \
            --with-virtualhosts \
            --with-virtualchroot \
            --with-largefile \
            --sysconfdir=%{_sysconfdir}/%{name} \
            --without-tls \
            --without-rendezvous \
            %{?_with_ldap} \
            %{?_with_mysql} \
            %{?_with_pgsql} \
            %{?_with_extauth}

make %{?_smp_mflags}

%install 
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8/
install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/ftp

# Conf 
install -p -m 755 configuration-file/pure-config.pl $RPM_BUILD_ROOT%{_sbindir}
install -p -m 644 configuration-file/pure-ftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -p -m 755 configuration-file/pure-config.py $RPM_BUILD_ROOT%{_sbindir}
install -p -m 644 pureftpd-ldap.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -p -m 644 pureftpd-mysql.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -p -m 644 pureftpd-pgsql.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}

# Man
install -p -m 644 man/pure-ftpd.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-ftpwho.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-mrtginfo.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-uploadscript.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-pw.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-pwconvert.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-statsdecode.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-quotacheck.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-authd.8 $RPM_BUILD_ROOT%{_mandir}/man8

# Init script
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}

# Pam 
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
install -p -m 644 pam/pure-ftpd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/

# Logrotate
install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}

# xinetd support
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/
install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ "$1" -le "1" ]; then 
    /sbin/chkconfig --add pure-ftpd
fi

%preun
if [ "$1" -lt "1" ]; then
    /sbin/service pure-ftpd stop > /dev/null 2>&1 || :
    /sbin/chkconfig --del pure-ftpd
fi

%postun 
if [ "$1" -ge "1" ]; then 
    /sbin/service pure-ftpd condrestart > /dev/null 2>&1 
fi


%files
%defattr(-, root, root, -)
%doc FAQ THANKS README.Authentication-Modules README.Virtual-Users README
%doc README.Contrib README.Configuration-File AUTHORS CONTACT HISTORY NEWS
%doc README.LDAP README.PGSQL README.MySQL README.Netfilter
%doc contrib/pure-vpopauth.pl pureftpd.schema contrib/pure-stat.pl
%{_bindir}/pure-*
%{_sbindir}/pure-*
%config %{_initrddir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
%{_mandir}/man8/*
%dir /var/ftp/


%changelog
* Wed Feb 16 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.9
- license is BSD, not GPL

* Mon Feb 14 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.8
- various fixes. See bug 1573 (fedora.us) for more info.

* Fri Feb 11 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.7
- fix init script
- require logrotate
- add rebuild switches to lower dependancies
- see bug 1573 (fedora.us) for more info.

* Fri Feb 04 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.6
- Add the "UseFtpUsers no" directive in the config file since we don't
  use it anymore

* Wed Feb 02 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.5
- various spec file improvements

* Mon Jan 31 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.4
- add patch for x86_64 support
- implement wishes in bug 1573 from Jose Pedro Oliveira
- don't use the ftpusers file, and thus remove conflicts with other FTP servers
- rediff config patch

* Tue Nov 02 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.3
- add large file support

* Fri Sep 24 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.2
- redirect %%preun output to /dev/null
- add requirements to chkconfig for the scriptlets

* Sun Aug 01 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.1
- version 1.0.20 (bugfixes)

* Mon Jun 28 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.19-0.fdr.1
- version 1.0.19

* Tue May 04 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.18-0.fdr.1
- version 1.0.18
- spec file cleanups

* Sun Oct 19 2003 Aurelien Bompard <gauret[AT]free.fr> 1.0.16a-1
- Redhatize the Mandrake RPM
- version 1.0.16a
- improve ftpusers creation script



--- NEW FILE pure-ftpd.xinetd ---
# default: off
# description: pure-ftpd server, xinetd version. \
# Don't run the standalone version if you run \
# this and remember do set "Daemonize" to "no" \
# in /etc/pure-ftpd/pure-ftpd.conf
service ftp
{
	disable	= yes
	socket_type		= stream
	wait			= no
	user			= root
	server			= /usr/sbin/pure-config.pl
	server_args		= /etc/pure-ftpd/pure-ftpd.conf
	log_on_success		+= DURATION USERID
	log_on_failure		+= USERID
	nice			= 10
}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Mar 2005 21:44:16 -0000	1.1
+++ .cvsignore	13 Mar 2005 21:45:54 -0000	1.2
@@ -0,0 +1 @@
+pure-ftpd-1.0.20.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Mar 2005 21:44:16 -0000	1.1
+++ sources	13 Mar 2005 21:45:54 -0000	1.2
@@ -0,0 +1 @@
+e928e9e15adf6b52bfe6183fdad20144  pure-ftpd-1.0.20.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar 13 21:45:56 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 13 Mar 2005 16:45:56 -0500
Subject: rpms/pure-ftpd import.log,1.1,1.2
Message-ID: <200503132145.j2DLjuvH020887@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20878

Modified Files:
	import.log 
Log Message:
auto-import pure-ftpd-1.0.20-0.fdr.9 on branch devel from pure-ftpd-1.0.20-0.fdr.9.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Mar 2005 21:44:16 -0000	1.1
+++ import.log	13 Mar 2005 21:45:53 -0000	1.2
@@ -0,0 +1 @@
+pure-ftpd-1_0_20-0_fdr_9:HEAD:pure-ftpd-1.0.20-0.fdr.9.src.rpm:1110750342



From fedora-extras-commits at redhat.com  Sun Mar 13 21:49:31 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 13 Mar 2005 16:49:31 -0500
Subject: rpms/pure-ftpd/devel pure-ftpd.spec,1.1,1.2
Message-ID: <200503132149.j2DLnVGO021084@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21076

Modified Files:
	pure-ftpd.spec 
Log Message:
- adapt to Fedora Extras (drop Epoch, change Release tag)



Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pure-ftpd.spec	13 Mar 2005 21:45:54 -0000	1.1
+++ pure-ftpd.spec	13 Mar 2005 21:49:29 -0000	1.2
@@ -1,7 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.20
-Release:    0.fdr.9
-Epoch:      0
+Release:    1
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -164,6 +163,9 @@
 
 
 %changelog
+* Sun Mar 13 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.20-1
+- adapt to Fedora Extras (drop Epoch, change Release tag)
+
 * Wed Feb 16 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.9
 - license is BSD, not GPL
 



From gauret at free.fr  Sun Mar 13 22:35:20 2005
From: gauret at free.fr (Aurelien Bompard)
Date: Sun, 13 Mar 2005 23:35:20 +0100
Subject: APPROVED: pure-ftpd
Message-ID: <200503132335.20873.gauret@free.fr>

Name: pure-ftpd
Pure-FTPd is a fast, production-quality, standard-comformant FTP server,
based upon Troll-FTPd. Unlike other popular FTP servers, it has no known
security flaw, it is really trivial to set up and it is especially designed
for modern Linux and FreeBSD kernels (setfsuid, sendfile, capabilities) .
Features include PAM support, IPv6, chroot()ed home directories, virtual
domains, built-in LS, anti-warez system, bandwidth throttling, FXP, bounded
ports for passive downloads, UL/DL ratios, native LDAP and SQL support,
Apache log files and more.

QA done at fedora.us : https://bugzilla.fedora.us/show_bug.cgi?id=1573

Maintainer: Aurelien Bompard
Reviewer: Jose Pedro Oliveira

-- 
http://gauret.free.fr   ~~~~   Jabber : abompard at jabber.fr
"Programming today is a race between software engineers striving to build
bigger and better idiot-proof programs, and the Universe trying to produce
bigger and better idiots. So far, the Universe is winning." -- Rich Cook
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 220 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050313/1d1b67c9/attachment.sig>

From fedora-extras-commits at redhat.com  Mon Mar 14 00:23:06 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 13 Mar 2005 19:23:06 -0500
Subject: rpms/logjam/devel logjam-4.4.1-gtkhtml3.6.patch,1.1,1.2
Message-ID: <200503140023.j2E0N6JI026292@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam-4.4.1-gtkhtml3.6.patch 
Log Message:


Add a minor fix for gtkhtml-3.6, from CVS.


logjam-4.4.1-gtkhtml3.6.patch:

Index: logjam-4.4.1-gtkhtml3.6.patch
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam-4.4.1-gtkhtml3.6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logjam-4.4.1-gtkhtml3.6.patch	26 Feb 2005 04:20:03 -0000	1.1
+++ logjam-4.4.1-gtkhtml3.6.patch	14 Mar 2005 00:23:04 -0000	1.2
@@ -31,3 +31,14 @@
  
    LJ_PKG_ARG_WITH(librsvg, LIBRSVG,
      AC_HELP_STRING([--with-librsvg],
+--- logjam-4.4.1/src/preview.c.gtkhtml36	2005-03-13 18:17:06.000000000 -0600
++++ logjam-4.4.1/src/preview.c	2005-03-13 18:11:02.000000000 -0600
+@@ -31,7 +31,7 @@
+ 
+ static void
+ html_preview_init(HTMLPreview *hp) {
+-	gtk_html_construct(GTK_WIDGET(hp));
++	gtk_html_construct((gpointer)(hp));
+ 	g_signal_connect(G_OBJECT(hp), "url_requested",
+ 			G_CALLBACK(url_requested), NULL);
+ 	g_signal_connect(G_OBJECT(hp), "link_clicked",



From fedora-extras-commits at redhat.com  Mon Mar 14 00:24:02 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 13 Mar 2005 19:24:02 -0500
Subject: rpms/logjam/devel logjam-4.4.1-cleanups.patch,NONE,1.1
Message-ID: <200503140024.j2E0O2GJ026350@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	logjam-4.4.1-cleanups.patch 
Log Message:


Cleanups from Bugzilla: 149865


logjam-4.4.1-cleanups.patch:

--- NEW FILE logjam-4.4.1-cleanups.patch ---
--- logjam-4.4.1/src/tools.c.BAD	2005-03-13 17:17:31.000000000 -0600
+++ logjam-4.4.1/src/tools.c	2005-03-13 17:54:53.000000000 -0600
@@ -209,7 +209,7 @@
 
 	while (gtk_dialog_run(GTK_DIALOG(cmd_dlg)) == GTK_RESPONSE_OK) {
 		const gchar *command;
-		const gchar *encoding;
+		const gchar *encoding = 0;
 		GError *err = NULL;
 
 		command = gtk_entry_get_text(GTK_ENTRY(entry));
--- logjam-4.4.1/src/checkfriends-gtk.c.BAD	2005-03-13 17:50:06.000000000 -0600
+++ logjam-4.4.1/src/checkfriends-gtk.c	2005-03-13 17:51:41.000000000 -0600
@@ -255,8 +255,6 @@
 
 static void
 cf_float_destroy(CFFloat *cff) {
-	CFMgr *cfm = cff->cfmgr;
-
 	if (GTK_IS_WIDGET(cff->win))
 		gtk_widget_destroy(cff->win);
 
@@ -277,8 +275,6 @@
 #ifdef USE_DOCK
 static void
 cf_dock_destroy(CFFloat *cff) {
-	CFMgr *cfm = cff->cfmgr;
-
 	g_signal_handlers_disconnect_by_func(G_OBJECT(cff->win),
 			G_CALLBACK(cf_dock_destroyed_cb), NULL);
 	gtk_widget_destroy(GTK_WIDGET(cff->win));
@@ -290,7 +286,11 @@
 cf_dock_destroyed_cb(GtkWidget *widget, CFFloat *cff) {
 	app.docklet = NULL;
 }
-	
+
+/* 
+ * Not currently used.	
+ */
+/*
 static void
 cf_dock_setup(CFFloat *ind) {
 	GtkWidget *docklet = app.docklet;
@@ -303,6 +303,7 @@
 
 	ind->win = docklet;
 }
+*/
 #endif /* USE_DOCK */
 
 void cf_float_decorate_refresh(void) {
--- logjam-4.4.1/src/cmdline.c.BAD	2005-03-13 17:41:34.000000000 -0600
+++ logjam-4.4.1/src/cmdline.c	2005-03-13 17:46:22.000000000 -0600
@@ -664,7 +664,7 @@
 
 static void
 command_dispatch(Cmdline *cmdline, Command *commands, const char *help, int argc, gchar *argv[]) {
-	JamAccount *acc;
+	JamAccount *acc = NULL;
 	Command *command = NULL;
 	char *cmdname;
 	int i;
--- logjam-4.4.1/src/menu.c.BAD	2005-03-13 17:52:10.000000000 -0600
+++ logjam-4.4.1/src/menu.c	2005-03-13 17:52:16.000000000 -0600
@@ -440,7 +440,6 @@
 
 };
 	int itemcount = sizeof(menu_items) / sizeof(menu_items[0]);
-	int i;
 	JamView *view;
 
 	accelgroup = gtk_accel_group_new();



From fedora-extras-commits at redhat.com  Mon Mar 14 00:28:27 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 13 Mar 2005 19:28:27 -0500
Subject: rpms/logjam/devel logjam.desktop,1.2,1.3 logjam.spec,1.10,1.11
Message-ID: <200503140028.j2E0SR0O026501@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	logjam.desktop logjam.spec 
Log Message:

-5 spec, change X-Fedora-Extras to X-Fedora, include cleanups patch.



Index: logjam.desktop
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logjam.desktop	10 Feb 2005 05:31:38 -0000	1.2
+++ logjam.desktop	14 Mar 2005 00:28:25 -0000	1.3
@@ -4,6 +4,6 @@
 Type=Application
 Exec=/usr/bin/logjam
 Icon=/usr/share/pixmaps/gnome-log.png
-Categories=Application;Network;X-Fedora-Extras;
+Categories=Application;Network;X-Fedora;
 Comment=LiveJournal Client
 GenericName=LiveJournal Client


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- logjam.spec	5 Mar 2005 21:10:23 -0000	1.10
+++ logjam.spec	14 Mar 2005 00:28:25 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name: logjam
 Version: 4.4.1
-Release: 4
+Release: 5
 Epoch: 1
 Summary: GTK2 client for LiveJournal
 License: GPL
@@ -22,6 +22,7 @@
 Patch1: logjam-4.4.1-rupo.patch
 Patch2: logjam-4.4.1-backdated.patch
 Patch3: logjam-4.4.1-gtkhtml3.6.patch
+Patch4: logjam-4.4.1-cleanups.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -44,6 +45,7 @@
 %patch1 -p1 -b .rupo
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .gtkhtml36
+%patch4 -p1 -b .cleanups
 
 %build
 %configure \
@@ -60,7 +62,7 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 desktop-file-install --vendor fedora                    \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
-  --add-category X-Fedora-Extras                        \
+  --add-category X-Fedora                               \
   %{SOURCE1}
 
 %files -f %{name}.lang
@@ -80,6 +82,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Mar 13 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-5
+- Cleanups for compiler errors brought to light in Bugzilla 149865
+- Change X-Fedora-Extras to X-Fedora
+
 * Fri Feb 25 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-4
 - Rebuilt for FC4/devel
 - Replace Gtkhtml 3.1 patch with Gtkhtml 3.6 patch



From fedora-extras-commits at redhat.com  Mon Mar 14 12:15:32 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 14 Mar 2005 07:15:32 -0500
Subject: rpms/gnumeric - New directory
Message-ID: <200503141215.j2ECFWFZ019274@cvs-int.fedora.redhat.com>

Author: caolanm

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

Log Message:
Directory /cvs/extras/rpms/gnumeric added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 12:15:32 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 14 Mar 2005 07:15:32 -0500
Subject: rpms/gnumeric/devel - New directory
Message-ID: <200503141215.j2ECFWdr019277@cvs-int.fedora.redhat.com>

Author: caolanm

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

Log Message:
Directory /cvs/extras/rpms/gnumeric/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 12:15:57 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 14 Mar 2005 07:15:57 -0500
Subject: rpms/gnumeric Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503141215.j2ECFvG9019342@cvs-int.fedora.redhat.com>

Author: caolanm

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module gnumeric


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

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

common : CVS/Root
	@cvs 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 Mar 14 12:15:57 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 14 Mar 2005 07:15:57 -0500
Subject: rpms/gnumeric/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503141215.j2ECFvwG019345@cvs-int.fedora.redhat.com>

Author: caolanm

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnumeric


--- 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 Mar 14 12:17:15 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 14 Mar 2005 07:17:15 -0500
Subject: rpms/gnumeric import.log,1.1,1.2
Message-ID: <200503141217.j2ECHFE7019471@cvs-int.fedora.redhat.com>

Author: caolanm

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Mar 2005 12:15:55 -0000	1.1
+++ import.log	14 Mar 2005 12:17:13 -0000	1.2
@@ -0,0 +1 @@
+gnumeric-1_4_3-1:HEAD:gnumeric-1.4.3-1.src.rpm:1110802621



From fedora-extras-commits at redhat.com  Mon Mar 14 12:17:15 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 14 Mar 2005 07:17:15 -0500
Subject: rpms/gnumeric/devel gnumeric-1.4.1-configure.patch, NONE,
	1.1 gnumeric-1.4.1-desktop.patch, NONE,
	1.1 gnumeric-1.4.1-excelcrash.patch, NONE, 1.1 gnumeric.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503141217.j2ECHFHs019475@cvs-int.fedora.redhat.com>

Author: caolanm

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

Modified Files:
	.cvsignore sources 
Added Files:
	gnumeric-1.4.1-configure.patch gnumeric-1.4.1-desktop.patch 
	gnumeric-1.4.1-excelcrash.patch gnumeric.spec 
Log Message:
auto-import gnumeric-1.4.3-1 on branch devel from gnumeric-1.4.3-1.src.rpm

gnumeric-1.4.1-configure.patch:

--- NEW FILE gnumeric-1.4.1-configure.patch ---
--- gnumeric-1.4.1.orig/configure.in	2004-12-10 15:06:14.000000000 +0000
+++ gnumeric-1.4.1/configure.in	2004-12-15 13:54:19.899301960 +0000
@@ -708,7 +708,7 @@
 dnl * Check for Perl
 dnl **************************************************
 dnl
-perl_msg=no
+perl_msg="yes"
 AC_ARG_WITH(perl, [--{with,without}-perl   Compile the Perl plugin loader])
 AC_ARG_VAR(PERL, [The Perl executable.])
 if test "x$with_perl" != xno; then

gnumeric-1.4.1-desktop.patch:

--- NEW FILE gnumeric-1.4.1-desktop.patch ---
--- gnumeric-1.4.1.orig/Makefile.in	2004-12-10 15:06:35.000000000 +0000
+++ gnumeric-1.4.1/Makefile.in	2004-12-15 13:05:38.887083537 +0000
@@ -310,20 +310,20 @@
 gnew_DATA = gnumeric.desktop
 
 Mimedir = $(datadir)/mime-info
-Mime_DATA = gnumeric.keys gnumeric.mime
+Mime_DATA = gnumeric.mime
 
 @WITH_GNOME_TRUE at serverdir = $(libdir)/bonobo/servers/
 @WITH_GNOME_TRUE at server_in_files = GNOME_Gnumeric.server.in
 @WITH_GNOME_TRUE at server_DATA = GNOME_Gnumeric.server
 
 CLEANFILES = $(server_DATA) $(server_in_files) \
-	gnumeric.desktop gnumeric.keys
+	gnumeric.desktop
 
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
 EXTRA_DIST = \
 	gnumeric.desktop.in gnumeric.spec.in GNOME_Gnumeric.server.in.in\
-	gnumeric.keys.in gnumeric.mime 					\
+	gnumeric.mime 					\
 	gnumeric.xsd							\
 	README HACKING NEWS BEVERAGES BUGS MAINTAINERS AUTHORS $(change_logs)	\
 	intltool-extract.in	\
@@ -839,10 +839,6 @@
 
 @INTLTOOL_SERVER_RULE@
 
-gnumeric.keys: gnumeric.keys.in Makefile
-	sed -e 's^\@gnumeric_icondir\@^$(gnumeric_icondir)^g' < $(srcdir)/gnumeric.keys.in > gnumeric.keys.tmp \
-	&& mv gnumeric.keys.tmp gnumeric.keys 
-
 gnumeric.desktop: gnumeric.desktop.in Makefile $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
 	 LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@.tmp
 @WITH_GNOME_TRUE@	sed -e 's/F_OR_U/U/' <$@.tmp >$@.tmp2

gnumeric-1.4.1-excelcrash.patch:

--- NEW FILE gnumeric-1.4.1-excelcrash.patch ---
--- gnumeric-1.4.1.orig/plugins/excel/ms-excel-read.c	2004-11-28 05:27:04.000000000 +0000
+++ gnumeric-1.4.1/plugins/excel/ms-excel-read.c	2004-12-17 10:13:32.981467314 +0000
@@ -4119,6 +4119,8 @@
 static void
 excel_read_DIMENSIONS (BiffQuery *q, ExcelWorkbook *ewb)
 {
+	if (!(q->length))
+		return;
 	GnmRange r;
 
 	if (ewb->container.ver >= MS_BIFF_V8) {


--- NEW FILE gnumeric.spec ---
%define gnumeric_version %{version}
%define desktop_file_utils_version 0.9

Summary:        A spreadsheet program for GNOME.
Name:     	gnumeric
Version: 	1.4.3
Release: 	1
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.4.0
Requires:       libgnomeprintui22 >= 2.3.0
Requires:       gtk2 >= 2.2.0
Requires:       libgsf >= 1.10.0
#Requires:  	libgnomedb >= 1.0.4
PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
BuildRequires:  libgnomeui-devel >= 2.4.0
BuildRequires:  libgnomeprintui22-devel >= 0.20
BuildRequires:  libxml2-devel
BuildRequires:  python-devel
BuildRequires:  libgsf-devel >= 1.10.0
BuildRequires:  automake autoconf libtool
BuildRequires:  intltool scrollkeeper gettext desktop-file-utils
#BuildRequires:  libgnomedb-devel >= 1.0.4
BuildRequires:  pango-devel >= 1.4.0
Patch0: gnumeric-1.4.1-desktop.patch
Patch1: gnumeric-1.4.1-excelcrash.patch
Patch2: gnumeric-1.4.1-configure.patch

%description
Gnumeric is a spreadsheet program for the GNOME GUI desktop
environment.

%package devel
Summary: Files necessary to develop gnumeric-based applications.
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}

%description devel
Gnumeric is a spreadsheet program for the GNOME GUI desktop
environment. The gnumeric-devel package includes files necessary to
develop gnumeric-based applications.

%prep
%setup -q
%patch0 -p1 -b .desktop
%patch1 -p1 -b .excelcrash
%patch2 -p1 -b .configure

%build
libtoolize --force --copy && aclocal && autoconf
export mllibname=%{_lib}
%configure --without-gb --without-guile

OLD_PO_FILE_INPUT=yes make

%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT

export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL

if [ -f /usr/lib/rpm/find-lang.sh ] ; then
 /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name
fi

./mkinstalldirs $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor gnome --delete-original                   \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
  --add-category X-Red-Hat-Extra                                        \
  --add-category Office                                                 \
  --add-category Application                                            \
  --add-category Spreadsheet                                            \
  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop

#remove spurious .ico thing
rm -rf $RPM_BUILD_ROOT/usr/share/pixmaps/win32-gnumeric.ico

#remove scrollkeeper stuff
rm -rf $RPM_BUILD_ROOT/var

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/ldconfig
update-desktop-database %{_datadir}/applications

export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnumeric*.schemas > /dev/null

%postun
/sbin/ldconfig
update-desktop-database %{_datadir}/applications

%files -f %{name}.lang

%defattr (0755, root, root)
%{_bindir}/*
%dir %{_libdir}/gnumeric
%dir %{_libdir}/gnumeric/%{gnumeric_version}
%{_libdir}/gnumeric/%{gnumeric_version}/plugins/*
# guile disabled due to 64-bit crash
## %{_datadir}/gnumeric/%{gnumeric_version}/guile
# FIXME - for s390 it builds some more with "--with-pic=-fPIC", but the
# grep for dlname then still fails.

%defattr (0644, root, root, 0755)
%doc HACKING AUTHORS ChangeLog NEWS BUGS README COPYING TODO
%{_datadir}/pixmaps/gnumeric
%{_datadir}/pixmaps/gnome-application-*.png
%{_datadir}/pixmaps/gnome-gnumeric.png
%dir %{_datadir}/gnumeric
%dir %{_datadir}/gnumeric/%{gnumeric_version} 
%dir %{_libdir}/gnumeric/%{gnumeric_version}/plugins
%{_datadir}/gnumeric/%{gnumeric_version}/*
%{_datadir}/mime-info/gnumeric.mime
%{_datadir}/mc/templates/gnumeric.desktop
%{_datadir}/applications/*
%dir %{_datadir}/omf/gnumeric/
%{_datadir}/omf/gnumeric/*
%{_sysconfdir}/gconf/schemas/*.schemas
%{_libdir}/bonobo/servers/GNOME_Gnumeric.server
%{_mandir}/man1/*

%files devel
%defattr (-, root, root)
%dir %{_datadir}/gnumeric
%dir %{_datadir}/gnumeric/%{gnumeric_version} 
%{_datadir}/gnumeric/%{gnumeric_version}/idl/*.idl
%dir %{_libdir}/gnumeric
%dir %{_libdir}/gnumeric/%{gnumeric_version}

%changelog
* Mon Mar 14 2005 Caolan McNamara <caolanm at redhat.com> 1.4.3-1
- bump to latest, first in extras
- drop helppath

* Fri Feb 18 2005 Caolan McNamara <caolanm at redhat.com> 1.4.2-3
- rh#149005#

* Mon Feb  7 2005 Matthias Clasen <mclasen at redhat.com> 1.4.2-2
- rebuild

* Thu Jan 27 2005 Caolan McNamara <caolanm at redhat.com> 1.4.2-1
- bump to next version

* Wed Dec 22 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-5
- RH#143587# pango-devel >= 1.4.0

* Sun Dec 19 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-4
- libgsf must be >= 1.10.0

* Fri Dec 17 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-3
- dubious "lib" usage from 64bit POV

* Thu Dec 17 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-2
- RH#143161# crash on reading corrupt excel file

* Wed Dec 15 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-1
- bump to new version
- drop integrated 64bit patch
- drop integrated desktop.in patch
- drop integrated latex patch
- drop disable bonobo patch
- add enable perl configure patch
- add quickfix for help being searched for in wrong place #gnome161404#

* Tue Nov 02 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-9
- #rh137694# backport latex exporter fix
- #rh137692# backport x64 excel fix

* Sat Oct 30 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-7
- #rh137565# Requires libgnomedb

* Thu Sep 30 2004 Christopher Aillon <caillon at redhat.com> 1.2.13-6
- Change Requires(post) to PreReq

* Thu Sep 30 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-5
- #rh134250# improve Requires: desktop-file-utils

* Thu Sep 30 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-4
- #rh134175# invalid mime type entry

* Mon Sep 27 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-3
- make a wild stab at #rh133662#

* Mon Sep 6 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-2
- update .keys to .desktop

* Tue Jul 27 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13
- update to 1.2.13 
- #107278# --without-bonobo, help is fairly nonfunctional otherwise

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed May 5 2004 Caolan McNamara <caolanm at redhat.com> 1.2.12
- update to 1.2.12 some exported excel workbooks will not work in Excel
with older versions
_ delete unused patches

* Tue Apr 13 2004 Warren Togami <wtogami at redhat.com> 1.2.8-2
- #74034 own plugin dir
- #111112 BR intltool scrollkeeper gettext desktop-file-utils
- some cleanup

* Fri Apr  2 2004 Mark McLoughlin <markmc at redhat.com> 1.2.8-1
- Update to 1.2.8

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 6 2004 Daniel Reed <dreed at redhat.com> 1:1.2.6-1
- Version bump (1.2.6)

* Tue Oct 14 2003 Jonathan Blandford <jrb at redhat.com> 1:1.2.1-2
- add ssconvert

* Tue Oct 14 2003 Havoc Pennington <hp at redhat.com> 1:1.2.1-1
- add %post to install schemas
- 1.2.1

* Fri Sep 19 2003 Havoc Pennington <hp at redhat.com> 1:1.2.0-1
- 1.2.0 final

* Mon Aug 25 2003 Jonathan Blandford <jrb at redhat.com>
- new version for GNOME 2.4

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Apr 29 2003 Tim Powers <timp at redhat.com> 1:1.0.12-5
- rebuild to fix broken libgal dep

* Tue Feb 18 2003 Elliot Lee <sopwith at redhat.com> 1:1.0.12-4
- Put in a fix for the no-python-on-lib64 problem.

* Wed Feb 12 2003 Havoc Pennington <hp at redhat.com> 1:1.0.12-3
- add --without-guile due to crash on 64-bit #82977

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Thu Jan  9 2003 Havoc Pennington <hp at redhat.com>
- 1.0.12
- remove libtoolize/autotools invocations, dunno why they were there

* Mon Dec 16 2002 Elliot Lee <sopwith at redhat.com> 1.0.9-6
- Run libtool/auto*
- Rebuild

* Thu Dec 05 2002 Florian La Roche <Florian.LaRoche at redhat.de>
- also disable python for mainframe, this should be fixed properly
  at some point...
- add guile to filelist

* Wed Nov  6 2002 Bill Nottingham <notting at redhat.com> 1.0.9-4
- rebuild everywhere
- no python on hammer ATM

* Thu Oct 24 2002 Jeremy Katz <katzj at redhat.com>
- rebuild against new gal
- fixup file lists to use correct macros and include all files

* Fri Aug  2 2002 Havoc Pennington <hp at redhat.com>
- desktop file fixage

* Fri Jul 26 2002 Akira TAGOH <tagoh at redhat.com> 1.0.9-1
- update to 1.0.9
- gnumeric-0.67-excel95-ja.patch: we no longer need it. removed. (Bug#62776)

* Fri Jul 12 2002 Havoc Pennington <hp at redhat.com>
- update to 1.0.8
- remove exceljpfonts patch that no longer applies

* 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 Apr 10 2002 Havoc Pennington <hp at redhat.com>
- add jp excel reading patch #62776

* Wed Mar 27 2002 Havoc Pennington <hp at redhat.com>
- add multibyte patch #61624

* Mon Mar 11 2002 Havoc Pennington <hp at redhat.com>
- 1.0.5

* Wed Jan 30 2002 Tim Powers <timp at redhat.com>
- update to 1.0.3

* Tue Nov 20 2001 Jonathan Blandford <jrb at redhat.com>
- Version 0.76

* Mon Oct  8 2001 Matt Wilson <msw at redhat.com>
- removed patch4 (gnumeric-0.67-sheet_corruption.patch), in CVS now.
- removed patch8 (gnumeric-0.67-xlsscale.patch), no longer needed.
- removed patch4 (gnumeric-0.67-s390.patch), no longer needed.
- regenerated patch6 (gnumeric-0.67.lengthen-warning.patch) against 0.71
- removed patch2 (gnumeric-0.67-mb.patch), in CVS now.
- removed patch9 (gnumeric-0.67-backspace.patch), came from CVS.
- removed patch5 (gnumeric-0.67-desktop.patch), ditto
- renamed remaining patches:
    patch3 (gnumeric-0.67-excel95-ja.patch) -> patch2
    patch6 (gnumeric-0.71-lengthen-warning.patch) -> patch3
- removed source10, ja.po from upstream is more up to date.
- added files needed for bonobo gnumeric back into file list

* Wed Sep  5 2001 Owen Taylor <otaylor at redhat.com>
- Add patch from CVS to fix backspace (#53062)

* Tue Aug  7 2001 Owen Taylor <otaylor at redhat.com>
- Fix problem with scaling percentage and XLS files (#51054)
- Fix problem where default font for ja and other locales was backwards

* Mon Aug  6 2001 Owen Taylor <otaylor at redhat.com>
- Install all files from the plugins in the main package. Putting .la
  files in the main package didn't make sense, and we were missing
  some files for the gnome-glossary package.

* Fri Aug  3 2001 Owen Taylor <otaylor at redhat.com>
- Add some missing directories to the main package (#50701)

* Tue Jul 31 2001 Than Ngo <than at redhat.com>
- add patch to build on s390, s390x

* Fri Jul 27 2001 Jonathan Blandford <jrb at redhat.com>
- change 'old copy' dialog to popup after 9 months

* Fri Jul 20 2001 Owen Taylor <otaylor at redhat.com>
- Add missing contents of .desktop file from CVS

* Thu Jul 19 2001 Owen Taylor <otaylor at redhat.com>
- Move desktop file to /etc/X11/applnk (#23488)
- Added BuildPrereq on python-devel (#45029)
- Add BuildPrereq on gal-devel (#45027)
- Add <locale.h> include to .mb patch 
  (don't know why it works for me / in the build system, #32388)

* Mon Jul 16 2001 Jonathan Blandford <jrb at redhat.com>
- backport sheet corruption fix

* Tue Jul 10 2001 Trond Eivind Glomsr?d <teg at redhat.com>
- Make devel subpackage depend on main package

* Sat Jul 07 2001 Owen Taylor <otaylor at redhat.com>
- Version 0.67

* Fri Jun 15 2001 Nalin Dahyabhai <nalin at redhat.com>
- rebuild in new environment

* Thu Jun 07 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- support newer gettext version

* Fri Mar  9 2001 Akira TAGOH <tagoh at redhat.com> 0.61-9
- Fixed read excel95's .xls for Japanese.

* Fri Feb 23 2001 Akira TAGOH <tagoh at rehdat.com> 0.61-8
- Fixed jp patch with gnome-print.

* Mon Feb 19 2001 Akira TAGOH <tagoh at redhat.com>
- Fixed jp patch.

* Thu Feb 08 2001 Yukihiro Nakai <ynakai at redhat.com>
- Fix about Japanese translation (ja.po)

* Wed Feb 07 2001 Yukihiro Nakai <ynakai at redhat.com>
- Update Japanese translation.

* Tue Feb 06 2001 Akira TAGOH <tagoh at redhat.com>
- Added Japanese patch.
- Updated Japanese translation.
  Note: Please remove Source10 when the next upstream release.

* Thu Jan 18 2001 Matt Wilson <msw at redhat.com>
- don't use bin:bin for files in devel.

* Wed Jan 03 2001 Preston Brown <pbrown at redhat.com>
- standard file and directory modes/ownership

* Fri Dec 29 2000 Matt Wilson <msw at redhat.com>
- use rpm > 3.0.5 macros
- 0.61

* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
- Up Epoch and release

* Tue Jul 18 2000 Owen Taylor <otaylor at redhat.com>
- Fix DocDir:

* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Mar 2005 12:15:55 -0000	1.1
+++ .cvsignore	14 Mar 2005 12:17:13 -0000	1.2
@@ -0,0 +1 @@
+gnumeric-1.4.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Mar 2005 12:15:55 -0000	1.1
+++ sources	14 Mar 2005 12:17:13 -0000	1.2
@@ -0,0 +1 @@
+b684eec48b1696d7a8d7152d1e17741c  gnumeric-1.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 14 22:32:51 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:32:51 -0500
Subject: rpms/aiksaurus - New directory
Message-ID: <200503142232.j2EMWpF6007004@cvs-int.fedora.redhat.com>

Author: katzj

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

Log Message:
Directory /cvs/extras/rpms/aiksaurus added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:32:51 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:32:51 -0500
Subject: rpms/aiksaurus/devel - New directory
Message-ID: <200503142232.j2EMWpvs007007@cvs-int.fedora.redhat.com>

Author: katzj

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

Log Message:
Directory /cvs/extras/rpms/aiksaurus/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:33:04 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:33:04 -0500
Subject: rpms/aiksaurus Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503142233.j2EMX4gf007087@cvs-int.fedora.redhat.com>

Author: katzj

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module aiksaurus


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

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

common : CVS/Root
	@cvs 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 Mar 14 22:33:04 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:33:04 -0500
Subject: rpms/aiksaurus/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503142233.j2EMX4ol007090@cvs-int.fedora.redhat.com>

Author: katzj

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module aiksaurus


--- 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 Mar 14 22:33:26 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:33:26 -0500
Subject: rpms/aiksaurus import.log,1.1,1.2
Message-ID: <200503142233.j2EMXQTK007237@cvs-int.fedora.redhat.com>

Author: katzj

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/aiksaurus/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Mar 2005 22:33:02 -0000	1.1
+++ import.log	14 Mar 2005 22:33:24 -0000	1.2
@@ -0,0 +1 @@
+aiksaurus-1_2_1-5:HEAD:aiksaurus-1.2.1-5.src.rpm:1110839601



From fedora-extras-commits at redhat.com  Mon Mar 14 22:33:26 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:33:26 -0500
Subject: rpms/aiksaurus/devel aiksaurus-1.2.1-desktop.patch, NONE,
	1.1 aiksaurus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503142233.j2EMXQKQ007241@cvs-int.fedora.redhat.com>

Author: katzj

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

Modified Files:
	.cvsignore sources 
Added Files:
	aiksaurus-1.2.1-desktop.patch aiksaurus.spec 
Log Message:
auto-import aiksaurus-1.2.1-5 on branch devel from aiksaurus-1.2.1-5.src.rpm

aiksaurus-1.2.1-desktop.patch:

--- NEW FILE aiksaurus-1.2.1-desktop.patch ---
--- /dev/null	2005-01-24 09:03:19.124049840 +0000
+++ aiksaurus-1.2.1/gaiksaurus.desktop	2005-01-24 10:43:05.176025758 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Thesaurus
+Comment=Lookup words in a thesaurus
+Exec=gaiksaurus
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;Application;Utility;


--- NEW FILE aiksaurus.spec ---
Summary: An English-language thesaurus library.
Name: aiksaurus
Version: 1.2.1
Release: 5
Epoch: 1
Group: System Environment/Libraries
License: GPL
Source: http://prdownloads.sourceforge.net/aiksaurus/aiksaurus-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gtk2-devel, desktop-file-utils >= 0.9
PreReq: desktop-file-utils >= 0.9

Patch0: aiksaurus-1.2.1-desktop.patch

%description
Aiksaurus is an English-language thesaurus library that can be 
embedded in word processors, email composers, and other authoring
software to provide thesaurus capabilities.  A basic command line 
thesaurus program is also included.

%package devel
Requires: aiksaurus
Summary: Files for developing with aiksaurus.
Group: Development/Libraries
                                                                                
%description devel
Includes and definitions for developing with aiksaurus.

%package gtk
Requires: aiksaurus >= %{version}
Requires: gtk2
Summary: A GTK+ frontend to aiksaurus.
Group: System Environment/Libraries
Requires: aiksaurus

%description gtk
AiksaurusGTK is a GTK+ interface to the Aiksaurus library.  
It provides an attractive thesaurus interface, and can be embedded
in GTK+ projects, notably AbiWord.  A standalone thesaurus program
is also provided.

%package gtk-devel
Requires: aiksaurus-gtk
Requires: aiksaurus-devel >= %{version}
Summary: Files for developing with aiksaurus-gtk.
Group: Development/Libraries
                                                                                
%description gtk-devel
gtk includes and definitions for developing with aiksaurus.

%prep
%setup -q
%patch0 -p1 -b .desktop.patch

%build
%configure
make

%install
%makeinstall
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
desktop-file-install --vendor gnome --dir $RPM_BUILD_ROOT%{_datadir}/applications ./gaiksaurus.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

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

%files devel
%defattr(-, root, root)
%{_includedir}/Aiksaurus/Aiksaurus.h
%{_includedir}/Aiksaurus/AiksaurusC.h
%{_libdir}/*Aiksaurus.so
%{_libdir}/pkgconfig/aiksaurus-1.0.pc

%files gtk
%defattr(-, root, root)
%{_bindir}/gaiksaurus
%{_libdir}/*GTK*.so.*
%{_datadir}/applications/gnome-gaiksaurus.desktop

%post gtk
/sbin/ldconfig
update-desktop-database %{_datadir}/applications

%postun gtk
/sbin/ldconfig
update-desktop-database %{_datadir}/applications

%files gtk-devel
%defattr(-, root, root)
%{_includedir}/Aiksaurus/AiksaurusGTK*.h
%{_libdir}/*GTK*.so
%{_libdir}/pkgconfig/gaiksaurus-1.0.pc

%changelog
* Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1.2.1-5
- rebuild with gcc4

* Mon Jan 24 2005 Caolan McNamara <caolanm at redhat.com> 1.2.1-4
- RH#145922# wrong location

* Mon Jan 24 2005 Caolan McNamara <caolanm at redhat.com> 1.2.1-3
- RH#145922# make a .desktop for gaiksaurus

* Wed Oct 10 2004 Caolan McNamara <caolanm at redhat.com> 1.2.1-2
- #rh134808# BuildRequires gtk2-devel

* Tue Aug 10 2004 Caolan McNamara <caolanm at redhat.com>
- initially import 1.2.1 and tweak .spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aiksaurus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Mar 2005 22:33:02 -0000	1.1
+++ .cvsignore	14 Mar 2005 22:33:24 -0000	1.2
@@ -0,0 +1 @@
+aiksaurus-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aiksaurus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Mar 2005 22:33:02 -0000	1.1
+++ sources	14 Mar 2005 22:33:24 -0000	1.2
@@ -0,0 +1 @@
+3eae03b7c49843ccc9262e52846ea6b4  aiksaurus-1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 14 22:34:34 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:34:34 -0500
Subject: rpms/enchant - New directory
Message-ID: <200503142234.j2EMYYQ4007418@cvs-int.fedora.redhat.com>

Author: katzj

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

Log Message:
Directory /cvs/extras/rpms/enchant added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:34:34 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:34:34 -0500
Subject: rpms/enchant/devel - New directory
Message-ID: <200503142234.j2EMYYPH007421@cvs-int.fedora.redhat.com>

Author: katzj

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

Log Message:
Directory /cvs/extras/rpms/enchant/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:34:46 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:34:46 -0500
Subject: rpms/enchant Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503142234.j2EMYkXL007501@cvs-int.fedora.redhat.com>

Author: katzj

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module enchant


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

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

common : CVS/Root
	@cvs 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 Mar 14 22:34:46 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:34:46 -0500
Subject: rpms/enchant/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503142234.j2EMYkil007504@cvs-int.fedora.redhat.com>

Author: katzj

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module enchant


--- 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 Mar 14 22:35:01 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:35:01 -0500
Subject: rpms/enchant import.log,1.1,1.2
Message-ID: <200503142235.j2EMZ1qZ007648@cvs-int.fedora.redhat.com>

Author: katzj

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/enchant/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Mar 2005 22:34:44 -0000	1.1
+++ import.log	14 Mar 2005 22:34:59 -0000	1.2
@@ -0,0 +1 @@
+enchant-1_1_5-3:HEAD:enchant-1.1.5-3.src.rpm:1110839696



From fedora-extras-commits at redhat.com  Mon Mar 14 22:35:01 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:35:01 -0500
Subject: rpms/enchant/devel enchant-1.1.5-manpage.patch, NONE,
	1.1 enchant.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503142235.j2EMZ1fR007652@cvs-int.fedora.redhat.com>

Author: katzj

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

Modified Files:
	.cvsignore sources 
Added Files:
	enchant-1.1.5-manpage.patch enchant.spec 
Log Message:
auto-import enchant-1.1.5-3 on branch devel from enchant-1.1.5-3.src.rpm

enchant-1.1.5-manpage.patch:

--- NEW FILE enchant-1.1.5-manpage.patch ---
diff -ru enchant-1.1.5.orig/doc/enchant.1 enchant-1.1.5/doc/enchant.1
--- enchant-1.1.5.orig/doc/enchant.1	2005-01-14 08:42:25.000000000 +0000
+++ enchant-1.1.5/doc/enchant.1	2005-01-14 08:51:34.355927565 +0000
@@ -22,13 +22,15 @@
 .TP
 .I "\-v"
 Prints the program's version
-.SH Enchant Ordering File
-.TP
+.SH ENCHANT ORDERING FILE
 Enchant has a global and a local ordering file. It lets the user specify
 which spelling backend to use for individual languages if you really care
 which backend gets used. It takes the form of:
+.PP
 *:aspell,myspell,ispell
+.br
 en:aspell,myspell,ispell
+.br
 fr:myspell,ispell:aspell
 .SH MORE INFORMATION
 http://www.abisource.com/enchant/


--- NEW FILE enchant.spec ---
Summary: An Enchanting Spell Checking Library
Name: enchant
Version: 1.1.5
Release: 3
Epoch: 1
Group: System Environment/Libraries
License: LGPL
Source: http://prdownloads.sourceforge.net/abiword/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

Patch0: enchant-1.1.5-manpage.patch

%description
A library that wraps other spell checking backends.

%package devel
Summary: Support files necessary to compile applications with libenchant.
Group: Development/Libraries
Requires: enchant

%description devel
Libraries, headers, and support files necessary to compile applications using libenchant.

%prep
%setup -q
%patch0 -p1 -b .manpage

%build
%configure --disable-ispell

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant/*.la

%files
%defattr(-,root,root)
%doc AUTHORS COPYING.LIB README
%{_bindir}/*
%{_libdir}/lib*.so.*
%{_libdir}/enchant/lib*.so*
%{_mandir}/man1/enchant.1.gz

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

%post
/sbin/ldconfig

%postun
/sbin/ldconfig

%clean
rm -r $RPM_BUILD_ROOT

%changelog
* Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.15-3
- rebuild with gcc4

* Fri Jan 14 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.15-2
- RH#145010# misformatted manpage

* Mon Dec 20 2004 Caolan McNamara <caolanm at redhat.com> 1:1.1.15-1
- initial fedora import

* Sun Aug 24 2003 Rui Miguel Seabra <rms at 1407.org>
- update spec to current stat of affairs
- building from source rpm is now aware of --with and --without flags:
- --without aspell --without ispell --without myspell --with uspell

* Wed Jul 16 2003 Rui Miguel Seabra <rms at 1407.org>
- take advantage of environment rpm macros

* Sun Jul 13 2003 Dom Lachowicz <cinamod at hotmail.com>
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Mar 2005 22:34:44 -0000	1.1
+++ .cvsignore	14 Mar 2005 22:34:59 -0000	1.2
@@ -0,0 +1 @@
+enchant-1.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Mar 2005 22:34:44 -0000	1.1
+++ sources	14 Mar 2005 22:34:59 -0000	1.2
@@ -0,0 +1 @@
+b7f266ca9241797839929972395a76cf  enchant-1.1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 14 22:35:31 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:35:31 -0500
Subject: rpms/ots - New directory
Message-ID: <200503142235.j2EMZVLB007819@cvs-int.fedora.redhat.com>

Author: katzj

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

Log Message:
Directory /cvs/extras/rpms/ots added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:35:31 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:35:31 -0500
Subject: rpms/ots/devel - New directory
Message-ID: <200503142235.j2EMZVBU007822@cvs-int.fedora.redhat.com>

Author: katzj

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

Log Message:
Directory /cvs/extras/rpms/ots/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:35:44 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:35:44 -0500
Subject: rpms/ots Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503142235.j2EMZiSs007917@cvs-int.fedora.redhat.com>

Author: katzj

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module ots


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

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

common : CVS/Root
	@cvs 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 Mar 14 22:35:44 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:35:44 -0500
Subject: rpms/ots/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503142235.j2EMZirG007920@cvs-int.fedora.redhat.com>

Author: katzj

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ots


--- 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 Mar 14 22:36:11 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:36:11 -0500
Subject: rpms/ots import.log,1.1,1.2
Message-ID: <200503142236.j2EMaB0V008103@cvs-int.fedora.redhat.com>

Author: katzj

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ots/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Mar 2005 22:35:42 -0000	1.1
+++ import.log	14 Mar 2005 22:36:09 -0000	1.2
@@ -0,0 +1 @@
+ots-0_4_2-4:HEAD:ots-0.4.2-4.src.rpm:1110839761



From fedora-extras-commits at redhat.com  Mon Mar 14 22:36:11 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:36:11 -0500
Subject: rpms/ots/devel ots-0.2.0-nodocs.patch, NONE,
	1.1 ots-0.4.2-gcc4.patch, NONE, 1.1 ots.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503142236.j2EMaBlV008106@cvs-int.fedora.redhat.com>

Author: katzj

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

Modified Files:
	.cvsignore sources 
Added Files:
	ots-0.2.0-nodocs.patch ots-0.4.2-gcc4.patch ots.spec 
Log Message:
auto-import ots-0.4.2-4 on branch devel from ots-0.4.2-4.src.rpm

ots-0.2.0-nodocs.patch:

--- NEW FILE ots-0.2.0-nodocs.patch ---
--- ots-0.2.0/Makefile.in.nodocs	2003-07-12 17:34:47.000000000 -0400
+++ ots-0.2.0/Makefile.in	2003-07-12 17:34:59.000000000 -0400
@@ -106,7 +106,7 @@
 AUTOMAKE_OPTIONS = gnu 1.4
 
 DIST_SUBDIRS = src articles dic doc
-SUBDIRS = src dic doc
+SUBDIRS = src dic
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libots-1.pc
--- ots-0.2.0/Makefile.am.nodocs	2003-07-12 17:35:38.000000000 -0400
+++ ots-0.2.0/Makefile.am	2003-07-12 17:35:47.000000000 -0400
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = gnu 1.4
 
 DIST_SUBDIRS=src articles dic doc
-SUBDIRS=src dic doc
+SUBDIRS=src dic
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libots-1.pc

ots-0.4.2-gcc4.patch:

--- NEW FILE ots-0.4.2-gcc4.patch ---
--- ots-0.4.2/src/article.c.orig	2005-03-02 19:42:19.479330826 +0000
+++ ots-0.4.2/src/article.c	2005-03-02 19:42:43.967625287 +0000
@@ -35,7 +35,7 @@
 ots_new_sentence (void)
 {
   OtsSentence *aLine = g_new0 (OtsSentence, 1);
-  (GList *) aLine->words = NULL;
+  aLine->words = NULL;
   aLine->wc = 0;
   aLine->selected = 0;
   aLine->score = 0;


--- NEW FILE ots.spec ---
Name: ots
Summary: A text summarizer
Version: 0.4.2
Release: 4
License: GPL
Group: System Environment/Libraries
Source: http://prdownloads.sourceforge.net/libots/ots-%{version}.tar.gz
Patch1: ots-0.2.0-nodocs.patch
Patch2: ots-0.4.2-gcc4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: pkgconfig >= 0.8
Requires: glib2 >= 2.0
BuildRequires: glib2-devel >= 2.0
BuildRequires: libxml2-devel >= 2.4.23
BuildRequires: automake16

%description
The open text summarizer is an open source tool for summarizing texts.
The program reads a text and decides which sentences are important and
which are not.
 
%package devel
Summary: Libraries and include files for developing with libots.
Group: Development/Libraries
Requires: %{name} = %{version}
Requires: pkgconfig >= 0.8
Requires: glib2 >= 2.0
Requires: glib2-devel >= 2.0


%description devel
This package provides the necessary development libraries and include
files to allow you to develop with libots.

%prep
%setup -q 
%patch1 -p1 -b .nodocs
%patch2 -p1 -b .gcc4

%build
# until patch1 goes away
automake-1.6
autoconf

%configure
make

%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 ChangeLog NEWS README TODO
%{_bindir}/ots
%{_libdir}/*.so.*
#{_mandir}/*/*
%{_datadir}/ots

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

%changelog
* Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> - 0.4.2-4
- rebuild with gcc4
- small lvalue assign patch

* Wed Feb 09 2005 Caolan McNamara <caolanm at redhat.com> - 0.4.2-3
- rebuilt

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Feb 19 2004 Jeremy Katz <katzj at redhat.com> - 0.4.2-1
- 0.4.2

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Nov 28 2003 Jeremy Katz <katzj at redhat.com> 
- add some buildrequires (#111158)

* Mon Sep 15 2003 Jeremy Katz <katzj at redhat.com> 0.4.1-1
- 0.4.1

* Mon Aug  4 2003 Jeremy Katz <katzj at redhat.com> 0.4.0-1
- 0.4.0

* Tue Jul 22 2003 Jeremy Katz <katzj at redhat.com> 0.3.0-1
- update to 0.3.0

* Sat Jul 12 2003 Jeremy Katz <katzj at redhat.com> 0.2.0-2
- forcibly disable gtk-doc (openjade is busted on s390)

* Mon Jul  7 2003 Jeremy Katz <katzj at redhat.com> 0.2.0-1
- update to 0.2.0
- ldconfig in %%post/%%postun
- libtoolize
- clean up spec file a little, build gtk-doc
- fix libtool versioning 

* Thu Jun 05 2003 Rui Miguel Silva Seabra <rms at 1407.org>
- fix spec
- disable gtk-doc (it's not building in RH 9,
  maybe it's broken for some reason)

* Fri May 02 2003 Rui Miguel Silva Seabra <rms at 1407.org>
- define a longer description from the README file
- explicitly set file permissions

* Wed Apr 30 2003 Dom Lachowicz <cinamod at hotmail.com>
- created this thing


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ots/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Mar 2005 22:35:42 -0000	1.1
+++ .cvsignore	14 Mar 2005 22:36:09 -0000	1.2
@@ -0,0 +1 @@
+ots-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ots/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Mar 2005 22:35:42 -0000	1.1
+++ sources	14 Mar 2005 22:36:09 -0000	1.2
@@ -0,0 +1 @@
+bb02a56a3bf2d5ebf9ffd064992d0ae4  ots-0.4.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 14 22:38:38 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:38:38 -0500
Subject: rpms/abiword - New directory
Message-ID: <200503142238.j2EMccV9008309@cvs-int.fedora.redhat.com>

Author: katzj

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

Log Message:
Directory /cvs/extras/rpms/abiword added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:38:38 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:38:38 -0500
Subject: rpms/abiword/devel - New directory
Message-ID: <200503142238.j2EMccXR008312@cvs-int.fedora.redhat.com>

Author: katzj

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

Log Message:
Directory /cvs/extras/rpms/abiword/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:38:51 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:38:51 -0500
Subject: rpms/abiword Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503142238.j2EMcpuM008392@cvs-int.fedora.redhat.com>

Author: katzj

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module abiword


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

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

common : CVS/Root
	@cvs 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 Mar 14 22:38:51 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:38:51 -0500
Subject: rpms/abiword/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503142238.j2EMcpri008395@cvs-int.fedora.redhat.com>

Author: katzj

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module abiword


--- 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 Mar 14 22:39:47 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:39:47 -0500
Subject: rpms/abiword import.log,1.1,1.2
Message-ID: <200503142239.j2EMdlqp008601@cvs-int.fedora.redhat.com>

Author: katzj

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/abiword/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Mar 2005 22:38:49 -0000	1.1
+++ import.log	14 Mar 2005 22:39:45 -0000	1.2
@@ -0,0 +1 @@
+abiword-2_2_5-2:HEAD:abiword-2.2.5-2.src.rpm:1110839981



From fedora-extras-commits at redhat.com  Mon Mar 14 22:39:47 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:39:47 -0500
Subject: rpms/abiword/devel abiword-2.0.9-windowshelppaths.patch, NONE,
	1.1 abiword-2.2.1-desktop.patch, NONE,
	1.1 abiword-2.2.5-gcc4.patch, NONE,
	1.1 abiword-2.2.5-wvread.patch, NONE, 1.1 abiword.mime, NONE,
	1.1 abiword.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503142239.j2EMdlH6008605@cvs-int.fedora.redhat.com>

Author: katzj

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

Modified Files:
	.cvsignore sources 
Added Files:
	abiword-2.0.9-windowshelppaths.patch 
	abiword-2.2.1-desktop.patch abiword-2.2.5-gcc4.patch 
	abiword-2.2.5-wvread.patch abiword.mime abiword.spec 
Log Message:
auto-import abiword-2.2.5-2 on branch devel from abiword-2.2.5-2.src.rpm

abiword-2.0.9-windowshelppaths.patch:

--- NEW FILE abiword-2.0.9-windowshelppaths.patch ---
diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/howto/howtoword.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/howto/howtoword.abw
--- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/howto/howtoword.abw	2004-07-28 19:00:11.612412860 +0100
+++ abiword-2.0.9/abiword-docs/ABW/fr-FR/howto/howtoword.abw	2004-07-28 19:00:49.785296529 +0100
@@ -23,7 +23,7 @@
 <p style="Normal"><c props="lang:fr-FR">Il est presque in??vitable qu'?? un certain moment, vous aurez le besoin d'exp??dier un document que vous avez cr???? avec AbiWord ?? une personne utilisant Microsoft Word ou ouvrir un document cr???? avec Microsoft Word avec AbiWord. Heureusement, il est facile de r??aliser ces transferts.</c><c props="lang:fr-FR"></c></p>
 <p style="Heading 2"><c style="Heading 2" props="lang:fr-FR">Visualiser un document AbiWord avec Microsoft Word</c><c style="Heading 2" props="lang:fr-FR"></c></p>
 <p style="Normal"><c props="lang:fr-FR">Jusqu'?? ce que Microsoft annonce le support des fichiers d'AbiWord, les documents cr????s avec AbiWord n??cessiteront d'??tre export??s dans un format que Word peut lire. L'enregistrement au format </c><c props="lang:fr-FR"></c><c props="font-family:Times New Roman; text-decoration:none; color:000000; font-size:12pt; text-position:normal; font-weight:normal; font-style:normal; lang:fr-FR">Rich Text Format </c><c props="lang:fr-FR">permet de r??aliser facilement cette exportation.</c></p>
-<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\howto\gettingstarted.abw.png_1" props="height:6.91in; width:5.63in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/gettingstarted.abw.png_1" props="height:6.91in; width:5.63in"/></p>
 <p style="Normal"></p>
 <p style="Normal"><c props="lang:fr-FR">Le format Rich Text est couramment utilis?? par les produits Microsoft Office et ils n'auront aucune difficult?? ?? importer les documents enregistr??s ainsi.</c><c props="lang:fr-FR"></c></p>
 <p style="Heading 2"><c style="Heading 2" props="lang:fr-FR">Visualiser les documents Word avec AbiWord</c><c style="Heading 2" props="lang:fr-FR"></c></p>
@@ -31,7 +31,7 @@
 <p style="Normal"><c props="lang:fr-FR">Si vous rencontrez des probl??mes, demandez ?? l'utilisateur de Word d'enregistrer le document au format </c><c props="lang:fr-FR"></c><c props="font-style:italic; lang:fr-FR">Rich Text Format (.rtf)</c><c props="lang:fr-FR">. Toutes les versions de Microsoft Word peuvent le faire et AbiWord peut ouvrir les fichiers RTF de mani??re fiable.</c></p>
 </section>
 <data>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\howto\gettingstarted.abw.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/gettingstarted.abw.png_1" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAhwAAAKXCAYAAADJiZNnAAAABmJLR0QA/wD/AP+gvaeTAAAA
 CXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH0gUSDDMylHTKNAAAIABJREFUeJzsvV+oJcl5
 4PlVcwzngh6qG2TUxgtbl9lmu+7QuOvONu6usbBKEuw0eGGEdmE07MO4C4tZ2TMsMy9m9bY9
diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw
--- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw	2004-07-28 19:00:11.595415583 +0100
+++ abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw	2004-07-28 19:00:49.786296369 +0100
@@ -16,7 +16,7 @@
 <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
 <section>
 <p style="Heading 1"><c props="lang:fr-CA"></c><c props="lang:fr-FR">Dialogue remplacer</c></p>
-<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\replace.png_0" props="height:1.77in; width:4.93in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/replace.png_0" props="height:1.77in; width:4.93in"/></p>
 <p style="Heading 2"><c props="lang:fr-FR">Rechercher</c><c props="lang:fr-FR"></c></p>
 <p style="Normal"><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt">Entrez le mot que vous d??sirez rechercher dans cette bo??te. Il s'agit de la cha??ne de recherche. Cette commande recherche la cha??ne de caract??res ou de nombres que vous entrez. Ainsi, si vous recherchez </c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt"></c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; font-size:12pt">en</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt">, vous trouverez les deux lettres au milieu du mot </c><c props="font-family:Times New Roman!
; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; font-size:12pt">dent</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt"> tout autant que le mot </c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; font-size:12pt">en</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt">.</c></p>
 <p style="Heading 2"><c props="lang:fr-FR">Respecter la casse</c><c props="lang:fr-FR"></c></p>
@@ -33,7 +33,7 @@
 <p style="Normal"><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none">Ce bouton ferme le dialogue </c><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none"></c><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; text-decoration:none">Remplacer</c><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none">.</c></p>
 </section>
 <data>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\replace.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/replace.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAdkAAACqCAIAAABu5KKOAAAaMElEQVR4nO2dX4gkx33Hfxfa
 UAMXmDEyaPWknYcj2jFHtBMd6BaF6BzlQdgPtslDTn7KiRjspxDpIfjyEklvtgPByoOQYgg+
 P8TS6cGnS/BFa5DZPdAxu7Dy3JhE3CxEeJbo2G7wQf/ABZuHqq6urv4zPT3d23u33w/LUl1d
diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/workspace.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/workspace.abw
--- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/workspace.abw	2004-07-28 19:00:11.604414141 +0100
+++ abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/workspace.abw	2004-07-28 19:00:49.789295889 +0100
@@ -23,24 +23,24 @@
 <section header="26414915">
 <p style="Heading 1"><c props="lang:fr-CA"></c><c props="lang:fr-FR">L'espace de travail d'AbiWord</c></p>
 <p style="Normal"><c props="lang:fr-FR">AbiWord a une apparence tr??s similaire ?? d'autres traitements de texte, ce qui, nous l'esp??rons, met ?? l'aise toute personne qui d??bute avec le logiciel.</c><c props="lang:fr-FR"></c></p>
-<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\full_window.png_1" props="height:4.14in; width:6.75in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/full_window.png_1" props="height:4.14in; width:6.75in"/></p>
 <p style="Normal"><c props="lang:fr-FR">L'interface famili??re devrait permettre ?? la plupart des personnes de d??marrer le travail imm??diatement. Cependant, certaines caract??ristiques sont peut-??tre nouvelles.</c><c props="lang:fr-FR"></c></p>
 <p level="1" listid="0" parentid="0" style="Heading 2"><c props="lang:fr-FR">Titre de fen??tre</c><c props="lang:fr-FR"></c></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\titlebar.png_1" props="height:0.23in; width:6.73in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/titlebar.png_1" props="height:0.23in; width:6.73in"/></p>
 <p level="1" listid="0" parentid="0" style="Normal"><c props="lang:fr-FR">La fen??tre de titre est similaire ?? cette de toute autre application, avec une diff??rence toutefois. Notez le caract??re </c><c props="lang:fr-FR"></c><c props="font-style:italic; lang:fr-FR">*</c><c props="lang:fr-FR"> pr??s de </c><c props="font-style:italic; lang:fr-FR">Document10</c><c props="lang:fr-FR">. L'ast??rique signifie que </c><c props="font-style:italic; lang:fr-FR">Document10</c><c props="lang:fr-FR"> a ??t?? modifi??. Ceci fourni un mani??re simple d'identifier si le document doit ??tre enregistr??.</c></p>
 <p level="1" listid="0" parentid="0" style="Heading 2"><c props="lang:fr-FR">Les barres de fonction</c><c props="lang:fr-FR"></c></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars.png_1" props="height:0.98in; width:6.63in"/><c props="lang:fr-FR">Voici les trois plus importantes barres de fonctions. La premi??re, nomm??e barre de menu, est le meilleur endroit pour se familiariser avec AbiWord. Il est pr??f??rable d'y d??buter l'exploration des menus pour saisir ce que AbiWord peut faire avec les documents.</c><c props="lang:fr-FR"></c></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars.png_1" props="height:0.98in; width:6.63in"/><c props="lang:fr-FR">Voici les trois plus importantes barres de fonctions. La premi??re, nomm??e barre de menu, est le meilleur endroit pour se familiariser avec AbiWord. Il est pr??f??rable d'y d??buter l'exploration des menus pour saisir ce que AbiWord peut faire avec les documents.</c><c props="lang:fr-FR"></c></p>
 <p level="1" listid="0" parentid="0" style="Normal"><c props="lang:fr-FR">La seconde est la barre d'outils standard et la troisi??me (au bas) est la barre d'outils de mise en forme.</c><c props="lang:fr-FR"></c></p>
 <p level="1" listid="0" parentid="0" style="Heading 2"><c props="lang:fr-FR">Manipuler les barres</c><c props="lang:fr-FR"></c></p>
 <p level="1" listid="0" parentid="0" style="Normal"><c props="lang:fr-FR">AbiWord permet de cacher les barres. Si certaines manquent ou ne sont pas requises v??rifiez le menu </c><c props="lang:fr-FR"></c><c props="font-style:italic; lang:fr-FR">Affichage</c><c props="lang:fr-FR"> &gt; </c><c props="font-style:italic; lang:fr-FR">Barres d'outils</c><c props="lang:fr-FR">.</c></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars_hiding.png_1" props="height:3.19in; width:5.76in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars_hiding.png_1" props="height:3.19in; width:5.76in"/></p>
 <p style="Heading 2"><c props="lang:fr-FR">Barre de saisie</c><c props="lang:fr-FR"></c></p>
 <p style="Normal"><image dataid="/usr/src/abiword/commit/images/grabbar_shaded.png_0" props="height:1.08in; width:1.35in"/></p>
 <p style="Normal"><c props="lang:fr-FR">Pour ceux qui ex??cutent AbiWord sous GNOME, La barre de saisie localis??e ?? l'extr??mit?? gauche de chaque barre d'outils repr??sente une mani??res simple offerte ?? chacun de modifier l'interface ?? leur convenance. Cliquez la barre de saisie et d??placez-l??. La barre d'outils suivra la souris, permettant m??me ?? la barre d'outil de survoler une partie quelconque de l'??cran.</c><c props="lang:fr-FR"></c></p>
 <p style="Heading 2"><c props="lang:fr-FR">Barre d'??tat</c><c props="lang:fr-FR"></c></p>
 <p style="Normal"><image dataid="/usr/src/abiword/commit/images/statusbar.png_0" props="height:0.22in; width:5.04in"/></p>
 <p style="Normal"><c props="lang:fr-FR">La barre d'??tat permet une vue rapide de l'??tat du document. A la gauche, AbiWord note la page courante. La bo??te du milieu, qui est habituellement vide, affiche un message d'aide rapide d??crivant l'option de menu courante.</c><c props="lang:fr-FR"></c></p>
-<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\statusbar_quickhelp.png_1" props="height:1.61in; width:6.49in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/statusbar_quickhelp.png_1" props="height:1.61in; width:6.49in"/></p>
 <p style="Heading 2"><c props="lang:fr-FR">Les r??gles</c><c props="lang:fr-FR"></c></p>
 <p style="Normal"><image dataid="/usr/src/abiword/commit/images/ruler.png_0" props="height:0.32in; width:5.55in"/></p>
 <p style="Normal"><c props="lang:fr-FR">En employant les r??gles, il devient facile de fixer les marges de la page et les tabulations.</c><c props="lang:fr-FR"></c></p>
@@ -49,7 +49,7 @@
 <p style="Normal" props="text-align:left"></p>
 </section>
 <data>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\full_window.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/full_window.png_1" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAogAAAGNCAIAAAAdDhfDAAAgAElEQVR4nOy9bWwcx5ku+mjR
 vqgJmMWMoSw4gh1oCFnIkLZhkhtBGkbBmjoOYDpZwKIdwGZ8FgnlBDYdX2Qt70EiO4u7trPY
 WE5wEmuDxKKDbEQZiCXqIpaYQDozOpB2hoKU4QSSyTFsg0NsBDcRE5rGCeEuXDWg+6O6q6ur
@@ -732,7 +732,7 @@
 Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW
 iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg==
 </d>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars_hiding.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/functionbars_hiding.png_1" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAikAAAEyCAIAAACwCNeMAAAACXBIWXMAAABEAAAARACdvuRJ
 AABTv0lEQVR42u29f2wcx5nn/bXQflGzYF4MDSfgGEngIbJGKCbGSrw1LCoJTtRqcWHWC1hO
 Foi8uRf2yA4SOTns2flj3yR3eC82Du+beA/5oQTrFWXsxT+AtS0DF1kXREdqYYekYYecQAo1
@@ -1135,7 +1135,7 @@
 MThhNzQ3OWNiNDVjMWM4ZjU4ODEwMjAxODdiNmZkOGRmYmNlZGIwNjWQ4/dNAAAAAElFTkSu
 QmCC
 </d>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/functionbars.png_1" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAnwAAABeCAIAAAA2dF4VAAAACXBIWXMAAABEAAAARACdvuRJ
 AABD6UlEQVR42u29fYwc1Zkv/HNUXFVHzlWPBdG0BZG7BRY9DVZmOrGYmQVdZjbRzZi9EraJ
 BEPeVRgDAjtIiU1WiSHRrk1WG5tEy8VEITNcZRk7UrDNVRhPInO7/cpst9FAz0SGno4ATVvB
@@ -1496,7 +1496,7 @@
 DARcAEBsLLAFAABFC65ZAT5ljHl7Cpt/HGtWAABrMLOCaDgEBABIgTUriEbi4lkAQPkIK4iC
 QzsAgFT+AnafvftOpg+NAAAAAElFTkSuQmCC
 </d>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\titlebar.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/titlebar.png_1" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAoYAAAAWCAIAAADSEcpEAAAACXBIWXMAAABEAAAARACdvuRJ
 AAAKN0lEQVR42u2dXYjc1hXH/wEFjmACEriwAy10TAlxHEq9bgO2ScBx85AtLsROXtYkD0me
 4rSQ2n0o5CnYD/1wCiHbQogTKN0EanYWmnobanZcajxbutkZ8McqtCYa6IIGvFgXMqADvg99
@@ -1550,7 +1550,7 @@
 N2NlNzE0YWQwMjdlM2M5MWZiMjk0ZTc2ZDNlNDU2ZmQxMjFjZmE4ODZiNWRlMGUzZTNmZjhm
 ZTJhZTY0MmU4HyCiUgAAAABJRU5ErkJggg==
 </d>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\statusbar_quickhelp.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/statusbar_quickhelp.png_1" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAm8AAACbCAIAAAC7yOv5AAAACXBIWXMAAABEAAAARACdvuRJ
 AAAqpUlEQVR42u2df2hlx5XnT4cbqAcaeDJOkGB3icTSxFII69Zug92TMN2eXkgvXoiT/LEd
 ZiBW40DayZCN88eS5J9J+4/9kVmSuGdYY7VhZ+3ABsuwiXuH9LZ6iSMpuEfS0G31M4nRE6yZ
diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/howto/howtoword.abw abiword-2.0.9/abiword-docs/ABW/pl-PL/howto/howtoword.abw
--- abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/howto/howtoword.abw	2004-07-28 19:00:11.584417345 +0100
+++ abiword-2.0.9/abiword-docs/ABW/pl-PL/howto/howtoword.abw	2004-07-28 19:00:49.791295568 +0100
@@ -24,7 +24,7 @@
 <p style="Heading 2"><c style="Heading 2" props="lang:en-US">Podgl??d dokument??w AbiWorda w programie Microsoft Word</c></p>
 <p style="Normal"><c props="lang:en-US">Jakkolwiek Microsoft zapowiada wsparcie dla plik??w AbiWorda, to przede wszystkim dokumenty tworzone w AbiWordzie powinny by?? eksportowane do formatu czytelnego dla programu Microsoft Word. Naj??atwiej to zrobi?? przez zapisanie pliku w postaci Rich Text Format.</c></p>
 <p style="Normal"></p>
-<p style="Normal"><image dataid="E:\nowyAbiWord\abiword-doc\docs 9.1\ok---howto\howtoword.png_0" props="height:3.40in; width:5.04in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/howtoword.png_0" props="height:3.40in; width:5.04in"/></p>
 <p style="Normal"></p>
 <p style="Normal"><c props="lang:en-US">Rich Text Format cz??sto jest u??ywany przez pakiet oprogramowania biurowego firmy Microsoft i nie b??dzie problem??w z importem dokument??w zapisanych w ten spos??b.</c></p>
 <p style="Heading 2"><c style="Heading 2" props="lang:en-US">Podgl??d dokument??w Microsoft Word w AbiWordzie</c></p>
@@ -32,7 +32,7 @@
 <p style="Normal"><c props="lang:en-US">Je??li napotykasz problemy, to popro?? u??ytkownika programu Microsoft Word, aby zapisywa?? dokumenty jako Rich Text Format (.rtf). Wszystkie wersje programu Microsoft Word mog?? zapisywa?? pliki w tym formacie, a AbiWord potrafi wiernie odczytywa?? pliki typu RTF.</c></p>
 </section>
 <data>
-<d name="E:\nowyAbiWord\abiword-doc\docs 9.1\ok---howto\howtoword.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/howtoword.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAl0AAAGYCAIAAAGAKvBwAAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXQUxbru6Z59Jvu+IU9Qr7jh8Yrg
 Coq4IKiIinAFFFxYghCQhASyEQj7GgKB7CsJgYCAEJLM9ARCUNGrjyvi9TxChCBclsBlMWzp
diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/interface/workspace.abw abiword-2.0.9/abiword-docs/ABW/pl-PL/interface/workspace.abw
--- abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/interface/workspace.abw	2004-07-28 19:00:11.576418627 +0100
+++ abiword-2.0.9/abiword-docs/ABW/pl-PL/interface/workspace.abw	2004-07-28 19:00:49.962268173 +0100
@@ -25,24 +25,24 @@
 <p style="Heading 1"><c props="lang:pl-PL">Obszar roboczy </c><c props="lang:pl-PL"></c>AbiWorda</p>
 <p style="Normal">Obszar roboczy jest podobny do tych, jakie znamy z innych edytor??w tekstu. Dlatego ka??dy nowy u??ytkownik <c props="lang:en-US">AbiWorda mo??e si?? czu?? jak u siebie w domu</c><c props="lang:en-US"></c>.</p>
 <p style="doc_normal"></p>
-<p style="doc_normal" props="text-indent:0.0000in; text-align:center"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\full_window.png_0" props="height:3.68in; width:6.96in"/></p>
+<p style="doc_normal" props="text-indent:0.0000in; text-align:center"><image dataid="/usr/src/abiword/commit/full_window.png_0" props="height:3.68in; width:6.96in"/></p>
 <p style="doc_normal"></p>
 <p level="1" listid="0" parentid="0" style="Normal">Znajomy interfejs pozwala wi??kszo??ci u??ytkownikom <c props="lang:en-US">od razu rozpocz???? prac??</c><c props="lang:en-US"></c>. Tym niemniej niekt??re mo??liwo??ci b??d?? nowo??ci??.</p>
 <p level="1" listid="0" parentid="0" style="Normal"></p>
 <p level="1" listid="0" parentid="0" style="Heading 3">Okno tytu??u</p>
 <p level="1" listid="0" parentid="0" style="doc_normal" props="text-indent:-0.5000in"></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\titlebar.png_0" props="height:0.25in; width:6.99in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/titlebar.png_0" props="height:0.25in; width:6.99in"/></p>
 <p level="1" listid="0" parentid="0" style="Normal"></p>
 <p level="1" listid="0" parentid="0" style="Normal">Okno tytu??u jest podobne do okien innych aplikacji, z jedn?? jednak r????nic??. Zw???? uwag?? na gwiazdk?? * obok ???Dokument_10???. Gwiazdka oznacza, ??e ???Dokument_10??? zosta?? zmodyfikowany. W ten prosty spos??b AbiWord podpowiada ci, ??e dokument powinien by?? zapisany.</p>
 <p level="1" listid="0" parentid="0" style="Heading 3">Paski funkcji</p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars.png_0" props="height:0.90in; width:6.99in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars.png_0" props="height:0.90in; width:6.99in"/></p>
 <p level="1" listid="0" parentid="0" style="Normal"></p>
 <p level="1" listid="0" parentid="0" style="Normal">Oto trzy podstawowe paski funkcji. Pierwszy, nazywany Paskiem Menu, to najlepsze miejsce, by zapozna?? si?? z AbiWordem. Najlepiej po prostu przejrzyj ka??de menu, wtedy poznasz wszystkie komendy, jakich AbiWord mo??e u??y?? do dokument??w.</p>
 <p level="1" listid="0" parentid="0" style="Normal">Drugi to pasek ???Standardowy???, trzeci z wy??ej pokazanych (na dole) to pasek "Formatowanie".</p>
 <p level="1" listid="0" parentid="0" style="Heading 3">Paski robocze</p>
 <p level="1" listid="0" parentid="0" style="Normal">AbiWord pozwala na ukrywanie pask??w narz??dzi. Je??li kt??rego?? brakuje albo nie jest potrzebny, sprawd?? w Widok &gt; Paski narz??dzi.</p>
 <p level="1" listid="0" parentid="0" style="Normal"></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars_hiding.png_1" props="height:1.67in; width:3.54in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars_hiding.png_1" props="height:1.67in; width:3.54in"/></p>
 <p style="Heading 3">Pasek uchwytu</p>
 <p style="doc_normal"></p>
 <p style="Normal" props="text-align:left"><image dataid="/usr/src/abiword/commit/images/grabbar_shaded.png_0" props="height:1.08in; width:1.35in"/></p>
@@ -50,14 +50,14 @@
 <p style="Normal" props="lang:en-US">U??ytkownicy, kt??rzy uruchamiaj?? AbiWorda w ??rodowisku GNOME, znajd?? pasek uchwytu umieszczony na skraju lewej cz????ci ka??dego z pask??w narz??dziowych, kt??ry pozwala w prosty spos??b zmodyfikowa?? interfejs wedle ??yczenia. Kliknij na pasek uchwytu i przeci??gnij. Pasek narz??dziowy b??dzie przesuwa?? si?? wzd??u?? toru myszki, mo??e nawet wisie?? nad dowoln?? cz????ci?? ekranu.</p>
 <p style="Heading 3">Pasek statusu</p>
 <p style="doc_normal"></p>
-<p style="Normal" props="text-indent:0.0000in"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar.png_0" props="height:0.24in; width:6.96in"/></p>
+<p style="Normal" props="text-indent:0.0000in"><image dataid="/usr/src/abiword/commit/statusbar.png_0" props="height:0.24in; width:6.96in"/></p>
 <p style="doc_normal" props="text-indent:0.5000in; margin-left:0.0000in"></p>
 <p style="Normal" props="text-indent:0.5000in">W pasku statusu znajdziesz skr??towy opis statusu dokumentu. W lewej cz????ci paska<c props="font-family:Times New Roman; text-decoration:none; color:000000; font-size:12pt; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"> AbiWord</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; font-size:12pt; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c> wy??wietla kolejny numer strony oraz liczb?? wszystkich stron. Nast??pnie w ??rodkowej cz????ci, kt??ra najcz????ciej jest pusta, wy??wietlany jest kr??tki pomocniczy opis bie????cej opcji menu. W prawej cz????ci paska podany jest tryb pracy klawiatury (<c props="font-weight:bold">+INS</c>, czyli tryb wstawiania, albo <c props="font-weight:bold">-ins</c>, czyli tryb zast??powania) oraz nazwa aktualnego szablonu.</p>
 <p style="Normal" props="text-indent:0.5000in"></p>
-<p style="Normal" props="text-indent:0.0000in"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar_quickhelp.png_0" props="height:2.48in; width:6.97in"/></p>
+<p style="Normal" props="text-indent:0.0000in"><image dataid="/usr/src/abiword/commit/statusbar_quickhelp.png_0" props="height:2.48in; width:6.97in"/></p>
 <p style="Heading 3">Linijka</p>
 <p style="doc_normal"></p>
-<p style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\ruler.png_0" props="height:0.34in; width:8.85in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/ruler.png_0" props="height:0.34in; width:8.85in"/></p>
 <p style="Normal"></p>
 <p style="Normal">U??ywaj??c linijki mo??esz w ??atwy spos??b definiowa?? <c props="lang:en-US">na stronie </c><c props="lang:en-US"></c>marginesy oraz tabulatory.</p>
 </section>
@@ -65,7 +65,7 @@
 <p style="Normal" props="text-align:left"></p>
 </section>
 <data>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\full_window.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/full_window.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAApwAAAFhCAIAAAElyt0+AAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXwURdbvLPC54IeIuMoKArKcUQgi
 d2JABIGVKxwGVrmPGMQQzklmJpcCIUBMgpBwJBzBEI4glwR0RTySzISEzAyZJIC6IB6suwLK
@@ -1458,7 +1458,7 @@
 Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW
 iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg==
 </d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\titlebar.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/titlebar.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAp8AAAAYCAIAAAFEpzGAAAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9d1RUWbZ38TqYMAdUkAKabCBoS5As
 qKAiKIIgWck5JwkigkgWEFSiiIqCtpjaHFqSIlSBobvtoHaY6fj19Dezpue9Wa++fc6+99at
@@ -1824,7 +1824,7 @@
 U3NkC/pNXf3TzsJ2jxwsz3aUR7tKcWkNGacs2/619xjliewpfDI4XsC01wCb6ZPN6En3gjNT
 F/m4k8smfLv/D9XFSL9vOncQAAAAAElFTkSuQmCC
 </d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar_quickhelp.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/statusbar_quickhelp.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAp0AAADuCAIAAAGDmRu5AAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCVQUx7oeAi5EcXlZTKKXQUUJmgii
 kVUkUURwQdwAgwiIwKCAKLLIooiiILKIgiKCgrsoKhHUuAvMsM4gi8bk5ZpEk6OJeZrz7kty
@@ -2753,7 +2753,7 @@
 rHHd5lpt9kxeQWueBlaZZ/Fw+ux83+U9jEtmQ0dDO9V/An0RGn6kluj/H0TjWnMwPK11AAAA
 AElFTkSuQmCC
 </d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/statusbar.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAApwAAAAXCAIAAAFexjhWAAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAQ2ElEQVR4nO1dC1fbuBIOr+7v3W0pPUtS2P61S3Cc
 0NiOQ7g/5HZpu6fkzswnjR628yKQkPU5g4+QZVmR5q0ZuTPJhkWRFvmoCXJq0Hz3hSAvgn/L
@@ -2837,7 +2837,7 @@
 pHc9YRw/VddzPPJlb69v8xK8bi3Qo7dknmEXttcXuibeNbhLgrjSHv6qx6vuxdUlifPRnA9/
 vvh8+bGUMol5AkbjCX+D/v/6OPv+i4Ym1QAAAABJRU5ErkJggg==
 </d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/functionbars.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAp8AAABWCAIAAAFx9VqcAAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9CXxU1bn4HRJwa23rv699z7a2tX1t
 ta226nOBWLVqfW3t5trF1rpVpVpbBFlmEpBFUURZFZCloICgoIKAooBCJpN1lsxkwhJIWAOU
@@ -3416,7 +3416,7 @@
 bOnGe+2M3XYot2UDS4L5O8omnlXu+gHXqLwXOB02sXB53k22Z9RfqVlmje7/A8GWRyS/OvHV
 AAAAAElFTkSuQmCC
 </d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\ruler.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/ruler.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAA1IAAAAhCAIAAAErHT00AAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAN60lEQVR4nO1djXLbOA6WNnmmvb1r76l2u0lrqd2H
 c+OkzkRy7Tj3KJ26tg8kJIrWD0VLlAjZwHyjcWSGhiASBEkADN69/xejD4Jt8jWO7uL4A3xA
@@ -3486,7 +3486,7 @@
 5Nm7YpO32pdkR7qtS7ijYei3Sa21MD/MD/PD/DA/18gPH/dai3qzrxHWK0Y91/kYVcAsR85m
 FvqatoL+5yYxmH0MBoPBYFwa2MizxP8Bf0pzQLOvs0QAAAAASUVORK5CYII=
 </d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars_hiding.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/functionbars_hiding.png_1" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAVQAAACgCAIAAAGrgzPPAAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nLRcC3CURbb+h8lr8k4IRALOPwmQ18S8
 ABHxcVnBSMTwlofZSEiCGALy2EgkExRlQQQf4FvR0t3VXXdXry513dq61i2rbkIICZkZEhK3

abiword-2.2.1-desktop.patch:

--- NEW FILE abiword-2.2.1-desktop.patch ---
--- abiword-2.2.1/abi/abiword.desktop.desktop	2004-12-06 08:55:02.366730824 +0000
+++ abiword-2.2.1/abi/abiword.desktop	2004-12-06 08:57:31.004206527 +0000
@@ -6,11 +6,17 @@
 Categories=Application;Office;WordProcessor;X-Red-Hat-Base;
 StartupNotify=true
 Encoding=UTF-8
-X-Desktop-File-Install-Version=0.4
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;
-Name=AbiWord Word Processor
-Name[de]=AbiWord Textverarbeitung
-Name[nb]=AbiWord Tekstbehandling
-Name[nn]=AbiWord Tekstbehandling
-Name[no]=AbiWord Tekstbehandler
-Name[pt]=AbiWord Processador de Texto
+X-Desktop-File-Install-Version=0.9
+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;
+Name=Word Processor
+Comment=AbiWord Word Processor
+Name[de]=Textverarbeitung
+Comment[de]=AbiWord Textverarbeitung
+Name[nb]=Tekstbehandling
+Comment[nb]=AbiWord Tekstbehandling
+Name[nn]=Tekstbehandling
+Comment[nn]=AbiWord Tekstbehandling
+Name[no]=Tekstbehandler
+Comment[no]=AbiWord Tekstbehandler
+Name[pt]=Processador de Texto
+Comment[pt]=AbiWord Processador de Texto

abiword-2.2.5-gcc4.patch:

--- NEW FILE abiword-2.2.5-gcc4.patch ---
diff -ru abiword-2.2.5.orig/wv/wvConfig.c abiword-2.2.5/wv/wvConfig.c
--- abiword-2.2.5.orig/wv/wvConfig.c	2005-03-04 08:48:33.804025324 +0000
+++ abiword-2.2.5/wv/wvConfig.c	2005-03-04 08:50:44.807202081 +0000
@@ -2130,7 +2130,7 @@
 }
 
 static void
-startElement (void *userData, const XML_Char *name, const XML_Char **atts)
+wvstartElement (void *userData, const XML_Char *name, const XML_Char **atts)
 {
     unsigned int nAtts = 0;
     const XML_Char **p;
@@ -3094,7 +3094,7 @@
 }
 
 static void
-endElement (void *userData, const XML_Char *name)
+wvendElement (void *userData, const XML_Char *name)
 {
     state_data *mydata = (state_data *) userData;
     unsigned int token_type;
@@ -3470,8 +3470,8 @@
 	memset(&hdl, 0, sizeof(hdl));
 
 	hdl.getEntity = _getEntity;
-	hdl.startElement = startElement;
-	hdl.endElement = endElement;
+	hdl.startElement = wvstartElement;
+	hdl.endElement = wvendElement;
 	hdl.characters = charData;
 
 	if (myhandle->fp)
@@ -3514,7 +3514,7 @@
     size_t len;
 
     XML_SetUserData (parser, myhandle);
-    XML_SetElementHandler (parser, startElement, endElement);
+    XML_SetElementHandler (parser, wvstartElement, wvendElement);
     XML_SetCharacterDataHandler (parser, charData);
 
     if (myhandle->fp == NULL)

abiword-2.2.5-wvread.patch:

--- NEW FILE abiword-2.2.5-wvread.patch ---
diff -u abiword-2.2.5.orig/wv/libole2/ms-ole.c abiword-2.2.5/wv/libole2/ms-ole.c
--- abiword-2.2.5.orig/wv/libole2/ms-ole.c	2004-10-23 02:59:51.000000000 +0200
+++ abiword-2.2.5/wv/libole2/ms-ole.c	2005-03-14 21:50:48.000000000 +0100
@@ -36,6 +36,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <string.h>
+#undef read
 
 #ifdef __MINGW32__ /* incomplete defines on mingw */
 


--- NEW FILE abiword.mime ---
application/x-abiword
	ext: abw



--- NEW FILE abiword.spec ---
%define desktop_file_utils_version 0.9

Summary: The AbiWord word processor
Name: abiword
Version: 2.2.5
Release: 2
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
PreReq: desktop-file-utils >= %{desktop_file_utils_version}

BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: libstdc++, /usr/bin/g++
BuildRequires: gtk2-devel aspell-devel libpng-devel
BuildRequires: libxml2-devel
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
BuildRequires: fribidi-devel, enchant-devel

# some plugin build deps
BuildRequires: ots-devel >= 0.4.2
BuildRequires: libwpd-devel >= 0.8.0
BuildRequires: librsvg2-devel
BuildRequires: libwmf-devel
BuildRequires: aiksaurus-gtk-devel >= 1.2.1

# gnome build deps
BuildRequires: libbonobo-devel
BuildRequires: libbonoboui-devel
BuildRequires: libgnomeprint22-devel
BuildRequires: libgnomeprintui22-devel
BuildRequires: libgnomeui-devel
URL: http://www.abisource.com/

Patch0: abiword-2.0.9-windowshelppaths.patch
Patch1: abiword-2.2.1-desktop.patch
Patch2: abiword-2.2.5-gcc4.patch
Patch3: abiword-2.2.5-wvread.patch

%description
AbiWord is a cross-platform Open Source word processor. The goal is to make
AbiWord full-featured, and remain lean.

%prep
%setup -q 
%patch0 -p1 -b .windowshelppaths
%patch1 -p1 -b .desktop
%patch2 -p1 -b .gcc4
%patch3 -p1 -b .wvread

%build
cd abi
autoconf
%configure --enable-gnome --with-libxml2
cd ../wv
%configure --with-libwmf --with-libxml2
cd ../abi
make
cd ../abiword-plugins
libtoolize --copy --force
./nextgen.sh
%configure --disable-gda --with-abiword=../abi
sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo
sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool
make

# now make the docs
cd ../abiword-docs
ABI_DOC_PROG=$(pwd)/../abi/src/wp/main/unix/AbiWord-2.2 ./make-html.sh

%install
cd abi
%makeinstall
cd ../abiword-plugins
%makeinstall DESTDIR=$RPM_BUILD_ROOT

# install the docs
cd ../abiword-docs
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.2/AbiWord/help
cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.2/AbiWord/help/
# some of the help dirs have bad perms (#109261)
find $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.2/AbiWord/help/ -type d -exec chmod -c o+rx {} \;

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
cp $RPM_BUILD_ROOT%{_datadir}/AbiSuite-2.2/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png

cd ../abi
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor gnome \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Red-Hat-Extra --remove-category X-Red-Hat-Base \
  --add-category Applications --add-category Office \
  ./abiword.desktop
# remove the original one (which has X-Red-Hat-Base)  (#107023)
rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/abiword.desktop

mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info
install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info

rm -f $RPM_BUILD_ROOT%{_bindir}/ttf*
# nuke .la files
rm -f $RPM_BUILD_ROOT/%{_libdir}/AbiWord-2.2/plugins/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/ldconfig
update-desktop-database %{_datadir}/applications

%postun
/sbin/ldconfig
update-desktop-database %{_datadir}/applications

%files
%defattr(-,root,root)
%doc abi/docs 
%{_bindir}/AbiWord-2.2
%{_bindir}/abiword
%{_libdir}/AbiWord-2.2
%{_datadir}/AbiSuite-2.2
%{_datadir}/applications/*
%{_datadir}/mime-info/*
%{_datadir}/pixmaps/*png
%{_datadir}/icons/*png

%changelog
* Fri Mar 14 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.5-2
- Remove the --disable-magick plugin switch
- disable GDA support until the plugin is ported to gnomedb 1.2.x
- Change the download location from SF to http://www.abisource.com/
- patch libole2

* Fri Mar  2 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.5-1
- bump to latest stable
- drop integrated dashboard patch again
- some gcc4 fixes

* Wed Feb 23 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.4-2
- rh#149447# dashboard spam revisited

* Tue Feb 22 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.4-1
- bump to latest stable version
- drop integrated nautilus depend patch
- drop integrated libwpd depend patch

* Fri Feb 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.3-4
- upgrade to libwpd-0.8 and incoroprate necessary changeover patches

* Mon Feb 7 2005 Matthias Clasen <mclasen at redhat.com> - 1:2.2.3-3
- rebuild

* Mon Feb 2 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.3-2
- remove unneccessary nautilus dependency

* Mon Jan 17 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.3-1
- bump to new version
- drop integrated silenceabidash patch

* Fri Jan 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.2-4
- RH#145085# annoying cluepacket message on stdout/stderr

* Wed Jan 12 2005 Tim Waugh <twaugh at redhat.com> - 1:2.2.2-3
- Rebuilt for new readline.

* Tue Jan 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.2-2
- RH#143368# use enchant as spellchecker

* Mon Dec 13 2004 Caolan McNamara <caolanm at redhat.com> - 1:2.2.2-1
- bump to new version

* Mon Dec 6 2004 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-1
- bump to new version
- geometry patch upstreamed
- security patch upstreamed
- removeoledecod patch upstreamed
- regenerate desktop patch

* Mon Nov 22 2004 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-2
- #abi7961# remove tempnam usages

* Mon Nov 22 2004 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-1
- bump to latest major stable version
- #rh140321# sanity check geometry

* Tue Nov  9 2004 Caolan McNamara <caolanm at redhat.com> - 1:2.0.14-1
- bump to latest stable version

* Mon Nov  8 2004 Jeremy Katz <katzj at redhat.com> - 1:2.0.12-4
- rebuild for python 2.4

* Thu Sep 30 2004 Christopher Aillon <caillon at redhat.com> 1:2.0.12-3
- Change to PreReq instead of Requires(post), up to 0.9

* Thu Sep 29 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.12-2
- Better Requires desktop-file-utils

* Wed Sep 29 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.12-1
- update to new abiword, + change norwegian wordprocessor translation

* Tue Sep 14 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.11-3
- #132389# Add more abiword supported mime types to abiword.desktop

* Mon Sep 6 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.11-2
- merge abiword.keys into abiword.desktop

* Fri Aug 27 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.11-1
- 2.0.11

* Tue Aug 10 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.10-2
- use libgnomedb

* Tue Aug 10 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.10-1
- 2.0.10
- use aiksaurus

* Tue Aug 2 2004 Matthias Clasen <mclasen at redhat.com> 1:2.0.9-4
- rebuilt

* Thu Jul 29 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.9-3
- #126012# some desktop translations

* Wed Jul 28 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.9-2
- #128004# fix irritating windows looking filenames for generated pngs

* Fri Jul 16 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.9-1
- 2.0.9, new version with security fix

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 20 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.6-1
- 2.0.7, new version + gcc34 fixes

* Wed Apr 28 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.6-1
- 2.0.6, 64bit changes made upstream

* Sat Mar 13 2004 Jeremy Katz <> 1:2.0.5-1
- 2.0.5

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Feb 19 2004 Jeremy Katz <katzj at redhat.com> - 1:2.0.3-3
- rebuild for newer libots and libwpd
- fix verify as non-root (#109261)
- add wpd files to abiword.keys (#114907)

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Jan 29 2004 Jeremy Katz <katzj at redhat.com> - 1:2.0.3-1
- 2.0.3 (fixes build against gtk+ 2.3 and lets us rebuild to fix libcroco dep)

* Wed Dec 17 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.2-2
- rebuild for new libwpd

* Sun Nov 30 2003 Jeremy Katz <katzj at redhat.com> 
- and librsvg2-devel (#111222)

* Fri Nov 28 2003 Jeremy Katz <katzj at redhat.com> 
- buildrequire libgnomeui-devel (#111164)

* Tue Oct 28 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.1-1
- 2.0.1
- really remove duplicate desktop file

* Tue Oct 21 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.0-6
- make the docs with the just built abiword so that we don't have to 
  have abiword installed to build the docs (#107279)

* Tue Oct 21 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.0-5
- fix linkage to glib 1.2 in hancom plugin (#106033)

* Sun Oct 19 2003 Florian La Roche <Florian.LaRoche at redhat.de>
- add %%clean specfile target

* Tue Oct 14 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.0-4
- remove duplicate desktop file (#107023)

* Tue Sep 23 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.0-3
- include the help
- show the clipart (#104577)

* Mon Sep 15 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.0-2
- rebuild with newer libwpd and libots to get those plugins

* Sun Sep 14 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.0-1
- 2.0.0

* Thu Sep  4 2003 Jeremy Katz <katzj at redhat.com> 1:1.99.6-1
- 1.99.6

* Mon Aug 25 2003 Jeremy Katz <katzj at redhat.com> 1:1.99.5-1
- 1.99.5

* Tue Aug  5 2003 Jeremy Katz <katzj at redhat.com> 1:1.99.3-1
- 1.99.3
- put icon in the right place (#101646)
- fix some 64bit casting issues
- disable ots plugin for now, doesn't seem to build with ots 0.4.0 :/
- disable -pedantic -ansi so that it will build

* Mon Jul 14 2003 Jeremy Katz <katzj at redhat.com> 1:1.99.2-2
- ugly hack to deal with libtool silliness on x86_64

* Fri Jul 11 2003 Jeremy Katz <katzj at redhat.com> 1:1.99.2-1
- 1.99.2
- add buildrequires to make sure the ots and wp plugins get built
- no longer needs libgal2, remove buildrequires

* Mon Jun 16 2003 Jeremy Katz <katzj at redhat.com> 1:1.99.1-1
- 1.99.1

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon May 26 2003 Jeremy Katz <katzj at redhat.com> 1:1.9.1-3
- rebuild for new libgal2

* Mon May 19 2003 Jeremy Katz <katzj at redhat.com> 1:1.9.1-2
- tweak plugins build

* Mon May 12 2003 Jeremy Katz <katzj at redhat.com> 1:1.9.1-0.2
- 1.9.1
- drop old patches, switch to using autoconf based build system instead 
  of diving makefiles
- build with gnome support
- build with plugins
- add patch to build on AMD64

* Mon Apr 28 2003 Tim Powers <timp at redhat.com> 1:1.0.5-2
- rebuild to fix broken libpspell dep

* Mon Mar 24 2003 Jeremy Katz <katzj at redhat.com> 1:1.0.5-1
- 1.0.5

* Mon Feb 10 2003 Jeremy Katz <katzj at redhat.com> 1:1.0.4-2
- fix for abiword starting off the screen (#82425)

* Thu Jan 23 2003 Jeremy Katz <katzj at redhat.com> 1:1.0.4-1
- 1.0.4

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Sun Dec 29 2002 Jeremy Katz <katzj at redhat.com> 1:1.0.3-2
- make it build on x86_64

* Sun Dec 29 2002 Jeremy Katz <katzj at redhat.com> 1:1.0.3-1
- 1.0.3 (#80560)
- set umask before running mkfontdir in %%post
- patch AbiWord script to convert utf8 locales into non-utf8 variants (#72633)

* Mon Dec 02 2002 Elliot Lee <sopwith at redhat.com> 1.0.2-7
- Fix doc lines
- Fix multilib

* Sat Aug 10 2002 Elliot Lee <sopwith at redhat.com> 1.0.2-6
- rebuilt with gcc-3.2 (we hope)

* Sat Aug 10 2002 Jeremy Katz <katzj at redhat.com> 1.0.2-5
- fix help index symlink (#71219)

* Thu Aug  1 2002 Jeremy Katz <katzj at redhat.com> 1.0.2-4
- add abiword binary symlink for upstream compatibility (#70267)

* Mon Jul 22 2002 Tim Powers <timp at redhat.com> 1.0.2-3
- rebuild using gcc-3.2-0.1

* Thu Jul 18 2002 Jeremy Katz <katzj at redhat.com> 1.0.2-2
- use included desktop file (#64447)
- use desktop-file-install

* Wed Jun 26 2002 Jeremy Katz <katzj at redhat.com> 1.0.2-1
- 1.0.2
- disable perl module build since we weren't including it anyway

* Wed May 29 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.0.1-1
- 1.0.1

* Sun Apr 14 2002 Jeremy Katz <katzj at redhat.com> 0.99.5-1
- zh_CN and zh_TW fonts.dir were flipped
- update to 0.99.5 as it fixes some major bugs
- define ABI_BUILD_VERSION so the about screen gives us a version

* Mon Apr  8 2002 Bennhard Rosenkraenzer <bero at redhat.com> 0.99.4-2
- 1st try at fixing up CJK (#61590)
- #if 0'ify font warning dialog (#62909, #64556)

* Tue Apr  2 2002 Bernhard Rosenkraenzer <bero at redhat.com> 0.99.4-1
- Update to 0.99.4, fixes #61153
- Fix #61344
- Nuke the warning about being unable to add anything to font path,
  that's not how xfs works.

* Thu Feb 28 2002 Bernhard Rosenkraenzer <bero at redhat.com> 0.99.2-1
- 0.99.2
- remove blank lines in fonts.dir

* Thu Jan 31 2002 Bernhard Rosenkraenzer <bero at redhat.com> 0.99.1-1
- 0.99.1

* Wed Jan 30 2002 Alex Larsson <alexl at redhat.com> 0.9.5-3
- Added patch to use libpng10
- Added patch to fix perl build problems.

* Fri Nov 23 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.9.5-1
- 0.9.5

* Tue Oct 23 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.9.4.1-1
- Update to 0.9.4.1 (RFE #54806)
- Add URL (RFE #54590)

* Thu Jul 19 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.7.14-7
- Fix uninstall (#49350)

* Sat Jul  7 2001 Tim Powers <timp at redhat.com>
- rebuilt so that dirs aren't sgid root

* Tue Jun 26 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.7.14-5
- Add build requirements (#45157)

* Tue Jun 26 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.7.14-4
- Remove CVS admin files from documentation (#44916)

* Mon Jun 18 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- add s390x patch from <oliver.paukstadt at millenux.com>

* Sat Jun 09 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- add s390 patch from Helge Deller

* Tue May 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.7.14-1
- Update to 0.7.14

* Tue Feb 27 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- Handle MIME type stuff (Bug #27530)
- Add BuildPrereqs for some of the less common stuff AbiWord uses
  (gal-devel, gnome-print-devel, libunicode-devel)

* Tue Feb 20 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.7.13

* Mon Jan 15 2001 Than Ngo <than at redhat.com>
- fixed broken code for building

* Fri Dec 29 2000 Matt Wilson <msw at redhat.com>
- 0.7.12
- copy fonts.dir to fonts.scale so mkfontdir doesn't blow it away

* Tue Dec 12 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Rebuild to get rid of 0777 dirs

* Fri Nov 17 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.7.11

* Sun Aug 20 2000 Preston Brown <pbrown at redhat.com>
- fix path to chkfontpath, it was wrong.

* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
- Up Epoch and release

* Mon Aug  7 2000 Jakub Jelinek <jakub at redhat.com>
- Don't ship AbiWord_s if we have AbiWord_d
- Register AbiWord's fontpath with xfs

* Wed Aug  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Rebuild with new libpng. This fixes Bug #13707 - gotta love it when they
  change the ABI without increasing the soname!
- fix tooltip (Bug #14711)
- move binaries from /usr/share to /usr/lib

* Wed Jul 12 2000 Jakub Jelinek <jakub at redhat.com>
- Fix build on ia64.

* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Tue Jul  4 2000 Jakub Jelinek <jakub at redhat.com>
- Rebuild with new gcc.

* Sat Jun 18 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Fix build on ia64

* Fri Jun 17 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.7.10
- update download location

* Fri Jun  9 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- initial build for main CD
- clean up specfile
- fix build with gcc 2.96 and glibc 2.2
- exclude ia64 for now

* Wed May  3 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.7.9

* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.7.8
- move the desktop file to /etc/X11/applnk so it can be used in both
  GNOME and KDE
- fix up handling of RPM_OPT_FLAGS

* Thu Jan 20 2000 Tim Powers <timp at redhat.com>
- bzipped source to conserve space.

* Sun Jan  9 2000 Matt Wilson <msw at redhat.com>
- enable GNOME, remove perl hack to do RPM_OPT_FLAGS
- added libpng requirement.  0.7.7 requires 1.0.5 libpng ABI

* Tue Jan  4 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.7.7
- handle RPM_OPT_FLAGS

* Mon Nov 15 1999 Tim Powers <timp at redhat.com>
- first build for inclusion into Powertools.
- some things in this spec file are from the abisuite-0.7.5-1mdk package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Mar 2005 22:38:49 -0000	1.1
+++ .cvsignore	14 Mar 2005 22:39:45 -0000	1.2
@@ -0,0 +1 @@
+abiword-2.2.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Mar 2005 22:38:49 -0000	1.1
+++ sources	14 Mar 2005 22:39:45 -0000	1.2
@@ -0,0 +1 @@
+265a6ece8fcfd37cb7c3fc4d13056ad2  abiword-2.2.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 14 23:02:49 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 18:02:49 -0500
Subject: rpms/abiword/devel abiword-2.2.5-wvread.patch, 1.1, 1.2 abiword.spec,
	1.1, 1.2
Message-ID: <200503142302.j2EN2nKj009844@cvs-int.fedora.redhat.com>

Author: katzj

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

Modified Files:
	abiword-2.2.5-wvread.patch abiword.spec 
Log Message:
* Fri Mar 14 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.5-2
- Remove the --disable-magick plugin switch
- disable GDA support until the plugin is ported to gnomedb 1.2.x
- Change the download location from SF to http://www.abisource.com/
- patch libole2
- fix read as a macro in new glibc


abiword-2.2.5-wvread.patch:

Index: abiword-2.2.5-wvread.patch
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword-2.2.5-wvread.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- abiword-2.2.5-wvread.patch	14 Mar 2005 22:39:45 -0000	1.1
+++ abiword-2.2.5-wvread.patch	14 Mar 2005 23:02:47 -0000	1.2
@@ -1,11 +1,21 @@
 diff -u abiword-2.2.5.orig/wv/libole2/ms-ole.c abiword-2.2.5/wv/libole2/ms-ole.c
 --- abiword-2.2.5.orig/wv/libole2/ms-ole.c	2004-10-23 02:59:51.000000000 +0200
-+++ abiword-2.2.5/wv/libole2/ms-ole.c	2005-03-14 21:50:48.000000000 +0100
-@@ -36,6 +36,7 @@
- #include <assert.h>
- #include <ctype.h>
- #include <string.h>
-+#undef read
++++ abiword-2.2.5/wv/libole2/ms-ole.c	2005-03-14 23:36:08.130603903 +0100
+@@ -482,7 +482,7 @@
  
- #ifdef __MINGW32__ /* incomplete defines on mingw */
+ 	offset = (b+1)*BB_BLOCK_SIZE;
+ 	f->syswrap->lseek (f->file_des, offset, SEEK_SET, f->syswrap->closure);
+-	f->syswrap->read (f->file_des, attr->data, BB_BLOCK_SIZE, f->syswrap->closure);
++	(f->syswrap->read) (f->file_des, attr->data, BB_BLOCK_SIZE, f->syswrap->closure);
+ 	attr->usage = 1;
+ 	attr->dirty = forwrite;
  
+@@ -1791,7 +1791,7 @@
+ 		f->mem = g_new (guint8, BB_BLOCK_SIZE);
+ 
+ 		if (!f->mem ||
+-		    f->syswrap->read (file, f->mem, BB_BLOCK_SIZE,
++		    (f->syswrap->read) (file, f->mem, BB_BLOCK_SIZE,
+ 				      f->syswrap->closure) == -1) {
+ 			g_warning ("Error reading header\n");
+ 			f->syswrap->close (file, f->syswrap->closure) ;


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- abiword.spec	14 Mar 2005 22:39:45 -0000	1.1
+++ abiword.spec	14 Mar 2005 23:02:47 -0000	1.2
@@ -136,6 +136,7 @@
 - disable GDA support until the plugin is ported to gnomedb 1.2.x
 - Change the download location from SF to http://www.abisource.com/
 - patch libole2
+- fix read as a macro in new glibc
 
 * Fri Mar  2 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.5-1
 - bump to latest stable



From fedora-extras-commits at redhat.com  Tue Mar 15 05:48:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 15 Mar 2005 00:48:57 -0500
Subject: devel/bittorrent sources, 1.3, 1.4 .cvsignore, 1.3,
	1.4 bittorrent.spec, 1.7, 1.8
Message-ID: <200503150548.j2F5mvft022900@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/bittorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22894

Modified Files:
	sources .cvsignore bittorrent.spec 
Log Message:
Update by David Hill.


Index: sources
===================================================================
RCS file: /cvs/extras/devel/bittorrent/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:05:46 -0000	1.3
+++ sources	15 Mar 2005 05:48:55 -0000	1.4
@@ -1 +1 @@
-84d8cfedeba539db8b497d63e6ecceed  BitTorrent-3.4.1a.zip
+67f449df351b66f408b72b6bd196952f  BitTorrent-4.0.0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/bittorrent/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:05:46 -0000	1.3
+++ .cvsignore	15 Mar 2005 05:48:55 -0000	1.4
@@ -1 +1 @@
-BitTorrent-3.4.1a.zip
+BitTorrent-4.0.0.tar.gz


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/devel/bittorrent/bittorrent.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bittorrent.spec	3 Mar 2005 19:46:39 -0000	1.7
+++ bittorrent.spec	15 Mar 2005 05:48:55 -0000	1.8
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        3.4.1
-Release:        3.a
+Version:        4.0.0
+Release:        1
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
-License:        MIT
-URL:            http://bitconjurer.org/BitTorrent/
-Source0:        http://dl.sf.net/bittorrent/BitTorrent-3.4.1a.zip
+License:        BitTorrent Open Source License
+URL:            http://www.bittorrent.com/
+Source0:        http://www.bittorrent.com/dl/BitTorrent-4.0.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -27,7 +27,7 @@
 %package        gui
 Summary:        GUI versions of the BitTorrent file transfer tool
 Group:          Applications/Internet
-Requires:       wxPython
+Requires:       pygtk2
 Requires:       %{name} = %{version}-%{release}
 
 %description    gui
@@ -36,7 +36,8 @@
 
 
 %prep
-%setup -q -n BitTorrent-3.4.1a
+%setup -q -n BitTorrent-4.0.0
+sed -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py
 
 
 %build
@@ -56,13 +57,11 @@
 %files
 %defattr(-,root,root,-)
 %doc README.txt credits.txt LICENSE.txt
-%{_bindir}/btcompletedir.py
 %{_bindir}/btdownloadcurses.py
 %{_bindir}/btdownloadheadless.py
-%{_bindir}/btdownloadlibrary.py
 %{_bindir}/btlaunchmany.py
 %{_bindir}/btlaunchmanycurses.py
-%{_bindir}/btmakemetafile.py
+%{_bindir}/btmaketorrent.py
 %{_bindir}/btreannounce.py
 %{_bindir}/btrename.py
 %{_bindir}/btshowmetainfo.py
@@ -75,11 +74,15 @@
 
 %files gui
 %defattr(-,root,root)
-%{_bindir}/btcompletedirgui.py
 %{_bindir}/btdownloadgui.py
+%{_bindir}/btmaketorrentgui.py
+%{_datadir}/pixmaps/%{name}-%{version}
 
 
 %changelog
+* Mon Mar 14 2005 David Hill <djh[at]ii.net> - 4.0.0-1
+- update to 4.0.0, no longer requires wxPythonGTK
+
 * Wed Dec 22 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:3.4.1-3.a
 - x86_64: Fix python dependency, replace with python-abi dependency.
 



From fedora-extras-commits at redhat.com  Tue Mar 15 05:50:48 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 15 Mar 2005 00:50:48 -0500
Subject: devel/bittorrent bittorrent.desktop, NONE, 1.1 bittorrent.png, NONE,
	1.1 bittorrent.spec, 1.8, 1.9
Message-ID: <200503150550.j2F5om2w022937@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/bittorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22931

Modified Files:
	bittorrent.spec 
Added Files:
	bittorrent.desktop bittorrent.png 
Log Message:
- add desktop file, desktop menu icon, post/postun scriptlets



--- NEW FILE bittorrent.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=BitTorrent File Transfer
Comment=Distributed download of files from the Internet
Exec=btdownloadgui.py
Icon=bittorrent.png
Terminal=false
Type=Application
StartupNotify=false
Categories=Application;Network;
MimeType=application/x-bittorrent;


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/devel/bittorrent/bittorrent.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bittorrent.spec	15 Mar 2005 05:48:55 -0000	1.8
+++ bittorrent.spec	15 Mar 2005 05:50:46 -0000	1.9
@@ -1,17 +1,21 @@
+%define desktopvendor fedora
+
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
 Version:        4.0.0
-Release:        1
+Release:        2
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
 License:        BitTorrent Open Source License
 URL:            http://www.bittorrent.com/
-Source0:        http://www.bittorrent.com/dl/BitTorrent-4.0.0.tar.gz
+Source0:        http://www.bittorrent.com/dl/BitTorrent-%{version}.tar.gz
+Source1:        bittorrent.desktop
+Source2:        bittorrent.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel
+BuildRequires:  python-devel desktop-file-utils
 Requires:       python
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
@@ -36,7 +40,7 @@
 
 
 %prep
-%setup -q -n BitTorrent-4.0.0
+%setup -q -n BitTorrent-%{version}
 sed -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py
 
 
@@ -49,11 +53,25 @@
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 sed -i -e 's/env python2/env python/' $RPM_BUILD_ROOT%{_bindir}/*
 
+desktop-file-install --vendor %{desktopvendor} \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	--add-category X-Fedora \
+	%{SOURCE1}
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bittorrent.png
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post gui
+update-desktop-database %{_datadir}/applications &>/dev/null || :
+
+
+%postun gui
+update-desktop-database %{_datadir}/applications &>/dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc README.txt credits.txt LICENSE.txt
@@ -76,10 +94,15 @@
 %defattr(-,root,root)
 %{_bindir}/btdownloadgui.py
 %{_bindir}/btmaketorrentgui.py
+%{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
 %{_datadir}/pixmaps/%{name}-%{version}
+%{_datadir}/pixmaps/bittorrent.png
 
 
 %changelog
+* Tue Mar 15 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 4.0.0-2
+- add desktop file, desktop menu icon, post/postun scriptlets
+
 * Mon Mar 14 2005 David Hill <djh[at]ii.net> - 4.0.0-1
 - update to 4.0.0, no longer requires wxPythonGTK
 



From fedora-extras-commits at redhat.com  Tue Mar 15 08:12:08 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:12:08 -0500
Subject: rpms/libgda - New directory
Message-ID: <200503150812.j2F8C8uI029184@cvs-int.fedora.redhat.com>

Author: caolanm

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

Log Message:
Directory /cvs/extras/rpms/libgda added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 08:12:08 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:12:08 -0500
Subject: rpms/libgda/devel - New directory
Message-ID: <200503150812.j2F8C8G5029187@cvs-int.fedora.redhat.com>

Author: caolanm

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

Log Message:
Directory /cvs/extras/rpms/libgda/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 08:12:25 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:12:25 -0500
Subject: rpms/libgda Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503150812.j2F8CPg0029248@cvs-int.fedora.redhat.com>

Author: caolanm

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module libgda


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

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

common : CVS/Root
	@cvs 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 Mar 15 08:12:25 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:12:25 -0500
Subject: rpms/libgda/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503150812.j2F8CPZS029251@cvs-int.fedora.redhat.com>

Author: caolanm

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libgda


--- 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 Mar 15 08:13:06 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:13:06 -0500
Subject: rpms/libgda import.log,1.1,1.2
Message-ID: <200503150813.j2F8D642029378@cvs-int.fedora.redhat.com>

Author: caolanm

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libgda/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 08:12:23 -0000	1.1
+++ import.log	15 Mar 2005 08:13:04 -0000	1.2
@@ -0,0 +1 @@
+libgda-1_2_0-5:HEAD:libgda-1.2.0-5.src.rpm:1110874378



From fedora-extras-commits at redhat.com  Tue Mar 15 08:13:06 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:13:06 -0500
Subject: rpms/libgda/devel libgda-1.2.0-64bitgnomeXXXXXX.patch, NONE,
	1.1 libgda-1.2.0-configure.patch, NONE,
	1.1 libgda-1.2.0-gnome162569.patch, NONE,
	1.1 libgda-1.2.0-gnomeXXXXXX.patch, NONE, 1.1 libgda.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503150813.j2F8D6HU029384@cvs-int.fedora.redhat.com>

Author: caolanm

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

Modified Files:
	.cvsignore sources 
Added Files:
	libgda-1.2.0-64bitgnomeXXXXXX.patch 
	libgda-1.2.0-configure.patch libgda-1.2.0-gnome162569.patch 
	libgda-1.2.0-gnomeXXXXXX.patch libgda.spec 
Log Message:
auto-import libgda-1.2.0-5 on branch devel from libgda-1.2.0-5.src.rpm

libgda-1.2.0-64bitgnomeXXXXXX.patch:

--- NEW FILE libgda-1.2.0-64bitgnomeXXXXXX.patch ---
--- libgda-1.2.0/configure.in.orig	2005-02-04 14:55:37.264111391 +0000
+++ libgda-1.2.0/configure.in	2005-02-04 14:57:40.495430489 +0000
@@ -157,25 +157,31 @@
 bdbdir=""
 if test $try_bdb = true
 then
-	AC_MSG_CHECKING(for Berkeley DB files)
-	for d in $dir /usr /usr/local
-	do
-		if test -f $d/$lib/libdb.so -a -f $d/include/db.h
+	AC_CHECK_HEADER(db.h, bdb_ok=yes, bdb_ok=no, [])
+	if test $bdb_ok = yes ; then
+		bdbdir=yes
+		BDB_LIBS="-ldb"
+	else
+		AC_MSG_CHECKING(for Berkeley DB files)
+		for d in $dir /usr /usr/local
+		do
+			if test -f $d/$lib/libdb.so -a -f $d/include/db.h
+			then
+				AC_MSG_RESULT(found Berkeley DB in $d)
+				bdblib="-ldb"
+				bdbdir=$d
+				break
+			fi
+			dnl FIXME: check for db1 (non-sleepycat implementation)
+		done
+		if test x$bdbdir = x
 		then
-			AC_MSG_RESULT(found Berkeley DB in $d)
-			bdblib="-ldb"
-			bdbdir=$d
-			break
+			AC_MSG_WARN(Berkeley DB backend not used)
+		else
+			AC_DEFINE(HAVE_BDB, 1, [Have Berkeley DB])
+			BDB_CFLAGS="-I${bdbdir}/include"
+			BDB_LIBS="-L${bdbdir}/lib ${bdblib}"
 		fi
-		dnl FIXME: check for db1 (non-sleepycat implementation)
-	done
-	if test x$bdbdir = x
-	then
-		AC_MSG_WARN(Berkeley DB backend not used)
-	else
-		AC_DEFINE(HAVE_BDB, 1, [Have Berkeley DB])
-		BDB_CFLAGS="-I${bdbdir}/include"
-		BDB_LIBS="-L${bdbdir}/lib ${bdblib}"
 	fi
 fi
 

libgda-1.2.0-configure.patch:

--- NEW FILE libgda-1.2.0-configure.patch ---
--- libgda-1.2.0/configure.in.orig	2005-02-04 09:54:32.000000000 +0000
+++ libgda-1.2.0/configure.in	2005-02-04 09:59:32.030377459 +0000
@@ -251,7 +251,7 @@
 mysqldir=""
 if test $try_mysql = true
 then
-	AC_PATH_PROG(MYSQL_CONFIG, mysql_config)
+	AC_PATH_PROG(MYSQL_CONFIG, mysql_config, 'no', [${libdir}/mysql3/mysql:$PATH])
 
 	if test x$MYSQL_CONFIG = xno; then
 		AC_MSG_CHECKING(for MySQL files)

libgda-1.2.0-gnome162569.patch:

--- NEW FILE libgda-1.2.0-gnome162569.patch ---
--- libgda-1.2.0/providers/bdb/gda-bdb-recordset.c.orig	2005-02-04 12:38:17.332297982 +0000
+++ libgda-1.2.0/providers/bdb/gda-bdb-recordset.c	2005-02-04 12:39:29.939219610 +0000
@@ -227,6 +227,9 @@
 
 	/* get the number of records in the database */
 	ret = dbp->stat (dbp,
+#if BDB_VERSION > 40300
+			 NULL,
+#endif
 			 &statp,
 #if BDB_VERSION < 40000
 			 NULL,

libgda-1.2.0-gnomeXXXXXX.patch:

--- NEW FILE libgda-1.2.0-gnomeXXXXXX.patch ---
diff -ru libgda-1.2.0.orig/providers/bdb/Makefile.am libgda-1.2.0/providers/bdb/Makefile.am
--- libgda-1.2.0.orig/providers/bdb/Makefile.am	2005-02-04 14:04:28.990148676 +0000
+++ libgda-1.2.0/providers/bdb/Makefile.am	2005-02-04 14:06:25.117365278 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-bdb.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/firebird/Makefile.am libgda-1.2.0/providers/firebird/Makefile.am
--- libgda-1.2.0.orig/providers/firebird/Makefile.am	2005-02-04 14:04:23.061056775 +0000
+++ libgda-1.2.0/providers/firebird/Makefile.am	2005-02-04 14:06:32.416247710 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-firebird.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/freetds/Makefile.am libgda-1.2.0/providers/freetds/Makefile.am
--- libgda-1.2.0.orig/providers/freetds/Makefile.am	2005-02-04 14:04:22.368162899 +0000
+++ libgda-1.2.0/providers/freetds/Makefile.am	2005-02-04 14:06:36.861567075 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-freetds.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/ibmdb2/Makefile.am libgda-1.2.0/providers/ibmdb2/Makefile.am
--- libgda-1.2.0.orig/providers/ibmdb2/Makefile.am	2005-02-04 14:04:30.323944395 +0000
+++ libgda-1.2.0/providers/ibmdb2/Makefile.am	2005-02-04 14:06:42.224745913 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-ibmdb2.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/ldap/Makefile.am libgda-1.2.0/providers/ldap/Makefile.am
--- libgda-1.2.0.orig/providers/ldap/Makefile.am	2005-02-04 14:04:31.462769975 +0000
+++ libgda-1.2.0/providers/ldap/Makefile.am	2005-02-04 14:06:46.713058713 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-ldap.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/mdb/Makefile.am libgda-1.2.0/providers/mdb/Makefile.am
--- libgda-1.2.0.orig/providers/mdb/Makefile.am	2005-02-04 14:04:24.488838095 +0000
+++ libgda-1.2.0/providers/mdb/Makefile.am	2005-02-04 14:06:50.902417292 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-mdb.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/msql/Makefile.am libgda-1.2.0/providers/msql/Makefile.am
--- libgda-1.2.0.orig/providers/msql/Makefile.am	2005-02-04 14:04:31.593749914 +0000
+++ libgda-1.2.0/providers/msql/Makefile.am	2005-02-04 14:06:59.626081654 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-msql.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/mysql/Makefile.am libgda-1.2.0/providers/mysql/Makefile.am
--- libgda-1.2.0.orig/providers/mysql/Makefile.am	2005-02-04 14:04:25.430693840 +0000
+++ libgda-1.2.0/providers/mysql/Makefile.am	2005-02-04 14:07:03.699458009 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-mysql.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/odbc/Makefile.am libgda-1.2.0/providers/odbc/Makefile.am
--- libgda-1.2.0.orig/providers/odbc/Makefile.am	2005-02-04 14:04:30.094979462 +0000
+++ libgda-1.2.0/providers/odbc/Makefile.am	2005-02-04 14:07:07.067942289 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-odbc.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/oracle/Makefile.am libgda-1.2.0/providers/oracle/Makefile.am
--- libgda-1.2.0.orig/providers/oracle/Makefile.am	2005-02-04 14:04:22.745105166 +0000
+++ libgda-1.2.0/providers/oracle/Makefile.am	2005-02-04 14:07:11.378282375 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-oracle.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/postgres/Makefile.am libgda-1.2.0/providers/postgres/Makefile.am
--- libgda-1.2.0.orig/providers/postgres/Makefile.am	2005-02-04 14:04:31.058831841 +0000
+++ libgda-1.2.0/providers/postgres/Makefile.am	2005-02-04 14:07:15.095713241 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-postgres.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/sqlite/Makefile.am libgda-1.2.0/providers/sqlite/Makefile.am
--- libgda-1.2.0.orig/providers/sqlite/Makefile.am	2005-02-04 14:04:29.397086350 +0000
+++ libgda-1.2.0/providers/sqlite/Makefile.am	2005-02-04 14:07:20.493886796 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-sqlite.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/sybase/Makefile.am libgda-1.2.0/providers/sybase/Makefile.am
--- libgda-1.2.0.orig/providers/sybase/Makefile.am	2005-02-04 14:04:29.291102583 +0000
+++ libgda-1.2.0/providers/sybase/Makefile.am	2005-02-04 14:07:24.356295478 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-sybase.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/xbase/Makefile.am libgda-1.2.0/providers/xbase/Makefile.am
--- libgda-1.2.0.orig/providers/xbase/Makefile.am	2005-02-04 14:04:25.803636720 +0000
+++ libgda-1.2.0/providers/xbase/Makefile.am	2005-02-04 14:07:27.598799070 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-xbase.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/xml/Makefile.am libgda-1.2.0/providers/xml/Makefile.am
--- libgda-1.2.0.orig/providers/xml/Makefile.am	2005-02-04 14:04:24.039906854 +0000
+++ libgda-1.2.0/providers/xml/Makefile.am	2005-02-04 14:07:35.898528447 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-xml.la
 
 AM_CPPFLAGS = \


--- NEW FILE libgda.spec ---
# Default provider build options (MySQL, Postgres & unixODBC)
#
# Package build options:
# --with tds
# --with db2
# --with oracle
# --with sqlite
# --with sybase
# --with mdb
# --with ldap
# --without mysql
# --without odbc
# --without postgres
# 

%define           FREETDS  0
%define           IBMDB2   0
%define           MYSQL    1
%define           ODBC     1
%define           ORACLE   0
%define           POSTGRES 1
%define           SQLITE   0
%define           SYBASE   0
%define 	  MDB	   0
%define		  LDAP	   0

%{?_with_tds:%define FREETDS 	1}
%{?_with_db2:%define IBMDB2 	1}
%{?_with_ldap:%define LDAP 	1}
%{?_with_mdb:%define MDB 	1}
%{?_with_oracle:%define ORACLE 	1}
%{?_with_sqlite:%define SQLITE 	1}
%{?_with_sybase:%define SYBASE 	1}
%{?_without_mysql:%define MYSQL 0}
%{?_without_odbc:%define ODBC 	0}
%{?_without_postgres:%define POSTGRES 	0}

Summary:          Library for writing gnome database programs
Name:             libgda
Version:          1.2.0
Release: 	  5
Epoch:		  1
Source:           %{name}-%{version}.tar.bz2
URL:              http://www.gnome-db.org/
Group:            System Environment/Libraries
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

%if %{FREETDS}
BuildRequires:    freetds-devel
%endif

%if %{MYSQL}
BuildRequires:    mysqlclient10-devel
%endif

%if %{POSTGRES}
BuildRequires:    postgresql-devel
%endif

%if %{ODBC}
BuildRequires:    unixODBC-devel
%endif

%if %{SQLITE}
BuildRequires:	  sqlite-devel
%endif

%if %{MDB}
BuildRequires:	  mdbtools-devel
%endif

%if %{LDAP}
BuildRequires:	  openldap-devel
%endif

Patch0: libgda-1.2.0-configure.patch
Patch1: libgda-1.2.0-gnome162569.patch
Patch2: libgda-1.2.0-gnomeXXXXXX.patch
Patch3: libgda-1.2.0-64bitgnomeXXXXXX.patch

%description
libgda is a library that eases the task of writing
gnome database programs.


%package devel
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:	  %{name} = %{epoch}:%{version}-%{release}

%description devel
This package contains the header files and libraries needed to write
or compile programs that use libgda.

%if %{FREETDS}
%package -n gda-freetds
Summary:	GDA FreeTDS Provider
Group:		System Environment/Libraries
%description -n gda-freetds
This package includes the GDA FreeTDS provider.
%endif

%if %{IBMDB2}
%package -n gda-ibmdb2
Summary:	GDA IBM DB2 Provider
Group:		System Environment/Libraries
%description -n gda-ibmdb2
This package includes the GDA IBM DB2 provider.
%endif

%if %{MYSQL}
%package -n gda-mysql
Summary:	GDA MySQL Provider
Group:		System Environment/Libraries
%description -n gda-mysql
This package includes the GDA MySQL provider.
%endif

%if %{ODBC}
%package -n gda-odbc
Summary:	GDA ODBC Provider
Group:		System Environment/Libraries
%description -n gda-odbc
This package includes the GDA ODBC provider.
%endif

%if %{ORACLE}
%package -n gda-oracle
Summary:	GDA Oracle Provider
Group:		System Environment/Libraries
%description -n gda-oracle
This package includes the GDA Oracle provider.
%endif

%if %{POSTGRES}
%package -n gda-postgres
Summary:	GDA PostgreSQL Provider
Group:		System Environment/Libraries
%description -n gda-postgres
This package includes the GDA PostgreSQL provider.
%endif

%if %{SQLITE}
%package -n gda-sqlite
Summary:	GDA SQLite Provider
Group:		System Environment/Libraries
%description -n gda-sqlite
This package includes the GDA SQLite provider.
%endif

%if %{SYBASE}
%package -n gda-sybase
Summary:	GDA Sybase Provider
Group:		System Environment/Libraries
%description -n gda-sybase
This package includes the GDA Sybase provider.
%endif

%if %{MDB}
%package -n gda-mdb
Summary:	GDA MDB Provider
Group:		System Environment/Libraries
%description -n gda-mdb
This package includes the GDA MDB provider.
%endif

%if %{LDAP}
%package -n gda-ldap
Summary:	GDA LDAP Provider
Group:		System Environment/Libraries
%description -n gda-ldap
This package includes the GDA LDAP provider.
%endif

%prep
%setup -q
%patch0 -p1 -b .configure
%patch1 -p1 -b .gnome162569
%patch2 -p1 -b .gnomeXXXXXX
%patch3 -p1 -b .64bitgnomeXXXXXX.patch

%build
aclocal
automake
autoconf
%if %{FREETDS}
CONFIG="$CONFIG --with-tds"
%else
CONFIG="$CONFIG --without-tds"
%endif

%if %{IBMDB2}
CONFIG="$CONFIG --with-ibmdb2"
%else
CONFIG="$CONFIG --without-ibmdb2"
%endif

%if %{MYSQL}
CONFIG="$CONFIG --with-mysql"
%else
CONFIG="$CONFIG --without-mysql"
%endif

%if %{POSTGRES}
CONFIG="$CONFIG --with-postgres"
%else
CONFIG="$CONFIG --without-postgres"
%endif

%if %{ODBC}
CONFIG="$CONFIG --with-odbc"
%else
CONFIG="$CONFIG --without-odbc"
%endif

%if %{ORACLE}
CONFIG="$CONFIG --with-oracle"
%else
CONFIG="$CONFIG --without-oracle"
%endif

%if %{SQLITE}
CONFIG="$CONFIG --with-sqlite"
%else
CONFIG="$CONFIG --without-sqlite"
%endif

%if %{SYBASE}
CONFIG="$CONFIG --with-sybase"
%else
CONFIG="$CONFIG --without-sybase"
%endif

%if %{MDB}
CONFIG="$CONFIG --with-mdb"
%else
CONFIG="$CONFIG --without-mdb"
%endif

%if %{LDAP}
CONFIG="$CONFIG --with-ldap"
%else
CONFIG="$CONFIG --without-ldap"
%endif

%configure $CONFIG --disable-gtk-doc
make

%install
rm -rf %{buildroot}
%makeinstall

# Cleanup unnecessary, unpackaged files
rm -f %{buildroot}/%{_libdir}/libgda/providers/*.{a,la}

%find_lang libgda-2

%post -p /sbin/ldconfig

%post devel
if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi

%postun -p /sbin/ldconfig

%postun devel
if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi

%clean
rm -rf %{buildroot}

%files -f libgda-2.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README NEWS
#%doc %{_datadir}/gnome/help/libgda
%dir %{_sysconfdir}/libgda
%config(noreplace) %{_sysconfdir}/libgda/config
%{_bindir}/*
%{_datadir}/libgda
%{_libdir}/*.so.*
%dir %{_libdir}/libgda
%dir %{_libdir}/libgda/providers
%{_libdir}/libgda/providers/libgda-xml.so
%{_libdir}/libgda/providers/libgda-bdb.so
%{_mandir}/man1/*
%{_mandir}/man5/*

%files devel
%defattr(-,root,root)
%doc %{_datadir}/gtk-doc/html/libgda
%{_datadir}/omf/*
%{_includedir}/*
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%if %{FREETDS}
%files -n gda-freetds
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-freetds.so
%endif

%if %{IBMDB2}
%files -n gda-ibmdb2
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-ibmdb2.so
%endif

%if %{MYSQL}
%files -n gda-mysql
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-mysql.so
%endif

%if %{ODBC}
%files -n gda-odbc
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-odbc.so
%endif

%if %{ORACLE}
%files -n gda-oracle
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-oracle.so
%endif

%if %{POSTGRES}
%files -n gda-postgres
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-postgres.so
%endif

%if %{SQLITE}
%files -n gda-sqlite
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-sqlite.so
%endif

%if %{SYBASE}
%files -n gda-sybase
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-sybase.so
%endif

%if %{MDB}
%files -n gda-mdb
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-mdb.so
%endif

%if %{LDAP}
%files -n gda-ldap
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-ldap.so
%endif


%changelog
* Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1:1.2.0-5
- rebuild with gcc4

* Fri Feb 11 2005 Caolan McNamara <caolanm at redhat.com> 1:1.2.0-4
- well, that was moronic

* Wed Feb 10 2005 Caolan McNamara <caolanm at redhat.com> 1:1.2.0-3
- bandaid

* Wed Feb  9 2005 Jeremy Katz <katzj at redhat.com> - 1:1.2.0-2
- rebuild to try to fix broken dep

* Fri Feb 4 2005 Caolan McNamara <caolanm at redhat.com> 1:1.2.0-1
- bump to latest version
- drop integrated break warning patch
- update configure patch

* Wed Jan 12 2005 Tim Waugh <twaugh at redhat.com> 1:1.0.4-5
- Rebuilt for new readline.

* Sat Oct 30 2004 Caolan McNamara <caolanm at redhat.com> 1:1.0.4-4
- Use mysqlclient10

* Fri Oct  8 2004 Caolan McNamara <caolanm at redhat.com> 1:1.0.4-3
- #rh135043# Extra BuildRequires

* Thu Sep  9 2004 Bill Nottingham <notting at redhat.com> 1:1.0.4-2
- %%defattr

* Thu Aug 12 2004 Caolan McNamara <caolanm at redhat.com> 1:1.0.4-1
- Initial Red Hat import
- patch for missing break statement
- fixup devel package requirement pickiness
- autoconf patch to pick up correct mysql path from mysql_config (e.g. x64)
- autoconf patch to just look in the normal place for postgres first

* Tue Mar 11 2003 David Hollis <dhollis at davehollis.com>
- Fix --with-tds & --without-tds to match what configure wants

* Tue Jan 28 2003 Yanko Kaneti <yaneti at declera.com>
- Remove the idl path
- Include gda-config man page
- add --without-* for disabled providers
- package and use the omf/scrollkeeper bits

* Tue Dec 31 2002 David Hollis <dhollis at davehollis.com>
- Added sqlite-devel buildreq
- Include gda-config-tool man page

* Mon Aug 19 2002 Ben Liblit <liblit at acm.org>
- Fixed version number substitutions

- Removed some explicit "Requires:" prerequisites that RPM will figure
  out on its own.  Removed explicit dependency on older MySQL client
  libraries

- Required that the ODBC development package be installed if we are
  building the ODBC provider

- Created distinct subpackages for each provider, conditional on that
  provider actually being enabled; some of these will need to be
  updated as the family of available providers changes

- Updated files list to match what "make install" actually installs

- Added URL tag pointing to GNOME-DB project's web site

* Tue Feb 26 2002 Chris Chabot <chabotc at reviewboard.com>
- Added defines and configure flags for all supported DB types

* Mon Feb 25 2002 Chris Chabot <chabotc at reviewboard.com>
- Cleaned up formatting
- Added Requirements
- Added defines for postgres, mysql, odbc support

* Thu Feb 21 2002 Chris Chabot <chabotc at reviewboard.com>
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 08:12:23 -0000	1.1
+++ .cvsignore	15 Mar 2005 08:13:04 -0000	1.2
@@ -0,0 +1 @@
+libgda-1.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 08:12:23 -0000	1.1
+++ sources	15 Mar 2005 08:13:04 -0000	1.2
@@ -0,0 +1 @@
+c18ac2dc6484c58cc9f72387abb9a10c  libgda-1.2.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar 15 08:13:49 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:13:49 -0500
Subject: rpms/libgnomedb - New directory
Message-ID: <200503150813.j2F8Dn0b029513@cvs-int.fedora.redhat.com>

Author: caolanm

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

Log Message:
Directory /cvs/extras/rpms/libgnomedb added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 08:13:49 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:13:49 -0500
Subject: rpms/libgnomedb/devel - New directory
Message-ID: <200503150813.j2F8DnXP029516@cvs-int.fedora.redhat.com>

Author: caolanm

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

Log Message:
Directory /cvs/extras/rpms/libgnomedb/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 08:14:06 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:14:06 -0500
Subject: rpms/libgnomedb Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503150814.j2F8E6D2029577@cvs-int.fedora.redhat.com>

Author: caolanm

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module libgnomedb


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

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

common : CVS/Root
	@cvs 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 Mar 15 08:14:06 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:14:06 -0500
Subject: rpms/libgnomedb/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503150814.j2F8E68C029580@cvs-int.fedora.redhat.com>

Author: caolanm

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libgnomedb


--- 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 Mar 15 08:14:37 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:14:37 -0500
Subject: rpms/libgnomedb import.log,1.1,1.2
Message-ID: <200503150814.j2F8Ebe5029689@cvs-int.fedora.redhat.com>

Author: caolanm

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 08:14:04 -0000	1.1
+++ import.log	15 Mar 2005 08:14:35 -0000	1.2
@@ -0,0 +1 @@
+libgnomedb-1_2_0-3:HEAD:libgnomedb-1.2.0-3.src.rpm:1110874469



From fedora-extras-commits at redhat.com  Tue Mar 15 08:14:37 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:14:37 -0500
Subject: rpms/libgnomedb/devel libgnomedb-1.2.0-desktop.patch, NONE,
	1.1 libgnomedb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200503150814.j2F8EbFJ029693@cvs-int.fedora.redhat.com>

Author: caolanm

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

Modified Files:
	.cvsignore sources 
Added Files:
	libgnomedb-1.2.0-desktop.patch libgnomedb.spec 
Log Message:
auto-import libgnomedb-1.2.0-3 on branch devel from libgnomedb-1.2.0-3.src.rpm

libgnomedb-1.2.0-desktop.patch:

--- NEW FILE libgnomedb-1.2.0-desktop.patch ---
--- libgnomedb-1.2.0.orig/control-center/database-properties.desktop.in	2005-02-21 17:38:51.000000000 +0000
+++ libgnomedb-1.2.0/control-center/database-properties.desktop.in	2005-02-21 17:39:42.000000000 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Database Access Properties 
 _Comment=Configure your database environment
-Icon=libgnomedb/gnome-db.png
+Icon=/usr/share/pixmaps/libgnomedb/gnome-db.png
 Exec=gnome-database-properties
 Terminal=0
 Type=Application


--- NEW FILE libgnomedb.spec ---
Summary:         Library for writing gnome database programs
Name:            libgnomedb
Version:         1.2.0
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
Requires:	 libgda >= 1.2.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.2.0

Patch0: libgnomedb-1.2.0-desktop.patch

%description
libgnomedb is a library that eases the task of writing
gnome database programs.

%package devel
Summary:         Development libraries and header files for libgnomedb.
Group:           Development/Libraries
Requires:	  %{name} = %{epoch}:%{version}-%{release}
Requires:        pkgconfig >= 0.8
Requires:        libgnomeui >= 1.103.0
Requires:        libgnomeui-devel >= 1.103.0
Requires:        libgda >= 1.2.0
Requires:        libgda-devel >= 1.2.0
Requires:        gtk2 >= 1.3.6
Requires:        gtk2-devel >= 1.3.6
Requires:        libglade2
Requires:        libglade2-devel

%description devel
This package contains the header files and libraries needed to write
or compile programs that use libgda.

%prep
%setup -q
%patch0 -p1 -b .desktop.patch

%build
%configure --disable-gtk-doc
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%makeinstall
%find_lang libgnomedb-2

# rh#14932# install the .desktop into the canonical location
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --vendor=database --delete-original \
  $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/database-properties.desktop

%post
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`

for SCHEMA in %{_sysconfdir}/gconf/schemas/libgnomedb.schemas; do
/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-2.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README NEWS
%{_bindir}/*
%{_datadir}/mime-info/*
%{_datadir}/pixmaps/libgnomedb
%{_datadir}/applications/*.desktop
%{_datadir}/gnome-db
%{_libdir}/*.so.*
%{_libdir}/libglade/2.0/*
%config(noreplace) %{_sysconfdir}/gconf/schemas/*

%files devel
%defattr(-,root,root)
%{_includedir}/libgnomedb-1.2
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/*.so
%{_libdir}/pkgconfig/*


%changelog
* Wed Mar 02 2005 Caolan McNamara <caolanm at redhat.com> 1.2.0-3
- rebuild with gcc4

* Mon Feb 21 2005 Caolan McNamara <caolanm at redhat.com> 1.2.0-2
- rh#149232#/rh#149222# install .desktop to /usr/share/applications

* Fri Feb 04 2005 Caolan McNamara <caolanm at redhat.com> 1.2.0-1
- bump to latest stable version
- drop integrated patchs

* Tue Dec 07 2004 Caolan McNamara <caolanm at redhat.com> 1.0.4-4
- #rh142098# missing return

* Wed Oct 20 2004 Caolan McNamara <caolanm at redhat.com> 1.0.4-3
- #rh136069# Backport crashfix on no tables
- #rh136361# Move icon for gnome properties

* Fri Oct 08 2004 Caolan McNamara <caolanm at redhat.com> 1.0.4-2
- #rh135044# BuildRequires

* Thu Aug 12 2004 Caolan McNamara <caolanm at redhat.com>
- Initial Red Hat import
- patch for missing break statement
- fixup devel package requirement pickiness

* Tue Jan 28 2003 Yanko Kaneti <yaneti at delcera.com>
- Package and add the omf/scrollkeeper bits.
- --disable-gtk-doc to configure because the generated docs are in the tarball

* Mon Aug 19 2002 Ben Liblit <liblit at acm.org>
- Fixed version number substitutions
- Updated files list to match what "make install" actually installs
- Added URL tag pointing to GNOME-DB project's web site

* Mon Feb 25 2002 Chris Chabot <chabotc at reviewboard.com>
- Cleaned up formatting
- Added requirements

* Thu Feb 21 2002 Chris Chabot <chabotc at reviewboard.com>
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 08:14:04 -0000	1.1
+++ .cvsignore	15 Mar 2005 08:14:35 -0000	1.2
@@ -0,0 +1 @@
+libgnomedb-1.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 08:14:04 -0000	1.1
+++ sources	15 Mar 2005 08:14:35 -0000	1.2
@@ -0,0 +1 @@
+d446a3b7b13e0100794feb62fbc296c6  libgnomedb-1.2.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar 15 08:15:59 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:15:59 -0500
Subject: rpms/gnumeric/devel gnumeric.spec,1.1,1.2
Message-ID: <200503150815.j2F8Fxt8029814@cvs-int.fedora.redhat.com>

Author: caolanm

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

Modified Files:
	gnumeric.spec 
Log Message:
add libgnomedb to extras and gnumeric's requires


Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnumeric.spec	14 Mar 2005 12:17:13 -0000	1.1
+++ gnumeric.spec	15 Mar 2005 08:15:57 -0000	1.2
@@ -4,7 +4,7 @@
 Summary:        A spreadsheet program for GNOME.
 Name:     	gnumeric
 Version: 	1.4.3
-Release: 	1
+Release: 	2
 Epoch:		1
 License:	GPL
 Group:		Applications/Productivity
@@ -16,7 +16,7 @@
 Requires:       libgnomeprintui22 >= 2.3.0
 Requires:       gtk2 >= 2.2.0
 Requires:       libgsf >= 1.10.0
-#Requires:  	libgnomedb >= 1.0.4
+Requires:  	libgnomedb >= 1.0.4
 PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:  libgnomeui-devel >= 2.4.0
@@ -26,7 +26,7 @@
 BuildRequires:  libgsf-devel >= 1.10.0
 BuildRequires:  automake autoconf libtool
 BuildRequires:  intltool scrollkeeper gettext desktop-file-utils
-#BuildRequires:  libgnomedb-devel >= 1.0.4
+BuildRequires:  libgnomedb-devel >= 1.0.4
 BuildRequires:  pango-devel >= 1.4.0
 Patch0: gnumeric-1.4.1-desktop.patch
 Patch1: gnumeric-1.4.1-excelcrash.patch
@@ -138,6 +138,9 @@
 %dir %{_libdir}/gnumeric/%{gnumeric_version}
 
 %changelog
+* Tue Mar 15 2005 Caolan McNamara <caolanm at redhat.com> 1.4.3-2
+- add libgnomedb to extras and gnumeric's requires
+
 * Mon Mar 14 2005 Caolan McNamara <caolanm at redhat.com> 1.4.3-1
 - bump to latest, first in extras
 - drop helppath



From fedora-extras-commits at redhat.com  Tue Mar 15 08:29:40 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 03:29:40 -0500
Subject: rpms/rpmlint/FC-3 rpmlint.spec,1.9,1.10
Message-ID: <200503150829.j2F8Tems030214@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	rpmlint.spec 
Log Message:
Fix build.


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-3/rpmlint.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmlint.spec	13 Mar 2005 20:52:20 -0000	1.9
+++ rpmlint.spec	15 Mar 2005 08:29:38 -0000	1.10
@@ -33,6 +33,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_datadir}/rpmlint/compile.pyo
 install -pm 644 rpmlint.bash-completion $RPM_BUILD_ROOT%{_datadir}/rpmlint
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 touch $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
@@ -75,7 +76,6 @@
 %{_bindir}/rpm*
 %dir %{_datadir}/rpmlint
 %{_datadir}/rpmlint/rpmlint.bash-completion
-%exclude %{_datadir}/rpmlint/compile.pyo
 %dir %{_sysconfdir}/rpmlint
 %config(noreplace) %{_sysconfdir}/rpmlint/config
 %ghost %{_sysconfdir}/bash_completion.d/rpmlint



From fedora-extras-commits at redhat.com  Tue Mar 15 08:29:40 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 03:29:40 -0500
Subject: rpms/rpmlint/devel rpmlint.spec,1.10,1.11
Message-ID: <200503150829.j2F8TeLa030218@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	rpmlint.spec 
Log Message:
Fix build.


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rpmlint.spec	13 Mar 2005 20:52:20 -0000	1.10
+++ rpmlint.spec	15 Mar 2005 08:29:38 -0000	1.11
@@ -32,6 +32,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_datadir}/rpmlint/compile.pyo
 install -pm 644 rpmlint.bash-completion $RPM_BUILD_ROOT%{_datadir}/rpmlint
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 touch $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
@@ -74,7 +75,6 @@
 %{_bindir}/rpm*
 %dir %{_datadir}/rpmlint
 %{_datadir}/rpmlint/rpmlint.bash-completion
-%exclude %{_datadir}/rpmlint/compile.pyo
 %dir %{_sysconfdir}/rpmlint
 %config(noreplace) %{_sysconfdir}/rpmlint/config
 %ghost %{_sysconfdir}/bash_completion.d/rpmlint



From fedora-extras-commits at redhat.com  Tue Mar 15 08:45:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 15 Mar 2005 03:45:45 -0500
Subject: devel/bittorrent bittorrent.spec,1.9,1.10
Message-ID: <200503150845.j2F8jj68030579@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/bittorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30569

Modified Files:
	bittorrent.spec 
Log Message:
+ scriptlet deps


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/devel/bittorrent/bittorrent.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bittorrent.spec	15 Mar 2005 05:50:46 -0000	1.9
+++ bittorrent.spec	15 Mar 2005 08:45:43 -0000	1.10
@@ -18,6 +18,8 @@
 BuildRequires:  python-devel desktop-file-utils
 Requires:       python
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 BuildArch:      noarch
 



From fedora-extras-commits at redhat.com  Tue Mar 15 11:59:34 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 06:59:34 -0500
Subject: devel/hddtemp hddtemp.db,1.2,1.3 hddtemp.spec,1.8,1.9
Message-ID: <200503151159.j2FBxY4C005188@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/hddtemp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5180

Modified Files:
	hddtemp.db hddtemp.spec 
Log Message:
hddtemp.db 2005-03-15.


Index: hddtemp.db
===================================================================
RCS file: /cvs/extras/devel/hddtemp/hddtemp.db,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hddtemp.db	22 Jan 2005 13:39:06 -0000	1.2
+++ hddtemp.db	15 Mar 2005 11:59:32 -0000	1.3
@@ -74,6 +74,7 @@
 "FUJITSU MPG3409AH.*"           194  C  "Fujitsu MPG3409AH E"
 "FUJITSU MPG3204AH"		194  C  "Fujitsu MPG3204AH"
 
+
 ########################################
 ############# Hitachi drives
 ########################################
@@ -141,6 +142,7 @@
 #"Maxtor 4D040H2"					9    C	"Maxtor DiamondMax D540X-4D"
 #"Maxtor 4D040H2"                        		0    C  "Maxtor 4D040H2"
 #"Maxtor 4D080H4"					12   C	"Maxtor DiamondMax D540X-4D"
+#"Maxtor 4D060H3"					12   C	"Maxtor DiamondMax D540X-4D"
 #"Maxtor 4D080H4"					9    C	"Maxtor DiamondMax D540X-4D"
 "MAXTOR 4K0[468]0H[234]"				194  C  "Maxtor DiamondMax D540X serie"
 "Maxtor 4[RA](25|16|12|08|06)0[LJ]0"			194  C  "Maxtor DiamondMax 16"
@@ -148,11 +150,13 @@
 "Maxtor 5A250J0"					194  C  "Maxtor MaXline II 250GB 5400RPM"
 "Maxtor 5A300J0"					194  C  "Maxtor 5A300J0"
 "Maxtor 5T0[24]0H[24]"					0    C  "Maxtor DiamondMax Plus 60"
+"Maxtor 6B(08|12|16|20|25|30)0[RSPM]0"			194  C  "Maxtor DiamondMax Plus 10"
 "Maxtor 6E0[234]0L0"					194  C  "Maxtor DiamondMax Plus 8"
 "MAXTOR 6L0[2468]0[LJ][1234]"				194  C  "Maxtor DiamondMax Plus D740X family"
-"Maxtor 6[YB](04|06|08|12|16|20|25)0[LPM]0"		194  C  "Maxtor DiamondMax Plus 9" 
+"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0"			194  C  "Maxtor DiamondMax Plus 9" 
 "Maxtor 7Y250[PM]0"					194  C	"Maxtor MaXLine Plus II 250GB 7200RPM"
 "Maxtor 94098U8"			 		11   C  "Maxtor DiamondMax 40 94098U8"
+"Maxtor 6B200P0" 194 C "Maxtor DiamondMax 10"
 
 ########################################
 ############# Quantum drives
@@ -185,7 +189,6 @@
 "SAMSUNG SV(0401|0802|1203|1604)N"			194  C  "Samsung SpinPoint V80 serie"
 
 
-
 ########################################
 ############# Seagate drives
 ########################################
@@ -234,6 +237,9 @@
 "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"
+"ST3250823A"				194  C  "Seagate Barracuda 7200.8 250GB"
+"ST3400832A"                            194  C  "Seagate Barracuda 7200.8 Plus 400GB"
+"ST9100823A"				194  C	"Seagate Momentus 5400.2 100GB"
 "ST94[08]11A"				194  C  "Seagate ST94011A"
 
 
@@ -247,6 +253,7 @@
 "TOSHIBA MK3017GAP"			0    C  "Toshiba MK3017GAP"
 "TOSHIBA MK3021GAS"			194  C  "Toshiba MK3021GAS"
 #"TOSHIBA MK4019GAX"			222  C  "Toshiba MK4019GAX"
+"TOSHIBA MK4025GAS"			194  C  "Toshiba MK4025GAS 40 Go"
 "TOSHIBA MK6021GAS"			194  C	"Toshiba MK6021GAS"
 "TOSHIBA MK6022GAX"			194  C	"Toshiba MK6022GAX"
 "TOSHIBA MK6025GAS"			194  C  "Toshiba MK6025GAS"
@@ -254,41 +261,47 @@
 "TOSHIBA MK8026GAX"			194  C  "Toshiba MK8026GAX" 
 "MK4025GAS"                             194  C  "Toshiba MK4025GAS"
 
-
-
 ########################################
 ############# Western Digital drives
 ########################################
 # WDC AC310100B and WDC AC2850F are reported not working
 # no more informations were given
-"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 WD360GD-00FNA0"				194 C "Western Digital SATA Raptor 36.7GB"
-"WDC WD400BB-(18CA|00DE)A0"     		  0 C "Western Digital Caviar WD400BB"
-"WDC WD400EB-00CPF0"				  0 C "Western Digital 400EB-00CPF0"
-"WDC WD400JB-00FMA0"				194 C "Western Digital Caviar 40GB Special Edition 8MB"
-"WDC WD600BB-32BSA0"				  0 C "Western Digital 600BB-32BSA0"
-"WDC WD600LB-00DNA0"            		194 C "Western Digital 60GB"
-"WDC WD800BB-00CAA1"				  0 C "Western Digital WD800BB-00CAA1"
-"WDC WD800BB-22DKA0"				194 C "Western Digital 800BB-22DKA0"
-"WDC WD800BB-32CCB0"				194 C "Western Digital 800BB-32CCB0"
-"WDC WD800BB-55JKA0"				194 C "Western Digital 800BB-55JKA0" 
-"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-00JJA0"				194 C "Western Digital WD800JB"
-"WDC WD800JD-00HKA0"				194 C "Western Digital SATA 80GB, 8MB Cache"
-"WDC WD1200JB-00(EV|FU|GV)A0"   		194 C "Western Digital Caviar 120GB Special Edition 8MB" 
-"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-00(EV|FU|GV)A0"   		194 C "Western Digital Caviar 160GB Special Edition 8MB"
-"WDC WD2000JB-(00EV|34EV|00FU|00GV|98GV)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
-"WDC WD2500JB-(00FU|32FU|00GV)A0"		194 C "Western Digital Caviar 250GB Special Edition 8MB"
-"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-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)A0"				194 C "Western Digital Caviar 40GB Special Edition 8MB"
+"WDC WD600BB-32BSA0"					  0 C "Western Digital 600BB-32BSA0"
+"WDC WD600LB-00DNA0"            			194 C "Western Digital 60GB"
+"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-55JKA0"					194 C "Western Digital 800BB-55JKA0" 
+"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-00JJA0"					194 C "Western Digital WD800JB"
+"WDC WD800JD-00HKA0"					194 C "Western Digital SATA 80GB, 8MB Cache"
+"WDC WD1200BB-00FTA0"					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 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-00(EV|FU|GV)A0"   			194 C "Western Digital Caviar 160GB Special Edition 8MB"
+"WDC WD2000JB-(00EV|34EV|00FU|00GV|55GV|98GV)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
+"WDC WD2500JB-(00FU|32FU|00GV)A0"			194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC WD2500PB-98FBA0"					194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC AC420400D"                 			231 C "Western Digital Caviar AC420400D"
+"WDC AC418000D"						231 C "Western Digital AC418000D"
+"WDC WD135BA"						231 C "Western Digital WD135BA"
 
 # not sure for next
 # "WDC WD1200JB-00CRA1"		9   C "Western Digital 1200JB-00CRA1"
 # "WDC WD273BA"			9   C "Western Digital WD273BA"
+
+# SATA drive with libata passthru
+"WDC WD740GD-00FL21.0"				194 C "Western Digital SATA Raptor"


Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/devel/hddtemp/hddtemp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hddtemp.spec	3 Mar 2005 21:46:21 -0000	1.8
+++ hddtemp.spec	15 Mar 2005 11:59:32 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           hddtemp
 Version:        0.3
-Release:        0.2.beta12
+Release:        0.3.beta12
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Tue Mar 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.3.beta12
+- Update hddtemp.db to 2005-03-15.
+
 * Sat Jan 22 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3-0.2.beta12
 - Update hddtemp.db to 2005-01-17.
 



From fedora-extras-commits at redhat.com  Tue Mar 15 13:04:05 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 15 Mar 2005 08:04:05 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.9,1.10
Message-ID: <200503151304.j2FD453j008426@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.spec 
Log Message:
buildrequire correct tcl-devel version that includes tclConfig.sh



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ppracer.spec	8 Mar 2005 21:49:50 -0000	1.9
+++ ppracer.spec	15 Mar 2005 13:04:02 -0000	1.10
@@ -20,7 +20,7 @@
 BuildRequires: xorg-x11-devel
 BuildRequires: SDL-devel >= 1.2
 BuildRequires: SDL_mixer-devel >= 1.2
-BuildRequires: tcl-devel >= 8.0
+BuildRequires: tcl-devel >= 8.4.9
 BuildRequires: autoconf
 BuildRequires: freetype-devel
 BuildRequires: libpng-devel
@@ -67,6 +67,9 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Tue Mar 15 2004 Nils Philippsen <nphilipp at redhat.com>
+- buildrequire correct tcl-devel version that includes tclConfig.sh
+
 * Tue Mar 08 2005 Nils Philippsen <nphilipp at redhat.com>
 - don't use integer for boolean value in desktop file
 - remove optflags patch as it isn't necessary anymore



From fedora-extras-commits at redhat.com  Tue Mar 15 14:15:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 09:15:11 -0500
Subject: rpms/perl-Pod-POM - New directory
Message-ID: <200503151415.j2FEFBnU010505@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10498/perl-Pod-POM

Log Message:
Directory /cvs/extras/rpms/perl-Pod-POM added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 14:15:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 09:15:11 -0500
Subject: rpms/perl-Pod-POM/devel - New directory
Message-ID: <200503151415.j2FEFBTt010508@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10498/perl-Pod-POM/devel

Log Message:
Directory /cvs/extras/rpms/perl-Pod-POM/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 14:15:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 09:15:31 -0500
Subject: rpms/perl-Pod-POM Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503151415.j2FEFVF4010574@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10565

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Pod-POM


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

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

common : CVS/Root
	@cvs 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 Mar 15 14:15:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 09:15:31 -0500
Subject: rpms/perl-Pod-POM/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503151415.j2FEFVZl010577@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10565/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Pod-POM


--- 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 Mar 15 14:16:12 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 09:16:12 -0500
Subject: rpms/perl-Pod-POM import.log,1.1,1.2
Message-ID: <200503151416.j2FEGCw1010680@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10671

Modified Files:
	import.log 
Log Message:
auto-import perl-Pod-POM-0.17-3 on branch devel from perl-Pod-POM-0.17-3.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 14:15:29 -0000	1.1
+++ import.log	15 Mar 2005 14:16:10 -0000	1.2
@@ -0,0 +1 @@
+perl-Pod-POM-0_17-3:HEAD:perl-Pod-POM-0.17-3.src.rpm:1110896069



From fedora-extras-commits at redhat.com  Tue Mar 15 14:16:12 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 09:16:12 -0500
Subject: rpms/perl-Pod-POM/devel perl-Pod-POM.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503151416.j2FEGCWW010684@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10671/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Pod-POM.spec 
Log Message:
auto-import perl-Pod-POM-0.17-3 on branch devel from perl-Pod-POM-0.17-3.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


--- NEW FILE perl-Pod-POM.spec ---
%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:           perl-Pod-POM
Version:        0.17
Release:        3
Summary:        Object-oriented interface to Perl POD documents

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Pod-POM/
Source0:        http://www.cpan.org/authors/id/A/AB/ABW/Pod-POM-0.17.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module implements a parser to convert Pod documents into a simple
object model form known hereafter as the Pod Object Model.  The object
model is generated as a hierarchical tree of nodes, each of which
represents a different element of the original document.  The tree can
be walked manually and the nodes examined, printed or otherwise
manipulated.  In addition, Pod::POM supports and provides view objects
which can automatically traverse the tree, or section thereof, and
generate an output representation in one form or another.


%prep
%setup -q -n Pod-POM-%{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+w $RPM_BUILD_ROOT/*


%check || :
# http://rt.cpan.org/NoAuth/Bug.html?id=3910
PERL_HASH_SEED=0 make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{_bindir}/podlint
%{_bindir}/pom2
%{perl_vendorlib}/Pod
%{_mandir}/man[13]/*.[13]*


%changelog
* Tue Mar 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.17-3
- Remove Epoch: 0.
- Improve summary.

* Sun Jul 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.17-0.fdr.3
- Bring up to date with current fedora.us Perl spec template.

* Fri Nov 21 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.17-0.fdr.2
- Add workaround for http://rt.cpan.org/NoAuth/Bug.html?id=3910.

* Sun Oct 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.17-0.fdr.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 14:15:29 -0000	1.1
+++ .cvsignore	15 Mar 2005 14:16:10 -0000	1.2
@@ -0,0 +1 @@
+Pod-POM-0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 14:15:29 -0000	1.1
+++ sources	15 Mar 2005 14:16:10 -0000	1.2
@@ -0,0 +1 @@
+6ec8b345c9d43d45cc404c9416443d76  Pod-POM-0.17.tar.gz



From ville.skytta at iki.fi  Tue Mar 15 14:16:36 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Tue, 15 Mar 2005 16:16:36 +0200
Subject: APPROVED: perl-Pod-POM
Message-ID: <1110896196.26174.2.camel@bobcat.mine.nu>

perl-Pod-POM provides an OO interface to Perl POD documents.  It is a
dependency of perl-Template-Toolkit (soon to be submitted) which is a
dependency of Bugzilla and others.

https://bugzilla.fedora.us/show_bug.cgi?id=1954
Approved by: Jos? Pedro Oliveira
Maintainer: yours truly

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050315/72e8410b/attachment.sig>

From fedora-extras-commits at redhat.com  Tue Mar 15 15:36:14 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 15 Mar 2005 10:36:14 -0500
Subject: rpms/amarok/FC-3 .cvsignore, 1.6, 1.7 amarok.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <200503151536.j2FFaEjs012941@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Mar 2005 22:09:28 -0000	1.6
+++ .cvsignore	15 Mar 2005 15:36:12 -0000	1.7
@@ -1 +1 @@
-amarok-1.2.1.tar.bz2
+amarok-1.2.2.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/amarok.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- amarok.spec	12 Mar 2005 08:44:14 -0000	1.8
+++ amarok.spec	15 Mar 2005 15:36:12 -0000	1.9
@@ -6,13 +6,13 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.2.1
+Version:    1.2.2
 Release:    1
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.2.1.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.2.2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -132,7 +132,6 @@
 %defattr(-,root,root)
 %{_bindir}/amarok
 %{_bindir}/amarokapp
-%{_bindir}/release_amarok
 %_datadir/apps/%{name}
 %_datadir/icons/*/*/*
 %{_datadir}/applications/kde/*.desktop
@@ -171,11 +170,14 @@
 %defattr(-,root,root)
 %{_libdir}/kde3/libamarok_xine-engine.*
 %{_datadir}/services/amarok_xine-engine.desktop
-%{_datadir}/services/amarok_xineengine_plugin.desktop
+#%{_datadir}/services/amarok_xine-engine_plugin.desktop
 %endif
 
 
 %changelog
+* Mon Mar 14 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.2-1
+- version 1.2.2
+
 * Sat Mar 05 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.1-1
 - version 1.2.1 (bugfixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Mar 2005 22:09:28 -0000	1.6
+++ sources	15 Mar 2005 15:36:12 -0000	1.7
@@ -1 +1 @@
-90a8cce693a31e4d6ff552508c31aed3  amarok-1.2.1.tar.bz2
+af3bd552fbc61168a894a9cd447d2b2e  amarok-1.2.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar 15 15:36:14 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 15 Mar 2005 10:36:14 -0500
Subject: rpms/amarok/devel .cvsignore, 1.6, 1.7 amarok.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200503151536.j2FFaEMf012946@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Mar 2005 22:09:28 -0000	1.6
+++ .cvsignore	15 Mar 2005 15:36:12 -0000	1.7
@@ -1 +1 @@
-amarok-1.2.1.tar.bz2
+amarok-1.2.2.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- amarok.spec	12 Mar 2005 08:44:14 -0000	1.10
+++ amarok.spec	15 Mar 2005 15:36:12 -0000	1.11
@@ -1,4 +1,4 @@
-# Rebuild switch:
+# Rebuild switch: 
 #  --with xine    Enables xine engine
 #
 
@@ -6,13 +6,13 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.2.1
+Version:    1.2.2
 Release:    1
 
-Group:      Applications/Multimedia
+Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.2.1.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.2.2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -24,7 +24,7 @@
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 
 %if  0%{?use_xine}
-BuildRequires:  xine-lib-devel >= 1.0.0
+BuildRequires:  xine-lib-devel >= 0:1.0.0
 BuildRequires:  libmad-devel
 %endif
 
@@ -93,7 +93,7 @@
 
 %install
 rm -fr $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT 
 
 # desktop files
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -132,7 +132,6 @@
 %defattr(-,root,root)
 %{_bindir}/amarok
 %{_bindir}/amarokapp
-%{_bindir}/release_amarok
 %_datadir/apps/%{name}
 %_datadir/icons/*/*/*
 %{_datadir}/applications/kde/*.desktop
@@ -171,11 +170,14 @@
 %defattr(-,root,root)
 %{_libdir}/kde3/libamarok_xine-engine.*
 %{_datadir}/services/amarok_xine-engine.desktop
-%{_datadir}/services/amarok_xineengine_plugin.desktop
+#%{_datadir}/services/amarok_xine-engine_plugin.desktop
 %endif
 
 
 %changelog
+* Mon Mar 14 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.2-1
+- version 1.2.2
+
 * Sat Mar 05 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.1-1
 - version 1.2.1 (bugfixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Mar 2005 22:09:28 -0000	1.6
+++ sources	15 Mar 2005 15:36:12 -0000	1.7
@@ -1 +1 @@
-90a8cce693a31e4d6ff552508c31aed3  amarok-1.2.1.tar.bz2
+af3bd552fbc61168a894a9cd447d2b2e  amarok-1.2.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar 15 15:47:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 15 Mar 2005 10:47:14 -0500
Subject: rpms/dkms - New directory
Message-ID: <200503151547.j2FFlEkP013225@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/dkms added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 15:47:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 15 Mar 2005 10:47:14 -0500
Subject: rpms/dkms/devel - New directory
Message-ID: <200503151547.j2FFlEfO013228@cvs-int.fedora.redhat.com>

Author: spot

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

Log Message:
Directory /cvs/extras/rpms/dkms/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 15:47:42 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 15 Mar 2005 10:47:42 -0500
Subject: rpms/dkms Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503151547.j2FFlg7i013305@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module dkms


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

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

common : CVS/Root
	@cvs 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 Mar 15 15:47:42 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 15 Mar 2005 10:47:42 -0500
Subject: rpms/dkms/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503151547.j2FFlgiO013308@cvs-int.fedora.redhat.com>

Author: spot

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dkms


--- 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 Mar 15 15:48:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 15 Mar 2005 10:48:36 -0500
Subject: rpms/dkms import.log,1.1,1.2
Message-ID: <200503151548.j2FFmaRe013427@cvs-int.fedora.redhat.com>

Author: spot

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dkms/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 15:47:39 -0000	1.1
+++ import.log	15 Mar 2005 15:48:34 -0000	1.2
@@ -0,0 +1 @@
+dkms-2_0_5_2-2:HEAD:dkms-2.0.5.2-2.src.rpm:1110901444



From fedora-extras-commits at redhat.com  Tue Mar 15 15:48:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 15 Mar 2005 10:48:36 -0500
Subject: rpms/dkms/devel dkms.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200503151548.j2FFmaav013431@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	dkms.spec 
Log Message:
auto-import dkms-2.0.5.2-2 on branch devel from dkms-2.0.5.2-2.src.rpm


--- NEW FILE dkms.spec ---
Summary: Dynamic Kernel Module Support Framework
Name: dkms
Version: 2.0.5.2
Release: 2
License: GPL
Group: System Environment/Base
BuildArch: noarch
Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
Requires: bash > 1.99
Provides: dkms-minimal
Source0: dkms-%version.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This package contains the framework for the Dynamic
Kernel Module Support (DKMS) method for installing
module RPMS as originally developed by the Dell
Computer Corporation.

%prep

%setup -q

%triggerpostun -- dkms < 1.90.00-1
for dir in `find /var/dkms -type d -maxdepth 1 -mindepth 1`; do
	mv -f $dir /var/lib/dkms
done
[ -e /etc/dkms_framework.conf ] && ! [ -e /etc/dkms/framework.conf ] && mkdir /etc/dkms && cp /etc/dkms_framework.conf /etc/dkms/framework.conf
arch_used=""
[ `uname -m` == "x86_64" ] && [ `cat /proc/cpuinfo | grep -c "Intel"` -gt 0 ] && arch_used="ia32e" || arch_used=`uname -m`
echo ""
echo "ALERT! ALERT! ALERT!"
echo ""
echo "You are using a version of DKMS which does not support multiple system"
echo "architectures.  Your DKMS tree will now be modified to add this support."
echo ""
echo "The upgrade will assume all built modules are for arch: $arch_used"
current_kernel=`uname -r`
dkms_tree="/var/lib/dkms"
source_tree="/usr/src"
tmp_location="/tmp"
dkms_frameworkconf="/etc/dkms/framework.conf"
. $dkms_frameworkconf 2>/dev/null
echo ""
echo "Fixing directories."
for directory in `find $dkms_tree -type d -name "module" -mindepth 3 -maxdepth 4`; do
	dir_to_fix=`echo $directory | sed 's#/module$##'`
	echo "Creating $dir_to_fix/$arch_used..."
	mkdir $dir_to_fix/$arch_used
	mv -f $dir_to_fix/* $dir_to_fix/$arch_used 2>/dev/null 
done
echo ""
echo "Fixing symlinks."	
for symlink in `find $dkms_tree -type l -name "kernel*" -mindepth 2 -maxdepth 2`; do
	symlink_kernelname=`echo $symlink | sed 's#.*/kernel-##'`
	dir_of_symlink=`echo $symlink | sed 's#/kernel-.*$##'`
	cd $dir_of_symlink
        read_link="$symlink"
        while [ -L "$read_link" ]; do
            read_link=`ls -l $read_link | sed 's/.*-> //'`
        done
	if [ `echo $read_link | sed 's#/# #g' | wc -w | awk {'print $1'}` -lt 3 ]; then
		echo "Updating $symlink..."
		ln -sf $read_link/$arch_used kernel-$symlink_kernelname-$arch_used
		rm -f $symlink
	fi
	cd -
done
echo ""

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/{var/lib/dkms,/usr/sbin,usr/share/man/man8,etc/init.d,etc/dkms}
install -m 755 dkms $RPM_BUILD_ROOT/usr/sbin/dkms
install -m 644 dkms.8.gz $RPM_BUILD_ROOT/usr/share/man/man8
install -m 644 dkms_framework.conf  $RPM_BUILD_ROOT/etc/dkms/framework.conf
install -m 644 template-dkms-mkrpm.spec $RPM_BUILD_ROOT/etc/dkms
install -m 644 dkms_dbversion $RPM_BUILD_ROOT/var/lib/dkms/dkms_dbversion
install -m 755 dkms_autoinstaller $RPM_BUILD_ROOT/etc/init.d/dkms_autoinstaller
install -m 755 dkms_mkkerneldoth $RPM_BUILD_ROOT/usr/sbin/dkms_mkkerneldoth

%clean 
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%attr(0755,root,root) /usr/sbin/dkms
%attr(0755,root,root) /var/lib/dkms
%attr(0755,root,root) /etc/init.d/dkms_autoinstaller
%attr(0755,root,root) /usr/sbin/dkms_mkkerneldoth
%doc %attr(0644,root,root) /usr/share/man/man8/dkms.8.gz
%doc %attr (-,root,root) sample.spec sample.conf AUTHORS COPYING
%config(noreplace) /etc/dkms/framework.conf
%config(noreplace) /etc/dkms/template-dkms-mkrpm.spec

%post
[ -e /sbin/dkms ] && mv -f /sbin/dkms /sbin/dkms.old 2>/dev/null
/sbin/chkconfig dkms_autoinstaller on


%changelog
* Tue Mar 15 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.5.2-2
- Minor spec cleanups:
  Removed check for / before performing clean, unnecessary.
  Removed "Packager" tag.
  Removed "Vendor" tag.
  Replaced "Source" with "Source0".

* Mon Mar 14 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.5.2
- Tweaked spec to follow http://fedoraproject.org/wiki/PackagingGuidelines

* Thu Mar 03 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.5.1
- Added --size for alternate driver disk image sizes

* Tue Jan 25 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.5
- Repackaged as 2.0.5

* Mon Jan 17 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.4.3
- Allow MAKE_MATCH[0] to decide if MAKE[0] will be used
- Add Taroon check in template-dkms-mkrpm.spec for ia32e detection

* Mon Dec 20 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.4.2
- John Hull's patch for no SuSE 2.6 kernel preparation

* Wed Dec 15 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.4.1
- Red Hat driver disks can now have modules.pcimap and pci.ids files

* Mon Dec 13 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.4
- bumped revision

* Fri Dec 10 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.3.3
- Added quotes to $kernel_config when checking variable
- Tweak the multiowned arch detection workaround to deal with no ownership

* Mon Dec 6 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.3.2
- Fix to template-spec so that ia32e check doesn't require kernel sources

* Wed Dec 1 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.3.1
- Jeffrey Kirsher's workaround for arch detection on multiowned /lib/modules

* Mon Nov 22 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.3
- Issues regressed.  Bumped to non-testing version.

* Fri Nov 19 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.2.5
- DKMS ldtarball arch fix for changed Andreas 2.0.2 code
- Workaround for Red Hat's new source symlink in 2.6.9
- All 'cd -' now output to /dev/null

* Sat Oct 2 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.2
- Added --verbose which invoke_command uses
- Fixed it so mrproper doesn't get run > 2.6.6

* Tue Sep 28 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.1.2-1
- Charles Duffy's fix for multiple rpms owning /lib/modules/kernel...
- Andreas Gruenbacher's removal of IFS usage 
- Andreas Gruenbacher's reorganizing prepare check into prepare_kernel
- Andreas Gruenbacher's patch to cut down on line length by using $base_dir
- fixed $base_dir so it gets set after setup_kernels_arches

* Sun Sep 12 2004 Andreas Gruenbacher <agruen at suse.de>
- patch to remove tick usage
- patch to rewrite version comparison code
- patch to switch to usage of case, remove use of grep -c, remove use of IFS 
- patch to change handling of stderr

* Fri Sep 10 2004 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Fixed remove so you can remove modules in added state

* Thu Sep 9 2004 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Removed "module ignored" message from dkms_autoinstaller

* Thu Aug 26 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.0-1
- Output to stderr is now >> and not >
- Added kludge to allow redhat1 driver disks with BOOT kernel modules
- Allow cross arch building on 2.6 if --kernelsourcedir is passed
- Generic make commands now respect --kernelsourcedir
- Bumped dkms_dbversion to 2.0.0

* Thu Aug 19 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.96.02-1
- Fixed suse driver disks for i386

* Thu Aug 12 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.96.01-1
- Look for /etc/SuSEconfig also to know if its a SuSE box
- If no make command, set the clean command

* Wed Aug 11 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.32-1
- Added suse mkdriverdisk support
- Updated man page

* Tue Aug 10 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.25-1
- Added provides: dkms-minimal for Mandrake
- Added -r, --release for use in SuSE driver disks

* Fri Aug 06 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.24-1
- Fixed kernelsourcedir error message.
- dkms_autoinstaller now excepts a kernel parameter

* Tue Jul 27 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.19-1
- Created a set_kernel_source_dir function to remove dup code

* Mon Jul 26 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.18-1
- Added John Hull's SuSE support patches (mkinitrd, config prep)

* Fri Jul 23 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.11-1
- Split modulesconf_modify to separate add and remove functions
- Added support for /etc/modprobe.conf

* Thu Jul 15 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.10-1
- Remove coreutils as a dependency to avoid RH21 error.

* Wed Jul 14 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.09-1
- DKMS ldtarball now check dbversion and wont load future tarballs

* Mon Jul 12 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.06-1
- Buchan Milne's Mandrake prep support patch
- Buchan Milne's macro additions to template-dkms-mkrpm.spec
- Buchan Milne's typo corrections in mkrpm
- Buchan Milne's change to how mkrpm works (mktarball happen in rpm prep)

* Tue Jul 06 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.94.16-1
- Added a dependency on modutils for usage of modinfo
- Added version sanity check
- dkms_autoinstaller now check for sanity of version
- Changed conversion algorithm for /var/dkms to /var/lib/dkms
- Changed all warning to get to stderr
- set_module_suffix doesn't use version_checker because its too slow

* Thu Jul 01 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.94.06-1
- Reworked version checking to handle non-digit characters
- Added coreutils as a dependency
- Create a tempdir in mkdriverdisk, whoops (thanks Charles Duffy)

* Wed Jun 30 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.94.03-1
- dkms_dbversion belongs in /var/lib/dkms (thanks Thomas Palmieri)
- Added a version checking subroutine
- Removed gt2dot4 variable in favor of kernel version checking
- MAKE is no longer required.  If none specified, it uses a default.

* Thu Jun 24 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.94.01-1
- Buchan Milne's optimization of the arch detection code

* Wed Jun 23 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.93.14-1
- Fixed bug when find finds more than one thing (thanks Paul Howarth)
- Changed arch detection code to first try RPM which always will get it right (thanks Vladimir Simonov)

* Tue Jun 22 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.93.12-1
- Initial mkrpm is working
- Added --source-only option to mktarball
- mkrpm handles --source-only
- Updated manpage

* Fri Jun 17 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.93.04-1
- Started adding mkrpm

* Wed Jun 16 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.93.01-1
- Fixed dkms_autoinstaller bugs (thanks Vladimir Simonov)
- Fixed paths in the tarball's install.sh

* Tue Jun 15 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.92.33-1
- kernelver/arch handling for mktarball

* Mon Jun 14 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.92.26-1
- Added support for RH v2 driver disks (they support multiple arches)

* Fri Jun 11 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.92.24-1
- Continue rework of kernelver/arch handling
- Added PATH fix (thanks Andrey Ulanov <andrey.ulanov at acronis.com>)
- config_contents should not be local (thanks Andrey Ulanov)
- If no config in /configs, just use .config (thanks Andrey Ulanov)
- match now pays attention to --kernelsourcedir

* Wed Jun 09 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.92.06-1
- Started coding new kernelver arch CLI handling

* Mon Jun 07 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.92.04-1
- Added STRIP[] directive.  By default dkms now runs strip -g on all built modules.
- Fix set_module_suffix in dkms build
- Changed /etc/dkms_framework.conf to /etc/dkms/framework.conf
- Added reload into dkms_autoinstaller to limit Mandrake error messages
- Moved /var/dkms to /var/lib/dkms !!!!!!!!!!!!!!!!

* Fri Jun 04 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.92.01-1
- PRE_BUILD, POST_BUILD, POST_ADD, etc all now allow their scripts to accept parameters

* Thu Jun 03 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.91.18-1
- Added --installtree option to specify different install location besides /lib/modules
- Took Charles Duffy's advice and removed brackets on error messages

* Wed Jun 02 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.91.14-1
- Added set_module_suffix function

* Tue Jun 01 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.91.12-1
- Added a PRE_BUILD dkms.conf directive.

* Thu May 27 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.91.11-1
- Added build time check for gcc and make if there is a build failure
- You can now specify --archive to mktarball to control the naming of the made tarball (thanks Vladimir Simonov)

* Wed May 26 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.91.07-1
- Removed rpm dependency on gcc (thanks Vladimir Simonov)
- Re-implemented dkms status recursively

* Mon May 24 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.91.01-1
- Added local variable declarations to local variables

* Fri May 21 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.90.46-1
- Vladimir Simonov's invoke_command improvements for keeping /tmp clean

* Thu May 20 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.90.45-1
- Pass --targetarch to dkms_mkkerneldoth (thanks to Vladimir Simonov <validimir.simonov at acronis.com>)
- Moved arch detection into a function called detect_arch

* Wed May 19 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.90.44-1
- Bug fixes on arch support
- Updated man page

* Tue May 18 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.90.32-1
- Completing arch awareness and transition scripts
- Created upgrade_dkms_archify.sh to update DKMS trees for arch support

* Mon May 17 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.90.06-1
- Continued adding arch awareness

* Thu May 13 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.90.01-1
- Started adding arch awareness into the DKMS tree

* Fri May 07 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.10-1
- bumped the revision

* Thu May 06 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.09.21-1
- Improved readability of install and uninstall text to the screen
- You can now specify multiple actions in the same command

* Wed May 05 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.09.05-1
- Added arch_used as part of the filename of a tarball created by mktarball
- If multiple original modules exist in a single kernel, the one in /updates is preferred
- Changed multiple original module handling to move out and store all collisions

* Mon May 03 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.09.01-1
- Changed 2.6 prep prepare-all target usage to make modules_prepare
- Changed 2.6 make command to always use M= as this is fixed in 2.6.6-rc3-bk5

* Fri Apr 30 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.09-1
- If module build exit status is bad, die accordingly
- 2.6 kernel prep changes (not quite there yet, still broken)

* Thu Apr 29 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.08.06-1
- Added BUILD_EXCLUSIVE_KERNEL & BUILD_EXCLUSIVE_ARCH directives for dkms.conf
- Tweaked dkms_autoinstaller to more gracefully handle a build failure

* Tue Apr 27 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.08.02-1
- Got rid of make clean warning if not present

* Tue Apr 20 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.08.01-1
- Fixed error message when compiling with --no-prepare-kernel

* Tue Apr 13 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.08-1
- Fixed the format of rhdd-6.1 for Red Hat driver disks
- Update man page with new white paper info

* Thu Apr 1 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.07-1
- Added work-around to recognize ia32e kernel config instead of x86_64
- Got rid of start and stop functions which were no-ops anyway

* Thu Mar 25 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.06-1
- Added a fix to keep the driver disk filename from being so long that it breaks

* Mon Feb 09 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.05-1
- Added a fix to resolve RHEL21 depmod errors when an obsolete reference is found

* Thu Jan 15 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.02-1
- Fixed mkinitrd for ia64

* Tue Dec 09 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.00.01-1
- Fixed /usr/share/doc/dkms-<version> mode to 755

* Mon Dec 01 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.00-1
- Bumped version to 1.00

* Mon Nov 24 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.99.02-1
- Add -t vfat to loopback mount during creation of driver disk

* Fri Nov 21 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.99.01-1
- Only edit /etc/modules.conf if remake_initrd is set or if this is the last uninstall and no original module exists
- Added MODULES_CONF_OBSOLETE_ONLY array directive in dkms.conf
- Updated man page

* Wed Nov 19 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.46.05-1
- Fixed a bug in mktarball to limit the tarball name to less than 255 chars

* Tue Nov 18 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.46.04-1
- Binary only tarballs now contain a copy of dkms.conf so that they can be force loaded

* Mon Nov 17 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.45.03-1
- Updated man page, recommended rpm naming: <module>-<version>-<rpmversion>dkms.noarch.rpm

* Thu Nov 13 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.45.02-1
- dkms_autoinstaller is now installed to /etc/init.d for cross-distro happiness

* Fri Nov 07 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.45.01-1
- Added kernel config prepping for hugemem kernel (thanks Amit Bhutani)
- modules.conf only now gets changed during install or uninstall of active module

* Tue Nov 03 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.44.05-1
- Changed MODULES_CONF_ALIAS_TYPE to an array in dkms.conf
- Added MODULES_CONF_OBSOLETES array in dkms.conf
- Reworked modules_conf_modify to make use of OBSOLETES logic
- Updated man page

* Fri Oct 31 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.42.03-1
- Added --binaries-only option to mktarball
- Updated man page

* Thu Oct 30 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.41.15-1
- If depmod or mkinitrd fail during install, automatically go back to built state
- Warn heavily if mkinitrd fails during uninstall

* Wed Oct 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.41.11-1
- Removed paths from dkms calls in sample.spec
- Fixed typo of KERNELRELEASE

* Wed Oct 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.41.10-1
- Added Red Hat specific kernel prep to avoid make dep (Thanks Matt Domsch)
- Added dkms_mkkerneldoth script to support RH kernel prep
- Moved dkms from /sbin/ to /usr/sbin
- Fixed typo which caused original_module not to get replaced on uninstall
- No longer edit Makefiles, just specify KERNELVERSION=$kernel_version on the command line
- Removed unnecessary depmod during uninstall

* Thu Oct 23 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.40.16-1
- Fixed mkdriverdisk to copy rhdd-6.1 file into driver disk image

* Wed Oct 22 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.40.15-1
- Changed expected driver disk filename from module-info to modinfo to work on legacy RH OSs

* Tue Oct 14 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.40.14-1
- Unset all arrays before using them.  duh.

* Tue Oct 07 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.40.12-1
- Fixed bug in autoinstaller where it wasn't looking for dkms.conf through source symlink

* Thu Oct 02 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.40.11-1
- Added --rpm_safe_upgrade flag
- Updated the man page and sample.spec

* Wed Oct 01 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.40.05-1
- No longer copy dkms.conf into /var/dkms tree, just go to the source_tree so as to reduce duplication
- Got rid of --post-add, --post-build, --post-install and --post-remove
- Replaced the above with DKMS directives POST_ADD, POST_BUILD, POST_INSTALL, POST_REMOVE
- Fixed ldtarball and mktarball to no longer look for these duplicate files
- Added a sample.conf for /usr/share/doc
- Updated dkms_dbversion to 1.01 from 1.00 due to these changes
- Update the man page

* Tue Sep 30 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.39.17-1
- Added diff checking in status command in case modules are overwritten by someone else
- Fixed already built error message in build_module
- Changed build-arch to noarch
- Updated sample.spec
- Change dest_module_location to not get prefaced by /lib/modules/$kernel_version
- When saving old initrd, copy it instead of moving it in case new one doesn't build
- Only create source symlink during loadtarball if --force or if it doesn't exist
- Decide to completely remove during remove_module after doing find with maxdepth of 0 not 1

* Mon Sep 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.39.08-1
- Reworked mktarball format to remove dependence on /var/dkms and /usr/src
- Reworked ldtarball to match new tarball format
- Ldtarball now uses --archive=tarball-location flag instead of --config flag
- Ldtarball can now load any old source tarball as long as it contains a good dkms.conf
- Added --kernelsourcedir cli option to provide alternate location for kernel source
- Driver disk files are now looked for in /redhat_driver_disk
- Added $tmp_location specifiable in /etc/dkms_framework.conf to specify your /tmp dir (default /tmp)
- Updated man page

* Thu Sep 25 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.38.03-1
- Fixed tmp_dir_name typo in ldtarball
- Fixed mkdriverdisk to correctly create kernel/module structure
- Don't expect a rhdd-6.1 file for RH driver disk, dkms will create it
- Remove mkdriverdisk warning on non BOOT kernels
- Moved driver_disk directory location to underneath $module_version
- mkdriverdisk can now accept multiple kernel versions
- Updated man page with info about $dkms_tree and $source_tree as dkms.conf variables

* Wed Sep 24 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.37.10-1
- Don't allow installs of modules onto non-existant kernels
- Suppressed stderr on some commands
- Fixed brain-dead bug for REMAKE INITRD
- During uninstall, dont remake initrd if it was not installed
- ldtarball into unique tempdir and delete it when finished

* Tue Sep 23 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.37.04-1
- Changed PATCH to array based system (added PATCH_MATCH array)
- PATCHes can now be matched against regular expressions, not just substrings
- Changed MODULES_CONF to array based system
- CHANGED MAKE to array based system (added MAKE_MATCH array)
- MAKEs can now be matched against regular expressions, not just substrings.
- Updated man page

* Mon Sep 22 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.36.10-1
- Changed autoinstaller bootup priority from 08 to 04
- Changed invoke_command routine to use mktemp for better security
- Changed invoke_command in dkms_autoinstaller too

* Fri Sep 19 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.36.05-1
- Continued bug testing and fixing new features

* Wed Sep 17 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.36.02-1
- Got rid of MODULE_NAME: replaced with BUILT_MODULE_NAME, DEST_MODULE_NAME arrays
- Got rid of LOCATION: replaced with BUILT_MODULE_LOCATION, DEST_MODULE_LOCATION arrays
- Update man page

* Tue Sep 16 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.36.01-1
- Fixed the setting of the gt2dot4 variable

* Wed Sep 10 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.35.02-1
- Added PACKAGE_NAME, PACKAGE_VERSION requirements to dkms.conf for gmodconfig use
- Fixed creation of /var/dkms before cp of dkms_dbversion in install.sh

* Mon Sep 08 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.34.10-1
- Continued adding autoinstall stuff
- Updated man page

* Fri Sep 05 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.34.01-1
- Added dkms_autoinstaller service (builds module on boot if AUTOINSTALL="yes" in dkms.conf)
- DKMS usage no longer sent to std_err
- Added --no-prepare-kernel cli option

* Fri Aug 08 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.33.02-1
- Fixed quote bugs in match (Reported by: John Hull <john_hull at dell.com>) 
- Added Fred Treasure to the AUTHORS list
- Added dkms_dbversion file to DKMS tree to track architecture of dkms db layout

* Thu Jul 03 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.32.04-1
- Added mkinitrd support for SuSE (etc_sysconfig_kernel_modify)
- Added generic make command for kernel >2.4 (make -C <path-to-kernel-source> SUBDIRS=<build dir> modules)
- Fixed kernel prepare to do Red Hat/Generic by default
- Only do make dep if < 2.5

* Tue Jun 03 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.31.04-1
- Modified the Red Hat prep routine to be smaller and more robust (including summit support)
- Added sample.spec to the sources for /usr/share/doc
- If you save a .config before make mrproper, return it right afterwards
- Updated the man page

* Fri May 30 2003 Gary Lerhaupt <gary_lerahupt at dell.com> 0.30.17-1
- Added a remake_initrd function to keep SuSE from doing wrong things
- If you know the correct right steps for rebuilding SuSE initrds, please let me know!
- Updated man page

* Thu May 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.30.15-1
- Added a native readlink function to make sure it exists
- Added a mkdir -p to $location to make sure it exists
- Added --directive

* Wed May 28 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.30.05-1
- Added kernel preparation support for SLES/United Linux (Many thanks to: Fred Treasure <fwtreas at us.ibm.com>)

* Tue May 20 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.29.09-1
- On remove, to remove all kernel versions you must now specify --all
- Added grep, cpio and gzip to the Requires of the RPM
- Added cleaning kernel tree (make mrproper) after last build completes
- Before prepare kernel, the current .config is stored in memory to be restored later
- Added a verbose warning to the status command to remind people it only shows DKMS modules
- Added /etc/dkms_framwork.conf for controlling source_tree and dkms_tree
- Added the undocumented --dkmstree and --sourcetree options for cli control of these vars
- When looking for original modules, dkms now employs the find command to expand search past $location
- Updated man page

* Wed May 14 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.28.05-1
- Fixed a typo in the man page.

* Tue May 05 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.28.04-1
- Fixed ldtarball/mktarball to obey source_tree & dkms_tree (Reported By: Jordan Hargrave <jordan_hargrave at dell.com>)
- Added DKMS mailing list to man page

* Tue Apr 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.27.05-1
- Changed NEEDED_FOR_BOOT to REMAKE_INITRD as this makes more sense
- Redid handling of modifying modules.conf 
- Added MODULE_CONF_ALIAS_TYPE to specs

* Mon Apr 28 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.26.12-1
- Started adding ldtarball support
- added the --force option
- Update man page

* Thu Apr 24 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.26.05-1
- Started adding mktarball support
- Fixed up the spec file to use the tarball

* Tue Mar 25 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.25.14-1
- Continued integrating mkdriverdisk
- Updated man page

* Mon Mar 24 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.25.03-1
- Added renaming ability to modules after builds (MODULE_NAME="beforename.o:aftername.o")
- Started adding mkdriverdisk support
- Added distro parameter for use with mkdriverdisk
- Now using readlink to determine symlink pointing location
- Added redhat BOOT config to default location of config files
- Fixed a bug in read_conf that caused the wrong make subdirective to be used
- Remove root requirement for build action

* Wed Mar 19 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.23.19-1
- Fixed archiving of original modules (Reported by: Kris Jordan <kris at sagebrushnetworks.com>)

* Wed Mar 12 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.23.18-1
- Added kernel specific patching ability

* Mon Mar 10 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.23.16-1
- Removed the sourcing in of /etc/init.d/functions as it was unused anyway
- Implemented generic patching support
- Updated man page
- Fixed timing of the creation of DKMS built infrastructure in case of failure

* Fri Mar 07 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.23.11-1
- Builds now occur in /var/dkms/$module/$module_version/build and not in /usr/src
- Fixed the logging of the kernel_config

* Thu Mar 06 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.23.01-1
- Started adding patch support
- Redid reading implementation of modules_conf entries in dkms.conf (now supports more than 5)
- Updated man page

* Tue Mar 04 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.22.06-1
- Module names are not just assumed to end in .o any longer (you must specify full module name)
- At exit status to invoke_command when bad exit status is returned

* Fri Feb 28 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.22.03-1
- Changed the way variables are handled in dkms.conf, %kernelver to $kernelver

* Mon Feb 24 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.22.02-1
- Fixed a typo in install

* Tue Feb 11 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.22.01-1
- Fixed bug in remove which made it too greedy
- Updated match code

* Mon Feb 10 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.21.16-1
- Added uninstall action
- Updated man page

* Fri Feb 07 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.20.06-1
- Added --config option to specify where alternate .config location exists
- Updated the man page to indicate the new option.
- Updated the spec to allow for software versioning printout
- Added -V which prints out the current dkms version and exits

* Thu Jan 09 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.19.01-1
- Added GPL stuffs

* Mon Dec 09 2002 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.18.04-1
- Added support for multiple modules within the same install
- Added postadd and fixed up the man page

* Fri Dec 06 2002 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.17.01-1
- Cleaned up the spec file.

* Fri Nov 22 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Fixed a bug in finding MAKE subdirectives

* Thu Nov 21 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Fixed make.log path error when module make fails
- Fixed invoke_command to work under RH8.0
- DKMS now edits kernel makefile to get around RH8.0 problems

* Wed Nov 20 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Reworked the implementation of -q, --quiet

* Tue Nov 19 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Version 0.16: added man page

* Mon Nov 18 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Version 0.13: added match option
- Version 0.14: dkms is no longer a SysV service
- Added depmod after install and remove
- Version 0.15: added MODULES_CONF directives in dkms.conf

* Fri Nov 15 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Version 0.12: added the -q (quiet) option

* Thu Nov 14 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Version 0.11: began coding the status function

* Wed Nov 13 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Changed the name to DKMS
- Moved original_module to its own separate directory structure
- Removal now does a complete clean up

* Mon Nov 11 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Split build into build and install
- dkds.conf is now sourced in
- added kernelver variable to dkds.conf

* Fri Nov 8 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Added date to make.log
- Created the prepare_kernel function

* Thu Nov 7 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Barebones implementation complete

* Wed Oct 30 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Initial coding


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 15:47:39 -0000	1.1
+++ .cvsignore	15 Mar 2005 15:48:34 -0000	1.2
@@ -0,0 +1 @@
+dkms-2.0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 15:47:39 -0000	1.1
+++ sources	15 Mar 2005 15:48:34 -0000	1.2
@@ -0,0 +1 @@
+0e3030c92d21613a726563f8b94788d1  dkms-2.0.5.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 15 15:49:31 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 15 Mar 2005 10:49:31 -0500
Subject: rpms/bzflag/devel bzflag.spec,1.4,1.5
Message-ID: <200503151549.j2FFnVOv013530@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	bzflag.spec 
Log Message:
buildrequire bc for curl version check



Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bzflag.spec	4 Mar 2005 19:44:02 -0000	1.4
+++ bzflag.spec	15 Mar 2005 15:49:29 -0000	1.5
@@ -17,6 +17,8 @@
 BuildRequires: SDL-devel
 BuildRequires: ncurses-devel
 BuildRequires: curl-devel
+# for curl version checking in configure. ugh.
+BuildRequires: bc
 
 %description
 BZFlag is a 3D multi-player tank battle game  that  allows users to play
@@ -63,7 +65,10 @@
 %{_mandir}/man*/*
 
 %changelog
-* Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-4
+* Tue Mar 15 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-4
+- buildrequire bc for curl version check
+
+* Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com>
 - move package over to Extras
 - make desktop file a file, don't generate it in %%install
 - use an a bit more individual build root



From fedora-extras-commits at redhat.com  Tue Mar 15 16:41:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 15 Mar 2005 11:41:50 -0500
Subject: rpms/bittorrent import.log,1.5,1.6
Message-ID: <200503151641.j2FGfohI015705@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	import.log 
Log Message:
auto-import bittorrent-4.0.0-1.FC3 on branch FC-3 from bittorrent-4.0.0-1.FC3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	8 Nov 2004 04:06:01 -0000	1.5
+++ import.log	15 Mar 2005 16:41:48 -0000	1.6
@@ -2,3 +2,4 @@
 bittorrent-3_4_1-0_fdr_2_a_rh90:HEAD:bittorrent-3.4.1-0.fdr.2.a.rh90.src.rpm:1099886746
 bittorrent-3_4_1-0_fdr_2_a_1:HEAD:bittorrent-3.4.1-0.fdr.2.a.1.src.rpm:1099886755
 bittorrent-3_4_1-0_fdr_2_a_1_91:HEAD:bittorrent-3.4.1-0.fdr.2.a.1.91.src.rpm:1099886761
+bittorrent-4_0_0-1_FC3:FC-3:bittorrent-4.0.0-1.FC3.src.rpm:1110904916



From fedora-extras-commits at redhat.com  Tue Mar 15 16:41:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 15 Mar 2005 11:41:50 -0500
Subject: rpms/bittorrent/FC-3 bittorrent.desktop, NONE, 1.1 bittorrent.png,
	NONE, 1.1 .cvsignore, 1.3, 1.4 bittorrent.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200503151641.j2FGfofx015708@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore bittorrent.spec sources 
Added Files:
	bittorrent.desktop bittorrent.png 
Log Message:
auto-import bittorrent-4.0.0-1.FC3 on branch FC-3 from bittorrent-4.0.0-1.FC3.src.rpm


--- NEW FILE bittorrent.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=BitTorrent File Transfer
Comment=Distributed download of files from the Internet
Exec=btdownloadgui.py
Icon=bittorrent.png
Terminal=false
Type=Application
StartupNotify=false
Categories=Application;Network;
MimeType=application/x-bittorrent;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:05:46 -0000	1.3
+++ .cvsignore	15 Mar 2005 16:41:48 -0000	1.4
@@ -1 +1 @@
-BitTorrent-3.4.1a.zip
+BitTorrent-4.0.0.tar.gz


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/bittorrent.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bittorrent.spec	14 Jan 2005 20:00:29 -0000	1.6
+++ bittorrent.spec	15 Mar 2005 16:41:48 -0000	1.7
@@ -1,20 +1,25 @@
+%define desktopvendor fedora
+
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        3.4.1
-Release:        3.a
-Epoch:          0
+Version:        4.0.0
+Release:        1.FC3
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
-License:        MIT
-URL:            http://bitconjurer.org/BitTorrent/
-Source0:        http://dl.sf.net/bittorrent/BitTorrent-3.4.1a.zip
+License:        BitTorrent Open Source License
+URL:            http://www.bittorrent.com/
+Source0:        http://www.bittorrent.com/dl/BitTorrent-%{version}.tar.gz
+Source1:        bittorrent.desktop
+Source2:        bittorrent.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel
+BuildRequires:  python-devel desktop-file-utils
 Requires:       python
-Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 BuildArch:      noarch
 
@@ -28,16 +33,17 @@
 %package        gui
 Summary:        GUI versions of the BitTorrent file transfer tool
 Group:          Applications/Internet
-Requires:       wxPython
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       pygtk2
+Requires:       %{name} = %{version}-%{release}
 
-%description    gui 
+%description    gui
 This package contains the GUI versions of the BitTorrent file transfer
 tool.
 
 
 %prep
-%setup -q -n BitTorrent-3.4.1a
+%setup -q -n BitTorrent-%{version}
+sed -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py
 
 
 %build
@@ -49,21 +55,33 @@
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 sed -i -e 's/env python2/env python/' $RPM_BUILD_ROOT%{_bindir}/*
 
+desktop-file-install --vendor %{desktopvendor} \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	--add-category X-Fedora \
+	%{SOURCE1}
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bittorrent.png
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post gui
+update-desktop-database %{_datadir}/applications &>/dev/null || :
+
+
+%postun gui
+update-desktop-database %{_datadir}/applications &>/dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc README.txt credits.txt LICENSE.txt
-%{_bindir}/btcompletedir.py
 %{_bindir}/btdownloadcurses.py
 %{_bindir}/btdownloadheadless.py
-%{_bindir}/btdownloadlibrary.py
 %{_bindir}/btlaunchmany.py
 %{_bindir}/btlaunchmanycurses.py
-%{_bindir}/btmakemetafile.py
+%{_bindir}/btmaketorrent.py
 %{_bindir}/btreannounce.py
 %{_bindir}/btrename.py
 %{_bindir}/btshowmetainfo.py
@@ -76,11 +94,20 @@
 
 %files gui
 %defattr(-,root,root)
-%{_bindir}/btcompletedirgui.py
 %{_bindir}/btdownloadgui.py
+%{_bindir}/btmaketorrentgui.py
+%{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
+%{_datadir}/pixmaps/%{name}-%{version}
+%{_datadir}/pixmaps/bittorrent.png
 
 
 %changelog
+* Tue Mar 15 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 4.0.0-1.FC3
+- add desktop file, desktop menu icon, post/postun scriptlets
+
+* Mon Mar 14 2005 David Hill <djh[at]ii.net> - 4.0.0-1
+- update to 4.0.0, no longer requires wxPythonGTK
+
 * Wed Dec 22 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:3.4.1-3.a
 - x86_64: Fix python dependency, replace with python-abi dependency.
 
@@ -109,7 +136,7 @@
 - adapted to Doors Linux
 
 * Sun Mar 30 2003 G??tz Waschk <waschk at linux-mandrake.com> 3.2.1b-1mdk
-- split out gui tools to remove wxPythonGTK dep from the main package 
+- split out gui tools to remove wxPythonGTK dep from the main package
 - new version
 
 * Fri Mar 28 2003 Frederic Lepied <flepied at mandrakesoft.com> 3.2-1mdk


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:05:46 -0000	1.3
+++ sources	15 Mar 2005 16:41:48 -0000	1.4
@@ -1 +1 @@
-84d8cfedeba539db8b497d63e6ecceed  BitTorrent-3.4.1a.zip
+67f449df351b66f408b72b6bd196952f  BitTorrent-4.0.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 15 17:02:17 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 15 Mar 2005 12:02:17 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.10,1.11
Message-ID: <200503151702.j2FH2Hp5017221@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.spec 
Log Message:
fox year in changelog entry



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ppracer.spec	15 Mar 2005 13:04:02 -0000	1.10
+++ ppracer.spec	15 Mar 2005 17:02:15 -0000	1.11
@@ -67,7 +67,7 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
-* Tue Mar 15 2004 Nils Philippsen <nphilipp at redhat.com>
+* Tue Mar 15 2005 Nils Philippsen <nphilipp at redhat.com>
 - buildrequire correct tcl-devel version that includes tclConfig.sh
 
 * Tue Mar 08 2005 Nils Philippsen <nphilipp at redhat.com>



From fedora-extras-commits at redhat.com  Tue Mar 15 18:58:15 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 15 Mar 2005 13:58:15 -0500
Subject: rpms/aqhbci-qt-tools/devel aqhbci-qt-tools.spec,1.4,1.5
Message-ID: <200503151858.j2FIwFdH019774@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/aqhbci-qt-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19762

Modified Files:
	aqhbci-qt-tools.spec 
Log Message:
buildreq qt-devel



Index: aqhbci-qt-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/aqhbci-qt-tools/devel/aqhbci-qt-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aqhbci-qt-tools.spec	5 Mar 2005 21:10:20 -0000	1.4
+++ aqhbci-qt-tools.spec	15 Mar 2005 18:58:13 -0000	1.5
@@ -1,12 +1,12 @@
 Name: aqhbci-qt-tools
 Summary: Setup wizard and debugger for the HBCI backend for the Aqbanking library
 Version: 1.0.1beta
-Release: 2
+Release: 3
 Source: http://download.sourceforge.net/aqhbci/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 License: GPL
 URL: http://sourceforge.net/projects/aqhbci
-BuildRequires: gwenhywfar-devel aqbanking-devel aqhbci-devel
+BuildRequires: gwenhywfar-devel aqbanking-devel aqhbci-devel qt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -37,5 +37,8 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Tue Mar 15 2005  Bill Nottingham <notting at redhat.com> 1.0.1beta-3
+- buildreq qt-devel
+
 * Mon Feb 28 2005  Bill Nottingham <notting at redhat.com> 1.0.1beta-2
 - initial import



From fedora-extras-commits at redhat.com  Tue Mar 15 20:44:19 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:44:19 -0500
Subject: rpms/python-tpg - New directory
Message-ID: <200503152044.j2FKiJkO022882@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22875/python-tpg

Log Message:
Directory /cvs/extras/rpms/python-tpg added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:44:19 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:44:19 -0500
Subject: rpms/python-tpg/devel - New directory
Message-ID: <200503152044.j2FKiJN6022885@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22875/python-tpg/devel

Log Message:
Directory /cvs/extras/rpms/python-tpg/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:44:31 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:44:31 -0500
Subject: rpms/python-tpg Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503152044.j2FKiVUC022949@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22937

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-tpg


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

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

common : CVS/Root
	@cvs 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 Mar 15 20:44:31 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:44:31 -0500
Subject: rpms/python-tpg/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503152044.j2FKiVtt022952@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22937/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-tpg


--- 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 Mar 15 20:44:52 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:44:52 -0500
Subject: rpms/python-tpg import.log,1.1,1.2
Message-ID: <200503152044.j2FKiq9u023048@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23039

Modified Files:
	import.log 
Log Message:
auto-import python-tpg-3.0.5-1 on branch devel from python-tpg-3.0.5-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 20:44:29 -0000	1.1
+++ import.log	15 Mar 2005 20:44:50 -0000	1.2
@@ -0,0 +1 @@
+python-tpg-3_0_5-1:HEAD:python-tpg-3.0.5-1.src.rpm:1110919487



From fedora-extras-commits at redhat.com  Tue Mar 15 20:44:52 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:44:52 -0500
Subject: rpms/python-tpg/devel python-tpg.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503152044.j2FKiqPO023052@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23039/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-tpg.spec 
Log Message:
auto-import python-tpg-3.0.5-1 on branch devel from python-tpg-3.0.5-1.src.rpm


--- NEW FILE python-tpg.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)")}

%define srcname TPG

Name:           python-tpg
Version:        3.0.5
Release:        1
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
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
Toy Parser Generator is a lexical and syntactic parser generator
for Python. This generator was born from a simple statement: YACC
is to complex to use in simple cases (calculators, configuration
files, small programming languages, ...).

TPG can very simply write parsers that are usefull for most every
day needs (even if it can't make your coffee). With a very clear
and simple syntax, you can write an attributed grammar that is
translated into a recursive descendant parser. TPG generated code
is very closed to the original grammar. This means that the parser
works "like" the grammar. A grammar rule can be seen as a method
of the parser class, symbols as method calls, attributes as method
parameters and semantic values as return values. You can also add
Python code directly into grammar rules and build abstract syntax
trees while parsing.


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


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README doc THANKS ChangeLog License.txt
%{_bindir}/tpg
%{python_sitelib}/tpg.py
%{python_sitelib}/tpg.pyc
%ghost %{python_sitelib}/tpg.pyo

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 3.0.5-1 -
- Update to 3.0.5
- Clean up spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 20:44:29 -0000	1.1
+++ .cvsignore	15 Mar 2005 20:44:50 -0000	1.2
@@ -0,0 +1 @@
+TPG-3.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 20:44:29 -0000	1.1
+++ sources	15 Mar 2005 20:44:50 -0000	1.2
@@ -0,0 +1 @@
+4608d9a4795b02a9df685d1916090432  TPG-3.0.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 15 20:46:23 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:46:23 -0500
Subject: rpms/python-simpletal - New directory
Message-ID: <200503152046.j2FKkN82023195@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23188/python-simpletal

Log Message:
Directory /cvs/extras/rpms/python-simpletal added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:46:23 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:46:23 -0500
Subject: rpms/python-simpletal/devel - New directory
Message-ID: <200503152046.j2FKkNPW023198@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23188/python-simpletal/devel

Log Message:
Directory /cvs/extras/rpms/python-simpletal/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:46:37 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:46:37 -0500
Subject: rpms/python-simpletal Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503152046.j2FKkbQk023260@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23251

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-simpletal


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

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

common : CVS/Root
	@cvs 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 Mar 15 20:46:37 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:46:37 -0500
Subject: rpms/python-simpletal/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503152046.j2FKkbBA023263@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23251/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-simpletal


--- 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 Mar 15 20:46:55 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:46:55 -0500
Subject: rpms/python-simpletal import.log,1.1,1.2
Message-ID: <200503152046.j2FKkt1U023362@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23353

Modified Files:
	import.log 
Log Message:
auto-import python-simpletal-3.12-1 on branch devel from python-simpletal-3.12-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 20:46:35 -0000	1.1
+++ import.log	15 Mar 2005 20:46:53 -0000	1.2
@@ -0,0 +1 @@
+python-simpletal-3_12-1:HEAD:python-simpletal-3.12-1.src.rpm:1110919611



From fedora-extras-commits at redhat.com  Tue Mar 15 20:46:55 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:46:55 -0500
Subject: rpms/python-simpletal/devel python-simpletal.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503152046.j2FKkt7M023366@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23353/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-simpletal.spec 
Log Message:
auto-import python-simpletal-3.12-1 on branch devel from python-simpletal-3.12-1.src.rpm


--- NEW FILE python-simpletal.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define srcname SimpleTAL

Name:           python-simpletal
Version:        3.12
Release:        1
Summary:        An XML based template processor for TAL, TALES and METAL specifications.

Group:          Development/Libraries
License:        Other
URL:            http://www.owlfish.com/software/simpleTAL/index.html
Source0:        http://www.owlfish.com/software/simpleTAL/downloads/SimpleTAL-3.12.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
SimpleTAL is a stand alone Python implementation of the TAL, TALES and METAL  specifications  used in Zope to power HTML and XML templates.


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

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes.txt LICENSE.txt README.txt examples/
%dir %{python_sitelib}/simpletal
%{python_sitelib}/simpletal/*.py
%{python_sitelib}/simpletal/*.pyc
%ghost %{python_sitelib}/simpletal/*.pyo

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 3.12-1 -
- Update to 3.12
- Clean up spec file

* Mon Dec 06 2004 Shahms E. King <shahms at shahms.com> -
- Update to 3.11
* Thu May 27 2004 Shahms King <shahms at shahms.com> -
- Initial Release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 20:46:35 -0000	1.1
+++ .cvsignore	15 Mar 2005 20:46:53 -0000	1.2
@@ -0,0 +1 @@
+SimpleTAL-3.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 20:46:35 -0000	1.1
+++ sources	15 Mar 2005 20:46:53 -0000	1.2
@@ -0,0 +1 @@
+4c34dc80dba22d9f7ea7ff7fd2e2bea1  SimpleTAL-3.12.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 15 20:49:16 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:49:16 -0500
Subject: rpms/python-protocols - New directory
Message-ID: <200503152049.j2FKnGDg023517@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-protocols
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23510/python-protocols

Log Message:
Directory /cvs/extras/rpms/python-protocols added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:49:16 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:49:16 -0500
Subject: rpms/python-protocols/devel - New directory
Message-ID: <200503152049.j2FKnGXF023520@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-protocols/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23510/python-protocols/devel

Log Message:
Directory /cvs/extras/rpms/python-protocols/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:49:29 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:49:29 -0500
Subject: rpms/python-protocols Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503152049.j2FKnTQ4023582@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-protocols
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23573

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-protocols


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

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

common : CVS/Root
	@cvs 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 Mar 15 20:49:29 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:49:29 -0500
Subject: rpms/python-protocols/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503152049.j2FKnT3c023585@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-protocols/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23573/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-protocols


--- 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 Mar 15 20:49:51 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:49:51 -0500
Subject: rpms/python-protocols import.log,1.1,1.2
Message-ID: <200503152049.j2FKnpO7023687@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-protocols
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23678

Modified Files:
	import.log 
Log Message:
auto-import python-protocols-0.9.3-2 on branch devel from python-protocols-0.9.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-protocols/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 20:49:27 -0000	1.1
+++ import.log	15 Mar 2005 20:49:49 -0000	1.2
@@ -0,0 +1 @@
+python-protocols-0_9_3-2:HEAD:python-protocols-0.9.3-2.src.rpm:1110919786



From fedora-extras-commits at redhat.com  Tue Mar 15 20:49:51 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:49:51 -0500
Subject: rpms/python-protocols/devel python-protocols.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503152049.j2FKnpL9023691@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-protocols/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23678/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-protocols.spec 
Log Message:
auto-import python-protocols-0.9.3-2 on branch devel from python-protocols-0.9.3-2.src.rpm


--- NEW FILE python-protocols.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)")}

%define srcname PyProtocols

Name:           python-protocols
Version:        0.9.3
Release:        2
Summary:        Open Protocols and Component Adaptation for Python

Group:          Development/Libraries
License:        PSF or ZPL
URL:            http://peak.telecommunity.com/PyProtocols.html
Source0:        http://peak.telecommunity.com/dist/PyProtocols-0.9.3.tar.gz
Source1:        setuptools.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
PyProtocols is an implementation of PEP 246 allowing Python programmers to define
Interfaces and adapters between them, thereby reducing or eliminating fragile 'isinstance'
if type() comparisons.

%prep
%setup -q -n %{srcname}-%{version}
# install setuptools
tar -zxf %{SOURCE1}

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt CHANGES.txt docs/*
%dir %{python_sitelib}/protocols
%{python_sitelib}/protocols/*.so
%{python_sitelib}/protocols/*.py
%{python_sitelib}/protocols/*.pyc
%ghost %{python_sitelib}/protocols/*.pyo
%{python_sitelib}/protocols/*/*.py
%{python_sitelib}/protocols/*/*.pyc
%ghost %{python_sitelib}/protocols/*/*.pyo

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 0.9.3-2
- Clean up spec file
* Tue Aug 31 2004 Shahms E. King <shahms at shahms.com> -
- Update to 0.9.3
* Fri Jul 30 2004 Shahms E. King <shahms at shahms.com> -
- Update to 0.9.3rc2
* Thu May 27 2004 Shahms King <shahms at shahms.com> -
- Initial Release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-protocols/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 20:49:27 -0000	1.1
+++ .cvsignore	15 Mar 2005 20:49:49 -0000	1.2
@@ -0,0 +1,2 @@
+PyProtocols-0.9.3.tar.gz
+setuptools.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-protocols/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 20:49:27 -0000	1.1
+++ sources	15 Mar 2005 20:49:49 -0000	1.2
@@ -0,0 +1,2 @@
+50559c9869389e9d576b98f6382b1324  PyProtocols-0.9.3.tar.gz
+1fe0f57c72b81ab7fc357b972ba80f4b  setuptools.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 15 20:51:36 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:51:36 -0500
Subject: rpms/python-psycopg - New directory
Message-ID: <200503152051.j2FKpaOw023838@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23831/python-psycopg

Log Message:
Directory /cvs/extras/rpms/python-psycopg added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:51:36 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:51:36 -0500
Subject: rpms/python-psycopg/devel - New directory
Message-ID: <200503152051.j2FKpaHv023841@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23831/python-psycopg/devel

Log Message:
Directory /cvs/extras/rpms/python-psycopg/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:51:48 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:51:48 -0500
Subject: rpms/python-psycopg Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503152051.j2FKpmMb023903@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23894

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-psycopg


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

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

common : CVS/Root
	@cvs 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 Mar 15 20:51:48 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:51:48 -0500
Subject: rpms/python-psycopg/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503152051.j2FKpmqi023906@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23894/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-psycopg


--- 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 Mar 15 20:52:08 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:52:08 -0500
Subject: rpms/python-psycopg import.log,1.1,1.2
Message-ID: <200503152052.j2FKq8Up024004@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23995

Modified Files:
	import.log 
Log Message:
auto-import python-psycopg-1.1.18-1 on branch devel from python-psycopg-1.1.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 20:51:46 -0000	1.1
+++ import.log	15 Mar 2005 20:52:06 -0000	1.2
@@ -0,0 +1 @@
+python-psycopg-1_1_18-1:HEAD:python-psycopg-1.1.18-1.src.rpm:1110919922



From fedora-extras-commits at redhat.com  Tue Mar 15 20:52:08 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:52:08 -0500
Subject: rpms/python-psycopg/devel python-psycopg.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503152052.j2FKq8PG024008@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23995/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-psycopg.spec 
Log Message:
auto-import python-psycopg-1.1.18-1 on branch devel from python-psycopg-1.1.18-1.src.rpm


--- NEW FILE python-psycopg.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)")}

%define srcname psycopg

Name:           python-psycopg
Version:        1.1.18
Release:        1
Summary:        PostgreSQL database adapter for Python

Group:          Development/Libraries
License:        GPL
URL:            http://www.initd.org/software/initd/psycopg
Source0:        http://initd.org/pub/software/psycopg/psycopg-1.1.18.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel postgresql-devel mx
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") mx postgresql-libs

%description
psycopg is a PostgreSQL database adapter for the Python programming
language (just like pygresql and popy.) It was written from scratch with
the aim of being very small and fast, and stable as a rock. The main
advantages of psycopg are that it supports the full Python DBAPI-2.0 and
being thread safe at level 2.

%prep
%setup -n %{srcname}-%{version}

%build
if [ -x /usr/bin/pg_config ]; then
	POSTGRESQLINC=$(/usr/bin/pg_config --includedir-server)
	POSTGRESQLLIB=$(/usr/bin/pg_config --libdir)
else
	POSTGRESQLINC=/usr/include/pgsql
	POSTGRESQLLIB=/usr/lib
fi
%configure --with-python=%{__python} \
      --with-mxdatetime-includes=%{_includedir}  \
      --with-postgres-includes=$POSTGRESQLINC \
      --with-postgres-libs=$POSTGRESQLLIB
make

%install
mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
install -m 555 psycopgmodule.so $RPM_BUILD_ROOT%{python_sitelib}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS  COPYING  CREDITS  FAQ  INSTALL  NEWS  README  RELEASE-1.0  SUCCESS  TODO doc
%{python_sitearch}/*.so

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 1.1.18-1
- Repackage for Extras
- Update to 1.1.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 20:51:46 -0000	1.1
+++ .cvsignore	15 Mar 2005 20:52:06 -0000	1.2
@@ -0,0 +1 @@
+psycopg-1.1.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 20:51:46 -0000	1.1
+++ sources	15 Mar 2005 20:52:06 -0000	1.2
@@ -0,0 +1 @@
+8e5cd2925a25a5aa80cd83418d6a5f09  psycopg-1.1.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 15 20:53:36 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:53:36 -0500
Subject: rpms/python-psyco - New directory
Message-ID: <200503152053.j2FKra5B024147@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24140/python-psyco

Log Message:
Directory /cvs/extras/rpms/python-psyco added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:53:36 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:53:36 -0500
Subject: rpms/python-psyco/devel - New directory
Message-ID: <200503152053.j2FKra9T024150@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24140/python-psyco/devel

Log Message:
Directory /cvs/extras/rpms/python-psyco/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:53:51 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:53:51 -0500
Subject: rpms/python-psyco Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503152053.j2FKrp4q024212@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24203

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-psyco


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

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

common : CVS/Root
	@cvs 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 Mar 15 20:53:51 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:53:51 -0500
Subject: rpms/python-psyco/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503152053.j2FKrpwV024215@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24203/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-psyco


--- 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 Mar 15 20:54:12 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:54:12 -0500
Subject: rpms/python-psyco import.log,1.1,1.2
Message-ID: <200503152054.j2FKsC4o024316@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24306

Modified Files:
	import.log 
Log Message:
auto-import python-psyco-1.4-1 on branch devel from python-psyco-1.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 20:53:49 -0000	1.1
+++ import.log	15 Mar 2005 20:54:10 -0000	1.2
@@ -0,0 +1 @@
+python-psyco-1_4-1:HEAD:python-psyco-1.4-1.src.rpm:1110920047



From fedora-extras-commits at redhat.com  Tue Mar 15 20:54:12 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:54:12 -0500
Subject: rpms/python-psyco/devel python-psyco.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503152054.j2FKsCuO024320@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24306/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-psyco.spec 
Log Message:
auto-import python-psyco-1.4-1 on branch devel from python-psyco-1.4-1.src.rpm


--- NEW FILE python-psyco.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)")}

%define srcname psyco

Name:           python-%{srcname}
Version:        1.4
Release:        1
Summary:        The Python Specialing Compiler

Group:          Development/Libraries
License:        MIT
URL:            http://psyco.sourceforge.net/
Source0:        http://prdownloads.sourceforge.net/psyco/psyco-1.4-src.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description


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


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING.txt INSTALL.txt README.txt doc/
%{python_sitearch}/psyco/*.so
%{python_sitearch}/psyco/*.py
%{python_sitearch}/psyco/*.pyc
%dir %{python_sitearch}/psyco
%ghost %{python_sitearch}/psyco/*.pyo

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 1.4-1
- Repackage for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 20:53:49 -0000	1.1
+++ .cvsignore	15 Mar 2005 20:54:10 -0000	1.2
@@ -0,0 +1 @@
+psyco-1.4-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 20:53:49 -0000	1.1
+++ sources	15 Mar 2005 20:54:10 -0000	1.2
@@ -0,0 +1 @@
+b1365ceaa40a75326d3deb48edf0c8cc  psyco-1.4-src.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 15 21:24:40 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 15 Mar 2005 16:24:40 -0500
Subject: rpms/abiword/devel abiword-2.2.5-pt64.patch, NONE,
	1.1 abiword-2.2.5-virtdestr.patch, NONE, 1.1 abiword.spec, 1.2, 1.3
Message-ID: <200503152124.j2FLOeZ9025741@cvs-int.fedora.redhat.com>

Author: katzj

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

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.2.5-pt64.patch abiword-2.2.5-virtdestr.patch 
Log Message:
* Fri Mar 15 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.5-3
- Fix 64bit build
- Add virtual destructors to classes with virtual functions


abiword-2.2.5-pt64.patch:

--- NEW FILE abiword-2.2.5-pt64.patch ---
diff -r -u abiword-2.2.5.orig/abi/src/text/ptbl/xp/pp_TableAttrProp.cpp abiword-2.2.5/abi/src/text/ptbl/xp/pp_TableAttrProp.cpp
--- abiword-2.2.5.orig/abi/src/text/ptbl/xp/pp_TableAttrProp.cpp	2004-04-03 19:48:28.000000000 +0200
+++ abiword-2.2.5/abi/src/text/ptbl/xp/pp_TableAttrProp.cpp	2005-03-15 21:33:41.519703662 +0100
@@ -53,10 +53,9 @@
 static UT_sint32 compareAPBinary(const void * vX1, const void * vX2)
 {
 //
-// vX1 is actually the key value (a UT_uint32 checkSum) cast into a
-// void * pointer so this cast is correct even on a 64 bit machine
+// vX1 is actually a pointer to a UT_uint32 key value (a checkSum)
 //
-	UT_uint32 u1 = ((UT_uint32) (vX1));
+	UT_uint32 u1 = *((UT_uint32*) (vX1));
 	PP_AttrProp *x2 = *(PP_AttrProp **)(vX2);
 	UT_uint32 u2 = x2->getCheckSum();
 
@@ -176,7 +175,8 @@
  	// VC6 complains about not being able to convert from
  	// 'const class UT_Vector *' to 'class UT_Vector &'
  	// so I put in the cast to shut it up
- 	k = ((UT_Vector &)m_vecTableSorted).binarysearch(reinterpret_cast<void *>(pMatch->getCheckSum()), compareAPBinary);
+	UT_uint32 checksum = pMatch->getCheckSum();
+ 	k = ((UT_Vector &)m_vecTableSorted).binarysearch(reinterpret_cast<void *>(&checksum), compareAPBinary);
  	UT_uint32 cksum = pMatch->getCheckSum();
  
  	if (k == -1)

abiword-2.2.5-virtdestr.patch:

--- NEW FILE abiword-2.2.5-virtdestr.patch ---
diff -u -r abiword-2.2.5.orig/abi/src/af/gr/xp/gr_Graphics.h abiword-2.2.5/abi/src/af/gr/xp/gr_Graphics.h
--- abiword-2.2.5.orig/abi/src/af/gr/xp/gr_Graphics.h	2005-01-01 01:16:58.000000000 +0100
+++ abiword-2.2.5/abi/src/af/gr/xp/gr_Graphics.h	2005-03-15 21:05:32.020613488 +0100
@@ -247,6 +247,8 @@
 class GR_AllocInfo
 {
   public:
+	virtual ~GR_AllocInfo() {}
+
 	virtual GR_GraphicsId getType() const {UT_ASSERT_HARMLESS(UT_NOT_IMPLEMENTED); return GRID_UNKNOWN;}
 	virtual bool isPrinterGraphics()const {UT_ASSERT_HARMLESS(UT_NOT_IMPLEMENTED); return false;}
 };
diff -u -r abiword-2.2.5.orig/abi/src/af/gr/xp/gr_Image.h abiword-2.2.5/abi/src/af/gr/xp/gr_Image.h
--- abiword-2.2.5.orig/abi/src/af/gr/xp/gr_Image.h	2004-03-18 17:00:48.000000000 +0100
+++ abiword-2.2.5/abi/src/af/gr/xp/gr_Image.h	2005-03-15 21:05:32.040610718 +0100
@@ -79,6 +79,8 @@
 class ABI_EXPORT GR_ImageFactory
 {
 public:
+	virtual ~GR_ImageFactory() {}
+
    	virtual GR_Image*	createNewImage(const char* pszName, GR_Image::GRType iType = GR_Image::GRT_Raster) = 0;
 };
 
diff -u -r abiword-2.2.5.orig/abi/src/af/util/xp/ut_TextIterator.h abiword-2.2.5/abi/src/af/util/xp/ut_TextIterator.h
--- abiword-2.2.5.orig/abi/src/af/util/xp/ut_TextIterator.h	2004-03-10 23:03:21.000000000 +0100
+++ abiword-2.2.5/abi/src/af/util/xp/ut_TextIterator.h	2005-03-15 21:05:32.063607531 +0100
@@ -104,6 +104,7 @@
 class ABI_EXPORT UT_TextIterator
 {
   public:
+	virtual ~UT_TextIterator() {}
 
 	/////////////////////////////////////////////////////////////////////////
 	// data accessor; retrieves character at present position
diff -u -r abiword-2.2.5.orig/abi/src/af/xap/xp/xap_AppImpl.h abiword-2.2.5/abi/src/af/xap/xp/xap_AppImpl.h
--- abiword-2.2.5.orig/abi/src/af/xap/xp/xap_AppImpl.h	2004-02-06 12:13:47.000000000 +0100
+++ abiword-2.2.5/abi/src/af/xap/xp/xap_AppImpl.h	2005-03-15 21:05:32.084604622 +0100
@@ -27,6 +27,8 @@
 class XAP_AppImpl
 {
 public:
+	virtual ~XAP_AppImpl() {}
+
 	static XAP_AppImpl* static_constructor(void);		/* must be implemented by the ap_<FE>AppImpl */
 
 	/* XAP_App can call impl methods. */
diff -u -r abiword-2.2.5.orig/abi/src/af/xap/xp/xav_Listener.h abiword-2.2.5/abi/src/af/xap/xp/xav_Listener.h
--- abiword-2.2.5.orig/abi/src/af/xap/xp/xav_Listener.h	2004-10-05 12:25:42.000000000 +0200
+++ abiword-2.2.5/abi/src/af/xap/xp/xav_Listener.h	2005-03-15 21:05:32.104601851 +0100
@@ -94,6 +94,8 @@
 class AV_Listener
 {
 public:
+	virtual ~AV_Listener() {}
+
 	virtual bool		notify(AV_View * pView, const AV_ChangeMask mask) = 0;
 	virtual AV_ListenerType    getType(void) = 0;
 };


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- abiword.spec	14 Mar 2005 23:02:47 -0000	1.2
+++ abiword.spec	15 Mar 2005 21:24:38 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.2.5
-Release: 2
+Release: 3
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -42,6 +42,8 @@
 Patch1: abiword-2.2.1-desktop.patch
 Patch2: abiword-2.2.5-gcc4.patch
 Patch3: abiword-2.2.5-wvread.patch
+Patch4: abiword-2.2.5-virtdestr.patch
+Patch5: abiword-2.2.5-pt64.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -53,6 +55,8 @@
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .gcc4
 %patch3 -p1 -b .wvread
+%patch4 -p1 -b .virtdestr
+%patch5 -p1 -b .pt64
 
 %build
 cd abi
@@ -131,6 +135,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Fri Mar 15 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.5-3
+- Fix 64bit build
+- Add virtual destructors to classes with virtual functions
+
 * Fri Mar 14 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.5-2
 - Remove the --disable-magick plugin switch
 - disable GDA support until the plugin is ported to gnomedb 1.2.x



From fedora-extras-commits at redhat.com  Wed Mar 16 12:27:25 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 16 Mar 2005 07:27:25 -0500
Subject: rpms/ppracer/devel ppracer-0.3.1-lib64.patch, NONE, 1.1 ppracer.spec,
	1.11, 1.12 ppracer-0.3.1-optflags.patch, 1.1, NONE
Message-ID: <200503161227.j2GCRP5o025289@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.spec 
Added Files:
	ppracer-0.3.1-lib64.patch 
Removed Files:
	ppracer-0.3.1-optflags.patch 
Log Message:
look in .../lib64 as well for tclConfig.sh
remove obsolete optflags patch


ppracer-0.3.1-lib64.patch:

--- NEW FILE ppracer-0.3.1-lib64.patch ---
--- ppracer-0.3.1/configure.in.lib64	2005-02-27 19:43:18.000000000 +0100
+++ ppracer-0.3.1/configure.in	2005-03-16 13:23:36.600097963 +0100
@@ -127,29 +127,31 @@
     found=0
     if test "$tcl" != "no"; then
     	tcl=no
-    	for try in $dirs; do
-    		if test -f $try/tclConfig.sh; then		
-    			found=1
-    			. $try/tclConfig.sh
-    			tcl=yes
-                customtcl="no"
-                if test "x$with_tcl_lib_name" != "x"; then
-                    TCL_LIBS="-l$with_tcl_lib_name"
-                    AC_MSG_NOTICE(["Using custom TCL Library: $with_tcl_lib_name"])
-                else
-                    TCL_LIBS="$TCL_LIB_SPEC $TCL_LIBS"
-                fi
-
-                if test "x$with_tcl_inc" != "x"; then
-                    TCL_CFLAGS="-I$with_tcl_inc"
-                    AC_MSG_NOTICE(["Using custom TCL headers directory: $with_tcl_inc"])
-                else
-                    TCL_CFLAGS="-I$TCL_INC_DIR $TCL_INCLUDE_SPEC"
-                fi
-
-    			AC_MSG_RESULT($try/tclConfig.sh)
-    			break
-    		fi
+    	for trydir in $dirs; do
+            for try in ${trydir}64 ${trydir}; do
+    		    if test -f $try/tclConfig.sh; then		
+    			    found=1
+    			    . $try/tclConfig.sh
+    			    tcl=yes
+                    customtcl="no"
+                    if test "x$with_tcl_lib_name" != "x"; then
+                        TCL_LIBS="-l$with_tcl_lib_name"
+                        AC_MSG_NOTICE(["Using custom TCL Library: $with_tcl_lib_name"])
+                    else
+                        TCL_LIBS="$TCL_LIB_SPEC $TCL_LIBS"
+                    fi
+
+                    if test "x$with_tcl_inc" != "x"; then
+                        TCL_CFLAGS="-I$with_tcl_inc"
+                        AC_MSG_NOTICE(["Using custom TCL headers directory: $with_tcl_inc"])
+                    else
+                        TCL_CFLAGS="-I$TCL_INC_DIR $TCL_INCLUDE_SPEC"
+                    fi
+
+    			    AC_MSG_RESULT($try/tclConfig.sh)
+    			    break
+    		    fi
+            done
     	done
     	if test "$found" -eq 0 ; then
     		AC_MSG_ERROR([tclConfig.sh not found - use the --with-tcl option])


Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ppracer.spec	15 Mar 2005 17:02:15 -0000	1.11
+++ ppracer.spec	16 Mar 2005 12:27:22 -0000	1.12
@@ -6,7 +6,7 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 3
+Release: 4
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
@@ -16,6 +16,7 @@
 Source2: ppracer.desktop
 
 Patch0: PPRacer-0.1.9-ia64.patch
+Patch1: ppracer-0.3.1-lib64.patch
 
 BuildRequires: xorg-x11-devel
 BuildRequires: SDL-devel >= 1.2
@@ -38,6 +39,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .ia64
+%patch1 -p1 -b .lib64
 
 %build
 autoconf
@@ -67,6 +69,9 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Wed Mar 16 2005 Nils Philippsen <nphilipp at redhat.com>
+- look in .../lib64 as well for tclConfig.sh
+
 * Tue Mar 15 2005 Nils Philippsen <nphilipp at redhat.com>
 - buildrequire correct tcl-devel version that includes tclConfig.sh
 


--- ppracer-0.3.1-optflags.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar 16 16:38:46 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 16 Mar 2005 11:38:46 -0500
Subject: rpms/gazpacho/devel gazpacho.spec,1.4,1.5
Message-ID: <200503161638.j2GGckJr000657@cvs-int.fedora.redhat.com>

Author: katzj

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

Modified Files:
	gazpacho.spec 
Log Message:
test trying to change something



Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/gazpacho.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gazpacho.spec	22 Feb 2005 02:36:44 -0000	1.4
+++ gazpacho.spec	16 Mar 2005 16:38:44 -0000	1.5
@@ -33,7 +33,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files -f %{name}-%{version}.files
 %defattr(-,root,root,-)
 %doc README COPYING NEWS



From fedora-extras-commits at redhat.com  Wed Mar 16 16:53:23 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:53:23 -0500
Subject: rpms/clearlooks - New directory
Message-ID: <200503161653.j2GGrNHV001150@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Log Message:
Directory /cvs/extras/rpms/clearlooks added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 16:53:23 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:53:23 -0500
Subject: rpms/clearlooks/devel - New directory
Message-ID: <200503161653.j2GGrNfq001153@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Log Message:
Directory /cvs/extras/rpms/clearlooks/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 16:53:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:53:50 -0500
Subject: rpms/clearlooks Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161653.j2GGroD5001221@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module clearlooks


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

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

common : CVS/Root
	@cvs 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 Mar 16 16:53:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:53:50 -0500
Subject: rpms/clearlooks/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161653.j2GGroR4001224@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module clearlooks


--- 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 Mar 16 16:55:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:55:03 -0500
Subject: rpms/clearlooks import.log,1.1,1.2
Message-ID: <200503161655.j2GGt30a001347@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	import.log 
Log Message:
auto-import clearlooks-0.4-1 on branch devel from clearlooks-0.4-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/clearlooks/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 16:53:48 -0000	1.1
+++ import.log	16 Mar 2005 16:55:01 -0000	1.2
@@ -0,0 +1 @@
+clearlooks-0_4-1:HEAD:clearlooks-0.4-1.src.rpm:1110992088



From fedora-extras-commits at redhat.com  Wed Mar 16 16:55:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:55:03 -0500
Subject: rpms/clearlooks/devel clearlooks.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503161655.j2GGt3m4001351@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore sources 
Added Files:
	clearlooks.spec 
Log Message:
auto-import clearlooks-0.4-1 on branch devel from clearlooks-0.4-1.src.rpm
Initial import


--- NEW FILE clearlooks.spec ---
Name:           clearlooks
Version:        0.4
Release:        1
Summary:        An attractive GTK+ 2 engine with a focus on usability
Group:          User Interface/Desktops
License:        GPL
URL:            http://clearlooks.sourceforge.net/screenshots/
Source0:        http://prdownloads.sourceforge.net/clearlooks/clearlooks-0.4.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtk2-devel
Requires:       gtk2

%description
Clearlooks will transform your GNOME desktop into an attractive looking and usable environment.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING CREDITS ChangeLog NEWS README TODO
%{_datadir}/themes/*
%{_libdir}/gtk-2.0/2.4.0/engines/*

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-1
- Bump release to 1

* Sat Mar  5 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.4-0.iva.0
- Upstream update

* Sat Feb 26 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.3-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clearlooks/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 16:53:48 -0000	1.1
+++ .cvsignore	16 Mar 2005 16:55:01 -0000	1.2
@@ -0,0 +1 @@
+clearlooks-0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clearlooks/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 16:53:48 -0000	1.1
+++ sources	16 Mar 2005 16:55:01 -0000	1.2
@@ -0,0 +1 @@
+d714197da50c4eb3c2278f3c786fa996  clearlooks-0.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar 16 16:58:17 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:58:17 -0500
Subject: rpms/deskbar-applet - New directory
Message-ID: <200503161658.j2GGwHEc001683@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Log Message:
Directory /cvs/extras/rpms/deskbar-applet added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 16:58:17 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:58:17 -0500
Subject: rpms/deskbar-applet/devel - New directory
Message-ID: <200503161658.j2GGwHlA001686@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Log Message:
Directory /cvs/extras/rpms/deskbar-applet/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 16:58:35 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:58:35 -0500
Subject: rpms/deskbar-applet Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161658.j2GGwZFs001748@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module deskbar-applet


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

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

common : CVS/Root
	@cvs 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 Mar 16 16:58:35 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:58:35 -0500
Subject: rpms/deskbar-applet/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161658.j2GGwZv6001751@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module deskbar-applet


--- 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 Mar 16 16:59:06 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:59:06 -0500
Subject: rpms/deskbar-applet/devel deskbar-applet.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161659.j2GGx61P001858@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore sources 
Added Files:
	deskbar-applet.spec 
Log Message:
auto-import deskbar-applet-0.2-1 on branch devel from deskbar-applet-0.2-1.src.rpm
Initial import


--- NEW FILE deskbar-applet.spec ---
Name:           deskbar-applet
Version:        0.2
Release:        1
Summary:        A Gnome applet to allow easy access to various search engines
Group:          Applications/Internet
License:        GPL
URL:            http://browserbookapp.sourceforge.net/deskbar.html
Source0:        http://prdownloads.sourceforge.net/browserbookapp/deskbar-applet-0.2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf
BuildArch:      noarch

%description
This applet looks like the current Gnome Mini-Commander, but it launches search queries instead of programs.

Example search-engines include
+ Google
+ MSN
+ EBay
+ IMDB
+ Stock Quotes
+ Wikipedia
+ Local File Search (and eventually also Beagle)

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT
install -D -m 0755 deskbar-applet.py $RPM_BUILD_ROOT%{_libexecdir}/deskbar-applet.py
install -D -m 0644 DeskbarApplet.server $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/DeskbarApplet.server

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENCE README
%{_libexecdir}/deskbar-applet.py
%{_libdir}/bonobo/servers/DeskbarApplet.server

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-1
- Bump release to 1

* Thu Feb 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.2-0.iva.0
- Upstream update

* Sun Feb 20 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.1-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 16:58:33 -0000	1.1
+++ .cvsignore	16 Mar 2005 16:59:04 -0000	1.2
@@ -0,0 +1 @@
+deskbar-applet-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 16:58:33 -0000	1.1
+++ sources	16 Mar 2005 16:59:04 -0000	1.2
@@ -0,0 +1 @@
+051558aa867073aa901dc1049ae0ae12  deskbar-applet-0.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 16:59:06 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:59:06 -0500
Subject: rpms/deskbar-applet import.log,1.1,1.2
Message-ID: <200503161659.j2GGx68c001853@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	import.log 
Log Message:
auto-import deskbar-applet-0.2-1 on branch devel from deskbar-applet-0.2-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 16:58:33 -0000	1.1
+++ import.log	16 Mar 2005 16:59:04 -0000	1.2
@@ -0,0 +1 @@
+deskbar-applet-0_2-1:HEAD:deskbar-applet-0.2-1.src.rpm:1110992338



From fedora-extras-commits at redhat.com  Wed Mar 16 16:59:43 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:59:43 -0500
Subject: rpms/edb - New directory
Message-ID: <200503161659.j2GGxhnB001984@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Log Message:
Directory /cvs/extras/rpms/edb added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 16:59:44 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:59:44 -0500
Subject: rpms/edb/devel - New directory
Message-ID: <200503161659.j2GGxiAD001987@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Log Message:
Directory /cvs/extras/rpms/edb/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:00:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:00:01 -0500
Subject: rpms/edb Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161700.j2GH01ah002053@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Added Files:
	Makefile import.log 
Log Message:
Setup of module edb


--- NEW FILE Makefile ---
# Top level Makefile for module edb
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:00:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:00:01 -0500
Subject: rpms/edb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161700.j2GH01X5002056@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2044/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module edb


--- 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 Mar 16 17:01:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:01:02 -0500
Subject: rpms/edb import.log,1.1,1.2
Message-ID: <200503161701.j2GH12Yp002818@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2168

Modified Files:
	import.log 
Log Message:
auto-import edb-1.0.5-1 on branch devel from edb-1.0.5-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/edb/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 16:59:59 -0000	1.1
+++ import.log	16 Mar 2005 17:01:00 -0000	1.2
@@ -0,0 +1 @@
+edb-1_0_5-1:HEAD:edb-1.0.5-1.src.rpm:1110992452



From fedora-extras-commits at redhat.com  Wed Mar 16 17:01:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:01:02 -0500
Subject: rpms/edb/devel edb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200503161701.j2GH129x002822@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2168/devel

Modified Files:
	.cvsignore sources 
Added Files:
	edb.spec 
Log Message:
auto-import edb-1.0.5-1 on branch devel from edb-1.0.5-1.src.rpm
Initial import


--- NEW FILE edb.spec ---
Name:           edb
Version:        1.0.5
Release:        1
Summary:        A database convenience library wrapped around BDB
Group:          System Environment/Libraries
License:        MIT
URL:            http://enlightenment.org/pages/edb.html
Source0:        http://prdownloads.sourceforge.net/enlightenment/edb-1.0.5.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtk+-devel, ncurses-devel zlib-devel 
Requires:       zlib
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
EDB is a database convenience library wrapped around the Berkeley DB 2.7.7 by Sleepycat Software. It is intended to make accessing database information portable, easy, fast and efficient.

%package        devel
Summary:        Development libraries for edb
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The edb-devel package contains static libraries and header files for developing edb applications.

%package        ncurses
Summary:        ncurses frontend for edb
Group:          Applications/Databases
Requires:       %{name} = %{version}-%{release} ncurses

%description    ncurses
edb-ncurses is a frontend for edb that uses ncurses

%package        gtk
Summary:        GTK+ 1.x frontend for edb
Group:          Applications/Databases
Requires:       %{name} = %{version}-%{release} gtk+

%description    gtk
edb-gtk is a frontend for edb that uses GTK+ 1.x

%prep
%setup -q

%build
#./autogen.sh %{_target_platform} --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir} --program-prefix=
%configure
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

%post
/sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/edb_ed
%{_libdir}/libedb.so.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/edb-config
%{_includedir}/Edb.h
%{_libdir}/*.a
%{_libdir}/*.so
%{_libdir}/pkgconfig/edb.pc

%files ncurses
%defattr(-,root,root,-)
%{_bindir}/edb_vt_ed

%files gtk
%defattr(-,root,root,-)
%{_bindir}/edb_gtk_ed

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-1
- Bump release to 1
- Fix %description of -gtk
- Fix Source0

* Wed Mar  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-0.iva.1
- Backleveled to released version

* Sun Feb  6 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-0.iva.0.20050205
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/edb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 16:59:59 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:01:00 -0000	1.2
@@ -0,0 +1 @@
+edb-1.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/edb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 16:59:59 -0000	1.1
+++ sources	16 Mar 2005 17:01:00 -0000	1.2
@@ -0,0 +1 @@
+c8ee165f92dbc6e6fd9c9114e90e338c  edb-1.0.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:01:42 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:01:42 -0500
Subject: rpms/ghasher - New directory
Message-ID: <200503161701.j2GH1g6h003047@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ghasher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3040/ghasher

Log Message:
Directory /cvs/extras/rpms/ghasher added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:01:42 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:01:42 -0500
Subject: rpms/ghasher/devel - New directory
Message-ID: <200503161701.j2GH1gn5003050@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ghasher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3040/ghasher/devel

Log Message:
Directory /cvs/extras/rpms/ghasher/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:02:00 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:02:00 -0500
Subject: rpms/ghasher Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161702.j2GH20g0003115@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ghasher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3104

Added Files:
	Makefile import.log 
Log Message:
Setup of module ghasher


--- NEW FILE Makefile ---
# Top level Makefile for module ghasher
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:02:00 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:02:00 -0500
Subject: rpms/ghasher/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161702.j2GH20nR003118@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ghasher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3104/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ghasher


--- 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 Mar 16 17:02:29 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:02:29 -0500
Subject: rpms/ghasher import.log,1.1,1.2
Message-ID: <200503161702.j2GH2TvE003216@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ghasher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3207

Modified Files:
	import.log 
Log Message:
auto-import ghasher-1.2.0-1 on branch devel from ghasher-1.2.0-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ghasher/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:01:58 -0000	1.1
+++ import.log	16 Mar 2005 17:02:26 -0000	1.2
@@ -0,0 +1 @@
+ghasher-1_2_0-1:HEAD:ghasher-1.2.0-1.src.rpm:1110992542



From fedora-extras-commits at redhat.com  Wed Mar 16 17:02:29 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:02:29 -0500
Subject: rpms/ghasher/devel ghasher.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503161702.j2GH2Tm8003220@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ghasher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3207/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ghasher.spec 
Log Message:
auto-import ghasher-1.2.0-1 on branch devel from ghasher-1.2.0-1.src.rpm
Initial import


--- NEW FILE ghasher.spec ---
Name:           ghasher
Version:        1.2.0
Release:        1
Summary:        GUI hasher for GTK+ 2
Group:          Applications/File
License:        BSD
URL:            http://asgaard.homelinux.org/code/ghasher/
Source0:        http://asgaard.homelinux.org/code/ghasher/ghasher-1.2.0.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtk2-devel >= 2.4 openssl-devel desktop-file-utils libglade2-devel
Requires:       gtk2 >= 2.4 libglade2

%description
ghasher can easily show the MD5 sum (or md2, md4, sha1, sha, ripemd160, dss1) of a file. Motivation for this utility was that users shouldn't need to open a command line for checking the MD5 sum of files they download.

%prep
%setup -q

%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -D -m 0755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
install -D -m 0644 hash.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/hash.xpm
cat > %{name}.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Name=MD5 sum utility
Comment=Calculate the md5 sum of a file
Exec=ghasher %F
Terminal=false
Type=Application
Icon=hash.xpm
Categories=Utility;GTK;X-Fedora;
EOF
desktop-file-install --vendor=fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category Utility \
  --add-category GTK \
  %{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE NEWS README TODO
%{_bindir}/*
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/*

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-1
- Bump release to 1
- Cleaned up %description

* Thu Mar  3 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.0-0.iva.1
- Fixed several packaging errors

* Mon Feb 28 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.0-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghasher/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:01:58 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:02:26 -0000	1.2
@@ -0,0 +1 @@
+ghasher-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghasher/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:01:58 -0000	1.1
+++ sources	16 Mar 2005 17:02:26 -0000	1.2
@@ -0,0 +1 @@
+b0b2dc591e210bca509249c8841a0869  ghasher-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:02:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:02:59 -0500
Subject: rpms/gpredict - New directory
Message-ID: <200503161702.j2GH2x53003343@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gpredict
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3334/gpredict

Log Message:
Directory /cvs/extras/rpms/gpredict added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:03:00 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:03:00 -0500
Subject: rpms/gpredict/devel - New directory
Message-ID: <200503161703.j2GH2xZn003346@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gpredict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3334/gpredict/devel

Log Message:
Directory /cvs/extras/rpms/gpredict/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:03:12 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:03:12 -0500
Subject: rpms/gpredict Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161703.j2GH3CHC003411@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gpredict
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3401

Added Files:
	Makefile import.log 
Log Message:
Setup of module gpredict


--- NEW FILE Makefile ---
# Top level Makefile for module gpredict
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:03:12 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:03:12 -0500
Subject: rpms/gpredict/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161703.j2GH3Cf0003414@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gpredict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3401/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gpredict


--- 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 Mar 16 17:04:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:04:13 -0500
Subject: rpms/gpredict import.log,1.1,1.2
Message-ID: <200503161704.j2GH4Dm6003542@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gpredict
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3532

Modified Files:
	import.log 
Log Message:
auto-import gpredict-0.5.0-0.iva.0 on branch devel from gpredict-0.5.0-0.iva.0.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gpredict/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:03:10 -0000	1.1
+++ import.log	16 Mar 2005 17:04:11 -0000	1.2
@@ -0,0 +1 @@
+gpredict-0_5_0-0_iva_0:HEAD:gpredict-0.5.0-0.iva.0.src.rpm:1110992642



From fedora-extras-commits at redhat.com  Wed Mar 16 17:04:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:04:13 -0500
Subject: rpms/gpredict/devel gpredict-0.5.0-po.patch, NONE, 1.1 gpredict.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161704.j2GH4D5J003546@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gpredict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3532/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gpredict-0.5.0-po.patch gpredict.spec 
Log Message:
auto-import gpredict-0.5.0-0.iva.0 on branch devel from gpredict-0.5.0-0.iva.0.src.rpm
Initial import

gpredict-0.5.0-po.patch:

--- NEW FILE gpredict-0.5.0-po.patch ---
--- gpredict-0.5.0/po/Makefile.in.in.orig	2005-02-13 10:13:36.724457992 -0500
+++ gpredict-0.5.0/po/Makefile.in.in	2005-02-13 10:13:50.365384256 -0500
@@ -29,7 +29,7 @@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(MKINSTALLDIRS)
 
 CC = @CC@
 GMSGFMT = @GMSGFMT@


--- NEW FILE gpredict.spec ---
Name:           gpredict
Version:        0.5.0
Release:        0.iva.0
Summary:        Real-time satellite tracking and orbit prediction program
Group:          Applications/Communications
License:        GPL
URL:            http://sourceforge.net/projects/groundstation/
Source0:        http://prdownloads.sourceforge.net/groundstation/gpredict-0.5.0.tar.gz
Patch0:         gpredict-0.5.0-po.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtk+-devel hamlib-devel gnome-libs-devel gettext GConf-devel gnome-vfs-devel gnome-print-devel gal-devel desktop-file-utils
Requires:       gtk+ hamlib gnome-libs GConf gnome-vfs gnome-print gal

%description
Gpredict calculates and shows the position of satellites in lists and on maps. It can also make detailed predictions of upcoming satellites passes.

%prep
%setup -q
%patch -p 1 -b .po

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

rm -f $RPM_BUILD_ROOT%{_infodir}/dir
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

cat > gpredict.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Type=Application
Exec=gpredict
TryExec=
Icon=gpredict/icons/gpredict-icon.png
Terminal=false
Name=Gpredict
GenericName=Satellite Tracker
Comment=Track satellites in real-time
Startup-Notify=true
EOF
desktop-file-install --vendor=fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category HamRadio \
  --add-category GTK \
  gpredict.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-1
- Bump release to 1
- Added d-f-u to BR

* Sun Feb 13 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.5.0-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpredict/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:03:10 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:04:11 -0000	1.2
@@ -0,0 +1 @@
+gpredict-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpredict/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:03:10 -0000	1.1
+++ sources	16 Mar 2005 17:04:11 -0000	1.2
@@ -0,0 +1 @@
+9aaf9acc813c8a02cb99816fd3979696  gpredict-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:04:36 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:04:36 -0500
Subject: rpms/hamlib - New directory
Message-ID: <200503161704.j2GH4auo003680@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3673/hamlib

Log Message:
Directory /cvs/extras/rpms/hamlib added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:04:36 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:04:36 -0500
Subject: rpms/hamlib/devel - New directory
Message-ID: <200503161704.j2GH4aNT003683@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/hamlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3673/hamlib/devel

Log Message:
Directory /cvs/extras/rpms/hamlib/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:04:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:04:50 -0500
Subject: rpms/hamlib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161704.j2GH4oij003747@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/hamlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3735/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hamlib


--- 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 Mar 16 17:04:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:04:50 -0500
Subject: rpms/hamlib Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161704.j2GH4ovA003744@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3735

Added Files:
	Makefile import.log 
Log Message:
Setup of module hamlib


--- NEW FILE Makefile ---
# Top level Makefile for module hamlib
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:05:34 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:05:34 -0500
Subject: rpms/hamlib import.log,1.1,1.2
Message-ID: <200503161705.j2GH5YQg003866@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3857

Modified Files:
	import.log 
Log Message:
auto-import hamlib-1.2.3-1 on branch devel from hamlib-1.2.3-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/hamlib/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:04:48 -0000	1.1
+++ import.log	16 Mar 2005 17:05:32 -0000	1.2
@@ -0,0 +1 @@
+hamlib-1_2_3-1:HEAD:hamlib-1.2.3-1.src.rpm:1110992729



From fedora-extras-commits at redhat.com  Wed Mar 16 17:05:34 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:05:34 -0500
Subject: rpms/hamlib/devel hamlib-automake.patch, NONE,
	1.1 hamlib-bindings.patch, NONE, 1.1 hamlib.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161705.j2GH5YfH003870@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/hamlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3857/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hamlib-automake.patch hamlib-bindings.patch hamlib.spec 
Log Message:
auto-import hamlib-1.2.3-1 on branch devel from hamlib-1.2.3-1.src.rpm
Initial import

hamlib-automake.patch:

--- NEW FILE hamlib-automake.patch ---
--- hamlib-1.2.3/hamlib.m4.orig	2005-02-09 23:44:25.065619304 -0500
+++ hamlib-1.2.3/hamlib.m4	2005-02-09 23:44:34.349207984 -0500
@@ -10,7 +10,7 @@
 dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified,
 dnl and the hamlib libraries are not found, a fatal AC_MSG_ERROR() will result.
 dnl
-AC_DEFUN(AM_PATH_HAMLIB,
+AC_DEFUN([AM_PATH_HAMLIB],
 [dnl Save the original CFLAGS, LDFLAGS, and LIBS
 hamlib_save_CFLAGS="$CFLAGS"
 hamlib_save_LDFLAGS="$LDFLAGS"

hamlib-bindings.patch:

--- NEW FILE hamlib-bindings.patch ---
--- hamlib-1.2.0/bindings/Makefile.in	2004-02-16 18:04:55.000000000 -0500
+++ hamlib-1.2.0.mod/bindings/Makefile.in	2004-04-19 05:48:59.000000000 -0500
@@ -138,7 +138,7 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SWIG = @SWIG@
+SWIG = /usr/bin/swig
 TCL_BIN_DIR = @TCL_BIN_DIR@
 TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
 TCL_LIB_FILE = @TCL_LIB_FILE@
@@ -195,7 +195,7 @@
 program_transform_name = @program_transform_name@
 pyexecdir = @pyexecdir@
 
-pythondir = $(prefix)/lib/python
+pythondir = $(prefix)/lib/python2.3
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 subdirs = @subdirs@


--- NEW FILE hamlib.spec ---
Name: hamlib
Version: 1.2.3
Release: 1
License: LGPL
Group: System Environment/Libraries
Summary: Run-time library to control radio transcievers and receivers.
Source: ftp://ftp.sourceforge.net/pub/sourceforge/hamlib/hamlib-1.2.3.tar.gz

# For whatever reason @SWIG@ isn't being set by the configure script.
Patch: hamlib-bindings.patch
Patch1: hamlib-automake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://hamlib.sourceforge.net
BuildRequires: /bin/sh, automake >= 1.4, libtool >= 1.4, fileutils, findutils, flex
BuildRequires: binutils >= 2.9.4, gcc >= 2.95, glibc-devel >= 2.1
BuildRequires: gzip, make >= 3.77, patch >= 2.5, rpm >= 3.0, sed
BuildRequires: textutils python-devel swig gd-devel
BuildRequires: doxygen

%description
Hamlib provides a standardised programming interface that applications 
can uso to send the appropriate commands to a radio.
 
Also included in the package is a simple radio control program 'rigctl',
which lets one control a radio transceiver or receiver, either from
command line interface or in a text-oriented interactive interface.

%package devel
Summary: Development library to control radio transcievers and receivers.
Group: Development/Libraries
Requires: hamlib = %{version}

%description devel
Hamlib radio control library C development headers and libraries
for building C applications with Hamlib.

%package c++
Summary: Hamlib radio control library C++ binding
Group: Development/Libraries
Requires: hamlib

%description c++
Hamlib radio control library C++ language binding.

%package c++-devel
Summary: Hamlib radio control library C++ binding development headers and libraries
Group: Development/Libraries
Requires: hamlib, hamlib-devel

%description c++-devel
Hamlib radio control library C++ binding development headers and libraries
for building C++ applications with Hamlib.


#%package perl
#Summary: Hamlib radio control library Perl binding
#Group: Development/Libraries
#Requires: hamlib = %{version}
#
#%description perl
#Hamlib PERL Language bindings to allow radio control from PERL scripts.

%package python
Summary: Hamlib radio control library Python binding
Group: Development/Libraries
Requires: hamlib = %{version}
Requires: python => 2.2.3

%description python
Hamlib Python Language bindings to allow radio control from Python scripts.

%prep
%setup
%patch -p1
%patch1 -p1
%build

%configure \
        --with-rigmatrix \
        --without-tcl-binding \
        --with-python-binding
##        --with-perl-binding

# Build libs, drivers, and programs
make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" all

# Build PERL and Python bindings
pushd bindings
  #  make all-perl
  make all-py
popd
# Build Documentation
pushd doc
  make doc
popd

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
pushd bindings
# Install Python
make prefix=$RPM_BUILD_ROOT%{_prefix} \
        exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
        bindir=$RPM_BUILD_ROOT%{_bindir} \
        sbindir=$RPM_BUILD_ROOT%{_sbindir} \
        sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
        datadir=$RPM_BUILD_ROOT%{_datadir} \
        includedir=$RPM_BUILD_ROOT%{_includedir} \
        libdir=$RPM_BUILD_ROOT%{_libdir} \
        libexecdir=$RPM_BUILD_ROOT%{_libexecdir} \
        localstatedir=$RPM_BUILD_ROOT%{_localstatedir} \
        sharedstatedir=$RPM_BUILD_ROOT%{_sharedstatedir} \
        mandir=$RPM_BUILD_ROOT%{_mandir} \
        infodir=$RPM_BUILD_ROOT%{_infodir} \
   install-pythonPYTHON

# Install PERL 
# make prefix=$RPM_BUILD_ROOT%{_prefix} \
#        exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
#        bindir=$RPM_BUILD_ROOT%{_bindir} \
#        sbindir=$RPM_BUILD_ROOT%{_sbindir} \
#        sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
#        datadir=$RPM_BUILD_ROOT%{_datadir} \
#        includedir=$RPM_BUILD_ROOT%{_includedir} \
#        libdir=$RPM_BUILD_ROOT%{_libdir} \
#        libexecdir=$RPM_BUILD_ROOT%{_libexecdir} \
#        localstatedir=$RPM_BUILD_ROOT%{_localstatedir} \
#        sharedstatedir=$RPM_BUILD_ROOT%{_sharedstatedir} \
#        mandir=$RPM_BUILD_ROOT%{_mandir} \
#        infodir=$RPM_BUILD_ROOT%{_infodir} \
#   install-perl
popd

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%doc COPYING doc/html
%{_bindir}/rigctl
%{_bindir}/rigmem
%{_bindir}/rigswr
%{_bindir}/rotctl
%{_sbindir}/rpc.rigd
%{_sbindir}/rpc.rotd
%{_libdir}/libhamlib-%{version}.so.2.0.2
%{_libdir}/hamlib-*.so
%{_libdir}/libhamlib.la
%{_libdir}/hamlib-*.la
%{_mandir}/man8/rpc.rigd.8.gz
%{_mandir}/man8/rpc.rotd.8.gz
%{_mandir}/man1/rigctl.1.gz
%{_mandir}/man1/rigmem.1.gz
%{_mandir}/man1/rigswr.1.gz
%{_mandir}/man1/rotctl.1.gz

%files c++
%defattr(-, root, root)
%{_libdir}/libhamlib++-%{version}.so.2.0.0
%{_libdir}/libhamlib++.la

%files c++-devel
%defattr(-, root, root)
%{_libdir}/libhamlib++.so
%{_libdir}/libhamlib++.a
%{_includedir}/hamlib/rigclass.h
%{_includedir}/hamlib/rotclass.h

#%files perl
#%defattr(-, root, root)
#%{_libdir}/perl5/site_perl/5.8.3/i386-linux-thread-multi/auto/Hamlib/hamlib.so
#%{_libdir}/perl5/site_perl/5.8.3/i386-linux-thread-multi/auto/Hamlib/hamlib.bs
#%{_libdir}/perl5/site_perl/5.8.3/i386-linux-thread-multi/Hamlib.pm
#%{_libdir}/perl5/5.8.3/i386-linux-thread-multi/perllocal.pod
#%{_libdir}/perl5/site_perl/5.8.3/i386-linux-thread-multi/auto/Hamlib/.packlist
#%{_libdir}/perl5/site_perl/5.8.3/i386-linux-thread-multi/perltest.pl

%files python
%defattr(-, root, root)
%{_libdir}/python2.3/Hamlib.py
%{_libdir}/python2.3/Hamlib.pyc
%{_libdir}/python2.3/Hamlib.pyo

%files devel
%defattr(-, root, root)
%{_libdir}/libhamlib.so
%{_libdir}/libhamlib.a
%{_libdir}/hamlib-*.a
%{_datadir}/aclocal/hamlib.m4
%{_includedir}/hamlib/rig.h
%{_includedir}/hamlib/riglist.h
%{_includedir}/hamlib/rig_dll.h
%{_includedir}/hamlib/rotator.h
%{_includedir}/hamlib/rotlist.h
%{_libdir}/pkgconfig/hamlib.pc


%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-1
- Bump release to 1
- Fixed BuildRoot

* Mon Feb 10 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.3-0.iva.1
- Fixed error with automake in -devel (#26)

* Mon Jan 31 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.3-0.iva.0
- Upstream update

* Sun Jan  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.2-0.iva.1
- Fixed %files %defattr

* Sun Jan  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.2-0.iva.0
- Ported to FC3
- Upgraded to 1.2.2

* Sun Apr 18 2004 David L Norris <dave at webaugur.com>
- Enable disabled script bindings.
- Touch up descriptions.

* Tue Jan 20 2004 Tomi Manninen
- Fix for 1.1.5pre2
- Better use of rpm macros
- Disable all bindings

* Tue Oct 08 2003 Joop Stakenborg
- Fix 'make rpm' again by disabling c++ bindings.
- rotclass.h and rigclass.h go into the devel package for now (FIXME)

* Wed Jan 15 2003 Joop Stakenborg
- Fix the spec file for 1.1.4CVS
- 'make rpm' should work now

* Thu Jun 17 2002 Stephane Fillod
- Added rotator support
- Added RPC daemon, hamlib.m4
- Upstream version 1.1.3

* Mon Jul 18 2001 Stephane Fillod
- Made initial "working" SPEC file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hamlib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:04:48 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:05:32 -0000	1.2
@@ -0,0 +1 @@
+hamlib-1.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hamlib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:04:48 -0000	1.1
+++ sources	16 Mar 2005 17:05:32 -0000	1.2
@@ -0,0 +1 @@
+f049d6d126d5391adde5cc7838483564  hamlib-1.2.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:06:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:06:01 -0500
Subject: rpms/kphone - New directory
Message-ID: <200503161706.j2GH61uU003996@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3989/kphone

Log Message:
Directory /cvs/extras/rpms/kphone added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:06:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:06:01 -0500
Subject: rpms/kphone/devel - New directory
Message-ID: <200503161706.j2GH61xt003999@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3989/kphone/devel

Log Message:
Directory /cvs/extras/rpms/kphone/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:06:16 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:06:16 -0500
Subject: rpms/kphone Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161706.j2GH6Ghj004060@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4049

Added Files:
	Makefile import.log 
Log Message:
Setup of module kphone


--- NEW FILE Makefile ---
# Top level Makefile for module kphone
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:06:16 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:06:16 -0500
Subject: rpms/kphone/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161706.j2GH6Gr8004063@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4049/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kphone


--- 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 Mar 16 17:06:46 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:06:46 -0500
Subject: rpms/kphone import.log,1.1,1.2
Message-ID: <200503161706.j2GH6kpE004170@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4161

Modified Files:
	import.log 
Log Message:
auto-import kphone-4.1.0-0.iva.0 on branch devel from kphone-4.1.0-0.iva.0.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kphone/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:06:14 -0000	1.1
+++ import.log	16 Mar 2005 17:06:44 -0000	1.2
@@ -0,0 +1 @@
+kphone-4_1_0-0_iva_0:HEAD:kphone-4.1.0-0.iva.0.src.rpm:1110992800



From fedora-extras-commits at redhat.com  Wed Mar 16 17:06:46 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:06:46 -0500
Subject: rpms/kphone/devel kphone.desktop, NONE, 1.1 kphone.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161706.j2GH6kGa004174@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4161/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kphone.desktop kphone.spec 
Log Message:
auto-import kphone-4.1.0-0.iva.0 on branch devel from kphone-4.1.0-0.iva.0.src.rpm
Initial import


--- NEW FILE kphone.desktop ---
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Type=Application
Exec=kphone
Icon=kphone.png
Terminal=false
Name=kphone
GenericName=SIP VoIP Application
X-KDE-StartupNotify=true


--- NEW FILE kphone.spec ---
Name:           kphone
Version:        4.1.0
Release:        0.iva.0
Summary:        A SIP (Session Initiation Protocol) user agent for Linux

Group:          Applications/Communications
License:        GPL
URL:            http://www.wirlab.net/kphone/
Source0:        http://www.wirlab.net/kphone/kphone-4.1.0.tar.gz
Source1:        kphone.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils
Requires:       qt alsa-lib

%description
KPhone is a SIP (Session Initiation Protocol) user agent for Linux, with which you can initiate VoIP (Voice over IP) connections over the Internet.  It supports Presence and Instant Messaging, and to some extent also video calls between two hosts.

%prep
%setup -q -c kphone

%build
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
cd kphone
./configure --prefix=$RPM_BUILD_ROOT%{_prefix}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
cd kphone
%makeinstall
install -D -m 0644 icons/large-kphone.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kphone.png
desktop-file-install --vendor=Fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category Internet \
  --add-category Telephony \
  --add-category Qt \
  %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_bindir}/kphone
%{_datadir}/applications/*.desktop
%{_datadir}/apps/kphone
%{_datadir}/kphone
%{_datadir}/pixmaps/*.png

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-1
- Bump release to 1
- Added d-f-u to BR

* Sat Jan 22 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:4.1.0-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:06:14 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:06:44 -0000	1.2
@@ -0,0 +1 @@
+kphone-4.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:06:14 -0000	1.1
+++ sources	16 Mar 2005 17:06:44 -0000	1.2
@@ -0,0 +1 @@
+d226b44d34e99887e3169ddd52a4684d  kphone-4.1.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:07:15 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:07:15 -0500
Subject: rpms/ktrack - New directory
Message-ID: <200503161707.j2GH7F0b004297@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4290/ktrack

Log Message:
Directory /cvs/extras/rpms/ktrack added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:07:15 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:07:15 -0500
Subject: rpms/ktrack/devel - New directory
Message-ID: <200503161707.j2GH7FCB004300@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ktrack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4290/ktrack/devel

Log Message:
Directory /cvs/extras/rpms/ktrack/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:07:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:07:30 -0500
Subject: rpms/ktrack Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161707.j2GH7UuT004365@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4353

Added Files:
	Makefile import.log 
Log Message:
Setup of module ktrack


--- NEW FILE Makefile ---
# Top level Makefile for module ktrack
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:07:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:07:30 -0500
Subject: rpms/ktrack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161707.j2GH7U7I004368@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ktrack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4353/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ktrack


--- 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 Mar 16 17:08:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:08:09 -0500
Subject: rpms/ktrack import.log,1.1,1.2
Message-ID: <200503161708.j2GH89uC004481@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4472

Modified Files:
	import.log 
Log Message:
auto-import ktrack-0.3.0-1.rc1 on branch devel from ktrack-0.3.0-1.rc1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ktrack/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:07:28 -0000	1.1
+++ import.log	16 Mar 2005 17:08:07 -0000	1.2
@@ -0,0 +1 @@
+ktrack-0_3_0-1_rc1:HEAD:ktrack-0.3.0-1.rc1.src.rpm:1110992883



From fedora-extras-commits at redhat.com  Wed Mar 16 17:08:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:08:09 -0500
Subject: rpms/ktrack/devel ktrack-headers.patch, NONE, 1.1 ktrack.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161708.j2GH8910004485@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ktrack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4472/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ktrack-headers.patch ktrack.spec 
Log Message:
auto-import ktrack-0.3.0-1.rc1 on branch devel from ktrack-0.3.0-1.rc1.src.rpm
Initial import

ktrack-headers.patch:

--- NEW FILE ktrack-headers.patch ---
diff -ur ktrack-0.3.0-rc1.orig/ktrack/calculator.cpp ktrack-0.3.0-rc1/ktrack/calculator.cpp
--- ktrack-0.3.0-rc1.orig/ktrack/calculator.cpp	2005-01-09 04:51:43.793099259 -0500
+++ ktrack-0.3.0-rc1/ktrack/calculator.cpp	2004-01-09 07:49:39.000000000 -0500
@@ -17,6 +17,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <sys/time.h>
 #include <kstandarddirs.h>
 #include <qfile.h>
 #include <qtimer.h>
diff -ur ktrack-0.3.0-rc1.orig/ktrack/hamlibwrapper.cpp ktrack-0.3.0-rc1/ktrack/hamlibwrapper.cpp
--- ktrack-0.3.0-rc1.orig/ktrack/hamlibwrapper.cpp	2005-01-09 04:50:52.321676590 -0500
+++ ktrack-0.3.0-rc1/ktrack/hamlibwrapper.cpp	2004-01-18 03:25:00.000000000 -0500
@@ -17,6 +17,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <math.h>
 #include <kapplication.h>
 
 #include "hamlibwrapper.h"


--- NEW FILE ktrack.spec ---
Summary: Satellite prediction software for KDE
Name: ktrack
Version: 0.3.0
Release: 1.rc1
License: GPL
Group: Applications/Communications
Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
Patch: ktrack-headers.patch
Requires: kdelibs >= 3.3 hamlib = 1.2.3
BuildRequires: desktop-file-utils kdelibs-devel >= 3.3 hamlib-devel = 1.2.3
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
K-Track is an KDE3 satellite prediction software, especially suited for radio amateurs operating through the satellites that are providing linear transponders.

%prep
rm -rf $RPM_BUILD_ROOT
%setup -q -c %{name}-%{version}-rc1
pushd %{name}-%{version}-rc1
%patch -p 1 -b .headers
popd

%build
pushd %{name}-%{version}-rc1
%configure --with-qt-includes=/usr/lib/qt-3.3/include --with-qt-libraries=/usr/lib/qt-3.3/lib
make
popd

%install
rm -rf $RPM_BUILD_ROOT
pushd %{name}-%{version}-rc1
%makeinstall
desktop-file-install --vendor=Fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category HamRadio \
  --add-category KDE \
  ktrack/ktrack.desktop
install -D -m 0644 ktrack/hi32-app-ktrack.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ktrack.png
popd
rm -r $RPM_BUILD_ROOT%{_datadir}/doc

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_bindir}/ktrack
%{_datadir}/applnk/Applications/HamRadio/ktrack.desktop
%{_datadir}/apps/ktrack/earth.jpg
%{_datadir}/apps/ktrack/nasa.tle
%{_datadir}/apps/ktrack/night.jpg
%{_datadir}/icons/hicolor/16x16/apps/ktrack.png
%{_datadir}/icons/hicolor/32x32/apps/ktrack.png
%{_datadir}/icons/locolor/16x16/apps/ktrack.png
%{_datadir}/icons/locolor/32x32/apps/ktrack.png
%{_datadir}/locale/de/LC_MESSAGES/ktrack.mo
%{_datadir}/locale/fr/LC_MESSAGES/ktrack.mo
%{_datadir}/applications/Fedora-ktrack.desktop
%{_datadir}/pixmaps/ktrack.png
%doc %{name}-%{version}-rc1/AUTHORS %{name}-%{version}-rc1/ChangeLog %{name}-%{version}-rc1/COPYING %{name}-%{version}-rc1/README %{name}-%{version}-rc1/TODO %{name}-%{version}-rc1/doc/en/index.docbook %{name}-%{version}-rc1/doc/en/index.cache.bz2

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-1.rc1
- Bump release to 1
- Fixed BuildRoot
- Added -with-qt-* options to %configure

* Mon Jan 31 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.3.0-0.iva.1.rc1
- Rebuild against hamlib 1.2.3

* Sun Jan  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.3.0-0.iva.0.rc1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ktrack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:07:28 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:08:07 -0000	1.2
@@ -0,0 +1 @@
+ktrack-0.3.0-rc1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ktrack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:07:28 -0000	1.1
+++ sources	16 Mar 2005 17:08:07 -0000	1.2
@@ -0,0 +1 @@
+032c914ab7316471505265e6a68d9da3  ktrack-0.3.0-rc1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar 16 17:08:36 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:08:36 -0500
Subject: rpms/leafpad - New directory
Message-ID: <200503161708.j2GH8abT004615@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4603/leafpad

Log Message:
Directory /cvs/extras/rpms/leafpad added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:08:36 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:08:36 -0500
Subject: rpms/leafpad/devel - New directory
Message-ID: <200503161708.j2GH8a47004618@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/leafpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4603/leafpad/devel

Log Message:
Directory /cvs/extras/rpms/leafpad/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:08:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:08:50 -0500
Subject: rpms/leafpad Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161708.j2GH8os4004680@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4671

Added Files:
	Makefile import.log 
Log Message:
Setup of module leafpad


--- NEW FILE Makefile ---
# Top level Makefile for module leafpad
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:08:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:08:50 -0500
Subject: rpms/leafpad/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161708.j2GH8oEr004683@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/leafpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4671/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module leafpad


--- 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 Mar 16 17:09:18 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:09:18 -0500
Subject: rpms/leafpad import.log,1.1,1.2
Message-ID: <200503161709.j2GH9Is6004788@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4779

Modified Files:
	import.log 
Log Message:
auto-import leafpad-0.7.9-1 on branch devel from leafpad-0.7.9-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/leafpad/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:08:48 -0000	1.1
+++ import.log	16 Mar 2005 17:09:16 -0000	1.2
@@ -0,0 +1 @@
+leafpad-0_7_9-1:HEAD:leafpad-0.7.9-1.src.rpm:1110992952



From fedora-extras-commits at redhat.com  Wed Mar 16 17:09:18 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:09:18 -0500
Subject: rpms/leafpad/devel leafpad-0.7.9-file_chooser.patch, NONE,
	1.1 leafpad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161709.j2GH9Ivl004792@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/leafpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4779/devel

Modified Files:
	.cvsignore sources 
Added Files:
	leafpad-0.7.9-file_chooser.patch leafpad.spec 
Log Message:
auto-import leafpad-0.7.9-1 on branch devel from leafpad-0.7.9-1.src.rpm
Initial import

leafpad-0.7.9-file_chooser.patch:

--- NEW FILE leafpad-0.7.9-file_chooser.patch ---
diff -uNr leafpad-0.7.9.orig/src/callback.c leafpad-0.7.9/src/callback.c
--- leafpad-0.7.9.orig/src/callback.c	2004-12-20 03:58:26.000000000 -0800
+++ leafpad-0.7.9/src/callback.c	2004-12-28 18:43:09.000000000 -0800
@@ -93,7 +93,7 @@
 	
 	if (!check_text_modification(sd)) {
 //		fi = get_file_info_by_selector(OPEN, sd->fi);
-		fi = get_fileinfo_from_selector(sd->mainwin->window, sd->fi, OPEN);
+		fi = get_fileinfo_from_chooser(sd->mainwin->window, sd->fi, OPEN);
 		if (fi) {
 			if (file_open_real(sd->mainwin->textview, fi)) {
 				g_free(fi);
@@ -123,7 +123,7 @@
 {
 	FileInfo *fi;
 	
-	fi = get_fileinfo_from_selector(sd->mainwin->window, sd->fi, SAVE);
+	fi = get_fileinfo_from_chooser(sd->mainwin->window, sd->fi, SAVE);
 	if (fi) {
 		if (file_save_real(sd->mainwin->textview, fi))
 			g_free(fi);
diff -uNr leafpad-0.7.9.orig/src/selector.c leafpad-0.7.9/src/selector.c
--- leafpad-0.7.9.orig/src/selector.c	2004-12-24 01:35:12.000000000 -0800
+++ leafpad-0.7.9/src/selector.c	2004-12-28 19:00:29.000000000 -0800
@@ -310,7 +310,7 @@
 	return option_menu;
 }
 
-static GtkWidget *create_file_selector(FileInfo *selected_fi)
+static GtkWidget *create_file_chooser(FileInfo *selected_fi, GtkWidget *window)
 {
 	GtkWidget *filesel;
 	GtkWidget *align;
@@ -322,12 +322,19 @@
 	
 	title = mode ? _("Open") : _("Save As");
 	
-	filesel = gtk_file_selection_new(title);
-//	gtk_window_set_transient_for(GTK_WINDOW(filesel), GTK_WINDOW(window));
+	if(mode == OPEN)
+		filesel = gtk_file_chooser_dialog_new(title, GTK_WINDOW(window),
+				GTK_FILE_CHOOSER_ACTION_OPEN,
+				GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,
+				GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,NULL);
+	else
+		filesel = gtk_file_chooser_dialog_new(title, GTK_WINDOW(window),
+				GTK_FILE_CHOOSER_ACTION_SAVE,
+				GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,
+				GTK_STOCK_SAVE,GTK_RESPONSE_ACCEPT,NULL);
 	
 	align = gtk_alignment_new(1, 0, 0, 0);
-	gtk_box_pack_end(GTK_BOX(GTK_FILE_SELECTION(filesel)->main_vbox),
-		align, FALSE, FALSE, 0);
+	gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(filesel),align);
 	table = gtk_table_new(2, 2, FALSE);
 	gtk_table_set_row_spacings(GTK_TABLE(table), 5);
 	gtk_container_add(GTK_CONTAINER(align), table);
@@ -340,15 +347,15 @@
 		option_menu_lineend = create_lineend_menu(selected_fi);
 		gtk_table_attach_defaults(GTK_TABLE(table), option_menu_lineend, 1, 2, 0, 1);
 	}
-	gtk_widget_show_all(GTK_FILE_SELECTION(filesel)->main_vbox);
+	gtk_widget_show_all(GTK_FILE_CHOOSER(filesel));
 	
 	if (selected_fi->filename)
-		gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), selected_fi->filename);
+		gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(filesel), selected_fi->filename);
 	
 	return filesel;
 }
 
-FileInfo *get_fileinfo_from_selector(GtkWidget *window, FileInfo *fi, gint requested_mode)
+FileInfo *get_fileinfo_from_chooser(GtkWidget *window, FileInfo *fi, gint requested_mode)
 {
 	FileInfo *selected_fi;
 	GtkWidget *filesel;
@@ -366,24 +373,24 @@
 	selected_fi->manual_charset =
 		fi->manual_charset ? g_strdup(fi->manual_charset) : NULL;
 	
-	filesel = create_file_selector(selected_fi);
+	filesel = create_file_chooser(selected_fi,window);
 	
 	gtk_window_set_transient_for(GTK_WINDOW(filesel), GTK_WINDOW(window));
 	
 	do {
 		res = gtk_dialog_run(GTK_DIALOG(filesel));
-		if (res == GTK_RESPONSE_OK) {
+		if (res == GTK_RESPONSE_ACCEPT) {
 			if (selected_fi->filename)
 				g_free(selected_fi->filename);
 			selected_fi->filename = g_strdup(
-				gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel)));
+				gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filesel)));
 			if (g_file_test(selected_fi->filename, G_FILE_TEST_IS_DIR)) {
 				len = strlen(selected_fi->filename);
 				if (len < 1 || selected_fi->filename[len - 1] != G_DIR_SEPARATOR)
 					str = g_strconcat(selected_fi->filename, G_DIR_SEPARATOR_S, NULL);
 				else
 					str = g_strdup(selected_fi->filename);
-				gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), str);
+				gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), str);
 				g_free(str);
 				continue;
 			}
@@ -397,14 +404,14 @@
 				case GTK_RESPONSE_NO:
 					continue;
 				case GTK_RESPONSE_YES:
-					res = GTK_RESPONSE_OK;
+					res = GTK_RESPONSE_ACCEPT;
 				}
 			}
 		}
 		gtk_widget_hide(filesel);
 	} while (GTK_WIDGET_VISIBLE(filesel));
 	
-	if (res != GTK_RESPONSE_OK) {
+	if (res != GTK_RESPONSE_ACCEPT) {
 		if (selected_fi->charset)
 			g_free(selected_fi->charset);
 		if (selected_fi->manual_charset)
diff -uNr leafpad-0.7.9.orig/src/selector.h leafpad-0.7.9/src/selector.h
--- leafpad-0.7.9.orig/src/selector.h	2004-12-20 16:51:06.000000000 -0800
+++ leafpad-0.7.9/src/selector.h	2004-12-28 18:43:09.000000000 -0800
@@ -30,6 +30,6 @@
 	OPEN
 };
 
-FileInfo *get_fileinfo_from_selector(GtkWidget *window, FileInfo *fi, gint requested_mode);
+FileInfo *get_fileinfo_from_chooser(GtkWidget *window, FileInfo *fi, gint requested_mode);
 
 #endif  /* _SELECTOR_H */


--- NEW FILE leafpad.spec ---
Name:           leafpad
Version:        0.7.9
Release:        1
Summary:        GTK+ based simple text editor

Group:          Applications/Editors
License:        GPL
URL:            http://tarot.freeshell.org/leafpad/
Source0:        http://savannah.nongnu.org/download/leafpad/leafpad-0.7.9.tar.gz
Patch0:         leafpad-0.7.9-file_chooser.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.4
Requires:       gtk2 >= 2.4
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils

%description
Leafpad is a GTK+ based simple text editor. The user interface is similar to Notepad. It aims to be lighter than GEdit and KWrite, and to be as useful as them.

%prep
%setup -q
%patch -p 1 -b .filechooser

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_datadir}/applications/leafpad.desktop
cat >> leafpad.desktop << EOF
StartupNotify=true
EOF
desktop-file-install --vendor=Fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category Utility \
  --add-category TextEditor \
  --add-category GTK \
  leafpad.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post
update-desktop-database

%postun
update-desktop-database

%files
%defattr(-,root,root,-)
%{_bindir}/leafpad
%{_datadir}/applications/Fedora-leafpad.desktop
%{_datadir}/locale/*/LC_MESSAGES/leafpad.mo
%{_datadir}/pixmaps/leafpad.png

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-1
- Bump release to 1

* Thu Feb  3 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.7.9-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:08:48 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:09:16 -0000	1.2
@@ -0,0 +1 @@
+leafpad-0.7.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:08:48 -0000	1.1
+++ sources	16 Mar 2005 17:09:16 -0000	1.2
@@ -0,0 +1 @@
+01d851421f554cce3867e39bb258c414  leafpad-0.7.9.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:09:46 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:09:46 -0500
Subject: rpms/libosip - New directory
Message-ID: <200503161709.j2GH9k5m004915@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4908/libosip

Log Message:
Directory /cvs/extras/rpms/libosip added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:09:46 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:09:46 -0500
Subject: rpms/libosip/devel - New directory
Message-ID: <200503161709.j2GH9kTo004918@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libosip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4908/libosip/devel

Log Message:
Directory /cvs/extras/rpms/libosip/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:10:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:10:02 -0500
Subject: rpms/libosip Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161710.j2GHA2H0004980@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4971

Added Files:
	Makefile import.log 
Log Message:
Setup of module libosip


--- NEW FILE Makefile ---
# Top level Makefile for module libosip
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:10:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:10:02 -0500
Subject: rpms/libosip/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161710.j2GHA2Rp004983@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libosip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4971/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libosip


--- 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 Mar 16 17:10:32 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:10:32 -0500
Subject: rpms/libosip import.log,1.1,1.2
Message-ID: <200503161710.j2GHAWd9005087@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5078

Modified Files:
	import.log 
Log Message:
auto-import libosip-0.9.7-1 on branch devel from libosip-0.9.7-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libosip/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:10:00 -0000	1.1
+++ import.log	16 Mar 2005 17:10:30 -0000	1.2
@@ -0,0 +1 @@
+libosip-0_9_7-1:HEAD:libosip-0.9.7-1.src.rpm:1110993026



From fedora-extras-commits at redhat.com  Wed Mar 16 17:10:32 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:10:32 -0500
Subject: rpms/libosip/devel libosip.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503161710.j2GHAWlM005091@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libosip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5078/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libosip.spec 
Log Message:
auto-import libosip-0.9.7-1 on branch devel from libosip-0.9.7-1.src.rpm
Initial import


--- NEW FILE libosip.spec ---
Name:           libosip
Version:        0.9.7
Release:        1
Summary:        oSIP is an implementation of SIP

Group:          System Environment/Libraries
License:        LGPL
URL:            http://www.fsf.org/software/osip/osip.html
Source0:        http://ftp.gnu.org/gnu/osip/libosip-0.9.7.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
oSIP is an implementation of SIP.

SIP stands for the Session Initiation Protocol and is described by the rfc3261 (wich deprecates rfc2543). This library aims to provide multimedia and telecom software developers an easy and powerful interface to initiate and control SIP based sessions in their applications. SIP is a open standard replacement from IETF for H323.

%package        devel
Summary:        Development libraries for oSIP
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The GNU oSIP library is written in C and get no dependencies except the standard C library. oSIP is thread safe and will generally be used in a multi-threaded application. Nevertheless, this is optional.

oSIP is little in size and code and thus could be use to implement IP soft-phone as well as embedded SIP software. oSIP is not limited to endpoint agents, and can also be used to implement "SIP proxy".

oSIP does not intend to provide a high layer API for controlling "SIP Session" at this step. Instead, it currently provides an API for the SIP message parser, SDP message parser, and library to handle "SIP transactions" as defined by the SIP document.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/ldconfig

%preun

%postun
/sbin/ldconfig

%files
%defattr(-,root,root)
%{_libdir}/*.so.*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root)
%{_includedir}/osip/*.h
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/*.so

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-1
- Bump release to 1

* Fri Jan 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.9.7-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libosip/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:10:00 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:10:30 -0000	1.2
@@ -0,0 +1 @@
+libosip-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libosip/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:10:00 -0000	1.1
+++ sources	16 Mar 2005 17:10:30 -0000	1.2
@@ -0,0 +1 @@
+1c97d2bbc042ba318b1ad422b6109537  libosip-0.9.7.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:10:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:10:59 -0500
Subject: rpms/linphone - New directory
Message-ID: <200503161710.j2GHAxki005214@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5207/linphone

Log Message:
Directory /cvs/extras/rpms/linphone added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:10:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:10:59 -0500
Subject: rpms/linphone/devel - New directory
Message-ID: <200503161710.j2GHAxn9005217@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5207/linphone/devel

Log Message:
Directory /cvs/extras/rpms/linphone/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:11:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:11:13 -0500
Subject: rpms/linphone Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161711.j2GHBDAx005279@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5270

Added Files:
	Makefile import.log 
Log Message:
Setup of module linphone


--- NEW FILE Makefile ---
# Top level Makefile for module linphone
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:11:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:11:13 -0500
Subject: rpms/linphone/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161711.j2GHBDg0005282@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5270/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module linphone


--- 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 Mar 16 17:12:27 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:12:27 -0500
Subject: rpms/linphone import.log,1.1,1.2
Message-ID: <200503161712.j2GHCRYH005415@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5406

Modified Files:
	import.log 
Log Message:
auto-import linphone-0.12.2-1 on branch devel from linphone-0.12.2-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/linphone/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:11:11 -0000	1.1
+++ import.log	16 Mar 2005 17:12:25 -0000	1.2
@@ -0,0 +1 @@
+linphone-0_12_2-1:HEAD:linphone-0.12.2-1.src.rpm:1110993141



From fedora-extras-commits at redhat.com  Wed Mar 16 17:12:27 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:12:27 -0500
Subject: rpms/linphone/devel linphone-0.12.2-docs.patch, NONE,
	1.1 linphone-0.12.2-speex.patch, NONE, 1.1 linphone.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161712.j2GHCRRV005419@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5406/devel

Modified Files:
	.cvsignore sources 
Added Files:
	linphone-0.12.2-docs.patch linphone-0.12.2-speex.patch 
	linphone.spec 
Log Message:
auto-import linphone-0.12.2-1 on branch devel from linphone-0.12.2-1.src.rpm
Initial import

linphone-0.12.2-docs.patch:

--- NEW FILE linphone-0.12.2-docs.patch ---
--- linphone-0.12.2/oRTP/configure.orig	2005-01-21 11:24:48.993986731 -0500
+++ linphone-0.12.2/oRTP/configure	2005-01-21 11:25:08.144473681 -0500
@@ -20640,7 +20640,7 @@
 
 
 
-                                                  ac_config_files="$ac_config_files Makefile src/Makefile docs/Makefile build/Makefile build/win32/Makefile"
+                                                  ac_config_files="$ac_config_files Makefile src/Makefile build/Makefile build/win32/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -21206,7 +21206,6 @@
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
   "build/Makefile" ) CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
   "build/win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES build/win32/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
--- linphone-0.12.2/oRTP/Makefile.am.orig	2005-01-21 11:28:40.834457361 -0500
+++ linphone-0.12.2/oRTP/Makefile.am	2005-01-21 11:28:46.102490995 -0500
@@ -6,7 +6,7 @@
 EXTRA_DIST=oRTP.prj   ortp-config.h.in	TODO
 
 
-SUBDIRS=src docs build
+SUBDIRS=src build
 
 mod-dist:
 	mkdir oRTP-bin
--- linphone-0.12.2/osipua/configure.orig	2005-01-21 11:33:56.904478419 -0500
+++ linphone-0.12.2/osipua/configure	2005-01-21 11:34:22.628759708 -0500
@@ -22300,7 +22300,7 @@
 
 
 
-                              ac_config_files="$ac_config_files Makefile src/Makefile docs/Makefile"
+                              ac_config_files="$ac_config_files Makefile src/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -22852,7 +22852,6 @@
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "osipua-config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS osipua-config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--- linphone-0.12.2/osipua/Makefile.am.orig	2005-01-21 11:34:02.887380950 -0500
+++ linphone-0.12.2/osipua/Makefile.am	2005-01-21 11:34:29.713460135 -0500
@@ -1,3 +1,3 @@
 EXTRA_DIST=	osipua-config.h.in
 
-SUBDIRS=src docs
+SUBDIRS=src
--- linphone-0.12.2/oRTP/Makefile.in.orig	2005-03-15 21:27:48.740665660 -0500
+++ linphone-0.12.2/oRTP/Makefile.in	2005-03-15 21:27:55.102342712 -0500
@@ -110,7 +110,7 @@
 #dist...
 EXTRA_DIST = oRTP.prj   ortp-config.h.in	TODO
 
-SUBDIRS = src docs build
+SUBDIRS = src build
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
--- linphone-0.12.2/osipua/Makefile.in.orig	2005-03-15 21:43:26.476524155 -0500
+++ linphone-0.12.2/osipua/Makefile.in	2005-03-15 21:43:31.467515812 -0500
@@ -102,7 +102,7 @@
 osip_prefix = @osip_prefix@
 EXTRA_DIST = osipua-config.h.in
 
-SUBDIRS = src docs
+SUBDIRS = src
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs

linphone-0.12.2-speex.patch:

--- NEW FILE linphone-0.12.2-speex.patch ---
--- linphone-0.12.2/Makefile.am.speex	2004-03-31 15:40:14.000000000 -0500
+++ linphone-0.12.2/Makefile.am	2005-01-21 11:46:24.109386492 -0500
@@ -6,11 +6,11 @@
 
 if BUILD_SPEEX
 SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \
-                $(WIN32ACM_DIR) speex mediastreamer \
+                $(WIN32ACM_DIR) mediastreamer \
 		media_api osipua coreapi console gnome share developer-docs
 else
 SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \
-                $(WIN32ACM_DIR) speex mediastreamer \
+                $(WIN32ACM_DIR) mediastreamer \
 		media_api osipua coreapi console gnome share developer-docs
 endif
 
--- linphone-0.12.2/Makefile.in.orig	2005-03-15 21:37:06.508714564 -0500
+++ linphone-0.12.2/Makefile.in	2005-03-15 21:37:41.282614403 -0500
@@ -157,11 +157,11 @@
 @BUILD_TRUESPEECH_TRUE at WIN32ACM_DIR = win32acm
 
 @BUILD_SPEEX_TRUE at SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \
- at BUILD_SPEEX_TRUE@                $(WIN32ACM_DIR) speex mediastreamer \
+ at BUILD_SPEEX_TRUE@                $(WIN32ACM_DIR) mediastreamer \
 @BUILD_SPEEX_TRUE@		media_api osipua coreapi console gnome share developer-docs
 
 @BUILD_SPEEX_FALSE at SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \
- at BUILD_SPEEX_FALSE@                $(WIN32ACM_DIR) speex mediastreamer \
+ at BUILD_SPEEX_FALSE@                $(WIN32ACM_DIR) mediastreamer \
 @BUILD_SPEEX_FALSE@		media_api osipua coreapi console gnome share developer-docs
 
 


--- NEW FILE linphone.spec ---
Name:           linphone
Version:        0.12.2
Release:        1
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/0.12.2/source/linphone-0.12.2.tar.gz
Patch:          linphone-0.12.2-docs.patch
Patch1:         linphone-0.12.2-speex.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
BuildRequires:  libosip-devel speex-devel gettext
Requires:       gnome-panel libgnomeui glib2 alsa-lib libosip speex
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Linphone is mostly sip compliant. It works successfully with these implementations:
    * eStara softphone (commercial software for windows)
    * Pingtel phones (with DNS enabled and VLAN QOS support disabled).
    * Hotsip, a free of charge phone for Windows.
    * Vocal, an open source SIP stack from Vovida that includes a SIP proxy that works with linphone since version 0.7.1.
    * Siproxd is a free sip proxy being developped by Thomas Ries because he would like to have linphone working behind his firewall. Siproxd is simple to setup and works perfectly with linphone.
    * Partysip aims at being a generic and fully functionnal SIP proxy. Visit the web page for more details on its functionalities.

Linphone may work also with other sip phones, but this has not been tested yet.

%package devel
Summary:        Development libraries for linphone
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
Libraries required to develop software with linphone

%prep
%setup -q
%patch -p 1 -b .docs
%patch1 -p 1 -b .speex
rm -r $RPM_BUILD_DIR/linphone-0.12.2/oRTP/docs
rm -r $RPM_BUILD_DIR/linphone-0.12.2/speex

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/ldconfig

%postun
/sbin/ldconfig

%files
%defattr(-,root,root)
%{_bindir}/*
%{_libdir}/bonobo
%{_libdir}/*.so.*
%{_libexecdir}/*
%{_mandir}/man1/*
%{_datadir}/gnome
%{_datadir}/gnome-2.0
%{_datadir}/gtk-doc
%{_datadir}/linphonec/linphonec
%{_datadir}/locale/*/*
%{_datadir}/pixmaps
%{_datadir}/sounds

%files devel
%defattr(-,root,root)
%{_includedir}/*/*.h
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-1
- Bump release to 1
- Cleaned up the -docs and -speex patches

* Fri Jan 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.12.2-0.iva.1
- Fixed a silly spec error

* Fri Jan 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.12.2-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:11:11 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:12:25 -0000	1.2
@@ -0,0 +1 @@
+linphone-0.12.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:11:11 -0000	1.1
+++ sources	16 Mar 2005 17:12:25 -0000	1.2
@@ -0,0 +1 @@
+86c01dbbcdb41786229f51ec0994ff67  linphone-0.12.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:12:55 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:12:55 -0500
Subject: rpms/lock-keys-applet - New directory
Message-ID: <200503161712.j2GHCtqj005543@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5536/lock-keys-applet

Log Message:
Directory /cvs/extras/rpms/lock-keys-applet added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:12:55 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:12:55 -0500
Subject: rpms/lock-keys-applet/devel - New directory
Message-ID: <200503161712.j2GHCtaw005546@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5536/lock-keys-applet/devel

Log Message:
Directory /cvs/extras/rpms/lock-keys-applet/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:13:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:13:09 -0500
Subject: rpms/lock-keys-applet Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161713.j2GHD99f005611@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5599

Added Files:
	Makefile import.log 
Log Message:
Setup of module lock-keys-applet


--- NEW FILE Makefile ---
# Top level Makefile for module lock-keys-applet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:13:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:13:09 -0500
Subject: rpms/lock-keys-applet/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161713.j2GHD99a005614@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5599/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lock-keys-applet


--- 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 Mar 16 17:13:35 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:13:35 -0500
Subject: rpms/lock-keys-applet/devel lock-keys-applet.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161713.j2GHDZwX005717@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5704/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lock-keys-applet.spec 
Log Message:
auto-import lock-keys-applet-1.0-1 on branch devel from lock-keys-applet-1.0-1.src.rpm
Initial import


--- NEW FILE lock-keys-applet.spec ---
Name:           lock-keys-applet
Version:        1.0
Release:        1
Summary:        A GNOME panel applet that shows the status of the lock keys
Group:          Applications/System
License:        GPL
URL:            http://mfcn.ilo.de/led_applet/
Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libgnomeui-devel gnome-panel-devel
Requires:       libgnomeui gnome-panel
Requires(post): scrollkeeper
Requires(postun): scrollkeeper

%description
lock-keys-applet is a GNOME applet that shows the status of the Caps, Num and Scroll Lock keys of your keyboard. This isn't especially usefull for normal keyboards as they have LEDs for that. But some keyboards (especially wireless keyboards) don't. One more feature of the applet is that it saves the status of the lock keys and restores them when starting GNOME.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%post
scrollkeeper-update

%postun
scrollkeeper-update

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_datadir}/gnome/help/%{name}
%{_datadir}/locale/*/*/%{name}.mo
%{_datadir}/omf/%{name}
%{_datadir}/pixmaps/%{name}.png
%{_libdir}/bonobo/servers/*.server
%{_libexecdir}/%{name}

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-1
- Bump release to 1
- Added Requires(post) and Requires(postun)

* Mon Feb  7 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.0-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lock-keys-applet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:13:07 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:13:33 -0000	1.2
@@ -0,0 +1 @@
+lock-keys-applet-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lock-keys-applet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:13:07 -0000	1.1
+++ sources	16 Mar 2005 17:13:33 -0000	1.2
@@ -0,0 +1 @@
+8dc772d62f0881c8978513d7e69de3db  lock-keys-applet-1.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:13:35 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:13:35 -0500
Subject: rpms/lock-keys-applet import.log,1.1,1.2
Message-ID: <200503161713.j2GHDZE4005714@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5704

Modified Files:
	import.log 
Log Message:
auto-import lock-keys-applet-1.0-1 on branch devel from lock-keys-applet-1.0-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lock-keys-applet/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:13:07 -0000	1.1
+++ import.log	16 Mar 2005 17:13:33 -0000	1.2
@@ -0,0 +1 @@
+lock-keys-applet-1_0-1:HEAD:lock-keys-applet-1.0-1.src.rpm:1110993210



From fedora-extras-commits at redhat.com  Wed Mar 16 17:13:57 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:13:57 -0500
Subject: rpms/pam_mysql - New directory
Message-ID: <200503161713.j2GHDvHB005840@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5833/pam_mysql

Log Message:
Directory /cvs/extras/rpms/pam_mysql added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:13:57 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:13:57 -0500
Subject: rpms/pam_mysql/devel - New directory
Message-ID: <200503161713.j2GHDvUP005843@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5833/pam_mysql/devel

Log Message:
Directory /cvs/extras/rpms/pam_mysql/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:14:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:14:13 -0500
Subject: rpms/pam_mysql Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161714.j2GHEDSg005905@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5896

Added Files:
	Makefile import.log 
Log Message:
Setup of module pam_mysql


--- NEW FILE Makefile ---
# Top level Makefile for module pam_mysql
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:14:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:14:13 -0500
Subject: rpms/pam_mysql/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161714.j2GHEDma005908@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5896/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pam_mysql


--- 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 Mar 16 17:14:36 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:14:36 -0500
Subject: rpms/pam_mysql import.log,1.1,1.2
Message-ID: <200503161714.j2GHEaTD006009@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5999

Modified Files:
	import.log 
Log Message:
auto-import pam_mysql-0.50-2 on branch devel from pam_mysql-0.50-2.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:14:10 -0000	1.1
+++ import.log	16 Mar 2005 17:14:34 -0000	1.2
@@ -0,0 +1 @@
+pam_mysql-0_50-2:HEAD:pam_mysql-0.50-2.src.rpm:1110993270



From fedora-extras-commits at redhat.com  Wed Mar 16 17:14:36 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:14:36 -0500
Subject: rpms/pam_mysql/devel pam_mysql.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503161714.j2GHEaea006012@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5999/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pam_mysql.spec 
Log Message:
auto-import pam_mysql-0.50-2 on branch devel from pam_mysql-0.50-2.src.rpm
Initial import


--- NEW FILE pam_mysql.spec ---
Summary:	PAM module for auth UNIX users using MySQL data base
Summary(pl):	modu? PAM uwierzytelniaj?cy u?ytkownik?w Linuksa poprzez baz? danych MySQL
Name:		pam_mysql
Version:	0.50
Release:	2
License:	GPL
Group:		Base
Source0:	http://dl.sf.net/pam-mysql/pam_mysql-0.5.tar.gz
URL:		http://sf.net/projects/pam-mysql/
BuildRequires:	pam-devel mysql-devel
Requires:       pam mysql
BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)

%description
Pam_mysql aims to provide a backend neutral means of authenticating
users against an MySQL database.

%description -l pl
Modu? PAM pozwalaj?cy na uwierzytelnianie u?ytkownik?w Linuksa poprzez
baz? danych MySQL.

%prep
%setup -q -n %{name}

%build
make

%install
rm -rf $RPM_BUILD_ROOT
install -D -m 755 pam_mysql.so $RPM_BUILD_ROOT/%{_lib}/security/pam_mysql.so

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc Readme Changelog
/%{_lib}/security/pam_mysql.so

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-2
- Bump release to 2
- Added Requires

* Fri Jan  7 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.50-1.iva.0
- Retooled spec file for FC3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:14:11 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:14:34 -0000	1.2
@@ -0,0 +1 @@
+pam_mysql-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:14:11 -0000	1.1
+++ sources	16 Mar 2005 17:14:34 -0000	1.2
@@ -0,0 +1 @@
+8cf002392292ae2a5774545324739a94  pam_mysql-0.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:15:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:15:03 -0500
Subject: rpms/python-amara - New directory
Message-ID: <200503161715.j2GHF3JH006136@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6129/python-amara

Log Message:
Directory /cvs/extras/rpms/python-amara added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:15:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:15:03 -0500
Subject: rpms/python-amara/devel - New directory
Message-ID: <200503161715.j2GHF3cD006139@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6129/python-amara/devel

Log Message:
Directory /cvs/extras/rpms/python-amara/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:15:19 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:15:19 -0500
Subject: rpms/python-amara Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161715.j2GHFJ00006208@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6199

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-amara


--- NEW FILE Makefile ---
# Top level Makefile for module python-amara
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:15:19 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:15:19 -0500
Subject: rpms/python-amara/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161715.j2GHFJUT006211@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6199/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-amara


--- 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 Mar 16 17:15:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:15:50 -0500
Subject: rpms/python-amara import.log,1.1,1.2
Message-ID: <200503161715.j2GHFoQ4006318@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6309

Modified Files:
	import.log 
Log Message:
auto-import python-amara-0.9.4-1 on branch devel from python-amara-0.9.4-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-amara/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:15:17 -0000	1.1
+++ import.log	16 Mar 2005 17:15:48 -0000	1.2
@@ -0,0 +1 @@
+python-amara-0_9_4-1:HEAD:python-amara-0.9.4-1.src.rpm:1110993344



From fedora-extras-commits at redhat.com  Wed Mar 16 17:15:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:15:50 -0500
Subject: rpms/python-amara/devel python-amara.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503161715.j2GHFoel006322@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6309/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-amara.spec 
Log Message:
auto-import python-amara-0.9.4-1 on branch devel from python-amara-0.9.4-1.src.rpm
Initial import


--- NEW FILE python-amara.spec ---
%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}

Name:           python-amara
Version:        0.9.4
Release:        1
Summary:        A collection of Pythonic tools for XML data binding

Group:          Development/Libraries
License:        ASL-derived
URL:            http://uche.ogbuji.net/uche.ogbuji.net/tech/4Suite/amara/
Source0:        http://uche.ogbuji.net/uche.ogbuji.net/tech/4Suite/amara/Amara-0.9.4.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python
Requires:       python >= 2.3 4Suite >= 1.0
Provides:       python-Amara = %{version} Amara = %{version}
BuildArch:      noarch

%description
Amara is a collection of Pythonic tools for XML data binding. Not just tools that happen to be written in Python, but tools built from the ground up to use Python idioms and take advantage of the many advantages of Python over other programming languages.

Amara builds on 4Suite, but whereas 4Suite focuses more on literal implementation of XML standards in Python, Amara adds a much more Pythonic face to these capabilities.

Amara provides tools you can trust to conform with XML standards without losing the familiar Python feel.

%prep
%setup -q -c Amara-0.9.4

%build
cd Amara-0.9.4
python setup.py build

%install
rm -rf $RPM_BUILD_ROOT
cd Amara-0.9.4
python setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/flextyper.py
%{_bindir}/scimitar.py
%{_libdir}/python%{pyver}/site-packages/amara/*
%doc Amara-0.9.4/CHANGES Amara-0.9.4/COPYING Amara-0.9.4/demo Amara-0.9.4/manual.html Amara-0.9.4/README Amara-0.9.4/TODO

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-1
- Bump release to 1

* Fri Feb  4 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.9.4-0.iva.0
- Upstream update

* Mon Jan 31 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.9.3-0.iva.0
- Upstream update

* Thu Jan 20 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.9.2-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-amara/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:15:17 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:15:48 -0000	1.2
@@ -0,0 +1 @@
+Amara-0.9.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-amara/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:15:17 -0000	1.1
+++ sources	16 Mar 2005 17:15:48 -0000	1.2
@@ -0,0 +1 @@
+916d2b60e59e10b6a7780d3bc7522046  Amara-0.9.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar 16 17:16:18 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:16:18 -0500
Subject: rpms/python-HTMLgen - New directory
Message-ID: <200503161716.j2GHGIJu006443@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6436/python-HTMLgen

Log Message:
Directory /cvs/extras/rpms/python-HTMLgen added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:16:18 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:16:18 -0500
Subject: rpms/python-HTMLgen/devel - New directory
Message-ID: <200503161716.j2GHGI2L006446@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6436/python-HTMLgen/devel

Log Message:
Directory /cvs/extras/rpms/python-HTMLgen/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:16:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:16:33 -0500
Subject: rpms/python-HTMLgen Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161716.j2GHGXOT006513@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6504

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-HTMLgen


--- NEW FILE Makefile ---
# Top level Makefile for module python-HTMLgen
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:16:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:16:33 -0500
Subject: rpms/python-HTMLgen/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161716.j2GHGXtx006516@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6504/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-HTMLgen


--- 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 Mar 16 17:17:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:17:01 -0500
Subject: rpms/python-HTMLgen import.log,1.1,1.2
Message-ID: <200503161717.j2GHH14f006621@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6610

Modified Files:
	import.log 
Log Message:
auto-import python-HTMLgen-2.2.2-0.iva.1 on branch devel from python-HTMLgen-2.2.2-0.iva.1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-HTMLgen/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:16:31 -0000	1.1
+++ import.log	16 Mar 2005 17:16:59 -0000	1.2
@@ -0,0 +1 @@
+python-HTMLgen-2_2_2-0_iva_1:HEAD:python-HTMLgen-2.2.2-0.iva.1.src.rpm:1110993415



From fedora-extras-commits at redhat.com  Wed Mar 16 17:17:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:17:01 -0500
Subject: rpms/python-HTMLgen/devel python-HTMLgen.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161717.j2GHH1Wn006627@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6610/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-HTMLgen.spec 
Log Message:
auto-import python-HTMLgen-2.2.2-0.iva.1 on branch devel from python-HTMLgen-2.2.2-0.iva.1.src.rpm
Initial import


--- NEW FILE python-HTMLgen.spec ---
%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')

%define version 2.2.2

%if "%{pyver}" == "%{mainpyver}"
%define name python-HTMLgen
%define prov python%{pyver}-htmlgen = %{version} python-htmlgen = %{version}
%else
%define name python%{pyver}-HTMLgen
%define prov python%{pyver}-htmlgen = %{version}
%endif

Name:           %name
Version:        %version
Release:        0.iva.1
Summary:        A class library for the generation of HTML documents

Group:          Development/Libraries
License:        See Source
URL:            http://starship.python.net/lib.html
Source0:        http://starship.python.net/crew/friedrich/HTMLgen.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Provides:       %{prov}
BuildRequires:  python-abi = %{pyver}
Requires:       python-abi = %{pyver}
Provides:       HTMLgen = %{version}
BuildArch:      noarch

%description
HTMLgen is a class library for the generation of HTML documents with Python scripts. It's used when you want to create HTML pages containing information which changes from time to time.

%prep
%setup -q -c htmlgen

%build

%install
rm -rf $RPM_BUILD_ROOT
install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
for file in HTMLgen.py HTMLcolors.py HTMLutil.py HTMLcalendar.py barchart.py colorcube.py imgsize.py NavLinks.py Formtools.py ImageH.py ImageFileH.py ImagePaletteH.py GifImagePluginH.py JpegImagePluginH.py PngImagePluginH.py; do
  install -m 0644 HTMLgen/$file $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
done
python%{pyver} %{_libdir}/python%{pyver}/compileall.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
python%{pyver} -O %{_libdir}/python%{pyver}/compileall.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_libdir}/python%pyver/site-packages/*.py
%{_libdir}/python%pyver/site-packages/*.py[co]

%changelog
* Thu Mar 10 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-0.iva.1
- Name changed to python-HTMLgen to match module import
- %pyver cleanups

* Thu Jan 20 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-HTMLgen/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:16:31 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:16:59 -0000	1.2
@@ -0,0 +1 @@
+HTMLgen.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-HTMLgen/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:16:31 -0000	1.1
+++ sources	16 Mar 2005 17:16:59 -0000	1.2
@@ -0,0 +1 @@
+cd20f8b63d3215e57289ddbf56c97f48  HTMLgen.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:17:28 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:17:28 -0500
Subject: rpms/repoml - New directory
Message-ID: <200503161717.j2GHHSR5006747@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/repoml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6740/repoml

Log Message:
Directory /cvs/extras/rpms/repoml added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:17:28 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:17:28 -0500
Subject: rpms/repoml/devel - New directory
Message-ID: <200503161717.j2GHHSPh006750@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/repoml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6740/repoml/devel

Log Message:
Directory /cvs/extras/rpms/repoml/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:17:42 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:17:42 -0500
Subject: rpms/repoml Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161717.j2GHHgaC006814@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/repoml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6802

Added Files:
	Makefile import.log 
Log Message:
Setup of module repoml


--- NEW FILE Makefile ---
# Top level Makefile for module repoml
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:17:42 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:17:42 -0500
Subject: rpms/repoml/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161717.j2GHHg1t006817@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/repoml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6802/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module repoml


--- 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 Mar 16 17:18:05 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:18:05 -0500
Subject: rpms/repoml import.log,1.1,1.2
Message-ID: <200503161718.j2GHI5UY006914@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/repoml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6904

Modified Files:
	import.log 
Log Message:
auto-import repoml-0.1-1 on branch devel from repoml-0.1-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/repoml/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:17:40 -0000	1.1
+++ import.log	16 Mar 2005 17:18:03 -0000	1.2
@@ -0,0 +1 @@
+repoml-0_1-1:HEAD:repoml-0.1-1.src.rpm:1110993479



From fedora-extras-commits at redhat.com  Wed Mar 16 17:18:05 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:18:05 -0500
Subject: rpms/repoml/devel repoml.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503161718.j2GHI5eT006917@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/repoml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6904/devel

Modified Files:
	.cvsignore sources 
Added Files:
	repoml.spec 
Log Message:
auto-import repoml-0.1-1 on branch devel from repoml-0.1-1.src.rpm
Initial import


--- NEW FILE repoml.spec ---
Name:           repoml
Version:        0.1
Release:        1
Summary:        Tools and data for working with RepoML files
Group:          Applications/System
License:        GPL
URL:            http://fedora.ivazquez.net/
Source0:        http://fedora.ivazquez.net/files/repoml-0.1.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       libxslt
BuildArch:      noarch

%description
Contains:
  - repoml.xsd, an XML Schema for RepoML files
  - repoml.xsl, a stylesheet for converting RepoML files into .repo files
  - repoml2repo, a script that invokes repoml.xsl

%prep
%setup -q

%build
sed -ipath -e s!@@DATADIR@@!%{_datadir}!g repoml2repo

%install
rm -rf $RPM_BUILD_ROOT
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}
install -m 0644 repoml.xs? $RPM_BUILD_ROOT%{_datadir}/%{name}
install -D -m 0755 repoml2repo $RPM_BUILD_ROOT%{_bindir}/repoml2repo

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog CREDITS NEWS README TODO
%{_bindir}/*
%{_datadir}/%{name}

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
- Bump to release 1

* Fri Feb 25 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/repoml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:17:40 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:18:03 -0000	1.2
@@ -0,0 +1 @@
+repoml-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/repoml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:17:40 -0000	1.1
+++ sources	16 Mar 2005 17:18:03 -0000	1.2
@@ -0,0 +1 @@
+609eef9fb8e3fed976c32336a19b3021  repoml-0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:21:00 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 16 Mar 2005 12:21:00 -0500
Subject: rpms/bmp - New directory
Message-ID: <200503161721.j2GHL08j007077@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7070/bmp

Log Message:
Directory /cvs/extras/rpms/bmp added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:21:00 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 16 Mar 2005 12:21:00 -0500
Subject: rpms/bmp/devel - New directory
Message-ID: <200503161721.j2GHL0U3007080@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7070/bmp/devel

Log Message:
Directory /cvs/extras/rpms/bmp/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:21:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 16 Mar 2005 12:21:21 -0500
Subject: rpms/bmp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161721.j2GHLLSK007149@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7140

Added Files:
	Makefile import.log 
Log Message:
Setup of module bmp


--- NEW FILE Makefile ---
# Top level Makefile for module bmp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:21:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 16 Mar 2005 12:21:21 -0500
Subject: rpms/bmp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161721.j2GHLLQ4007152@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7140/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bmp


--- 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 Mar 16 17:24:51 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 16 Mar 2005 12:24:51 -0500
Subject: rpms/bmp import.log,1.1,1.2
Message-ID: <200503161724.j2GHOpv6007336@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7326

Modified Files:
	import.log 
Log Message:
auto-import bmp-0.9.7-4 on branch devel from bmp-0.9.7-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bmp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:21:19 -0000	1.1
+++ import.log	16 Mar 2005 17:24:48 -0000	1.2
@@ -0,0 +1 @@
+bmp-0_9_7-4:HEAD:bmp-0.9.7-4.src.rpm:1110993900



From fedora-extras-commits at redhat.com  Wed Mar 16 17:24:51 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 16 Mar 2005 12:24:51 -0500
Subject: rpms/bmp/devel beep.png, NONE, 1.1 bmp-0.9.7-default-alsa.patch,
	NONE, 1.1 bmp-0.9.7-default-skin.patch, NONE,
	1.1 bmp-0.9.7-readmacro.patch, NONE, 1.1 bmp.sh, NONE,
	1.1 bmp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161724.j2GHOpAU007342@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7326/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beep.png bmp-0.9.7-default-alsa.patch 
	bmp-0.9.7-default-skin.patch bmp-0.9.7-readmacro.patch bmp.sh 
	bmp.spec 
Log Message:
auto-import bmp-0.9.7-4 on branch devel from bmp-0.9.7-4.src.rpm

bmp-0.9.7-default-alsa.patch:

--- NEW FILE bmp-0.9.7-default-alsa.patch ---
diff -Nur bmp-0.9.7-orig/beep/main.c bmp-0.9.7/beep/main.c
--- bmp-0.9.7-orig/beep/main.c	2004-12-04 10:04:24.000000000 +0100
+++ bmp-0.9.7/beep/main.c	2005-03-16 18:03:12.000000000 +0100
@@ -504,9 +504,9 @@
         cfg.gentitle_format = g_strdup("%p - %t");
 
     if (!cfg.outputplugin) {
-#ifdef HAVE_OSS
+#ifdef HAVE_ALSA
         cfg.outputplugin = g_build_filename(PLUGIN_DIR, plugin_dir_list[0],
-                                            PLUGIN_FILENAME("OSS"), NULL);
+                                            PLUGIN_FILENAME("ALSA"), NULL);
 #else
         /* FIXME: This implicitly means the output plugin that is
          * first in the alphabet will be used (usually the disk writer

bmp-0.9.7-default-skin.patch:

--- NEW FILE bmp-0.9.7-default-skin.patch ---
diff -Nur bmp-0.9.7/beep/main.c bmp-0.9.7-modified/beep/main.c
--- bmp-0.9.7/beep/main.c	2004-12-04 10:04:24.000000000 +0100
+++ bmp-0.9.7-modified/beep/main.c	2005-01-28 23:54:17.938968912 +0100
@@ -144,7 +144,7 @@
     0.0,                        /* equalizer preamp */
     {0, 0, 0, 0, 0,             /* equalizer bands */
      0, 0, 0, 0, 0},
-    NULL,                       /* skin */
+    "/usr/share/xmms/Skins/Bluecurve-xmms.zip",  /* skin */
     NULL,                       /* output plugin */
     NULL,                       /* file selector path */
     NULL,                       /* playlist path */

bmp-0.9.7-readmacro.patch:

--- NEW FILE bmp-0.9.7-readmacro.patch ---
--- bmp-0.9.7-orig/libbeep/configfile.c	2004-06-23 01:50:53.000000000 +0200
+++ bmp-0.9.7/libbeep/configfile.c	2005-03-11 13:53:06.000000000 +0100
@@ -83,7 +83,7 @@
                              const gchar * section, const gchar * key,
                              XmmsCfgValueType value_type, gpointer * value)
 {
-    return xmms_cfg_value_type_func[value_type].read(config_file,
+    return (xmms_cfg_value_type_func[value_type].read)(config_file,
                                                      section, key, value);
 }
 
@@ -91,7 +91,7 @@
                           const gchar * section, const gchar * key,
                           XmmsCfgValueType value_type, gpointer * value)
 {
-    xmms_cfg_value_type_func[value_type].read(config_file,
+    (xmms_cfg_value_type_func[value_type].read)(config_file,
                                               section, key, value);
 }
 


--- NEW FILE bmp.sh ---
#!/bin/sh

# Colon-separated directory path to look for
# additional skins. See man beep-media-player.
export SKINSDIR=/usr/share/xmms/Skins


--- NEW FILE bmp.spec ---
Name:           bmp
Version:        0.9.7
Release:        4
Summary:        GTK2 based port of the XMMS media player

Group:          Applications/Multimedia
License:        GPL
URL:            http://beepmp.sourceforge.net/
# The original source files contain an mp3 decoder. It is removed in the
# -patched- file
# Source0:        http://dl.sf.net/beepmp/bmp-%{version}.tar.gz
Source0:        bmp-patched-%{version}.tar.gz
Source1:        bmp.sh
Source2:        beep.png
Patch0:         bmp-0.9.7-readmacro.patch
Patch1:         bmp-0.9.7-default-skin.patch
Patch2:         bmp-0.9.7-default-alsa.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pkgconfig gtk2-devel esound-devel libvorbis-devel
BuildRequires:  zlib-devel desktop-file-utils alsa-lib-devel
BuildRequires:  gnome-vfs2-devel libglade2-devel
#BuildRequires:  id3lib-devel

# Package seems to miscompile on PPC, possibly a endianess issue
ExcludeArch: ppc

%description
BMP (Beep Media Player) is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
XMMS.

%package        devel
Summary:        Development files for the Beep Media Player
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
Development files for the Beep Media Player

%prep
%setup -q

# Fix the improper use of read as a function name
%patch0 -p1 -b .readmacro

# Use the XMMS Bluecurve skin by default
%patch1 -p1 -b .default-skin

%patch2 -p1 -b .default-alsa


%build
%configure \
%ifarch %{ix86}
	--enable-simd \
%endif
	--disable-mp3 \
	--enable-gconf \
	--enable-gnome-vfs
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

perl -pi -e 's/svg/png/ ; s/^(Categories=.+[^;\n])$/\1;/' beep/bmp.desktop
desktop-file-install --vendor fedora \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
    --add-category X-Fedora  \
    --add-category Application  \
    beep/bmp.desktop
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/bmp.desktop

rm -f $RPM_BUILD_ROOT%{_infodir}/dir
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

# Shell variables
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d

# Replace icon
rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/bmp.svg
install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bmp.png


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog FAQ NEWS README TODO
%{_bindir}/*
%{_libdir}/*.so.*
%{_libdir}/bmp
%{_datadir}/bmp
%{_mandir}/man[^3]/*
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%config(noreplace) %{_sysconfdir}/profile.d/bmp.sh

%files devel
%defattr(-,root,root,-)
%{_includedir}/bmp
%{_libdir}/*.so
%{_libdir}/pkgconfig/*


%changelog
* Wed Mar 16 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-4
- Apply common spec cleanup and corrections.
- Add patch to make ALSA output driver the default.

* Sun Mar 13 2005 Ralf Ertzinger <ralf at skytale.net> 0.9.7-3 
- More changes from livna

* Fri Mar 11 2005 Ralf Ertzinger <ralf at skytale.net> 0.9.7-2 
- Added bmp.sh, default-skin patch from livna package
- Removed mp3 plugin code

* Fri Mar 11 2005 Ralf Ertzinger <ralf at skytale.net> 0.9.7-1 
- Initial build for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bmp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:21:19 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:24:48 -0000	1.2
@@ -0,0 +1 @@
+bmp-patched-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bmp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:21:19 -0000	1.1
+++ sources	16 Mar 2005 17:24:48 -0000	1.2
@@ -0,0 +1 @@
+bcfd525c376ff9ece8f935d34bdcb56e  bmp-patched-0.9.7.tar.gz



From katzj at redhat.com  Wed Mar 16 18:01:17 2005
From: katzj at redhat.com (Jeremy Katz)
Date: Wed, 16 Mar 2005 13:01:17 -0500
Subject: rpms/pam_mysql/devel pam_mysql.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503161714.j2GHEaea006012@cvs-int.fedora.redhat.com>
References: <200503161714.j2GHEaea006012@cvs-int.fedora.redhat.com>
Message-ID: <1110996078.7095.36.camel@bree.local.net>

On Wed, 2005-03-16 at 12:14 -0500, Ignacio Vazquez-Abrams wrote:
> Summary(pl):	modu PAM uwierzytelniajcy uytkownikw Linuksa poprzez baz danych MySQL

Doing the localized summary and description in the spec file is less
useful because it makes it harder to make small tweaks to them.
Eventually we're going to end up needing specspo-like for extras, but
right now, English is really the only way :/

Jeremy



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/hamlib hamlib.spec,1.1,1.2
Message-ID: <200503161854.j2GIslG8010860@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/hamlib

Modified Files:
	hamlib.spec 
Log Message:
Initial review fixes


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hamlib.spec	16 Mar 2005 17:05:32 -0000	1.1
+++ hamlib.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name: hamlib
 Version: 1.2.3
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transcievers and receivers.
@@ -37,7 +37,6 @@
 %package c++
 Summary: Hamlib radio control library C++ binding
 Group: Development/Libraries
-Requires: hamlib
 
 %description c++
 Hamlib radio control library C++ language binding.
@@ -45,7 +44,7 @@
 %package c++-devel
 Summary: Hamlib radio control library C++ binding development headers and libraries
 Group: Development/Libraries
-Requires: hamlib, hamlib-devel
+Requires: hamlib-devel = %{version}
 
 %description c++-devel
 Hamlib radio control library C++ binding development headers and libraries
@@ -63,8 +62,6 @@
 %package python
 Summary: Hamlib radio control library Python binding
 Group: Development/Libraries
-Requires: hamlib = %{version}
-Requires: python => 2.2.3
 
 %description python
 Hamlib Python Language bindings to allow radio control from Python scripts.
@@ -200,6 +197,9 @@
 
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-2
+- Removed/fixed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-1
 - Bump release to 1
 - Fixed BuildRoot



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/lock-keys-applet lock-keys-applet.spec,1.1,1.2
Message-ID: <200503161854.j2GIslEO010880@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/lock-keys-applet

Modified Files:
	lock-keys-applet.spec 
Log Message:
Initial review fixes


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/extras/devel/lock-keys-applet/lock-keys-applet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lock-keys-applet.spec	16 Mar 2005 17:13:33 -0000	1.1
+++ lock-keys-applet.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        1
+Release:        2
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
 License:        GPL
@@ -8,7 +8,6 @@
 Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel gnome-panel-devel
-Requires:       libgnomeui gnome-panel
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -46,6 +45,9 @@
 %{_libexecdir}/%{name}
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-1
 - Bump release to 1
 - Added Requires(post) and Requires(postun)



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/clearlooks clearlooks.spec,1.1,1.2
Message-ID: <200503161854.j2GIslDY010844@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/clearlooks

Modified Files:
	clearlooks.spec 
Log Message:
Initial review fixes


Index: clearlooks.spec
===================================================================
RCS file: /cvs/extras/devel/clearlooks/clearlooks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clearlooks.spec	16 Mar 2005 16:55:01 -0000	1.1
+++ clearlooks.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           clearlooks
 Version:        0.4
-Release:        1
+Release:        2
 Summary:        An attractive GTK+ 2 engine with a focus on usability
 Group:          User Interface/Desktops
 License:        GPL
@@ -8,7 +8,6 @@
 Source0:        http://prdownloads.sourceforge.net/clearlooks/clearlooks-0.4.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel
-Requires:       gtk2
 
 %description
 Clearlooks will transform your GNOME desktop into an attractive looking and usable environment.
@@ -34,6 +33,9 @@
 %{_libdir}/gtk-2.0/2.4.0/engines/*
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-1
 - Bump release to 1
 



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/pam_mysql pam_mysql.spec,1.1,1.2
Message-ID: <200503161854.j2GIslig010884@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/pam_mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/pam_mysql

Modified Files:
	pam_mysql.spec 
Log Message:
Initial review fixes


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/devel/pam_mysql/pam_mysql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam_mysql.spec	16 Mar 2005 17:14:34 -0000	1.1
+++ pam_mysql.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,24 +1,18 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
-Summary(pl):	modu? PAM uwierzytelniaj?cy u?ytkownik?w Linuksa poprzez baz? danych MySQL
 Name:		pam_mysql
 Version:	0.50
-Release:	2
+Release:	3
 License:	GPL
 Group:		Base
 Source0:	http://dl.sf.net/pam-mysql/pam_mysql-0.5.tar.gz
 URL:		http://sf.net/projects/pam-mysql/
 BuildRequires:	pam-devel mysql-devel
-Requires:       pam mysql
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Pam_mysql aims to provide a backend neutral means of authenticating
 users against an MySQL database.
 
-%description -l pl
-Modu? PAM pozwalaj?cy na uwierzytelnianie u?ytkownik?w Linuksa poprzez
-baz? danych MySQL.
-
 %prep
 %setup -q -n %{name}
 
@@ -38,6 +32,10 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Wed Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-3
+- Removed explicit Requires
+- Removed Polish Summary and Description
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-2
 - Bump release to 2
 - Added Requires



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/kphone kphone.spec,1.1,1.2
Message-ID: <200503161854.j2GIsl0v010864@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/kphone

Modified Files:
	kphone.spec 
Log Message:
Initial review fixes


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kphone.spec	16 Mar 2005 17:06:44 -0000	1.1
+++ kphone.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        0.iva.0
+Release:        2
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -11,7 +11,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils
-Requires:       qt alsa-lib
 
 %description
 KPhone is a SIP (Session Initiation Protocol) user agent for Linux, with which you can initiate VoIP (Voice over IP) connections over the Internet.  It supports Presence and Instant Messaging, and to some extent also video calls between two hosts.
@@ -51,6 +50,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-1
 - Bump release to 1
 - Added d-f-u to BR



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/gpredict gpredict.spec,1.1,1.2
Message-ID: <200503161854.j2GIslRU010856@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/gpredict
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/gpredict

Modified Files:
	gpredict.spec 
Log Message:
Initial review fixes


Index: gpredict.spec
===================================================================
RCS file: /cvs/extras/devel/gpredict/gpredict.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpredict.spec	16 Mar 2005 17:04:11 -0000	1.1
+++ gpredict.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gpredict
 Version:        0.5.0
-Release:        0.iva.0
+Release:        2
 Summary:        Real-time satellite tracking and orbit prediction program
 Group:          Applications/Communications
 License:        GPL
@@ -9,7 +9,6 @@
 Patch0:         gpredict-0.5.0-po.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk+-devel hamlib-devel gnome-libs-devel gettext GConf-devel gnome-vfs-devel gnome-print-devel gal-devel desktop-file-utils
-Requires:       gtk+ hamlib gnome-libs GConf gnome-vfs gnome-print gal
 
 %description
 Gpredict calculates and shows the position of satellites in lists and on maps. It can also make detailed predictions of upcoming satellites passes.
@@ -64,6 +63,9 @@
 %{_datadir}/pixmaps/%{name}
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-1
 - Bump release to 1
 - Added d-f-u to BR



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/ktrack ktrack.spec,1.1,1.2
Message-ID: <200503161854.j2GIslI3010868@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/ktrack

Modified Files:
	ktrack.spec 
Log Message:
Initial review fixes


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ktrack.spec	16 Mar 2005 17:08:07 -0000	1.1
+++ ktrack.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,12 +1,11 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 1.rc1
+Release: 2.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
 Patch: ktrack-headers.patch
-Requires: kdelibs >= 3.3 hamlib = 1.2.3
 BuildRequires: desktop-file-utils kdelibs-devel >= 3.3 hamlib-devel = 1.2.3
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,6 +61,9 @@
 %doc %{name}-%{version}-rc1/AUTHORS %{name}-%{version}-rc1/ChangeLog %{name}-%{version}-rc1/COPYING %{name}-%{version}-rc1/README %{name}-%{version}-rc1/TODO %{name}-%{version}-rc1/doc/en/index.docbook %{name}-%{version}-rc1/doc/en/index.cache.bz2
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-2.rc1
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-1.rc1
 - Bump release to 1
 - Fixed BuildRoot



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/python-amara python-amara.spec,1.1,1.2
Message-ID: <200503161854.j2GIslAB010892@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/python-amara

Modified Files:
	python-amara.spec 
Log Message:
Initial review fixes


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/devel/python-amara/python-amara.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-amara.spec	16 Mar 2005 17:15:48 -0000	1.1
+++ python-amara.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-amara
 Version:        0.9.4
-Release:        1
+Release:        2
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python
-Requires:       python >= 2.3 4Suite >= 1.0
+Requires:       4Suite >= 1.0
 Provides:       python-Amara = %{version} Amara = %{version}
 BuildArch:      noarch
 
@@ -46,6 +46,9 @@
 %doc Amara-0.9.4/CHANGES Amara-0.9.4/COPYING Amara-0.9.4/demo Amara-0.9.4/manual.html Amara-0.9.4/README Amara-0.9.4/TODO
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-1
 - Bump release to 1
 



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/linphone linphone.spec,1.1,1.2
Message-ID: <200503161854.j2GIsl5C010876@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/linphone

Modified Files:
	linphone.spec 
Log Message:
Initial review fixes


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linphone.spec	16 Mar 2005 17:12:25 -0000	1.1
+++ linphone.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        1
+Release:        2
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -13,7 +13,6 @@
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
 BuildRequires:  libosip-devel speex-devel gettext
-Requires:       gnome-panel libgnomeui glib2 alsa-lib libosip speex
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -84,6 +83,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-1
 - Bump release to 1
 - Cleaned up the -docs and -speex patches



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/edb edb.spec,1.1,1.2
Message-ID: <200503161854.j2GIslp1010848@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/edb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/edb

Modified Files:
	edb.spec 
Log Message:
Initial review fixes


Index: edb.spec
===================================================================
RCS file: /cvs/extras/devel/edb/edb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edb.spec	16 Mar 2005 17:01:00 -0000	1.1
+++ edb.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           edb
 Version:        1.0.5
-Release:        1
+Release:        2
 Summary:        A database convenience library wrapped around BDB
 Group:          System Environment/Libraries
 License:        MIT
@@ -8,7 +8,6 @@
 Source0:        http://prdownloads.sourceforge.net/enlightenment/edb-1.0.5.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk+-devel, ncurses-devel zlib-devel 
-Requires:       zlib
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -26,7 +25,7 @@
 %package        ncurses
 Summary:        ncurses frontend for edb
 Group:          Applications/Databases
-Requires:       %{name} = %{version}-%{release} ncurses
+Requires:       %{name} = %{version}-%{release}
 
 %description    ncurses
 edb-ncurses is a frontend for edb that uses ncurses
@@ -34,7 +33,7 @@
 %package        gtk
 Summary:        GTK+ 1.x frontend for edb
 Group:          Applications/Databases
-Requires:       %{name} = %{version}-%{release} gtk+
+Requires:       %{name} = %{version}-%{release}
 
 %description    gtk
 edb-gtk is a frontend for edb that uses GTK+ 1.x
@@ -83,6 +82,9 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-1
 - Bump release to 1
 - Fix %description of -gtk



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/leafpad leafpad.spec,1.1,1.2
Message-ID: <200503161854.j2GIslXo010872@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/leafpad

Modified Files:
	leafpad.spec 
Log Message:
Initial review fixes


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/devel/leafpad/leafpad.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- leafpad.spec	16 Mar 2005 17:09:16 -0000	1.1
+++ leafpad.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           leafpad
 Version:        0.7.9
-Release:        1
+Release:        2
 Summary:        GTK+ based simple text editor
 
 Group:          Applications/Editors
@@ -11,7 +11,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.4
-Requires:       gtk2 >= 2.4
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -60,6 +59,9 @@
 %{_datadir}/pixmaps/leafpad.png
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-1
 - Bump release to 1
 



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/ghasher ghasher.spec,1.1,1.2
Message-ID: <200503161854.j2GIslAl010853@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ghasher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/ghasher

Modified Files:
	ghasher.spec 
Log Message:
Initial review fixes


Index: ghasher.spec
===================================================================
RCS file: /cvs/extras/devel/ghasher/ghasher.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghasher.spec	16 Mar 2005 17:02:26 -0000	1.1
+++ ghasher.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ghasher
 Version:        1.2.0
-Release:        1
+Release:        2
 Summary:        GUI hasher for GTK+ 2
 Group:          Applications/File
 License:        BSD
@@ -8,7 +8,6 @@
 Source0:        http://asgaard.homelinux.org/code/ghasher/ghasher-1.2.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel >= 2.4 openssl-devel desktop-file-utils libglade2-devel
-Requires:       gtk2 >= 2.4 libglade2
 
 %description
 ghasher can easily show the MD5 sum (or md2, md4, sha1, sha, ripemd160, dss1) of a file. Motivation for this utility was that users shouldn't need to open a command line for checking the MD5 sum of files they download.
@@ -54,6 +53,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-1
 - Bump release to 1
 - Cleaned up %description



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/python-HTMLgen python-HTMLgen.spec,1.1,1.2
Message-ID: <200503161854.j2GIsl3O010888@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/python-HTMLgen

Modified Files:
	python-HTMLgen.spec 
Log Message:
Initial review fixes


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/devel/python-HTMLgen/python-HTMLgen.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-HTMLgen.spec	16 Mar 2005 17:16:59 -0000	1.1
+++ python-HTMLgen.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -13,11 +13,11 @@
 
 Name:           %name
 Version:        %version
-Release:        0.iva.1
+Release:        1
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
-License:        See Source
+License:        MIT
 URL:            http://starship.python.net/lib.html
 Source0:        http://starship.python.net/crew/friedrich/HTMLgen.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +54,10 @@
 %{_libdir}/python%pyver/site-packages/*.py[co]
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-1
+- Bump release to 1
+- Fixed License tag
+
 * Thu Mar 10 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-0.iva.1
 - Name changed to python-HTMLgen to match module import
 - %pyver cleanups



From bugs.michael at gmx.net  Wed Mar 16 19:43:20 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Wed, 16 Mar 2005 20:43:20 +0100
Subject: rpms/clearlooks/devel clearlooks.spec, NONE, 1.1 .cvsignore,
 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503161655.j2GGt3m4001351@cvs-int.fedora.redhat.com>
References: <200503161655.j2GGt3m4001351@cvs-int.fedora.redhat.com>
Message-ID: <20050316204320.7b3b4dc2.bugs.michael@gmx.net>

On Wed, 16 Mar 2005 11:55:03 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/rpms/clearlooks/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1338/devel

Build fails on FC3. Does it work on FC4T1 (can't test right now):

error: Installed (but unpackaged) file(s) found:
   /share/themes/Clearlooks/metacity-1/metacity-theme-1.xml



From fedora-extras-commits at redhat.com  Wed Mar 16 19:45:13 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 14:45:13 -0500
Subject: rpms/perl-ExtUtils-CBuilder/FC-3 .cvsignore, 1.6,
	1.7 perl-ExtUtils-CBuilder.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200503161945.j2GJjDl2012611@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12602/FC-3

Modified Files:
	.cvsignore perl-ExtUtils-CBuilder.spec sources 
Log Message:
Update to 0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Feb 2005 02:35:09 -0000	1.6
+++ .cvsignore	16 Mar 2005 19:45:11 -0000	1.7
@@ -1 +1 @@
-ExtUtils-CBuilder-0.09.tar.gz
+ExtUtils-CBuilder-0.10.tar.gz


Index: perl-ExtUtils-CBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3/perl-ExtUtils-CBuilder.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-ExtUtils-CBuilder.spec	15 Feb 2005 02:35:09 -0000	1.8
+++ perl-ExtUtils-CBuilder.spec	16 Mar 2005 19:45:11 -0000	1.9
@@ -1,15 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-ExtUtils-CBuilder
-Version:        0.09
+Version:        0.10
 Release:        1
-Epoch:          0
 Summary:        Compile and link C code for Perl modules
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-CBuilder/
-Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.09.tar.gz
+Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.10.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -56,6 +55,9 @@
 
 
 %changelog
+* Wed Mar 16 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.10-1
+- Update to 0.10.
+
 * Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.09-1
 - Update to 0.09.
 - Patch no longer needed.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Feb 2005 02:35:09 -0000	1.6
+++ sources	16 Mar 2005 19:45:11 -0000	1.7
@@ -1 +1 @@
-c0e6e997525e41cb9ac96ca981903336  ExtUtils-CBuilder-0.09.tar.gz
+e20aae61839fd7df8c719e2c97a3aac5  ExtUtils-CBuilder-0.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 19:45:13 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 14:45:13 -0500
Subject: rpms/perl-ExtUtils-CBuilder/devel .cvsignore, 1.6,
	1.7 perl-ExtUtils-CBuilder.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200503161945.j2GJjD17012617@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12602/devel

Modified Files:
	.cvsignore perl-ExtUtils-CBuilder.spec sources 
Log Message:
Update to 0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Feb 2005 02:35:09 -0000	1.6
+++ .cvsignore	16 Mar 2005 19:45:11 -0000	1.7
@@ -1 +1 @@
-ExtUtils-CBuilder-0.09.tar.gz
+ExtUtils-CBuilder-0.10.tar.gz


Index: perl-ExtUtils-CBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-ExtUtils-CBuilder.spec	3 Mar 2005 23:46:26 -0000	1.9
+++ perl-ExtUtils-CBuilder.spec	16 Mar 2005 19:45:11 -0000	1.10
@@ -1,14 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-ExtUtils-CBuilder
-Version:        0.09
+Version:        0.10
 Release:        1
 Summary:        Compile and link C code for Perl modules
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-CBuilder/
-Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.09.tar.gz
+Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.10.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Mar 16 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.10-1
+- Update to 0.10.
+
 * Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.09-1
 - Update to 0.09.
 - Patch no longer needed.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Feb 2005 02:35:09 -0000	1.6
+++ sources	16 Mar 2005 19:45:11 -0000	1.7
@@ -1 +1 @@
-c0e6e997525e41cb9ac96ca981903336  ExtUtils-CBuilder-0.09.tar.gz
+e20aae61839fd7df8c719e2c97a3aac5  ExtUtils-CBuilder-0.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 19:49:45 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 16 Mar 2005 14:49:45 -0500
Subject: rpms/python-docutils/devel - New directory
Message-ID: <200503161949.j2GJnj4Z012720@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12711/python-docutils/devel

Log Message:
Directory /cvs/extras/rpms/python-docutils/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 19:49:45 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 16 Mar 2005 14:49:45 -0500
Subject: rpms/python-docutils - New directory
Message-ID: <200503161949.j2GJnj4p012718@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12711/python-docutils

Log Message:
Directory /cvs/extras/rpms/python-docutils added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 19:50:03 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 16 Mar 2005 14:50:03 -0500
Subject: rpms/python-docutils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161950.j2GJo3du012781@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12772

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-docutils


--- NEW FILE Makefile ---
# Top level Makefile for module python-docutils
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 19:50:03 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 16 Mar 2005 14:50:03 -0500
Subject: rpms/python-docutils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161950.j2GJo3Ql012784@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12772/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-docutils


--- 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 Mar 16 19:51:21 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 16 Mar 2005 14:51:21 -0500
Subject: rpms/python-docutils import.log,1.1,1.2
Message-ID: <200503161951.j2GJpLRn012878@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12869

Modified Files:
	import.log 
Log Message:
auto-import python-docutils-0.3.7-5 on branch devel from python-docutils-0.3.7-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 19:50:01 -0000	1.1
+++ import.log	16 Mar 2005 19:51:19 -0000	1.2
@@ -0,0 +1 @@
+python-docutils-0_3_7-5:HEAD:python-docutils-0.3.7-5.src.rpm:1111002672



From fedora-extras-commits at redhat.com  Wed Mar 16 19:51:21 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 16 Mar 2005 14:51:21 -0500
Subject: rpms/python-docutils/devel python-docutils.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161951.j2GJpLHE012882@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12869/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-docutils.spec 
Log Message:
auto-import python-docutils-0.3.7-5 on branch devel from python-docutils-0.3.7-5.src.rpm


--- NEW FILE python-docutils.spec ---
%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.7
Release:        5
Summary:        A system for processing plaintext documentation

Group:          Development/Languages
License:        Public domain, BSD, PSF, 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
Provides: docutils = %{version}-%{release}
Obsoletes: docutils < %{version}-%{release}
Requires:	python-abi = %{pyver}

%description
The Docutils project specifies a plaintext markup language, reStructuredText,
which is easy to read and quick to write.  The project includes a python
library to parse rST files and transform them into other useful formats such
as HTML, XML, and TeX as well as commandline tools that give the enduser
access to this functionality.

Currently, the library supports parsing rST that is in standalone files and
PEPs (Python Enhancement Proposals).  Work is underway to parse rST from
Python inline documentation modules and packages.

%prep
%setup -q -n %{srcname}-%{version}

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
	
for file in $RPM_BUILD_ROOT/%{_bindir}/*.py; do
	mv $file `dirname $file`/`basename $file .py`
done

# We want the licenses but don't need this build file
rm -f licenses/docutils.conf

# docutils only installs this if its not already on the system.  Due to the
# possibility that a previous version of docutils may be installed, we install
# it manually here.
file=roman.py
extradest=%{python_sitelib}
fullextradest=$RPM_BUILD_ROOT/$extradest
install -m 0644 extras/$file $fullextradest
%{__python} -c "import py_compile; py_compile.compile(\
    '$fullextradest/$file', \
    '$fullextradest/$file' + 'c', \
    '$extradest/$file')"
%{__python} -O -c "import py_compile; py_compile.compile(\
    '$fullextradest/$file', \
    '$fullextradest/$file' + 'o', \
    '$extradest/$file')"

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt licenses docs tools
%{_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
* Sat Mar 12 2005 Toshio Kuratomi <toshio.tiki-lounge.com> 0.3.7-5
- Add GPL as a license (mschwendt)
- Use versioned Obsoletes and Provides (mschwendt)

* Fri Mar 04 2005 Toshio Kuratomi <toshio.tiki-lounge.com> 0:0.3.7-4
- Rename to python-docutils per the new packaging guidelines.

* Wed Jan 12 2005 Toshio Kuratomi <toshio.tiki-lounge.com> 0:0.3.7-0.fdr.3
- Really install roman.py and build roman.py[co].  Needed to make sure I have
  docutils installed to test that it builds roman.py fine in that case.

* Tue Jan 11 2005 Toshio Kuratomi <toshio.tiki-lounge.com> 0:0.3.7-0.fdr.2
- Special case roman.py to always install.  This is the behaviour we want
  unless something else provides it.  Will need to watch out for this in
  future Core and Extras packages, but the auto detection code makes it
  possible that builds will not be reproducible if roman.py were installed
  from another package.... Lesser of two evils here.
- Provide python-docutils in case that package were preinstalled from
  another repository.
  
* Fri Dec 31 2004 Toshio Kuratomi <toshio.tiki-lounge.com> 0:0.3.7-0.fdr.1
- Update to 0.3.7
- Rename from python-docutils to docutils.
- Make roman.py optionally a part of the files list.  In FC2, this will be
  included.  In FC3, this won't.
- BuildConflict with self since the docutils build detects the presence
  of roman.py and doesn't reinstall itself.
  
* Mon Aug 9 2004 Toshio Kuratomi <toshio.tiki-lounge.com> 0:0.3.5-0.fdr.1
- Update to 0.3.5.
- Update spec style to latest fedora-rpmdevtools.
- Merge everything into a single package.  There isn't very much space
  advantage to having separate packages in a package this small and in
  this case, the documentation on using docutils as a library is also a
  good example of how to write in ReSructuredText.

* Sat Jan 10 2004 Michel Alexandre Salim <salimma[AT]users.sf.net> 0:0.3-0.fdr.1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 19:50:01 -0000	1.1
+++ .cvsignore	16 Mar 2005 19:51:19 -0000	1.2
@@ -0,0 +1 @@
+docutils-0.3.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 19:50:01 -0000	1.1
+++ sources	16 Mar 2005 19:51:19 -0000	1.2
@@ -0,0 +1 @@
+fdd192d62bf5aebac6258a7ae8af5123  docutils-0.3.7.tar.gz



From bugs.michael at gmx.net  Wed Mar 16 19:51:59 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Wed, 16 Mar 2005 20:51:59 +0100
Subject: rpms/ktrack/devel ktrack-headers.patch, NONE, 1.1 ktrack.spec, 
 NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503161708.j2GH8910004485@cvs-int.fedora.redhat.com>
References: <200503161708.j2GH8910004485@cvs-int.fedora.redhat.com>
Message-ID: <20050316205159.4487bc37.bugs.michael@gmx.net>

On Wed, 16 Mar 2005 12:08:09 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/rpms/ktrack/devel


> %setup -q -c %{name}-%{version}-rc1
> pushd %{name}-%{version}-rc1

Option -c is a systematical mistake in several of your packages. You
want -n ... 



From bugs.michael at gmx.net  Wed Mar 16 19:54:18 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Wed, 16 Mar 2005 20:54:18 +0100
Subject: rpms/libosip/devel libosip.spec, NONE, 1.1 .cvsignore, 1.1, 1.2
 sources, 1.1, 1.2
In-Reply-To: <200503161710.j2GHAWlM005091@cvs-int.fedora.redhat.com>
References: <200503161710.j2GHAWlM005091@cvs-int.fedora.redhat.com>
Message-ID: <20050316205418.24aa2144.bugs.michael@gmx.net>

On Wed, 16 Mar 2005 12:10:32 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/rpms/libosip/devel

> %files devel
> %defattr(-,root,root)
> %{_includedir}/osip/*.h

Directory %_includedir/osip  is not included in the package!



From bugs.michael at gmx.net  Wed Mar 16 20:01:54 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Wed, 16 Mar 2005 21:01:54 +0100
Subject: rpms/lock-keys-applet/devel lock-keys-applet.spec, NONE, 1.1
 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503161713.j2GHDZwX005717@cvs-int.fedora.redhat.com>
References: <200503161713.j2GHDZwX005717@cvs-int.fedora.redhat.com>
Message-ID: <20050316210154.2f884bbf.bugs.michael@gmx.net>

On Wed, 16 Mar 2005 12:13:35 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/rpms/lock-keys-applet/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5704/devel

Fails to build. At least Buildrequires gettext is missing.

make[3]: Leaving directory `/home/qa/tmp/rpm/tmp/lock-keys-applet-1.0/docs'
Making all in po
make[3]: Entering directory `/home/qa/tmp/rpm/tmp/lock-keys-applet-1.0/po'
make[3]: *** No rule to make target `deNONE', needed by `all-yes'.  Stop.
make[3]: Leaving directory `/home/qa/tmp/rpm/tmp/lock-keys-applet-1.0/po'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/qa/tmp/rpm/tmp/lock-keys-applet-1.0'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/qa/tmp/rpm/tmp/lock-keys-applet-1.0'
error: Bad exit status from /home/qa/tmp/rpm/tmp/rpm-tmp.2051 (%build)

> %files
> %defattr(-,root,root,-)
> %doc AUTHORS COPYING ChangeLog NEWS README TODO
> %{_datadir}/gnome/help/%{name}
> %{_datadir}/locale/*/*/%{name}.mo

%find_lang is for language files.



From fedora-extras-commits at redhat.com  Wed Mar 16 21:00:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 16:00:39 -0500
Subject: devel/clearlooks clearlooks-0.4-dirs.patch, NONE,
	1.1 clearlooks.spec, 1.2, 1.3
Message-ID: <200503162100.j2GL0dQt013993@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13986

Modified Files:
	clearlooks.spec 
Added Files:
	clearlooks-0.4-dirs.patch 
Log Message:
Fix install issues

clearlooks-0.4-dirs.patch:

--- NEW FILE clearlooks-0.4-dirs.patch ---
--- clearlooks-0.4/themes/Clearlooks-Olive/gtk-2.0/Makefile.in.orig	2005-03-16 15:05:43.149930536 -0500
+++ clearlooks-0.4/themes/Clearlooks-Olive/gtk-2.0/Makefile.in	2005-03-16 15:05:58.706150174 -0500
@@ -217,7 +217,7 @@
 uninstall-info-am:
 install-themeDATA: $(theme_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
+	test -z "$(DESTDIR)$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
 	@list='$(theme_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
--- clearlooks-0.4/themes/Clearlooks-DeepSky/gtk-2.0/Makefile.in.orig	2005-03-16 15:01:35.995104503 -0500
+++ clearlooks-0.4/themes/Clearlooks-DeepSky/gtk-2.0/Makefile.in	2005-03-16 15:01:54.102868103 -0500
@@ -245,7 +245,7 @@
 uninstall-info-am:
 install-themeDATA: $(theme_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
+	test -z "$(DESTDIR)$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
 	@list='$(theme_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
--- clearlooks-0.4/themes/Clearlooks/gtk-2.0/Makefile.in.orig	2005-03-16 15:00:08.175800441 -0500
+++ clearlooks-0.4/themes/Clearlooks/gtk-2.0/Makefile.in	2005-03-16 15:00:16.964229686 -0500
@@ -245,7 +245,7 @@
 uninstall-info-am:
 install-themeDATA: $(theme_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
+	test -z "$(DESTDIR)$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
 	@list='$(theme_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
--- clearlooks-0.4/themes/Clearlooks/metacity-1/Makefile.in.orig	2005-03-16 15:00:33.588258474 -0500
+++ clearlooks-0.4/themes/Clearlooks/metacity-1/Makefile.in	2005-03-16 15:36:58.038831762 -0500
@@ -171,7 +171,7 @@
 target_alias = @target_alias@
 gnome_data = @gnome_prefix@/share
 dummy = 
-themedir = $(gnome_data)/themes/Clearlooks/metacity-1
+themedir = $(datadir)/themes/Clearlooks/metacity-1
 theme_DATA = metacity-theme-1.xml
 EXTRA_DIST = metacity-theme-1.xml
 all: all-am
@@ -218,7 +218,7 @@
 uninstall-info-am:
 install-themeDATA: $(theme_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
+	test -z "$(DESTDIR)$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
 	@list='$(theme_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
--- clearlooks-0.4/themes/Clearlooks/Makefile.in.orig	2005-03-16 14:59:21.839082200 -0500
+++ clearlooks-0.4/themes/Clearlooks/Makefile.in	2005-03-16 14:59:47.009583478 -0500
@@ -230,7 +230,7 @@
 uninstall-info-am:
 install-themeDATA: $(theme_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
+	test -z "$(DESTDIR)$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
 	@list='$(theme_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
--- clearlooks-0.4/src/Makefile.in.orig	2005-03-16 14:56:17.892958879 -0500
+++ clearlooks-0.4/src/Makefile.in	2005-03-16 14:56:56.330089013 -0500
@@ -241,7 +241,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-engineLTLIBRARIES: $(engine_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(enginedir)" || $(mkdir_p) "$(DESTDIR)$(enginedir)"
+	test -z "$(DESTDIR)$(enginedir)" || $(mkdir_p) "$(DESTDIR)$(enginedir)"
 	@list='$(engine_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \


Index: clearlooks.spec
===================================================================
RCS file: /cvs/extras/devel/clearlooks/clearlooks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clearlooks.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ clearlooks.spec	16 Mar 2005 21:00:37 -0000	1.3
@@ -1,11 +1,12 @@
 Name:           clearlooks
 Version:        0.4
-Release:        2
+Release:        3
 Summary:        An attractive GTK+ 2 engine with a focus on usability
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://clearlooks.sourceforge.net/screenshots/
 Source0:        http://prdownloads.sourceforge.net/clearlooks/clearlooks-0.4.tar.bz2
+Patch0:         clearlooks-0.4-dirs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel
 
@@ -14,14 +15,16 @@
 
 %prep
 %setup -q
+%patch -p 1 -b dirs
 
 %build
-%configure
+%configure --enable-animation
 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
@@ -33,6 +36,11 @@
 %{_libdir}/gtk-2.0/2.4.0/engines/*
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-3
+- Fixed build problem with metacity-theme-1.xml
+- Added option for animated progress bars
+- Removed .la files
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 21:15:09 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed, 16 Mar 2005 16:15:09 -0500
Subject: devel/galeon .cvsignore, 1.2, 1.3 galeon.spec, 1.5, 1.6 sources, 1.3,
	1.4
Message-ID: <200503162115.j2GLF9G5015073@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/devel/galeon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15065

Modified Files:
	.cvsignore galeon.spec sources 
Log Message:
galeon: updated to 1.3.20


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/galeon/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:21:30 -0000	1.2
+++ .cvsignore	16 Mar 2005 21:15:07 -0000	1.3
@@ -1 +1 @@
-galeon-1.3.11a-fixed.tar.bz2
+galeon-1.3.20.tar.bz2


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/devel/galeon/galeon.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- galeon.spec	5 Mar 2005 21:10:21 -0000	1.5
+++ galeon.spec	16 Mar 2005 21:15:07 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
-Version:	1.3.19
-Release:	2
+Version:	1.3.20
+Release:	1
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -16,7 +16,6 @@
 BuildRequires:	libgnomeui-devel >= 2.5.2
 %{!?_without_nautilus:BuildRequires:	eel2-devel nautilus}
 
-
 %description
 Galeon is a web browser built around Gecko (Mozilla's rendering
 engine) and Necko (Mozilla's networking engine). It's a GNOME web
@@ -95,6 +94,9 @@
 
 
 %changelog
+* Wed Mar 16 2005 Dams <anvil[AT]livna.org> - 1.3.20-1
+- Updated to 1.3.20
+
 * Sun Jan 23 2005 Dams <anvil[AT]livna.org> - 0:1.3.19-2
 - Urlized Source0
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/galeon/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jan 2005 19:40:22 -0000	1.3
+++ sources	16 Mar 2005 21:15:07 -0000	1.4
@@ -1 +1 @@
-7d272c6b1863252026386fd299122841  galeon-1.3.19.tar.bz2
+13954dd2f11748c02f3071ac9987d7d3  galeon-1.3.20.tar.bz2



From toshio at tiki-lounge.com  Wed Mar 16 20:19:35 2005
From: toshio at tiki-lounge.com (Toshio)
Date: Wed, 16 Mar 2005 15:19:35 -0500
Subject: APPROVED: python-docutils
Message-ID: <1111004376.4342.12.camel@Madison.badger.com>

Name: python-docutils
The Docutils project specifies a plaintext markup language,
reStructuredText,
which is easy to read and quick to write.  The project includes a python
library to parse rST files and transform them into other useful formats
such
as HTML, XML, and TeX as well as commandline tools that give the enduser
access to this functionality.

Currently, the library supports parsing rST that is in standalone files
and
PEPs (Python Enhancement Proposals).  Work is underway to parse rST from
Python inline documentation modules and packages.

QA done at fedora.us : https://bugzilla.fedora.us/show_bug.cgi?id=2081

Maintainer: Toshio Kuratomi
Reviewer: Michael Schwendt

-- 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/hamlib hamlib.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1dc019223@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/hamlib

Modified Files:
	hamlib.spec 
Log Message:
More review fixes


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hamlib.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ hamlib.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -19,7 +19,7 @@
 
 %description
 Hamlib provides a standardised programming interface that applications 
-can uso to send the appropriate commands to a radio.
+can use to send the appropriate commands to a radio.
  
 Also included in the package is a simple radio control program 'rigctl',
 which lets one control a radio transceiver or receiver, either from
@@ -197,6 +197,9 @@
 
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-3
+- Spell-corrected %description
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-2
 - Removed/fixed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/ktrack ktrack.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1q2019231@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/ktrack

Modified Files:
	ktrack.spec 
Log Message:
More review fixes


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ktrack.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ ktrack.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 2.rc1
+Release: 3.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -10,24 +10,21 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-K-Track is an KDE3 satellite prediction software, especially suited for radio amateurs operating through the satellites that are providing linear transponders.
+K-Track is an KDE3 satellite prediction software, especially suited for radio
+amateurs operating through the satellites that are providing linear
+transponders.
 
 %prep
 rm -rf $RPM_BUILD_ROOT
-%setup -q -c %{name}-%{version}-rc1
-pushd %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc1
 %patch -p 1 -b .headers
-popd
 
 %build
-pushd %{name}-%{version}-rc1
 %configure --with-qt-includes=/usr/lib/qt-3.3/include --with-qt-libraries=/usr/lib/qt-3.3/lib
 make
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-pushd %{name}-%{version}-rc1
 %makeinstall
 desktop-file-install --vendor=Fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -37,7 +34,6 @@
   --add-category KDE \
   ktrack/ktrack.desktop
 install -D -m 0644 ktrack/hi32-app-ktrack.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ktrack.png
-popd
 rm -r $RPM_BUILD_ROOT%{_datadir}/doc
 
 %clean
@@ -58,9 +54,13 @@
 %{_datadir}/locale/fr/LC_MESSAGES/ktrack.mo
 %{_datadir}/applications/Fedora-ktrack.desktop
 %{_datadir}/pixmaps/ktrack.png
-%doc %{name}-%{version}-rc1/AUTHORS %{name}-%{version}-rc1/ChangeLog %{name}-%{version}-rc1/COPYING %{name}-%{version}-rc1/README %{name}-%{version}-rc1/TODO %{name}-%{version}-rc1/doc/en/index.docbook %{name}-%{version}-rc1/doc/en/index.cache.bz2
+%doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-3.rc1
+- Modified %setup to use -n
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-2.rc1
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/gpredict gpredict.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1cL019219@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/gpredict
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/gpredict

Modified Files:
	gpredict.spec 
Log Message:
More review fixes


Index: gpredict.spec
===================================================================
RCS file: /cvs/extras/devel/gpredict/gpredict.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gpredict.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ gpredict.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -11,7 +11,8 @@
 BuildRequires:  gtk+-devel hamlib-devel gnome-libs-devel gettext GConf-devel gnome-vfs-devel gnome-print-devel gal-devel desktop-file-utils
 
 %description
-Gpredict calculates and shows the position of satellites in lists and on maps. It can also make detailed predictions of upcoming satellites passes.
+Gpredict calculates and shows the position of satellites in lists and on maps.
+It can also make detailed predictions of upcoming satellites passes.
 
 %prep
 %setup -q
@@ -63,6 +64,9 @@
 %{_datadir}/pixmaps/%{name}
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-3
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/edb edb.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1Fv019211@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/edb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/edb

Modified Files:
	edb.spec 
Log Message:
More review fixes


Index: edb.spec
===================================================================
RCS file: /cvs/extras/devel/edb/edb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- edb.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ edb.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           edb
 Version:        1.0.5
-Release:        2
+Release:        3
 Summary:        A database convenience library wrapped around BDB
 Group:          System Environment/Libraries
 License:        MIT
@@ -12,7 +12,9 @@
 Requires(postun): /sbin/ldconfig
 
 %description
-EDB is a database convenience library wrapped around the Berkeley DB 2.7.7 by Sleepycat Software. It is intended to make accessing database information portable, easy, fast and efficient.
+EDB is a database convenience library wrapped around the Berkeley DB 2.7.7 by
+Sleepycat Software. It is intended to make accessing database information
+portable, easy, fast and efficient.
 
 %package        devel
 Summary:        Development libraries for edb
@@ -20,7 +22,8 @@
 Requires:       %{name} = %{version}-%{release}
 
 %description    devel
-The edb-devel package contains static libraries and header files for developing edb applications.
+The edb-devel package contains static libraries and header files for developing
+edb applications.
 
 %package        ncurses
 Summary:        ncurses frontend for edb
@@ -82,6 +85,9 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-3
+- Broke %descriptions at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/python-amara python-amara.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1fk019251@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/python-amara

Modified Files:
	python-amara.spec 
Log Message:
More review fixes


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/devel/python-amara/python-amara.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-amara.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ python-amara.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -1,8 +1,19 @@
-%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')
 
-Name:           python-amara
-Version:        0.9.4
-Release:        2
+%define version 0.9.4
+
+%if "%{pyver}" == "%{mainpyver}"
+%define name python-amara
+%define prov python%{pyver}-amara = %{version} python-amara = %{version}
+%else
+%define name python%{pyver}-amara
+%define prov python%{pyver}-Amara = %{version}
+%endif
+
+Name:           %name
+Version:        %version
+Release:        3
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -11,29 +22,33 @@
 Source0:        http://uche.ogbuji.net/uche.ogbuji.net/tech/4Suite/amara/Amara-0.9.4.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python
-Requires:       4Suite >= 1.0
-Provides:       python-Amara = %{version} Amara = %{version}
+BuildRequires:  python-abi = %{pyver}
+Requires:       python-abi = %{pyver} 4Suite >= 1.0
+Provides:       %{prov}
 BuildArch:      noarch
 
 %description
-Amara is a collection of Pythonic tools for XML data binding. Not just tools that happen to be written in Python, but tools built from the ground up to use Python idioms and take advantage of the many advantages of Python over other programming languages.
-
-Amara builds on 4Suite, but whereas 4Suite focuses more on literal implementation of XML standards in Python, Amara adds a much more Pythonic face to these capabilities.
+Amara is a collection of Pythonic tools for XML data binding. Not just tools
+that happen to be written in Python, but tools built from the ground up to use
+Python idioms and take advantage of the many advantages of Python over other
+programming languages.
+
+Amara builds on 4Suite, but whereas 4Suite focuses more on literal
+implementation of XML standards in Python, Amara adds a much more Pythonic face
+to these capabilities.
 
-Amara provides tools you can trust to conform with XML standards without losing the familiar Python feel.
+Amara provides tools you can trust to conform with XML standards without losing
+the familiar Python feel.
 
 %prep
-%setup -q -c Amara-0.9.4
+%setup -q -n Amara-0.9.4
 
 %build
-cd Amara-0.9.4
 python setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd Amara-0.9.4
-python setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}
+python%{pyver} setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,10 +57,15 @@
 %defattr(-,root,root,-)
 %{_bindir}/flextyper.py
 %{_bindir}/scimitar.py
-%{_libdir}/python%{pyver}/site-packages/amara/*
-%doc Amara-0.9.4/CHANGES Amara-0.9.4/COPYING Amara-0.9.4/demo Amara-0.9.4/manual.html Amara-0.9.4/README Amara-0.9.4/TODO
+%{_libdir}/python%{pyver}/site-packages/amara
+%doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-3
+- Better %pyver and BR/Requires handling
+- Broke %description at 80 columns
+- Fixed file ownership
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/ghasher ghasher.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1NF019215@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ghasher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/ghasher

Modified Files:
	ghasher.spec 
Log Message:
More review fixes


Index: ghasher.spec
===================================================================
RCS file: /cvs/extras/devel/ghasher/ghasher.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ghasher.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ ghasher.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ghasher
 Version:        1.2.0
-Release:        2
+Release:        3
 Summary:        GUI hasher for GTK+ 2
 Group:          Applications/File
 License:        BSD
@@ -10,7 +10,9 @@
 BuildRequires:  gtk2-devel >= 2.4 openssl-devel desktop-file-utils libglade2-devel
 
 %description
-ghasher can easily show the MD5 sum (or md2, md4, sha1, sha, ripemd160, dss1) of a file. Motivation for this utility was that users shouldn't need to open a command line for checking the MD5 sum of files they download.
+ghasher can easily show the MD5 sum (or md2, md4, sha1, sha, ripemd160, dss1)
+of a file. Motivation for this utility was that users shouldn't need to open a
+command line for checking the MD5 sum of files they download.
 
 %prep
 %setup -q
@@ -53,6 +55,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-3
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/lock-keys-applet lock-keys-applet.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1Lo019243@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/lock-keys-applet

Modified Files:
	lock-keys-applet.spec 
Log Message:
More review fixes


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/extras/devel/lock-keys-applet/lock-keys-applet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lock-keys-applet.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ lock-keys-applet.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        2
+Release:        3
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
 License:        GPL
@@ -12,7 +12,11 @@
 Requires(postun): scrollkeeper
 
 %description
-lock-keys-applet is a GNOME applet that shows the status of the Caps, Num and Scroll Lock keys of your keyboard. This isn't especially usefull for normal keyboards as they have LEDs for that. But some keyboards (especially wireless keyboards) don't. One more feature of the applet is that it saves the status of the lock keys and restores them when starting GNOME.
+lock-keys-applet is a GNOME applet that shows the status of the Caps, Num and
+Scroll Lock keys of your keyboard. This isn't especially usefull for normal
+keyboards as they have LEDs for that. But some keyboards (especially wireless
+keyboards) don't. One more feature of the applet is that it saves the status of
+the lock keys and restores them when starting GNOME.
 
 %prep
 %setup -q
@@ -24,6 +28,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -34,17 +39,20 @@
 %postun
 scrollkeeper-update
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_datadir}/gnome/help/%{name}
-%{_datadir}/locale/*/*/%{name}.mo
 %{_datadir}/omf/%{name}
 %{_datadir}/pixmaps/%{name}.png
 %{_libdir}/bonobo/servers/*.server
 %{_libexecdir}/%{name}
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-3
+- Used %find_lang instead of putting the .mo files in %files.
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/deskbar-applet deskbar-applet.spec,1.1,1.2
Message-ID: <200503162342.j2GNg1Q5019207@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/deskbar-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/deskbar-applet

Modified Files:
	deskbar-applet.spec 
Log Message:
More review fixes


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/devel/deskbar-applet/deskbar-applet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deskbar-applet.spec	16 Mar 2005 16:59:04 -0000	1.1
+++ deskbar-applet.spec	16 Mar 2005 23:41:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           deskbar-applet
 Version:        0.2
-Release:        1
+Release:        2
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
 License:        GPL
@@ -11,7 +11,8 @@
 BuildArch:      noarch
 
 %description
-This applet looks like the current Gnome Mini-Commander, but it launches search queries instead of programs.
+This applet looks like the current Gnome Mini-Commander, but it launches search
+queries instead of programs.
 
 Example search-engines include
 + Google
@@ -42,6 +43,9 @@
 %{_libdir}/bonobo/servers/DeskbarApplet.server
 
 %changelog
+* Wed Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-2
+- Broke %description at 80 columns
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-1
 - Bump release to 1
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/python-HTMLgen python-HTMLgen.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1Nq019247@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/python-HTMLgen

Modified Files:
	python-HTMLgen.spec 
Log Message:
More review fixes


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/devel/python-HTMLgen/python-HTMLgen.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-HTMLgen.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ python-HTMLgen.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -13,7 +13,7 @@
 
 Name:           %name
 Version:        %version
-Release:        1
+Release:        2
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -29,10 +29,12 @@
 BuildArch:      noarch
 
 %description
-HTMLgen is a class library for the generation of HTML documents with Python scripts. It's used when you want to create HTML pages containing information which changes from time to time.
+HTMLgen is a class library for the generation of HTML documents with Python
+scripts. It's used when you want to create HTML pages containing information
+which changes from time to time.
 
 %prep
-%setup -q -c htmlgen
+%setup -q -n HTMLgen
 
 %build
 
@@ -40,7 +42,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
 for file in HTMLgen.py HTMLcolors.py HTMLutil.py HTMLcalendar.py barchart.py colorcube.py imgsize.py NavLinks.py Formtools.py ImageH.py ImageFileH.py ImagePaletteH.py GifImagePluginH.py JpegImagePluginH.py PngImagePluginH.py; do
-  install -m 0644 HTMLgen/$file $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+  install -m 0644 $file $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
 done
 python%{pyver} %{_libdir}/python%{pyver}/compileall.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
 python%{pyver} -O %{_libdir}/python%{pyver}/compileall.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
@@ -54,6 +56,10 @@
 %{_libdir}/python%pyver/site-packages/*.py[co]
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-2
+- Modified %setup to use -n
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-1
 - Bump release to 1
 - Fixed License tag



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/leafpad leafpad.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1Bk019235@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/leafpad

Modified Files:
	leafpad.spec 
Log Message:
More review fixes


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/devel/leafpad/leafpad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- leafpad.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ leafpad.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           leafpad
 Version:        0.7.9
-Release:        2
+Release:        3
 Summary:        GTK+ based simple text editor
 
 Group:          Applications/Editors
@@ -15,7 +15,9 @@
 Requires(postun): desktop-file-utils
 
 %description
-Leafpad is a GTK+ based simple text editor. The user interface is similar to Notepad. It aims to be lighter than GEdit and KWrite, and to be as useful as them.
+Leafpad is a GTK+ based simple text editor. The user interface is similar to
+Notepad. It aims to be lighter than GEdit and KWrite, and to be as useful as
+them.
 
 %prep
 %setup -q
@@ -59,6 +61,9 @@
 %{_datadir}/pixmaps/leafpad.png
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-3
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/libosip libosip.spec,1.1,1.2
Message-ID: <200503162342.j2GNg1IX019239@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/libosip

Modified Files:
	libosip.spec 
Log Message:
More review fixes


Index: libosip.spec
===================================================================
RCS file: /cvs/extras/devel/libosip/libosip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libosip.spec	16 Mar 2005 17:10:30 -0000	1.1
+++ libosip.spec	16 Mar 2005 23:41:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libosip
 Version:        0.9.7
-Release:        1
+Release:        2
 Summary:        oSIP is an implementation of SIP
 
 Group:          System Environment/Libraries
@@ -15,7 +15,11 @@
 %description
 oSIP is an implementation of SIP.
 
-SIP stands for the Session Initiation Protocol and is described by the rfc3261 (wich deprecates rfc2543). This library aims to provide multimedia and telecom software developers an easy and powerful interface to initiate and control SIP based sessions in their applications. SIP is a open standard replacement from IETF for H323.
+SIP stands for the Session Initiation Protocol and is described by the rfc3261
+(wich deprecates rfc2543). This library aims to provide multimedia and telecom
+software developers an easy and powerful interface to initiate and control SIP
+based sessions in their applications. SIP is a open standard replacement from
+IETF for H.323.
 
 %package        devel
 Summary:        Development libraries for oSIP
@@ -58,12 +62,16 @@
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/osip/*.h
+%{_includedir}/osip
 %{_libdir}/*.a
 %{_libdir}/*.la
 %{_libdir}/*.so
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-2
+- Fix %files devel to include %{_includedir}/osip
+- Broke %description at 80 columns
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-1
 - Bump release to 1
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/kphone kphone.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1uh019227@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/kphone

Modified Files:
	kphone.spec 
Log Message:
More review fixes


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kphone.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ kphone.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        2
+Release:        3
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -13,20 +13,21 @@
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils
 
 %description
-KPhone is a SIP (Session Initiation Protocol) user agent for Linux, with which you can initiate VoIP (Voice over IP) connections over the Internet.  It supports Presence and Instant Messaging, and to some extent also video calls between two hosts.
+KPhone is a SIP (Session Initiation Protocol) user agent for Linux, with which
+you can initiate VoIP (Voice over IP) connections over the Internet.  It
+supports Presence and Instant Messaging, and to some extent also video calls
+between two hosts.
 
 %prep
-%setup -q -c kphone
+%setup -q -n kphone
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-cd kphone
 ./configure --prefix=$RPM_BUILD_ROOT%{_prefix}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd kphone
 %makeinstall
 install -D -m 0644 icons/large-kphone.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kphone.png
 desktop-file-install --vendor=Fedora \
@@ -50,6 +51,10 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-3
+- Modified %setup to use -n
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/clearlooks clearlooks.spec,1.3,1.4
Message-ID: <200503162342.j2GNg1J9019203@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/clearlooks

Modified Files:
	clearlooks.spec 
Log Message:
More review fixes


Index: clearlooks.spec
===================================================================
RCS file: /cvs/extras/devel/clearlooks/clearlooks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- clearlooks.spec	16 Mar 2005 21:00:37 -0000	1.3
+++ clearlooks.spec	16 Mar 2005 23:41:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           clearlooks
 Version:        0.4
-Release:        3
+Release:        4
 Summary:        An attractive GTK+ 2 engine with a focus on usability
 Group:          User Interface/Desktops
 License:        GPL
@@ -11,7 +11,8 @@
 BuildRequires:  gtk2-devel
 
 %description
-Clearlooks will transform your GNOME desktop into an attractive looking and usable environment.
+Clearlooks will transform your GNOME desktop into an attractive looking and
+usable environment.
 
 %prep
 %setup -q
@@ -36,6 +37,9 @@
 %{_libdir}/gtk-2.0/2.4.0/engines/*
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-4
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-3
 - Fixed build problem with metacity-theme-1.xml
 - Added option for animated progress bars



From fedora-extras-commits at redhat.com  Thu Mar 17 02:05:20 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 21:05:20 -0500
Subject: rpms/perl-pmtools - New directory
Message-ID: <200503170205.j2H25KEw024311@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24304/perl-pmtools

Log Message:
Directory /cvs/extras/rpms/perl-pmtools added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 02:05:20 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 21:05:20 -0500
Subject: rpms/perl-pmtools/devel - New directory
Message-ID: <200503170205.j2H25KNT024314@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24304/perl-pmtools/devel

Log Message:
Directory /cvs/extras/rpms/perl-pmtools/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 02:05:39 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 21:05:39 -0500
Subject: rpms/perl-pmtools Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503170205.j2H25dV0024375@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24366

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-pmtools


--- NEW FILE Makefile ---
# Top level Makefile for module perl-pmtools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 17 02:05:39 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 21:05:39 -0500
Subject: rpms/perl-pmtools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503170205.j2H25d7n024378@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24366/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-pmtools


--- 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 Mar 17 02:06:22 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 21:06:22 -0500
Subject: rpms/perl-pmtools import.log,1.1,1.2
Message-ID: <200503170206.j2H26MSf024493@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24484

Modified Files:
	import.log 
Log Message:
auto-import perl-pmtools-1.00-0.fdr.1 on branch devel from perl-pmtools-1.00-0.fdr.1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Mar 2005 02:05:37 -0000	1.1
+++ import.log	17 Mar 2005 02:06:20 -0000	1.2
@@ -0,0 +1 @@
+perl-pmtools-1_00-0_fdr_1:HEAD:perl-pmtools-1.00-0.fdr.1.src.rpm:1111025239



From fedora-extras-commits at redhat.com  Thu Mar 17 02:06:22 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 21:06:22 -0500
Subject: rpms/perl-pmtools/devel perl-pmtools.spec, NONE,
	1.1 pmtools-1.00-different-tarball.patch, NONE,
	1.1 pmtools-1.00-pmall.patch, NONE,
	1.1 pmtools-1.00-pmeth-pman2pmman.patch, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503170206.j2H26Mql024497@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24484/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-pmtools.spec pmtools-1.00-different-tarball.patch 
	pmtools-1.00-pmall.patch pmtools-1.00-pmeth-pman2pmman.patch 
Log Message:
auto-import perl-pmtools-1.00-0.fdr.1 on branch devel from perl-pmtools-1.00-0.fdr.1.src.rpm


--- NEW FILE perl-pmtools.spec ---
%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:           perl-pmtools
Version:        1.00
Release:        0.fdr.1
Epoch:          0
Summary:        A suite of small programs to help manage Perl modules

Group:          Development/Libraries
License:        Artistic
Url:            http://language.perl.com/
Source:         http://history.perl.org/src/pmtools-1.00.tar.gz
Patch1:         pmtools-1.00-different-tarball.patch
Patch2:         pmtools-1.00-pmall.patch
Patch3:         pmtools-1.00-pmeth-pman2pmman.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is pmtools -- a suite of small programs to help manage modules.
The names are totally preliminary, and in fact, so is the code.  We follow
the "keep it small" notion of many tiny tools each doing one thing well,
eschewing giant megatools with millions of options.

Tom Christiansen


%prep
%setup -q -n pmtools-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
chmod 755 pmman
find . -type f -perm 755 | xargs %{__perl} -pi -e 's{^#!/usr/bin/env perl}{#!%{__perl}}'


%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 README
%{_bindir}/*
%{perl_vendorlib}/Devel/
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3*


%changelog
* Sun Feb 06 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.00-0.fdr.1
- Valid source file link found.
- Package renamed to 'perl-pmtools' in order to avoid name clash with
  the ACPI debugging tools (pmtools).

* Tue Dec 28 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.00-0.fdr.1
- The patch adds a missing target in Makefile.PL (pmeth) and renames the
  script 'pman' into 'pmman' in order to avoid a filename clash with
  the pinfo package.

* Sat Feb 28 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:1.00-0.fdr.0
- Initial build for fedora.us

pmtools-1.00-different-tarball.patch:

--- NEW FILE pmtools-1.00-different-tarball.patch ---
diff -ruN pmtools-1.00-history/pmall pmtools-1.00/pmall
--- pmtools-1.00-history/pmall	1999-02-16 01:18:36.000000000 +0000
+++ pmtools-1.00/pmall	1999-02-22 17:56:21.000000000 +0000
@@ -132,7 +132,7 @@
     # This should really use system(), because otherwise we bloat.
     my $mod = shift;
     local $SIG{__WARN__} = sub {};
-    eval "require $mod";
+    eval "local \$^W = 0; require $module";
     if ($@) {
 	warn "Cannot require $mod -- $@\n"
 	    if $opt_v;
diff -ruN pmtools-1.00-history/pmeth pmtools-1.00/pmeth
--- pmtools-1.00-history/pmeth	1999-02-16 01:18:48.000000000 +0000
+++ pmtools-1.00/pmeth	1999-02-22 17:56:25.000000000 +0000
@@ -16,7 +16,7 @@
     my $module = shift;
     my @indirect = @_;
     my @baseclasses = @indirect[ 0 .. ($#indirect-1) ];
-    eval "require $module";
+    eval "local \$^W = 0; require $module";
     if ($@) {
 	$@ =~ s/at \(eval.*$//;
 	warn "$0: $@";
diff -ruN pmtools-1.00-history/pmexp pmtools-1.00/pmexp
--- pmtools-1.00-history/pmexp	1999-02-16 01:18:50.000000000 +0000
+++ pmtools-1.00/pmexp	1999-02-22 17:56:28.000000000 +0000
@@ -8,7 +8,7 @@
 $errors = 0;
 
 for $module (@ARGV) { 
-    eval "require $module";
+    eval "local \$^W = 0; require $module";
     if ($@) {
         $@ =~ s/at \(eval.*$//;
         warn "$0: $@";
diff -ruN pmtools-1.00-history/pmload pmtools-1.00/pmload
--- pmtools-1.00-history/pmload	1999-02-16 01:18:57.000000000 +0000
+++ pmtools-1.00/pmload	1999-02-22 17:56:33.000000000 +0000
@@ -8,7 +8,7 @@
 %seen = %INC;
 
 $module = shift;
-eval "require $module";
+eval "local \$^W = 0; require $module";
 
 if ($@) {
     $@ =~ s/at \(eval.*$//;
diff -ruN pmtools-1.00-history/pmpath pmtools-1.00/pmpath
--- pmtools-1.00-history/pmpath	1999-02-16 01:19:01.000000000 +0000
+++ pmtools-1.00/pmpath	1999-02-22 17:55:54.000000000 +0000
@@ -7,7 +7,7 @@
 $errors = 0;
 
 for $module (@ARGV) {
-    eval "require $module";
+    eval "local \$^W = 0; require $module";
     if ($@) {
 	$@ =~ s/at \(eval.*$//;
 	warn "$0: $@";
diff -ruN pmtools-1.00-history/pmvers pmtools-1.00/pmvers
--- pmtools-1.00-history/pmvers	1999-02-16 01:19:05.000000000 +0000
+++ pmtools-1.00/pmvers	1999-02-22 17:56:41.000000000 +0000
@@ -7,7 +7,7 @@
 $errors = 0;
 
 for $module (@ARGV) {
-    eval "require $module";
+    eval "local \$^W = 0; require $module";
     if ($@) {
 	$@ =~ s/at \(eval.*$//;
 	warn "$0: $@";

pmtools-1.00-pmall.patch:

--- NEW FILE pmtools-1.00-pmall.patch ---
diff -ruN pmtools-1.00/pmall pmtools-1.00-modified/pmall
--- pmtools-1.00/pmall	2005-02-07 01:20:07.045247168 +0000
+++ pmtools-1.00-modified/pmall	2005-02-07 01:21:50.649496928 +0000
@@ -132,7 +132,7 @@
     # This should really use system(), because otherwise we bloat.
     my $mod = shift;
     local $SIG{__WARN__} = sub {};
-    eval "local \$^W = 0; require $module";
+    eval "local \$^W = 0; require $mod";
     if ($@) {
 	warn "Cannot require $mod -- $@\n"
 	    if $opt_v;

pmtools-1.00-pmeth-pman2pmman.patch:

--- NEW FILE pmtools-1.00-pmeth-pman2pmman.patch ---
diff -ruN pmtools-1.00/Makefile.lame pmtools-1.00-modified/Makefile.lame
--- pmtools-1.00/Makefile.lame	1999-02-15 21:40:31.000000000 +0000
+++ pmtools-1.00-modified/Makefile.lame	2004-12-28 20:06:11.745150464 +0000
@@ -1,5 +1,5 @@
 
-PROGRAMS=basepods faqpods modpods pfcat plxload pmall pman pmcat \
+PROGRAMS=basepods faqpods modpods pfcat plxload pmall pmman pmcat \
 	pmdesc pmdirs pmeth pmexp pmfunc pminst pmload pmls pmpath pmvers podgrep \
 	podpath pods podtoc sitepods stdpods
 
diff -ruN pmtools-1.00/Makefile.PL pmtools-1.00-modified/Makefile.PL
--- pmtools-1.00/Makefile.PL	1999-02-16 01:13:35.000000000 +0000
+++ pmtools-1.00-modified/Makefile.PL	2004-12-28 20:00:27.997408064 +0000
@@ -4,8 +4,8 @@
 	NAME => "pmtools",
         DISTNAME => "pmtools",
 	EXE_FILES => [  basepods, faqpods, modpods, pfcat, plxload,
-			pmall, pman, pmcat, pmdesc, pmdirs, pmexp,
-			pmfunc, pminst, pmload, pmls, pmpath, pmvers,
+			pmall, pmcat, pmdesc, pmdirs, pmeth, pmexp,
+			pmfunc, pminst, pmload, pmman, pmls, pmpath, pmvers,
 			podgrep, podpath, pods, podtoc, sitepods,
 			stdpods ],
 	PM => { 'Devel/Loaded.pm' => '$(INST_LIBDIR)/Devel/Loaded.pm' }
diff -ruN pmtools-1.00/MANIFEST pmtools-1.00-modified/MANIFEST
--- pmtools-1.00/MANIFEST	1999-02-16 01:17:15.000000000 +0000
+++ pmtools-1.00-modified/MANIFEST	2004-12-28 20:06:29.068516912 +0000
@@ -10,7 +10,7 @@
 pfcat
 plxload
 pmall
-pman
+pmman
 pmcat
 pmdesc
 pmdirs
diff -ruN pmtools-1.00/pman pmtools-1.00-modified/pman
--- pmtools-1.00/pman	1999-02-16 01:18:39.000000000 +0000
+++ pmtools-1.00-modified/pman	1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-#!/usr/bin/env perl
-# pman -- show a module's man page
-# tchrist at perl.com
-
-BEGIN { $^W = 1 }
-BEGIN { die "usage: $0 module ...\n" unless @ARGV }
-
-use FindBin qw($Bin);
-
-$errors = 0;
-
-unless ($pager = $ENV{PAGER}) {
-    require Config;
-    $pager = $Config::Config{"pager"} || "more";
-} 
-
-for $module (@ARGV) { 
-    my $path =  `$Bin/pmpath $module`;
-    if ($?) {
-	$errors++;
-	next;
-    } 
-    chomp $path;
-    system "pod2text $path | $pager";
-    $errors += ($? != 1);
-}
-
-exit($errors != 0);
-
-__END__
-
-=head1 NAME
-
-pman - show a module's man page
-
-=head1 DESCRIPTION
-
-Send a module's pod through pod2text and your pager.
-
-This is mostly here for people too lazy to type
-
-    $ pod2text `pmpath CGI` | $PAGER
-
-=head1 EXAMPLES
-
-    $ pman CGI
-    $ pman Curses
-
-Or running under different versions of Perl: 
-
-    $ oldperl -S pman CGI
-    $ filsperl -S pman Threads
-
-=head1 SEE ALSO
-
-pod2text(1), perlpod(1), pod2man(1), pod2html(1).
-
-=head1 AUTHOR and COPYRIGHT
-
-Copyright (c) 1999 Tom Christiansen
-
-This is free software.  You may modify it and distribute it 
-under Perl's Artistic Licence.  Modified versions must be
-clearly indicated.
diff -ruN pmtools-1.00/pmman pmtools-1.00-modified/pmman
--- pmtools-1.00/pmman	1970-01-01 01:00:00.000000000 +0100
+++ pmtools-1.00-modified/pmman	2004-12-28 20:03:48.054994688 +0000
@@ -0,0 +1,64 @@
+#!/usr/bin/env perl
+# pmman -- show a module's man page
+# tchrist at perl.com
+
+BEGIN { $^W = 1 }
+BEGIN { die "usage: $0 module ...\n" unless @ARGV }
+
+use FindBin qw($Bin);
+
+$errors = 0;
+
+unless ($pager = $ENV{PAGER}) {
+    require Config;
+    $pager = $Config::Config{"pager"} || "more";
+} 
+
+for $module (@ARGV) { 
+    my $path =  `$Bin/pmpath $module`;
+    if ($?) {
+	$errors++;
+	next;
+    } 
+    chomp $path;
+    system "pod2text $path | $pager";
+    $errors += ($? != 1);
+}
+
+exit($errors != 0);
+
+__END__
+
+=head1 NAME
+
+pmman - show a module's man page
+
+=head1 DESCRIPTION
+
+Send a module's pod through pod2text and your pager.
+
+This is mostly here for people too lazy to type
+
+    $ pod2text `pmpath CGI` | $PAGER
+
+=head1 EXAMPLES
+
+    $ pmman CGI
+    $ pmman Curses
+
+Or running under different versions of Perl: 
+
+    $ oldperl -S pmman CGI
+    $ filsperl -S pmman Threads
+
+=head1 SEE ALSO
+
+pod2text(1), perlpod(1), pod2man(1), pod2html(1).
+
+=head1 AUTHOR and COPYRIGHT
+
+Copyright (c) 1999 Tom Christiansen
+
+This is free software.  You may modify it and distribute it 
+under Perl's Artistic Licence.  Modified versions must be
+clearly indicated.
diff -ruN pmtools-1.00/README pmtools-1.00-modified/README
--- pmtools-1.00/README	1999-02-16 01:18:08.000000000 +0000
+++ pmtools-1.00-modified/README	2004-12-28 20:01:27.751324088 +0000
@@ -383,10 +383,10 @@
 
 =========================================================
 
-pman - show the module's pod docs
+pmman - show the module's pod docs
 
-    $ pman CGI
-    $ pman Curses
+    $ pmman CGI
+    $ pmman Curses
 
 This is mostly here for people too lazy to type
     $ pod2text `pmpath CGI` | more


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Mar 2005 02:05:37 -0000	1.1
+++ .cvsignore	17 Mar 2005 02:06:20 -0000	1.2
@@ -0,0 +1 @@
+pmtools-1.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Mar 2005 02:05:37 -0000	1.1
+++ sources	17 Mar 2005 02:06:20 -0000	1.2
@@ -0,0 +1 @@
+88ee58113ac3d513d94f81f9fdfaeb00  pmtools-1.00.tar.gz



From jpo at di.uminho.pt  Thu Mar 17 02:13:41 2005
From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=)
Date: Thu, 17 Mar 2005 02:13:41 +0000
Subject: APPROVED: perl-pmtools
Message-ID: <4238E7D5.9020009@di.uminho.pt>

Description:
This is pmtools -- a suite of small programs to help manage modules.
The names are totally preliminary, and in fact, so is the code.  We
follow the "keep it small" notion of many tiny tools each doing one
thing well, eschewing giant megatools with millions of options.

Author:
Tom Christiansen

QA:
https://bugzilla.fedora.us/show_bug.cgi?id=2415

Reviewer:
Ville Skytt?

Maintainer:
Jos? Pedro Oliveira
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/128c848e/attachment.sig>

From rc040203 at freenet.de  Thu Mar 17 03:21:33 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Thu, 17 Mar 2005 04:21:33 +0100
Subject: devel/clearlooks clearlooks-0.4-dirs.patch, NONE, 1.1
	clearlooks.spec, 1.2, 1.3
In-Reply-To: <200503162100.j2GL0dQt013993@cvs-int.fedora.redhat.com>
References: <200503162100.j2GL0dQt013993@cvs-int.fedora.redhat.com>
Message-ID: <1111029694.17514.144.camel@mccallum.corsepiu.local>

On Wed, 2005-03-16 at 16:00 -0500, Ignacio Vazquez-Abrams wrote:
> Author: ivazquez
> 
> Update of /cvs/extras/devel/clearlooks
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13986
> 
> Modified Files:
> 	clearlooks.spec 
> Added Files:
> 	clearlooks-0.4-dirs.patch 
> Log Message:
> Fix install issues
> 
> clearlooks-0.4-dirs.patch:
> 
> --- NEW FILE clearlooks-0.4-dirs.patch ---
> --- clearlooks-0.4/themes/Clearlooks-Olive/gtk-2.0/Makefile.in.orig	2005-03-16 15:05:43.149930536 -0500
> +++ clearlooks-0.4/themes/Clearlooks-Olive/gtk-2.0/Makefile.in	2005-03-16 15:05:58.706150174 -0500
> @@ -217,7 +217,7 @@
>  uninstall-info-am:
>  install-themeDATA: $(theme_DATA)
>  	@$(NORMAL_INSTALL)
> -	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
> +	test -z "$(DESTDIR)$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"

This patch doesn't seem correct to me for 2 reasons:

1. This patch hacks an automake-generated Makefile.in.
If something is broken in a configuration, you should edit the
Makefile.am and regenerate the Makefile.in, but you must not manually
edit Makefile.ins.

2. The patch doesn't make sense.
test -z "$(themedir)" and test -z "$(DESTDIR)$(themedir)"
are equivalent.

Ralf





From fedora-extras-commits at redhat.com  Thu Mar 17 03:40:09 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 22:40:09 -0500
Subject: rpms/perl-pmtools/FC-3 perl-pmtools.spec,1.1,1.2
Message-ID: <200503170340.j2H3e9AJ026681@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26670/FC-3

Modified Files:
	perl-pmtools.spec 
Log Message:
Adapting to Fedora.Extras


Index: perl-pmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/FC-3/perl-pmtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-pmtools.spec	17 Mar 2005 02:06:20 -0000	1.1
+++ perl-pmtools.spec	17 Mar 2005 03:40:07 -0000	1.2
@@ -2,8 +2,7 @@
 
 Name:           perl-pmtools
 Version:        1.00
-Release:        0.fdr.1
-Epoch:          0
+Release:        1
 Summary:        A suite of small programs to help manage Perl modules
 
 Group:          Development/Libraries
@@ -68,7 +67,7 @@
 
 
 %changelog
-* Sun Feb 06 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.00-0.fdr.1
+* Sun Feb 06 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.00-1
 - Valid source file link found.
 - Package renamed to 'perl-pmtools' in order to avoid name clash with
   the ACPI debugging tools (pmtools).



From fedora-extras-commits at redhat.com  Thu Mar 17 03:40:09 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 22:40:09 -0500
Subject: rpms/perl-pmtools/devel perl-pmtools.spec,1.1,1.2
Message-ID: <200503170340.j2H3e9qD026685@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26670/devel

Modified Files:
	perl-pmtools.spec 
Log Message:
Adapting to Fedora.Extras


Index: perl-pmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/devel/perl-pmtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-pmtools.spec	17 Mar 2005 02:06:20 -0000	1.1
+++ perl-pmtools.spec	17 Mar 2005 03:40:07 -0000	1.2
@@ -2,8 +2,7 @@
 
 Name:           perl-pmtools
 Version:        1.00
-Release:        0.fdr.1
-Epoch:          0
+Release:        1
 Summary:        A suite of small programs to help manage Perl modules
 
 Group:          Development/Libraries
@@ -68,7 +67,7 @@
 
 
 %changelog
-* Sun Feb 06 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.00-0.fdr.1
+* Sun Feb 06 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.00-1
 - Valid source file link found.
 - Package renamed to 'perl-pmtools' in order to avoid name clash with
   the ACPI debugging tools (pmtools).



From rc040203 at freenet.de  Thu Mar 17 03:57:06 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Thu, 17 Mar 2005 04:57:06 +0100
Subject: rpms/clearlooks/devel clearlooks.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <20050316204320.7b3b4dc2.bugs.michael@gmx.net>
References: <200503161655.j2GGt3m4001351@cvs-int.fedora.redhat.com>
	<20050316204320.7b3b4dc2.bugs.michael@gmx.net>
Message-ID: <1111031826.17514.154.camel@mccallum.corsepiu.local>

On Wed, 2005-03-16 at 20:43 +0100, Michael Schwendt wrote:
> On Wed, 16 Mar 2005 11:55:03 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> 
> > Author: ivazquez
> > 
> > Update of /cvs/extras/rpms/clearlooks/devel
> > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1338/devel
> 
> Build fails on FC3.

Try adding
BuildRequires: libgnome-devel

>  Does it work on FC4T1 (can't test right now):
> 
> error: Installed (but unpackaged) file(s) found:
>    /share/themes/Clearlooks/metacity-1/metacity-theme-1.xml
This is a side effect of the missing "BR: libgnome-devel"


Further (minor) bug:

checking for ANSI C header files... (cached) yes
./configure: line 21956: --variable=gtk_binary_version: command not
found
checking for pkg-config... /usr/bin/pkg-config

The cause is the configure script invoking $PKG_CONFIG before setting
PKG_CONFIG.

It doesn't have any effect on the rpm, so letting upstream fix this
probably would be appropriate.

Below is what works for me on FC3.

Ralf

-------------- next part --------------
A non-text attachment was scrubbed...
Name: clearlooks.diff
Type: text/x-patch
Size: 867 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/63534428/attachment.bin>

From ivazquez at ivazquez.net  Thu Mar 17 05:21:24 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 00:21:24 -0500
Subject: rpms/clearlooks/devel clearlooks.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <1111031826.17514.154.camel@mccallum.corsepiu.local>
References: <200503161655.j2GGt3m4001351@cvs-int.fedora.redhat.com>
	<20050316204320.7b3b4dc2.bugs.michael@gmx.net>
	<1111031826.17514.154.camel@mccallum.corsepiu.local>
Message-ID: <1111036884.18744.8.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 04:57 +0100, Ralf Corsepius wrote:
> On Wed, 2005-03-16 at 20:43 +0100, Michael Schwendt wrote:
> > error: Installed (but unpackaged) file(s) found:
> >    /share/themes/Clearlooks/metacity-1/metacity-theme-1.xml
> This is a side effect of the missing "BR: libgnome-devel"

Aha! This is a much better solution than futzing with patches and
makefiles.

> The cause is the configure script invoking $PKG_CONFIG before setting
> PKG_CONFIG.
> 
> It doesn't have any effect on the rpm, so letting upstream fix this
> probably would be appropriate.

Agreed. I'll kick this one upstream.

Thanks for looking at this closer.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/17446f2c/attachment.sig>

From fedora-extras-commits at redhat.com  Thu Mar 17 05:36:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 00:36:03 -0500
Subject: devel/clearlooks clearlooks.spec, 1.4, 1.5 clearlooks-0.4-dirs.patch,
	1.1, NONE
Message-ID: <200503170536.j2H5a34M029857@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29851

Modified Files:
	clearlooks.spec 
Removed Files:
	clearlooks-0.4-dirs.patch 
Log Message:
BuildRequires: libgnome-devel fix


Index: clearlooks.spec
===================================================================
RCS file: /cvs/extras/devel/clearlooks/clearlooks.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- clearlooks.spec	16 Mar 2005 23:41:59 -0000	1.4
+++ clearlooks.spec	17 Mar 2005 05:36:01 -0000	1.5
@@ -1,14 +1,13 @@
 Name:           clearlooks
 Version:        0.4
-Release:        4
+Release:        5
 Summary:        An attractive GTK+ 2 engine with a focus on usability
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://clearlooks.sourceforge.net/screenshots/
 Source0:        http://prdownloads.sourceforge.net/clearlooks/clearlooks-0.4.tar.bz2
-Patch0:         clearlooks-0.4-dirs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gtk2-devel
+BuildRequires:  gtk2-devel libgnome-devel
 
 %description
 Clearlooks will transform your GNOME desktop into an attractive looking and
@@ -16,7 +15,6 @@
 
 %prep
 %setup -q
-%patch -p 1 -b dirs
 
 %build
 %configure --enable-animation
@@ -37,6 +35,10 @@
 %{_libdir}/gtk-2.0/2.4.0/engines/*
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-5
+- Added libgnome-devel to BR
+- Removed iffy dir patch
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-4
 - Broke %description at 80 columns
 


--- clearlooks-0.4-dirs.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar 17 07:19:47 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 02:19:47 -0500
Subject: rpms/nabi - New directory
Message-ID: <200503170719.j2H7Jlw8000721@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv708/nabi

Log Message:
Directory /cvs/extras/rpms/nabi added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 07:19:47 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 02:19:47 -0500
Subject: rpms/nabi/devel - New directory
Message-ID: <200503170719.j2H7JlWj000724@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv708/nabi/devel

Log Message:
Directory /cvs/extras/rpms/nabi/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 07:20:06 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 02:20:06 -0500
Subject: rpms/nabi Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503170720.j2H7K6p1000803@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv788

Added Files:
	Makefile import.log 
Log Message:
Setup of module nabi


--- NEW FILE Makefile ---
# Top level Makefile for module nabi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 17 07:20:06 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 02:20:06 -0500
Subject: rpms/nabi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503170720.j2H7K6oU000806@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv788/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nabi


--- 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 Mar 17 07:21:04 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 02:21:04 -0500
Subject: rpms/nabi import.log,1.1,1.2
Message-ID: <200503170721.j2H7L4VA000962@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv947

Modified Files:
	import.log 
Log Message:
auto-import nabi-0.14-3 on branch devel from nabi-0.14-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nabi/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Mar 2005 07:20:04 -0000	1.1
+++ import.log	17 Mar 2005 07:21:02 -0000	1.2
@@ -0,0 +1 @@
+nabi-0_14-3:HEAD:nabi-0.14-3.src.rpm:1111044052



From fedora-extras-commits at redhat.com  Thu Mar 17 07:21:04 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 02:21:04 -0500
Subject: rpms/nabi/devel nabi.spec, NONE, 1.1 themeRemoval.sh, NONE,
	1.1 xinput.d-nabi, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503170721.j2H7L4HD000966@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv947/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nabi.spec themeRemoval.sh xinput.d-nabi 
Log Message:
auto-import nabi-0.14-3 on branch devel from nabi-0.14-3.src.rpm


--- NEW FILE nabi.spec ---
%define name nabi
%define version 0.14
%define release 3
%define prefix /usr

Summary: Simple Hangul X Input Method
Name: %{name}
Version: %{version}
Release: %{release}

Group: User Interface/X

Copyright: GPL
URL: http://nabi.kldp.net
Source: http://download.kldp.net/%{name}/%{name}-%{version}.tar.gz
Source2: xinput.d-%{name}
Source3: themeRemoval.sh

BuildRequires: gtk2-devel >= 2.2.0

BuildRoot:  /var/tmp/%{name}-root

%description
Nabi is a simple XIM for Korean, implemented with GTK+2.
It can dock in the notification area, and also show the
status of imhangul(See also http://imhangul.kldp.net).

%prep
rm -rf $RPM_BUILD_ROOT
%setup -q -n %{name}-%{version}

%build
./configure --prefix=%{prefix}
make

%install
make DESTDIR=$RPM_BUILD_ROOT install-strip

install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}

# Nabi shortcut menu

mkdir -p $RPM_BUILD_ROOT/usr/share/applications
cat >$RPM_BUILD_ROOT/usr/share/applications/nabi.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=Nabi
Comment=Simple Hangul XIM
Exec=nabi
Icon=/usr/share/nabi/nabi.png
Terminal=false
NoDisplay=true
Type=Application
Categories=Application;System;X-Red-Hat-Base;
EOF
# End of nabi.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post
alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/ko_KR xinput-ko_KR %{_sysconfdir}/X11/xinit/xinput.d/%{name} 30

%preun
if [ "$1" = 0 ]; then
   alternatives --remove xinput-ko_KR %{_sysconfdir}/X11/xinit/xinput.d/%{name}
fi

%postun

%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README
%attr(755,root,root) %{prefix}/bin/nabi
%{prefix}/share/nabi
%{prefix}/share/locale/*/LC_MESSAGES/nabi.mo
/usr/share/applications/nabi.desktop
%{_sysconfdir}/X11/xinit/xinput.d


%changelog
* Tue Oct 12 2004 Leon Ho <llch at redhat.com>
- add NoDisplay=true to .desktop to hide desktop entry

* Wed Sep 29 2004 Lawrence Lim <llim at redhat.com>
- upgraded to 0.14
- fix bug 131586
  - Trademaked icons in nabi themes
- fix bug 131866
  - Upgrade nabi to 0.14

* Tue Jul 06 2004 Leon Ho <llch at redhat.com>
- upgraded to 0.13
- added support to xinitrc-4.0.1
  - added xinput-nabi
  - added alternativies on post and preun

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Dec 02 2003 David Joo <djoo at redhat.com> 0.11-3
- Packaged against Fedora Core2

* Sat Nov 29 2003 DongCheon Park <pdc at kaist.ac.kr> 0.11-1pdc
- updated to 0.11 release

* Sat Nov 29 2003 DongCheon Park <pdc at kaist.ac.kr> 0.10-2pdc
- fixed BuildRequires

* Sun Nov 09 2003 DongCheon Park <pdc at kaist.ac.kr> 0.10-1pdc
- updated to 0.10 release

* Mon Oct 20 2003 DongCheon Park <pdc at kaist.ac.kr> 0.9-2pdc
- added RedHat/Mandrake specific entries

* Wed Oct 15 2003 DongCheon Park <pdc at kaist.ac.kr> 0.9-1pdc
- updated to 0.9 release

* Thu Oct 09 2003 DongCheon Park <pdc at kaist.ac.kr> 0.8-1pdc
- updated to 0.8 release

* Fri Sep 26 2003 DongCheon Park <pdc at kaist.ac.kr> 0.7-1pdc
- updated to 0.7 release

* Tue Sep 16 2003 DongCheon Park <pdc at kaist.ac.kr> 0.6-1pdc
- updated to 0.6 release

* Mon Sep 08 2003 DongCheon Park <pdc at kaist.ac.kr> 0.5-1pdc
- updated to 0.5 release

* Wed Sep 03 2003 DongCheon Park <pdc at kaist.ac.kr> 0.4-2pdc
- cleaned up nabi.spec

* Wed Aug 27 2003 DongCheon Park <pdc at kaist.ac.kr> 0.4-1pdc
- updated to 0.4 release

* Mon Aug 11 2003 DongCheon Park <pdc at kaist.ac.kr> 0.3-1pdc
- updated to 0.3 release

* Sat Aug 09 2003 DongCheon Park <pdc at kaist.ac.kr> 0.2-1pdc
- updated to 0.2 release

* Thu Aug 07 2003 DongCheon Park <pdc at kaist.ac.kr> 0.1-1pdc
- initial build



--- NEW FILE themeRemoval.sh ---
#!/bin/bash

NAME=nabi-0.14
FILENAME=$NAME.orig.tar.gz
MODIFICATION=$NAME/themes/Makefile.am
CONFIGURE=$NAME/configure.in                         
                                                                                                    
tar xfz $FILENAME
   
for i in Mac MS
do
   sed -e 's/^.*MS.*$//' $CONFIGURE > $CONFIGURE.changed
   cp $CONFIGURE.changed $CONFIGURE
   sed -e 's/^.*Mac.*$//' $CONFIGURE > $CONFIGURE.changed
   cp $CONFIGURE.changed $CONFIGURE
done

mv -f $CONFIGURE.changed $CONFIGURE

echo "configure.in file updated"                                   
                                                                                       
for i in Mac MS
do
   rm -Rf $NAME/themes/$i*
   sed -e 's/^.*MS.*$//' $MODIFICATION > $MODIFICATION.changed
   cp $MODIFICATION.changed $MODIFICATION
   sed -e 's/^.*Mac.*$//' $MODIFICATION > $MODIFICATION.changed
   cp $MODIFICATION.changed $MODIFICATION
done
                                                                                                                             
sed -e '/^$/d' $MODIFICATION > $MODIFICATION.changed
mv -f $MODIFICATION.changed $MODIFICATION
                                                                                                                             
echo "themes removed"


--- NEW FILE xinput.d-nabi ---
XIM=nabi
XIM_PROGRAM=nabi
GTK_IM_MODULE=xim


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Mar 2005 07:20:04 -0000	1.1
+++ .cvsignore	17 Mar 2005 07:21:02 -0000	1.2
@@ -0,0 +1 @@
+nabi-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Mar 2005 07:20:04 -0000	1.1
+++ sources	17 Mar 2005 07:21:02 -0000	1.2
@@ -0,0 +1 @@
+fd17d4baedf374d3f0930ce61f4497c3  nabi-0.14.tar.gz



From wtogami at redhat.com  Thu Mar 17 07:23:46 2005
From: wtogami at redhat.com (Warren Togami)
Date: Wed, 16 Mar 2005 21:23:46 -1000
Subject: APPROVED: nabi
Message-ID: <42393082.7000207@redhat.com>

Nabi is a simple XIM for Korean, implemented with GTK+2.
It can dock in the notification area, and also show the
status of imhangul(See also http://imhangul.kldp.net

This was previously shipped in FC3 so requires no review, however I am 
fixing it up...

Warren Togami
wtogami at redhat.com



From fedora-extras-commits at redhat.com  Thu Mar 17 07:54:09 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 02:54:09 -0500
Subject: rpms/nabi/devel nabi.spec,1.1,1.2
Message-ID: <200503170754.j2H7s9Rb001666@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1654

Modified Files:
	nabi.spec 
Log Message:
many spec fixes



Index: nabi.spec
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/nabi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nabi.spec	17 Mar 2005 07:21:02 -0000	1.1
+++ nabi.spec	17 Mar 2005 07:54:07 -0000	1.2
@@ -1,24 +1,17 @@
-%define name nabi
-%define version 0.14
-%define release 3
-%define prefix /usr
-
 Summary: Simple Hangul X Input Method
-Name: %{name}
-Version: %{version}
-Release: %{release}
-
+Name: nabi
+Version: 0.14
+Release: 4
 Group: User Interface/X
-
-Copyright: GPL
+License: GPL
 URL: http://nabi.kldp.net
 Source: http://download.kldp.net/%{name}/%{name}-%{version}.tar.gz
 Source2: xinput.d-%{name}
 Source3: themeRemoval.sh
-
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel >= 2.2.0
+BuildRequires: gettext
 
-BuildRoot:  /var/tmp/%{name}-root
 
 %description
 Nabi is a simple XIM for Korean, implemented with GTK+2.
@@ -30,10 +23,11 @@
 %setup -q -n %{name}-%{version}
 
 %build
-./configure --prefix=%{prefix}
+./configure --prefix=/usr
 make
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install-strip
 
 install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}
@@ -71,14 +65,18 @@
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog README
-%attr(755,root,root) %{prefix}/bin/nabi
-%{prefix}/share/nabi
-%{prefix}/share/locale/*/LC_MESSAGES/nabi.mo
-/usr/share/applications/nabi.desktop
+%attr(755,root,root)
+%{_bindir}/nabi
+%{_datadir}/nabi
+%{_datadir}/locale/*/LC_MESSAGES/nabi.mo
+%{_datadir}/applications/nabi.desktop
 %{_sysconfdir}/X11/xinit/xinput.d
 
 
 %changelog
+* Wed Mar 16 2005 Warren Togami <wtogami at redhat.com> -  0.14-4
+- many spec fixes
+
 * Tue Oct 12 2004 Leon Ho <llch at redhat.com>
 - add NoDisplay=true to .desktop to hide desktop entry
 



From rc040203 at freenet.de  Thu Mar 17 08:24:43 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Thu, 17 Mar 2005 09:24:43 +0100
Subject: rpms/nabi/devel nabi.spec,1.1,1.2
In-Reply-To: <200503170754.j2H7s9Rb001666@cvs-int.fedora.redhat.com>
References: <200503170754.j2H7s9Rb001666@cvs-int.fedora.redhat.com>
Message-ID: <1111047883.17514.179.camel@mccallum.corsepiu.local>

On Thu, 2005-03-17 at 02:54 -0500, Warren Togami wrote:
> Author: wtogami

>  
>  %build
> -./configure --prefix=%{prefix}
> +./configure --prefix=/usr

> +%attr(755,root,root)
> +%{_bindir}/nabi
> +%{_datadir}/nabi
> +%{_datadir}/locale/*/LC_MESSAGES/nabi.mo
> +%{_datadir}/applications/nabi.desktop
>  %{_sysconfdir}/X11/xinit/xinput.d

?? This is inconsistent:

* If you need "configure --prefix=/usr" you should hard code 
/usr in %files, too.

* If you're using %{_XXX} in %files, you should pass each of the %{_XXX}
vars to configure, too.

Try 
rpmbuild --define '_prefix /usr/local' ...
to see the effect of this inconsistency.

Ralf




From rc040203 at freenet.de  Thu Mar 17 08:29:36 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Thu, 17 Mar 2005 09:29:36 +0100
Subject: devel/kphone kphone.spec,1.2,1.3
In-Reply-To: <200503162342.j2GNg1uh019227@cvs-int.fedora.redhat.com>
References: <200503162342.j2GNg1uh019227@cvs-int.fedora.redhat.com>
Message-ID: <1111048177.17514.182.camel@mccallum.corsepiu.local>

On Wed, 2005-03-16 at 18:42 -0500, Ignacio Vazquez-Abrams wrote:
> Author: ivazquez
> 
> Update of /cvs/extras/devel/kphone
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/kphone
> 
> Modified Files:
> 	kphone.spec 
> Log Message:
> More review fixes

>  ./configure --prefix=$RPM_BUILD_ROOT%{_prefix}

A prefix containing $RPM_BUILD_ROOT hardly can be correct.
You probably want %configure


Furthermore, I am not convinced about this package's sources quality:

- The tarballs is badly packaged:
+ tar -xf -
tar: kphone/dissipate2: implausibly old time stamp 1970-01-01 01:00:00
tar: kphone/gsm: implausibly old time stamp 1970-01-01 01:00:00
tar: kphone/icons: implausibly old time stamp 1970-01-01 01:00:00
tar: kphone/ilbc: implausibly old time stamp 1970-01-01 01:00:00
tar: kphone/kphone: implausibly old time stamp 1970-01-01 01:00:00
tar: Read 7168 bytes from -
tar: kphone/po: implausibly old time stamp 1970-01-01 01:00:00
tar: kphone: implausibly old time stamp 1970-01-01 01:00:00
+ STATUS=0

- Serious compiler warnings:
In file included from dspoutrtp.cpp:16:
rtpdataheader.h:35: warning: `__packed__' attribute ignored
(I didn't investigate potential issues being caused by this warning.)

- This package does not acknowledge RPM_OPT_FLAGS
(This package's configuration is ..., to say the least ...)


Below is a patch to workaround the prefix issue.

Ralf

-------------- next part --------------
A non-text attachment was scrubbed...
Name: kphone-4.1.0-po-hacks.diff
Type: text/x-patch
Size: 478 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/8f7cde0a/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: kphone.spec.diff
Type: text/x-patch
Size: 1101 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/8f7cde0a/attachment-0001.bin>

From ivazquez at ivazquez.net  Thu Mar 17 08:31:31 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 03:31:31 -0500
Subject: rpms/nabi/devel nabi.spec,1.1,1.2
In-Reply-To: <1111047883.17514.179.camel@mccallum.corsepiu.local>
References: <200503170754.j2H7s9Rb001666@cvs-int.fedora.redhat.com>
	<1111047883.17514.179.camel@mccallum.corsepiu.local>
Message-ID: <1111048291.30220.0.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 09:24 +0100, Ralf Corsepius wrote:
> On Thu, 2005-03-17 at 02:54 -0500, Warren Togami wrote:
> >  %build
> > -./configure --prefix=%{prefix}
> > +./configure --prefix=/usr
> 
> * If you're using %{_XXX} in %files, you should pass each of the %{_XXX}
> vars to configure, too.

Or just use %configure.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/5f97ec3f/attachment.sig>

From wtogami at redhat.com  Thu Mar 17 08:31:54 2005
From: wtogami at redhat.com (Warren Togami)
Date: Wed, 16 Mar 2005 22:31:54 -1000
Subject: rpms/nabi/devel nabi.spec,1.1,1.2
In-Reply-To: <1111047883.17514.179.camel@mccallum.corsepiu.local>
References: <200503170754.j2H7s9Rb001666@cvs-int.fedora.redhat.com>
	<1111047883.17514.179.camel@mccallum.corsepiu.local>
Message-ID: <4239407A.1060904@redhat.com>

Ralf Corsepius wrote:
> On Thu, 2005-03-17 at 02:54 -0500, Warren Togami wrote:
> 
>>Author: wtogami
> 
> 
>> 
>> %build
>>-./configure --prefix=%{prefix}
>>+./configure --prefix=/usr
> 
> 
>>+%attr(755,root,root)
>>+%{_bindir}/nabi
>>+%{_datadir}/nabi
>>+%{_datadir}/locale/*/LC_MESSAGES/nabi.mo
>>+%{_datadir}/applications/nabi.desktop
>> %{_sysconfdir}/X11/xinit/xinput.d
> 
> 
> ?? This is inconsistent:
> 
> * If you need "configure --prefix=/usr" you should hard code 
> /usr in %files, too.
> 
> * If you're using %{_XXX} in %files, you should pass each of the %{_XXX}
> vars to configure, too.
> 
> Try 
> rpmbuild --define '_prefix /usr/local' ...
> to see the effect of this inconsistency.
> 
> Ralf

Good catch.  Glad to see folks reviewing checkins.

Eternal vigilance.

Warren



From fedora-extras-commits at redhat.com  Thu Mar 17 08:50:11 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 03:50:11 -0500
Subject: rpms/nabi/devel nabi.spec,1.2,1.3
Message-ID: <200503170850.j2H8oBQx003373@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3351

Modified Files:
	nabi.spec 
Log Message:
uh... I think this fixes it.  I didn't test it.
djoo at redhat.com will be taking over this package tomorrow so it is his problem.
He needs to learn this stuff anyway.



Index: nabi.spec
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/nabi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nabi.spec	17 Mar 2005 07:54:07 -0000	1.2
+++ nabi.spec	17 Mar 2005 08:50:09 -0000	1.3
@@ -23,7 +23,7 @@
 %setup -q -n %{name}-%{version}
 
 %build
-./configure --prefix=/usr
+./configure --prefix={%_prefix}
 make
 
 %install



From fedora-extras-commits at redhat.com  Thu Mar 17 10:53:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 05:53:32 -0500
Subject: devel/gkrellm-weather .cvsignore, 1.2, 1.3 gkrellm-weather.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200503171053.j2HArWEZ007431@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/gkrellm-weather
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7425

Modified Files:
	.cvsignore gkrellm-weather.spec sources 
Log Message:
2.0.7, provide upstream name.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/gkrellm-weather/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:24:18 -0000	1.2
+++ .cvsignore	17 Mar 2005 10:53:30 -0000	1.3
@@ -1 +1 @@
-gkrellweather-2.0.6.tgz
+gkrellweather-2.0.7.tgz


Index: gkrellm-weather.spec
===================================================================
RCS file: /cvs/extras/devel/gkrellm-weather/gkrellm-weather.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gkrellm-weather.spec	3 Mar 2005 21:26:02 -0000	1.6
+++ gkrellm-weather.spec	17 Mar 2005 10:53:30 -0000	1.7
@@ -3,14 +3,15 @@
 
 Summary:        Weather plugin for GKrellM
 Name:           gkrellm-weather
-Version:        2.0.6
-Release:        2
+Version:        2.0.7
+Release:        1
 License:        GPL
 Group:          Applications/System
 URL:            http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
-Source:   http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/gkrellweather-2.0.6.tgz
+Source:         http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/gkrellweather-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+Provides:       gkrellweather = %{version}-%{release}
 BuildRequires:  perl, gtk2-devel, gkrellm-devel >= 2, gettext
 Requires:       gkrellm >= 2
 
@@ -57,6 +58,10 @@
 
 
 %changelog
+* Thu Mar 17 2005 Ville Skytt?? <ville.skytta at iki.fi> - 2.0.7-1
+- 2.0.7.
+- Provide upstream name.
+
 * Fri Nov 19 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.0.6-2
 - Clean up specfile and convert to UTF-8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/gkrellm-weather/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:24:18 -0000	1.2
+++ sources	17 Mar 2005 10:53:30 -0000	1.3
@@ -1 +1 @@
-458125fe9276db3733a6c4b0e27eca86  gkrellweather-2.0.6.tgz
+73f5ec4e950f933a5904317037d6add2  gkrellweather-2.0.7.tgz



From ville.skytta at iki.fi  Thu Mar 17 10:57:07 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Thu, 17 Mar 2005 12:57:07 +0200
Subject: rpms/nabi/devel nabi.spec,1.2,1.3
In-Reply-To: <200503170850.j2H8oBQx003373@cvs-int.fedora.redhat.com>
References: <200503170850.j2H8oBQx003373@cvs-int.fedora.redhat.com>
Message-ID: <1111057027.20672.4.camel@bobcat.mine.nu>

On Thu, 2005-03-17 at 03:50 -0500, Warren Togami wrote:
> Author: wtogami
> 
> Update of /cvs/extras/rpms/nabi/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3351
> 
> Modified Files:
> 	nabi.spec 
> Log Message:
> uh... I think this fixes it.  I didn't test it.

And it shows ;)

> +./configure --prefix={%_prefix}

Oops.




From fedora-extras-commits at redhat.com  Thu Mar 17 11:08:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 06:08:03 -0500
Subject: rpms/perl-Pod-POM import.log,1.2,1.3
Message-ID: <200503171108.j2HB83BH008483@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8471

Modified Files:
	import.log 
Log Message:
auto-import perl-Pod-POM-0.17-0.fdr.3.rh90 on branch RHL-9 from perl-Pod-POM-0.17-0.fdr.3.rh90.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	15 Mar 2005 14:16:10 -0000	1.2
+++ import.log	17 Mar 2005 11:08:01 -0000	1.3
@@ -1 +1,2 @@
 perl-Pod-POM-0_17-3:HEAD:perl-Pod-POM-0.17-3.src.rpm:1110896069
+perl-Pod-POM-0_17-0_fdr_3_rh90:RHL-9:perl-Pod-POM-0.17-0.fdr.3.rh90.src.rpm:1111057554



From fedora-extras-commits at redhat.com  Thu Mar 17 11:08:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 06:08:03 -0500
Subject: rpms/perl-Pod-POM/RHL-9 perl-Pod-POM.spec,1.1,1.2
Message-ID: <200503171108.j2HB83Ra008487@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8471/RHL-9

Modified Files:
	perl-Pod-POM.spec 
Log Message:
auto-import perl-Pod-POM-0.17-0.fdr.3.rh90 on branch RHL-9 from perl-Pod-POM-0.17-0.fdr.3.rh90.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


Index: perl-Pod-POM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/RHL-9/perl-Pod-POM.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Pod-POM.spec	15 Mar 2005 14:16:10 -0000	1.1
+++ perl-Pod-POM.spec	17 Mar 2005 11:08:01 -0000	1.2
@@ -2,8 +2,9 @@
 
 Name:           perl-Pod-POM
 Version:        0.17
-Release:        3
-Summary:        Object-oriented interface to Perl POD documents
+Release:        0.fdr.3.rh90
+Epoch:          0
+Summary:        OO interface to Perl POD documents
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -62,10 +63,6 @@
 
 
 %changelog
-* Tue Mar 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.17-3
-- Remove Epoch: 0.
-- Improve summary.
-
 * Sun Jul 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.17-0.fdr.3
 - Bring up to date with current fedora.us Perl spec template.
 



From fedora-extras-commits at redhat.com  Thu Mar 17 11:08:49 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 06:08:49 -0500
Subject: rpms/perl-Pod-POM import.log,1.3,1.4
Message-ID: <200503171108.j2HB8nPH008599@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8590

Modified Files:
	import.log 
Log Message:
auto-import perl-Pod-POM-0.17-0.fdr.3.1 on branch FC-1 from perl-Pod-POM-0.17-0.fdr.3.1.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	17 Mar 2005 11:08:01 -0000	1.3
+++ import.log	17 Mar 2005 11:08:47 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Pod-POM-0_17-3:HEAD:perl-Pod-POM-0.17-3.src.rpm:1110896069
 perl-Pod-POM-0_17-0_fdr_3_rh90:RHL-9:perl-Pod-POM-0.17-0.fdr.3.rh90.src.rpm:1111057554
+perl-Pod-POM-0_17-0_fdr_3_1:FC-1:perl-Pod-POM-0.17-0.fdr.3.1.src.rpm:1111057600



From fedora-extras-commits at redhat.com  Thu Mar 17 11:08:49 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 06:08:49 -0500
Subject: rpms/perl-Pod-POM/FC-1 perl-Pod-POM.spec,1.1,1.2
Message-ID: <200503171108.j2HB8ngO008603@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8590/FC-1

Modified Files:
	perl-Pod-POM.spec 
Log Message:
auto-import perl-Pod-POM-0.17-0.fdr.3.1 on branch FC-1 from perl-Pod-POM-0.17-0.fdr.3.1.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


Index: perl-Pod-POM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/FC-1/perl-Pod-POM.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Pod-POM.spec	15 Mar 2005 14:16:10 -0000	1.1
+++ perl-Pod-POM.spec	17 Mar 2005 11:08:47 -0000	1.2
@@ -2,8 +2,9 @@
 
 Name:           perl-Pod-POM
 Version:        0.17
-Release:        3
-Summary:        Object-oriented interface to Perl POD documents
+Release:        0.fdr.3.1
+Epoch:          0
+Summary:        OO interface to Perl POD documents
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -62,10 +63,6 @@
 
 
 %changelog
-* Tue Mar 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.17-3
-- Remove Epoch: 0.
-- Improve summary.
-
 * Sun Jul 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.17-0.fdr.3
 - Bring up to date with current fedora.us Perl spec template.
 



From fedora-extras-commits at redhat.com  Thu Mar 17 11:09:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 06:09:32 -0500
Subject: rpms/perl-Pod-POM import.log,1.4,1.5
Message-ID: <200503171109.j2HB9Wvg008715@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8706

Modified Files:
	import.log 
Log Message:
auto-import perl-Pod-POM-0.17-0.fdr.3.2 on branch FC-2 from perl-Pod-POM-0.17-0.fdr.3.2.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	17 Mar 2005 11:08:47 -0000	1.4
+++ import.log	17 Mar 2005 11:09:30 -0000	1.5
@@ -1,3 +1,4 @@
 perl-Pod-POM-0_17-3:HEAD:perl-Pod-POM-0.17-3.src.rpm:1110896069
 perl-Pod-POM-0_17-0_fdr_3_rh90:RHL-9:perl-Pod-POM-0.17-0.fdr.3.rh90.src.rpm:1111057554
 perl-Pod-POM-0_17-0_fdr_3_1:FC-1:perl-Pod-POM-0.17-0.fdr.3.1.src.rpm:1111057600
+perl-Pod-POM-0_17-0_fdr_3_2:FC-2:perl-Pod-POM-0.17-0.fdr.3.2.src.rpm:1111057643



From fedora-extras-commits at redhat.com  Thu Mar 17 11:09:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 06:09:32 -0500
Subject: rpms/perl-Pod-POM/FC-2 perl-Pod-POM.spec,1.1,1.2
Message-ID: <200503171109.j2HB9Wqm008719@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8706/FC-2

Modified Files:
	perl-Pod-POM.spec 
Log Message:
auto-import perl-Pod-POM-0.17-0.fdr.3.2 on branch FC-2 from perl-Pod-POM-0.17-0.fdr.3.2.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


Index: perl-Pod-POM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/FC-2/perl-Pod-POM.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Pod-POM.spec	15 Mar 2005 14:16:10 -0000	1.1
+++ perl-Pod-POM.spec	17 Mar 2005 11:09:30 -0000	1.2
@@ -2,8 +2,9 @@
 
 Name:           perl-Pod-POM
 Version:        0.17
-Release:        3
-Summary:        Object-oriented interface to Perl POD documents
+Release:        0.fdr.3.2
+Epoch:          0
+Summary:        OO interface to Perl POD documents
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -62,10 +63,6 @@
 
 
 %changelog
-* Tue Mar 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.17-3
-- Remove Epoch: 0.
-- Improve summary.
-
 * Sun Jul 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.17-0.fdr.3
 - Bring up to date with current fedora.us Perl spec template.
 



From fedora-extras-commits at redhat.com  Thu Mar 17 11:20:38 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 06:20:38 -0500
Subject: devel/gkrellm-hddtemp gkrellm-hddtemp.spec,1.5,1.6
Message-ID: <200503171120.j2HBKccj008985@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/gkrellm-hddtemp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8978

Modified Files:
	gkrellm-hddtemp.spec 
Log Message:
Fix URLs.


Index: gkrellm-hddtemp.spec
===================================================================
RCS file: /cvs/extras/devel/gkrellm-hddtemp/gkrellm-hddtemp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gkrellm-hddtemp.spec	3 Mar 2005 21:26:02 -0000	1.5
+++ gkrellm-hddtemp.spec	17 Mar 2005 11:20:36 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           gkrellm-hddtemp
 Version:        0.2
-Release:        0.2.beta
+Release:        0.3.beta
 Summary:        Hard disk temperature plugin for GKrellM
 
 Group:          Applications/System
 License:        GPL
-URL:            http://coredump.free.fr/linux/hddtemp.php
-Source:         http://coredump.free.fr/linux/gkrellm-hddtemp-0.2-beta.tar.gz
+URL:            http://www.guzu.net/linux/hddtemp.php
+Source:         http://www.guzu.net/linux/gkrellm-hddtemp-0.2-beta.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, gkrellm-devel >= 2
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Thu Mar 17 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.2-0.3.beta
+- Fix URLs.
+
 * Fri May 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.2-0.fdr.0.2.beta
 - Spec file cleanups.
 



From bugs.michael at gmx.net  Thu Mar 17 13:03:12 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 17 Mar 2005 14:03:12 +0100
Subject: devel/python-amara python-amara.spec,1.2,1.3
In-Reply-To: <200503162342.j2GNg1fk019251@cvs-int.fedora.redhat.com>
References: <200503162342.j2GNg1fk019251@cvs-int.fedora.redhat.com>
Message-ID: <20050317140312.282928f7.bugs.michael@gmx.net>

On Wed, 16 Mar 2005 18:42:01 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/devel/python-amara

> -%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
> +%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
> +%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')

> +BuildRequires:  python-abi = %{pyver}
> +Requires:       python-abi = %{pyver} 4Suite >= 1.0

> +%{_libdir}/python%{pyver}/site-packages/amara

Please take a look at e.g. the "bittorrent" package in devel tree on
how to use %python_sitelib.

> +%if "%{pyver}" == "%{mainpyver}"
> +%define name python-amara
> +%define prov python%{pyver}-amara = %{version} python-amara = %{version}
> +%else
> +%define name python%{pyver}-amara
> +%define prov python%{pyver}-Amara = %{version}
> +%endif
> +Provides:       %{prov}

I consider this unnecessary and ugly bloat, also considering that we have
specific Python module naming guidelines. You're over-complicating the
packaging.



From bugs.michael at gmx.net  Thu Mar 17 13:13:28 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 17 Mar 2005 14:13:28 +0100
Subject: APPROVED: bmp
Message-ID: <20050317141328.2be51de0.bugs.michael@gmx.net>

Name: bmp
Version: 0.9.7-4

BMP (Beep Media Player) is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
XMMS.

[...]

Imported package approved by mschwendt for adding to Fedora Extras.
Ralf Ertzinger will be responsible for this package.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/f778d2ee/attachment.sig>

From ivazquez at ivazquez.net  Thu Mar 17 17:13:33 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 12:13:33 -0500
Subject: devel/python-amara python-amara.spec,1.2,1.3
In-Reply-To: <20050317140312.282928f7.bugs.michael@gmx.net>
References: <200503162342.j2GNg1fk019251@cvs-int.fedora.redhat.com>
	<20050317140312.282928f7.bugs.michael@gmx.net>
Message-ID: <1111079613.30220.16.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 14:03 +0100, Michael Schwendt wrote:
> On Wed, 16 Mar 2005 18:42:01 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> > +%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
> > +%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')
> 
> > +%{_libdir}/python%{pyver}/site-packages/amara
> 
> Please take a look at e.g. the "bittorrent" package in devel tree on
> how to use %python_sitelib.
> 
> > +%if "%{pyver}" == "%{mainpyver}"
> 
> I consider this unnecessary and ugly bloat, also considering that we have
> specific Python module naming guidelines. You're over-complicating the
> packaging.

BitTorrent is an app, Amara is a library. For the most part that "bloat"
serves to allow Amara to be built for multiple versions of Python on the
same platform.

However, if you would like me to remove it regardless then I will do so.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/dd2a0602/attachment.sig>

From ivazquez at ivazquez.net  Thu Mar 17 17:15:13 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 12:15:13 -0500
Subject: devel/kphone kphone.spec,1.2,1.3
In-Reply-To: <1111048177.17514.182.camel@mccallum.corsepiu.local>
References: <200503162342.j2GNg1uh019227@cvs-int.fedora.redhat.com>
	<1111048177.17514.182.camel@mccallum.corsepiu.local>
Message-ID: <1111079713.30220.17.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 09:29 +0100, Ralf Corsepius wrote:
> On Wed, 2005-03-16 at 18:42 -0500, Ignacio Vazquez-Abrams wrote:
> >  ./configure --prefix=$RPM_BUILD_ROOT%{_prefix}
> 
> A prefix containing $RPM_BUILD_ROOT hardly can be correct.
> You probably want %configure

Yes. I'll fix it.

> Furthermore, I am not convinced about this package's sources quality:

> tar: kphone/dissipate2: implausibly old time stamp 1970-01-01 01:00:00

I agree that it looks flaky, but that's exactly how it's found on the
site.

> - Serious compiler warnings:
> In file included from dspoutrtp.cpp:16:
> rtpdataheader.h:35: warning: `__packed__' attribute ignored
> (I didn't investigate potential issues being caused by this warning.)

Well, the attribute is on a bitfield dword-aligned struct so it should
be fine on 32-bit archs. On 64-bit archs it may have runtime failures
unless alignment is dword-forced.

Also, looking into it reveals that the package probably won't run
properly on big-endian archs. Unfortunately I don't have enough endian
experience to construct a universal patch.

> - This package does not acknowledge RPM_OPT_FLAGS
> (This package's configuration is ..., to say the least ...)

It was one of my first with FC3, so I'm not surprised that it's a piece
of ....

> Below is a patch to workaround the prefix issue.

I'll apply it, thanks.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/c3ba87c2/attachment.sig>

From fedora-extras-commits at redhat.com  Thu Mar 17 17:37:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 12:37:49 -0500
Subject: devel/chkrootkit chkrootkit-0.45-includes.patch, NONE,
	1.1 chkrootkit.spec, 1.8, 1.9
Message-ID: <200503171737.j2HHbnrI020256@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/chkrootkit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20246

Modified Files:
	chkrootkit.spec 
Added Files:
	chkrootkit-0.45-includes.patch 
Log Message:
- Make GCC4 shut up by including more C headers in chkproc.c/chkwtmp.c



chkrootkit-0.45-includes.patch:

--- NEW FILE chkrootkit-0.45-includes.patch ---
diff -Nur chkrootkit-0.45-orig/chkproc.c chkrootkit-0.45/chkproc.c
--- chkrootkit-0.45-orig/chkproc.c	2004-09-13 20:39:29.000000000 +0200
+++ chkrootkit-0.45/chkproc.c	2005-03-17 16:48:48.000000000 +0100
@@ -48,6 +48,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
+#include <string.h>
 #if defined(__sun)
 #include <procfs.h>
 #include <fcntl.h>
diff -Nur chkrootkit-0.45-orig/chkwtmp.c chkrootkit-0.45/chkwtmp.c
--- chkrootkit-0.45-orig/chkwtmp.c	2004-09-06 21:24:56.000000000 +0200
+++ chkrootkit-0.45/chkwtmp.c	2005-03-17 16:49:01.000000000 +0100
@@ -17,7 +17,7 @@
    Nelson Murilo, nelson at pangeia.com.br
 */
 
-
+#include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>


Index: chkrootkit.spec
===================================================================
RCS file: /cvs/extras/devel/chkrootkit/chkrootkit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- chkrootkit.spec	3 Mar 2005 20:08:36 -0000	1.8
+++ chkrootkit.spec	17 Mar 2005 17:37:47 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           chkrootkit
 Version:        0.45
-Release:        1
+Release:        2
 Summary:        Tool to locally check for signs of a rootkit
 
 Group:          Applications/System
@@ -14,6 +14,7 @@
 Source5:        chkrootkit.pam
 Patch1:         chkrootkit-0.44-getCMD.patch
 Patch2:         chkrootkit-0.44-inetd.patch
+Patch3:         chkrootkit-0.45-includes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -39,6 +40,7 @@
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .getCMD
 %patch2 -p1 -b .inetd
+%patch3 -p1 -b .includes
 
 
 %build
@@ -104,6 +106,9 @@
 
 
 %changelog
+* Thu Mar 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.45-2
+- Make GCC4 shut up by including more C headers in chkproc.c/chkwtmp.c
+
 * Thu Feb 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.45-1
 - Update to 0.45, trim description.
 



From fedora-extras-commits at redhat.com  Thu Mar 17 17:40:19 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 12:40:19 -0500
Subject: devel/sylpheed sylpheed-1.0.3-desktop.patch, NONE, 1.1 sylpheed.spec,
	1.4, 1.5
Message-ID: <200503171740.j2HHeJ7F020343@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/sylpheed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20331

Modified Files:
	sylpheed.spec 
Added Files:
	sylpheed-1.0.3-desktop.patch 
Log Message:
Desktop file fixes.



sylpheed-1.0.3-desktop.patch:

--- NEW FILE sylpheed-1.0.3-desktop.patch ---
diff -Naur sylpheed-1.0.3-orig/sylpheed.desktop sylpheed-1.0.3/sylpheed.desktop
--- sylpheed-1.0.3-orig/sylpheed.desktop	2002-08-30 10:53:18.000000000 +0200
+++ sylpheed-1.0.3/sylpheed.desktop	2005-03-17 18:18:12.000000000 +0100
@@ -1,10 +1,11 @@
 [Desktop Entry]
-Name=Sylpheed
+Encoding=UTF-8
+Name=Sylpheed E-Mail
 Name[ja]=Sylpheed
 Comment=E-Mail client
-Comment[ja]=??????????????????????
+Comment[ja]=?????????????????????????????????
 Exec=sylpheed
 Icon=sylpheed.png
-Terminal=0
+Terminal=false
 Type=Application
 Categories=Application;Network;


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sylpheed.spec	8 Mar 2005 19:18:00 -0000	1.4
+++ sylpheed.spec	17 Mar 2005 17:40:17 -0000	1.5
@@ -20,6 +20,7 @@
 Patch0: %{name}-0.8.9-ck.patch
 Patch1: %{name}-0.8.9-ssl.patch
 Patch2: sylpheed-default-browser.patch
+Patch3: sylpheed-1.0.3-desktop.patch
 
 %description
 This program is an X based fast email client which has features
@@ -41,6 +42,7 @@
 %patch0 -p1 -b .ck
 %patch1 -p1 -b .ssl
 %patch2 -p1 -b .default-browser
+%patch3 -p1 -b .desktop
 
 %build
 autoconf
@@ -59,7 +61,7 @@
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category Application \
 	--add-category Network \
-	--add-category X-Fedora-Extra \
+	--add-category X-Fedora \
 	sylpheed.desktop
 install -d $RPM_BUILD_ROOT%{_mandir}/man1/
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -82,7 +84,7 @@
 * Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-1
 - Update to 1.0.3.
 - Enable support for GPGME 1.0 and compface.
-- Apply common spec cleanup.
+- Apply common spec cleanup. Make desktop file UTF-8.
 
 * Wed Jan  5 2005 Akira TAGOH <tagoh at redhat.com> - 1.0.0-1
 - New upstream release.



From fedora-extras-commits at redhat.com  Thu Mar 17 17:40:29 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 12:40:29 -0500
Subject: devel/kphone kphone.spec,1.3,1.4
Message-ID: <200503171740.j2HHeTRu020376@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20368

Modified Files:
	kphone.spec 
Log Message:
Fix %configure and po patch


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kphone.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ kphone.spec	17 Mar 2005 17:40:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        3
+Release:        4
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -8,6 +8,7 @@
 URL:            http://www.wirlab.net/kphone/
 Source0:        http://www.wirlab.net/kphone/kphone-4.1.0.tar.gz
 Source1:        kphone.desktop
+Patch0:         kphone-4.1.0-po-hacks.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils
@@ -20,10 +21,11 @@
 
 %prep
 %setup -q -n kphone
+%patch -p1 -b .po-hacks
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-./configure --prefix=$RPM_BUILD_ROOT%{_prefix}
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -51,6 +53,10 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-4
+- Fixed %configure
+- Added po-hacks patch
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-3
 - Modified %setup to use -n
 - Broke %description at 80 columns



From fedora-extras-commits at redhat.com  Thu Mar 17 17:40:53 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 12:40:53 -0500
Subject: devel/kphone kphone-4.1.0-po-hacks.diff,NONE,1.1
Message-ID: <200503171740.j2HHerAA020415@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20409

Added Files:
	kphone-4.1.0-po-hacks.diff 
Log Message:
Fix %configure and po patch

kphone-4.1.0-po-hacks.diff:

--- NEW FILE kphone-4.1.0-po-hacks.diff ---
--- kphone-4.1.0.orig/po/Makefile.in	2004-10-19 10:24:16.000000000 +0200
+++ kphone/po/Makefile.in	2005-03-17 08:56:38.165328978 +0100
@@ -4,11 +4,11 @@
 PO_DIR=$(SHAREDIR)/translations/
 
 install:
-	install --mode=0755 --directory $(PO_DIR)
+	install --mode=0755 --directory $(DESTDIR)$(PO_DIR)
 	for T in *.qm; do \
-		install --mode=0644 $$T $(PO_DIR); \
+		install --mode=0644 $$T $(DESTDIR)$(PO_DIR); \
 	done
 
 uninstall:
-	rm -r $(PO_DIR)
+	rm -r $(DESTDIR)$(PO_DIR)
 



From bugs.michael at gmx.net  Thu Mar 17 17:48:55 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 17 Mar 2005 18:48:55 +0100
Subject: devel/python-amara python-amara.spec,1.2,1.3
In-Reply-To: <1111079613.30220.16.camel@ignacio.ignacio.lan>
References: <200503162342.j2GNg1fk019251@cvs-int.fedora.redhat.com>
	<20050317140312.282928f7.bugs.michael@gmx.net>
	<1111079613.30220.16.camel@ignacio.ignacio.lan>
Message-ID: <20050317184855.374d9293.bugs.michael@gmx.net>

On Thu, 17 Mar 2005 12:13:33 -0500, Ignacio Vazquez-Abrams wrote:

> On Thu, 2005-03-17 at 14:03 +0100, Michael Schwendt wrote:
> > On Wed, 16 Mar 2005 18:42:01 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> > > +%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
> > > +%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')
> > 
> > > +%{_libdir}/python%{pyver}/site-packages/amara
> > 
> > Please take a look at e.g. the "bittorrent" package in devel tree on
> > how to use %python_sitelib.
> > 
> > > +%if "%{pyver}" == "%{mainpyver}"
> > 
> > I consider this unnecessary and ugly bloat, also considering that we have
> > specific Python module naming guidelines. You're over-complicating the
> > packaging.
> 
> BitTorrent is an app, Amara is a library. For the most part that "bloat"
> serves to allow Amara to be built for multiple versions of Python on the
> same platform.

Two different comments in one mail. The bottom comment did not refer
to bittorrent. Using %python_sitelib instead of "path hacks" would still
be an improvement.



From ville.skytta at iki.fi  Thu Mar 17 18:33:05 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Thu, 17 Mar 2005 20:33:05 +0200
Subject: APPROVED: bmp
In-Reply-To: <20050317141328.2be51de0.bugs.michael@gmx.net>
References: <20050317141328.2be51de0.bugs.michael@gmx.net>
Message-ID: <1111084385.4784.2.camel@bobcat.mine.nu>

On Thu, 2005-03-17 at 14:13 +0100, Michael Schwendt wrote:
> Name: bmp
> Version: 0.9.7-4
> 
> BMP (Beep Media Player) is a media player that currently uses a skinned
> user interface based on Winamp 2.x skins. It is based on ("forked off")
> XMMS.
> 
> [...]
> 
> Imported package approved by mschwendt for adding to Fedora Extras.
> Ralf Ertzinger will be responsible for this package.

bmp-devel is missing lots of dependencies.  Start with pkgconfig, then
proceed to stuff listed in /usr/lib/pkg-config/bmp.pc (Requires:)...



From fedora-extras-commits at redhat.com  Thu Mar 17 18:55:42 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 13:55:42 -0500
Subject: devel/python-amara python-amara.spec,1.3,1.4
Message-ID: <200503171855.j2HItg9q022302@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22294

Modified Files:
	python-amara.spec 
Log Message:
Path and version fixes


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/devel/python-amara/python-amara.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-amara.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ python-amara.spec	17 Mar 2005 18:55:40 -0000	1.4
@@ -1,19 +1,16 @@
-%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
-%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')
-
-%define version 0.9.4
+%{!?pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
+%define mainpyver %(%{__python} -c 'import sys;print(sys.version[0:3])')
+%{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %if "%{pyver}" == "%{mainpyver}"
 %define name python-amara
-%define prov python%{pyver}-amara = %{version} python-amara = %{version}
 %else
 %define name python%{pyver}-amara
-%define prov python%{pyver}-Amara = %{version}
 %endif
 
 Name:           %name
-Version:        %version
-Release:        3
+Version:        0.9.4
+Release:        4
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -24,7 +21,7 @@
 
 BuildRequires:  python-abi = %{pyver}
 Requires:       python-abi = %{pyver} 4Suite >= 1.0
-Provides:       %{prov}
+Provides:       python%{pyver}-amara = %{version}
 BuildArch:      noarch
 
 %description
@@ -37,30 +34,32 @@
 implementation of XML standards in Python, Amara adds a much more Pythonic face
 to these capabilities.
 
-Amara provides tools you can trust to conform with XML standards without losing
-the familiar Python feel.
-
 %prep
 %setup -q -n Amara-0.9.4
 
 %build
-python setup.py build
+%{__python}%{pyver} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python%{pyver} setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}
+%{__python}%{pyver} setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}
+[ "%{pyver}" == "%{mainpyver}" ] || rename .py %{pyver}.py $RPM_BUILD_ROOT%{_bindir}/*.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/flextyper.py
-%{_bindir}/scimitar.py
-%{_libdir}/python%{pyver}/site-packages/amara
+%{_bindir}/*.py
+%{python_sitelib}/amara
 %doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-4
+- Streamlined/fixed Python version handling
+- Implemented %python_sitelib
+- Decreased verbosity in %description
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-3
 - Better %pyver and BR/Requires handling
 - Broke %description at 80 columns



From ivazquez at ivazquez.net  Thu Mar 17 18:55:46 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 13:55:46 -0500
Subject: devel/python-amara python-amara.spec,1.2,1.3
In-Reply-To: <20050317184855.374d9293.bugs.michael@gmx.net>
References: <200503162342.j2GNg1fk019251@cvs-int.fedora.redhat.com>
	<20050317140312.282928f7.bugs.michael@gmx.net>
	<1111079613.30220.16.camel@ignacio.ignacio.lan>
	<20050317184855.374d9293.bugs.michael@gmx.net>
Message-ID: <1111085746.30220.21.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 18:48 +0100, Michael Schwendt wrote:
> On Thu, 17 Mar 2005 12:13:33 -0500, Ignacio Vazquez-Abrams wrote:
> > BitTorrent is an app, Amara is a library. For the most part that "bloat"
> > serves to allow Amara to be built for multiple versions of Python on the
> > same platform.
> 
> Two different comments in one mail. The bottom comment did not refer
> to bittorrent. Using %python_sitelib instead of "path hacks" would still
> be an improvement.

My bad. That's what happens when I read things when I'm not awake :/

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/09a3869c/attachment.sig>

From fedora-extras-commits at redhat.com  Thu Mar 17 19:03:41 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 14:03:41 -0500
Subject: devel/perl-PAR-Dist perl-PAR-Dist.spec,1.5,1.6
Message-ID: <200503171903.j2HJ3fao023170@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/perl-PAR-Dist
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22389

Modified Files:
	perl-PAR-Dist.spec 
Log Message:
Don't run signature test during build, sync with Perl spec template.

If Module::Signature is installed, running the signature test would
import stuff from pgp.mit.edu to the build user's GPG keyring.



Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/extras/devel/perl-PAR-Dist/perl-PAR-Dist.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-PAR-Dist.spec	3 Mar 2005 23:46:27 -0000	1.5
+++ perl-PAR-Dist.spec	17 Mar 2005 19:03:39 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           perl-PAR-Dist
 Version:        0.07
-Release:        2
+Release:        3
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 
 Group:          Development/Libraries
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl
+BuildRequires:  perl >= 1:5.6.1
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -24,24 +24,21 @@
 
 
 %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 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 || :
-rm -f debugfiles.list debugsources.list
-make test
+make test TEST_FILES=t/1*.t # avoid signature check
 
 
 %clean
@@ -56,6 +53,10 @@
 
 
 %changelog
+* Thu Mar 17 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-3
+- Avoid running signature test during build.
+- Sync with fedora-rpmdevtools' Perl spec template.
+
 * Sun Apr 25 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.07-0.fdr.2
 - Require perl(:MODULE_COMPAT_*).
 



From fedora-extras-commits at redhat.com  Thu Mar 17 19:12:34 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 14:12:34 -0500
Subject: devel/libmodplug libmodplug.spec,1.5,1.6
Message-ID: <200503171912.j2HJCYpi023303@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/libmodplug
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23297

Modified Files:
	libmodplug.spec 
Log Message:
Restore incorrectly removed Epoch from -devel dependency, other minor tweaks.


Index: libmodplug.spec
===================================================================
RCS file: /cvs/extras/devel/libmodplug/libmodplug.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmodplug.spec	5 Mar 2005 21:10:22 -0000	1.5
+++ libmodplug.spec	17 Mar 2005 19:12:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libmodplug
 Version:        0.7
-Release:        1
+Release:        2
 Epoch:          1
 Summary:        Modplug mod music file format library
 
@@ -16,7 +16,7 @@
 %package        devel
 Summary:        Development files for the Modplug mod music file format library
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, pkgconfig
+Requires:       %{name} = %{epoch}:%{version}-%{release}, pkgconfig
 
 %description    devel
 %{summary}.
@@ -27,9 +27,8 @@
 
 
 %build
-%configure --enable-static
+%configure --enable-static --disable-dependency-tracking
 make %{?_smp_mflags}
-make check
 
 
 %install
@@ -38,6 +37,10 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
+%check || :
+make check
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -60,6 +63,10 @@
 
 
 %changelog
+* Thu Mar 17 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.7-2
+- Build with dependency tracking disabled.
+- Run tests in the %%check section.
+
 * Fri Oct 17 2003 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.7-0.fdr.1
 - First build, separated from xmms-modplug.
 - Bump Epoch.



From fedora-extras-commits at redhat.com  Thu Mar 17 19:46:55 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 14:46:55 -0500
Subject: devel/goopy - New directory
Message-ID: <200503171946.j2HJkt4g023620@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/devel/goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23615/goopy

Log Message:
Directory /cvs/extras/devel/goopy added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 19:54:10 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 14:54:10 -0500
Subject: rpms/goopy - New directory
Message-ID: <200503171954.j2HJsAVV023703@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23696/goopy

Log Message:
Directory /cvs/extras/rpms/goopy added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 19:54:10 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 14:54:10 -0500
Subject: rpms/goopy/devel - New directory
Message-ID: <200503171954.j2HJsA66023706@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23696/goopy/devel

Log Message:
Directory /cvs/extras/rpms/goopy/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 19:54:23 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 14:54:23 -0500
Subject: rpms/goopy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503171954.j2HJsNUe023768@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23756/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module goopy


--- 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 Mar 17 19:54:23 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 14:54:23 -0500
Subject: rpms/goopy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503171954.j2HJsNSe023765@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23756

Added Files:
	Makefile import.log 
Log Message:
Setup of module goopy


--- NEW FILE Makefile ---
# Top level Makefile for module goopy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 17 19:54:39 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 14:54:39 -0500
Subject: rpms/goopy import.log,1.1,1.2
Message-ID: <200503171954.j2HJsdl5023864@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23853

Modified Files:
	import.log 
Log Message:
auto-import goopy-0.1-1 on branch devel from goopy-0.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/goopy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Mar 2005 19:54:21 -0000	1.1
+++ import.log	17 Mar 2005 19:54:37 -0000	1.2
@@ -0,0 +1 @@
+goopy-0_1-1:HEAD:goopy-0.1-1.src.rpm:1111089273



From fedora-extras-commits at redhat.com  Thu Mar 17 19:54:39 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 14:54:39 -0500
Subject: rpms/goopy/devel goopy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200503171954.j2HJsdFi023868@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23853/devel

Modified Files:
	.cvsignore sources 
Added Files:
	goopy.spec 
Log Message:
auto-import goopy-0.1-1 on branch devel from goopy-0.1-1.src.rpm


--- NEW FILE goopy.spec ---
%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
%undefine _enable_debug_packages

Summary: Google Python Utilities
Name: goopy
Version: 0.1
Release: 1
Source0: %{name}-%{version}.tar.gz
License: BSD
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python >= %{pyver}
Requires: python >= %{pyver}
BuildArch: noarch

%description
The goopy package contains python utilities from Google.

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --root "${RPM_BUILD_ROOT}"

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README PKG-INFO
%{_libdir}/python?.?/site-packages/goopy

%changelog
* Thu Mar 17 2005 Peter Jones <pjones at redhat.com> - 0.1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/goopy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Mar 2005 19:54:21 -0000	1.1
+++ .cvsignore	17 Mar 2005 19:54:37 -0000	1.2
@@ -0,0 +1 @@
+goopy-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/goopy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Mar 2005 19:54:21 -0000	1.1
+++ sources	17 Mar 2005 19:54:37 -0000	1.2
@@ -0,0 +1 @@
+e6f6782c01af621dfaf7f4a272838a70  goopy-0.1.tar.gz



From bugs.michael at gmx.net  Thu Mar 17 20:04:54 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 17 Mar 2005 21:04:54 +0100
Subject: devel/python-amara python-amara.spec,1.2,1.3
In-Reply-To: <1111079613.30220.16.camel@ignacio.ignacio.lan>
References: <200503162342.j2GNg1fk019251@cvs-int.fedora.redhat.com>
	<20050317140312.282928f7.bugs.michael@gmx.net>
	<1111079613.30220.16.camel@ignacio.ignacio.lan>
Message-ID: <20050317210454.030b7bb1.bugs.michael@gmx.net>

On Thu, 17 Mar 2005 12:13:33 -0500, Ignacio Vazquez-Abrams wrote:

> On Thu, 2005-03-17 at 14:03 +0100, Michael Schwendt wrote:
> > On Wed, 16 Mar 2005 18:42:01 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> > > +%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
> > > +%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')
> > 
> > > +%{_libdir}/python%{pyver}/site-packages/amara
> > 
> > Please take a look at e.g. the "bittorrent" package in devel tree on
> > how to use %python_sitelib.
> > 
> > > +%if "%{pyver}" == "%{mainpyver}"
> > 
> > I consider this unnecessary and ugly bloat, also considering that we have
> > specific Python module naming guidelines. You're over-complicating the
> > packaging.
> 
> BitTorrent is an app, Amara is a library. For the most part that "bloat"
> serves to allow Amara to be built for multiple versions of Python on the
> same platform.

Two different comments in one mail. The bottom comment did not refer
to bittorrent. Using %python_sitelib instead of "path hacks" would still
be an improvement.

-- 
Fedora Core release Rawhide (Rawhide) - Linux 2.6.11-1.1177_FC4
loadavg: 2.92 2.96 2.49



From fedora-extras-commits at redhat.com  Thu Mar 17 20:05:48 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 15:05:48 -0500
Subject: devel/sylpheed sylpheed-1.0.3-draftsegf.patch, NONE,
	1.1 sylpheed.spec, 1.5, 1.6
Message-ID: <200503172005.j2HK5mRN024924@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/sylpheed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24916

Modified Files:
	sylpheed.spec 
Added Files:
	sylpheed-1.0.3-draftsegf.patch 
Log Message:
- Fix segfault when reopening drafts.



sylpheed-1.0.3-draftsegf.patch:

--- NEW FILE sylpheed-1.0.3-draftsegf.patch ---
diff -Naur sylpheed-1.0.3-orig/src/account.c sylpheed-1.0.3/src/account.c
--- sylpheed-1.0.3-orig/src/account.c	2004-12-22 08:19:09.000000000 +0100
+++ sylpheed-1.0.3/src/account.c	2005-03-17 20:56:24.000000000 +0100
@@ -256,7 +256,9 @@
 {
 	static HeaderEntry hentry[] = {{"From:",		  NULL, FALSE},
 				       {"X-Sylpheed-Account-Id:", NULL, FALSE},
-				       {"AID:",			  NULL, FALSE}};
+				       {"AID:",			  NULL, FALSE},
+				       {NULL, NULL, FALSE}
+	};
 
 	enum
 	{



Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sylpheed.spec	17 Mar 2005 17:40:17 -0000	1.5
+++ sylpheed.spec	17 Mar 2005 20:05:46 -0000	1.6
@@ -5,7 +5,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 1.0.3
-Release: 1
+Release: 2
 License: GPL
 URL: http://sylpheed.good-day.net/
 Group: Applications/Internet
@@ -21,6 +21,7 @@
 Patch1: %{name}-0.8.9-ssl.patch
 Patch2: sylpheed-default-browser.patch
 Patch3: sylpheed-1.0.3-desktop.patch
+Patch4: sylpheed-1.0.3-draftsegf.patch
 
 %description
 This program is an X based fast email client which has features
@@ -43,6 +44,7 @@
 %patch1 -p1 -b .ssl
 %patch2 -p1 -b .default-browser
 %patch3 -p1 -b .desktop
+%patch4 -p1 -b .draftsegf
 
 %build
 autoconf
@@ -81,6 +83,9 @@
 %{_mandir}/man1
 
 %changelog
+* Thu Mar 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-2
+- Fix segfault when reopening drafts.
+
 * Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-1
 - Update to 1.0.3.
 - Enable support for GPGME 1.0 and compface.



From ivazquez at ivazquez.net  Thu Mar 17 20:06:09 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 15:06:09 -0500
Subject: rpms/goopy/devel goopy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2
	sources, 1.1, 1.2
In-Reply-To: <200503171954.j2HJsdFi023868@cvs-int.fedora.redhat.com>
References: <200503171954.j2HJsdFi023868@cvs-int.fedora.redhat.com>
Message-ID: <1111089969.30220.24.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 14:54 -0500, Peter Jones wrote:
> Author: pjones
> 
> BuildRequires: python >= %{pyver}
> Requires: python >= %{pyver}

Should this use python-abi instead?

> %{_libdir}/python?.?/site-packages/goopy

Might want to consider using %python_sitelib as bittorrent does.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/9cc53472/attachment.sig>

From notting at redhat.com  Thu Mar 17 20:12:41 2005
From: notting at redhat.com (Bill Nottingham)
Date: Thu, 17 Mar 2005 15:12:41 -0500
Subject: rpms/goopy/devel goopy.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
In-Reply-To: <1111089969.30220.24.camel@ignacio.ignacio.lan>
References: <200503171954.j2HJsdFi023868@cvs-int.fedora.redhat.com>
	<1111089969.30220.24.camel@ignacio.ignacio.lan>
Message-ID: <20050317201241.GG30312@nostromo.devel.redhat.com>

Ignacio Vazquez-Abrams (ivazquez at ivazquez.net) said: 
> > BuildRequires: python >= %{pyver}
> > Requires: python >= %{pyver}
> 
> Should this use python-abi instead?

Actually, why does the *source* package buildreq the version
of python the source package was built with? It really shouldn't
care.

Bill



From fedora-extras-commits at redhat.com  Thu Mar 17 20:14:13 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 15:14:13 -0500
Subject: rpms/goopy/devel goopy.spec,1.1,1.2
Message-ID: <200503172014.j2HKEDAX025137@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25129

Modified Files:
	goopy.spec 
Log Message:
update per warren's review


Index: goopy.spec
===================================================================
RCS file: /cvs/extras/rpms/goopy/devel/goopy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- goopy.spec	17 Mar 2005 19:54:37 -0000	1.1
+++ goopy.spec	17 Mar 2005 20:14:11 -0000	1.2
@@ -1,16 +1,17 @@
 %define pyver %(%{__python} -c "import sys; print sys.version[:3]")
 %undefine _enable_debug_packages
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 
 Summary: Google Python Utilities
 Name: goopy
 Version: 0.1
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.gz
 License: BSD
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python >= %{pyver}
-Requires: python >= %{pyver}
 BuildArch: noarch
 
 %description
@@ -31,8 +32,12 @@
 %files
 %defattr(-,root,root)
 %doc README PKG-INFO
-%{_libdir}/python?.?/site-packages/goopy
+%{python_sitelib}/goopy
 
 %changelog
-* Thu Mar 17 2005 Peter Jones <pjones at redhat.com> - 0.1
+* Thu Mar 17 2005 Peter Jones <pjones at redhat.com> - 0.1-2
+- remove dep on python; rpm auto-requires python(abi) = %%{pyver}
+- ask python where the site-packages dir is for %%files
+
+* Thu Mar 17 2005 Peter Jones <pjones at redhat.com> - 0.1-1
 - initial packaging



From ivazquez at ivazquez.net  Thu Mar 17 20:18:06 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 15:18:06 -0500
Subject: rpms/clearlooks/devel clearlooks.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <1111036884.18744.8.camel@ignacio.ignacio.lan>
References: <200503161655.j2GGt3m4001351@cvs-int.fedora.redhat.com>
	<20050316204320.7b3b4dc2.bugs.michael@gmx.net>
	<1111031826.17514.154.camel@mccallum.corsepiu.local>
	<1111036884.18744.8.camel@ignacio.ignacio.lan>
Message-ID: <1111090687.30220.25.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 00:21 -0500, Ignacio Vazquez-Abrams wrote:
> On Thu, 2005-03-17 at 04:57 +0100, Ralf Corsepius wrote:
> > On Wed, 2005-03-16 at 20:43 +0100, Michael Schwendt wrote:
> > > error: Installed (but unpackaged) file(s) found:
> > >    /share/themes/Clearlooks/metacity-1/metacity-theme-1.xml
> > This is a side effect of the missing "BR: libgnome-devel"
> 
> Aha! This is a much better solution than futzing with patches and
> makefiles.

Turns out that this is an upstream error in configure.in. I submitted it
as well.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/be063103/attachment.sig>

From wtogami at redhat.com  Thu Mar 17 20:33:38 2005
From: wtogami at redhat.com (Warren Togami)
Date: Thu, 17 Mar 2005 10:33:38 -1000
Subject: APPROVED: goopy
Message-ID: <4239E9A2.6020005@redhat.com>

The goopy package contains python utilities from Google.

Reviewed by wtogami at redhat.com, pjones at redhat.com will be the maintainer.



From fedora-extras-commits at redhat.com  Thu Mar 17 20:35:32 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 15:35:32 -0500
Subject: rpms/bmp/devel bmp.spec,1.1,1.2
Message-ID: <200503172035.j2HKZWMa025528@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25512

Modified Files:
	bmp.spec 
Log Message:
- Add -devel dependencies needed for headers and pkgconfig template.




Index: bmp.spec
===================================================================
RCS file: /cvs/extras/rpms/bmp/devel/bmp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bmp.spec	16 Mar 2005 17:24:48 -0000	1.1
+++ bmp.spec	17 Mar 2005 20:35:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           bmp
 Version:        0.9.7
-Release:        4
+Release:        5
 Summary:        GTK2 based port of the XMMS media player
 
 Group:          Applications/Multimedia
@@ -34,6 +34,7 @@
 Summary:        Development files for the Beep Media Player
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       glib2-devel gtk2-devel gnome-vfs2-devel GConf2-devel
 
 %description    devel
 Development files for the Beep Media Player
@@ -116,6 +117,9 @@
 
 
 %changelog
+* Thu Mar 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-5
+- Add -devel dependencies needed for headers and pkgconfig template.
+
 * Wed Mar 16 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-4
 - Apply common spec cleanup and corrections.
 - Add patch to make ALSA output driver the default.



From fedora-extras-commits at redhat.com  Thu Mar 17 20:58:44 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 15:58:44 -0500
Subject: rpms/goopy/devel goopy.spec,1.2,1.3
Message-ID: <200503172058.j2HKwiDf025740@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25732

Modified Files:
	goopy.spec 
Log Message:
remove version on buildreq



Index: goopy.spec
===================================================================
RCS file: /cvs/extras/rpms/goopy/devel/goopy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- goopy.spec	17 Mar 2005 20:14:11 -0000	1.2
+++ goopy.spec	17 Mar 2005 20:58:42 -0000	1.3
@@ -6,12 +6,12 @@
 Summary: Google Python Utilities
 Name: goopy
 Version: 0.1
-Release: 2
+Release: 3
 Source0: %{name}-%{version}.tar.gz
 License: BSD
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python >= %{pyver}
+BuildRequires: python
 BuildArch: noarch
 
 %description
@@ -35,6 +35,9 @@
 %{python_sitelib}/goopy
 
 %changelog
+* Thu Mar 17 2005 Peter Jones <pjones at redhat.com> - 0.1-3
+- version on python buildreq is dumb
+
 * Thu Mar 17 2005 Peter Jones <pjones at redhat.com> - 0.1-2
 - remove dep on python; rpm auto-requires python(abi) = %%{pyver}
 - ask python where the site-packages dir is for %%files



From fedora-extras-commits at redhat.com  Thu Mar 17 21:14:58 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:14:58 -0500
Subject: rpms/python-goopy - New directory
Message-ID: <200503172114.j2HLEw0l026657@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26648/python-goopy

Log Message:
Directory /cvs/extras/rpms/python-goopy added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 21:14:58 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:14:58 -0500
Subject: rpms/python-goopy/devel - New directory
Message-ID: <200503172114.j2HLEw3P026660@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26648/python-goopy/devel

Log Message:
Directory /cvs/extras/rpms/python-goopy/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 21:17:29 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:17:29 -0500
Subject: rpms/python-goopy Makefile,NONE,1.1
Message-ID: <200503172117.j2HLHTsi026818@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26809

Added Files:
	Makefile 
Log Message:
wtf didn't these get created right?



--- NEW FILE Makefile ---
# Top level Makefile for module python-goopy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From fedora-extras-commits at redhat.com  Thu Mar 17 21:17:29 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:17:29 -0500
Subject: rpms/python-goopy/devel Makefile,NONE,1.1
Message-ID: <200503172117.j2HLHT5C026821@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26809/devel

Added Files:
	Makefile 
Log Message:
wtf didn't these get created right?



***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'



From fedora-extras-commits at redhat.com  Thu Mar 17 21:21:39 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:21:39 -0500
Subject: rpms/python-goopy - New directory
Message-ID: <200503172121.j2HLLd1d027067@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27060/python-goopy

Log Message:
Directory /cvs/extras/rpms/python-goopy added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 21:21:39 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:21:39 -0500
Subject: rpms/python-goopy/devel - New directory
Message-ID: <200503172121.j2HLLdwn027070@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27060/python-goopy/devel

Log Message:
Directory /cvs/extras/rpms/python-goopy/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 21:21:52 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:21:52 -0500
Subject: rpms/python-goopy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503172121.j2HLLqSE027129@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27120

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-goopy


--- NEW FILE Makefile ---
# Top level Makefile for module python-goopy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 17 21:21:52 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:21:52 -0500
Subject: rpms/python-goopy/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503172121.j2HLLq28027132@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27120/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-goopy


--- 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 Mar 17 21:22:11 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:22:11 -0500
Subject: rpms/python-goopy import.log,1.1,1.2
Message-ID: <200503172122.j2HLMBVl027231@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27222

Modified Files:
	import.log 
Log Message:
auto-import python-goopy-0.1-1 on branch devel from python-goopy-0.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-goopy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Mar 2005 21:21:50 -0000	1.1
+++ import.log	17 Mar 2005 21:22:09 -0000	1.2
@@ -0,0 +1 @@
+python-goopy-0_1-1:HEAD:python-goopy-0.1-1.src.rpm:1111094526



From fedora-extras-commits at redhat.com  Thu Mar 17 21:22:11 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:22:11 -0500
Subject: rpms/python-goopy/devel python-goopy.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503172122.j2HLMBaY027235@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27222/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-goopy.spec 
Log Message:
auto-import python-goopy-0.1-1 on branch devel from python-goopy-0.1-1.src.rpm


--- NEW FILE python-goopy.spec ---
%define realname goopy
%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
%undefine _enable_debug_packages
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Google Python Utilities
Name: python-goopy
Version: 0.1
Release: 1
Source0: %{realname}-%{version}.tar.gz
License: BSD
Group: Development/Libraries
Url: https://sourceforge.net/projects/goog-goopy/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
BuildArch: noarch

%description
The python-goopy package contains python utilities from Google.

%prep
%setup -q -n %{realname}-%{version}

%build

%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --root "${RPM_BUILD_ROOT}" --record=INSTALLED_FILES

%clean
rm -rf $RPM_BUILD_ROOT

%files -f INSTALLED_FILES
%defattr(-,root,root)
%doc README PKG-INFO

%changelog
* Thu Mar 17 2005 Peter Jones <pjones at redhat.com> - 0.1-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-goopy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Mar 2005 21:21:50 -0000	1.1
+++ .cvsignore	17 Mar 2005 21:22:09 -0000	1.2
@@ -0,0 +1 @@
+goopy-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-goopy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Mar 2005 21:21:50 -0000	1.1
+++ sources	17 Mar 2005 21:22:09 -0000	1.2
@@ -0,0 +1 @@
+e6f6782c01af621dfaf7f4a272838a70  goopy-0.1.tar.gz



From sopwith at redhat.com  Thu Mar 17 21:37:50 2005
From: sopwith at redhat.com (Elliot Lee)
Date: Thu, 17 Mar 2005 16:37:50 -0500 (EST)
Subject: Fedora Core CVS commit notifications
Message-ID: <Pine.LNX.4.58.0503171614400.18630@devserv.devel.redhat.com>

Hey hackers!

If you would like to get details of the commits to Fedora Core packages,
you can now receive them by subscribing to the fedora-cvs-commits mailing
list (https://www.redhat.com/mailman/listinfo/fedora-cvs-commits).

This list is the Fedora Core equivalent of the fedora-extras-commits list.

Best,
-- Elliot



From fedora-extras-commits at redhat.com  Thu Mar 17 21:57:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 16:57:11 -0500
Subject: devel/xosd xosd-defaults.patch,NONE,1.1 xosd.spec,1.7,1.8
Message-ID: <200503172157.j2HLvBje027921@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/xosd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27914

Modified Files:
	xosd.spec 
Added Files:
	xosd-defaults.patch 
Log Message:
Add BMP plugin subpackage, improve default config.

xosd-defaults.patch:

--- NEW FILE xosd-defaults.patch ---
diff -Naru xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c xosd-2.2.14/src/bmp_plugin/bmp_osd.c
--- xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c	2004-11-17 21:26:56.000000000 +0200
+++ xosd-2.2.14/src/bmp_plugin/bmp_osd.c	2005-03-17 23:42:25.000000000 +0200
@@ -177,8 +177,8 @@
   colour = NULL;
   font = NULL;
   timeout = 3;
-  offset = 50;
-  h_offset = 0;
+  offset = 60;
+  h_offset = 60;
   shadow_offset = 1;
   outline_offset = 0;
   pos = XOSD_bottom;
diff -Naru xosd-2.2.14.orig/src/libxosd/xosd.c xosd-2.2.14/src/libxosd/xosd.c
--- xosd-2.2.14.orig/src/libxosd/xosd.c	2004-11-17 21:27:11.000000000 +0200
+++ xosd-2.2.14/src/libxosd/xosd.c	2005-03-17 23:43:48.000000000 +0200
@@ -24,7 +24,7 @@
 #define XOFFSET 10
 
 const char *osd_default_font =
-  "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*";
+  "-*-luxi sans-*-r-*-*-17-*-*-*-*-*-*-*";
 #if 0
 "-adobe-helvetica-bold-r-*-*-10-*";
 #endif
diff -Naru xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c xosd-2.2.14/src/xmms_plugin/xmms_osd.c
--- xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c	2004-11-04 21:47:50.000000000 +0200
+++ xosd-2.2.14/src/xmms_plugin/xmms_osd.c	2005-03-17 23:42:11.000000000 +0200
@@ -177,8 +177,8 @@
   colour = NULL;
   font = NULL;
   timeout = 3;
-  offset = 50;
-  h_offset = 0;
+  offset = 60;
+  h_offset = 60;
   shadow_offset = 1;
   outline_offset = 0;
   pos = XOSD_bottom;


Index: xosd.spec
===================================================================
RCS file: /cvs/extras/devel/xosd/xosd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xosd.spec	29 Nov 2004 18:40:26 -0000	1.7
+++ xosd.spec	17 Mar 2005 21:57:09 -0000	1.8
@@ -1,8 +1,9 @@
-%define	plugdir	%(xmms-config --general-plugin-dir 2>/dev/null)
+%define	xmms_plugdir %(xmms-config --general-plugin-dir 2>/dev/null)
+%define bmp_plugdir %(pkg-config bmp --variable=general_plugin_dir 2>/dev/null)
 
 Name:           xosd
 Version:        2.2.14
-Release:        1
+Release:        2
 Summary:        On-screen display library for X
 
 Group:          System Environment/Libraries
@@ -10,9 +11,11 @@
 URL:            http://www.ignavus.net/software.html
 Source:         http://ftp.debian.org/debian/pool/main/x/xosd/xosd_2.2.14.orig.tar.gz
 Patch0:         %{name}-aclocal18.patch
+Patch1:         %{name}-defaults.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel >= 1:0.22.0, xmms-devel
+BuildRequires:  bmp-devel
 
 %description
 XOSD displays text on your screen, sounds simple right? The difference
@@ -32,19 +35,29 @@
 display.
 
 %package     -n xmms-%{name}
-Summary:        An XMMS plugin for on-screen display using the XOSD library
+Summary:        XMMS plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
 Requires:       %{name} = %{version}-%{release}, xmms
 Obsoletes:      %{name}-xmms <= 2.2.12
 
 %description -n xmms-%{name}
-An X MultiMedia System plugin to display information on-screen through
+X MultiMedia System plugin to display information on-screen through
+the XOSD library, similarly to TV OSD.
+
+%package     -n bmp-%{name}
+Summary:        BMP plugin for on-screen display using the XOSD library
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}-%{release}, bmp
+
+%description -n bmp-%{name}
+Beep Media Player plugin to display information on-screen through
 the XOSD library, similarly to TV OSD.
 
 
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 
 %build
@@ -56,7 +69,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT{%{_libdir},%{plugdir}}/*.la
+rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir},%{bmp_plugdir}}/*.la
 
 
 %clean
@@ -87,10 +100,18 @@
 
 %files -n xmms-%{name}
 %defattr(-,root,root,-)
-%{plugdir}/*.so
+%{xmms_plugdir}/*.so
+
+%files -n bmp-%{name}
+%defattr(-,root,root,-)
+%{bmp_plugdir}/*.so
 
 
 %changelog
+* Thu Mar 17 2005 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-2
+- Add Beep Media Player plugin subpackage.
+- Improve default font and plugin OSD placement.
+
 * Mon Nov 29 2004 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-1
 - Update to 2.2.14 (from Debian).
 - Drop pre-FC1 gdk-pixbuf compatibility kludges.



From fedora-extras-commits at redhat.com  Thu Mar 17 22:09:27 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 17:09:27 -0500
Subject: devel/python-HTMLgen python-HTMLgen.spec,1.3,1.4
Message-ID: <200503172209.j2HM9R04029175@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29167

Modified Files:
	python-HTMLgen.spec 
Log Message:
Version and %python_sitelib cleanup


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/devel/python-HTMLgen/python-HTMLgen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-HTMLgen.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ python-HTMLgen.spec	17 Mar 2005 22:09:25 -0000	1.4
@@ -1,19 +1,16 @@
-%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
-%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')
-
-%define version 2.2.2
+%{!?pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}%define mainpyver %(%{__python} -c 'import sys;print(sys.version[0:3])')
+%{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?pydir: %define pydir %(%{__python}%{pyver} -c "from distutils.sysconfig import get_config_vars; print get_config_vars()['LIBDEST']")}
 
 %if "%{pyver}" == "%{mainpyver}"
 %define name python-HTMLgen
-%define prov python%{pyver}-htmlgen = %{version} python-htmlgen = %{version}
 %else
 %define name python%{pyver}-HTMLgen
-%define prov python%{pyver}-htmlgen = %{version}
 %endif
 
 Name:           %name
-Version:        %version
-Release:        2
+Version:        2.2.2
+Release:        3
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -22,10 +19,9 @@
 Source0:        http://starship.python.net/crew/friedrich/HTMLgen.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Provides:       %{prov}
 BuildRequires:  python-abi = %{pyver}
 Requires:       python-abi = %{pyver}
-Provides:       HTMLgen = %{version}
+Provides:       python%{pyver}HTMLgen = %{version}
 BuildArch:      noarch
 
 %description
@@ -40,22 +36,26 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+install -d -m 0755 $RPM_BUILD_ROOT%{python_sitelib}
 for file in HTMLgen.py HTMLcolors.py HTMLutil.py HTMLcalendar.py barchart.py colorcube.py imgsize.py NavLinks.py Formtools.py ImageH.py ImageFileH.py ImagePaletteH.py GifImagePluginH.py JpegImagePluginH.py PngImagePluginH.py; do
-  install -m 0644 $file $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+  install -m 0644 $file $RPM_BUILD_ROOT%{python_sitelib}
 done
-python%{pyver} %{_libdir}/python%{pyver}/compileall.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
-python%{pyver} -O %{_libdir}/python%{pyver}/compileall.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+%{__python}%{pyver} %{pydir}/compileall.py $RPM_BUILD_ROOT%{python_sitelib}
+%{__python}%{pyver} -O %{pydir}/compileall.py $RPM_BUILD_ROOT%{python_sitelib}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/python%pyver/site-packages/*.py
-%{_libdir}/python%pyver/site-packages/*.py[co]
+%{python_sitelib}/*.py
+%{python_sitelib}/*.py[co]
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-3
+- Streamlined version handling
+- Implemented %python_sitelib
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-2
 - Modified %setup to use -n
 - Broke %description at 80 columns



From fedora-extras-commits at redhat.com  Thu Mar 17 22:12:34 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 17:12:34 -0500
Subject: devel/python-HTMLgen python-HTMLgen.spec,1.4,1.5
Message-ID: <200503172212.j2HMCYn6029369@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29360

Modified Files:
	python-HTMLgen.spec 
Log Message:
Fixed small Provides bug


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/devel/python-HTMLgen/python-HTMLgen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-HTMLgen.spec	17 Mar 2005 22:09:25 -0000	1.4
+++ python-HTMLgen.spec	17 Mar 2005 22:12:32 -0000	1.5
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        2.2.2
-Release:        3
+Release:        4
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -21,7 +21,7 @@
 
 BuildRequires:  python-abi = %{pyver}
 Requires:       python-abi = %{pyver}
-Provides:       python%{pyver}HTMLgen = %{version}
+Provides:       python%{pyver}-HTMLgen = %{version}
 BuildArch:      noarch
 
 %description
@@ -52,6 +52,9 @@
 %{python_sitelib}/*.py[co]
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-4
+- Fixed small Provides bug
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-3
 - Streamlined version handling
 - Implemented %python_sitelib



From fedora-extras-commits at redhat.com  Thu Mar 17 22:35:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 17:35:39 -0500
Subject: devel/hamlib hamlib.spec,1.3,1.4
Message-ID: <200503172235.j2HMZdND030501@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30495

Modified Files:
	hamlib.spec 
Log Message:
Fixed %post and %postun along with Requires(...)


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hamlib.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ hamlib.spec	17 Mar 2005 22:35:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name: hamlib
 Version: 1.2.3
-Release: 2
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transcievers and receivers.
@@ -16,6 +16,8 @@
 BuildRequires: gzip, make >= 3.77, patch >= 2.5, rpm >= 3.0, sed
 BuildRequires: textutils python-devel swig gd-devel
 BuildRequires: doxygen
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 Hamlib provides a standardised programming interface that applications 
@@ -37,6 +39,8 @@
 %package c++
 Summary: Hamlib radio control library C++ binding
 Group: Development/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description c++
 Hamlib radio control library C++ language binding.
@@ -135,6 +139,10 @@
 
 %postun -p /sbin/ldconfig
 
+%post c++ -p /sbin/ldconfig
+
+%postun c++ -p /sbin/ldconfig
+
 %files
 %defattr(-, root, root)
 %doc COPYING doc/html
@@ -197,6 +205,9 @@
 
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-4
+- Fixed %post and %postun along with Requires(...)
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-3
 - Spell-corrected %description
 



From fedora-extras-commits at redhat.com  Thu Mar 17 22:39:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 17:39:02 -0500
Subject: devel/libosip libosip.spec,1.2,1.3
Message-ID: <200503172239.j2HMd2IC030707@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30699

Modified Files:
	libosip.spec 
Log Message:
Spec file cleanup


Index: libosip.spec
===================================================================
RCS file: /cvs/extras/devel/libosip/libosip.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libosip.spec	16 Mar 2005 23:41:59 -0000	1.2
+++ libosip.spec	17 Mar 2005 22:39:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libosip
 Version:        0.9.7
-Release:        2
+Release:        3
 Summary:        oSIP is an implementation of SIP
 
 Group:          System Environment/Libraries
@@ -27,11 +27,18 @@
 Requires:       %{name} = %{version}-%{release}
 
 %description    devel
-The GNU oSIP library is written in C and get no dependencies except the standard C library. oSIP is thread safe and will generally be used in a multi-threaded application. Nevertheless, this is optional.
-
-oSIP is little in size and code and thus could be use to implement IP soft-phone as well as embedded SIP software. oSIP is not limited to endpoint agents, and can also be used to implement "SIP proxy".
-
-oSIP does not intend to provide a high layer API for controlling "SIP Session" at this step. Instead, it currently provides an API for the SIP message parser, SDP message parser, and library to handle "SIP transactions" as defined by the SIP document.
+The GNU oSIP library is written in C and get no dependencies except the
+standard C library. oSIP is thread safe and will generally be used in a
+multi-threaded application. Nevertheless, this is optional.
+
+oSIP is little in size and code and thus could be use to implement IP
+soft-phone as well as embedded SIP software. oSIP is not limited to endpoint
+agents, and can also be used to implement "SIP proxy".
+
+oSIP does not intend to provide a high layer API for controlling "SIP Session"
+at this step. Instead, it currently provides an API for the SIP message parser,
+SDP message parser, and library to handle "SIP transactions" as defined by the
+SIP document.
 
 %prep
 %setup -q
@@ -50,8 +57,6 @@
 %post
 /sbin/ldconfig
 
-%preun
-
 %postun
 /sbin/ldconfig
 
@@ -68,6 +73,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-3
+- Spec file cleanup
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-2
 - Fix %files devel to include %{_includedir}/osip
 - Broke %description at 80 columns



From bugs.michael at gmx.net  Thu Mar 17 22:45:48 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 17 Mar 2005 23:45:48 +0100
Subject: devel/hamlib hamlib.spec,1.3,1.4
In-Reply-To: <200503172235.j2HMZdND030501@cvs-int.fedora.redhat.com>
References: <200503172235.j2HMZdND030501@cvs-int.fedora.redhat.com>
Message-ID: <20050317234548.2dc77869.bugs.michael@gmx.net>

On Thu, 17 Mar 2005 17:35:39 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/devel/hamlib
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30495
> 
> Modified Files:
> 	hamlib.spec 
> Log Message:
> Fixed %post and %postun along with Requires(...)

> +Requires(post): /sbin/ldconfig
> +Requires(postun): /sbin/ldconfig

Not needed. These are automatically set because you change the
scriplet interpreter with -p:

> +%post c++ -p /sbin/ldconfig
> +
> +%postun c++ -p /sbin/ldconfig
> +



From fedora-extras-commits at redhat.com  Thu Mar 17 22:53:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 17:53:03 -0500
Subject: devel/linphone linphone.spec,1.2,1.3
Message-ID: <200503172253.j2HMr3Sl031351@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31345

Modified Files:
	linphone.spec 
Log Message:
Broke %description at 80 columns


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linphone.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ linphone.spec	17 Mar 2005 22:53:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        2
+Release:        3
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -17,13 +17,18 @@
 Requires(postun): /sbin/ldconfig
 
 %description
-Linphone is mostly sip compliant. It works successfully with these implementations:
+Linphone is mostly sip compliant. It works successfully with these
+implementations:
     * eStara softphone (commercial software for windows)
     * Pingtel phones (with DNS enabled and VLAN QOS support disabled).
     * Hotsip, a free of charge phone for Windows.
-    * Vocal, an open source SIP stack from Vovida that includes a SIP proxy that works with linphone since version 0.7.1.
-    * Siproxd is a free sip proxy being developped by Thomas Ries because he would like to have linphone working behind his firewall. Siproxd is simple to setup and works perfectly with linphone.
-    * Partysip aims at being a generic and fully functionnal SIP proxy. Visit the web page for more details on its functionalities.
+    * Vocal, an open source SIP stack from Vovida that includes a SIP proxy
+        that works with linphone since version 0.7.1.
+    * Siproxd is a free sip proxy being developped by Thomas Ries because he
+        would like to have linphone working behind his firewall. Siproxd is
+        simple to setup and works perfectly with linphone.
+    * Partysip aims at being a generic and fully functionnal SIP proxy. Visit
+        the web page for more details on its functionalities.
 
 Linphone may work also with other sip phones, but this has not been tested yet.
 
@@ -83,6 +88,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-3
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-2
 - Removed explicit Requires
 



From ivazquez at ivazquez.net  Thu Mar 17 22:59:10 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 17:59:10 -0500
Subject: devel/hamlib hamlib.spec,1.3,1.4
In-Reply-To: <20050317234548.2dc77869.bugs.michael@gmx.net>
References: <200503172235.j2HMZdND030501@cvs-int.fedora.redhat.com>
	<20050317234548.2dc77869.bugs.michael@gmx.net>
Message-ID: <1111100350.30220.27.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 23:45 +0100, Michael Schwendt wrote:
> On Thu, 17 Mar 2005 17:35:39 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> > +Requires(post): /sbin/ldconfig
> > +Requires(postun): /sbin/ldconfig
> 
> Not needed. These are automatically set because you change the
> scriplet interpreter with -p:

Aha. Thanks.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/ebab248f/attachment.sig>

From fedora-extras-commits at redhat.com  Thu Mar 17 22:59:26 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 17:59:26 -0500
Subject: devel/hamlib hamlib.spec,1.4,1.5
Message-ID: <200503172259.j2HMxQps031405@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31399

Modified Files:
	hamlib.spec 
Log Message:
Removed spurious Requires(...)


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hamlib.spec	17 Mar 2005 22:35:37 -0000	1.4
+++ hamlib.spec	17 Mar 2005 22:59:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name: hamlib
 Version: 1.2.3
-Release: 4
+Release: 5
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transcievers and receivers.
@@ -16,8 +16,6 @@
 BuildRequires: gzip, make >= 3.77, patch >= 2.5, rpm >= 3.0, sed
 BuildRequires: textutils python-devel swig gd-devel
 BuildRequires: doxygen
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 
 %description
 Hamlib provides a standardised programming interface that applications 
@@ -39,8 +37,6 @@
 %package c++
 Summary: Hamlib radio control library C++ binding
 Group: Development/Libraries
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 
 %description c++
 Hamlib radio control library C++ language binding.
@@ -205,6 +201,9 @@
 
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-5
+- Removed spurious Requires(...)
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-4
 - Fixed %post and %postun along with Requires(...)
 



From fedora-extras-commits at redhat.com  Thu Mar 17 23:13:55 2005
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Thu, 17 Mar 2005 18:13:55 -0500
Subject: rpms/cfengine/FC-3 cfengine.spec, 1.6, 1.7 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200503172313.j2HNDtfB032301@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32295

Modified Files:
	cfengine.spec sources .cvsignore 
Log Message:
update to upstream 2.1.13, multiple spec file changes


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/cfengine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cfengine.spec	15 Dec 2004 19:33:17 -0000	1.6
+++ cfengine.spec	17 Mar 2005 23:13:53 -0000	1.7
@@ -1,16 +1,17 @@
-Summary: GNU cfengine - a systems administration tool for networks
+Summary: A systems administration tool for networks
 Name: cfengine
-Epoch: 0
-Version: 2.1.9
-Release: 2
+Version: 2.1.13
+Release: 4
 License: GPL
-Group: System Environment/Daemons
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.9.tar.gz
+Group: Applications/System
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.13.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
 URL: http://www.cfengine.org/
-BuildRequires: db4-devel,openssl-devel,texinfo,tetex-dvips,bison,flex,m4
+BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel
+Requires(post): /sbin/chkconfig, /sbin/install-info
+Requires(preun): /sbin/chkconfig, /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -22,12 +23,10 @@
 configurations. Cfengine is designed to be a part of a computer immune
 system.
 
-#---------------------------------------------------------------------
 
 %prep
-%setup -n %{name}-%{version}
+%setup -q
 
-#---------------------------------------------------------------------
 
 %build
 # Since /usr is managed by rpmdb, we can build stuff in there
@@ -35,10 +34,9 @@
 # ./configure BERKELEY_DB_LIB=-ldb --prefix=/usr --infodir=/usr/share/info
 %configure BERKELEY_DB_LIB=-ldb --with-docs
 make
-
 # Some of the example files have execute bit for some reason.
 chmod 644 inputs/*example
-#---------------------------------------------------------------------
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,56 +45,46 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 make DESTDIR=$RPM_BUILD_ROOT install
 # make directory tree for cfengine configs
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_var}/%{name}
 for i in ppkeys inputs outputs
 do
- 	mkdir -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/%{name}/$i
+ 	mkdir -m 0700 $RPM_BUILD_ROOT%{_var}/%{name}/$i
 done
 
 # It's ugly, but thats the way Mark wants to have it. :(
 # If we don't create this link, cfexecd will not be able to start
 # (hardcoded) /var/sbin/cfagent in scheduled intervals. Other option 
 # would be to patch cfengine to use %{_sbindir}/cfagent
-mkdir -p $RPM_BUILD_ROOT/var/cfengine/bin
-ln -sf %{_sbindir}/cfagent $RPM_BUILD_ROOT/var/cfengine/bin/
+mkdir -p $RPM_BUILD_ROOT/%{_var}/%{name}/bin
+ln -sf %{_sbindir}/cfagent $RPM_BUILD_ROOT/%{_var}/%{name}/bin/
 
 # Startup file for cfexecd and cfservd
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 for i in %{SOURCE1} %{SOURCE2} %{SOURCE3}
 do
-	install -m 0755 $i $RPM_BUILD_ROOT%{_initrddir}/
+	install -p -m 0755 $i $RPM_BUILD_ROOT%{_initrddir}/
 done
 
-#
-# Appearantly this %{_infodir}/dir gets build on RH9, but it doesn't
-# appear in my RH8 box. Confusing situation...
-#
-if [ -f $RPM_BUILD_ROOT%{_infodir}/dir ]; then
-	rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-fi
-if [ -f NEWS -a -z "`cat NEWS`" ]; then
-	rm -f NEWS
-fi
-#
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
 # All this stuff is pushed into doc directory.
-#
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} 
-#---------------------------------------------------------------------
+
 
 %post
 # cfagent won't run nicely, unless your host has keys.
-if [ ! -d /mnt/sysimage -a ! -f %{_localstatedir}/%{name}/ppkeys/localhost.priv ]; then
+if [ ! -d /mnt/sysimage -a ! -f %{_var}/%{name}/ppkeys/localhost.priv ]; then
 	%{_sbindir}/cfkey
-	/sbin/install-info --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
 fi
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
+# add init files to chkconfig
 if [ "$1" = "1" ]; then
 	chkconfig --add cfenvd
 	chkconfig --add cfexecd
 	chkconfig --add cfservd
-	chkconfig cfenvd off
-	chkconfig cfexecd off
-	chkconfig cfservd off
 fi
+
+
 %preun
 if [ "$1" = "0" ]; then
         /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
@@ -105,15 +93,13 @@
 	chkconfig --del cfservd
 fi
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %doc contrib
 %doc inputs
@@ -123,18 +109,36 @@
 %{_sbindir}/*
 %{_mandir}/man8/*
 %{_infodir}/cfengine*
-%config(noreplace) %{_initrddir}/cfenvd
-%config(noreplace) %{_initrddir}/cfexecd
-%config(noreplace) %{_initrddir}/cfservd
-/var/cfengine/bin
-%dir %{_localstatedir}/%{name}
-%dir %{_localstatedir}/%{name}/inputs
-%dir %{_localstatedir}/%{name}/outputs
-%dir %{_localstatedir}/%{name}/ppkeys
+%config %{_initrddir}/cfenvd
+%config %{_initrddir}/cfexecd
+%config %{_initrddir}/cfservd
+%dir %{_var}/%{name}
+%dir %{_var}/%{name}/bin
+%dir %{_var}/%{name}/inputs
+%dir %{_var}/%{name}/outputs
+%dir %{_var}/%{name}/ppkeys
 
-#---------------------------------------------------------------------
 
 %changelog
+* Mon Mar 14 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.13-4
+- add buildrequires: tetex
+
+* Wed Mar  9 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.13-3
+- change _localstatdir macros to _var
+- change group to Applications/System
+- add buildrequires: libacl-devel
+- add requires(post,preun) for chkconfig and install-info
+
+* Wed Mar  9 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.13-2
+- Remove unnecessary 'chkconfig <init_script> off' from post section
+
+* Mon Mar  7 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.13-1
+- Various spec file changes: change summary, line separators, defattr
+- Remove epoch 0
+
+* Mon Feb 27 2005 David Dorgan <davidd at micro-gravity.com> - 0:2.1.13-0
+- Updated to version 2.1.13
+
 * Sun Aug 15 2004 Juha Ylitalo <jylitalo at iki.fi> - 0:2.1.9-2
 - nowdays we need --with-docs to get man pages included
 - texinfo added into buildrequires list


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Dec 2004 19:33:17 -0000	1.4
+++ sources	17 Mar 2005 23:13:53 -0000	1.5
@@ -1 +1 @@
-421ac1ba0fd9cbe0384f1b0eded1afd8  cfengine-2.1.9.tar.gz
+2c002fc37f2fc9f87248ad8b9e899091  cfengine-2.1.13.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Dec 2004 19:33:17 -0000	1.4
+++ .cvsignore	17 Mar 2005 23:13:53 -0000	1.5
@@ -1 +1 @@
-cfengine-2.1.9.tar.gz
+cfengine-2.1.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 17 23:31:38 2005
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Thu, 17 Mar 2005 18:31:38 -0500
Subject: rpms/fortune-mod/FC-3 fortune-mod-1.99-move-offensive.patch, NONE,
	1.1 fortune-mod-1.99-remove-offensive-option.patch, NONE,
	1.1 fortune-mod-cflags.patch, NONE,
	1.1 fortune-mod-offense.patch, 1.1, 1.2 fortune-mod.spec, 1.5,
	1.6 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4
Message-ID: <200503172331.j2HNVcdM032446@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/fortune-mod/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32440

Modified Files:
	fortune-mod-offense.patch fortune-mod.spec sources .cvsignore 
Added Files:
	fortune-mod-1.99-move-offensive.patch 
	fortune-mod-1.99-remove-offensive-option.patch 
	fortune-mod-cflags.patch 
Log Message:
update to version 1.99.1 - and a few spec file changes

fortune-mod-1.99-move-offensive.patch:

--- NEW FILE fortune-mod-1.99-move-offensive.patch ---
--- datfiles/riddles	2004-03-05 05:29:56.000000000 -0800
+++ datfiles/riddles.pc	2005-03-14 06:09:08.290062640 -0800
@@ -419,9 +419,6 @@
 Q:	What's a light-year?
 A:	One-third less calories than a regular year.
 %
-Q:	What's a WASP's idea of open-mindedness?
-A:	Dating a Canadian.
-%
 Q:	What's buried in Grant's tomb?
 A:	A corpse.
 %
--- datfiles/off/unrotated/riddles	2004-03-05 05:29:56.000000000 -0800
+++ datfiles/off/unrotated/riddles.new	2005-03-14 06:11:01.351874632 -0800
@@ -1098,3 +1098,6 @@
 Why is it that there are so many more horses' asses than there are horses?
 		-- G. Gordon Liddy
 %
+Q:     What's a WASP's idea of open-mindedness?
+A:     Dating a Canadian.
+%

fortune-mod-1.99-remove-offensive-option.patch:

--- NEW FILE fortune-mod-1.99-remove-offensive-option.patch ---
--- fortune/fortune.c	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune.c.nooff	2005-03-13 08:47:12.815509344 -0800
@@ -275,7 +275,7 @@
 #ifndef	NO_REGEX
     (void) fprintf(stderr, "i");
 #endif /* NO_REGEX */
-    (void) fprintf(stderr, "losw]");
+    (void) fprintf(stderr, "lsw]");
 #ifndef	NO_REGEX
     (void) fprintf(stderr, " [-m pattern]");
 #endif /* NO_REGEX */
@@ -1013,9 +1013,9 @@
     ignore_case = FALSE;
 
 #ifdef DEBUG
-    while ((ch = getopt(argc, argv, "acDefilm:n:osvw")) != EOF)
+    while ((ch = getopt(argc, argv, "acDefilm:n:svw")) != EOF)
 #else
-    while ((ch = getopt(argc, argv, "acefilm:n:osvw")) != EOF)
+    while ((ch = getopt(argc, argv, "acefilm:n:svw")) != EOF)
 #endif /* DEBUG */
 	switch (ch)
 	  {
@@ -1040,9 +1040,6 @@
 	  case 'n':
 	      SLEN = atoi(optarg);
 	      break;
-	  case 'o':		/* offensive ones only */
-	      Offend++;
-	      break;
 	  case 's':		/* short ones only */
 	      Short_only++;
 	      Long_only = FALSE;
--- fortune/fortune-man.part1	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune-man.part1.nooff	2005-03-13 09:00:47.344682088 -0800
@@ -50,7 +50,7 @@
 .SH NAME
 fortune \- print a random, hopefully interesting, adage
 .SH SYNOPSIS
-.BR fortune " [" -acefilosw "] [" -n 
+.BR fortune " [" -acefilsw "] [" -n 
 .IR length "] ["
 .B -m 
 .IR pattern "] [[" n% "] " file/dir/all ]
@@ -58,15 +58,12 @@
 When
 .B fortune
 is run with no arguments it prints out a random epigram. Epigrams are
-divided into several categories, where each category is sub-divided
-into those which are potentially offensive and those which are not.
+divided into several categories.
 .SS Options
 The options are as follows:
 .TP
 .B -a
-Choose from all lists of maxims, both offensive and not.  (See the
-.B -o 
-option for more information on offensive fortunes.)
+Choose from all lists of maxims.
 .TP
 .B -c
 Show the cookie file from which the fortune came.
@@ -114,29 +111,6 @@
 ask for short fortunes, or too long and ask for long ones, fortune goes
 into a never-ending thrash loop.
 .TP
-.B -o
-Choose only from potentially offensive aphorisms.  The -o option is
-ignored if a fortune directory is specified.
-.sp
-.B Please, please, please request a potentially
-.B offensive fortune if and only if
-.B you believe, deep in your heart,
-.B that you are willing to be
-.B offended. (And that you'll just quit
-.BR using " -o " rather
-.B than give us grief about it,
-.B okay?)
-.sp
-.RS
-\&... let us keep in mind the basic governing philosophy of The
-Brotherhood, as handsomely summarized in these words: we believe in
-healthy, hearty laughter -- at the expense of the whole human race, if
-needs be.  Needs be.
-.RS
---H. Allen Smith, "Rude Jokes"
-.RE
-.RE
-.TP
 .B -s
 Short apothegms only.  See
 .B -n
@@ -207,30 +181,6 @@
 .RI "50% " funny " 50% " not-funny
 .sp
 .RE
-This fortune also supports the BSD method of appending ``-o'' to
-database names to specify offensive fortunes.  However this is
-.B not
-how fortune stores them: offensive fortunes are stored in a seperate
-directory without the ``-o'' infix.  A plain name (i.e., not a path to a
-file or directory) that ends in ``-o'' will be assumed to be an
-offensive database, and will have its suffix stripped off and be
-searched in the offensive directory (even if the neither of the
-.IR -a " or " -o
-options were specified).  This feature is not only for
-backwards-compatibility, but also to allow users to distinguish between
-inoffensive and offensive databases of the same name.
-.PP
-For example, assuming there is a database named
-.I definitions
-in both the inoffensive and potentially offensive collections, then the
-following command will select an inoffensive definition 90% of the time,
-and a potentially offensive definition for the remaining 10%:
-.RS
-.sp
-.B fortune
-90%
-.I definitions definitions-o
-.RE
 .SH FILES
 Note: these are the defaults as defined at compile time.
 .PP
--- fortune/fortune-man.part2	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune-man.part2.nooff	2005-03-13 09:13:40.985070872 -0800
@@ -8,16 +8,6 @@
 .B fortune
 no longer finds the pointers file, it ignores the text file.
 .SH BUGS
-The division of fortunes into offensive and non-offensive by directory,
-rather than via the `-o' file infix, is not 100% compatible with
-original BSD fortune. Although the `-o' infix is recognised as referring
-to an offensive database, the offensive database files still need to be
-in a separate directory.  The workaround, of course, is to move the `-o'
-files into the offensive directory (with or without renaming), and to
-use the
-.B -a
-option.
-.PP
 The supplied fortune databases have been attacked, in order to correct
 orthographical and grammatical errors, and particularly to reduce
 redundancy and repetition and redundancy.  But especially to avoid
@@ -26,13 +16,7 @@
 .PP
 The fortune databases are now divided into a larger number of smaller
 files, some organized by format (poetry, definitions), and some by
-content (religion, politics).  There are parallel files in the main
-directory and in the offensive files directory (e.g., fortunes/definitions and
-fortunes/off/definitions).  Not all the potentially offensive fortunes are in
-the offensive fortunes files, nor are all the fortunes in the offensive
-files potentially offensive, probably, though a strong attempt has been
-made to achieve greater consistency.  Also, a better division might be
-made.
+content (religion, politics).
 .SH HISTORY
 This version of fortune is based on the NetBSD fortune 1.4, but with a
 number of bug fixes and enhancements.

fortune-mod-cflags.patch:

--- NEW FILE fortune-mod-cflags.patch ---
--- fortune-mod-1.99.1/Makefile	2004-03-05 05:29:56.000000000 -0800
+++ fortune-mod-1.99.1/Makefile.cflags	2005-03-13 08:34:26.910944536 -0800
@@ -65,8 +65,8 @@
 RECODELIBS=-lrecode
 
 DEFINES=-DFORTDIR="\"$(COOKIEDIR)\"" -DOFFDIR="\"$(OCOOKIEDIR)\"" -DLOCFORTDIR="\"$(LOCALDIR)\"" -DLOCOFFDIR="\"$(LOCALODIR)\""
-CFLAGS=-O2 $(DEFINES) -Wall -fomit-frame-pointer -pipe -fsigned-char
-LDFLAGS=-s
+CFLAGS=$(RPM_OPT_FLAGS) $(DEFINES)
+LDFLAGS=
 
 # The above flags are used by default; the debug flags are used when make
 # is called with a debug target, such as 'make debug'

fortune-mod-offense.patch:

Index: fortune-mod-offense.patch
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/FC-3/fortune-mod-offense.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fortune-mod-offense.patch	8 Nov 2004 04:20:02 -0000	1.1
+++ fortune-mod-offense.patch	17 Mar 2005 23:31:36 -0000	1.2
@@ -1,32 +1,7 @@
---- fortune-mod-9708/Makefile.mike	Thu Aug 28 15:36:15 1997
-+++ fortune-mod-9708/Makefile	Tue Jun  6 17:57:18 2000
-@@ -3,27 +3,27 @@
- #
- 
- # Where does the fortune program go?
--FORTDIR=/usr/local/games
-+FORTDIR=/usr/games
- # Where do the data files (fortunes, or cookies) go?
--COOKIEDIR=/usr/local/share/games/fortunes
-+COOKIEDIR=/usr/share/games/fortunes
- # Offensive ones?
- OCOOKIEDIR=$(COOKIEDIR)/off
- # The ones with html tags?
- WCOOKIEDIR=$(COOKIEDIR)/html
- # Where do strfile and unstr go?
--BINDIR=/usr/local/bin
-+BINDIR=/usr/sbin
- # What is the proper mode for strfile and unstr? 755= everyone, 700= root only
- BINMODE=0755
- #BINMODE=0700
- # Where do the man pages for strfile and unstr go?
--BINMANDIR=/usr/local/man/man1
-+BINMANDIR=/usr/man/man1
- # What is their proper extension?
- BINMANEXT=1
- # And the same for the fortune man page
--FORTMANDIR=/usr/local/man/man6
-+FORTMANDIR=/usr/man/man6
+--- fortune-mod-1.99.1/Makefile	2004-03-05 05:29:56.000000000 -0800
++++ fortune-mod-1.99.1/Makefile.nooff	2005-03-13 09:08:19.087006816 -0800
+@@ -29,7 +29,7 @@
+ FORTMANDIR=$(prefix)/usr/share/man/man6
  FORTMANEXT=6
  # Do we want to install the offensive files? (0 no, 1 yes)
 -OFFENSIVE=1
@@ -34,14 +9,15 @@
  # Do we want to install files with html tags? (0 no, 1 yes)
  # (Note: These files are not yet available)
  WEB=0
-@@ -55,8 +55,8 @@
- REGEXLIBS=
- 
- DEFINES=-DFORTDIR="\"$(COOKIEDIR)\"" -DOFFDIR="\"$(OCOOKIEDIR)\""
--CFLAGS=-O2 $(DEFINES) -Wall -fomit-frame-pointer -pipe
--LDFLAGS=-s
-+CFLAGS=$(RPM_OPT_FLAGS) $(DEFINES)
-+LDFLAGS=
+@@ -156,10 +156,7 @@
+ 	@echo -n "Building fortune/fortune.man ... "
+ 	@cat fortune/fortune-man.part1 >fortune/fortune.man
+ 	@echo ".I $(COOKIEDIR)" >>fortune/fortune.man
+-	@echo "Directory for innoffensive fortunes." >>fortune/fortune.man
+-	@echo ".TP" >>fortune/fortune.man
+-	@echo ".I $(OCOOKIEDIR)" >>fortune/fortune.man
+-	@echo "Directory for offensive fortunes." >>fortune/fortune.man
++	@echo "Directory for fortunes." >>fortune/fortune.man
+ 	@cat fortune/fortune-man.part2 >>fortune/fortune.man
+ 	@echo done.
  
- # The above flags are used by default; the debug flags are used when make
- # is called with a debug target, such as 'make debug'


Index: fortune-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/FC-3/fortune-mod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fortune-mod.spec	14 Nov 2004 16:23:47 -0000	1.5
+++ fortune-mod.spec	17 Mar 2005 23:31:36 -0000	1.6
@@ -1,14 +1,14 @@
 %define DisableOffensiveFortunes 1
 %define CookieDir %{_prefix}/games/fortune
 
-Summary: A program which will display a fortune.
-Name:		fortune-mod
-Version:	1.0
-Release:	25
-URL:		http://www.ibiblio.org/pub/Linux/games/amusements/fortune/fortune-mod-9708.README
+Summary: A program which will display a fortune
+Name: fortune-mod
+Version: 1.99.1
+Release: 2
+URL: http://www.redellipse.net/code/fortune
 License: BSD
 Group: Amusements/Games
-Source: http://www.ibiblio.org/pub/Linux/games/amusements/fortune/fortune-mod-9708.tar.gz
+Source: http://www.redellipse.net/code/downloads/fortune-mod-1.99.1.tar.gz
 Source1: kernelnewbies-fortunes.tar.gz
 Source2: bofh-excuses.tar.bz2
 Source3: http://www.aboleo.net/software/misc/fortune-tao.tar.gz
@@ -16,9 +16,11 @@
 Source5: http://www.dibona.com/opensources/osfortune.tar.gz
 Source6: http://humorix.org/downloads/humorixfortunes-1.4.tar.gz
 Patch0: fortune-mod-offense.patch
-Patch1: fortune-mod-1.0-remove-offensive.patch
-Patch2: fortune-mod-1.0-remove-offensive-option.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Patch1: fortune-mod-1.99-remove-offensive-option.patch
+Patch2: fortune-mod-cflags.patch
+Patch3: fortune-mod-1.99-move-offensive.patch
+BuildRequires: recode-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 Fortune-mod contains the ever-popular fortune program, which will
@@ -27,14 +29,19 @@
 wisdom each time they log in.
 
 %prep
-%setup -q -n fortune-mod-9708
+%setup -q
 
+# disable offensive fortunes completely
 %if %{DisableOffensiveFortunes}
 %patch0 -p1 -b .disable-offensive1
-%patch1 -p0 -b .disable-offensive2
-%patch2 -p0 -b .remove-offensive-option
+%patch1 -p0 -b .remove-offensive-option
 %endif
 
+# use CFLAGS from rpmbuld
+%patch2 -p1 -b .cflags
+# move possibly offensive fortunes into the offensive directory
+%patch3 -p0 -b .move-offensive
+
 %build
 make COOKIEDIR=%{CookieDir} \
 	FORTDIR=%{_bindir} BINDIR=%{_sbindir}
@@ -45,6 +52,7 @@
 make    COOKIEDIR=%{CookieDir} fortune/fortune.man
 make	FORTDIR=$RPM_BUILD_ROOT/%{_bindir} \
 	COOKIEDIR=$RPM_BUILD_ROOT%{CookieDir} \
+	LOCALDIR=$RPM_BUILD_ROOT%{CookieDir} \
 	BINDIR=$RPM_BUILD_ROOT/%{_sbindir} \
 	BINMANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 \
 	FORTMANDIR=$RPM_BUILD_ROOT/%{_mandir}/man6 \
@@ -52,13 +60,14 @@
 
 tar zxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{CookieDir}
 %if %{DisableOffensiveFortunes}
-rm $RPM_BUILD_ROOT%{CookieDir}/men-women*
+rm -f $RPM_BUILD_ROOT%{CookieDir}/men-women*
 %endif
 
-# Using bzcat for portability because tar keeps randomly changing the switch
-# for bzip.  It was "y" at one point, then "I", and now it is "j".  God knows
-# WTF they'll change it too next.
+# this isn't debian
+rm -f $RPM_BUILD_ROOT%{CookieDir}/debian*
+rm -f $RPM_BUILD_ROOT%{CookieDir}/off/debian*
 
+# Using bzcat for portability because tar keeps changing the switch
 bzcat %{SOURCE2} | tar xvf - -C $RPM_BUILD_ROOT%{CookieDir}
 
 # Non-standard source files, need to move things around
@@ -88,7 +97,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README ChangeLog TODO
 %{_bindir}/fortune
 %{_sbindir}/strfile
@@ -97,6 +106,15 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Mar 14 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> 1.99.1-2
+- Add patch for moving fortunes into offensive directory
+
+* Sun Mar 13 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> 1.99.1-1
+- Update to newer source (see URL)
+- Update patches as necessary, separate cflags patch as it was only applied if applying offensive patches
+- New source has recode-devel buildreq
+- Remove debian fortunes which are included in new source
+
 * Sat Nov 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.0-25
 - Recreate .dat files at build-time to fix x86_64 fedora.us bug #2279.
 - Use %%CookieDir everywhere.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:20:06 -0000	1.3
+++ sources	17 Mar 2005 23:31:36 -0000	1.4
@@ -1,6 +1,6 @@
+f208805b3b712e32997d7667e0ec52d8  fortune-mod-1.99.1.tar.gz
 50ea110b4a9dd719a410045700760401  bofh-excuses.tar.bz2
 dc2860793725fce93445035b4aa8c812  fortune-hitchhiker.tgz
-81a87a44f9d94b0809dfc2b7b140a379  fortune-mod-9708.tar.gz
 9dd679fee3a8fff17daaf6563fd2cd8f  fortune-tao.tar.gz
 a0f5eb298aa5982aa54571f6e46aa58b  humorixfortunes-1.4.tar.gz
 73d25d1b7cfb9f82376e61fa3d8e58f2  kernelnewbies-fortunes.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:20:06 -0000	1.3
+++ .cvsignore	17 Mar 2005 23:31:36 -0000	1.4
@@ -1,6 +1,6 @@
+fortune-mod-1.99.1.tar.gz
 bofh-excuses.tar.bz2
 fortune-hitchhiker.tgz
-fortune-mod-9708.tar.gz
 fortune-tao.tar.gz
 humorixfortunes-1.4.tar.gz
 kernelnewbies-fortunes.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 17 23:40:57 2005
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Thu, 17 Mar 2005 18:40:57 -0500
Subject: rpms/fortune-mod/devel fortune-mod-1.99-move-offensive.patch, NONE,
	1.1 fortune-mod-1.99-remove-offensive-option.patch, NONE,
	1.1 fortune-mod-cflags.patch, NONE,
	1.1 fortune-mod-offense.patch, 1.1, 1.2 fortune-mod.spec, 1.5,
	1.6 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4
Message-ID: <200503172340.j2HNev6q000344@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/fortune-mod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv336

Modified Files:
	fortune-mod-offense.patch fortune-mod.spec sources .cvsignore 
Added Files:
	fortune-mod-1.99-move-offensive.patch 
	fortune-mod-1.99-remove-offensive-option.patch 
	fortune-mod-cflags.patch 
Log Message:
update to version 1.99.1 - and a few spec file changes

fortune-mod-1.99-move-offensive.patch:

--- NEW FILE fortune-mod-1.99-move-offensive.patch ---
--- datfiles/riddles	2004-03-05 05:29:56.000000000 -0800
+++ datfiles/riddles.pc	2005-03-14 06:09:08.290062640 -0800
@@ -419,9 +419,6 @@
 Q:	What's a light-year?
 A:	One-third less calories than a regular year.
 %
-Q:	What's a WASP's idea of open-mindedness?
-A:	Dating a Canadian.
-%
 Q:	What's buried in Grant's tomb?
 A:	A corpse.
 %
--- datfiles/off/unrotated/riddles	2004-03-05 05:29:56.000000000 -0800
+++ datfiles/off/unrotated/riddles.new	2005-03-14 06:11:01.351874632 -0800
@@ -1098,3 +1098,6 @@
 Why is it that there are so many more horses' asses than there are horses?
 		-- G. Gordon Liddy
 %
+Q:     What's a WASP's idea of open-mindedness?
+A:     Dating a Canadian.
+%

fortune-mod-1.99-remove-offensive-option.patch:

--- NEW FILE fortune-mod-1.99-remove-offensive-option.patch ---
--- fortune/fortune.c	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune.c.nooff	2005-03-13 08:47:12.815509344 -0800
@@ -275,7 +275,7 @@
 #ifndef	NO_REGEX
     (void) fprintf(stderr, "i");
 #endif /* NO_REGEX */
-    (void) fprintf(stderr, "losw]");
+    (void) fprintf(stderr, "lsw]");
 #ifndef	NO_REGEX
     (void) fprintf(stderr, " [-m pattern]");
 #endif /* NO_REGEX */
@@ -1013,9 +1013,9 @@
     ignore_case = FALSE;
 
 #ifdef DEBUG
-    while ((ch = getopt(argc, argv, "acDefilm:n:osvw")) != EOF)
+    while ((ch = getopt(argc, argv, "acDefilm:n:svw")) != EOF)
 #else
-    while ((ch = getopt(argc, argv, "acefilm:n:osvw")) != EOF)
+    while ((ch = getopt(argc, argv, "acefilm:n:svw")) != EOF)
 #endif /* DEBUG */
 	switch (ch)
 	  {
@@ -1040,9 +1040,6 @@
 	  case 'n':
 	      SLEN = atoi(optarg);
 	      break;
-	  case 'o':		/* offensive ones only */
-	      Offend++;
-	      break;
 	  case 's':		/* short ones only */
 	      Short_only++;
 	      Long_only = FALSE;
--- fortune/fortune-man.part1	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune-man.part1.nooff	2005-03-13 09:00:47.344682088 -0800
@@ -50,7 +50,7 @@
 .SH NAME
 fortune \- print a random, hopefully interesting, adage
 .SH SYNOPSIS
-.BR fortune " [" -acefilosw "] [" -n 
+.BR fortune " [" -acefilsw "] [" -n 
 .IR length "] ["
 .B -m 
 .IR pattern "] [[" n% "] " file/dir/all ]
@@ -58,15 +58,12 @@
 When
 .B fortune
 is run with no arguments it prints out a random epigram. Epigrams are
-divided into several categories, where each category is sub-divided
-into those which are potentially offensive and those which are not.
+divided into several categories.
 .SS Options
 The options are as follows:
 .TP
 .B -a
-Choose from all lists of maxims, both offensive and not.  (See the
-.B -o 
-option for more information on offensive fortunes.)
+Choose from all lists of maxims.
 .TP
 .B -c
 Show the cookie file from which the fortune came.
@@ -114,29 +111,6 @@
 ask for short fortunes, or too long and ask for long ones, fortune goes
 into a never-ending thrash loop.
 .TP
-.B -o
-Choose only from potentially offensive aphorisms.  The -o option is
-ignored if a fortune directory is specified.
-.sp
-.B Please, please, please request a potentially
-.B offensive fortune if and only if
-.B you believe, deep in your heart,
-.B that you are willing to be
-.B offended. (And that you'll just quit
-.BR using " -o " rather
-.B than give us grief about it,
-.B okay?)
-.sp
-.RS
-\&... let us keep in mind the basic governing philosophy of The
-Brotherhood, as handsomely summarized in these words: we believe in
-healthy, hearty laughter -- at the expense of the whole human race, if
-needs be.  Needs be.
-.RS
---H. Allen Smith, "Rude Jokes"
-.RE
-.RE
-.TP
 .B -s
 Short apothegms only.  See
 .B -n
@@ -207,30 +181,6 @@
 .RI "50% " funny " 50% " not-funny
 .sp
 .RE
-This fortune also supports the BSD method of appending ``-o'' to
-database names to specify offensive fortunes.  However this is
-.B not
-how fortune stores them: offensive fortunes are stored in a seperate
-directory without the ``-o'' infix.  A plain name (i.e., not a path to a
-file or directory) that ends in ``-o'' will be assumed to be an
-offensive database, and will have its suffix stripped off and be
-searched in the offensive directory (even if the neither of the
-.IR -a " or " -o
-options were specified).  This feature is not only for
-backwards-compatibility, but also to allow users to distinguish between
-inoffensive and offensive databases of the same name.
-.PP
-For example, assuming there is a database named
-.I definitions
-in both the inoffensive and potentially offensive collections, then the
-following command will select an inoffensive definition 90% of the time,
-and a potentially offensive definition for the remaining 10%:
-.RS
-.sp
-.B fortune
-90%
-.I definitions definitions-o
-.RE
 .SH FILES
 Note: these are the defaults as defined at compile time.
 .PP
--- fortune/fortune-man.part2	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune-man.part2.nooff	2005-03-13 09:13:40.985070872 -0800
@@ -8,16 +8,6 @@
 .B fortune
 no longer finds the pointers file, it ignores the text file.
 .SH BUGS
-The division of fortunes into offensive and non-offensive by directory,
-rather than via the `-o' file infix, is not 100% compatible with
-original BSD fortune. Although the `-o' infix is recognised as referring
-to an offensive database, the offensive database files still need to be
-in a separate directory.  The workaround, of course, is to move the `-o'
-files into the offensive directory (with or without renaming), and to
-use the
-.B -a
-option.
-.PP
 The supplied fortune databases have been attacked, in order to correct
 orthographical and grammatical errors, and particularly to reduce
 redundancy and repetition and redundancy.  But especially to avoid
@@ -26,13 +16,7 @@
 .PP
 The fortune databases are now divided into a larger number of smaller
 files, some organized by format (poetry, definitions), and some by
-content (religion, politics).  There are parallel files in the main
-directory and in the offensive files directory (e.g., fortunes/definitions and
-fortunes/off/definitions).  Not all the potentially offensive fortunes are in
-the offensive fortunes files, nor are all the fortunes in the offensive
-files potentially offensive, probably, though a strong attempt has been
-made to achieve greater consistency.  Also, a better division might be
-made.
+content (religion, politics).
 .SH HISTORY
 This version of fortune is based on the NetBSD fortune 1.4, but with a
 number of bug fixes and enhancements.

fortune-mod-cflags.patch:

--- NEW FILE fortune-mod-cflags.patch ---
--- fortune-mod-1.99.1/Makefile	2004-03-05 05:29:56.000000000 -0800
+++ fortune-mod-1.99.1/Makefile.cflags	2005-03-13 08:34:26.910944536 -0800
@@ -65,8 +65,8 @@
 RECODELIBS=-lrecode
 
 DEFINES=-DFORTDIR="\"$(COOKIEDIR)\"" -DOFFDIR="\"$(OCOOKIEDIR)\"" -DLOCFORTDIR="\"$(LOCALDIR)\"" -DLOCOFFDIR="\"$(LOCALODIR)\""
-CFLAGS=-O2 $(DEFINES) -Wall -fomit-frame-pointer -pipe -fsigned-char
-LDFLAGS=-s
+CFLAGS=$(RPM_OPT_FLAGS) $(DEFINES)
+LDFLAGS=
 
 # The above flags are used by default; the debug flags are used when make
 # is called with a debug target, such as 'make debug'

fortune-mod-offense.patch:

Index: fortune-mod-offense.patch
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/devel/fortune-mod-offense.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fortune-mod-offense.patch	8 Nov 2004 04:20:02 -0000	1.1
+++ fortune-mod-offense.patch	17 Mar 2005 23:40:55 -0000	1.2
@@ -1,32 +1,7 @@
---- fortune-mod-9708/Makefile.mike	Thu Aug 28 15:36:15 1997
-+++ fortune-mod-9708/Makefile	Tue Jun  6 17:57:18 2000
-@@ -3,27 +3,27 @@
- #
- 
- # Where does the fortune program go?
--FORTDIR=/usr/local/games
-+FORTDIR=/usr/games
- # Where do the data files (fortunes, or cookies) go?
--COOKIEDIR=/usr/local/share/games/fortunes
-+COOKIEDIR=/usr/share/games/fortunes
- # Offensive ones?
- OCOOKIEDIR=$(COOKIEDIR)/off
- # The ones with html tags?
- WCOOKIEDIR=$(COOKIEDIR)/html
- # Where do strfile and unstr go?
--BINDIR=/usr/local/bin
-+BINDIR=/usr/sbin
- # What is the proper mode for strfile and unstr? 755= everyone, 700= root only
- BINMODE=0755
- #BINMODE=0700
- # Where do the man pages for strfile and unstr go?
--BINMANDIR=/usr/local/man/man1
-+BINMANDIR=/usr/man/man1
- # What is their proper extension?
- BINMANEXT=1
- # And the same for the fortune man page
--FORTMANDIR=/usr/local/man/man6
-+FORTMANDIR=/usr/man/man6
+--- fortune-mod-1.99.1/Makefile	2004-03-05 05:29:56.000000000 -0800
++++ fortune-mod-1.99.1/Makefile.nooff	2005-03-13 09:08:19.087006816 -0800
+@@ -29,7 +29,7 @@
+ FORTMANDIR=$(prefix)/usr/share/man/man6
  FORTMANEXT=6
  # Do we want to install the offensive files? (0 no, 1 yes)
 -OFFENSIVE=1
@@ -34,14 +9,15 @@
  # Do we want to install files with html tags? (0 no, 1 yes)
  # (Note: These files are not yet available)
  WEB=0
-@@ -55,8 +55,8 @@
- REGEXLIBS=
- 
- DEFINES=-DFORTDIR="\"$(COOKIEDIR)\"" -DOFFDIR="\"$(OCOOKIEDIR)\""
--CFLAGS=-O2 $(DEFINES) -Wall -fomit-frame-pointer -pipe
--LDFLAGS=-s
-+CFLAGS=$(RPM_OPT_FLAGS) $(DEFINES)
-+LDFLAGS=
+@@ -156,10 +156,7 @@
+ 	@echo -n "Building fortune/fortune.man ... "
+ 	@cat fortune/fortune-man.part1 >fortune/fortune.man
+ 	@echo ".I $(COOKIEDIR)" >>fortune/fortune.man
+-	@echo "Directory for innoffensive fortunes." >>fortune/fortune.man
+-	@echo ".TP" >>fortune/fortune.man
+-	@echo ".I $(OCOOKIEDIR)" >>fortune/fortune.man
+-	@echo "Directory for offensive fortunes." >>fortune/fortune.man
++	@echo "Directory for fortunes." >>fortune/fortune.man
+ 	@cat fortune/fortune-man.part2 >>fortune/fortune.man
+ 	@echo done.
  
- # The above flags are used by default; the debug flags are used when make
- # is called with a debug target, such as 'make debug'


Index: fortune-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/devel/fortune-mod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fortune-mod.spec	14 Nov 2004 16:23:47 -0000	1.5
+++ fortune-mod.spec	17 Mar 2005 23:40:55 -0000	1.6
@@ -1,14 +1,14 @@
 %define DisableOffensiveFortunes 1
 %define CookieDir %{_prefix}/games/fortune
 
-Summary: A program which will display a fortune.
-Name:		fortune-mod
-Version:	1.0
-Release:	25
-URL:		http://www.ibiblio.org/pub/Linux/games/amusements/fortune/fortune-mod-9708.README
+Summary: A program which will display a fortune
+Name: fortune-mod
+Version: 1.99.1
+Release: 2
+URL: http://www.redellipse.net/code/fortune
 License: BSD
 Group: Amusements/Games
-Source: http://www.ibiblio.org/pub/Linux/games/amusements/fortune/fortune-mod-9708.tar.gz
+Source: http://www.redellipse.net/code/downloads/fortune-mod-1.99.1.tar.gz
 Source1: kernelnewbies-fortunes.tar.gz
 Source2: bofh-excuses.tar.bz2
 Source3: http://www.aboleo.net/software/misc/fortune-tao.tar.gz
@@ -16,9 +16,11 @@
 Source5: http://www.dibona.com/opensources/osfortune.tar.gz
 Source6: http://humorix.org/downloads/humorixfortunes-1.4.tar.gz
 Patch0: fortune-mod-offense.patch
-Patch1: fortune-mod-1.0-remove-offensive.patch
-Patch2: fortune-mod-1.0-remove-offensive-option.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Patch1: fortune-mod-1.99-remove-offensive-option.patch
+Patch2: fortune-mod-cflags.patch
+Patch3: fortune-mod-1.99-move-offensive.patch
+BuildRequires: recode-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 Fortune-mod contains the ever-popular fortune program, which will
@@ -27,14 +29,19 @@
 wisdom each time they log in.
 
 %prep
-%setup -q -n fortune-mod-9708
+%setup -q
 
+# disable offensive fortunes completely
 %if %{DisableOffensiveFortunes}
 %patch0 -p1 -b .disable-offensive1
-%patch1 -p0 -b .disable-offensive2
-%patch2 -p0 -b .remove-offensive-option
+%patch1 -p0 -b .remove-offensive-option
 %endif
 
+# use CFLAGS from rpmbuld
+%patch2 -p1 -b .cflags
+# move possibly offensive fortunes into the offensive directory
+%patch3 -p0 -b .move-offensive
+
 %build
 make COOKIEDIR=%{CookieDir} \
 	FORTDIR=%{_bindir} BINDIR=%{_sbindir}
@@ -45,6 +52,7 @@
 make    COOKIEDIR=%{CookieDir} fortune/fortune.man
 make	FORTDIR=$RPM_BUILD_ROOT/%{_bindir} \
 	COOKIEDIR=$RPM_BUILD_ROOT%{CookieDir} \
+	LOCALDIR=$RPM_BUILD_ROOT%{CookieDir} \
 	BINDIR=$RPM_BUILD_ROOT/%{_sbindir} \
 	BINMANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 \
 	FORTMANDIR=$RPM_BUILD_ROOT/%{_mandir}/man6 \
@@ -52,13 +60,14 @@
 
 tar zxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{CookieDir}
 %if %{DisableOffensiveFortunes}
-rm $RPM_BUILD_ROOT%{CookieDir}/men-women*
+rm -f $RPM_BUILD_ROOT%{CookieDir}/men-women*
 %endif
 
-# Using bzcat for portability because tar keeps randomly changing the switch
-# for bzip.  It was "y" at one point, then "I", and now it is "j".  God knows
-# WTF they'll change it too next.
+# this isn't debian
+rm -f $RPM_BUILD_ROOT%{CookieDir}/debian*
+rm -f $RPM_BUILD_ROOT%{CookieDir}/off/debian*
 
+# Using bzcat for portability because tar keeps changing the switch
 bzcat %{SOURCE2} | tar xvf - -C $RPM_BUILD_ROOT%{CookieDir}
 
 # Non-standard source files, need to move things around
@@ -88,7 +97,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README ChangeLog TODO
 %{_bindir}/fortune
 %{_sbindir}/strfile
@@ -97,6 +106,15 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Mar 14 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> 1.99.1-2
+- Add patch for moving fortunes into offensive directory
+
+* Sun Mar 13 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> 1.99.1-1
+- Update to newer source (see URL)
+- Update patches as necessary, separate cflags patch as it was only applied if applying offensive patches
+- New source has recode-devel buildreq
+- Remove debian fortunes which are included in new source
+
 * Sat Nov 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.0-25
 - Recreate .dat files at build-time to fix x86_64 fedora.us bug #2279.
 - Use %%CookieDir everywhere.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:20:06 -0000	1.3
+++ sources	17 Mar 2005 23:40:55 -0000	1.4
@@ -1,6 +1,6 @@
+f208805b3b712e32997d7667e0ec52d8  fortune-mod-1.99.1.tar.gz
 50ea110b4a9dd719a410045700760401  bofh-excuses.tar.bz2
 dc2860793725fce93445035b4aa8c812  fortune-hitchhiker.tgz
-81a87a44f9d94b0809dfc2b7b140a379  fortune-mod-9708.tar.gz
 9dd679fee3a8fff17daaf6563fd2cd8f  fortune-tao.tar.gz
 a0f5eb298aa5982aa54571f6e46aa58b  humorixfortunes-1.4.tar.gz
 73d25d1b7cfb9f82376e61fa3d8e58f2  kernelnewbies-fortunes.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:20:06 -0000	1.3
+++ .cvsignore	17 Mar 2005 23:40:55 -0000	1.4
@@ -1,6 +1,6 @@
+fortune-mod-1.99.1.tar.gz
 bofh-excuses.tar.bz2
 fortune-hitchhiker.tgz
-fortune-mod-9708.tar.gz
 fortune-tao.tar.gz
 humorixfortunes-1.4.tar.gz
 kernelnewbies-fortunes.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 18 03:02:18 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 22:02:18 -0500
Subject: devel/gpgme03 gpgme-0.3.16-macro.patch, NONE,
	1.1 gpgme-0.3.16-relocate.patch, NONE, 1.1 gpgme03.spec, 1.8, 1.9
Message-ID: <200503180302.j2I32ItV009138@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gpgme03
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9120

Modified Files:
	gpgme03.spec 
Added Files:
	gpgme-0.3.16-macro.patch gpgme-0.3.16-relocate.patch 
Log Message:
* Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.3.16-8
- Fix build for FC4.
- Remove conflict with gpgme packages (relocate files in -devel
  package, rename .info file and rename macro in .m4 file).
  This is not as clean as I wanted it to be. But other -devel
  packages in FC pollute the linker's search path with leading
  -L%_libdir options, which makes parallel installation of multiple
  library versions unnecessarily complicated.



gpgme-0.3.16-macro.patch:

--- NEW FILE gpgme-0.3.16-macro.patch ---
diff -Nur gpgme-0.3.16-orig/gpgme/ath.c gpgme-0.3.16/gpgme/ath.c
--- gpgme-0.3.16-orig/gpgme/ath.c	2002-09-20 12:44:22.000000000 +0200
+++ gpgme-0.3.16/gpgme/ath.c	2005-03-18 03:29:24.000000000 +0100
@@ -108,7 +108,7 @@
 ath_read (int fd, void *buf, size_t nbytes)
 {
   if (ath_ops && ath_ops->read)
-    return ath_ops->read (fd, buf, nbytes);
+    return (ath_ops->read) (fd, buf, nbytes);
   else
     return read (fd, buf, nbytes);
 }

gpgme-0.3.16-relocate.patch:

--- NEW FILE gpgme-0.3.16-relocate.patch ---
diff -Nur gpgme-0.3.16-orig/gpgme/gpgme.m4 gpgme-0.3.16/gpgme/gpgme.m4
--- gpgme-0.3.16-orig/gpgme/gpgme.m4	2002-08-23 21:48:30.000000000 +0200
+++ gpgme-0.3.16/gpgme/gpgme.m4	2005-03-18 03:42:55.000000000 +0100
@@ -6,7 +6,7 @@
 dnl               [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS
 dnl
-AC_DEFUN([AM_PATH_GPGME],
+AC_DEFUN([AM_PATH_GPGME03],
 [ AC_ARG_WITH(gpgme-prefix,
             AC_HELP_STRING([--with-gpgme-prefix=PFX],
                            [prefix where GPGME is installed (optional)]),


Index: gpgme03.spec
===================================================================
RCS file: /cvs/extras/devel/gpgme03/gpgme03.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gpgme03.spec	3 Mar 2005 21:26:03 -0000	1.8
+++ gpgme03.spec	18 Mar 2005 03:02:16 -0000	1.9
@@ -1,12 +1,17 @@
+# For partial relocation of files to avoid conflict with gpgme package.
+%define rootprefix	%{_libdir}/gpgme03
+
 Summary:        GnuPG Made Easy interface library
 Name:           gpgme03
 Version:        0.3.16
-Release:        7
+Release:        8
 License:        GPL
 Group:          Applications/System
 Source:         ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-0.3.16.tar.gz
 Patch:          gpgme-0.3.16-select.patch
 Patch1:         gpgme-0.3.16-underquoted.patch
+Patch2:         gpgme-0.3.16-macro.patch
+Patch3:         gpgme-0.3.16-relocate.patch
 URL:            http://www.gnupg.org/related_software/gpgme/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gnupg >= 1.2.0
@@ -23,7 +28,6 @@
 Requires:       %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
-Conflicts:      gpgme-devel
 
 %description    devel
 Static library, object and header files for GnuPG Made Easy (GPGME).
@@ -33,10 +37,15 @@
 %setup -q -n gpgme-%{version}
 %patch -p1 -b .select
 %patch1 -p1 -b .underquoted
+%patch2 -p1 -b .macro
+%patch3 -p1 -b .relocate
 
 
 %build
-%configure --with-pth=no --without-gpgsm
+%configure --with-pth=no --without-gpgsm \
+    --bindir=%{rootprefix}/bin \
+    --includedir=%{rootprefix}/include \
+    --libdir=%{rootprefix}/lib
 make %{?_smp_mflags}
 
 
@@ -45,6 +54,16 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/*.la}
 
+# Relocation and renaming:
+mv $RPM_BUILD_ROOT%{_datadir}/info/gpgme{.info,03.info}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme.so.* $RPM_BUILD_ROOT%{_libdir}
+# Keep run-time libs in original libdir and link build-time lib to there.
+rm -f  $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme{.so,.la}
+ln -s %{_libdir}/libgpgme.so.6 $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme.so
+ln -s %{_libdir}/libgpgme.so.6 $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme03.so
+sed -i 's!lgpgme!lgpgme03!' $RPM_BUILD_ROOT%{rootprefix}/bin/gpgme-config
+
 
 %check || :
 make check
@@ -74,15 +93,24 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/gpgme-config
-%{_includedir}/gpgme.h
-%{_libdir}/libgpgme.a
-%{_libdir}/libgpgme.so
+%{rootprefix}/bin/gpgme-config
+%{rootprefix}/include/gpgme.h
+%{rootprefix}/lib/libgpgme.a
+%{rootprefix}/lib/libgpgme.so
 %{_datadir}/aclocal/gpgme.m4
-%{_infodir}/gpgme.info*
+%{_infodir}/gpgme03.info*
 
 
 %changelog
+* Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.3.16-8
+- Fix build for FC4.
+- Remove conflict with gpgme packages (relocate files in -devel
+  package, rename .info file and rename macro in .m4 file).
+  This is not as clean as I wanted it to be. But other -devel
+  packages in FC pollute the linker's search path with leading
+  -L%_libdir options, which makes parallel installation of multiple
+  library versions unnecessarily complicated.
+
 * Sun Jan 16 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.3.16-7
 - Disable GPGSM, remove /usr/bin/gpgsm dependency.
   None of our GPGME 0.3.x API users need this.



From fedora-extras-commits at redhat.com  Fri Mar 18 03:03:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 22:03:38 -0500
Subject: devel/sylpheed-claws sylpheed-claws.spec,1.6,1.7
Message-ID: <200503180303.j2I33ciB009194@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/sylpheed-claws
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9180

Modified Files:
	sylpheed-claws.spec 
Log Message:
* Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.1-3
- Set --with-gpgme-prefix to use relocated gpgme03 package contents.
- BR startup-notification-devel




Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/sylpheed-claws.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sylpheed-claws.spec	5 Mar 2005 19:28:28 -0000	1.6
+++ sylpheed-claws.spec	18 Mar 2005 03:03:36 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name:           sylpheed-claws
 Version:        1.0.1
-Release:        2
+Release:        3
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
@@ -23,8 +23,8 @@
 BuildRequires:  pilot-link-devel
 BuildRequires:  gdk-pixbuf-devel
 BuildRequires:  clamav-devel
-BuildRequires:  gnupg >= 1.2.1, gpgme03-devel >= 0.3.12
-BuildRequires:  desktop-file-utils
+BuildRequires:  gnupg >= 1.2.1, gpgme03-devel >= 0.3.16-8
+BuildRequires:  desktop-file-utils startup-notification-devel
 BuildRequires:  pkgconfig
 Requires:  spamassassin
 Requires:  dillo
@@ -46,7 +46,7 @@
 for development with %{name}.
 
 %prep
-%setup
+%setup -q
 
 %build
 %if %openssl_pc
@@ -61,6 +61,7 @@
            --enable-aspell \
 %endif
            --disable-dependency-tracking \
+           --with-gpgme-prefix=%{_libdir}/gpgme03 \
            --program-suffix="-claws"
 
 %{__make} %{?_smp_mflags}
@@ -111,6 +112,10 @@
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 
 %changelog
+* Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.1-3
+- Set --with-gpgme-prefix to use relocated gpgme03 package contents.
+- BR startup-notification-devel
+
 * Sat Mar 05 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.0.1-2
 - fixed some sylpheed/sylpheed-claws



From fedora-extras-commits at redhat.com  Fri Mar 18 03:08:17 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 22:08:17 -0500
Subject: devel/gpgme03 gpgme03.spec,1.9,1.10
Message-ID: <200503180308.j2I38H7V009294@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gpgme03
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9287

Modified Files:
	gpgme03.spec 
Log Message:
Add newly created unowned directories to files section.


Index: gpgme03.spec
===================================================================
RCS file: /cvs/extras/devel/gpgme03/gpgme03.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gpgme03.spec	18 Mar 2005 03:02:16 -0000	1.9
+++ gpgme03.spec	18 Mar 2005 03:08:15 -0000	1.10
@@ -93,8 +93,12 @@
 
 %files devel
 %defattr(-,root,root,-)
+%dir %{rootprefix}
+%dir %{rootprefix}/bin
 %{rootprefix}/bin/gpgme-config
+%dir %{rootprefix}/include
 %{rootprefix}/include/gpgme.h
+%dir %{rootprefix}/lib
 %{rootprefix}/lib/libgpgme.a
 %{rootprefix}/lib/libgpgme.so
 %{_datadir}/aclocal/gpgme.m4



From fedora-extras-commits at redhat.com  Fri Mar 18 03:11:33 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 22:11:33 -0500
Subject: devel/gpgme03 gpgme03.spec,1.10,1.11
Message-ID: <200503180311.j2I3BXr3009385@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gpgme03
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9375

Modified Files:
	gpgme03.spec 
Log Message:
Add missing library link to files section.


Index: gpgme03.spec
===================================================================
RCS file: /cvs/extras/devel/gpgme03/gpgme03.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gpgme03.spec	18 Mar 2005 03:08:15 -0000	1.10
+++ gpgme03.spec	18 Mar 2005 03:11:31 -0000	1.11
@@ -100,7 +100,7 @@
 %{rootprefix}/include/gpgme.h
 %dir %{rootprefix}/lib
 %{rootprefix}/lib/libgpgme.a
-%{rootprefix}/lib/libgpgme.so
+%{rootprefix}/lib/libgpgme*.so
 %{_datadir}/aclocal/gpgme.m4
 %{_infodir}/gpgme03.info*
 



From fedora-extras-commits at redhat.com  Fri Mar 18 03:16:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 22:16:49 -0500
Subject: devel/gpgme03 gpgme03.spec,1.11,1.12
Message-ID: <200503180316.j2I3GnhU009504@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gpgme03
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9495

Modified Files:
	gpgme03.spec 
Log Message:
Also add a link for the static library just to be complete.


Index: gpgme03.spec
===================================================================
RCS file: /cvs/extras/devel/gpgme03/gpgme03.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gpgme03.spec	18 Mar 2005 03:11:31 -0000	1.11
+++ gpgme03.spec	18 Mar 2005 03:16:47 -0000	1.12
@@ -60,6 +60,7 @@
 mv $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme.so.* $RPM_BUILD_ROOT%{_libdir}
 # Keep run-time libs in original libdir and link build-time lib to there.
 rm -f  $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme{.so,.la}
+ln -s libgpgme.a $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme03.a
 ln -s %{_libdir}/libgpgme.so.6 $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme.so
 ln -s %{_libdir}/libgpgme.so.6 $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme03.so
 sed -i 's!lgpgme!lgpgme03!' $RPM_BUILD_ROOT%{rootprefix}/bin/gpgme-config
@@ -99,7 +100,7 @@
 %dir %{rootprefix}/include
 %{rootprefix}/include/gpgme.h
 %dir %{rootprefix}/lib
-%{rootprefix}/lib/libgpgme.a
+%{rootprefix}/lib/libgpgme*.a
 %{rootprefix}/lib/libgpgme*.so
 %{_datadir}/aclocal/gpgme.m4
 %{_infodir}/gpgme03.info*



From bugs.michael at gmx.net  Fri Mar 18 03:53:51 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 18 Mar 2005 04:53:51 +0100
Subject: rpms/python-protocols/devel python-protocols.spec, NONE, 1.1
 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503152049.j2FKnpL9023691@cvs-int.fedora.redhat.com>
References: <200503152049.j2FKnpL9023691@cvs-int.fedora.redhat.com>
Message-ID: <20050318045351.5c5cf82d.bugs.michael@gmx.net>

On Tue, 15 Mar 2005 15:49:51 -0500, Shahms King (shahms) wrote:

> Author: shahms
> 
> Update of /cvs/extras/rpms/python-protocols/devel

> --- NEW FILE python-protocols.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)")}
>
> %{python_sitelib}/protocols/*.so

At least this package and python-simpletal will not build on multilib
platforms, such as x86_64, since they don't install into python_sitearch.


-- 
Fedora Core release Rawhide (Rawhide) - Linux 2.6.11-1.1177_FC4
loadavg: 2.58 3.95 3.75



From fedora-extras-commits at redhat.com  Fri Mar 18 04:18:43 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 23:18:43 -0500
Subject: devel/sylpheed-claws sylpheed-claws.spec,1.7,1.8
Message-ID: <200503180418.j2I4IhPW011394@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/sylpheed-claws
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11386

Modified Files:
	sylpheed-claws.spec 
Log Message:
sylpheed-claws.spec


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/sylpheed-claws.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sylpheed-claws.spec	18 Mar 2005 03:03:36 -0000	1.7
+++ sylpheed-claws.spec	18 Mar 2005 04:18:41 -0000	1.8
@@ -98,7 +98,8 @@
 %{_bindir}/*
 %dir %{_libdir}/sylpheed-claws/
 %dir %{_libdir}/sylpheed-claws/plugins/
-%{_libdir}/sylpheed-claws/plugins/*
+%{_libdir}/sylpheed-claws/plugins/*.so
+%exclude %{_libdir}/sylpheed-claws/plugins/*.a
 %{_datadir}/pixmaps/*
 %dir %{_datadir}/sylpheed-claws/
 %{_datadir}/sylpheed-claws/*
@@ -113,6 +114,7 @@
 
 %changelog
 * Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.1-3
+- Don't include static libs in plugin directory.
 - Set --with-gpgme-prefix to use relocated gpgme03 package contents.
 - BR startup-notification-devel
 



From fedora-extras-commits at redhat.com  Fri Mar 18 07:52:52 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 18 Mar 2005 02:52:52 -0500
Subject: rpms/iiimf-le-simplehangul - New directory
Message-ID: <200503180752.j2I7qqJk017529@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17516/iiimf-le-simplehangul

Log Message:
Directory /cvs/extras/rpms/iiimf-le-simplehangul added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 07:52:52 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 18 Mar 2005 02:52:52 -0500
Subject: rpms/iiimf-le-simplehangul/devel - New directory
Message-ID: <200503180752.j2I7qqMp017532@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17516/iiimf-le-simplehangul/devel

Log Message:
Directory /cvs/extras/rpms/iiimf-le-simplehangul/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 07:53:12 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 18 Mar 2005 02:53:12 -0500
Subject: rpms/iiimf-le-simplehangul Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503180753.j2I7rCsp017613@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17598

Added Files:
	Makefile import.log 
Log Message:
Setup of module iiimf-le-simplehangul


--- NEW FILE Makefile ---
# Top level Makefile for module iiimf-le-simplehangul
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 18 07:53:12 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 18 Mar 2005 02:53:12 -0500
Subject: rpms/iiimf-le-simplehangul/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200503180753.j2I7rCEg017616@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17598/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module iiimf-le-simplehangul


--- 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 Mar 18 07:53:51 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 18 Mar 2005 02:53:51 -0500
Subject: rpms/iiimf-le-simplehangul import.log,1.1,1.2
Message-ID: <200503180753.j2I7rp4S017759@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17744

Modified Files:
	import.log 
Log Message:
auto-import iiimf-le-simplehangul-0.1.1-2 on branch devel from iiimf-le-simplehangul-0.1.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/iiimf-le-simplehangul/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Mar 2005 07:53:10 -0000	1.1
+++ import.log	18 Mar 2005 07:53:49 -0000	1.2
@@ -0,0 +1 @@
+iiimf-le-simplehangul-0_1_1-2:HEAD:iiimf-le-simplehangul-0.1.1-2.src.rpm:1111132414



From fedora-extras-commits at redhat.com  Fri Mar 18 07:53:51 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 18 Mar 2005 02:53:51 -0500
Subject: rpms/iiimf-le-simplehangul/devel iiimf-le-simplehangul.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503180753.j2I7rpbW017763@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17744/devel

Modified Files:
	.cvsignore sources 
Added Files:
	iiimf-le-simplehangul.spec 
Log Message:
auto-import iiimf-le-simplehangul-0.1.1-2 on branch devel from iiimf-le-simplehangul-0.1.1-2.src.rpm


--- NEW FILE iiimf-le-simplehangul.spec ---
%define im_dir %{_libdir}/im

Summary: Romanized Korean Hangul language engine for IIIMF
Name: iiimf-le-simplehangul
Version: 0.1.1
Release: 2
License: GPL
Source: %{name}-%{version}.tar.bz2
URL: http://www3.sympatico.ca/d.moser/hangul.html
Group: User Interface/X
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: iiimf-libs-devel

%description
Romanised Korean Hangul language engine for IIIMF
Simple Hangul input with any Western keyboard

%define sendhup %{_bindir}/killall -HUP htt_server >& /dev/null || :
%define instle %{_bindir}/iiimf-le-tools --install %{im_dir}/leif/
%define uninstle %{_bindir}/iiimf-le-tools --remove %{im_dir}/leif/

%prep
rm -rf $RPM_BUILD_ROOT

%setup -q -n %{name}-%{version}

%build
./configure --prefix=%{im_dir}
make  

%install
rm -rf $RPM_BUILD_ROOT
make prefix=$RPM_BUILD_ROOT%{im_dir}
# FIXME: make install should honor $DESTDIR
# so we don't need to install it manually
mkdir -p $RPM_BUILD_ROOT%{im_dir}/leif
install -m 755 src/.libs/simplehangul.so $RPM_BUILD_ROOT%{im_dir}/leif

%clean
rm -rf $RPM_BUILD_ROOT

%preun
if [ "$1" = 0 ]; then
  %{uninstle}chinput.so >& /dev/null || :
fi

%postun
if [ "$1" = 0 ]; then
  %{sendhup}
fi

%files
%defattr(-,root,root)
%{im_dir}/*

%changelog
* Thu Mar 17 2005 Warren Togami <wtogami at redhat.com> 0.1.1-2
- minor spec changes
- copy preun and postun scripts from iiimf-le-chinput

* Mon Jan 10 2005 Derrick Moser <derrick_moser at yahoo.com> 0.1.1-1
- clean-ups

* Wed Sep 08 2004 Warren Togami <wtogami at redhat.com> 0.0-1
- ugly hacked up package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/iiimf-le-simplehangul/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Mar 2005 07:53:10 -0000	1.1
+++ .cvsignore	18 Mar 2005 07:53:49 -0000	1.2
@@ -0,0 +1 @@
+iiimf-le-simplehangul-0.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/iiimf-le-simplehangul/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Mar 2005 07:53:10 -0000	1.1
+++ sources	18 Mar 2005 07:53:49 -0000	1.2
@@ -0,0 +1 @@
+7410d1f14e19f58493a51bdb648996b8  iiimf-le-simplehangul-0.1.1.tar.bz2



From wtogami at redhat.com  Fri Mar 18 08:11:49 2005
From: wtogami at redhat.com (Warren Togami)
Date: Thu, 17 Mar 2005 22:11:49 -1000
Subject: APPROVED: iiimf-le-simplehangul
Message-ID: <423A8D45.5040607@redhat.com>

Romanised Korean Hangul language engine for IIIMF
Simple Hangul input with any Western keyboard

Reviewed by: petersen at redhat.com
Maintained by: wtogami at redhat.com



From fedora-extras-commits at redhat.com  Fri Mar 18 08:12:44 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 18 Mar 2005 03:12:44 -0500
Subject: rpms/iiimf-le-simplehangul/FC-3 iiimf-le-simplehangul.spec,1.1,1.2
Message-ID: <200503180812.j2I8Ci8o019081@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19069

Modified Files:
	iiimf-le-simplehangul.spec 
Log Message:
prep FC3 build



Index: iiimf-le-simplehangul.spec
===================================================================
RCS file: /cvs/extras/rpms/iiimf-le-simplehangul/FC-3/iiimf-le-simplehangul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iiimf-le-simplehangul.spec	18 Mar 2005 07:53:49 -0000	1.1
+++ iiimf-le-simplehangul.spec	18 Mar 2005 08:12:42 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Romanized Korean Hangul language engine for IIIMF
 Name: iiimf-le-simplehangul
 Version: 0.1.1
-Release: 2
+Release: 1.FC3
 License: GPL
 Source: %{name}-%{version}.tar.bz2
 URL: http://www3.sympatico.ca/d.moser/hangul.html
@@ -54,7 +54,7 @@
 %{im_dir}/*
 
 %changelog
-* Thu Mar 17 2005 Warren Togami <wtogami at redhat.com> 0.1.1-2
+* Thu Mar 17 2005 Warren Togami <wtogami at redhat.com> 0.1.1-1.FC3
 - minor spec changes
 - copy preun and postun scripts from iiimf-le-chinput
 



From fedora-extras-commits at redhat.com  Fri Mar 18 09:13:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 04:13:50 -0500
Subject: devel/libassuan libassuan-macro.patch, NONE, 1.1 libassuan.spec, 1.5,
	1.6
Message-ID: <200503180913.j2I9Do3L021515@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/libassuan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21505

Modified Files:
	libassuan.spec 
Added Files:
	libassuan-macro.patch 
Log Message:
Fix FC4 build and source URLs.

libassuan-macro.patch:

--- NEW FILE libassuan-macro.patch ---
--- src/assuan-buffer.c~	2004-12-07 11:29:58.000000000 +0200
+++ src/assuan-buffer.c	2005-03-18 01:07:54.000000000 +0200
@@ -61,7 +61,7 @@
   *r_nread = 0;
   while (nleft > 0)
     {
-      ssize_t n = ctx->io->read (ctx, buf, nleft);
+      ssize_t n = (ctx->io->read) (ctx, buf, nleft);
 
       if (n < 0)
         {


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/devel/libassuan/libassuan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libassuan.spec	5 Mar 2005 21:10:22 -0000	1.5
+++ libassuan.spec	18 Mar 2005 09:13:48 -0000	1.6
@@ -1,9 +1,10 @@
 Summary: GnuPG IPC library
 Name:    libassuan
 Version: 0.6.9
-Release: 2%{?dist_tag}
-Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz
-Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig
+Release: 3%{?dist_tag}
+Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz
+Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig
+Patch0:  %{name}-macro.patch
 URL:     http://www.gnupg.org/
 License: GPL
 Group:   System Environment/Libraries
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -78,6 +80,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-3
+- Fix FC4 build and source URLs.
+
 * Thu Feb  3 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.6.9-2
 - Build PIC to fix x86_64 linking.
 



From fedora-extras-commits at redhat.com  Fri Mar 18 09:23:20 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 04:23:20 -0500
Subject: devel/opensc opensc-lvalue.patch,NONE,1.1 opensc.spec,1.4,1.5
Message-ID: <200503180923.j2I9NKLN021699@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/opensc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21693

Modified Files:
	opensc.spec 
Added Files:
	opensc-lvalue.patch 
Log Message:
Fix FC4 build, opensc-pam -> pam_opensc.

opensc-lvalue.patch:

--- NEW FILE opensc-lvalue.patch ---
Index: src/pam/pam_support.c
===================================================================
--- src/pam/pam_support.c	(revision 2139)
+++ src/pam/pam_support.c	(revision 2140)
@@ -205,7 +205,8 @@
 
 static void _cleanup(pam_handle_t * pamh, void *x, int error_status)
 {
-	_pam_delete((char *) x);
+	char *y = (char *) x;
+	_pam_delete(y);
 }
 
 /* ************************************************************** *


Index: opensc.spec
===================================================================
RCS file: /cvs/extras/devel/opensc/opensc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- opensc.spec	5 Mar 2005 21:10:23 -0000	1.4
+++ opensc.spec	18 Mar 2005 09:23:18 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name:           opensc
 Version:        0.9.4
-Release:        2
+Release:        3
 Summary:        OpenSC SmartCard library and applications
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@
 URL:            http://www.opensc.org/
 Source0:        http://www.opensc.org/files/opensc-0.9.4.tar.gz
 Patch0:         %{name}-build.patch
+Patch1:         %{name}-lvalue.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.1.1 flex pam-devel openldap-devel
@@ -41,20 +42,21 @@
 plugins that will generate digital signatures using facilities on
 PKI-capable smartcards.
 
-%package        pam
+%package     -n pam_%{name}
 Summary:        OpenSC pluggable authentication module
 Group:          System Environment/Base
-Provides:       pam_opensc = %{version}-%{release}
+Provides:       %{name}-pam = %{version}-%{release}
+Obsoletes:      %{name}-pam < 0.9.4-3
 Requires:       %{name} = %{version}-%{release}
 
-%description    pam
+%description -n pam_%{name}
 OpenSC pluggable authentication module implementing smart card support.
 
 %package        devel
 Summary:        OpenSC development files
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release} pkgconfig
-Requires:       %{name}-pam = %{version}-%{release}
+Requires:       pam_%{name} = %{version}-%{release}
 
 %description    devel
 OpenSC development files.
@@ -63,6 +65,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 cp -p src/pkcs15init/README ./README.pkcs15init
 cp -p src/scconf/README.scconf .
 for file in docs/*.1 ; do
@@ -105,9 +108,9 @@
 
 
 %post -p /sbin/ldconfig
-%post pam -p /sbin/ldconfig
+%post -n pam_%{name} -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
-%postun pam -p /sbin/ldconfig
+%postun -n pam_%{name} -p /sbin/ldconfig
 
 
 %files
@@ -147,7 +150,7 @@
 %{plugindir}/opensc-signer.so
 %{_libdir}/opensc/opensc-signer.so
 
-%files pam
+%files -n pam_%{name}
 %defattr(-,root,root,-)
 %doc PAM_README
 /%{_lib}/security/pam_opensc.so
@@ -179,6 +182,10 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.4-3
+- Fix FC4 build.
+- Rename opensc-pam to pam_opensc per package naming guidelines.
+
 * Wed Feb  9 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.4-2
 - Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms.
 - Use --with-plugin-dir instead of --with-plugin-path (fixes x86_64).



From fedora-extras-commits at redhat.com  Fri Mar 18 09:27:56 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 04:27:56 -0500
Subject: devel/cabextract cabextract-macro.patch, NONE, 1.1 cabextract.spec,
	1.6, 1.7
Message-ID: <200503180927.j2I9RumE021818@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/cabextract
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21812

Modified Files:
	cabextract.spec 
Added Files:
	cabextract-macro.patch 
Log Message:
Fix FC4 build.

cabextract-macro.patch:

--- NEW FILE cabextract-macro.patch ---
diff -NarU1 cabextract-1.1.orig/mspack/cabd.c cabextract-1.1/mspack/cabd.c
--- cabextract-1.1.orig/mspack/cabd.c	2004-10-18 11:10:15.000000000 +0300
+++ cabextract-1.1/mspack/cabd.c	2005-03-18 01:24:26.000000000 +0200
@@ -331,3 +331,3 @@
   /* read in the CFHEADER */
-  if (sys->read(fh, &buf[0], cfhead_SIZEOF) != cfhead_SIZEOF) {
+  if ((sys->read)(fh, &buf[0], cfhead_SIZEOF) != cfhead_SIZEOF) {
     return MSPACK_ERR_READ;
@@ -367,3 +367,3 @@
   if (cab->base.flags & cfheadRESERVE_PRESENT) {
-    if (sys->read(fh, &buf[0], cfheadext_SIZEOF) != cfheadext_SIZEOF) {
+    if ((sys->read)(fh, &buf[0], cfheadext_SIZEOF) != cfheadext_SIZEOF) {
       return MSPACK_ERR_READ;
@@ -405,3 +405,3 @@
   for (i = 0; i < num_folders; i++) {
-    if (sys->read(fh, &buf[0], cffold_SIZEOF) != cffold_SIZEOF) {
+    if ((sys->read)(fh, &buf[0], cffold_SIZEOF) != cffold_SIZEOF) {
       return MSPACK_ERR_READ;
@@ -435,3 +435,3 @@
   for (i = 0; i < num_files; i++) {
-    if (sys->read(fh, &buf[0], cffile_SIZEOF) != cffile_SIZEOF) {
+    if ((sys->read)(fh, &buf[0], cffile_SIZEOF) != cffile_SIZEOF) {
       return MSPACK_ERR_READ;
@@ -528,3 +528,3 @@
   /* read up to 256 bytes */
-  len = sys->read(fh, &buf[0], 256);
+  len = (sys->read)(fh, &buf[0], 256);
 
@@ -641,3 +641,3 @@
     /* fill the search buffer with data from disk */
-    if (sys->read(fh, &buf[0], length) != length) {
+    if ((sys->read)(fh, &buf[0], length) != length) {
       return MSPACK_ERR_READ;
@@ -1213,3 +1213,3 @@
     /* read the block header */
-    if (sys->read(d->infh, &hdr[0], cfdata_SIZEOF) != cfdata_SIZEOF) {
+    if ((sys->read)(d->infh, &hdr[0], cfdata_SIZEOF) != cfdata_SIZEOF) {
       return MSPACK_ERR_READ;
@@ -1239,3 +1239,3 @@
     /* read the block data */
-    if (sys->read(d->infh, d->i_end, len) != len) {
+    if ((sys->read)(d->infh, d->i_end, len) != len) {
       return MSPACK_ERR_READ;
@@ -1353,3 +1353,3 @@
     run = (bytes > s->bufsize) ? s->bufsize : (int) bytes;
-    if (s->sys->read(s->i, &s->buf[0], run) != run) return MSPACK_ERR_READ;
+    if ((s->sys->read)(s->i, &s->buf[0], run) != run) return MSPACK_ERR_READ;
     if (s->sys->write(s->o, &s->buf[0], run) != run) return MSPACK_ERR_WRITE;
diff -NarU1 cabextract-1.1.orig/mspack/lzxd.c cabextract-1.1/mspack/lzxd.c
--- cabextract-1.1.orig/mspack/lzxd.c	2004-10-18 11:10:15.000000000 +0300
+++ cabextract-1.1/mspack/lzxd.c	2005-03-18 01:23:01.000000000 +0200
@@ -128,3 +128,3 @@
 static int lzxd_read_input(struct lzxd_stream *lzx) {
-  int read = lzx->sys->read(lzx->input, &lzx->inbuf[0], (int)lzx->inbuf_size);
+  int read = (lzx->sys->read)(lzx->input, &lzx->inbuf[0], (int)lzx->inbuf_size);
   if (read < 0) return lzx->error = MSPACK_ERR_READ;
diff -NarU1 cabextract-1.1.orig/mspack/mszipd.c cabextract-1.1/mspack/mszipd.c
--- cabextract-1.1.orig/mspack/mszipd.c	2004-10-18 11:10:15.000000000 +0300
+++ cabextract-1.1/mspack/mszipd.c	2005-03-18 01:23:59.000000000 +0200
@@ -91,3 +91,3 @@
 static int zipd_read_input(struct mszipd_stream *zip) {
-  int read = zip->sys->read(zip->input, &zip->inbuf[0], (int)zip->inbuf_size);
+  int read = (zip->sys->read)(zip->input, &zip->inbuf[0], (int)zip->inbuf_size);
   if (read < 0) return zip->error = MSPACK_ERR_READ;
diff -NarU1 cabextract-1.1.orig/mspack/qtmd.c cabextract-1.1/mspack/qtmd.c
--- cabextract-1.1.orig/mspack/qtmd.c	2004-10-18 11:10:15.000000000 +0300
+++ cabextract-1.1/mspack/qtmd.c	2005-03-18 01:25:06.000000000 +0200
@@ -91,3 +91,3 @@
 static int qtmd_read_input(struct qtmd_stream *qtm) {
-  int read = qtm->sys->read(qtm->input, &qtm->inbuf[0], (int)qtm->inbuf_size);
+  int read = (qtm->sys->read)(qtm->input, &qtm->inbuf[0], (int)qtm->inbuf_size);
   if (read < 0) return qtm->error = MSPACK_ERR_READ;


Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/devel/cabextract/cabextract.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cabextract.spec	25 Nov 2004 21:16:20 -0000	1.6
+++ cabextract.spec	18 Mar 2005 09:27:54 -0000	1.7
@@ -1,12 +1,13 @@
 Name:           cabextract
 Version:        1.1
-Release:        2
-Summary:        A Microsoft Cabinet file extractor
+Release:        3
+Summary:        Microsoft Cabinet file extractor
 
 Group:          Applications/Archiving
 License:        GPL
-URL:            http://www.kyz.uklinux.net/cabextract.php3
+URL:            http://www.kyz.uklinux.net/cabextract.php
 Source:         http://www.kyz.uklinux.net/downloads/cabextract-%{version}.tar.gz
+Patch0:         %{name}-macro.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -41,6 +43,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.1-3
+- Fix FC4 build.
+
 * Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 1.1-2
 - Update to 1.1.
 - Bump release to provide Extras upgrade path.



From fedora-extras-commits at redhat.com  Fri Mar 18 10:25:22 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 18 Mar 2005 05:25:22 -0500
Subject: devel/kphone kphone-4.1.0-po-hacks.patch, NONE,
	1.1 kphone-4.1.0-po-hacks.diff, 1.1, NONE
Message-ID: <200503181025.j2IAPM5x023788@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23782

Added Files:
	kphone-4.1.0-po-hacks.patch 
Removed Files:
	kphone-4.1.0-po-hacks.diff 
Log Message:
Filename fix

kphone-4.1.0-po-hacks.patch:

--- NEW FILE kphone-4.1.0-po-hacks.patch ---
--- kphone-4.1.0.orig/po/Makefile.in	2004-10-19 10:24:16.000000000 +0200
+++ kphone/po/Makefile.in	2005-03-17 08:56:38.165328978 +0100
@@ -4,11 +4,11 @@
 PO_DIR=$(SHAREDIR)/translations/
 
 install:
-	install --mode=0755 --directory $(PO_DIR)
+	install --mode=0755 --directory $(DESTDIR)$(PO_DIR)
 	for T in *.qm; do \
-		install --mode=0644 $$T $(PO_DIR); \
+		install --mode=0644 $$T $(DESTDIR)$(PO_DIR); \
 	done
 
 uninstall:
-	rm -r $(PO_DIR)
+	rm -r $(DESTDIR)$(PO_DIR)
 


--- kphone-4.1.0-po-hacks.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar 18 10:46:23 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 05:46:23 -0500
Subject: devel/gnome-applet-netmon - New directory
Message-ID: <200503181046.j2IAkNvr024515@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gnome-applet-netmon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24507/gnome-applet-netmon

Log Message:
Directory /cvs/extras/devel/gnome-applet-netmon added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 10:48:32 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 05:48:32 -0500
Subject: devel/gnome-applet-netmon Makefile,NONE,1.1
Message-ID: <200503181048.j2IAmWju024573@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gnome-applet-netmon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24567

Added Files:
	Makefile 
Log Message:
 


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'



From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net  Fri Mar 18 10:51:46 2005
From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou)
Date: Fri, 18 Mar 2005 11:51:46 +0100
Subject: APPROVED: bmp
In-Reply-To: <20050317141328.2be51de0.bugs.michael@gmx.net>
References: <20050317141328.2be51de0.bugs.michael@gmx.net>
Message-ID: <20050318115146.2dbeffa8@python2>

Michael Schwendt wrote :

> Name: bmp
> Version: 0.9.7-4
> 
> BMP (Beep Media Player) is a media player that currently uses a skinned
> user interface based on Winamp 2.x skins. It is based on ("forked off")
> XMMS.
> 
> [...]
> 
> Imported package approved by mschwendt for adding to Fedora Extras.
> Ralf Ertzinger will be responsible for this package.

After launching it for the first time, I saw it appear with a Bluecurve
look, but I then went into "Preferences", where in "Appearance" I only see
one skin called "Default" which is not the Bluecurve one, and when I went
out of the prefs, the appearance changed to that one. I can't find any way
to switch back to the Bluecurve look, so it seems like something in the
way the new default is set needs fixing.

Matthias

-- 
Clean custom Red Hat Linux rpm packages : http://freshrpms.net/
Fedora Core release 3 (Heidelberg) - Linux kernel 2.6.10-1.766_FC3.radeon
Load : 0.82 0.85 0.71



From fedora-extras-commits at redhat.com  Fri Mar 18 10:53:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 05:53:06 -0500
Subject: rpms/gnome-applet-netmon - New directory
Message-ID: <200503181053.j2IAr6BS024719@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24711/gnome-applet-netmon

Log Message:
Directory /cvs/extras/rpms/gnome-applet-netmon added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 10:53:19 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 05:53:19 -0500
Subject: rpms/gnome-applet-netmon/devel - New directory
Message-ID: <200503181053.j2IArJF5024749@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24741/gnome-applet-netmon/devel

Log Message:
Directory /cvs/extras/rpms/gnome-applet-netmon/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 10:53:52 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 05:53:52 -0500
Subject: rpms/gnome-applet-netmon Makefile,NONE,1.1
Message-ID: <200503181053.j2IArqUV024795@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24786/gnome-applet-netmon

Added Files:
	Makefile 
Log Message:
 


--- NEW FILE Makefile ---
# Top level Makefile for module gqview
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From fedora-extras-commits at redhat.com  Fri Mar 18 10:58:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 05:58:55 -0500
Subject: rpms/gnome-applet-netmon/devel Makefile,NONE,1.1
Message-ID: <200503181058.j2IAwtWX024988@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24979/devel

Added Files:
	Makefile 
Log Message:
 


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'



From fedora-extras-commits at redhat.com  Fri Mar 18 11:05:28 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 06:05:28 -0500
Subject: rpms/gnome-applet-netmon Makefile,1.1,1.2
Message-ID: <200503181105.j2IB5SfH026006@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26000

Modified Files:
	Makefile 
Log Message:
fixed broken/partial automated import


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-netmon/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	18 Mar 2005 10:53:50 -0000	1.1
+++ Makefile	18 Mar 2005 11:05:26 -0000	1.2
@@ -1,4 +1,4 @@
-# Top level Makefile for module gqview
+# Top level Makefile for module gnome-applet-netmon
 all : CVS/Root common-update
 	@cvs update
 



From fedora-extras-commits at redhat.com  Fri Mar 18 11:15:57 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 06:15:57 -0500
Subject: devel/gpgme gpgme-1.0.2-macro.patch,NONE,1.1 gpgme.spec,1.7,1.8
Message-ID: <200503181115.j2IBFvsw026280@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/gpgme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26273

Modified Files:
	gpgme.spec 
Added Files:
	gpgme-1.0.2-macro.patch 
Log Message:
Fix FC4 build.

gpgme-1.0.2-macro.patch:

--- NEW FILE gpgme-1.0.2-macro.patch ---
--- gpgme/ath-compat.c~	2004-12-07 23:11:52.000000000 +0200
+++ gpgme/ath-compat.c	2005-03-18 12:54:44.000000000 +0200
@@ -108,7 +108,7 @@
 ath_read (int fd, void *buf, size_t nbytes)
 {
   if (ath_ops && ath_ops->read)
-    return ath_ops->read (fd, buf, nbytes);
+    return (ath_ops->read) (fd, buf, nbytes);
   else
     return read (fd, buf, nbytes);
 }


Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/devel/gpgme/gpgme.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gpgme.spec	3 Mar 2005 21:26:03 -0000	1.7
+++ gpgme.spec	18 Mar 2005 11:15:55 -0000	1.8
@@ -1,12 +1,13 @@
 Name:    gpgme
 Version: 1.0.2
-Release: 1%{?dist_tag}
+Release: 2%{?dist_tag}
 Summary: GnuPG Made Easy - high level crypto API
 License: LGPL
 Group:   Applications/System
 URL:     http://www.gnupg.org/related_software/gpgme/
 Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2.sig
+Patch0:  %{name}-1.0.2-macro.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gnupg >= 1.2.2
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -92,6 +94,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.2-2
+- Fix FC4 build.
+
 * Tue Feb  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.0.2-1
 - LGPL used here, and made summary more explicit.
 - Remove dirmngr dependency (gpgsm interfaces with it).



From bugs.michael at gmx.net  Fri Mar 18 11:16:30 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 18 Mar 2005 12:16:30 +0100
Subject: APPROVED: bmp
In-Reply-To: <20050318115146.2dbeffa8@python2>
References: <20050317141328.2be51de0.bugs.michael@gmx.net>
	<20050318115146.2dbeffa8@python2>
Message-ID: <20050318121630.361716a6.bugs.michael@gmx.net>

On Fri, 18 Mar 2005 11:51:46 +0100, Matthias Saou wrote:

> Michael Schwendt wrote :
> 
> > Name: bmp
> > Version: 0.9.7-4
> > 
> > BMP (Beep Media Player) is a media player that currently uses a skinned
> > user interface based on Winamp 2.x skins. It is based on ("forked off")
> > XMMS.
> > 
> > [...]
> > 
> > Imported package approved by mschwendt for adding to Fedora Extras.
> > Ralf Ertzinger will be responsible for this package.
> 
> After launching it for the first time, I saw it appear with a Bluecurve
> look, but I then went into "Preferences", where in "Appearance" I only see
> one skin called "Default" which is not the Bluecurve one, and when I went
> out of the prefs, the appearance changed to that one. I can't find any way
> to switch back to the Bluecurve look, so it seems like something in the
> way the new default is set needs fixing.

You need to source /etc/profile.d/bmp.sh before trying to access the skins.

Might be better to make that bullet-proof with a patch directly in the
program, though.



From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net  Fri Mar 18 11:25:17 2005
From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou)
Date: Fri, 18 Mar 2005 12:25:17 +0100
Subject: APPROVED: bmp
In-Reply-To: <20050318121630.361716a6.bugs.michael@gmx.net>
References: <20050317141328.2be51de0.bugs.michael@gmx.net>
	<20050318115146.2dbeffa8@python2>
	<20050318121630.361716a6.bugs.michael@gmx.net>
Message-ID: <20050318122517.7f20282d@python2>

Michael Schwendt wrote :

> > After launching it for the first time, I saw it appear with a Bluecurve
> > look, but I then went into "Preferences", where in "Appearance" I only see
> > one skin called "Default" which is not the Bluecurve one, and when I went
> > out of the prefs, the appearance changed to that one. I can't find any way
> > to switch back to the Bluecurve look, so it seems like something in the
> > way the new default is set needs fixing.
> 
> You need to source /etc/profile.d/bmp.sh before trying to access the skins.
> 
> Might be better to make that bullet-proof with a patch directly in the
> program, though.

Ah, indeed. I had just looked quickly at the patch that hardcodes the
default skin in. Well... this is a non-obvious side effect that people who
install then toy with bmp in the same session will see, but it's
definitely not a major issue.

Matthias

-- 
Clean custom Red Hat Linux rpm packages : http://freshrpms.net/
Fedora Core release 3 (Heidelberg) - Linux kernel 2.6.10-1.766_FC3.radeon
Load : 0.26 0.80 0.93



From fedora-extras-commits at redhat.com  Fri Mar 18 12:31:56 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 07:31:56 -0500
Subject: rpms/gnome-applet-netmon/devel gnome-applet-netmon.spec,NONE,1.1
Message-ID: <200503181231.j2ICVu6P028282@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28274

Added Files:
	gnome-applet-netmon.spec 
Log Message:
 



--- NEW FILE gnome-applet-netmon.spec ---
Name: 		gnome-applet-netmon
Version: 	0.4
Release: 	2
Epoch: 		0
Summary: 	GNOME Network Load Applet

Group: 		Applications/Internet
License: 	GPL
URL: 		http://www.demonseed.net/~jp/code/netmon_applet/
Source0: 	http://www.demonseed.net/~jp/code/netmon_applet/netmon_applet-0.4.tar.gz
BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot

Provides: 	netmon_applet
Obsoletes:	netmon_applet

BuildRequires  : GConf2
BuildRequires  : gnome-panel >= 0:2.0.0
BuildRequires  : pkgconfig
BuildRequires  : gtk2-devel >= 0:2.0.0
BuildRequires  : libgnomeui-devel >= 0:2.0.0


%description
This is a simple textual network load monitor for the GNOME panel.
Much of the code comes straight from the excellent program xnetload, by Roland
Smith.  (http://www.xs4all.nl/~rsmith/software/). This version is for Gnome 2.X

%prep
%setup -q -n netmon_applet-%{version}

%build
%configure 				
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install  DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
	%{_sysconfdir}/gconf/schemas/netmon.schemas > /dev/null

%preun
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
        %{_sysconfdir}/gconf/schemas/netmon.schemas >/dev/null

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README TODO
%{_libdir}/bonobo/servers/GNOME_NetmonApplet_Factory.server
%{_bindir}/netmon_applet
%{_sysconfdir}/gconf/schemas/netmon.schemas
%{_datadir}/pixmaps/netmon_applet.png

%changelog
* Wed Feb 23 2005 Gavin Henry <ghenry[AT]suretecsystems.com> - 0:0.4-2
- Changed name to gnome-applet-netmon and rebuilt for
  Fedora Core 3 Extras, plus some specfile maintance.
* Sun Feb 08 2004 Gavin Henry <ghenry[AT]suretecsystems.com> - 0:0.4-0.fdr.1
- Initial build.



From fedora-extras-commits at redhat.com  Fri Mar 18 12:42:28 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 07:42:28 -0500
Subject: rpms/gnome-applet-netmon/devel sources, NONE, 1.1 .cvsignore, NONE,
	1.1
Message-ID: <200503181242.j2ICgS3Q028545@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28539

Added Files:
	sources .cvsignore 
Log Message:
 


--- NEW FILE sources ---
6cdb16b2242b70aeabd9fb804b5477e2  gnome-applet-netmon.spec


--- NEW FILE .cvsignore ---
netmon_applet-0.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 18 12:45:10 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 07:45:10 -0500
Subject: rpms/gnome-applet-netmon/devel sources,1.1,1.2
Message-ID: <200503181245.j2ICjA4w028612@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28605

Modified Files:
	sources 
Log Message:
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-netmon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Mar 2005 12:42:26 -0000	1.1
+++ sources	18 Mar 2005 12:45:08 -0000	1.2
@@ -1 +1 @@
-6cdb16b2242b70aeabd9fb804b5477e2  gnome-applet-netmon.spec
+2681886857dbd9c2e80e10da45464861  netmon_applet-0.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 18 12:50:11 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri, 18 Mar 2005 07:50:11 -0500
Subject: rpms/gnome-applet-netmon/devel
	netmon.schemas.in.vertical_layout.to.false.patch, NONE,
	1.1 gnome-applet-netmon.spec, 1.1, 1.2
Message-ID: <200503181250.j2ICoBhL028768@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/gnome-applet-netmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28756/devel

Modified Files:
	gnome-applet-netmon.spec 
Added Files:
	netmon.schemas.in.vertical_layout.to.false.patch 
Log Message:
auto-import gnome-applet-netmon-0.4-3 on branch devel from gnome-applet-netmon-0.4-3.src.rpm
Initial update

netmon.schemas.in.vertical_layout.to.false.patch:

--- NEW FILE netmon.schemas.in.vertical_layout.to.false.patch ---
--- netmon_applet-0.4/netmon.schemas.in.vertical_layout.to.false	2005-03-18 09:56:55.318006288 +0000
+++ netmon_applet-0.4/netmon.schemas.in	2005-03-18 09:57:06.921242328 +0000
@@ -24,7 +24,7 @@
             <key>/schemas/apps/netmon_applet/prefs/vertical_layout</key>
             <owner>netmon_applet</owner>
             <type>bool</type>
-            <default>true</default>
+            <default>false</default>
             <locale name="C">
                 <short>orientation</short>
                 <long>orientation</long>


Index: gnome-applet-netmon.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-netmon/devel/gnome-applet-netmon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-applet-netmon.spec	18 Mar 2005 12:31:53 -0000	1.1
+++ gnome-applet-netmon.spec	18 Mar 2005 12:50:09 -0000	1.2
@@ -1,20 +1,20 @@
 Name: 		gnome-applet-netmon
 Version: 	0.4
-Release: 	2
-Epoch: 		0
+Release: 	3
 Summary: 	GNOME Network Load Applet
 
 Group: 		Applications/Internet
 License: 	GPL
 URL: 		http://www.demonseed.net/~jp/code/netmon_applet/
 Source0: 	http://www.demonseed.net/~jp/code/netmon_applet/netmon_applet-0.4.tar.gz
+Patch0:     netmon.schemas.in.vertical_layout.to.false.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot
 
-Provides: 	netmon_applet
-Obsoletes:	netmon_applet
+Provides: 	netmon_applet = %{version}-%{release}
+Obsoletes:	netmon_applet < %{version}-%{release}
 
 BuildRequires  : GConf2
-BuildRequires  : gnome-panel >= 0:2.0.0
+BuildRequires  : gnome-panel-devel >= 0:2.0.0
 BuildRequires  : pkgconfig
 BuildRequires  : gtk2-devel >= 0:2.0.0
 BuildRequires  : libgnomeui-devel >= 0:2.0.0
@@ -27,6 +27,7 @@
 
 %prep
 %setup -q -n netmon_applet-%{version}
+%patch0 -p1 -b .vertical_layout.to.false
 
 %build
 %configure 				
@@ -60,8 +61,11 @@
 %{_datadir}/pixmaps/netmon_applet.png
 
 %changelog
-* Wed Feb 23 2005 Gavin Henry <ghenry[AT]suretecsystems.com> - 0:0.4-2
+* Fri Mar 18 2005 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.4-3
+- Updated specfile in accordance to bugzilla bug 2439 and created
+  a patch..
+* Wed Feb 23 2005 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.4-2
 - Changed name to gnome-applet-netmon and rebuilt for
   Fedora Core 3 Extras, plus some specfile maintance.
-* Sun Feb 08 2004 Gavin Henry <ghenry[AT]suretecsystems.com> - 0:0.4-0.fdr.1
+* Sun Feb 08 2004 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.4-0.fdr.1
 - Initial build.



From fedora-extras-commits at redhat.com  Fri Mar 18 13:01:32 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri, 18 Mar 2005 08:01:32 -0500
Subject: rpms/rsnapshot - New directory
Message-ID: <200503181301.j2ID1WAE029837@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rsnapshot
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29830/rsnapshot

Log Message:
Directory /cvs/extras/rpms/rsnapshot added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 13:01:32 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri, 18 Mar 2005 08:01:32 -0500
Subject: rpms/rsnapshot/devel - New directory
Message-ID: <200503181301.j2ID1W8x029840@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rsnapshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29830/rsnapshot/devel

Log Message:
Directory /cvs/extras/rpms/rsnapshot/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 13:02:05 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri, 18 Mar 2005 08:02:05 -0500
Subject: rpms/rsnapshot Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503181302.j2ID25MP029912@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rsnapshot
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29903

Added Files:
	Makefile import.log 
Log Message:
Setup of module rsnapshot


--- NEW FILE Makefile ---
# Top level Makefile for module rsnapshot
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 18 13:02:05 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri, 18 Mar 2005 08:02:05 -0500
Subject: rpms/rsnapshot/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503181302.j2ID25Mi029915@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rsnapshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29903/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rsnapshot


--- 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 Mar 18 13:03:21 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri, 18 Mar 2005 08:03:21 -0500
Subject: rpms/rsnapshot import.log,1.1,1.2
Message-ID: <200503181303.j2ID3LEr030025@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rsnapshot
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30015

Modified Files:
	import.log 
Log Message:
auto-import rsnapshot-1.1.4-0.fdr.2 on branch devel from rsnapshot-1.1.4-0.fdr.2.src.rpm
Initial Import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rsnapshot/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Mar 2005 13:02:02 -0000	1.1
+++ import.log	18 Mar 2005 13:03:18 -0000	1.2
@@ -0,0 +1 @@
+rsnapshot-1_1_4-0_fdr_2:HEAD:rsnapshot-1.1.4-0.fdr.2.src.rpm:1111150918



From fedora-extras-commits at redhat.com  Fri Mar 18 13:03:21 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri, 18 Mar 2005 08:03:21 -0500
Subject: rpms/rsnapshot/devel rsnapshot.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503181303.j2ID3LKg030028@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rsnapshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30015/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rsnapshot.spec 
Log Message:
auto-import rsnapshot-1.1.4-0.fdr.2 on branch devel from rsnapshot-1.1.4-0.fdr.2.src.rpm
Initial Import


--- NEW FILE rsnapshot.spec ---
Name: rsnapshot
Summary: Local and remote filesystem snapshot utility
Version: 1.1.4
Release: 0.fdr.2
BuildArch: noarch
License: GPL
Group: Applications/System
URL: http://www.rsnapshot.org
Source: http://www.rsnapshot.org/downloads/rsnapshot-1.1.4.tar.gz
# Configure script checks for rsync, so we need it in order to build
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl, rsync
Requires: perl, openssh-clients, rsync, /usr/bin/logger, /bin/cp, /bin/rm

%description
This is a remote backup program that uses rsync to take backup snapshots 
of filesystems.  It uses hard links to save space on disk.

%prep
%setup -q
perl -p -i -e "s#/usr/local/bin/rsnapshot#%{_bindir}/rsnapshot#" rsnapshot.1

%build
%configure --with-rsync=%{_bindir}/rsync --with-ssh=%{_bindir}/ssh \
	--with-logger=%{_bindir}/logger --with-cp=/bin/cp \
	--with-rm=/bin/rm --with-perl=%{_bindir}/perl

%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_bindir}
install -m 755 rsnapshot $RPM_BUILD_ROOT%{_bindir}/rsnapshot

install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -m 644 rsnapshot.1 $RPM_BUILD_ROOT%{_mandir}/man1

install -d $RPM_BUILD_ROOT%{_sysconfdir}
install -m 644 rsnapshot.conf.default $RPM_BUILD_ROOT%{_sysconfdir}/rsnapshot.conf.default

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README TODO
%config %{_sysconfdir}/rsnapshot.conf.default
%{_bindir}/rsnapshot
%{_mandir}/man1/rsnapshot.1*

%changelog
* Mon Jun 15 2004 Erik S. LaBianca <erik at ilsw.com>  1.1.4-0.fdr.2
- added rsync to buildrequires

* Mon Jun 7 2004 Erik S. LaBianca <erik at ilsw.com>  1.1.4-0.fdr.1
- updated to latest upstream release

* Fri Jun 4 2004 Erik S. LaBianca <erik at ilsw.com>  1.1.1-0.fdr.3
- changed buildroot to fedora spec
- removed /etc/rsnapshot.conf

* Thu Jun 3 2004 Erik S. LaBianca <erik at ilsw.com>  1.1.1-0.fdr.2
- changed buildroot 
- removed explicit perl dep, added /usr/bin/logger
- changed %configure arguments to macros
- fixed rm -rf locations, removed %verify verbosity, empty %post
- replaced rsnapshot references in man page with correct location
- removed INSTALL from %doc

* Mon Feb 16 2004 Erik S. LaBianca <erik at totalcirculation.com>
- Converted to Fedora packaging guidelines for fedora.us submission
- changed release to 0.fdr.1
- removed AutoReqProv: no
- replaced hardcoded paths with macros

* Thu Jan 15 2004 Nathan Rosenquist <nathan at rsnapshot.org>
- Added "AutoReqProv: no" for SuSE compatibility

* Fri Dec 26 2003 Nathan Rosenquist <nathan at rsnapshot.org>
- Added util-linux dependency, and --with-logger= option

* Fri Dec 19 2003 Nathan Rosenquist <nathan at rsnapshot.org>
- now fully support autoconf

* Tue Dec 16 2003 Nathan Rosenquist <nathan at rsnapshot.org>
- changed rsnapshot.conf to rsnapshot.conf.default from the source tree

* Wed Nov 05 2003 Nathan Rosenquist <nathan at rsnapshot.org>
- Removed fileutils dependency, added verification info

* Tue Nov 04 2003 Nathan Rosenquist <nathan at rsnapshot.org>
- fixed anonymous rsync error

* Thu Oct 30 2003 Nathan Rosenquist <nathan at rsnapshot.org>
- update to 1.0.3

* Tue Oct 28 2003 Carl Wilhelm Soderstrom <chrome at real-time.com>
- created spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsnapshot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Mar 2005 13:02:02 -0000	1.1
+++ .cvsignore	18 Mar 2005 13:03:19 -0000	1.2
@@ -0,0 +1 @@
+rsnapshot-1.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsnapshot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Mar 2005 13:02:02 -0000	1.1
+++ sources	18 Mar 2005 13:03:19 -0000	1.2
@@ -0,0 +1 @@
+938a065a0da619d7d94908dc9374b63c  rsnapshot-1.1.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 18 13:07:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 08:07:38 -0500
Subject: rpms/gnome-applet-netmon import.log,NONE,1.1
Message-ID: <200503181307.j2ID7ceA030176@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30170

Added Files:
	import.log 
Log Message:
 


--- NEW FILE import.log ---
gnome-applet-netmon-0_4-3:HEAD:gnome-applet-netmon-0.4-3.src.rpm:1111151241



From fedora-extras-commits at redhat.com  Fri Mar 18 13:20:42 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 08:20:42 -0500
Subject: devel/uqm uqm-decls.patch, NONE, 1.1 uqm-lvalues.patch, NONE,
	1.1 uqm-macros.patch, NONE, 1.1 uqm.spec, 1.5, 1.6
Message-ID: <200503181320.j2IDKg6v030443@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/uqm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30436

Modified Files:
	uqm.spec 
Added Files:
	uqm-decls.patch uqm-lvalues.patch uqm-macros.patch 
Log Message:
Fix FC4 build.

uqm-decls.patch:

--- NEW FILE uqm-decls.patch ---
diff -Naru uqm-0.3.orig/src/sc2code/comm/starbas/starbas.c uqm-0.3/src/sc2code/comm/starbas/starbas.c
--- uqm-0.3.orig/src/sc2code/comm/starbas/starbas.c	2003-06-22 03:55:59.000000000 +0300
+++ uqm-0.3/src/sc2code/comm/starbas/starbas.c	2005-03-18 14:40:50.000000000 +0200
@@ -552,6 +552,8 @@
 	Response (enough_history, NeedInfo);
 }
 
+static void TellMission (RESPONSE_REF R);
+
 static void
 DefeatUrquan (RESPONSE_REF R)
 {
@@ -560,7 +562,6 @@
 #define HOW_ALLY_AGAINST_URQUAN (1 << 2)
 #define HOW_STRONG_AGAINST_URQUAN (1 << 3)
 	static BYTE DefeatMask = 0;
-	static void TellMission (RESPONSE_REF R);
 
 	if (PLAYER_SAID (R, how_defeat))
 	{
@@ -1635,6 +1636,8 @@
 	}
 }
 
+static void SellMinerals (RESPONSE_REF R);
+
 static void
 NormalStarbase (RESPONSE_REF R)
 {
@@ -1716,8 +1719,6 @@
 
 	if (GLOBAL_SIS (TotalElementMass))
 	{
-		static void SellMinerals (RESPONSE_REF R);
-
 		Response (have_minerals, SellMinerals);
 	}
 	if (DiscussDevices (FALSE))
diff -Naru uqm-0.3.orig/src/sc2code/gameopt.c uqm-0.3/src/sc2code/gameopt.c
--- uqm-0.3.orig/src/sc2code/gameopt.c	2003-09-05 00:32:06.000000000 +0300
+++ uqm-0.3/src/sc2code/gameopt.c	2005-03-18 14:39:21.000000000 +0200
@@ -188,6 +188,8 @@
 
 static BOOLEAN DoSettings (PMENU_STATE pMS);
 
+static BOOLEAN DoNaming (PMENU_STATE pMS);
+
 static BOOLEAN
 DrawDescriptionString (PMENU_STATE pMS, COUNT which_string, SIZE state)
 {
@@ -196,7 +198,6 @@
 	TEXT lf;
 	COLOR BackGround, ForeGround;
 	FONT Font;
-	static BOOLEAN DoNaming (PMENU_STATE pMS);
 
 	SetSemaphore (GraphicsSem);
 
diff -Naru uqm-0.3.orig/src/sc2code/melee.c uqm-0.3/src/sc2code/melee.c
--- uqm-0.3.orig/src/sc2code/melee.c	2003-08-26 06:22:58.000000000 +0300
+++ uqm-0.3/src/sc2code/melee.c	2005-03-18 14:40:53.000000000 +0200
@@ -201,13 +201,13 @@
 	DrawMeleeIcon (1 + (8 * (1 - which_side)) + (HiLite ? 4 : 0) + which_icon);
 }
 
+static void DrawMeleeShipStrings (PMELEE_STATE pMS, BYTE NewStarShip);
+
 static void
 DrawPickFrame (PMELEE_STATE pMS)
 {
 	FRAME F;
 	RECT r, r0, r1, ship_r;
-	static void DrawMeleeShipStrings (PMELEE_STATE pMS, BYTE
-			NewStarShip);
 				
 	GetShipBox (&r0, 0, 0, 0),
 	GetShipBox (&r1, 1, NUM_MELEE_ROWS - 1, NUM_MELEE_COLUMNS - 1),

uqm-lvalues.patch:

--- NEW FILE uqm-lvalues.patch ---
diff -Naru uqm-0.3.orig/src/sc2code/libs/decomp/lzencode.c uqm-0.3/src/sc2code/libs/decomp/lzencode.c
--- uqm-0.3.orig/src/sc2code/libs/decomp/lzencode.c	2003-07-08 21:17:39.000000000 +0300
+++ uqm-0.3/src/sc2code/libs/decomp/lzencode.c	2005-03-18 14:43:35.000000000 +0200
@@ -60,9 +60,9 @@
 		*(MEM_HANDLE *)lson = h;
 		lson = (PSWORD)((PBYTE)lson + sizeof (h));
 		rson = lson;
-		((BYTE *) rson) += (N + 1) * sizeof (lson[0]);
+		rson = ((BYTE *) rson) + (N + 1) * sizeof (lson[0]);
 		dad = rson;
-		((BYTE *) dad) += (N + 257) * sizeof (rson[0]);
+		dad = ((BYTE *) dad) + (N + 257) * sizeof (rson[0]);
 
 		for (i = N + 1; i <= N + 256; i++)
 			rson[i] = NIL; /* root */
diff -Naru uqm-0.3.orig/src/sc2code/libs/resource/loadres.c uqm-0.3/src/sc2code/libs/resource/loadres.c
--- uqm-0.3.orig/src/sc2code/libs/resource/loadres.c	2003-07-08 21:17:39.000000000 +0300
+++ uqm-0.3/src/sc2code/libs/resource/loadres.c	2005-03-18 14:43:13.000000000 +0200
@@ -62,7 +62,7 @@
 					if ((int)(ReadResFile (RDPtr, 1, num_read, fp)) != (int)num_read)
 						break;
 				}
-				((BYTE *) RDPtr) += num_read;
+				RDPtr = ((BYTE *) RDPtr) + num_read;
 			} while (length -= num_read);
 
 			UnlockResourceData (RData);
diff -Naru uqm-0.3.orig/src/sc2code/libs/strings/strings.c uqm-0.3/src/sc2code/libs/strings/strings.c
--- uqm-0.3.orig/src/sc2code/libs/strings/strings.c	2003-01-19 01:08:39.000000000 +0200
+++ uqm-0.3/src/sc2code/libs/strings/strings.c	2005-03-18 14:45:07.000000000 +0200
@@ -176,8 +176,7 @@
 			StringAddr = 0;
 		else
 		{
-			StringAddr = (STRINGPTR)StringTablePtr;
-			((BYTE *) StringAddr) += StringTablePtr->StringOffsets[StringIndex];
+			StringAddr = (STRINGPTR)StringTablePtr + StringTablePtr->StringOffsets[StringIndex];
 		}
 		UnlockStringTable (StringTable);
 	}
@@ -209,8 +208,7 @@
 			StringAddr = 0;
 		else
 		{
-			StringAddr = (STRINGPTR)StringTablePtr;
-			((BYTE *) StringAddr) += StringTablePtr->StringOffsets[StringIndex];
+			StringAddr = (STRINGPTR)StringTablePtr + StringTablePtr->StringOffsets[StringIndex];
 		}
 		UnlockStringTable (StringTable);
 	}
@@ -233,8 +231,7 @@
 
 		StringIndex = STRING_INDEX (String);
 		LockStringTable (StringTable, &StringTablePtr);
-		StringAddr = (STRINGPTR)StringTablePtr;
-		((BYTE *) StringAddr) += StringTablePtr->StringOffsets[StringIndex];
+		StringAddr = (STRINGPTR)StringTablePtr + StringTablePtr->StringOffsets[StringIndex];
 		UnlockStringTable (StringTable);
 	}
 
diff -Naru uqm-0.3.orig/src/sc2code/libs/uio/uiostream.c uqm-0.3/src/sc2code/libs/uio/uiostream.c
--- uqm-0.3.orig/src/sc2code/libs/uio/uiostream.c	2003-07-13 02:02:55.000000000 +0300
+++ uqm-0.3/src/sc2code/libs/uio/uiostream.c	2005-03-18 14:45:05.000000000 +0200
@@ -141,7 +141,7 @@
 
 		numRead = minu(stream->readEnd - stream->bufPtr, bytesToRead);
 		memcpy(buf, stream->bufPtr, numRead);
-		(char *) buf += numRead;
+		buf = (char *) buf + numRead;
 		stream->bufPtr += numRead;
 		bytesToRead -= numRead;
 		bytesRead += numRead;

uqm-macros.patch:

--- NEW FILE uqm-macros.patch ---
diff -Naru uqm-0.3.orig/src/sc2code/libs/uio/ioaux.c uqm-0.3/src/sc2code/libs/uio/ioaux.c
--- uqm-0.3.orig/src/sc2code/libs/uio/ioaux.c	2003-08-31 21:40:01.000000000 +0300
+++ uqm-0.3/src/sc2code/libs/uio/ioaux.c	2005-03-18 14:46:39.000000000 +0200
@@ -182,7 +182,7 @@
 			// not allocated on the stack, as this function may be called
 			// from a thread with little stack space.
 	while (1) {
-		numInBuf = fromHandler->read(fromHandle, buf, BUFSIZE);
+		numInBuf = (fromHandler->read)(fromHandle, buf, BUFSIZE);
 		if (numInBuf == -1)
 		{
 			if (errno == EINTR)
diff -Naru uqm-0.3.orig/src/sc2code/libs/uio/io.c uqm-0.3/src/sc2code/libs/uio/io.c
--- uqm-0.3.orig/src/sc2code/libs/uio/io.c	2003-09-05 06:12:18.000000000 +0300
+++ uqm-0.3/src/sc2code/libs/uio/io.c	2005-03-18 14:46:39.000000000 +0200
@@ -680,7 +680,7 @@
 
 ssize_t
 uio_read(uio_Handle *handle, void *buf, size_t count) {
-	return handle->root->handler->read(handle, buf, count);
+	return (handle->root->handler->read)(handle, buf, count);
 }
 
 int


Index: uqm.spec
===================================================================
RCS file: /cvs/extras/devel/uqm/uqm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- uqm.spec	5 Mar 2005 19:55:54 -0000	1.5
+++ uqm.spec	18 Mar 2005 13:20:40 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           uqm
 Version:        0.3
-Release:        3
+Release:        4
 Summary:        The Ur-Quan Masters, a port of the classic game Star Control II
 
 Group:          Amusements/Games
@@ -14,6 +14,9 @@
 # Patch2: http://uqm.stack.nl/cgi-bin/bugs/show_bug.cgi?id=363#c20
 Patch2:         %{name}-comms-bluescreen.patch
 Patch3:         %{name}-gcc34MM.patch
+Patch4:         %{name}-decls.patch
+Patch5:         %{name}-lvalues.patch
+Patch6:         %{name}-macros.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2.3, SDL_image-devel, SDL_mixer-devel
@@ -34,6 +37,9 @@
 %patch1 -p0
 %patch2 -p0
 %patch3
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 
 %build
@@ -87,6 +93,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-4
+- Fix FC4 build.
+
 * Sat Dec 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3-3
 - Fix build on FC3.
 - Improve comment in desktop entry file, add Finnish translation.



From fedora-extras-commits at redhat.com  Fri Mar 18 14:02:23 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 09:02:23 -0500
Subject: devel/libcdio libcdio-gcc4.patch,NONE,1.1 libcdio.spec,1.5,1.6
Message-ID: <200503181402.j2IE2N5f031873@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/libcdio
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31867

Modified Files:
	libcdio.spec 
Added Files:
	libcdio-gcc4.patch 
Log Message:
Fix FC4 build, build with dep tracking disabled.

libcdio-gcc4.patch:

--- NEW FILE libcdio-gcc4.patch ---
diff -Naru libcdio-0.70.orig/lib/cdio.c libcdio-0.70.new/lib/cdio.c
--- libcdio-0.70.orig/lib/cdio.c	2004-08-29 06:55:24.000000000 +0300
+++ libcdio-0.70.new/lib/cdio.c	2005-03-18 15:48:40.000000000 +0200
@@ -848,7 +848,7 @@
   if (cdio == NULL) return -1;
   
   if (cdio->op.read)
-    return cdio->op.read (cdio->env, buf, size);
+    return (cdio->op.read) (cdio->env, buf, size);
   return -1;
 }
 
diff -Naru libcdio-0.70.orig/lib/_cdio_stream.c libcdio-0.70.new/lib/_cdio_stream.c
--- libcdio-0.70.orig/lib/_cdio_stream.c	2004-02-07 20:53:02.000000000 +0200
+++ libcdio-0.70.new/lib/_cdio_stream.c	2005-03-18 15:46:44.000000000 +0200
@@ -145,7 +145,7 @@
 
   if (!_cdio_stream_open_if_necessary(obj)) return 0;
 
-  read_bytes = obj->op.read(obj->user_data, ptr, size*nmemb);
+  read_bytes = (obj->op.read)(obj->user_data, ptr, size*nmemb);
   obj->position += read_bytes;
 
   return read_bytes;
diff -Naru libcdio-0.70.orig/src/cd-drive.c libcdio-0.70.new/src/cd-drive.c
--- libcdio-0.70.orig/src/cd-drive.c	2004-08-27 14:53:38.000000000 +0300
+++ libcdio-0.70.new/src/cd-drive.c	2005-03-18 15:51:43.000000000 +0200
@@ -140,7 +140,6 @@
 
 /* CDIO logging routines */
 
-static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
 
 static void 
 _log_handler (cdio_log_level_t level, const char message[])
diff -Naru libcdio-0.70.orig/src/cd-info.c libcdio-0.70.new/src/cd-info.c
--- libcdio-0.70.orig/src/cd-info.c	2004-09-02 04:33:57.000000000 +0300
+++ libcdio-0.70.new/src/cd-info.c	2005-03-18 15:53:49.000000000 +0200
@@ -371,7 +371,6 @@
 
 /* CDIO logging routines */
 
-static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
 #ifdef HAVE_CDDB
 static cddb_log_handler_t gl_default_cddb_log_handler = NULL;
 #endif
diff -Naru libcdio-0.70.orig/src/iso-info.c libcdio-0.70.new/src/iso-info.c
--- libcdio-0.70.orig/src/iso-info.c	2004-06-19 22:15:15.000000000 +0300
+++ libcdio-0.70.new/src/iso-info.c	2005-03-18 15:55:57.000000000 +0200
@@ -133,7 +133,6 @@
 
 /* CDIO logging routines */
 
-static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
 
 static void 
 _log_handler (cdio_log_level_t level, const char message[])


Index: libcdio.spec
===================================================================
RCS file: /cvs/extras/devel/libcdio/libcdio.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libcdio.spec	3 Mar 2005 22:41:31 -0000	1.5
+++ libcdio.spec	18 Mar 2005 14:02:21 -0000	1.6
@@ -1,15 +1,16 @@
 Name:           libcdio
 Version:        0.70
-Release:        1
+Release:        2
 Summary:        CD-ROM input and control library
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.gnu.org/software/libcdio/
 Source0:        http://ftp.gnu.org/gnu/libcdio/libcdio-0.70.tar.gz
+Patch0:         %{name}-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libcddb-devel
+BuildRequires:  libcddb-devel >= 0.9.4
 BuildRequires:  pkgconfig
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -33,10 +34,11 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
-%configure --disable-vcd-info
+%configure --disable-vcd-info --disable-dependency-tracking
 # Parallel build fails
 make
 
@@ -84,6 +86,10 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.70-2
+- Fix FC4 build (#151468).
+- Build with dependency tracking disabled.
+
 * Sun Sep  5 2004 Marius L. J??hndal <mariuslj at ifi.uio.no> - 0:0.70-0.fdr.1
 - Updated to 0.70.
 



From fedora-extras-commits at redhat.com  Fri Mar 18 14:17:24 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 09:17:24 -0500
Subject: devel/bmp bmp-0.9.7-xmms-skins.patch, NONE, 1.1 bmp.sh, 1.1,
	1.2 bmp.spec, 1.2, 1.3
Message-ID: <200503181417.j2IEHOEH032184@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/bmp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32174

Modified Files:
	bmp.sh bmp.spec 
Added Files:
	bmp-0.9.7-xmms-skins.patch 
Log Message:
* Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-6
- Enable XMMS skins directory inside binary, not via profile.d/bmp.sh



bmp-0.9.7-xmms-skins.patch:

--- NEW FILE bmp-0.9.7-xmms-skins.patch ---
diff -Nur bmp-0.9.7-orig/beep/skinwin.c bmp-0.9.7/beep/skinwin.c
--- bmp-0.9.7-orig/beep/skinwin.c	2004-12-04 10:04:29.000000000 +0100
+++ bmp-0.9.7/beep/skinwin.c	2005-03-18 14:40:23.000000000 +0100
@@ -230,11 +230,15 @@
 skinlist_update(void)
 {
     gchar *skinsdir;
+    gchar xmmsskinsdir = "/usr/share/xmms/Skins";
 
     skinlist_clear();
 
     scan_skindir(bmp_user_skin_dir);
     scan_skindir(DATA_DIR G_DIR_SEPARATOR_S BMP_SKIN_DIR_BASENAME);
+    if (g_file_test(xmmsskinsdir, G_FILE_TEST_IS_DIR)) {
+        scan_skindir( xmmsskinsdir);
+    }
 
     skinsdir = getenv("SKINSDIR");
     if (skinsdir) {


Index: bmp.sh
===================================================================
RCS file: /cvs/extras/devel/bmp/bmp.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bmp.sh	16 Mar 2005 17:24:48 -0000	1.1
+++ bmp.sh	18 Mar 2005 14:17:22 -0000	1.2
@@ -2,4 +2,4 @@
 
 # Colon-separated directory path to look for
 # additional skins. See man beep-media-player.
-export SKINSDIR=/usr/share/xmms/Skins
+#export SKINSDIR=


Index: bmp.spec
===================================================================
RCS file: /cvs/extras/devel/bmp/bmp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bmp.spec	17 Mar 2005 20:35:30 -0000	1.2
+++ bmp.spec	18 Mar 2005 14:17:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           bmp
 Version:        0.9.7
-Release:        5
+Release:        6
 Summary:        GTK2 based port of the XMMS media player
 
 Group:          Applications/Multimedia
@@ -15,6 +15,7 @@
 Patch0:         bmp-0.9.7-readmacro.patch
 Patch1:         bmp-0.9.7-default-skin.patch
 Patch2:         bmp-0.9.7-default-alsa.patch
+Patch3:         bmp-0.9.7-xmms-skins.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig gtk2-devel esound-devel libvorbis-devel
@@ -49,6 +50,7 @@
 %patch1 -p1 -b .default-skin
 
 %patch2 -p1 -b .default-alsa
+%patch3 -p1 -b .xmms-skins
 
 
 %build
@@ -117,6 +119,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-6
+- Enable XMMS skins directory inside binary, not via profile.d/bmp.sh
+
 * Thu Mar 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-5
 - Add -devel dependencies needed for headers and pkgconfig template.
 



From fedora-extras-commits at redhat.com  Fri Mar 18 16:04:12 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 18 Mar 2005 11:04:12 -0500
Subject: rpms/perl-Cache-Cache/FC-3 .cvsignore, 1.3,
	1.4 perl-Cache-Cache.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200503181604.j2IG4CkY003527@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cache-Cache/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3517/FC-3

Modified Files:
	.cvsignore perl-Cache-Cache.spec sources 
Log Message:
Update to 1.04.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2005 09:43:31 -0000	1.3
+++ .cvsignore	18 Mar 2005 16:04:09 -0000	1.4
@@ -1 +1 @@
-Cache-Cache-1.03.tar.gz
+Cache-Cache-1.04.tar.gz


Index: perl-Cache-Cache.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-3/perl-Cache-Cache.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Cache-Cache.spec	28 Feb 2005 21:10:11 -0000	1.5
+++ perl-Cache-Cache.spec	18 Mar 2005 16:04:09 -0000	1.6
@@ -1,14 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Cache-Cache
-Version:        1.03
-Release:        2
+Version:        1.04
+Release:        1
 Summary:        Generic cache interface and implementations
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Cache-Cache/
-Source0:   http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-1.03.tar.gz
+Source0:   http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-1.04.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
+- Update to 1.04.
+
 * Mon Feb 28 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.03-2
 - Bring up to date with current fedora.extras perl spec template.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2005 09:43:31 -0000	1.3
+++ sources	18 Mar 2005 16:04:09 -0000	1.4
@@ -1 +1 @@
-5482dea509c2133d1ffbfbd031d2f1c9  Cache-Cache-1.03.tar.gz
+60f79f31e74830dba1e0acda4d232d31  Cache-Cache-1.04.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 18 16:04:12 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 18 Mar 2005 11:04:12 -0500
Subject: rpms/perl-Cache-Cache/devel .cvsignore, 1.3,
	1.4 perl-Cache-Cache.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200503181604.j2IG4Cka003533@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cache-Cache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3517/devel

Modified Files:
	.cvsignore perl-Cache-Cache.spec sources 
Log Message:
Update to 1.04.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2005 09:43:31 -0000	1.3
+++ .cvsignore	18 Mar 2005 16:04:09 -0000	1.4
@@ -1 +1 @@
-Cache-Cache-1.03.tar.gz
+Cache-Cache-1.04.tar.gz


Index: perl-Cache-Cache.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/perl-Cache-Cache.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Cache-Cache.spec	28 Feb 2005 21:08:22 -0000	1.5
+++ perl-Cache-Cache.spec	18 Mar 2005 16:04:10 -0000	1.6
@@ -1,14 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Cache-Cache
-Version:        1.03
-Release:        2
+Version:        1.04
+Release:        1
 Summary:        Generic cache interface and implementations
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Cache-Cache/
-Source0:   http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-1.03.tar.gz
+Source0:   http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-1.04.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
+- Update to 1.04.
+
 * Mon Feb 28 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.03-2
 - Bring up to date with current fedora.extras perl spec template.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2005 09:43:31 -0000	1.3
+++ sources	18 Mar 2005 16:04:10 -0000	1.4
@@ -1 +1 @@
-5482dea509c2133d1ffbfbd031d2f1c9  Cache-Cache-1.03.tar.gz
+60f79f31e74830dba1e0acda4d232d31  Cache-Cache-1.04.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 18 16:36:16 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 11:36:16 -0500
Subject: devel/qascade qascade-dblsep.patch, NONE, 1.1 qascade.desktop, 1.1,
	1.2 qascade.spec, 1.5, 1.6
Message-ID: <200503181636.j2IGaGmL004223@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/qascade
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4216

Modified Files:
	qascade.desktop qascade.spec 
Added Files:
	qascade-dblsep.patch 
Log Message:
Work around #150528, other cosmetic tweaks.

qascade-dblsep.patch:

--- NEW FILE qascade-dblsep.patch ---
--- qascade_main.ui~	2003-05-03 02:04:13.000000000 +0300
+++ qascade_main.ui	2005-03-18 18:18:28.000000000 +0200
@@ -11149,7 +11149,6 @@
     <item text="&amp;File" name="fileMenu">
         <action name="fileNewAction"/>
         <separator/>
-        <separator/>
         <action name="fileExitAction"/>
     </item>
     <item text="View" name="PopupMenu">


Index: qascade.desktop
===================================================================
RCS file: /cvs/extras/devel/qascade/qascade.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qascade.desktop	8 Nov 2004 05:17:16 -0000	1.1
+++ qascade.desktop	18 Mar 2005 16:36:14 -0000	1.2
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=Qascade
-Comment=QT port of classic puzzle game
+Comment=Classic puzzle game
 Exec=qascade
-Icon=qascade.png
+Icon=qascade
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;Game;PuzzleGame;QT;
+Categories=Application;Game;PuzzleGame;Qt;


Index: qascade.spec
===================================================================
RCS file: /cvs/extras/devel/qascade/qascade.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qascade.spec	4 Mar 2005 00:05:42 -0000	1.5
+++ qascade.spec	18 Mar 2005 16:36:14 -0000	1.6
@@ -1,13 +1,14 @@
 Name:           qascade
 Version:        0.1
-Release:        2
-Summary:        QT port of classic puzzle game
+Release:        3
+Summary:        Classic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.bitsnpieces.org.uk/qascade/
 Source0:        http://www.bitsnpieces.org.uk/qascade/qascade-0.1.tar.bz2
 Source1:        %{name}.desktop
+Patch0:         %{name}-dblsep.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, XFree86-devel, desktop-file-utils
@@ -19,12 +20,14 @@
 
 %prep
 %setup -q
+%patch0
 
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 qmake INSTALL_ROOT=$RPM_BUILD_ROOT qascade.pro
 perl -pi -e 's|^(C(XX)?FLAGS\s*=.*)$|$1 \$(RPM_OPT_FLAGS)|g' Makefile
+perl -pi -e 's|^(UIC\s*=.*)|$1 -nounload|' Makefile # work around #150528
 make %{?_smp_mflags}
 
 
@@ -57,6 +60,10 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.1-3
+- Add workaround for UIC segfault (#150528).
+- Various cosmetic desktop entry and UI tweaks.
+
 * Sun Aug 24 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.1-0.fdr.2
 - Fix URL.
 - Ensure that QTDIR is also defined in %%install.



From fedora-extras-commits at redhat.com  Fri Mar 18 17:22:21 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 18 Mar 2005 12:22:21 -0500
Subject: rpms/sabayon - New directory
Message-ID: <200503181722.j2IHML5A005867@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5860/sabayon

Log Message:
Directory /cvs/extras/rpms/sabayon added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 17:22:21 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 18 Mar 2005 12:22:21 -0500
Subject: rpms/sabayon/devel - New directory
Message-ID: <200503181722.j2IHMLDG005870@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5860/sabayon/devel

Log Message:
Directory /cvs/extras/rpms/sabayon/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 17:22:41 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 18 Mar 2005 12:22:41 -0500
Subject: rpms/sabayon Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503181722.j2IHMfnP005935@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5926

Added Files:
	Makefile import.log 
Log Message:
Setup of module sabayon


--- NEW FILE Makefile ---
# Top level Makefile for module sabayon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 18 17:22:41 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 18 Mar 2005 12:22:41 -0500
Subject: rpms/sabayon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503181722.j2IHMf4D005938@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5926/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sabayon


--- 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 Mar 18 17:25:15 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 18 Mar 2005 12:25:15 -0500
Subject: rpms/sabayon import.log,1.1,1.2
Message-ID: <200503181725.j2IHPFZG006105@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6095

Modified Files:
	import.log 
Log Message:
auto-import sabayon-0.16-1 on branch devel from sabayon-0.16-1.src.rpm
Initial import of Sabayon (http://www.gnome.org/projects/sabayon)


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sabayon/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Mar 2005 17:22:39 -0000	1.1
+++ import.log	18 Mar 2005 17:25:13 -0000	1.2
@@ -0,0 +1 @@
+sabayon-0_16-1:HEAD:sabayon-0.16-1.src.rpm:1111166704



From fedora-extras-commits at redhat.com  Fri Mar 18 17:25:15 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 18 Mar 2005 12:25:15 -0500
Subject: rpms/sabayon/devel sabayon.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503181725.j2IHPFpc006108@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6095/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sabayon.spec 
Log Message:
auto-import sabayon-0.16-1 on branch devel from sabayon-0.16-1.src.rpm
Initial import of Sabayon (http://www.gnome.org/projects/sabayon)


--- NEW FILE sabayon.spec ---
%define pygtk2_version 2.5.3-2
%define gnome_python2_version 2.6.0-5

%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_pytho\n_lib()")}

Name:    sabayon
Version: 0.16
Release: 1
Summary: Tool to maintain user profiles in a GNOME desktop.

Group:   Applications/System
License: GPL
URL:     http://www.gnome.org/projects/sabayon
Source:  sabayon-%{version}.tar.gz

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires: python-abi = %{pyver}
Requires: gamin-python
Requires: pygtk2 >= %{pygtk2_version}
Requires: gnome-python2-gconf >= %{gnome_python2_version}
Requires: xorg-x11-Xnest
Requires: shadow-utils

BuildRequires: desktop-file-utils

Requires(post):  shadow-utils
Requires(preun): shadow-utils

%description
Sabayon is a tool to help sysadmins and user change and maintain the
default behaviour of the GNOME desktop.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}
gzip -9 ChangeLog

%install
rm -rf $RPM_BUILD_ROOT

%makeinstall PAM_PREFIX=$RPM_BUILD_ROOT%{_sysconfdir}

mkdir -p $RPM_BUILD_ROOT/etc/gconf/2
echo 'include "$(HOME)/.gconf.path.defaults"'  > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2/local-defaults.path
echo 'include "$(HOME)/.gconf.path.mandatory"' > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2/local-mandatory.path

desktop-file-install --vendor gnome --delete-original		\
  --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%find_lang sabayon

%clean
rm -rf $RPM_BUILD_ROOT

%pre
/usr/sbin/groupadd -r %{name} &>/dev/null || :
/usr/sbin/useradd  -r -s /sbin/nologin -c "Sabayon user" -g %{name} %{name} &>/dev/null || :
/usr/sbin/usermod -d "" %{name} &>/dev/null || :

%postun
if [ $1 -eq 0 ]; then
  /usr/sbin/userdel  %{name} &>/dev/null || :
  /usr/sbin/groupdel %{name} &>/dev/null || :
fi

%files -f sabayon.lang
%defattr(-, root, root)

%doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES
%doc doc/index.html doc/testing.html doc/helping.html doc/developing.html
%doc doc/sabayon.css doc/*.jpg doc/*.gif

%config(noreplace) /etc/gconf/2/local-defaults.path
%config(noreplace) /etc/gconf/2/local-mandatory.path
%config(noreplace) /etc/pam.d/%{name}
%config(noreplace) /etc/security/console.apps/%{name}
%config(noreplace) /etc/X11/xinit/xinitrc.d/%{name}*

%{_sysconfdir}/desktop-profiles

%{_bindir}/%{name}*
%{_sbindir}/%{name}*
%{_libexecdir}/%{name}*

%{_datadir}/%{name}/glade/%{name}.glade
%{_datadir}/applications/gnome-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png

%{python_sitelib}/%{name}/*.py
%{python_sitelib}/%{name}/*.pyc
%ghost %{python_sitelib}/%{name}/*.pyo
%{python_sitelib}/%{name}/sources/*.py
%{python_sitelib}/%{name}/sources/*.pyc
%ghost %{python_sitelib}/%{name}/sources/*.pyo

%changelog
* Wed Mar 16 2005 Mark McLoughlin <markmc at redhat.com>
- Various changes to bring in line with Fedora package guidelines

* Wed Feb  9 2005 Daniel Veillard <veillard at redhat.com>
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Mar 2005 17:22:39 -0000	1.1
+++ .cvsignore	18 Mar 2005 17:25:13 -0000	1.2
@@ -0,0 +1 @@
+sabayon-0.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Mar 2005 17:22:39 -0000	1.1
+++ sources	18 Mar 2005 17:25:13 -0000	1.2
@@ -0,0 +1 @@
+e7798dacf96d8b6db2f8b94f5ccd5032  sabayon-0.16.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 18 17:31:36 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 18 Mar 2005 12:31:36 -0500
Subject: rpms/sabayon/devel sabayon.spec,1.1,1.2
Message-ID: <200503181731.j2IHVaB9006277@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6270

Modified Files:
	sabayon.spec 
Log Message:
* Fri Mar 18 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-2
- BuildRequires: gettext-devel
- Add X-Fedora-Extra to .desktop file



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sabayon.spec	18 Mar 2005 17:25:13 -0000	1.1
+++ sabayon.spec	18 Mar 2005 17:31:34 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:    sabayon
 Version: 0.16
-Release: 1
+Release: 2
 Summary: Tool to maintain user profiles in a GNOME desktop.
 
 Group:   Applications/System
@@ -23,6 +23,7 @@
 Requires: xorg-x11-Xnest
 Requires: shadow-utils
 
+BuildRequires: gettext-devel
 BuildRequires: desktop-file-utils
 
 Requires(post):  shadow-utils
@@ -51,6 +52,7 @@
 
 desktop-file-install --vendor gnome --delete-original		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
+  --add-category X-Fedora-Extra					\
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang sabayon
@@ -100,6 +102,10 @@
 %ghost %{python_sitelib}/%{name}/sources/*.pyo
 
 %changelog
+* Fri Mar 18 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-2
+- BuildRequires: gettext-devel
+- Add X-Fedora-Extra to .desktop file
+
 * Wed Mar 16 2005 Mark McLoughlin <markmc at redhat.com>
 - Various changes to bring in line with Fedora package guidelines
 



From fedora-extras-commits at redhat.com  Fri Mar 18 18:03:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 13:03:05 -0500
Subject: rpms/bmp/devel bmp-0.9.7-xmms-skins.patch,1.1,1.2
Message-ID: <200503181803.j2II350J007556@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7547

Modified Files:
	bmp-0.9.7-xmms-skins.patch 
Log Message:
note to self: always commit the tested patch, not introduce cut'n'paste errors'

bmp-0.9.7-xmms-skins.patch:

Index: bmp-0.9.7-xmms-skins.patch
===================================================================
RCS file: /cvs/extras/rpms/bmp/devel/bmp-0.9.7-xmms-skins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bmp-0.9.7-xmms-skins.patch	18 Mar 2005 14:17:22 -0000	1.1
+++ bmp-0.9.7-xmms-skins.patch	18 Mar 2005 18:03:03 -0000	1.2
@@ -5,14 +5,14 @@
  skinlist_update(void)
  {
      gchar *skinsdir;
-+    gchar xmmsskinsdir = "/usr/share/xmms/Skins";
++    gchar xmmsskinsdir[] = "/usr/share/xmms/Skins";
  
      skinlist_clear();
  
      scan_skindir(bmp_user_skin_dir);
      scan_skindir(DATA_DIR G_DIR_SEPARATOR_S BMP_SKIN_DIR_BASENAME);
 +    if (g_file_test(xmmsskinsdir, G_FILE_TEST_IS_DIR)) {
-+        scan_skindir( xmmsskinsdir);
++        scan_skindir( xmmsskinsdir );
 +    }
  
      skinsdir = getenv("SKINSDIR");



From bugs.michael at gmx.net  Fri Mar 18 18:26:05 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 18 Mar 2005 19:26:05 +0100
Subject: devel/cabextract cabextract-macro.patch, NONE, 1.1
 cabextract.spec, 1.6, 1.7
In-Reply-To: <200503180927.j2I9RumE021818@cvs-int.fedora.redhat.com>
References: <200503180927.j2I9RumE021818@cvs-int.fedora.redhat.com>
Message-ID: <20050318192605.32e17b4a.bugs.michael@gmx.net>

On Fri, 18 Mar 2005 04:27:56 -0500, Ville Skytta (scop) wrote:

> Author: scop
> 
> Update of /cvs/extras/devel/cabextract

> -Summary:        A Microsoft Cabinet file extractor
> +Release:        3
> +Summary:        Microsoft Cabinet file extractor

Potential problem, as Microsoft is a registered trademark.
My proposal:  File extractor for cabinet (.cab) files



From fedora-extras-commits at redhat.com  Fri Mar 18 18:45:28 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 18 Mar 2005 13:45:28 -0500
Subject: devel/edb edb.spec,1.3,1.4
Message-ID: <200503181845.j2IIjSnJ008228@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/edb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8219

Modified Files:
	edb.spec 
Log Message:
Fixed URL


Index: edb.spec
===================================================================
RCS file: /cvs/extras/devel/edb/edb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- edb.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ edb.spec	18 Mar 2005 18:45:26 -0000	1.4
@@ -1,10 +1,10 @@
 Name:           edb
 Version:        1.0.5
-Release:        3
+Release:        4
 Summary:        A database convenience library wrapped around BDB
 Group:          System Environment/Libraries
 License:        MIT
-URL:            http://enlightenment.org/pages/edb.html
+URL:            http://enlightenment.org/index.php?id=23
 Source0:        http://prdownloads.sourceforge.net/enlightenment/edb-1.0.5.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk+-devel, ncurses-devel zlib-devel 
@@ -85,6 +85,9 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-4
+- Fixed URL
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-3
 - Broke %descriptions at 80 columns
 



From fedora-extras-commits at redhat.com  Fri Mar 18 19:17:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 14:17:03 -0500
Subject: rpms/cabextract/devel cabextract.spec,1.7,1.8
Message-ID: <200503181917.j2IJH3k6009606@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cabextract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/devel

Modified Files:
	cabextract.spec 
Log Message:
Improve summary and description.


Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/rpms/cabextract/devel/cabextract.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cabextract.spec	18 Mar 2005 09:27:54 -0000	1.7
+++ cabextract.spec	18 Mar 2005 19:17:01 -0000	1.8
@@ -1,7 +1,7 @@
 Name:           cabextract
 Version:        1.1
 Release:        3
-Summary:        Microsoft Cabinet file extractor
+Summary:        Utility for extracting cabinet (.cab) archives
 
 Group:          Applications/Archiving
 License:        GPL
@@ -11,9 +11,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-cabextract is a program which can extract Microsoft Cabinet
-files. Cabinet files are archive files, usually with the extension
-.cab, used by Microsoft and others to distribute software.
+cabextract is a program which can extract files from cabinet (.cab)
+archives.
 
 
 %prep



From fedora-extras-commits at redhat.com  Fri Mar 18 19:17:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 14:17:03 -0500
Subject: rpms/cabextract/FC-1 cabextract.spec,1.3,1.4
Message-ID: <200503181917.j2IJH3nI009586@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cabextract/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/FC-1

Modified Files:
	cabextract.spec 
Log Message:
Improve summary and description.


Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/rpms/cabextract/FC-1/cabextract.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cabextract.spec	8 Nov 2004 04:07:25 -0000	1.3
+++ cabextract.spec	18 Mar 2005 19:17:01 -0000	1.4
@@ -2,7 +2,7 @@
 Version:        1.0
 Release:        0.fdr.1.1
 Epoch:          0
-Summary:        A program to extract Microsoft Cabinet files.
+Summary:        Utility for extracting cabinet (.cab) archives
 
 Group:          Applications/Archiving
 License:        GPL
@@ -11,9 +11,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Cabinet files (with the suffix .cab) are a form of archive files used
-by Microsoft to distribute their software. The cabextract program
-unpacks such files. 
+cabextract is a program which can extract files from cabinet (.cab)
+archives.
 
 
 %prep



From fedora-extras-commits at redhat.com  Fri Mar 18 19:17:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 14:17:03 -0500
Subject: rpms/cabextract/FC-3 cabextract.spec,1.6,1.7
Message-ID: <200503181917.j2IJH3MS009594@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cabextract/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/FC-3

Modified Files:
	cabextract.spec 
Log Message:
Improve summary and description.


Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/rpms/cabextract/FC-3/cabextract.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cabextract.spec	25 Nov 2004 21:16:20 -0000	1.6
+++ cabextract.spec	18 Mar 2005 19:17:01 -0000	1.7
@@ -1,7 +1,7 @@
 Name:           cabextract
 Version:        1.1
 Release:        2
-Summary:        A Microsoft Cabinet file extractor
+Summary:        Utility for extracting cabinet (.cab) archives
 
 Group:          Applications/Archiving
 License:        GPL
@@ -10,9 +10,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-cabextract is a program which can extract Microsoft Cabinet
-files. Cabinet files are archive files, usually with the extension
-.cab, used by Microsoft and others to distribute software.
+cabextract is a program which can extract files from cabinet (.cab)
+archives.
 
 
 %prep



From fedora-extras-commits at redhat.com  Fri Mar 18 19:17:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 14:17:03 -0500
Subject: rpms/cabextract/FC-2 cabextract.spec,1.4,1.5
Message-ID: <200503181917.j2IJH3WW009590@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cabextract/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/FC-2

Modified Files:
	cabextract.spec 
Log Message:
Improve summary and description.


Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/rpms/cabextract/FC-2/cabextract.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cabextract.spec	8 Nov 2004 04:07:31 -0000	1.4
+++ cabextract.spec	18 Mar 2005 19:17:01 -0000	1.5
@@ -2,7 +2,7 @@
 Version:        1.0
 Release:        0.fdr.1.2
 Epoch:          0
-Summary:        A program to extract Microsoft Cabinet files.
+Summary:        Utility for extracting cabinet (.cab) archives
 
 Group:          Applications/Archiving
 License:        GPL
@@ -11,9 +11,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Cabinet files (with the suffix .cab) are a form of archive files used
-by Microsoft to distribute their software. The cabextract program
-unpacks such files. 
+cabextract is a program which can extract files from cabinet (.cab)
+archives.
 
 
 %prep



From fedora-extras-commits at redhat.com  Fri Mar 18 19:17:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 14:17:03 -0500
Subject: rpms/cabextract/RHL-9 cabextract.spec,1.2,1.3
Message-ID: <200503181917.j2IJH35M009603@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cabextract/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/RHL-9

Modified Files:
	cabextract.spec 
Log Message:
Improve summary and description.


Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/rpms/cabextract/RHL-9/cabextract.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cabextract.spec	8 Nov 2004 04:07:19 -0000	1.2
+++ cabextract.spec	18 Mar 2005 19:17:01 -0000	1.3
@@ -2,7 +2,7 @@
 Version:        1.0
 Release:        0.fdr.1.rh90
 Epoch:          0
-Summary:        A program to extract Microsoft Cabinet files.
+Summary:        Utility for extracting cabinet (.cab) archives
 
 Group:          Applications/Archiving
 License:        GPL
@@ -11,9 +11,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Cabinet files (with the suffix .cab) are a form of archive files used
-by Microsoft to distribute their software. The cabextract program
-unpacks such files. 
+cabextract is a program which can extract files from cabinet (.cab)
+archives.
 
 
 %prep



From fedora-extras-commits at redhat.com  Fri Mar 18 19:17:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 14:17:03 -0500
Subject: rpms/cabextract/RHL-8 cabextract.spec,1.1,1.2
Message-ID: <200503181917.j2IJH3Rk009598@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cabextract/RHL-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/RHL-8

Modified Files:
	cabextract.spec 
Log Message:
Improve summary and description.


Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/rpms/cabextract/RHL-8/cabextract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cabextract.spec	8 Nov 2004 04:07:13 -0000	1.1
+++ cabextract.spec	18 Mar 2005 19:17:01 -0000	1.2
@@ -2,7 +2,7 @@
 Version:        1.0
 Release:        0.fdr.1.rh80
 Epoch:          0
-Summary:        A program to extract Microsoft Cabinet files.
+Summary:        Utility for extracting cabinet (.cab) archives
 
 Group:          Applications/Archiving
 License:        GPL
@@ -11,9 +11,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Cabinet files (with the suffix .cab) are a form of archive files used
-by Microsoft to distribute their software. The cabextract program
-unpacks such files. 
+cabextract is a program which can extract files from cabinet (.cab)
+archives.
 
 
 %prep



From fedora-extras-commits at redhat.com  Fri Mar 18 19:56:11 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 18 Mar 2005 14:56:11 -0500
Subject: rpms/perl-pmtools/FC-1 perl-pmtools.spec,1.1,1.2
Message-ID: <200503181956.j2IJuBQi010342@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10330/FC-1

Modified Files:
	perl-pmtools.spec 
Log Message:
Fedora.us sync


Index: perl-pmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/FC-1/perl-pmtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-pmtools.spec	17 Mar 2005 02:06:20 -0000	1.1
+++ perl-pmtools.spec	18 Mar 2005 19:56:09 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-pmtools
 Version:        1.00
-Release:        0.fdr.1
+Release:        0.fdr.1.1
 Epoch:          0
 Summary:        A suite of small programs to help manage Perl modules
 



From fedora-extras-commits at redhat.com  Fri Mar 18 19:56:11 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 18 Mar 2005 14:56:11 -0500
Subject: rpms/perl-pmtools/RHL-9 perl-pmtools.spec,1.1,1.2
Message-ID: <200503181956.j2IJuBJD010350@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10330/RHL-9

Modified Files:
	perl-pmtools.spec 
Log Message:
Fedora.us sync


Index: perl-pmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/RHL-9/perl-pmtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-pmtools.spec	17 Mar 2005 02:06:20 -0000	1.1
+++ perl-pmtools.spec	18 Mar 2005 19:56:09 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-pmtools
 Version:        1.00
-Release:        0.fdr.1
+Release:        0.fdr.1.rh90
 Epoch:          0
 Summary:        A suite of small programs to help manage Perl modules
 



From fedora-extras-commits at redhat.com  Fri Mar 18 19:56:11 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 18 Mar 2005 14:56:11 -0500
Subject: rpms/perl-pmtools/FC-2 perl-pmtools.spec,1.1,1.2
Message-ID: <200503181956.j2IJuBsK010346@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10330/FC-2

Modified Files:
	perl-pmtools.spec 
Log Message:
Fedora.us sync


Index: perl-pmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/FC-2/perl-pmtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-pmtools.spec	17 Mar 2005 02:06:20 -0000	1.1
+++ perl-pmtools.spec	18 Mar 2005 19:56:09 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-pmtools
 Version:        1.00
-Release:        0.fdr.1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        A suite of small programs to help manage Perl modules
 



From fedora-extras-commits at redhat.com  Fri Mar 18 21:05:32 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 18 Mar 2005 16:05:32 -0500
Subject: devel/ktrack ktrack.spec,1.3,1.4
Message-ID: <200503182105.j2IL5WHm012880@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12874

Modified Files:
	ktrack.spec 
Log Message:
Added --disable-rpath to %configure


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ktrack.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ ktrack.spec	18 Mar 2005 21:05:30 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 3.rc1
+Release: 4.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -20,7 +20,7 @@
 %patch -p 1 -b .headers
 
 %build
-%configure --with-qt-includes=/usr/lib/qt-3.3/include --with-qt-libraries=/usr/lib/qt-3.3/lib
+%configure --with-qt-includes=/usr/lib/qt-3.3/include --with-qt-libraries=/usr/lib/qt-3.3/lib --disable-rpath
 make
 
 %install
@@ -57,6 +57,9 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-4.rc1
+* Added --disable-rpath to %configure
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-3.rc1
 - Modified %setup to use -n
 - Broke %description at 80 columns



From fedora-extras-commits at redhat.com  Fri Mar 18 21:19:44 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 18 Mar 2005 16:19:44 -0500
Subject: devel/kphone kphone.spec,1.4,1.5
Message-ID: <200503182119.j2ILJibk013188@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13182

Modified Files:
	kphone.spec 
Log Message:
Added DESTDIR to %makeinstall


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kphone.spec	17 Mar 2005 17:40:27 -0000	1.4
+++ kphone.spec	18 Mar 2005 21:19:42 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        4
+Release:        5
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -30,7 +30,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%makeinstall DESTDIR=$RPM_BUILD_ROOT
 install -D -m 0644 icons/large-kphone.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kphone.png
 desktop-file-install --vendor=Fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -53,6 +53,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-5
+- Added DESTDIR to %makeinstall
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-4
 - Fixed %configure
 - Added po-hacks patch



From bugs.michael at gmx.net  Fri Mar 18 21:32:02 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 18 Mar 2005 22:32:02 +0100
Subject: devel/kphone kphone.spec,1.4,1.5
In-Reply-To: <200503182119.j2ILJibk013188@cvs-int.fedora.redhat.com>
References: <200503182119.j2ILJibk013188@cvs-int.fedora.redhat.com>
Message-ID: <20050318223202.24febdc0.bugs.michael@gmx.net>

On Fri, 18 Mar 2005 16:19:44 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Update of /cvs/extras/devel/kphone

> -%makeinstall
> +%makeinstall DESTDIR=$RPM_BUILD_ROOT

Sure about that?  The %makeinstall macro already prepends the buildroot
to all install locations like bindir, libdir, datadir and so on.


-- 
Fedora Core release Rawhide (Rawhide) - Linux 2.6.11-1.1185_FC4
loadavg: 0.26 0.31 0.33



From ivazquez at ivazquez.net  Fri Mar 18 21:41:40 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Fri, 18 Mar 2005 16:41:40 -0500
Subject: devel/kphone kphone.spec,1.4,1.5
In-Reply-To: <20050318223202.24febdc0.bugs.michael@gmx.net>
References: <200503182119.j2ILJibk013188@cvs-int.fedora.redhat.com>
	<20050318223202.24febdc0.bugs.michael@gmx.net>
Message-ID: <1111182100.14232.18.camel@ignacio.ignacio.lan>

On Fri, 2005-03-18 at 22:32 +0100, Michael Schwendt wrote:
> On Fri, 18 Mar 2005 16:19:44 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> > Update of /cvs/extras/devel/kphone
> 
> > -%makeinstall
> > +%makeinstall DESTDIR=$RPM_BUILD_ROOT
> 
> Sure about that?  The %makeinstall macro already prepends the buildroot
> to all install locations like bindir, libdir, datadir and so on.

Unfortunately po/Makefile.in eschews mechanisms that allow that method
to work. If anyone can come up with a patch then I'll be glad to
incorporate it. I'm still too new to autotools to handle it myself.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050318/0613e3bd/attachment.sig>

From fedora-extras-commits at redhat.com  Fri Mar 18 21:54:00 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Fri, 18 Mar 2005 16:54:00 -0500
Subject: rpms/gnome-common/devel gnome-common.spec,1.4,1.5
Message-ID: <200503182154.j2ILs0h3013673@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/gnome-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13665

Modified Files:
	gnome-common.spec 
Log Message:
Bump release and rebuild for FC4t1.



Index: gnome-common.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-common/devel/gnome-common.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-common.spec	3 Mar 2005 21:26:03 -0000	1.4
+++ gnome-common.spec	18 Mar 2005 21:53:58 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gnome-common
 Version:        2.8.0
-Release:        1
+Release:        2
 Summary:        Useful things common to building gnome packages from scratch
 
 Group:          Development/Tools
@@ -57,6 +57,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Fri Mar 18 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.8.0-2
+- Rebuild for FC4t1
+
 * Tue Sep 14 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.8.0-1
 - Update to 2.8.0
   + This release supports automake thru version 1.9 and has had a lot of



From rc040203 at freenet.de  Sat Mar 19 03:50:05 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Sat, 19 Mar 2005 04:50:05 +0100
Subject: devel/kphone kphone.spec,1.4,1.5
In-Reply-To: <1111182100.14232.18.camel@ignacio.ignacio.lan>
References: <200503182119.j2ILJibk013188@cvs-int.fedora.redhat.com>
	<20050318223202.24febdc0.bugs.michael@gmx.net>
	<1111182100.14232.18.camel@ignacio.ignacio.lan>
Message-ID: <1111204206.2475.148.camel@mccallum.corsepiu.local>

On Fri, 2005-03-18 at 16:41 -0500, Ignacio Vazquez-Abrams wrote:
> On Fri, 2005-03-18 at 22:32 +0100, Michael Schwendt wrote:
> > On Fri, 18 Mar 2005 16:19:44 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> > > Update of /cvs/extras/devel/kphone
> > 
> > > -%makeinstall
> > > +%makeinstall DESTDIR=$RPM_BUILD_ROOT
> > 
> > Sure about that?
Without any doubt this is wrong.

Either 
%makeinstall
or 
make DESTDIR=$RPM_BUILD_ROOT install
but not both.

In most cases you will want
make DESTDIR=$RPM_BUILD_ROOT install

>   The %makeinstall macro already prepends the buildroot
> > to all install locations like bindir, libdir, datadir and so on.
> 
> Unfortunately po/Makefile.in eschews mechanisms that allow that method
> to work. If anyone can come up with a patch then I'll be glad to
> incorporate it.

The kphone-4.1.0-po-hacks.diff I sent a couple of days ago, implements
this.

>  I'm still too new to autotools to handle it myself.
This package uses manually written Makefile.ins. The "make install"
related probs this package suffers from are Makefile bugs the authors of
this package are to blame for.


Try this patch:
--- kphone.spec 18 Mar 2005 21:19:42 -0000      1.5
+++ kphone.spec 19 Mar 2005 03:42:22 -0000
@@ -30,7 +30,8 @@

 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
+
 install -D -m 0644 icons/large-kphone.png $RPM_BUILD_ROOT%
{_datadir}/pixmaps/kphone.png
 desktop-file-install --vendor=Fedora \

Ralf




From fedora-extras-commits at redhat.com  Sat Mar 19 06:44:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 01:44:05 -0500
Subject: rpms/dbh - New directory
Message-ID: <200503190644.j2J6i5to001541@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1532/dbh

Log Message:
Directory /cvs/extras/rpms/dbh added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 06:44:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 01:44:05 -0500
Subject: rpms/dbh/devel - New directory
Message-ID: <200503190644.j2J6i5xT001544@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1532/dbh/devel

Log Message:
Directory /cvs/extras/rpms/dbh/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 06:44:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 01:44:18 -0500
Subject: rpms/dbh Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503190644.j2J6iIBI001605@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1596

Added Files:
	Makefile import.log 
Log Message:
Setup of module dbh


--- NEW FILE Makefile ---
# Top level Makefile for module dbh
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 06:44:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 01:44:18 -0500
Subject: rpms/dbh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503190644.j2J6iIFM001608@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1596/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dbh


--- 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 Mar 19 07:05:37 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sat, 19 Mar 2005 02:05:37 -0500
Subject: rpms/iiimf-le-simplehangul/devel iiimf-le-simplehangul.spec, 1.1,
	1.2
Message-ID: <200503190705.j2J75b8d002812@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2797

Modified Files:
	iiimf-le-simplehangul.spec 
Log Message:
Ugly lib64 hack from FC im-sdk



Index: iiimf-le-simplehangul.spec
===================================================================
RCS file: /cvs/extras/rpms/iiimf-le-simplehangul/devel/iiimf-le-simplehangul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iiimf-le-simplehangul.spec	18 Mar 2005 07:53:49 -0000	1.1
+++ iiimf-le-simplehangul.spec	19 Mar 2005 07:05:35 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Romanized Korean Hangul language engine for IIIMF
 Name: iiimf-le-simplehangul
 Version: 0.1.1
-Release: 2
+Release: 3.FC4
 License: GPL
 Source: %{name}-%{version}.tar.bz2
 URL: http://www3.sympatico.ca/d.moser/hangul.html
@@ -25,6 +25,12 @@
 %setup -q -n %{name}-%{version}
 
 %build
+# /usr/lib or /usr/lib64 substitution
+# TODO: This could be done in a cleaner way...
+if [ %{im_dir} != "/usr/lib/im" ]; then
+  find . -type f | xargs grep -l "/usr/lib/im" | \
+        xargs perl -pi -e "s|/usr/lib/im|%{im_dir}|g;"
+fi
 ./configure --prefix=%{im_dir}
 make  
 
@@ -54,6 +60,9 @@
 %{im_dir}/*
 
 %changelog
+* Fri Mar 18 2005 Warren Togami <wtogami at redhat.com> 0.1.1-3
+- Ugly lib64 hack from FC im-sdk
+
 * Thu Mar 17 2005 Warren Togami <wtogami at redhat.com> 0.1.1-2
 - minor spec changes
 - copy preun and postun scripts from iiimf-le-chinput



From fedora-extras-commits at redhat.com  Sat Mar 19 07:06:34 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sat, 19 Mar 2005 02:06:34 -0500
Subject: rpms/iiimf-le-simplehangul/FC-3 iiimf-le-simplehangul.spec,1.2,1.3
Message-ID: <200503190706.j2J76Ymp002883@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2868

Modified Files:
	iiimf-le-simplehangul.spec 
Log Message:
Ugly lib64 hack from FC im-sdk



Index: iiimf-le-simplehangul.spec
===================================================================
RCS file: /cvs/extras/rpms/iiimf-le-simplehangul/FC-3/iiimf-le-simplehangul.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iiimf-le-simplehangul.spec	18 Mar 2005 08:12:42 -0000	1.2
+++ iiimf-le-simplehangul.spec	19 Mar 2005 07:06:32 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Romanized Korean Hangul language engine for IIIMF
 Name: iiimf-le-simplehangul
 Version: 0.1.1
-Release: 1.FC3
+Release: 3.FC3
 License: GPL
 Source: %{name}-%{version}.tar.bz2
 URL: http://www3.sympatico.ca/d.moser/hangul.html
@@ -25,6 +25,12 @@
 %setup -q -n %{name}-%{version}
 
 %build
+# /usr/lib or /usr/lib64 substitution
+# TODO: This could be done in a cleaner way...
+if [ %{im_dir} != "/usr/lib/im" ]; then
+  find . -type f | xargs grep -l "/usr/lib/im" | \
+        xargs perl -pi -e "s|/usr/lib/im|%{im_dir}|g;"
+fi
 ./configure --prefix=%{im_dir}
 make  
 
@@ -54,7 +60,10 @@
 %{im_dir}/*
 
 %changelog
-* Thu Mar 17 2005 Warren Togami <wtogami at redhat.com> 0.1.1-1.FC3
+* Fri Mar 18 2005 Warren Togami <wtogami at redhat.com> 0.1.1-3
+- Ugly lib64 hack from FC im-sdk
+
+* Thu Mar 17 2005 Warren Togami <wtogami at redhat.com> 0.1.1-2
 - minor spec changes
 - copy preun and postun scripts from iiimf-le-chinput
 



From fedora-extras-commits at redhat.com  Sat Mar 19 07:13:49 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sat, 19 Mar 2005 02:13:49 -0500
Subject: rpms/nabi/devel nabi.spec,1.3,1.4
Message-ID: <200503190713.j2J7Dn8j003042@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3024

Modified Files:
	nabi.spec 
Log Message:
oops



Index: nabi.spec
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/nabi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nabi.spec	17 Mar 2005 08:50:09 -0000	1.3
+++ nabi.spec	19 Mar 2005 07:13:47 -0000	1.4
@@ -23,7 +23,7 @@
 %setup -q -n %{name}-%{version}
 
 %build
-./configure --prefix={%_prefix}
+./configure --prefix=%{_prefix}
 make
 
 %install



From fedora-extras-commits at redhat.com  Sat Mar 19 08:05:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 03:05:30 -0500
Subject: devel/kphone kphone.spec,1.5,1.6
Message-ID: <200503190805.j2J85U0E004596@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4590

Modified Files:
	kphone.spec 
Log Message:
Split %makeinstall ... to make ... install


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kphone.spec	18 Mar 2005 21:19:42 -0000	1.5
+++ kphone.spec	19 Mar 2005 08:05:28 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        5
+Release:        6
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -30,7 +30,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
 install -D -m 0644 icons/large-kphone.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kphone.png
 desktop-file-install --vendor=Fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -53,6 +53,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-6
+- Split %makeinstall ... to make ... install
+
 * Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-5
 - Added DESTDIR to %makeinstall
 



From ivazquez at ivazquez.net  Sat Mar 19 08:10:08 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Sat, 19 Mar 2005 03:10:08 -0500
Subject: devel/kphone kphone.spec,1.4,1.5
In-Reply-To: <1111204206.2475.148.camel@mccallum.corsepiu.local>
References: <200503182119.j2ILJibk013188@cvs-int.fedora.redhat.com>
	<20050318223202.24febdc0.bugs.michael@gmx.net>
	<1111182100.14232.18.camel@ignacio.ignacio.lan>
	<1111204206.2475.148.camel@mccallum.corsepiu.local>
Message-ID: <1111219808.26827.4.camel@ignacio.ignacio.lan>

On Sat, 2005-03-19 at 04:50 +0100, Ralf Corsepius wrote:
> many very correct things

*sigh*
I'm tired of fighting with this one. It builds when changed as you
recommended, so right now that's good enough for me.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050319/a973541c/attachment.sig>

From fedora-extras-commits at redhat.com  Sat Mar 19 09:23:47 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Sat, 19 Mar 2005 04:23:47 -0500
Subject: rpms/sabayon/devel sabayon.spec,1.2,1.3
Message-ID: <200503190923.j2J9Nlnd007203@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7195

Modified Files:
	sabayon.spec 
Log Message:
* Sat Mar 19 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-3
- Remove period at the end of the summary
- Specify full URL for source
- BuildRequires: python
- Use %{_sysconfdir} everywhere
- Set the directory mode



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sabayon.spec	18 Mar 2005 17:31:34 -0000	1.2
+++ sabayon.spec	19 Mar 2005 09:23:45 -0000	1.3
@@ -6,13 +6,13 @@
 
 Name:    sabayon
 Version: 0.16
-Release: 2
-Summary: Tool to maintain user profiles in a GNOME desktop.
+Release: 3
+Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
 License: GPL
 URL:     http://www.gnome.org/projects/sabayon
-Source:  sabayon-%{version}.tar.gz
+Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/%{version}/sabayon-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,6 +23,7 @@
 Requires: xorg-x11-Xnest
 Requires: shadow-utils
 
+BuildRequires: python
 BuildRequires: gettext-devel
 BuildRequires: desktop-file-utils
 
@@ -46,7 +47,7 @@
 
 %makeinstall PAM_PREFIX=$RPM_BUILD_ROOT%{_sysconfdir}
 
-mkdir -p $RPM_BUILD_ROOT/etc/gconf/2
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2
 echo 'include "$(HOME)/.gconf.path.defaults"'  > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2/local-defaults.path
 echo 'include "$(HOME)/.gconf.path.mandatory"' > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2/local-mandatory.path
 
@@ -72,17 +73,17 @@
 fi
 
 %files -f sabayon.lang
-%defattr(-, root, root)
+%defattr(-, root, root, 755)
 
 %doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES
 %doc doc/index.html doc/testing.html doc/helping.html doc/developing.html
 %doc doc/sabayon.css doc/*.jpg doc/*.gif
 
-%config(noreplace) /etc/gconf/2/local-defaults.path
-%config(noreplace) /etc/gconf/2/local-mandatory.path
-%config(noreplace) /etc/pam.d/%{name}
-%config(noreplace) /etc/security/console.apps/%{name}
-%config(noreplace) /etc/X11/xinit/xinitrc.d/%{name}*
+%config(noreplace) %{_sysconfdir}/gconf/2/local-defaults.path
+%config(noreplace) %{_sysconfdir}/gconf/2/local-mandatory.path
+%config(noreplace) %{_sysconfdir}/pam.d/%{name}
+%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
+%config(noreplace) %{_sysconfdir}/X11/xinit/xinitrc.d/%{name}*
 
 %{_sysconfdir}/desktop-profiles
 
@@ -102,6 +103,13 @@
 %ghost %{python_sitelib}/%{name}/sources/*.pyo
 
 %changelog
+* Sat Mar 19 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-3
+- Remove period at the end of the summary
+- Specify full URL for source
+- BuildRequires: python 
+- Use %{_sysconfdir} everywhere
+- Set the directory mode
+
 * Fri Mar 18 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-2
 - BuildRequires: gettext-devel
 - Add X-Fedora-Extra to .desktop file



From fedora-extras-commits at redhat.com  Sat Mar 19 09:29:07 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Sat, 19 Mar 2005 04:29:07 -0500
Subject: rpms/sabayon/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200503190929.j2J9T7dc007359@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7349

Modified Files:
	.cvsignore sources 
Log Message:
upload .tar.bz2 instead of .tar.gz



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Mar 2005 17:25:13 -0000	1.2
+++ .cvsignore	19 Mar 2005 09:29:05 -0000	1.3
@@ -1 +1 @@
-sabayon-0.16.tar.gz
+sabayon-0.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Mar 2005 17:25:13 -0000	1.2
+++ sources	19 Mar 2005 09:29:05 -0000	1.3
@@ -1 +1 @@
-e7798dacf96d8b6db2f8b94f5ccd5032  sabayon-0.16.tar.gz
+3a2a9a18f44fa5e32dded73a4e111746  sabayon-0.16.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 10:24:09 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 19 Mar 2005 05:24:09 -0500
Subject: devel/uqm uqm-lvalues.patch,1.1,1.2
Message-ID: <200503191024.j2JAO9Kv009007@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/uqm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9001

Modified Files:
	uqm-lvalues.patch 
Log Message:
Adjust according to upstream comments.

uqm-lvalues.patch:

Index: uqm-lvalues.patch
===================================================================
RCS file: /cvs/extras/devel/uqm/uqm-lvalues.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uqm-lvalues.patch	18 Mar 2005 13:20:40 -0000	1.1
+++ uqm-lvalues.patch	19 Mar 2005 10:24:07 -0000	1.2
@@ -21,7 +21,7 @@
  						break;
  				}
 -				((BYTE *) RDPtr) += num_read;
-+				RDPtr = ((BYTE *) RDPtr) + num_read;
++				RDPtr = (RESOURCE_DATAPTR) ((BYTE *) RDPtr + num_read);
  			} while (length -= num_read);
  
  			UnlockResourceData (RData);
@@ -34,7 +34,7 @@
  		{
 -			StringAddr = (STRINGPTR)StringTablePtr;
 -			((BYTE *) StringAddr) += StringTablePtr->StringOffsets[StringIndex];
-+			StringAddr = (STRINGPTR)StringTablePtr + StringTablePtr->StringOffsets[StringIndex];
++			StringAddr = (STRINGPTR) ((BYTE *) StringTablePtr + StringTablePtr->StringOffsets[StringIndex]);
  		}
  		UnlockStringTable (StringTable);
  	}
@@ -44,7 +44,7 @@
  		{
 -			StringAddr = (STRINGPTR)StringTablePtr;
 -			((BYTE *) StringAddr) += StringTablePtr->StringOffsets[StringIndex];
-+			StringAddr = (STRINGPTR)StringTablePtr + StringTablePtr->StringOffsets[StringIndex];
++			StringAddr = (STRINGPTR) ((BYTE *) StringTablePtr + StringTablePtr->StringOffsets[StringIndex]);
  		}
  		UnlockStringTable (StringTable);
  	}
@@ -54,7 +54,7 @@
  		LockStringTable (StringTable, &StringTablePtr);
 -		StringAddr = (STRINGPTR)StringTablePtr;
 -		((BYTE *) StringAddr) += StringTablePtr->StringOffsets[StringIndex];
-+		StringAddr = (STRINGPTR)StringTablePtr + StringTablePtr->StringOffsets[StringIndex];
++		StringAddr = (STRINGPTR) ((BYTE *) StringTablePtr + StringTablePtr->StringOffsets[StringIndex]);
  		UnlockStringTable (StringTable);
  	}
  



From fedora-extras-commits at redhat.com  Sat Mar 19 11:18:28 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 19 Mar 2005 06:18:28 -0500
Subject: devel/apt apt.spec,1.11,1.12
Message-ID: <200503191118.j2JBIShn010694@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/apt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10688

Modified Files:
	apt.spec 
Log Message:
Apply hack against missing libselinux-devel dep in rpm-devel for rpm 4.4 too.


Index: apt.spec
===================================================================
RCS file: /cvs/extras/devel/apt/apt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- apt.spec	5 Mar 2005 21:10:20 -0000	1.11
+++ apt.spec	19 Mar 2005 11:18:26 -0000	1.12
@@ -97,7 +97,7 @@
 BuildRequires: %{_bindir}/xsltproc, %{comps}
 %endif
 
-%if "%{rpmver}" == "4.3"
+%if "%{rpmver}" >= "4.3"
 BuildRequires: libselinux-devel
 %endif
 
@@ -359,6 +359,9 @@
 
 
 %changelog
+* Sat Mar 19 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Apply hack against missing libselinux-devel dep in rpm-devel for rpm 4.4 too.
+
 * Wed Feb 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.15cnc6-16.r362
 - Make mirror-select.lua write commented out rpm-src entries for Extras (Panu).
 - Add Extras GPG key (Panu), and add it to fedora-vendors.list.



From bugs.michael at gmx.net  Sat Mar 19 11:27:56 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Sat, 19 Mar 2005 12:27:56 +0100
Subject: devel/apt apt.spec,1.11,1.12
In-Reply-To: <200503191118.j2JBIShn010694@cvs-int.fedora.redhat.com>
References: <200503191118.j2JBIShn010694@cvs-int.fedora.redhat.com>
Message-ID: <20050319122756.174d27a6.bugs.michael@gmx.net>

On Sat, 19 Mar 2005 06:18:28 -0500, Ville Skytta (scop) wrote:

> Author: scop
> 
> Update of /cvs/extras/devel/apt
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10688
> 
> Modified Files:
> 	apt.spec 
> Log Message:
> Apply hack against missing libselinux-devel dep in rpm-devel for rpm 4.4 too.
> 
> 
> Index: apt.spec
> ===================================================================
> RCS file: /cvs/extras/devel/apt/apt.spec,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -u -r1.11 -r1.12
> --- apt.spec	5 Mar 2005 21:10:20 -0000	1.11
> +++ apt.spec	19 Mar 2005 11:18:26 -0000	1.12
> @@ -97,7 +97,7 @@
>  BuildRequires: %{_bindir}/xsltproc, %{comps}
>  %endif
>  
> -%if "%{rpmver}" == "4.3"
> +%if "%{rpmver}" >= "4.3"

Interesting, since this was fixed in 0.5.15cnc6-11 already.



From ville.skytta at iki.fi  Sat Mar 19 11:39:31 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Sat, 19 Mar 2005 13:39:31 +0200
Subject: devel/apt apt.spec,1.11,1.12
In-Reply-To: <20050319122756.174d27a6.bugs.michael@gmx.net>
References: <200503191118.j2JBIShn010694@cvs-int.fedora.redhat.com>
	<20050319122756.174d27a6.bugs.michael@gmx.net>
Message-ID: <1111232371.8997.14.camel@bobcat.mine.nu>

On Sat, 2005-03-19 at 12:27 +0100, Michael Schwendt wrote:
> On Sat, 19 Mar 2005 06:18:28 -0500, Ville Skytta (scop) wrote:
>
> > -%if "%{rpmver}" == "4.3"
> > +%if "%{rpmver}" >= "4.3"
> 
> Interesting, since this was fixed in 0.5.15cnc6-11 already.

Well, in any case, it needed treatment again.  According to the
changelog, the original -11 fix had been reverted in -12.r362.  Possibly
an oversight, or hoping that at rpm 4.4 time, the missing deps in rpm-
devel would already be fixed... :I



From fedora-extras-commits at redhat.com  Sat Mar 19 15:33:15 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 10:33:15 -0500
Subject: devel/leafpad leafpad.spec,1.3,1.4
Message-ID: <200503191533.j2JFXF0d016818@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16810

Modified Files:
	leafpad.spec 
Log Message:
Added desktop-file-utils to BuildRequires


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/devel/leafpad/leafpad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- leafpad.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ leafpad.spec	19 Mar 2005 15:33:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           leafpad
 Version:        0.7.9
-Release:        3
+Release:        4
 Summary:        GTK+ based simple text editor
 
 Group:          Applications/Editors
@@ -10,7 +10,7 @@
 Patch0:         leafpad-0.7.9-file_chooser.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 2.4
+BuildRequires:  gtk2-devel >= 2.4 desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -61,6 +61,9 @@
 %{_datadir}/pixmaps/leafpad.png
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-4
+- Added desktop-file-utils to BuildRequires
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-3
 - Broke %description at 80 columns
 



From fedora-extras-commits at redhat.com  Sat Mar 19 15:37:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 10:37:47 -0500
Subject: devel/ktrack ktrack.spec,1.4,1.5
Message-ID: <200503191537.j2JFblFN016949@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16940

Modified Files:
	ktrack.spec 
Log Message:
Removed explicit hamlib-devel version


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ktrack.spec	18 Mar 2005 21:05:30 -0000	1.4
+++ ktrack.spec	19 Mar 2005 15:37:45 -0000	1.5
@@ -1,12 +1,12 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 4.rc1
+Release: 5.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
 Patch: ktrack-headers.patch
-BuildRequires: desktop-file-utils kdelibs-devel >= 3.3 hamlib-devel = 1.2.3
+BuildRequires: desktop-file-utils kdelibs-devel >= 3.3 hamlib-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -57,8 +57,11 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-5.rc1
+- Removed explicit hamlib-devel version
+ 
 * Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-4.rc1
-* Added --disable-rpath to %configure
+- Added --disable-rpath to %configure
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-3.rc1
 - Modified %setup to use -n



From fedora-extras-commits at redhat.com  Sat Mar 19 15:57:43 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 10:57:43 -0500
Subject: devel/linphone linphone.spec,1.3,1.4
Message-ID: <200503191557.j2JFvhUq017256@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17248

Modified Files:
	linphone.spec 
Log Message:
Various .spec cleanups


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linphone.spec	17 Mar 2005 22:53:01 -0000	1.3
+++ linphone.spec	19 Mar 2005 15:57:41 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        3
+Release:        4
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -13,8 +13,6 @@
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
 BuildRequires:  libosip-devel speex-devel gettext
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 
 %description
 Linphone is mostly sip compliant. It works successfully with these
@@ -54,40 +52,44 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %{_bindir}/*
-%{_libdir}/bonobo
+%{_libdir}/bonobo/servers/*.server
 %{_libdir}/*.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
-%{_datadir}/gnome
-%{_datadir}/gnome-2.0
-%{_datadir}/gtk-doc
-%{_datadir}/linphonec/linphonec
-%{_datadir}/locale/*/*
-%{_datadir}/pixmaps
-%{_datadir}/sounds
+%{_datadir}/gnome/apps/Internet/*.desktop
+%{_datadir}/gnome/help/linphone
+%{_datadir}/gnome-2.0/ui/*.xml
+%{_datadir}/gtk-doc/html/mediastreamer
+%{_datadir}/linphonec
+%{_datadir}/pixmaps/linphone
+%{_datadir}/sounds/linphone
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/*/*.h
+%{_includedir}/*
 %{_libdir}/*.a
 %{_libdir}/*.la
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-4
+- Used %find_lang
+- Tightened up %files
+- Streamlined spec file
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-3
 - Broke %description at 80 columns
 



From bugs.michael at gmx.net  Sat Mar 19 16:02:32 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Sat, 19 Mar 2005 17:02:32 +0100
Subject: devel/ktrack ktrack.spec,1.4,1.5
In-Reply-To: <200503191537.j2JFblFN016949@cvs-int.fedora.redhat.com>
References: <200503191537.j2JFblFN016949@cvs-int.fedora.redhat.com>
Message-ID: <20050319170232.4e47380e.bugs.michael@gmx.net>

On Sat, 19 Mar 2005 10:37:47 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/devel/ktrack

>  * Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-4.rc1
> -* Added --disable-rpath to %configure
> +- Added --disable-rpath to %configure

Danger! Avoid mentioning macros in spec changelog. Escape them with a
double % like %%configure, %%install, %%_libdir, and so on, so they
are not expanded.



From ivazquez at ivazquez.net  Sat Mar 19 16:14:08 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Sat, 19 Mar 2005 11:14:08 -0500
Subject: devel/ktrack ktrack.spec,1.4,1.5
In-Reply-To: <20050319170232.4e47380e.bugs.michael@gmx.net>
References: <200503191537.j2JFblFN016949@cvs-int.fedora.redhat.com>
	<20050319170232.4e47380e.bugs.michael@gmx.net>
Message-ID: <1111248848.26827.10.camel@ignacio.ignacio.lan>

On Sat, 2005-03-19 at 17:02 +0100, Michael Schwendt wrote:
> On Sat, 19 Mar 2005 10:37:47 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> 
> > Author: ivazquez
> > 
> > Update of /cvs/extras/devel/ktrack
> 
> >  * Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-4.rc1
> > -* Added --disable-rpath to %configure
> > +- Added --disable-rpath to %configure
> 
> Danger! Avoid mentioning macros in spec changelog. Escape them with a
> double % like %%configure, %%install, %%_libdir, and so on, so they
> are not expanded.

Whoops. I'll go fix.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050319/8c363f45/attachment.sig>

From fedora-extras-commits at redhat.com  Sat Mar 19 16:27:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 11:27:33 -0500
Subject: devel/libosip libosip.spec,1.3,1.4
Message-ID: <200503191627.j2JGRXVJ018581@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/libosip

Modified Files:
	libosip.spec 
Log Message:
Macros in %changelog are dangerous


Index: libosip.spec
===================================================================
RCS file: /cvs/extras/devel/libosip/libosip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libosip.spec	17 Mar 2005 22:39:00 -0000	1.3
+++ libosip.spec	19 Mar 2005 16:27:31 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libosip
 Version:        0.9.7
-Release:        3
+Release:        4
 Summary:        oSIP is an implementation of SIP
 
 Group:          System Environment/Libraries
@@ -73,11 +73,14 @@
 %{_libdir}/*.so
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-4
+- Macros in %changelog are dangerous
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-3
 - Spec file cleanup
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-2
-- Fix %files devel to include %{_includedir}/osip
+- Fix %files devel to include %%{_includedir}/osip
 - Broke %description at 80 columns
 
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-1



From fedora-extras-commits at redhat.com  Sat Mar 19 16:27:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 11:27:33 -0500
Subject: devel/python-amara python-amara.spec,1.4,1.5
Message-ID: <200503191627.j2JGRXat018593@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/python-amara

Modified Files:
	python-amara.spec 
Log Message:
Macros in %changelog are dangerous


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/devel/python-amara/python-amara.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-amara.spec	17 Mar 2005 18:55:40 -0000	1.4
+++ python-amara.spec	19 Mar 2005 16:27:31 -0000	1.5
@@ -55,13 +55,16 @@
 %doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-5
+- Macros in %changelog are dangerous
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-4
 - Streamlined/fixed Python version handling
-- Implemented %python_sitelib
+- Implemented %%python_sitelib
 - Decreased verbosity in %description
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-3
-- Better %pyver and BR/Requires handling
+- Better %%pyver and BR/Requires handling
 - Broke %description at 80 columns
 - Fixed file ownership
 



From fedora-extras-commits at redhat.com  Sat Mar 19 16:27:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 11:27:33 -0500
Subject: devel/ktrack ktrack.spec,1.5,1.6
Message-ID: <200503191627.j2JGRXiA018577@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/ktrack

Modified Files:
	ktrack.spec 
Log Message:
Macros in %changelog are dangerous


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ktrack.spec	19 Mar 2005 15:37:45 -0000	1.5
+++ ktrack.spec	19 Mar 2005 16:27:31 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 5.rc1
+Release: 6.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -57,6 +57,9 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-6.rc1
+- Macros in %changelog are dangerous
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-5.rc1
 - Removed explicit hamlib-devel version
  
@@ -64,7 +67,7 @@
 - Added --disable-rpath to %configure
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-3.rc1
-- Modified %setup to use -n
+- Modified %%setup to use -n
 - Broke %description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-2.rc1



From fedora-extras-commits at redhat.com  Sat Mar 19 16:27:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 11:27:33 -0500
Subject: devel/lock-keys-applet lock-keys-applet.spec,1.3,1.4
Message-ID: <200503191627.j2JGRXOD018585@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/lock-keys-applet

Modified Files:
	lock-keys-applet.spec 
Log Message:
Macros in %changelog are dangerous


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/extras/devel/lock-keys-applet/lock-keys-applet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lock-keys-applet.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ lock-keys-applet.spec	19 Mar 2005 16:27:31 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        3
+Release:        4
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
 License:        GPL
@@ -49,8 +49,11 @@
 %{_libexecdir}/%{name}
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-4
+- Macros in %changelog are dangerous
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-3
-- Used %find_lang instead of putting the .mo files in %files.
+- Used %%find_lang instead of putting the .mo files in %files.
 - Broke %description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-2



From fedora-extras-commits at redhat.com  Sat Mar 19 16:27:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 11:27:33 -0500
Subject: devel/python-HTMLgen python-HTMLgen.spec,1.5,1.6
Message-ID: <200503191627.j2JGRXWd018590@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/python-HTMLgen

Modified Files:
	python-HTMLgen.spec 
Log Message:
Macros in %changelog are dangerous


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/devel/python-HTMLgen/python-HTMLgen.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-HTMLgen.spec	17 Mar 2005 22:12:32 -0000	1.5
+++ python-HTMLgen.spec	19 Mar 2005 16:27:31 -0000	1.6
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        2.2.2
-Release:        4
+Release:        5
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -52,15 +52,18 @@
 %{python_sitelib}/*.py[co]
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-5
+- Macros in %changelog are dangerous
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-4
 - Fixed small Provides bug
 
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-3
 - Streamlined version handling
-- Implemented %python_sitelib
+- Implemented %%python_sitelib
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-2
-- Modified %setup to use -n
+- Modified %%setup to use -n
 - Broke %description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-1



From fedora-extras-commits at redhat.com  Sat Mar 19 16:27:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 11:27:33 -0500
Subject: devel/kphone kphone.spec,1.6,1.7
Message-ID: <200503191627.j2JGRXIk018573@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/kphone

Modified Files:
	kphone.spec 
Log Message:
Macros in %changelog are dangerous


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kphone.spec	19 Mar 2005 08:05:28 -0000	1.6
+++ kphone.spec	19 Mar 2005 16:27:31 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        6
+Release:        7
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -53,18 +53,21 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-7
+- Macros in %changelog are dangerous
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-6
-- Split %makeinstall ... to make ... install
+- Split %%makeinstall ... to make ... install
 
 * Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-5
-- Added DESTDIR to %makeinstall
+- Added DESTDIR to %%makeinstall
 
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-4
-- Fixed %configure
+- Fixed %%configure
 - Added po-hacks patch
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-3
-- Modified %setup to use -n
+- Modified %%setup to use -n
 - Broke %description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-2



From fedora-extras-commits at redhat.com  Sat Mar 19 17:31:40 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:31:40 -0500
Subject: rpms/libxfce4mcs - New directory
Message-ID: <200503191731.j2JHVexR020617@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20610/libxfce4mcs

Log Message:
Directory /cvs/extras/rpms/libxfce4mcs added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:31:40 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:31:40 -0500
Subject: rpms/libxfce4mcs/devel - New directory
Message-ID: <200503191731.j2JHVeG7020620@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20610/libxfce4mcs/devel

Log Message:
Directory /cvs/extras/rpms/libxfce4mcs/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:31:55 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:31:55 -0500
Subject: rpms/libxfce4mcs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191731.j2JHVt8i020681@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20672

Added Files:
	Makefile import.log 
Log Message:
Setup of module libxfce4mcs


--- NEW FILE Makefile ---
# Top level Makefile for module libxfce4mcs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 17:31:55 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:31:55 -0500
Subject: rpms/libxfce4mcs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191731.j2JHVtfw020684@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20672/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libxfce4mcs


--- 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 Mar 19 17:32:26 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:32:26 -0500
Subject: rpms/libxfce4mcs import.log,1.1,1.2
Message-ID: <200503191732.j2JHWQIv020783@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20774

Modified Files:
	import.log 
Log Message:
auto-import libxfce4mcs-4.2.1-1 on branch devel from libxfce4mcs-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 17:31:53 -0000	1.1
+++ import.log	19 Mar 2005 17:32:24 -0000	1.2
@@ -0,0 +1 @@
+libxfce4mcs-4_2_1-1:HEAD:libxfce4mcs-4.2.1-1.src.rpm:1111253532



From fedora-extras-commits at redhat.com  Sat Mar 19 17:32:26 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:32:26 -0500
Subject: rpms/libxfce4mcs/devel libxfce4mcs.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191732.j2JHWQIA020787@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20774/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libxfce4mcs.spec 
Log Message:
auto-import libxfce4mcs-4.2.1-1 on branch devel from libxfce4mcs-4.2.1-1.src.rpm


--- NEW FILE libxfce4mcs.spec ---
Summary: Multi-channel settings management support for Xfce
Name: libxfce4mcs
Version: 4.2.1
Release: 1
License: LGPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4mcs-4.2.1.tar.bz2
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Prereq: /sbin/ldconfig

Requires: libxfce4util >= %{version}
Requires: libxfcegui4 >= %{version}

BuildRequires: libxfce4util-devel >= %{version}
BuildRequires: libxfcegui4-devel >= %{version}

%description
This package includes multi-channel settings management support for Xfce.

%package devel
Summary: Developpment tools for libxfce4mcs library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: xorg-x11-devel
Requires: glib2-devel

%description devel
This package includes the static libraries and header files you will need
to compile applications for Xfce.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%{_libdir}/lib*.so.*

%files devel
%defattr(-, root, root)
%{_libdir}/lib*.so
%{_libdir}/*a
%{_libdir}/pkgconfig/*.pc
%{_includedir}/xfce4/libxfce4mcs
%{_datadir}/gtk-doc/html/libxfce4mcs

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Fixed Xfce case

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Inital Fedora Extras version
- Updated the Source line
- Capitalized first letter of Summary in devel section to quiet rpmlint
- Increased the Relase version by one

* Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
- update to 4.2.0

* Wed Dec 08 2004 Than Ngo <than at redhat.com> 4.1.99.1-1
- update to 4.2 rc1

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6
- add requires on xorg-x11-devel, glib2-devel, bug #124199

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Apr 20 2004 Than Ngo <than at redhat.com> 4.0.5-2
- Remove spurious warning at startup, thanks to Olivier Fourdan <fourdan at xfce.org>

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Fri Jan 09 2004 Than Ngo <than at redhat.com> 4.0.3-1
- 4.0.3 release

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 17:31:53 -0000	1.1
+++ .cvsignore	19 Mar 2005 17:32:24 -0000	1.2
@@ -0,0 +1 @@
+libxfce4mcs-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 17:31:53 -0000	1.1
+++ sources	19 Mar 2005 17:32:24 -0000	1.2
@@ -0,0 +1 @@
+2e29527dcabfb0a2f398d253465c0a12  libxfce4mcs-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 17:36:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:36:05 -0500
Subject: rpms/dbh import.log,1.1,1.2
Message-ID: <200503191736.j2JHa5kc020969@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20957

Modified Files:
	import.log 
Log Message:
auto-import dbh-1.0.22-1 on branch devel from dbh-1.0.22-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dbh/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 06:44:16 -0000	1.1
+++ import.log	19 Mar 2005 17:36:03 -0000	1.2
@@ -0,0 +1 @@
+dbh-1_0_22-1:HEAD:dbh-1.0.22-1.src.rpm:1111253751



From fedora-extras-commits at redhat.com  Sat Mar 19 17:36:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:36:05 -0500
Subject: rpms/dbh/devel dbh-1.0.22-rpath.patch, NONE, 1.1 dbh.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191736.j2JHa5og020973@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20957/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dbh-1.0.22-rpath.patch dbh.spec 
Log Message:
auto-import dbh-1.0.22-1 on branch devel from dbh-1.0.22-1.src.rpm

dbh-1.0.22-rpath.patch:

--- NEW FILE dbh-1.0.22-rpath.patch ---
diff -Nur dbh-1.0.22.orig/src/dbh-1.0.pc.in dbh-1.0.22/src/dbh-1.0.pc.in
--- dbh-1.0.22.orig/src/dbh-1.0.pc.in	2005-01-28 13:26:35.000000000 -0700
+++ dbh-1.0.22/src/dbh-1.0.pc.in	2005-03-15 19:10:10.705246122 -0700
@@ -7,5 +7,5 @@
 Description: Diskbased Hashtables
 Requires:
 Version: @DBH_VERSION@
-Libs: -Wl,-R${libdir} -L${libdir} -ldbh -lm
+Libs: -L${libdir} -ldbh -lm
 Cflags: -I${includedir}


--- NEW FILE dbh.spec ---
Summary: Disk based hash library
Name: dbh
Version: 1.0.22
Release: 1
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src/dbh-1.0.22.tar.gz
Patch: dbh-1.0.22-rpath.patch
Epoch: 1
License: LGPL
Group: System Environment/Libraries
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root

%description 
Disk based hashes is a method to create multidimensional binary trees on disk.
This library permits the extension of database concept to a plethora of 
electronic data, such as graphic information. With the multidimensional binary 
tree it is possible to mathematically prove that access time to any 
particular record is minimized (using the concept of critical points from 
calculus), which provides the means to construct optimized databases for 
particular applications.

%package devel
Summary: Header files for disk based hash library
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}

%description devel
This package includes the static libraries and header files you will need
to compile applications for dbh.

%prep
%setup -q

%patch -p1 -b .rpath

%build
%configure --disable-rpath

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT 

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-, root, root)
%doc examples/*.c examples/Makefile* doc/*.html
%{_libdir}/lib*.so
%{_libdir}/*a
%{_libdir}/pkgconfig/*
%{_includedir}/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 1:1.0.22-1
- Updated to 4.2.1 version
- Rediffed rpath patch for new version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 1:1.0.20-3
- Removed generic INSTALL doc from doc

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 1:1.0.20-2
- Inital fedora extras version
- Updated Source line
- Changed license to LGPL
- Increased the Release version by one

* Wed Dec 08 2004 Than Ngo <than at redhat.com> 1:1.0.20-1
- update to 1.0.20

* Tue Sep 28 2004 Than Ngo <than at redhat.com> 1:1.0.18-5
- fix file conflicts

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 13 2004 Than Ngo <than at redhat.com> 1:1.0.18-3
- get rid of rpath

* Sun Apr 18 2004 Warren Togami <wtogami at redhat.com> 1:1.0.18-2
- #121140 explicit epoch in -devel dep

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 1:1.0.18-1
- update to 1.0.18

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 1.0.15-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dbh/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 06:44:16 -0000	1.1
+++ .cvsignore	19 Mar 2005 17:36:03 -0000	1.2
@@ -0,0 +1 @@
+dbh-1.0.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dbh/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 06:44:16 -0000	1.1
+++ sources	19 Mar 2005 17:36:03 -0000	1.2
@@ -0,0 +1 @@
+2dfd35a284068ed0e5a545d18f9bf0f2  dbh-1.0.22.tar.gz



From fedora-extras-commits at redhat.com  Sat Mar 19 17:44:28 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:44:28 -0500
Subject: rpms/gtk-xfce-engine - New directory
Message-ID: <200503191744.j2JHiSW5021234@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21227/gtk-xfce-engine

Log Message:
Directory /cvs/extras/rpms/gtk-xfce-engine added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:44:28 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:44:28 -0500
Subject: rpms/gtk-xfce-engine/devel - New directory
Message-ID: <200503191744.j2JHiSto021237@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21227/gtk-xfce-engine/devel

Log Message:
Directory /cvs/extras/rpms/gtk-xfce-engine/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:44:43 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:44:43 -0500
Subject: rpms/gtk-xfce-engine Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191744.j2JHihnd021301@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21292

Added Files:
	Makefile import.log 
Log Message:
Setup of module gtk-xfce-engine


--- NEW FILE Makefile ---
# Top level Makefile for module gtk-xfce-engine
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 17:44:43 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:44:43 -0500
Subject: rpms/gtk-xfce-engine/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191744.j2JHih3c021304@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21292/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gtk-xfce-engine


--- 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 Mar 19 17:45:13 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:45:13 -0500
Subject: rpms/gtk-xfce-engine import.log,1.1,1.2
Message-ID: <200503191745.j2JHjD8T021405@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21396

Modified Files:
	import.log 
Log Message:
auto-import gtk-xfce-engine-2.2.6-1 on branch devel from gtk-xfce-engine-2.2.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 17:44:41 -0000	1.1
+++ import.log	19 Mar 2005 17:45:11 -0000	1.2
@@ -0,0 +1 @@
+gtk-xfce-engine-2_2_6-1:HEAD:gtk-xfce-engine-2.2.6-1.src.rpm:1111254299



From fedora-extras-commits at redhat.com  Sat Mar 19 17:45:13 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:45:13 -0500
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191745.j2JHjD28021409@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21396/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gtk-xfce-engine.spec 
Log Message:
auto-import gtk-xfce-engine-2.2.6-1 on branch devel from gtk-xfce-engine-2.2.6-1.src.rpm


--- NEW FILE gtk-xfce-engine.spec ---
Summary: Port of Xfce engine to GTK+-2.0
Name: gtk-xfce-engine
Version: 2.2.6
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/gtk-xfce-engine-2.2.6.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: gtk2 >= 2.0.0
Requires: glib2 >= 2.0.0
BuildRequires: gtk2-devel >= 2.0.0
BuildRequires: glib2-devel >= 2.0.0

%description
Port of Xfce engine to GTK+-2.0.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README COPYING AUTHORS
%{_libdir}/gtk-2.0/2.4.0/engines
%{_datadir}/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 2.2.6-1
- Updated to 2.2.6 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 2.2.5-2
- Fixed Xfce case

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 2.2.5-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 17:44:41 -0000	1.1
+++ .cvsignore	19 Mar 2005 17:45:11 -0000	1.2
@@ -0,0 +1 @@
+gtk-xfce-engine-2.2.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 17:44:41 -0000	1.1
+++ sources	19 Mar 2005 17:45:11 -0000	1.2
@@ -0,0 +1 @@
+abb3f1e554d637e01a686360cc120644  gtk-xfce-engine-2.2.6.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 17:46:38 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:46:38 -0500
Subject: rpms/libxfce4util - New directory
Message-ID: <200503191746.j2JHkcAo021558@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21549/libxfce4util

Log Message:
Directory /cvs/extras/rpms/libxfce4util added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:46:38 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:46:38 -0500
Subject: rpms/libxfce4util/devel - New directory
Message-ID: <200503191746.j2JHkcB2021561@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21549/libxfce4util/devel

Log Message:
Directory /cvs/extras/rpms/libxfce4util/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:46:51 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:46:51 -0500
Subject: rpms/libxfce4util Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191746.j2JHkp5R021626@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21617

Added Files:
	Makefile import.log 
Log Message:
Setup of module libxfce4util


--- NEW FILE Makefile ---
# Top level Makefile for module libxfce4util
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 17:46:51 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:46:51 -0500
Subject: rpms/libxfce4util/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191746.j2JHkpXT021629@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21617/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libxfce4util


--- 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 Mar 19 17:47:53 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:47:53 -0500
Subject: rpms/libxfce4util import.log,1.1,1.2
Message-ID: <200503191747.j2JHlrDr021745@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21736

Modified Files:
	import.log 
Log Message:
auto-import libxfce4util-4.2.1-1 on branch devel from libxfce4util-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 17:46:49 -0000	1.1
+++ import.log	19 Mar 2005 17:47:51 -0000	1.2
@@ -0,0 +1 @@
+libxfce4util-4_2_1-1:HEAD:libxfce4util-4.2.1-1.src.rpm:1111254456



From fedora-extras-commits at redhat.com  Sat Mar 19 17:47:53 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:47:53 -0500
Subject: rpms/libxfce4util/devel libxfce4util.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191747.j2JHlrql021749@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21736/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libxfce4util.spec 
Log Message:
auto-import libxfce4util-4.2.1-1 on branch devel from libxfce4util-4.2.1-1.src.rpm


--- NEW FILE libxfce4util.spec ---
Summary: Utility library for the Xfce4 desktop environment
Name: libxfce4util
Version: 4.2.1
Release: 1
License: BSD and LGPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4util-4.2.1.tar.bz2
Group: Development/Libraries
Requires: glib2 >= 2.0.0
Prereq: /sbin/ldconfig
BuildRequires: glib2-devel >= 2.0.0
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

%description
This package includes basic utility non-GUI functions for Xfce4.

%package devel
Summary: Developpment tools for libxfce4util library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: glib2-devel
Requires: gtk2-devel

%description devel
This package includes static libraries and header files for the
libxfce4util library.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%{_libdir}/lib*.so.*
%{_sbindir}/xfce4-kiosk-query

%files devel
%defattr(-, root, root)
%{_libdir}/lib*.so
%{_libdir}/*a
%{_libdir}/pkgconfig/*.pc
%{_includedir}/xfce4/libxfce4util
%{_datadir}/xfce4/m4/
%doc %{_datadir}/gtk-doc/html/libxfce4util

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Fixed License to be BSD and LGPL
- Fixed case on Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Inital Fedora Extras version
- Updated Source line
- Capitalized first letter of Summary in devel section to quiet rpmlint
- Added LGPL to License as 2 files are under LGPL, the rest BSD
- Increased the Release version by one

* Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
- update to 4.2.0 release

* Wed Dec 08 2004 Than Ngo <than at redhat.com> 4.1.99.1-1
- update to 4.2 rc1

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6
- add requires on glib2-devel, bug #124200
- remove unneeded patch file, which is included in new upstream

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Jan 26 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Fri Jan 09 2004 Than Ngo <than at redhat.com> 4.0.3-1
- 4.0.3

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 17:46:49 -0000	1.1
+++ .cvsignore	19 Mar 2005 17:47:51 -0000	1.2
@@ -0,0 +1 @@
+libxfce4util-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 17:46:49 -0000	1.1
+++ sources	19 Mar 2005 17:47:51 -0000	1.2
@@ -0,0 +1 @@
+7fac21585a72c3f4fadf3b0d9807875f  libxfce4util-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 17:51:13 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:51:13 -0500
Subject: rpms/libxfcegui4 - New directory
Message-ID: <200503191751.j2JHpD5B021925@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21916/libxfcegui4

Log Message:
Directory /cvs/extras/rpms/libxfcegui4 added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:51:13 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:51:13 -0500
Subject: rpms/libxfcegui4/devel - New directory
Message-ID: <200503191751.j2JHpDcG021928@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21916/libxfcegui4/devel

Log Message:
Directory /cvs/extras/rpms/libxfcegui4/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:51:28 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:51:28 -0500
Subject: rpms/libxfcegui4 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191751.j2JHpS1M021989@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21980

Added Files:
	Makefile import.log 
Log Message:
Setup of module libxfcegui4


--- NEW FILE Makefile ---
# Top level Makefile for module libxfcegui4
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 17:51:28 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:51:28 -0500
Subject: rpms/libxfcegui4/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191751.j2JHpSHp021992@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21980/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libxfcegui4


--- 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 Mar 19 17:52:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:52:18 -0500
Subject: rpms/libxfcegui4 import.log,1.1,1.2
Message-ID: <200503191752.j2JHqI1K022100@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22091

Modified Files:
	import.log 
Log Message:
auto-import libxfcegui4-4.2.1-2 on branch devel from libxfcegui4-4.2.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 17:51:26 -0000	1.1
+++ import.log	19 Mar 2005 17:52:16 -0000	1.2
@@ -0,0 +1 @@
+libxfcegui4-4_2_1-2:HEAD:libxfcegui4-4.2.1-2.src.rpm:1111254723



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:52:18 -0500
Subject: rpms/libxfcegui4/devel libxfcegui4.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191752.j2JHqIlb022104@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22091/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libxfcegui4.spec 
Log Message:
auto-import libxfcegui4-4.2.1-2 on branch devel from libxfcegui4-4.2.1-2.src.rpm


--- NEW FILE libxfcegui4.spec ---
Summary: GTK widgets for Xfce
Name: libxfcegui4
Version: 4.2.1
Release: 2
License: LGPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfcegui4-4.2.1.tar.bz2
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Prereq: /sbin/ldconfig
Requires: gtk2 >= 2.0.6
Requires: libxfce4util >= %{version}
BuildRequires: gtk2-devel >= 2.0.6
BuildRequires: libxfce4util-devel >= %{version}
BuildRequires: dbh-devel >= 1.0

%description
The package includes various gtk widgets for Xfce.

%package devel
Summary: Developpment tools for libxfcegui4 library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gtk2-devel
Requires: libxfce4util-devel
Provides: libxfcegui4-devel

%description devel
This package includes the static libraries and header files you will need
to compile applications for Xfce.

%prep
%setup -q

%build
%configure --enable-xinerama

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root)
%{_libdir}/lib*.so*
%{_libdir}/xfce4/modules/*.so*
%{_datadir}/xfce4/*

%files devel
%defattr(-, root, root)
%{_libdir}/lib*.so
%{_libdir}/*a
%{_libdir}/xfce4/modules/*.a
%{_libdir}/xfce4/modules/*.la
%{_libdir}/pkgconfig/*.pc
%{_includedir}/xfce4/*
%{_datadir}/gtk-doc/html/libxfcegui4

%changelog
* Wed Mar 16 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
- Fixed %files bug that wasn't packaging .so files

* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Fixed Xfce case

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Inital Fedora Extras version
- Updated the Source line
- Capitalized first letter of Summary in devel section to quiet rpmlint
- Added dbh-devel to BuildRequires
- Capitalized the GTK in the Summary to queit rpmlint
- Moved all the module *.a and *.la libraries to the devel package
- Added Provides: libxfcegui4-devel to devel package
- Increased the Relase version by one

* Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
- update to 4.2.0

* Wed Dec 08 2004 Than Ngo <than at redhat.com> 4.1.99.1-1
- update to 4.2 rc1

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Thu Mar 11 2004 Than Ngo <than at redhat.com> 4.0.3-4
- rebuilt

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Fri Jan 09 2004 Than Ngo <than at redhat.com> 4.0.3-1
- 4.0.3 release

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2 release

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 17:51:26 -0000	1.1
+++ .cvsignore	19 Mar 2005 17:52:16 -0000	1.2
@@ -0,0 +1 @@
+libxfcegui4-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 17:51:26 -0000	1.1
+++ sources	19 Mar 2005 17:52:16 -0000	1.2
@@ -0,0 +1 @@
+020c057cfe25a8aca99af9f39fe2015a  libxfcegui4-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/clearlooks clearlooks.spec,1.5,1.6
Message-ID: <200503191752.j2JHqlpL022228@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/clearlooks

Modified Files:
	clearlooks.spec 
Log Message:
%%


Index: clearlooks.spec
===================================================================
RCS file: /cvs/extras/devel/clearlooks/clearlooks.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- clearlooks.spec	17 Mar 2005 05:36:01 -0000	1.5
+++ clearlooks.spec	19 Mar 2005 17:52:45 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           clearlooks
 Version:        0.4
-Release:        5
+Release:        6
 Summary:        An attractive GTK+ 2 engine with a focus on usability
 Group:          User Interface/Desktops
 License:        GPL
@@ -35,12 +35,15 @@
 %{_libdir}/gtk-2.0/2.4.0/engines/*
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-6
+- %%
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-5
 - Added libgnome-devel to BR
 - Removed iffy dir patch
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-4
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-3
 - Fixed build problem with metacity-theme-1.xml



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/python-HTMLgen python-HTMLgen.spec,1.6,1.7
Message-ID: <200503191752.j2JHqljv022276@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/python-HTMLgen

Modified Files:
	python-HTMLgen.spec 
Log Message:
%%


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/devel/python-HTMLgen/python-HTMLgen.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-HTMLgen.spec	19 Mar 2005 16:27:31 -0000	1.6
+++ python-HTMLgen.spec	19 Mar 2005 17:52:45 -0000	1.7
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        2.2.2
-Release:        5
+Release:        6
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -52,8 +52,11 @@
 %{python_sitelib}/*.py[co]
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-6
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-5
-- Macros in %changelog are dangerous
+- Macros in %%changelog are dangerous
 
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-4
 - Fixed small Provides bug
@@ -64,7 +67,7 @@
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-2
 - Modified %%setup to use -n
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-1
 - Bump release to 1



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/leafpad leafpad.spec,1.4,1.5
Message-ID: <200503191752.j2JHqldf022260@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/leafpad

Modified Files:
	leafpad.spec 
Log Message:
%%


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/devel/leafpad/leafpad.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- leafpad.spec	19 Mar 2005 15:33:13 -0000	1.4
+++ leafpad.spec	19 Mar 2005 17:52:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           leafpad
 Version:        0.7.9
-Release:        4
+Release:        5
 Summary:        GTK+ based simple text editor
 
 Group:          Applications/Editors
@@ -61,11 +61,14 @@
 %{_datadir}/pixmaps/leafpad.png
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-5
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-4
 - Added desktop-file-utils to BuildRequires
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-3
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-2
 - Removed explicit Requires



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/libosip libosip.spec,1.4,1.5
Message-ID: <200503191752.j2JHqlvK022264@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/libosip

Modified Files:
	libosip.spec 
Log Message:
%%


Index: libosip.spec
===================================================================
RCS file: /cvs/extras/devel/libosip/libosip.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libosip.spec	19 Mar 2005 16:27:31 -0000	1.4
+++ libosip.spec	19 Mar 2005 17:52:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libosip
 Version:        0.9.7
-Release:        4
+Release:        5
 Summary:        oSIP is an implementation of SIP
 
 Group:          System Environment/Libraries
@@ -73,15 +73,18 @@
 %{_libdir}/*.so
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-5
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-4
-- Macros in %changelog are dangerous
+- Macros in %%changelog are dangerous
 
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-3
 - Spec file cleanup
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-2
-- Fix %files devel to include %%{_includedir}/osip
-- Broke %description at 80 columns
+- Fix %%files devel to include %%{_includedir}/osip
+- Broke %%description at 80 columns
 
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-1
 - Bump release to 1



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/python-amara python-amara.spec,1.5,1.6
Message-ID: <200503191752.j2JHqlGK022280@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/python-amara

Modified Files:
	python-amara.spec 
Log Message:
%%


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/devel/python-amara/python-amara.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-amara.spec	19 Mar 2005 16:27:31 -0000	1.5
+++ python-amara.spec	19 Mar 2005 17:52:45 -0000	1.6
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        0.9.4
-Release:        4
+Release:        6
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -55,17 +55,20 @@
 %doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-6
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-5
-- Macros in %changelog are dangerous
+- Macros in %%changelog are dangerous
 
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-4
 - Streamlined/fixed Python version handling
 - Implemented %%python_sitelib
-- Decreased verbosity in %description
+- Decreased verbosity in %%description
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-3
 - Better %%pyver and BR/Requires handling
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 - Fixed file ownership
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-2



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/edb edb.spec,1.4,1.5
Message-ID: <200503191752.j2JHqlh9022236@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/edb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/edb

Modified Files:
	edb.spec 
Log Message:
%%


Index: edb.spec
===================================================================
RCS file: /cvs/extras/devel/edb/edb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- edb.spec	18 Mar 2005 18:45:26 -0000	1.4
+++ edb.spec	19 Mar 2005 17:52:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           edb
 Version:        1.0.5
-Release:        4
+Release:        5
 Summary:        A database convenience library wrapped around BDB
 Group:          System Environment/Libraries
 License:        MIT
@@ -85,18 +85,21 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-5
+- %%
+
 * Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-4
 - Fixed URL
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-3
-- Broke %descriptions at 80 columns
+- Broke %%descriptions at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-2
 - Removed explicit Requires
 
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-1
 - Bump release to 1
-- Fix %description of -gtk
+- Fix %%description of -gtk
 - Fix Source0
 
 * Wed Mar  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-0.iva.1



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/ktrack ktrack.spec,1.6,1.7
Message-ID: <200503191752.j2JHqllZ022256@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/ktrack

Modified Files:
	ktrack.spec 
Log Message:
%%


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ktrack.spec	19 Mar 2005 16:27:31 -0000	1.6
+++ ktrack.spec	19 Mar 2005 17:52:45 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 6.rc1
+Release: 7.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -57,18 +57,21 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-7.rc1
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-6.rc1
-- Macros in %changelog are dangerous
+- Macros in %%changelog are dangerous
 
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-5.rc1
 - Removed explicit hamlib-devel version
  
 * Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-4.rc1
-- Added --disable-rpath to %configure
+- Added --disable-rpath to %%configure
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-3.rc1
 - Modified %%setup to use -n
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-2.rc1
 - Removed explicit Requires
@@ -76,7 +79,7 @@
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-1.rc1
 - Bump release to 1
 - Fixed BuildRoot
-- Added -with-qt-* options to %configure
+- Added -with-qt-* options to %%configure
 
 * Mon Jan 31 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.3.0-0.iva.1.rc1
 - Rebuild against hamlib 1.2.3



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/hamlib hamlib.spec,1.5,1.6
Message-ID: <200503191752.j2JHqlkb022248@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/hamlib

Modified Files:
	hamlib.spec 
Log Message:
%%


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hamlib.spec	17 Mar 2005 22:59:24 -0000	1.5
+++ hamlib.spec	19 Mar 2005 17:52:45 -0000	1.6
@@ -1,6 +1,6 @@
 Name: hamlib
 Version: 1.2.3
-Release: 5
+Release: 6
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transcievers and receivers.
@@ -201,14 +201,17 @@
 
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-6
+- %%
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-5
 - Removed spurious Requires(...)
 
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-4
-- Fixed %post and %postun along with Requires(...)
+- Fixed %%post and %%postun along with Requires(...)
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-3
-- Spell-corrected %description
+- Spell-corrected %%description
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-2
 - Removed/fixed explicit Requires
@@ -224,7 +227,7 @@
 - Upstream update
 
 * Sun Jan  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.2-0.iva.1
-- Fixed %files %defattr
+- Fixed %%files %%defattr
 
 * Sun Jan  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.2-0.iva.0
 - Ported to FC3



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/lock-keys-applet lock-keys-applet.spec,1.4,1.5
Message-ID: <200503191752.j2JHql91022272@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/lock-keys-applet

Modified Files:
	lock-keys-applet.spec 
Log Message:
%%


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/extras/devel/lock-keys-applet/lock-keys-applet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lock-keys-applet.spec	19 Mar 2005 16:27:31 -0000	1.4
+++ lock-keys-applet.spec	19 Mar 2005 17:52:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        4
+Release:        5
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
 License:        GPL
@@ -49,12 +49,15 @@
 %{_libexecdir}/%{name}
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-5
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-4
-- Macros in %changelog are dangerous
+- Macros in %%changelog are dangerous
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-3
-- Used %%find_lang instead of putting the .mo files in %files.
-- Broke %description at 80 columns
+- Used %%find_lang instead of putting the .mo files in %%files.
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-2
 - Removed explicit Requires



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/gpredict gpredict.spec,1.3,1.4
Message-ID: <200503191752.j2JHqlwd022244@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/gpredict
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/gpredict

Modified Files:
	gpredict.spec 
Log Message:
%%


Index: gpredict.spec
===================================================================
RCS file: /cvs/extras/devel/gpredict/gpredict.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gpredict.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ gpredict.spec	19 Mar 2005 17:52:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gpredict
 Version:        0.5.0
-Release:        2
+Release:        3
 Summary:        Real-time satellite tracking and orbit prediction program
 Group:          Applications/Communications
 License:        GPL
@@ -64,8 +64,11 @@
 %{_datadir}/pixmaps/%{name}
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-4
+- %%
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-3
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-2
 - Removed explicit Requires



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/deskbar-applet deskbar-applet.spec,1.2,1.3
Message-ID: <200503191752.j2JHqleq022232@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/deskbar-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/deskbar-applet

Modified Files:
	deskbar-applet.spec 
Log Message:
%%


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/devel/deskbar-applet/deskbar-applet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- deskbar-applet.spec	16 Mar 2005 23:41:59 -0000	1.2
+++ deskbar-applet.spec	19 Mar 2005 17:52:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           deskbar-applet
 Version:        0.2
-Release:        2
+Release:        3
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
 License:        GPL
@@ -43,8 +43,11 @@
 %{_libdir}/bonobo/servers/DeskbarApplet.server
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-3
+- %%
+
 * Wed Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-2
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-1
 - Bump release to 1



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/linphone linphone.spec,1.4,1.5
Message-ID: <200503191752.j2JHqlA6022268@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/linphone

Modified Files:
	linphone.spec 
Log Message:
%%


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linphone.spec	19 Mar 2005 15:57:41 -0000	1.4
+++ linphone.spec	19 Mar 2005 17:52:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        4
+Release:        5
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -85,13 +85,16 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-5
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-4
-- Used %find_lang
-- Tightened up %files
+- Used %%find_lang
+- Tightened up %%files
 - Streamlined spec file
 
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-3
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-2
 - Removed explicit Requires



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/kphone kphone.spec,1.7,1.8
Message-ID: <200503191752.j2JHql3m022252@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/kphone

Modified Files:
	kphone.spec 
Log Message:
%%


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kphone.spec	19 Mar 2005 16:27:31 -0000	1.7
+++ kphone.spec	19 Mar 2005 17:52:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        7
+Release:        8
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -53,8 +53,11 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-8
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-7
-- Macros in %changelog are dangerous
+- Macros in %%changelog are dangerous
 
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-6
 - Split %%makeinstall ... to make ... install
@@ -68,7 +71,7 @@
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-3
 - Modified %%setup to use -n
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-2
 - Removed explicit Requires



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/ghasher ghasher.spec,1.3,1.4
Message-ID: <200503191752.j2JHqlOg022240@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ghasher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/ghasher

Modified Files:
	ghasher.spec 
Log Message:
%%


Index: ghasher.spec
===================================================================
RCS file: /cvs/extras/devel/ghasher/ghasher.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghasher.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ ghasher.spec	19 Mar 2005 17:52:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ghasher
 Version:        1.2.0
-Release:        3
+Release:        4
 Summary:        GUI hasher for GTK+ 2
 Group:          Applications/File
 License:        BSD
@@ -55,15 +55,18 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-4
+- %%
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-3
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-2
 - Removed explicit Requires
 
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-1
 - Bump release to 1
-- Cleaned up %description
+- Cleaned up %%description
 
 * Thu Mar  3 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.0-0.iva.1
 - Fixed several packaging errors



From fedora-extras-commits at redhat.com  Sat Mar 19 17:53:26 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:53:26 -0500
Subject: rpms/xfcalendar - New directory
Message-ID: <200503191753.j2JHrQWN022574@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22562/xfcalendar

Log Message:
Directory /cvs/extras/rpms/xfcalendar added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:53:26 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:53:26 -0500
Subject: rpms/xfcalendar/devel - New directory
Message-ID: <200503191753.j2JHrQFM022577@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22562/xfcalendar/devel

Log Message:
Directory /cvs/extras/rpms/xfcalendar/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:53:54 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:53:54 -0500
Subject: rpms/xfcalendar Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191753.j2JHrsh4022639@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22630

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfcalendar


--- NEW FILE Makefile ---
# Top level Makefile for module xfcalendar
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 17:53:54 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:53:54 -0500
Subject: rpms/xfcalendar/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191753.j2JHrswa022642@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22630/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfcalendar


--- 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 Mar 19 17:54:26 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:54:26 -0500
Subject: rpms/xfcalendar import.log,1.1,1.2
Message-ID: <200503191754.j2JHsQ3G022749@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22737

Modified Files:
	import.log 
Log Message:
auto-import xfcalendar-4.2.1-1 on branch devel from xfcalendar-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 17:53:52 -0000	1.1
+++ import.log	19 Mar 2005 17:54:24 -0000	1.2
@@ -0,0 +1 @@
+xfcalendar-4_2_1-1:HEAD:xfcalendar-4.2.1-1.src.rpm:1111254851



From fedora-extras-commits at redhat.com  Sat Mar 19 17:54:26 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:54:26 -0500
Subject: rpms/xfcalendar/devel xfcalendar.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191754.j2JHsQ69022752@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22737/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfcalendar.spec 
Log Message:
auto-import xfcalendar-4.2.1-1 on branch devel from xfcalendar-4.2.1-1.src.rpm


--- NEW FILE xfcalendar.spec ---
Summary: Time-managing application for Xfce4
Name: xfcalendar
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfcalendar-4.2.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xfce-mcs-manager-devel

%description
Time-managing application for Xfce4

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README ChangeLog COPYING AUTHORS
%{_bindir}/xfcalendar
%{_libdir}/xfce4/mcs-plugins/xfcalendar_plugin.a
%{_libdir}/xfce4/mcs-plugins/xfcalendar_plugin.la
%{_libdir}/xfce4/mcs-plugins/xfcalendar_plugin.so
%{_datadir}/applications/xfcalendar.desktop
%{_datadir}/applications/xfce-xfcalendar-settings.desktop
%{_datadir}/icons/hicolor/48x48/apps/xfcalendar.png
%{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc
- Added BuildRequires for xfce-mcs-manager-devel

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 17:53:52 -0000	1.1
+++ .cvsignore	19 Mar 2005 17:54:24 -0000	1.2
@@ -0,0 +1 @@
+xfcalendar-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 17:53:52 -0000	1.1
+++ sources	19 Mar 2005 17:54:24 -0000	1.2
@@ -0,0 +1 @@
+b64bf1b492660c25fa12f838e470b777  xfcalendar-4.2.1.tar.bz2



From ivazquez at ivazquez.net  Sat Mar 19 17:57:19 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Sat, 19 Mar 2005 12:57:19 -0500
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec, NONE, 1.1
	.cvsignore, 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503191745.j2JHjD28021409@cvs-int.fedora.redhat.com>
References: <200503191745.j2JHjD28021409@cvs-int.fedora.redhat.com>
Message-ID: <1111255039.26827.20.camel@ignacio.ignacio.lan>

On Sat, 2005-03-19 at 12:45 -0500, Kevin Fenzi wrote:
> Author: kevin
> 
> Requires: gtk2 >= 2.0.0
> Requires: glib2 >= 2.0.0

Lots and lots of explicit Requires to clean up.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050319/354e3a24/attachment.sig>

From fedora-extras-commits at redhat.com  Sat Mar 19 17:58:11 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:58:11 -0500
Subject: rpms/xfce4-appfinder - New directory
Message-ID: <200503191758.j2JHwBXn022928@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22921/xfce4-appfinder

Log Message:
Directory /cvs/extras/rpms/xfce4-appfinder added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:58:11 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:58:11 -0500
Subject: rpms/xfce4-appfinder/devel - New directory
Message-ID: <200503191758.j2JHwBXG022931@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22921/xfce4-appfinder/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-appfinder/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:58:24 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:58:24 -0500
Subject: rpms/xfce4-appfinder Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191758.j2JHwOEp022992@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22983

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-appfinder


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-appfinder
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 17:58:24 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:58:24 -0500
Subject: rpms/xfce4-appfinder/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191758.j2JHwOGe022995@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22983/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-appfinder


--- 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 Mar 19 17:58:47 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:58:47 -0500
Subject: rpms/xfce4-appfinder import.log,1.1,1.2
Message-ID: <200503191758.j2JHwlMJ023096@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23085

Modified Files:
	import.log 
Log Message:
auto-import xfce4-appfinder-4.2.1-1 on branch devel from xfce4-appfinder-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 17:58:22 -0000	1.1
+++ import.log	19 Mar 2005 17:58:45 -0000	1.2
@@ -0,0 +1 @@
+xfce4-appfinder-4_2_1-1:HEAD:xfce4-appfinder-4.2.1-1.src.rpm:1111255113



From fedora-extras-commits at redhat.com  Sat Mar 19 17:58:47 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:58:47 -0500
Subject: rpms/xfce4-appfinder/devel xfce4-appfinder.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191758.j2JHwlSA023100@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23085/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-appfinder.spec 
Log Message:
auto-import xfce4-appfinder-4.2.1-1 on branch devel from xfce4-appfinder-4.2.1-1.src.rpm


--- NEW FILE xfce4-appfinder.spec ---
Summary: Appfinder for the Xfce4 Desktop Environment
Name: xfce4-appfinder
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-appfinder-4.2.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: libxfcegui4 >= 4.2.0
BuildRequires: libxfcegui4-devel >= 4.2.0

%description
xfce-appfinder shows system wide installed applications

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README TODO ChangeLog NEWS COPYING AUTHORS
%{_bindir}/xfce4-appfinder
%{_datadir}/applications/xfce4-appfinder.desktop
%{_datadir}/pixmaps/xfce4-appfinder.png
%{_datadir}/xfce4/doc/C/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version
- Fixed %files section to not list lang files twice

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc
- Fixed case on Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 17:58:22 -0000	1.1
+++ .cvsignore	19 Mar 2005 17:58:45 -0000	1.2
@@ -0,0 +1 @@
+xfce4-appfinder-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 17:58:22 -0000	1.1
+++ sources	19 Mar 2005 17:58:45 -0000	1.2
@@ -0,0 +1 @@
+6bf74961b2aa65c2fae98f9c3d6aabce  xfce4-appfinder-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 17:59:55 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:59:55 -0500
Subject: rpms/xfce4-iconbox - New directory
Message-ID: <200503191759.j2JHxtw9023234@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23227/xfce4-iconbox

Log Message:
Directory /cvs/extras/rpms/xfce4-iconbox added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:59:55 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:59:55 -0500
Subject: rpms/xfce4-iconbox/devel - New directory
Message-ID: <200503191759.j2JHxtFo023237@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23227/xfce4-iconbox/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-iconbox/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:00:08 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:00:08 -0500
Subject: rpms/xfce4-iconbox Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191800.j2JI08Tg023298@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23289

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-iconbox


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-iconbox
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:00:08 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:00:08 -0500
Subject: rpms/xfce4-iconbox/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191800.j2JI085F023301@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23289/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-iconbox


--- 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 Mar 19 18:00:36 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:00:36 -0500
Subject: rpms/xfce4-iconbox import.log,1.1,1.2
Message-ID: <200503191800.j2JI0auh023402@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23393

Modified Files:
	import.log 
Log Message:
auto-import xfce4-iconbox-4.2.1-1 on branch devel from xfce4-iconbox-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-iconbox/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:00:06 -0000	1.1
+++ import.log	19 Mar 2005 18:00:34 -0000	1.2
@@ -0,0 +1 @@
+xfce4-iconbox-4_2_1-1:HEAD:xfce4-iconbox-4.2.1-1.src.rpm:1111255221



From fedora-extras-commits at redhat.com  Sat Mar 19 18:00:36 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:00:36 -0500
Subject: rpms/xfce4-iconbox/devel xfce4-iconbox.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191800.j2JI0aL5023406@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23393/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-iconbox.spec 
Log Message:
auto-import xfce4-iconbox-4.2.1-1 on branch devel from xfce4-iconbox-4.2.1-1.src.rpm


--- NEW FILE xfce4-iconbox.spec ---
Summary: Icon box for the Xfce4 Desktop Environment
Name: xfce4-iconbox
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-iconbox-4.2.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: libxfcegui4 >= %{version}
Requires: libxfce4mcs >= %{version}
BuildRequires: pkgconfig
BuildRequires: gettext
BuildRequires: libxfcegui4-devel >= %{version}
BuildRequires: libxfce4mcs-devel >= %{version}
BuildRequires: xfce-mcs-manager-devel >= %{version}

%description
xfce-iconbox shows icons for running programs.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root, 0755)
%doc README TODO ChangeLog NEWS COPYING AUTHORS
%{_bindir}/*
%{_libdir}/xfce4/mcs-plugins
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/*/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to version 4.2.1

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Fixed case on Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Inital Fedora Extras version
- Updated the Source line
- Increased the Release by one

* Fri Jan 28 2005 Than Ngo <than at redhat.com> 4.2.0-1
- 4.2.0

* Wed Sep 01 2004 Than Ngo <than at redhat.com> 4.0.6-2
- use find_lang macro
- get rid of useless static library

* Tue Aug 17 2004 Than Ngo <than at redhat.com> 4.0.6-1 
- Initial packaging for Fedora Core 3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-iconbox/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:00:06 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:00:34 -0000	1.2
@@ -0,0 +1 @@
+xfce4-iconbox-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-iconbox/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:00:06 -0000	1.1
+++ sources	19 Mar 2005 18:00:34 -0000	1.2
@@ -0,0 +1 @@
+81919388d17e2d1395bea8d92d99c6f8  xfce4-iconbox-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:02:47 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:02:47 -0500
Subject: rpms/xfce4-icon-theme - New directory
Message-ID: <200503191802.j2JI2lvJ024326@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24317/xfce4-icon-theme

Log Message:
Directory /cvs/extras/rpms/xfce4-icon-theme added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:02:48 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:02:48 -0500
Subject: rpms/xfce4-icon-theme/devel - New directory
Message-ID: <200503191802.j2JI2m5h024329@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24317/xfce4-icon-theme/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-icon-theme/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:03:03 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:03:03 -0500
Subject: rpms/xfce4-icon-theme Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191803.j2JI338S024390@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24381

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-icon-theme


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-icon-theme
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Mar 19 18:03:03 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:03:03 -0500
Subject: rpms/xfce4-icon-theme/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191803.j2JI33KK024393@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24381/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-icon-theme


--- 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 Mar 19 18:03:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:03:42 -0500
Subject: rpms/xfce4-icon-theme import.log,1.1,1.2
Message-ID: <200503191803.j2JI3gG5024494@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24485

Modified Files:
	import.log 
Log Message:
auto-import xfce4-icon-theme-4.2.1-1 on branch devel from xfce4-icon-theme-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:03:00 -0000	1.1
+++ import.log	19 Mar 2005 18:03:40 -0000	1.2
@@ -0,0 +1 @@
+xfce4-icon-theme-4_2_1-1:HEAD:xfce4-icon-theme-4.2.1-1.src.rpm:1111255409



From fedora-extras-commits at redhat.com  Sat Mar 19 18:03:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:03:42 -0500
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191803.j2JI3g4b024498@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24485/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-icon-theme.spec 
Log Message:
auto-import xfce4-icon-theme-4.2.1-1 on branch devel from xfce4-icon-theme-4.2.1-1.src.rpm


--- NEW FILE xfce4-icon-theme.spec ---
Summary: Icons for Xfce
Name: xfce4-icon-theme
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-icon-theme-4.2.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Icon theme for Xfce 4 Desktop Environment.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README ChangeLog NEWS COPYING AUTHORS
%{_datadir}/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:03:00 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:03:40 -0000	1.2
@@ -0,0 +1 @@
+xfce4-icon-theme-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:03:01 -0000	1.1
+++ sources	19 Mar 2005 18:03:40 -0000	1.2
@@ -0,0 +1 @@
+d0471ff2772a55664cc3081db8c2b973  xfce4-icon-theme-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:05:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:05:20 -0500
Subject: rpms/xfce4-mixer - New directory
Message-ID: <200503191805.j2JI5KQc024648@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24639/xfce4-mixer

Log Message:
Directory /cvs/extras/rpms/xfce4-mixer added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:05:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:05:20 -0500
Subject: rpms/xfce4-mixer/devel - New directory
Message-ID: <200503191805.j2JI5K1X024651@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24639/xfce4-mixer/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-mixer/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:05:38 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:05:38 -0500
Subject: rpms/xfce4-mixer Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191805.j2JI5cOA024712@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24703

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-mixer


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-mixer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Mar 19 18:05:38 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:05:38 -0500
Subject: rpms/xfce4-mixer/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191805.j2JI5cl0024715@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24703/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-mixer


--- 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 Mar 19 18:06:07 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:06:07 -0500
Subject: rpms/xfce4-mixer import.log,1.1,1.2
Message-ID: <200503191806.j2JI67FD024814@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24805

Modified Files:
	import.log 
Log Message:
auto-import xfce4-mixer-4.2.1-1 on branch devel from xfce4-mixer-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:05:36 -0000	1.1
+++ import.log	19 Mar 2005 18:06:05 -0000	1.2
@@ -0,0 +1 @@
+xfce4-mixer-4_2_1-1:HEAD:xfce4-mixer-4.2.1-1.src.rpm:1111255551



From fedora-extras-commits at redhat.com  Sat Mar 19 18:06:07 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:06:07 -0500
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191806.j2JI67OD024820@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24805/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-mixer.spec 
Log Message:
auto-import xfce4-mixer-4.2.1-1 on branch devel from xfce4-mixer-4.2.1-1.src.rpm


--- NEW FILE xfce4-mixer.spec ---
Summary: Volume control plugin for the Xfce 4 panel
Name: xfce4-mixer
Version: 4.2.1
Release: 1
License: BSD
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-mixer-4.2.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xfce4-panel >= 4.2.1
BuildRequires: xfce4-panel >= 4.2.1

%description
Volume control plugin for the Xfce 4 panel

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README TODO ChangeLog NOTES COPYING AUTHORS NEWS
%{_bindir}/xfce4-mixer
%{_libdir}/xfce4/*
%{_datadir}/applications/xfce-mixer-settings.desktop
%{_datadir}/icons/hicolor/48x48/apps/xfce4-mixer.png

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:05:36 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:06:05 -0000	1.2
@@ -0,0 +1 @@
+xfce4-mixer-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:05:36 -0000	1.1
+++ sources	19 Mar 2005 18:06:05 -0000	1.2
@@ -0,0 +1 @@
+8f4288708d6365178fec89053742fa01  xfce4-mixer-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:07:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:07:05 -0500
Subject: rpms/xfce4-panel - New directory
Message-ID: <200503191807.j2JI750L024948@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24941/xfce4-panel

Log Message:
Directory /cvs/extras/rpms/xfce4-panel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:07:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:07:05 -0500
Subject: rpms/xfce4-panel/devel - New directory
Message-ID: <200503191807.j2JI75k3024951@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24941/xfce4-panel/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-panel/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:07:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:07:18 -0500
Subject: rpms/xfce4-panel Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191807.j2JI7IZv025013@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25003

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-panel


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-panel
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:07:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:07:18 -0500
Subject: rpms/xfce4-panel/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191807.j2JI7Ile025014@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25003/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-panel


--- 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 Mar 19 18:07:53 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:07:53 -0500
Subject: rpms/xfce4-panel import.log,1.1,1.2
Message-ID: <200503191807.j2JI7rGk025125@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25116

Modified Files:
	import.log 
Log Message:
auto-import xfce4-panel-4.2.1.1-1 on branch devel from xfce4-panel-4.2.1.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:07:15 -0000	1.1
+++ import.log	19 Mar 2005 18:07:51 -0000	1.2
@@ -0,0 +1 @@
+xfce4-panel-4_2_1_1-1:HEAD:xfce4-panel-4.2.1.1-1.src.rpm:1111255659



From fedora-extras-commits at redhat.com  Sat Mar 19 18:07:53 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:07:53 -0500
Subject: rpms/xfce4-panel/devel panel-launchmail.patch, NONE,
	1.1 xfce4-panel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200503191807.j2JI7rZK025132@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25116/devel

Modified Files:
	.cvsignore sources 
Added Files:
	panel-launchmail.patch xfce4-panel.spec 
Log Message:
auto-import xfce4-panel-4.2.1.1-1 on branch devel from xfce4-panel-4.2.1.1-1.src.rpm

panel-launchmail.patch:

--- NEW FILE panel-launchmail.patch ---
diff -Naur xfce4-panel-4.2.0.orig/contents.xml xfce4-panel-4.2.0/contents.xml
--- xfce4-panel-4.2.0.orig/contents.xml	2004-11-11 13:21:40.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml	2005-03-06 12:30:36.094410428 -0700
@@ -50,7 +50,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ar xfce4-panel-4.2.0/contents.xml.ar
--- xfce4-panel-4.2.0.orig/contents.xml.ar	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.ar	2005-03-06 12:32:03.001970353 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.az xfce4-panel-4.2.0/contents.xml.az
--- xfce4-panel-4.2.0.orig/contents.xml.az	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.az	2005-03-06 12:32:10.393827217 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ca xfce4-panel-4.2.0/contents.xml.ca
--- xfce4-panel-4.2.0.orig/contents.xml.ca	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.ca	2005-03-06 12:32:15.329063993 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.eu xfce4-panel-4.2.0/contents.xml.eu
--- xfce4-panel-4.2.0.orig/contents.xml.eu	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.eu	2005-03-06 12:32:21.150163772 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.fr xfce4-panel-4.2.0/contents.xml.fr
--- xfce4-panel-4.2.0.orig/contents.xml.fr	2004-11-26 10:53:59.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.fr	2005-03-06 12:32:26.080401321 -0700
@@ -50,7 +50,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.he xfce4-panel-4.2.0/contents.xml.he
--- xfce4-panel-4.2.0.orig/contents.xml.he	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.he	2005-03-06 12:32:32.065475742 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.hu xfce4-panel-4.2.0/contents.xml.hu
--- xfce4-panel-4.2.0.orig/contents.xml.hu	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.hu	2005-03-06 12:32:37.809587427 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.it xfce4-panel-4.2.0/contents.xml.it
--- xfce4-panel-4.2.0.orig/contents.xml.it	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.it	2005-03-06 12:32:43.531702513 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ko xfce4-panel-4.2.0/contents.xml.ko
--- xfce4-panel-4.2.0.orig/contents.xml.ko	2004-12-05 16:43:32.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.ko	2005-03-06 12:32:49.445787912 -0700
@@ -50,7 +50,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.lt xfce4-panel-4.2.0/contents.xml.lt
--- xfce4-panel-4.2.0.orig/contents.xml.lt	2005-01-10 05:23:37.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.lt	2005-03-06 12:32:57.514540097 -0700
@@ -50,7 +50,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ms xfce4-panel-4.2.0/contents.xml.ms
--- xfce4-panel-4.2.0.orig/contents.xml.ms	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.ms	2005-03-06 12:33:02.966696932 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.nl xfce4-panel-4.2.0/contents.xml.nl
--- xfce4-panel-4.2.0.orig/contents.xml.nl	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.nl	2005-03-06 12:33:07.448003907 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ro xfce4-panel-4.2.0/contents.xml.ro
--- xfce4-panel-4.2.0.orig/contents.xml.ro	2005-01-09 05:03:42.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.ro	2005-03-06 12:33:11.880318459 -0700
@@ -50,7 +50,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail -splash</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ru xfce4-panel-4.2.0/contents.xml.ru
--- xfce4-panel-4.2.0.orig/contents.xml.ru	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.ru	2005-03-06 12:33:22.203721965 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.sk xfce4-panel-4.2.0/contents.xml.sk
--- xfce4-panel-4.2.0.orig/contents.xml.sk	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.sk	2005-03-06 12:33:27.477906324 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.tr xfce4-panel-4.2.0/contents.xml.tr
--- xfce4-panel-4.2.0.orig/contents.xml.tr	2004-11-29 02:47:38.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.tr	2005-03-06 12:33:33.747936677 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.vi xfce4-panel-4.2.0/contents.xml.vi
--- xfce4-panel-4.2.0.orig/contents.xml.vi	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.vi	2005-03-06 12:33:38.300232673 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.zh_TW xfce4-panel-4.2.0/contents.xml.zh_TW
--- xfce4-panel-4.2.0.orig/contents.xml.zh_TW	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.zh_TW	2005-03-06 12:33:43.195475634 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>


--- NEW FILE xfce4-panel.spec ---
Summary: Next generation panel for Xfce
Name: xfce4-panel
Version: 4.2.1.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-panel-4.2.1.1.tar.bz2
# Change default for Fedora
Patch0: panel-launchmail.patch
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-root
Requires: libxfcegui4 >= 4.2.1
Requires: libxfce4mcs >= 4.2.1
Requires: xfce-mcs-manager >= 4.2.1
Requires: libxml2 >= 2.4.0
BuildRequires: libxfcegui4-devel >= 4.2.1
BuildRequires: libxfce4mcs-devel >= 4.2.1
BuildRequires: xfce-mcs-manager-devel >= 4.2.1
BuildRequires: libxml2-devel >= 2.4.0
BuildRequires: startup-notification-devel

%description
This package includes the panel for the Xfce desktop environment

%package devel
Summary: developpment headers for xfce4-panel
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig

%description devel
This package includes the header files you will need to build
plugins for xfce4-panel.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README TODO ChangeLog NEWS NOTES COPYING AUTHORS
/etc/xdg/xfce4
%{_datadir}/xfce4/doc
%{_libdir}/xfce4
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/*/*.png

%files devel
%defattr(-, root, root)
%{_libdir}/pkgconfig/*
%{_includedir}/xfce4

%changelog
* Thu Mar 17 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1.1-1
- Updated to 4.2.1.1 version
- Changed Requires/Buildrequires to 4.2.1, as xfce4-panel was the only package updated to 4.2.1.1

* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-4
- Fixed case of Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Inital Fedora Extras version
- Updated the Source line
- Created a new patch to change mozilla -mail to launchmail
- Moved the includes to the devel subpackage
- Increased the Release by one

* Thu Feb 03 2005 Than Ngo <than at redhat.com> 4.2.0-2
- new sub package xfce4-panel-devel

* Tue Jan 25 2005 Than Ngo <than at redhat.com> 4.2.0-1
- 4.2.0

* Wed Dec 08 2004 Than Ngo <than at redhat.com> 4.0.6-2 
- add patch to use lauchmail/htmlview #142160

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6
- remove some unneeded patch files

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jun 01 2004 Than Ngo <than at redhat.com> 4.0.5-4
- add buildrequires on startup-notification-devel, bug #124948
- use %%find_lang macros, bug #124948

* Mon May 31 2004 Than Ngo <than at redhat.com> 4.0.5-3
- own %%{_libdir}i/xfce4, bug #124826

* Mon Apr 26 2004 Than Ngo <than at redhat.com> 4.0.5-2
- Change more defaults for fedora, use startup notification
  by default, remove "-splash" option from mozilla launcher. Thanks to Olivier Fourdan
- Patch to avoid crash at startup under some rare circumstances
- Change defaults for fedora

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Fri Jan 09 2004 Than Ngo <than at redhat.com> 4.0.3-1
- 4.0.3 release

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2 release

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:07:16 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:07:51 -0000	1.2
@@ -0,0 +1 @@
+xfce4-panel-4.2.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:07:16 -0000	1.1
+++ sources	19 Mar 2005 18:07:51 -0000	1.2
@@ -0,0 +1 @@
+51f77bcd31daf8a62c53a93be263c06a  xfce4-panel-4.2.1.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:08:52 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:08:52 -0500
Subject: rpms/xfce4-session - New directory
Message-ID: <200503191808.j2JI8qxe025262@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25255/xfce4-session

Log Message:
Directory /cvs/extras/rpms/xfce4-session added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:08:52 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:08:52 -0500
Subject: rpms/xfce4-session/devel - New directory
Message-ID: <200503191808.j2JI8qNI025265@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25255/xfce4-session/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-session/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:09:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:09:05 -0500
Subject: rpms/xfce4-session Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191809.j2JI95Pm025329@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25317

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-session


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-session
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:09:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:09:05 -0500
Subject: rpms/xfce4-session/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191809.j2JI95xr025332@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25317/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-session


--- 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 Mar 19 18:09:43 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:09:43 -0500
Subject: rpms/xfce4-session import.log,1.1,1.2
Message-ID: <200503191809.j2JI9hLv025433@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25423

Modified Files:
	import.log 
Log Message:
auto-import xfce4-session-4.2.1-1 on branch devel from xfce4-session-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:09:03 -0000	1.1
+++ import.log	19 Mar 2005 18:09:41 -0000	1.2
@@ -0,0 +1 @@
+xfce4-session-4_2_1-1:HEAD:xfce4-session-4.2.1-1.src.rpm:1111255769



From fedora-extras-commits at redhat.com  Sat Mar 19 18:09:43 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:09:43 -0500
Subject: rpms/xfce4-session/devel xfce4-session.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191809.j2JI9hd4025436@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25423/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-session.spec 
Log Message:
auto-import xfce4-session-4.2.1-1 on branch devel from xfce4-session-4.2.1-1.src.rpm


--- NEW FILE xfce4-session.spec ---
Summary: Xfce session manager
Name: xfce4-session
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-session-4.2.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: libxfcegui4 >= 4.2.1
Requires: libxfce4mcs >= 4.2.1
Requires: xfce-mcs-manager >= 4.2.1
BuildRequires: libxfcegui4-devel >= 4.2.1
BuildRequires: libxfce4mcs-devel >= 4.2.1
BuildRequires: xfce-mcs-manager-devel >= 4.2.1

%description
xfce4-session is the session manager for the Xfce desktop environment.

%package devel
Summary: Development files for xfce4-session
Group: Development/Libraries
Requires: xfce4-session

%description devel
Header files for the Xfce Session Manager.

%package engines
Summary: Additional engines for xfce4-session
Group: User Interface/Desktops
Requires: xfce4-session

%description engines
Additional splash screen engines for the Xfce Session Manager.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/icons/*
%{_datadir}/xfce4/*
%{_libdir}/lib*.so.*
%{_libdir}/xfce4/mcs-plugins/*
%{_libdir}/xfce4/splash/engines/libmice.*
%{_libexecdir}/xfsm-shutdown-helper
%{_mandir}/man1/*
%{_sysconfdir}/xdg/xfce4-session/*

%files devel
%defattr(-,root,root)
%{_includedir}/xfce4/xfce4-session-4.2/libxfsm/*.h
%{_libdir}/lib*.so
%{_libdir}/*a
%{_libdir}/pkgconfig/*.pc

%files engines
%defattr(-,root,root)
%{_datadir}/themes/Default/balou/*
%{_libdir}/xfce4/splash/engines/libbalou.*
%{_libdir}/xfce4/splash/engines/libsimple.*
%{_libexecdir}/balou-*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:09:03 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:09:41 -0000	1.2
@@ -0,0 +1 @@
+xfce4-session-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:09:03 -0000	1.1
+++ sources	19 Mar 2005 18:09:41 -0000	1.2
@@ -0,0 +1 @@
+6487d53d0aff82697217d8462766c31f  xfce4-session-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:11:47 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:11:47 -0500
Subject: rpms/xfce4-systray - New directory
Message-ID: <200503191811.j2JIBll0025591@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25584/xfce4-systray

Log Message:
Directory /cvs/extras/rpms/xfce4-systray added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:11:47 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:11:47 -0500
Subject: rpms/xfce4-systray/devel - New directory
Message-ID: <200503191811.j2JIBl3B025594@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25584/xfce4-systray/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-systray/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:12:00 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:12:00 -0500
Subject: rpms/xfce4-systray Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191812.j2JIC0WF025658@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25646

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-systray


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-systray
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:12:00 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:12:00 -0500
Subject: rpms/xfce4-systray/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191812.j2JIC06h025661@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25646/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-systray


--- 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 Mar 19 18:12:27 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:12:27 -0500
Subject: rpms/xfce4-systray import.log,1.1,1.2
Message-ID: <200503191812.j2JICRl7025759@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25749

Modified Files:
	import.log 
Log Message:
auto-import xfce4-systray-4.2.1-1 on branch devel from xfce4-systray-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systray/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:11:58 -0000	1.1
+++ import.log	19 Mar 2005 18:12:25 -0000	1.2
@@ -0,0 +1 @@
+xfce4-systray-4_2_1-1:HEAD:xfce4-systray-4.2.1-1.src.rpm:1111255933



From fedora-extras-commits at redhat.com  Sat Mar 19 18:12:27 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:12:27 -0500
Subject: rpms/xfce4-systray/devel xfce4-systray.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191812.j2JICRZ9025762@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25749/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-systray.spec 
Log Message:
auto-import xfce4-systray-4.2.1-1 on branch devel from xfce4-systray-4.2.1-1.src.rpm


--- NEW FILE xfce4-systray.spec ---
Summary: Systray for the Xfce4 Desktop Environment
Name: xfce4-systray
Version: 4.2.1
Release: 1
License: BSD
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-systray-4.2.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-root
Requires: xfce4-panel >= %{version}
BuildRequires: xfce4-panel >= %{version}
BuildRequires: libxml2-devel
BuildRequires: libxfcegui4-devel
BuildRequires: startup-notification-devel
BuildRequires: xfce-mcs-manager-devel

%description
This is a systemtray plugin for Xfce4.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root)
%doc README COPYING AUTHORS
%{_libdir}/xfce4

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-4
- Removed generic INSTALL from %doc
- Fixed case of Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Inital Fedora Extras version
- Updated the Source line
- Increased the Release by one

* Wed Jan 26 2005 Than Ngo <than at redhat.com> 4.2.0-1
- 4.2.0

* Wed Oct 06 2004 Than Ngo <than at redhat.com> 4.0.6-2
- more Buildrequires

* Tue Aug 17 2004 Than Ngo <than at redhat.com> 4.0.6-1 
- Initial packaging for Fedora Core 3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systray/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:11:58 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:12:25 -0000	1.2
@@ -0,0 +1 @@
+xfce4-systray-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systray/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:11:58 -0000	1.1
+++ sources	19 Mar 2005 18:12:25 -0000	1.2
@@ -0,0 +1 @@
+d85ec276685040a857e64aa74cdc4c7f  xfce4-systray-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:14:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:14:05 -0500
Subject: rpms/xfce4-toys - New directory
Message-ID: <200503191814.j2JIE5Cp025909@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25902/xfce4-toys

Log Message:
Directory /cvs/extras/rpms/xfce4-toys added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:14:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:14:05 -0500
Subject: rpms/xfce4-toys/devel - New directory
Message-ID: <200503191814.j2JIE5g2025912@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25902/xfce4-toys/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-toys/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:14:19 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:14:19 -0500
Subject: rpms/xfce4-toys Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191814.j2JIEJo4025973@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25964

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-toys


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-toys
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:14:19 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:14:19 -0500
Subject: rpms/xfce4-toys/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191814.j2JIEJMY025976@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25964/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-toys


--- 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 Mar 19 18:14:48 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:14:48 -0500
Subject: rpms/xfce4-toys import.log,1.1,1.2
Message-ID: <200503191814.j2JIEm30026077@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26067

Modified Files:
	import.log 
Log Message:
auto-import xfce4-toys-4.2.1-1 on branch devel from xfce4-toys-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-toys/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:14:17 -0000	1.1
+++ import.log	19 Mar 2005 18:14:46 -0000	1.2
@@ -0,0 +1 @@
+xfce4-toys-4_2_1-1:HEAD:xfce4-toys-4.2.1-1.src.rpm:1111256071



From fedora-extras-commits at redhat.com  Sat Mar 19 18:14:48 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:14:48 -0500
Subject: rpms/xfce4-toys/devel xfce4-toys.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191814.j2JIEmDM026080@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26067/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-toys.spec 
Log Message:
auto-import xfce4-toys-4.2.1-1 on branch devel from xfce4-toys-4.2.1-1.src.rpm


--- NEW FILE xfce4-toys.spec ---
Summary: Various tools for Xfce4
Name: xfce4-toys
Version: 4.2.1
Release: 1
License: BSD
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-toys-4.2.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xfce4-panel >= 4.2.1
BuildRequires: xfce4-panel >= 4.2.1

%description
xfce4-toys includes an "xeyes" type plugin for the Xfce4 panel
and an small application to display tips at startup.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README ChangeLog NOTES COPYING AUTHORS
%{_bindir}/*
%{_libdir}/xfce4/*
%{_datadir}/locale/*/*/xfce4-toys.mo
%{_datadir}/xfce4/eyes/*
%{_datadir}/xfce4/tips/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Upgraded to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc
- Fixed case of Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-toys/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:14:17 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:14:46 -0000	1.2
@@ -0,0 +1 @@
+xfce4-toys-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-toys/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:14:17 -0000	1.1
+++ sources	19 Mar 2005 18:14:46 -0000	1.2
@@ -0,0 +1 @@
+92cfc3d1eba5096900761706f108b59d  xfce4-toys-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:17:01 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:17:01 -0500
Subject: rpms/xfce4-trigger-launcher - New directory
Message-ID: <200503191817.j2JIH1Ia026226@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26219/xfce4-trigger-launcher

Log Message:
Directory /cvs/extras/rpms/xfce4-trigger-launcher added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:17:01 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:17:01 -0500
Subject: rpms/xfce4-trigger-launcher/devel - New directory
Message-ID: <200503191817.j2JIH14V026229@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26219/xfce4-trigger-launcher/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-trigger-launcher/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:17:14 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:17:14 -0500
Subject: rpms/xfce4-trigger-launcher Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191817.j2JIHEtr026291@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26280

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-trigger-launcher


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-trigger-launcher
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:17:14 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:17:14 -0500
Subject: rpms/xfce4-trigger-launcher/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200503191817.j2JIHE02026294@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26280/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-trigger-launcher


--- 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 Mar 19 18:17:43 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:17:43 -0500
Subject: rpms/xfce4-trigger-launcher import.log,1.1,1.2
Message-ID: <200503191817.j2JIHhpi026392@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26383

Modified Files:
	import.log 
Log Message:
auto-import xfce4-trigger-launcher-4.2.1-1 on branch devel from xfce4-trigger-launcher-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-trigger-launcher/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:17:12 -0000	1.1
+++ import.log	19 Mar 2005 18:17:41 -0000	1.2
@@ -0,0 +1 @@
+xfce4-trigger-launcher-4_2_1-1:HEAD:xfce4-trigger-launcher-4.2.1-1.src.rpm:1111256249



From fedora-extras-commits at redhat.com  Sat Mar 19 18:17:43 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:17:43 -0500
Subject: rpms/xfce4-trigger-launcher/devel xfce4-trigger-launcher.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191817.j2JIHhOZ026396@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26383/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-trigger-launcher.spec 
Log Message:
auto-import xfce4-trigger-launcher-4.2.1-1 on branch devel from xfce4-trigger-launcher-4.2.1-1.src.rpm


--- NEW FILE xfce4-trigger-launcher.spec ---
Summary: A panel plugin acting as a launcher with two states
Name: xfce4-trigger-launcher
Version: 4.2.1
Release: 1
License: BSD
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-trigger-launcher-4.2.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xfce4-panel >= 4.2.0
BuildRequires: xfce4-panel >= 4.2.0

%description
xfce4-trigger-launcher is a launcher with two states, like a trigger.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README ChangeLog COPYING AUTHORS
%{_libdir}/xfce4/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version
- Removed unneeded glob in files for lang files

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-trigger-launcher/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:17:12 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:17:41 -0000	1.2
@@ -0,0 +1 @@
+xfce4-trigger-launcher-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-trigger-launcher/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:17:12 -0000	1.1
+++ sources	19 Mar 2005 18:17:41 -0000	1.2
@@ -0,0 +1 @@
+82ac900e930782be035f2689a57425e2  xfce4-trigger-launcher-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:18:46 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:18:46 -0500
Subject: rpms/xfce-mcs-manager - New directory
Message-ID: <200503191818.j2JIIksY026530@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26523/xfce-mcs-manager

Log Message:
Directory /cvs/extras/rpms/xfce-mcs-manager added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:18:46 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:18:46 -0500
Subject: rpms/xfce-mcs-manager/devel - New directory
Message-ID: <200503191818.j2JIIkX4026533@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26523/xfce-mcs-manager/devel

Log Message:
Directory /cvs/extras/rpms/xfce-mcs-manager/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:18:59 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:18:59 -0500
Subject: rpms/xfce-mcs-manager Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191818.j2JIIxSa026594@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26585

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce-mcs-manager


--- NEW FILE Makefile ---
# Top level Makefile for module xfce-mcs-manager
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:18:59 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:18:59 -0500
Subject: rpms/xfce-mcs-manager/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191818.j2JIIxeR026597@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26585/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce-mcs-manager


--- 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 Mar 19 18:19:29 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:19:29 -0500
Subject: rpms/xfce-mcs-manager import.log,1.1,1.2
Message-ID: <200503191819.j2JIJT92026696@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26687

Modified Files:
	import.log 
Log Message:
auto-import xfce-mcs-manager-4.2.1-1 on branch devel from xfce-mcs-manager-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:18:57 -0000	1.1
+++ import.log	19 Mar 2005 18:19:26 -0000	1.2
@@ -0,0 +1 @@
+xfce-mcs-manager-4_2_1-1:HEAD:xfce-mcs-manager-4.2.1-1.src.rpm:1111256354



From fedora-extras-commits at redhat.com  Sat Mar 19 18:19:29 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:19:29 -0500
Subject: rpms/xfce-mcs-manager/devel xfce-mcs-manager.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191819.j2JIJTxc026700@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26687/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce-mcs-manager.spec 
Log Message:
auto-import xfce-mcs-manager-4.2.1-1 on branch devel from xfce-mcs-manager-4.2.1-1.src.rpm


--- NEW FILE xfce-mcs-manager.spec ---
Summary: Multi channel settings manager
Name: xfce-mcs-manager
Version: 4.2.1
Release: 1
License: LGPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-manager-4.2.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: libxfce4mcs >= %{version}
Requires: libxfcegui4 >= %{version}
BuildRequires: pkgconfig
BuildRequires: gettext
BuildRequires: libxfce4mcs-devel >= %{version}
BuildRequires: libxfcegui4-devel >= %{version}

%description
This package includes a multi channel settings manager for Xfce4

%package devel
Summary: Header file to build xfce-mcs-manager plugins
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: libxfce4mcs-devel
Requires: gtk2-devel

%description devel
This package includes the header files you will need to build
mcs plugins.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,0755)
%doc README TODO COPYING AUTHORS
%docdir %{_datadir}/xfce4/doc
%{_datadir}/xfce4/doc/C
%{_datadir}/icons/*/*/apps/*.png
%{_bindir}/*
%{_datadir}/applications/*

%files devel
%defattr(-, root, root,0755)
%{_libdir}/pkgconfig/*.pc
%{_includedir}/xfce4/xfce-mcs-manager

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Fixed case of Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Inital Fedora Extras version
- Updated the Source line
- Capitalized first letter of Summary in devel section to quiet rpmlint
- Increased the Release by one

* Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
- update to 4.2.0

* Wed Dec 08 2004 Than Ngo <than at redhat.com> 4.1.99.1-1
- update to 4.2 rc1

* Wed Sep 01 2004 Than Ngo <than at redhat.com> 4.0.6-2
- use find_lang macro

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Fri Jan 09 2004 Than Ngo <than at redhat.com> 4.0.3-1
- 4.0.3 release

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2 release

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:18:57 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:19:27 -0000	1.2
@@ -0,0 +1 @@
+xfce-mcs-manager-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:18:57 -0000	1.1
+++ sources	19 Mar 2005 18:19:27 -0000	1.2
@@ -0,0 +1 @@
+d2c8a58115ad60c49760c2079d408c51  xfce-mcs-manager-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:21:44 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:21:44 -0500
Subject: rpms/xfce-mcs-plugins - New directory
Message-ID: <200503191821.j2JILijc026856@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26849/xfce-mcs-plugins

Log Message:
Directory /cvs/extras/rpms/xfce-mcs-plugins added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:21:44 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:21:44 -0500
Subject: rpms/xfce-mcs-plugins/devel - New directory
Message-ID: <200503191821.j2JILiCG026859@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26849/xfce-mcs-plugins/devel

Log Message:
Directory /cvs/extras/rpms/xfce-mcs-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:21:58 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:21:58 -0500
Subject: rpms/xfce-mcs-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191821.j2JILwVI026920@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26911

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce-mcs-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module xfce-mcs-plugins
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:21:58 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:21:58 -0500
Subject: rpms/xfce-mcs-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191821.j2JILwEZ026923@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26911/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce-mcs-plugins


--- 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 Mar 19 18:22:33 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:22:33 -0500
Subject: rpms/xfce-mcs-plugins import.log,1.1,1.2
Message-ID: <200503191822.j2JIMXFs027046@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27035

Modified Files:
	import.log 
Log Message:
auto-import xfce-mcs-plugins-4.2.1-1 on branch devel from xfce-mcs-plugins-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:21:56 -0000	1.1
+++ import.log	19 Mar 2005 18:22:31 -0000	1.2
@@ -0,0 +1 @@
+xfce-mcs-plugins-4_2_1-1:HEAD:xfce-mcs-plugins-4.2.1-1.src.rpm:1111256539



From fedora-extras-commits at redhat.com  Sat Mar 19 18:22:33 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:22:33 -0500
Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins-4.2.0-rh.patch, NONE,
	1.1 xfce-mcs-plugins.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191822.j2JIMXRU027050@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27035/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce-mcs-plugins-4.2.0-rh.patch xfce-mcs-plugins.spec 
Log Message:
auto-import xfce-mcs-plugins-4.2.1-1 on branch devel from xfce-mcs-plugins-4.2.1-1.src.rpm

xfce-mcs-plugins-4.2.0-rh.patch:

--- NEW FILE xfce-mcs-plugins-4.2.0-rh.patch ---
--- xfce-mcs-plugins-4.2.0/plugins/ui_plugin/ui_plugin.c.orig	2004-12-27 20:05:36.000000000 +0100
+++ xfce-mcs-plugins-4.2.0/plugins/ui_plugin/ui_plugin.c	2005-01-24 11:01:02.291654459 +0100
@@ -118,8 +118,8 @@
 #define CHANNEL "settings"
 #define PLUGIN_NAME "ui"
 #define DEFAULT_THEME "Default"
-#define INITIAL_THEME "Xfce"
-#define DEFAULT_ICON_THEME "hicolor"
+#define INITIAL_THEME "Bluecurve"
+#define DEFAULT_ICON_THEME "Bluecurve"
 #define INITIAL_ICON_THEME "Rodent"
 #define DEFAULT_TOOLBAR_STYLE "icons"
 #define DEFAULT_FONT "Sans 9"


--- NEW FILE xfce-mcs-plugins.spec ---
Summary: Plugins for multi channel settings manager
Name: xfce-mcs-plugins
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-plugins-4.2.1.tar.bz2
Patch: xfce-mcs-plugins-4.2.0-rh.patch
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: gtk2 >= 2.0.6
Requires: xfce-mcs-manager >= %{version}
BuildRequires: gettext
BuildRequires: gtk2-devel >= 2.0.6
BuildRequires: xfce-mcs-manager-devel >= %{version}
BuildRequires: libxfcegui4-devel >= %{version}
BuildRequires: libxfce4util-devel >= %{version}
BuildRequires: libxfce4mcs-devel >= %{version}

%description
This package inlcudes a set of plugins for the multi channel
settings manager.

%prep
%setup -q
%patch -p1 -b .fedora

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,0755)
%doc README TODO COPYING AUTHORS
%docdir %{_datadir}/xfce4/doc
%{_datadir}/xfce4/doc/C
%{_libdir}/xfce4/mcs-plugins/*
%{_datadir}/applications/*
%{_datadir}/icons/*/*/apps/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Inital Fedora Extras version
- Updated the Source line
- Capitalized first letter of Summary in devel section to quiet rpmlint
- Increased the Release by one

* Mon Jan 24 2005 Than Ngo <than at redhat.com> 4.2.0-1
- 4.2.0

* Wed Dec 08 2004 Than Ngo <than at redhat.com> 4.1.99.1-1
- update to 4.2 rc1

* Thu Sep 02 2004 Than Ngo <than at redhat.com> 4.0.6-2
- use find_lang macro
- cleanup specfile

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6
- remove some unneeded patch files, which are included in new upstream

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Apr 20 2004 Than Ngo <than at redhat.com> 4.0.5-2
- Fix bug in default icon theme selection, thanks to Olivier Fourdan <fourdan at xfce.org>
- Add support for icon theme, Change defaults for fedora, #119647, thanks to Olivier Fourdan <fourdan at xfce.org>

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Fri Jan 09 2004 Than Ngo <than at redhat.com> 4.0.3-1
- add libxfce4util-devel, libxfcegui4-devel in BuildRequires
- 4.0.3 release

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2 release

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:21:56 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:22:31 -0000	1.2
@@ -0,0 +1 @@
+xfce-mcs-plugins-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:21:56 -0000	1.1
+++ sources	19 Mar 2005 18:22:31 -0000	1.2
@@ -0,0 +1 @@
+f53711b93e28b6751f18f6346d4194e2  xfce-mcs-plugins-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:24:30 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:24:30 -0500
Subject: rpms/xfce-utils - New directory
Message-ID: <200503191824.j2JIOUp2027205@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27198/xfce-utils

Log Message:
Directory /cvs/extras/rpms/xfce-utils added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:24:30 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:24:30 -0500
Subject: rpms/xfce-utils/devel - New directory
Message-ID: <200503191824.j2JIOU2m027208@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27198/xfce-utils/devel

Log Message:
Directory /cvs/extras/rpms/xfce-utils/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:24:44 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:24:44 -0500
Subject: rpms/xfce-utils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191824.j2JIOiUx027272@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27263

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce-utils


--- NEW FILE Makefile ---
# Top level Makefile for module xfce-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  Sat Mar 19 18:24:44 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:24:44 -0500
Subject: rpms/xfce-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191824.j2JIOiJW027275@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27263/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce-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  Sat Mar 19 18:25:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:25:20 -0500
Subject: rpms/xfce-utils import.log,1.1,1.2
Message-ID: <200503191825.j2JIPKNN027384@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27374

Modified Files:
	import.log 
Log Message:
auto-import xfce-utils-4.2.1-1 on branch devel from xfce-utils-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:24:42 -0000	1.1
+++ import.log	19 Mar 2005 18:25:18 -0000	1.2
@@ -0,0 +1 @@
+xfce-utils-4_2_1-1:HEAD:xfce-utils-4.2.1-1.src.rpm:1111256706



From fedora-extras-commits at redhat.com  Sat Mar 19 18:25:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:25:20 -0500
Subject: rpms/xfce-utils/devel xfce-utils.spec, NONE, 1.1 xfce4.desktop, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191825.j2JIPKTq027387@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27374/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce-utils.spec xfce4.desktop 
Log Message:
auto-import xfce-utils-4.2.1-1 on branch devel from xfce-utils-4.2.1-1.src.rpm


--- NEW FILE xfce-utils.spec ---
%define xsessiondir %{_datadir}/xsessions

Summary: Utilities for the Xfce Desktop Environment
Name: xfce-utils
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-utils-4.2.1.tar.bz2
Source1: xfce4.desktop
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: xfce-mcs-manager
Requires: xfwm4
Requires: xfdesktop
Requires: /usr/bin/id
BuildRequires: libxfcegui4-devel >= %{version}
BuildRequires: libxfce4mcs-devel >= %{version}
BuildRequires: xfce-mcs-manager-devel

%description
This package includes utilities for the Xfce Desktop Environment

%prep
%setup -q

%build
%configure --enable-gdm

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{xsessiondir}

make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{xsessiondir}/xfce.desktop

install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/

%find_lang %{name}

rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README TODO ChangeLog NEWS COPYING AUTHORS
%attr(0755,root,root) %{_sysconfdir}/xdg/xfce4
%{_bindir}/*
%{_libdir}/xfce4/mcs-plugins/*
%{_datadir}/apps/switchdesk/*
%{_datadir}/xfce4
%{_datadir}/icons/*/*/*
%{_datadir}/applications/*
%{xsessiondir}/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Fixed case on Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Inital Fedora Extras version
- Updated the Source line
- Removed old misc patch 
- Increased the Release by one

* Thu Jan 27 2005 Than Ngo <than at redhat.com> 4.2.0-1
- 4.2.0

* Thu Dec 02 2004 Than Ngo <than at redhat.com> 4.0.6-3
- permission fix #141597

* Mon Nov 22 2004 Than Ngo <than at redhat.com> 4.0.6-2
- add session desktop file from KDE, better translations
- improve xfterm4 #139183

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6
- use %%find_lang macros, bug #124950
- fix component deps, bug #125744
- don't run xmodmap twice, bug #115500

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Tue Jan 13 2004 Than Ngo <than at redhat.com> 4.0.3-1
- 4.0.3 release

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2 release

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build



--- NEW FILE xfce4.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=XSession
Exec=startxfce4
TryExec=startxfce4
Name=XFce 4
Name[eo]=Facoj 4
Name[pa]=XFce ???
Name[sv]=Xfce 4
Comment=The Cholesterol Free Desktop Environment, version 4. A desktop environment reminiscent of CDE
Comment[bn]=?????? ???????????????????????? ???????????? ????????????????????? ????????????????????????????????????, ???????????? ???????????????????????? CDE-??? ????????? ????????? ??????????????? ????????? ????????? ???????????? ????????????????????? ????????????????????????????????????
Comment[bs]=Cholesterol Free Desktop Environment. Desktop okolina nalik na CDE
Comment[ca]=L'entorn d'escriptori sense colesterol, versi?? 4. Un entorn d'escriptori que recorda a CDE
Comment[cy]=Yr Amgylchedd Penbwrdd Di-Golesterol, fersiwn 4.  Amgylchedd penbwrdd sy'n atgoffaol o CDE
Comment[da]=Det kolesterolfrie desktopmilj??, version 4. Et desktopmilj?? der minder om CDE
Comment[de]=Cholesterol Free Desktop Environment, Version 4. Benutzerumgebung in der Art von CDE
Comment[el]=???? Cholesterol Free Desktop Environment, ???????????? 4. ?????? ???????????????????? ???????????????????? ???????????????? ?????????????????? ?????? CDE
Comment[eo]=La libera labortablo ??irka??ajo 4
Comment[es]=El Cholesterol Free Desktop Environment, versi??n 4. Un entorno de escritorio que recuerda a CDE
Comment[et]=Kolesteroolivaba t????laua keskkond (versioon 4), mis meenutab mitmeti CDE-d
Comment[eu]=Kolesterolik gabeko idazmahai ingurunea, 4 bertsioa. CDE gogorarazten duen mahaigaina
Comment[fi]=Cholesterol Free -ty??p??yt??ymp??rist??. CDE:t?? muisteleva ty??p??yt??ymp??rist??.
Comment[fr]=The Cholesterol Free Desktop Environment, version 4. Un environnement de bureau rappelant CDE
Comment[gl]=O Cholesterol Free Desktop Environment, versi??n 4. Un entorno de escritorio reminiscencia de CDE
Comment[he]=The Cholesterol Free Desktop Environment. ???????? 4, ?????????? ?????????? ?????????????? ???? CDE
Comment[hu]=The Cholesterol Free Desktop Environment, 4-es verzi??. Egy CDE-szer?? ablakkezel??
Comment[is]=K??lesterol-lausa skj??bor??sumhverfi??, ??tg??fa 4. Skj??bor?? sem l??kist CDE
Comment[it]=Il Cholesterol Free Desktop Environment, versione 4. Un desktop environment che ricorda CDE
Comment[ja]=Cholesterol Free Desktop Environment version 4 CDE?????????????????????????????????????????????????????????
Comment[mt]=Cholesterol Free Desktop Environment (v4). Ambjent grafiku li jixba?? lis-CDE
Comment[nb]=Den Kolesterolfrie Brukerflate, versjon 4. Et skrivebordsmilj?? som minner om CDE
Comment[nds]=De Cholesterol Free Desktop Environment, Verschoon 4. En Schriefdisch-??mgeven, de wat liek is to CDE
Comment[nl]=De Cholesterol Free Desktop Environment, versie 4. Een desktop environment die herinnert aan  CDE
Comment[nn]=Cholesterol Free Desktop Environment. Eit skrivebordsmilj?? som minner om CDE
Comment[pa]=?????????????????????????????? ???????????? ?????????????????????, ???????????? ??? ????????? CDE ???????????? ?????????????????????
Comment[pl]=Cholesterol Free Desktop Environment, wersja 4 - ??rodowisko graficzne podobne do CDE.
Comment[pt]=O Cholesterol Free Desktop Environment, vers??o 4. Um ambiente de trabalho com vest??gios do CDE
Comment[pt_BR]=Acr??nimo para Cholesterol Free Desktop Environment (ou ambiente livre de colesterol), vers??o 4; um ambiente de trabalho remanescente do CDE 
Comment[ro]=Cholesterol Free Desktop Environment, versiunea 4. Un mediu grafic cu reminescente din CDE
Comment[ru]="???? ???????????????????? ??????????????????????" ?????????????? ?????????? xfce ???????????? 4, ???????????????????????? CDE
Comment[sk]=The Cholesterol Free Desktop Environment verzia 4. Pracovn?? prostredie pripom??naj??ce CDE
Comment[sl]=Cholesterol Free Desktop Environment, razli??ica 4. Namizno okolje, podobno okolju CDE
Comment[sr]=???The Cholesterol Free Desktop Environment??? 4. ????????????. ?????????? ???????????????? ???????? ?????????????? ???? CDE
Comment[sr at Latn]=???The Cholesterol Free Desktop Environment??? 4. ????????????. ?????????? ???????????????? ???????? ?????????????? ???? CDE
Comment[sv]=Den kolesterolfria skrivbordsmilj??n, version 4. En skrivbordsmilj?? som p??minner om CDE
Comment[ta]=????????????????????????????????? ?????????????????? ???????????????????????? ???????????????. ????????????????????? 4. CDE ??????????????????????????????????????? ???????????????????????? ???????????????
Comment[tr]=Cholesterol ??cretsiz Masa??st?? Ortam??, s??r??m 4. CDE'nin benzeri olan masa??st?? ortam??
Comment[uk]=The Cholesterol Free Desktop Environment, ???????????? 4. ???????????????? ????????????????????, ???? ?????????????? CDE
Comment[zh_CN]=???????????????????????????????????? 4???CDE ????????????????????????


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:24:42 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:25:18 -0000	1.2
@@ -0,0 +1 @@
+xfce-utils-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:24:42 -0000	1.1
+++ sources	19 Mar 2005 18:25:18 -0000	1.2
@@ -0,0 +1 @@
+b765cc3144731c2fc1e39a0ed70fc25b  xfce-utils-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:26:16 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:26:16 -0500
Subject: rpms/xfdesktop - New directory
Message-ID: <200503191826.j2JIQGbt027520@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27513/xfdesktop

Log Message:
Directory /cvs/extras/rpms/xfdesktop added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:26:16 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:26:16 -0500
Subject: rpms/xfdesktop/devel - New directory
Message-ID: <200503191826.j2JIQGcQ027523@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27513/xfdesktop/devel

Log Message:
Directory /cvs/extras/rpms/xfdesktop/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:26:29 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:26:29 -0500
Subject: rpms/xfdesktop Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191826.j2JIQTGF027588@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27579

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfdesktop


--- NEW FILE Makefile ---
# Top level Makefile for module xfdesktop
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:26:29 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:26:29 -0500
Subject: rpms/xfdesktop/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191826.j2JIQT07027591@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27579/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfdesktop


--- 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 Mar 19 18:27:40 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:27:40 -0500
Subject: rpms/xfdesktop import.log,1.1,1.2
Message-ID: <200503191827.j2JIReM0027700@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27691

Modified Files:
	import.log 
Log Message:
auto-import xfdesktop-4.2.1-1 on branch devel from xfdesktop-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:26:27 -0000	1.1
+++ import.log	19 Mar 2005 18:27:38 -0000	1.2
@@ -0,0 +1 @@
+xfdesktop-4_2_1-1:HEAD:xfdesktop-4.2.1-1.src.rpm:1111256845



From fedora-extras-commits at redhat.com  Sat Mar 19 18:27:40 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:27:40 -0500
Subject: rpms/xfdesktop/devel xfdesktop.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191827.j2JIReHb027704@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27691/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfdesktop.spec 
Log Message:
auto-import xfdesktop-4.2.1-1 on branch devel from xfdesktop-4.2.1-1.src.rpm


--- NEW FILE xfdesktop.spec ---
Summary: Desktop manager for the Xfce Desktop Environment
Name: xfdesktop
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfdesktop-4.2.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: gtk2 >= 2.2.0
Requires: libxfce4mcs >= 4.2.1
Requires: libxfcegui4 >= 4.2.1
BuildRequires: gtk2 >= 2.2.0
BuildRequires: libxfce4mcs-devel >= 4.2.1
BuildRequires: libxfcegui4-devel >= 4.2.1

%description
xfdesktop is a desktop manager for the Xfce Desktop Environment

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README TODO ChangeLog NEWS COPYING AUTHORS
%{_sysconfdir}
%{_bindir}/xfce4-menueditor
%{_bindir}/xfdesktop
%{_mandir}/man1/xfdesktop.1.gz
%{_libdir}/xfce4/*
%{_datadir}/applications/xfce-backdrop-settings.desktop
%{_datadir}/applications/xfce-menueditor.desktop
%{_datadir}/icons/hicolor/32x32/apps/xfce4-backdrop.png
%{_datadir}/icons/hicolor/32x32/apps/xfce4-menueditor.png
%{_datadir}/icons/hicolor/48x48/apps/xfce4-backdrop.png
%{_datadir}/icons/hicolor/48x48/apps/xfce4-menueditor.png
%{_datadir}/icons/hicolor/scalable/apps/xfce4-backdrop.svg
%{_datadir}/icons/hicolor/scalable/apps/xfce4-menueditor.svg
%{_datadir}/pixmaps/*
%{_datadir}/xfce4/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:26:27 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:27:38 -0000	1.2
@@ -0,0 +1 @@
+xfdesktop-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:26:27 -0000	1.1
+++ sources	19 Mar 2005 18:27:38 -0000	1.2
@@ -0,0 +1 @@
+91f02bb04a14f773f4877f4aa534ce0b  xfdesktop-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:31:07 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:31:07 -0500
Subject: rpms/xffm - New directory
Message-ID: <200503191831.j2JIV7tE027874@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27867/xffm

Log Message:
Directory /cvs/extras/rpms/xffm added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:31:07 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:31:07 -0500
Subject: rpms/xffm/devel - New directory
Message-ID: <200503191831.j2JIV7bx027877@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27867/xffm/devel

Log Message:
Directory /cvs/extras/rpms/xffm/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:31:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:31:20 -0500
Subject: rpms/xffm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191831.j2JIVKnr027939@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27930

Added Files:
	Makefile import.log 
Log Message:
Setup of module xffm


--- NEW FILE Makefile ---
# Top level Makefile for module xffm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:31:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:31:20 -0500
Subject: rpms/xffm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503191831.j2JIVKGb027942@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27930/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xffm


--- 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 Mar 19 18:32:14 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:32:14 -0500
Subject: rpms/xffm import.log,1.1,1.2
Message-ID: <200503191832.j2JIWE0u028052@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28043

Modified Files:
	import.log 
Log Message:
auto-import xffm-4.2.1-1 on branch devel from xffm-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xffm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:31:18 -0000	1.1
+++ import.log	19 Mar 2005 18:32:11 -0000	1.2
@@ -0,0 +1 @@
+xffm-4_2_1-1:HEAD:xffm-4.2.1-1.src.rpm:1111257119



From fedora-extras-commits at redhat.com  Sat Mar 19 18:32:14 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:32:14 -0500
Subject: rpms/xffm/devel xffm-4.0.5-rpath.patch, NONE, 1.1 xffm.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191832.j2JIWEJY028056@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28043/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xffm-4.0.5-rpath.patch xffm.spec 
Log Message:
auto-import xffm-4.2.1-1 on branch devel from xffm-4.2.1-1.src.rpm

xffm-4.0.5-rpath.patch:

--- NEW FILE xffm-4.0.5-rpath.patch ---
--- xffm-4.0.5/configure.orig	2004-05-13 14:42:21.764371688 +0200
+++ xffm-4.0.5/configure	2004-05-13 14:44:42.109609434 +0200
@@ -35263,7 +35263,7 @@
 
             echo "$as_me:$LINENO: checking DBH_LIBS" >&5
 echo $ECHO_N "checking DBH_LIBS... $ECHO_C" >&6
-            DBH_LIBS=`$PKG_CONFIG --libs "dbh-1.0 >= 1.0"`
+            DBH_LIBS=`$PKG_CONFIG --libs-only-l "dbh-1.0 >= 1.0"`
             echo "$as_me:$LINENO: result: $DBH_LIBS" >&5
 echo "${ECHO_T}$DBH_LIBS" >&6
         else


--- NEW FILE xffm.spec ---
Summary: Next generation filemanager and SMB network navigator for Xfce4
Name: xffm
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
Patch1: xffm-4.0.5-rpath.patch
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Prereq: /sbin/ldconfig
Requires: dbh >= 1.0
Requires: glib2 >= 2.0.0
Requires: gtk2 >= 2.0.0
Requires: libxfce4mcs >= 4.0.5
Requires: libxfce4util >= 4.0.5
Requires: libxfcegui4 >= 4.0.5
Requires: libxml2 >= 2.4.0
BuildRequires: dbh-devel >= 1.0
BuildRequires: glib2-devel >= 2.0.0
BuildRequires: gtk2-devel >= 2.0.0
BuildRequires: libxfce4mcs-devel >= 4.0.5
BuildRequires: libxfce4util-devel >= 4.0.5
BuildRequires: libxfcegui4-devel >= 4.0.5
BuildRequires: libxml2-devel >= 2.4.0
BuildRequires: xfce-mcs-manager-devel >= 4.0.5

%description
This package includes a filemanager and SMB network navigator for Xfce4.

%prep
%setup -q

%patch1 -p1 -b .rpath

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root)
%doc README TODO ChangeLog NEWS COPYING AUTHORS
%{_bindir}/*
%{_libdir}/lib*
%{_libdir}/xfce4/xffm/*
%{_libdir}/pkgconfig/*
%{_libdir}/xfce4/mcs-plugins/*
%{_datadir}/xffm
%{_datadir}/xfce4/*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/*
%{_mandir}/man?/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed case of Xfce
- Fixed Source0 line. 
- Removed generic INSTALL from %doc
- Inital Fedora Extras version

* Tue Jul 20 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6

* Thu Jun 17 2004 Than Ngo <than at redhat.com> 4.0.5-4
- own %{_datadir}/xffm, bug #124825
- use %%find_lang macros, bug #124954
- add buildrequires on xfce-mcs-manager-devel, bug #125061

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 13 2004 Than Ngo <than at redhat.com> 4.0.5-2
- get rid of rpath
- fix gcc34 build problem

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Thu Mar 11 2004 Than Ngo <than at redhat.com> 4.0.3-4
- fixed gcc-3.4 build problem

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Wed Jan 14 2004 Than Ngo <than at redhat.com> 4.0.3-1
- update 4.0.3

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2 release

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:31:18 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:32:11 -0000	1.2
@@ -0,0 +1 @@
+xffm-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:31:18 -0000	1.1
+++ sources	19 Mar 2005 18:32:11 -0000	1.2
@@ -0,0 +1 @@
+543aba5286949b660bd0b9eaa0e0a515  xffm-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:33:32 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:33:32 -0500
Subject: rpms/xfwm4 - New directory
Message-ID: <200503191833.j2JIXWws028196@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28187/xfwm4

Log Message:
Directory /cvs/extras/rpms/xfwm4 added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:33:32 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:33:32 -0500
Subject: rpms/xfwm4/devel - New directory
Message-ID: <200503191833.j2JIXWvo028199@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28187/xfwm4/devel

Log Message:
Directory /cvs/extras/rpms/xfwm4/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:33:45 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:33:45 -0500
Subject: rpms/xfwm4 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191833.j2JIXjDD028264@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28254

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfwm4


--- NEW FILE Makefile ---
# Top level Makefile for module xfwm4
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:33:45 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:33:45 -0500
Subject: rpms/xfwm4/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503191833.j2JIXjRw028267@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28254/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfwm4


--- 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 Mar 19 18:34:21 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:34:21 -0500
Subject: rpms/xfwm4 import.log,1.1,1.2
Message-ID: <200503191834.j2JIYLOO028377@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28365

Modified Files:
	import.log 
Log Message:
auto-import xfwm4-4.2.1-1 on branch devel from xfwm4-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:33:43 -0000	1.1
+++ import.log	19 Mar 2005 18:34:19 -0000	1.2
@@ -0,0 +1 @@
+xfwm4-4_2_1-1:HEAD:xfwm4-4.2.1-1.src.rpm:1111257247



From fedora-extras-commits at redhat.com  Sat Mar 19 18:34:21 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:34:21 -0500
Subject: rpms/xfwm4/devel xfwm4.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200503191834.j2JIYLG6028381@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28365/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfwm4.spec 
Log Message:
auto-import xfwm4-4.2.1-1 on branch devel from xfwm4-4.2.1-1.src.rpm


--- NEW FILE xfwm4.spec ---
Summary: Next generation window manager for Xfce
Name: xfwm4
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: libxfce4mcs >= 4.2.1
Requires: libxfcegui4 >= 4.2.1
Requires: xfce-mcs-manager >= 4.2.1
BuildRequires: libxfce4mcs-devel >= 4.2.1
BuildRequires: libxfcegui4-devel >= 4.2.1
BuildRequires: xfce-mcs-manager-devel >= 4.2.1

%description
xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc example.gtkrc-2.0 README TODO COPYING AUTHORS COMPOSITOR
%{_bindir}/xfwm4
%{_libdir}/xfce4
%{_datadir}/applications
%{_datadir}/icons
%{_datadir}/xfce4
%{_datadir}/xfwm4
%{_datadir}/themes

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to version 4.2.1

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc
- Fixed case of Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:33:43 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:34:19 -0000	1.2
@@ -0,0 +1 @@
+xfwm4-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:33:43 -0000	1.1
+++ sources	19 Mar 2005 18:34:19 -0000	1.2
@@ -0,0 +1 @@
+da3e434bff601fa567710fa288979e2d  xfwm4-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:35:58 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:35:58 -0500
Subject: rpms/xfprint - New directory
Message-ID: <200503191835.j2JIZw0V028528@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28521/xfprint

Log Message:
Directory /cvs/extras/rpms/xfprint added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:35:58 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:35:58 -0500
Subject: rpms/xfprint/devel - New directory
Message-ID: <200503191835.j2JIZwU5028531@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28521/xfprint/devel

Log Message:
Directory /cvs/extras/rpms/xfprint/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:36:11 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:36:11 -0500
Subject: rpms/xfprint Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191836.j2JIaBxp028595@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28586

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfprint


--- NEW FILE Makefile ---
# Top level Makefile for module xfprint
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:36:11 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:36:11 -0500
Subject: rpms/xfprint/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503191836.j2JIaBgN028598@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28586/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfprint


--- 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 Mar 19 18:36:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:36:42 -0500
Subject: rpms/xfprint import.log,1.1,1.2
Message-ID: <200503191836.j2JIagGL028704@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28690

Modified Files:
	import.log 
Log Message:
auto-import xfprint-4.2.1-1 on branch devel from xfprint-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfprint/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:36:09 -0000	1.1
+++ import.log	19 Mar 2005 18:36:39 -0000	1.2
@@ -0,0 +1 @@
+xfprint-4_2_1-1:HEAD:xfprint-4.2.1-1.src.rpm:1111257387



From fedora-extras-commits at redhat.com  Sat Mar 19 18:36:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:36:42 -0500
Subject: rpms/xfprint/devel xfprint.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191836.j2JIagYZ028703@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28690/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfprint.spec 
Log Message:
auto-import xfprint-4.2.1-1 on branch devel from xfprint-4.2.1-1.src.rpm


--- NEW FILE xfprint.spec ---
Summary: Print dialog and printer manager for Xfce 4
Name: xfprint
Version: 4.2.1
Release: 1
License: BSD
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfprint-4.2.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: glib2 >= 2.2.0
Requires: libxfcegui4 >= 4.2.1
Requires: a2ps
BuildRequires: glib2-devel >= 2.2.0
BuildRequires: libxfcegui4-devel >= 4.2.1
BuildRequires: a2ps

%description
xfprint contains a print dialog and a printer manager for the Xfce 4
Desktop Environment, it supports CUPS, BSD-LPR and file as printing
destinations.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README ChangeLog NEWS COPYING AUTHORS NOTES
%{_bindir}/*
%{_libdir}/xfce4/*
%{_datadir}/applications/*
%{_datadir}/xfce4/*
%{_datadir}/icons/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc
- Fixed case of Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:36:09 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:36:39 -0000	1.2
@@ -0,0 +1 @@
+xfprint-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:36:09 -0000	1.1
+++ sources	19 Mar 2005 18:36:39 -0000	1.2
@@ -0,0 +1 @@
+15922d7e3840ad06144d7e210621ffee  xfprint-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:39:08 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:39:08 -0500
Subject: rpms/xfwm4-themes - New directory
Message-ID: <200503191839.j2JId8FR028854@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847/xfwm4-themes

Log Message:
Directory /cvs/extras/rpms/xfwm4-themes added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:39:08 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:39:08 -0500
Subject: rpms/xfwm4-themes/devel - New directory
Message-ID: <200503191839.j2JId8Rk028857@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847/xfwm4-themes/devel

Log Message:
Directory /cvs/extras/rpms/xfwm4-themes/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:39:21 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:39:21 -0500
Subject: rpms/xfwm4-themes/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191839.j2JIdLGa028923@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28909/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfwm4-themes


--- 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 Mar 19 18:39:21 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:39:21 -0500
Subject: rpms/xfwm4-themes Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191839.j2JIdLpT028920@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28909

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfwm4-themes


--- NEW FILE Makefile ---
# Top level Makefile for module xfwm4-themes
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:39:48 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:39:48 -0500
Subject: rpms/xfwm4-themes import.log,1.1,1.2
Message-ID: <200503191839.j2JIdmDO029021@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29012

Modified Files:
	import.log 
Log Message:
auto-import xfwm4-themes-4.2.1-1 on branch devel from xfwm4-themes-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:39:19 -0000	1.1
+++ import.log	19 Mar 2005 18:39:46 -0000	1.2
@@ -0,0 +1 @@
+xfwm4-themes-4_2_1-1:HEAD:xfwm4-themes-4.2.1-1.src.rpm:1111257574



From fedora-extras-commits at redhat.com  Sat Mar 19 18:39:48 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:39:48 -0500
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191839.j2JIdm7X029026@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29012/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfwm4-themes.spec 
Log Message:
auto-import xfwm4-themes-4.2.1-1 on branch devel from xfwm4-themes-4.2.1-1.src.rpm


--- NEW FILE xfwm4-themes.spec ---
Summary: Additional themes for xfwm4
Name: xfwm4-themes
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-themes-4.2.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xfwm4
BuildArch: noarch

%description
A set of additional themes for the xfwm4 window manager.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README TODO COPYING AUTHORS
%{_datadir}/themes

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed spelling: Additionnal to Additional

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:39:19 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:39:46 -0000	1.2
@@ -0,0 +1 @@
+xfwm4-themes-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:39:19 -0000	1.1
+++ sources	19 Mar 2005 18:39:46 -0000	1.2
@@ -0,0 +1 @@
+f3c3110d1c5a7a49b53ced19512ab66a  xfwm4-themes-4.2.1.tar.bz2



From riel at redhat.com  Fri Mar 18 12:31:36 2005
From: riel at redhat.com (Rik van Riel)
Date: Fri, 18 Mar 2005 07:31:36 -0500 (EST)
Subject: devel/hamlib hamlib.spec,1.4,1.5
In-Reply-To: <200503172259.j2HMxQps031405@cvs-int.fedora.redhat.com>
References: <200503172259.j2HMxQps031405@cvs-int.fedora.redhat.com>
Message-ID: <Pine.LNX.4.61.0503180730580.26156@chimarrao.boston.redhat.com>

On Thu, 17 Mar 2005, Ignacio Vazquez-Abrams wrote:

> Update of /cvs/extras/devel/hamlib
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31399

Awesome.  I've always wanted to try out hamlib and rigcontrol,
but so far have been too lazy to compile them ;)

Thank you for this RPM.

-- 
"Debugging is twice as hard as writing the code in the first place.
Therefore, if you write the code as cleverly as possible, you are,
by definition, not smart enough to debug it." - Brian W. Kernighan



From fedora-extras-commits at redhat.com  Sun Mar 20 00:08:01 2005
From: fedora-extras-commits at redhat.com (Toni Willberg (twillber))
Date: Sat, 19 Mar 2005 19:08:01 -0500
Subject: rpms/silky/devel silky-0.5.4-desktop.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 silky.spec, 1.5, 1.6 sources, 1.3,
	1.4 silky-0.5.1-desktop.patch, 1.1, NONE
Message-ID: <200503200008.j2K081Xb006702@cvs-int.fedora.redhat.com>

Author: twillber

Update of /cvs/extras/rpms/silky/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6691

Modified Files:
	.cvsignore silky.spec sources 
Added Files:
	silky-0.5.4-desktop.patch 
Removed Files:
	silky-0.5.1-desktop.patch 
Log Message:
 - New upstream release, Silky 0.5.4
 - removed silc flags from configure, now using pkg-config


silky-0.5.4-desktop.patch:

--- NEW FILE silky-0.5.4-desktop.patch ---
--- silky-0.5.4/Makefile.in.orig	2005-03-20 01:45:10.022296880 +0200
+++ silky-0.5.4/Makefile.in	2005-03-20 01:45:45.019976424 +0200
@@ -142,7 +142,7 @@
 
 EXTRA_DIST = $(silkydoc_DATA) $(glade_DATA)
 
-gnomemenudir = $(prefix)/@NO_PREFIX_PACKAGE_MENU_DIR@/Applications
+gnomemenudir = $(prefix)/share/applications
 gnomemenu_DATA = silky.desktop
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/silky/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:20:41 -0000	1.3
+++ .cvsignore	20 Mar 2005 00:07:59 -0000	1.4
@@ -1 +1 @@
-silky-0.5.2.tar.gz
+silky-0.5.4.tar.gz


Index: silky.spec
===================================================================
RCS file: /cvs/extras/rpms/silky/devel/silky.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- silky.spec	5 Mar 2005 19:28:28 -0000	1.5
+++ silky.spec	20 Mar 2005 00:07:59 -0000	1.6
@@ -1,16 +1,15 @@
 Summary: Easy-to-use graphical SILC client
 Name: silky
-Version: 0.5.2
+Version: 0.5.4
 Release: 1
 License: GPL
 Group: Applications/Communications
 URL: http://silky.sourceforge.net/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Patch: silky-0.5.1-desktop.patch
+Patch0: silky-0.5.4-desktop.patch
 
 # mailcap is needed for /etc/mime.types
-
 Requires: mailcap
 Requires: libsilc >= 0.9.12
 
@@ -25,9 +24,8 @@
 %patch -p1
 
 %build
-%configure --with-silc-libs=%{_libdir}/silc \
- --with-silc-includes=%{_includedir}/silc \
- --with-docdir=%{_docdir}/silky-%{version}
+%configure --with-docdir=%{_docdir}/silky-%{version}
+
 make %{?_smp_mflags}
 
 %install
@@ -47,10 +45,14 @@
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Fri Oct 10 2004 Toni Willberg <toniw2iki.fi> - 0.5.2-0.fdr.1
+* Sun Mar 20 2005 Toni Willberg <toniw at iki.fi> - 0.5.4-1
+- New upstream release, Silky 0.5.4
+- removed silc flags from configure, now using pkg-config
+
+* Fri Oct 10 2004 Toni Willberg <toniw at iki.fi> - 0.5.2-0.fdr.1
 - corrected buildrequires and version number
 
-* Fri Oct 08 2004 Toni Willberg <toniw2iki.fi> - 0.5.2-0.fdr.0
+* Fri Oct 08 2004 Toni Willberg <toniw at iki.fi> - 0.5.2-0.fdr.0
 - Release 0.5.2
 
 * Sat Sep 11 2004 Toni Willberg <toniw at iki.fi> - 0.5.1-0.fdr.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/silky/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:20:41 -0000	1.3
+++ sources	20 Mar 2005 00:07:59 -0000	1.4
@@ -1 +1 @@
-6e73ec6cb441bb4ed25ca78636c8c0de  silky-0.5.2.tar.gz
+ef7a583bfb612ec16b3437f56e5c72a3  silky-0.5.4.tar.gz


--- silky-0.5.1-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar 20 01:34:47 2005
From: fedora-extras-commits at redhat.com (Toni Willberg (twillber))
Date: Sat, 19 Mar 2005 20:34:47 -0500
Subject: rpms/silky/FC-3 silky-0.5.4-desktop.patch, NONE, 1.1 silky.spec, 1.4,
	1.5 sources, 1.3, 1.4 silky-0.5.1-desktop.patch, 1.1, NONE
Message-ID: <200503200134.j2K1Yl7R008794@cvs-int.fedora.redhat.com>

Author: twillber

Update of /cvs/extras/rpms/silky/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8782/FC-3

Modified Files:
	silky.spec sources 
Added Files:
	silky-0.5.4-desktop.patch 
Removed Files:
	silky-0.5.1-desktop.patch 
Log Message:
 - release 0.5.4


silky-0.5.4-desktop.patch:

--- NEW FILE silky-0.5.4-desktop.patch ---
--- silky-0.5.4/Makefile.in.orig	2005-03-20 01:45:10.022296880 +0200
+++ silky-0.5.4/Makefile.in	2005-03-20 01:45:45.019976424 +0200
@@ -142,7 +142,7 @@
 
 EXTRA_DIST = $(silkydoc_DATA) $(glade_DATA)
 
-gnomemenudir = $(prefix)/@NO_PREFIX_PACKAGE_MENU_DIR@/Applications
+gnomemenudir = $(prefix)/share/applications
 gnomemenu_DATA = silky.desktop
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs


Index: silky.spec
===================================================================
RCS file: /cvs/extras/rpms/silky/FC-3/silky.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- silky.spec	10 Dec 2004 22:03:11 -0000	1.4
+++ silky.spec	20 Mar 2005 01:34:45 -0000	1.5
@@ -1,22 +1,20 @@
-Summary: Silky is an easy-to-use graphical SILC client.
+Summary: Easy-to-use graphical SILC client
 Name: silky
-Version: 0.5.2
+Version: 0.5.4
 Release: 1
 License: GPL
 Group: Applications/Communications
 URL: http://silky.sourceforge.net/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Patch: silky-0.5.1-desktop.patch
-Epoch: 0
+Patch0: silky-0.5.4-desktop.patch
 
 # mailcap is needed for /etc/mime.types
-
 Requires: mailcap
-Requires: libsilc >= 0:0.9.12
+Requires: libsilc >= 0.9.12
 
 BuildRequires: gtk2-devel libxml2-devel libglade2-devel
-BuildRequires: libsilc-devel >= 0:0.9.12
+BuildRequires: libsilc-devel >= 0.9.12
 
 %description
 Silky is a graphical SILC client.
@@ -26,8 +24,8 @@
 %patch -p1
 
 %build
-%configure --with-silc-libs=%{_libdir}/silc \
- --with-silc-includes=%{_includedir}/silc --with-docdir=%{_docdir}/silky-%{version}
+%configure --with-docdir=%{_docdir}/silky-%{version}
+
 make %{?_smp_mflags}
 
 %install
@@ -47,10 +45,14 @@
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Fri Oct 10 2004 Toni Willberg <toniw2iki.fi> - 0.5.2-0.fdr.1
+* Sun Mar 20 2005 Toni Willberg <toniw at iki.fi> - 0.5.4-1
+- New upstream release, Silky 0.5.4
+- removed silc flags from configure, now using pkg-config
+
+* Fri Oct 10 2004 Toni Willberg <toniw at iki.fi> - 0.5.2-0.fdr.1
 - corrected buildrequires and version number
 
-* Fri Oct 08 2004 Toni Willberg <toniw2iki.fi> - 0.5.2-0.fdr.0
+* Fri Oct 08 2004 Toni Willberg <toniw at iki.fi> - 0.5.2-0.fdr.0
 - Release 0.5.2
 
 * Sat Sep 11 2004 Toni Willberg <toniw at iki.fi> - 0.5.1-0.fdr.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/silky/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:20:41 -0000	1.3
+++ sources	20 Mar 2005 01:34:45 -0000	1.4
@@ -1 +1 @@
-6e73ec6cb441bb4ed25ca78636c8c0de  silky-0.5.2.tar.gz
+ef7a583bfb612ec16b3437f56e5c72a3  silky-0.5.4.tar.gz


--- silky-0.5.1-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar 20 01:38:27 2005
From: fedora-extras-commits at redhat.com (Toni Willberg (twillber))
Date: Sat, 19 Mar 2005 20:38:27 -0500
Subject: rpms/silky/FC-3 .cvsignore,1.3,1.4
Message-ID: <200503200138.j2K1cRgR008886@cvs-int.fedora.redhat.com>

Author: twillber

Update of /cvs/extras/rpms/silky/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8876

Modified Files:
	.cvsignore 
Log Message:
 - release 0.5.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/silky/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:20:41 -0000	1.3
+++ .cvsignore	20 Mar 2005 01:38:25 -0000	1.4
@@ -1 +1 @@
-silky-0.5.2.tar.gz
+silky-0.5.4.tar.gz



From rc040203 at freenet.de  Sun Mar 20 06:57:48 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Sun, 20 Mar 2005 07:57:48 +0100
Subject: rpms/libxfce4mcs/devel libxfce4mcs.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503191732.j2JHWQIA020787@cvs-int.fedora.redhat.com>
References: <200503191732.j2JHWQIA020787@cvs-int.fedora.redhat.com>
Message-ID: <1111301868.2475.195.camel@mccallum.corsepiu.local>

On Sat, 2005-03-19 at 12:32 -0500, Kevin Fenzi wrote:
> Author: kevin
> 
> Update of /cvs/extras/rpms/libxfce4mcs/devel

> Added Files:
> 	libxfce4mcs.spec 
> Log Message:
> auto-import libxfce4mcs-4.2.1-1 on branch devel from libxfce4mcs-4.2.1-1.src.rpm

> %install
> rm -rf $RPM_BUILD_ROOT
> make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

The "mandir=%{_mandir}" is redundant/superfluous, and probably also in
most (all?) of your xfce*.specs.

Ralf



From fedora-extras-commits at redhat.com  Sun Mar 20 07:28:04 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:28:04 -0500
Subject: rpms/dbh/devel dbh.spec,1.1,1.2
Message-ID: <200503200728.j2K7S4Ks022311@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/dbh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22290

Modified Files:
	dbh.spec 
Log Message:
remove moronic changelog lines and prep for FC4 build



Index: dbh.spec
===================================================================
RCS file: /cvs/extras/rpms/dbh/devel/dbh.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbh.spec	19 Mar 2005 17:36:03 -0000	1.1
+++ dbh.spec	20 Mar 2005 07:28:02 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Disk based hash library
 Name: dbh
 Version: 1.0.22
-Release: 1
+Release: 2.FC4
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src/dbh-1.0.22.tar.gz
 Patch: dbh-1.0.22-rpath.patch
@@ -63,18 +63,18 @@
 %{_includedir}/*
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 1:1.0.22-2
+- remove stuff
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 1:1.0.22-1
 - Updated to 4.2.1 version
 - Rediffed rpath patch for new version
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 1:1.0.20-3
-- Removed generic INSTALL doc from doc
+- Removed generic INSTALL doc
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 1:1.0.20-2
-- Inital fedora extras version
-- Updated Source line
 - Changed license to LGPL
-- Increased the Release version by one
 
 * Wed Dec 08 2004 Than Ngo <than at redhat.com> 1:1.0.20-1
 - update to 1.0.20



From fedora-extras-commits at redhat.com  Sun Mar 20 07:34:01 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:34:01 -0500
Subject: rpms/libxfce4util/devel libxfce4util.spec,1.1,1.2
Message-ID: <200503200734.j2K7Y18F022451@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22435

Modified Files:
	libxfce4util.spec 
Log Message:
remove moronic lines and prep for FC4 build



Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libxfce4util.spec	19 Mar 2005 17:47:51 -0000	1.1
+++ libxfce4util.spec	20 Mar 2005 07:33:59 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
 Version: 4.2.1
-Release: 1
+Release: 1.FC4
 License: BSD and LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4util-4.2.1.tar.bz2
@@ -58,6 +58,9 @@
 %doc %{_datadir}/gtk-doc/html/libxfce4util
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- remove stuff 
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
@@ -67,10 +70,8 @@
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
 - Inital Fedora Extras version
-- Updated Source line
 - Capitalized first letter of Summary in devel section to quiet rpmlint
 - Added LGPL to License as 2 files are under LGPL, the rest BSD
-- Increased the Release version by one
 
 * Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - update to 4.2.0 release



From fedora-extras-commits at redhat.com  Sun Mar 20 07:41:26 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:41:26 -0500
Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.1,1.2
Message-ID: <200503200741.j2K7fQWs022599@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22585

Modified Files:
	libxfcegui4.spec 
Log Message:
remove moronic lines and prep for FC4 build



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libxfcegui4.spec	19 Mar 2005 17:52:16 -0000	1.1
+++ libxfcegui4.spec	20 Mar 2005 07:41:24 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
 Version: 4.2.1
-Release: 2
+Release: 3.FC4
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfcegui4-4.2.1.tar.bz2
@@ -67,6 +67,9 @@
 %{_datadir}/gtk-doc/html/libxfcegui4
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-3
+- remove stuff
+
 * Wed Mar 16 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
 - Fixed %files bug that wasn't packaging .so files
 
@@ -77,14 +80,11 @@
 - Fixed Xfce case
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Inital Fedora Extras version
-- Updated the Source line
 - Capitalized first letter of Summary in devel section to quiet rpmlint
 - Added dbh-devel to BuildRequires
 - Capitalized the GTK in the Summary to queit rpmlint
 - Moved all the module *.a and *.la libraries to the devel package
 - Added Provides: libxfcegui4-devel to devel package
-- Increased the Relase version by one
 
 * Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - update to 4.2.0



From fedora-extras-commits at redhat.com  Sun Mar 20 07:42:17 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:42:17 -0500
Subject: rpms/libxfce4util/devel libxfce4util.spec,1.2,1.3
Message-ID: <200503200742.j2K7gHtR022655@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22640

Modified Files:
	libxfce4util.spec 
Log Message:
bump



Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libxfce4util.spec	20 Mar 2005 07:33:59 -0000	1.2
+++ libxfce4util.spec	20 Mar 2005 07:42:15 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
 Version: 4.2.1
-Release: 1.FC4
+Release: 2.FC4
 License: BSD and LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4util-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar 20 07:45:09 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:45:09 -0500
Subject: rpms/libxfce4mcs/devel libxfce4mcs.spec,1.1,1.2
Message-ID: <200503200745.j2K7j9XA022750@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22736

Modified Files:
	libxfce4mcs.spec 
Log Message:
remove and prep for FC4 build



Index: libxfce4mcs.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/libxfce4mcs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libxfce4mcs.spec	19 Mar 2005 17:32:24 -0000	1.1
+++ libxfce4mcs.spec	20 Mar 2005 07:45:07 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Multi-channel settings management support for Xfce
 Name: libxfce4mcs
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4mcs-4.2.1.tar.bz2
@@ -61,6 +61,9 @@
 %{_datadir}/gtk-doc/html/libxfce4mcs
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- remove stuff
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
@@ -68,10 +71,7 @@
 - Fixed Xfce case
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Inital Fedora Extras version
-- Updated the Source line
 - Capitalized first letter of Summary in devel section to quiet rpmlint
-- Increased the Relase version by one
 
 * Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - update to 4.2.0



From fedora-extras-commits at redhat.com  Sun Mar 20 07:47:28 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:47:28 -0500
Subject: rpms/xfce-mcs-manager/devel xfce-mcs-manager.spec,1.1,1.2
Message-ID: <200503200747.j2K7lSEb022852@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22840

Modified Files:
	xfce-mcs-manager.spec 
Log Message:
remove and prep for FC4 build



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/xfce-mcs-manager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce-mcs-manager.spec	19 Mar 2005 18:19:27 -0000	1.1
+++ xfce-mcs-manager.spec	20 Mar 2005 07:47:26 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-manager-4.2.1.tar.bz2
@@ -59,6 +59,9 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- remove stuff
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
@@ -66,10 +69,7 @@
 - Fixed case of Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Inital Fedora Extras version
-- Updated the Source line
 - Capitalized first letter of Summary in devel section to quiet rpmlint
-- Increased the Release by one
 
 * Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - update to 4.2.0



From fedora-extras-commits at redhat.com  Sun Mar 20 07:50:48 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:50:48 -0500
Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.1,1.2
Message-ID: <200503200750.j2K7om5w022959@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22945

Modified Files:
	xfce4-panel.spec 
Log Message:
remove stuff and prep for FC4 build



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-panel.spec	19 Mar 2005 18:07:51 -0000	1.1
+++ xfce4-panel.spec	20 Mar 2005 07:50:46 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.2.1.1
-Release: 1
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-panel-4.2.1.1.tar.bz2
@@ -65,6 +65,9 @@
 %{_includedir}/xfce4
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1.1-2
+- remove stuff
+
 * Thu Mar 17 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1.1-1
 - Updated to 4.2.1.1 version
 - Changed Requires/Buildrequires to 4.2.1, as xfce4-panel was the only package updated to 4.2.1.1
@@ -76,11 +79,8 @@
 - Fixed case of Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
-- Inital Fedora Extras version
-- Updated the Source line
 - Created a new patch to change mozilla -mail to launchmail
 - Moved the includes to the devel subpackage
-- Increased the Release by one
 
 * Thu Feb 03 2005 Than Ngo <than at redhat.com> 4.2.0-2
 - new sub package xfce4-panel-devel



From fedora-extras-commits at redhat.com  Sun Mar 20 07:53:33 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:53:33 -0500
Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.2,1.3
Message-ID: <200503200753.j2K7rXqS023040@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23020

Modified Files:
	libxfcegui4.spec 
Log Message:
dbh has an epoch of 1
I could have added the epoch to the versioned requires
but this really doesn't need a version, so removed instead



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libxfcegui4.spec	20 Mar 2005 07:41:24 -0000	1.2
+++ libxfcegui4.spec	20 Mar 2005 07:53:31 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
 Version: 4.2.1
-Release: 3.FC4
+Release: 3.FC3
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfcegui4-4.2.1.tar.bz2
@@ -12,7 +12,7 @@
 Requires: libxfce4util >= %{version}
 BuildRequires: gtk2-devel >= 2.0.6
 BuildRequires: libxfce4util-devel >= %{version}
-BuildRequires: dbh-devel >= 1.0
+BuildRequires: dbh-devel
 
 %description
 The package includes various gtk widgets for Xfce.
@@ -68,7 +68,7 @@
 
 %changelog
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-3
-- remove stuff
+- remove stuff, remove version from dbh-devel buildreq
 
 * Wed Mar 16 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
 - Fixed %files bug that wasn't packaging .so files



From fedora-extras-commits at redhat.com  Sun Mar 20 07:54:00 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:54:00 -0500
Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.3,1.4
Message-ID: <200503200754.j2K7s0q3023104@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23091

Modified Files:
	libxfcegui4.spec 
Log Message:
oops



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libxfcegui4.spec	20 Mar 2005 07:53:31 -0000	1.3
+++ libxfcegui4.spec	20 Mar 2005 07:53:58 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
 Version: 4.2.1
-Release: 3.FC3
+Release: 3.FC4
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfcegui4-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar 20 08:40:44 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 03:40:44 -0500
Subject: rpms/xfce4-iconbox/devel xfce4-iconbox.spec,1.1,1.2
Message-ID: <200503200840.j2K8eiEv025275@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-iconbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25257

Modified Files:
	xfce4-iconbox.spec 
Log Message:
prep for FC4 build



Index: xfce4-iconbox.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-iconbox/devel/xfce4-iconbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-iconbox.spec	19 Mar 2005 18:00:34 -0000	1.1
+++ xfce4-iconbox.spec	20 Mar 2005 08:40:42 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Icon box for the Xfce4 Desktop Environment
 Name: xfce4-iconbox
 Version: 4.2.1
-Release: 1
+Release: 1.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-iconbox-4.2.1.tar.bz2
@@ -53,8 +53,6 @@
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
 - Inital Fedora Extras version
-- Updated the Source line
-- Increased the Release by one
 
 * Fri Jan 28 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - 4.2.0



From fedora-extras-commits at redhat.com  Sun Mar 20 08:43:41 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 03:43:41 -0500
Subject: rpms/xfce4-systray/devel xfce4-systray.spec,1.1,1.2
Message-ID: <200503200843.j2K8hfdT025401@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25386/xfce4-systray/devel

Modified Files:
	xfce4-systray.spec 
Log Message:
remove macro from changelog and prep for FC4 build



Index: xfce4-systray.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systray/devel/xfce4-systray.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-systray.spec	19 Mar 2005 18:12:25 -0000	1.1
+++ xfce4-systray.spec	20 Mar 2005 08:43:39 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Systray for the Xfce4 Desktop Environment
 Name: xfce4-systray
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-systray-4.2.1.tar.bz2
@@ -39,17 +39,18 @@
 %{_libdir}/xfce4
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- remove macro from changelog
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-4
-- Removed generic INSTALL from %doc
+- Removed generic INSTALL from doc
 - Fixed case of Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
 - Inital Fedora Extras version
-- Updated the Source line
-- Increased the Release by one
 
 * Wed Jan 26 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - 4.2.0



From fedora-extras-commits at redhat.com  Sun Mar 20 08:47:59 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 03:47:59 -0500
Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins.spec,1.1,1.2
Message-ID: <200503200847.j2K8lxMU025606@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25592

Modified Files:
	xfce-mcs-plugins.spec 
Log Message:
remove explicit gtk2 req and prep for FC4 build



Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce-mcs-plugins.spec	19 Mar 2005 18:22:31 -0000	1.1
+++ xfce-mcs-plugins.spec	20 Mar 2005 08:47:57 -0000	1.2
@@ -1,14 +1,13 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-plugins-4.2.1.tar.bz2
 Patch: xfce-mcs-plugins-4.2.0-rh.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: gtk2 >= 2.0.6
 Requires: xfce-mcs-manager >= %{version}
 BuildRequires: gettext
 BuildRequires: gtk2-devel >= 2.0.6
@@ -48,14 +47,14 @@
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- remove explicit gtk2 req
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Inital Fedora Extras version
-- Updated the Source line
 - Capitalized first letter of Summary in devel section to quiet rpmlint
-- Increased the Release by one
 
 * Mon Jan 24 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - 4.2.0



From fedora-extras-commits at redhat.com  Sun Mar 20 08:49:50 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 03:49:50 -0500
Subject: rpms/xfce-utils/devel xfce-utils.spec,1.1,1.2
Message-ID: <200503200849.j2K8noBR025696@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25682

Modified Files:
	xfce-utils.spec 
Log Message:
prep for FC4 build



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce-utils.spec	19 Mar 2005 18:25:18 -0000	1.1
+++ xfce-utils.spec	20 Mar 2005 08:49:48 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
 Version: 4.2.1
-Release: 1
+Release: 1.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-utils-4.2.1.tar.bz2
@@ -66,10 +66,7 @@
 - Fixed case on Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Inital Fedora Extras version
-- Updated the Source line
 - Removed old misc patch 
-- Increased the Release by one
 
 * Thu Jan 27 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - 4.2.0



From fedora-extras-commits at redhat.com  Sun Mar 20 09:57:51 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Sun, 20 Mar 2005 04:57:51 -0500
Subject: rpms/sabayon/devel sabayon.spec,1.3,1.4
Message-ID: <200503200957.j2K9vphu031385@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31375

Modified Files:
	sabayon.spec 
Log Message:
* Sun Mar 20 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-4
- Split the package into sabayon and sabayon-admin
- BuildRequires: gettext instead of gettext-devel



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sabayon.spec	19 Mar 2005 09:23:45 -0000	1.3
+++ sabayon.spec	20 Mar 2005 09:57:49 -0000	1.4
@@ -6,7 +6,7 @@
 
 Name:    sabayon
 Version: 0.16
-Release: 3
+Release: 4
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -24,7 +24,7 @@
 Requires: shadow-utils
 
 BuildRequires: python
-BuildRequires: gettext-devel
+BuildRequires: gettext
 BuildRequires: desktop-file-utils
 
 Requires(post):  shadow-utils
@@ -34,6 +34,15 @@
 Sabayon is a tool to help sysadmins and user change and maintain the
 default behaviour of the GNOME desktop.
 
+%package  admin
+Summary:  Graphical tools for Sabayon profile management
+Group:    Applications/System
+Requires: %{name} = %{version}-%{release}
+
+%description admin
+The sabayon-admin package contains the graphical tools which a
+sysadmin should use to manage Sabayon profiles.
+
 %prep
 %setup -q
 
@@ -61,48 +70,107 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-/usr/sbin/groupadd -r %{name} &>/dev/null || :
-/usr/sbin/useradd  -r -s /sbin/nologin -c "Sabayon user" -g %{name} %{name} &>/dev/null || :
-/usr/sbin/usermod -d "" %{name} &>/dev/null || :
+%pre admin
+/usr/sbin/groupadd -r %{name}-admin &>/dev/null || :
+/usr/sbin/useradd  -r -s /sbin/nologin -c "Sabayon user" -g %{name}-admin %{name}-admin &>/dev/null || :
+/usr/sbin/usermod -d "" %{name}-admin &>/dev/null || :
 
-%postun
+%postun admin
 if [ $1 -eq 0 ]; then
-  /usr/sbin/userdel  %{name} &>/dev/null || :
-  /usr/sbin/groupdel %{name} &>/dev/null || :
+  /usr/sbin/userdel  %{name}-admin &>/dev/null || :
+  /usr/sbin/groupdel %{name}-admin &>/dev/null || :
 fi
 
 %files -f sabayon.lang
 %defattr(-, root, root, 755)
 
 %doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES
-%doc doc/index.html doc/testing.html doc/helping.html doc/developing.html
-%doc doc/sabayon.css doc/*.jpg doc/*.gif
 
 %config(noreplace) %{_sysconfdir}/gconf/2/local-defaults.path
 %config(noreplace) %{_sysconfdir}/gconf/2/local-mandatory.path
-%config(noreplace) %{_sysconfdir}/pam.d/%{name}
-%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 %config(noreplace) %{_sysconfdir}/X11/xinit/xinitrc.d/%{name}*
 
 %{_sysconfdir}/desktop-profiles
 
-%{_bindir}/%{name}*
-%{_sbindir}/%{name}*
+%{_sbindir}/%{name}-apply
+
+%{python_sitelib}/%{name}/__init__.py
+%{python_sitelib}/%{name}/__init__.pyc
+%ghost %{python_sitelib}/%{name}/__init__.pyo
+%{python_sitelib}/%{name}/config.py
+%{python_sitelib}/%{name}/config.pyc
+%ghost %{python_sitelib}/%{name}/config.pyo
+%{python_sitelib}/%{name}/storage.py
+%{python_sitelib}/%{name}/storage.pyc
+%ghost %{python_sitelib}/%{name}/storage.pyo
+%{python_sitelib}/%{name}/userdb.py
+%{python_sitelib}/%{name}/userdb.pyc
+%ghost %{python_sitelib}/%{name}/userdb.pyo
+%{python_sitelib}/%{name}/userprofile.py
+%{python_sitelib}/%{name}/userprofile.pyc
+%ghost %{python_sitelib}/%{name}/userprofile.pyo
+%{python_sitelib}/%{name}/util.py
+%{python_sitelib}/%{name}/util.pyc
+%ghost %{python_sitelib}/%{name}/util.pyo
+
+%{python_sitelib}/%{name}/sources/*.py
+%{python_sitelib}/%{name}/sources/*.pyc
+%ghost %{python_sitelib}/%{name}/sources/*.pyo
+
+%files admin
+%doc doc/index.html doc/testing.html doc/helping.html doc/developing.html
+%doc doc/sabayon.css doc/*.jpg doc/*.gif
+
+%config(noreplace) %{_sysconfdir}/pam.d/%{name}
+%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
+
+%{_bindir}/%{name}
+%{_sbindir}/%{name}
 %{_libexecdir}/%{name}*
 
 %{_datadir}/%{name}/glade/%{name}.glade
 %{_datadir}/applications/gnome-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
-%{python_sitelib}/%{name}/*.py
-%{python_sitelib}/%{name}/*.pyc
-%ghost %{python_sitelib}/%{name}/*.pyo
-%{python_sitelib}/%{name}/sources/*.py
-%{python_sitelib}/%{name}/sources/*.pyc
-%ghost %{python_sitelib}/%{name}/sources/*.pyo
+%{python_sitelib}/%{name}/aboutdialog.py
+%{python_sitelib}/%{name}/aboutdialog.pyc
+%ghost %{python_sitelib}/%{name}/aboutdialog.pyo
+%{python_sitelib}/%{name}/dirmonitor.py
+%{python_sitelib}/%{name}/dirmonitor.pyc
+%ghost %{python_sitelib}/%{name}/dirmonitor.pyo
+%{python_sitelib}/%{name}/editorwindow.py
+%{python_sitelib}/%{name}/editorwindow.pyc
+%ghost %{python_sitelib}/%{name}/editorwindow.pyo
+%{python_sitelib}/%{name}/fileviewer.py
+%{python_sitelib}/%{name}/fileviewer.pyc
+%ghost %{python_sitelib}/%{name}/fileviewer.pyo
+%{python_sitelib}/%{name}/gconfviewer.py
+%{python_sitelib}/%{name}/gconfviewer.pyc
+%ghost %{python_sitelib}/%{name}/gconfviewer.pyo
+%{python_sitelib}/%{name}/monitorwindow.py
+%{python_sitelib}/%{name}/monitorwindow.pyc
+%ghost %{python_sitelib}/%{name}/monitorwindow.pyo
+%{python_sitelib}/%{name}/profilesdialog.py
+%{python_sitelib}/%{name}/profilesdialog.pyc
+%ghost %{python_sitelib}/%{name}/profilesdialog.pyo
+%{python_sitelib}/%{name}/protosession.py
+%{python_sitelib}/%{name}/protosession.pyc
+%ghost %{python_sitelib}/%{name}/protosession.pyo
+%{python_sitelib}/%{name}/saveconfirm.py
+%{python_sitelib}/%{name}/saveconfirm.pyc
+%ghost %{python_sitelib}/%{name}/saveconfirm.pyo
+%{python_sitelib}/%{name}/usermod.py
+%{python_sitelib}/%{name}/usermod.pyc
+%ghost %{python_sitelib}/%{name}/usermod.pyo
+%{python_sitelib}/%{name}/userswindow.py
+%{python_sitelib}/%{name}/userswindow.pyc
+%ghost %{python_sitelib}/%{name}/userswindow.pyo
 
 %changelog
+* Sun Mar 20 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-4
+- Split the package into sabayon and sabayon-admin
+- BuildRequires: gettext instead of gettext-devel
+
 * Sat Mar 19 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-3
 - Remove period at the end of the summary
 - Specify full URL for source



From fedora-extras-commits at redhat.com  Sun Mar 20 13:08:45 2005
From: fedora-extras-commits at redhat.com (Toni Willberg (twillber))
Date: Sun, 20 Mar 2005 08:08:45 -0500
Subject: rpms/silky/FC-3 silky.spec,1.5,1.6
Message-ID: <200503201308.j2KD8jqW004857@cvs-int.fedora.redhat.com>

Author: twillber

Update of /cvs/extras/rpms/silky/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4849

Modified Files:
	silky.spec 
Log Message:
 - corrected release tag for FC3



Index: silky.spec
===================================================================
RCS file: /cvs/extras/rpms/silky/FC-3/silky.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- silky.spec	20 Mar 2005 01:34:45 -0000	1.5
+++ silky.spec	20 Mar 2005 13:08:43 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Easy-to-use graphical SILC client
 Name: silky
 Version: 0.5.4
-Release: 1
+Release: 0.FC3
 License: GPL
 Group: Applications/Communications
 URL: http://silky.sourceforge.net/
@@ -48,6 +48,7 @@
 * Sun Mar 20 2005 Toni Willberg <toniw at iki.fi> - 0.5.4-1
 - New upstream release, Silky 0.5.4
 - removed silc flags from configure, now using pkg-config
+- corrected release tag to 0.FC3, to distinguish from devel
 
 * Fri Oct 10 2004 Toni Willberg <toniw at iki.fi> - 0.5.2-0.fdr.1
 - corrected buildrequires and version number



From fedora-extras-commits at redhat.com  Sun Mar 20 19:16:52 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 20 Mar 2005 14:16:52 -0500
Subject: rpms/gai/FC-3 gai-0.5.8-multilib.patch,1.1,1.2 gai.spec,1.8,1.9
Message-ID: <200503201916.j2KJGqXd014186@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14175

Modified Files:
	gai-0.5.8-multilib.patch gai.spec 
Log Message:
* Sun Mar 20 2005 Fabrice Colin <fabrice.colin[AT]gmail.com> - 0.5.8-6
- Make gai.pc multilib friendly so that 'pkg-config --exists gai' 
  doesn't fail on x86_64.



gai-0.5.8-multilib.patch:

Index: gai-0.5.8-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/gai/FC-3/gai-0.5.8-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gai-0.5.8-multilib.patch	25 Feb 2005 18:06:58 -0000	1.1
+++ gai-0.5.8-multilib.patch	20 Mar 2005 19:16:50 -0000	1.2
@@ -39,3 +39,13 @@
  clean:
  	rm -f *.o *~ *@LIB_END@
  
+--- gai-0.5.8.old/gai.pc.in     2005-03-20 11:18:30.593311880 +0000
++++ gai-0.5.8/gai.pc.in 2005-03-20 11:18:49.061504288 +0000
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib/gai
++libdir=@libdir@/gai
+ includedir=${prefix}/include
+ gnome=@gnome_installed@
+ gl=@gl_installed@


Index: gai.spec
===================================================================
RCS file: /cvs/extras/rpms/gai/FC-3/gai.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gai.spec	13 Mar 2005 05:25:43 -0000	1.8
+++ gai.spec	20 Mar 2005 19:16:50 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		gai
 Version:	0.5.8
-Release:	5
+Release:	6
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -68,6 +68,10 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Sun Mar 20 2005 Fabrice Colin <fabrice.colin[AT]gmail.com> - 0.5.8-6
+- Make gai.pc multilib friendly so that 'pkg-config --exists gai' 
+  doesn't fail on x86_64.
+
 * Sun Mar 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-5
 - Really add gtkglext-devel dependencies (Fabrice Colin).
 



From fedora-extras-commits at redhat.com  Sun Mar 20 19:18:43 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 20 Mar 2005 14:18:43 -0500
Subject: devel/gai gai-0.5.8-gcc4.patch, NONE, 1.1 gai-0.5.8-multilib.patch,
	1.1, 1.2 gai.spec, 1.9, 1.10
Message-ID: <200503201918.j2KJIhOr014251@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gai
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14241

Modified Files:
	gai-0.5.8-multilib.patch gai.spec 
Added Files:
	gai-0.5.8-gcc4.patch 
Log Message:
* Sun Mar 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-7
- Fix lvalue assignment errors for GCC4.

* Sun Mar 20 2005 Fabrice Colin <fabrice.colin[AT]gmail.com> - 0.5.8-6
- Make gai.pc multilib friendly so that 'pkg-config --exists gai' 
  doesn't fail on x86_64.



gai-0.5.8-gcc4.patch:

--- NEW FILE gai-0.5.8-gcc4.patch ---
diff -Nur gai-0.5.8-orig/gai/gai-pref2.c gai-0.5.8/gai/gai-pref2.c
--- gai-0.5.8-orig/gai/gai-pref2.c	2004-09-12 10:17:58.000000000 +0200
+++ gai-0.5.8/gai/gai-pref2.c	2005-03-20 20:09:30.000000000 +0100
@@ -870,7 +870,7 @@
 
 	    
 	    if(j == g_list_length((GList *)((int *)iw[i].result)[0])){
-		(GList *)((int *)iw[i].result)[0] = g_list_append((GList *)((int *)iw[i].result)[0], 
+		((int *)iw[i].result)[0] = (GList *)g_list_append((GList *)((int *)iw[i].result)[0], 
 								  g_strdup(buff));
 	    } 
 	    ((int *)iw[i].result2)[0] = j;
diff -Nur gai-0.5.8-orig/gai/gai-pref.c gai-0.5.8/gai/gai-pref.c
--- gai-0.5.8-orig/gai/gai-pref.c	2004-03-18 08:56:35.000000000 +0100
+++ gai-0.5.8/gai/gai-pref.c	2005-03-20 20:08:27.000000000 +0100
@@ -967,8 +967,8 @@
 
 	    if((unsigned char*)(((int *)iw[i].result)[0]) != NULL &&
 	       (unsigned char*)(((int *)iw[i].default_val)[0]) != NULL)
-		(unsigned char*)(((int *)iw[i].result)[0]) = 
-		    (unsigned char*)(((int *)iw[i].default_val)[0]) = g_strdup(buff);
+		(((int *)iw[i].result)[0]) = 
+		    (((int *)iw[i].default_val)[0]) = (unsigned char*)g_strdup(buff);
 
 
 	    //printf("%s\n",buff);
@@ -988,7 +988,7 @@
 
 	    
 	    if(j == g_list_length((GList *)((int *)iw[i].result)[0])){
-		(GList *)((int *)iw[i].result)[0] = g_list_append((GList *)((int *)iw[i].result)[0], 
+		((int *)iw[i].result)[0] = (GList *)g_list_append((GList *)((int *)iw[i].result)[0], 
 								  g_strdup(buff));
 		//		printf("%s is a new entry\n",buff);
 	    } 

gai-0.5.8-multilib.patch:

Index: gai-0.5.8-multilib.patch
===================================================================
RCS file: /cvs/extras/devel/gai/gai-0.5.8-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gai-0.5.8-multilib.patch	25 Feb 2005 18:06:58 -0000	1.1
+++ gai-0.5.8-multilib.patch	20 Mar 2005 19:18:40 -0000	1.2
@@ -39,3 +39,13 @@
  clean:
  	rm -f *.o *~ *@LIB_END@
  
+--- gai-0.5.8.old/gai.pc.in     2005-03-20 11:18:30.593311880 +0000
++++ gai-0.5.8/gai.pc.in 2005-03-20 11:18:49.061504288 +0000
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib/gai
++libdir=@libdir@/gai
+ includedir=${prefix}/include
+ gnome=@gnome_installed@
+ gl=@gl_installed@


Index: gai.spec
===================================================================
RCS file: /cvs/extras/devel/gai/gai.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gai.spec	13 Mar 2005 05:25:43 -0000	1.9
+++ gai.spec	20 Mar 2005 19:18:41 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		gai
 Version:	0.5.8
-Release:	5
+Release:	7
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -8,6 +8,7 @@
 URL:		http://gai.sourceforge.net
 Source0:	http://download.sf.net/gai/gai-0.5.8.tar.bz2
 Patch0:		gai-0.5.8-multilib.patch
+Patch1:		gai-0.5.8-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel, gtk2-devel >= 2.2, gnome-panel-devel
@@ -36,6 +37,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
+%patch1 -p1 -b .gcc4
 
 %build
 %ifarch x86_64
@@ -68,6 +70,13 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Sun Mar 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-7
+- Fix lvalue assignment errors for GCC4.
+
+* Sun Mar 20 2005 Fabrice Colin <fabrice.colin[AT]gmail.com> - 0.5.8-6
+- Make gai.pc multilib friendly so that 'pkg-config --exists gai' 
+  doesn't fail on x86_64.
+
 * Sun Mar 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-5
 - Really add gtkglext-devel dependencies (Fabrice Colin).
 



From fedora-extras-commits at redhat.com  Sun Mar 20 20:17:13 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 20 Mar 2005 15:17:13 -0500
Subject: rpms/xfdesktop/devel xfdesktop-image.patch, NONE, 1.1 xfdesktop.spec,
	1.1, 1.2
Message-ID: <200503202017.j2KKHD1h016114@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16087

Modified Files:
	xfdesktop.spec 
Added Files:
	xfdesktop-image.patch 
Log Message:
readded xfdesktop-image.patch
reset spec back to the core/devel version


xfdesktop-image.patch:

--- NEW FILE xfdesktop-image.patch ---
diff -Naur xfdesktop-4.0.5.orig/settings/backdrop_settings.c xfdesktop-4.0.5/settings/backdrop_settings.c
--- xfdesktop-4.0.5.orig/settings/backdrop_settings.c	2003-09-19 23:10:59.000000000 +0200
+++ xfdesktop-4.0.5/settings/backdrop_settings.c	2004-04-20 21:00:10.000000000 +0200
@@ -72,7 +72,8 @@
 #define gdk_pixbuf_new_from_inline gdk_pixbuf_new_from_stream
 #endif
 
-#define DEFAULT_BACKDROP (DATADIR "/xfce4/backdrops/xfce-stripes.png")
+/* Use Fedora (tm) default background image */
+#define DEFAULT_BACKDROP (DATADIR "/backgrounds/images/default.png")
 
 /*
  * XXX - No help button for now. Wait for the others to ACK on this.
@@ -216,12 +217,10 @@
     }
     else
     {
-        /* 
-           Just a color by default #336699 - That number looks cool :)
-         */
-        backdrop_color.red   = (guint16) 0x3300;
-        backdrop_color.green = (guint16) 0x6600;
-        backdrop_color.blue  = (guint16) 0x9900;
+        /* Use Fedora (tm) default background color */
+        backdrop_color.red   = (guint16) 0x2600;
+        backdrop_color.green = (guint16) 0x3200;
+        backdrop_color.blue  = (guint16) 0x4c00;
         backdrop_color.alpha = (guint16) 0;
         mcs_manager_set_color(mcs_plugin->manager, "color", BACKDROP_CHANNEL, 
                               &backdrop_color);


Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfdesktop.spec	19 Mar 2005 18:27:38 -0000	1.1
+++ xfdesktop.spec	20 Mar 2005 20:17:11 -0000	1.2
@@ -1,25 +1,34 @@
-Summary: Desktop manager for the Xfce Desktop Environment
+Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.2.1
 Release: 1
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfdesktop-4.2.1.tar.bz2
+Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz/xfdesktop-4.2.1.tar.bz2
+
+# Change default for Fedora
+Patch1: xfdesktop-image.patch
+
 Group: User Interface/Desktops
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: gtk2 >= 2.2.0
-Requires: libxfce4mcs >= 4.2.1
-Requires: libxfcegui4 >= 4.2.1
-BuildRequires: gtk2 >= 2.2.0
-BuildRequires: libxfce4mcs-devel >= 4.2.1
-BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires: xfce-mcs-manager
+Requires: xfwm4
+Requires: xfce4-panel
+Requires: desktop-backgrounds-basic
+BuildRequires: libxfce4mcs-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: libxml2-devel
+BuildRequires: xfce-mcs-manager-devel
 
 %description
-xfdesktop is a desktop manager for the Xfce Desktop Environment
+This package includes a desktop manager for the XFce Desktop Environment
 
 %prep
 %setup -q
 
+#%patch1 -p1 -b .fedora
+
 %build
 %configure
 
@@ -27,7 +36,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.a
+
 %find_lang %{name}
 
 %clean
@@ -36,29 +49,54 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
-%{_sysconfdir}
-%{_bindir}/xfce4-menueditor
-%{_bindir}/xfdesktop
-%{_mandir}/man1/xfdesktop.1.gz
-%{_libdir}/xfce4/*
-%{_datadir}/applications/xfce-backdrop-settings.desktop
-%{_datadir}/applications/xfce-menueditor.desktop
-%{_datadir}/icons/hicolor/32x32/apps/xfce4-backdrop.png
-%{_datadir}/icons/hicolor/32x32/apps/xfce4-menueditor.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-backdrop.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-menueditor.png
-%{_datadir}/icons/hicolor/scalable/apps/xfce4-backdrop.svg
-%{_datadir}/icons/hicolor/scalable/apps/xfce4-menueditor.svg
-%{_datadir}/pixmaps/*
+%{_sysconfdir}/xdg/xfce4/*
+%{_bindir}/*
 %{_datadir}/xfce4/*
+%{_libdir}/xfce4/mcs-plugins/*
+%{_libdir}/xfce4/modules/*
+%{_libdir}/xfce4/panel-plugins/*
+%{_datadir}/applications/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/pixmaps/*
+%{_mandir}/man1/*
 
 %changelog
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
-* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
-- Removed generic INSTALL from %doc
+* Thu Jan 27 2005 Than Ngo <than at redhat.com> 4.2.0-1
+- 4.2.0
+
+* Wed Sep 01 2004 Than Ngo <than at redhat.com> 4.0.6-2
+- get rid useless static library #131485
+
+* Tue Jul 20 2004 Than Ngo <than at redhat.com> 4.0.6-1
+- update to 4.0.6
+- fix bug #122743, #124951, #125058
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Apr 20 2004 Than Ngo <than at redhat.com> 4.0.5-2
+- Change defaults for fedora, thanks to Olivier Fourdan <fourdan at xfce.org>
+
+* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
+- update to 4.0.5
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
+- fixed dependant libraries check on x86_64
+
+* Wed Jan 14 2004 Than Ngo <than at redhat.com> 4.0.3-1
+- 4.0.3 release
+
+* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
+- 4.0.2 release
 
-* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
-- Inital Fedora Extras version
+* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
+- initial build



From fedora-extras-commits at redhat.com  Sun Mar 20 20:45:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 20 Mar 2005 15:45:42 -0500
Subject: rpms/xffm/devel xffm-4.2.0-menu.patch,NONE,1.1 xffm.spec,1.1,1.2
Message-ID: <200503202045.j2KKjgRA016539@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16527

Modified Files:
	xffm.spec 
Added Files:
	xffm-4.2.0-menu.patch 
Log Message:
Resynced with 4.2.0 spec file from core cvs. 
Readded patches. 


xffm-4.2.0-menu.patch:

--- NEW FILE xffm-4.2.0-menu.patch ---
--- xffm-4.2.0/src/Xffstab.desktop.orig	2005-02-21 12:09:22.065891551 +0100
+++ xffm-4.2.0/src/Xffstab.desktop	2005-02-21 12:09:37.992253979 +0100
@@ -15,3 +15,4 @@
 Categories=X-XFCE;Core;Filemanager;Utility;System
 GenericName=Fstab mount manager
 GenericName[ko]=Fstab ????????? ?????????
+OnlyShowIn=XFCE;
--- xffm-4.2.0/src/Xftree.desktop.orig	2005-02-21 12:08:46.142840482 +0100
+++ xffm-4.2.0/src/Xftree.desktop	2005-02-21 12:09:04.912732203 +0100
@@ -117,3 +117,4 @@
 Terminal=false
 Type=Application
 Categories=Applications;X-XFCE;Core
+OnlyShowIn=XFCE;
--- xffm-4.2.0/src/Xfdiff.desktop.orig	2005-02-21 12:10:00.011607212 +0100
+++ xffm-4.2.0/src/Xfdiff.desktop	2005-02-21 12:10:17.853652159 +0100
@@ -11,3 +11,4 @@
 Terminal=false
 Type=Application
 Categories=X-XFCE;Core;Utility
+OnlyShowIn=XFCE;


Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xffm.spec	19 Mar 2005 18:32:11 -0000	1.1
+++ xffm.spec	20 Mar 2005 20:45:39 -0000	1.2
@@ -5,33 +5,38 @@
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
-Patch1: xffm-4.0.5-rpath.patch
+
+Patch: xffm-4.2.0-rpath.patch
+Patch1: xffm-4.2.0-menu.patch
+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Prereq: /sbin/ldconfig
+
 Requires: dbh >= 1.0
 Requires: glib2 >= 2.0.0
 Requires: gtk2 >= 2.0.0
-Requires: libxfce4mcs >= 4.0.5
-Requires: libxfce4util >= 4.0.5
-Requires: libxfcegui4 >= 4.0.5
+Requires: libxfce4mcs >= %{version}
+Requires: libxfce4util >= %{version}
+Requires: libxfcegui4 >= %{version}
 Requires: libxml2 >= 2.4.0
+
 BuildRequires: dbh-devel >= 1.0
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: gtk2-devel >= 2.0.0
-BuildRequires: libxfce4mcs-devel >= 4.0.5
-BuildRequires: libxfce4util-devel >= 4.0.5
-BuildRequires: libxfcegui4-devel >= 4.0.5
+BuildRequires: libxfce4mcs-devel >= %{version}
+BuildRequires: libxfce4util-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: libxml2-devel >= 2.4.0
-BuildRequires: xfce-mcs-manager-devel >= 4.0.5
+BuildRequires: xfce-mcs-manager-devel >= %{version}
 
 %description
 This package includes a filemanager and SMB network navigator for Xfce4.
 
 %prep
 %setup -q
-
-%patch1 -p1 -b .rpath
+%patch -p1 -b .rpath
+%patch1 -p1 -b .menu
 
 %build
 %configure
@@ -56,26 +61,25 @@
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
 %{_bindir}/*
 %{_libdir}/lib*
-%{_libdir}/xfce4/xffm/*
 %{_libdir}/pkgconfig/*
 %{_libdir}/xfce4/mcs-plugins/*
+%{_libdir}/xfce4/xffm/*
 %{_datadir}/xffm
 %{_datadir}/xfce4/*
-%{_datadir}/applications/*.desktop
-%{_datadir}/icons/*
+%{_datadir}/applications/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man?/*
 
 %changelog
-* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
-- Updated to 4.2.1 version
-
-* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
+* Sun Mar 20 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Fixed case of Xfce
-- Fixed Source0 line. 
-- Removed generic INSTALL from %doc
-- Inital Fedora Extras version
+- Fixed Source0 line
+- Reimported 4.2.0 spec from core cvs
+
+* Mon Feb 21 2005 Than Ngo <than at redhat.com> 4.2.0-2
+- cleanup menu
 
-* Tue Jul 20 2004 Than Ngo <than at redhat.com> 4.0.6-1
+* Fri Jan 28 2005 Than Ngo <than at redhat.com> 4.2.0-1 
 - update to 4.0.6
 
 * Thu Jun 17 2004 Than Ngo <than at redhat.com> 4.0.5-4



From fedora-extras-commits at redhat.com  Sun Mar 20 20:59:26 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 15:59:26 -0500
Subject: rpms/xfdesktop/devel xfdesktop.spec,1.2,1.3
Message-ID: <200503202059.j2KKxQGX016790@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16770

Modified Files:
	xfdesktop.spec 
Log Message:
prep for FC4 build



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfdesktop.spec	20 Mar 2005 20:17:11 -0000	1.2
+++ xfdesktop.spec	20 Mar 2005 20:59:24 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.2.1
-Release: 1
+Release: 1.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz/xfdesktop-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar 20 21:03:14 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 16:03:14 -0500
Subject: rpms/xffm/devel xffm.spec,1.2,1.3
Message-ID: <200503202103.j2KL3ESS017701@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17685

Modified Files:
	xffm.spec 
Log Message:
remove unnecessary deps and versions, prep for FC4 build



Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xffm.spec	20 Mar 2005 20:45:39 -0000	1.2
+++ xffm.spec	20 Mar 2005 21:03:12 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Next generation filemanager and SMB network navigator for Xfce4
 Name: xffm
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
@@ -13,17 +13,14 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Prereq: /sbin/ldconfig
 
-Requires: dbh >= 1.0
-Requires: glib2 >= 2.0.0
-Requires: gtk2 >= 2.0.0
 Requires: libxfce4mcs >= %{version}
 Requires: libxfce4util >= %{version}
 Requires: libxfcegui4 >= %{version}
 Requires: libxml2 >= 2.4.0
 
-BuildRequires: dbh-devel >= 1.0
-BuildRequires: glib2-devel >= 2.0.0
-BuildRequires: gtk2-devel >= 2.0.0
+BuildRequires: dbh-devel
+BuildRequires: glib2-devel 
+BuildRequires: gtk2-devel
 BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: libxfce4util-devel >= %{version}
 BuildRequires: libxfcegui4-devel >= %{version}
@@ -71,6 +68,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- remove stuff
+
 * Sun Mar 20 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Fixed case of Xfce
 - Fixed Source0 line



From fedora-extras-commits at redhat.com  Sun Mar 20 21:13:53 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 20 Mar 2005 16:13:53 -0500
Subject: rpms/xffm/devel xffm-4.2.0-rpath.patch, NONE,
	1.1 xffm-4.2.1-static.patch, NONE, 1.1 xffm.spec, 1.3, 1.4
Message-ID: <200503202113.j2KLDrvZ017926@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17914

Modified Files:
	xffm.spec 
Added Files:
	xffm-4.2.0-rpath.patch xffm-4.2.1-static.patch 
Log Message:
Synced with spec in core devel
Added patch to fix compile on devel
Readded rpath patch


xffm-4.2.0-rpath.patch:

--- NEW FILE xffm-4.2.0-rpath.patch ---
--- xffm-4.2.0/configure.orig	2005-01-09 13:54:20.000000000 +0100
+++ xffm-4.2.0/configure	2005-01-28 14:12:56.000000000 +0100
@@ -38678,7 +38678,7 @@
 
             echo "$as_me:$LINENO: checking DBH_LIBS" >&5
 echo $ECHO_N "checking DBH_LIBS... $ECHO_C" >&6
-            DBH_LIBS=`$PKG_CONFIG --libs "dbh-1.0 >= 1.0"`
+            DBH_LIBS=`$PKG_CONFIG --libs-only-l "dbh-1.0 >= 1.0"`
             echo "$as_me:$LINENO: result: $DBH_LIBS" >&5
 echo "${ECHO_T}$DBH_LIBS" >&6
         else

xffm-4.2.1-static.patch:

--- NEW FILE xffm-4.2.1-static.patch ---
diff -Nur xffm-4.2.1.orig/libs/callbacks.c xffm-4.2.1/libs/callbacks.c
--- xffm-4.2.1.orig/libs/callbacks.c	2004-12-29 14:51:17.000000000 -0700
+++ xffm-4.2.1/libs/callbacks.c	2005-03-20 13:52:51.937643998 -0700
@@ -665,7 +665,7 @@
     skip_second_release = FALSE;
 
     for (tree_id=0; tree_id<TREECOUNT; tree_id++) {      
-      static gboolean unsel(GtkTreeModel *,GtkTreePath *, GtkTreeIter *, gpointer);
+      gboolean unsel(GtkTreeModel *,GtkTreePath *, GtkTreeIter *, gpointer);
       /*printf("DBG: treeview is  0x%x==0x%x\n",tree_details->treestuff[tree_id].treeview,treeview);*/
       if (treeview != tree_details->treestuff[tree_id].treeview){
         /* unselect all in auxiliary treeview */


Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xffm.spec	20 Mar 2005 21:03:12 -0000	1.3
+++ xffm.spec	20 Mar 2005 21:13:51 -0000	1.4
@@ -6,8 +6,9 @@
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
 
-Patch: xffm-4.2.0-rpath.patch
+Patch0: xffm-4.2.0-rpath.patch
 Patch1: xffm-4.2.0-menu.patch
+Patch2: xffm-4.2.1-static.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,7 +20,7 @@
 Requires: libxml2 >= 2.4.0
 
 BuildRequires: dbh-devel
-BuildRequires: glib2-devel 
+BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: libxfce4util-devel >= %{version}
@@ -32,8 +33,9 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rpath
+%patch0 -p1 -b .rpath
 %patch1 -p1 -b .menu
+%patch2 -p1 -b .static
 
 %build
 %configure
@@ -75,6 +77,7 @@
 - Fixed case of Xfce
 - Fixed Source0 line
 - Reimported 4.2.0 spec from core cvs
+- Added patch to remove static call that was breaking compile on devel. 
 
 * Mon Feb 21 2005 Than Ngo <than at redhat.com> 4.2.0-2
 - cleanup menu



From fedora-extras-commits at redhat.com  Sun Mar 20 21:29:03 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 16:29:03 -0500
Subject: rpms/xffm/devel xffm.spec,1.4,1.5
Message-ID: <200503202129.j2KLT3a6018209@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18193

Modified Files:
	xffm.spec 
Log Message:
gtk2-devel pulls in glib2-devel



Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xffm.spec	20 Mar 2005 21:13:51 -0000	1.4
+++ xffm.spec	20 Mar 2005 21:29:01 -0000	1.5
@@ -20,7 +20,6 @@
 Requires: libxml2 >= 2.4.0
 
 BuildRequires: dbh-devel
-BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: libxfce4util-devel >= %{version}



From fedora-extras-commits at redhat.com  Sun Mar 20 21:39:37 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 20 Mar 2005 16:39:37 -0500
Subject: rpms/xfprint/devel xfprint.spec,1.1,1.2
Message-ID: <200503202139.j2KLdbAE018445@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18425

Modified Files:
	xfprint.spec 
Log Message:
readded changelog from core cvs spec
readded ldconfig and get rid of useless library
added Buildrequires for cups-devel



Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfprint.spec	19 Mar 2005 18:36:39 -0000	1.1
+++ xfprint.spec	20 Mar 2005 21:39:35 -0000	1.2
@@ -3,21 +3,21 @@
 Version: 4.2.1
 Release: 1
 License: BSD
-URL: http://www.xfce.org/
+URL: http://www.xfce.org
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfprint-4.2.1.tar.bz2
 Group: User Interface/Desktops
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: glib2 >= 2.2.0
-Requires: libxfcegui4 >= 4.2.1
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prereq: /sbin/ldconfig
+Requires: libxfcegui4 >= %{version}
 Requires: a2ps
-BuildRequires: glib2-devel >= 2.2.0
-BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: glib2-devel
+BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: a2ps
+BuildRequires: cups-devel
 
 %description
-xfprint contains a print dialog and a printer manager for the Xfce 4
-Desktop Environment, it supports CUPS, BSD-LPR and file as printing
-destinations.
+xfprint contains a print dialog and a printer manager for the
+Xfce 4 Desktop Environment
 
 %prep
 %setup -q
@@ -29,29 +29,42 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
+
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README ChangeLog NEWS COPYING AUTHORS NOTES
 %{_bindir}/*
-%{_libdir}/xfce4/*
+%{_libdir}/xfce4/mcs-plugins
+%{_libdir}/xfce4/xfprint-plugins
 %{_datadir}/applications/*
-%{_datadir}/xfce4/*
-%{_datadir}/icons/*
+%{_datadir}/xfce4/doc/C
+%{_datadir}/icons/hicolor/*/*/*
 
 %changelog
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
-
-* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
-- Removed generic INSTALL from %doc
 - Fixed case of Xfce
 
-* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
-- Inital Fedora Extras version
+* Fri Jan 28 2005 Than Ngo <than at redhat.com> 4.2.0-1
+- 4.2.0
+
+* Wed Sep 01 2004 Than Ngo <than at redhat.com> 4.0.6-2
+- get rid of useless static library
+- add missing ldconfig
+- use find_lang
+
+* Tue Aug 17 2004 Than Ngo <than at redhat.com> 4.0.6-1 
+- Initial packaging for Fedora Core 3 



From fedora-extras-commits at redhat.com  Sun Mar 20 21:44:38 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 16:44:38 -0500
Subject: rpms/xfprint/devel xfprint.spec,1.2,1.3
Message-ID: <200503202144.j2KLicnO018592@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18580

Modified Files:
	xfprint.spec 
Log Message:
prep for FC4 build



Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfprint.spec	20 Mar 2005 21:39:35 -0000	1.2
+++ xfprint.spec	20 Mar 2005 21:44:36 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
 Version: 4.2.1
-Release: 1
+Release: 1.FC4
 License: BSD
 URL: http://www.xfce.org
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfprint-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar 20 22:19:28 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 20 Mar 2005 17:19:28 -0500
Subject: rpms/xfwm4/devel xfwm4-bluecurve.patch, NONE,
	1.1 xfwm4-bluecurve-prep.patch, NONE, 1.1 xfwm4.spec, 1.1, 1.2
Message-ID: <200503202219.j2KMJSLB019896@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19862

Modified Files:
	xfwm4.spec 
Added Files:
	xfwm4-bluecurve.patch xfwm4-bluecurve-prep.patch 
Log Message:
Readded changelog entries. 
Fixed bluecurve patch, split into prep and main themes and got to apply. 


xfwm4-bluecurve.patch:

--- NEW FILE xfwm4-bluecurve.patch ---
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/Makefile.am xfwm4-4.0.5/themes/bluecurve/Makefile.am
--- xfwm4-4.0.5.orig2/themes/bluecurve/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/Makefile.am	2004-04-19 23:25:30.000000000 +0200
@@ -0,0 +1,43 @@
+themedir = $(pkgdatadir)/themes/Bluecurve
+theme_DATA = README \
+	bottom-active.xpm \
+	bottom-inactive.xpm \
+	bottom-left-active.xpm \
+	bottom-left-inactive.xpm \
+	bottom-right-active.xpm \
+	bottom-right-inactive.xpm \
+	close-active.xpm \
+	close-inactive.xpm \
+	close-pressed.xpm \
+	hide-active.xpm \
+	hide-inactive.xpm \
+	hide-pressed.xpm \
+	left-active.xpm \
+	left-inactive.xpm \
+	maximize-active.xpm \
+	maximize-inactive.xpm \
+	maximize-pressed.xpm \
+        maximize-toggled-active.xpm \
+        maximize-toggled-inactive.xpm \
+        maximize-toggled-pressed.xpm \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
+EXTRA_DIST = $(theme_DATA)
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/Makefile.in xfwm4-4.0.5/themes/bluecurve/Makefile.in
--- xfwm4-4.0.5.orig2/themes/bluecurve/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/Makefile.in	2004-04-19 23:30:58.000000000 +0200
@@ -0,0 +1,424 @@
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = themes/bluecurve
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \
+	$(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \
+	$(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__installdirs = $(DESTDIR)$(themedir)
+themeDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(theme_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
+LIBSTARTUP_NOTIFICATION_LIBS = @LIBSTARTUP_NOTIFICATION_LIBS@
+LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
+LIBTOOL = @LIBTOOL@
+LIBX11_CFLAGS = @LIBX11_CFLAGS@
+LIBX11_LDFLAGS = @LIBX11_LDFLAGS@
+LIBX11_LIBS = @LIBX11_LIBS@
+LIBXFCE4MCS_CLIENT_CFLAGS = @LIBXFCE4MCS_CLIENT_CFLAGS@
+LIBXFCE4MCS_CLIENT_LIBS = @LIBXFCE4MCS_CLIENT_LIBS@
+LIBXFCE4MCS_CLIENT_REQUIRED_VERSION = @LIBXFCE4MCS_CLIENT_REQUIRED_VERSION@
+LIBXFCE4MCS_MANAGER_CFLAGS = @LIBXFCE4MCS_MANAGER_CFLAGS@
+LIBXFCE4MCS_MANAGER_LIBS = @LIBXFCE4MCS_MANAGER_LIBS@
+LIBXFCE4MCS_MANAGER_REQUIRED_VERSION = @LIBXFCE4MCS_MANAGER_REQUIRED_VERSION@
+LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@
+LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@
+LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@
+LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@
+LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@
+LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@
+LIBXPM_CFLAGS = @LIBXPM_CFLAGS@
+LIBXPM_LDFLAGS = @LIBXPM_LDFLAGS@
+LIBXPM_LIBS = @LIBXPM_LIBS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANDR_LIBS = @RANDR_LIBS@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XFCE_MCS_MANAGER_CFLAGS = @XFCE_MCS_MANAGER_CFLAGS@
+XFCE_MCS_MANAGER_LIBS = @XFCE_MCS_MANAGER_LIBS@
+XFCE_MCS_MANAGER_PLUGINSDIR = @XFCE_MCS_MANAGER_PLUGINSDIR@
+XFCE_MCS_MANAGER_REQUIRED_VERSION = @XFCE_MCS_MANAGER_REQUIRED_VERSION@
+XGETTEXT = @XGETTEXT@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+themedir = $(pkgdatadir)/themes/Bluecurve
+theme_DATA = README \
+	bottom-active.xpm \
+	bottom-inactive.xpm \
+	bottom-left-active.xpm \
+	bottom-left-inactive.xpm \
+	bottom-right-active.xpm \
+	bottom-right-inactive.xpm \
+	close-active.xpm \
+	close-inactive.xpm \
+	close-pressed.xpm \
+	hide-active.xpm \
+	hide-inactive.xpm \
+	hide-pressed.xpm \
+	left-active.xpm \
+	left-inactive.xpm \
+	maximize-active.xpm \
+	maximize-inactive.xpm \
+	maximize-pressed.xpm \
+        maximize-toggled-active.xpm \
+        maximize-toggled-inactive.xpm \
+        maximize-toggled-pressed.xpm \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
+
+EXTRA_DIST = $(theme_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  themes/bluecurve/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  themes/bluecurve/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-themeDATA: $(theme_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkdir_p) $(DESTDIR)$(themedir)
+	@list='$(theme_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \
+	  $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \
+	done
+
+uninstall-themeDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(theme_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(themedir)/$$f"; \
+	  rm -f $(DESTDIR)$(themedir)/$$f; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+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
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	$(mkdir_p) $(DESTDIR)$(themedir)
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+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:
+	-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-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-themeDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-themeDATA
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	install-themeDATA installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-info-am uninstall-themeDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/README xfwm4-4.0.5/themes/bluecurve/README
--- xfwm4-4.0.5.orig2/themes/bluecurve/README	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/README	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,7 @@
+Bluecurve
+---------
+
+Garrett LeSage <garrett at redhat.com> Havoc Pennington <hp at redhat.com>
+(c) 2002 Red Hat Inc.
+May 29, 2002
+Red Hat Linux default theme
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-active.xpm xfwm4-4.0.5/themes/bluecurve/bottom-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/bottom-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,11 @@
+/* XPM */
+static char * bottom_active_xpm[] = {
+"4 5 3 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s active_color_2",
+"....",
+"....",
+"....",
+"....",
+"++++"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-inactive.xpm xfwm4-4.0.5/themes/bluecurve/bottom-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/bottom-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,11 @@
+/* XPM */
+static char * bottom_inactive_xpm[] = {
+"4 5 3 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s inactive_color_2",
+"....",
+"....",
+"....",
+"....",
+"++++"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-left-active.xpm xfwm4-4.0.5/themes/bluecurve/bottom-left-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-left-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/bottom-left-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,24 @@
+/* XPM */
+static char * bottom_left_active_xpm[] = {
+"16 16 5 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s active_color_2",
+"@	c #c1c1c1 s active_mid_2",
+"#	c #a7a7a7 s active_shadow_2",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+ at ...           ",
+"+#...           ",
+" +..............",
+" + at .............",
+"  + at ............",
+"   ++#@.........",
+"     +++++++++++"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-left-inactive.xpm xfwm4-4.0.5/themes/bluecurve/bottom-left-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-left-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/bottom-left-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,24 @@
+/* XPM */
+static char * bottom_left_inactive_xpm[] = {
+"16 16 5 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s inactive_color_2",
+"@	c #c1c1c1 s inactive_mid_2",
+"#	c #a7a7a7 s inactive_shadow_2",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+ at ...           ",
+"+#...           ",
+" +..............",
+" + at .............",
+"  + at ............",
+"   ++#@.........",
+"     +++++++++++"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-right-active.xpm xfwm4-4.0.5/themes/bluecurve/bottom-right-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-right-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/bottom-right-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,24 @@
+/* XPM */
+static char * bottom_right_active_xpm[] = {
+"16 16 5 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s active_color_2",
+"@	c #c1c1c1 s active_mid_2",
+"#	c #a7a7a7 s active_shadow_2",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ... at +",
+"           ...#+",
+"..............+ ",
+"............. at + ",
+"............ at +  ",
+".........@#++   ",
+"+++++++++++     "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-right-inactive.xpm xfwm4-4.0.5/themes/bluecurve/bottom-right-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-right-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/bottom-right-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,24 @@
+/* XPM */
+static char * bottom_right_inactive_xpm[] = {
+"16 16 5 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s inactive_color_2",
+"@	c #c1c1c1 s inactive_mid_2",
+"#	c #a7a7a7 s inactive_shadow_2",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ... at +",
+"           ...#+",
+"..............+ ",
+"............. at + ",
+"............ at +  ",
+".........@#++   ",
+"+++++++++++     "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/close-active.xpm xfwm4-4.0.5/themes/bluecurve/close-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/close-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/close-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,48 @@
+/* XPM */
+static char * close_active_xpm[] = {
+"18 16 29 1",
+" 	c None",
+".	c #858FA4",
+"+	c #F8F9FD",
+"@	c #E0E7F7",
+"#	c #E1E7F7",
+"$	c #E1E8F7",
+"%	c #E2E8F7",
+"&	c #E2E9F7",
+"*	c #E3E9F7",
+"=	c #E4EAF8",
+"-	c #E5EAF8",
+";	c #E5EBF8",
+">	c #E6EBF8",
+",	c #E7ECF8",
+"'	c #CED3DE",
+")	c #E8EDF9",
+"!	c #647190",
+"~	c #647290",
+"{	c #657290",
+"]	c #E9EEF9",
+"^	c #EAEEF9",
+"/	c #EBEFF9",
+"(	c #657390",
+"_	c #667390",
+":	c #ECF0FA",
+"<	c #EDF0FA",
+"[	c #EDF1FA",
+"}	c #EEF1FA",
+"|	c #EEF2FA",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@#$%&*==-;>,,'.",
+".+@#$%&*==-;>,,)'.",
+".+#$%&!==-~>,,))'.",
+".+$%&!~~-~{{,))]'.",
+".+%&*=~~~{{,))]^'.",
+".+&*==-~{{,))]^^'.",
+".+==-;{{{{{]^^//'.",
+".+=-;{{{){(_^//:'.",
+".+-;>,{))]_^//:<'.",
+".+;>,,))]^^//:<['.",
+".+>,,))]^^//:<[}'.",
+".+,,))]^^//:<[}|'.",
+" .''''''''''''''. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/close-inactive.xpm xfwm4-4.0.5/themes/bluecurve/close-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/close-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/close-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,28 @@
+/* XPM */
+static char * close_inactive_xpm[] = {
+"18 16 9 1",
+" 	c None",
+".	c #BDBDBD",
+"+	c #EEEEEE",
+"@	c #EDEDED",
+"#	c #ECECEC",
+"$	c #939393",
+"%	c #EBEBEB",
+"&	c #EAEAEA",
+"*	c #E9E9E9",
+"  ..............  ",
+" .++++++++++++++. ",
+".@@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@@.",
+".#####$###$######.",
+".####$$$#$$$#####.",
+".#####$$$$$######.",
+".%%%%%%$$$%%%%%%%.",
+".%%%%%$$$$$%%%%%%.",
+".%%%%$$$%$$$%%%%%.",
+".&&&&&$&&&$&&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".****************.",
+" .**************. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/close-pressed.xpm xfwm4-4.0.5/themes/bluecurve/close-pressed.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/close-pressed.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/close-pressed.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,27 @@
+/* XPM */
+static char * close_pressed_xpm[] = {
+"18 16 8 1",
+" 	c None",
+".	c #858FA4",
+"+	c #B0B7C8",
+"@	c #647190",
+"#	c #647290",
+"$	c #657290",
+"%	c #657390",
+"&	c #667390",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".+++++ at +++#++++++.",
+".++++@##+#$$+++++.",
+".+++++###$$++++++.",
+".++++++#$$+++++++.",
+".+++++$$$$$++++++.",
+".++++$$$+$%&+++++.",
+".+++++$+++&++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/hide-active.xpm xfwm4-4.0.5/themes/bluecurve/hide-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/hide-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/hide-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,47 @@
+/* XPM */
+static char * hide_active_xpm[] = {
+"18 16 28 1",
+" 	c None",
+".	c #858FA4",
+"+	c #F8F9FD",
+"@	c #E0E7F7",
+"#	c #E1E7F7",
+"$	c #E1E8F7",
+"%	c #E2E8F7",
+"&	c #E2E9F7",
+"*	c #E3E9F7",
+"=	c #E4EAF8",
+"-	c #E5EAF8",
+";	c #E5EBF8",
+">	c #E6EBF8",
+",	c #E7ECF8",
+"'	c #CED3DE",
+")	c #E8EDF9",
+"!	c #E9EEF9",
+"~	c #EAEEF9",
+"{	c #647290",
+"]	c #657290",
+"^	c #657390",
+"/	c #EBEFF9",
+"(	c #667390",
+"_	c #ECF0FA",
+":	c #EDF0FA",
+"<	c #EDF1FA",
+"[	c #EEF1FA",
+"}	c #EEF2FA",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@#$%&*==-;>,,'.",
+".+@#$%&*==-;>,,)'.",
+".+#$%&*==-;>,,))'.",
+".+$%&*==-;>,,))!'.",
+".+%&*==-;>,,))!~'.",
+".+&*==-;>,,))!~~'.",
+".+==-{]]]]]^~~//'.",
+".+=-;]]]]]^(~//_'.",
+".+-;>]]]]^((//_:'.",
+".+;>,,))!~~//_:<'.",
+".+>,,))!~~//_:<['.",
+".+,,))!~~//_:<[}'.",
+" .''''''''''''''. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/hide-inactive.xpm xfwm4-4.0.5/themes/bluecurve/hide-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/hide-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/hide-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,28 @@
+/* XPM */
+static char * hide_inactive_xpm[] = {
+"18 16 9 1",
+" 	c None",
+".	c #BDBDBD",
+"+	c #EEEEEE",
+"@	c #EDEDED",
+"#	c #ECECEC",
+"$	c #EBEBEB",
+"%	c #939393",
+"&	c #EAEAEA",
+"*	c #E9E9E9",
+"  ..............  ",
+" .++++++++++++++. ",
+".@@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@@.",
+".################.",
+".################.",
+".################.",
+".$$$$$$$$$$$$$$$$.",
+".$$$$%%%%%%%$$$$$.",
+".$$$$%%%%%%%$$$$$.",
+".&&&&%%%%%%%&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".****************.",
+" .**************. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/hide-pressed.xpm xfwm4-4.0.5/themes/bluecurve/hide-pressed.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/hide-pressed.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/hide-pressed.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,26 @@
+/* XPM */
+static char * hide_pressed_xpm[] = {
+"18 16 7 1",
+" 	c None",
+".	c #858FA4",
+"+	c #B0B7C8",
+"@	c #647290",
+"#	c #657290",
+"$	c #657390",
+"%	c #667390",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++@#####$+++++.",
+".++++#####$%+++++.",
+".++++####$%%+++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/left-active.xpm xfwm4-4.0.5/themes/bluecurve/left-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/left-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/left-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,10 @@
+/* XPM */
+static char * left_active_xpm[] = {
+"5 4 3 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s active_color_2",
+"+....",
+"+....",
+"+....",
+"+...."};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/left-inactive.xpm xfwm4-4.0.5/themes/bluecurve/left-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/left-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/left-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,10 @@
+/* XPM */
+static char * left_inactive_xpm[] = {
+"5 4 3 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s inactive_color_2",
+"+....",
+"+....",
+"+....",
+"+...."};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-active.xpm xfwm4-4.0.5/themes/bluecurve/maximize-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/maximize-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,48 @@
+/* XPM */
+static char * maximize_active_xpm[] = {
+"18 16 29 1",
+" 	c None",
+".	c #858FA4",
+"+	c #F8F9FD",
+"@	c #E0E7F7",
+"#	c #E1E7F7",
+"$	c #E1E8F7",
+"%	c #E2E8F7",
+"&	c #E2E9F7",
+"*	c #E3E9F7",
+"=	c #E4EAF8",
+"-	c #E5EAF8",
+";	c #E5EBF8",
+">	c #E6EBF8",
+",	c #E7ECF8",
+"'	c #CED3DE",
+")	c #E8EDF9",
+"!	c #647190",
+"~	c #647290",
+"{	c #657290",
+"]	c #E9EEF9",
+"^	c #EAEEF9",
+"/	c #657390",
+"(	c #EBEFF9",
+"_	c #667390",
+":	c #ECF0FA",
+"<	c #EDF0FA",
+"[	c #EDF1FA",
+"}	c #EEF1FA",
+"|	c #EEF2FA",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@#$%&*==-;>,,'.",
+".+@#$%&*==-;>,,)'.",
+".+#$%!!~~~~{,,))'.",
+".+$%&!~~~~{{,))]'.",
+".+%&*~~~~{{{))]^'.",
+".+&*=~-;>,,{)]^^'.",
+".+==-~>,,))/^^(('.",
+".+=-;{,,))]_^((:'.",
+".+-;>{{{{/__((:<'.",
+".+;>,,))]^^((:<['.",
+".+>,,))]^^((:<[}'.",
+".+,,))]^^((:<[}|'.",
+" .''''''''''''''. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-inactive.xpm xfwm4-4.0.5/themes/bluecurve/maximize-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/maximize-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,28 @@
+/* XPM */
+static char * maximize_inactive_xpm[] = {
+"18 16 9 1",
+" 	c None",
+".	c #BDBDBD",
+"+	c #EEEEEE",
+"@	c #EDEDED",
+"#	c #ECECEC",
+"$	c #939393",
+"%	c #EBEBEB",
+"&	c #EAEAEA",
+"*	c #E9E9E9",
+"  ..............  ",
+" .++++++++++++++. ",
+".@@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@@.",
+".####$$$$$$$#####.",
+".####$$$$$$$#####.",
+".####$$$$$$$#####.",
+".%%%%$%%%%%$%%%%%.",
+".%%%%$%%%%%$%%%%%.",
+".%%%%$%%%%%$%%%%%.",
+".&&&&$$$$$$$&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".****************.",
+" .**************. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-pressed.xpm xfwm4-4.0.5/themes/bluecurve/maximize-pressed.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-pressed.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/maximize-pressed.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,27 @@
+/* XPM */
+static char * maximize_pressed_xpm[] = {
+"18 16 8 1",
+" 	c None",
+".	c #858FA4",
+"+	c #B0B7C8",
+"@	c #647190",
+"#	c #647290",
+"$	c #657290",
+"%	c #657390",
+"&	c #667390",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++@@####$+++++.",
+".++++@####$$+++++.",
+".++++####$$$+++++.",
+".++++#+++++$+++++.",
+".++++#+++++%+++++.",
+".++++$+++++&+++++.",
+".++++$$$$%&&+++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-active.xpm xfwm4-4.0.5/themes/bluecurve/maximize-toggled-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/maximize-toggled-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,54 @@
+/* XPM */
+static char * maximize_toggled_active_xpm[] = {
+"18 16 35 1",
+" 	c None",
+".	c #858FA4",
+"+	c #F8F9FD",
+"@	c #E0E7F7",
+"#	c #E1E7F7",
+"$	c #E1E8F7",
+"%	c #E2E8F7",
+"&	c #E2E9F7",
+"*	c #E3E9F7",
+"=	c #E4EAF8",
+"-	c #E5EAF8",
+";	c #E5EBF8",
+">	c #E6EBF8",
+",	c #E7ECF8",
+"'	c #CED3DE",
+")	c #8A95AE",
+"!	c #8A95AF",
+"~	c #8B95AF",
+"{	c #8B96AF",
+"]	c #E8EDF9",
+"^	c #8C96AF",
+"/	c #647190",
+"(	c #647290",
+"_	c #657290",
+":	c #E9EEF9",
+"<	c #EAEEF9",
+"[	c #8D97AF",
+"}	c #EBEFF9",
+"|	c #657390",
+"1	c #ECF0FA",
+"2	c #667390",
+"3	c #EDF0FA",
+"4	c #EDF1FA",
+"5	c #EEF1FA",
+"6	c #EEF2FA",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@#$%&*==-;>,,'.",
+".+@#$%&)!!~{{,,]'.",
+".+#$%&*==-;>^,]]'.",
+".+$%&/((((_,^]]:'.",
+".+%&*((((__,^]:<'.",
+".+&*=(((___]^:<<'.",
+".+==-(>,,]_:[<}}'.",
+".+=-;_,,]]|<<}}1'.",
+".+-;>____|2<}}13'.",
+".+;>,,]]:<<}}134'.",
+".+>,,]]:<<}}1345'.",
+".+,,]]:<<}}13456'.",
+" .''''''''''''''. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-inactive.xpm xfwm4-4.0.5/themes/bluecurve/maximize-toggled-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/maximize-toggled-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,29 @@
+/* XPM */
+static char * maximize_toggled_inactive_xpm[] = {
+"18 16 10 1",
+" 	c None",
+".	c #BDBDBD",
+"+	c #EEEEEE",
+"@	c #EDEDED",
+"#	c #AEAEAE",
+"$	c #ECECEC",
+"%	c #939393",
+"&	c #EBEBEB",
+"*	c #EAEAEA",
+"=	c #E9E9E9",
+"  ..............  ",
+" .++++++++++++++. ",
+".@@@@@@@@@@@@@@@@.",
+".@@@@@@######@@@@.",
+".$$$$$$$$$$$#$$$$.",
+".$$$$%%%%%%$#$$$$.",
+".$$$$%%%%%%$#$$$$.",
+".&&&&%%%%%%&#&&&&.",
+".&&&&%&&&&%&#&&&&.",
+".&&&&%&&&&%&&&&&&.",
+".****%%%%%%******.",
+".****************.",
+".****************.",
+".================.",
+" .==============. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-pressed.xpm xfwm4-4.0.5/themes/bluecurve/maximize-toggled-pressed.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-pressed.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/maximize-toggled-pressed.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,33 @@
+/* XPM */
+static char * maximize_toggled_pressed_xpm[] = {
+"18 16 14 1",
+" 	c None",
+".	c #858FA4",
+"+	c #B0B7C8",
+"@	c #8A95AE",
+"#	c #8A95AF",
+"$	c #8B95AF",
+"%	c #8B96AF",
+"&	c #8C96AF",
+"*	c #647190",
+"=	c #647290",
+"-	c #657290",
+";	c #8D97AF",
+">	c #657390",
+",	c #667390",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++@##$%%++++.",
+".+++++++++++&++++.",
+".++++*====-+&++++.",
+".++++====--+&++++.",
+".++++===---+&++++.",
+".++++=++++-+;++++.",
+".++++-++++>++++++.",
+".++++---->,++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/menu-active.xpm xfwm4-4.0.5/themes/bluecurve/menu-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/menu-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/menu-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,46 @@
+/* XPM */
+static char * menu_active_xpm[] = {
+"18 16 27 1",
+" 	c None",
+".	c #858FA4",
+"+	c #F8F9FD",
+"@	c #E0E7F7",
+"#	c #E1E7F7",
+"$	c #E1E8F7",
+"%	c #E2E8F7",
+"&	c #E2E9F7",
+"*	c #E3E9F7",
+"=	c #E4EAF8",
+"-	c #E5EAF8",
+";	c #E5EBF8",
+">	c #E6EBF8",
+",	c #E7ECF8",
+"'	c #CED3DE",
+")	c #E8EDF9",
+"!	c #647190",
+"~	c #657290",
+"{	c #E9EEF9",
+"]	c #647290",
+"^	c #EAEEF9",
+"/	c #EBEFF9",
+"(	c #ECF0FA",
+"_	c #EDF0FA",
+":	c #EDF1FA",
+"<	c #EEF1FA",
+"[	c #EEF2FA",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@#$%&*==-;>,,'.",
+".+@#$%&*==-;>,,)'.",
+".+#$%&*==-;>,,))'.",
+".+$%&!==-;>~,)){'.",
+".+%&!]]-;>~~~){^'.",
+".+&*=]]]>~~~){^^'.",
+".+==-;~~~~~{^^//'.",
+".+=-;>,~~~{^^//('.",
+".+-;>,,)~{^^//(_'.",
+".+;>,,)){^^//(_:'.",
+".+>,,)){^^//(_:<'.",
+".+,,)){^^//(_:<['.",
+" .''''''''''''''. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/menu-inactive.xpm xfwm4-4.0.5/themes/bluecurve/menu-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/menu-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/menu-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,28 @@
+/* XPM */
+static char * menu_inactive_xpm[] = {
+"18 16 9 1",
+" 	c None",
+".	c #BDBDBD",
+"+	c #EEEEEE",
+"@	c #EDEDED",
+"#	c #ECECEC",
+"$	c #939393",
+"%	c #EBEBEB",
+"&	c #EAEAEA",
+"*	c #E9E9E9",
+"  ..............  ",
+" .++++++++++++++. ",
+".@@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@@.",
+".################.",
+".####$#####$#####.",
+".###$$$###$$$####.",
+".%%%%$$$%$$$%%%%%.",
+".%%%%%$$$$$%%%%%%.",
+".%%%%%%$$$%%%%%%%.",
+".&&&&&&&$&&&&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".****************.",
+" .**************. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/menu-pressed.xpm xfwm4-4.0.5/themes/bluecurve/menu-pressed.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/menu-pressed.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/menu-pressed.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,25 @@
+/* XPM */
+static char * menu_pressed_xpm[] = {
+"18 16 6 1",
+" 	c None",
+".	c #858FA4",
+"+	c #B0B7C8",
+"@	c #647190",
+"#	c #657290",
+"$	c #647290",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++ at +++++#+++++.",
+".+++@$$+++###++++.",
+".++++$$$+###+++++.",
+".+++++#####++++++.",
+".++++++###+++++++.",
+".+++++++#++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/right-active.xpm xfwm4-4.0.5/themes/bluecurve/right-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/right-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/right-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,10 @@
+/* XPM */
+static char * right_active_xpm[] = {
+"5 4 3 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s active_color_2",
+"....+",
+"....+",
+"....+",
+"....+"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/right-inactive.xpm xfwm4-4.0.5/themes/bluecurve/right-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/right-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/right-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,10 @@
+/* XPM */
+static char * right_inactive_xpm[] = {
+"5 4 3 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s inactive_color_2",
+"....+",
+"....+",
+"....+",
+"....+"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/themerc xfwm4-4.0.5/themes/bluecurve/themerc
--- xfwm4-4.0.5.orig2/themes/bluecurve/themerc	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/themerc	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,11 @@
+active_text_color=#ffffff
+inactive_text_color=#777777
+button_layout=O|HMC
+button_offset=-1
+button_spacing=2
+full_width_title=true
+title_horizontal_offset=4
+title_shadow_active=true
+title_shadow_inactive=false
+title_vertical_offset_active=2
+title_vertical_offset_inactive=2
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-1-active.xpm xfwm4-4.0.5/themes/bluecurve/title-1-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-1-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-1-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,33 @@
+/* XPM */
+static char * title_1_active_xpm[] = {
+"2 22 8 1",
+" 	c None",
+".	c #000000",
+"+	c #BEC6D8",
+"@	c #C3CBDE",
+"#	c #C9D1E3",
+"$	c #CED6E9",
+"%	c #D3DCEF",
+"&	c #7283A7",
+"..",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"@@",
+"##",
+"$$",
+"%%",
+"&&"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-1-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-1-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-1-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-1-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,35 @@
+/* XPM */
+static char * title_1_inactive_xpm[] = {
+"2 22 10 1",
+" 	c None",
+".	c #000000",
+"+	c #E8E8E8",
+"@	c #E3E3E3",
+"#	c #DEDEDE",
+"$	c #D9D9D9",
+"%	c #D6D6D6",
+"&	c #D4D4D4",
+"*	c #D2D2D2",
+"=	c #C4C4C4",
+"..",
+"++",
+"@@",
+"##",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"%%",
+"&&",
+"**",
+"**",
+"=="};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-2-active.xpm xfwm4-4.0.5/themes/bluecurve/title-2-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-2-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-2-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,34 @@
+/* XPM */
+static char * title_2_active_xpm[] = {
+"4 22 9 1",
+" 	c None",
+".	c #000000",
+"+	c #BEC6D8",
+"@	c #283C67",
+"#	c #C3CBDE",
+"$	c #C9D1E3",
+"%	c #CED6E9",
+"&	c #D3DCEF",
+"*	c #7283A7",
+"....",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"###@",
+"$$$@",
+"%%%@",
+"&&&@",
+"***@"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-2-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-2-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-2-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-2-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,35 @@
+/* XPM */
+static char * title_2_inactive_xpm[] = {
+"4 22 10 1",
+" 	c None",
+".	c #000000",
+"+	c #E8E8E8",
+"@	c #E3E3E3",
+"#	c #DEDEDE",
+"$	c #D9D9D9",
+"%	c #D6D6D6",
+"&	c #D4D4D4",
+"*	c #D2D2D2",
+"=	c #C4C4C4",
+"....",
+"++++",
+"@@@@",
+"####",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"%%%%",
+"&&&&",
+"****",
+"****",
+"===="};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-3-active.xpm xfwm4-4.0.5/themes/bluecurve/title-3-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-3-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-3-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,81 @@
+/* XPM */
+static char * title_3_active_xpm[] = {
+"5 22 56 1",
+" 	c None",
+".	c #000000",
+"+	c #A8B9DE",
+"@	c #647EBA",
+"#	c #3D4F77",
+"$	c #899DC9",
+"%	c #5E7AB8",
+"&	c #859AC7",
+"*	c #5875B5",
+"=	c #3A4D76",
+"-	c #5370B3",
+";	c #374975",
+">	c #8095C5",
+",	c #4D6CB0",
+"'	c #334672",
+")	c #7C92C3",
+"!	c #4B6AB0",
+"~	c #314572",
+"{	c #7B91C3",
+"]	c #304471",
+"^	c #7A91C2",
+"/	c #4969AF",
+"(	c #7A90C2",
+"_	c #4867AE",
+":	c #304472",
+"<	c #4665AD",
+"[	c #2E4271",
+"}	c #778DC0",
+"|	c #4464AC",
+"1	c #2D4171",
+"2	c #768BC0",
+"3	c #2F4270",
+"4	c #788EC0",
+"5	c #314573",
+"6	c #7A8EC2",
+"7	c #4A68AF",
+"8	c #7D92C4",
+"9	c #4E6CB1",
+"0	c #364B78",
+"a	c #5270B4",
+"b	c #3B4F7D",
+"c	c #7D93C4",
+"d	c #5774B5",
+"e	c #405480",
+"f	c #7E95C5",
+"g	c #5F7AB8",
+"h	c #485B86",
+"i	c #8497C7",
+"j	c #4F618B",
+"k	c #879BC7",
+"l	c #6680BA",
+"m	c #8B9ECA",
+"n	c #6D85BE",
+"o	c #566892",
+"p	c #7289C0",
+"q	c #0B0B0C",
+".....",
+"+++++",
+"@@@@@",
+"#$%%%",
+"&***=",
+"---;>",
+",,'),",
+"!~{!!",
+"]^///",
+"(___:",
+"<<<[}",
+"||12|",
+"<34<<",
+"56777",
+"89990",
+"aaabc",
+"ddefd",
+"ghigg",
+"jklll",
+"mnnno",
+"ppppp",
+"qqqqq"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-3-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-3-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-3-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-3-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,35 @@
+/* XPM */
+static char * title_3_inactive_xpm[] = {
+"5 22 10 1",
+" 	c None",
+".	c #000000",
+"+	c #E8E8E8",
+"@	c #E3E3E3",
+"#	c #DEDEDE",
+"$	c #D9D9D9",
+"%	c #D6D6D6",
+"&	c #D4D4D4",
+"*	c #D2D2D2",
+"=	c #C4C4C4",
+".....",
+"+++++",
+"@@@@@",
+"#####",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"%%%%%",
+"&&&&&",
+"*****",
+"*****",
+"====="};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-4-active.xpm xfwm4-4.0.5/themes/bluecurve/title-4-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-4-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-4-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,34 @@
+/* XPM */
+static char * title_4_active_xpm[] = {
+"4 22 9 1",
+" 	c None",
+".	c #000000",
+"+	c #283C67",
+"@	c #BEC6D8",
+"#	c #C3CBDE",
+"$	c #C9D1E3",
+"%	c #CED6E9",
+"&	c #D3DCEF",
+"*	c #7283A7",
+"....",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+###",
+"+$$$",
+"+%%%",
+"+&&&",
+"+***"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-4-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-4-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-4-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-4-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,35 @@
+/* XPM */
+static char * title_4_inactive_xpm[] = {
+"4 22 10 1",
+" 	c None",
+".	c #000000",
+"+	c #E8E8E8",
+"@	c #E3E3E3",
+"#	c #DEDEDE",
+"$	c #D9D9D9",
+"%	c #D6D6D6",
+"&	c #D4D4D4",
+"*	c #D2D2D2",
+"=	c #C4C4C4",
+"....",
+"++++",
+"@@@@",
+"####",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"%%%%",
+"&&&&",
+"****",
+"****",
+"===="};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-5-active.xpm xfwm4-4.0.5/themes/bluecurve/title-5-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-5-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-5-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,33 @@
+/* XPM */
+static char * title_5_active_xpm[] = {
+"2 22 8 1",
+" 	c None",
+".	c #000000",
+"+	c #BEC6D8",
+"@	c #C3CBDE",
+"#	c #C9D1E3",
+"$	c #CED6E9",
+"%	c #D3DCEF",
+"&	c #7283A7",
+"..",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"@@",
+"##",
+"$$",
+"%%",
+"&&"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-5-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-5-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-5-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-5-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,35 @@
+/* XPM */
+static char * title_5_inactive_xpm[] = {
+"2 22 10 1",
+" 	c None",
+".	c #000000",
+"+	c #E8E8E8",
+"@	c #E3E3E3",
+"#	c #DEDEDE",
+"$	c #D9D9D9",
+"%	c #D6D6D6",
+"&	c #D4D4D4",
+"*	c #D2D2D2",
+"=	c #C4C4C4",
+"..",
+"++",
+"@@",
+"##",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"%%",
+"&&",
+"**",
+"**",
+"=="};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/top-left-active.xpm xfwm4-4.0.5/themes/bluecurve/top-left-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/top-left-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/top-left-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,38 @@
+/* XPM */
+static char * top_left_active_xpm[] = {
+"10 22 13 1",
+" 	c None",
+".	c #000000",
+"+	c #36383D",
+"@	c #A7AEBE",
+"#	c #BEC6D8",
+"$	c #979EAC",
+"%	c #393B40",
+"&	c #A5ACBB",
+"*	c #C3CBDE",
+"=	c #C9D1E3",
+"-	c #CED6E9",
+";	c #D3DCEF",
+">	c #7283A7",
+"     .....",
+"   .+@####",
+"  .$######",
+" .$#######",
+" %########",
+".&########",
+".#########",
+".#########",
+".#########",
+".#########",
+".#########",
+".#########",
+".#########",
+".#########",
+".#########",
+".#########",
+".#########",
+".*********",
+".=========",
+".---------",
+".;;;;;;;;;",
+".>>>>>>>>>"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/top-left-inactive.xpm xfwm4-4.0.5/themes/bluecurve/top-left-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/top-left-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/top-left-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,41 @@
+/* XPM */
+static char * top_left_inactive_xpm[] = {
+"10 22 16 1",
+" 	c None",
+".	c #000000",
+"+	c #424242",
+"@	c #CCCCCC",
+"#	c #E8E8E8",
+"$	c #B5B5B5",
+"%	c #E3E3E3",
+"&	c #B1B1B1",
+"*	c #DEDEDE",
+"=	c #414141",
+"-	c #D9D9D9",
+";	c #BCBCBC",
+">	c #D6D6D6",
+",	c #D4D4D4",
+"'	c #D2D2D2",
+")	c #C4C4C4",
+"     .....",
+"   .+@####",
+"  .$%%%%%%",
+" .&*******",
+" =--------",
+".;--------",
+".---------",
+".---------",
+".---------",
+".---------",
+".---------",
+".---------",
+".---------",
+".---------",
+".---------",
+".---------",
+".---------",
+".>>>>>>>>>",
+".,,,,,,,,,",
+".'''''''''",
+".'''''''''",
+".)))))))))"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/top-right-active.xpm xfwm4-4.0.5/themes/bluecurve/top-right-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/top-right-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/top-right-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,38 @@
+/* XPM */
+static char * top_right_active_xpm[] = {
+"10 22 13 1",
+" 	c None",
+".	c #000000",
+"+	c #BEC6D8",
+"@	c #A7AEBE",
+"#	c #36383D",
+"$	c #979EAC",
+"%	c #393B40",
+"&	c #A5ACBB",
+"*	c #C3CBDE",
+"=	c #C9D1E3",
+"-	c #CED6E9",
+";	c #D3DCEF",
+">	c #7283A7",
+".....     ",
+"++++@#.   ",
+"++++++$.  ",
+"+++++++$. ",
+"++++++++% ",
+"++++++++&.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"*********.",
+"=========.",
+"---------.",
+";;;;;;;;;.",
+">>>>>>>>>."};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/top-right-inactive.xpm xfwm4-4.0.5/themes/bluecurve/top-right-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/top-right-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/top-right-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,41 @@
+/* XPM */
+static char * top_right_inactive_xpm[] = {
+"10 22 16 1",
+" 	c None",
+".	c #000000",
+"+	c #E8E8E8",
+"@	c #CCCCCC",
+"#	c #424242",
+"$	c #E3E3E3",
+"%	c #B5B5B5",
+"&	c #DEDEDE",
+"*	c #B1B1B1",
+"=	c #D9D9D9",
+"-	c #414141",
+";	c #BCBCBC",
+">	c #D6D6D6",
+",	c #D4D4D4",
+"'	c #D2D2D2",
+")	c #C4C4C4",
+".....     ",
+"++++@#.   ",
+"$$$$$$%.  ",
+"&&&&&&&*. ",
+"========- ",
+"========;.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+">>>>>>>>>.",
+",,,,,,,,,.",
+"'''''''''.",
+"'''''''''.",
+")))))))))."};

xfwm4-bluecurve-prep.patch:

--- NEW FILE xfwm4-bluecurve-prep.patch ---
diff -Nur xfwm4-4.2.1.orig/configure xfwm4-4.2.1/configure
--- xfwm4-4.2.1.orig/configure	2005-03-12 07:19:39.000000000 -0700
+++ xfwm4-4.2.1/configure	2005-03-20 15:00:33.492532918 -0700
@@ -25253,7 +25253,7 @@
   fi
 
 
-                                                                                                                                                                                                                            ac_config_files="$ac_config_files xfwm4.spec Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile defaults/Makefile icons/Makefile icons/48x48/Makefile icons/scalable/Makefile mcs-plugin/Makefile po/Makefile.in src/Makefile themes/Makefile themes/default/Makefile themes/default.keys/Makefile themes/default-4.0/Makefile themes/opta/Makefile themes/symphony/Makefile themes/tyrex/Makefile themes/therapy/Makefile themes/waza/Makefile themes/wildbush/Makefile"
+                                                                                                                                                                                                                            ac_config_files="$ac_config_files xfwm4.spec Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile defaults/Makefile icons/Makefile icons/48x48/Makefile icons/scalable/Makefile mcs-plugin/Makefile po/Makefile.in src/Makefile themes/Makefile themes/bluecurve/Makefile themes/default/Makefile themes/default.keys/Makefile themes/default-4.0/Makefile themes/opta/Makefile themes/symphony/Makefile themes/tyrex/Makefile themes/therapy/Makefile themes/waza/Makefile themes/wildbush/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -25854,6 +25854,7 @@
   "themes/therapy/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/therapy/Makefile" ;;
   "themes/waza/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/waza/Makefile" ;;
   "themes/wildbush/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/wildbush/Makefile" ;;
+  "themes/bluecurve/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/bluecurve/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
diff -Nur xfwm4-4.2.1.orig/configure.ac xfwm4-4.2.1/configure.ac
--- xfwm4-4.2.1.orig/configure.ac	2005-03-12 07:19:39.000000000 -0700
+++ xfwm4-4.2.1/configure.ac	2005-03-20 15:00:45.731640166 -0700
@@ -125,4 +125,5 @@
 themes/therapy/Makefile
 themes/waza/Makefile
 themes/wildbush/Makefile
+themes/bluecurve/Makefile
 ])
diff -Nur xfwm4-4.2.1.orig/mcs-plugin/xfwm4_plugin.h xfwm4-4.2.1/mcs-plugin/xfwm4_plugin.h
--- xfwm4-4.2.1.orig/mcs-plugin/xfwm4_plugin.h	2004-12-18 16:32:07.000000000 -0700
+++ xfwm4-4.2.1/mcs-plugin/xfwm4_plugin.h	2005-03-20 15:02:32.162180902 -0700
@@ -29,7 +29,7 @@
 #define CHANNEL2  "xfwm4_keys"
 #define PLUGIN_NAME "xfwm4"
 
-#define DEFAULT_THEME "Default"
+#define DEFAULT_THEME "Bluecurve"
 #define DEFAULT_KEY_THEME "Default"
 #define DEFAULT_LAYOUT "OTS|HMC"
 #define DEFAULT_ACTION "maximize"
diff -Nur xfwm4-4.2.1.orig/themes/Makefile.am xfwm4-4.2.1/themes/Makefile.am
--- xfwm4-4.2.1.orig/themes/Makefile.am	2005-01-13 12:56:07.000000000 -0700
+++ xfwm4-4.2.1/themes/Makefile.am	2005-03-20 15:03:03.076400082 -0700
@@ -10,4 +10,5 @@
 	therapy								\
 	tyrex								\
 	waza								\
-	wildbush
+	wildbush                                                        \
+        bluecurve
diff -Nur xfwm4-4.2.1.orig/themes/Makefile.in xfwm4-4.2.1/themes/Makefile.in
--- xfwm4-4.2.1.orig/themes/Makefile.in	2005-01-13 12:56:07.000000000 -0700
+++ xfwm4-4.2.1/themes/Makefile.in	2005-03-20 15:04:02.131267369 -0700
@@ -226,7 +226,8 @@
 	therapy								\
 	tyrex								\
 	waza								\
-	wildbush
+	wildbush                                                        \
+        bluecurve
 
 all: all-recursive
 


Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfwm4.spec	19 Mar 2005 18:34:19 -0000	1.1
+++ xfwm4.spec	20 Mar 2005 22:19:26 -0000	1.2
@@ -1,18 +1,24 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.2.1
-Release: 1
+Release: 2
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2
+
+# Change default for Fedora
+Patch0: xfwm4-bluecurve-prep.patch
+Patch1: xfwm4-bluecurve.patch
+
 Group: User Interface/Desktops
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libxfce4mcs >= 4.2.1
-Requires: libxfcegui4 >= 4.2.1
-Requires: xfce-mcs-manager >= 4.2.1
-BuildRequires: libxfce4mcs-devel >= 4.2.1
-BuildRequires: libxfcegui4-devel >= 4.2.1
-BuildRequires: xfce-mcs-manager-devel >= 4.2.1
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires: libxfce4mcs >= %{version}
+Requires: libxfcegui4 >= %{version}
+Requires: xfce-mcs-manager >= %{version}
+BuildRequires: libxfce4mcs-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: xfce-mcs-manager-devel >= %{version}
 
 %description
 xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.
@@ -20,6 +26,9 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .bluecurve-prep
+%patch1 -p1 -b .bluecurve
+
 %build
 %configure
 
@@ -28,6 +37,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+
 %find_lang %{name}
 
 %clean
@@ -37,21 +47,62 @@
 %defattr(-,root,root)
 %doc example.gtkrc-2.0 README TODO COPYING AUTHORS COMPOSITOR
 %{_bindir}/xfwm4
-%{_libdir}/xfce4
-%{_datadir}/applications
-%{_datadir}/icons
+%{_libdir}/xfce4/mcs-plugins/*
+%{_datadir}/applications/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/xfce4
 %{_datadir}/xfwm4
 %{_datadir}/themes
 
 %changelog
+* Sun Mar 20 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
+- Readded changelogs
+- Split old fedora patch into a bluecurve-prep and bluecurve patch and applied
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to version 4.2.1
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
 - Removed generic INSTALL from %doc
 - Fixed case of Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
 - Inital Fedora Extras version
+
+* Thu Jan 27 2005 Than Ngo <than at redhat.com> 4.2.0-1
+- 4.2.0
+
+* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
+- update to 4.0.6
+- use %%find_lang macros
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Apr 20 2004 Than Ngo <than at redhat.com> 4.0.5-2
+- Add a patch for stacking request with sibling, thanks to Olivier Fourdan <fourdan at xfce.org>
+- Change defaults for fedora, thanks to Olivier Fourdan <fourdan at xfce.org>
+
+* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
+- update to 4.0.5
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3.1-2
+- fixed dependant libraries check on x86_64
+
+* Tue Jan 13 2004 Than Ngo <than at redhat.com> 4.0.3.1-1
+- 4.0.3.1 release
+
+* Mon Jan 12 2004 Than Ngo <than at redhat.com> 4.0.3-1
+- 4.0.3 release
+
+* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
+- 4.0.2 release
+
+* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
+- initial build



From fedora-extras-commits at redhat.com  Sun Mar 20 22:31:19 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 17:31:19 -0500
Subject: rpms/xfce4-systray/devel xfce4-systray.spec,1.2,1.3
Message-ID: <200503202231.j2KMVJc4020117@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20104

Modified Files:
	xfce4-systray.spec 
Log Message:
needs xfce4-panel-devel



Index: xfce4-systray.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systray/devel/xfce4-systray.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-systray.spec	20 Mar 2005 08:43:39 -0000	1.2
+++ xfce4-systray.spec	20 Mar 2005 22:31:17 -0000	1.3
@@ -8,7 +8,7 @@
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: xfce4-panel >= %{version}
-BuildRequires: xfce4-panel >= %{version}
+BuildRequires: xfce4-panel-devel >= %{version}
 BuildRequires: libxml2-devel
 BuildRequires: libxfcegui4-devel
 BuildRequires: startup-notification-devel



From fedora-extras-commits at redhat.com  Sun Mar 20 22:38:52 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 20 Mar 2005 17:38:52 -0500
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec,1.1,1.2
Message-ID: <200503202238.j2KMcqD7020263@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20251

Modified Files:
	xfwm4-themes.spec 
Log Message:
Readded changelog entries from core cvs spec. 
Removed mandir on install



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/xfwm4-themes.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfwm4-themes.spec	19 Mar 2005 18:39:46 -0000	1.1
+++ xfwm4-themes.spec	20 Mar 2005 22:38:50 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
 Version: 4.2.1
-Release: 1
+Release: 2
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-themes-4.2.1.tar.bz2
@@ -24,7 +24,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -35,6 +35,9 @@
 %{_datadir}/themes
 
 %changelog
+* Sun Mar 20 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
+- Readded changelogs back in from core cvs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
@@ -43,3 +46,27 @@
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
 - Inital Fedora Extras version
+
+* Thu Feb 03 2005 Than Ngo <than at redhat.com> 4.2.0-1
+- 4.2.0
+
+* Fri Sep 24 2004 Than Ngo <than at redhat.com> 4.0.6-2
+- fix package description
+
+* Tue Jul 20 2004 Than Ngo <than at redhat.com> 4.0.6-1
+- update to 4.0.6
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
+- update to 4.0.5
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed Jan 14 2004 Than Ngo <than at redhat.com> 4.0.3-1
+- 4.0.3 release
+
+* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
+- initial build



From fedora-extras-commits at redhat.com  Sun Mar 20 22:41:22 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 17:41:22 -0500
Subject: rpms/xfdesktop/devel xfdesktop.spec,1.3,1.4
Message-ID: <200503202241.j2KMfMEp020516@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20504

Modified Files:
	xfdesktop.spec 
Log Message:
BuildRequires: xfce4-panel-devel >= %{version}



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfdesktop.spec	20 Mar 2005 20:59:24 -0000	1.3
+++ xfdesktop.spec	20 Mar 2005 22:41:19 -0000	1.4
@@ -18,6 +18,7 @@
 Requires: desktop-backgrounds-basic
 BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: xfce4-panel-devel >= %{version}
 BuildRequires: libxml2-devel
 BuildRequires: xfce-mcs-manager-devel
 



From fedora-extras-commits at redhat.com  Sun Mar 20 22:50:52 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 17:50:52 -0500
Subject: rpms/xfwm4/devel xfwm4.spec,1.2,1.3
Message-ID: <200503202250.j2KMoqRa020845@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20831

Modified Files:
	xfwm4.spec 
Log Message:
prep for FC4 build



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfwm4.spec	20 Mar 2005 22:19:26 -0000	1.2
+++ xfwm4.spec	20 Mar 2005 22:50:50 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.2.1
-Release: 2
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar 20 22:52:06 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 17:52:06 -0500
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec,1.2,1.3
Message-ID: <200503202252.j2KMq6TO020918@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20904

Modified Files:
	xfwm4-themes.spec 
Log Message:
prep for FC4 build



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/xfwm4-themes.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfwm4-themes.spec	20 Mar 2005 22:38:50 -0000	1.2
+++ xfwm4-themes.spec	20 Mar 2005 22:52:04 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
 Version: 4.2.1
-Release: 2
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-themes-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar 20 23:33:54 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Sun, 20 Mar 2005 18:33:54 -0500
Subject: rpms/pybliographer import.log,1.3,1.4
Message-ID: <200503202333.j2KNXs4b022304@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22293

Modified Files:
	import.log 
Log Message:
auto-import pybliographer-1.2.4-0.fdr.4.1 on branch FC-1 from pybliographer-1.2.4-0.fdr.4.1.src.rpm
Update from fedora.us


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 05:14:20 -0000	1.3
+++ import.log	20 Mar 2005 23:33:52 -0000	1.4
@@ -1,2 +1,3 @@
 pybliographer-1_2_4-0_fdr_1_1:HEAD:pybliographer-1.2.4-0.fdr.1.1.src.rpm:1099890854
 pybliographer-1_2_4-0_fdr_1_2:HEAD:pybliographer-1.2.4-0.fdr.1.2.src.rpm:1099890860
+pybliographer-1_2_4-0_fdr_4_1:FC-1:pybliographer-1.2.4-0.fdr.4.1.src.rpm:1111361718



From fedora-extras-commits at redhat.com  Sun Mar 20 23:33:54 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Sun, 20 Mar 2005 18:33:54 -0500
Subject: rpms/pybliographer/FC-1 pyblio.patch, NONE, 1.1 pybliographer.spec,
	1.1, 1.2
Message-ID: <200503202333.j2KNXsI4022308@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22293/FC-1

Modified Files:
	pybliographer.spec 
Added Files:
	pyblio.patch 
Log Message:
auto-import pybliographer-1.2.4-0.fdr.4.1 on branch FC-1 from pybliographer-1.2.4-0.fdr.4.1.src.rpm
Update from fedora.us

pyblio.patch:

--- NEW FILE pyblio.patch ---
--- pybliographer-1.2.4/Pyblio/Base.py	2004-07-17 21:52:43.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Base.py	2004-11-26 08:09:55.000000000 +0100
@@ -76,6 +76,12 @@
 
 	return self.field_and_loss (key) [0]
 
+    def get (self, key, default=None):
+        if self.has_key (key):
+            return self [key]
+        else :
+            return default
+
 
     def __setitem__ (self, name, value):
 	self.dict [name] = value
@@ -116,7 +122,11 @@
 	tp = self.type.name
 	fields = self.type.fields
 
-	text = '%s [%s]\n' % (tp, self.key.key)
+        try:
+            text = '%s [%s]\n' % (tp, self.key.key)
+        except AttributeError:
+            text  = '%s [no key]\n' %(tp)
+            
 	text = text + ('-' * 70) + '\n'
 
 	dico = self.keys ()
--- pybliographer-1.2.4/Pyblio/ConfDir/Base.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/ConfDir/Base.py	2004-11-26 08:09:55.000000000 +0100
@@ -60,7 +60,7 @@
            'Date', 'NoSeries', 'ConfPlace', 'Cote', 'IEEECN', 'Annotate',
            'Quote', 'LoCN', 'ISBN', 'ISSN', 'Note', 'Language', 'HowPublished',
            'To_Appear', 'From', 'Received', 'Owner', 'Keywords', 'Abstract',
-           'Remarks', 'URL' ]
+           'Remarks', 'URL', 'Beigabevermerk' ]
 
 entries = {
     'Article' : (('author', 'title', 'journal', 'date'),
@@ -81,7 +81,7 @@
     
     'InCollection' : (('author', 'title', 'booktitle', 'publisher', 'date', ),
                       ('editor', 'volume', 'number', 'series', 'type',
-                      'chapter', 'pages', 'address', 'edition',)),
+                      'chapter', 'pages', 'address', 'edition', 'note',)),
     
     'InProceedings' : (('author', 'title', 'booktitle', 'date',),
                        ('editor', 'volume', 'number', 'series',
@@ -136,6 +136,7 @@
 desc ['note'].type         = Fields.LongText
 desc ['quote'].type        = Fields.LongText
 desc ['remarks'].type      = Fields.LongText
+#desc ['beigabevermerk'].type      = Fields.LongText
 
 
 Config.set ('base/fields', desc)
--- pybliographer-1.2.4/Pyblio/ConfDir/GnomeUI.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/ConfDir/GnomeUI.py	2004-11-26 08:09:56.000000000 +0100
@@ -64,7 +64,9 @@
              ('editor', 150),
              ('title',  200),
              ('booktitle', 200),
-             ('date', 50)):
+             ('date', 50),
+             ('-author/editor-', 150),
+             ('-author/title-', 250)):
     
     if not h.has_key (f): continue
 
--- pybliographer-1.2.4/Pyblio/ConfDir/Ovid.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/ConfDir/Ovid.py	2004-11-26 08:09:56.000000000 +0100
@@ -11,23 +11,23 @@
 Config.set ('ovid/deftype',
             Config.get ('base/entries').data ['article'])
 
-Config.define ('ovid/sourceregexp',
-               """A regexp used to parse the source and abbreviated
-               source input fields. This is a raw and verbose Python
-               regular expression""",
-               Config.String())
-
-Config.set ('ovid/sourceregexp',
-    r"""
-    (?P<journal>.*)\.\ +
-    (?P<volume>\d+)
-    (?:\((?P<number>.*)\))?
-    (?::(?P<pages>.*?(?:-+.*?)?)
-    (?:;\ *(?P<other>.*))?)
-    (?:,\ *(?P<year>\d\d\d\d))\ *
-    (?P<month>.*)
-    \.\Z
-    """)
+## Config.define ('ovid/sourceregexp',
+##                """A regexp used to parse the source and abbreviated
+##                source input fields. This is a raw and verbose Python
+##                regular expression""",
+##                Config.String())
+
+## Config.set ('ovid/sourceregexp',
+##     r"""
+##     (?P<journal>.*)\.\ +
+##     (?P<volume>\d+)
+##     (?:\((?P<number>.*)\))?
+##     (?::(?P<pages>.*?(?:-+.*?)?)
+##     (?:;\ *(?P<other>.*))?)
+##     (?:,\ *(?P<year>\d\d\d\d))\ *
+##     (?P<month>.*)
+##     \.\Z
+##     """)
 
 Config.define ('ovid/mapping', 
                """ A mapping between the Ovid field name and
@@ -40,52 +40,53 @@
 
 
 Config.set ('ovid/mapping', {
-    'abbreviated source'
+    'Abbreviated Source'
                     : ('abbrevsrc',   SimpleField),
-    'abstract'      : ('abstract',    SimpleField),
-    'accession number'
+    'Abstract'      : ('abstract',    SimpleField),
+    'Accession Number'
                     : ('accession',   SimpleField),
-    'author'        : ('author',      AuthorField),
-    'author keywords'
-                    : ('keywords',    KeywordField),
-    'authors'       : ('author',      AuthorField),
-    'cas registry/ec number' 
+    'Author'        : ('author',      AuthorField),
+    'Author Keywords'
+                    : ('author-keywords',
+                       KeywordField),
+    'Authors'       : ('author',      AuthorField),
+    'CAS Registry/EC Number' 
                     : ('casec',       SimpleField),
-    'cc categories' : ('cccat',       SimpleField),
-    'classification codes'
+    'CC Categories' : ('cccat',       SimpleField),
+    'Classification Codes'
                     : ('classificationCodes',
                                       SimpleField),
-    'country of publication'
+    'Country of Publication'
                     : ('country',     SimpleField),
-    'document delivery'
+    'Document Delivery'
                     : ('docdeliv',    SimpleField),
-    'entry date'    : ('sourceid4',   SimpleField),
-    'institution'   : ('institution', SimpleField),
-    'issn'          : ('issn',        SimpleField),
-    'journal subset': ('nlmsubset',   SimpleField),
-    'key phrase identifiers'
-                    : ('keywords',    SimpleField),
-    'keywords+'     : ('keywords',    KeywordField),
-    'keywords plus' : ('keywords',    KeywordField),
-    'language'      : ('language',    SimpleField),
-    'mesh subject headings'
-                    : ('mesh',        SimpleField),
-    'nlm journal code'
+    'Entry Date'    : ('sourceid4',   SimpleField),
+    'Institution'   : ('institution', SimpleField),
+    'ISSN'          : ('issn',        SimpleField),
+    'Journal Subset': ('nlmsubset',   SimpleField),
+    'Key Phrase Identifiers'
+                    : ('keyphrase',   SimpleField),
+    'Keywords+'     : ('keywords',    KeywordField),
+    'KeyWords Plus' : ('keywordsplus',    KeywordField),
+    'Language'      : ('language',    SimpleField),
+    'Mesh Subject Headings'
+                    : ('mesh',        KeywordField),
+    'NLM Journal Code'
                     : ('nlmjournal',  SimpleField),
-    'publication notes'
+    'Publication Notes'
                     : ('note',        SimpleField),
-    'publication type'
-                    : ('type',        SimpleField),
-    'record owner'  : ('sourceid1',   SimpleField),
-    'revision date' : ('sourceid3',   SimpleField),
-    'source'        : ('journal',     SourceField),
-    'subject headings'
+    'Publication Type'
+                    : ('profile',     SimpleField),
+    'Record Owner'  : ('sourceid1',   SimpleField),
+    'Revision Date' : ('sourceid3',   SimpleField),
+    'Source'        : ('journal',     SourceField),
+    'Subject Headings'
                     : ('subjectHdgs', SimpleField),
-    'subset'        : ('subset',      SimpleField), 
-    'title'         : ('title',       SimpleField),
-    'treatment'     : ('treatment',   SimpleField),
-    'unique identifier'
+    'Subset'        : ('subset',      SimpleField), 
+    'Title'         : ('title',       SimpleField),
+    'Treatment'     : ('treatment',   SimpleField),
+    'Unique Identifier'
                     : ('sourceid0',   SimpleField),
-    'update date'   : ('sourceid2',   SimpleField), 
+    'Update Date'   : ('sourceid2',   SimpleField), 
     })
 
--- pybliographer-1.2.4/Pyblio/Config.py	2004-07-17 21:54:36.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Config.py	2004-11-26 08:09:56.000000000 +0100
@@ -71,14 +71,16 @@
 
 
     def eventually_resolve (self, key):
+
         if self.items.has_key (key): return
         domain = string.split (key, '/') [0]
-        
+
         if self.sources.has_key (domain):
             file = self.sources [domain]
             del self.sources [domain]
 
             execfile (file, globals (), globals ())
+
         return
 
 
@@ -115,6 +117,7 @@
 
 
     def __getitem__ (self, key):
+
         self.eventually_resolve (key)
         return self.items [key]
         
@@ -148,7 +151,9 @@
     try:
         ConfigItems [key].set (value)
     except KeyError:
-        sys.stderr.write ("pybliographer: warning: configuration key `%s' is undefined\n" % key)
+        sys.stderr.write (
+            "pybliographer: warning: configuration key `%s' is undefined\n"
+            % key)
     return
 
 _changes = {}
--- pybliographer-1.2.4/Pyblio/Fields.py	2004-07-17 21:54:49.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Fields.py	2004-11-26 08:09:56.000000000 +0100
@@ -154,7 +154,7 @@
 
         total = []
 
-        if self.first is None: return None
+        if self.first is None: return ''
         
         for atom in string.split (self.first, ' '):
             list = []
--- pybliographer-1.2.4/Pyblio/Format/isifile.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Format/isifile.py	2004-11-26 08:09:56.000000000 +0100
@@ -293,7 +293,7 @@
             authors = []
             for author in entry['author']:
                 initials = author.initials()
-                initials = re.sub('\. *','',initials)
+                initials = re.sub('\. *','', initials)
                 authors.append( '%s, %s' % (author.last, initials))
             del remaining ['author']    
             output_write('AU', authors)    
--- pybliographer-1.2.4/Pyblio/Format/OvidLike.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Format/OvidLike.py	2004-11-26 08:09:56.000000000 +0100
@@ -33,7 +33,6 @@
 KeywordField = 3
 
 separator_re = re.compile (r'<\d+>$')
-#source_re    = re.compile (r'(\w+)?\(([^\)]+)\):(\d+-\d+)')
 
 compact_dot  = re.compile (r'\.(\s*\.)+')
 
@@ -51,13 +50,32 @@
     month_name [long_month [key] - 1] = key
 
 
+
+def make_anti_mapping (mapping):
+    m = {}
+    for i, j in mapping.items():
+        m[j[0]] = (i, j[1])
+    return m
+
 class OvidLike (Iterator.Iterator):
+    source_rx  = r"""(?P<journal>.*?)\.\ +
+        (?P<volume>\w+)?
+        (?P<inseries>(\ PG\.\ +))?
+        (?:\((?P<number>.*)\))?
+        (?::?(?P<pages>.*?(?:-+.*?)?)
+        (?:;\ *(?P<other>.*))?)
+        (?:[,\.]\ *(?P<year>\d\d\d\d))\ *
+        (?P<month>.*)
+        \.\s*\Z"""
+
+    source_re = re.compile  (source_rx, flags=re.VERBOSE)
 
-    def __init__ (self, file, mapping, deftype, sourceregexp):
+    def __init__ (self, file, mapping, deftype):
         self.file    = file
         self.deftype = deftype
-        self.mapping = mapping
-        self.source_re = re.compile(sourceregexp, flags= re.VERBOSE)
+        self.mapping = {}
+        for i, j in mapping.iteritems():
+            self.mapping[i.lower()] = j
         return
 
     def first (self):
@@ -82,20 +100,17 @@
         dict = {}
         
         # read entry till next blank line
-        text  = ''
+        text  = []
         field = ''
         while 1:
             line = self.file.readline ()
             if line == '': break
-
             line = string.rstrip (line)
 
-            if line == '': continue
-            
             # starting with a blank ?
-            if line [0] == ' ':
+            if line == '' or   line [0] == ' ':
                 # ...then we continue the current text
-                text = text + ' ' + string.lstrip (line)
+                text.append (string.lstrip (line))
                 continue
 
             # new entry ?
@@ -104,25 +119,25 @@
             # else, this is a new field
             if field:
                 # save the previous one if needed
-                dict [field] = text
-                text = ''
+                dict [field] = '\n'.join(text)
+                text = []
 
             # store the name of this new field
             field = string.lower (line)
 
         # don't waste the last field content
         if field:
-            dict [field] = text
+            dict [field] = '\n'.join(text)
 
         # did we parse a field ?
         if len (dict) == 0: return None
-        
+
         # create the entry content
         entry = Base.Entry (type = self.deftype)
 
         for key in dict.keys ():
             if not self.mapping.has_key (key):
-                print "warning: unused key `%s'" % key
+                #print "warning: unused key `%s'" % key
                 continue
 
             (name, type) = self.mapping [key]
@@ -131,18 +146,16 @@
             # parse a simple text field
             if type == SimpleField:
                 entry [name] = text_type (string.strip (dict [key]))
-                continue
 
-            if type == KeywordField:
+            elif type == KeywordField:
                 text = string.strip (dict [key])
                 if entry.has_key (name):
-                    text = str (entry [name]) + '  ' + text
+                    text = str (entry [name]) + '\n  ' + text
                     
                 entry [name] = text_type (text)
-                continue
 
             # parse an author field
-            if type == AuthorField:
+            elif type == AuthorField:
                 ag = Fields.AuthorGroup ()
 
                 for names in string.split (dict [key], '  '):
@@ -169,19 +182,32 @@
                 continue
 
             # parse a source field
-            if type == SourceField:
-
-                m = self.source_re.match (dict[key])
-
+            elif type == SourceField:
+                m = self.source_re.match (dict[key].strip())
                 if m:
                     year, month, day = None, None, None
-
-                    j, v, n, p, o, y, m = m.group(
-                        'journal', 'volume', 'number', 'pages',
-                        'other', 'year', 'month')
-
-                    if j:
-                        entry [name] = Fields.Text (j)
+                    j, v, s, n, p, o, y, d = m.group(
+                        'journal', 'volume', 'inseries', 'number',
+                        'pages', 'other', 'year', 'month')
+
+                    if s:                ### article in a monograph series
+                        entry['booktitle'] = Fields.Text (j)
+                        if d:
+                            entry['beigabevermerk'] = Fields.LongText (d)
+                        entry.type = Types.get_entry('incollection')
+
+                    elif j:
+                        entry ['journal'] = Fields.Text (j)
+                        if d and not d.isspace():
+                            dates = d.split ()                    
+                            try:
+                                month = long_month [dates[0]]
+                            except KeyError:
+                                print 'OVID Warning:',
+                                print '%s is not representable in %s' %(
+                                dates[0], m)
+                            if len(dates) > 1:
+                                day = int (dates[1])
 
                     if v:
                         entry ['volume'] = Fields.Text (v)
@@ -198,21 +224,12 @@
                     if y:
                         year = int(y)
 
-                    if m and not m.isspace():
-                        dates = m.split ()                    
-                        try:
-                            month = long_month [dates[0]]
-                        except KeyError:
-                            print 'OVID Warning: %s is not representable in %s' %(
-                                dates[0], m)
-                        if len(dates) > 1:
-                            day = int (dates[1])
-                            
                     entry ['date'] = Fields.Date((year, month, day))
-                
+                else:
+                    print '>>> Error: Source field  does not parse correctly:'
+                    print dict[key]
+                    print entry
                 continue
-
-            raise TypeError, "unknown field type `%d'" % type
         
         return entry
 
@@ -221,78 +238,139 @@
 
     counter = 1
     entry   = iter.first ()
-
+    m = make_anti_mapping (mapping)
     while entry:
-        output.write ('<%d>\n' % counter)
+        write_entry (output, entry, counter, m)
         counter = counter + 1
+        entry = iter.next ()
+        if entry: output.write ('\n')
 
-        for key in mapping.keys ():
-            (name, type) = mapping [key]
-            key = string.capwords (key)
+def write_entry (output, entry, counter, mapping):
+    output.write ('<%d>\n' % counter)
 
-            if type == SimpleField:
-                if not entry.has_key (name): continue
-                output.write (key + '\n')
+    keys = entry.keys()
 
-                output.write (Utils.format (str (entry [name]),
-                                            75, 2, 2) + '\n')
-                continue
+    write_source_field (output, entry, keys)
+     
+    for key in keys:
+        (name, typ) = mapping.get(key, (None, None))
+        if name == None or typ == SourceField: continue
 
-            if type == AuthorField:
-                if not entry.has_key (name): continue
-                output.write (key + '\n')
+        output.write (name)
+        output.write('\n')
+        
+        if typ == SimpleField:
+            write_simple_field (output, entry[key])
 
-                auths = map (lambda auth: '%s %s' % (auth.last or '', auth.first or ''),
-                             entry [name])
+        elif typ == AuthorField:
+            write_author_field (output, entry[key])
 
-                output.write ('  ' + string.join (auths, '  ') + '\n')
-                continue
+        elif typ == SourceField: print 'sourcefield: %s' %(entry[key])
+#             write_source_field (output, entry, keys)
 
-            if type == SourceField:
-                # do we have one of those fields ?
-                if not (entry.has_key (name [0]) or
-                        entry.has_key (name [1]) or
-                        entry.has_key (name [2]) or
-                        entry.has_key (name [3]) or
-                        entry.has_key (name [4])): continue
-                output.write (key + '\n')
-
-                text = ''
-                if entry.has_key (name [0]):
-                    # put the title
-                    text = text + str (entry [name [0]]) + '. '
-
-                has_source = 0
-                vals = ['', '', '']
-                for i in range (0, 3):
-                    if entry.has_key (name [i + 1]):
-                        has_source = 1
-                        vals [i] = str (entry [name [i + 1]])
-
-                if has_source:
-                    text = text + '%s(%s):%s' % tuple (vals)
-
-                if entry.has_key (name [4]):
-                    if has_source:
-                        text = text + ', '
-
-                    date = entry [name [4]]
-                    text = text + str (date.year)
-                    if date.month:
-                        text = text + ' ' + month_name [date.month - 1]
-                    if date.day:
-                        text = text + ' ' + str (date.day)
-
-                # final dot.
-                if text: text = text + '.'
-
-                # correct the number of dots...
-                text = compact_dot.sub ('.', text)
-                
-                output.write (Utils.format (text,
-                                            75, 2, 2) + '\n')
-                
-        entry = iter.next ()
-        if entry: output.write ('\n')
+        elif typ == KeywordField:
+            if key == 'mesh':
+                offset = 4
+            else:
+                offset = 2
+            write_simple_field (output, entry[key], offset)
+
+    
+def write_simple_field (output, value, offset=2):
+    off = offset * ' '
+    lines = str(value).split('\n')
+    for l in lines:
+        output.write(off)
+        output.write (l)
+        output.write ('\n')
+
+
+def write_keyword_field (output, value):
+    lines = str(value).split('\n')
+    for line in lines:
+        output.write('    ')
+        output.write(line)
+        output.write('\n')
+
+
+def write_author_field (output, value):
+    auths = [ '%s %s' % (auth.last or '', auth.first or '')
+              for auth in value]
+    output.write ('  ')
+    output.write ('  '.join (auths))
+    output.write ('\n')
+
+
+def write_source_field (output, entry, keys):
+    t = []
+
+    output.write('Source\n')
+    
+    if entry.type == Types.get_entry(
+        'incollection') or entry.has_key ('booktitle'):
+        t = [str(entry.get ('booktitle')).strip()]
+        
+        if entry.has_key ('volume'):
+            t.append (".  %s " % (entry ['volume']))
+        if entry.has_key ('number'):
+            t.append ("(%s)" %  (entry ['number']))
+
+        if entry.has_key ('pages'):
+            p = str (entry ['pages'])
+            #p = Utils.compress_page_range (p)
+            t.append ("PG. %s." %(p))
+
+        if entry.has_key('date'):
+            date  = entry['date']
+            t.append (" %s" % (date.year))
+        if entry.has_key ('beigabeevermerk'):
+            t.append (str(entry.get('beigabevermerk')))
+    else: 
+
+        t.append ("%s. " %(entry ['journal']))
+
+        if entry.has_key ('volume'):
+            t.append ("%s" % (entry ['volume']))
+
+        if entry.has_key ('number'):
+            t.append ("(%s)" %  (entry ['number']))
+
+        if entry.has_key ('pages'):
+            p = str (entry ['pages'])
+            #p = Utils.compress_page_range (p)
+            t.append (":%s" %(p))
+
+        if entry.has_key ('other-note'):
+            t.append ("; %s" %(entry ['other-note']))
+
+        if entry.has_key('date'):
+            date  = entry['date']
+
+            t.append (", %s" % (date.year))
+
+            if date.month:
+                t.append (" %s" % (month_name [date.month - 1]))
+            if date.day:
+                t.append (" %s" %(date.day))
+        
+
+    # final dot.
+    t.append (".")
+    text = ''.join (t)
+
+    # correct the number of dots...
+    #text = compact_dot.sub ('.', text)
+    output.write('  ')
+    output.write (text)
+    output.write ('\n')
+
+
+
+
+
+
+### Local Variables:
+### Mode: python
+### py-master-file : "ut_Ovidlike.py"
+### End:
 
-    return
--- pybliographer-1.2.4/Pyblio/Format/Ovid.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Format/Ovid.py	2004-11-26 08:09:56.000000000 +0100
@@ -73,8 +73,8 @@
     return  OvidLike.OvidLike (
         file,
         Config.get ('ovid/mapping').data,
-        Config.get ('ovid/deftype').data,
-        Config.get ('ovid/sourceregexp').data)
+        Config.get ('ovid/deftype').data
+        )
 
 
 def writer (iter, output):
--- pybliographer-1.2.4/Pyblio/GnomeUI/Document.py	2004-07-17 21:51:48.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/GnomeUI/Document.py	2004-11-26 08:09:58.000000000 +0100
@@ -779,7 +779,7 @@
         Utils.config.set_int ('/apps/pybliographic/ui/width',  alloc [2])
         Utils.config.set_int ('/apps/pybliographic/ui/height', alloc [3])
 
-        # 2.- Proportion betzeen list and text
+        # 2.- Proportion between list and text
         height = self.paned.get_position ()
         Utils.config.set_int ('/apps/pybliographic/ui/paned', height)
 
--- pybliographer-1.2.4/Pyblio/GnomeUI/Editor.py	2004-07-17 21:55:14.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/GnomeUI/Editor.py	2004-11-26 08:09:58.000000000 +0100
@@ -640,6 +640,7 @@
                     self.w.get_toplevel(), gtk.DIALOG_DESTROY_WITH_PARENT,
                     gtk.MESSAGE_WARNING, gtk.BUTTONS_OK_CANCEL,
                     "Text will be lost if you click OK.")
+                dialog.set_transient_for (self.dialogue.w)
                 rc = dialog.run()
                 dialog.destroy()
                 
@@ -1225,7 +1226,7 @@
             anno_label.set_markup(l)
             vbox.pack_start (anno_label)
             
-            if entry.has_key(key): t = str (entry[key])
+            if entry.has_key(key): t = str (entry[key]).decode ('latin-1')
             else:                  t = ''
 
             l = min (len(t), 150)
@@ -1286,7 +1287,7 @@
         key = node['key']
         if not item.has_key(key):
             item[key] = Fields.LongText(_('Enter text here'))
-        self.buff.set_text (str(item[key]), -1)
+        self.buff.set_text (str (item[key]).decode ('latin-1'), -1)
         self.buff.set_modified (False)
         self.page.show_all ()
         if self.hidden:
@@ -1301,7 +1302,7 @@
             start, end = self.buff.get_bounds()
             
             key = self.node['key']
-            text = self.buff.get_text (start, end)
+            text = self.buff.get_text (start, end).encode ('latin-1')
             if text.strip():
                 self.entry[key] = Fields.LongText(text)
             else:
@@ -1325,7 +1326,7 @@
 
         start, end = self.buff.get_bounds()
         key = self.node['key']
-        self.entry[key].text = self.buff.get_text (start, end)
+        self.entry[key].text = self.buff.get_text (start, end).encode ('latin-1')
         
 
     def enable_buttons (self):
--- pybliographer-1.2.4/Pyblio/GnomeUI/Fields.py	2004-07-17 21:55:41.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/GnomeUI/Fields.py	2004-11-26 08:09:48.000000000 +0100
@@ -43,22 +43,26 @@
     Fields.Date        : _('Date')
     }
 
-class FieldsDialog:
+class FieldsDialog (Utils.GladeWindow):
 
-    def __init__ (self, parent = None):
+    gladeinfo = {
 
-        gp = os.path.join (version.pybdir, 'glade', 'fields1.glade')
+        'file': 'fields1.glade',
+        'name': 'fields',
+        'root': 'fields1'
         
-        self.xml = gtk.glade.XML (gp, 'fields1')
-        self.xml.signal_autoconnect (self)
+        }
+
+    def __init__ (self, parent = None):
 
+        Utils.GladeWindow.__init__ (self, parent)
+        
         self.dialog = self.xml.get_widget ('fields1')
         self.w = self.xml.get_widget ('notebook')
 
         tooltips = gtk.Tooltips ()
         tooltips.enable ()
         
-        if parent: self.dialog.set_transient_for (parent)
         self.warning = 0
         self.parent = parent
         self.init_page_1()
@@ -74,7 +78,9 @@
 
     def on_close (self, w):
         self.dialog.hide_all()
-
+        self.size_save ()
+        return
+    
     def on_add(self, *args):
         page = self.w.get_current_page ()
         if page == 0: self.page1_add (*args)
@@ -323,8 +329,8 @@
         for i in item.optional:
              self.sm.append((i.name, False, i.name, i))
         self.label3.set_markup (
-            _('Fields associated with <b>%s</b> entry type' %(
-            item.name)))
+            _('Fields associated with <b>%s</b> entry type') %
+            item.name)
         self.check()
 
     def page3_add (self, *args):
--- pybliographer-1.2.4/Pyblio/GnomeUI/Index.py	2004-07-17 21:55:56.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/GnomeUI/Index.py	2004-11-26 08:09:56.000000000 +0100
@@ -30,7 +30,7 @@
 
 ''' Main index containing the columned view of the entries '''
 
-from Pyblio import Fields, Config, Connector, Types, Sort
+from Pyblio import Fields, Config, Connector, Types, Sort, userformat
 
 from gnome import ui
 import gtk, gobject
@@ -335,6 +335,12 @@
                 elif f == '-type-':
                     row.append (str (entry.type.name))
                     
+                elif f == '-author/editor-':
+                    row.append (userformat.author_editor_format (entry))
+
+                elif f == '-author/title-':
+                    row.append (userformat.author_title_format (entry))
+                    
                 elif entry.has_key (f):
                     
                     if Types.get_field (f).type == Fields.AuthorGroup:
--- pybliographer-1.2.4/Pyblio/GnomeUI/__init__.py	2004-07-17 21:56:41.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/GnomeUI/__init__.py	2004-11-26 08:09:58.000000000 +0100
@@ -24,7 +24,8 @@
 
 import sys, string
 
-sys.argv = sys.argv [:2] + ['--'] + sys.argv [2:]
+files    = sys.argv [2:]
+sys.argv = sys.argv [:2] + ['--'] + files
 
 # correctly identify the program
 import pygtk
@@ -46,9 +47,9 @@
     _vnum (gtk.gtk_version), _vnum (gtk.pygtk_version))
     
 # clean up our garbage
-sys.argv = sys.argv [:2] + sys.argv [3:]
+sys.argv = sys.argv [:2] + files
 
-del sys
+del sys, files
 
 import gtk.glade
 
--- pybliographer-1.2.4/Pyblio/GnomeUI/Pybliographic.py	2004-07-17 21:56:09.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/GnomeUI/Pybliographic.py	2004-11-26 08:09:56.000000000 +0100
@@ -106,13 +106,15 @@
         
         if not document.close_document_request ():
             return
+
+        if len (self.documents) == 1 and maybe_exit:
+            self.exit_application (self.documents [0])
+            return
         
         document.w.destroy ()
         self.documents.remove (document)
         
-        if not self.documents:
-            if maybe_exit: mainquit ()
-            else:          self.new_document ()
+        if not self.documents: self.new_document ()
         return
 
 
@@ -137,6 +139,6 @@
             doc.w.destroy ()
             self.documents.remove (doc)
 
-        mainquit ()
+        main_quit ()
         return
     
--- pybliographer-1.2.4/Pyblio/GnomeUI/Search.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/GnomeUI/Search.py	2004-11-26 08:09:51.000000000 +0100
@@ -128,7 +128,8 @@
                 'after' :    TextUI.after,
                 }
             
-            search = self._w_expert_text.get_text ()
+            search = self._w_expert_text.get_text ().encode ('latin-1')
+            
             try:
                 exec ('tester = ' + search, user_global)
             except:
@@ -157,7 +158,7 @@
 
             if field == ' - any field - ' or field == '':
                 try:
-                    test = Search.AnyTester (match)
+                    test = Search.AnyTester (match.encode ('latin-1'))
                 except re.error, err:
                     error = 1
                     
--- pybliographer-1.2.4/Pyblio/Makefile.am	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Makefile.am	2004-11-26 08:09:56.000000000 +0100
@@ -47,7 +47,8 @@
 	__init__.py 	\
 	Query.py	\
 	pybtextvar.py	\
-	recode.py
+	recode.py       \
+	userformat.py
 
 SUBDIRS = GnomeUI Output Format ConfDir Style
 
--- pybliographer-1.2.4/Pyblio/Makefile.in	2004-07-07 22:12:29.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Makefile.in	2004-11-26 08:12:07.000000000 +0100
@@ -139,7 +139,8 @@
 	__init__.py 	\
 	Query.py	\
 	pybtextvar.py	\
-	recode.py
+	recode.py       \
+	userformat.py

 
 SUBDIRS = GnomeUI Output Format ConfDir Style 
--- pybliographer-1.2.4/Pyblio/Open.py	2004-07-17 21:57:10.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Open.py	2004-11-26 08:09:57.000000000 +0100
@@ -21,6 +21,7 @@
 
 
 from types import *
+
 from Pyblio import Autoload, Fields, Help, Exceptions
 
 import urlparse, urllib, traceback, os, sys, tempfile, string
--- pybliographer-1.2.4/Pyblio/userformat.py	1970-01-01 01:00:00.000000000 +0100
+++ pybliographer-1.2.4-patch/Pyblio/userformat.py	2004-11-26 08:09:55.000000000 +0100
@@ -0,0 +1,71 @@
+# This file is part of Pybliographer
+# 
+# Copyright (C) 2004 Peter Schulte-Stracke
+# Email : mail at schulte-stracke.de
+#          
+# 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.
+# 
+# 
+
+
+
+def author_editor_format (item):
+    """Return the author or editor of an item, for use
+    in list displays."""
+    s = []
+    r = item.get ('author') or  item.get ('editor', [])
+
+
+    try:  len(r)
+    except TypeError:
+        print 'USERFORMAT INPUT:', `r`, str(r) 
+        return str(r)
+    
+    if len (r) == 1:
+        a = r[0]
+        s.append ("%s, %s" %(
+            a.last, a.initials()))
+    
+    elif len (r) > 3:       
+        a = r[0]
+        s.append ("%s, %s et al." %(
+            a.last, a.initials()))
+    
+    elif len (r) > 1:
+        for a in r:
+            s.append (a.last)
+        return '/'.join (s)
+
+    return "".join (s)
+
+
+def author_title_format (item):
+    """Return author/title string for use in list displays."""
+
+    r = author_editor_format (item)
+    if r:
+        s = [r, ': ']
+    else:
+        s = []
+        
+    r = item.get ('title') or item.get ('booktitle', '[no title]')
+    s.append (str(r))
+
+    return ''.join (s)
+
+
+
+            
+        
--- pybliographer-1.2.4/Pyblio/Utils.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Utils.py	2004-11-26 08:09:57.000000000 +0100
@@ -18,13 +18,36 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 # 
 # 
-
+import re
 from string import *
 
 from Pyblio import Key, Autoload, recode
 
 _flat = recode.recode ('latin1..flat')
 
+def compress_page_range (pages, separator='-'):
+    """Returns a page range with common prefix
+    elided from the second number. Resulte is string
+    firstpage(separator)(lastpage), except if separator
+    is None, then a sequence is returned."""
+
+    p = re.sub (' *--? *', '-', pages)
+    s = p.split('-')
+    if len(s) > 1:
+        l, r = s
+        if len(l) == len(r):
+            i = 0
+            while r [i] == l[i]:
+                i += 1
+            r = r[i:]
+    else:
+        l, r = s[0], ''
+    if separator:
+        return "%s%s%s" %(l, separator, r)
+    else:
+        return l, r
+
+
 def format (string, width, first, next):
     ''' Format a string on a given width '''
 
--- pybliographer-1.2.4/pybliographer.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/pybliographer.py	2004-11-26 08:09:50.000000000 +0100
@@ -23,14 +23,12 @@
 version  = "@version@"
 progname = "@package@"
 
-lib_pybdir  = "@libpyb@"
 data_pybdir = "@datapyb@"
 localedir   = "@localedir@"
 
 import sys
 
 sys.path.insert (0, data_pybdir)
-sys.path.insert (0, lib_pybdir)
 sys.path.insert (0, '.')
 
 import locale
--- pybliographer-1.2.4/scripts/pybcheck.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/scripts/pybcheck.py	2004-11-26 08:09:45.000000000 +0100
@@ -23,9 +23,12 @@
 import os, sys, string
 from Pyblio import Config, Exceptions
 
+import locale
+charset = locale.getlocale () [1] or 'ascii'
+
 # check the arguments
 if len (sys.argv) < 3:
-    print "usage: pybcheck <file | directory>..."
+    print _("usage: pybcheck <file | directory>...").encode (charset)
     sys.exit (1)
 
 # list containing the broken entries
@@ -54,7 +57,7 @@
         # try to open the database
         try:
             b = bibopen (f)
-            print "file `%s' is ok [%d entries]" % (f, len (b))
+            print (_("file `%s' is ok [%d entries]") % (f, len (b))).encode (charset)
         except (Exceptions.ParserError, KeyError), err:
             broken.append (str (err))
 
--- pybliographer-1.2.4/scripts/pybcompact.py	2004-07-17 22:03:56.000000000 +0200
+++ pybliographer-1.2.4-patch/scripts/pybcompact.py	2004-11-26 08:09:46.000000000 +0100
@@ -23,12 +23,15 @@
 import string, os, re, copy, sys
 from Pyblio import Base, Key
 
+import locale
+charset = locale.getlocale () [1] or 'ascii'
+
 def usage ():
-    print _("usage: pybcompact <latexfile> <bibtexfiles...>")
+    print _("usage: pybcompact <latexfile> <bibtexfiles...>").encode (charset)
     return
 
 def error (msg):
-    sys.stderr.write (_("pybcompact: error: %s\n") % msg)
+    sys.stderr.write ((_("pybcompact: error: %s\n") % msg).encode (charset))
     sys.exit (1)
     return
 
@@ -54,8 +57,8 @@
     try:
         aux = open (auxfile, 'r')
     except IOError, err:
-        error ('%s: %s' % (auxfile, err))
-    
+        error ("`%s': %s" % (auxfile, str (err).decode (charset)))
+
     citations = []
 
     # parse the whole file
--- pybliographer-1.2.4/scripts/pybconvert.py	2004-07-17 22:04:03.000000000 +0200
+++ pybliographer-1.2.4-patch/scripts/pybconvert.py	2004-11-26 08:09:45.000000000 +0100
@@ -22,8 +22,11 @@
 
 import os, sys, string
 
+import locale
+charset = locale.getlocale () [1] or 'ascii'
+
 if len (sys.argv) < 4 or len (sys.argv) > 5:
-    print _("usage: pybconvert <source>..<target> <input> [output]")
+    print _("usage: pybconvert <source>..<target> <input> [output]").encode (charset)
     sys.exit (1)
 
 
@@ -32,7 +35,7 @@
 try:
     source, target = string.split (format, '..')
 except:
-    print _("pybconvert: bad conversion format")
+    print _("pybconvert: error: bad conversion format").encode (charset)
     sys.exit (1)
 
 
--- pybliographer-1.2.4/scripts/pybformat.py	2004-07-17 22:04:11.000000000 +0200
+++ pybliographer-1.2.4-patch/scripts/pybformat.py	2004-11-26 08:09:49.000000000 +0100
@@ -27,18 +27,32 @@
 from Pyblio import Base, Autoload
 from Pyblio.Style import Utils
 
+import locale
+charset = locale.getlocale () [1] or 'ascii'
+
 def usage ():
-    sys.stderr.write (_("usage: pybformat [bibtexfiles...]\n"))
+    print _("""usage: pybformat [options] <database...>
+
+    options:
+      -o file, --output=file		specify an output filename
+      -s style, --style=style		specify a bibliography style
+      -f format, --format=format	specify an output format
+      -H header, --header=header	defines a header file
+      -F footer, --footer=footer	defines a footer file
+      -l 'output', --list='output'	lists the available output formats
+      -h, --help			show this help message
+      -v, --version			show this help message
+    """).encode (charset)
     return
 
 def error (text, exit = 1):
-    sys.stderr.write (_("pybformat: error: %s\n") % text)
+    sys.stderr.write ((_("pybformat: error: %s\n") % text).encode (charset))
     if exit:
         sys.exit (1)
     return
 
 def warning (text, exit = 0):
-    sys.stderr.write (_("pybformat: warning: %s\n") % text)
+    sys.stderr.write ((_("pybformat: warning: %s\n") % text).encode (charset))
     if exit:
         sys.exit (1)
     return
@@ -73,21 +87,21 @@
         try:
             outfile = open (value, 'w')
         except IOError, err:
-            error ("can't open `%s': %s" % (value, err))
+            error (_("can't open `%s': %s") % (value, str (err).decode (charset)))
         continue
 
     if opt == '-l' or opt == '--list':
         try:
             list = Autoload.available (value)
         except KeyError:
-            error ("unknown list `%s'" % value)
+            error (_("unknown list `%s'") % value)
             
         if list:
-            print "pybformat: available values for `%s':" % value
+            print (_("pybformat: available values for `%s':") % value).encode (charset)
             print "  " + string.join (list, ", ")
             sys.exit (0)
         else:
-            warning ("empty value list `%s'" % value)
+            warning (_("empty value list `%s'") % value)
             sys.exit (0)
             
     if opt == '-h' or opt == '--help':
@@ -115,14 +129,14 @@
 if len (args) < 1:
     # user gave wrong arguments...
     usage ()
-    error ("too few arguments")
+    error (_("too few arguments"))
 
 files  = args
 
 # get the specified style and the output
 output = Autoload.get_by_name ('output', format)
 if output is None:
-    error ("unknown output format `%s'" % format)
+    error (_("unknown output format `%s'") % format)
 
 url = None
 style = os.path.splitext (style) [0]
@@ -138,8 +152,7 @@
     error (_("can't find style `%s'") % style)
 
 
-sys.stderr.write ("pybformat: using style `%s', format `%s'\n" \
-                  % (style, output.name))
+sys.stderr.write ((_("pybformat: using style `%s', format `%s'\n") % (style, output.name)).encode (charset))
 
 formatter = output.data
 
@@ -154,7 +167,7 @@
                 outfile.write (line)
         h.close ()
     except IOError, err:
-        error ("can't open header `%s': %s" % (header, err))
+        error (_("can't open header `%s': %s") % (header, str (err).decode (charset)))
 
 # write the data
 for file in files:
@@ -162,7 +175,7 @@
     try:
         db = bibopen (file)
     except IOError, err:
-        error ("can't open database: %s" % file)
+        error (_("can't open database: %s") % file)
 
     Utils.generate (url, formatter, db, db.keys (), outfile)
     
@@ -177,7 +190,7 @@
                 outfile.write (line)
         h.close ()
     except IOError, err:
-        error ("can't open footer `%s': %s" % (header, err))
+        error (_("can't open footer `%s': %s") % (footer, str (err).decode (charset)))
 
         
 outfile.close ()
--- pybliographer-1.2.4/scripts/pybtex.py	2004-07-17 22:04:28.000000000 +0200
+++ pybliographer-1.2.4-patch/scripts/pybtex.py	2004-11-26 08:09:45.000000000 +0100
@@ -27,12 +27,15 @@
 from Pyblio import Base, Autoload, Fields
 from Pyblio.Style import Utils
 
+import locale
+charset = locale.getlocale () [1] or 'ascii'
+
 def usage ():
-    print _("usage: pybtex <latexfile> [bibtexfiles...]")
+    print _("usage: pybtex <latexfile> [bibtexfiles...]").encode (charset)
     return
 
 def error (message):
-    sys.stderr.write (_("pybtex: error: %s\n") % message)
+    sys.stderr.write ((_("pybtex: error: %s\n") % message).encode (charset))
     sys.exit (1)
     return
 
@@ -53,7 +56,7 @@
 
 if missing:
     # warn the user that some entries were not found
-    print _("pybtex: warning: the following keys were not resolved")
+    print _("pybtex: warning: the following keys were not resolved").encode (charset)
     print '	' + string.join (missing, '\n	') + '\n'
 
 if style is None:
--- pybliographer-1.2.4/scripts/pybtext.py	2004-07-17 22:04:41.000000000 +0200
+++ pybliographer-1.2.4-patch/scripts/pybtext.py	2004-11-26 08:09:45.000000000 +0100
@@ -34,17 +34,20 @@
 
 from Pyblio import pybtextvar
 
+import locale
+charset = locale.getlocale () [1] or 'ascii'
+
 def usage ():
-    print _("usage: pybtext [-o outputfile] [-s style] <textfile> <bibfiles...>")
+    print _("usage: pybtext [-o outputfile] [-s style] <textfile> <bibfiles...>").encode (charset)
     return
 
 def error (msg):
-    sys.stderr.write (_("pybtext: error: %s\n") % msg)
+    sys.stderr.write ((_("pybtext: error: %s\n") % msg).encode (charset))
     sys.exit (1)
     return
 
 def warning (msg, exit = 0):
-    sys.stderr.write (_("pybtext: warning: %s\n") % msg)
+    sys.stderr.write ((_("pybtext: warning: %s\n") % msg).encode (charset))
     if exit:
         sys.exit (1)
     return
@@ -111,17 +114,17 @@
 output = Autoload.get_by_name ('output', format)
 
 if output is None:
-    error ("unknown output format `%s'" % format)
+    error (_("unknown output format `%s'") % format)
 
 
 
 reffile = outfile + '.ref'
 
 if os.path.exists(outfile):
-    error ("File already exists: `%s'" % outfile)
+    error (_("File already exists: `%s'") % outfile)
 
 if os.path.exists(reffile):
-    error ("The file `%s' to be used for creating the reference list already exists." % reffile)
+    error (_("A file with the same name already exists: `%s'") % reffile)
 
 textfile = args [0]
 bibfile = args [1:]
@@ -137,7 +140,7 @@
     try:
         txt = open (textfile, 'r')
     except IOError, err:
-        error ('%s: %s' % (textfile, err))
+        error ("`%s': %s" % (textfile, str (err).decode (charset)))
     
     citations = []
 
@@ -187,8 +190,7 @@
 order = copy.copy (entries)
 
 
-sys.stderr.write ("pybtext: using style `%s', format `%s'\n" \
-                  % (style, output.name))
+sys.stderr.write ((_("pybtext: using style `%s', format `%s'\n") % (style, output.name)).encode (charset))
 
 formatter = output.data
 
@@ -247,7 +249,7 @@
 try:
     refs = open (reffile, 'w')
 except IOError, err:
-    error ("can't open `%s': %s" % (reffile, err))
+    error (_("can't open `%s': %s") % (reffile, str (err).decode (charset)))
 
 refs.write ("\n\nReferences:\n")
 
@@ -268,12 +270,12 @@
     try:
         txt = open (textfile, 'r')
     except IOError, err:
-        error ('%s: %s' % (textfile, err))
+        error ("`%s': %s" % (textfile, str (err).decode (charset)))
 
     try:
         dest = open (outfile, 'a')
     except IOError, err:
-        error ("can't open `%s': %s" % (outfile, err))
+        error (_("can't open `%s': %s") % (outfile, str (err).decode (charset)))
 
     citations = []
     
@@ -311,19 +313,19 @@
     try:
         copyfile (textfile, outfile)
     except:
-        error ("can't create `%s'" % outfile)
+        error (_("can't create `%s'") % outfile)
 
     try:
         dest = open (outfile, 'a')
     except IOError, err:
-        error ("can't open `%s': %s" % (outfile, err))
+        error (_("can't open `%s': %s") % (outfile, str (err).decode (charset)))
 
 
 # appending the reference list
 try:
     refs = open (reffile, 'r')
 except IOError, err:
-    error ('%s: %s' % (reffile, err))
+    error ("`%s': %s" % (reffile, str (err).decode (charset)))
 
 while 1:
     line = refs.readline ()
@@ -337,6 +339,6 @@
 try:
     os.remove (reffile)
 except:
-    warning ("can't remove `%s'" % reffile)
+    warning (_("can't remove `%s'") % reffile)
 
-print "Done"
+print _("Done").encode (charset)


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-1/pybliographer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pybliographer.spec	8 Nov 2004 05:14:14 -0000	1.1
+++ pybliographer.spec	20 Mar 2005 23:33:52 -0000	1.2
@@ -1,19 +1,17 @@
 Summary: A framework for working with bibliographic databases.
 Name: pybliographer
 Version: 1.2.4
-Release: 0.fdr.1.1
+Release: 0.fdr.4.1
 Epoch: 0
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.4.tar.gz
+Patch: pyblio.patch
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-PreReq: scrollkeeper >= 0:0.1.4
 
-BuildRequires: python >= 0:2.2
-BuildRequires: pygtk2 >= 0:2.0.0
 BuildRequires: pygtk2-libglade >= 0:2.0.0
 BuildRequires: gnome-python2 >= 0:2.0.0
 BuildRequires: gnome-python2-gconf >= 0:2.0.0
@@ -23,14 +21,12 @@
 BuildRequires: desktop-file-utils
 BuildRequires: intltool
 
-Requires: python >= 0:2.2
-Requires: pygtk2 >= 0:2.0.0
 Requires: pygtk2-libglade >= 0:2.0.0
 Requires: gnome-python2 >= 0:2.0.0
 Requires: gnome-python2-gconf >= 0:2.0.0
 Requires: python-bibtex >= 0:1.1.93.1
-Requires: recode >= 0:3.6-11
-
+Requires(post): scrollkeeper >= 0:0.1.4
+Requires(postun): scrollkeeper >= 0:0.1.4
 
 %description
 Pybliographer is a tool for managing bibliographic databases. It can be 
@@ -47,10 +43,11 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -63,6 +60,10 @@
 
 %__rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 
+# Compile .pyc and .pyo
+%{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT%{_datadir}/pybliographer', ddir='%{_datadir}/pybliographer', force=1)"
+%{__python} -O -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT%{_datadir}/pybliographer', ddir='%{_datadir}/pybliographer', force=1)"
+
 
 %{find_lang} %{name}
 
@@ -78,7 +79,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING* ChangeLog* INSTALL NEWS README TODO
+%doc AUTHORS COPYING* ChangeLog* NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/fedora-pybliographic.desktop
 %{_datadir}/gnome/help/pybliographer
@@ -86,20 +87,74 @@
 %{_datadir}/omf/pybliographer
 %{_datadir}/pixmaps/*
 %dir %{_datadir}/pybliographer
-%{_datadir}/pybliographer/Pyblio
+%dir %{_datadir}/pybliographer/Pyblio
+%dir %{_datadir}/pybliographer/Pyblio/ConfDir
+%{_datadir}/pybliographer/Pyblio/ConfDir/*.py
+%{_datadir}/pybliographer/Pyblio/ConfDir/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/ConfDir/*.pyo
+%dir %{_datadir}/pybliographer/Pyblio/Format
+%{_datadir}/pybliographer/Pyblio/Format/*.py
+%{_datadir}/pybliographer/Pyblio/Format/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/Format/*.pyo
+%dir %{_datadir}/pybliographer/Pyblio/GnomeUI
+%{_datadir}/pybliographer/Pyblio/GnomeUI/*.py
+%{_datadir}/pybliographer/Pyblio/GnomeUI/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/GnomeUI/*.pyo
+%dir %{_datadir}/pybliographer/Pyblio/Output
+%{_datadir}/pybliographer/Pyblio/Output/*.py
+%{_datadir}/pybliographer/Pyblio/Output/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/Output/*.pyo
+%dir %{_datadir}/pybliographer/Pyblio/Style
+%{_datadir}/pybliographer/Pyblio/Style/*.py
+%{_datadir}/pybliographer/Pyblio/Style/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/Style/*.pyo
+%{_datadir}/pybliographer/Pyblio/*.py
+%{_datadir}/pybliographer/Pyblio/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/*.pyo
 %{_datadir}/pybliographer/Styles
 %{_datadir}/pybliographer/glade
-%{_datadir}/pybliographer/pybcheck.py
-%{_datadir}/pybliographer/pybcompact.py
-%{_datadir}/pybliographer/pybconvert.py
-%{_datadir}/pybliographer/pybformat.py
-%{_datadir}/pybliographer/pybliographic.py
-%{_datadir}/pybliographer/pybtex.py
-%{_datadir}/pybliographer/pybtext.py
+%attr(644,root,root) %{_datadir}/pybliographer/pybcheck.py
+%attr(644,root,root) %{_datadir}/pybliographer/pybcompact.py
+%attr(644,root,root) %{_datadir}/pybliographer/pybconvert.py
+%attr(644,root,root) %{_datadir}/pybliographer/pybformat.py
+%attr(644,root,root) %{_datadir}/pybliographer/pybliographic.py
+%attr(644,root,root) %{_datadir}/pybliographer/pybtex.py
+%attr(644,root,root) %{_datadir}/pybliographer/pybtext.py
+%ghost %{_datadir}/pybliographer/pybcheck.pyc
+%ghost %{_datadir}/pybliographer/pybcompact.pyc
+%ghost %{_datadir}/pybliographer/pybconvert.pyc
+%ghost %{_datadir}/pybliographer/pybformat.pyc
+%ghost %{_datadir}/pybliographer/pybliographic.pyc
+%ghost %{_datadir}/pybliographer/pybtex.pyc
+%ghost %{_datadir}/pybliographer/pybtext.pyc
+%ghost %{_datadir}/pybliographer/pybcheck.pyo
+%ghost %{_datadir}/pybliographer/pybcompact.pyo
+%ghost %{_datadir}/pybliographer/pybconvert.pyo
+%ghost %{_datadir}/pybliographer/pybformat.pyo
+%ghost %{_datadir}/pybliographer/pybliographic.pyo
+%ghost %{_datadir}/pybliographer/pybtex.pyo
+%ghost %{_datadir}/pybliographer/pybtext.pyo
 %config %{_datadir}/pybliographer/pybrc.py
 %ghost %{_datadir}/pybliographer/pybrc.pyc
+%ghost %{_datadir}/pybliographer/pybrc.pyo
+
 
 %changelog
+* Fri Mar 11 2005 Zoltan Kota <z.kota at gmx.net> - 0:1.2.4-0.fdr.4
+- fixed file ownerships
+
+* Mon Nov 29 2004 Zoltan Kota <z.kota at gmx.net> - 0:1.2.4-0.fdr.3
+- removed redundant dependencies
+- fixed directories in file list
+
+* Fri Nov 26 2004 Zoltan Kota <z.kota at gmx.net> - 0:1.2.4-0.fdr.2
+- added a patch to fix bugs and add some new features
+  (generated from pyblio arch: 
+  patch-139,141-143,150,154,155,161,163,164,167)
+- (re)compile pyc and pyo files. pyo and redundant pyc
+  files are ghosted
+- fix permission of scripts
+
 * Mon Jul 19 2004 Zoltan Kota <z.kota at gmx.net> - 0:1.2.4-0.fdr.1
 - update to 1.2.4
 - using macros for rm and localstatedir



From fedora-extras-commits at redhat.com  Sun Mar 20 23:37:29 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Sun, 20 Mar 2005 18:37:29 -0500
Subject: rpms/pybliographer import.log,1.4,1.5
Message-ID: <200503202337.j2KNbTOo022465@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22455

Modified Files:
	import.log 
Log Message:
auto-import pybliographer-1.2.6.2-0.fdr.1.2 on branch FC-2 from pybliographer-1.2.6.2-0.fdr.1.2.src.rpm
Update from fedora.us


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	20 Mar 2005 23:33:52 -0000	1.4
+++ import.log	20 Mar 2005 23:37:27 -0000	1.5
@@ -1,3 +1,4 @@
 pybliographer-1_2_4-0_fdr_1_1:HEAD:pybliographer-1.2.4-0.fdr.1.1.src.rpm:1099890854
 pybliographer-1_2_4-0_fdr_1_2:HEAD:pybliographer-1.2.4-0.fdr.1.2.src.rpm:1099890860
 pybliographer-1_2_4-0_fdr_4_1:FC-1:pybliographer-1.2.4-0.fdr.4.1.src.rpm:1111361718
+pybliographer-1_2_6_2-0_fdr_1_2:FC-2:pybliographer-1.2.6.2-0.fdr.1.2.src.rpm:1111361934



From fedora-extras-commits at redhat.com  Sun Mar 20 23:37:29 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Sun, 20 Mar 2005 18:37:29 -0500
Subject: rpms/pybliographer/FC-2 .cvsignore, 1.3, 1.4 pybliographer.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200503202337.j2KNbTbj022470@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22455/FC-2

Modified Files:
	.cvsignore pybliographer.spec sources 
Log Message:
auto-import pybliographer-1.2.6.2-0.fdr.1.2 on branch FC-2 from pybliographer-1.2.6.2-0.fdr.1.2.src.rpm
Update from fedora.us


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-2/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2004 16:13:25 -0000	1.3
+++ .cvsignore	20 Mar 2005 23:37:27 -0000	1.4
@@ -1,2 +1 @@
-pybliographer-1.2.4.tar.gz
-pybliographer-1.2.5.tar.gz
+pybliographer-1.2.6.2.tar.gz


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-2/pybliographer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pybliographer.spec	1 Dec 2004 16:13:25 -0000	1.3
+++ pybliographer.spec	20 Mar 2005 23:37:27 -0000	1.4
@@ -1,11 +1,11 @@
 Summary: A framework for working with bibliographic databases.
 Name: pybliographer
-Version: 1.2.5
-Release: 0.fdr.2.2
+Version: 1.2.6.2
+Release: 0.fdr.1.2
 Epoch: 0
 License: GPL
 Group: Applications/Publishing
-Source: http://dl.sf.net/pybliographer/pybliographer-1.2.5.tar.gz
+Source: http://dl.sf.net/pybliographer/pybliographer-1.2.6.2.tar.gz
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Tue Feb 22 2005 Zoltan Kota <z.kota at gmx.net> - 0:1.2.6.2-0.fdr.1
+- update to 1.2.6.2
+
 * Mon Nov 29 2004 Zoltan Kota <z.kota at gmx.net> - 0:1.2.5-0.fdr.2
 - removed redundant dependencies
 - fixed directories in file list


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-2/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2004 16:13:25 -0000	1.3
+++ sources	20 Mar 2005 23:37:27 -0000	1.4
@@ -1 +1 @@
-b909a988a5e25f23669b7f03a8ea739f  pybliographer-1.2.5.tar.gz
+4404f82be39f5db82da6fe26e3a8f1e5  pybliographer-1.2.6.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 21 00:04:46 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:04:46 -0500
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec,1.1,1.2
Message-ID: <200503210004.j2L04k18024275@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24263

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
remove stuff



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk-xfce-engine.spec	19 Mar 2005 17:45:11 -0000	1.1
+++ gtk-xfce-engine.spec	21 Mar 2005 00:04:44 -0000	1.2
@@ -7,10 +7,7 @@
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/gtk-xfce-engine-2.2.6.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: gtk2 >= 2.0.0
-Requires: glib2 >= 2.0.0
 BuildRequires: gtk2-devel >= 2.0.0
-BuildRequires: glib2-devel >= 2.0.0
 
 %description
 Port of Xfce engine to GTK+-2.0.



From fedora-extras-commits at redhat.com  Mon Mar 21 00:05:05 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:05:05 -0500
Subject: rpms/gtk-xfce-engine/FC-3 gtk-xfce-engine.spec,1.1,1.2
Message-ID: <200503210005.j2L055Sq024326@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/gtk-xfce-engine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24312

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
remove stuff



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/FC-3/gtk-xfce-engine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk-xfce-engine.spec	19 Mar 2005 17:45:11 -0000	1.1
+++ gtk-xfce-engine.spec	21 Mar 2005 00:05:03 -0000	1.2
@@ -7,10 +7,7 @@
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/gtk-xfce-engine-2.2.6.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: gtk2 >= 2.0.0
-Requires: glib2 >= 2.0.0
 BuildRequires: gtk2-devel >= 2.0.0
-BuildRequires: glib2-devel >= 2.0.0
 
 %description
 Port of Xfce engine to GTK+-2.0.



From fedora-extras-commits at redhat.com  Mon Mar 21 00:26:19 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:26:19 -0500
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec,1.2,1.3
Message-ID: <200503210026.j2L0QJFI024659@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24646

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
more stuff



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-xfce-engine.spec	21 Mar 2005 00:04:44 -0000	1.2
+++ gtk-xfce-engine.spec	21 Mar 2005 00:26:17 -0000	1.3
@@ -23,7 +23,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Mon Mar 21 00:27:03 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:27:03 -0500
Subject: rpms/gtk-xfce-engine/FC-3 gtk-xfce-engine.spec,1.2,1.3
Message-ID: <200503210027.j2L0R3ZS024703@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/gtk-xfce-engine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24683

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
prep for FC3 build



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/FC-3/gtk-xfce-engine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-xfce-engine.spec	21 Mar 2005 00:05:03 -0000	1.2
+++ gtk-xfce-engine.spec	21 Mar 2005 00:27:00 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
 Version: 2.2.6
-Release: 1
+Release: 1.FC3
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/gtk-xfce-engine-2.2.6.tar.bz2
@@ -23,7 +23,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Mon Mar 21 00:27:37 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:27:37 -0500
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec,1.3,1.4
Message-ID: <200503210027.j2L0RbMX024759@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24743

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
prep for FC4 build



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk-xfce-engine.spec	21 Mar 2005 00:26:17 -0000	1.3
+++ gtk-xfce-engine.spec	21 Mar 2005 00:27:35 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
 Version: 2.2.6
-Release: 1
+Release: 1.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/gtk-xfce-engine-2.2.6.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 21 00:46:03 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:46:03 -0500
Subject: rpms/xfcalendar/devel xfcalendar.spec,1.1,1.2
Message-ID: <200503210046.j2L0k3cV025066@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfcalendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25051

Modified Files:
	xfcalendar.spec 
Log Message:
fix BuildRequires and prep for FC4 build



Index: xfcalendar.spec
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/devel/xfcalendar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfcalendar.spec	19 Mar 2005 17:54:24 -0000	1.1
+++ xfcalendar.spec	21 Mar 2005 00:46:01 -0000	1.2
@@ -1,13 +1,17 @@
 Summary: Time-managing application for Xfce4
 Name: xfcalendar
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfcalendar-4.2.1.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xfce-mcs-manager-devel
+BuildRequires: libxfce4util-devel
+BuildRequires: libxfcegui4-devel
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 Time-managing application for Xfce4
@@ -22,7 +26,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -41,6 +45,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildRequires
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 00:46:43 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:46:43 -0500
Subject: rpms/xfcalendar/FC-3 xfcalendar.spec,1.1,1.2
Message-ID: <200503210046.j2L0khfc025109@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfcalendar/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25095

Modified Files:
	xfcalendar.spec 
Log Message:
fix BuildRequires and prep for FC4 build



Index: xfcalendar.spec
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/FC-3/xfcalendar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfcalendar.spec	19 Mar 2005 17:54:24 -0000	1.1
+++ xfcalendar.spec	21 Mar 2005 00:46:41 -0000	1.2
@@ -1,13 +1,17 @@
 Summary: Time-managing application for Xfce4
 Name: xfcalendar
 Version: 4.2.1
-Release: 1
+Release: 2.FC3
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfcalendar-4.2.1.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xfce-mcs-manager-devel
+BuildRequires: libxfce4util-devel
+BuildRequires: libxfcegui4-devel
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 Time-managing application for Xfce4
@@ -22,7 +26,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -41,6 +45,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildRequires
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 00:54:11 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:54:11 -0500
Subject: rpms/xfce4-appfinder/devel xfce4-appfinder.spec,1.1,1.2
Message-ID: <200503210054.j2L0sBGw025287@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25266

Modified Files:
	xfce4-appfinder.spec 
Log Message:
fix BuildReqs and prep for FC4 build



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-appfinder.spec	19 Mar 2005 17:58:45 -0000	1.1
+++ xfce4-appfinder.spec	21 Mar 2005 00:54:09 -0000	1.2
@@ -1,14 +1,16 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-appfinder-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libxfcegui4 >= 4.2.0
-BuildRequires: libxfcegui4-devel >= 4.2.0
+Requires: libxfcegui4 >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 xfce-appfinder shows system wide installed applications
@@ -23,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -38,6 +40,9 @@
 %{_datadir}/xfce4/doc/C/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 - Fixed %files section to not list lang files twice



From fedora-extras-commits at redhat.com  Mon Mar 21 00:54:41 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:54:41 -0500
Subject: rpms/xfce4-appfinder/FC-3 xfce4-appfinder.spec,1.1,1.2
Message-ID: <200503210054.j2L0sfJl025328@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-appfinder/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25315

Modified Files:
	xfce4-appfinder.spec 
Log Message:
fix buildreqs and prep for FC3 build



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/FC-3/xfce4-appfinder.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-appfinder.spec	19 Mar 2005 17:58:45 -0000	1.1
+++ xfce4-appfinder.spec	21 Mar 2005 00:54:39 -0000	1.2
@@ -1,14 +1,16 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
 Version: 4.2.1
-Release: 1
+Release: 2.FC3
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-appfinder-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libxfcegui4 >= 4.2.0
-BuildRequires: libxfcegui4-devel >= 4.2.0
+Requires: libxfcegui4 >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 xfce-appfinder shows system wide installed applications
@@ -23,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -38,6 +40,9 @@
 %{_datadir}/xfce4/doc/C/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 - Fixed %files section to not list lang files twice



From fedora-extras-commits at redhat.com  Mon Mar 21 01:00:27 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:00:27 -0500
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.1,1.2
Message-ID: <200503210100.j2L10RKF025476@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25462

Modified Files:
	xfce4-icon-theme.spec 
Log Message:
noarch and prep for FC4 build



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-icon-theme.spec	19 Mar 2005 18:03:40 -0000	1.1
+++ xfce4-icon-theme.spec	21 Mar 2005 01:00:25 -0000	1.2
@@ -1,12 +1,13 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-icon-theme-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 %description
 Icon theme for Xfce 4 Desktop Environment.
@@ -22,7 +23,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -33,6 +34,9 @@
 %{_datadir}/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- noarch
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:00:55 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:00:55 -0500
Subject: rpms/xfce4-icon-theme/FC-3 xfce4-icon-theme.spec,1.1,1.2
Message-ID: <200503210100.j2L10tAk025517@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-icon-theme/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25503

Modified Files:
	xfce4-icon-theme.spec 
Log Message:
noarch and prep for FC3 build



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/FC-3/xfce4-icon-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-icon-theme.spec	19 Mar 2005 18:03:40 -0000	1.1
+++ xfce4-icon-theme.spec	21 Mar 2005 01:00:53 -0000	1.2
@@ -1,12 +1,13 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.2.1
-Release: 1
+Release: 2.FC3
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-icon-theme-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 %description
 Icon theme for Xfce 4 Desktop Environment.
@@ -22,7 +23,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -33,6 +34,9 @@
 %{_datadir}/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- noarch
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:12:42 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:12:42 -0500
Subject: rpms/xcin/devel - New directory
Message-ID: <200503210112.j2L1Cgpb026581@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26562/xcin/devel

Log Message:
Directory /cvs/extras/rpms/xcin/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 21 01:12:42 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:12:42 -0500
Subject: rpms/xcin - New directory
Message-ID: <200503210112.j2L1CgON026578@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26562/xcin

Log Message:
Directory /cvs/extras/rpms/xcin added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 21 01:12:51 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:12:51 -0500
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec,1.1,1.2
Message-ID: <200503210112.j2L1Cp2P026629@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26570

Modified Files:
	xfce4-mixer.spec 
Log Message:
fix BuildReqs and prep for FC4 build



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-mixer.spec	19 Mar 2005 18:06:05 -0000	1.1
+++ xfce4-mixer.spec	21 Mar 2005 01:12:49 -0000	1.2
@@ -1,14 +1,21 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-mixer-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfce4-panel >= 4.2.1
-BuildRequires: xfce4-panel >= 4.2.1
+BuildRequires: xfce4-panel-devel >= 4.2.1
+BuildRequires: libxfce4util-devel >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: libxfce4mcs-devel >= 4.2.1
+BuildRequires: xfce-mcs-manager-devel >= 4.2.1
+BuildRequires: libxml2 >= 2.4.0
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 Volume control plugin for the Xfce 4 panel
@@ -23,7 +30,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -38,6 +45,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-mixer.png
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:13:06 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:13:06 -0500
Subject: rpms/xcin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503210113.j2L1D66h026668@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26659

Added Files:
	Makefile import.log 
Log Message:
Setup of module xcin


--- NEW FILE Makefile ---
# Top level Makefile for module xcin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 21 01:13:06 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:13:06 -0500
Subject: rpms/xcin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503210113.j2L1D6JJ026671@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26659/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xcin


--- 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 Mar 21 01:14:30 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:14:30 -0500
Subject: rpms/xfce4-mixer/FC-3 xfce4-mixer.spec,1.1,1.2
Message-ID: <200503210114.j2L1EUd5026821@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-mixer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26807

Modified Files:
	xfce4-mixer.spec 
Log Message:
fix BuildReqs and prep for FC3 build



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/FC-3/xfce4-mixer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-mixer.spec	19 Mar 2005 18:06:05 -0000	1.1
+++ xfce4-mixer.spec	21 Mar 2005 01:14:28 -0000	1.2
@@ -1,14 +1,21 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
 Version: 4.2.1
-Release: 1
+Release: 2.FC3
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-mixer-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfce4-panel >= 4.2.1
-BuildRequires: xfce4-panel >= 4.2.1
+BuildRequires: xfce4-panel-devel >= 4.2.1
+BuildRequires: libxfce4util-devel >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: libxfce4mcs-devel >= 4.2.1
+BuildRequires: xfce-mcs-manager-devel >= 4.2.1
+BuildRequires: libxml2 >= 2.4.0
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 Volume control plugin for the Xfce 4 panel
@@ -23,7 +30,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -38,6 +45,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-mixer.png
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:15:09 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:15:09 -0500
Subject: rpms/xcin import.log,1.1,1.2
Message-ID: <200503210115.j2L1F969026887@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26876

Modified Files:
	import.log 
Log Message:
auto-import xcin-2.5.3.pre3-24 on branch devel from xcin-2.5.3.pre3-24.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xcin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Mar 2005 01:13:04 -0000	1.1
+++ import.log	21 Mar 2005 01:15:07 -0000	1.2
@@ -0,0 +1 @@
+xcin-2_5_3_pre3-24:HEAD:xcin-2.5.3.pre3-24.src.rpm:1111367680



From fedora-extras-commits at redhat.com  Mon Mar 21 01:15:09 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:15:09 -0500
Subject: rpms/xcin/devel xcin-2.5.3-mkuserdir.patch, NONE,
	1.1 xcin-2.5.3-no_rpath.patch, NONE, 1.1 xcin.spec, NONE,
	1.1 xcin.wrap, NONE, 1.1 xcin.xpm, NONE, 1.1 xcinrc.UTF-8,
	NONE, 1.1 xinput.d-xcin, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503210115.j2L1F9au026891@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26876/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xcin-2.5.3-mkuserdir.patch xcin-2.5.3-no_rpath.patch xcin.spec 
	xcin.wrap xcin.xpm xcinrc.UTF-8 xinput.d-xcin 
Log Message:
auto-import xcin-2.5.3.pre3-24 on branch devel from xcin-2.5.3.pre3-24.src.rpm

xcin-2.5.3-mkuserdir.patch:

--- NEW FILE xcin-2.5.3-mkuserdir.patch ---
--- xcin.orig/src/lib/xcintool/check_file.c	2001-09-21 03:00:57.000000000 +1000
+++ xcin/src/lib/xcintool/check_file.c	2004-01-28 16:21:56.000000000 +1000
@@ -155,8 +155,10 @@
 	snprintf(path, 1024, "%s/%s", xrc->usrhome, xrc->user_dir);
     else
 	strncpy(path, xrc->user_dir, 1024);
-    if (check_file_exist(path, FTYPE_DIR) == False)
-	xrc->user_dir = NULL;
-    else
-	xrc->user_dir = (char *)strdup(path);
+    if (check_file_exist(xrc->usrhome, FTYPE_DIR) == True)
+        if (check_file_exist(path, FTYPE_DIR) == False){
+	    mkdir(path, 0700);
+	    xrc->user_dir = (char *)strdup(path);
+        } else
+	    xrc->user_dir = (char *)strdup(path);
 }

xcin-2.5.3-no_rpath.patch:

--- NEW FILE xcin-2.5.3-no_rpath.patch ---
--- xcin/cin/big5/Makefile.in.no_rpath	2003-12-02 16:15:54.000000000 +0100
+++ xcin/cin/big5/Makefile.in	2003-12-02 16:18:08.000000000 +0100
@@ -2,8 +2,7 @@
 top_srcdir  = @top_srcdir@
 include $(top_srcdir)/Rules
 
-build = $(top_srcdir)/libtool --mode=execute $(cin2tab)
-
+build = $(top_srcdir)/libtool --mode=execute -dlopen $(top_srcdir)/src/lib/libxcin.la $(cin2tab) 
 .PHONY: install clean distclean
 
 all: all-$(OS_TYPE)
--- xcin/cin/gb/Makefile.in.no_rpath	2003-12-02 16:19:00.000000000 +0100
+++ xcin/cin/gb/Makefile.in	2003-12-02 16:19:01.000000000 +0100
@@ -2,7 +2,7 @@
 top_srcdir  = @top_srcdir@
 include $(top_srcdir)/Rules
 
-build = $(top_srcdir)/libtool --mode=execute $(cin2tab)
+build = $(top_srcdir)/libtool --mode=execute -dlopen $(top_srcdir)/src/lib/libxcin.la $(cin2tab)
 
 .PHONY: install clean distclean
 


--- NEW FILE xcin.spec ---
Summary: An X Input Method Server for Chinese.
Name: xcin
Version: 2.5.3.pre3
Release: 24
License: GPL
Group: User Interface/X
Source0: ftp://xcin.linux.org.tw/pub/xcin/xcin/%{name}-%{version}.tar.gz
Source2: xcin.xpm
Source3: xcin.wrap
Source4: xcinrc.UTF-8
Source5: xinput.d-%{name}
Patch0: xcin-2.5.3-mkuserdir.patch
Patch1:  xcin-2.5.3-no_rpath.patch
BuildRequires: libtabe >= 0.2.4a
Requires: libtabe >= 0.2.4a
Requires(post,preun): /usr/sbin/alternatives
BuildPrereq: db4-devel,libtabe-devel
Buildroot: %{_tmppath}/%{name}-buildroot

%description
An X Input Method Server for Chinese.

%prep

rm -rf $RPM_BUILD_ROOT

%setup -q -n %{name}
%patch0 -p1 -b .mkuserdir
%patch1 -p1 -b .no_rpath

find . -name CVS | xargs rm -rf

(cd po; \
OLD_PO_FILE_INPUT=yes msgmerge xcin-zh_TW.po xcin.pot > new.po; \
mv new.po xcin-zh_TW.po; \
)


%build
cp /usr/share/libtool/config.sub $RPM_BUILD_DIR/%{name}/script/
cp /usr/share/libtool/config.guess $RPM_BUILD_DIR/%{name}/script/
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \
	--prefix=/usr/X11R6 --libdir=/usr/X11R6/%{_lib} \
        --with-xcin-dir=/usr/X11R6/%{_lib}/X11/xcin \
	--with-xcin-rcdir=/etc/chinese/xcin \
	--with-localedir=/usr/share/locale \
	--with-extra-lib=/usr/%{_lib}

perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool

make
( cd po; msgfmt -o xcin.mo xcin-zh_TW.po )

%install

mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin
mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
mkdir -p $RPM_BUILD_ROOT/etc/chinese/xcin
mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin/tab
mkdir -p $RPM_BUILD_ROOT/usr/X11R6/man

export program_prefix=$RPM_BUILD_ROOT
export xcin_rcp=$RPM_BUILD_ROOT/etc/chinese/xcin
make -e install

mkdir -p $RPM_BUILD_ROOT/usr/share/icons/
mkdir -p $RPM_BUILD_ROOT/usr/share/gnome/apps/Utilities/
mkdir -p $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/

install -m 644 $RPM_SOURCE_DIR/xcin.xpm \
		$RPM_BUILD_ROOT/usr/share/icons/xcin.xpm
install -m 644 po/xcin.mo $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/xcin.mo
install -m 644 src/lib/.libs/libxcin.so.0.0.0 $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/
install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/chinese/xcin/xcinrc
install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}

# remove unpackaged files from the buildroot
rm -rf $RPM_BUILD_ROOT/usr/X11R6/man
rm -f $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/{libxcin.a,libxcin.la}
rm -rf $RPM_BUILD_ROOT/usr/X11R6/share

%post
/sbin/ldconfig
alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/zh_TW xinput-zh_TW %{_sysconfdir}/X11/xinit/xinput.d/%{name} 30

%preun
if [ "$1" = 0 ]; then
   alternatives --remove xinput-zh_TW %{_sysconfdir}/X11/xinit/xinput.d/%{name}
fi


%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc doc/* 
%dir %{_sysconfdir}/chinese
%dir %{_sysconfdir}/chinese/xcin
%config %{_sysconfdir}/chinese/xcin/xcinrc
/usr/X11R6/bin/*
/usr/X11R6/%{_lib}/X11/xcin/
/usr/X11R6/%{_lib}/*
/usr/share/icons/xcin.xpm
%lang(zh_TW) /usr/share/locale/zh_TW/LC_MESSAGES/xcin.mo
%{_sysconfdir}/X11/xinit/xinput.d

%clean 
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT

%changelog
* Thu Jul 01 2004 Leon Ho <llch at redhat.com>
- modify post script

* Wed Jun 30 2004 Leon Ho <llch at redhat.com>
- add xinput.d script
- require alternatives for %%post and %%preun
- install/uninstall xinput.d script as xinput-ja_JP alternative

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Mar 08 2004 Leon Ho <llch at redhat.com>
- update for fc1

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Jan 28 2004 Leon Ho <llch at redhat.com> 2.5.3.pre3-20
- fixed the libraries linking
- fixed the user defined database saved in the current directory

* Thu Jan 22 2004 Leon Ho <llch at redhat.com> 2.5.3.pre3-19
- uses the merged utf-8 patches
- overthespot patches from cvs

* Tue Dec  2 2003 Thomas Woerner <twoerner at redhat.com> 2.5.3.pre3-18
- removed rpath
- fixed libdir problem on 64 bit architectures

* Thu Oct 23 2003 Leon Ho <llch at redhat.com> 2.5.3.pre3-17
- fixes for utf-8

* Wed Sep 24 2003 Leon Ho <llch at redhat.com>
- rebuilt

* Fri Aug  8 2003 Elliot Lee <sopwith at redhat.com>
- Fix libtool

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Apr 30 2003 Elliot Lee <sopwith at redhat.com> 2.5.3.pre3-12
- Always cp config.guess/config.sub

* Tue Feb 04 2003 Florian La Roche <Florian.LaRoche at redhat.de>
- add symlink to shared lib

* Fri Jan 31 2003 Leon Ho <llch at redhat.com> 2.5.3.pre3-11
- rebuild

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Tue Dec 09 2002 Leon Ho <llch at redhat.com> 2.5.3.pre3-10
- fix for the cantonese input setting in config

* Thu Dec 05 2002 Leon Ho <llch at redhat.com> 2.5.3.pre3-9
- check pointers to prevent xcin crash when xcin terminate
- add memory leak patch from James Su
- add ez input method table
- toggle off BEEP_DUPCHAR for some modules.

* Wed Nov 27 2002 Tim Powers <timp at redhat.com> 2.5.3.pre3-8
- rebuild on all arches
- remove unpackaged files from the buildroot
- truly lib64'ize it

* Tue Sep 24 2002 Leon Ho <llch at redhat.com>
- use latest libtool's config.{sub,guess} if x86_64

* Mon Sep 02 2002 Leon Ho <llch at redhat.com>
- some interfaces fix for new desktops

* Tue Aug 06 2002 Leon Ho <llch at redhat.com>
- rebuild with various changes

* Thu Jul 25 2002 Tim Powers <timp at redhat.com>
- rebuild against new libtabe

* Mon Jul 22 2002 Leon Ho <llch at redhat.com>
- own /etc/chinese

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu Jun 13 2002 Leon Ho <llch at redhat.com>
- 2.5.3-pre3

* Mon May 28 2002 Leon Ho <llch at redhat.com>
- rebuild for new toolchains

* Tue Mar 26 2002 Nalin Dahyabhai <nalin at redhat.com>
- rebuild

* Mon Mar 25 2002 Leon Ho <llch at redhat.com>
- take out CVS internal files from doc dir

* Wed Feb 27 2002 Leon Ho <llch at redhat.com>
- rebuild with new tree

* Thu Jan 30 2002 Leon Ho <llch at redhat.com>
- db4
- rebuild with new tools

* Fri Dec 07 2001 Leon Ho <llch at redhat.com>
- update to 2.5.3.pre2 latest from cvs
- update xinitrc.LINUX

* Tue Nov 27 2001 Leon Ho <llch at redhat.com>
- build against 7.2-tcsc
- update to 2.5.3.pre2 

* Tue Oct 29 2001 Chung-Yen Chang <candyz at linux.org.tw>
- update to 2.5.3.pre1

* Thu Aug  2 2001 Yukihiro Nakai <ynakai at redhat.com>
- Remove wmconfig file. (#50110)

* Mon Jul 30 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add (noreplace) to %%config (#50110)

* Fri Jul 27 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add %%lang (#50110)
- Add %%config for xcin.wm (#50110)

* Tue Jul 17 2001 Yukihiro Nakai <ynakai at redhat.com>
- Delete .desktop (#48780)
- Add db2-devel to BuildPrereq. (#48918)

* Wed Jul 11 2001 Jonathan Blandford <jrb at redhat.com>
- moved .desktop file from 'Chinese' to 'Utilities'

* Sun Jul  8 2001 Tim Powers <timp at redhat.com>
- don't have sgid root dirs

* Mon Jun 18 2001 Yukihiro Nakai <ynakai at redhat.com>
- Rebuild against Red Hat 7.2
- Add ia64 support.

* Tue Dec 05 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- Rebuild for Red Hat 7.0
- Add BuildRequires Requires

* Mon Oct 30 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 2.5.2.1

* Mon Oct 16 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 2.5.2

* Tue Oct 10 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 2.5.2-pre6.diff1

* Sun Oct 08 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 2.5.2-pre6

* Mon Sep 04 2000 Chih-Wei Huang <cwhuang at linux.org.tw>
- fix missing icon in xcin.desktop and xcin.wm
- apply xcin-2.5.2.pre5.diff3

* Fri Aug 25 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 2.5.2-pre5

* Sun Apr 23 2000 Andrew Lee <andrew at cle.linux.org.tw>
- change xcin directory to /usr/X11R6/lib/X11/xcin/
- path fix

* Fri Apr 21 2000 Andrew Lee <andrew at cle.linux.org.tw>
- update 2.5.2-pre3
- set OverTheSpot enable default

* Tue Feb 29 2000 Chih-Wei Huang <cwhuang at linux.org.tw>
- update 2.5.2-pre2

* Fri Feb 18 2000 Andrew Lee <andrew at cle.linux.org.tw>
- update 2.5.2-pre1

* Thu Feb 10 2000 Chih-Wei Huang <cwhuang at linux.org.tw>
- remove kdelnk, modify xcin.desktop

* Tue Jan 25 2000 Andrew Lee <andrew at cle.linux.org.tw>
- add bimsphone module patch

* Mon Jan 24 2000 Andrew Lee <andrew at cle.linux.org.tw>
- update xcin-2.5-20000124
- add non-autoselect bimsphone 
- add phonegb2

* Thu Jan 6 2000 Andrew Lee <andrew at cle.linux.org.tw>
- rebuild for yami

* Mon Jan  3 2000 Andrew Lee <andrew at cle.linux.org.tw>
- update xcin-2.5-20000103

* Mon Dec 13 1999 Andrew Lee <andrew at cle.linux.org.tw>
- Patch a bug (gui.c)

* Mon Nov 29 1999 Andrew Lee <Andrew at nssh.tpc.edu.tw>
- update xcin-2.5-19991128

* Thu Nov 25 1999 Andrew Lee <Andrew at nssh.tpc.edu.tw>
- update xcin-2.5-19991109
- fix cin2tab rcfile bug

* Mon Nov 22 1999 Andrew Lee <Andrew at nssh.tpc.edu.tw>
- rebuild for mandrake
- patch cin/Makefile path

* Thu Aug 26 1999 Cheng Yuan-Cheng <platin at linux.org.tw>
- for xcin-2.5.1
- menu entry for GNOME and KDE were added...

* Sat Jun 19 1999 Cheng Yuan-Cheng <platin at cle.linux.org.tw>
- for xcin-2.5.0-pre3

* Sun May  2 1999 Cheng Yuan-Cheng <platin at cle.linux.org.tw>
- frist build xcin-2.5



--- NEW FILE xcin.wrap ---
#!/bin/sh

TESTPRELOAD=`echo $LD_PRELOAD | grep "xa+cv"`
[ -n "$TESTPRELOAD" ] && unset LD_PRELOAD

exec /usr/X11R6/lib/X11/xcin2.5/xcin $@


--- NEW FILE xcin.xpm ---
/* XPM */
static char* xcin = {
"59 29 3 2",
"__ c #ffffff",
"_` c #ff8aa6",
"_a c #4582b6",
"_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a", 
"_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a", 
"_a_______a_a_a_a_a_a_a___a_a_a_a_____a_a___a_a_a_______a_a_a_a_a_a_a_____a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_______a", 
"_a_______a_a_a___a_a_a_____a_a_a___a___a___a_a_a_______a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a_a_a_a_a_a_a___a_a_a___a", 
"_a_______a_a_a_____a_a___a___a_________a___a_a_a_a_____a_a_a_a_a_a_a___a_a_a_a_a_a___a_a___a___________a_a_____a_a___a", 
"_a_____a_a_________a_________a_____a___a___a_a_a_a_____a_a_a_a_a_a_a___a_a_a___a_a___a_a___a_a___a___a_a_a___a_a_a___a", 
"_a_____a_a_a_a___a___a___a_a_a_____a___a___a_a_a_a_____a_a_a_a_a_a_a___a_a_a___a_a___a_a_a_a_a___a___a_a___a_a_a_a___a", 
"_a_____a_a_a_a_a_a___a___a_a___________a___a___a_a_____a_a_a_a_a_a_a___a_a_a_a_a_a___a___a_a_a___a___a_a___a_a_a_a___a", 
"_a_____a_a_a_a_a_a___a___a_a___________a___a___a_a_____a_a_a_a_a_a_a___a_a_a_a_a_a___a___a_a_a___a___a_a___a_a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a_a_a_a_____a___a_______a_a_a___a_a_a_a_a_a_a___a_a_a_a___a___a___a_a_a___a___a___a_a_a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a___a_a_____a___a_a_a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a___a_____a_a_a_a_a_a___a", 
"_a___a_a_a_a_a_____________a_a___________a_a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a_____a___a_a___a___a_a_a_a___a_a___a", 
"_a___a_a_a_a_a_a_a___a_a___a___a___a_a_____a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_______________a_a___a_____a_a_____a_a___a", 
"_a___a_a_a_a_a_a_a___a_a___a___________a___a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a___________a_a___a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a___a___a___a___a___a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a___a___a_a_a_a_a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a___a___a___a___a___a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a___a___a_a_a_a_a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a___a___a___a___a___a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a___a___a_a___a_a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a___a___________a___a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a___a___a_a_a_a_a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a_______a___a___a_____a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a___a___a___a___a_a_a_a_a___a", 
"_a___a_a_a___________________a_a_a_a_a_a_____a_a_a_a___a_a_a_a_a_a_a___a_a___________________a___a_____a_a_a_a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a_a_a___________a_a___a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a___a_a___a", 
"_a___a_a_a_a_a_a_______a_a_a_a___a_a_a_a_a___a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_____a_a___a", 
"_a___a_a_a_a_a_a_______a_a_a_a___a_a_a_a_a___a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_____a_a___a", 
"_a_____a_a_a_a_a___a_a___a_a_a___a_a_a_a_a_a_a_a_a_____a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a_a_a___a_a_a___a_a_a___a", 
"_a_____a_a_a_a_a___a_a___a_a_________a_a_a___a_a_a_____a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a_a___a", 
"_a_____a_a_a_a_a_a_a_a_a___a_a_a_a___a_a_____a_a_a_____a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a___a_a___a_a___a_a_a_a___a", 
"_a_______a_a_a___a_a_a_a___a_a_a___a___a___a___a_a_____a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a___a_a___a___a_a_a_a_a___a", 
"_a_______a_a_a_a_a_a_a_a_a___a___a_a_____a_a___a_______a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a___a_a_a_____a_a_a_a_a___a", 
"_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`", 
} ;


--- NEW FILE xcinrc.UTF-8 ---
;
;  Xcin resource file for GNU/Linux
;
;  By T.H.Hsieh.
;

;
;  Directories.
;
(define XCIN_DEFAULT_DIR      "/usr/X11R6/lib/X11/xcin")
(define XCIN_USER_DIR         ".xcin")

;
;  This defines GUI attribute.
;
(define INDEX_FONT  		"-sony-*-16-*-iso8859-1")
(define FG_COLOR    		"white")
(define BG_COLOR    		"blue")
(define M_FG_COLOR  		"yellow")
(define M_BG_COLOR  		"darkred")
(define ULINE_COLOR		"cyan")
(define GRID_COLOR		"white")
(define X_GEOMETRY  		"45x2+200-1")
(define START_MAINWIN2		"YES")
(define MAINWIN2_GEOMETRY	"27x1+200-1")
(define XCIN_HIDE   		"NO")
(define XKILL_DISABLE		"NO")
(define ICCHECK_DISABLE		"NO")
(define SINGLE_IM_CONTEXT	"NO")
(define IM_FOCUS_ON		"NO")
(define KEEP_POSITION_ON	"NO")
(define DIFF_BEEP		"YES")
(define KEYBOARD_TRANSLATE	"NO")

(define LOCALE	'(zh_TW.Big5 zh_HK.Big5HKSCS zh_CN.GB2312 zh_CN.GBK zh_TW.UTF-8))

;
;  XIM Input Style Adjustments.
;
(define INPUT_STYLE		'(Root OverTheSpot OnTheSpot))
(define OVERSPOT_USE_USRCOLOR	"YES")
(define OVERSPOT_USE_USRFONTSET "YES")
(define OVERSPOT_WINDOW_ONLY	"YES")
(define ONSPOT_PREEDIT_MODE     "REVERSE")

;
;  Special Trigger Keys.
;
;(define FKEY_ZHEN		"ctrl space")
;(define FKEY_2BSB		"shift space")
;(define FKEY_CIRIM		"ctrl shift")
;(define FKEY_CIRRIM		"shift ctrl")
;(define FKEY_CHREP		"ctrl alt r")
;(define FKEY_SIMD		"ctrl alt i")
;(define FKEY_IMFOCUS		"ctrl alt f")
;(define FKEY_IMN		"ctrl alt")
;(define FKEY_QPHRASE		"shift alt")

;
;  IM module default resources.
;
(define gen_inp_default
        '((AUTO_COMPOSE         YES)
          (AUTO_UPCHAR          YES)
          (AUTO_FULLUP          NO)
          (SPACE_AUTOUP         NO)
          (SELKEY_SHIFT         NO)
          (SPACE_IGNORE         NO)
          (SPACE_RESET          YES)
          (AUTO_RESET           NO)
          (WILD_ENABLE          YES)
          (SINMD_IN_LINE1       NO)
          (END_KEY              NO)
          (QPHRASE_MODE         0)      ; 1:shift, 2:ctrl, 4:alt, 8:fallback
          (DISABLE_SEL_LIST     "NONE")
	  (KEYSTROKE_REMAP	"NONE")
          (BEEP_WRONG           YES)
          (BEEP_DUPCHAR         NO)
          (TSI_FNAME            "tsi.db")
	  (HINT_SELECT		NO)
	  (HINT_TSI		NO)))

(define bimsphone_default
        '((N_SELECTION_KEY      9)
          (SELECTION_KEYS       0)      ; 0: "1234567890", 1: "asdfgjkl;"
          (PAGE_KEYS            5)      ; 1:<> 2:,. 4:(Rt)(Lt)
          (QPHRASE_MODE         1)      ; 1:shift, 2:ctrl, 4:alt, 8:fallback
        ;
        ; This is only valid for "bimsphone*" IM name.
          (AUTO_SELECTION       YES)
          (KEYMAP               0)      ; 0:zozy, 1:et, 2:et26, 3:hsu
        ;
        ; This is only valid for "bimspinyin*" IM name.
          (PINPHO_MAP           "bims_pinyin")
        ;
        ; The following has effect only when AUTO_SELECTION is YES
          (TSI_FNAME            "tsi.db")
          (YIN_FNAME            "yin.db")
	  (TSI_USERDEF_FNAME	"utsi.db")
	  (YIN_USERDEF_FNAME	"uyin.db")
          (SPACE_SELECTION      NO)
          (PHRASE_SELECTION     YES)
          (N_SELECTION_PHR      4)
        ;
        ; The following has effect only when AUTO_SELECTION is NO
          (AUTO_UPCHAR          YES)))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;
;  This is the global configuration of the zh_TW.UTF-8 locale
;
(define zh_TW.UTF-8
  '((DEFAULT_IM         "cj5")
    (DEFAULT_IM_MODULE  "gen_inp")
    (DEFAULT_IM_SINMD   "DEFAULT")
    (PHRASE             "default.phr")
    (CINPUT             (cj5 simplex5 phone jyutping bimspinyin bimsphone
                         array30 jyutping0 zh_hex))
    (FONTSET            "-*-medium-*-24-*,*")
    (OVERSPOT_FONTSET   "-*-medium-*-16-*,*")))

(define cj5 at utf-8
        '((SETKEY               1)))

(define simplex5 at utf-8
        '((SETKEY               2)))

(define phone at utf-8
        '((SETKEY               3)
          (END_KEY              YES)
          (BEEP_DUPCHAR         YES)))

(define jyutping at utf-8
        '((SETKEY               4)
          (END_KEY              YES)
          (BEEP_DUPCHAR         YES)))

(define bimsphone at utf-8
        '((SETKEY               6)
          (MODULE               "bimsphone")))

(define bimspinyin at utf-8
        '((SETKEY               7)
          (MODULE               "bimsphone")))

(define array30 at utf-8
        '((SETKEY               8)
          (BEEP_DUPCHAR         YES)
          (DISABLE_SEL_LIST     "w")
          (KEYSTROKE_REMAP      "t:0xaaba;T:0xaaba;")))

(define jyutping0 at utf-8
        '((SETKEY               9)
          (BEEP_DUPCHAR         YES)))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;
;  This is the global configuration of the zh_TW.Big5 locale 
;
(define zh_TW.Big5 
  '((DEFAULT_IM		"cj")
    (DEFAULT_IM_MODULE	"gen_inp")
    (DEFAULT_IM_SINMD	"DEFAULT")
    (PHRASE		"default.phr")
    (CINPUT		(cj simplex phone bimspinyin bimsphone jyutping
			 array30 jyutping0 zh_hex))
    (FONTSET		"-sony-*-24-*-iso8859-1,-*-medium-r-*-24-*-big5-0")
    (OVERSPOT_FONTSET	"-sony-*-16-*-iso8859-1,-*-medium-r-*-16-*-big5-0")))
;
;  Here are detailed configuration of each IM (for zh_TW.Big5 locale).
;
(define cj at big5
	'((SETKEY		1)))

(define simplex at big5
	'((SETKEY		2)))

(define phone at big5
	'((SETKEY		3)
	  (END_KEY		YES)))

(define jyutping at big5
	'((SETKEY		4)
	  (END_KEY		YES)))

(define bimsphone at big5
	'((SETKEY		6)
	  (MODULE		"bimsphone")))

(define bimspinyin at big5
	'((SETKEY		7)
	  (MODULE		"bimsphone")))

(define array30 at big5
	'((SETKEY		8)
	  (DISABLE_SEL_LIST	"w")
	  (KEYSTROKE_REMAP	"t:0xaaba;T:0xaaba;")))

(define jyutping0 at big5
	'((SETKEY		9)))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;
;  This is the global configuration of the zh_CN.GB2312 locale 
;
(define zh_CN.GB2312
  '((DEFAULT_IM		"pinyin")
    (DEFAULT_IM_MODULE	"gen_inp")
    (DEFAULT_IM_SINMD	"DEFAULT")
    (PHRASE		"default.phr")
    (CINPUT		(pinyin shuangpin jtcj_gb wubizixing phonegb2
			 zh_hex))
    (FONTSET		"-sony-*-24-*-iso8859-1,-*-medium-r-*-24-*-gb2312.1980-0")
    (OVERSPOT_FONTSET	"-sony-*-16-*-iso8859-1,-*-medium-r-*-16-*-gb2312.1980-0")))
;
;  Here are detailed configuration of each IM (for zh_CN.GB2312 locale).
;
(define pinyin at gb2312
	'((SETKEY		1)))

(define shuangpin at gb2312
	'((SETKEY		2)))

(define jtcj_gb at gb2312
	'((SETKEY		3)))

(define phonegb2 at gb2312
	'((SETKEY		4)
	  (END_KEY		YES)))

(define wubizixing at gb2312
	'((SETKEY		5)))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;
;  This is the global configuration of the zh_HK.Big5HKSCS locale 
;
(define zh_HK.Big5HKSCS
  '((DEFAULT_IM		"cj")
    (DEFAULT_IM_MODULE	"gen_inp")
    (DEFAULT_IM_SINMD	"DEFAULT")
    (PHRASE		"default.phr")
    (CINPUT             (cj simplex phone bimspinyin bimsphone jyutping
			 array30 jyutping0 zh_hex))
    (FONTSET		"-sony-*-24-*-iso8859-1,-*-medium-r-*-24-*-big5-0,-*-24-*-c-*-big5hkscs-0")
    (OVERSPOT_FONTSET	"-sony-*-16-*-iso8859-1,-*-medium-r-*-16-*-big5-0,-*-16-*-c-*-big5hkscs-0")))
;
;  Here are detailed configuration of each IM (for zh_HK.Big5HKSCS locale).
;
(define cj at big5hkscs
	'((SETKEY		1)))

(define simplex at big5hkscs
	'((SETKEY		2)))

(define phone at big5hkscs
	'((SETKEY		3)
	  (END_KEY		YES)))

(define jyutping at big5hkscs
	'((SETKEY		4)
	  (END_KEY		YES)))

(define bimsphone at big5hkscs
	'((SETKEY		6)
	  (MODULE		"bimsphone")))

(define bimspinyin at big5hkscs
	'((SETKEY		7)
	  (MODULE		"bimsphone")))

(define array30 at big5hkscs
	'((SETKEY		8)
	  (DISABLE_SEL_LIST	"w")
	  (KEYSTROKE_REMAP	"t:0xaaba;T:0xaaba;")))

(define jyutping0 at big5hkscs
	'((SETKEY		9)
	  (END_KEY		YES)))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;
;  This is the global configuration of the zh_CN.GBK locale 
;
(define zh_CN.GBK
  '((DEFAULT_IM		"zh_hex")
    (DEFAULT_IM_MODULE	"gen_inp")
    (DEFAULT_IM_SINMD	"DEFAULT")
    (PHRASE		"default.phr")
    (CINPUT		(zh_hex))
    (FONTSET		"-sony-*-24-*-iso8859-1,-*-medium-r-*-24-*-gbk-0")
    (OVERSPOT_FONTSET	"NONE")))

;
;  The zh_hex module (zh_hex input method) is a special IM, which can be
;  used in many different encodings.
;
(define zh_hex 
	'((SETKEY		0)
	  (MODULE		zh_hex)
	  (INP_CNAME_big5	"0xa4ba+0xbd58")
	  (INP_CNAME_big5hkscs	"0xa4ba+0xbd58")
	  (INP_CNAME_gb2312	"0xc4da+0xc2eb")
	  (INP_CNAME_gbk	"0xc4da+0xc2eb")
	  (INP_CNAME_utf-8	"0xe585a7+0xe7a2bc")
	  (BEEP_WRONG		YES)))



--- NEW FILE xinput.d-xcin ---
XIM=xcin
XIM_PROGRAM=xcin
XIM_ARGS="-x xcin"
GTK_IM_MODULE=xim


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xcin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Mar 2005 01:13:04 -0000	1.1
+++ .cvsignore	21 Mar 2005 01:15:07 -0000	1.2
@@ -0,0 +1 @@
+xcin-2.5.3.pre3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xcin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Mar 2005 01:13:04 -0000	1.1
+++ sources	21 Mar 2005 01:15:07 -0000	1.2
@@ -0,0 +1 @@
+354f46d3f22cab2d8fb57b7649cdc37a  xcin-2.5.3.pre3.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 21 01:22:02 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:22:02 -0500
Subject: rpms/xcin/devel xcin.spec,1.1,1.2
Message-ID: <200503210122.j2L1M2gO027056@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27042

Modified Files:
	xcin.spec 
Log Message:
bump for build



Index: xcin.spec
===================================================================
RCS file: /cvs/extras/rpms/xcin/devel/xcin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xcin.spec	21 Mar 2005 01:15:07 -0000	1.1
+++ xcin.spec	21 Mar 2005 01:22:00 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: An X Input Method Server for Chinese.
 Name: xcin
 Version: 2.5.3.pre3
-Release: 24
+Release: 25
 License: GPL
 Group: User Interface/X
 Source0: ftp://xcin.linux.org.tw/pub/xcin/xcin/%{name}-%{version}.tar.gz
@@ -108,6 +108,9 @@
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Mar 21 2005 Leon Ho <llch at redhat.com>
+- rebuilt for Fedora Extras
+
 * Thu Jul 01 2004 Leon Ho <llch at redhat.com>
 - modify post script
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:22:28 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:22:28 -0500
Subject: rpms/xfce4-session/devel xfce4-session.spec,1.1,1.2
Message-ID: <200503210122.j2L1MSZI027108@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27093

Modified Files:
	xfce4-session.spec 
Log Message:
fix BuildReqs and prep for FC4 build



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-session.spec	19 Mar 2005 18:09:41 -0000	1.1
+++ xfce4-session.spec	21 Mar 2005 01:22:26 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-session-4.2.1.tar.bz2
@@ -13,6 +13,8 @@
 BuildRequires: libxfcegui4-devel >= 4.2.1
 BuildRequires: libxfce4mcs-devel >= 4.2.1
 BuildRequires: xfce-mcs-manager-devel >= 4.2.1
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 xfce4-session is the session manager for the Xfce desktop environment.
@@ -43,7 +45,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -78,6 +80,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:23:34 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:23:34 -0500
Subject: rpms/xfce4-session/FC-3 xfce4-session.spec,1.1,1.2
Message-ID: <200503210123.j2L1NYRI027160@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-session/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27145

Modified Files:
	xfce4-session.spec 
Log Message:
fix BuildReqs and prep for FC3 build



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/FC-3/xfce4-session.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-session.spec	19 Mar 2005 18:09:41 -0000	1.1
+++ xfce4-session.spec	21 Mar 2005 01:23:32 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.2.1
-Release: 1
+Release: 2.FC3
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-session-4.2.1.tar.bz2
@@ -13,6 +13,8 @@
 BuildRequires: libxfcegui4-devel >= 4.2.1
 BuildRequires: libxfce4mcs-devel >= 4.2.1
 BuildRequires: xfce-mcs-manager-devel >= 4.2.1
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 xfce4-session is the session manager for the Xfce desktop environment.
@@ -43,7 +45,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -78,6 +80,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:28:41 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:28:41 -0500
Subject: rpms/system-switch-im - New directory
Message-ID: <200503210128.j2L1SfqF027305@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/system-switch-im
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27298/system-switch-im

Log Message:
Directory /cvs/extras/rpms/system-switch-im added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 21 01:28:41 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:28:41 -0500
Subject: rpms/system-switch-im/devel - New directory
Message-ID: <200503210128.j2L1SfFr027308@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/system-switch-im/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27298/system-switch-im/devel

Log Message:
Directory /cvs/extras/rpms/system-switch-im/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 21 01:29:17 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:29:17 -0500
Subject: rpms/system-switch-im Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503210129.j2L1THea027370@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/system-switch-im
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27361

Added Files:
	Makefile import.log 
Log Message:
Setup of module system-switch-im


--- NEW FILE Makefile ---
# Top level Makefile for module system-switch-im
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 21 01:29:17 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:29:17 -0500
Subject: rpms/system-switch-im/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503210129.j2L1THl2027373@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/system-switch-im/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27361/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module system-switch-im


--- 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 Mar 21 01:30:25 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:30:25 -0500
Subject: rpms/system-switch-im import.log,1.1,1.2
Message-ID: <200503210130.j2L1UPXi027479@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/system-switch-im
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27470

Modified Files:
	import.log 
Log Message:
auto-import system-switch-im-0.1.2-3 on branch devel from system-switch-im-0.1.2-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/system-switch-im/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Mar 2005 01:29:15 -0000	1.1
+++ import.log	21 Mar 2005 01:30:23 -0000	1.2
@@ -0,0 +1 @@
+system-switch-im-0_1_2-3:HEAD:system-switch-im-0.1.2-3.src.rpm:1111368597



From fedora-extras-commits at redhat.com  Mon Mar 21 01:30:25 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:30:25 -0500
Subject: rpms/system-switch-im/devel im-switch, NONE,
	1.1 system-switch-im.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503210130.j2L1UPOp027483@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/system-switch-im/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27470/devel

Modified Files:
	.cvsignore sources 
Added Files:
	im-switch system-switch-im.spec 
Log Message:
auto-import system-switch-im-0.1.2-3 on branch devel from system-switch-im-0.1.2-3.src.rpm


--- NEW FILE im-switch ---
#!/bin/sh

XINPUT_PATH=/etc/X11/xinit/xinput.d
DOTXINPUT_PATH=${HOME}/.xinput.d
ALTER_XINPUT=/etc/alternatives/xinput-
LNG=`echo ${LC_CTYPE:-$LANG} | awk -F. '{ print $1 }'`
DEFAULT=`/usr/sbin/alternatives --display xinput-$LNG | awk '{ if ($0 ~/link/) print $5 }'`

auto() {
    if [ ! -r "${ALTER_XINPUT}${LNG}" ]; then
	echo "No alternatives defined for language $LNG"
	exit 1
    else
	if [ "$UID" -eq 0 ]; then
	    /usr/sbin/alternatives --auto xinput-$LNG
	else
	   [ -r "${XINPUT_PATH}/${LNG}" -a -r "${DOTXINPUT_PATH}/${LNG}" ] && mv ${DOTXINPUT_PATH}/${LNG} ${DOTXINPUT_PATH}/${LNG}.backup
	fi
    fi
}

list() {
    if [ -r "${DOTXINPUT_PATH}/${LNG}" ]; then
	echo "You have ${LNG} setup in \"${DOTXINPUT_PATH}\"."
	echo "======================================================="
    fi
    if [ ! -r "${ALTER_XINPUT}${LNG}" ]; then
	echo "No alternatives defined for language $LNG"
    else
	/usr/sbin/alternatives --display xinput-$LNG | sed -e "s%$XINPUT_PATH/%%"
    fi
    echo "======================================================="
    echo "The following languages currently have input methods configured:"
    for i in `ls $ALTER_XINPUT* | sed -e "s%$ALTER_XINPUT%%"`; do
        echo -n "$i "
    done
    echo
}

setalt() {
    if [ "$UID" -eq 0 ]; then
	if [ ! -r "${ALTER_XINPUT}${LNG}" ]; then
	    echo "No alternatives defined for language $LNG"
	else
	    /usr/sbin/alternatives --set xinput-$LNG $XINPUT_PATH/$1
	fi
    else
	[ -r "$XINPUT_PATH/$1" ] || { echo "No xinput.d config for $1 available." ; exit 1 ; }
	if [ -d ${DOTXINPUT_PATH} ]; then
	    [ -r "${DOTXINPUT_PATH}/${LNG}" ] && mv ${DOTXINPUT_PATH}/${LNG} ${DOTXINPUT_PATH}/${LNG}.backup
	else
	    mkdir -p ${DOTXINPUT_PATH}
	fi
	ln -s $XINPUT_PATH/$1 ${DOTXINPUT_PATH}/$LNG
    fi
}

help() {
echo "Input Method Switcher 0.3"
echo ""
echo "Usage: $0 [-z lang] -s inputmethodname"
echo "           to set a specific input method for the language"
echo "       $0 [-z lang] -a"
echo "           to revent to the default input method for the language"
echo "       $0 [-z lang] -l"
echo "           to list current settings and available input methods for"
echo "           the language, and also all the available languages"
echo "       $0 -h"
echo "           to show this help"
echo
echo "The \"LANG\" argument of -z takes the form \"ll_CC\" and is used to override"
echo "the current language with ll_CC instead: eg \"-z ja_JP\""
    exit 65
}

setcommand() {
if [ -z "$COMMAND" ]; then
    COMMAND=$1
else
    echo "Use only of -s, -a or -l."
    echo "Try \"$0 -h\" for usage."
    exit 1
fi
}

if [ $# -eq 0 ]; then
    help
    exit 1
fi

bad_option=0

while getopts "hz:als:" OPTION; do
    case $OPTION in
        z) LNG=$OPTARG;;
        a) setcommand auto;;
        l) setcommand list;;
        s) setcommand "setalt $OPTARG";;
        h) setcommand "help $0";;
	?) bad_option=1
    esac
done

if [ "$bad_option" -eq 1 ]; then
    echo "Try \"$0 -h\" for usage."
    exit 1
else
    $COMMAND
fi


--- NEW FILE system-switch-im.spec ---
Summary: The Input Method System Switcher
Name: system-switch-im
Version: 0.1.2
Release: 3
Source0: %{name}-%{version}.tar.bz2
Source1: im-switch
License: GPL
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-root

BuildArch: noarch

#Requires: newt
Requires: /usr/sbin/alternatives
Requires: python >= 2.3

# GUI
Requires: libglade2
Requires: pygtk2-libglade
Requires: pygtk2

Conflicts: xinitrc < 4.0.1-1

BuildPreReq: python >= 2.3
BuildPreReq: gettext
BuildPreReq: automake
BuildPreReq: intltool

%description
The system-switch-im is the Input Method Switcher.
It enables users to easily switch between various input methods that they have installed.

#%package gnome
#Summary: A GUI interface for Input Method System Switcher.
#Group: Applications/System
#Requires: %{name} = %{version}-%{release}
#Requires: python >= 2.3
#Requires: /usr/sbin/alternatives

#%description gnome
#The system-switch-im-gnome package contains a GNOME interface for the
#Input Method Switcher.

%prep
%setup -q 

%build
make

%install
rm -rf %{buildroot}

%makeinstall
install %SOURCE1 $RPM_BUILD_ROOT%{_bindir}/

rm -rf $RPM_BUILD_ROOT/usr/bin/system-switch-im-nox
rm -rf $RPM_BUILD_ROOT/usr/sbin/system-switch-im-nox
rm -rf $RPM_BUILD_ROOT/etc/pam.d/system-switch-im-nox
rm -rf $RPM_BUILD_ROOT/etc/security/console.apps/system-switch-im-nox
rm -rf $RPM_BUILD_ROOT/usr/share/system-switch-im/imswitch_tui.py
rm -rf $RPM_BUILD_ROOT/usr/share/system-switch-im/imswitch_tui.pyc
               

%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root)
%{_bindir}/*
%{_sbindir}/*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/functions.py*
%{_datadir}/%{name}/locale-list
%config(noreplace) /etc/pam.d/*
#%{_datadir}/%{name}/imswitch_tui.py*
#%config(noreplace) /etc/security/console.apps/%{name}-nox

#%files gnome
#%defattr(-,root,root)
%config(noreplace) /etc/security/console.apps/%{name}
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_datadir}/%{name}/imswitch_gui.py*
%{_datadir}/%{name}/pixmaps
%{_datadir}/%{name}/imswitch.glade

%changelog
* Mon Oct 11 2004 Leon Ho <llch at redhat.com> 0.1.2-3
- rebuilt for translation

* Thu Sep 16 2004 Leon Ho <llch at redhat.com> 0.1.2-2
- fixed Makefile for locale-list

* Thu Sep 9 2004 Leon Ho <llch at redhat.com> 0.1.2-1
- used locale-list to display more user friendly language names
- fixed on the category for .desktop
- only display languages who has more than one IM

* Mon Aug 24 2004 Leon Ho <llch at redhat.com> 0.1.1-3
- added "Languages" into translatable string

* Mon Aug 23 2004 Leon Ho <llch at redhat.com> 0.1.1-2
- included im-switch cli tool
- fixed on unable to get kinput2 alternatives files bug
- added notification for restarting X
- dropped XIM ratio and retrim UI
- redid po files for translators and built existing translation
- checked if able to avoid confirm dialog if no change


* Wed Jul 21 2004 Leon Ho <llch at redhat.com> 0.1.1-1
- 0.1.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-switch-im/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Mar 2005 01:29:15 -0000	1.1
+++ .cvsignore	21 Mar 2005 01:30:23 -0000	1.2
@@ -0,0 +1 @@
+system-switch-im-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-switch-im/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Mar 2005 01:29:15 -0000	1.1
+++ sources	21 Mar 2005 01:30:23 -0000	1.2
@@ -0,0 +1 @@
+d6702deff3ec8f4fbc61d8c219df94b0  system-switch-im-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 21 01:32:16 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:32:16 -0500
Subject: rpms/xfce4-toys/devel xfce4-toys.spec,1.1,1.2
Message-ID: <200503210132.j2L1WGXL027595@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-toys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27580

Modified Files:
	xfce4-toys.spec 
Log Message:
fix BuildReqs and prep for FC4 build



Index: xfce4-toys.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-toys/devel/xfce4-toys.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-toys.spec	19 Mar 2005 18:14:46 -0000	1.1
+++ xfce4-toys.spec	21 Mar 2005 01:32:14 -0000	1.2
@@ -1,14 +1,18 @@
 Summary: Various tools for Xfce4
 Name: xfce4-toys
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-toys-4.2.1.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfce4-panel >= 4.2.1
-BuildRequires: xfce4-panel >= 4.2.1
+BuildRequires: xfce4-panel-devel >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: libxml2-devel
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 xfce4-toys includes an "xeyes" type plugin for the Xfce4 panel
@@ -24,7 +28,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -40,6 +44,9 @@
 %{_datadir}/xfce4/tips/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Upgraded to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:33:31 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:33:31 -0500
Subject: rpms/xfce4-toys/FC-3 xfce4-toys.spec,1.1,1.2
Message-ID: <200503210133.j2L1XVqc027655@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-toys/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27641

Modified Files:
	xfce4-toys.spec 
Log Message:
fix BuildReqs and prep for FC3 build



Index: xfce4-toys.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-toys/FC-3/xfce4-toys.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-toys.spec	19 Mar 2005 18:14:46 -0000	1.1
+++ xfce4-toys.spec	21 Mar 2005 01:33:29 -0000	1.2
@@ -1,14 +1,18 @@
 Summary: Various tools for Xfce4
 Name: xfce4-toys
 Version: 4.2.1
-Release: 1
+Release: 2.FC3
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-toys-4.2.1.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfce4-panel >= 4.2.1
-BuildRequires: xfce4-panel >= 4.2.1
+BuildRequires: xfce4-panel-devel >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: libxml2-devel
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 xfce4-toys includes an "xeyes" type plugin for the Xfce4 panel
@@ -24,7 +28,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -40,6 +44,9 @@
 %{_datadir}/xfce4/tips/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Upgraded to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:42:28 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:42:28 -0500
Subject: rpms/xfce4-trigger-launcher/devel xfce4-trigger-launcher.spec, 1.1,
	1.2
Message-ID: <200503210142.j2L1gSaK027844@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-trigger-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27829

Modified Files:
	xfce4-trigger-launcher.spec 
Log Message:
fix BuildReqs and prep for FC4 build



Index: xfce4-trigger-launcher.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-trigger-launcher/devel/xfce4-trigger-launcher.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-trigger-launcher.spec	19 Mar 2005 18:17:41 -0000	1.1
+++ xfce4-trigger-launcher.spec	21 Mar 2005 01:42:26 -0000	1.2
@@ -1,14 +1,18 @@
 Summary: A panel plugin acting as a launcher with two states
 Name: xfce4-trigger-launcher
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-trigger-launcher-4.2.1.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: xfce4-panel >= 4.2.0
-BuildRequires: xfce4-panel >= 4.2.0
+Requires: xfce4-panel >= 4.2.1
+BuildRequires: xfce4-panel-devel >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: libxfce4util-devel >= 4.2.1
+BuildRequires: libxml2-devel
+BuildRequires: gettext
 
 %description
 xfce4-trigger-launcher is a launcher with two states, like a trigger.
@@ -23,7 +27,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -35,6 +39,9 @@
 %{_libdir}/xfce4/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 - Removed unneeded glob in files for lang files



From fedora-extras-commits at redhat.com  Mon Mar 21 01:43:07 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:43:07 -0500
Subject: rpms/xfce4-trigger-launcher/FC-3 xfce4-trigger-launcher.spec, 1.1,
	1.2
Message-ID: <200503210143.j2L1h7rs027902@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-trigger-launcher/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27887

Modified Files:
	xfce4-trigger-launcher.spec 
Log Message:
fix BuildReqs and prep for FC4 build



Index: xfce4-trigger-launcher.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-trigger-launcher/FC-3/xfce4-trigger-launcher.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-trigger-launcher.spec	19 Mar 2005 18:17:41 -0000	1.1
+++ xfce4-trigger-launcher.spec	21 Mar 2005 01:43:05 -0000	1.2
@@ -1,14 +1,18 @@
 Summary: A panel plugin acting as a launcher with two states
 Name: xfce4-trigger-launcher
 Version: 4.2.1
-Release: 1
+Release: 2.FC3
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-trigger-launcher-4.2.1.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: xfce4-panel >= 4.2.0
-BuildRequires: xfce4-panel >= 4.2.0
+Requires: xfce4-panel >= 4.2.1
+BuildRequires: xfce4-panel-devel >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: libxfce4util-devel >= 4.2.1
+BuildRequires: libxml2-devel
+BuildRequires: gettext
 
 %description
 xfce4-trigger-launcher is a launcher with two states, like a trigger.
@@ -23,7 +27,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -35,6 +39,9 @@
 %{_libdir}/xfce4/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 - Removed unneeded glob in files for lang files



From fedora-extras-commits at redhat.com  Mon Mar 21 01:47:28 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:47:28 -0500
Subject: rpms/system-switch-im/devel system-switch-im.spec,1.1,1.2
Message-ID: <200503210147.j2L1lSak028009@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/system-switch-im/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28001

Modified Files:
	system-switch-im.spec 
Log Message:
rebuilt for extras



Index: system-switch-im.spec
===================================================================
RCS file: /cvs/extras/rpms/system-switch-im/devel/system-switch-im.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-switch-im.spec	21 Mar 2005 01:30:23 -0000	1.1
+++ system-switch-im.spec	21 Mar 2005 01:47:26 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: The Input Method System Switcher
 Name: system-switch-im
 Version: 0.1.2
-Release: 3
+Release: 4
 Source0: %{name}-%{version}.tar.bz2
 Source1: im-switch
 License: GPL
@@ -87,6 +87,9 @@
 %{_datadir}/%{name}/imswitch.glade
 
 %changelog
+* Mon Mar 21 2005 Leon Ho <llch at redhat.com> 0.1.2-4
+- rebuilt for Extras
+
 * Mon Oct 11 2004 Leon Ho <llch at redhat.com> 0.1.2-3
 - rebuilt for translation
 



From bugs.michael at gmx.net  Mon Mar 21 02:21:11 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Mon, 21 Mar 2005 03:21:11 +0100
Subject: rpms/xfprint/devel xfprint.spec,1.1,1.2
In-Reply-To: <200503202139.j2KLdbAE018445@cvs-int.fedora.redhat.com>
References: <200503202139.j2KLdbAE018445@cvs-int.fedora.redhat.com>
Message-ID: <20050321032111.442dc0c6.bugs.michael@gmx.net>

On Sun, 20 Mar 2005 16:39:37 -0500, Kevin Fenzi (kevin) wrote:

> Author: kevin
> 
> Update of /cvs/extras/rpms/xfprint/devel

> +%post -p /sbin/ldconfig
> +
> +%postun -p /sbin/ldconfig
> +
>  %files -f %{name}.lang
>  %defattr(-,root,root)
>  %doc README ChangeLog NEWS COPYING AUTHORS NOTES
>  %{_bindir}/*
> -%{_libdir}/xfce4/*
> +%{_libdir}/xfce4/mcs-plugins
> +%{_libdir}/xfce4/xfprint-plugins
>  %{_datadir}/applications/*
> -%{_datadir}/xfce4/*
> -%{_datadir}/icons/*
> +%{_datadir}/xfce4/doc/C
> +%{_datadir}/icons/hicolor/*/*/*

Does any of the xfce packages add to /etc/ld.so.conf or /etc/ld.so.conf.d/?
(I assume "no", because the directory names look like plugin directories)

If no package does that, the added ldconfig calls are not needed, because
no library is installed into run-time linker's default search path.



From bugs.michael at gmx.net  Mon Mar 21 02:31:30 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Mon, 21 Mar 2005 03:31:30 +0100
Subject: rpms/xcin/devel xcin-2.5.3-mkuserdir.patch, NONE, 1.1
 xcin-2.5.3-no_rpath.patch, NONE, 1.1 xcin.spec, NONE, 1.1 xcin.wrap, NONE,
 1.1 xcin.xpm, NONE, 1.1 xcinrc.UTF-8, NONE, 1.1 xinput.d-xcin, NONE, 1.1
 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503210115.j2L1F9au026891@cvs-int.fedora.redhat.com>
References: <200503210115.j2L1F9au026891@cvs-int.fedora.redhat.com>
Message-ID: <20050321033130.04e4eb64.bugs.michael@gmx.net>

On Sun, 20 Mar 2005 20:15:09 -0500, Leon Ho (llch) wrote:

> Author: llch
> 
> Update of /cvs/extras/rpms/xcin/devel

> %install
> 
> mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin
> mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
> mkdir -p $RPM_BUILD_ROOT/etc/chinese/xcin
> mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin/tab
> mkdir -p $RPM_BUILD_ROOT/usr/X11R6/man

Every package should

  rm -rf $RPM_BUILD_ROOT

at the beginning of the %install section. That is not just to make sure
the build root is emptied. It also makes short-circuit installs necessary
(man rpmbuild). Very handy if these work.



From fedora-extras-commits at redhat.com  Mon Mar 21 03:05:22 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 22:05:22 -0500
Subject: rpms/xcin/devel xcin.spec,1.2,1.3
Message-ID: <200503210305.j2L35MWx030666@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30657

Modified Files:
	xcin.spec 
Log Message:
-rebuilt



Index: xcin.spec
===================================================================
RCS file: /cvs/extras/rpms/xcin/devel/xcin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xcin.spec	21 Mar 2005 01:22:00 -0000	1.2
+++ xcin.spec	21 Mar 2005 03:05:20 -0000	1.3
@@ -52,7 +52,7 @@
 ( cd po; msgfmt -o xcin.mo xcin-zh_TW.po )
 
 %install
-
+rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin
 mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
 mkdir -p $RPM_BUILD_ROOT/etc/chinese/xcin
@@ -110,6 +110,7 @@
 %changelog
 * Mon Mar 21 2005 Leon Ho <llch at redhat.com>
 - rebuilt for Fedora Extras
+- add rm -rf $RPM_BUILD_ROOT
 
 * Thu Jul 01 2004 Leon Ho <llch at redhat.com>
 - modify post script



From fedora-extras-commits at redhat.com  Mon Mar 21 04:23:54 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 23:23:54 -0500
Subject: rpms/xcin/devel xcin.spec,1.3,1.4
Message-ID: <200503210423.j2L4NsBo032697@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32685

Modified Files:
	xcin.spec 
Log Message:
- fix BuildReqs
- macroize stuff and other fixes



Index: xcin.spec
===================================================================
RCS file: /cvs/extras/rpms/xcin/devel/xcin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xcin.spec	21 Mar 2005 03:05:20 -0000	1.3
+++ xcin.spec	21 Mar 2005 04:23:52 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: An X Input Method Server for Chinese.
 Name: xcin
 Version: 2.5.3.pre3
-Release: 25
+Release: 26
 License: GPL
 Group: User Interface/X
 Source0: ftp://xcin.linux.org.tw/pub/xcin/xcin/%{name}-%{version}.tar.gz
@@ -11,11 +11,14 @@
 Source5: xinput.d-%{name}
 Patch0: xcin-2.5.3-mkuserdir.patch
 Patch1:  xcin-2.5.3-no_rpath.patch
-BuildRequires: libtabe >= 0.2.4a
-Requires: libtabe >= 0.2.4a
-Requires(post,preun): /usr/sbin/alternatives
-BuildPrereq: db4-devel,libtabe-devel
 Buildroot: %{_tmppath}/%{name}-buildroot
+Requires(post): /usr/sbin/alternatives
+Requires(preun): /usr/sbin/alternatives
+BuildRequires: db4-devel
+BuildRequires: libtabe-devel >= 0.2.4a
+BuildRequires: libtool
+BuildRequires: xorg-x11-devel
+BuildRequires: gettext
 
 %description
 An X Input Method Server for Chinese.
@@ -37,14 +40,14 @@
 
 
 %build
-cp /usr/share/libtool/config.sub $RPM_BUILD_DIR/%{name}/script/
-cp /usr/share/libtool/config.guess $RPM_BUILD_DIR/%{name}/script/
+cp %{_datadir}/libtool/config.sub $RPM_BUILD_DIR/%{name}/script/
+cp %{_datadir}/libtool/config.guess $RPM_BUILD_DIR/%{name}/script/
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \
-	--prefix=/usr/X11R6 --libdir=/usr/X11R6/%{_lib} \
-        --with-xcin-dir=/usr/X11R6/%{_lib}/X11/xcin \
-	--with-xcin-rcdir=/etc/chinese/xcin \
-	--with-localedir=/usr/share/locale \
-	--with-extra-lib=/usr/%{_lib}
+	--prefix=%{_prefix}/X11R6 --libdir=%{_prefix}/X11R6/%{_lib} \
+        --with-xcin-dir=%{_prefix}/X11R6/%{_lib}/X11/xcin \
+	--with-xcin-rcdir=%{_sysconfdir}/chinese/xcin \
+	--with-localedir=%{_datadir}/locale \
+	--with-extra-lib=%{_libdir}
 
 perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
 
@@ -53,31 +56,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
-mkdir -p $RPM_BUILD_ROOT/etc/chinese/xcin
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin/tab
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/man
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/%{_lib}/X11/xcin
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/chinese/xcin
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/%{_lib}/X11/xcin/tab
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/man
 
 export program_prefix=$RPM_BUILD_ROOT
-export xcin_rcp=$RPM_BUILD_ROOT/etc/chinese/xcin
+export xcin_rcp=$RPM_BUILD_ROOT%{_sysconfdir}/chinese/xcin
 make -e install
 
-mkdir -p $RPM_BUILD_ROOT/usr/share/icons/
-mkdir -p $RPM_BUILD_ROOT/usr/share/gnome/apps/Utilities/
-mkdir -p $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Utilities/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/
 
 install -m 644 $RPM_SOURCE_DIR/xcin.xpm \
-		$RPM_BUILD_ROOT/usr/share/icons/xcin.xpm
-install -m 644 po/xcin.mo $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/xcin.mo
-install -m 644 src/lib/.libs/libxcin.so.0.0.0 $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/
+		$RPM_BUILD_ROOT%{_datadir}/icons/xcin.xpm
+install -m 644 po/xcin.mo $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/xcin.mo
+install -m 644 src/lib/.libs/libxcin.so.0.0.0 $RPM_BUILD_ROOT%{_prefix}/X11R6/%{_lib}/
 install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/chinese/xcin/xcinrc
 install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}
 
 # remove unpackaged files from the buildroot
-rm -rf $RPM_BUILD_ROOT/usr/X11R6/man
-rm -f $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/{libxcin.a,libxcin.la}
-rm -rf $RPM_BUILD_ROOT/usr/X11R6/share
+rm -rf $RPM_BUILD_ROOT%{_prefix}/X11R6/man
+rm -f $RPM_BUILD_ROOT%{_prefix}/X11R6/%{_lib}/{libxcin.a,libxcin.la}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/X11R6/share
 
 %post
 /sbin/ldconfig
@@ -97,21 +100,24 @@
 %dir %{_sysconfdir}/chinese
 %dir %{_sysconfdir}/chinese/xcin
 %config %{_sysconfdir}/chinese/xcin/xcinrc
-/usr/X11R6/bin/*
-/usr/X11R6/%{_lib}/X11/xcin/
-/usr/X11R6/%{_lib}/*
-/usr/share/icons/xcin.xpm
+%{_prefix}/X11R6/bin/*
+%{_prefix}/X11R6/%{_lib}/*
+%{_datadir}/icons/xcin.xpm
 %lang(zh_TW) /usr/share/locale/zh_TW/LC_MESSAGES/xcin.mo
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %clean 
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Mar 21 2005 Leon Ho <llch at redhat.com>
 - rebuilt for Fedora Extras
 - add rm -rf $RPM_BUILD_ROOT
 
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com>
+- fix BuildReqs
+- macroize stuff and other fixes
+
 * Thu Jul 01 2004 Leon Ho <llch at redhat.com>
 - modify post script
 



From rc040203 at freenet.de  Mon Mar 21 06:44:01 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Mon, 21 Mar 2005 07:44:01 +0100
Subject: rpms/nabi/devel nabi.spec,1.3,1.4
In-Reply-To: <200503190713.j2J7Dn8j003042@cvs-int.fedora.redhat.com>
References: <200503190713.j2J7Dn8j003042@cvs-int.fedora.redhat.com>
Message-ID: <1111387441.2475.243.camel@mccallum.corsepiu.local>

On Sat, 2005-03-19 at 02:13 -0500, Warren Togami wrote:
> Author: wtogami

> Index: nabi.spec
> ===================================================================
> RCS file: /cvs/extras/rpms/nabi/devel/nabi.spec,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- nabi.spec	17 Mar 2005 08:50:09 -0000	1.3
> +++ nabi.spec	19 Mar 2005 07:13:47 -0000	1.4
> @@ -23,7 +23,7 @@
>  %setup -q -n %{name}-%{version}
>  
>  %build
> -./configure --prefix={%_prefix}
> +./configure --prefix=%{_prefix}
>  make

This is still broken.

Your spec also is using %{_bindir}, %{_datadir},
%_sysconfdir}, but you miss to propagate them to the package's
configuration.

Try this and you'll see the bug:
# rpmbuild --rebuild nabi-0.14-4.src.rpm --define "_datadir /foo/bar"

Further bugs:
* RPM_OPT_FLAGS is being not honoured.
* Using install-strip void *debug.rpms

My advice: use %configure and remove install-strip

Another issue:
* When building the rpm, the autotools are being run.
I haven't investigated, but this could indicate the timestamps inside of
the original tarball to be broken.

Ralf





From wtogami at redhat.com  Mon Mar 21 07:23:17 2005
From: wtogami at redhat.com (Warren Togami)
Date: Sun, 20 Mar 2005 21:23:17 -1000
Subject: rpms/nabi/devel nabi.spec,1.3,1.4
In-Reply-To: <1111387441.2475.243.camel@mccallum.corsepiu.local>
References: <200503190713.j2J7Dn8j003042@cvs-int.fedora.redhat.com>
	<1111387441.2475.243.camel@mccallum.corsepiu.local>
Message-ID: <423E7665.90400@redhat.com>

Ralf Corsepius wrote:
> On Sat, 2005-03-19 at 02:13 -0500, Warren Togami wrote:
> 
>>Author: wtogami
> 
> 
>>Index: nabi.spec
>>===================================================================
>>RCS file: /cvs/extras/rpms/nabi/devel/nabi.spec,v
>>retrieving revision 1.3
>>retrieving revision 1.4
>>diff -u -r1.3 -r1.4
>>--- nabi.spec	17 Mar 2005 08:50:09 -0000	1.3
>>+++ nabi.spec	19 Mar 2005 07:13:47 -0000	1.4
>>@@ -23,7 +23,7 @@
>> %setup -q -n %{name}-%{version}
>> 
>> %build
>>-./configure --prefix={%_prefix}
>>+./configure --prefix=%{_prefix}
>> make
> 
> 
> This is still broken.
> 
> Your spec also is using %{_bindir}, %{_datadir},
> %_sysconfdir}, but you miss to propagate them to the package's
> configuration.
> 
> Try this and you'll see the bug:
> # rpmbuild --rebuild nabi-0.14-4.src.rpm --define "_datadir /foo/bar"
> 
> Further bugs:
> * RPM_OPT_FLAGS is being not honoured.
> * Using install-strip void *debug.rpms
> 
> My advice: use %configure and remove install-strip
> 
> Another issue:
> * When building the rpm, the autotools are being run.
> I haven't investigated, but this could indicate the timestamps inside of
> the original tarball to be broken.

This is an upstream issue.  There is a newer version, but I'm letting 
the new maintainer of nabi take care of these fixes and the version 
upgrade because he needs the practice.  Thanks for the analysis.

Warren Togami
wtogami at redhat.com



From fedora-extras-commits at redhat.com  Mon Mar 21 08:16:02 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Mon, 21 Mar 2005 03:16:02 -0500
Subject: rpms/sabayon/devel sabayon.spec,1.4,1.5
Message-ID: <200503210816.j2L8G2VH010376@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10367

Modified Files:
	sabayon.spec 
Log Message:
* Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-5
- Add dirmonitor.py to base package



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sabayon.spec	20 Mar 2005 09:57:49 -0000	1.4
+++ sabayon.spec	21 Mar 2005 08:16:00 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name:    sabayon
 Version: 0.16
-Release: 4
+Release: 5
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -100,6 +100,9 @@
 %{python_sitelib}/%{name}/config.py
 %{python_sitelib}/%{name}/config.pyc
 %ghost %{python_sitelib}/%{name}/config.pyo
+%{python_sitelib}/%{name}/dirmonitor.py
+%{python_sitelib}/%{name}/dirmonitor.pyc
+%ghost %{python_sitelib}/%{name}/dirmonitor.pyo
 %{python_sitelib}/%{name}/storage.py
 %{python_sitelib}/%{name}/storage.pyc
 %ghost %{python_sitelib}/%{name}/storage.pyo
@@ -135,9 +138,6 @@
 %{python_sitelib}/%{name}/aboutdialog.py
 %{python_sitelib}/%{name}/aboutdialog.pyc
 %ghost %{python_sitelib}/%{name}/aboutdialog.pyo
-%{python_sitelib}/%{name}/dirmonitor.py
-%{python_sitelib}/%{name}/dirmonitor.pyc
-%ghost %{python_sitelib}/%{name}/dirmonitor.pyo
 %{python_sitelib}/%{name}/editorwindow.py
 %{python_sitelib}/%{name}/editorwindow.pyc
 %ghost %{python_sitelib}/%{name}/editorwindow.pyo
@@ -167,6 +167,9 @@
 %ghost %{python_sitelib}/%{name}/userswindow.pyo
 
 %changelog
+* Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-5
+- Add dirmonitor.py to base package
+
 * Sun Mar 20 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-4
 - Split the package into sabayon and sabayon-admin
 - BuildRequires: gettext instead of gettext-devel



From fedora-extras-commits at redhat.com  Mon Mar 21 08:28:24 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Mon, 21 Mar 2005 03:28:24 -0500
Subject: rpms/sabayon/devel sabayon.spec,1.5,1.6
Message-ID: <200503210828.j2L8SOhC010571@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10562

Modified Files:
	sabayon.spec 
Log Message:
* Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-6
- Make noarch



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sabayon.spec	21 Mar 2005 08:16:00 -0000	1.5
+++ sabayon.spec	21 Mar 2005 08:28:21 -0000	1.6
@@ -6,7 +6,7 @@
 
 Name:    sabayon
 Version: 0.16
-Release: 5
+Release: 6
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -15,6 +15,7 @@
 Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/%{version}/sabayon-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 Requires: python-abi = %{pyver}
 Requires: gamin-python
@@ -167,6 +168,9 @@
 %ghost %{python_sitelib}/%{name}/userswindow.pyo
 
 %changelog
+* Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-6
+- Make noarch
+
 * Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-5
 - Add dirmonitor.py to base package
 



From fedora-extras-commits at redhat.com  Mon Mar 21 09:28:59 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Mon, 21 Mar 2005 04:28:59 -0500
Subject: rpms/sabayon/devel sabayon.spec,1.6,1.7
Message-ID: <200503210928.j2L9Sx4H013024@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13016

Modified Files:
	sabayon.spec 
Log Message:
* Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-7
- Move Xnest and shadow-utils requires to sabayon-admin
- Require libxml2-python



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sabayon.spec	21 Mar 2005 08:28:21 -0000	1.6
+++ sabayon.spec	21 Mar 2005 09:28:57 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:    sabayon
 Version: 0.16
-Release: 6
+Release: 7
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -19,10 +19,9 @@
 
 Requires: python-abi = %{pyver}
 Requires: gamin-python
+Requires: libxml2-python
 Requires: pygtk2 >= %{pygtk2_version}
 Requires: gnome-python2-gconf >= %{gnome_python2_version}
-Requires: xorg-x11-Xnest
-Requires: shadow-utils
 
 BuildRequires: python
 BuildRequires: gettext
@@ -40,6 +39,9 @@
 Group:    Applications/System
 Requires: %{name} = %{version}-%{release}
 
+Requires: xorg-x11-Xnest
+Requires: shadow-utils
+
 %description admin
 The sabayon-admin package contains the graphical tools which a
 sysadmin should use to manage Sabayon profiles.
@@ -168,6 +170,10 @@
 %ghost %{python_sitelib}/%{name}/userswindow.pyo
 
 %changelog
+* Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-7
+- Move Xnest and shadow-utils requires to sabayon-admin
+- Require libxml2-python
+
 * Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-6
 - Make noarch
 



From markmc at redhat.com  Mon Mar 21 09:36:18 2005
From: markmc at redhat.com (Mark McLoughlin)
Date: Mon, 21 Mar 2005 09:36:18 +0000
Subject: APPROVED: sabayon
Message-ID: <1111397778.3644.72.camel@blaa>

Sabayon is a tool to help sysadmins and user change and maintain the
default behaviour of the GNOME desktop.

Project website: http://www.gnome.org/projects/sabayon

Reviewed by Nils Philippsen, Warren Togami and Ralf Corsepius:

https://www.redhat.com/archives/fedora-extras-list/2005-March/thread.html#00565

Mark McLoughlin, Daniel Veillard and John Dennis will maintain the
package.



From fedora-extras-commits at redhat.com  Mon Mar 21 11:58:57 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 21 Mar 2005 06:58:57 -0500
Subject: rpms/awstats/FC-3 awstats.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <200503211158.j2LBwvVH018265@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18214/FC-3

Modified Files:
	awstats.spec sources 
Log Message:
- version 6.4 final
- change release tag for FC3/FC4 (following Owen's scheme: 
  https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00633.html)
- convert tabs into spaces



Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-3/awstats.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- awstats.spec	15 Feb 2005 17:35:38 -0000	1.5
+++ awstats.spec	21 Mar 2005 11:58:55 -0000	1.6
@@ -1,16 +1,16 @@
-Name:		awstats
-Version:	6.4
-Release:	0.1.pre
-Summary:	Advanced Web Statistics
-License:	GPL
-Group:		Applications/Internet
-URL:		http://awstats.sourceforge.net
-#Source0:	http://dl.sf.net/awstats/awstats-6.3.tgz
-Source0:	http://awstats.sourceforge.net/files/awstats-6.4.tgz
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	httpd
-Requires:	perl
+Name:       awstats
+Version:    6.4
+Release:    1.fc3
+Summary:    Advanced Web Statistics
+License:    GPL
+Group:      Applications/Internet
+URL:        http://awstats.sourceforge.net
+Source0:    http://dl.sf.net/awstats/awstats-6.4.tgz
+#Source0:   http://awstats.sourceforge.net/files/awstats-6.4.tgz
+BuildArch:  noarch
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:   httpd
+Requires:   perl
 Requires(post): perl
 Requires(postun): /sbin/service
 
@@ -151,6 +151,11 @@
 %{_datadir}/%{name}/wwwroot/js
 
 %changelog
+* Mon Mar 21 2005 Aurelien Bompard <gauret[AT]free.fr> 6.4-1.fc3
+- version 6.4 final
+- change release tag for FC3 (following Owen's scheme)
+- convert tabs into spaces
+
 * Tue Feb 15 2005 Aurelien Bompard <gauret[AT]free.fr> 6.4-0.1.pre
 - update to 6.4pre to fix a vulnerability
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Feb 2005 17:35:38 -0000	1.5
+++ sources	21 Mar 2005 11:58:55 -0000	1.6
@@ -1 +1 @@
-f4e236d2ab4c71933cb476b20172a68e  awstats-6.4.tgz
+056e6fb0c7351b17fe5bbbe0aa1297b1  awstats-6.4.tgz



From fedora-extras-commits at redhat.com  Mon Mar 21 11:58:57 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 21 Mar 2005 06:58:57 -0500
Subject: rpms/awstats/devel awstats.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200503211158.j2LBwvo8018269@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18214/devel

Modified Files:
	awstats.spec sources 
Log Message:
- version 6.4 final
- change release tag for FC3/FC4 (following Owen's scheme: 
  https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00633.html)
- convert tabs into spaces



Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- awstats.spec	5 Mar 2005 21:10:20 -0000	1.6
+++ awstats.spec	21 Mar 2005 11:58:55 -0000	1.7
@@ -1,18 +1,18 @@
-Name:		awstats
-Version:	6.4
-Release:	0.1.pre
-Summary:	Advanced Web Statistics
-License:	GPL
-Group:		Applications/Internet
-URL:		http://awstats.sourceforge.net
-#Source0:	http://dl.sf.net/awstats/awstats-6.3.tgz
-Source0:	http://awstats.sourceforge.net/files/awstats-6.4.tgz
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	httpd
-Requires:	perl
-Requires(post):		perl
-Requires(postun):	/sbin/service
+Name:       awstats
+Version:    6.4
+Release:    1.fc4
+Summary:    Advanced Web Statistics
+License:    GPL
+Group:      Applications/Internet
+URL:        http://awstats.sourceforge.net
+Source0:    http://dl.sf.net/awstats/awstats-6.4.tgz
+#Source0:   http://awstats.sourceforge.net/files/awstats-6.4.tgz
+BuildArch:  noarch
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:   httpd
+Requires:   perl
+Requires(post): perl
+Requires(postun): /sbin/service
 
 %description
 Advanced Web Statistics is a powerful and featureful tool that generates
@@ -91,7 +91,7 @@
                 s|^SkipHosts=.*$|SkipHosts="127.0.0.1"|;
                 s|^Expires=.*$|Expires=3600|;
         ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf
-install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf
+install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf 
 
 # Fix scripts
 %{__perl} -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \
@@ -151,6 +151,11 @@
 %{_datadir}/%{name}/wwwroot/js
 
 %changelog
+* Mon Mar 21 2005 Aurelien Bompard <gauret[AT]free.fr> 6.4-1.fc4
+- version 6.4 final
+- change release tag for FC4 (following Owen's scheme)
+- convert tabs into spaces
+
 * Tue Feb 15 2005 Aurelien Bompard <gauret[AT]free.fr> 6.4-0.1.pre
 - update to 6.4pre to fix a vulnerability
 
@@ -208,7 +213,7 @@
 - only restart apache if we are upgrading
 - install and cp use the "-p" switch
 - use %%_datadir in /etc/httpd/conf.d/awstats.conf
-- improve cron job
+- improve cron job 
 - don't brutally recode HTML pages
 - the scan is now done hourly instead of daily
 - *.pm files are not executable any more


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Feb 2005 17:35:38 -0000	1.5
+++ sources	21 Mar 2005 11:58:55 -0000	1.6
@@ -1 +1 @@
-f4e236d2ab4c71933cb476b20172a68e  awstats-6.4.tgz
+056e6fb0c7351b17fe5bbbe0aa1297b1  awstats-6.4.tgz



From fedora-extras-commits at redhat.com  Mon Mar 21 14:41:06 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 21 Mar 2005 09:41:06 -0500
Subject: rpms/qof/devel qof.spec,1.4,1.5
Message-ID: <200503211441.j2LEf6vi027373@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27364

Modified Files:
	qof.spec 
Log Message:
Bump release for FC4 rebuild


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qof.spec	4 Mar 2005 00:05:42 -0000	1.4
+++ qof.spec	21 Mar 2005 14:41:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           qof
 Version:        0.5.0
-Release:        2
+Release:        3
 Summary:        QOF provides a query engine library for C objects
 
 Group:          System Environment/Libraries
@@ -99,7 +99,7 @@
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
+%defattr(-,root,root,0755)
 %doc html examples
 %{_includedir}/qof
 %{_libdir}/*.a
@@ -107,7 +107,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Tue Sep 28 2004 Toshio Kuuratomi <toshio-tiki-lounge.com> - 0:0.5.0-0.fdr.2
+* Sun Mar 20 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.5.0-3
+- Rebuild for FC4t1.
+
+* Tue Sep 28 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:0.5.0-0.fdr.2
 - Added pkgconfig and glib2-devel to the -devel package's requirements.
   (suggestion from Michael Schwendt)
 



From fedora-extras-commits at redhat.com  Mon Mar 21 14:49:46 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 21 Mar 2005 09:49:46 -0500
Subject: rpms/python-docutils/devel python-docutils.spec,1.1,1.2
Message-ID: <200503211449.j2LEnkdp028033@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28023

Modified Files:
	python-docutils.spec 
Log Message:
Bump release for FC4


Index: python-docutils.spec
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/devel/python-docutils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-docutils.spec	16 Mar 2005 19:51:19 -0000	1.1
+++ python-docutils.spec	21 Mar 2005 14:49:44 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           python-%{srcname}
 Version:        0.3.7
-Release:        5
+Release:        6
 Summary:        A system for processing plaintext documentation
 
 Group:          Development/Languages
@@ -101,6 +101,9 @@
 %ghost %{python_sitelib}/docutils/*/*/*/*.pyo
 
 %changelog
+* Sun Mar 20 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 0.3.7-6
+- Rebuild for FC4t1
+
 * Sat Mar 12 2005 Toshio Kuratomi <toshio.tiki-lounge.com> 0.3.7-5
 - Add GPL as a license (mschwendt)
 - Use versioned Obsoletes and Provides (mschwendt)



From fedora-extras-commits at redhat.com  Mon Mar 21 15:11:16 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 21 Mar 2005 10:11:16 -0500
Subject: devel/clearlooks clearlooks.spec,1.6,1.7
Message-ID: <200503211511.j2LFBGq0029657@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29650

Modified Files:
	clearlooks.spec 
Log Message:
Upstream update


Index: clearlooks.spec
===================================================================
RCS file: /cvs/extras/devel/clearlooks/clearlooks.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- clearlooks.spec	19 Mar 2005 17:52:45 -0000	1.6
+++ clearlooks.spec	21 Mar 2005 15:11:13 -0000	1.7
@@ -1,11 +1,12 @@
 Name:           clearlooks
-Version:        0.4
-Release:        6
+Version:        0.5
+Release:        1
 Summary:        An attractive GTK+ 2 engine with a focus on usability
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://clearlooks.sourceforge.net/screenshots/
-Source0:        http://prdownloads.sourceforge.net/clearlooks/clearlooks-0.4.tar.bz2
+Source0:        http://prdownloads.sourceforge.net/clearlooks/clearlooks-0.5.tar.bz2
+Source1:        http://www.gnome-look.org/content/files/21237-clearlooks-metacity-0.5.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel libgnome-devel
 
@@ -14,7 +15,7 @@
 usable environment.
 
 %prep
-%setup -q
+%setup -q -a 1
 
 %build
 %configure --enable-animation
@@ -24,6 +25,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+install -D -m 0644 Clearlooks/metacity-1/metacity-theme-1.xml $RPM_BUILD_ROOT%{_datadir}/themes/Clearlooks/metacity-1/metacity-theme-1.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -31,10 +33,15 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING CREDITS ChangeLog NEWS README TODO
+%{_datadir}/icons/*
 %{_datadir}/themes/*
 %{_libdir}/gtk-2.0/2.4.0/engines/*
 
 %changelog
+* Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5-1
+- Upstream update
+- Reintegrated Metacity theme
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-6
 - %%
 



From fedora-extras-commits at redhat.com  Mon Mar 21 15:15:49 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 21 Mar 2005 10:15:49 -0500
Subject: devel/clearlooks .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200503211515.j2LFFnVM030020@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30012

Modified Files:
	.cvsignore sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/clearlooks/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Mar 2005 16:55:01 -0000	1.2
+++ .cvsignore	21 Mar 2005 15:15:47 -0000	1.3
@@ -1 +1,2 @@
-clearlooks-0.4.tar.bz2
+clearlooks-0.5.tar.bz2
+21237-clearlooks-metacity-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/devel/clearlooks/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Mar 2005 16:55:01 -0000	1.2
+++ sources	21 Mar 2005 15:15:47 -0000	1.3
@@ -1 +1,2 @@
-d714197da50c4eb3c2278f3c786fa996  clearlooks-0.4.tar.bz2
+16ad9981ebbd816d7adfe05aadb0503b  clearlooks-0.5.tar.bz2
+7cad4d05b820260b61d63d3cb361877b  21237-clearlooks-metacity-0.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 21 15:36:07 2005
From: fedora-extras-commits at redhat.com (Dennis Gregorovic (dgregor))
Date: Mon, 21 Mar 2005 10:36:07 -0500
Subject: rpms/perl-Class-MethodMaker/FC-3 .cvsignore, 1.2,
	1.3 perl-Class-MethodMaker.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200503211536.j2LFa7qa030727@cvs-int.fedora.redhat.com>

Author: dgregor

Update of /cvs/extras/rpms/perl-Class-MethodMaker/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30718

Modified Files:
	.cvsignore perl-Class-MethodMaker.spec sources 
Log Message:
upgrade to version 2.06


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Feb 2005 01:23:43 -0000	1.2
+++ .cvsignore	21 Mar 2005 15:36:05 -0000	1.3
@@ -1 +1,2 @@
 Class-MethodMaker-2.05.tar.gz
+Class-MethodMaker-2.06.tar.gz


Index: perl-Class-MethodMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/FC-3/perl-Class-MethodMaker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-MethodMaker.spec	28 Feb 2005 01:23:43 -0000	1.1
+++ perl-Class-MethodMaker.spec	21 Mar 2005 15:36:05 -0000	1.2
@@ -1,14 +1,14 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Class-MethodMaker
-Version:        2.05
-Release:        2
+Version:        2.06
+Release:        1
 Summary:        Perl module for creating generic object-oriented methods
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-MethodMaker/
-Source:         http://www.cpan.org/authors/id/F/FL/FLUFFY/Class-MethodMaker-2.05.tar.gz
+Source:         http://www.cpan.org/authors/id/F/FL/FLUFFY/Class-MethodMaker-2.06.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Feb 2005 01:23:43 -0000	1.2
+++ sources	21 Mar 2005 15:36:05 -0000	1.3
@@ -1 +1,2 @@
 a4092146c05bac58b3f99b3f5d2a9a75  Class-MethodMaker-2.05.tar.gz
+21291a8033091c1f77ecdc339e167802  Class-MethodMaker-2.06.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 21 15:37:59 2005
From: fedora-extras-commits at redhat.com (Dennis Gregorovic (dgregor))
Date: Mon, 21 Mar 2005 10:37:59 -0500
Subject: rpms/perl-Class-MethodMaker/FC-3 perl-Class-MethodMaker.spec, 1.2,
	1.3
Message-ID: <200503211537.j2LFbxMc030810@cvs-int.fedora.redhat.com>

Author: dgregor

Update of /cvs/extras/rpms/perl-Class-MethodMaker/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30802

Modified Files:
	perl-Class-MethodMaker.spec 
Log Message:
added changelog entry


Index: perl-Class-MethodMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/FC-3/perl-Class-MethodMaker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-MethodMaker.spec	21 Mar 2005 15:36:05 -0000	1.2
+++ perl-Class-MethodMaker.spec	21 Mar 2005 15:37:57 -0000	1.3
@@ -52,6 +52,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Mar 21 2005 Dennis Gregorovic <dgregor at redhat.com> - 2.06-1
+- Rebuilt for version 2.06 of source
+
 * Thu Feb 24 2005 Dennis Gregorovic <dgregor at redhat.com> - 2.05-2
 - Incorporated feedback from Jose Pedro Oliveira. (#149637)
 



From fedora-extras-commits at redhat.com  Mon Mar 21 15:41:46 2005
From: fedora-extras-commits at redhat.com (Dennis Gregorovic (dgregor))
Date: Mon, 21 Mar 2005 10:41:46 -0500
Subject: rpms/perl-Class-MethodMaker/devel .cvsignore, 1.2,
	1.3 perl-Class-MethodMaker.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200503211541.j2LFfkHI030913@cvs-int.fedora.redhat.com>

Author: dgregor

Update of /cvs/extras/rpms/perl-Class-MethodMaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30907

Modified Files:
	.cvsignore perl-Class-MethodMaker.spec sources 
Log Message:
upgrade to version 2.06


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Feb 2005 01:23:43 -0000	1.2
+++ .cvsignore	21 Mar 2005 15:41:44 -0000	1.3
@@ -1 +1,2 @@
 Class-MethodMaker-2.05.tar.gz
+Class-MethodMaker-2.06.tar.gz


Index: perl-Class-MethodMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/perl-Class-MethodMaker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-MethodMaker.spec	28 Feb 2005 01:23:43 -0000	1.1
+++ perl-Class-MethodMaker.spec	21 Mar 2005 15:41:44 -0000	1.2
@@ -1,14 +1,14 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Class-MethodMaker
-Version:        2.05
+Version:        2.06
 Release:        2
 Summary:        Perl module for creating generic object-oriented methods
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-MethodMaker/
-Source:         http://www.cpan.org/authors/id/F/FL/FLUFFY/Class-MethodMaker-2.05.tar.gz
+Source:         http://www.cpan.org/authors/id/F/FL/FLUFFY/Class-MethodMaker-2.06.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
@@ -52,6 +52,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Mar 21 2005 Dennis Gregorovic <dgregor at redhat.com> - 2.06-2
+- Rebuilt for version 2.06 of source
+
 * Thu Feb 24 2005 Dennis Gregorovic <dgregor at redhat.com> - 2.05-2
 - Incorporated feedback from Jose Pedro Oliveira. (#149637)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Feb 2005 01:23:43 -0000	1.2
+++ sources	21 Mar 2005 15:41:44 -0000	1.3
@@ -1 +1,2 @@
 a4092146c05bac58b3f99b3f5d2a9a75  Class-MethodMaker-2.05.tar.gz
+21291a8033091c1f77ecdc339e167802  Class-MethodMaker-2.06.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 21 16:03:08 2005
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Mon, 21 Mar 2005 11:03:08 -0500
Subject: rpms/fortune-mod/devel fortune-mod.spec,1.6,1.7
Message-ID: <200503211603.j2LG38Fn032410@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/fortune-mod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32404

Modified Files:
	fortune-mod.spec 
Log Message:
bump version for fc4


Index: fortune-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/devel/fortune-mod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fortune-mod.spec	17 Mar 2005 23:40:55 -0000	1.6
+++ fortune-mod.spec	21 Mar 2005 16:03:06 -0000	1.7
@@ -4,7 +4,7 @@
 Summary: A program which will display a fortune
 Name: fortune-mod
 Version: 1.99.1
-Release: 2
+Release: 3
 URL: http://www.redellipse.net/code/fortune
 License: BSD
 Group: Amusements/Games
@@ -106,6 +106,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Mar 21 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> 1.99.1-3
+- Bump version to 3 for fc4 package
+
 * Mon Mar 14 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> 1.99.1-2
 - Add patch for moving fortunes into offensive directory
 



From fedora-extras-commits at redhat.com  Mon Mar 21 16:18:20 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 21 Mar 2005 11:18:20 -0500
Subject: devel/ktrack ktrack.spec,1.7,1.8
Message-ID: <200503211618.j2LGIKTM000429@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv421

Modified Files:
	ktrack.spec 
Log Message:
Use $QTDIR instead of hard-coding paths


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ktrack.spec	19 Mar 2005 17:52:45 -0000	1.7
+++ ktrack.spec	21 Mar 2005 16:18:18 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 7.rc1
+Release: 8.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -20,7 +20,8 @@
 %patch -p 1 -b .headers
 
 %build
-%configure --with-qt-includes=/usr/lib/qt-3.3/include --with-qt-libraries=/usr/lib/qt-3.3/lib --disable-rpath
+[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+%configure --disable-rpath
 make
 
 %install
@@ -57,6 +58,9 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-8.rc1
+- Use $QTDIR instead of hard-coding paths
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-7.rc1
 - %%
 



From ivazquez at ivazquez.net  Mon Mar 21 19:22:55 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:22:55 -0500
Subject: APPROVED: clearlooks
Message-ID: <1111432975.4045.75.camel@ignacio.ignacio.lan>

clearlooks: An attractive GTK+ 2 engine with a focus on usability

Clearlooks will transform your GNOME desktop into an attractive looking
and usable environment.

Reviewers: Jeremy Katz, Michael Schwendt, Ralf Corsepius, Adrian Reber
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/58331211/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:22:56 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:22:56 -0500
Subject: APPROVED: hamlib
Message-ID: <1111432976.4045.76.camel@ignacio.ignacio.lan>

hamlib: Run-time library to control radio transceivers and receivers

Hamlib provides a standardised programming interface that applications
can use to send the appropriate commands to a radio.

Also included in the package is a simple radio control program 'rigctl',
which lets one control a radio transceiver or receiver, either from
command line interface or in a text-oriented interactive interface.

Reviewers: Jeremy Katz, Michael Schwendt
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/1481b8f9/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:22:57 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:22:57 -0500
Subject: APPROVED: ktrack
Message-ID: <1111432977.4045.77.camel@ignacio.ignacio.lan>

ktrack: Satellite prediction software for KDE

K-Track is an KDE3 satellite prediction software, especially suited for
radio amateurs operating through the satellites that are providing
linear transponders.

Reviewers: Jeremy Katz, Michael Schwendt

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/99ed438c/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:22:57 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:22:57 -0500
Subject: APPROVED: lock-keys-applet
Message-ID: <1111432977.4045.78.camel@ignacio.ignacio.lan>

lock-keys-applet: A GNOME panel applet that shows the status of the lock
keys

lock-keys-applet is a GNOME applet that shows the status of the Caps,
Num and Scroll Lock keys of your keyboard. This isn't especially usefull
for normal keyboards as they have LEDs for that. But some keyboards
(especially wireless keyboards) don't. One more feature of the applet is
that it saves the status of the lock keys and restores them when
starting GNOME.

Reviewers: Jeremy Katz, Michael Schwendt
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/ca599f4c/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:22:58 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:22:58 -0500
Subject: APPROVED: linphone
Message-ID: <1111432979.4045.79.camel@ignacio.ignacio.lan>

linphone: Phone anywhere in the whole world by using the Internet

Linphone is mostly sip compliant. It works successfully with these
implementations:
    * eStara softphone (commercial software for windows)
    * Pingtel phones (with DNS enabled and VLAN QOS support disabled).
    * Hotsip, a free of charge phone for Windows.
    * Vocal, an open source SIP stack from Vovida that includes a SIP
        proxy that works with linphone since version 0.7.1.
    * Siproxd is a free sip proxy being developped by Thomas Ries
        because he would like to have linphone working behind his
        firewall. Siproxd is simple to setup and works perfectly with
        linphone.
    * Partysip aims at being a generic and fully functionnal SIP proxy.
        Visit the web page for more details on its functionalities.

Linphone may work also with other sip phones, but this has not been
tested yet.

Reviewer: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/4a783898/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:00 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:00 -0500
Subject: APPROVED: leafpad
Message-ID: <1111432980.4045.80.camel@ignacio.ignacio.lan>

leafpad: GTK+ based simple text editor

Leafpad is a GTK+ based simple text editor. The user interface is
similar to Notepad. It aims to be lighter than GEdit and KWrite, and to
be as useful as them.

Reviewer: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/e17d46ad/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:01 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:01 -0500
Subject: APPROVED: gpredict
Message-ID: <1111432981.4045.81.camel@ignacio.ignacio.lan>

gpredict: Real-time satellite tracking and orbit prediction program

Gpredict calculates and shows the position of satellites in lists and on
maps. It can also make detailed predictions of upcoming satellites
passes.

Reviewer: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/9c033b45/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:02 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:02 -0500
Subject: APPROVED: ghasher
Message-ID: <1111432982.4045.82.camel@ignacio.ignacio.lan>

ghasher: GUI hasher for GTK+ 2

ghasher can easily show the MD5 sum (or md2, md4, sha1, sha, ripemd160,
dss1) of a file. Motivation for this utility was that users shouldn't
need to open a command line for checking the MD5 sum of files they
download.

Reviewers: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/de7b36ab/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:03 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:03 -0500
Subject: APPROVED: deskbar-applet
Message-ID: <1111432983.4045.83.camel@ignacio.ignacio.lan>

deskbar-applet: A Gnome applet to allow easy access to various search
engines

This applet looks like the current Gnome Mini-Commander, but it launches
search queries instead of programs.

Example search-engines include
+ Google
+ MSN
+ EBay
+ IMDB
+ Stock Quotes
+ Wikipedia
+ Local File Search (and eventually also Beagle)

Reviewer: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/3318d413/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:05 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:05 -0500
Subject: APPROVED: repoml
Message-ID: <1111432985.4045.84.camel@ignacio.ignacio.lan>

repoml: Tools and data for working with RepoML files

Contains:
  - repoml.xsd, an XML Schema for RepoML files
  - repoml.xsl, a stylesheet for converting RepoML files into .repo
      files
  - repoml2repo, a script that invokes repoml.xsl

Reviewer: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/9cc6f3af/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:06 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:06 -0500
Subject: APPROVED: pam_mysql
Message-ID: <1111432986.4045.85.camel@ignacio.ignacio.lan>

pam_mysql: PAM module for auth UNIX users using MySQL data base

Pam_mysql aims to provide a backend neutral means of authenticating
users against an MySQL database.

Reviewers: Jeremy Katz, Brian Pepple
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/4d543c86/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:07 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:07 -0500
Subject: APPROVED: libosip
Message-ID: <1111432987.4045.86.camel@ignacio.ignacio.lan>

libosip: oSIP is an implementation of SIP

SIP stands for the Session Initiation Protocol and is described by the
rfc3261 (wich deprecates rfc2543). This library aims to provide
multimedia and telecom software developers an easy and powerful
interface to initiate and control SIP based sessions in their
applications. SIP is a open standard replacement from IETF for H.323.

Reviewers: Jeremy Katz, Michael Schwendt

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/9d797fd6/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:08 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:08 -0500
Subject: APPROVED: edb
Message-ID: <1111432988.4045.87.camel@ignacio.ignacio.lan>

edb: A database convenience library wrapped around BDB

EDB is a database convenience library wrapped around the Berkeley DB
2.7.7 by Sleepycat Software. It is intended to make accessing database
information portable, easy, fast and efficient.

Reviewer: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/fff60555/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:10 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:10 -0500
Subject: APPROVED: python-HTMLgen
Message-ID: <1111432990.4045.88.camel@ignacio.ignacio.lan>

python-HTMLgen: A class library for the generation of HTML documents

HTMLgen is a class library for the generation of HTML documents with
Python scripts. It's used when you want to create HTML pages containing
information which changes from time to time.

Reviewer: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/65fd0c74/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:11 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:11 -0500
Subject: APPROVED: python-amara
Message-ID: <1111432991.4045.89.camel@ignacio.ignacio.lan>

python-amara: A collection of Pythonic tools for XML data binding

Amara is a collection of Pythonic tools for XML data binding. Not just
tools that happen to be written in Python, but tools built from the
ground up to use Python idioms and take advantage of the many advantages
of Python over other programming languages.

Amara builds on 4Suite, but whereas 4Suite focuses more on literal
implementation of XML standards in Python, Amara adds a much more
Pythonic face to these capabilities.

Reviewers: Jeremy Katz, Michael Schwendt, Ville Skytt?
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/dd22410e/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:11 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:11 -0500
Subject: APPROVED: kphone
Message-ID: <1111432991.4045.90.camel@ignacio.ignacio.lan>

kphone: A SIP (Session Initiation Protocol) user agent for Linux

KPhone is a SIP (Session Initiation Protocol) user agent for Linux, with
which you can initiate VoIP (Voice over IP) connections over the
Internet.  It supports Presence and Instant Messaging, and to some
extent also video calls between two hosts.

Reviewers: Jeremy Katz, Michael Schwendt, Ralf Corsepius
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/73dce18b/attachment.sig>

From dag at wieers.com  Mon Mar 21 20:24:42 2005
From: dag at wieers.com (Dag Wieers)
Date: Mon, 21 Mar 2005 21:24:42 +0100 (CET)
Subject: APPROVED: clearlooks
In-Reply-To: <1111432975.4045.75.camel@ignacio.ignacio.lan>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
Message-ID: <Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>

On Mon, 21 Mar 2005, Ignacio Vazquez-Abrams wrote:

> clearlooks: An attractive GTK+ 2 engine with a focus on usability
> 
> Clearlooks will transform your GNOME desktop into an attractive looking
> and usable environment.
> 
> Reviewers: Jeremy Katz, Michael Schwendt, Ralf Corsepius, Adrian Reber
> Maintainer: Ignacio Vazquez-Abrams

Is it ok to package a Gnome theme as 'clearlooks' when it 
will become the default theme in Gnome ? If so, wouldn't 
gnome-themes-clearlooks not be a better name ? Like gnome-themes and 
gnome-themes-extras already set a precedent.

--   dag wieers,  dag at wieers.com,  http://dag.wieers.com/   --
[all I want is a warm bed and a kind word and unlimited power]



From ivazquez at ivazquez.net  Mon Mar 21 20:30:35 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 15:30:35 -0500
Subject: APPROVED: clearlooks
In-Reply-To: <Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
Message-ID: <1111437035.1810.3.camel@ignacio.ignacio.lan>

On Mon, 2005-03-21 at 21:24 +0100, Dag Wieers wrote:
> On Mon, 21 Mar 2005, Ignacio Vazquez-Abrams wrote:
> 
> > clearlooks: An attractive GTK+ 2 engine with a focus on usability
> > 
> > Clearlooks will transform your GNOME desktop into an attractive looking
> > and usable environment.
> > 
> > Reviewers: Jeremy Katz, Michael Schwendt, Ralf Corsepius, Adrian Reber
> > Maintainer: Ignacio Vazquez-Abrams
> 
> Is it ok to package a Gnome theme as 'clearlooks' when it 
> will become the default theme in Gnome ? If so, wouldn't 
> gnome-themes-clearlooks not be a better name ? Like gnome-themes and 
> gnome-themes-extras already set a precedent.

https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00317.html
https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00453.html
https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00569.html

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/c34d4572/attachment.sig>

From bdpepple at ameritech.net  Mon Mar 21 20:46:55 2005
From: bdpepple at ameritech.net (Brian Pepple)
Date: Mon, 21 Mar 2005 15:46:55 -0500
Subject: APPROVED: clearlooks
In-Reply-To: <Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
Message-ID: <1111438015.7533.5.camel@localhost.localdomain>

On Mon, 2005-03-21 at 21:24 +0100, Dag Wieers wrote:
> Is it ok to package a Gnome theme as 'clearlooks' when it 
> will become the default theme in Gnome ? If so, wouldn't 
> gnome-themes-clearlooks not be a better name ? Like gnome-themes and 
> gnome-themes-extras already set a precedent.

Glad to see I'm not the only one bothered by this.

/B
-- 
Brian Pepple <bdpepple at ameritech.net>

gpg --keyserver pgp.mit.edu --recv-keys 810CC15E
BD5E 6F9E 8688 E668 8F5B  CBDE 326A E936 810C C15E
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/5acee4a7/attachment.sig>

From dag at wieers.com  Mon Mar 21 21:21:37 2005
From: dag at wieers.com (Dag Wieers)
Date: Mon, 21 Mar 2005 22:21:37 +0100 (CET)
Subject: APPROVED: clearlooks
In-Reply-To: <1111437035.1810.3.camel@ignacio.ignacio.lan>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
	<1111437035.1810.3.camel@ignacio.ignacio.lan>
Message-ID: <Pine.LNX.4.62.0503212211500.8489@horsea.3ti.be>

On Mon, 21 Mar 2005, Ignacio Vazquez-Abrams wrote:

> On Mon, 2005-03-21 at 21:24 +0100, Dag Wieers wrote:
> > On Mon, 21 Mar 2005, Ignacio Vazquez-Abrams wrote:
> > 
> > > clearlooks: An attractive GTK+ 2 engine with a focus on usability
> > > 
> > > Clearlooks will transform your GNOME desktop into an attractive looking
> > > and usable environment.
> > > 
> > > Reviewers: Jeremy Katz, Michael Schwendt, Ralf Corsepius, Adrian Reber
> > > Maintainer: Ignacio Vazquez-Abrams
> > 
> > Is it ok to package a Gnome theme as 'clearlooks' when it 
> > will become the default theme in Gnome ? If so, wouldn't 
> > gnome-themes-clearlooks not be a better name ? Like gnome-themes and 
> > gnome-themes-extras already set a precedent.
> 
> https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00317.html
> https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00453.html
> https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00569.html

Ok, I've only subscribed this weekend to fedora-extras. (For some 
reason I thought I was already subscribed to every fedora mailinglist, 
but I noticed today I'm still missing the buildsystem mailinglist, 
sigh) None of these mails seem conclusive on the subject and since I was 
subscribed to fedora-packaging I would have expected such a 
discussion/decision there probably.

I think package naming is an important (and the first) part of good 
packaging and I would hate to see a Gnome theme be packaged like an 
application or library. The current guidelines already have some policy 
for plugins and extras, so I think this is an obvious extension to that.

The same is true for Gnome (or other) applets. foo-applet could be an 
applet for a lot of things, so gnome-applet-foo seems a much better 
scheme.

--   dag wieers,  dag at wieers.com,  http://dag.wieers.com/   --
[all I want is a warm bed and a kind word and unlimited power]



From wtogami at redhat.com  Mon Mar 21 21:29:55 2005
From: wtogami at redhat.com (Warren Togami)
Date: Mon, 21 Mar 2005 11:29:55 -1000
Subject: gnome-theme-clearlooks please Re: APPROVED: clearlooks
In-Reply-To: <Pine.LNX.4.62.0503212211500.8489@horsea.3ti.be>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>	<1111437035.1810.3.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212211500.8489@horsea.3ti.be>
Message-ID: <423F3CD3.7050100@redhat.com>

I'm totally OK with this package contents, but can I also add my request 
to rename this package to gnome-theme-clearlooks?

I am working now to add an Obsoletes: (whatever-clearlooks-is-called) to 
gtk2-engines of FC4, but we really should avoid polluting the namespace 
forever with a short package name that existed for only one 
distribution.  "gnome-theme-clearlooks" describes exactly what it is, 
and we should really use it for FC3.

Thoughts?

Warren Togami
wtogami at redhat.com



From ville.skytta at iki.fi  Mon Mar 21 21:31:04 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Mon, 21 Mar 2005 23:31:04 +0200
Subject: gnome-theme-clearlooks please Re: APPROVED: clearlooks
In-Reply-To: <423F3CD3.7050100@redhat.com>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
	<1111437035.1810.3.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212211500.8489@horsea.3ti.be>
	<423F3CD3.7050100@redhat.com>
Message-ID: <1111440664.9841.48.camel@bobcat.mine.nu>

On Mon, 2005-03-21 at 11:29 -1000, Warren Togami wrote:
> I'm totally OK with this package contents, but can I also add my request 
> to rename this package to gnome-theme-clearlooks?

+1, FWIW.



From bdpepple at ameritech.net  Mon Mar 21 21:37:48 2005
From: bdpepple at ameritech.net (Brian Pepple)
Date: Mon, 21 Mar 2005 16:37:48 -0500
Subject: gnome-theme-clearlooks please
In-Reply-To: <423F3CD3.7050100@redhat.com>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
	<1111437035.1810.3.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212211500.8489@horsea.3ti.be>
	<423F3CD3.7050100@redhat.com>
Message-ID: <1111441069.8011.1.camel@localhost.localdomain>

On Mon, 2005-03-21 at 11:29 -1000, Warren Togami wrote:
> I am working now to add an Obsoletes: (whatever-clearlooks-is-called) to 
> gtk2-engines of FC4, but we really should avoid polluting the namespace 
> forever with a short package name that existed for only one 
> distribution.  "gnome-theme-clearlooks" describes exactly what it is, 
> and we should really use it for FC3.

+1 Sounds good.

/B
-- 
Brian Pepple <bdpepple at ameritech.net>

gpg --keyserver pgp.mit.edu --recv-keys 810CC15E
BD5E 6F9E 8688 E668 8F5B  CBDE 326A E936 810C C15E
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/e971c1ab/attachment.sig>

From bugs.michael at gmx.net  Mon Mar 21 21:49:54 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Mon, 21 Mar 2005 22:49:54 +0100
Subject: APPROVED: clearlooks
In-Reply-To: <Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
Message-ID: <20050321224954.75965904.bugs.michael@gmx.net>

On Mon, 21 Mar 2005 21:24:42 +0100 (CET), Dag Wieers wrote:

> On Mon, 21 Mar 2005, Ignacio Vazquez-Abrams wrote:
> 
> > clearlooks: An attractive GTK+ 2 engine with a focus on usability
> > 
> > Clearlooks will transform your GNOME desktop into an attractive looking
> > and usable environment.
> > 
> > Reviewers: Jeremy Katz, Michael Schwendt, Ralf Corsepius, Adrian Reber
> > Maintainer: Ignacio Vazquez-Abrams
> 
> Is it ok to package a Gnome theme as 'clearlooks' when it 
> will become the default theme in Gnome ? If so, wouldn't 
> gnome-themes-clearlooks not be a better name ? Like gnome-themes and 
> gnome-themes-extras already set a precedent.

I'd also like to point out that there is still a difference between
commenting on cvs commits and full reviewing and approving.



From wtogami at redhat.com  Mon Mar 21 21:53:21 2005
From: wtogami at redhat.com (Warren Togami)
Date: Mon, 21 Mar 2005 11:53:21 -1000
Subject: APPROVED: clearlooks
In-Reply-To: <20050321224954.75965904.bugs.michael@gmx.net>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
	<20050321224954.75965904.bugs.michael@gmx.net>
Message-ID: <423F4251.3020809@redhat.com>

Michael Schwendt wrote:
> 
> I'd also like to point out that there is still a difference between
> commenting on cvs commits and full reviewing and approving.
> 

In this case Jeremy seems to give all these packages his approval, but I 
would agree and warn against naming people who do not give an explicit 
"I approve this."

Warren Togami
wtogami at redhat.com



From ville.skytta at iki.fi  Mon Mar 21 21:58:20 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Mon, 21 Mar 2005 23:58:20 +0200
Subject: APPROVED: cvsps
Message-ID: <1111442300.9841.115.camel@bobcat.mine.nu>

CVSps is a program for generating 'patchset' information from a CVS
repository.  A patchset in this case is defined as a set of changes
made to a collection of files, and all committed at the same time
(using a single 'cvs commit' command).  This information is valuable
to seeing the big picture of the evolution of a cvs project.  While
cvs tracks revision information, it is often difficult to see what
changes were committed 'atomically' to the repository.

Reviewed by: Brian Pepple, Panu Matilainen
Maintainer: Ville Skytt?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/bf9a934e/attachment.sig>

From ivazquez at ivazquez.net  Mon Mar 21 22:03:31 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 17:03:31 -0500
Subject: APPROVED: clearlooks
In-Reply-To: <423F4251.3020809@redhat.com>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
	<20050321224954.75965904.bugs.michael@gmx.net>
	<423F4251.3020809@redhat.com>
Message-ID: <1111442611.1810.15.camel@ignacio.ignacio.lan>

On Mon, 2005-03-21 at 11:53 -1000, Warren Togami wrote:
> Michael Schwendt wrote:
> > 
> > I'd also like to point out that there is still a difference between
> > commenting on cvs commits and full reviewing and approving.
> > 
> 
> In this case Jeremy seems to give all these packages his approval, but I 
> would agree and warn against naming people who do not give an explicit 
> "I approve this."

My apologies. I guess the distinction between "reviewing" and
"examining" is a bit too fuzzy still, and I misinterpreted what caused
one to be a reviewer.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/7d68644c/attachment.sig>

From fedora-extras-commits at redhat.com  Tue Mar 22 20:48:37 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 22 Mar 2005 15:48:37 -0500
Subject: rpms/kphone/FC-3 kphone.spec,1.8,1.9
Message-ID: <200503222048.j2MKmbvn022463@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/kphone/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22455

Modified Files:
	kphone.spec 
Log Message:

add in buildreq for openssl-devel on kphone



Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-3/kphone.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kphone.spec	19 Mar 2005 17:52:45 -0000	1.8
+++ kphone.spec	22 Mar 2005 20:48:34 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        8
+Release:        9
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -11,7 +11,7 @@
 Patch0:         kphone-4.1.0-po-hacks.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils
+BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
 
 %description
 KPhone is a SIP (Session Initiation Protocol) user agent for Linux, with which
@@ -53,6 +53,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Tue Mar 22 2005 Seth Vidal <skvidal at phy.duke.edu> 4.1.0-9
+- add required openssl-devel to buildreqs
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-8
 - %%
 



From fedora-extras-commits at redhat.com  Tue Mar 22 20:52:02 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 22 Mar 2005 15:52:02 -0500
Subject: devel/kphone kphone.spec,1.8,1.9
Message-ID: <200503222052.j2MKq2ko022539@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22533

Modified Files:
	kphone.spec 
Log Message:

openssl-devel to buildreqs in devel branch



Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kphone.spec	19 Mar 2005 17:52:45 -0000	1.8
+++ kphone.spec	22 Mar 2005 20:51:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        8
+Release:        9
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -11,7 +11,7 @@
 Patch0:         kphone-4.1.0-po-hacks.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils
+BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
 
 %description
 KPhone is a SIP (Session Initiation Protocol) user agent for Linux, with which
@@ -53,6 +53,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Tue Mar 22 2005 Seth Vidal <skvidal at phy.duke.edu> 4.1.0-9
+- add openssl-devel to buildreqs
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-8
 - %%
 



From fedora-extras-commits at redhat.com  Tue Mar 22 21:13:10 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 22 Mar 2005 16:13:10 -0500
Subject: rpms/xffm/devel xffm.spec,1.5,1.6
Message-ID: <200503222113.j2MLDAmj023580@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23574

Modified Files:
	xffm.spec 
Log Message:
removed unneeded mandir and added dir to files
removed unneeded ldconfig and la/a files.



Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xffm.spec	20 Mar 2005 21:29:01 -0000	1.5
+++ xffm.spec	22 Mar 2005 21:13:08 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Next generation filemanager and SMB network navigator for Xfce4
 Name: xffm
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
@@ -12,7 +12,6 @@
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Prereq: /sbin/ldconfig
 
 Requires: libxfce4mcs >= %{version}
 Requires: libxfce4util >= %{version}
@@ -43,23 +42,24 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/xffm/*.la
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
 %{_bindir}/*
 %{_libdir}/lib*
 %{_libdir}/pkgconfig/*
+%{_libdir}/xfce4
 %{_libdir}/xfce4/mcs-plugins/*
 %{_libdir}/xfce4/xffm/*
 %{_datadir}/xffm
@@ -69,6 +69,10 @@
 %{_mandir}/man?/*
 
 %changelog
+* Tue Mar 22 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- removed unneeded mandir and added dir to files
+- removed unneeded ldconfig and la/a files. 
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - remove stuff
 



From ivazquez at ivazquez.net  Tue Mar 22 21:52:25 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Tue, 22 Mar 2005 16:52:25 -0500
Subject: rpms/xffm/devel xffm.spec,1.5,1.6
In-Reply-To: <200503222113.j2MLDAmj023580@cvs-int.fedora.redhat.com>
References: <200503222113.j2MLDAmj023580@cvs-int.fedora.redhat.com>
Message-ID: <1111528345.11822.0.camel@ignacio.ignacio.lan>

On Tue, 2005-03-22 at 16:13 -0500, Kevin Fenzi wrote:
> +%{_libdir}/xfce4
>  %{_libdir}/xfce4/mcs-plugins/*
>  %{_libdir}/xfce4/xffm/*

Shouldn't those other 2 lines be removed then?

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050322/1ab0f139/attachment.sig>

From fedora-extras-commits at redhat.com  Wed Mar 23 04:35:53 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 22 Mar 2005 23:35:53 -0500
Subject: rpms/aqhbci-qt-tools/devel aqhbci-qt-tools-build.patch, NONE,
	1.1 aqhbci-qt-tools.spec, 1.5, 1.6
Message-ID: <200503230435.j2N4ZrnR030424@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/aqhbci-qt-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30412

Modified Files:
	aqhbci-qt-tools.spec 
Added Files:
	aqhbci-qt-tools-build.patch 
Log Message:
fix build


aqhbci-qt-tools-build.patch:

--- NEW FILE aqhbci-qt-tools-build.patch ---
--- aqhbci-qt-tools-1.0.1beta/src/libs/dialogs/wizard.cpp.foo	2005-03-22 23:07:15.000000000 -0500
+++ aqhbci-qt-tools-1.0.1beta/src/libs/dialogs/wizard.cpp	2005-03-22 23:07:39.000000000 -0500
@@ -333,7 +333,7 @@
   }
 
   if (rv) {
-    DBG_NOTICE(0, "Pushing page %08x", (unsigned int)p);
+    DBG_NOTICE(0, "Pushing page %08x", (unsigned long)p);
     _pagesDone.push_front(p);
   }
   return rv;
@@ -399,7 +399,7 @@
     bool rv;
 
     p=_pagesDone.front();
-    DBG_NOTICE(0, "Undoing page %08x", (unsigned int)(p));
+    DBG_NOTICE(0, "Undoing page %08x", (unsigned long)(p));
     rv=_undoPage(p);
     if (!rv)
       _pagesDone.pop_front();


Index: aqhbci-qt-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/aqhbci-qt-tools/devel/aqhbci-qt-tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aqhbci-qt-tools.spec	15 Mar 2005 18:58:13 -0000	1.5
+++ aqhbci-qt-tools.spec	23 Mar 2005 04:35:51 -0000	1.6
@@ -1,8 +1,9 @@
 Name: aqhbci-qt-tools
 Summary: Setup wizard and debugger for the HBCI backend for the Aqbanking library
 Version: 1.0.1beta
-Release: 3
+Release: 4
 Source: http://download.sourceforge.net/aqhbci/%{name}-%{version}.tar.gz
+Patch: aqhbci-qt-tools-build.patch
 Group: System Environment/Libraries
 License: GPL
 URL: http://sourceforge.net/projects/aqhbci
@@ -16,6 +17,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 [ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
@@ -37,6 +39,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Tue Mar 22 2005  Bill Nottingham <notting at redhat.com> 1.0.1beta-4
+- fix build on x86-64
+
 * Tue Mar 15 2005  Bill Nottingham <notting at redhat.com> 1.0.1beta-3
 - buildreq qt-devel
 



From fedora-extras-commits at redhat.com  Wed Mar 23 06:32:40 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Wed, 23 Mar 2005 01:32:40 -0500
Subject: devel/anthy anthy.spec,1.4,1.5
Message-ID: <200503230632.j2N6WeNP032357@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/devel/anthy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32351

Modified Files:
	anthy.spec 
Log Message:

modify spec file to make it point to the right version of anthy that is in
the lookaside cache.



Index: anthy.spec
===================================================================
RCS file: /cvs/extras/devel/anthy/anthy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- anthy.spec	22 Mar 2005 08:05:33 -0000	1.4
+++ anthy.spec	23 Mar 2005 06:32:38 -0000	1.5
@@ -1,4 +1,4 @@
-%define	version	6300d
+%define	version	6131
 
 Name:		anthy
 Version:	%{version}



From fedora-extras-commits at redhat.com  Wed Mar 23 11:02:18 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 23 Mar 2005 06:02:18 -0500
Subject: devel/ifplugd ifplugd.spec,1.4,1.5
Message-ID: <200503231102.j2NB2IVS005906@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/ifplugd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5897/ifplugd

Modified Files:
	ifplugd.spec 
Log Message:
Fix real name in changelog entries.


Index: ifplugd.spec
===================================================================
RCS file: /cvs/extras/devel/ifplugd/ifplugd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ifplugd.spec	3 Mar 2005 21:46:21 -0000	1.4
+++ ifplugd.spec	23 Mar 2005 11:02:16 -0000	1.5
@@ -57,29 +57,29 @@
 /sbin/chkconfig --del ifplugd
 
 %changelog
-* Fri Jun 4 2004 <aaron.bennett at olin.edu> - 0:0.24-0.fdr.5
+* Fri Jun 4 2004 Aaron Bennett <aaron.bennett at olin.edu> - 0:0.24-0.fdr.5
 - Capitalized summary tag
 - Added /etc/ifplugd directory
 
-* Thu Jun  3 2004  <aaron.bennett at olin.edu> - 0:0.24-0.fdr.4
+* Thu Jun  3 2004 Aaron Bennett <aaron.bennett at olin.edu> - 0:0.24-0.fdr.4
 - renamed confpatches.patch to ifplugd-0.24-confpatches.patch
 - used %config for /etc/init.d/ifplugd
 - added %config(noreplace) for /etc/ifplugd/*
 - removed patch
 
-* Wed Jun  2 2004  <aaron.bennett at olin.edu> - 0:0.24-0.fdr.3
+* Wed Jun  2 2004 Aaron Bennett <aaron.bennett at olin.edu> - 0:0.24-0.fdr.3
 - Fixed summary
 - added -p option to install
 - added buildrequires
 
-* Tue May 3 2004 <aaron.bennett at olin.edu>
+* Tue May 3 2004 Aaron Bennett <aaron.bennett at olin.edu>
 - Changed Source0 to URL for source
 - signed package
 
-* Mon May 3 2004 <aaron.bennett at olin.edu>
+* Mon May 3 2004 Aaron Bennett <aaron.bennett at olin.edu>
 - Revamped for Fedora.us packaging guidelines
 
-* Wed Mar 31 2004  <abennett at olin.edu>
+* Wed Mar 31 2004 Aaron Bennett <abennett at olin.edu>
 - Initial build.
 
 



From fedora-extras-commits at redhat.com  Wed Mar 23 11:02:18 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 23 Mar 2005 06:02:18 -0500
Subject: devel/libdaemon libdaemon.spec,1.4,1.5
Message-ID: <200503231102.j2NB2I4V005910@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/libdaemon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5897/libdaemon

Modified Files:
	libdaemon.spec 
Log Message:
Fix real name in changelog entries.


Index: libdaemon.spec
===================================================================
RCS file: /cvs/extras/devel/libdaemon/libdaemon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libdaemon.spec	3 Mar 2005 22:41:31 -0000	1.4
+++ libdaemon.spec	23 Mar 2005 11:02:16 -0000	1.5
@@ -48,22 +48,22 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Thu May 13 2004 <aaron.bennett at olin.edu> 0:0.6-0.fdr.4
+* Thu May 13 2004 Aaron Bennett <aaron.bennett at olin.edu> 0:0.6-0.fdr.4
 - Added post and postun scripts to run ldconfig
 - changed group to standard System/Libraries group
 - removed libtool *.la files
 
-* Tue May 4 2004 <aaron.bennett at olin.edu> 0:0.6.-0.fdr.3
+* Tue May 4 2004 Aaron Bennett <aaron.bennett at olin.edu> 0:0.6.-0.fdr.3
 - Signed packaged with GPG key
 
-* Tue May 4 2004 <aaron.bennett at olin.edu> - 0:0.6-0.fdr.2
+* Tue May 4 2004 Aaron Bennett <aaron.bennett at olin.edu> - 0:0.6-0.fdr.2
 - Changed URL and Source tag for Fedora.us packaging compliance
 - Incremented release tag
 
-* Thu Apr 29 2004  <abennett at olin.edu> - 0:0.6-1
+* Thu Apr 29 2004 Aaron Bennett <abennett at olin.edu> - 0:0.6-1
 - Changed to version 0.6 of libdaemon
 
-* Wed Mar 31 2004  <abennett at olin.edu>
+* Wed Mar 31 2004 Aaron Bennett <abennett at olin.edu>
 - Initial build.
 
 



From fedora-extras-commits at redhat.com  Wed Mar 23 12:22:34 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 23 Mar 2005 07:22:34 -0500
Subject: devel/qof qof.spec,1.7,1.8
Message-ID: <200503231222.j2NCMYII007297@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/devel/qof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7291

Modified Files:
	qof.spec 
Log Message:
ltdl is a subpackage of libtool.


Index: qof.spec
===================================================================
RCS file: /cvs/extras/devel/qof/qof.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qof.spec	22 Mar 2005 19:46:47 -0000	1.7
+++ qof.spec	23 Mar 2005 12:22:32 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           qof
 Version:        0.5.0
-Release:        4
+Release:        5
 Summary:        QOF provides a query engine library for C objects
 
 Group:          System Environment/Libraries
@@ -16,7 +16,7 @@
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel
 BuildRequires: intltool
-BuildRequires: ltdl-devel
+BuildRequires: libtool-ltdl-devel
 # Only needed to compile the example programs.  I don't want the compiled
 # programs anyhow so how to get rid of that?
 BuildRequires: gtk2-devel
@@ -108,6 +108,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Mar 23 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.5.0-5
+- ltdl-devel package is libtool-ltdl-devel.
+
 * Tue Mar 22 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.5.0-4
 - BuildRequire ltdl-devel as libtool no longer pulls it in automatically.
 



From adrian at lisas.de  Wed Mar 23 12:35:07 2005
From: adrian at lisas.de (Adrian Reber)
Date: Wed, 23 Mar 2005 13:35:07 +0100
Subject: APPROVED: xlockmore
Message-ID: <20050323123507.GA30131@lisas.de>

Locks the local X display until a password is entered.

Reviewed by: Nils Philippsen
Maintainer: Adrian Reber
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050323/74d896f1/attachment.sig>

From fedora-extras-commits at redhat.com  Wed Mar 23 13:00:44 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 08:00:44 -0500
Subject: rpms/perl-Test-Manifest/FC-3 .cvsignore, 1.3,
	1.4 perl-Test-Manifest.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200503231300.j2ND0ijt007474@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Manifest/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7465/FC-3

Modified Files:
	.cvsignore perl-Test-Manifest.spec sources 
Log Message:
Update to 1.13


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2004 15:25:16 -0000	1.3
+++ .cvsignore	23 Mar 2005 13:00:42 -0000	1.4
@@ -1,2 +1 @@
-Test-Manifest-0.93.tar.gz
-Test-Manifest-1.11.tar.gz
+Test-Manifest-1.13.tar.gz


Index: perl-Test-Manifest.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/FC-3/perl-Test-Manifest.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-Manifest.spec	1 Dec 2004 15:25:16 -0000	1.4
+++ perl-Test-Manifest.spec	23 Mar 2005 13:00:42 -0000	1.5
@@ -1,20 +1,19 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Test-Manifest
-Version:        1.11
+Version:        1.13
 Release:        1
-Epoch:          0
 Summary:        Test case module for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Test-Manifest/
-Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.11.tar.gz
+Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.13.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -62,6 +61,9 @@
 
 
 %changelog
+* Wed Mar 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
+- Update to 1.13.
+
 * Sat Oct 30 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.11-1
 - Update to 1.11.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2004 15:25:16 -0000	1.3
+++ sources	23 Mar 2005 13:00:42 -0000	1.4
@@ -1 +1 @@
-6191645d223be819120b540fdf2c6cc9  Test-Manifest-1.11.tar.gz
+620d7172ff66a9dbe8f08c629ab5e521  Test-Manifest-1.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 23 13:00:44 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 08:00:44 -0500
Subject: rpms/perl-Test-Manifest/devel .cvsignore, 1.3,
	1.4 perl-Test-Manifest.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200503231300.j2ND0iJl007480@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Manifest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7465/devel

Modified Files:
	.cvsignore perl-Test-Manifest.spec sources 
Log Message:
Update to 1.13


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2004 15:25:16 -0000	1.3
+++ .cvsignore	23 Mar 2005 13:00:42 -0000	1.4
@@ -1,2 +1 @@
-Test-Manifest-0.93.tar.gz
-Test-Manifest-1.11.tar.gz
+Test-Manifest-1.13.tar.gz


Index: perl-Test-Manifest.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/perl-Test-Manifest.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Test-Manifest.spec	5 Mar 2005 21:10:23 -0000	1.6
+++ perl-Test-Manifest.spec	23 Mar 2005 13:00:42 -0000	1.7
@@ -1,19 +1,19 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Test-Manifest
-Version:        1.11
+Version:        1.13
 Release:        1
 Summary:        Test case module for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Test-Manifest/
-Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.11.tar.gz
+Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.13.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -55,12 +55,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes
+%doc Changes 
 %{perl_vendorlib}/Test/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Wed Mar 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
+- Update to 1.13.
+
 * Sat Oct 30 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.11-1
 - Update to 1.11.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2004 15:25:16 -0000	1.3
+++ sources	23 Mar 2005 13:00:42 -0000	1.4
@@ -1 +1 @@
-6191645d223be819120b540fdf2c6cc9  Test-Manifest-1.11.tar.gz
+620d7172ff66a9dbe8f08c629ab5e521  Test-Manifest-1.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 23 13:06:13 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 23 Mar 2005 08:06:13 -0500
Subject: devel/qof qof.spec,1.8,1.9
Message-ID: <200503231306.j2ND6Du9008332@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/devel/qof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8326

Modified Files:
	qof.spec 
Log Message:
libtool-ltdl-devel is a BuildRequires for the examples.  Note that.


Index: qof.spec
===================================================================
RCS file: /cvs/extras/devel/qof/qof.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qof.spec	23 Mar 2005 12:22:32 -0000	1.8
+++ qof.spec	23 Mar 2005 13:06:11 -0000	1.9
@@ -16,9 +16,9 @@
 BuildRequires: libxml2-devel
 BuildRequires: glib2-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
-# Only needed to compile the example programs.  I don't want the compiled
-# programs anyhow so how to get rid of that?
 BuildRequires: gtk2-devel
 # Patch1 changes a Makefile.am so we have to regenerate the build files.
 BuildRequires: libtool



From fedora-extras-commits at redhat.com  Wed Mar 23 14:54:11 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 09:54:11 -0500
Subject: rpms/gkrellmms import.log,1.3,1.4
Message-ID: <200503231454.j2NEsBTj009493@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gkrellmms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9484

Modified Files:
	import.log 
Log Message:
auto-import gkrellmms-2.1.22-1 on branch devel from gkrellmms-2.1.22-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 04:24:51 -0000	1.3
+++ import.log	23 Mar 2005 14:54:09 -0000	1.4
@@ -1,2 +1,3 @@
 gkrellmms-2_1_19-0_fdr_1_1:HEAD:gkrellmms-2.1.19-0.fdr.1.1.src.rpm:1099887885
 gkrellmms-2_1_19-0_fdr_1_2:HEAD:gkrellmms-2.1.19-0.fdr.1.2.src.rpm:1099887891
+gkrellmms-2_1_22-1:HEAD:gkrellmms-2.1.22-1.src.rpm:1111589643



From fedora-extras-commits at redhat.com  Wed Mar 23 14:54:12 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 09:54:12 -0500
Subject: rpms/gkrellmms/devel .cvsignore, 1.2, 1.3 gkrellmms.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200503231454.j2NEsB4h009497@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gkrellmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9484/devel

Modified Files:
	.cvsignore gkrellmms.spec sources 
Log Message:
auto-import gkrellmms-2.1.22-1 on branch devel from gkrellmms-2.1.22-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:24:45 -0000	1.2
+++ .cvsignore	23 Mar 2005 14:54:09 -0000	1.3
@@ -1 +1 @@
-gkrellmms-2.1.19.tar.gz
+gkrellmms-2.1.22.tar.gz


Index: gkrellmms.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/devel/gkrellmms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gkrellmms.spec	3 Mar 2005 21:26:02 -0000	1.4
+++ gkrellmms.spec	23 Mar 2005 14:54:09 -0000	1.5
@@ -1,19 +1,20 @@
 %define plugdir %{_libdir}/gkrellm2/plugins
 
 Name:           gkrellmms
-Version:        2.1.19
+Version:        2.1.22
 Release:        1
 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.19.tar.gz
+Source0:        http://gkrellm.luon.net/files/gkrellmms-2.1.22.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-BuildRequires:  gtk+-devel >= 1:1.2.10, gtk2-devel >= 2.0.1, xmms-devel >= 1:1.2.8
+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:1.2.8
+
+Requires:       gkrellm >= 2.0, xmms >= 1.2.8
 
 %description
 GKrellM plugin for controlling XMMS.
@@ -49,6 +50,10 @@
 
 
 %changelog
+* Wed Mar 23 2005 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-1
+- Updated to 2.1.22.
+- Drop epochs from BuildRequires.
+
 * Fri May  7 2004 Brian Pepple <bdpepple at ameritech.net> 0:2.1.19-0.fdr.1
 - Updated to 2.1.19.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:24:45 -0000	1.2
+++ sources	23 Mar 2005 14:54:09 -0000	1.3
@@ -1 +1 @@
-192b5f39094b8bff9a7ccc72dda362b8  gkrellmms-2.1.19.tar.gz
+2739eaf7047d7c8d203111a3c2e7eb17  gkrellmms-2.1.22.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 23 15:08:29 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 10:08:29 -0500
Subject: rpms/gkrellmms/FC-3 .cvsignore, 1.2, 1.3 gkrellmms.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200503231508.j2NF8TbZ010430@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gkrellmms/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10424/FC-3

Modified Files:
	.cvsignore gkrellmms.spec sources 
Log Message:
Update to 2.1.22


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:24:45 -0000	1.2
+++ .cvsignore	23 Mar 2005 15:08:27 -0000	1.3
@@ -1 +1 @@
-gkrellmms-2.1.19.tar.gz
+gkrellmms-2.1.22.tar.gz


Index: gkrellmms.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/FC-3/gkrellmms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gkrellmms.spec	10 Dec 2004 22:03:02 -0000	1.3
+++ gkrellmms.spec	23 Mar 2005 15:08:27 -0000	1.4
@@ -1,35 +1,32 @@
 %define plugdir %{_libdir}/gkrellm2/plugins
 
 Name:           gkrellmms
-Version:        2.1.19
+Version:        2.1.22
 Release:        1
-Epoch:          0
 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.19.tar.gz
+Source0:        http://gkrellm.luon.net/files/gkrellmms-2.1.22.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-BuildRequires:  gtk+-devel >= 1:1.2.10, gtk2-devel >= 0:2.0.1, xmms-devel >= 1:1.2.8
-BuildRequires:	gkrellm-devel, gettext
-Requires:       gkrellm >= 0:2.0, xmms >= 1:1.2.8
+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.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}
 
-# -----------------------------------------------------------------------------
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} enable_nls=1
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -41,21 +38,22 @@
   enable_nls=1
 %find_lang %{name}
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc Changelog README Themes FAQ
 %{plugdir}/*
 
-# -----------------------------------------------------------------------------
 
 %changelog
+* Wed Mar 23 2005 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-1
+- Updated to 2.1.22.
+- Drop epochs from BuildRequires.
+
 * Fri May  7 2004 Brian Pepple <bdpepple at ameritech.net> 0:2.1.19-0.fdr.1
 - Updated to 2.1.19.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:24:45 -0000	1.2
+++ sources	23 Mar 2005 15:08:27 -0000	1.3
@@ -1 +1 @@
-192b5f39094b8bff9a7ccc72dda362b8  gkrellmms-2.1.19.tar.gz
+2739eaf7047d7c8d203111a3c2e7eb17  gkrellmms-2.1.22.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 23 15:52:31 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 23 Mar 2005 10:52:31 -0500
Subject: rpms/tla/devel tla-1.3.1-gcc4.patch,NONE,1.1 tla.spec,1.8,1.9
Message-ID: <200503231552.j2NFqV9J010652@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/tla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10646

Modified Files:
	tla.spec 
Added Files:
	tla-1.3.1-gcc4.patch 
Log Message:
add patch to fix build with gcc4


tla-1.3.1-gcc4.patch:

--- NEW FILE tla-1.3.1-gcc4.patch ---
--- tla-1.3.1/src/hackerlab/vu/vu-virtual-null.c.orig	2005-03-17 11:05:57.000000000 -0800
+++ tla-1.3.1/src/hackerlab/vu/vu-virtual-null.c	2005-03-23 07:17:29.041691253 -0800
@@ -58,7 +58,7 @@
 static int vu_virtual_null_move_state (int * errn, int fd, int newfd, void * closure);
 
 
-static struct vu_fs_discipline vu_virtual_null_vtable
+struct vu_fs_discipline vu_virtual_null_vtable
   = { VU_FS_DISCIPLINE_INITIALIZERS (vu_virtual_null_) };
 
 /************************************************************************


Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tla.spec	22 Mar 2005 19:39:20 -0000	1.8
+++ tla.spec	23 Mar 2005 15:52:29 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           tla
 Version:        1.3.1
-Release:        2
+Release:        3
 Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
@@ -14,6 +14,7 @@
 Patch1:         tla-1.2-texi.diff
 Patch2:         tla-sysneon.patch
 Patch3:         tla-1.2-alt-texinfo.patch
+Patch4:         tla-1.3.1-gcc4.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -40,6 +41,7 @@
 rm -rf src/tla/libneon
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -94,6 +96,9 @@
 
 
 %changelog
+* Wed Mar 23 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.1-3
+- gcc4 build fixes
+
 * Tue Mar 22 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.1-2
 - Add BuildRequires which to fix building under mach
 



From fedora-extras-commits at redhat.com  Wed Mar 23 15:52:42 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 23 Mar 2005 10:52:42 -0500
Subject: rpms/bzflag/devel .cvsignore, 1.2, 1.3 bzflag.spec, 1.5, 1.6 sources,
	1.2, 1.3
Message-ID: <200503231552.j2NFqgsK010683@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10675

Modified Files:
	.cvsignore bzflag.spec sources 
Log Message:
version 2.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Mar 2005 14:10:26 -0000	1.2
+++ .cvsignore	23 Mar 2005 15:52:40 -0000	1.3
@@ -1 +1 @@
-bzflag-2.0.0.20050117.tar.bz2
+bzflag-2.0.2.20050318.tar.bz2


Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bzflag.spec	15 Mar 2005 15:49:29 -0000	1.5
+++ bzflag.spec	23 Mar 2005 15:52:40 -0000	1.6
@@ -1,10 +1,10 @@
 %define desktop_vendor fedora
-%define date           20050117
+%define date           20050318
 
 Summary: 3D multi-player tank battle game
 Name: bzflag
-Version: 2.0.0
-Release: 4
+Version: 2.0.2
+Release: 1
 License: GPL
 Group: Amusements/Games
 URL: http://bzflag.org
@@ -65,6 +65,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Mar 23 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.2-1
+- version 2.0.2
+
 * Tue Mar 15 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-4
 - buildrequire bc for curl version check
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 14:10:26 -0000	1.2
+++ sources	23 Mar 2005 15:52:40 -0000	1.3
@@ -1 +1 @@
-16da32cfaac130bf68ca156d0dec2b2e  bzflag-2.0.0.20050117.tar.bz2
+d4a72c6e85299fb72d5e8ab7450b31c3  bzflag-2.0.2.20050318.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar 23 16:41:01 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 11:41:01 -0500
Subject: rpms/xffm/devel xffm.spec,1.6,1.7
Message-ID: <200503231641.j2NGf1Tj011774@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11768

Modified Files:
	xffm.spec 
Log Message:
removed some unneeded directories. 



Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xffm.spec	22 Mar 2005 21:13:08 -0000	1.6
+++ xffm.spec	23 Mar 2005 16:40:59 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Next generation filemanager and SMB network navigator for Xfce4
 Name: xffm
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
@@ -60,8 +60,6 @@
 %{_libdir}/lib*
 %{_libdir}/pkgconfig/*
 %{_libdir}/xfce4
-%{_libdir}/xfce4/mcs-plugins/*
-%{_libdir}/xfce4/xffm/*
 %{_datadir}/xffm
 %{_datadir}/xfce4/*
 %{_datadir}/applications/*
@@ -69,6 +67,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.FC4
+- removed unneeded directories
+
 * Tue Mar 22 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - removed unneeded mandir and added dir to files
 - removed unneeded ldconfig and la/a files. 



From fedora-extras-commits at redhat.com  Wed Mar 23 19:52:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 23 Mar 2005 14:52:59 -0500
Subject: devel/edb edb.spec,1.5,1.6
Message-ID: <200503231952.j2NJqxgR014826@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/edb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14818

Modified Files:
	edb.spec 
Log Message:
Fix build error on GTK+ frontend


Index: edb.spec
===================================================================
RCS file: /cvs/extras/devel/edb/edb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- edb.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ edb.spec	23 Mar 2005 19:52:57 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           edb
 Version:        1.0.5
-Release:        5
+Release:        6
 Summary:        A database convenience library wrapped around BDB
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://enlightenment.org/index.php?id=23
 Source0:        http://prdownloads.sourceforge.net/enlightenment/edb-1.0.5.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gtk+-devel, ncurses-devel zlib-devel 
+BuildRequires:  gtk+-devel, ncurses-devel zlib-devel which
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -85,6 +85,9 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-6
+- Added which to BuildRequires
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-5
 - %%
 



From shahms at shahms.com  Wed Mar 23 20:03:40 2005
From: shahms at shahms.com (Shahms King)
Date: Wed, 23 Mar 2005 12:03:40 -0800
Subject: APPROVED: python-{protocols, psycopg, simpletal, tpg, psyco}
Message-ID: <1111608220.12534.19.camel@shahms.mesd.k12.or.us>

python-protocols -- 
PyProtocols 'adapt()' implementation

Reviewed By: Ignacio Vazquez-Abrams
Maintainer: Shahms King

--------------------------------------------------
python-psycopg   --
Alternative high-speed Postgres DB adapter

Reviewed By: Ignacio Vazquez-Abrams
Maintainer: Shahms King

--------------------------------------------------
python-simpletal -- 
Alternative implementation of Zope Page Templates

Reviewed By: Ignacio Vazquez-Abrams
Maintainer: Shahms King

--------------------------------------------------
python-tpg       -- 
Toy Parser Generator

Reviewed By: Ignacio Vazquez-Abrams
Maintainer: Shahms King

--------------------------------------------------
python-psyco     -- 
Python specializing compiler

Reviewed By: Ignacio Vazquez-Abrams
Maintainer: Shahms King

-- 
Shahms E. King <shahms at shahms.com>
Multnomah ESD

Public Key:
http://shahms.mesd.k12.or.us/~sking/shahms.asc
Fingerprint:
1612 054B CE92 8770 F1EA  AB1B FEAB 3636 45B2 D75B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050323/a361aac4/attachment.sig>

From fedora-extras-commits at redhat.com  Wed Mar 23 20:20:52 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 15:20:52 -0500
Subject: rpms/xfwm4/devel xfwm4.spec,1.3,1.4
Message-ID: <200503232020.j2NKKqWS015803@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15797

Modified Files:
	xfwm4.spec 
Log Message:
Removed unneeded a/la files



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfwm4.spec	20 Mar 2005 22:50:50 -0000	1.3
+++ xfwm4.spec	23 Mar 2005 20:20:50 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2
@@ -36,7 +36,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 
 %find_lang %{name}
 
@@ -55,6 +58,9 @@
 %{_datadir}/themes
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Removed unneeded a/la files
+
 * Sun Mar 20 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
 - Readded changelogs
 - Split old fedora patch into a bluecurve-prep and bluecurve patch and applied



From fedora-extras-commits at redhat.com  Wed Mar 23 20:46:55 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 15:46:55 -0500
Subject: rpms/xfdesktop/devel xfdesktop-image-4.2.1.patch, NONE,
	1.1 xfdesktop.spec, 1.4, 1.5
Message-ID: <200503232046.j2NKktD4016292@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16286

Modified Files:
	xfdesktop.spec 
Added Files:
	xfdesktop-image-4.2.1.patch 
Log Message:
Removed unneeded a/la files
Rediffed xfdesktop-image patch against current version and applied


xfdesktop-image-4.2.1.patch:

--- NEW FILE xfdesktop-image-4.2.1.patch ---
diff -Nur xfdesktop-4.2.1.orig/common/xfdesktop-common.h xfdesktop-4.2.1/common/xfdesktop-common.h
--- xfdesktop-4.2.1.orig/common/xfdesktop-common.h	2005-01-09 14:18:36.000000000 -0700
+++ xfdesktop-4.2.1/common/xfdesktop-common.h	2005-03-23 13:31:20.448625169 -0700
@@ -28,7 +28,8 @@
 #include <glib.h>
 
 #define BACKDROP_CHANNEL         "BACKDROP"
-#define DEFAULT_BACKDROP         DATADIR "/xfce4/backdrops/xfce-smoke.png"
+/* Use Fedora (tm) default background image */
+#define DEFAULT_BACKDROP         DATADIR "/backgrounds/images/default.png"
 #define LIST_TEXT                "# xfce backdrop list"
 #define XFDESKTOP_SELECTION_FMT  "XFDESKTOP_SELECTION_%d"
 #define XFDESKTOP_IMAGE_FILE_FMT "XFDESKTOP_IMAGE_FILE_%d"
diff -Nur xfdesktop-4.2.1.orig/settings/backdrop_settings.c xfdesktop-4.2.1/settings/backdrop_settings.c
--- xfdesktop-4.2.1.orig/settings/backdrop_settings.c	2005-01-10 03:05:16.000000000 -0700
+++ xfdesktop-4.2.1/settings/backdrop_settings.c	2005-03-23 13:33:09.725725691 -0700
@@ -242,10 +242,10 @@
 				bp->color1.blue = setting->data.v_color.blue;
 				bp->color1.alpha = setting->data.v_color.alpha;
 			} else {
-				/* Just a color by default #1f3f6f - That number looks cool :) */
-				bp->color1.red = (guint16)0x1f00;
-				bp->color1.green = (guint16)0x3f00;
-				bp->color1.blue = (guint16)0x6f00;
+                                /* Use Fedora (tm) default background color */
+                               bp->color1.red = (guint16) 0x2600;
+                               bp->color1.green = (guint16) 0x3200;
+                               bp->color1.blue  = (guint16) 0x4c00;
 				bp->color1.alpha = (guint16)0xffff;
 				mcs_manager_set_color(mcs_plugin->manager, setting_name,
 						BACKDROP_CHANNEL, &bp->color1);


Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfdesktop.spec	20 Mar 2005 22:41:19 -0000	1.4
+++ xfdesktop.spec	23 Mar 2005 20:46:53 -0000	1.5
@@ -1,13 +1,13 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.2.1
-Release: 1.FC4
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz/xfdesktop-4.2.1.tar.bz2
 
 # Change default for Fedora
-Patch1: xfdesktop-image.patch
+Patch0: xfdesktop-image-4.2.1.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,7 +28,7 @@
 %prep
 %setup -q
 
-#%patch1 -p1 -b .fedora
+%patch0 -p1 -b .fedora
 
 %build
 %configure
@@ -38,9 +38,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.la
 
 %find_lang %{name}
 
@@ -62,6 +63,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
+- Removed unneeded a/la files
+- Rediffed xfdesktop-image patch against current version and applied
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Wed Mar 23 21:13:27 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 16:13:27 -0500
Subject: rpms/xfce-utils/devel xfce-utils.spec,1.2,1.3
Message-ID: <200503232113.j2NLDRUd017173@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17167

Modified Files:
	xfce-utils.spec 
Log Message:
Removed unneeded la/a files



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce-utils.spec	20 Mar 2005 08:49:48 -0000	1.2
+++ xfce-utils.spec	23 Mar 2005 21:13:25 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
 Version: 4.2.1
-Release: 1.FC4
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-utils-4.2.1.tar.bz2
@@ -39,6 +39,9 @@
 
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/
 
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
+
 %find_lang %{name}
 
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11
@@ -59,6 +62,9 @@
 %{xsessiondir}/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
+- Removed unneeded la/a files
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Wed Mar 23 21:32:46 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 16:32:46 -0500
Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins.spec,1.2,1.3
Message-ID: <200503232132.j2NLWkeX017289@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17283

Modified Files:
	xfce-mcs-plugins.spec 
Log Message:
Removed unneeded la/a files



Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce-mcs-plugins.spec	20 Mar 2005 08:47:57 -0000	1.2
+++ xfce-mcs-plugins.spec	23 Mar 2005 21:32:44 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-plugins-4.2.1.tar.bz2
@@ -32,6 +32,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 %find_lang %{name}
 
 %clean
@@ -47,6 +49,9 @@
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Removed unneeded la/a files
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - remove explicit gtk2 req
 



From fedora-extras-commits at redhat.com  Wed Mar 23 21:35:49 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 23 Mar 2005 16:35:49 -0500
Subject: devel/linphone linphone-0.12.2-pkgconfig.patch, NONE,
	1.1 linphone.spec, 1.5, 1.6
Message-ID: <200503232135.j2NLZnW6017327@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17321

Modified Files:
	linphone.spec 
Added Files:
	linphone-0.12.2-pkgconfig.patch 
Log Message:
Fix build on x86_64

linphone-0.12.2-pkgconfig.patch:

--- NEW FILE linphone-0.12.2-pkgconfig.patch ---
--- linphone-0.12.2/share/Makefile.in.orig	2005-03-23 16:26:52.922690626 -0500
+++ linphone-0.12.2/share/Makefile.in	2005-03-23 16:27:13.949932428 -0500
@@ -184,7 +184,7 @@
 confexdir = $(datadir)/linphonec
 confex_DATA = linphonec
 
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = linphone.pc
 
 EXTRA_DIST = $(LINPHONE_SOUNDS) \


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linphone.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ linphone.spec	23 Mar 2005 21:35:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        5
+Release:        6
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -9,6 +9,7 @@
 Source0:        http://simon.morlat.free.fr/download/0.12.2/source/linphone-0.12.2.tar.gz
 Patch:          linphone-0.12.2-docs.patch
 Patch1:         linphone-0.12.2-speex.patch
+Patch2:         linphone-0.12.2-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
@@ -42,6 +43,7 @@
 %setup -q
 %patch -p 1 -b .docs
 %patch1 -p 1 -b .speex
+%patch2 -p 1 -b .pkgconfig
 rm -r $RPM_BUILD_DIR/linphone-0.12.2/oRTP/docs
 rm -r $RPM_BUILD_DIR/linphone-0.12.2/speex
 
@@ -85,6 +87,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-6
+- Fix build on x86_64
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-5
 - %%
 



From fedora-extras-commits at redhat.com  Wed Mar 23 21:41:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 16:41:42 -0500
Subject: rpms/xfce4-trigger-launcher/devel xfce4-trigger-launcher.spec, 1.2,
	1.3
Message-ID: <200503232141.j2NLfgqc017374@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17368

Modified Files:
	xfce4-trigger-launcher.spec 
Log Message:
Removed unneeded la/a files



Index: xfce4-trigger-launcher.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-trigger-launcher/devel/xfce4-trigger-launcher.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-trigger-launcher.spec	21 Mar 2005 01:42:26 -0000	1.2
+++ xfce4-trigger-launcher.spec	23 Mar 2005 21:41:40 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: A panel plugin acting as a launcher with two states
 Name: xfce4-trigger-launcher
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-trigger-launcher-4.2.1.tar.bz2
@@ -28,6 +28,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
+
 %find_lang %{name}
 
 %clean
@@ -39,6 +42,9 @@
 %{_libdir}/xfce4/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Removed uneeded la/a files
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - fix BuildReqs
 



From fedora-extras-commits at redhat.com  Wed Mar 23 21:46:22 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 16:46:22 -0500
Subject: rpms/xfce4-toys/devel xfce4-toys.spec,1.2,1.3
Message-ID: <200503232146.j2NLkMsw017411@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17405

Modified Files:
	xfce4-toys.spec 
Log Message:
Removed unneeded la/a files. 



Index: xfce4-toys.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-toys/devel/xfce4-toys.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-toys.spec	21 Mar 2005 01:32:14 -0000	1.2
+++ xfce4-toys.spec	23 Mar 2005 21:46:20 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Various tools for Xfce4
 Name: xfce4-toys
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-toys-4.2.1.tar.bz2
@@ -29,6 +29,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
 %find_lang %{name}
 
 %clean
@@ -44,6 +46,9 @@
 %{_datadir}/xfce4/tips/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at scrye.com> - 4.2.1-3.FC4
+- Removed uneeded la/a files
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - fix BuildReqs
 



From fedora-extras-commits at redhat.com  Wed Mar 23 22:19:46 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 23 Mar 2005 17:19:46 -0500
Subject: rpms/pure-ftpd/FC-3 pure-ftpd.pure-ftpwho.consoleapp, NONE,
	1.1 pure-ftpd.pure-ftpwho.pam, NONE, 1.1 pure-ftpd.init, 1.1,
	1.2 pure-ftpd.spec, 1.2, 1.3
Message-ID: <200503232219.j2NMJkCw018291@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18282/FC-3

Modified Files:
	pure-ftpd.init pure-ftpd.spec 
Added Files:
	pure-ftpd.pure-ftpwho.consoleapp pure-ftpd.pure-ftpwho.pam 
Log Message:
- implement Jose's RFE in bug 151337: pure-ftpwho can be run by a normal user.
- change release tag for FC3/FC4



--- NEW FILE pure-ftpd.pure-ftpwho.consoleapp ---
USER=root
PROGRAM=/usr/sbin/pure-ftpwho
GUI=no


--- NEW FILE pure-ftpd.pure-ftpwho.pam ---
#%PAM-1.0
auth       sufficient   pam_rootok.so
auth       required     pam_localuser.so
account    required     pam_permit.so


Index: pure-ftpd.init
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/FC-3/pure-ftpd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pure-ftpd.init	13 Mar 2005 21:45:54 -0000	1.1
+++ pure-ftpd.init	23 Mar 2005 22:19:44 -0000	1.2
@@ -10,6 +10,8 @@
 
 # Source function library.
 . /etc/init.d/functions
+
+# Source networking configuration.
 . /etc/sysconfig/network
 
 # Check that networking is configured.


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/FC-3/pure-ftpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pure-ftpd.spec	13 Mar 2005 21:49:29 -0000	1.2
+++ pure-ftpd.spec	23 Mar 2005 22:19:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.20
-Release:    1
+Release:    2.fc3
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -10,6 +10,8 @@
 Source1:    pure-ftpd.init 
 Source2:    pure-ftpd.logrotate
 Source3:    pure-ftpd.xinetd
+Source4:    pure-ftpd.pure-ftpwho.pam
+Source5:    pure-ftpd.pure-ftpwho.consoleapp
 Patch0:     pure-ftpd-1.0.20-config.patch
 Patch1:     pure-ftpd-1.0.20-libdir.patch
 Provides:   ftpserver
@@ -23,7 +25,7 @@
 Requires(post):   chkconfig
 Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
-Requires:   logrotate
+Requires:   logrotate, usermode
 
 
 %description
@@ -83,7 +85,7 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8/
+install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8
 install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
 install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -112,17 +114,23 @@
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 # Pam 
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -p -m 644 pam/pure-ftpd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
 
 # Logrotate
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
 # xinetd support
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
 
+# pure-ftpwho and non-root users
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
+install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pure-ftpwho
+install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/pure-ftpwho
+ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/pure-ftpwho
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -158,11 +166,18 @@
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
+%config %{_sysconfdir}/pam.d/pure-ftpwho
+%config %{_sysconfdir}/security/console.apps/pure-ftpwho
 %{_mandir}/man8/*
 %dir /var/ftp/
 
 
 %changelog
+* Wed Mar 23 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.20-2
+- implement Jose's RFE in bug 151337: pure-ftpwho can be run
+  by a normal user.
+- change release tag for FC3
+
 * Sun Mar 13 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.20-1
 - adapt to Fedora Extras (drop Epoch, change Release tag)
 



From fedora-extras-commits at redhat.com  Wed Mar 23 22:19:46 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 23 Mar 2005 17:19:46 -0500
Subject: rpms/pure-ftpd/devel pure-ftpd.init,1.1,1.2 pure-ftpd.spec,1.2,1.3
Message-ID: <200503232219.j2NMJkeb018296@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18282/devel

Modified Files:
	pure-ftpd.init pure-ftpd.spec 
Log Message:
- implement Jose's RFE in bug 151337: pure-ftpwho can be run by a normal user.
- change release tag for FC3/FC4



Index: pure-ftpd.init
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pure-ftpd.init	13 Mar 2005 21:45:54 -0000	1.1
+++ pure-ftpd.init	23 Mar 2005 22:19:44 -0000	1.2
@@ -10,6 +10,8 @@
 
 # Source function library.
 . /etc/init.d/functions
+
+# Source networking configuration.
 . /etc/sysconfig/network
 
 # Check that networking is configured.


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pure-ftpd.spec	13 Mar 2005 21:49:29 -0000	1.2
+++ pure-ftpd.spec	23 Mar 2005 22:19:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.20
-Release:    1
+Release:    2.fc4
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -10,6 +10,8 @@
 Source1:    pure-ftpd.init 
 Source2:    pure-ftpd.logrotate
 Source3:    pure-ftpd.xinetd
+Source4:    pure-ftpd.pure-ftpwho.pam
+Source5:    pure-ftpd.pure-ftpwho.consoleapp
 Patch0:     pure-ftpd-1.0.20-config.patch
 Patch1:     pure-ftpd-1.0.20-libdir.patch
 Provides:   ftpserver
@@ -23,7 +25,7 @@
 Requires(post):   chkconfig
 Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
-Requires:   logrotate
+Requires:   logrotate, usermode
 
 
 %description
@@ -83,7 +85,7 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8/
+install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8
 install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
 install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -112,17 +114,23 @@
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 # Pam 
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -p -m 644 pam/pure-ftpd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
 
 # Logrotate
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
 # xinetd support
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
 
+# pure-ftpwho and non-root users
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
+install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pure-ftpwho
+install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/pure-ftpwho
+ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/pure-ftpwho
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -158,11 +166,18 @@
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
+%config %{_sysconfdir}/pam.d/pure-ftpwho
+%config %{_sysconfdir}/security/console.apps/pure-ftpwho
 %{_mandir}/man8/*
 %dir /var/ftp/
 
 
 %changelog
+* Wed Mar 23 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.20-2.fc4
+- implement Jose's RFE in bug 151337: pure-ftpwho can be run
+  by a normal user.
+- change release tag for FC4
+
 * Sun Mar 13 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.20-1
 - adapt to Fedora Extras (drop Epoch, change Release tag)
 



From fedora-extras-commits at redhat.com  Wed Mar 23 22:52:58 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Wed, 23 Mar 2005 17:52:58 -0500
Subject: devel/gazpacho gazpacho.spec,1.5,1.6
Message-ID: <200503232252.j2NMqwnO018375@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/devel/gazpacho
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18368

Modified Files:
	gazpacho.spec 
Log Message:

increment release for rebuild with python 2.4



Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/devel/gazpacho/gazpacho.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gazpacho.spec	16 Mar 2005 16:38:44 -0000	1.5
+++ gazpacho.spec	23 Mar 2005 22:52:56 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Glade Interface Creator
 Name: gazpacho
 Version: 0.5.2
-Release: 1
+Release: 2
 License: GPL
 Group: Development/Tools
 URL: http://gruppy.sicem.biz/descargas
@@ -39,6 +39,9 @@
 
 
 %changelog
+* Wed Mar 23 2005 Seth Vidal <skvidal at phy.duke.edu> - 0.5.2-2
+- increment release for rebuild on python 2.4
+
 * Mon Feb 21 2005 Jeremy Katz <katzj at redhat.com> - 0.5.2-1
 - update to 0.5.2
 



From fedora-extras-commits at redhat.com  Wed Mar 23 23:10:26 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 23 Mar 2005 18:10:26 -0500
Subject: devel/lock-keys-applet lock-keys-applet.spec,1.5,1.6
Message-ID: <200503232310.j2NNAQCs019267@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19260

Modified Files:
	lock-keys-applet.spec 
Log Message:
Added scrollkeeper to BuildRequires


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/extras/devel/lock-keys-applet/lock-keys-applet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lock-keys-applet.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ lock-keys-applet.spec	23 Mar 2005 23:10:24 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        5
+Release:        6
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
 License:        GPL
 URL:            http://mfcn.ilo.de/led_applet/
 Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgnomeui-devel gnome-panel-devel
+BuildRequires:  libgnomeui-devel gnome-panel-devel scrollkeeper
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -49,6 +49,9 @@
 %{_libexecdir}/%{name}
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-6
+- Added scrollkeeper to BuildRequires
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-5
 - %%
 



From fedora-extras-commits at redhat.com  Wed Mar 23 23:22:40 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 23 Mar 2005 18:22:40 -0500
Subject: devel/pam_mysql pam_mysql-0.5-vars.patch, NONE, 1.1 pam_mysql.spec,
	1.2, 1.3
Message-ID: <200503232322.j2NNMeqA019378@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/pam_mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19370

Modified Files:
	pam_mysql.spec 
Added Files:
	pam_mysql-0.5-vars.patch 
Log Message:
Fixed build on x86_64

pam_mysql-0.5-vars.patch:

--- NEW FILE pam_mysql-0.5-vars.patch ---
--- pam_mysql/Makefile.orig	2005-03-23 18:17:08.885220061 -0500
+++ pam_mysql/Makefile	2005-03-23 18:18:08.427578059 -0500
@@ -1,15 +1,16 @@
 # Convenient defaults for compiling independently of the full source
 # tree.
 ifndef FULL_LINUX_PAM_SOURCE_TREE
-export DYNAMIC=-DPAM_DYNAMIC
-export CC=gcc
-export CFLAGS=-O2 -Dlinux -DLINUX_PAM \
-       -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
-       -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \
-       -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \
-       -Wshadow -pedantic -fPIC
-export MKDIR=mkdir -p
-export LD_D=gcc -shared -Xlinker -x -L/usr/lib/mysql -lz
+DYNAMIC=-DPAM_DYNAMIC
+CC=gcc
+CFLAGS=-O2 -Dlinux -DLINUX_PAM \
+  -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
+  -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \
+  -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \
+  -Wshadow -pedantic -fPIC
+MKDIR=mkdir -p
+LIBDIR=/usr/lib
+LD_D=gcc -shared -Xlinker -x -L$(LIBDIR)/mysql -lz
 endif
 
 #


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/devel/pam_mysql/pam_mysql.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam_mysql.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ pam_mysql.spec	23 Mar 2005 23:22:38 -0000	1.3
@@ -1,10 +1,11 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
 Name:		pam_mysql
 Version:	0.50
-Release:	3
+Release:	4
 License:	GPL
 Group:		Base
 Source0:	http://dl.sf.net/pam-mysql/pam_mysql-0.5.tar.gz
+Patch:		pam_mysql-0.5-vars.patch
 URL:		http://sf.net/projects/pam-mysql/
 BuildRequires:	pam-devel mysql-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
@@ -15,9 +16,10 @@
 
 %prep
 %setup -q -n %{name}
+%patch -p 1 -b .vars
 
 %build
-make
+make LIBDIR=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -32,6 +34,9 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-4
+- Fixed build on x86_64
+
 * Wed Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-3
 - Removed explicit Requires
 - Removed Polish Summary and Description



From fedora-extras-commits at redhat.com  Wed Mar 23 23:28:07 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 23 Mar 2005 18:28:07 -0500
Subject: devel/hamlib hamlib-bindings.patch,1.1,1.2 hamlib.spec,1.7,1.8
Message-ID: <200503232328.j2NNS7XU019449@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19443

Modified Files:
	hamlib-bindings.patch hamlib.spec 
Log Message:
Fixed Python binding

hamlib-bindings.patch:

Index: hamlib-bindings.patch
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib-bindings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hamlib-bindings.patch	16 Mar 2005 17:05:32 -0000	1.1
+++ hamlib-bindings.patch	23 Mar 2005 23:28:05 -0000	1.2
@@ -14,7 +14,7 @@
  pyexecdir = @pyexecdir@
  
 -pythondir = $(prefix)/lib/python
-+pythondir = $(prefix)/lib/python2.3
++pythondir = $(libdir)/python2.3
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  subdirs = @subdirs@


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hamlib.spec	21 Mar 2005 18:36:05 -0000	1.7
+++ hamlib.spec	23 Mar 2005 23:28:05 -0000	1.8
@@ -1,6 +1,8 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Name: hamlib
 Version: 1.2.3
-Release: 7
+Release: 8
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transceivers and receivers
@@ -62,12 +64,13 @@
 %package python
 Summary: Hamlib radio control library Python binding
 Group: Development/Libraries
+Requires: python-abi = %(%{__python} -c 'import sys;print(sys.version[:3])')
 
 %description python
 Hamlib Python Language bindings to allow radio control from Python scripts.
 
 %prep
-%setup
+%setup -q
 %patch -p1
 %patch1 -p1
 %build
@@ -109,6 +112,7 @@
         sharedstatedir=$RPM_BUILD_ROOT%{_sharedstatedir} \
         mandir=$RPM_BUILD_ROOT%{_mandir} \
         infodir=$RPM_BUILD_ROOT%{_infodir} \
+        pythondir=$RPM_BUILD_ROOT%{python_sitelib} \
    install-pythonPYTHON
 
 # Install PERL 
@@ -182,9 +186,7 @@
 
 %files python
 %defattr(-, root, root)
-%{_libdir}/python2.3/Hamlib.py
-%{_libdir}/python2.3/Hamlib.pyc
-%{_libdir}/python2.3/Hamlib.pyo
+%{python_sitelib}/*.py*
 
 %files devel
 %defattr(-, root, root)
@@ -201,6 +203,10 @@
 
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-8
+- Added -q to %%setup
+- Fixed Python binding build and Requires
+
 * Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-7
 - Removed spurious period and spelling mistake in Summary
 



From fedora-extras-commits at redhat.com  Wed Mar 23 23:44:34 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 23 Mar 2005 18:44:34 -0500
Subject: devel/sylpheed-claws .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 sylpheed-claws.spec, 1.8, 1.9
Message-ID: <200503232344.j2NNiYV3019569@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/devel/sylpheed-claws
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19560

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- Version upgrade
- Fixes possible security vulnerability (see CAN-2005-0667)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Feb 2005 12:41:13 -0000	1.3
+++ .cvsignore	23 Mar 2005 23:44:32 -0000	1.4
@@ -1 +1 @@
-sylpheed-claws-1.0.1.tar.bz2
+sylpheed-claws-1.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2005 12:41:14 -0000	1.4
+++ sources	23 Mar 2005 23:44:32 -0000	1.5
@@ -1 +1 @@
-c297d397f99d97234df787dca61aa48e  sylpheed-claws-1.0.1.tar.bz2
+dba57595e89eef963a932ed5ea39c2a2  sylpheed-claws-1.0.3.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/sylpheed-claws.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sylpheed-claws.spec	18 Mar 2005 04:18:41 -0000	1.8
+++ sylpheed-claws.spec	23 Mar 2005 23:44:32 -0000	1.9
@@ -4,13 +4,13 @@
 %define         aspellver     %(rpm -q --qf "%%{version}" aspell)
 
 Name:           sylpheed-claws
-Version:        1.0.1
-Release:        3
+Version:        1.0.3
+Release:        1
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.1.tar.bz2
+Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.3.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -113,6 +113,9 @@
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 
 %changelog
+* Wed Mar 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.0.3-1
+- Version upgrade
 * Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.1-3
 - Don't include static libs in plugin directory.
 - Set --with-gpgme-prefix to use relocated gpgme03 package contents.



From jpo at di.uminho.pt  Thu Mar 24 00:18:55 2005
From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=)
Date: Thu, 24 Mar 2005 00:18:55 +0000
Subject: APPROVED: perl-Class-MethodMaker
Message-ID: <4242076F.6000204@di.uminho.pt>

[A couple of days later]

Summary:
   Perl module for creating generic object-oriented methods
Description:
   Class::MethodMaker solves the problem of having to continually write
   accessor methods for your objects that perform standard tasks.

Maintainer:
   Dennis Gregorovic
Reviewer:
   Jos? Pedro Oliveira
Review process:
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=149637

--
Jos? Pedro Oliveira
* mailto: jpo at di.uminho.pt * http://gsd.di.uminho.pt/~jpo *
* gpg fingerprint = F9B6 8D87 859D 1C94 48F0 84C0 9749 9EB5 91BD 851B *
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050324/3721c6ab/attachment.sig>

From kevin at scrye.com  Wed Mar 23 16:39:11 2005
From: kevin at scrye.com (Kevin Fenzi)
Date: Wed, 23 Mar 2005 09:39:11 -0700
Subject: rpms/xffm/devel xffm.spec,1.5,1.6
References: <200503222113.j2MLDAmj023580@cvs-int.fedora.redhat.com>
	<1111528345.11822.0.camel@ignacio.ignacio.lan>
Message-ID: <20050323163915.6B733C50CC@voldemort.scrye.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

>>>>> "Ignacio" == Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> writes:

Ignacio> On Tue, 2005-03-22 at 16:13 -0500, Kevin Fenzi wrote:
>> +%{_libdir}/xfce4 %{_libdir}/xfce4/mcs-plugins/*
>> %{_libdir}/xfce4/xffm/*

Ignacio> Shouldn't those other 2 lines be removed then?

Quite right. I will remove them. Thanks. 

Ignacio> -- Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>

kevin
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Processed by Mailcrypt 3.5.8 <http://mailcrypt.sourceforge.net/>

iD8DBQFCQZuz3imCezTjY0ERAnlKAJ0fqHAuKWxDfx8vVM/CcSbtAe4UrACfQDV2
KjW5o7zZH7Pgar69p5Y2ekQ=
=sH5C
-----END PGP SIGNATURE-----



From fedora-extras-commits at redhat.com  Thu Mar 24 01:02:56 2005
From: fedora-extras-commits at redhat.com (Dennis Gregorovic (dgregor))
Date: Wed, 23 Mar 2005 20:02:56 -0500
Subject: rpms/perl-Class-MethodMaker/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4
Message-ID: <200503240102.j2O12urf021430@cvs-int.fedora.redhat.com>

Author: dgregor

Update of /cvs/extras/rpms/perl-Class-MethodMaker/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21421/FC-3

Modified Files:
	.cvsignore sources 
Log Message:
removed old source file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Mar 2005 15:36:05 -0000	1.3
+++ .cvsignore	24 Mar 2005 01:02:54 -0000	1.4
@@ -1,2 +1 @@
-Class-MethodMaker-2.05.tar.gz
 Class-MethodMaker-2.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Mar 2005 15:36:05 -0000	1.3
+++ sources	24 Mar 2005 01:02:54 -0000	1.4
@@ -1,2 +1 @@
-a4092146c05bac58b3f99b3f5d2a9a75  Class-MethodMaker-2.05.tar.gz
 21291a8033091c1f77ecdc339e167802  Class-MethodMaker-2.06.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 01:02:56 2005
From: fedora-extras-commits at redhat.com (Dennis Gregorovic (dgregor))
Date: Wed, 23 Mar 2005 20:02:56 -0500
Subject: rpms/perl-Class-MethodMaker/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4
Message-ID: <200503240102.j2O12u0H021435@cvs-int.fedora.redhat.com>

Author: dgregor

Update of /cvs/extras/rpms/perl-Class-MethodMaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21421/devel

Modified Files:
	.cvsignore sources 
Log Message:
removed old source file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Mar 2005 15:41:44 -0000	1.3
+++ .cvsignore	24 Mar 2005 01:02:54 -0000	1.4
@@ -1,2 +1 @@
-Class-MethodMaker-2.05.tar.gz
 Class-MethodMaker-2.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Mar 2005 15:41:44 -0000	1.3
+++ sources	24 Mar 2005 01:02:54 -0000	1.4
@@ -1,2 +1 @@
-a4092146c05bac58b3f99b3f5d2a9a75  Class-MethodMaker-2.05.tar.gz
 21291a8033091c1f77ecdc339e167802  Class-MethodMaker-2.06.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 01:04:20 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 20:04:20 -0500
Subject: rpms/freeciv - New directory
Message-ID: <200503240104.j2O14KNm021526@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21519/freeciv

Log Message:
Directory /cvs/extras/rpms/freeciv added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 01:04:20 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 20:04:20 -0500
Subject: rpms/freeciv/devel - New directory
Message-ID: <200503240104.j2O14K8P021529@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21519/freeciv/devel

Log Message:
Directory /cvs/extras/rpms/freeciv/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 01:04:35 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 20:04:35 -0500
Subject: rpms/freeciv Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503240104.j2O14Z5U021588@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21579

Added Files:
	Makefile import.log 
Log Message:
Setup of module freeciv


--- NEW FILE Makefile ---
# Top level Makefile for module freeciv
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 01:04:35 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 20:04:35 -0500
Subject: rpms/freeciv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503240104.j2O14Zuo021591@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21579/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module freeciv


--- 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 Mar 24 01:08:09 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 20:08:09 -0500
Subject: rpms/freeciv/devel NEWS-1.14.2, NONE,
	1.1 freeciv-1.13.0-aifill.patch, NONE,
	1.1 freeciv-desktop-xauth.patch, NONE,
	1.1 freeciv-desktop.patch, NONE, 1.1 freeciv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503240108.j2O189mW021718@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21705/devel

Modified Files:
	.cvsignore sources 
Added Files:
	NEWS-1.14.2 freeciv-1.13.0-aifill.patch 
	freeciv-desktop-xauth.patch freeciv-desktop.patch freeciv.spec 
Log Message:
auto-import freeciv-1.14.2-4 on branch devel from freeciv-1.14.2-4.src.rpm


--- NEW FILE NEWS-1.14.2 ---
=======================
Welcome to Freeciv 1.14
=======================

This is release 1.14.2.

Thanks again to all our developers, who continue to work so hard.

This release includes lots of changes, outlined below.  Those who
are interested in seeing the detailed changes should check the
ChangeLog file.

WHAT'S CHANGED SINCE 1.14.1
 - important compile fixes for some platforms
 - game balance adjustments:
        x all buildings except wonders and space parts 30% cheaper
        x some wonders cheaper: Colossus, Copernicus, Isaac Newton's,
          King Richard's, Oracle and Shakespeare's
        x submarine has more attack and movement, and costs less
 - reputation recovery fixed (now much slower)
 - a few other minor bugfixes

freeciv-1.13.0-aifill.patch:

--- NEW FILE freeciv-1.13.0-aifill.patch ---
--- freeciv-1.13.0/common/game.h.aifill	2002-11-07 14:02:46.000000000 +0100
+++ freeciv-1.13.0/common/game.h	2002-11-07 14:03:13.000000000 +0100
@@ -300,7 +300,7 @@
 #define GAME_MIN_MAX_PLAYERS         1
 #define GAME_MAX_MAX_PLAYERS         MAX_NUM_PLAYERS
 
-#define GAME_DEFAULT_AIFILL          0
+#define GAME_DEFAULT_AIFILL          5
 #define GAME_MIN_AIFILL              0
 #define GAME_MAX_AIFILL              GAME_MAX_MAX_PLAYERS
 

freeciv-desktop-xauth.patch:

--- NEW FILE freeciv-desktop-xauth.patch ---
diff -rcN freeciv-1.14.2,orig/desktop/civclient-wrapper.in freeciv-1.14.2/desktop/civclient-wrapper.in
*** freeciv-1.14.2,orig/desktop/civclient-wrapper.in	2004-10-25 20:02:15.588044089 -0400
--- freeciv-1.14.2/desktop/civclient-wrapper.in	2004-10-25 20:06:14.243634855 -0400
***************
*** 4,13 ****
  test -d $HOME/.freeciv/client || mkdir $HOME/.freeciv/client
  cd $HOME/.freeciv/client || exit 1
  
! if test ! -w /etc
  then
! 	[ ! -e ~/.civclientrc ] && touch ~/.civclientrc
! 	@bindir@/civclient "$@" &
! else
! 	su nobody -c "@bindir@/civclient $@ &"
  fi
--- 4,44 ----
  test -d $HOME/.freeciv/client || mkdir $HOME/.freeciv/client
  cd $HOME/.freeciv/client || exit 1
  
! if test -w /etc
  then
! 	if su -s /bin/bash nobody -c "id >/dev/null 2>/dev/null"; then
! 		TMP=`mktemp /tmp/xauthXXXXXX`
! 		xauth extract $TMP $DISPLAY
! 		chown nobody:nobody $TMP
! 		su -s /bin/bash nobody -c "XAUTHORITY=$TMP @bindir@/civclient $@" &
! 		sleep 3
! 		rm -f $TMP
! 	else
! 		BASEMESSAGE=$(printf "You are logged in as the super user (root).\n\nFreeCiv would prefer to run as a less-privileged user, such as nobody, just in case there is a bug in FreeCiv that would allow a malicious server to compromise your system. However, FreeCiv is unable to change from root to nobody.")
! 		ERRORMESSAGE=$(printf "${BASEMESSAGE}\n\nYou can not run this version of FreeCiv as root.")
! 		QUESTIONMESSAGE=$(printf "${BASEMESSAGE}\n\nWould you like to run FreeCiv as root anyway?")
! 		ANSWER=
! 		if civclient --help >/dev/null 2>/dev/null; then
! 			if [ -t 1 ]; then
! 				read -s -n 1 -p "${QUESTIONMESSAGE} [n]" ANSWER
! 			else
! 				if zenity --question --text="${QUESTIONMESSAGE}"; then
! 					ANSWER=y
! 				fi
! 			fi
! 			if [ x"${ANSWER}" != xy ]; then
! 				exit 1
! 			fi
! 		else
! 			if [ -t 0 ]; then
! 				echo "${ERRORMESSAGE}"
! 			else
! 				zenity --error --text="${ERRORMESSAGE}"
! 			fi
! 			exit 1
! 		fi
! 	fi
  fi
+ 
+ [ ! -e ~/.civclientrc ] && touch ~/.civclientrc
+ exec @bindir@/civclient "$@"
diff -rcN freeciv-1.14.2,orig/desktop/civserver-wrapper.in freeciv-1.14.2/desktop/civserver-wrapper.in
*** freeciv-1.14.2,orig/desktop/civserver-wrapper.in	2004-10-25 20:02:15.594043249 -0400
--- freeciv-1.14.2/desktop/civserver-wrapper.in	2004-10-25 20:07:59.911842434 -0400
***************
*** 4,12 ****
  test -d $HOME/.freeciv/server || mkdir $HOME/.freeciv/server
  cd $HOME/.freeciv/server || exit 1
  
! if test ! -w /etc
  then
! 	xterm -sb -fn 10x20 -fg black -bg white -T FreeCiv -e sh -c @bindir@/civserver &
! else
! 	su nobody -c 'xterm -sb -fn 10x20 -fg black -bg white -T FreeCiv -e @bindir@/civserver &'
  fi
--- 4,43 ----
  test -d $HOME/.freeciv/server || mkdir $HOME/.freeciv/server
  cd $HOME/.freeciv/server || exit 1
  
! if test -w /etc
  then
! 	if su -s /bin/bash nobody -c "id >/dev/null 2>/dev/null"; then
! 		TMP=`mktemp /tmp/xauthXXXXXX`
! 		xauth extract $TMP $DISPLAY
! 		chown nobody:nobody $TMP
! 		su -s /bin/bash nobody -c "XAUTHORITY=$TMP xterm -sb -fn 10x20 -fg black -bg white -T FreeCiv -e @bindir@/civserver $@" &
! 		sleep 3
! 		rm -f $TMP
! 	else
! 		BASEMESSAGE=$(printf "You are logged in as the super user (root).\n\nFreeCiv would prefer to run as a less-privileged user, such as nobody, just in case there is a bug in FreeCiv that would allow a malicious server to compromise your system. However, FreeCiv is unable to change from root to nobody.")
! 		ERRORMESSAGE=$(printf "${BASEMESSAGE}\n\nYou can not run this version of FreeCiv as root.")
! 		QUESTIONMESSAGE=$(printf "${BASEMESSAGE}\n\nWould you like to run FreeCiv as root anyway?")
! 		ANSWER=
! 		if civserver --help >/dev/null 2>/dev/null; then
! 			if [ -t 1 ]; then
! 				read -s -n 1 -p "${QUESTIONMESSAGE} [n]" ANSWER
! 			else
! 				if zenity --question --text="${QUESTIONMESSAGE}"; then
! 					ANSWER=y
! 				fi
! 			fi
! 			if [ x"${ANSWER}" != xy ]; then
! 				exit 1
! 			fi
! 		else
! 			if [ -t 0 ]; then
! 				echo "${ERRORMESSAGE}"
! 			else
! 				zenity --error --text="${ERRORMESSAGE}"
! 			fi
! 			exit 1
! 		fi
! 	fi
  fi
+ 
+ xterm -sb -fn 10x20 -fg black -bg white -T FreeCiv -e sh -c @bindir@/civserver &

freeciv-desktop.patch:

--- NEW FILE freeciv-desktop.patch ---
--- freeciv-1.14.0/configure.in.desktop	2003-01-17 10:09:14.000000000 +0100
+++ freeciv-1.14.0/configure.in	2003-05-09 01:01:28.000000000 +0200
@@ -710,4 +710,10 @@
 	  intl/Makefile
 	  po/Makefile.in
 	  doc/Makefile
+	  desktop/civclient-wrapper
+	  desktop/civserver-wrapper
+	  desktop/freeciv-engels.desktop
+	  desktop/freeciv-server.desktop
+	  desktop/freeciv-trident.desktop
+	  desktop/freeciv-client.desktop
 	  undep.sh, [ chmod +x undep.sh ; ./undep.sh ])
--- freeciv-1.14.0/configure.desktop	2003-01-17 10:10:32.000000000 +0100
+++ freeciv-1.14.0/configure	2003-05-09 01:01:58.000000000 +0200
@@ -14388,7 +14388,7 @@
 
 
 
-                                                                                                                                                                                                                                                                    ac_config_files="$ac_config_files Makefile data/Makefile data/misc/Makefile data/trident/Makefile data/isotrident/Makefile data/default/Makefile data/civ1/Makefile data/civ2/Makefile data/scenario/Makefile data/nation/Makefile data/history/Makefile common/Makefile ai/Makefile client/Makefile client/agents/Makefile client/include/Makefile client/gui-gtk/Makefile client/gui-gtk-2.0/Makefile client/gui-xaw/Makefile client/gui-win32/Makefile client/gui-stub/Makefile server/Makefile intl/Makefile po/Makefile.in doc/Makefile undep.sh"
+                                                                                                                                                                                                                                                                    ac_config_files="$ac_config_files Makefile data/Makefile data/misc/Makefile data/trident/Makefile data/isotrident/Makefile data/default/Makefile data/civ1/Makefile data/civ2/Makefile data/scenario/Makefile data/nation/Makefile data/history/Makefile common/Makefile ai/Makefile client/Makefile client/agents/Makefile client/include/Makefile client/gui-gtk/Makefile client/gui-gtk-2.0/Makefile client/gui-xaw/Makefile client/gui-win32/Makefile client/gui-stub/Makefile desktop/civclient-wrapper desktop/civserver-wrapper desktop/freeciv-engels.desktop desktop/freeciv-server.desktop desktop/freeciv-trident.desktop desktop/freeciv-client.desktop server/Makefile intl/Makefile po/Makefile.in doc/Makefile undep.sh"
 
           ac_config_commands="$ac_config_commands default"
 


--- NEW FILE freeciv.spec ---
%define desktop_file 1
%if %{desktop_file}
%define desktop_file_utils_version 0.2.93
%endif
Summary: The Freeciv multi-player strategy game.
Name:		freeciv
Version:	1.14.2
Release:	4
Source:		ftp://freeciv.org/pub/freeciv/stable/%{name}-%{version}.tar.bz2
Source1:	freeciv-desktop.tar.bz2
Source2:	http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz
Source3:	NEWS-1.14.2
Patch1:         freeciv-desktop.patch
Patch2:		freeciv-desktop-xauth.patch
Patch3:		freeciv-1.13.0-aifill.patch
License:	GPL
Group: Amusements/Games
BuildRoot:	%{_tmppath}/%{name}-%{version}-root
BuildPrereq:	gtk2-devel >= 2.0.5 imlib-devel
%if %{desktop_file}
Requires: /usr/bin/desktop-file-install
BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
%endif

%description
Freeciv is a turn-based, multi-player, X based strategy game. Freeciv
is generally comparable to, and has compatible rules with, the
Civilization II(R) game by Microprose(R). In Freeciv, each player is
the leader of a civilization, and is competing with the other players
in order to become the leader of the greatest civilization.

%prep
%setup -a 1
%patch1 -p1 -b .desktop
%patch2 -p1 -b .xauth
%patch3 -p1 -b .aifill

%build
export OLD_PO_FILE_INPUT=yes
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
%configure --enable-debug=no --enable-client=gtk-2.0
	   #--with-gtk-prefix=/usr/lib/gtk-2.0 #not used because of with-xaw3d
           #--prefix=/usr --bindir=/usr/bin  --with-glib-prefix=/usr 
make
cp %{SOURCE3} .

%install
rm -rf $RPM_BUILD_ROOT

%makeinstall
chmod +x desktop/*wrapper
cp desktop/*wrapper $RPM_BUILD_ROOT/usr/bin
mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Games $RPM_BUILD_ROOT/usr/share/pixmaps
cp desktop/*.desktop $RPM_BUILD_ROOT/etc/X11/applnk/Games

%if %{desktop_file}
mkdir -p $RPM_BUILD_ROOT/usr/share/applications
desktop-file-install --vendor net \
        --dir $RPM_BUILD_ROOT/usr/share/applications \
        --add-category "Application;Game;X-Red-Hat-Extra" \
        $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-client.desktop
desktop-file-install --vendor net \
        --dir $RPM_BUILD_ROOT/usr/share/applications \
        --add-category "Application;Game;X-Red-Hat-Extra" \
        $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-server.desktop
rm $RPM_BUILD_ROOT/etc/X11/applnk/Games/*.desktop
%endif

cp desktop/*.xpm $RPM_BUILD_ROOT/usr/share/pixmaps

pushd client
perl -p -i -e "s/CFLAGS = $RPM_OPT_FLAGS/CFLAGS = $RPM_OPT_FLAGS \`gtk-config --cflags\`/" gui-gtk/Makefile
make clean
for i in 0 1 2 3 4 5 6 7 8 9 10; do
  perl -p -i -e "s/gui-xaw/gui-gtk/" Makefile
  perl -p -i -e "s|-I/usr/X11R6/include|\`glib-config --cflags\` \`gtk-config --cflags\` \`imlib-config --cflags-gdk\` -I/usr/X11R6/include|" Makefile 
  perl -p -i -e "s|-lXaw3d|\`glib-config --libs\` \`gtk-config --libs\` \`imlib-config --libs-gdk\`|" Makefile
done
make
cp civclient $RPM_BUILD_ROOT/usr/bin/civclient-gtk
popd

/usr/bin/install -c civ  $RPM_BUILD_ROOT/usr/bin/civ

/usr/bin/install -d $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults
mv $RPM_BUILD_ROOT/usr/share/freeciv/Freeciv $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/Freeciv

mv $RPM_BUILD_ROOT/usr/bin/civclient $RPM_BUILD_ROOT/usr/bin/civclient-xaw
ln -sf civclient-gtk $RPM_BUILD_ROOT/usr/bin/civclient

(cd $RPM_BUILD_ROOT/usr/share/freeciv; tar xzf %{SOURCE2}; )

%find_lang %name

%clean
rm -rf $RPM_BUILD_ROOT 

%files -f %{name}.lang
%defattr(-,root,root)
%if %{desktop_file}
%config /usr/share/applications/*
%doc NEWS*
%else
%config /etc/X11/applnk/Games/*
%endif
%config /usr/X11R6/lib/X11/app-defaults/Freeciv
%{_bindir}/*
%{_datadir}/freeciv
%{_datadir}/pixmaps/*


%changelog
* Wed Jan 12 2005 Tim Waugh <twaugh at redhat.com> 1.14.2-4
- Rebuilt for new readline.

* Tue Oct 26 2004 Daniel Reed <djr at redhat.com> 1.14.2-3
- [136921] Try a little harder to run as nobody

* Mon Oct 25 2004 Daniel Reed <djr at redhat.com> 1.14.2-2
- [136921] Provide the user with the opportunity to run FreeCiv as root if unable to su to nobody, and throw up an error message if everything fails

* Mon Sep 13 2004 Karsten Hopp <karsten at redhat.de> 1.14.2-1 
- update to latest stable version

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Feb 23 2004 Karsten Hopp <karsten at redhat.de> 1.14.1-3
- rebuild with new chown syntax

* Mon Feb 23 2004 Tim Waugh <twaugh at redhat.com>
- Use ':' instead of '.' as separator for chown.

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Dec 03 2003 Karsten Hopp <karsten at redhat.de> 1.14.1-1
- update to bugfix release 1.14.1

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 08 2003 Karsten Hopp <karsten at redhat.de> 1.14.0-1
- update

* Thu Feb 20 2003 Karsten Hopp <karsten at redhat.de> 1.13.0-6
- remove last patch (obsolete)

* Wed Feb 19 2003 Karsten Hopp <karsten at redhat.de>
- fix message translation (#84599)

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Thu Nov 07 2002 Karsten Hopp <karsten at redhat.de>
- spelling fix (#75021)
- set aifill to 5 on new servers to get some opponents (#72586)

* Thu Aug 01 2002 Karsten Hopp <karsten at redhat.de>
- desktop fixes (#69391)

* Wed Jul 24 2002 Karsten Hopp <karsten at redhat.de>
- 0.1.13
- s/Games/Game in desktop-file-install
- fix URL
- add standard sounds 

* Wed Jul 17 2002 Karsten Hopp <karsten at redhat.de> 1.12.0-6
- fix path to datafiles if FREECIV_PATH is not set (#67922)
- fix desktop files (#67920)
- use desktop-file-install

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu Jan 24 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.12.0-2
- Rebuild in current environment

* Thu Aug 23 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.12.0-1
- 1.12.0 (non-beta)

* Tue Jul 31 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.11.4-9
- Rebuild - the fix for #49442 didn't seem to get in last time.

* Mon Jul 30 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.11.4-8
- Fix up demographics (#50119)

* Wed Jun 27 2001 Than Ngo <than at redhat.com>
- support new gettext
- add patch to build against new libtool

* Tue Mar 20 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- use gtk-config instead of glib-config

* Sun Feb 25 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- Fix up civclient-wrapper so it doesn't fail silently when started as
  potentially harmful user (Bug #28928)

* Tue Aug  1 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Fix warning in civclient-wrapper (Bug 14860)

* Fri Jul 21 2000 Trond Eivind Glomsr?d <teg at redhat.com>
- 1.11.4
- move to /usr/bin and /usr/share/freeciv (no more /usr/games)

* Wed Jul 12 2000 Trond Eivind Glomsr?d <teg at redhat.com>
- remove icon, glint is obsoleted
- don't use find to build file lists, it claimed to own
  lots of directories
- use %%{_tmppath}

* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Mon Jul 10 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 1.11.0 (Bug #13610)
- Add .desktop files (Bug #13610)
- Add BuildPrereq: lines
- fix build

* Thu Jun  8 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- move to dist
- update
- clean up the spec file
- fix build with gcc 2.96
- make the gtk client default; it's better than the Xaw one by now.

* Thu Feb 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 1.10.0

* Fri Feb  4 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 1.9.2
- use the configure macro

* Sun Nov  7 1999 Bernhard Rosenkraenzer <bero at redhat.com>
- redo RPM for 1.9.0 (many changes to build/install procedure)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 01:04:33 -0000	1.1
+++ .cvsignore	24 Mar 2005 01:08:07 -0000	1.2
@@ -0,0 +1,3 @@
+freeciv-1.14.2.tar.bz2
+freeciv-desktop.tar.bz2
+stdsounds2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 01:04:33 -0000	1.1
+++ sources	24 Mar 2005 01:08:07 -0000	1.2
@@ -0,0 +1,3 @@
+280770591c8f87ac542dcd50702da205  freeciv-1.14.2.tar.bz2
+4f8f5234c6d9719b8eb6fa2526616124  freeciv-desktop.tar.bz2
+63b06631addeaccf45bc4bf6b8ddf7b3  stdsounds2.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 01:08:09 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 20:08:09 -0500
Subject: rpms/freeciv import.log,1.1,1.2
Message-ID: <200503240108.j2O189Yu021714@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21705

Modified Files:
	import.log 
Log Message:
auto-import freeciv-1.14.2-4 on branch devel from freeciv-1.14.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/freeciv/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 01:04:33 -0000	1.1
+++ import.log	24 Mar 2005 01:08:07 -0000	1.2
@@ -0,0 +1 @@
+freeciv-1_14_2-4:HEAD:freeciv-1.14.2-4.src.rpm:1111626483



From bugs.michael at gmx.net  Thu Mar 24 01:30:29 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 24 Mar 2005 02:30:29 +0100
Subject: devel/hamlib hamlib-bindings.patch,1.1,1.2 hamlib.spec,1.7,1.8
In-Reply-To: <200503232328.j2NNS7XU019449@cvs-int.fedora.redhat.com>
References: <200503232328.j2NNS7XU019449@cvs-int.fedora.redhat.com>
Message-ID: <20050324023029.47758d91.bugs.michael@gmx.net>

On Wed, 23 Mar 2005 18:28:07 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/devel/hamlib

>  -pythondir = $(prefix)/lib/python
> -+pythondir = $(prefix)/lib/python2.3
> ++pythondir = $(libdir)/python2.3

> +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

> +        pythondir=$RPM_BUILD_ROOT%{python_sitelib} \
>     install-pythonPYTHON

If you install into python sitelib (= /usr/lib/python...) and can set
pythondir= during make install, what do you need the hamlib-bindings.patch
for which defaults to /usr/lib64/python... on x86_64? If the patch is
needed, because the python bindings configuration needs it, it's
inconsistent.

>  %files python
>  %defattr(-, root, root)
> -%{_libdir}/python2.3/Hamlib.py
> -%{_libdir}/python2.3/Hamlib.pyc
> -%{_libdir}/python2.3/Hamlib.pyo
> +%{python_sitelib}/*.py*


The %_libdir/pkgconfig/hamlib.pc hardcodes libdir=${exec_prefix}/lib


In "hamlib" main package, /usr/lib/libhamlib-1.2.3.so.2.0.2 is included,
but the softlink /usr/lib/libhamlib-1.2.3.so.2 created by ldconfig is not:

  $ rpm -qf /usr/lib/libhamlib-1.2.3.so.2
  file /usr/lib/libhamlib-1.2.3.so.2 is not owned by any package

It's an upstream bug. Same for c++ sub-package.
You can fix this in packages with "ldconfig -N -n buildroot/somedir"
in %install section.


Licence COPYING included in %doc directory is GPL, but "License:" field
says LGPL. COPYING.LIB should be included instead.


%dir %{_includedir}/hamlib in -devel package is not included.


In the -devel package, all the %_libdir/hamlib-*.a static archives are
not needed. Their *.so counterparts in the main hamlib package are
loaded at run-time as backends by the frontend library libhamlib.
libhamlib provides the frontend user API.




From fedora-extras-commits at redhat.com  Thu Mar 24 01:39:42 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 20:39:42 -0500
Subject: rpms/freeciv/devel freeciv.spec,1.1,1.2
Message-ID: <200503240139.j2O1dgYJ021892@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21886/devel

Modified Files:
	freeciv.spec 
Log Message:
quick formatting changes


Index: freeciv.spec
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freeciv.spec	24 Mar 2005 01:08:07 -0000	1.1
+++ freeciv.spec	24 Mar 2005 01:39:40 -0000	1.2
@@ -2,10 +2,15 @@
 %if %{desktop_file}
 %define desktop_file_utils_version 0.2.93
 %endif
-Summary: The Freeciv multi-player strategy game.
+
 Name:		freeciv
 Version:	1.14.2
-Release:	4
+Release:	5
+Summary: 	The Freeciv multi-player strategy game
+
+Group:		Amusements/Games
+License:	GPL
+URL:		http://www.freeciv.org/index.php/Freeciv
 Source:		ftp://freeciv.org/pub/freeciv/stable/%{name}-%{version}.tar.bz2
 Source1:	freeciv-desktop.tar.bz2
 Source2:	http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz
@@ -13,13 +18,12 @@
 Patch1:         freeciv-desktop.patch
 Patch2:		freeciv-desktop-xauth.patch
 Patch3:		freeciv-1.13.0-aifill.patch
-License:	GPL
-Group: Amusements/Games
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildPrereq:	gtk2-devel >= 2.0.5 imlib-devel
 %if %{desktop_file}
-Requires: /usr/bin/desktop-file-install
-BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
+Requires: 	/usr/bin/desktop-file-install
+BuildPrereq: 	desktop-file-utils >= %{desktop_file_utils_version}
 %endif
 
 %description
@@ -57,11 +61,11 @@
 mkdir -p $RPM_BUILD_ROOT/usr/share/applications
 desktop-file-install --vendor net \
         --dir $RPM_BUILD_ROOT/usr/share/applications \
-        --add-category "Application;Game;X-Red-Hat-Extra" \
+        --add-category "Application;Game;X-Fedora" \
         $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-client.desktop
 desktop-file-install --vendor net \
         --dir $RPM_BUILD_ROOT/usr/share/applications \
-        --add-category "Application;Game;X-Red-Hat-Extra" \
+        --add-category "Application;Game;X-Fedora" \
         $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-server.desktop
 rm $RPM_BUILD_ROOT/etc/X11/applnk/Games/*.desktop
 %endif
@@ -110,6 +114,12 @@
 
 
 %changelog
+* Wed Mar 23 2005 Brian Pepple <bdpepple at ameritech.net> - 1.14.2-5
+- Changed X-Red-Hat-Extra to X-Fedora.
+- Added URL.
+- Changed BuildRoot to preferred value.
+- Removed period from summary.
+
 * Wed Jan 12 2005 Tim Waugh <twaugh at redhat.com> 1.14.2-4
 - Rebuilt for new readline.
 



From bugs.michael at gmx.net  Thu Mar 24 01:42:24 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 24 Mar 2005 02:42:24 +0100
Subject: devel/linphone linphone-0.12.2-pkgconfig.patch, NONE, 1.1
 linphone.spec, 1.5, 1.6
In-Reply-To: <200503232135.j2NLZnW6017327@cvs-int.fedora.redhat.com>
References: <200503232135.j2NLZnW6017327@cvs-int.fedora.redhat.com>
Message-ID: <20050324024224.0faa28fa.bugs.michael@gmx.net>

On Wed, 23 Mar 2005 16:35:49 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/devel/linphone

> -pkgconfigdir = $(prefix)/lib/pkgconfig
> +pkgconfigdir = $(libdir)/pkgconfig

$(libdir)/pkgconfig/linphone.pc hardcodes libdir=/usr/lib/...


The -devel package is missing "Requires: glib2-devel" in order to not
break the pkg-config dependency chain.

An explicit dependency on pkgconfig is not needed, since glib2-devel pulls
it in already.



From fedora-extras-commits at redhat.com  Thu Mar 24 01:57:48 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 23 Mar 2005 20:57:48 -0500
Subject: devel/kphone kphone-4.1.0-endian.patch, NONE, 1.1 kphone.spec, 1.9,
	1.10
Message-ID: <200503240157.j2O1vmH8022015@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22005

Modified Files:
	kphone.spec 
Added Files:
	kphone-4.1.0-endian.patch 
Log Message:
First attempt to get it working properly on PPC

kphone-4.1.0-endian.patch:

--- NEW FILE kphone-4.1.0-endian.patch ---
--- kphone/kphone/rtpdataheader.h.orig	2005-03-23 20:50:01.904726865 -0500
+++ kphone/kphone/rtpdataheader.h	2005-03-23 20:52:47.669099809 -0500
@@ -1,25 +1,24 @@
 #ifndef RTPDATAHEADER_H
 #define RTPDATAHEADER_H
 
+#include <endian.h>
+
 // For 32bit intel machines
 typedef short int16;
 typedef int   int32;
 typedef unsigned int u_int32;
 typedef unsigned short u_int16;
 
-#define RTP_BIG_ENDIAN 0
-#define RTP_LITTLE_ENDIAN 1
-
 //  RTP data header
 typedef __attribute__ ((__packed__)) struct {
-#if RTP_BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
 	unsigned int version:2;         // protocol version
 	unsigned int p:1;               // padding flag
 	unsigned int x:1;               // header extension flag
 	unsigned int cc:4;              // CSRC count
 	unsigned int m:1;               // marker bit
 	unsigned int pt:7;              // payload type
-#elif RTP_LITTLE_ENDIAN
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
 	unsigned int cc:4;              // CSRC count
 	unsigned int x:1;               // header extension flag
 	unsigned int p:1;               // padding flag
@@ -27,7 +26,7 @@
 	unsigned int pt:7;              // payload type
 	unsigned int m:1;               // marker bit
 #else
-#error Define one of RTP_LITTLE_ENDIAN or RTP_BIG_ENDIAN
+#error Unusable endianness detected
 #endif
 	unsigned int seq:16;            // sequence number
 	u_int32 ts;                     // timestamp 32bits


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kphone.spec	22 Mar 2005 20:51:59 -0000	1.9
+++ kphone.spec	24 Mar 2005 01:57:46 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        9
+Release:        10
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -9,6 +9,7 @@
 Source0:        http://www.wirlab.net/kphone/kphone-4.1.0.tar.gz
 Source1:        kphone.desktop
 Patch0:         kphone-4.1.0-po-hacks.patch
+Patch1:         kphone-4.1.0-endian.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
@@ -22,6 +23,7 @@
 %prep
 %setup -q -n kphone
 %patch -p1 -b .po-hacks
+%patch1 -p1 -b .endian
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -53,6 +55,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-10
+- First attempt to get it working properly on PPC
+
 * Tue Mar 22 2005 Seth Vidal <skvidal at phy.duke.edu> 4.1.0-9
 - add openssl-devel to buildreqs
 



From fedora-extras-commits at redhat.com  Thu Mar 24 01:58:02 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 20:58:02 -0500
Subject: rpms/tetex-bytefield - New directory
Message-ID: <200503240158.j2O1w27I022065@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-bytefield
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22058/tetex-bytefield

Log Message:
Directory /cvs/extras/rpms/tetex-bytefield added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 01:58:02 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 20:58:02 -0500
Subject: rpms/tetex-bytefield/devel - New directory
Message-ID: <200503240158.j2O1w2iG022068@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-bytefield/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22058/tetex-bytefield/devel

Log Message:
Directory /cvs/extras/rpms/tetex-bytefield/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 01:58:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 20:58:21 -0500
Subject: rpms/tetex-bytefield Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503240158.j2O1wLl8022127@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-bytefield
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22118

Added Files:
	Makefile import.log 
Log Message:
Setup of module tetex-bytefield


--- NEW FILE Makefile ---
# Top level Makefile for module tetex-bytefield
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 01:58:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 20:58:21 -0500
Subject: rpms/tetex-bytefield/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503240158.j2O1wLZ4022130@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-bytefield/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22118/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tetex-bytefield


--- 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 Mar 24 01:58:52 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 20:58:52 -0500
Subject: rpms/tetex-bytefield import.log,1.1,1.2
Message-ID: <200503240158.j2O1wq27022223@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-bytefield
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22214

Modified Files:
	import.log 
Log Message:
auto-import tetex-bytefield-1.2-1 on branch devel from tetex-bytefield-1.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tetex-bytefield/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 01:58:19 -0000	1.1
+++ import.log	24 Mar 2005 01:58:50 -0000	1.2
@@ -0,0 +1 @@
+tetex-bytefield-1_2-1:HEAD:tetex-bytefield-1.2-1.src.rpm:1111629525



From fedora-extras-commits at redhat.com  Thu Mar 24 01:58:52 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 20:58:52 -0500
Subject: rpms/tetex-bytefield/devel tetex-bytefield.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503240158.j2O1wqM1022227@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-bytefield/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22214/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tetex-bytefield.spec 
Log Message:
auto-import tetex-bytefield-1.2-1 on branch devel from tetex-bytefield-1.2-1.src.rpm


--- NEW FILE tetex-bytefield.spec ---
%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")}

%define texpkg      bytefield
%define texpkgdir   %{_texmf}/tex/latex/%{texpkg}
%define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}

Name:           tetex-%{texpkg}
Version:        1.2
Release:        1
Summary:        Create illustrations for network protocol specifications

Group:          Applications/Publishing
License:        LaTeX Project Public License
URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/bytefield.html
# DANTE generates CTAN packages tarballs on-the-fly
# ftp://ftp.dante.de/tex-archive/macros/latex/contrib/bytefield.tar.gz
Source0:        bytefield-1.2-20050315.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  tetex-latex
Requires:       tetex-latex
Requires(post): /usr/bin/texhash
Requires(postun): /usr/bin/texhash

%description
The bytefield package helps the user create illustrations for network
protocol specifications and anything else that utilizes fields of
data.  These illustrations show how the bits and bytes are laid out in
a packet or in memory.


%prep
%setup -q -n %{texpkg}

%build
latex bytefield.ins

%install
rm -rf $RPM_BUILD_ROOT

install -d -m 755 $RPM_BUILD_ROOT{%{texpkgdir},%{texpkgdoc}}
install -p -m 644 bytefield.sty $RPM_BUILD_ROOT%{texpkgdir}/
install -p -m 644 bytefield.pdf $RPM_BUILD_ROOT%{texpkgdoc}/

%clean
rm -rf $RPM_BUILD_ROOT


%post
texhash >/dev/null 2>&1 || :

%postun
texhash >/dev/null 2>&1 || :


%files
%defattr(-,root,root,-)
%doc README example.*
%{texpkgdir}/
%{_texmf}/doc/


%changelog
* Tue Mar 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.2-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-bytefield/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 01:58:19 -0000	1.1
+++ .cvsignore	24 Mar 2005 01:58:50 -0000	1.2
@@ -0,0 +1 @@
+bytefield-1.2-20050315.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-bytefield/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 01:58:19 -0000	1.1
+++ sources	24 Mar 2005 01:58:50 -0000	1.2
@@ -0,0 +1 @@
+8eca969277b7f9f3de746713f1d941ba  bytefield-1.2-20050315.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 02:02:34 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:02:34 -0500
Subject: rpms/tetex-xcolor - New directory
Message-ID: <200503240202.j2O22Ymj023146@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23139/tetex-xcolor

Log Message:
Directory /cvs/extras/rpms/tetex-xcolor added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 02:02:34 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:02:34 -0500
Subject: rpms/tetex-xcolor/devel - New directory
Message-ID: <200503240202.j2O22Yam023149@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23139/tetex-xcolor/devel

Log Message:
Directory /cvs/extras/rpms/tetex-xcolor/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 02:02:53 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:02:53 -0500
Subject: rpms/tetex-xcolor Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503240202.j2O22rmk023208@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23199

Added Files:
	Makefile import.log 
Log Message:
Setup of module tetex-xcolor


--- NEW FILE Makefile ---
# Top level Makefile for module tetex-xcolor
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 02:02:53 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:02:53 -0500
Subject: rpms/tetex-xcolor/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503240202.j2O22rvw023211@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23199/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tetex-xcolor


--- 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 Mar 24 02:03:26 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:03:26 -0500
Subject: rpms/tetex-xcolor import.log,1.1,1.2
Message-ID: <200503240203.j2O23Qfw023304@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23295

Modified Files:
	import.log 
Log Message:
auto-import tetex-xcolor-2.01-1 on branch devel from tetex-xcolor-2.01-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 02:02:51 -0000	1.1
+++ import.log	24 Mar 2005 02:03:24 -0000	1.2
@@ -0,0 +1 @@
+tetex-xcolor-2_01-1:HEAD:tetex-xcolor-2.01-1.src.rpm:1111629799



From fedora-extras-commits at redhat.com  Thu Mar 24 02:03:26 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:03:26 -0500
Subject: rpms/tetex-xcolor/devel tetex-xcolor.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503240203.j2O23Q72023308@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23295/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tetex-xcolor.spec 
Log Message:
auto-import tetex-xcolor-2.01-1 on branch devel from tetex-xcolor-2.01-1.src.rpm


--- NEW FILE tetex-xcolor.spec ---
%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")}

%define texpkg      xcolor
%define texpkgdir   %{_texmf}/tex/latex/%{texpkg}
%define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}

Name:           tetex-%{texpkg}
Version:        2.01
Release:        1
Summary:        Driver-independent color extensions for LaTeX and pdfLaTeX

Group:          Applications/Publishing
License:        LaTeX Project Public License
URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/xcolor.html
# DANTE generates CTAN packages tarballs on-the-fly
# ftp://ftp.dante.de/tex-archive/macros/latex/contrib/xcolor.tar.gz
Source0:        xcolor-2.01-20050323.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  tetex-latex
Requires:       tetex-latex
Requires(post): /usr/bin/texhash
Requires(postun): /usr/bin/texhash

%description
Provides easy driver-independent access to several kinds of color
tints, shades, tones, and mixes of arbitrary colors.  It allows a user
to select a document-wide target color model and offers complete tools
for conversion between eight color models.  Additionally, there is a
command for alternating row colors plus repeated non-aligned material
(like horizontal lines) in tables.  Colors can be mixed like
\color{red!30!green!40!blue}.


%prep
%setup -q -n %{texpkg}

%build
latex xcolor.ins
for example in xcolor1.tex xcolor3.tex; do
    pdflatex $example
    pdflatex $example
done

%install
rm -rf $RPM_BUILD_ROOT
 
install -d -m 755 $RPM_BUILD_ROOT{%{texpkgdir},%{texpkgdoc}}
install -d -m 755 $RPM_BUILD_ROOT%{_texmf}/dvips/%{texpkg}
install -p -m 644 *.sty *.def $RPM_BUILD_ROOT%{texpkgdir}/
install -p -m 644 *.pro $RPM_BUILD_ROOT%{_texmf}/dvips/%{texpkg}/
install -p -m 644 *.pdf $RPM_BUILD_ROOT%{texpkgdoc}/

%clean
rm -rf $RPM_BUILD_ROOT


%post
texhash >/dev/null 2>&1 || :

%postun
texhash >/dev/null 2>&1 || :


%files
%defattr(-,root,root,-)
%doc ChangeLog README xcolor?.tex
%{texpkgdir}/
%{_texmf}/dvips/%{texpkg}/
%{_texmf}/doc/


%changelog
* Wed Mar 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.01-1
- Update to 2.01.

* Wed Feb 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.00-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 02:02:51 -0000	1.1
+++ .cvsignore	24 Mar 2005 02:03:24 -0000	1.2
@@ -0,0 +1 @@
+xcolor-2.01-20050323.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 02:02:51 -0000	1.1
+++ sources	24 Mar 2005 02:03:24 -0000	1.2
@@ -0,0 +1 @@
+d60c7a02fc9f04b785f31c96c1fd8d4d  xcolor-2.01-20050323.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 02:04:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:04:21 -0500
Subject: rpms/tetex-pgf/devel - New directory
Message-ID: <200503240204.j2O24LQ1023427@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-pgf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23415/tetex-pgf/devel

Log Message:
Directory /cvs/extras/rpms/tetex-pgf/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 02:04:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:04:21 -0500
Subject: rpms/tetex-pgf - New directory
Message-ID: <200503240204.j2O24Lm8023424@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-pgf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23415/tetex-pgf

Log Message:
Directory /cvs/extras/rpms/tetex-pgf added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 02:04:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:04:35 -0500
Subject: rpms/tetex-pgf Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503240204.j2O24ZoY023486@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-pgf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23477

Added Files:
	Makefile import.log 
Log Message:
Setup of module tetex-pgf


--- NEW FILE Makefile ---
# Top level Makefile for module tetex-pgf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 02:04:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:04:35 -0500
Subject: rpms/tetex-pgf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503240204.j2O24ZwG023489@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-pgf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23477/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tetex-pgf


--- 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 Mar 24 02:05:07 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:05:07 -0500
Subject: rpms/tetex-pgf import.log,1.1,1.2
Message-ID: <200503240205.j2O2573f023582@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-pgf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23573

Modified Files:
	import.log 
Log Message:
auto-import tetex-pgf-0.65-1 on branch devel from tetex-pgf-0.65-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tetex-pgf/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 02:04:33 -0000	1.1
+++ import.log	24 Mar 2005 02:05:05 -0000	1.2
@@ -0,0 +1 @@
+tetex-pgf-0_65-1:HEAD:tetex-pgf-0.65-1.src.rpm:1111629900



From fedora-extras-commits at redhat.com  Thu Mar 24 02:05:07 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:05:07 -0500
Subject: rpms/tetex-pgf/devel tetex-pgf.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503240205.j2O257WL023586@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-pgf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23573/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tetex-pgf.spec 
Log Message:
auto-import tetex-pgf-0.65-1 on branch devel from tetex-pgf-0.65-1.src.rpm


--- NEW FILE tetex-pgf.spec ---
%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")}

%define texpkg      pgf
%define texpkgdir   %{_texmf}/tex/latex/%{texpkg}
%define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}

Name:           tetex-%{texpkg}
Version:        0.65
Release:        1
Summary:        Create PostScript and PDF graphics in TeX

Group:          Applications/Publishing
License:        LaTeX Project Public License
URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/pgf.html
# DANTE generates CTAN packages tarballs on-the-fly
# ftp://ftp.dante.de/tex-archive/graphics/pgf.tar.gz
Source0:        pgf-0.65-20050315.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       tetex-latex, tetex-xcolor
Requires(post): /usr/bin/texhash
Requires(postun): /usr/bin/texhash

%description
PGF is a macro package for creating graphics directly in TeX and
LaTeX.  Its usage is similar to pstricks and the standard picture
environment.  Unlike pstricks, it produces both PostScript and PDF
output and works together with latex, dvips, pdftex, and pdflatex.
PGF is used extensively with beamer for production of presentations.


%prep
%setup -q -n %{texpkg}

%build

%install
rm -rf $RPM_BUILD_ROOT
 
install -d -m 755 $RPM_BUILD_ROOT{%{texpkgdir},%{texpkgdoc}}
install -p -m 644 *.sty $RPM_BUILD_ROOT%{texpkgdir}/
install -p -m 644 *.pdf $RPM_BUILD_ROOT%{texpkgdoc}/

%clean
rm -rf $RPM_BUILD_ROOT


%post
texhash >/dev/null 2>&1 || :

%postun
texhash >/dev/null 2>&1 || :


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog README TODO pgfuserguide.tex *.eps *.jpg
%{texpkgdir}/
%{_texmf}/doc/


%changelog
* Wed Feb 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.65-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-pgf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 02:04:33 -0000	1.1
+++ .cvsignore	24 Mar 2005 02:05:05 -0000	1.2
@@ -0,0 +1 @@
+pgf-0.65-20050315.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-pgf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 02:04:33 -0000	1.1
+++ sources	24 Mar 2005 02:05:05 -0000	1.2
@@ -0,0 +1 @@
+25258180407513f071ae9aee3930d022  pgf-0.65-20050315.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 02:06:14 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:06:14 -0500
Subject: rpms/tetex-beamer - New directory
Message-ID: <200503240206.j2O26Edd023700@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-beamer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23693/tetex-beamer

Log Message:
Directory /cvs/extras/rpms/tetex-beamer added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 02:06:14 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:06:14 -0500
Subject: rpms/tetex-beamer/devel - New directory
Message-ID: <200503240206.j2O26Exd023703@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-beamer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23693/tetex-beamer/devel

Log Message:
Directory /cvs/extras/rpms/tetex-beamer/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 02:06:33 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:06:33 -0500
Subject: rpms/tetex-beamer Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503240206.j2O26XJw023762@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-beamer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23753

Added Files:
	Makefile import.log 
Log Message:
Setup of module tetex-beamer


--- NEW FILE Makefile ---
# Top level Makefile for module tetex-beamer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 02:06:33 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:06:33 -0500
Subject: rpms/tetex-beamer/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503240206.j2O26Xjg023765@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-beamer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23753/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tetex-beamer


--- 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 Mar 24 02:07:14 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:07:14 -0500
Subject: rpms/tetex-beamer import.log,1.1,1.2
Message-ID: <200503240207.j2O27EsZ023870@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-beamer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23861

Modified Files:
	import.log 
Log Message:
auto-import tetex-beamer-3.01-1 on branch devel from tetex-beamer-3.01-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tetex-beamer/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 02:06:31 -0000	1.1
+++ import.log	24 Mar 2005 02:07:12 -0000	1.2
@@ -0,0 +1 @@
+tetex-beamer-3_01-1:HEAD:tetex-beamer-3.01-1.src.rpm:1111630027



From fedora-extras-commits at redhat.com  Thu Mar 24 02:07:14 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:07:14 -0500
Subject: rpms/tetex-beamer/devel tetex-beamer.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503240207.j2O27EiX023874@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-beamer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23861/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tetex-beamer.spec 
Log Message:
auto-import tetex-beamer-3.01-1 on branch devel from tetex-beamer-3.01-1.src.rpm


--- NEW FILE tetex-beamer.spec ---
%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")}

%define texpkg      beamer
%define texpkgdir   %{_texmf}/tex/latex/%{texpkg}
%define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}

Name:           tetex-%{texpkg}
Version:        3.01
Release:        1
Summary:        A LaTeX class for producing presentations and slides

Group:          Applications/Publishing
License:        GPL
URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/beamer.html
# DANTE generates CTAN packages tarballs on-the-fly
# ftp://ftp.dante.de/tex-archive/macros/latex/contrib/beamer.tar.gz
Source0:        beamer-3.01-20050315.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       tetex-latex
Requires:       tetex-pgf >= 0.63, tetex-xcolor >= 2.00
Requires(post): /usr/bin/texhash
Requires(postun): /usr/bin/texhash

%description
The beamer LaTeX class can be used for producing slides.  Its
functionality is similar to Prosper but does not need any external
programs and can directly produce a presentation using pdflatex.
Beamer uses pgf for pdf/ps independent graphics.  Frames are created
using \frame{...}, and a frame can build multiple slides through a
simple notation for specifying material for each slide within a frame.
Beamer supports bibliographies, appendicies and transitions.  Short
versions of title, authors, institute can also be specified as
optional parameters.  A \plainframe{} allows a picture, for example,
to fill the whole frame.  Support figure and table environments,
transparency effects, a \transduration command, animation commands, a
pauses environment.  Beamer also provides compatibility with other
packages like prosper. 


%prep
%setup -q -n %{texpkg}

%build

%install
rm -rf $RPM_BUILD_ROOT
 
install -d -m 755 $RPM_BUILD_ROOT{%{texpkgdir},%{texpkgdoc}}
cp -pr base $RPM_BUILD_ROOT%{texpkgdir}/
cp -pr emulation $RPM_BUILD_ROOT%{texpkgdir}/
cp -pr extensions $RPM_BUILD_ROOT%{texpkgdir}/
cp -pr themes $RPM_BUILD_ROOT%{texpkgdir}/
install -p -m 644 doc/*.pdf $RPM_BUILD_ROOT%{texpkgdoc}/

%clean
rm -rf $RPM_BUILD_ROOT


%post
texhash >/dev/null 2>&1 || :

%postun
texhash >/dev/null 2>&1 || :


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog README TODO doc/*.tex doc/Makefile
%doc examples/ solutions/
%doc emacs/ lyx/
%{texpkgdir}/
%{_texmf}/doc/


%changelog
* Wed Feb 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.01-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-beamer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 02:06:31 -0000	1.1
+++ .cvsignore	24 Mar 2005 02:07:12 -0000	1.2
@@ -0,0 +1 @@
+beamer-3.01-20050315.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-beamer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 02:06:31 -0000	1.1
+++ sources	24 Mar 2005 02:07:12 -0000	1.2
@@ -0,0 +1 @@
+1ead85c1e1fad388076bbc4c523b4c69  beamer-3.01-20050315.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 02:17:49 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 23 Mar 2005 21:17:49 -0500
Subject: devel/linphone linphone-0.12.2-pkgconfig.patch, 1.1,
	1.2 linphone.spec, 1.6, 1.7
Message-ID: <200503240217.j2O2Hngu023989@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23983

Modified Files:
	linphone-0.12.2-pkgconfig.patch linphone.spec 
Log Message:
pkgconfig and -devel fixes

linphone-0.12.2-pkgconfig.patch:

Index: linphone-0.12.2-pkgconfig.patch
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone-0.12.2-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linphone-0.12.2-pkgconfig.patch	23 Mar 2005 21:35:47 -0000	1.1
+++ linphone-0.12.2-pkgconfig.patch	24 Mar 2005 02:17:47 -0000	1.2
@@ -9,3 +9,17 @@
  pkgconfig_DATA = linphone.pc
  
  EXTRA_DIST = $(LINPHONE_SOUNDS) \
+--- linphone-0.12.2/share/linphone.pc.in.orig	2005-03-23 21:10:49.392763407 -0500
++++ linphone-0.12.2/share/linphone.pc.in	2005-03-23 21:11:21.983938389 -0500
+@@ -1,7 +1,7 @@
+-prefix=@prefix@
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
+ 
+ 
+ Name: liblinphone


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linphone.spec	23 Mar 2005 21:35:47 -0000	1.6
+++ linphone.spec	24 Mar 2005 02:17:47 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        6
+Release:        7
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -34,7 +34,7 @@
 %package devel
 Summary:        Development libraries for linphone
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release} glib2-devel
 
 %description    devel
 Libraries required to develop software with linphone
@@ -87,6 +87,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-7
+- pkgconfig and -devel fixes
+
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-6
 - Fix build on x86_64
 



From fedora-extras-commits at redhat.com  Thu Mar 24 03:14:22 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 22:14:22 -0500
Subject: rpms/xfce4-systray/devel xfce4-systray.spec,1.3,1.4
Message-ID: <200503240314.j2O3EM1j024931@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24925

Modified Files:
	xfce4-systray.spec 
Log Message:
Removed unneeded la/a files



Index: xfce4-systray.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systray/devel/xfce4-systray.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-systray.spec	20 Mar 2005 22:31:17 -0000	1.3
+++ xfce4-systray.spec	24 Mar 2005 03:14:20 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Systray for the Xfce4 Desktop Environment
 Name: xfce4-systray
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-systray-4.2.1.tar.bz2
@@ -28,7 +28,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -39,6 +41,9 @@
 %{_libdir}/xfce4
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Removed unneeded la/a files
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - remove macro from changelog
 



From fedora-extras-commits at redhat.com  Thu Mar 24 03:38:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 22:38:42 -0500
Subject: rpms/xfce4-session/devel xfce4-session.spec,1.2,1.3
Message-ID: <200503240338.j2O3cgXR025033@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25025

Modified Files:
	xfce4-session.spec 
Log Message:
Removed unneeded la/a files
Added version to requires in devel and engine subpackages



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-session.spec	21 Mar 2005 01:22:26 -0000	1.2
+++ xfce4-session.spec	24 Mar 2005 03:38:40 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-session-4.2.1.tar.bz2
@@ -22,7 +22,7 @@
 %package devel
 Summary: Development files for xfce4-session
 Group: Development/Libraries
-Requires: xfce4-session
+Requires: xfce4-session >= %{version}
 
 %description devel
 Header files for the Xfce Session Manager.
@@ -30,7 +30,7 @@
 %package engines
 Summary: Additional engines for xfce4-session
 Group: User Interface/Desktops
-Requires: xfce4-session
+Requires: xfce4-session >= %{version}
 
 %description engines
 Additional splash screen engines for the Xfce Session Manager.
@@ -46,6 +46,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*/*.la
 %find_lang %{name}
 
 %clean
@@ -80,6 +84,10 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Removed unneeded la/a files
+- Added version to requires in devel and engine subpackages
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - fix BuildReqs
 



From fedora-extras-commits at redhat.com  Thu Mar 24 05:44:51 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu, 24 Mar 2005 00:44:51 -0500
Subject: devel/gazpacho setup-path.patch,NONE,1.1 gazpacho.spec,1.6,1.7
Message-ID: <200503240544.j2O5ipf6027064@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/devel/gazpacho
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27057

Modified Files:
	gazpacho.spec 
Added Files:
	setup-path.patch 
Log Message:

fix gazpacho so it runs using upstream patch to setup.py
patch will be in next release so it can be dropped when we
package next release


setup-path.patch:

--- NEW FILE setup-path.patch ---
--- gazpacho/setup.py   2005/02/21 17:00:53 953
+++ gazpacho/setup.py   2005/02/23 18:00:51 955
@@ -42,7 +42,7 @@
         i += 1
 
     # unless we are installing, don't generate the path.py file
-    if 'install' in sys.prefix:
+    if 'install' in sys.argv:
         f = file(join('gazpacho', 'path.py'), 'w')
         f.write('pixmaps_dir = r"%s"\n' % join(prefix, 'share', 'gazpacho',
                                                'pixmaps'))


Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/devel/gazpacho/gazpacho.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gazpacho.spec	23 Mar 2005 22:52:56 -0000	1.6
+++ gazpacho.spec	24 Mar 2005 05:44:49 -0000	1.7
@@ -1,12 +1,13 @@
 Summary: Glade Interface Creator
 Name: gazpacho
 Version: 0.5.2
-Release: 2
+Release: 3
 License: GPL
 Group: Development/Tools
 URL: http://gruppy.sicem.biz/descargas
 Provides: Gazpacho = %{version}-%{release}
 Source0: gazpacho-%{version}.tar.bz2
+Patch0: setup-path.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 Requires: pygtk2 >= 2.4.0, pygtk2-libglade
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q -n Gazpacho-%{version}
+%patch0 -p1
 
 %build
 python ./setup.py build
@@ -39,6 +41,9 @@
 
 
 %changelog
+* Thu Mar 24 2005 Seth Vidal <skvidal at phy.duke.edu> - 0.5.2-3
+- add patch for setup.py from upstream cvs to fix lack of gazpacho/path.py
+
 * Wed Mar 23 2005 Seth Vidal <skvidal at phy.duke.edu> - 0.5.2-2
 - increment release for rebuild on python 2.4
 



From fedora-extras-commits at redhat.com  Thu Mar 24 11:04:11 2005
From: fedora-extras-commits at redhat.com (Colin Charles (byte))
Date: Thu, 24 Mar 2005 06:04:11 -0500
Subject: rpms/tpb/devel tpb.spec,1.6,1.7
Message-ID: <200503241104.j2OB4BpS001699@cvs-int.fedora.redhat.com>

Author: byte

Update of /cvs/extras/rpms/tpb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1692

Modified Files:
	tpb.spec 
Log Message:
ExclusiveArch x86, since we don't really have IBM-based ppc laptops



Index: tpb.spec
===================================================================
RCS file: /cvs/extras/rpms/tpb/devel/tpb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tpb.spec	5 Mar 2005 19:43:17 -0000	1.6
+++ tpb.spec	24 Mar 2005 11:04:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           tpb
 Version:        0.6.3
-Release:        2
+Release:        3
 Summary:        IBM ThinkPad button support utility
 
 Group:          System Environment/Base
@@ -12,6 +12,7 @@
 Patch0:         %{name}-defaultconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+ExclusiveArch:	%{ix86}
 BuildRequires:  xosd-devel >= 2.0.0, XFree86-devel, gettext, /sbin/MAKEDEV
 Requires:       udev
 
@@ -68,6 +69,9 @@
 
 
 %changelog
+* Thu Mar 24 2005 Colin Charles <colin at fedoraproject.org> - 0:0.6.3-3
+- add ExclusiveArch x86 only
+
 * Wed Feb  9 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.3-2
 - Add udev-awareness to /dev/nvram handling (#147306, Matthew Saltzman).
 - Change default OSD font to "luxi sans", "sans" doesn't work early enough.



From fedora-extras-commits at redhat.com  Thu Mar 24 12:24:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 07:24:13 -0500
Subject: devel/hamlib hamlib-bindings.patch,1.2,1.3 hamlib.spec,1.8,1.9
Message-ID: <200503241224.j2OCODY9002798@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2790

Modified Files:
	hamlib-bindings.patch hamlib.spec 
Log Message:
Various spec and patch fixes

hamlib-bindings.patch:

Index: hamlib-bindings.patch
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib-bindings.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hamlib-bindings.patch	23 Mar 2005 23:28:05 -0000	1.2
+++ hamlib-bindings.patch	24 Mar 2005 12:24:11 -0000	1.3
@@ -9,12 +9,3 @@
  TCL_BIN_DIR = @TCL_BIN_DIR@
  TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
  TCL_LIB_FILE = @TCL_LIB_FILE@
-@@ -195,7 +195,7 @@
- program_transform_name = @program_transform_name@
- pyexecdir = @pyexecdir@
- 
--pythondir = $(prefix)/lib/python
-+pythondir = $(libdir)/python2.3
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- subdirs = @subdirs@


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hamlib.spec	23 Mar 2005 23:28:05 -0000	1.8
+++ hamlib.spec	24 Mar 2005 12:24:11 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name: hamlib
 Version: 1.2.3
-Release: 8
+Release: 9
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transceivers and receivers
@@ -97,6 +97,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
+rm -f $RPM_BUILD_ROOT%{_libdir}/hamlib-*.a $RPM_BUILD_ROOT%{_libdir}/hamlib-*.la
+/sbin/ldconfig -N -n $RPM_BUILDROOT%{_libdir}
 pushd bindings
 # Install Python
 make prefix=$RPM_BUILD_ROOT%{_prefix} \
@@ -145,7 +147,7 @@
 
 %files
 %defattr(-, root, root)
-%doc COPYING doc/html
+%doc COPYING.LIB doc/html
 %{_bindir}/rigctl
 %{_bindir}/rigmem
 %{_bindir}/rigswr
@@ -155,7 +157,6 @@
 %{_libdir}/libhamlib-%{version}.so.2.0.2
 %{_libdir}/hamlib-*.so
 %{_libdir}/libhamlib.la
-%{_libdir}/hamlib-*.la
 %{_mandir}/man8/rpc.rigd.8.gz
 %{_mandir}/man8/rpc.rotd.8.gz
 %{_mandir}/man1/rigctl.1.gz
@@ -190,10 +191,11 @@
 
 %files devel
 %defattr(-, root, root)
+%doc README.developer
 %{_libdir}/libhamlib.so
 %{_libdir}/libhamlib.a
-%{_libdir}/hamlib-*.a
 %{_datadir}/aclocal/hamlib.m4
+%dir %{_includedir}/hamlib
 %{_includedir}/hamlib/rig.h
 %{_includedir}/hamlib/riglist.h
 %{_includedir}/hamlib/rig_dll.h
@@ -203,6 +205,13 @@
 
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-9
+- Python binding cleanup
+- soname/ldconfig cleanup
+- Added %%{_includedir}/hamlib to -devel
+- Removed %%{_libdir}/hamlib-*.a and hamlib-*.la
+- %%doc cleanups
+
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-8
 - Added -q to %%setup
 - Fixed Python binding build and Requires



From fedora-extras-commits at redhat.com  Thu Mar 24 12:37:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 07:37:02 -0500
Subject: rpms/edb/FC-3 edb.spec,1.5,1.6
Message-ID: <200503241237.j2OCb2iE002918@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edb/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2912/FC-3

Modified Files:
	edb.spec 
Log Message:
Added which to BuildRequires


Index: edb.spec
===================================================================
RCS file: /cvs/extras/rpms/edb/FC-3/edb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- edb.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ edb.spec	24 Mar 2005 12:36:59 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           edb
 Version:        1.0.5
-Release:        5
+Release:        6
 Summary:        A database convenience library wrapped around BDB
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://enlightenment.org/index.php?id=23
 Source0:        http://prdownloads.sourceforge.net/enlightenment/edb-1.0.5.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gtk+-devel, ncurses-devel zlib-devel 
+BuildRequires:  gtk+-devel, ncurses-devel zlib-devel which
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -85,6 +85,9 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-6
+- Added which to BuildRequires
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-5
 - %%
 



From fedora-extras-commits at redhat.com  Thu Mar 24 12:38:58 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 07:38:58 -0500
Subject: rpms/hamlib/FC-3 hamlib-bindings.patch,1.1,1.2 hamlib.spec,1.7,1.8
Message-ID: <200503241238.j2OCcw65002972@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/hamlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2966

Modified Files:
	hamlib-bindings.patch hamlib.spec 
Log Message:
Various fixes and cleanups

hamlib-bindings.patch:

Index: hamlib-bindings.patch
===================================================================
RCS file: /cvs/extras/rpms/hamlib/FC-3/hamlib-bindings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hamlib-bindings.patch	16 Mar 2005 17:05:32 -0000	1.1
+++ hamlib-bindings.patch	24 Mar 2005 12:38:56 -0000	1.2
@@ -9,12 +9,3 @@
  TCL_BIN_DIR = @TCL_BIN_DIR@
  TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
  TCL_LIB_FILE = @TCL_LIB_FILE@
-@@ -195,7 +195,7 @@
- program_transform_name = @program_transform_name@
- pyexecdir = @pyexecdir@
- 
--pythondir = $(prefix)/lib/python
-+pythondir = $(prefix)/lib/python2.3
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- subdirs = @subdirs@


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/rpms/hamlib/FC-3/hamlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hamlib.spec	21 Mar 2005 18:36:05 -0000	1.7
+++ hamlib.spec	24 Mar 2005 12:38:56 -0000	1.8
@@ -1,6 +1,8 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Name: hamlib
 Version: 1.2.3
-Release: 7
+Release: 9
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transceivers and receivers
@@ -62,12 +64,13 @@
 %package python
 Summary: Hamlib radio control library Python binding
 Group: Development/Libraries
+Requires: python-abi = %(%{__python} -c 'import sys;print(sys.version[:3])')
 
 %description python
 Hamlib Python Language bindings to allow radio control from Python scripts.
 
 %prep
-%setup
+%setup -q
 %patch -p1
 %patch1 -p1
 %build
@@ -94,6 +97,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
+rm -f $RPM_BUILD_ROOT%{_libdir}/hamlib-*.a $RPM_BUILD_ROOT%{_libdir}/hamlib-*.la
+/sbin/ldconfig -N -n $RPM_BUILDROOT%{_libdir}
 pushd bindings
 # Install Python
 make prefix=$RPM_BUILD_ROOT%{_prefix} \
@@ -109,6 +114,7 @@
         sharedstatedir=$RPM_BUILD_ROOT%{_sharedstatedir} \
         mandir=$RPM_BUILD_ROOT%{_mandir} \
         infodir=$RPM_BUILD_ROOT%{_infodir} \
+        pythondir=$RPM_BUILD_ROOT%{python_sitelib} \
    install-pythonPYTHON
 
 # Install PERL 
@@ -141,7 +147,7 @@
 
 %files
 %defattr(-, root, root)
-%doc COPYING doc/html
+%doc COPYING.LIB doc/html
 %{_bindir}/rigctl
 %{_bindir}/rigmem
 %{_bindir}/rigswr
@@ -151,7 +157,6 @@
 %{_libdir}/libhamlib-%{version}.so.2.0.2
 %{_libdir}/hamlib-*.so
 %{_libdir}/libhamlib.la
-%{_libdir}/hamlib-*.la
 %{_mandir}/man8/rpc.rigd.8.gz
 %{_mandir}/man8/rpc.rotd.8.gz
 %{_mandir}/man1/rigctl.1.gz
@@ -182,16 +187,15 @@
 
 %files python
 %defattr(-, root, root)
-%{_libdir}/python2.3/Hamlib.py
-%{_libdir}/python2.3/Hamlib.pyc
-%{_libdir}/python2.3/Hamlib.pyo
+%{python_sitelib}/*.py*
 
 %files devel
 %defattr(-, root, root)
+%doc README.developer
 %{_libdir}/libhamlib.so
 %{_libdir}/libhamlib.a
-%{_libdir}/hamlib-*.a
 %{_datadir}/aclocal/hamlib.m4
+%dir %{_includedir}/hamlib
 %{_includedir}/hamlib/rig.h
 %{_includedir}/hamlib/riglist.h
 %{_includedir}/hamlib/rig_dll.h
@@ -201,6 +205,17 @@
 
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-9
+- Python binding cleanup
+- soname/ldconfig cleanup
+- Added %%{_includedir}/hamlib to -devel
+- Removed %%{_libdir}/hamlib-*.a and hamlib-*.la
+- %%doc cleanups
+
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-8
+- Added -q to %%setup
+- Fixed Python binding build and Requires
+
 * Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-7
 - Removed spurious period and spelling mistake in Summary
 



From fedora-extras-commits at redhat.com  Thu Mar 24 12:40:49 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 07:40:49 -0500
Subject: rpms/linphone/FC-3 linphone-0.12.2-pkgconfig.patch, NONE,
	1.1 linphone.spec, 1.5, 1.6
Message-ID: <200503241240.j2OCenOq003024@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3018

Modified Files:
	linphone.spec 
Added Files:
	linphone-0.12.2-pkgconfig.patch 
Log Message:
pkgconfig and -devel fixes

linphone-0.12.2-pkgconfig.patch:

--- NEW FILE linphone-0.12.2-pkgconfig.patch ---
--- linphone-0.12.2/share/Makefile.in.orig	2005-03-23 16:26:52.922690626 -0500
+++ linphone-0.12.2/share/Makefile.in	2005-03-23 16:27:13.949932428 -0500
@@ -184,7 +184,7 @@
 confexdir = $(datadir)/linphonec
 confex_DATA = linphonec
 
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = linphone.pc
 
 EXTRA_DIST = $(LINPHONE_SOUNDS) \
--- linphone-0.12.2/share/linphone.pc.in.orig	2005-03-23 21:10:49.392763407 -0500
+++ linphone-0.12.2/share/linphone.pc.in	2005-03-23 21:11:21.983938389 -0500
@@ -1,7 +1,7 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 
 Name: liblinphone


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-3/linphone.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linphone.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ linphone.spec	24 Mar 2005 12:40:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        5
+Release:        7
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -9,6 +9,7 @@
 Source0:        http://simon.morlat.free.fr/download/0.12.2/source/linphone-0.12.2.tar.gz
 Patch:          linphone-0.12.2-docs.patch
 Patch1:         linphone-0.12.2-speex.patch
+Patch2:         linphone-0.12.2-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
@@ -33,7 +34,7 @@
 %package devel
 Summary:        Development libraries for linphone
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release} glib2-devel
 
 %description    devel
 Libraries required to develop software with linphone
@@ -42,6 +43,7 @@
 %setup -q
 %patch -p 1 -b .docs
 %patch1 -p 1 -b .speex
+%patch2 -p 1 -b .pkgconfig
 rm -r $RPM_BUILD_DIR/linphone-0.12.2/oRTP/docs
 rm -r $RPM_BUILD_DIR/linphone-0.12.2/speex
 
@@ -85,6 +87,12 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-7
+- pkgconfig and -devel fixes
+
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-6
+- Fix build on x86_64
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-5
 - %%
 



From fedora-extras-commits at redhat.com  Thu Mar 24 12:42:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 07:42:09 -0500
Subject: rpms/lock-keys-applet/FC-3 lock-keys-applet.spec,1.5,1.6
Message-ID: <200503241242.j2OCg9Kg003061@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3055

Modified Files:
	lock-keys-applet.spec 
Log Message:
Added scrollkeeper to BuildRequires


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/lock-keys-applet/FC-3/lock-keys-applet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lock-keys-applet.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ lock-keys-applet.spec	24 Mar 2005 12:42:07 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        5
+Release:        6
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
 License:        GPL
 URL:            http://mfcn.ilo.de/led_applet/
 Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgnomeui-devel gnome-panel-devel
+BuildRequires:  libgnomeui-devel gnome-panel-devel scrollkeeper
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -49,6 +49,9 @@
 %{_libexecdir}/%{name}
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-6
+- Added scrollkeeper to BuildRequires
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-5
 - %%
 



From fedora-extras-commits at redhat.com  Thu Mar 24 12:43:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 07:43:47 -0500
Subject: rpms/pam_mysql/FC-3 pam_mysql-0.5-vars.patch, NONE,
	1.1 pam_mysql.spec, 1.2, 1.3
Message-ID: <200503241243.j2OChl8r003155@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3141

Modified Files:
	pam_mysql.spec 
Added Files:
	pam_mysql-0.5-vars.patch 
Log Message:
Fixed build on x86_64

pam_mysql-0.5-vars.patch:

--- NEW FILE pam_mysql-0.5-vars.patch ---
--- pam_mysql/Makefile.orig	2005-03-23 18:17:08.885220061 -0500
+++ pam_mysql/Makefile	2005-03-23 18:18:08.427578059 -0500
@@ -1,15 +1,16 @@
 # Convenient defaults for compiling independently of the full source
 # tree.
 ifndef FULL_LINUX_PAM_SOURCE_TREE
-export DYNAMIC=-DPAM_DYNAMIC
-export CC=gcc
-export CFLAGS=-O2 -Dlinux -DLINUX_PAM \
-       -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
-       -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \
-       -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \
-       -Wshadow -pedantic -fPIC
-export MKDIR=mkdir -p
-export LD_D=gcc -shared -Xlinker -x -L/usr/lib/mysql -lz
+DYNAMIC=-DPAM_DYNAMIC
+CC=gcc
+CFLAGS=-O2 -Dlinux -DLINUX_PAM \
+  -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
+  -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \
+  -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \
+  -Wshadow -pedantic -fPIC
+MKDIR=mkdir -p
+LIBDIR=/usr/lib
+LD_D=gcc -shared -Xlinker -x -L$(LIBDIR)/mysql -lz
 endif
 
 #


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/FC-3/pam_mysql.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam_mysql.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ pam_mysql.spec	24 Mar 2005 12:43:45 -0000	1.3
@@ -1,10 +1,11 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
 Name:		pam_mysql
 Version:	0.50
-Release:	3
+Release:	4
 License:	GPL
 Group:		Base
 Source0:	http://dl.sf.net/pam-mysql/pam_mysql-0.5.tar.gz
+Patch:		pam_mysql-0.5-vars.patch
 URL:		http://sf.net/projects/pam-mysql/
 BuildRequires:	pam-devel mysql-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
@@ -15,9 +16,10 @@
 
 %prep
 %setup -q -n %{name}
+%patch -p 1 -b .vars
 
 %build
-make
+make LIBDIR=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -32,6 +34,9 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-4
+- Fixed build on x86_64
+
 * Wed Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-3
 - Removed explicit Requires
 - Removed Polish Summary and Description



From fedora-extras-commits at redhat.com  Thu Mar 24 12:43:49 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 07:43:49 -0500
Subject: rpms/ufraw - New directory
Message-ID: <200503241243.j2OChnx1003177@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3148/ufraw

Log Message:
Directory /cvs/extras/rpms/ufraw added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 12:43:49 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 07:43:49 -0500
Subject: rpms/ufraw/devel - New directory
Message-ID: <200503241243.j2OChn9v003180@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3148/ufraw/devel

Log Message:
Directory /cvs/extras/rpms/ufraw/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 12:44:11 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 07:44:11 -0500
Subject: rpms/ufraw Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503241244.j2OCiBdY003239@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3230

Added Files:
	Makefile import.log 
Log Message:
Setup of module ufraw


--- NEW FILE Makefile ---
# Top level Makefile for module ufraw
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 12:44:11 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 07:44:11 -0500
Subject: rpms/ufraw/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503241244.j2OCiBbb003242@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3230/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ufraw


--- 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 Mar 24 12:44:56 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 07:44:56 -0500
Subject: rpms/ufraw import.log,1.1,1.2
Message-ID: <200503241244.j2OCiuba003341@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3332

Modified Files:
	import.log 
Log Message:
auto-import ufraw-0.4-1 on branch devel from ufraw-0.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ufraw/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 12:44:08 -0000	1.1
+++ import.log	24 Mar 2005 12:44:54 -0000	1.2
@@ -0,0 +1 @@
+ufraw-0_4-1:HEAD:ufraw-0.4-1.src.rpm:1111668258



From fedora-extras-commits at redhat.com  Thu Mar 24 12:44:56 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 07:44:56 -0500
Subject: rpms/ufraw/devel COPYING, NONE, 1.1 ufraw.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503241244.j2OCiulQ003345@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3332/devel

Modified Files:
	.cvsignore sources 
Added Files:
	COPYING ufraw.spec 
Log Message:
auto-import ufraw-0.4-1 on branch devel from ufraw-0.4-1.src.rpm


--- NEW FILE COPYING ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year  name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.


--- NEW FILE ufraw.spec ---
%define gimptool gimptool-2.0
%define gimpplugindir %(%gimptool --gimpplugindir)/plug-ins

Summary: A GIMP plugin to retreive raw image data from digital cameras.
Name: ufraw
Version: 0.4
Release: 1
Group: Applications/Multimedia
License: GPL
URL: http://ufraw.sourceforge.net
Source0: http://unc.dl.sourceforge.net/sourceforge/ufraw/ufraw-%{version}.tar.gz
Source1: COPYING
BuildRequires: gimp-devel >= 2.0
BuildRequires: gtk2-devel >= 2.4.0
BuildRequires: pkgconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

%description
UFRaw is a GIMP plug-in for opening digital cameras raw format images.

%prep
%setup -q
cp %{SOURCE1} .

%build
make

%install
rm -rf %buildroot
install -m 0755 -d %{buildroot}%{gimpplugindir}
install -m 0755 ufraw-gimp %{buildroot}%{gimpplugindir}

%clean
rm -rf %buildroot

%files
%defattr(-, root, root)
%doc COPYING README
%dir %{gimpplugindir}
%{gimpplugindir}/ufraw-gimp

%changelog
* Wed Mar 02 2005 Nils Philippsen <nphilipp at redhat.com>
- version 0.4
- update URLs

* Wed Dec 01 2004 Nils Philippsen <nphilipp at redhat.com>
- version 0.2
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 12:44:09 -0000	1.1
+++ .cvsignore	24 Mar 2005 12:44:54 -0000	1.2
@@ -0,0 +1 @@
+ufraw-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 12:44:09 -0000	1.1
+++ sources	24 Mar 2005 12:44:54 -0000	1.2
@@ -0,0 +1 @@
+c66a2498b3fb74eef6f3b7ce5477d44a  ufraw-0.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 13:10:42 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 08:10:42 -0500
Subject: rpms/ufraw/devel ufraw.spec,1.1,1.2
Message-ID: <200503241310.j2ODAg2I004391@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4377

Modified Files:
	ufraw.spec 
Log Message:
buildrequire lcms-devel
trim summary
change buildroot



Index: ufraw.spec
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ufraw.spec	24 Mar 2005 12:44:54 -0000	1.1
+++ ufraw.spec	24 Mar 2005 13:10:39 -0000	1.2
@@ -1,7 +1,7 @@
 %define gimptool gimptool-2.0
 %define gimpplugindir %(%gimptool --gimpplugindir)/plug-ins
 
-Summary: A GIMP plugin to retreive raw image data from digital cameras.
+Summary: GIMP plugin to retreive raw image data from digital cameras
 Name: ufraw
 Version: 0.4
 Release: 1
@@ -12,8 +12,9 @@
 Source1: COPYING
 BuildRequires: gimp-devel >= 2.0
 BuildRequires: gtk2-devel >= 2.4.0
+BuildRequires: lcms-devel
 BuildRequires: pkgconfig
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 
 %description
 UFRaw is a GIMP plug-in for opening digital cameras raw format images.
@@ -40,6 +41,11 @@
 %{gimpplugindir}/ufraw-gimp
 
 %changelog
+* Thu Mar 24 2005 Nils Philippsen <nphilipp at redhat.com> - 0.4-1
+- buildrequire lcms-devel
+- trim summary
+- change buildroot
+
 * Wed Mar 02 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 0.4
 - update URLs



From ivazquez at ivazquez.net  Thu Mar 24 14:14:50 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 24 Mar 2005 09:14:50 -0500
Subject: APPROVED: bmp
In-Reply-To: <20050317141328.2be51de0.bugs.michael@gmx.net>
References: <20050317141328.2be51de0.bugs.michael@gmx.net>
Message-ID: <1111673690.8887.4.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 14:13 +0100, Michael Schwendt wrote:
> Name: bmp
> Version: 0.9.7-4
> 
> BMP (Beep Media Player) is a media player that currently uses a skinned
> user interface based on Winamp 2.x skins. It is based on ("forked off")
> XMMS.

If bmp is going to have the xmms Bluecurve skin as a default then should
it have a dependency on either redhat-artwork
or /usr/share/xmms/Skins/Bluecurve-xmms.zip?

Oh, and it appears the windowshaded playlist part is wrong (grey when
focused, blue when unfocused), but that may be an upstream bug.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050324/7403b312/attachment.sig>

From fedora-extras-commits at redhat.com  Thu Mar 24 14:34:12 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 09:34:12 -0500
Subject: rpms/ufraw/devel ufraw.spec,1.2,1.3
Message-ID: <200503241434.j2OEYChR005539@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5533

Modified Files:
	ufraw.spec 
Log Message:
fix typo



Index: ufraw.spec
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ufraw.spec	24 Mar 2005 13:10:39 -0000	1.2
+++ ufraw.spec	24 Mar 2005 14:34:10 -0000	1.3
@@ -1,7 +1,7 @@
 %define gimptool gimptool-2.0
 %define gimpplugindir %(%gimptool --gimpplugindir)/plug-ins
 
-Summary: GIMP plugin to retreive raw image data from digital cameras
+Summary: GIMP plugin to retrieve raw image data from digital cameras
 Name: ufraw
 Version: 0.4
 Release: 1



From fedora-extras-commits at redhat.com  Thu Mar 24 15:16:19 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 24 Mar 2005 10:16:19 -0500
Subject: rpms/util-vserver/devel util-vserver.spec, 1.3, 1.4 sources, 1.3,
	1.4 .cvsignore, 1.3, 1.4
Message-ID: <200503241516.j2OFGJQK006637@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6631

Modified Files:
	util-vserver.spec sources .cvsignore 
Log Message:
version 0.30.205



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- util-vserver.spec	5 Mar 2005 19:55:54 -0000	1.3
+++ util-vserver.spec	24 Mar 2005 15:16:17 -0000	1.4
@@ -3,23 +3,26 @@
 ## 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...
-%{!?release_func:%define release_func() %1}
+%{!?_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
 
-%define confdir		%_sysconfdir/vservers
-%define confdefaultdir	%confdir/.defaults
-%define pkglibdir	%_libdir/%name
-%define __chattr	/usr/bin/chattr
-%define chkconfig	/sbin/chkconfig
+%global _localstatedir	%_var
 
-%define _localstatedir	%_var
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.203
+Version:	0.30.205
 Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
@@ -35,12 +38,12 @@
 Obsoletes:	vserver < %version
 BuildRequires:	mount vconfig gawk iproute iptables
 BuildRequires:	gcc-c++ wget
-BuildRequires:	e2fsprogs-devel
+BuildRequires:	e2fsprogs-devel beecrypt-devel
 BuildRequires:	doxygen tetex-latex
 Requires(post):		%__chattr
 Requires(pre):		%pkglibdir
 Requires(postun):	%pkglibdir
-%{!?_without_dietlibc:BuildRequires:	dietlibc >= 0:0.24}
+%{!?_without_dietlibc:BuildRequires:	dietlibc >= 0:0.25}
 %{!?_without_xalan:BuildRequires:	xalan-j}
 
 %package lib
@@ -88,7 +91,7 @@
 
 
 %description
-This package provides the components and a framework to setup virtual
+util-vserver provides the components and a framework to setup virtual
 servers.  A virtual server runs inside a linux server. It is nevertheless
 highly independent. As such, you can run various services with normal
 configuration. The various vservers can't interact with each other and
@@ -98,11 +101,66 @@
 set_ipv4root system call.
 
 %description lib
+util-vserver provides the components and a framework to setup virtual
+servers.  A virtual server runs inside a linux server. It is nevertheless
+highly independent. As such, you can run various services with normal
+configuration. The various vservers can't interact with each other and
+can't interact with services in the main server.
+
+This package contains the shared libraries needed by all other
+'util-vserver' subpackages.
+
 %description core
+util-vserver provides the components and a framework to setup virtual
+servers.  A virtual server runs inside a linux server. It is nevertheless
+highly independent. As such, you can run various services with normal
+configuration. The various vservers can't interact with each other and
+can't interact with services in the main server.
+
+This package contains utilities which are required to communicate with
+the Linux-Vserver enabled kernel.
+
+
 %description build
+util-vserver provides the components and a framework to setup virtual
+servers.  A virtual server runs inside a linux server. It is nevertheless
+highly independent. As such, you can run various services with normal
+configuration. The various vservers can't interact with each other and
+can't interact with services in the main server.
+
+This package contains utilities which assist in building Vservers.
+
 %description sysv
+util-vserver provides the components and a framework to setup virtual
+servers.  A virtual server runs inside a linux server. It is nevertheless
+highly independent. As such, you can run various services with normal
+configuration. The various vservers can't interact with each other and
+can't interact with services in the main server.
+
+This package contains the SysV initscripts which start and stop
+VServers and related tools.
+
+
 %description legacy
+util-vserver provides the components and a framework to setup virtual
+servers.  A virtual server runs inside a linux server. It is nevertheless
+highly independent. As such, you can run various services with normal
+configuration. The various vservers can't interact with each other and
+can't interact with services in the main server.
+
+This package contains the tools which are needed to work with VServers
+having an old-style configuration.
+
+
 %description devel
+util-vserver provides the components and a framework to setup virtual
+servers.  A virtual server runs inside a linux server. It is nevertheless
+highly independent. As such, you can run various services with normal
+configuration. The various vservers can't interact with each other and
+can't interact with services in the main server.
+
+This package contains header files and libraries which are needed to
+develop VServer related applications.
 
 
 %prep
@@ -167,6 +225,26 @@
 test "$1" = 0  || %_initrddir/vprocunhide condrestart >/dev/null || :
 
 
+%triggerin build -- fedora-release
+function copy()
+{
+    base=$1
+    shift
+
+    for i; do
+	test -r "$i" || continue
+
+	target=%confdir/.distributions/.common/pubkeys/$base-$(basename "$i")
+	cp -a "$i" "$target"
+    done
+}
+copy fedora /usr/share/doc/fedora-release-*/RPM-GPG-*
+
+
+%preun build
+test "$1" != 0 || rm -f %confdir/.distributions/.common/pubkeys/fedora-*
+
+
 ## Temporary workaround to remove old v_* files; it will conflict
 ## somehow with the -legacy package but can be fixed by reinstalling
 ## this package.
@@ -233,6 +311,10 @@
 %dir %confdir/.distributions
 %dir %confdir/.distributions/*
 %dir %confdir/.distributions/*/apt
+%dir %confdir/.distributions/.common
+%dir %confdir/.distributions/.common/pubkeys
+%dir %confdefaultdir/apps/vunify
+%dir %confdefaultdir/apps/vunify/hash
 
 
 %files legacy -f %name-legacy.list
@@ -247,6 +329,15 @@
 
 
 %changelog
+* Thu Mar 24 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.30.205-1
+- added some %%descriptions
+- copy GPG keys from the system into the confdir
+- buildrequire dietlibc-0.25
+- BuildRequire beecrypt-devel
+- cleanups
+- use %%global instead of %%define
+- removed 'run.rev' as a vserver-local variable and made it a system-wide setting
+
 * Wed Jan 26 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.30.198-0.3
 - updated BuildRequires:
 - use 'setattr --barrier' instead of 'chattr +t' in the %post scriptlet


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Feb 2005 00:54:37 -0000	1.3
+++ sources	24 Mar 2005 15:16:17 -0000	1.4
@@ -1,2 +1,2 @@
-205bed0babe0f64ce9073c5c15a3b8bb  util-vserver-0.30.203.tar.bz2
-1d8e15b81d7cc3d845851ce53c4ff433  util-vserver-0.30.203.tar.bz2.asc
+9d509327744fd5dfa84faa68531853c3  util-vserver-0.30.205.tar.bz2
+ce1b9390e89c332eec280a27883a6b46  util-vserver-0.30.205.tar.bz2.asc


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Feb 2005 00:53:05 -0000	1.3
+++ .cvsignore	24 Mar 2005 15:16:17 -0000	1.4
@@ -1 +1,4 @@
-util-vserver*.tar.bz2*
+util-vserver*.tar.bz2
+util-vserver*.tar.bz2.asc
+i386
+util-vserver*.src.rpm



From fedora-extras-commits at redhat.com  Thu Mar 24 15:28:20 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 10:28:20 -0500
Subject: devel/libosip libosip.spec,1.5,1.6
Message-ID: <200503241528.j2OFSKNZ006713@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6707

Modified Files:
	libosip.spec 
Log Message:
Moved osip.1 to -devel


Index: libosip.spec
===================================================================
RCS file: /cvs/extras/devel/libosip/libosip.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libosip.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ libosip.spec	24 Mar 2005 15:28:18 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libosip
 Version:        0.9.7
-Release:        5
+Release:        6
 Summary:        oSIP is an implementation of SIP
 
 Group:          System Environment/Libraries
@@ -63,7 +63,6 @@
 %files
 %defattr(-,root,root)
 %{_libdir}/*.so.*
-%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root)
@@ -71,8 +70,12 @@
 %{_libdir}/*.a
 %{_libdir}/*.la
 %{_libdir}/*.so
+%{_mandir}/man1/*
 
 %changelog
+* Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-6
+- Moved osip.1 to -devel
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-5
 - %%
 



From fedora-extras-commits at redhat.com  Thu Mar 24 15:41:01 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Thu, 24 Mar 2005 10:41:01 -0500
Subject: rpms/sabayon/devel .cvsignore, 1.3, 1.4 sabayon.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200503241541.j2OFf1ic006804@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6798

Modified Files:
	.cvsignore sabayon.spec sources 
Log Message:
* Thu Mar 24 2005 Mark McLoughlin <markmc at redhat.com> - 0.17-1
- Update to 0.17
- Pass --with-prototype-user=sabayon-admin to configure



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Mar 2005 09:29:05 -0000	1.3
+++ .cvsignore	24 Mar 2005 15:40:59 -0000	1.4
@@ -1 +1 @@
-sabayon-0.16.tar.bz2
+sabayon-0.17.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sabayon.spec	21 Mar 2005 18:44:15 -0000	1.8
+++ sabayon.spec	24 Mar 2005 15:40:59 -0000	1.9
@@ -5,8 +5,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_pytho\n_lib()")}
 
 Name:    sabayon
-Version: 0.16
-Release: 8
+Version: 0.17
+Release: 1
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -51,7 +51,9 @@
 %setup -q
 
 %build
-%configure --enable-consolehelper=yes
+%configure					\
+	--enable-consolehelper=yes		\
+	 --with-prototype-user=%{name}-admin
 make %{?_smp_mflags}
 gzip -9 ChangeLog
 
@@ -171,6 +173,10 @@
 %ghost %{python_sitelib}/%{name}/userswindow.pyo
 
 %changelog
+* Thu Mar 24 2005 Mark McLoughlin <markmc at redhat.com> - 0.17-1
+- Update to 0.17
+- Pass --with-prototype-user=sabayon-admin to configure
+
 * Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-8
 - Add BuildRequires: usermode and pass --enable-consolehelper=yes
   to configure


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Mar 2005 09:29:05 -0000	1.3
+++ sources	24 Mar 2005 15:40:59 -0000	1.4
@@ -1 +1 @@
-3a2a9a18f44fa5e32dded73a4e111746  sabayon-0.16.tar.bz2
+e2727f9f63e60a734e0953a78f31565a  sabayon-0.17.tar.bz2



From bugs.michael at gmx.net  Thu Mar 24 15:54:27 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 24 Mar 2005 16:54:27 +0100
Subject: APPROVED: bmp
In-Reply-To: <1111673690.8887.4.camel@ignacio.ignacio.lan>
References: <20050317141328.2be51de0.bugs.michael@gmx.net>
	<1111673690.8887.4.camel@ignacio.ignacio.lan>
Message-ID: <20050324165427.3c66c2cc.bugs.michael@gmx.net>

On Thu, 24 Mar 2005 09:14:50 -0500, Ignacio Vazquez-Abrams wrote:

> On Thu, 2005-03-17 at 14:13 +0100, Michael Schwendt wrote:
> > Name: bmp
> > Version: 0.9.7-4
> > 
> > BMP (Beep Media Player) is a media player that currently uses a skinned
> > user interface based on Winamp 2.x skins. It is based on ("forked off")
> > XMMS.
> 
> If bmp is going to have the xmms Bluecurve skin as a default then should
> it have a dependency on either redhat-artwork
> or /usr/share/xmms/Skins/Bluecurve-xmms.zip?

No. First of all, see "rpm --redhatrequires redhat-artwork". And if the
Bluecurve skin is not available, BMP falls back to its own default skin.
 
> Oh, and it appears the windowshaded playlist part is wrong (grey when
> focused, blue when unfocused), but that may be an upstream bug.

I don't see anything like that here.



From fedora-extras-commits at redhat.com  Thu Mar 24 16:15:24 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 24 Mar 2005 11:15:24 -0500
Subject: devel/sylpheed .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sylpheed.spec,
	1.6, 1.7 sylpheed-1.0.3-draftsegf.patch, 1.1, NONE
Message-ID: <200503241615.j2OGFOSw007765@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/sylpheed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7759

Modified Files:
	.cvsignore sources sylpheed.spec 
Removed Files:
	sylpheed-1.0.3-draftsegf.patch 
Log Message:
Use release version 1.FC4 to allow for FC3 and FC2 updates.

* Thu Mar 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.4-1.FC4
- Update to 1.0.4 (minor security fixes).
- Patch4 (draftsegf) merged upstream.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/sylpheed/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Mar 2005 23:51:10 -0000	1.3
+++ .cvsignore	24 Mar 2005 16:15:22 -0000	1.4
@@ -1 +1 @@
-sylpheed-1.0.3.tar.bz2
+sylpheed-1.0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/devel/sylpheed/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Mar 2005 23:51:10 -0000	1.3
+++ sources	24 Mar 2005 16:15:22 -0000	1.4
@@ -1 +1 @@
-9e2733a0ea903c3fb29f537b67a6f15a  sylpheed-1.0.3.tar.bz2
+e47b275c281335d09201503af2115eaa  sylpheed-1.0.4.tar.bz2


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sylpheed.spec	17 Mar 2005 20:05:46 -0000	1.6
+++ sylpheed.spec	24 Mar 2005 16:15:22 -0000	1.7
@@ -4,8 +4,8 @@
 
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 1.0.3
-Release: 2
+Version: 1.0.4
+Release: 1.FC4
 License: GPL
 URL: http://sylpheed.good-day.net/
 Group: Applications/Internet
@@ -21,7 +21,6 @@
 Patch1: %{name}-0.8.9-ssl.patch
 Patch2: sylpheed-default-browser.patch
 Patch3: sylpheed-1.0.3-desktop.patch
-Patch4: sylpheed-1.0.3-draftsegf.patch
 
 %description
 This program is an X based fast email client which has features
@@ -44,7 +43,6 @@
 %patch1 -p1 -b .ssl
 %patch2 -p1 -b .default-browser
 %patch3 -p1 -b .desktop
-%patch4 -p1 -b .draftsegf
 
 %build
 autoconf
@@ -83,6 +81,10 @@
 %{_mandir}/man1
 
 %changelog
+* Thu Mar 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.4-1.FC4
+- Update to 1.0.4 (minor security fixes).
+- Patch4 (draftsegf) merged upstream.
+
 * Thu Mar 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-2
 - Fix segfault when reopening drafts.
 


--- sylpheed-1.0.3-draftsegf.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar 24 16:45:43 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 24 Mar 2005 11:45:43 -0500
Subject: rpms/fedora-rpmdevtools/devel .cvsignore, 1.6,
	1.7 fedora-rpmdevtools.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200503241645.j2OGjh1M007979@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fedora-rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7964/devel

Modified Files:
	.cvsignore fedora-rpmdevtools.spec sources 
Log Message:
1.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Feb 2005 22:12:33 -0000	1.6
+++ .cvsignore	24 Mar 2005 16:45:41 -0000	1.7
@@ -1 +1,2 @@
-fedora-rpmdevtools-0.3.1.tar.bz2
+fedora-rpmdevtools-1.0.tar.bz2
+spectool-1.0.4.tar.bz2


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-rpmdevtools.spec	3 Mar 2005 21:26:02 -0000	1.8
+++ fedora-rpmdevtools.spec	24 Mar 2005 16:45:41 -0000	1.9
@@ -1,20 +1,23 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
-%define xemacs_sitestart_d %{_prefix}/lib/xemacs/xemacs-packages/lisp/site-start.d %{_prefix}/lib64/xemacs/site-packages/lisp/site-start.d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%define spectool_version   1.0.4
 
 Name:           fedora-rpmdevtools
-Version:        0.3.1
+Version:        1.0
 Release:        1
 Summary:        Fedora RPM Development Tools
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://www.fedora.us/
+URL:            http://fedora.redhat.com/
 # rpminfo upstream: http://people.redhat.com/twoerner/rpminfo/bin/
 Source0:        %{name}-%{version}.tar.bz2
+Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 Provides:       %{name}-emacs = %{version}-%{release}
+Provides:       spectool = %{spectool_version}
 Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
 Requires:       rpm-python, python, cpio, sed, perl
@@ -27,22 +30,23 @@
 development of Fedora RPM packages.  These tools are designed for Red
 Hat Linux 8.0 and higher.
 fedora-buildrpmtree     Create RPM build tree within user's home directory
-fedora-installdevkeys   Install developer keys in alternate RPM keyring
+fedora-installdevkeys   Install GPG keys in alternate RPM keyring
 fedora-kmodhelper       Helper script for building kernel module RPMs
 fedora-md5              Display the md5sum of all files in an RPM
 fedora-newrpmspec       Creates new .spec from template
-fedora-pkgannfmt        Produce output for fedora-package-announce
 fedora-rmdevelrpms      Find (and optionally remove) "development" RPMs
 fedora-rpmchecksig      Check package signatures using alternate RPM keyring
 fedora-rpminfo          Prints information about executables and libraries
 fedora-rpmvercmp        RPM version comparison checker
 fedora-extract          Extract various archives, "tar xvf" style
 fedora-diffarchive      Diff contents of two archives
-fedora-wipebuildtree    Erases all files within dirs created by buildrpmtree
+fedora-wipebuildtree    Erase all files within dirs created by buildrpmtree
+spectool                Expand and download sources and patches in specfiles
 
 
 %prep
-%setup -q
+%setup -q -a 1
+cp -p spectool*/README README.spectool
 
 
 %build
@@ -57,7 +61,6 @@
 install -pm 755 fedora-kmodhelper      $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-md5             $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-newrpmspec      $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-pkgannfmt       $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-rmdevelrpms     $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-rpmchecksig     $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 rpminfo                $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo
@@ -65,6 +68,7 @@
 install -pm 755 fedora-diffarchive     $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-rpmvercmp       $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-wipebuildtree   $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 spectool*/spectool     $RPM_BUILD_ROOT%{_bindir}
 
 install -dm 755 $RPM_BUILD_ROOT%{_prefix}/lib/rpm
 install -pm 755 check-buildroot check-rpaths* \
@@ -81,7 +85,6 @@
   install -dm 755 $RPM_BUILD_ROOT$dir
   ln -s %{_datadir}/fedora/emacs/fedora-init.el $RPM_BUILD_ROOT$dir
   touch $RPM_BUILD_ROOT$dir/fedora-init.elc
-  echo "%ghost $dir/fedora-init.el*" >> %{name}-%{version}.files
 done
 
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/fedora
@@ -95,39 +98,49 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerin -- emacs
-if [ -d %{emacs_sitestart_d} ] ; then
-  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{emacs_sitestart_d}
-fi
-
-%triggerin -- xemacs
-for dir in %{xemacs_sitestart_d} ; do
-  if [ -d $dir ] ; then
-    ln -sf %{_datadir}/fedora/emacs/fedora-init.el $dir
-  fi
-done
 
-%triggerun -- emacs
-[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/fedora-init.{el,elc} || :
+%triggerin -- emacs-common
+[ -d %{emacs_sitestart_d} ] && \
+  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{emacs_sitestart_d} || :
+
+%triggerin -- xemacs-common
+[ -d %{xemacs_sitestart_d} ] && \
+  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{xemacs_sitestart_d} || :
 
-%triggerun -- xemacs
-if [ $2 -eq 0 ] ; then
-  for dir in %{xemacs_sitestart_d} ; do
-    rm -f $dir/fedora-init.{el,elc} || :
-  done
-fi
+%triggerun -- emacs-common
+[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/fedora-init.el* || :
 
+%triggerun -- xemacs-common
+[ $2 -eq 0 ] && rm -f %{xemacs_sitestart_d}/fedora-init.el* || :
 
-%files -f %{name}-%{version}.files
+
+%files
 %defattr(-,root,root,-)
-%doc COPYING emacs/*.patch
+%doc COPYING README*
 %config(noreplace) %{_sysconfdir}/fedora
 %{_datadir}/fedora
 %{_bindir}/fedora-*
+%{_bindir}/spectool
 %{_prefix}/lib/rpm/check-*
+%ghost %{_datadir}/*emacs
 
 
 %changelog
+* Thu Mar 24 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-1
+- Make fedora-diffarchive work better with archives containing dirs without
+  read/execute permissions.
+- Sync "Epoch: 0" drops with Fedora Extras CVS.
+- Include Nils Philippsen's spectool.
+- Own (%%ghost'd) more dirs from the site-lisp dir hierarchies.
+- Drop trigger support pre-FC2 Emacs and XEmacs packages.
+- Drop rpm-spec-mode.el patch, no longer needed for FC2 Emacs and later.
+- Update URLs.
+- Drop developer GPG keys from the package, add Fedora Extras key.
+- Drop fedora-pkgannfmt, it's no longer relevant.
+- Remove pre-FC2 compatibility stuff from Perl spec template.
+- Don't try to remove gcc-java and related packages by default in rmdevelrpms.
+- Remove "full featured" spec template, convert newrpmspec to use -minimal.
+
 * Sun Feb  6 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3.1-1
 - Make buildrpmtree and wipebuildtree less dependent on a specific
   configuration (#147014, Ignacio Vazquez-Abrams).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Feb 2005 22:12:33 -0000	1.6
+++ sources	24 Mar 2005 16:45:41 -0000	1.7
@@ -1 +1,2 @@
-f602fb0535375b4591c67319de60040f  fedora-rpmdevtools-0.3.1.tar.bz2
+2f20b353cb5795cf01742f8ca08e8d29  fedora-rpmdevtools-1.0.tar.bz2
+f88484ff2a2d83f0cc1d37bc71300f7a  spectool-1.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Mar 24 16:45:43 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 24 Mar 2005 11:45:43 -0500
Subject: rpms/fedora-rpmdevtools/FC-3 .cvsignore, 1.6,
	1.7 fedora-rpmdevtools.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <200503241645.j2OGjh55007973@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fedora-rpmdevtools/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7964/FC-3

Modified Files:
	.cvsignore fedora-rpmdevtools.spec sources 
Log Message:
1.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Feb 2005 22:12:33 -0000	1.6
+++ .cvsignore	24 Mar 2005 16:45:41 -0000	1.7
@@ -1 +1,2 @@
-fedora-rpmdevtools-0.3.1.tar.bz2
+fedora-rpmdevtools-1.0.tar.bz2
+spectool-1.0.4.tar.bz2


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/fedora-rpmdevtools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-rpmdevtools.spec	9 Feb 2005 22:12:33 -0000	1.6
+++ fedora-rpmdevtools.spec	24 Mar 2005 16:45:41 -0000	1.7
@@ -1,22 +1,24 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
-%define xemacs_sitestart_d %{_prefix}/lib/xemacs/xemacs-packages/lisp/site-start.d %{_prefix}/lib64/xemacs/site-packages/lisp/site-start.d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%define spectool_version   1.0.4
 
 Name:           fedora-rpmdevtools
-Version:        0.3.1
+Version:        1.0
 Release:        1
-Epoch:          0
 Summary:        Fedora RPM Development Tools
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://www.fedora.us/
+URL:            http://fedora.redhat.com/
 # rpminfo upstream: http://people.redhat.com/twoerner/rpminfo/bin/
 Source0:        %{name}-%{version}.tar.bz2
+Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Provides:       %{name}-emacs = %{epoch}:%{version}-%{release}
-Obsoletes:      %{name}-emacs < 0:0.1.9
+Provides:       %{name}-emacs = %{version}-%{release}
+Provides:       spectool = %{spectool_version}
+Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
 Requires:       rpm-python, python, cpio, sed, perl
 # Minimal RPM build requirements
@@ -28,22 +30,23 @@
 development of Fedora RPM packages.  These tools are designed for Red
 Hat Linux 8.0 and higher.
 fedora-buildrpmtree     Create RPM build tree within user's home directory
-fedora-installdevkeys   Install developer keys in alternate RPM keyring
+fedora-installdevkeys   Install GPG keys in alternate RPM keyring
 fedora-kmodhelper       Helper script for building kernel module RPMs
 fedora-md5              Display the md5sum of all files in an RPM
 fedora-newrpmspec       Creates new .spec from template
-fedora-pkgannfmt        Produce output for fedora-package-announce
 fedora-rmdevelrpms      Find (and optionally remove) "development" RPMs
 fedora-rpmchecksig      Check package signatures using alternate RPM keyring
 fedora-rpminfo          Prints information about executables and libraries
 fedora-rpmvercmp        RPM version comparison checker
 fedora-extract          Extract various archives, "tar xvf" style
 fedora-diffarchive      Diff contents of two archives
-fedora-wipebuildtree    Erases all files within dirs created by buildrpmtree
+fedora-wipebuildtree    Erase all files within dirs created by buildrpmtree
+spectool                Expand and download sources and patches in specfiles
 
 
 %prep
-%setup -q
+%setup -q -a 1
+cp -p spectool*/README README.spectool
 
 
 %build
@@ -58,7 +61,6 @@
 install -pm 755 fedora-kmodhelper      $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-md5             $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-newrpmspec      $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-pkgannfmt       $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-rmdevelrpms     $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-rpmchecksig     $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 rpminfo                $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo
@@ -66,6 +68,7 @@
 install -pm 755 fedora-diffarchive     $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-rpmvercmp       $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-wipebuildtree   $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 spectool*/spectool     $RPM_BUILD_ROOT%{_bindir}
 
 install -dm 755 $RPM_BUILD_ROOT%{_prefix}/lib/rpm
 install -pm 755 check-buildroot check-rpaths* \
@@ -82,7 +85,6 @@
   install -dm 755 $RPM_BUILD_ROOT$dir
   ln -s %{_datadir}/fedora/emacs/fedora-init.el $RPM_BUILD_ROOT$dir
   touch $RPM_BUILD_ROOT$dir/fedora-init.elc
-  echo "%ghost $dir/fedora-init.el*" >> %{name}-%{version}.files
 done
 
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/fedora
@@ -96,39 +98,49 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerin -- emacs
-if [ -d %{emacs_sitestart_d} ] ; then
-  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{emacs_sitestart_d}
-fi
-
-%triggerin -- xemacs
-for dir in %{xemacs_sitestart_d} ; do
-  if [ -d $dir ] ; then
-    ln -sf %{_datadir}/fedora/emacs/fedora-init.el $dir
-  fi
-done
 
-%triggerun -- emacs
-[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/fedora-init.{el,elc} || :
+%triggerin -- emacs-common
+[ -d %{emacs_sitestart_d} ] && \
+  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{emacs_sitestart_d} || :
+
+%triggerin -- xemacs-common
+[ -d %{xemacs_sitestart_d} ] && \
+  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{xemacs_sitestart_d} || :
 
-%triggerun -- xemacs
-if [ $2 -eq 0 ] ; then
-  for dir in %{xemacs_sitestart_d} ; do
-    rm -f $dir/fedora-init.{el,elc} || :
-  done
-fi
+%triggerun -- emacs-common
+[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/fedora-init.el* || :
 
+%triggerun -- xemacs-common
+[ $2 -eq 0 ] && rm -f %{xemacs_sitestart_d}/fedora-init.el* || :
 
-%files -f %{name}-%{version}.files
+
+%files
 %defattr(-,root,root,-)
-%doc COPYING emacs/*.patch
+%doc COPYING README*
 %config(noreplace) %{_sysconfdir}/fedora
 %{_datadir}/fedora
 %{_bindir}/fedora-*
+%{_bindir}/spectool
 %{_prefix}/lib/rpm/check-*
+%ghost %{_datadir}/*emacs
 
 
 %changelog
+* Thu Mar 24 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-1
+- Make fedora-diffarchive work better with archives containing dirs without
+  read/execute permissions.
+- Sync "Epoch: 0" drops with Fedora Extras CVS.
+- Include Nils Philippsen's spectool.
+- Own (%%ghost'd) more dirs from the site-lisp dir hierarchies.
+- Drop trigger support pre-FC2 Emacs and XEmacs packages.
+- Drop rpm-spec-mode.el patch, no longer needed for FC2 Emacs and later.
+- Update URLs.
+- Drop developer GPG keys from the package, add Fedora Extras key.
+- Drop fedora-pkgannfmt, it's no longer relevant.
+- Remove pre-FC2 compatibility stuff from Perl spec template.
+- Don't try to remove gcc-java and related packages by default in rmdevelrpms.
+- Remove "full featured" spec template, convert newrpmspec to use -minimal.
+
 * Sun Feb  6 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3.1-1
 - Make buildrpmtree and wipebuildtree less dependent on a specific
   configuration (#147014, Ignacio Vazquez-Abrams).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Feb 2005 22:12:33 -0000	1.6
+++ sources	24 Mar 2005 16:45:41 -0000	1.7
@@ -1 +1,2 @@
-f602fb0535375b4591c67319de60040f  fedora-rpmdevtools-0.3.1.tar.bz2
+2f20b353cb5795cf01742f8ca08e8d29  fedora-rpmdevtools-1.0.tar.bz2
+f88484ff2a2d83f0cc1d37bc71300f7a  spectool-1.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Mar 24 16:57:49 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 24 Mar 2005 11:57:49 -0500
Subject: rpms/hddtemp/FC-3 .cvsignore, 1.4, 1.5 hddtemp.db, 1.2,
	1.3 hddtemp.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200503241657.j2OGvnYS008109@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/hddtemp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8099/FC-3

Modified Files:
	.cvsignore hddtemp.db hddtemp.spec sources 
Log Message:
0.3-beta13, hddtemp.db 2005-03-22.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jan 2005 13:32:11 -0000	1.4
+++ .cvsignore	24 Mar 2005 16:57:47 -0000	1.5
@@ -1 +1 @@
-hddtemp-0.3-beta12.tar.bz2
+hddtemp-0.3-beta13.tar.bz2


Index: hddtemp.db
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/FC-3/hddtemp.db,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hddtemp.db	22 Jan 2005 13:39:06 -0000	1.2
+++ hddtemp.db	24 Mar 2005 16:57:47 -0000	1.3
@@ -18,7 +18,6 @@
 # HITACHI HITACHI_DK23CA-10 9.8GB
 # HITACHI HITACHI_DK23CA-15 14.7GB
 # HITACHI HITACHI_DK23CA-30 29.3GB
-# MAXTOR MAXTOR 4K020H1 19.9GB
 # SAMSUNG SAMSUNG SV3012H 29.4GB
 # SEAGATE ST310210A 10.0GB
 # SEAGATE ST310211A 9.8GB
@@ -74,6 +73,7 @@
 "FUJITSU MPG3409AH.*"           194  C  "Fujitsu MPG3409AH E"
 "FUJITSU MPG3204AH"		194  C  "Fujitsu MPG3204AH"
 
+
 ########################################
 ############# Hitachi drives
 ########################################
@@ -141,18 +141,22 @@
 #"Maxtor 4D040H2"					9    C	"Maxtor DiamondMax D540X-4D"
 #"Maxtor 4D040H2"                        		0    C  "Maxtor 4D040H2"
 #"Maxtor 4D080H4"					12   C	"Maxtor DiamondMax D540X-4D"
+#"Maxtor 4D060H3"					12   C	"Maxtor DiamondMax D540X-4D"
 #"Maxtor 4D080H4"					9    C	"Maxtor DiamondMax D540X-4D"
 "MAXTOR 4K0[468]0H[234]"				194  C  "Maxtor DiamondMax D540X serie"
+"MAXTOR 4K020H1"					194  C  "Maxtor 4K020H1"
 "Maxtor 4[RA](25|16|12|08|06)0[LJ]0"			194  C  "Maxtor DiamondMax 16"
 "Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)"	0    C	"Maxtor DiamondMax Plus 40"
 "Maxtor 5A250J0"					194  C  "Maxtor MaXline II 250GB 5400RPM"
 "Maxtor 5A300J0"					194  C  "Maxtor 5A300J0"
 "Maxtor 5T0[24]0H[24]"					0    C  "Maxtor DiamondMax Plus 60"
+"Maxtor 6B(08|12|16|20|25|30)0[RSPM]0"			194  C  "Maxtor DiamondMax Plus 10"
 "Maxtor 6E0[234]0L0"					194  C  "Maxtor DiamondMax Plus 8"
 "MAXTOR 6L0[2468]0[LJ][1234]"				194  C  "Maxtor DiamondMax Plus D740X family"
-"Maxtor 6[YB](04|06|08|12|16|20|25)0[LPM]0"		194  C  "Maxtor DiamondMax Plus 9" 
+"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0"			194  C  "Maxtor DiamondMax Plus 9" 
 "Maxtor 7Y250[PM]0"					194  C	"Maxtor MaXLine Plus II 250GB 7200RPM"
 "Maxtor 94098U8"			 		11   C  "Maxtor DiamondMax 40 94098U8"
+"Maxtor 6B200P0" 194 C "Maxtor DiamondMax 10"
 
 ########################################
 ############# Quantum drives
@@ -185,7 +189,6 @@
 "SAMSUNG SV(0401|0802|1203|1604)N"			194  C  "Samsung SpinPoint V80 serie"
 
 
-
 ########################################
 ############# Seagate drives
 ########################################
@@ -234,6 +237,9 @@
 "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"
+"ST3250823A"				194  C  "Seagate Barracuda 7200.8 250GB"
+"ST3400832A"                            194  C  "Seagate Barracuda 7200.8 Plus 400GB"
+"ST9100823A"				194  C	"Seagate Momentus 5400.2 100GB"
 "ST94[08]11A"				194  C  "Seagate ST94011A"
 
 
@@ -247,6 +253,7 @@
 "TOSHIBA MK3017GAP"			0    C  "Toshiba MK3017GAP"
 "TOSHIBA MK3021GAS"			194  C  "Toshiba MK3021GAS"
 #"TOSHIBA MK4019GAX"			222  C  "Toshiba MK4019GAX"
+"TOSHIBA MK4025GAS"			194  C  "Toshiba MK4025GAS 40 Go"
 "TOSHIBA MK6021GAS"			194  C	"Toshiba MK6021GAS"
 "TOSHIBA MK6022GAX"			194  C	"Toshiba MK6022GAX"
 "TOSHIBA MK6025GAS"			194  C  "Toshiba MK6025GAS"
@@ -254,41 +261,47 @@
 "TOSHIBA MK8026GAX"			194  C  "Toshiba MK8026GAX" 
 "MK4025GAS"                             194  C  "Toshiba MK4025GAS"
 
-
-
 ########################################
 ############# Western Digital drives
 ########################################
 # WDC AC310100B and WDC AC2850F are reported not working
 # no more informations were given
-"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 WD360GD-00FNA0"				194 C "Western Digital SATA Raptor 36.7GB"
-"WDC WD400BB-(18CA|00DE)A0"     		  0 C "Western Digital Caviar WD400BB"
-"WDC WD400EB-00CPF0"				  0 C "Western Digital 400EB-00CPF0"
-"WDC WD400JB-00FMA0"				194 C "Western Digital Caviar 40GB Special Edition 8MB"
-"WDC WD600BB-32BSA0"				  0 C "Western Digital 600BB-32BSA0"
-"WDC WD600LB-00DNA0"            		194 C "Western Digital 60GB"
-"WDC WD800BB-00CAA1"				  0 C "Western Digital WD800BB-00CAA1"
-"WDC WD800BB-22DKA0"				194 C "Western Digital 800BB-22DKA0"
-"WDC WD800BB-32CCB0"				194 C "Western Digital 800BB-32CCB0"
-"WDC WD800BB-55JKA0"				194 C "Western Digital 800BB-55JKA0" 
-"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-00JJA0"				194 C "Western Digital WD800JB"
-"WDC WD800JD-00HKA0"				194 C "Western Digital SATA 80GB, 8MB Cache"
-"WDC WD1200JB-00(EV|FU|GV)A0"   		194 C "Western Digital Caviar 120GB Special Edition 8MB" 
-"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-00(EV|FU|GV)A0"   		194 C "Western Digital Caviar 160GB Special Edition 8MB"
-"WDC WD2000JB-(00EV|34EV|00FU|00GV|98GV)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
-"WDC WD2500JB-(00FU|32FU|00GV)A0"		194 C "Western Digital Caviar 250GB Special Edition 8MB"
-"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-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)A0"				194 C "Western Digital Caviar 40GB Special Edition 8MB"
+"WDC WD600BB-32BSA0"					  0 C "Western Digital 600BB-32BSA0"
+"WDC WD600LB-00DNA0"            			194 C "Western Digital 60GB"
+"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-55JKA0"					194 C "Western Digital 800BB-55JKA0" 
+"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-00JJA0"					194 C "Western Digital WD800JB"
+"WDC WD800JD-00HKA0"					194 C "Western Digital SATA 80GB, 8MB Cache"
+"WDC WD1200BB-00FTA0"					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 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-00(EV|FU|GV)A0"   			194 C "Western Digital Caviar 160GB Special Edition 8MB"
+"WDC WD2000JB-(00EV|34EV|00FU|00GV|55GV|98GV)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
+"WDC WD2500JB-(00FU|32FU|00GV)A0"			194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC WD2500PB-98FBA0"					194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC AC420400D"                 			231 C "Western Digital Caviar AC420400D"
+"WDC AC418000D"						231 C "Western Digital AC418000D"
+"WDC WD135BA"						231 C "Western Digital WD135BA"
 
 # not sure for next
 # "WDC WD1200JB-00CRA1"		9   C "Western Digital 1200JB-00CRA1"
 # "WDC WD273BA"			9   C "Western Digital WD273BA"
+
+# SATA drive with libata passthru
+"WDC WD740GD-00FL21.0"				194 C "Western Digital SATA Raptor"


Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/FC-3/hddtemp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hddtemp.spec	22 Jan 2005 13:39:06 -0000	1.7
+++ hddtemp.spec	24 Mar 2005 16:57:47 -0000	1.8
@@ -1,13 +1,15 @@
+%define beta    beta13
+
 Name:           hddtemp
 Version:        0.3
-Release:        0.2.beta12
+Release:        0.2.%{beta}
 Epoch:          0
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.guzu.net/linux/hddtemp.php
-Source0:        http://www.guzu.net/linux/hddtemp-0.3-beta12.tar.bz2
+Source0:        http://www.guzu.net/linux/%{name}-%{version}-%{beta}.tar.bz2
 Source1:        http://www.guzu.net/linux/hddtemp.db
 Source2:        %{name}.init
 Source3:        %{name}.sysconfig
@@ -24,7 +26,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-beta12
+%setup -q -n %{name}-%{version}-%{beta}
 %{__perl} -pi -e \
   's|/usr/share/misc/hddtemp\.db\b|%{_datadir}/misc/hddtemp.db|' \
   src/db.h doc/hddtemp.8
@@ -35,6 +37,7 @@
    s|__INITDIR__|%{_initrddir}|g ;
    s|__LOCKDIR__|%{_localstatedir}/lock|g' \
   hddtemp.init
+chmod -x contribs/analyze/*
 
 
 %build
@@ -92,6 +95,9 @@
 
 
 %changelog
+* Thu Mar 24 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3-0.2.beta13
+- 0.3-beta13, hddtemp.db 2005-03-22.
+
 * Sat Jan 22 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3-0.2.beta12
 - Update hddtemp.db to 2005-01-17.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Jan 2005 13:32:11 -0000	1.5
+++ sources	24 Mar 2005 16:57:47 -0000	1.6
@@ -1 +1 @@
-51f19658fa6e745eee62f6e100838884  hddtemp-0.3-beta12.tar.bz2
+36d98101daeac1ae8c1589a75aaab00c  hddtemp-0.3-beta13.tar.bz2



From fedora-extras-commits at redhat.com  Thu Mar 24 16:57:49 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 24 Mar 2005 11:57:49 -0500
Subject: rpms/hddtemp/devel .cvsignore, 1.4, 1.5 hddtemp.db, 1.3,
	1.4 hddtemp.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <200503241657.j2OGvnHv008116@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8099/devel

Modified Files:
	.cvsignore hddtemp.db hddtemp.spec sources 
Log Message:
0.3-beta13, hddtemp.db 2005-03-22.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jan 2005 13:32:11 -0000	1.4
+++ .cvsignore	24 Mar 2005 16:57:47 -0000	1.5
@@ -1 +1 @@
-hddtemp-0.3-beta12.tar.bz2
+hddtemp-0.3-beta13.tar.bz2


Index: hddtemp.db
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.db,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hddtemp.db	15 Mar 2005 11:59:32 -0000	1.3
+++ hddtemp.db	24 Mar 2005 16:57:47 -0000	1.4
@@ -18,7 +18,6 @@
 # HITACHI HITACHI_DK23CA-10 9.8GB
 # HITACHI HITACHI_DK23CA-15 14.7GB
 # HITACHI HITACHI_DK23CA-30 29.3GB
-# MAXTOR MAXTOR 4K020H1 19.9GB
 # SAMSUNG SAMSUNG SV3012H 29.4GB
 # SEAGATE ST310210A 10.0GB
 # SEAGATE ST310211A 9.8GB
@@ -145,6 +144,7 @@
 #"Maxtor 4D060H3"					12   C	"Maxtor DiamondMax D540X-4D"
 #"Maxtor 4D080H4"					9    C	"Maxtor DiamondMax D540X-4D"
 "MAXTOR 4K0[468]0H[234]"				194  C  "Maxtor DiamondMax D540X serie"
+"MAXTOR 4K020H1"					194  C  "Maxtor 4K020H1"
 "Maxtor 4[RA](25|16|12|08|06)0[LJ]0"			194  C  "Maxtor DiamondMax 16"
 "Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)"	0    C	"Maxtor DiamondMax Plus 40"
 "Maxtor 5A250J0"					194  C  "Maxtor MaXline II 250GB 5400RPM"


Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hddtemp.spec	15 Mar 2005 11:59:32 -0000	1.9
+++ hddtemp.spec	24 Mar 2005 16:57:47 -0000	1.10
@@ -1,12 +1,14 @@
+%define beta    beta13
+
 Name:           hddtemp
 Version:        0.3
-Release:        0.3.beta12
+Release:        0.3.%{beta}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.guzu.net/linux/hddtemp.php
-Source0:        http://www.guzu.net/linux/hddtemp-0.3-beta12.tar.bz2
+Source0:        http://www.guzu.net/linux/%{name}-%{version}-%{beta}.tar.bz2
 Source1:        http://www.guzu.net/linux/hddtemp.db
 Source2:        %{name}.init
 Source3:        %{name}.sysconfig
@@ -23,7 +25,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-beta12
+%setup -q -n %{name}-%{version}-%{beta}
 %{__perl} -pi -e \
   's|/usr/share/misc/hddtemp\.db\b|%{_datadir}/misc/hddtemp.db|' \
   src/db.h doc/hddtemp.8
@@ -34,6 +36,7 @@
    s|__INITDIR__|%{_initrddir}|g ;
    s|__LOCKDIR__|%{_localstatedir}/lock|g' \
   hddtemp.init
+chmod -x contribs/analyze/*
 
 
 %build
@@ -91,6 +94,9 @@
 
 
 %changelog
+* Thu Mar 24 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.3.beta13
+- 0.3-beta13, hddtemp.db 2005-03-22.
+
 * Tue Mar 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.3.beta12
 - Update hddtemp.db to 2005-03-15.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Jan 2005 13:32:11 -0000	1.5
+++ sources	24 Mar 2005 16:57:47 -0000	1.6
@@ -1 +1 @@
-51f19658fa6e745eee62f6e100838884  hddtemp-0.3-beta12.tar.bz2
+36d98101daeac1ae8c1589a75aaab00c  hddtemp-0.3-beta13.tar.bz2



From fedora-extras-commits at redhat.com  Thu Mar 24 17:48:04 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 12:48:04 -0500
Subject: rpms/libosip2 - New directory
Message-ID: <200503241748.j2OHm4ds009238@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/libosip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9231/libosip2

Log Message:
Directory /cvs/extras/rpms/libosip2 added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 17:48:04 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 12:48:04 -0500
Subject: rpms/libosip2/devel - New directory
Message-ID: <200503241748.j2OHm44T009241@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9231/libosip2/devel

Log Message:
Directory /cvs/extras/rpms/libosip2/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 17:48:25 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 12:48:25 -0500
Subject: rpms/libosip2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503241748.j2OHmPFt009300@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/libosip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9291

Added Files:
	Makefile import.log 
Log Message:
Setup of module libosip2


--- NEW FILE Makefile ---
# Top level Makefile for module libosip2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 17:48:25 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 12:48:25 -0500
Subject: rpms/libosip2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503241748.j2OHmPZ9009303@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9291/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libosip2


--- 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 Mar 24 17:49:12 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 12:49:12 -0500
Subject: rpms/libosip2 import.log,1.1,1.2
Message-ID: <200503241749.j2OHnC07009396@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/libosip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9387

Modified Files:
	import.log 
Log Message:
auto-import libosip2-2.2.0-1 on branch devel from libosip2-2.2.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libosip2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 17:48:23 -0000	1.1
+++ import.log	24 Mar 2005 17:49:10 -0000	1.2
@@ -0,0 +1 @@
+libosip2-2_2_0-1:HEAD:libosip2-2.2.0-1.src.rpm:1111686541



From fedora-extras-commits at redhat.com  Thu Mar 24 17:49:12 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 12:49:12 -0500
Subject: rpms/libosip2/devel libosip2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503241749.j2OHnCCp009400@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9387/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libosip2.spec 
Log Message:
auto-import libosip2-2.2.0-1 on branch devel from libosip2-2.2.0-1.src.rpm


--- NEW FILE libosip2.spec ---
Name:           libosip2
Version:        2.2.0
Release:        1
Summary:        oSIP is an implementation of SIP

Group:          System Environment/Libraries
License:        LGPL
URL:            http://www.gnu.org/software/osip/
Source0:        http://ftp.gnu.org/gnu/osip/libosip2-2.2.0.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
oSIP is an implementation of SIP.

SIP stands for the Session Initiation Protocol and is described by the rfc3261
(wich deprecates rfc2543). This library aims to provide multimedia and telecom
software developers an easy and powerful interface to initiate and control SIP
based sessions in their applications. SIP is a open standard replacement from
IETF for H.323.

%package        devel
Summary:        Development libraries for oSIP
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The GNU oSIP library is written in C and get no dependencies except the
standard C library. oSIP is thread safe and will generally be used in a
multi-threaded application. Nevertheless, this is optional.

oSIP is little in size and code and thus could be use to implement IP
soft-phone as well as embedded SIP software. oSIP is not limited to endpoint
agents, and can also be used to implement "SIP proxy".

oSIP does not intend to provide a high layer API for controlling "SIP Session"
at this step. Instead, it currently provides an API for the SIP message parser,
SDP message parser, and library to handle "SIP transactions" as defined by the
SIP document.

%prep
%setup -q

%build
%configure
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

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING ChangeLog FEATURES HISTORY NEWS README TODO
%{_libdir}/*.so.*
%{_mandir}/man[^3]/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/osip2
%{_includedir}/osipparser2
%{_libdir}/*.a
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc

%changelog
* Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.0-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 17:48:23 -0000	1.1
+++ .cvsignore	24 Mar 2005 17:49:10 -0000	1.2
@@ -0,0 +1 @@
+libosip2-2.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 17:48:23 -0000	1.1
+++ sources	24 Mar 2005 17:49:10 -0000	1.2
@@ -0,0 +1 @@
+f1237af0250c59b318bd64a59f5750ea  libosip2-2.2.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 18:33:28 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 13:33:28 -0500
Subject: devel/libosip2 libosip2.spec,1.1,1.2
Message-ID: <200503241833.j2OIXSEd010497@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/libosip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10491

Modified Files:
	libosip2.spec 
Log Message:
Renamed osip.1 and moved to -devel


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/devel/libosip2/libosip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libosip2.spec	24 Mar 2005 17:49:10 -0000	1.1
+++ libosip2.spec	24 Mar 2005 18:33:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libosip2
 Version:        2.2.0
-Release:        1
+Release:        2
 Summary:        oSIP is an implementation of SIP
 
 Group:          System Environment/Libraries
@@ -48,6 +48,7 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+rename .1 2.1 $RPM_BUILD_ROOT%{_mandir}/man1/osip.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,7 +61,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING ChangeLog FEATURES HISTORY NEWS README TODO
 %{_libdir}/*.so.*
-%{_mandir}/man[^3]/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -69,7 +69,11 @@
 %{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+%{_mandir}/man1/*
 
 %changelog
+* Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.0-2
+- Renamed osip.1 and moved to -devel
+
 * Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.0-1
 - Initial RPM release.



From fedora-extras-commits at redhat.com  Thu Mar 24 18:58:15 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 24 Mar 2005 13:58:15 -0500
Subject: rpms/contact-lookup-applet - New directory
Message-ID: <200503241858.j2OIwFfo010733@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10726/contact-lookup-applet

Log Message:
Directory /cvs/extras/rpms/contact-lookup-applet added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 18:58:15 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 24 Mar 2005 13:58:15 -0500
Subject: rpms/contact-lookup-applet/devel - New directory
Message-ID: <200503241858.j2OIwFsI010736@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-serv10726/contact-lookup-applet/devel

Log Message:
Directory /cvs/extras/rpms/contact-lookup-applet/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 18:58:29 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 24 Mar 2005 13:58:29 -0500
Subject: rpms/contact-lookup-applet Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503241858.j2OIwTuE010795@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10786

Added Files:
	Makefile import.log 
Log Message:
Setup of module contact-lookup-applet


--- NEW FILE Makefile ---
# Top level Makefile for module contact-lookup-applet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 18:58:29 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 24 Mar 2005 13:58:29 -0500
Subject: rpms/contact-lookup-applet/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200503241858.j2OIwTSt010798@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-serv10786/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module contact-lookup-applet


--- 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 Mar 24 18:58:57 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 24 Mar 2005 13:58:57 -0500
Subject: rpms/contact-lookup-applet import.log,1.1,1.2
Message-ID: <200503241858.j2OIwvn0010891@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10882

Modified Files:
	import.log 
Log Message:
auto-import contact-lookup-applet-0.10-2 on branch devel from contact-lookup-applet-0.10-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 18:58:27 -0000	1.1
+++ import.log	24 Mar 2005 18:58:55 -0000	1.2
@@ -0,0 +1 @@
+contact-lookup-applet-0_10-2:HEAD:contact-lookup-applet-0.10-2.src.rpm:1111690728



From fedora-extras-commits at redhat.com  Thu Mar 24 18:58:57 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 24 Mar 2005 13:58:57 -0500
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503241858.j2OIwv3C010895@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-serv10882/devel

Modified Files:
	.cvsignore sources 
Added Files:
	contact-lookup-applet.spec 
Log Message:
auto-import contact-lookup-applet-0.10-2 on branch devel from contact-lookup-applet-0.10-2.src.rpm


--- NEW FILE contact-lookup-applet.spec ---
Name:           contact-lookup-applet
Version:        0.10
Release:        2
Summary:        Contact Lookup Applet

Group:          Applications/Communications
License:        GPL
URL:            http://www.burtonini.com/blog/2004/Oct/27/
Source0:        http://www.burtonini.com/computing/contact-lookup-applet-0.10.tar.gz        
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.4.0
BuildRequires:  libgnomeui-devel >= 2.7.92
BuildRequires:  gnome-panel-devel >= 2.7.90
BuildRequires:  evolution-data-server-devel >= 1.0.0
BuildRequires: 	gettext

%description
This applet allows you to search your Evolution 2 address book for people. To
use, simply add it to your panel (Add to Panel -> Accessories -> Address book
Lookup), type a name into the field, and hit [return] or Search.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT}
%find_lang %{name}

%clean
rm -rf ${RPM_BUILD_ROOT}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libexecdir}/%{name}
%{_libdir}/bonobo/servers/*.server
%dir %{_datadir}/lookup-applet
%{_datadir}/lookup-applet/*.xml
%{_datadir}/lookup-applet/%{name}.glade

%changelog
* Mon Mar 21 2005 Brian Pepple <bdpepple at ameritech.net> - 0.10-2
- fixed ownership of %%{_datadir}.

* Mon Mar 14 2005 Brian Pepple <bdpepple at ameritech.net> - 0.10-1
- Initial Fedora Extras build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 18:58:27 -0000	1.1
+++ .cvsignore	24 Mar 2005 18:58:55 -0000	1.2
@@ -0,0 +1 @@
+contact-lookup-applet-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 18:58:27 -0000	1.1
+++ sources	24 Mar 2005 18:58:55 -0000	1.2
@@ -0,0 +1 @@
+d0a14459676a0f64e871d28dd334f5f8  contact-lookup-applet-0.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 19:27:22 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 24 Mar 2005 14:27:22 -0500
Subject: rpms/mknbi/devel mknbi.spec,1.5,1.6
Message-ID: <200503241927.j2OJRMPH011876@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mknbi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11863/devel

Modified Files:
	mknbi.spec 
Log Message:
ExclusiveArch: %%{ix86} -- does not build on PPC and x86_64 ATM and probably is of no use on PPC


Index: mknbi.spec
===================================================================
RCS file: /cvs/extras/rpms/mknbi/devel/mknbi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mknbi.spec	3 Mar 2005 23:01:24 -0000	1.5
+++ mknbi.spec	24 Mar 2005 19:27:20 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: 	Utility for creating network bootable images
 Name: 		mknbi
 Version:	1.4.0
-Release: 	3
+Release: 	4
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://etherboot.sourceforge.net/
@@ -9,6 +9,7 @@
 Patch1:		mknbi-makefile-optflags.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	perl
+ExclusiveArch:	%{ix86}
 %ifarch %{ix86}
 BuildRequires:	nasm
 %endif
@@ -49,6 +50,10 @@
 %{_mandir}/man1/mknbi.1*
 
 %changelog
+* Sun Mar 20 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 0:1.4.0-4
+- ExclusiveArch: %%{ix86} -- does not build on PPC and x86_64 ATM and
+  probably is of no use on PPC
+
 * Thu May 22 2003 Dams <anvil[AT]livna.org> 0:1.4.0-0.fdr.3
 - Added *.html in doc entry
 - slight change in build section



From fedora-extras-commits at redhat.com  Thu Mar 24 19:27:22 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 24 Mar 2005 14:27:22 -0500
Subject: rpms/mknbi/FC-3 mknbi.spec,1.4,1.5
Message-ID: <200503241927.j2OJRMEQ011873@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mknbi/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11863/FC-3

Modified Files:
	mknbi.spec 
Log Message:
ExclusiveArch: %%{ix86} -- does not build on PPC and x86_64 ATM and probably is of no use on PPC


Index: mknbi.spec
===================================================================
RCS file: /cvs/extras/rpms/mknbi/FC-3/mknbi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mknbi.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ mknbi.spec	24 Mar 2005 19:27:20 -0000	1.5
@@ -1,8 +1,7 @@
 Summary: 	Utility for creating network bootable images
 Name: 		mknbi
 Version:	1.4.0
-Release: 	3
-Epoch: 		0
+Release: 	4
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://etherboot.sourceforge.net/
@@ -10,6 +9,7 @@
 Patch1:		mknbi-makefile-optflags.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	perl
+ExclusiveArch:	%{ix86}
 %ifarch %{ix86}
 BuildRequires:	nasm
 %endif
@@ -50,6 +50,10 @@
 %{_mandir}/man1/mknbi.1*
 
 %changelog
+* Sun Mar 20 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 0:1.4.0-4
+- ExclusiveArch: %%{ix86} -- does not build on PPC and x86_64 ATM and
+  probably is of no use on PPC
+
 * Thu May 22 2003 Dams <anvil[AT]livna.org> 0:1.4.0-0.fdr.3
 - Added *.html in doc entry
 - slight change in build section
@@ -61,7 +65,7 @@
 
 * Tue May 20 2003 Dams <anvil[AT]livna.org> 0:1.4.0-0.fdr.1
 - nasm BuildRequires now arch dependent
-- Changed URL in Source0 
+- Changed URL in Source0
 - buildroot -> RPM_BUILD_ROOT
 - Modifed doc files
 
@@ -69,5 +73,5 @@
 - Updated to 1.4.0
 - Replaced /usr with %{_prefix} in sed
 
-* Sat Apr 26 2003 Dams <anvil[AT]livna.org> 
+* Sat Apr 26 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar 24 19:32:20 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 14:32:20 -0500
Subject: devel/linphone linphone-1.0.1-pkgconfig.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 linphone.spec, 1.7, 1.8 sources, 1.2,
	1.3 linphone-0.12.2-docs.patch, 1.1,
	NONE linphone-0.12.2-pkgconfig.patch, 1.2,
	NONE linphone-0.12.2-speex.patch, 1.1, NONE
Message-ID: <200503241932.j2OJWK8A011935@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11929

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.0.1-pkgconfig.patch 
Removed Files:
	linphone-0.12.2-docs.patch linphone-0.12.2-pkgconfig.patch 
	linphone-0.12.2-speex.patch 
Log Message:
Upstream update, separated ortp

linphone-1.0.1-pkgconfig.patch:

--- NEW FILE linphone-1.0.1-pkgconfig.patch ---
--- linphone-0.12.2/share/linphone.pc.in.orig	2005-03-23 21:10:49.392763407 -0500
+++ linphone-0.12.2/share/linphone.pc.in	2005-03-23 21:11:21.983938389 -0500
@@ -1,7 +1,7 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 
 Name: liblinphone
--- linphone-1.0.1/share/Makefile.in.pkgconfig	2005-03-23 03:17:48.000000000 -0500
+++ linphone-1.0.1/share/Makefile.in	2005-03-24 13:40:41.828557116 -0500
@@ -286,7 +286,7 @@
 #to be compliant with freedesktop.org:
 linphone_fddir = $(prefix)/share/applications/
 linphone_fd_DATA = linphone.desktop
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = linphone.pc
 EXTRA_DIST = $(LINPHONE_SOUNDS) \
 								$(LINPHONE_RINGS) \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/linphone/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Mar 2005 17:12:25 -0000	1.2
+++ .cvsignore	24 Mar 2005 19:32:18 -0000	1.3
@@ -1 +1 @@
-linphone-0.12.2.tar.gz
+linphone-1.0.1.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linphone.spec	24 Mar 2005 02:17:47 -0000	1.7
+++ linphone.spec	24 Mar 2005 19:32:18 -0000	1.8
@@ -1,19 +1,17 @@
 Name:           linphone
-Version:        0.12.2
-Release:        7
+Version:        1.0.1
+Release:        1
 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/0.12.2/source/linphone-0.12.2.tar.gz
-Patch:          linphone-0.12.2-docs.patch
-Patch1:         linphone-0.12.2-speex.patch
-Patch2:         linphone-0.12.2-pkgconfig.patch
+Source0:        http://simon.morlat.free.fr/download/1.0.x/source/linphone-1.0.1.tar.gz
+Patch:         linphone-1.0.1-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
-BuildRequires:  libosip-devel speex-devel gettext
+BuildRequires:  libosip2-devel speex-devel gettext desktop-file-utils
 
 %description
 Linphone is mostly sip compliant. It works successfully with these
@@ -37,15 +35,28 @@
 Requires:       %{name} = %{version}-%{release} glib2-devel
 
 %description    devel
-Libraries required to develop software with linphone
+Libraries and headers required to develop software with linphone.
+
+%package -n ortp
+Summary:        A C library implementing the RTP protocol (rfc1889)
+Group:          System Environment/Libraries
+Version:        0.7.0
+
+%description -n ortp
+oRTP is a LGPL licensed C library implementing the RTP protocol (rfc1889). It
+is available for most *nix clones (primilarly Linux and HP-UX), and Win32.
+
+%package -n ortp-devel
+Summary:        Development libraries for ortp
+Group:          Development/Libraries
+Version:        0.7.0
+
+%description -n ortp-devel
+Libraries and headers required to develop software with ortp.
 
 %prep
 %setup -q
-%patch -p 1 -b .docs
-%patch1 -p 1 -b .speex
-%patch2 -p 1 -b .pkgconfig
-rm -r $RPM_BUILD_DIR/linphone-0.12.2/oRTP/docs
-rm -r $RPM_BUILD_DIR/linphone-0.12.2/speex
+%patch -p 1 -b .pkgconfig
 
 %build
 %configure
@@ -55,6 +66,15 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
+desktop-file-install --vendor=fedora \
+  --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --remove-category Network \
+  --add-category X-Fedora \
+  --add-category Internet \
+  --add-category Telephony \
+  --add-category GTK \
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -63,30 +83,53 @@
 
 %postun -p /sbin/ldconfig
 
+%post -n ortp -p /sbin/ldconfig
+
+%postun -n ortp -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/*
 %{_libdir}/bonobo/servers/*.server
-%{_libdir}/*.so.*
+%{_libdir}/liblinphone.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
+%{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/apps/Internet/*.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/gtk-doc/html/mediastreamer
-%{_datadir}/linphonec
 %{_datadir}/pixmaps/linphone
 %{_datadir}/sounds/linphone
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/*
-%{_libdir}/*.a
-%{_libdir}/*.la
-%{_libdir}/*.so
+%{_datadir}/gtk-doc/html/ortp
+%{_includedir}/linphone
+%{_libdir}/liblinphone.a
+%{_libdir}/liblinphone.la
+%{_libdir}/liblinphone.so
 %{_libdir}/pkgconfig/*
 
+%files -n ortp
+%defattr(-,root,root)
+%doc oRTP/AUTHORS oRTP/ChangeLog oRTP/COPYING oRTP/NEWS oRTP/README oRTP/TODO oRTP/
+%{_libdir}/libortp.so.*
+
+%files -n ortp-devel
+%defattr(-,root,root)
+%{_includedir}/ortp
+%{_libdir}/libortp.a
+%{_libdir}/libortp.la
+%{_libdir}/libortp.so
+
 %changelog
+* Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.1-1
+- Upstream update
+- Separated ortp
+- Added %%doc
+
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-7
 - pkgconfig and -devel fixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/linphone/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Mar 2005 17:12:25 -0000	1.2
+++ sources	24 Mar 2005 19:32:18 -0000	1.3
@@ -1 +1 @@
-86c01dbbcdb41786229f51ec0994ff67  linphone-0.12.2.tar.gz
+d65f977dd6512b7725fcb2e2c9713e65  linphone-1.0.1.tar.gz


--- linphone-0.12.2-docs.patch DELETED ---


--- linphone-0.12.2-pkgconfig.patch DELETED ---


--- linphone-0.12.2-speex.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar 24 19:39:45 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 24 Mar 2005 14:39:45 -0500
Subject: rpms/synce/FC-3 synce.spec,1.1,1.2
Message-ID: <200503241939.j2OJdjrk011977@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/synce/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11968/FC-3

Modified Files:
	synce.spec 
Log Message:
ExcludeArch: x86_64; see #148003


Index: synce.spec
===================================================================
RCS file: /cvs/extras/rpms/synce/FC-3/synce.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synce.spec	8 Dec 2004 15:47:19 -0000	1.1
+++ synce.spec	24 Mar 2005 19:39:43 -0000	1.2
@@ -13,6 +13,7 @@
 Patch0: synce-rra-0.9.0-ambiguous.patch
 URL: http://synce.sourceforge.net/
 Distribution: Fedora Core
+ExcludeArch: x86_64
 Requires: ppp
 BuildRoot: /var/tmp/%{name}-%{version}-root
 
@@ -154,6 +155,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Mar 24 2005 Thorsten Leemhuis <fedora[at]leemhuis[dot]info> 0.9.0-2
+- ExcludeArch: x86_64; see #148003
+
 * Thu Aug 19 2004 Cristian Gafton <gafton at redhat.com> 0.9.0-1
 - build new spec file from scratch that groups all the little modules
   together to avoid the proliferation of another half dozen single



From fedora-extras-commits at redhat.com  Thu Mar 24 19:39:45 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 24 Mar 2005 14:39:45 -0500
Subject: rpms/synce/devel synce.spec,1.2,1.3
Message-ID: <200503241939.j2OJdjlx011981@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/synce/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11968/devel

Modified Files:
	synce.spec 
Log Message:
ExcludeArch: x86_64; see #148003


Index: synce.spec
===================================================================
RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- synce.spec	5 Mar 2005 21:10:24 -0000	1.2
+++ synce.spec	24 Mar 2005 19:39:43 -0000	1.3
@@ -12,6 +12,7 @@
 Source5: libmimedir-0.3.tar.gz
 Patch0: synce-rra-0.9.0-ambiguous.patch
 URL: http://synce.sourceforge.net/
+ExcludeArch: x86_64
 Requires: ppp
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -153,6 +154,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Mar 24 2005 Thorsten Leemhuis <fedora[at]leemhuis[dot]info> 0.9.0-2
+- ExcludeArch: x86_64; see #148003
+
 * Thu Aug 19 2004 Cristian Gafton <gafton at redhat.com> 0.9.0-1
 - build new spec file from scratch that groups all the little modules
   together to avoid the proliferation of another half dozen single



From shahms at shahms.com  Thu Mar 24 20:21:47 2005
From: shahms at shahms.com (Shahms King)
Date: Thu, 24 Mar 2005 12:21:47 -0800
Subject: APPROVED: tetex-{beamer,pgf,xcolor,bytefield}
Message-ID: <1111695707.12534.35.camel@shahms.mesd.k12.or.us>

tetex-beamer
------------
Summary: A LaTeX class for producing presentations and slides
Reviewer: Shahms King
Maintainer: Jos? Pedro Oliveira

tetex-pgf
---------
Summary: Create PostScript and PDF graphics in TeX
Reviewer: Shahms King
Maintainer: Jos? Pedro Oliveira

tetex-xcolor
------------
Summary: Driver-independent color extensions for LaTeX and pdfLaTeX
Reviewer: Shahms King
Maintainer: Jos? Pedro Oliveira

tetex-bytefield
---------------
Summary: Create illustrations for network protocol specifications
Reviewer: Shahms King
Maintainer: Jos? Pedro Oliveira

-- 
Shahms E. King <shahms at shahms.com>
Multnomah ESD

Public Key:
http://shahms.mesd.k12.or.us/~sking/shahms.asc
Fingerprint:
1612 054B CE92 8770 F1EA  AB1B FEAB 3636 45B2 D75B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050324/e510daee/attachment.sig>

From fedora-extras-commits at redhat.com  Thu Mar 24 20:30:28 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 15:30:28 -0500
Subject: rpms/zope/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 zope.spec, 1.3,
	1.4
Message-ID: <200503242030.j2OKUS3L013027@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/zope/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13018/FC-3

Modified Files:
	.cvsignore sources zope.spec 
Log Message:
- version 2.7.5
- drop Epoch
- change release tag for FC3/FC4
- convert some tabs into spaces




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Jan 2005 22:57:17 -0000	1.3
+++ .cvsignore	24 Mar 2005 20:30:26 -0000	1.4
@@ -1 +1 @@
-Zope-2.7.4-0.tgz
+Zope-2.7.5-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jan 2005 22:57:17 -0000	1.3
+++ sources	24 Mar 2005 20:30:26 -0000	1.4
@@ -1 +1 @@
-97c310f1de4609956c176588b08b25c5  Zope-2.7.4-0.tgz
+5b5c5823c62370d9f7325c6014a49d8b  Zope-2.7.5-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/zope.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zope.spec	2 Mar 2005 21:21:05 -0000	1.3
+++ zope.spec	24 Mar 2005 20:30:26 -0000	1.4
@@ -10,15 +10,14 @@
 %define zopectl        %{_bindir}/zopectl
 %define runzope        %{_bindir}/runzope
 
-Name: 	 zope
+Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.7.4
-Release: 1
-Epoch:	 0
+Version: 2.7.5
+Release: 1.fc3
 License: ZPL
 Group: 	 System Environment/Daemons
-URL:	 http://www.zope.org/
-Source:	 http://zope.org/Products/Zope/2.7.4/Zope-2.7.4-0.tgz
+URL:     http://www.zope.org/
+Source0: http://zope.org/Products/Zope/2.7.5/Zope-2.7.5-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -45,7 +44,7 @@
 
 
 %prep
-%setup -q -n Zope-%{version}-0
+%setup -q -n Zope-%{version}-final
 # Do not use -b option, or we'll install the backup too
 %patch0 -p1 -b .config
 rm -f skel/etc/zope.conf.in.config
@@ -181,6 +180,12 @@
 
 
 %changelog
+* Thu Mar 24 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-1.fc3
+- version 2.7.5
+- drop Epoch
+- change release tag for FC3
+- convert some tabs into spaces
+
 * Wed Jan 26 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.4-1
 - version 2.7.4
 - flag the documentation as %%doc



From fedora-extras-commits at redhat.com  Thu Mar 24 20:30:28 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 15:30:28 -0500
Subject: rpms/zope/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 zope.spec,
	1.7, 1.8
Message-ID: <200503242030.j2OKUSA0013033@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/zope/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13018/devel

Modified Files:
	.cvsignore sources zope.spec 
Log Message:
- version 2.7.5
- drop Epoch
- change release tag for FC3/FC4
- convert some tabs into spaces




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Jan 2005 22:57:17 -0000	1.3
+++ .cvsignore	24 Mar 2005 20:30:26 -0000	1.4
@@ -1 +1 @@
-Zope-2.7.4-0.tgz
+Zope-2.7.5-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jan 2005 22:57:17 -0000	1.3
+++ sources	24 Mar 2005 20:30:26 -0000	1.4
@@ -1 +1 @@
-97c310f1de4609956c176588b08b25c5  Zope-2.7.4-0.tgz
+5b5c5823c62370d9f7325c6014a49d8b  Zope-2.7.5-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- zope.spec	5 Mar 2005 20:07:10 -0000	1.7
+++ zope.spec	24 Mar 2005 20:30:26 -0000	1.8
@@ -12,12 +12,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.7.4
-Release: 1
+Version: 2.7.5
+Release: 1.fc4
 License: ZPL
-Group:   System Environment/Daemons
+Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source:  http://zope.org/Products/Zope/2.7.4/Zope-2.7.4-0.tgz
+Source0: http://zope.org/Products/Zope/2.7.5/Zope-2.7.5-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -28,8 +28,8 @@
 Source6: zope.logrotate.cron.in
 Patch0:  zope-2.7.3-config.patch
 
-BuildRequires: python-devel >= %{python_minver}
-BuildRequires: python >= %{python_minver}
+BuildRequires: python-devel >= %{python_minver} 
+BuildRequires: python >= %{python_minver} 
 Requires:      python >= %{python_minver}
 
 Requires(pre): /usr/sbin/useradd
@@ -44,7 +44,7 @@
 
 
 %prep
-%setup -q -n Zope-%{version}-0
+%setup -q -n Zope-%{version}-final
 # Do not use -b option, or we'll install the backup too
 %patch0 -p1 -b .config
 rm -f skel/etc/zope.conf.in.config
@@ -58,7 +58,7 @@
   --with-python=%{__python} \
   --prefix=$RPM_BUILD_ROOT%{zope_home} \
   --optimize
-
+  
 #    --no-compile
 
 make %{?_smp_mflags}
@@ -146,7 +146,7 @@
 
 
 
-%files
+%files 
 %defattr(-, root, root, -)
 %doc %{zope_home}/doc
 %doc docs README.Fedora
@@ -180,6 +180,12 @@
 
 
 %changelog
+* Thu Mar 24 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-1.fc4
+- version 2.7.5
+- drop Epoch
+- change release tag for FC4
+- convert some tabs into spaces
+
 * Wed Jan 26 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.4-1
 - version 2.7.4
 - flag the documentation as %%doc
@@ -217,7 +223,7 @@
 - drop patch 1, fixed upstream
 
 * Tue Aug 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.3
-- add hotfix from Zope.org:
+- add hotfix from Zope.org: 
   http://zope.org/Products/Zope/Hotfix-200400807/Hotfix-20040807-alert
 
 * Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.2
@@ -233,8 +239,8 @@
 - 2.7.1
 - move files created in %%post back into rpm.  Unowned files are bad.
 - make (theoretically) buildable for all rh73-rh90,fc1/2,el3
-  NOTE: lowerred python_minver to 2.2.2 to test builds, though (most)
-  docs claim 2.3.3 is required.  (??)
+  NOTE: lowerred python_minver to 2.2.2 to test builds, though (most) 
+  docs claim 2.3.3 is required.  (??) 
 - don't use Requires(preun,postun)
 - use %%_smp_mflags
 



From fedora-extras-commits at redhat.com  Thu Mar 24 21:22:34 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 24 Mar 2005 16:22:34 -0500
Subject: rpms/perl-Config-Tiny/FC-3 .cvsignore, 1.2,
	1.3 perl-Config-Tiny.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200503242122.j2OLMYGd014218@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14209/FC-3

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.01.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:58:14 -0000	1.2
+++ .cvsignore	24 Mar 2005 21:22:32 -0000	1.3
@@ -1 +1 @@
-Config-Tiny-2.00.tar.gz
+Config-Tiny-2.01.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-3/perl-Config-Tiny.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Config-Tiny.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ perl-Config-Tiny.spec	24 Mar 2005 21:22:32 -0000	1.5
@@ -1,20 +1,19 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Config-Tiny
-Version:        2.00
+Version:        2.01
 Release:        1
-Epoch:          0
 Summary:        Perl module for reading and writing .ini style configuration files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Config-Tiny/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.00.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.01.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::More), perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -56,6 +55,9 @@
 
 
 %changelog
+* Thu Mar 24 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.01-1
+- Updated to 2.01.
+
 * Sun Jul 25 2004 Marius L. J??hndal <mariuslj at ifi.uio.no> - 0:2.00-0.fdr.1
 - Updated to 2.00.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:58:14 -0000	1.2
+++ sources	24 Mar 2005 21:22:32 -0000	1.3
@@ -1 +1 @@
-a5b5d3b54f4c1c1574fee183103b0d41  Config-Tiny-2.00.tar.gz
+7ce2524c0eee4336f156caf729c17b02  Config-Tiny-2.01.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 21:22:34 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 24 Mar 2005 16:22:34 -0500
Subject: rpms/perl-Config-Tiny/devel .cvsignore, 1.2,
	1.3 perl-Config-Tiny.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200503242122.j2OLMYvG014224@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-serv14209/devel

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.01.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:58:14 -0000	1.2
+++ .cvsignore	24 Mar 2005 21:22:32 -0000	1.3
@@ -1 +1 @@
-Config-Tiny-2.00.tar.gz
+Config-Tiny-2.01.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Config-Tiny.spec	3 Mar 2005 23:46:26 -0000	1.5
+++ perl-Config-Tiny.spec	24 Mar 2005 21:22:32 -0000	1.6
@@ -1,19 +1,19 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Config-Tiny
-Version:        2.00
+Version:        2.01
 Release:        1
 Summary:        Perl module for reading and writing .ini style configuration files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Config-Tiny/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.00.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.01.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::More), perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Mar 24 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.01-1
+- Updated to 2.01.
+
 * Sun Jul 25 2004 Marius L. J??hndal <mariuslj at ifi.uio.no> - 0:2.00-0.fdr.1
 - Updated to 2.00.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:58:14 -0000	1.2
+++ sources	24 Mar 2005 21:22:32 -0000	1.3
@@ -1 +1 @@
-a5b5d3b54f4c1c1574fee183103b0d41  Config-Tiny-2.00.tar.gz
+7ce2524c0eee4336f156caf729c17b02  Config-Tiny-2.01.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 25 09:48:43 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 25 Mar 2005 04:48:43 -0500
Subject: rpms/snownews/devel snownews-1.5.6.1-destdir.patch, NONE,
	1.1 snownews-1.5.6.1-manpath.patch, NONE,
	1.1 snownews-1.5.6.1-nostrip.patch, NONE, 1.1 snownews.spec,
	1.3, 1.4 snownews-1.5.3-buildroot.patch, 1.1,
	NONE snownews-1.5.3-manpath.patch, 1.1,
	NONE snownews-1.5.3-nostrip.patch, 1.1, NONE
Message-ID: <200503250948.j2P9mhj8031408@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/snownews/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31394

Modified Files:
	snownews.spec 
Added Files:
	snownews-1.5.6.1-destdir.patch snownews-1.5.6.1-manpath.patch 
	snownews-1.5.6.1-nostrip.patch 
Removed Files:
	snownews-1.5.3-buildroot.patch snownews-1.5.3-manpath.patch 
	snownews-1.5.3-nostrip.patch 
Log Message:
1.5.6.1 and macroize dirs


snownews-1.5.6.1-destdir.patch:

--- NEW FILE snownews-1.5.6.1-destdir.patch ---
--- snownews-1.5.6.1/Makefile.orig	2005-02-25 00:13:44.962280604 -0500
+++ snownews-1.5.6.1/Makefile	2005-02-25 00:19:45.916256515 -0500
@@ -83,7 +83,7 @@
 		if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/$$L/man1" ]; then \
 			mkdir -p $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \
 		fi; \
-		$(INSTALL) -m 0644 $(DESTDIR)$(MAN)/$$L/snownews.1 $(PREFIX)/share/man/$$L/man1; \
+		$(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \
 	done
 
 ### Cleanup ###

snownews-1.5.6.1-manpath.patch:

--- NEW FILE snownews-1.5.6.1-manpath.patch ---
--- snownews-1.5.6.1/Makefile.orig	2004-12-09 06:29:08.000000000 -0500
+++ snownews-1.5.6.1/Makefile	2005-02-25 00:08:02.098175876 -0500
@@ -73,17 +73,17 @@
 	done
 
 install-man: manpages
-	if [ ! -d "$(DESTDIR)$(PREFIX)/man/man1" ]; then \
-		mkdir -p $(DESTDIR)$(PREFIX)/man/man1; \
+	if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/man1" ]; then \
+		mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1; \
 	fi
-	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/man/man1
-	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/man/man1
+	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/share/man/man1
+	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/share/man/man1
 	
 	for L in $(LANGS); do \
-		if [ ! -d "$(DESTDIR)$(PREFIX)/man/$$L/man1" ]; then \
-			mkdir -p $(DESTDIR)$(PREFIX)/man/$$L/man1; \
+		if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/$$L/man1" ]; then \
+			mkdir -p $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \
 		fi; \
-		$(INSTALL) -m 0644 $(DESTDIR)$(MAN)/$$L/snownews.1 $(PREFIX)/man/$$L/man1; \
+		$(INSTALL) -m 0644 $(DESTDIR)$(MAN)/$$L/snownews.1 $(PREFIX)/share/man/$$L/man1; \
 	done
 
 ### Cleanup ###

snownews-1.5.6.1-nostrip.patch:

--- NEW FILE snownews-1.5.6.1-nostrip.patch ---
--- snownews-1.5.6.1/Makefile.orig	2005-02-25 00:09:25.931552079 -0500
+++ snownews-1.5.6.1/Makefile	2005-02-25 00:12:47.288028006 -0500
@@ -60,7 +60,7 @@
 	if [ ! -d "$(DESTDIR)$(PREFIX)/bin" ]; then \
 		mkdir -p $(DESTDIR)$(PREFIX)/bin; \
 	fi
-	$(INSTALL) -s snownews $(DESTDIR)$(PREFIX)/bin
+	$(INSTALL) snownews $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL) opml2snow $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL) snowsync $(DESTDIR)$(PREFIX)/bin
 


Index: snownews.spec
===================================================================
RCS file: /cvs/extras/rpms/snownews/devel/snownews.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- snownews.spec	5 Mar 2005 21:10:24 -0000	1.3
+++ snownews.spec	25 Mar 2005 09:48:41 -0000	1.4
@@ -1,16 +1,16 @@
-Name:		snownews
-Version:	1.5.3
-Release:	4
-Summary:	RSS/RDF news aggregator
-Group:		Applications/Internet
-License:	GPL
-URL:		http://home.kcore.de/~kiza/software/snownews
-Source0:	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.3.tar.gz
+Name: 		snownews
+Version: 	1.5.6.1
+Release: 	3
+Summary: 	A text mode RSS/RDF newsreader
+Group: 		Applications/Internet
+License: 	GPL
+Url:		http://home.kcore.de/~kiza/software/snownews
+Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.6.1.tar.gz
 Patch0:		snownews-1.5.3-nocheck.patch
-Patch1:		snownews-1.5.3-manpath.patch
-Patch2:		snownews-1.5.3-nostrip.patch
-Patch3:		snownews-1.5.3-buildroot.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:		snownews-1.5.6.1-manpath.patch
+Patch2:		snownews-1.5.6.1-nostrip.patch
+Patch3:		snownews-1.5.6.1-destdir.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	gettext
@@ -19,7 +19,7 @@
 Snownews  is  a text mode RSS/RDF newsreader. It supports all versions
 of RSS natively and supports other formats via plugins.
 
-The program depends on ncurses for the user interface and uses libxml2
+The program depends on ncurses for the user interface and uses libxml2 
 for XML parsing. ncurses must be at least version 5.0. It should work
 with any version of libxml2.
 
@@ -31,12 +31,12 @@
 %patch3 -p1
 
 %build
-./configure --prefix=/usr --charset=UTF-8
+./configure --prefix=%{_prefix} --charset=UTF-8
 EXTRA_CFLAGS="$RPM_OPT_FLAGS -fpie" EXTRA_LDFLAGS="-pie" make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install
+make DESTDIR="$RPM_BUILD_ROOT" install
 %find_lang %name
 
 %clean
@@ -45,12 +45,23 @@
 %files -f %name.lang
 %defattr(-,root,root)
 %doc README* AUTHOR COPYING CREDITS Changelog
-/usr/bin/opml2snow
-/usr/bin/snownews
-/usr/share/man/man1/*
-/usr/share/man/*/man1/*
+%{_bindir}/opml2snow
+%{_bindir}/snownews
+%{_bindir}/snowsync
+%{_mandir}/man1/*
+%{_mandir}/*/man1/*
 
 %changelog
+* Thu Mar 24 2005 Warren Togami <wtogami at redhat.com> - 1.5.6.1-3
+- macroize dirs
+
+* Tue Mar 15 2005 Zing <shishz at hotpop.com> - 1.5.6.1-2
+- enable snowsync
+
+* Thu Feb 24 2005 Zing <shishz at hotpop.com> - 1.5.6.1-1
+- new upstream
+- remove snowsync for now. (we need perl-XML-LibXSLT)
+
 * Fri Jul 23 2004 Zing <shishz at hotpop.com> - 1.5.3-0.fdr.4
 - More cleanups from QA (M.Schwendt)
 -	do the buildroot better (grrr hopefully)


--- snownews-1.5.3-buildroot.patch DELETED ---


--- snownews-1.5.3-manpath.patch DELETED ---


--- snownews-1.5.3-nostrip.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar 25 10:17:55 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 25 Mar 2005 05:17:55 -0500
Subject: rpms/snownews/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200503251017.j2PAHt91032549@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/snownews/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32534

Modified Files:
	.cvsignore sources 
Log Message:
add sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/snownews/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:20:53 -0000	1.2
+++ .cvsignore	25 Mar 2005 10:17:52 -0000	1.3
@@ -1 +1,2 @@
 snownews-1.5.3.tar.gz
+snownews-1.5.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snownews/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:20:53 -0000	1.2
+++ sources	25 Mar 2005 10:17:52 -0000	1.3
@@ -1 +1 @@
-35aa49e42ac5232bf8ac0163e3793d4a  snownews-1.5.3.tar.gz
+466ca82e8df03d6126d6cc0f20772025  snownews-1.5.6.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 25 10:18:20 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 25 Mar 2005 05:18:20 -0500
Subject: rpms/snownews/devel snownews.spec,1.4,1.5
Message-ID: <200503251018.j2PAIKMf032601@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/snownews/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32587

Modified Files:
	snownews.spec 
Log Message:
bump for FC4 build



Index: snownews.spec
===================================================================
RCS file: /cvs/extras/rpms/snownews/devel/snownews.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- snownews.spec	25 Mar 2005 09:48:41 -0000	1.4
+++ snownews.spec	25 Mar 2005 10:18:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name: 		snownews
 Version: 	1.5.6.1
-Release: 	3
+Release: 	3.FC4
 Summary: 	A text mode RSS/RDF newsreader
 Group: 		Applications/Internet
 License: 	GPL



From fedora-extras-commits at redhat.com  Fri Mar 25 10:20:18 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 25 Mar 2005 05:20:18 -0500
Subject: rpms/snownews/FC-3 snownews-1.5.6.1-destdir.patch, NONE,
	1.1 snownews-1.5.6.1-manpath.patch, NONE,
	1.1 snownews-1.5.6.1-nostrip.patch, NONE, 1.1 snownews.spec,
	1.2, 1.3 sources, 1.2, 1.3 snownews-1.5.3-buildroot.patch, 1.1,
	NONE snownews-1.5.3-manpath.patch, 1.1,
	NONE snownews-1.5.3-nostrip.patch, 1.1, NONE
Message-ID: <200503251020.j2PAKIKd032694@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/snownews/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32680

Modified Files:
	snownews.spec sources 
Added Files:
	snownews-1.5.6.1-destdir.patch snownews-1.5.6.1-manpath.patch 
	snownews-1.5.6.1-nostrip.patch 
Removed Files:
	snownews-1.5.3-buildroot.patch snownews-1.5.3-manpath.patch 
	snownews-1.5.3-nostrip.patch 
Log Message:
macroize dirs, prep for FC3 build


snownews-1.5.6.1-destdir.patch:

--- NEW FILE snownews-1.5.6.1-destdir.patch ---
--- snownews-1.5.6.1/Makefile.orig	2005-02-25 00:13:44.962280604 -0500
+++ snownews-1.5.6.1/Makefile	2005-02-25 00:19:45.916256515 -0500
@@ -83,7 +83,7 @@
 		if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/$$L/man1" ]; then \
 			mkdir -p $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \
 		fi; \
-		$(INSTALL) -m 0644 $(DESTDIR)$(MAN)/$$L/snownews.1 $(PREFIX)/share/man/$$L/man1; \
+		$(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \
 	done
 
 ### Cleanup ###

snownews-1.5.6.1-manpath.patch:

--- NEW FILE snownews-1.5.6.1-manpath.patch ---
--- snownews-1.5.6.1/Makefile.orig	2004-12-09 06:29:08.000000000 -0500
+++ snownews-1.5.6.1/Makefile	2005-02-25 00:08:02.098175876 -0500
@@ -73,17 +73,17 @@
 	done
 
 install-man: manpages
-	if [ ! -d "$(DESTDIR)$(PREFIX)/man/man1" ]; then \
-		mkdir -p $(DESTDIR)$(PREFIX)/man/man1; \
+	if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/man1" ]; then \
+		mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1; \
 	fi
-	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/man/man1
-	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/man/man1
+	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/share/man/man1
+	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/share/man/man1
 	
 	for L in $(LANGS); do \
-		if [ ! -d "$(DESTDIR)$(PREFIX)/man/$$L/man1" ]; then \
-			mkdir -p $(DESTDIR)$(PREFIX)/man/$$L/man1; \
+		if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/$$L/man1" ]; then \
+			mkdir -p $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \
 		fi; \
-		$(INSTALL) -m 0644 $(DESTDIR)$(MAN)/$$L/snownews.1 $(PREFIX)/man/$$L/man1; \
+		$(INSTALL) -m 0644 $(DESTDIR)$(MAN)/$$L/snownews.1 $(PREFIX)/share/man/$$L/man1; \
 	done
 
 ### Cleanup ###

snownews-1.5.6.1-nostrip.patch:

--- NEW FILE snownews-1.5.6.1-nostrip.patch ---
--- snownews-1.5.6.1/Makefile.orig	2005-02-25 00:09:25.931552079 -0500
+++ snownews-1.5.6.1/Makefile	2005-02-25 00:12:47.288028006 -0500
@@ -60,7 +60,7 @@
 	if [ ! -d "$(DESTDIR)$(PREFIX)/bin" ]; then \
 		mkdir -p $(DESTDIR)$(PREFIX)/bin; \
 	fi
-	$(INSTALL) -s snownews $(DESTDIR)$(PREFIX)/bin
+	$(INSTALL) snownews $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL) opml2snow $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL) snowsync $(DESTDIR)$(PREFIX)/bin
 


Index: snownews.spec
===================================================================
RCS file: /cvs/extras/rpms/snownews/FC-3/snownews.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- snownews.spec	10 Dec 2004 22:03:11 -0000	1.2
+++ snownews.spec	25 Mar 2005 10:20:16 -0000	1.3
@@ -1,15 +1,15 @@
 Name: 		snownews
-Version: 	1.5.3
-Release: 	4
-Summary: 	A RSS/RDF news aggregator.
+Version: 	1.5.6.1
+Release: 	3.FC3
+Summary: 	A text mode RSS/RDF newsreader
 Group: 		Applications/Internet
 License: 	GPL
 Url:		http://home.kcore.de/~kiza/software/snownews
-Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.3.tar.gz
+Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.6.1.tar.gz
 Patch0:		snownews-1.5.3-nocheck.patch
-Patch1:		snownews-1.5.3-manpath.patch
-Patch2:		snownews-1.5.3-nostrip.patch
-Patch3:		snownews-1.5.3-buildroot.patch
+Patch1:		snownews-1.5.6.1-manpath.patch
+Patch2:		snownews-1.5.6.1-nostrip.patch
+Patch3:		snownews-1.5.6.1-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
@@ -31,12 +31,12 @@
 %patch3 -p1
 
 %build
-./configure --prefix=/usr --charset=UTF-8
+./configure --prefix=%{_prefix} --charset=UTF-8
 EXTRA_CFLAGS="$RPM_OPT_FLAGS -fpie" EXTRA_LDFLAGS="-pie" make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install
+make DESTDIR="$RPM_BUILD_ROOT" install
 %find_lang %name
 
 %clean
@@ -45,12 +45,23 @@
 %files -f %name.lang
 %defattr(-,root,root)
 %doc README* AUTHOR COPYING CREDITS Changelog
-/usr/bin/opml2snow
-/usr/bin/snownews
-/usr/share/man/man1/*
-/usr/share/man/*/man1/*
+%{_bindir}/opml2snow
+%{_bindir}/snownews
+%{_bindir}/snowsync
+%{_mandir}/man1/*
+%{_mandir}/*/man1/*
 
 %changelog
+* Thu Mar 24 2005 Warren Togami <wtogami at redhat.com> - 1.5.6.1-3
+- macroize dirs
+
+* Tue Mar 15 2005 Zing <shishz at hotpop.com> - 1.5.6.1-2
+- enable snowsync
+
+* Thu Feb 24 2005 Zing <shishz at hotpop.com> - 1.5.6.1-1
+- new upstream
+- remove snowsync for now. (we need perl-XML-LibXSLT)
+
 * Fri Jul 23 2004 Zing <shishz at hotpop.com> - 1.5.3-0.fdr.4
 - More cleanups from QA (M.Schwendt)
 -	do the buildroot better (grrr hopefully)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snownews/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:20:53 -0000	1.2
+++ sources	25 Mar 2005 10:20:16 -0000	1.3
@@ -1 +1 @@
-35aa49e42ac5232bf8ac0163e3793d4a  snownews-1.5.3.tar.gz
+466ca82e8df03d6126d6cc0f20772025  snownews-1.5.6.1.tar.gz


--- snownews-1.5.3-buildroot.patch DELETED ---


--- snownews-1.5.3-manpath.patch DELETED ---


--- snownews-1.5.3-nostrip.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar 25 12:16:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 25 Mar 2005 07:16:45 -0500
Subject: devel/sylpheed sylpheed.spec,1.7,1.8
Message-ID: <200503251216.j2PCGj1M002328@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/sylpheed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2322

Modified Files:
	sylpheed.spec 
Log Message:
lower-case dist tag should be safer


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sylpheed.spec	24 Mar 2005 16:15:22 -0000	1.7
+++ sylpheed.spec	25 Mar 2005 12:16:43 -0000	1.8
@@ -5,7 +5,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 1.0.4
-Release: 1.FC4
+Release: 1.fc4
 License: GPL
 URL: http://sylpheed.good-day.net/
 Group: Applications/Internet
@@ -81,7 +81,7 @@
 %{_mandir}/man1
 
 %changelog
-* Thu Mar 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.4-1.FC4
+* Thu Mar 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.4-1.fc4
 - Update to 1.0.4 (minor security fixes).
 - Patch4 (draftsegf) merged upstream.
 



From bugs.michael at gmx.net  Fri Mar 25 12:16:54 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 25 Mar 2005 13:16:54 +0100
Subject: rpms/snownews/devel snownews.spec,1.4,1.5
In-Reply-To: <200503251018.j2PAIKMf032601@cvs-int.fedora.redhat.com>
References: <200503251018.j2PAIKMf032601@cvs-int.fedora.redhat.com>
Message-ID: <20050325131654.3ab66f2f.bugs.michael@gmx.net>

On Fri, 25 Mar 2005 05:18:20 -0500, Warren Togami (wtogami) wrote:

> Author: wtogami
> 
> Update of /cvs/extras/rpms/snownews/devel

> -Release: 	3
> +Release: 	3.FC4

My interest in getting these dist tags standardised is unbroken, because
e.g.

  1.fc3 > 1.FC4

because of ASCII collation order. Current Dist Tag Guidelines at
http://fedoraproject.org/wiki/DistTag use lower-case dist tags, but
several packages and updates in Fedora Core use upper-case dist tags.

We [in Extras] should be safe if we used only lower-case dist tags.



From fedora-extras-commits at redhat.com  Fri Mar 25 15:19:07 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 25 Mar 2005 10:19:07 -0500
Subject: rpms/Macaulay2/FC-3 Macaulay2.spec,1.2,1.3
Message-ID: <200503251519.j2PFJ7GP005462@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/Macaulay2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5452/FC-3

Modified Files:
	Macaulay2.spec 
Log Message:
>From #149225

* Mon Feb 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.2-14
- x86_64 issues (%%_libdir -> %%_prefix/lib )
- remove desktop_file macro usage




Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/FC-3/Macaulay2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Macaulay2.spec	10 Dec 2004 22:03:01 -0000	1.2
+++ Macaulay2.spec	25 Mar 2005 15:19:05 -0000	1.3
@@ -1,10 +1,13 @@
-# $Id$
+# busted on x86_64 -- Rex
+# define m2home %{_libdir}/%{name}-%{version}
+# Makefiles hardcode "%prefix/lib" instead, ok?  -- Rex
+%define m2home %{_prefix}/lib/%{name}-%{version}
 
 Summary: A system for algebraic geometry and commutative algebra	
 Name:    Macaulay2 
 Epoch:	 0
 Version: 0.9.2
-Release: 13%{?dist_tag}
+Release: 14%{?dist_tag}
 License: GPL 
 Group:   Applications/Engineering
 URL:	 http://www.math.uiuc.edu/Macaulay2/
@@ -84,41 +87,36 @@
 %makeinstall
 
 # Fix locations
-perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
+perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \
 	$RPM_BUILD_ROOT%{_bindir}/M2 
-perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
+perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \
 	$RPM_BUILD_ROOT%{_bindir}/M2-help
-perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/emacs/*
+perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/*
 
 ## emacs files
 install -d      $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
-cp -alf	$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/emacs/*.el \
+cp -alf	$RPM_BUILD_ROOT%{m2home}/emacs/*.el \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 
 # app img
 install -p -D -m644 %{SOURCE1}      $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
-%if "%{?desktop_file}" != "0"
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
-
 desktop-file-install \
   --vendor fedora \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
   --add-category "X-Fedora" \
   %{SOURCE2}
-%else
-install -p -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Applications/%{name}.desktop
-%endif
 
 ## Unpackaged files
 # %doc stuff, no need to dup in appdir
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/{README,CHANGES,COPYING}
+rm -f $RPM_BUILD_ROOT%{m2home}/{README,CHANGES,COPYING}
 # created by make check
-find $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} \( -name test.out -o -name test.out*.trim \) -exec rm -v {} \;
+find $RPM_BUILD_ROOT%{m2home} \( -name test.out -o -name test.out*.trim \) -exec rm -v {} \;
 # .cvsignore
-find $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} -name .cvsignore -exec rm -v {} \;
+find $RPM_BUILD_ROOT%{m2home} -name .cvsignore -exec rm -v {} \;
 # unuseful files outside of build environment
-find  $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/packages -name "Makefile*" -exec rm -v {} \;
+find  $RPM_BUILD_ROOT%{m2home}/packages -name "Makefile*" -exec rm -v {} \;
 
 
 %clean
@@ -127,44 +125,44 @@
 
 %preun
 # Handle possibly existing dumpdata
-rm -f %{_libdir}/%{name}-%{version}/libexec/Macaulay2-*-data ||:
+rm -f %{m2home}/libexec/Macaulay2-*-data ||:
 
 
 %files
 %defattr(-,root,root)
 %doc Macaulay2/README Macaulay2/CHANGES
 %{_bindir}/M2
-%if "%{?desktop_file}" != "0"
 %{_datadir}/applications/*.desktop
-%else
-%{_sysconfdir}/X11/applnk/*/*.desktop
-%endif
 %{_datadir}/pixmaps/*.png
-%dir %{_libdir}/%{name}-%{version}
-%{_libdir}/%{name}-%{version}/cache
-%{_libdir}/%{name}-%{version}/libexec
-%{_libdir}/%{name}-%{version}/m2
-%{_libdir}/%{name}-%{version}/packages
+%dir %{m2home}
+%{m2home}/cache
+%{m2home}/libexec
+%{m2home}/m2
+%{m2home}/packages
 # Not needed/wanted
-%exclude %{_libdir}/%{name}-%{version}/setup
+%exclude %{m2home}/setup
 
 %files emacs
 %defattr(-,root,root)
-%dir %{_libdir}/%{name}-%{version}/emacs
-%doc %{_libdir}/%{name}-%{version}/emacs/*.m2
-%doc %{_libdir}/%{name}-%{version}/emacs/*.txt
-%doc %{_libdir}/%{name}-%{version}/emacs/README
-%{_libdir}/%{name}-%{version}/emacs/*.el
+%dir %{m2home}/emacs
+%doc %{m2home}/emacs/*.m2
+%doc %{m2home}/emacs/*.txt
+%doc %{m2home}/emacs/README
+%{m2home}/emacs/*.el
 %{_datadir}/emacs/site-lisp/*.el
 
 %files doc
 %defattr(-,root,root)
 %{_bindir}/M2-help
-%{_libdir}/%{name}-%{version}/html
-%{_libdir}/%{name}-%{version}/tutorial
+%{m2home}/html
+%{m2home}/tutorial
 
 
 %changelog
+* Mon Feb 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.2-14
+- x86_64 issues (%%_libdir -> %%_prefix/lib )
+- remove desktop_file macro usage
+
 * Sat Oct 23 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.13
 - BR: time (again)
 - omit m2_dir/setup (not needed/wanted)



From fedora-extras-commits at redhat.com  Fri Mar 25 15:19:07 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 25 Mar 2005 10:19:07 -0500
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.3,1.4
Message-ID: <200503251519.j2PFJ7Hc005465@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5452/devel

Modified Files:
	Macaulay2.spec 
Log Message:
>From #149225

* Mon Feb 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.2-14
- x86_64 issues (%%_libdir -> %%_prefix/lib )
- remove desktop_file macro usage




Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Macaulay2.spec	5 Mar 2005 21:10:20 -0000	1.3
+++ Macaulay2.spec	25 Mar 2005 15:19:05 -0000	1.4
@@ -1,9 +1,12 @@
-# $Id$
-
+# busted on x86_64 -- Rex
+# define m2home %{_libdir}/%{name}-%{version}
+# Makefiles hardcode "%prefix/lib" instead, ok?  -- Rex
+%define m2home %{_prefix}/lib/%{name}-%{version}
+ 
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.2
-Release: 13%{?dist_tag}
+Release: 14%{?dist_tag}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
@@ -83,41 +86,36 @@
 %makeinstall
 
 # Fix locations
-perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
+perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \
 	$RPM_BUILD_ROOT%{_bindir}/M2
-perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
+perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \
 	$RPM_BUILD_ROOT%{_bindir}/M2-help
-perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/emacs/*
+perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/*
 
 ## emacs files
 install -d      $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
-cp -alf	$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/emacs/*.el \
+cp -alf	$RPM_BUILD_ROOT%{m2home}/emacs/*.el \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 
 # app img
 install -p -D -m644 %{SOURCE1}      $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
-%if "%{?desktop_file}" != "0"
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
-
 desktop-file-install \
   --vendor fedora \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
   --add-category "X-Fedora" \
   %{SOURCE2}
-%else
-install -p -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Applications/%{name}.desktop
-%endif
 
 ## Unpackaged files
 # %doc stuff, no need to dup in appdir
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/{README,CHANGES,COPYING}
+rm -f $RPM_BUILD_ROOT%{m2home}/{README,CHANGES,COPYING}
 # created by make check
-find $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} \( -name test.out -o -name test.out*.trim \) -exec rm -v {} \;
+find $RPM_BUILD_ROOT%{m2home} \( -name test.out -o -name test.out*.trim \) -exec rm -v {} \;
 # .cvsignore
-find $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} -name .cvsignore -exec rm -v {} \;
+find $RPM_BUILD_ROOT%{m2home} -name .cvsignore -exec rm -v {} \;
 # unuseful files outside of build environment
-find  $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/packages -name "Makefile*" -exec rm -v {} \;
+find  $RPM_BUILD_ROOT%{m2home}/packages -name "Makefile*" -exec rm -v {} \;
 
 
 %clean
@@ -126,44 +124,44 @@
 
 %preun
 # Handle possibly existing dumpdata
-rm -f %{_libdir}/%{name}-%{version}/libexec/Macaulay2-*-data ||:
+rm -f %{m2home}/libexec/Macaulay2-*-data ||:
 
 
 %files
 %defattr(-,root,root)
 %doc Macaulay2/README Macaulay2/CHANGES
 %{_bindir}/M2
-%if "%{?desktop_file}" != "0"
 %{_datadir}/applications/*.desktop
-%else
-%{_sysconfdir}/X11/applnk/*/*.desktop
-%endif
 %{_datadir}/pixmaps/*.png
-%dir %{_libdir}/%{name}-%{version}
-%{_libdir}/%{name}-%{version}/cache
-%{_libdir}/%{name}-%{version}/libexec
-%{_libdir}/%{name}-%{version}/m2
-%{_libdir}/%{name}-%{version}/packages
+%dir %{m2home}
+%{m2home}/cache
+%{m2home}/libexec
+%{m2home}/m2
+%{m2home}/packages
 # Not needed/wanted
-%exclude %{_libdir}/%{name}-%{version}/setup
+%exclude %{m2home}/setup
 
 %files emacs
 %defattr(-,root,root)
-%dir %{_libdir}/%{name}-%{version}/emacs
-%doc %{_libdir}/%{name}-%{version}/emacs/*.m2
-%doc %{_libdir}/%{name}-%{version}/emacs/*.txt
-%doc %{_libdir}/%{name}-%{version}/emacs/README
-%{_libdir}/%{name}-%{version}/emacs/*.el
+%dir %{m2home}/emacs
+%doc %{m2home}/emacs/*.m2
+%doc %{m2home}/emacs/*.txt
+%doc %{m2home}/emacs/README
+%{m2home}/emacs/*.el
 %{_datadir}/emacs/site-lisp/*.el
 
 %files doc
 %defattr(-,root,root)
 %{_bindir}/M2-help
-%{_libdir}/%{name}-%{version}/html
-%{_libdir}/%{name}-%{version}/tutorial
+%{m2home}/html
+%{m2home}/tutorial
 
 
 %changelog
+* Mon Feb 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.2-14
+- x86_64 issues (%%_libdir -> %%_prefix/lib )
+- remove desktop_file macro usage
+
 * Sat Oct 23 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.13
 - BR: time (again)
 - omit m2_dir/setup (not needed/wanted)



From fedora-extras-commits at redhat.com  Fri Mar 25 16:14:08 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Fri, 25 Mar 2005 11:14:08 -0500
Subject: rpms/ipython/devel .cvsignore, 1.2, 1.3 ipython.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200503251614.j2PGE8Xc006682@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6658

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
New upstream version 0.6.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Mar 2005 17:33:52 -0000	1.2
+++ .cvsignore	25 Mar 2005 16:14:06 -0000	1.3
@@ -1 +1 @@
-ipython-0.6.11.tar.gz
+ipython-0.6.12.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/ipython.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipython.spec	9 Mar 2005 17:33:52 -0000	1.1
+++ ipython.spec	25 Mar 2005 16:14:06 -0000	1.2
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           ipython
-Version:        0.6.11
-Release:        2
+Version:        0.6.12
+Release:        1
 Summary:        An enhanced interactive Python shell
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://ipython.scipy.org/
-Source0:        http://ipython.scipy.org/dist/ipython-0.6.11.tar.gz
+Source0:        http://ipython.scipy.org/dist/ipython-0.6.12.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -82,6 +81,10 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Fri Mar 25 2005 Shahms E. King <shahms at shahms.com> 0.6.12-1
+- Update to 0.6.12
+- Removed unused python_sitearch define
+
 * Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 0.6.11-2
 - Fix up %doc file specifications
 - Use offical .tar.gz, not upstream .src.rpm .tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Mar 2005 17:33:52 -0000	1.2
+++ sources	25 Mar 2005 16:14:06 -0000	1.3
@@ -1 +1 @@
-cf4bdd4a89d71e497e76f0473cbe02f7  ipython-0.6.11.tar.gz
+3a72e214fe2164f9f86103523e3d8276  ipython-0.6.12.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 25 16:14:44 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Fri, 25 Mar 2005 11:14:44 -0500
Subject: rpms/ipython/FC-3 ipython.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200503251614.j2PGEiZ6006721@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6715

Modified Files:
	ipython.spec sources 
Log Message:
New upstream version 0.6.12



Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/ipython.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipython.spec	9 Mar 2005 17:33:52 -0000	1.1
+++ ipython.spec	25 Mar 2005 16:14:42 -0000	1.2
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           ipython
-Version:        0.6.11
-Release:        2
+Version:        0.6.12
+Release:        1
 Summary:        An enhanced interactive Python shell
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://ipython.scipy.org/
-Source0:        http://ipython.scipy.org/dist/ipython-0.6.11.tar.gz
+Source0:        http://ipython.scipy.org/dist/ipython-0.6.12.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -82,6 +81,10 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Fri Mar 25 2005 Shahms E. King <shahms at shahms.com> 0.6.12-1
+- Update to 0.6.12
+- Removed unused python_sitearch define
+
 * Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 0.6.11-2
 - Fix up %doc file specifications
 - Use offical .tar.gz, not upstream .src.rpm .tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Mar 2005 17:33:52 -0000	1.2
+++ sources	25 Mar 2005 16:14:42 -0000	1.3
@@ -1 +1 @@
-cf4bdd4a89d71e497e76f0473cbe02f7  ipython-0.6.11.tar.gz
+3a72e214fe2164f9f86103523e3d8276  ipython-0.6.12.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 25 16:20:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 25 Mar 2005 11:20:45 -0500
Subject: devel/taglib taglib.spec,1.7,1.8
Message-ID: <200503251620.j2PGKjKq006781@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/taglib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6775

Modified Files:
	taglib.spec 
Log Message:
* Fri Mar 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.3.1-2
- rebuild with g++4




Index: taglib.spec
===================================================================
RCS file: /cvs/extras/devel/taglib/taglib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- taglib.spec	5 Mar 2005 19:43:17 -0000	1.7
+++ taglib.spec	25 Mar 2005 16:20:43 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       taglib	
 Version:    1.3.1
-Release:    1
+Release:    2
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Fri Mar 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.3.1-2
+- rebuild with g++4
+
 * Mon Jan 10 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.3.1-1
 - version 1.3.1
 - drop patch0



From fedora-extras-commits at redhat.com  Fri Mar 25 16:31:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 25 Mar 2005 11:31:59 -0500
Subject: rpms/fyre - New directory
Message-ID: <200503251631.j2PGVxN8006921@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6914/fyre

Log Message:
Directory /cvs/extras/rpms/fyre added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 25 16:31:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 25 Mar 2005 11:31:59 -0500
Subject: rpms/fyre/devel - New directory
Message-ID: <200503251631.j2PGVxnZ006924@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6914/fyre/devel

Log Message:
Directory /cvs/extras/rpms/fyre/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 25 16:32:20 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 25 Mar 2005 11:32:20 -0500
Subject: rpms/fyre Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503251632.j2PGWKPV006988@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6979

Added Files:
	Makefile import.log 
Log Message:
Setup of module fyre


--- NEW FILE Makefile ---
# Top level Makefile for module fyre
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 25 16:32:20 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 25 Mar 2005 11:32:20 -0500
Subject: rpms/fyre/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503251632.j2PGWKIT006991@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6979/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fyre


--- 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 Mar 25 16:33:17 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 25 Mar 2005 11:33:17 -0500
Subject: rpms/fyre import.log,1.1,1.2
Message-ID: <200503251633.j2PGXHC6007107@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7091

Modified Files:
	import.log 
Log Message:
auto-import fyre-1.0.0-2 on branch devel from fyre-1.0.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fyre/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Mar 2005 16:32:18 -0000	1.1
+++ import.log	25 Mar 2005 16:33:15 -0000	1.2
@@ -0,0 +1 @@
+fyre-1_0_0-2:HEAD:fyre-1.0.0-2.src.rpm:1111768390



From fedora-extras-commits at redhat.com  Fri Mar 25 16:33:17 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 25 Mar 2005 11:33:17 -0500
Subject: rpms/fyre/devel fyre-1.0.0-apps.patch, NONE, 1.1 fyre.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503251633.j2PGXHIe007111@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7091/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fyre-1.0.0-apps.patch fyre.spec 
Log Message:
auto-import fyre-1.0.0-2 on branch devel from fyre-1.0.0-2.src.rpm

fyre-1.0.0-apps.patch:

--- NEW FILE fyre-1.0.0-apps.patch ---
--- fyre-1.0.0/configure.orig	2005-03-24 15:41:35.969025049 -0500
+++ fyre-1.0.0/configure	2005-03-24 15:42:06.250612823 -0500
@@ -4936,13 +4936,13 @@
 fi
 
 
-if test "x$enable_xdgmime" = "xyes"; then
-  ENABLE_XDGMIME_TRUE=
-  ENABLE_XDGMIME_FALSE='#'
-else
+#if test "x$enable_xdgmime" = "xyes"; then
+#  ENABLE_XDGMIME_TRUE=
+#  ENABLE_XDGMIME_FALSE='#'
+#else
   ENABLE_XDGMIME_TRUE='#'
   ENABLE_XDGMIME_FALSE=
-fi
+#fi
 
 
 # Extract the first word of "update-desktop-database", so it can be a program name with args.
@@ -4992,13 +4992,13 @@
 fi
 
 
-if test "x$enable_fdodesktop" = "xyes"; then
-  ENABLE_FDODESKTOP_TRUE=
-  ENABLE_FDODESKTOP_FALSE='#'
-else
+#if test "x$enable_fdodesktop" = "xyes"; then
+#  ENABLE_FDODESKTOP_TRUE=
+#  ENABLE_FDODESKTOP_FALSE='#'
+#else
   ENABLE_FDODESKTOP_TRUE='#'
   ENABLE_FDODESKTOP_FALSE=
-fi
+#fi
 
 
 pkg_modules="glib-2.0 >= 2.0.0, gtk+-2.0 >= 2.0.0, libglade-2.0 >= 2.0"
--- fyre-1.0.0/data/Makefile.in.orig	2005-03-24 15:51:57.493939940 -0500
+++ fyre-1.0.0/data/Makefile.in	2005-03-24 15:53:41.478354812 -0500
@@ -175,18 +175,18 @@
         fyre-32x32.png          \
         fyre-16x16.png
 
- at ENABLE_FDODESKTOP_TRUE@desktopdir = $(datadir)/applications
- at ENABLE_FDODESKTOP_TRUE@desktop_DATA = fyre.desktop
- at ENABLE_FDODESKTOP_TRUE@icondir = $(datadir)/pixmaps
- at ENABLE_FDODESKTOP_TRUE@icon_DATA = fyre-48x48.png
+desktopdir = $(datadir)/applications
+desktop_DATA = fyre.desktop
+icondir = $(datadir)/pixmaps
+icon_DATA = fyre-48x48.png
 @ENABLE_FDODESKTOP_FALSE at update_fdodesktop = /bin/true
 @ENABLE_FDODESKTOP_TRUE at update_fdodesktop = update-desktop-database
- at ENABLE_XDGMIME_TRUE@xdgmimedir = $(datadir)/mime/packages
- at ENABLE_XDGMIME_TRUE@xdgmime_DATA = fyre.xml
+xdgmimedir = $(datadir)/mime/packages
+xdgmime_DATA = fyre.xml
 @ENABLE_XDGMIME_FALSE at update_xdgmime = /bin/true
 @ENABLE_XDGMIME_TRUE at update_xdgmime = update-mime-database $(datadir)/mime
- at ENABLE_XDGMIME_TRUE@xdgicondir = $(datadir)/icons/hicolor/48x48/mimetypes
- at ENABLE_XDGMIME_TRUE@xdgicon_DATA = application-x-fyre-animation.png
+xdgicondir = $(datadir)/icons/hicolor/48x48/mimetypes
+xdgicon_DATA = application-x-fyre-animation.png
 EXTRA_DIST = \
 	$(fyredata_DATA)	\
 	$(desktop_DATA)		\


--- NEW FILE fyre.spec ---
Name:           fyre
Version:        1.0.0
Release:        2
Summary:        A tool for creating artwork from chaotic functions

Group:          Amusements/Graphics
License:        GPL
URL:            http://fyre.navi.cx/
Source0:        http://flapjack.navi.cx/releases/fyre/fyre-1.0.0.tar.bz2
Patch:          fyre-1.0.0-apps.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel libglade2-devel desktop-file-utils
Requires(post): desktop-file-utils shared-mime-info
Requires(postun): desktop-file-utils shared-mime-info

%description
Fyre is a tool for producing computational artwork based on histograms of
iterated chaotic functions. At the moment, it implements the Peter de Jong map
in a fixed-function pipeline with an interactive GTK+ frontend and a command
line interface for easy and efficient rendering of high-resolution, high
quality images.

%prep
%setup -q
%patch -p 1 -b .apps

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
desktop-file-install --vendor=fedora \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category=X-Fedora \
  --add-category=GTK \
  --delete-original \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post
update-mime-database %{_datadir}/mime &> /dev/null
update-desktop-database &> /dev/null

%postun
update-mime-database %{_datadir}/mime &> /dev/null
update-desktop-database &> /dev/null

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/icons/hicolor/48x48/mimetypes/*
%{_datadir}/mime/packages/*
%{_datadir}/pixmaps/*

%changelog
* Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-2
- Summary and %%post/%%postun changes

* Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Mar 2005 16:32:18 -0000	1.1
+++ .cvsignore	25 Mar 2005 16:33:15 -0000	1.2
@@ -0,0 +1 @@
+fyre-1.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Mar 2005 16:32:18 -0000	1.1
+++ sources	25 Mar 2005 16:33:15 -0000	1.2
@@ -0,0 +1 @@
+5da821b3166d3de187cc7d84bb1dc4d3  fyre-1.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Mar 25 16:40:18 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 25 Mar 2005 11:40:18 -0500
Subject: rpms/fyre/devel fyre.spec,1.1,1.2
Message-ID: <200503251640.j2PGeI8G007301@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7295

Modified Files:
	fyre.spec 
Log Message:
Removed NEWS, added || : to %post* commands


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/fyre.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fyre.spec	25 Mar 2005 16:33:15 -0000	1.1
+++ fyre.spec	25 Mar 2005 16:40:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           fyre
 Version:        1.0.0
-Release:        2
+Release:        3
 Summary:        A tool for creating artwork from chaotic functions
 
 Group:          Amusements/Graphics
@@ -43,16 +43,16 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-update-mime-database %{_datadir}/mime &> /dev/null
-update-desktop-database &> /dev/null
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 %postun
-update-mime-database %{_datadir}/mime &> /dev/null
-update-desktop-database &> /dev/null
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
@@ -61,6 +61,10 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Mar 25 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-3
+- Removed NEWS
+- Added || : to %%post* commands
+
 * Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-2
 - Summary and %%post/%%postun changes
 



From fedora-extras-commits at redhat.com  Fri Mar 25 17:48:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 12:48:18 -0500
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec,1.2,1.3
Message-ID: <200503251748.j2PHmIK2008438@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8432

Modified Files:
	xfce4-mixer.spec 
Log Message:
Removed unneeded la files



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-mixer.spec	21 Mar 2005 01:12:49 -0000	1.2
+++ xfce4-mixer.spec	25 Mar 2005 17:48:15 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-mixer-4.2.1.tar.bz2
@@ -31,6 +31,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.la
 %find_lang %{name}
 
 %clean
@@ -45,6 +46,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-mixer.png
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Removed unneeded la files
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - fix BuildReqs
 



From fedora-extras-commits at redhat.com  Fri Mar 25 18:17:58 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 13:17:58 -0500
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.2,1.3
Message-ID: <200503251817.j2PIHwJI009407@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9401

Modified Files:
	xfce4-icon-theme.spec 
Log Message:
Added Obsoletes/Provides for xffm-icons



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-icon-theme.spec	21 Mar 2005 01:00:25 -0000	1.2
+++ xfce4-icon-theme.spec	25 Mar 2005 18:17:56 -0000	1.3
@@ -1,13 +1,15 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-icon-theme-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+Obsoletes: xffm-icons
+Provides: xffm-icons
 
 %description
 Icon theme for Xfce 4 Desktop Environment.
@@ -34,6 +36,9 @@
 %{_datadir}/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Added Obsoletes/Provides for xffm-icons
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - noarch
 



From fedora-extras-commits at redhat.com  Fri Mar 25 18:28:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 13:28:05 -0500
Subject: rpms/xfce4-iconbox/devel xfce4-iconbox.spec,1.2,1.3
Message-ID: <200503251828.j2PIS5Z0009468@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9462

Modified Files:
	xfce4-iconbox.spec 
Log Message:
Removed unneeded la/a files



Index: xfce4-iconbox.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-iconbox/devel/xfce4-iconbox.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-iconbox.spec	20 Mar 2005 08:40:42 -0000	1.2
+++ xfce4-iconbox.spec	25 Mar 2005 18:28:03 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Icon box for the Xfce4 Desktop Environment
 Name: xfce4-iconbox
 Version: 4.2.1
-Release: 1.FC4
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-iconbox-4.2.1.tar.bz2
@@ -30,7 +30,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 %find_lang %{name}
 
 %clean
@@ -45,6 +46,9 @@
 %{_datadir}/icons/hicolor/*/*/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
+- Removed unneeded la/a files
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to version 4.2.1
 



From fedora-extras-commits at redhat.com  Fri Mar 25 18:48:32 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 13:48:32 -0500
Subject: rpms/xfcalendar/devel xfcalendar.spec,1.2,1.3
Message-ID: <200503251848.j2PImWs5009616@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9610

Modified Files:
	xfcalendar.spec 
Log Message:
Remove unneeded la/a files



Index: xfcalendar.spec
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/devel/xfcalendar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfcalendar.spec	21 Mar 2005 00:46:01 -0000	1.2
+++ xfcalendar.spec	25 Mar 2005 18:48:30 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Time-managing application for Xfce4
 Name: xfcalendar
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfcalendar-4.2.1.tar.bz2
@@ -27,6 +27,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 %find_lang %{name}
 
 %clean
@@ -36,8 +38,6 @@
 %defattr(-,root,root)
 %doc README ChangeLog COPYING AUTHORS
 %{_bindir}/xfcalendar
-%{_libdir}/xfce4/mcs-plugins/xfcalendar_plugin.a
-%{_libdir}/xfce4/mcs-plugins/xfcalendar_plugin.la
 %{_libdir}/xfce4/mcs-plugins/xfcalendar_plugin.so
 %{_datadir}/applications/xfcalendar.desktop
 %{_datadir}/applications/xfce-xfcalendar-settings.desktop
@@ -45,6 +45,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Remove unneeded la/a files
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - fix BuildRequires
 



From fedora-extras-commits at redhat.com  Fri Mar 25 18:57:55 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 13:57:55 -0500
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec,1.4,1.5
Message-ID: <200503251857.j2PIvti2009672@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9666

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
Removed unneeded la files



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtk-xfce-engine.spec	21 Mar 2005 00:27:35 -0000	1.4
+++ gtk-xfce-engine.spec	25 Mar 2005 18:57:53 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
 Version: 2.2.6
-Release: 1.FC4
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/gtk-xfce-engine-2.2.6.tar.bz2
@@ -24,7 +24,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*/*/engines/*.la
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -35,6 +35,9 @@
 %{_datadir}/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 2.2.6-2.FC4
+- Removed unneeded la files
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 2.2.6-1
 - Updated to 2.2.6 version
 



From fedora-extras-commits at redhat.com  Fri Mar 25 19:21:25 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 25 Mar 2005 14:21:25 -0500
Subject: rpms/Coin2/FC-3 coin-2.3.0-man3.diff, NONE, 1.1 .cvsignore, 1.2,
	1.3 Coin2.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200503251921.j2PJLP17010705@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/Coin2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10694/FC-3

Modified Files:
	.cvsignore Coin2.spec sources 
Added Files:
	coin-2.3.0-man3.diff 
Log Message:
* Tue Feb 22  2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-5
- Include simacros.
- Regenerate configure from simacros and FC3 libtool for x86_64.
- Don't install bogusly generated manpages for dirs.



coin-2.3.0-man3.diff:

--- NEW FILE coin-2.3.0-man3.diff ---
diff -u Coin-2.3.0.orig/man/man3/Makefile.am Coin-2.3.0/man/man3/Makefile.am
--- Coin-2.3.0.orig/man/man3/Makefile.am	2003-02-27 16:37:29.000000000 +0100
+++ Coin-2.3.0/man/man3/Makefile.am	2005-02-23 10:49:41.241888646 +0100
@@ -8,6 +8,7 @@
 	"$(sim_ac_doxygen_exe)" docs/coin.doxygen )
 
 filelist.txt: SoDB.3
+	rm -f *_.3
 	ls *.3 >filelist.txt
 
 
diff -u Coin-2.3.0.orig/man/man3/Makefile.in Coin-2.3.0/man/man3/Makefile.in
--- Coin-2.3.0.orig/man/man3/Makefile.in	2004-06-16 12:56:49.000000000 +0200
+++ Coin-2.3.0/man/man3/Makefile.in	2005-02-23 10:50:11.721791737 +0100
@@ -407,6 +407,7 @@
 	"$(sim_ac_doxygen_exe)" docs/coin.doxygen )
 
 filelist.txt: SoDB.3
+	rm -f *_.3
 	ls *.3 >filelist.txt
 
 @BUILD_MANPAGES_TRUE at all-local: filelist.txt


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 03:58:45 -0000	1.2
+++ .cvsignore	25 Mar 2005 19:21:23 -0000	1.3
@@ -1 +1,3 @@
 Coin-2.3.0.tar.gz
+coin-2.3.0-libtool.diff.bz2
+coin-2.3.0-simacros.diff.bz2


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-3/Coin2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Coin2.spec	10 Dec 2004 22:03:00 -0000	1.3
+++ Coin2.spec	25 Mar 2005 19:21:23 -0000	1.4
@@ -11,7 +11,7 @@
 Name: %{name}
 Version: %{srcvers}
 Epoch: 0
-Release: 4
+Release: 5
 
 License: GPL
 Group: System Environment/Libraries
@@ -22,6 +22,9 @@
 Patch0: coin-2.3.0-simage-soname.diff
 Patch1: coin-2.3.0-openal-soname.diff
 Patch2: coin-2.3.0-freetype-soname.diff
+Patch3: coin-2.3.0-simacros.diff.bz2
+Patch4: coin-2.3.0-libtool.diff.bz2
+Patch5: coin-2.3.0-man3.diff
 
 BuildRequires: libGL.so.1 libGLU.so.1 XFree86-devel
 BuildRequires: zlib-devel bzip2-devel
@@ -49,6 +52,9 @@
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .orig
 %patch2 -p1 -b .orig
+%patch3 -p1
+%patch4 -p1 -b .orig
+%patch5 -p1 -b .orig
 
 sed -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \
 < src/glue/freetype.c > src/glue/freetype.c~
@@ -106,6 +112,11 @@
 %doc %{_datadir}/Coin/html
 
 %changelog
+* Tue Feb 22  2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-5
+- Include simacros.
+- Regenerate configure from simacros and FC3 libtool for x86_64.
+- Don't install bogusly generated manpages for dirs.
+
 * Sun Jul 4  2004 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-0.fdr.4
 - Let Coin-devel Require: bzip2-devel, zlib-devel.
 - Use @XX@ patterns in soname sed calls.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 03:58:45 -0000	1.2
+++ sources	25 Mar 2005 19:21:23 -0000	1.3
@@ -1 +1,3 @@
 17fb23a394ab79f149878ea8a3845b32  Coin-2.3.0.tar.gz
+21483fa4cfff1fb57ad5811b998f9652  coin-2.3.0-libtool.diff.bz2
+30bc10eac1ad6d5daf0ffd3e5ac2b40f  coin-2.3.0-simacros.diff.bz2



From fedora-extras-commits at redhat.com  Fri Mar 25 19:21:25 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 25 Mar 2005 14:21:25 -0500
Subject: rpms/Coin2/devel coin-2.3.0-man3.diff, NONE, 1.1 .cvsignore, 1.2,
	1.3 Coin2.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200503251921.j2PJLPhi010713@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/Coin2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10694/devel

Modified Files:
	.cvsignore Coin2.spec sources 
Added Files:
	coin-2.3.0-man3.diff 
Log Message:
* Tue Feb 22  2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-5
- Include simacros.
- Regenerate configure from simacros and FC3 libtool for x86_64.
- Don't install bogusly generated manpages for dirs.



coin-2.3.0-man3.diff:

--- NEW FILE coin-2.3.0-man3.diff ---
diff -u Coin-2.3.0.orig/man/man3/Makefile.am Coin-2.3.0/man/man3/Makefile.am
--- Coin-2.3.0.orig/man/man3/Makefile.am	2003-02-27 16:37:29.000000000 +0100
+++ Coin-2.3.0/man/man3/Makefile.am	2005-02-23 10:49:41.241888646 +0100
@@ -8,6 +8,7 @@
 	"$(sim_ac_doxygen_exe)" docs/coin.doxygen )
 
 filelist.txt: SoDB.3
+	rm -f *_.3
 	ls *.3 >filelist.txt
 
 
diff -u Coin-2.3.0.orig/man/man3/Makefile.in Coin-2.3.0/man/man3/Makefile.in
--- Coin-2.3.0.orig/man/man3/Makefile.in	2004-06-16 12:56:49.000000000 +0200
+++ Coin-2.3.0/man/man3/Makefile.in	2005-02-23 10:50:11.721791737 +0100
@@ -407,6 +407,7 @@
 	"$(sim_ac_doxygen_exe)" docs/coin.doxygen )
 
 filelist.txt: SoDB.3
+	rm -f *_.3
 	ls *.3 >filelist.txt
 
 @BUILD_MANPAGES_TRUE at all-local: filelist.txt


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 03:58:45 -0000	1.2
+++ .cvsignore	25 Mar 2005 19:21:23 -0000	1.3
@@ -1 +1,3 @@
 Coin-2.3.0.tar.gz
+coin-2.3.0-libtool.diff.bz2
+coin-2.3.0-simacros.diff.bz2


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Coin2.spec	5 Mar 2005 21:10:19 -0000	1.4
+++ Coin2.spec	25 Mar 2005 19:21:23 -0000	1.5
@@ -10,7 +10,7 @@
 Summary: High-level 3D visualization library
 Name: %{name}
 Version: %{srcvers}
-Release: 4
+Release: 5
 
 License: GPL
 Group: System Environment/Libraries
@@ -21,6 +21,9 @@
 Patch0: coin-2.3.0-simage-soname.diff
 Patch1: coin-2.3.0-openal-soname.diff
 Patch2: coin-2.3.0-freetype-soname.diff
+Patch3: coin-2.3.0-simacros.diff.bz2
+Patch4: coin-2.3.0-libtool.diff.bz2
+Patch5: coin-2.3.0-man3.diff
 
 BuildRequires: libGL.so.1 libGLU.so.1 XFree86-devel
 BuildRequires: zlib-devel bzip2-devel
@@ -48,6 +51,9 @@
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .orig
 %patch2 -p1 -b .orig
+%patch3 -p1
+%patch4 -p1 -b .orig
+%patch5 -p1 -b .orig
 
 sed -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \
 < src/glue/freetype.c > src/glue/freetype.c~
@@ -105,6 +111,11 @@
 %doc %{_datadir}/Coin/html
 
 %changelog
+* Tue Feb 22  2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-5
+- Include simacros.
+- Regenerate configure from simacros and FC3 libtool for x86_64.
+- Don't install bogusly generated manpages for dirs.
+
 * Sun Jul 4  2004 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-0.fdr.4
 - Let Coin-devel Require: bzip2-devel, zlib-devel.
 - Use @XX@ patterns in soname sed calls.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 03:58:45 -0000	1.2
+++ sources	25 Mar 2005 19:21:23 -0000	1.3
@@ -1 +1,3 @@
 17fb23a394ab79f149878ea8a3845b32  Coin-2.3.0.tar.gz
+21483fa4cfff1fb57ad5811b998f9652  coin-2.3.0-libtool.diff.bz2
+30bc10eac1ad6d5daf0ffd3e5ac2b40f  coin-2.3.0-simacros.diff.bz2



From fedora-extras-commits at redhat.com  Fri Mar 25 19:39:47 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Fri, 25 Mar 2005 14:39:47 -0500
Subject: devel/jabberd jabberd.spec,1.4,1.5
Message-ID: <200503251939.j2PJdlcF010802@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10796

Modified Files:
	jabberd.spec 
Log Message:
* make backends optional during build
* use -p with the install command



Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jabberd.spec	22 Mar 2005 12:16:56 -0000	1.4
+++ jabberd.spec	25 Mar 2005 19:39:45 -0000	1.5
@@ -8,8 +8,12 @@
 Source1: jabberd
 URL: http://jabberd.jabberstudio.org/2/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel db4-devel libidn-devel pam-devel
-BuildRequires: openldap-devel postgresql-devel mysql-devel
+BuildRequires: openssl-devel libidn-devel
+%{!?_without_pam:BuildRequires: pam-devel}
+%{!?_without_db4:BuildRequires: db4-devel}
+%{!?_without_ldap:BuildRequires: openldap-devel}
+%{!?_without_mysql:BuildRequires: mysql-devel}
+%{!?_without_postgresql:BuildRequires: postgresql-devel}
 Requires(post): openssl chkconfig
 Requires(pre): shadow-utils
 Requires(preun): chkconfig shadow-utils
@@ -33,15 +37,21 @@
 %build
 %define _sysconfdir /etc/jabberd
 %define sysconfdir /etc/jabberd
-%{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g" \
-		configure
-%configure	--enable-db \
-		--enable-mysql \
-		--enable-pam \
-		--enable-ldap \
-		--enable-pgsql \
-		--with-extra-library-path=%{_libdir}/mysql \
-		--localstatedir=%{_var}/lib
+%{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g" configure
+
+%configure \
+	%{!?_without_pam:--enable-pam} \
+	%{?_without_pam:--disable-pam} \
+	%{!?_without_db4:--enable-db} \
+	%{?_without_db4:--disable-db} \
+	%{!?_without_mysql:--enable-mysql} \
+	%{!?_without_mysql:--with-extra-library-path=%{_libdir}/mysql} \
+	%{?_without_mysql:--disable-mysql} \
+	%{!?_without_ldap:--enable-ldap} \
+	%{?_without_ldap:--disable-ldap} \
+	%{!?_without_postgresql:--enable-pgsql} \
+	%{?_without_postgresql:--disable-pgsql} \
+	--localstatedir=%{_var}/lib
 
 %{__make} %{?_smp_mflags}
 
@@ -51,19 +61,19 @@
 %define _sysconfdir /etc
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_var}/lib/jabberd/{log,pid,db}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__install} -m 644 tools/db-setup.mysql $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__install} -m 644 tools/db-setup.pgsql $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__install} -m 644 tools/migrate.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__install} -m 644 tools/pipe-auth.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
-%{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
+%{__install} -p -m 644 tools/db-setup.mysql $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__install} -p -m 644 tools/db-setup.pgsql $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__install} -p -m 644 tools/migrate.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__install} -p -m 644 tools/pipe-auth.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 %{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
             -e "s,__ETCDIR__,%{sysconfdir},g" \
             -e "s,__PIDDIR__,%{_var}/lib/jabberd/pid,g" \
 		$RPM_BUILD_ROOT%{_initrddir}/%{name}
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
 %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/jabberd << END
 #%PAM-1.0
 auth       required     pam_nologin.so
@@ -168,6 +178,8 @@
 - typo 
 - changed db location to %%{_var}/lib/jabberd
 - removed noreplace for start script
+- make backends optional during build
+- use -p with the install command
 
 * Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
 - made password more random (/dev/random)



From fedora-extras-commits at redhat.com  Fri Mar 25 20:15:55 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:15:55 -0500
Subject: rpms/xfce4-panel/devel panel-htmlview.patch, NONE,
	1.1 xfce4-panel.spec, 1.2, 1.3
Message-ID: <200503252015.j2PKFtJs011708@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11702

Modified Files:
	xfce4-panel.spec 
Added Files:
	panel-htmlview.patch 
Log Message:
Added htmlview patch
Removed unneeded la/a files


panel-htmlview.patch:

--- NEW FILE panel-htmlview.patch ---
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml xfce4-panel-4.2.1.1/contents.xml
--- xfce4-panel-4.2.1.1.orig/contents.xml	2005-03-24 20:06:17.784671961 -0700
+++ xfce4-panel-4.2.1.1/contents.xml	2005-03-24 20:08:22.042455752 -0700
@@ -41,8 +41,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla Web Browser</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Web Browser</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ar xfce4-panel-4.2.1.1/contents.xml.ar
--- xfce4-panel-4.2.1.1.orig/contents.xml.ar	2005-03-24 20:06:17.784671961 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ar	2005-03-24 20:10:28.875841230 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>?????????? Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>??????????</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.az xfce4-panel-4.2.1.1/contents.xml.az
--- xfce4-panel-4.2.1.1.orig/contents.xml.az	2005-03-24 20:06:17.785671807 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.az	2005-03-24 20:10:41.511887092 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla Veb S??yyah??</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Veb S??yyah??</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ca xfce4-panel-4.2.1.1/contents.xml.ca
--- xfce4-panel-4.2.1.1.orig/contents.xml.ca	2005-03-24 20:06:17.786671652 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ca	2005-03-24 20:10:57.243454238 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Navegador mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Navegador</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.da xfce4-panel-4.2.1.1/contents.xml.da
--- xfce4-panel-4.2.1.1.orig/contents.xml.da	2005-03-05 04:21:43.000000000 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.da	2005-03-24 20:11:08.742675907 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla Web Browser</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Web Browser</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.eu xfce4-panel-4.2.1.1/contents.xml.eu
--- xfce4-panel-4.2.1.1.orig/contents.xml.eu	2005-03-24 20:06:17.786671652 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.eu	2005-03-24 20:11:21.628683112 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla Web Kudeatzailea</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Web Kudeatzailea</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.fi xfce4-panel-4.2.1.1/contents.xml.fi
--- xfce4-panel-4.2.1.1.orig/contents.xml.fi	2005-01-23 09:48:50.000000000 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.fi	2005-03-24 20:11:42.603439410 -0700
@@ -41,8 +41,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla Web-selain</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Web-selain</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.fr xfce4-panel-4.2.1.1/contents.xml.fr
--- xfce4-panel-4.2.1.1.orig/contents.xml.fr	2005-03-24 20:06:17.787671498 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.fr	2005-03-24 20:15:07.204798232 -0700
@@ -41,8 +41,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Navigateur Web Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Web</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.he xfce4-panel-4.2.1.1/contents.xml.he
--- xfce4-panel-4.2.1.1.orig/contents.xml.he	2005-03-24 20:06:17.787671498 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.he	2005-03-24 20:12:12.065883103 -0700
@@ -35,7 +35,7 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
+        <Command term="0" sn="0">htmlview</Command>
         <Tooltip>?????????? ????????????</Tooltip>
         <Icon id="7"/>
       </Control>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.hu xfce4-panel-4.2.1.1/contents.xml.hu
--- xfce4-panel-4.2.1.1.orig/contents.xml.hu	2005-03-24 20:06:17.788671343 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.hu	2005-03-24 20:12:24.431970714 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla webb??ng??sz??</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>webb??ng??sz??</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.it xfce4-panel-4.2.1.1/contents.xml.it
--- xfce4-panel-4.2.1.1.orig/contents.xml.it	2005-03-24 20:06:17.789671188 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.it	2005-03-24 20:12:38.720760982 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Browser Web Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Browser Web</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ja xfce4-panel-4.2.1.1/contents.xml.ja
--- xfce4-panel-4.2.1.1.orig/contents.xml.ja	2005-03-04 10:43:07.000000000 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ja	2005-03-24 20:12:49.108154593 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla ???????????????????????????????????????</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>???????????????????????????????????????</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ko xfce4-panel-4.2.1.1/contents.xml.ko
--- xfce4-panel-4.2.1.1.orig/contents.xml.ko	2005-03-24 20:06:17.789671188 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ko	2005-03-24 20:12:55.472170411 -0700
@@ -41,7 +41,7 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
+        <Command term="0" sn="0">htmlview</Command>
         <Tooltip>????????? ??? ????????????</Tooltip>
         <Icon id="7"/>
       </Control>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.lt xfce4-panel-4.2.1.1/contents.xml.lt
--- xfce4-panel-4.2.1.1.orig/contents.xml.lt	2005-03-24 20:06:17.790671034 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.lt	2005-03-24 20:13:04.482776939 -0700
@@ -41,8 +41,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla ??iniatinklio nar??ykl??</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>??iniatinklio nar??ykl??</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ms xfce4-panel-4.2.1.1/contents.xml.ms
--- xfce4-panel-4.2.1.1.orig/contents.xml.ms	2005-03-24 20:06:17.791670879 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ms	2005-03-24 20:13:12.433547369 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Pelayar Web Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Pelayar Web</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.nl xfce4-panel-4.2.1.1/contents.xml.nl
--- xfce4-panel-4.2.1.1.orig/contents.xml.nl	2005-03-24 20:06:17.791670879 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.nl	2005-03-24 20:13:20.923234456 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla Web Browser</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Web Browser</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ro xfce4-panel-4.2.1.1/contents.xml.ro
--- xfce4-panel-4.2.1.1.orig/contents.xml.ro	2005-03-24 20:06:17.792670724 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ro	2005-03-24 20:13:36.617807323 -0700
@@ -41,8 +41,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla -splash</Command>
-        <Tooltip>Navigatorul Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Navigatorul</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ru xfce4-panel-4.2.1.1/contents.xml.ru
--- xfce4-panel-4.2.1.1.orig/contents.xml.ru	2005-03-24 20:06:17.792670724 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ru	2005-03-24 20:13:44.978514357 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>????????????????-?????????????? Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>????????????????-??????????????</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.sk xfce4-panel-4.2.1.1/contents.xml.sk
--- xfce4-panel-4.2.1.1.orig/contents.xml.sk	2005-03-24 20:06:17.793670570 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.sk	2005-03-24 20:13:51.275540535 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Webov?? prehliada?? Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Webov?? prehliada??</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.tr xfce4-panel-4.2.1.1/contents.xml.tr
--- xfce4-panel-4.2.1.1.orig/contents.xml.tr	2005-03-24 20:06:17.794670415 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.tr	2005-03-24 20:14:00.384131910 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla Web Taray??c??s??</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Web Taray??c??s??</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.vi xfce4-panel-4.2.1.1/contents.xml.vi
--- xfce4-panel-4.2.1.1.orig/contents.xml.vi	2005-03-24 20:06:17.794670415 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.vi	2005-03-24 20:14:07.388048769 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Tr??nh duy???t web Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Tr??nh duy???t web</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.zh_CN xfce4-panel-4.2.1.1/contents.xml.zh_CN
--- xfce4-panel-4.2.1.1.orig/contents.xml.zh_CN	2005-02-01 10:25:19.000000000 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.zh_CN	2005-03-24 20:14:19.219219103 -0700
@@ -41,8 +41,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla ???????????????</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>???????????????</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.zh_TW xfce4-panel-4.2.1.1/contents.xml.zh_TW
--- xfce4-panel-4.2.1.1.orig/contents.xml.zh_TW	2005-03-24 20:06:17.795670261 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.zh_TW	2005-03-24 20:14:29.898567563 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla ???????????????</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>???????????????</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-panel.spec	20 Mar 2005 07:50:46 -0000	1.2
+++ xfce4-panel.spec	25 Mar 2005 20:15:53 -0000	1.3
@@ -1,12 +1,13 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.2.1.1
-Release: 2.FC4
+Release: 3.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-panel-4.2.1.1.tar.bz2
 # Change default for Fedora
 Patch0: panel-launchmail.patch
+Patch1: panel-htmlview.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libxfcegui4 >= 4.2.1
@@ -34,7 +35,8 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .launchmail
+%patch1 -p1 -b .htmlview
 
 %build
 %configure
@@ -42,8 +44,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
-
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
 %find_lang %{name}
 
 %clean
@@ -65,6 +68,10 @@
 %{_includedir}/xfce4
 
 %changelog
+* Thu Mar 24 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1.1-3.FC4
+- Added htmlview patch
+- Removed unneeded la/a files
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1.1-2
 - remove stuff
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:33:00 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:33:00 -0500
Subject: rpms/dbh/devel dbh.spec,1.2,1.3
Message-ID: <200503252033.j2PKX002011996@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11988

Modified Files:
	dbh.spec 
Log Message:
lowercase Release



Index: dbh.spec
===================================================================
RCS file: /cvs/extras/rpms/dbh/devel/dbh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dbh.spec	20 Mar 2005 07:28:02 -0000	1.2
+++ dbh.spec	25 Mar 2005 20:32:58 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Disk based hash library
 Name: dbh
 Version: 1.0.22
-Release: 2.FC4
+Release: 3.fc4
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src/dbh-1.0.22.tar.gz
 Patch: dbh-1.0.22-rpath.patch
@@ -63,6 +63,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 1:1.0.22-3.fc4
+- lowercase Release
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 1:1.0.22-2
 - remove stuff
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:36:35 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:36:35 -0500
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec,1.5,1.6
Message-ID: <200503252036.j2PKaZag012046@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12040

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
lowercase Release



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk-xfce-engine.spec	25 Mar 2005 18:57:53 -0000	1.5
+++ gtk-xfce-engine.spec	25 Mar 2005 20:36:33 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
 Version: 2.2.6
-Release: 2.FC4
+Release: 3.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/gtk-xfce-engine-2.2.6.tar.bz2
@@ -35,6 +35,9 @@
 %{_datadir}/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 2.2.6-3.fc4
+- lowercase Release
+
 * Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 2.2.6-2.FC4
 - Removed unneeded la files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:40:06 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:40:06 -0500
Subject: rpms/libxfce4mcs/devel libxfce4mcs.spec,1.2,1.3
Message-ID: <200503252040.j2PKe6qZ012092@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12086

Modified Files:
	libxfce4mcs.spec 
Log Message:
lowercase Release



Index: libxfce4mcs.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/libxfce4mcs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libxfce4mcs.spec	20 Mar 2005 07:45:07 -0000	1.2
+++ libxfce4mcs.spec	25 Mar 2005 20:40:04 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Multi-channel settings management support for Xfce
 Name: libxfce4mcs
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4mcs-4.2.1.tar.bz2
@@ -61,6 +61,9 @@
 %{_datadir}/gtk-doc/html/libxfce4mcs
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - remove stuff
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:43:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:43:20 -0500
Subject: rpms/libxfce4util/devel libxfce4util.spec,1.3,1.4
Message-ID: <200503252043.j2PKhK5X012141@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12135

Modified Files:
	libxfce4util.spec 
Log Message:
lowercase Release



Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libxfce4util.spec	20 Mar 2005 07:42:15 -0000	1.3
+++ libxfce4util.spec	25 Mar 2005 20:43:18 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: BSD and LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4util-4.2.1.tar.bz2
@@ -34,7 +34,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,6 +58,9 @@
 %doc %{_datadir}/gtk-doc/html/libxfce4util
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - remove stuff 
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:49:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:49:42 -0500
Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.4,1.5
Message-ID: <200503252049.j2PKngM5012211@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12205

Modified Files:
	libxfcegui4.spec 
Log Message:
lowercase Release



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libxfcegui4.spec	20 Mar 2005 07:53:58 -0000	1.4
+++ libxfcegui4.spec	25 Mar 2005 20:49:40 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfcegui4-4.2.1.tar.bz2
@@ -67,6 +67,9 @@
 %{_datadir}/gtk-doc/html/libxfcegui4
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release 
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-3
 - remove stuff, remove version from dbh-devel buildreq
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:52:08 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:52:08 -0500
Subject: rpms/xfcalendar/devel xfcalendar.spec,1.3,1.4
Message-ID: <200503252052.j2PKq8K4012248@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12242

Modified Files:
	xfcalendar.spec 
Log Message:
lowercase Release



Index: xfcalendar.spec
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/devel/xfcalendar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfcalendar.spec	25 Mar 2005 18:48:30 -0000	1.3
+++ xfcalendar.spec	25 Mar 2005 20:52:06 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Time-managing application for Xfce4
 Name: xfcalendar
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfcalendar-4.2.1.tar.bz2
@@ -45,6 +45,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Remove unneeded la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:53:30 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:53:30 -0500
Subject: rpms/xfce4-appfinder/devel xfce4-appfinder.spec,1.2,1.3
Message-ID: <200503252053.j2PKrUZB012285@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12279

Modified Files:
	xfce4-appfinder.spec 
Log Message:
lowercase Release



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-appfinder.spec	21 Mar 2005 00:54:09 -0000	1.2
+++ xfce4-appfinder.spec	25 Mar 2005 20:53:28 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-appfinder-4.2.1.tar.bz2
@@ -40,6 +40,9 @@
 %{_datadir}/xfce4/doc/C/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - fix BuildReqs
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:54:35 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:54:35 -0500
Subject: rpms/xfce4-iconbox/devel xfce4-iconbox.spec,1.3,1.4
Message-ID: <200503252054.j2PKsZiG012326@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12319

Modified Files:
	xfce4-iconbox.spec 
Log Message:
lowercase Release



Index: xfce4-iconbox.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-iconbox/devel/xfce4-iconbox.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-iconbox.spec	25 Mar 2005 18:28:03 -0000	1.3
+++ xfce4-iconbox.spec	25 Mar 2005 20:54:33 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Icon box for the Xfce4 Desktop Environment
 Name: xfce4-iconbox
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-iconbox-4.2.1.tar.bz2
@@ -46,6 +46,9 @@
 %{_datadir}/icons/hicolor/*/*/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
 - Removed unneeded la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:55:40 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:55:40 -0500
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.3,1.4
Message-ID: <200503252055.j2PKte3m012368@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12359

Modified Files:
	xfce4-icon-theme.spec 
Log Message:
lowercase Release



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-icon-theme.spec	25 Mar 2005 18:17:56 -0000	1.3
+++ xfce4-icon-theme.spec	25 Mar 2005 20:55:38 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-icon-theme-4.2.1.tar.bz2
@@ -36,6 +36,9 @@
 %{_datadir}/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Added Obsoletes/Provides for xffm-icons
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:56:30 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:56:30 -0500
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec,1.3,1.4
Message-ID: <200503252056.j2PKuUAg012404@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12398

Modified Files:
	xfce4-mixer.spec 
Log Message:
lowercase Release



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-mixer.spec	25 Mar 2005 17:48:15 -0000	1.3
+++ xfce4-mixer.spec	25 Mar 2005 20:56:28 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-mixer-4.2.1.tar.bz2
@@ -46,6 +46,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-mixer.png
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Removed unneeded la files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:58:48 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:58:48 -0500
Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.3,1.4
Message-ID: <200503252058.j2PKwm2P012446@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12440

Modified Files:
	xfce4-panel.spec 
Log Message:
lowercase Release



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-panel.spec	25 Mar 2005 20:15:53 -0000	1.3
+++ xfce4-panel.spec	25 Mar 2005 20:58:46 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.2.1.1
-Release: 3.FC4
+Release: 4.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-panel-4.2.1.1.tar.bz2
@@ -68,6 +68,9 @@
 %{_includedir}/xfce4
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1.1-4.fc4
+- lowercase Release
+
 * Thu Mar 24 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1.1-3.FC4
 - Added htmlview patch
 - Removed unneeded la/a files



From fedora-extras-commits at redhat.com  Fri Mar 25 21:00:17 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:00:17 -0500
Subject: rpms/xfce4-session/devel xfce4-session.spec,1.3,1.4
Message-ID: <200503252100.j2PL0HSF012484@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12477

Modified Files:
	xfce4-session.spec 
Log Message:
lowercase Release



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-session.spec	24 Mar 2005 03:38:40 -0000	1.3
+++ xfce4-session.spec	25 Mar 2005 21:00:15 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-session-4.2.1.tar.bz2
@@ -84,6 +84,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Removed unneeded la/a files
 - Added version to requires in devel and engine subpackages



From fedora-extras-commits at redhat.com  Fri Mar 25 21:01:59 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:01:59 -0500
Subject: rpms/xfce4-systray/devel xfce4-systray.spec,1.4,1.5
Message-ID: <200503252101.j2PL1xAk013224@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13218

Modified Files:
	xfce4-systray.spec 
Log Message:
lowercase Release



Index: xfce4-systray.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systray/devel/xfce4-systray.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-systray.spec	24 Mar 2005 03:14:20 -0000	1.4
+++ xfce4-systray.spec	25 Mar 2005 21:01:57 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Systray for the Xfce4 Desktop Environment
 Name: xfce4-systray
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-systray-4.2.1.tar.bz2
@@ -41,6 +41,9 @@
 %{_libdir}/xfce4
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Removed unneeded la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:04:31 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:04:31 -0500
Subject: rpms/xfce4-toys/devel xfce4-toys.spec,1.3,1.4
Message-ID: <200503252104.j2PL4Vg9013365@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13359

Modified Files:
	xfce4-toys.spec 
Log Message:
lowercase Release



Index: xfce4-toys.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-toys/devel/xfce4-toys.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-toys.spec	23 Mar 2005 21:46:20 -0000	1.3
+++ xfce4-toys.spec	25 Mar 2005 21:04:29 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Various tools for Xfce4
 Name: xfce4-toys
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-toys-4.2.1.tar.bz2
@@ -46,6 +46,9 @@
 %{_datadir}/xfce4/tips/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at scrye.com> - 4.2.1-3.FC4
 - Removed uneeded la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:05:41 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:05:41 -0500
Subject: rpms/xfce4-trigger-launcher/devel xfce4-trigger-launcher.spec, 1.3,
	1.4
Message-ID: <200503252105.j2PL5fPp013402@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13396

Modified Files:
	xfce4-trigger-launcher.spec 
Log Message:
lowercase Release



Index: xfce4-trigger-launcher.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-trigger-launcher/devel/xfce4-trigger-launcher.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-trigger-launcher.spec	23 Mar 2005 21:41:40 -0000	1.3
+++ xfce4-trigger-launcher.spec	25 Mar 2005 21:05:39 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A panel plugin acting as a launcher with two states
 Name: xfce4-trigger-launcher
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-trigger-launcher-4.2.1.tar.bz2
@@ -42,6 +42,9 @@
 %{_libdir}/xfce4/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Removed uneeded la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:07:48 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:07:48 -0500
Subject: rpms/xfce-mcs-manager/devel xfce-mcs-manager.spec,1.2,1.3
Message-ID: <200503252107.j2PL7m4k013432@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13426

Modified Files:
	xfce-mcs-manager.spec 
Log Message:
lowercase Release



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/xfce-mcs-manager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce-mcs-manager.spec	20 Mar 2005 07:47:26 -0000	1.2
+++ xfce-mcs-manager.spec	25 Mar 2005 21:07:46 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-manager-4.2.1.tar.bz2
@@ -59,6 +59,9 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - remove stuff
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:08:54 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:08:54 -0500
Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins.spec,1.3,1.4
Message-ID: <200503252108.j2PL8smJ013471@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13465

Modified Files:
	xfce-mcs-plugins.spec 
Log Message:
lowercase Release



Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce-mcs-plugins.spec	23 Mar 2005 21:32:44 -0000	1.3
+++ xfce-mcs-plugins.spec	25 Mar 2005 21:08:52 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-plugins-4.2.1.tar.bz2
@@ -49,6 +49,9 @@
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release 
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Removed unneeded la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:10:03 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:10:03 -0500
Subject: rpms/xfce-utils/devel xfce-utils.spec,1.3,1.4
Message-ID: <200503252110.j2PLA3Dr013508@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13502

Modified Files:
	xfce-utils.spec 
Log Message:
lowercase Release



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce-utils.spec	23 Mar 2005 21:13:25 -0000	1.3
+++ xfce-utils.spec	25 Mar 2005 21:10:01 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-utils-4.2.1.tar.bz2
@@ -62,6 +62,9 @@
 %{xsessiondir}/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
 - Removed unneeded la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:11:02 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:11:02 -0500
Subject: rpms/xfdesktop/devel xfdesktop.spec,1.5,1.6
Message-ID: <200503252111.j2PLB2aN013547@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13541

Modified Files:
	xfdesktop.spec 
Log Message:
lowercase Release



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfdesktop.spec	23 Mar 2005 20:46:53 -0000	1.5
+++ xfdesktop.spec	25 Mar 2005 21:11:00 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz/xfdesktop-4.2.1.tar.bz2
@@ -63,6 +63,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
 - Removed unneeded a/la files
 - Rediffed xfdesktop-image patch against current version and applied



From fedora-extras-commits at redhat.com  Fri Mar 25 21:12:10 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:12:10 -0500
Subject: rpms/xffm/devel xffm.spec,1.7,1.8
Message-ID: <200503252112.j2PLCAkf013584@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13578

Modified Files:
	xffm.spec 
Log Message:
lowercase Release



Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xffm.spec	23 Mar 2005 16:40:59 -0000	1.7
+++ xffm.spec	25 Mar 2005 21:12:08 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Next generation filemanager and SMB network navigator for Xfce4
 Name: xffm
 Version: 4.2.1
-Release: 4.FC4
+Release: 5.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
@@ -67,6 +67,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-5.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.FC4
 - removed unneeded directories
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:13:16 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:13:16 -0500
Subject: rpms/xfprint/devel xfprint.spec,1.4,1.5
Message-ID: <200503252113.j2PLDGqZ013621@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13615

Modified Files:
	xfprint.spec 
Log Message:
lowercase Release



Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfprint.spec	22 Mar 2005 18:55:48 -0000	1.4
+++ xfprint.spec	25 Mar 2005 21:13:14 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: BSD
 URL: http://www.xfce.org
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfprint-4.2.1.tar.bz2
@@ -53,6 +53,9 @@
 %{_datadir}/icons/hicolor/*/*/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Tue Mar 22 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
 - Removed unneeded ldconfig and la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:14:16 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:14:16 -0500
Subject: rpms/xfwm4/devel xfwm4.spec,1.4,1.5
Message-ID: <200503252114.j2PLEGn8013658@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13652

Modified Files:
	xfwm4.spec 
Log Message:
lowercase Release



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfwm4.spec	23 Mar 2005 20:20:50 -0000	1.4
+++ xfwm4.spec	25 Mar 2005 21:14:14 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2
@@ -58,6 +58,9 @@
 %{_datadir}/themes
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Removed unneeded a/la files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:15:13 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:15:13 -0500
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec,1.3,1.4
Message-ID: <200503252115.j2PLFDg7013698@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13692

Modified Files:
	xfwm4-themes.spec 
Log Message:
lowercase Release



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/xfwm4-themes.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfwm4-themes.spec	20 Mar 2005 22:52:04 -0000	1.3
+++ xfwm4-themes.spec	25 Mar 2005 21:15:11 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-themes-4.2.1.tar.bz2
@@ -35,6 +35,9 @@
 %{_datadir}/themes
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Sun Mar 20 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
 - Readded changelogs back in from core cvs
 



From bugs.michael at gmx.net  Fri Mar 25 21:18:21 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 25 Mar 2005 22:18:21 +0100
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.2,1.3
In-Reply-To: <200503251817.j2PIHwJI009407@cvs-int.fedora.redhat.com>
References: <200503251817.j2PIHwJI009407@cvs-int.fedora.redhat.com>
Message-ID: <20050325221821.228993bc.bugs.michael@gmx.net>

On Fri, 25 Mar 2005 13:17:58 -0500, Kevin Fenzi (kevin) wrote:

> Author: kevin
> 
> Update of /cvs/extras/rpms/xfce4-icon-theme/devel

> +Obsoletes: xffm-icons
> +Provides: xffm-icons

Obsoletes: xffm-icons <= %version-%release
Provides: xffm-icons = %version-%release

This is in the packaging guidelines somewhere, too, I think and makes it
easier to re-introduce a future xffm-icons package.



From kevin at scrye.com  Fri Mar 25 21:29:02 2005
From: kevin at scrye.com (Kevin Fenzi)
Date: Fri, 25 Mar 2005 14:29:02 -0700
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.2,1.3
References: <200503251817.j2PIHwJI009407@cvs-int.fedora.redhat.com>
	<20050325221821.228993bc.bugs.michael@gmx.net>
Message-ID: <20050325212906.218B3B8695@voldemort.scrye.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

>>>>> "Michael" == Michael Schwendt <bugs.michael at gmx.net> writes:

Michael> On Fri, 25 Mar 2005 13:17:58 -0500, Kevin Fenzi (kevin)
Michael> wrote:
>> Author: kevin
>> 
>> Update of /cvs/extras/rpms/xfce4-icon-theme/devel

>> +Obsoletes: xffm-icons +Provides: xffm-icons

Michael> Obsoletes: xffm-icons <= %version-%release Provides:
Michael> xffm-icons = %version-%release

Michael> This is in the packaging guidelines somewhere, too, I think
Michael> and makes it easier to re-introduce a future xffm-icons
Michael> package.

Makes sense. I will make that change. 

I don't see anything about Obsoletes/Provides on: 
http://fedoraproject.org/wiki/PackagingGuidelines

Or is there another packaging guidelines you are refering to?

kevin
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Processed by Mailcrypt 3.5.8 <http://mailcrypt.sourceforge.net/>

iD8DBQFCRIKh3imCezTjY0ERAvt3AJ0We8qTNODYUc3WZ0ymDdtvNUvbggCfb3rT
n/vl6JkwPJUmtHFdmtEMqLE=
=U4em
-----END PGP SIGNATURE-----



From fedora-extras-commits at redhat.com  Fri Mar 25 21:31:13 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:31:13 -0500
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.4,1.5
Message-ID: <200503252131.j2PLVDW1013777@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13771

Modified Files:
	xfce4-icon-theme.spec 
Log Message:
Added version to Obsoletes/Provides xffm-icons



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-icon-theme.spec	25 Mar 2005 20:55:38 -0000	1.4
+++ xfce4-icon-theme.spec	25 Mar 2005 21:31:10 -0000	1.5
@@ -1,15 +1,15 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.2.1
-Release: 4.fc4
+Release: 5.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-icon-theme-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Obsoletes: xffm-icons
-Provides: xffm-icons
+Obsoletes: xffm-icons <= %{version}-%{release}
+Provides: xffm-icons = %{version}-%{release}
 
 %description
 Icon theme for Xfce 4 Desktop Environment.
@@ -36,6 +36,9 @@
 %{_datadir}/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> 4.2.1-5.fc4
+- add explicit version/release to obsoletes/provides
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
 - lowercase Release
 



From bugs.michael at gmx.net  Fri Mar 25 21:46:19 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 25 Mar 2005 22:46:19 +0100
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.2,1.3
In-Reply-To: <20050325212906.218B3B8695@voldemort.scrye.com>
References: <200503251817.j2PIHwJI009407@cvs-int.fedora.redhat.com>
	<20050325221821.228993bc.bugs.michael@gmx.net>
	<20050325212906.218B3B8695@voldemort.scrye.com>
Message-ID: <20050325224619.5d8045c6.bugs.michael@gmx.net>

On Fri, 25 Mar 2005 14:29:02 -0700, Kevin Fenzi wrote:

> I don't see anything about Obsoletes/Provides on: 
> http://fedoraproject.org/wiki/PackagingGuidelines
> 
> Or is there another packaging guidelines you are refering to?

Found it:

http://fedoraproject.org/wiki/PackageNamingGuidelines#head-2c81f7aaf6772e9816f9cf8c5eb62efac828e902



From fedora-extras-commits at redhat.com  Fri Mar 25 22:49:06 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Fri, 25 Mar 2005 17:49:06 -0500
Subject: rpms/pybliographer/FC-3 pybliographer.spec,1.4,1.5
Message-ID: <200503252249.j2PMn6Q2014880@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14871/FC-3

Modified Files:
	pybliographer.spec 
Log Message:
add patch for gnome help display


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-3/pybliographer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pybliographer.spec	22 Feb 2005 22:46:02 -0000	1.4
+++ pybliographer.spec	25 Mar 2005 22:49:04 -0000	1.5
@@ -1,26 +1,27 @@
 Summary: A framework for working with bibliographic databases.
 Name: pybliographer
 Version: 1.2.6.2
-Release: 1
+Release: 2
 Epoch: 0
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.6.2.tar.gz
+Patch: gnome-help.patch
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 BuildRequires: pygtk2-libglade >= 0:2.0.0
-BuildRequires: gnome-python2 >= 0:2.0.0
-BuildRequires: gnome-python2-gconf >= 0:2.0.0
+BuildRequires: gnome-python2 >= 0:2.0.3
+BuildRequires: gnome-python2-gconf >= 0:2.0.3
 BuildRequires: python-bibtex >= 0:1.1.93.1
 BuildRequires: gettext
 BuildRequires: scrollkeeper
 BuildRequires: desktop-file-utils
 
 Requires: pygtk2-libglade >= 0:2.0.0
-Requires: gnome-python2 >= 0:2.0.0
-Requires: gnome-python2-gconf >= 0:2.0.0
+Requires: gnome-python2 >= 0:2.0.3
+Requires: gnome-python2-gconf >= 0:2.0.3
 Requires: python-bibtex >= 0:1.1.93.1
 
 Requires(post): scrollkeeper
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure
@@ -154,6 +156,10 @@
 
 
 %changelog
+* Fri Mar 25 2005 Zoltan Kota <z.kota at gmx.net> - 0:1.2.6.2-2
+- add patch for gnome help display
+- update gnome-python2 requirements
+
 * Tue Feb 22 2005 Zoltan Kota <z.kota at gmx.net> - 0:1.2.6.2-1
 - update to 1.2.6.2
 



From fedora-extras-commits at redhat.com  Fri Mar 25 22:49:06 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Fri, 25 Mar 2005 17:49:06 -0500
Subject: rpms/pybliographer/devel pybliographer.spec,1.6,1.7
Message-ID: <200503252249.j2PMn6GK014884@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14871/devel

Modified Files:
	pybliographer.spec 
Log Message:
add patch for gnome help display


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pybliographer.spec	5 Mar 2005 21:10:24 -0000	1.6
+++ pybliographer.spec	25 Mar 2005 22:49:04 -0000	1.7
@@ -1,25 +1,26 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
 Version: 1.2.6.2
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.6.2.tar.gz
+Patch: gnome-help.patch
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 BuildRequires: pygtk2-libglade >= 2.0.0
-BuildRequires: gnome-python2 >= 2.0.0
-BuildRequires: gnome-python2-gconf >= 2.0.0
+BuildRequires: gnome-python2 >= 2.0.3
+BuildRequires: gnome-python2-gconf >= 2.0.3
 BuildRequires: python-bibtex >= 1.1.93.1
 BuildRequires: gettext
 BuildRequires: scrollkeeper
 BuildRequires: desktop-file-utils
 
 Requires: pygtk2-libglade >= 2.0.0
-Requires: gnome-python2 >= 2.0.0
-Requires: gnome-python2-gconf >= 2.0.0
+Requires: gnome-python2 >= 2.0.3
+Requires: gnome-python2-gconf >= 2.0.3
 Requires: python-bibtex >= 1.1.93.1
 
 Requires(post): scrollkeeper
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure
@@ -153,6 +155,10 @@
 
 
 %changelog
+* Fri Mar 25 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.6.2-2
+- add patch for gnome help display
+- update gnome-python2 requirements
+
 * Tue Feb 22 2005 Zoltan Kota <z.kota at gmx.net> - 0:1.2.6.2-1
 - update to 1.2.6.2
 



From fedora-extras-commits at redhat.com  Fri Mar 25 23:07:05 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Fri, 25 Mar 2005 18:07:05 -0500
Subject: rpms/pybliographer/FC-3 gnome-help.patch,NONE,1.1
Message-ID: <200503252307.j2PN75ja015803@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15794/FC-3

Added Files:
	gnome-help.patch 
Log Message:
patch file commit

gnome-help.patch:

--- NEW FILE gnome-help.patch ---
--- pybliographer-1.2.6.2-orig/Pyblio/GnomeUI/Document.py	2005-02-21 18:50:41.000000000 +0100
+++ pybliographer-1.2.6.2/Pyblio/GnomeUI/Document.py	2005-03-24 23:45:06.359269808 +0100
@@ -800,7 +800,7 @@
         import gobject
 
         try:
-            gnome.help_display ('pybliographer', 'getting-started')
+            gnome.help_display ('pybliographer', None)
             
         except gobject.GError, msg:
             self.w.error (_("Can't display documentation:\n%s") % msg)



From fedora-extras-commits at redhat.com  Fri Mar 25 23:07:05 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Fri, 25 Mar 2005 18:07:05 -0500
Subject: rpms/pybliographer/devel gnome-help.patch,NONE,1.1
Message-ID: <200503252307.j2PN75Vi015808@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15794/devel

Added Files:
	gnome-help.patch 
Log Message:
patch file commit

gnome-help.patch:

--- NEW FILE gnome-help.patch ---
--- pybliographer-1.2.6.2-orig/Pyblio/GnomeUI/Document.py	2005-02-21 18:50:41.000000000 +0100
+++ pybliographer-1.2.6.2/Pyblio/GnomeUI/Document.py	2005-03-24 23:45:06.359269808 +0100
@@ -800,7 +800,7 @@
         import gobject
 
         try:
-            gnome.help_display ('pybliographer', 'getting-started')
+            gnome.help_display ('pybliographer', None)
             
         except gobject.GError, msg:
             self.w.error (_("Can't display documentation:\n%s") % msg)



From steve at kspei.com  Sat Mar 26 01:53:27 2005
From: steve at kspei.com (Steven Pritchard)
Date: Fri, 25 Mar 2005 19:53:27 -0600
Subject: devel/jabberd jabberd.spec,1.4,1.5
In-Reply-To: <200503251939.j2PJdlcF010802@cvs-int.fedora.redhat.com>
References: <200503251939.j2PJdlcF010802@cvs-int.fedora.redhat.com>
Message-ID: <20050326015327.GA30356@osiris.silug.org>

Not really important, but...

On Fri, Mar 25, 2005 at 02:39:47PM -0500, Adrian Reber wrote:
> +%{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g" configure

You can shorten that a lot.

  %{__sed} -i -e "s,sysconfdir=\"\$sysconfdir/jabberd\",#&,g" configure

Steve
-- 
Steven Pritchard - K&S Pritchard Enterprises, Inc.
Email: steve at kspei.com             http://www.kspei.com/
Phone: (618)398-3000               Mobile: (618)567-7320



From fedora-extras-commits at redhat.com  Sat Mar 26 08:47:55 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 26 Mar 2005 03:47:55 -0500
Subject: devel/jabberd jabberd.spec,1.5,1.6
Message-ID: <200503260847.j2Q8lt8O024776@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24759

Modified Files:
	jabberd.spec 
Log Message:
better sed magic (thanks Steve)



Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jabberd.spec	25 Mar 2005 19:39:45 -0000	1.5
+++ jabberd.spec	26 Mar 2005 08:47:53 -0000	1.6
@@ -37,7 +37,7 @@
 %build
 %define _sysconfdir /etc/jabberd
 %define sysconfdir /etc/jabberd
-%{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g" configure
+%{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#&,g" configure
 
 %configure \
 	%{!?_without_pam:--enable-pam} \



From fedora-extras-commits at redhat.com  Sat Mar 26 14:52:23 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 26 Mar 2005 09:52:23 -0500
Subject: rpms/freeciv/devel freeciv.spec,1.2,1.3
Message-ID: <200503261452.j2QEqNg1031003@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30996/devel

Modified Files:
	freeciv.spec 
Log Message:
minor spec file changes


Index: freeciv.spec
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freeciv.spec	24 Mar 2005 01:39:40 -0000	1.2
+++ freeciv.spec	26 Mar 2005 14:52:21 -0000	1.3
@@ -1,12 +1,9 @@
 %define desktop_file 1
-%if %{desktop_file}
-%define desktop_file_utils_version 0.2.93
-%endif
 
 Name:		freeciv
 Version:	1.14.2
-Release:	5
-Summary: 	The Freeciv multi-player strategy game
+Release:	6
+Summary:	The Freeciv multi-player strategy game
 
 Group:		Amusements/Games
 License:	GPL
@@ -15,15 +12,15 @@
 Source1:	freeciv-desktop.tar.bz2
 Source2:	http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz
 Source3:	NEWS-1.14.2
-Patch1:         freeciv-desktop.patch
+Patch1:		freeciv-desktop.patch
 Patch2:		freeciv-desktop-xauth.patch
 Patch3:		freeciv-1.13.0-aifill.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildPrereq:	gtk2-devel >= 2.0.5 imlib-devel
+BuildRequires:	gtk2-devel
+BuildRequires:	imlib-devel
 %if %{desktop_file}
-Requires: 	/usr/bin/desktop-file-install
-BuildPrereq: 	desktop-file-utils >= %{desktop_file_utils_version}
+BuildRequires:	desktop-file-utils
 %endif
 
 %description
@@ -53,24 +50,24 @@
 
 %makeinstall
 chmod +x desktop/*wrapper
-cp desktop/*wrapper $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Games $RPM_BUILD_ROOT/usr/share/pixmaps
+cp desktop/*wrapper $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Games $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp desktop/*.desktop $RPM_BUILD_ROOT/etc/X11/applnk/Games
 
 %if %{desktop_file}
-mkdir -p $RPM_BUILD_ROOT/usr/share/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor net \
-        --dir $RPM_BUILD_ROOT/usr/share/applications \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
         --add-category "Application;Game;X-Fedora" \
         $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-client.desktop
 desktop-file-install --vendor net \
-        --dir $RPM_BUILD_ROOT/usr/share/applications \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
         --add-category "Application;Game;X-Fedora" \
         $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-server.desktop
 rm $RPM_BUILD_ROOT/etc/X11/applnk/Games/*.desktop
 %endif
 
-cp desktop/*.xpm $RPM_BUILD_ROOT/usr/share/pixmaps
+cp desktop/*.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
 pushd client
 perl -p -i -e "s/CFLAGS = $RPM_OPT_FLAGS/CFLAGS = $RPM_OPT_FLAGS \`gtk-config --cflags\`/" gui-gtk/Makefile
@@ -81,18 +78,18 @@
   perl -p -i -e "s|-lXaw3d|\`glib-config --libs\` \`gtk-config --libs\` \`imlib-config --libs-gdk\`|" Makefile
 done
 make
-cp civclient $RPM_BUILD_ROOT/usr/bin/civclient-gtk
+cp civclient $RPM_BUILD_ROOT%{_bindir}/civclient-gtk
 popd
 
-/usr/bin/install -c civ  $RPM_BUILD_ROOT/usr/bin/civ
+/usr/bin/install -c civ  $RPM_BUILD_ROOT%{_bindir}/civ
 
 /usr/bin/install -d $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults
-mv $RPM_BUILD_ROOT/usr/share/freeciv/Freeciv $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/Freeciv
+mv $RPM_BUILD_ROOT%{_datadir}/freeciv/Freeciv $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/Freeciv
 
-mv $RPM_BUILD_ROOT/usr/bin/civclient $RPM_BUILD_ROOT/usr/bin/civclient-xaw
-ln -sf civclient-gtk $RPM_BUILD_ROOT/usr/bin/civclient
+mv $RPM_BUILD_ROOT%{_bindata}/civclient $RPM_BUILD_ROOT{%_bindir}/civclient-xaw
+ln -sf civclient-gtk $RPM_BUILD_ROOT%{_bindir}/civclient
 
-(cd $RPM_BUILD_ROOT/usr/share/freeciv; tar xzf %{SOURCE2}; )
+(cd $RPM_BUILD_ROOT%{_datadir}/freeciv; tar xzf %{SOURCE2}; )
 
 %find_lang %name
 
@@ -102,7 +99,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %if %{desktop_file}
-%config /usr/share/applications/*
+%config %{_datadir}/applications/*
 %doc NEWS*
 %else
 %config /etc/X11/applnk/Games/*
@@ -114,6 +111,11 @@
 
 
 %changelog
+* Sat Mar 26 2005 Brian Pepple <bdpepple at ameritech.net> - 1.14.2-6
+- Added more macros.
+- Replaced BuildPrereq with BuildRequires.
+- Drop version of gtk2-devel, since FC3 & later meet minimum needed.
+
 * Wed Mar 23 2005 Brian Pepple <bdpepple at ameritech.net> - 1.14.2-5
 - Changed X-Red-Hat-Extra to X-Fedora.
 - Added URL.



From fedora-extras-commits at redhat.com  Sat Mar 26 15:54:39 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 26 Mar 2005 10:54:39 -0500
Subject: rpms/freeciv/devel freeciv.spec,1.3,1.4
Message-ID: <200503261554.j2QFsd4S032063@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32056/devel

Modified Files:
	freeciv.spec 
Log Message:
fix typos


Index: freeciv.spec
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- freeciv.spec	26 Mar 2005 14:52:21 -0000	1.3
+++ freeciv.spec	26 Mar 2005 15:54:37 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		freeciv
 Version:	1.14.2
-Release:	6
+Release:	7
 Summary:	The Freeciv multi-player strategy game
 
 Group:		Amusements/Games
@@ -86,7 +86,7 @@
 /usr/bin/install -d $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults
 mv $RPM_BUILD_ROOT%{_datadir}/freeciv/Freeciv $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/Freeciv
 
-mv $RPM_BUILD_ROOT%{_bindata}/civclient $RPM_BUILD_ROOT{%_bindir}/civclient-xaw
+mv $RPM_BUILD_ROOT%{_bindir}/civclient $RPM_BUILD_ROOT%{_bindir}/civclient-xaw
 ln -sf civclient-gtk $RPM_BUILD_ROOT%{_bindir}/civclient
 
 (cd $RPM_BUILD_ROOT%{_datadir}/freeciv; tar xzf %{SOURCE2}; )
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Sat Mar 26 2005 Brian Pepple <bdpepple at ameritech.net> - 1.14.2-7
+- Fixed typos.
+
 * Sat Mar 26 2005 Brian Pepple <bdpepple at ameritech.net> - 1.14.2-6
 - Added more macros.
 - Replaced BuildPrereq with BuildRequires.



From fedora-extras-commits at redhat.com  Sat Mar 26 17:35:03 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Sat, 26 Mar 2005 12:35:03 -0500
Subject: rpms/ktrack/FC-3 ktrack.spec,1.8,1.9
Message-ID: <200503261735.j2QHZ3S3001436@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/ktrack/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1425

Modified Files:
	ktrack.spec 
Log Message:

add qt-devel to BuildRequires



Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/rpms/ktrack/FC-3/ktrack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ktrack.spec	21 Mar 2005 16:18:18 -0000	1.8
+++ ktrack.spec	26 Mar 2005 17:35:01 -0000	1.9
@@ -7,6 +7,7 @@
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
 Patch: ktrack-headers.patch
 BuildRequires: desktop-file-utils kdelibs-devel >= 3.3 hamlib-devel
+BuildRequires: qt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar 26 18:22:51 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 26 Mar 2005 13:22:51 -0500
Subject: devel/ocaml .cvsignore, 1.3, 1.4 ocaml.spec, 1.10, 1.11 sources, 1.3,
	1.4
Message-ID: <200503261822.j2QIMp76002763@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/devel/ocaml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2757

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/ocaml/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:49:55 -0000	1.3
+++ .cvsignore	26 Mar 2005 18:22:49 -0000	1.4
@@ -1,4 +1,4 @@
-ocaml-3.08.2.tar.bz2
+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


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/devel/ocaml/ocaml.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ocaml.spec	3 Mar 2005 23:53:13 -0000	1.10
+++ ocaml.spec	26 Mar 2005 18:22:49 -0000	1.11
@@ -1,12 +1,12 @@
 Name:		ocaml
-Version:	3.08.2
-Release:	2
+Version:	3.08.3
+Release:	1
 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.2.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.3.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
@@ -16,7 +16,7 @@
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
 Requires(post):	/sbin/install-info
-Requires(preun):	/sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 Objective Caml is a high-level, strongly-typed, functional and
@@ -176,6 +176,9 @@
 %doc emacs/README
 
 %changelog
+* Sat Mar 26 2005 Gerard Milmeister <gemi at bluewin.ch> - 3.08.3-1
+- New Version 3.08.3
+
 * Sat Feb 12 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:3.08.2-2
 - Added patch for removing rpath from shared libs
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/ocaml/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:49:55 -0000	1.3
+++ sources	26 Mar 2005 18:22:49 -0000	1.4
@@ -1,4 +1,4 @@
-608319707707cf4ac3f7a13eb63260ad  ocaml-3.08.2.tar.bz2
+8277bb1537051fe5151dc31c350d64cd  ocaml-3.08.3.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



From bugs.michael at gmx.net  Sat Mar 26 18:24:14 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Sat, 26 Mar 2005 19:24:14 +0100
Subject: rpms/ktrack/FC-3 ktrack.spec,1.8,1.9
In-Reply-To: <200503261735.j2QHZ3S3001436@cvs-int.fedora.redhat.com>
References: <200503261735.j2QHZ3S3001436@cvs-int.fedora.redhat.com>
Message-ID: <20050326192414.3b79f6b6.bugs.michael@gmx.net>

On Sat, 26 Mar 2005 12:35:03 -0500, Seth Vidal (skvidal) wrote:

> Author: skvidal
> 
> Update of /cvs/extras/rpms/ktrack/FC-3
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1425
> 
> Modified Files:
> 	ktrack.spec 
> Log Message:
> 
> add qt-devel to BuildRequires

Why?
 
> Index: ktrack.spec
> ===================================================================
> RCS file: /cvs/extras/rpms/ktrack/FC-3/ktrack.spec,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -r1.8 -r1.9
> --- ktrack.spec	21 Mar 2005 16:18:18 -0000	1.8
> +++ ktrack.spec	26 Mar 2005 17:35:01 -0000	1.9
> @@ -7,6 +7,7 @@
>  Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
>  Patch: ktrack-headers.patch
>  BuildRequires: desktop-file-utils kdelibs-devel >= 3.3 hamlib-devel
> +BuildRequires: qt-devel

$ rpm -qpR kdelibs-devel-3.3.1-2.6.FC3.i386.rpm | grep qt-devel
qt-devel >= 1:3.3.3



From skvidal at phy.duke.edu  Sat Mar 26 18:27:56 2005
From: skvidal at phy.duke.edu (seth vidal)
Date: Sat, 26 Mar 2005 13:27:56 -0500
Subject: rpms/ktrack/FC-3 ktrack.spec,1.8,1.9
In-Reply-To: <20050326192414.3b79f6b6.bugs.michael@gmx.net>
References: <200503261735.j2QHZ3S3001436@cvs-int.fedora.redhat.com>
	<20050326192414.3b79f6b6.bugs.michael@gmx.net>
Message-ID: <1111861677.26631.37.camel@cutter>

On Sat, 2005-03-26 at 19:24 +0100, Michael Schwendt wrote:
> On Sat, 26 Mar 2005 12:35:03 -0500, Seth Vidal (skvidal) wrote:
> 
> > Author: skvidal
> > 
> > Update of /cvs/extras/rpms/ktrack/FC-3
> > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1425
> > 
> > Modified Files:
> > 	ktrack.spec 
> > Log Message:
> > 
> > add qt-devel to BuildRequires
> 
> Why?

I thought it was the right one needed. I was wrong. I was going to
change it back and mark the package as broken b/c it's not looking
in /usr/lib64 properly.

-sv




From fedora-extras-commits at redhat.com  Sat Mar 26 18:41:38 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 26 Mar 2005 13:41:38 -0500
Subject: devel/kphone kphone.spec,1.10,1.11
Message-ID: <200503261841.j2QIfcsO002912@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2906

Modified Files:
	kphone.spec 
Log Message:
Added Network category to desktop entry


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kphone.spec	24 Mar 2005 01:57:46 -0000	1.10
+++ kphone.spec	26 Mar 2005 18:41:36 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        10
+Release:        11
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -39,6 +39,7 @@
   --add-category X-Fedora \
   --add-category Application \
   --add-category Internet \
+  --add-category Network \
   --add-category Telephony \
   --add-category Qt \
   %{SOURCE1}
@@ -55,6 +56,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Mar 26 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-11
+- Added Network category to desktop entry
+
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-10
 - First attempt to get it working properly on PPC
 



From fedora-extras-commits at redhat.com  Sat Mar 26 19:24:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 26 Mar 2005 14:24:57 -0500
Subject: devel/ktrack ktrack.spec,1.8,1.9
Message-ID: <200503261924.j2QJOv33003902@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3886/ktrack

Modified Files:
	ktrack.spec 
Log Message:
Make desktop vendor lower-case.


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ktrack.spec	21 Mar 2005 16:18:18 -0000	1.8
+++ ktrack.spec	26 Mar 2005 19:24:55 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 8.rc1
+Release: 9.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -21,13 +21,14 @@
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-%configure --disable-rpath
+%configure --disable-rpath \
+    --with-qt-libraries=${QTDIR}/lib --with-qt-includes=${QTDIR}/include
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-desktop-file-install --vendor=Fedora \
+desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
   --add-category Application \
@@ -53,11 +54,15 @@
 %{_datadir}/icons/locolor/32x32/apps/ktrack.png
 %{_datadir}/locale/de/LC_MESSAGES/ktrack.mo
 %{_datadir}/locale/fr/LC_MESSAGES/ktrack.mo
-%{_datadir}/applications/Fedora-ktrack.desktop
+%{_datadir}/applications/fedora-ktrack.desktop
 %{_datadir}/pixmaps/ktrack.png
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Sat Mar 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.3.0-9.rc1
+- Pass Qt library/header location to configure script to work around
+  broken Qt detection on x86_64.
+
 * Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-8.rc1
 - Use $QTDIR instead of hard-coding paths
 



From fedora-extras-commits at redhat.com  Sat Mar 26 19:24:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 26 Mar 2005 14:24:57 -0500
Subject: devel/leafpad leafpad.spec,1.5,1.6
Message-ID: <200503261924.j2QJOvrV003906@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3886/leafpad

Modified Files:
	leafpad.spec 
Log Message:
Make desktop vendor lower-case.


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/devel/leafpad/leafpad.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- leafpad.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ leafpad.spec	26 Mar 2005 19:24:55 -0000	1.6
@@ -35,7 +35,7 @@
 cat >> leafpad.desktop << EOF
 StartupNotify=true
 EOF
-desktop-file-install --vendor=Fedora \
+desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
   --add-category Application \
@@ -56,7 +56,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/leafpad
-%{_datadir}/applications/Fedora-leafpad.desktop
+%{_datadir}/applications/fedora-leafpad.desktop
 %{_datadir}/locale/*/LC_MESSAGES/leafpad.mo
 %{_datadir}/pixmaps/leafpad.png
 



From fedora-extras-commits at redhat.com  Sat Mar 26 19:24:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 26 Mar 2005 14:24:57 -0500
Subject: devel/kphone kphone.spec,1.11,1.12
Message-ID: <200503261924.j2QJOvb0003899@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3886/kphone

Modified Files:
	kphone.spec 
Log Message:
Make desktop vendor lower-case.


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kphone.spec	26 Mar 2005 18:41:36 -0000	1.11
+++ kphone.spec	26 Mar 2005 19:24:55 -0000	1.12
@@ -34,7 +34,7 @@
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 install -D -m 0644 icons/large-kphone.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kphone.png
-desktop-file-install --vendor=Fedora \
+desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
   --add-category Application \



From bugs.michael at gmx.net  Sat Mar 26 19:25:40 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Sat, 26 Mar 2005 20:25:40 +0100
Subject: rpms/ktrack/FC-3 ktrack.spec,1.8,1.9
In-Reply-To: <1111861677.26631.37.camel@cutter>
References: <200503261735.j2QHZ3S3001436@cvs-int.fedora.redhat.com>
	<20050326192414.3b79f6b6.bugs.michael@gmx.net>
	<1111861677.26631.37.camel@cutter>
Message-ID: <20050326202540.77da07d7.bugs.michael@gmx.net>

On Sat, 26 Mar 2005 13:27:56 -0500, seth vidal wrote:

> On Sat, 2005-03-26 at 19:24 +0100, Michael Schwendt wrote:
> > On Sat, 26 Mar 2005 12:35:03 -0500, Seth Vidal (skvidal) wrote:
> > 
> > > Author: skvidal
> > > 
> > > Update of /cvs/extras/rpms/ktrack/FC-3
> > > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1425
> > > 
> > > Modified Files:
> > > 	ktrack.spec 
> > > Log Message:
> > > 
> > > add qt-devel to BuildRequires
> > 
> > Why?
> 
> I thought it was the right one needed. I was wrong. I was going to
> change it back and mark the package as broken b/c it's not looking
> in /usr/lib64 properly.

Ah, I see. I've committed a work-around. ktrack appends kdelibsuff='64' in
other than the needed place and therefore looks in
/usr/lib64/qt-3.3.3/lib64, which doesn't exist.



From fedora-extras-commits at redhat.com  Sat Mar 26 19:28:04 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 26 Mar 2005 14:28:04 -0500
Subject: rpms/ocaml/FC-3 .cvsignore, 1.3, 1.4 ocaml.spec, 1.9, 1.10 sources,
	1.3, 1.4
Message-ID: <200503261928.j2QJS4SS003988@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3982

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
New Version 3.08.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:49:55 -0000	1.3
+++ .cvsignore	26 Mar 2005 19:28:02 -0000	1.4
@@ -1,4 +1,4 @@
-ocaml-3.08.2.tar.bz2
+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


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/ocaml.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ocaml.spec	12 Feb 2005 16:39:53 -0000	1.9
+++ ocaml.spec	26 Mar 2005 19:28:02 -0000	1.10
@@ -1,22 +1,22 @@
-Name: 		ocaml
-Version: 	3.08.2
-Release:	2
-Epoch:		0
-Summary: 	The Objective Caml compiler and programming environment
+Name:		ocaml
+Version:	3.08.3
+Release:	1
+Summary:	Objective Caml compiler and programming environment
 
-Group: 		Development/Languages
-License: 	QPL/LGPL
+Group:		Development/Languages
+License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0: 	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.2.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
-Patch:	 	ocaml-rpath.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.3.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
+Patch:		ocaml-rpath.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
-Requires(post,preun): /sbin/install-info
+Requires(post):	/sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 Objective Caml is a high-level, strongly-typed, functional and
@@ -30,7 +30,7 @@
 %package -n labltk
 Group:		Development/Languages
 Summary:	Tk bindings for Objective Caml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 
 %description -n labltk
 A library for interfacing Objective Caml with the scripting language
@@ -38,8 +38,8 @@
 
 %package -n camlp4
 Group:		Development/Languages
-Summary:	A Pre-Processor-Pretty-Printer for OCaml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Summary:	Pre-Processor-Pretty-Printer for OCaml
+Requires:	ocaml = %{version}-%{release}
 
 %description -n camlp4
 Camlp4 is a Pre-Processor-Pretty-Printer for OCaml, parsing a source
@@ -48,7 +48,7 @@
 %package ocamldoc
 Group:		Development/Languages
 Summary:	Documentation generator for OCaml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 
 %description ocamldoc
 Documentation generator for Objective Caml.
@@ -56,7 +56,7 @@
 %package emacs
 Group:		Development/Languages
 Summary:	Emacs mode for Objective Caml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 Requires:	emacs
 
 %description emacs
@@ -65,7 +65,7 @@
 %package docs
 Group:		Development/Languages
 Summary:	Documentation for OCaml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 
 %description docs
 Documentation for Objective Caml.
@@ -113,7 +113,7 @@
     %{_infodir}/dir 2>/dev/null || :
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 fi
 
@@ -176,6 +176,9 @@
 %doc emacs/README
 
 %changelog
+* Sat Mar 26 2005 Gerard Milmeister <gemi at bluewin.ch> - 3.08.3-1
+- New Version 3.08.3
+
 * Sat Feb 12 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:3.08.2-2
 - Added patch for removing rpath from shared libs
 
@@ -183,7 +186,7 @@
 - New Version 3.08.2
 
 * Thu Dec 30 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:3.07-6
-- add -x11lib %%{_prefix}/X11R6/%%{_lib} to configure; fixes labltk build 
+- add -x11lib %%{_prefix}/X11R6/%%{_lib} to configure; fixes labltk build
   on x86_64
 
 * Tue Dec  2 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:3.07-0.fdr.5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:49:55 -0000	1.3
+++ sources	26 Mar 2005 19:28:02 -0000	1.4
@@ -1,4 +1,4 @@
-608319707707cf4ac3f7a13eb63260ad  ocaml-3.08.2.tar.bz2
+8277bb1537051fe5151dc31c350d64cd  ocaml-3.08.3.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



From fedora-extras-commits at redhat.com  Sun Mar 27 09:01:20 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:01:20 -0500
Subject: rpms/drscheme - New directory
Message-ID: <200503270901.j2R91Ku2018195@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18182/drscheme

Log Message:
Directory /cvs/extras/rpms/drscheme added to the repository




From fedora-extras-commits at redhat.com  Sun Mar 27 09:01:20 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:01:20 -0500
Subject: rpms/drscheme/devel - New directory
Message-ID: <200503270901.j2R91KCF018198@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18182/drscheme/devel

Log Message:
Directory /cvs/extras/rpms/drscheme/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Mar 27 09:01:43 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:01:43 -0500
Subject: rpms/drscheme Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503270901.j2R91hY2018278@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18263

Added Files:
	Makefile import.log 
Log Message:
Setup of module drscheme


--- NEW FILE Makefile ---
# Top level Makefile for module drscheme
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 27 09:01:43 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:01:43 -0500
Subject: rpms/drscheme/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503270901.j2R91h6b018281@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18263/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module drscheme


--- 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 Mar 27 09:03:37 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:03:37 -0500
Subject: rpms/drscheme/devel drscheme.png, NONE, 1.1 drscheme.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503270903.j2R93bWL018773@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18753/devel

Modified Files:
	.cvsignore sources 
Added Files:
	drscheme.png drscheme.spec 
Log Message:
auto-import drscheme-299.100-1 on branch devel from drscheme-299.100-1.src.rpm


--- NEW FILE drscheme.spec ---
Name:           drscheme
Version:        299.100
Release:        1
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/299.100/plt/plt-299.100-src-unix.tgz
Source1:	drscheme.png
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel
BuildRequires:	desktop-file-utils
Obsoletes:	plt
Provides:	plt-scheme, mzscheme, mred, mrflow


%description
DrScheme is an interactive, integrated, graphical programming
environment for the MzScheme programming language, and the MrEd
windowing toolbox.

DrScheme provides source highlighting for syntax and run-time errors,
support for multiple language levels, an algebraic stepper, objects,
modules, a GUI library, TCP/IP, and much more. It includes an
extensive, hyper-linked help system called Help Desk, available from
the Help menu.

You can enhance DrScheme with many add-ons, including MrFlow, a static
debugger.

MzScheme is R5RS-compliant, including the full numerical tower. It
also provides threads (on all platforms), exceptions, modules,
class-based objects, regular-expression matching, TCP/IP, and more.

MrEd provides a windowing toolbox for creating windows and menus; a
drawing toolbox for drawing to windows, bitmaps, and printer devices;
and an editor toolbox for creating multimedia editors.

%prep
%setup -q -n plt

%build
cd src
%configure --enable-gl --enable-xrender --disable-xft
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/plt
(cd src; make install prefix=$RPM_BUILD_ROOT%{_libdir}/plt)
(cd $RPM_BUILD_ROOT%{_libdir}/plt/bin; ./setup-plt)

mkdir -p $RPM_BUILD_ROOT%{_bindir}
for i in $RPM_BUILD_ROOT%{_libdir}/plt/bin/{drscheme,help-desk,mzc,setup-plt,tex2page}
do
    perl -pi -e "s|PLTHOME=.*$|PLTHOME=/usr/lib/plt|" $i
done
(
   cd $RPM_BUILD_ROOT%{_bindir}
   ln -sf ../lib/plt/bin/{drscheme,mred,mzc,mzscheme} .
)
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
cp -f $RPM_BUILD_ROOT%{_libdir}/plt/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man
rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes
rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/install

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps

cat > drscheme.desktop <<EOF
[Desktop Entry]
Name=DrScheme
GenericName=Scheme programming
Comment=Programming environment for the Scheme programming language
Exec=drscheme
Terminal=false
Icon=drscheme.png
Type=Application
Encoding=UTF-8
X-Desktop-File-Install-Version=0.4
EOF

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora                     \
        --add-category X-Fedora                          \
        --add-category Application                       \
        --add-category Development                       \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications    \
        drscheme.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc notes/*
%{_bindir}/*
%{_libdir}/plt
%{_mandir}/*/*
%{_datadir}/pixmaps/*
%{_datadir}/applications/*

%changelog
* Sun Mar 27 2005 Gerard Milmeister <gemi at bluewin.ch> - 299.100-1
- New Version 299.100

* Sat Mar 26 2005 Gerard Milmeister <gemi at bluewin.ch> - 209-1
- Renamed package from plt to drscheme

* Sat Dec 18 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:209-0.fdr.1
- New Version 209

* Sat Nov 13 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:208-0.fdr.1
- New Version 208
- Added desktop file
- Added icon

* Sun Nov  9 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:205-0.fdr.1
- First Fedora release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/drscheme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Mar 2005 09:01:41 -0000	1.1
+++ .cvsignore	27 Mar 2005 09:03:35 -0000	1.2
@@ -0,0 +1 @@
+plt-299.100-src-unix.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/drscheme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Mar 2005 09:01:41 -0000	1.1
+++ sources	27 Mar 2005 09:03:35 -0000	1.2
@@ -0,0 +1 @@
+12186ba09947d9ebc3988e29de4ab104  plt-299.100-src-unix.tgz



From fedora-extras-commits at redhat.com  Sun Mar 27 09:03:37 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:03:37 -0500
Subject: rpms/drscheme import.log,1.1,1.2
Message-ID: <200503270903.j2R93bBP018772@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18753

Modified Files:
	import.log 
Log Message:
auto-import drscheme-299.100-1 on branch devel from drscheme-299.100-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/drscheme/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Mar 2005 09:01:41 -0000	1.1
+++ import.log	27 Mar 2005 09:03:35 -0000	1.2
@@ -0,0 +1 @@
+drscheme-299_100-1:HEAD:drscheme-299.100-1.src.rpm:1111914190



From fedora-extras-commits at redhat.com  Sun Mar 27 09:11:26 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:11:26 -0500
Subject: rpms/drscheme/devel drscheme.spec,1.1,1.2
Message-ID: <200503270911.j2R9BQ6m019321@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19309

Modified Files:
	drscheme.spec 
Log Message:
prep for FC4 build



Index: drscheme.spec
===================================================================
RCS file: /cvs/extras/rpms/drscheme/devel/drscheme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drscheme.spec	27 Mar 2005 09:03:35 -0000	1.1
+++ drscheme.spec	27 Mar 2005 09:11:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           drscheme
 Version:        299.100
-Release:        1
+Release:        1.fc4
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel
 BuildRequires:	desktop-file-utils
-Obsoletes:	plt
+Obsoletes:	plt <= %{version}
 Provides:	plt-scheme, mzscheme, mred, mrflow
 
 



From fedora-extras-commits at redhat.com  Sun Mar 27 09:11:45 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:11:45 -0500
Subject: rpms/drscheme/FC-3 drscheme.spec,1.1,1.2
Message-ID: <200503270911.j2R9Bj0G019357@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19345

Modified Files:
	drscheme.spec 
Log Message:
prep for FC3 build



Index: drscheme.spec
===================================================================
RCS file: /cvs/extras/rpms/drscheme/FC-3/drscheme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drscheme.spec	27 Mar 2005 09:03:35 -0000	1.1
+++ drscheme.spec	27 Mar 2005 09:11:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           drscheme
 Version:        299.100
-Release:        1
+Release:        1.fc3
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel
 BuildRequires:	desktop-file-utils
-Obsoletes:	plt
+Obsoletes:	plt <= %{version}
 Provides:	plt-scheme, mzscheme, mred, mrflow
 
 



From wtogami at redhat.com  Sun Mar 27 09:14:32 2005
From: wtogami at redhat.com (Warren Togami)
Date: Sat, 26 Mar 2005 23:14:32 -1000
Subject: APPROVED: drscheme
Message-ID: <42467978.8090706@redhat.com>

Name: drscheme
Summary: Graphical environment for developing programs using Scheme

Reviewed by: wtogami at redhat.com
Maintainer: gemi at bluewin.ch



From fedora-extras-commits at redhat.com  Sun Mar 27 12:08:40 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 27 Mar 2005 07:08:40 -0500
Subject: rpms/apt/devel apt-pymake.patch, NONE, 1.1 apt-scriptdir.patch, NONE,
	1.1 rpmpriorities, 1.2, 1.3 .cvsignore, 1.3, 1.4 apt.spec,
	1.12, 1.13 mirror-select.conf, 1.3, 1.4 sources, 1.3,
	1.4 apt-0.5.15cnc6-docbook.patch, 1.1,
	NONE apt-0.5.15cnc6-pymake.patch, 1.2,
	NONE apt-0.5.15cnc6-python-update.patch, 1.1,
	NONE apt-0.5.15cnc6-r362.patch, 1.1,
	NONE apt-0.5.15cnc6-scriptdir.patch, 1.1, NONE gpg-checker.lua,
	1.2, NONE gpg-import.lua, 1.2, NONE rpmpriorities.1, 1.3,
	NONE rpmpriorities.2, 1.3, NONE rpmpriorities.3, 1.1,
	NONE rpmpriorities.Rawhide, 1.1, NONE
Message-ID: <200503271208.j2RC8e4R025699@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25693

Modified Files:
	.cvsignore apt.spec mirror-select.conf sources 
Added Files:
	apt-pymake.patch apt-scriptdir.patch rpmpriorities 
Removed Files:
	apt-0.5.15cnc6-docbook.patch apt-0.5.15cnc6-pymake.patch 
	apt-0.5.15cnc6-python-update.patch apt-0.5.15cnc6-r362.patch 
	apt-0.5.15cnc6-scriptdir.patch gpg-checker.lua gpg-import.lua 
	rpmpriorities.1 rpmpriorities.2 rpmpriorities.3 
	rpmpriorities.Rawhide 
Log Message:
0.5.15cnc7, perms fix, cleanups, drop non-FC4 files and build hacks.

apt-pymake.patch:

--- NEW FILE apt-pymake.patch ---
Index: python/Makefile
===================================================================
--- python/Makefile	(revision 373)
+++ python/Makefile	(working copy)
@@ -16,10 +16,10 @@
 $(MODULES): %.py: _%.so
 
 _%.so: %_wrap.cxx
-	$(CC) -fPIC -shared -I.. $(PYTHONFLAGS) $(LUAFLAGS) -L../bin -L../build/bin -lapt-pkg -o $@ $<
+	$(CC) -fPIC -shared -I.. -I../include $(PYTHONFLAGS) $(LUAFLAGS) -L../apt-pkg/.libs -lapt-pkg -o $@ $<
 
 apt_wrap.cxx: apt.i
-	$(SWIG) $(SWIGFLAGS) -c++ -I.. $(LUAFLAGS) -python $<
+	$(SWIG) $(SWIGFLAGS) -c++ -I.. -I../include $(LUAFLAGS) -python $<
 
 clean:
 	rm -f *.cxx

apt-scriptdir.patch:

--- NEW FILE apt-scriptdir.patch ---
Index: contrib/apt-wrapper/apt.1.xml
===================================================================
--- contrib/apt-wrapper/apt.1.xml	(revision 373)
+++ contrib/apt-wrapper/apt.1.xml	(working copy)
@@ -325,7 +325,7 @@
 
  <refsect1><title>Files</title>
    <variablelist>
-     <varlistentry><term><filename>/usr/lib/apt/scripts</filename></term>
+     <varlistentry><term><filename>/usr/share/apt/scripts</filename></term>
      <listitem><para>APT lua scripts.
      Configuration item: <literal>Dir::Bin::scripts</literal>.</para></listitem>
      </varlistentry>
Index: contrib/apt-wrapper/apt.1
===================================================================
--- contrib/apt-wrapper/apt.1	(revision 373)
+++ contrib/apt-wrapper/apt.1	(working copy)
@@ -157,7 +157,7 @@
 .SH "FILES"
 
 .TP
-\fI/usr/lib/apt/scripts\fR
+\fI/usr/share/apt/scripts\fR
 APT lua scripts\&. Configuration item: Dir::Bin::scripts\&.
 
 .SH "ENVIRONMENT"
Index: contrib/apt-files/README
===================================================================
--- contrib/apt-files/README	(revision 373)
+++ contrib/apt-files/README	(working copy)
@@ -40,7 +40,7 @@
 these files in the following directories:
 
     /etc/apt/apt.conf.d/apt-files.conf
-    /usr/lib/apt/scripts/apt-files.lua
+    /usr/share/apt/scripts/apt-files.lua
     /var/state/apt/Contents.gz
 
 Bingo! It should be working. ;-)
Index: contrib/apt-groupinstall/apt-groupinstall.conf
===================================================================
--- contrib/apt-groupinstall/apt-groupinstall.conf	(revision 373)
+++ contrib/apt-groupinstall/apt-groupinstall.conf	(working copy)
@@ -10,7 +10,7 @@
 // For RHEL/FC systems
 Scripts::Groupinstall::Backend "groupinstall-backend-comps.py";
 Scripts::Groupinstall::DataPath "/usr/share/comps/i386/comps.xml";
-Synaptic::taskHelperProg "/usr/lib/apt/scripts/groupinstall-backend-comps.py";
+Synaptic::taskHelperProg "/usr/share/apt/scripts/groupinstall-backend-comps.py";
 
 // For Suse systems
 //Scripts::Groupinstall::Backend "groupinstall-backend-suse";
Index: apt-pkg/luaiface.cc
===================================================================
--- apt-pkg/luaiface.cc	(revision 373)
+++ apt-pkg/luaiface.cc	(working copy)
@@ -76,7 +76,7 @@
 Lua::Lua()
       : DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0)
 {
-   _config->CndSet("Dir::Bin::scripts", "/usr/lib/apt/scripts");
+   _config->CndSet("Dir::Bin::scripts", "/usr/share/apt/scripts");
 
    const luaL_reg lualibs[] = {
       {"base", luaopen_base},


Index: rpmpriorities
===================================================================
RCS file: rpmpriorities
diff -N rpmpriorities
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rpmpriorities	27 Mar 2005 12:08:38 -0000	1.3
@@ -0,0 +1,36 @@
+Essential:
+  grub
+  termcap
+  ed
+  kbd
+  iproute
+  libtermcap
+  libgcc
+  setserial
+  file
+  rpm
+  sysklogd
+  losetup
+  kudzu
+  glibc
+  shadow-utils
+  coreutils
+  bash
+  iputils
+  vim-minimal
+  passwd
+  cpio
+  raidtools
+  SysVinit
+  authconfig
+  hdparm
+  hotplug
+  readline
+  util-linux
+  basesystem
+  setup
+  e2fsprogs
+  procps
+  initscripts
+  filesystem
+  fedora-release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:04:37 -0000	1.3
+++ .cvsignore	27 Mar 2005 12:08:38 -0000	1.4
@@ -1 +1 @@
-apt-0.5.15cnc6.tar.bz2
+apt-0.5.15cnc7.tar.bz2


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apt.spec	19 Mar 2005 11:18:26 -0000	1.12
+++ apt.spec	27 Mar 2005 12:08:38 -0000	1.13
@@ -1,6 +1,3 @@
-# needed for rpmpriorities and mirror-select.conf:
-%{!?fcrel:%define fcrel %(cut -d' ' -f4 /etc/fedora-release )}
-
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define scriptdir %{_datadir}/apt/scripts/
@@ -8,23 +5,17 @@
 %define generate_rpmpriorities 0
 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
 
-# subversion revision for svn snapshots
-%define svnver r362
-
-# we need to work around various missing builddeps in rpm :-/
-%{!?rpmver:%define rpmver %(rpm --version | cut -d' ' -f3 | cut -d. -f1-2)}
-
 Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
-Version: 0.5.15cnc6
-Release: 16.%{svnver}
+Version: 0.5.15cnc7
+Release: 2
 Group: System Environment/Base
 URL: https://moin.conectiva.com.br/AptRpm
 License: GPL
 ExcludeArch: x86_64 ppc64
 
 # unfortunately the source isn't really directly downloadable with wget etc:
-#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc6.tar.bz2
+#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc7.tar.bz2
 Source0: %{name}-%{version}.tar.bz2
 
 # user editable template configs
@@ -34,10 +25,7 @@
 Source4: apt_preferences
 
 # rpmpriorities generated + manually tweaked from comps.xml core group
-Source5: rpmpriorities.1
-Source6: rpmpriorities.2
-Source6: rpmpriorities.3
-Source18: rpmpriorities.Rawhide
+Source5: rpmpriorities
 Source19: comps2prio.xsl
 
 # nightly updater scripts & config
@@ -78,44 +66,32 @@
 
 Provides: apt-mirrorselect
 
-# Others deps are automatically picked up by rpm
+# Other deps are automatically picked up by rpm
 Requires: gnupg, bzip2
 Requires(post): chkconfig, ldconfig
 Requires(preun): chkconfig
 # Needed by the mirror-selector script
 Requires: wget
 
-BuildRequires: beecrypt-devel
-BuildRequires: elfutils-devel
-# TODO: verify the required minimum version
+# TODO: verify the required minimum Python version
 BuildRequires: python-devel >= 2.2
 BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext
-BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel
-# for version detection to work
-BuildRequires: fedora-release
+BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel, libtool
 %if %{generate_rpmpriorities}
 BuildRequires: %{_bindir}/xsltproc, %{comps}
 %endif
-
-%if "%{rpmver}" >= "4.3"
-BuildRequires: libselinux-devel
-%endif
+# Work around missing deps in rpm-devel :-/
+BuildRequires: beecrypt-devel, elfutils-libelf-devel
 
 # Fix some issues in python binding build
-Patch1: apt-0.5.15cnc6-pymake.patch
+Patch1: apt-pymake.patch
 Patch5: apt-0.5.15cnc6-pymake2.patch
-# Update to current svn snapshot: svn diff -r316:%{svnver}
-Patch2: apt-0.5.15cnc6-%{svnver}.patch
 # Make rpm manifest usage configurable
 Patch3: apt-0.5.15cnc5-manifest-limit.patch
-# Docbook build fixes, send upstream
-Patch4: apt-0.5.15cnc6-docbook.patch
 # Take read-only, not exclusive rpmdb lock for the initial dependency processing
 Patch6: apt-0.5.15cnc6-rdonly.patch
 # Move scripts from /usr/lib/apt to /usr/share/apt
-Patch7: apt-0.5.15cnc6-scriptdir.patch
-# Update python bindings
-Patch8: apt-0.5.15cnc6-python-update.patch
+Patch7: apt-scriptdir.patch
 
 %description
 A port of Debian's apt tools for RPM based distributions.
@@ -161,23 +137,29 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .pymake
-%patch2 -p0 -b .svnsnap
+%patch1 -p0 -b .pymake
 %patch3 -p1 -b .manifest
-%patch4 -p0 -b .docbook
 %patch5 -p0 -b .pymake2
 %patch6 -p1 -b .rdonly
-%patch7 -p1 -b .scriptdir
-%patch8 -p1 -b .pyupdate
+%patch7 -p0 -b .scriptdir
 
 # fix docs to reference correct paths
 perl -pi -e \
   's|\bconfigure-index\.gz\b|configure-index| ;
    s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
-  doc/apt.ent doc/fr/apt.ent.fr
+  doc/apt.ent doc/*/apt.ent.*
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
+# don't require python, lua etc because of stuff in doc/contrib
+find contrib/ -type f | xargs chmod 0644
+
+# appease aclocal >= 1.8
+perl -pi -e 's|^(AC_DEFUN\()(\w+)|$1\[$2\]|' buildlib/*.m4
+
+# http://distro2.conectiva.com.br/pipermail/apt-rpm/2005-March/002664.html
+libtoolize -f && autoreconf
+
 
 %build
 %configure --disable-dependency-tracking
@@ -185,17 +167,12 @@
 SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \
 make %{?_smp_mflags}
 
-# prevent re-generation of the python wrapper, requires a patched swig :(
-#touch python/apt.py python/apt_wrap.cxx
-cp python/apt.py python/apt.py.pyupdate
-cp python/apt_wrap.cxx python/apt_wrap.cxx.pyupdate
 make -C python %{?_smp_mflags} PYTHON="%{__python}"
 %{__python} -c "import py_compile; py_compile.compile('python/apt.py')"
 
+cp -p %{SOURCE5} rpmpriorities
 %if %{generate_rpmpriorities}
 %{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
-%else
-cp -p $RPM_SOURCE_DIR/rpmpriorities.%{fcrel} rpmpriorities
 %endif
 
 
@@ -226,8 +203,6 @@
 for cnf in %{SOURCE150} %{SOURCE151}; do
 	install -p -m 644 $cnf $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
 done
-# fix mirror-select path
-perl -pi -e "s/FCREL/%{fcrel}/g" $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/mirror-select.conf
 
 install -p -m 644 %{SOURCE250} $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
@@ -259,14 +234,11 @@
 
 # apt-groupinstall from contrib
 install -p -m 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{scriptdir}
-install -p -m 755 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+install -p -m 644 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
 
 # nuke .la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# don't require python, lua etc because of stuff in doc/contrib
-find contrib/ -type f |xargs chmod 0644
-
 
 %pre
 if [ $1 -gt 1 ] && [ ! -f %{_sysconfdir}/apt/apt.conf.d/default.conf ]; then
@@ -287,7 +259,8 @@
 %post
 /sbin/ldconfig
 if [ ! -f %{_sysconfdir}/apt/apt.conf ]; then
- echo "// User customizable configuration goes here" > %{_sysconfdir}/apt/apt.conf
+ echo "// User customizable configuration goes here" \
+  > %{_sysconfdir}/apt/apt.conf
 fi
 /sbin/chkconfig --add apt
 
@@ -326,6 +299,7 @@
 %{_bindir}/apt-config
 %{_bindir}/apt-shell
 %{_bindir}/apt-get
+%{_bindir}/countpkglist
 %{_bindir}/genpkglist
 %{_bindir}/gensrclist
 %{_bindir}/genbasedir
@@ -359,6 +333,11 @@
 
 
 %changelog
+* Sat Mar 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15cnc7-2
+- 0.5.15cnc7, drop patches applied upstream.
+- Fix groupinstall config file permissions.
+- Various specfile and build cleanups and typo fixes.
+
 * Sat Mar 19 2005 Ville Skytt?? <ville.skytta at iki.fi>
 - Apply hack against missing libselinux-devel dep in rpm-devel for rpm 4.4 too.
 
@@ -401,7 +380,7 @@
 
 * Wed Aug 18 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r362
 - revision r362
-- add rpmprioties file for rawhide
+- add rpmpriorities file for rawhide
 
 * Sat Aug 14 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r361
 - update to revision r361
@@ -583,7 +562,7 @@
 - drop patches merged upstream
 
 * Tue Dec 23 2003 Panu Matilainen <pmatilai at welho.com>
-- remove extranuous mirror-select configs from default.conf
+- remove extraneous mirror-select configs from default.conf
 - updated mirror-select script
 
 * Fri Dec 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.4


Index: mirror-select.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/mirror-select.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mirror-select.conf	17 Jan 2005 22:01:26 -0000	1.3
+++ mirror-select.conf	27 Mar 2005 12:08:38 -0000	1.4
@@ -3,5 +3,5 @@
 Scripts::AptGet::Help::Command:: "mirror-select.lua";
 Dir::Etc::sourceparts::mirrorsource "mirror-select.list";
 Dir::State::mirrors "mirrors.list";
-Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fcFCREL-mirrors.list";
-Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fcFCREL-mirrors.list";
+Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fc4-mirrors.list";
+Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fc4-mirrors.list";


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:04:37 -0000	1.3
+++ sources	27 Mar 2005 12:08:38 -0000	1.4
@@ -1 +1 @@
-134575fd06c8c84d46766a65ed8a26af  apt-0.5.15cnc6.tar.bz2
+9e44ec1503fa96832bbd9b532543e4de  apt-0.5.15cnc7.tar.bz2


--- apt-0.5.15cnc6-docbook.patch DELETED ---


--- apt-0.5.15cnc6-pymake.patch DELETED ---


--- apt-0.5.15cnc6-python-update.patch DELETED ---


--- apt-0.5.15cnc6-r362.patch DELETED ---


--- apt-0.5.15cnc6-scriptdir.patch DELETED ---


--- gpg-checker.lua DELETED ---


--- gpg-import.lua DELETED ---


--- rpmpriorities.1 DELETED ---


--- rpmpriorities.2 DELETED ---


--- rpmpriorities.3 DELETED ---


--- rpmpriorities.Rawhide DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar 27 12:10:15 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 27 Mar 2005 07:10:15 -0500
Subject: rpms/apt/FC-3 apt-pymake.patch, NONE, 1.1 apt-scriptdir.patch, NONE,
	1.1 rpmpriorities, 1.2, 1.3 .cvsignore, 1.3, 1.4 apt.spec, 1.9,
	1.10 mirror-select.conf, 1.3, 1.4 sources, 1.3,
	1.4 apt-0.5.15cnc6-docbook.patch, 1.1,
	NONE apt-0.5.15cnc6-pymake.patch, 1.2,
	NONE apt-0.5.15cnc6-python-update.patch, 1.1,
	NONE apt-0.5.15cnc6-r362.patch, 1.1,
	NONE apt-0.5.15cnc6-scriptdir.patch, 1.1, NONE gpg-checker.lua,
	1.2, NONE gpg-import.lua, 1.2, NONE rpmpriorities.1, 1.3,
	NONE rpmpriorities.2, 1.3, NONE rpmpriorities.3, 1.1,
	NONE rpmpriorities.Rawhide, 1.1, NONE
Message-ID: <200503271210.j2RCAFbo025737@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/apt/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25731

Modified Files:
	.cvsignore apt.spec mirror-select.conf sources 
Added Files:
	apt-pymake.patch apt-scriptdir.patch rpmpriorities 
Removed Files:
	apt-0.5.15cnc6-docbook.patch apt-0.5.15cnc6-pymake.patch 
	apt-0.5.15cnc6-python-update.patch apt-0.5.15cnc6-r362.patch 
	apt-0.5.15cnc6-scriptdir.patch gpg-checker.lua gpg-import.lua 
	rpmpriorities.1 rpmpriorities.2 rpmpriorities.3 
	rpmpriorities.Rawhide 
Log Message:
0.5.15cnc7, perms fix, whitespace/cleanup sync w/devel, drop non-FC3 stuff.

apt-pymake.patch:

--- NEW FILE apt-pymake.patch ---
Index: python/Makefile
===================================================================
--- python/Makefile	(revision 373)
+++ python/Makefile	(working copy)
@@ -16,10 +16,10 @@
 $(MODULES): %.py: _%.so
 
 _%.so: %_wrap.cxx
-	$(CC) -fPIC -shared -I.. $(PYTHONFLAGS) $(LUAFLAGS) -L../bin -L../build/bin -lapt-pkg -o $@ $<
+	$(CC) -fPIC -shared -I.. -I../include $(PYTHONFLAGS) $(LUAFLAGS) -L../apt-pkg/.libs -lapt-pkg -o $@ $<
 
 apt_wrap.cxx: apt.i
-	$(SWIG) $(SWIGFLAGS) -c++ -I.. $(LUAFLAGS) -python $<
+	$(SWIG) $(SWIGFLAGS) -c++ -I.. -I../include $(LUAFLAGS) -python $<
 
 clean:
 	rm -f *.cxx

apt-scriptdir.patch:

--- NEW FILE apt-scriptdir.patch ---
Index: contrib/apt-wrapper/apt.1.xml
===================================================================
--- contrib/apt-wrapper/apt.1.xml	(revision 373)
+++ contrib/apt-wrapper/apt.1.xml	(working copy)
@@ -325,7 +325,7 @@
 
  <refsect1><title>Files</title>
    <variablelist>
-     <varlistentry><term><filename>/usr/lib/apt/scripts</filename></term>
+     <varlistentry><term><filename>/usr/share/apt/scripts</filename></term>
      <listitem><para>APT lua scripts.
      Configuration item: <literal>Dir::Bin::scripts</literal>.</para></listitem>
      </varlistentry>
Index: contrib/apt-wrapper/apt.1
===================================================================
--- contrib/apt-wrapper/apt.1	(revision 373)
+++ contrib/apt-wrapper/apt.1	(working copy)
@@ -157,7 +157,7 @@
 .SH "FILES"
 
 .TP
-\fI/usr/lib/apt/scripts\fR
+\fI/usr/share/apt/scripts\fR
 APT lua scripts\&. Configuration item: Dir::Bin::scripts\&.
 
 .SH "ENVIRONMENT"
Index: contrib/apt-files/README
===================================================================
--- contrib/apt-files/README	(revision 373)
+++ contrib/apt-files/README	(working copy)
@@ -40,7 +40,7 @@
 these files in the following directories:
 
     /etc/apt/apt.conf.d/apt-files.conf
-    /usr/lib/apt/scripts/apt-files.lua
+    /usr/share/apt/scripts/apt-files.lua
     /var/state/apt/Contents.gz
 
 Bingo! It should be working. ;-)
Index: contrib/apt-groupinstall/apt-groupinstall.conf
===================================================================
--- contrib/apt-groupinstall/apt-groupinstall.conf	(revision 373)
+++ contrib/apt-groupinstall/apt-groupinstall.conf	(working copy)
@@ -10,7 +10,7 @@
 // For RHEL/FC systems
 Scripts::Groupinstall::Backend "groupinstall-backend-comps.py";
 Scripts::Groupinstall::DataPath "/usr/share/comps/i386/comps.xml";
-Synaptic::taskHelperProg "/usr/lib/apt/scripts/groupinstall-backend-comps.py";
+Synaptic::taskHelperProg "/usr/share/apt/scripts/groupinstall-backend-comps.py";
 
 // For Suse systems
 //Scripts::Groupinstall::Backend "groupinstall-backend-suse";
Index: apt-pkg/luaiface.cc
===================================================================
--- apt-pkg/luaiface.cc	(revision 373)
+++ apt-pkg/luaiface.cc	(working copy)
@@ -76,7 +76,7 @@
 Lua::Lua()
       : DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0)
 {
-   _config->CndSet("Dir::Bin::scripts", "/usr/lib/apt/scripts");
+   _config->CndSet("Dir::Bin::scripts", "/usr/share/apt/scripts");
 
    const luaL_reg lualibs[] = {
       {"base", luaopen_base},


Index: rpmpriorities
===================================================================
RCS file: rpmpriorities
diff -N rpmpriorities
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rpmpriorities	27 Mar 2005 12:10:13 -0000	1.3
@@ -0,0 +1,37 @@
+Essential:
+  grub
+  termcap
+  ed
+  kbd
+  iproute
+  libtermcap
+  libgcc
+  setserial
+  file
+  rpm
+  sysklogd
+  losetup
+  kudzu
+  glibc
+  shadow-utils
+  coreutils
+  bash
+  iputils
+  vim-minimal
+  passwd
+  cpio
+  raidtools
+  SysVinit
+  authconfig
+  hdparm
+  hotplug
+  readline
+  util-linux
+  basesystem
+  setup
+  e2fsprogs
+  procps
+  initscripts
+  filesystem
+  fedora-release
+  udev


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:04:37 -0000	1.3
+++ .cvsignore	27 Mar 2005 12:10:13 -0000	1.4
@@ -1 +1 @@
-apt-0.5.15cnc6.tar.bz2
+apt-0.5.15cnc7.tar.bz2


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-3/apt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apt.spec	18 Feb 2005 22:14:10 -0000	1.9
+++ apt.spec	27 Mar 2005 12:10:13 -0000	1.10
@@ -1,6 +1,3 @@
-# needed for rpmpriorities and mirror-select.conf:
-%{!?fcrel:%define fcrel %(cut -d' ' -f4 /etc/fedora-release )}
-
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define scriptdir %{_datadir}/apt/scripts/
@@ -8,16 +5,10 @@
 %define generate_rpmpriorities 0
 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
 
-# subversion revision for svn snapshots
-%define svnver r362
-
-# we need to work around various missing builddeps in rpm :-/
-%{!?rpmver:%define rpmver %(rpm --version | cut -d' ' -f3 | cut -d. -f1-2)}
-
-Summary: Debian's Advanced Packaging Tool with RPM support.
+Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
-Version: 0.5.15cnc6
-Release: 16.%{svnver}
+Version: 0.5.15cnc7
+Release: 1
 Epoch: 0
 Group: System Environment/Base
 URL: https://moin.conectiva.com.br/AptRpm
@@ -25,7 +16,7 @@
 ExcludeArch: x86_64 ppc64
 
 # unfortunately the source isn't really directly downloadable with wget etc:
-#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc6.tar.bz2
+#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc7.tar.bz2
 Source0: %{name}-%{version}.tar.bz2
 
 # user editable template configs
@@ -35,10 +26,7 @@
 Source4: apt_preferences
 
 # rpmpriorities generated + manually tweaked from comps.xml core group
-Source5: rpmpriorities.1
-Source6: rpmpriorities.2
-Source6: rpmpriorities.3
-Source18: rpmpriorities.Rawhide
+Source5: rpmpriorities
 Source19: comps2prio.xsl
 
 # nightly updater scripts & config
@@ -79,49 +67,37 @@
 
 Provides: apt-mirrorselect
 
-# Others deps are automatically picked up by rpm
+# Other deps are automatically picked up by rpm
 Requires: gnupg, bzip2
 Requires(post): chkconfig, ldconfig
 Requires(preun): chkconfig
 # Needed by the mirror-selector script
 Requires: wget
 
-BuildRequires: beecrypt-devel
-BuildRequires: elfutils-devel
-# TODO: verify the required minimum version
+# TODO: verify the required minimum Python version
 BuildRequires: python-devel >= 0:2.2
 BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext
-BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel
-# for version detection to work 
-BuildRequires: fedora-release
+BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel, libtool
 %if %{generate_rpmpriorities}
 BuildRequires: %{_bindir}/xsltproc, %{comps}
 %endif
-
-%if "%{rpmver}" == "4.3"
-BuildRequires: libselinux-devel
-%endif
+# Work around missing deps in rpm-devel :-/
+BuildRequires: beecrypt-devel, elfutils-libelf-devel, libselinux-devel
 
 # Fix some issues in python binding build
-Patch1: apt-0.5.15cnc6-pymake.patch
+Patch1: apt-pymake.patch
 Patch5: apt-0.5.15cnc6-pymake2.patch
-# Update to current svn snapshot: svn diff -r316:%{svnver}
-Patch2: apt-0.5.15cnc6-%{svnver}.patch
 # Make rpm manifest usage configurable
 Patch3: apt-0.5.15cnc5-manifest-limit.patch
-# Docbook build fixes, send upstream
-Patch4: apt-0.5.15cnc6-docbook.patch
 # Take read-only, not exclusive rpmdb lock for the initial dependency processing
 Patch6: apt-0.5.15cnc6-rdonly.patch
 # Move scripts from /usr/lib/apt to /usr/share/apt
-Patch7: apt-0.5.15cnc6-scriptdir.patch
-# Update python bindings
-Patch8: apt-0.5.15cnc6-python-update.patch
+Patch7: apt-scriptdir.patch
 
 %description
 A port of Debian's apt tools for RPM based distributions.
-It provides the apt-get utility that provides a simpler, safer way to 
-install and upgrade packages. APT features complete installation ordering, 
+It provides the apt-get utility that provides a simpler, safer way to
+install and upgrade packages. APT features complete installation ordering,
 multiple source capability and several other unique features.
 
 %package devel
@@ -156,47 +132,48 @@
 apt-get groupremove <groupname> [<groupname2> ..]
 
 The group information is retrieved from comps.xml used by anaconda (the
-system installer) and other package management tools of RHL/RHEL/FC 
+system installer) and other package management tools of RHL/RHEL/FC
 distributions.
 
 
 %prep
 %setup -q
-%patch1 -p1 -b .pymake
-%patch2 -p0 -b .svnsnap
+%patch1 -p0 -b .pymake
 %patch3 -p1 -b .manifest
-%patch4 -p0 -b .docbook
 %patch5 -p0 -b .pymake2
 %patch6 -p1 -b .rdonly
-%patch7 -p1 -b .scriptdir
-%patch8 -p1 -b .pyupdate
+%patch7 -p0 -b .scriptdir
 
 # fix docs to reference correct paths
 perl -pi -e \
   's|\bconfigure-index\.gz\b|configure-index| ;
    s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
-  doc/apt.ent doc/fr/apt.ent.fr
+  doc/apt.ent doc/*/apt.ent.*
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
+# don't require python, lua etc because of stuff in doc/contrib
+find contrib/ -type f | xargs chmod 0644
+
+# appease aclocal >= 1.8
+perl -pi -e 's|^(AC_DEFUN\()(\w+)|$1\[$2\]|' buildlib/*.m4
+
+# http://distro2.conectiva.com.br/pipermail/apt-rpm/2005-March/002664.html
+libtoolize -f && autoreconf
+
 
 %build
 %configure --disable-dependency-tracking
 
 SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
-# prevent re-generation of the python wrapper, requires a patched swig :(
-#touch python/apt.py python/apt_wrap.cxx
-cp python/apt.py python/apt.py.pyupdate
-cp python/apt_wrap.cxx python/apt_wrap.cxx.pyupdate
 make -C python %{?_smp_mflags} PYTHON="%{__python}"
 %{__python} -c "import py_compile; py_compile.compile('python/apt.py')"
 
+cp -p %{SOURCE5} rpmpriorities
 %if %{generate_rpmpriorities}
 %{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
-%else
-cp -p $RPM_SOURCE_DIR/rpmpriorities.%{fcrel} rpmpriorities
 %endif
 
 
@@ -227,8 +204,6 @@
 for cnf in %{SOURCE150} %{SOURCE151}; do
 	install -p -m 644 $cnf $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
 done
-# fix mirror-select path
-perl -pi -e "s/FCREL/%{fcrel}/g" $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/mirror-select.conf
 
 install -p -m 644 %{SOURCE250} $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
@@ -260,14 +235,11 @@
 
 # apt-groupinstall from contrib
 install -p -m 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{scriptdir}
-install -p -m 755 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+install -p -m 644 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
 
 # nuke .la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# don't require python, lua etc because of stuff in doc/contrib
-find contrib/ -type f |xargs chmod 0644
-
 
 %pre
 if [ $1 -gt 1 ] && [ ! -f %{_sysconfdir}/apt/apt.conf.d/default.conf ]; then
@@ -285,10 +257,11 @@
 fi
 exit 0
 
-%post 
+%post
 /sbin/ldconfig
 if [ ! -f %{_sysconfdir}/apt/apt.conf ]; then
-	echo "// User customizable configuration goes here" > %{_sysconfdir}/apt/apt.conf
+ echo "// User customizable configuration goes here" \
+  > %{_sysconfdir}/apt/apt.conf
 fi
 /sbin/chkconfig --add apt
 
@@ -310,7 +283,7 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/apt
 %config(noreplace) %{_sysconfdir}/apt/rpmpriorities
 %config(noreplace) %{_sysconfdir}/apt/preferences
-%config(noreplace) %{_sysconfdir}/apt/apt.conf 
+%config(noreplace) %{_sysconfdir}/apt/apt.conf
 %config(noreplace) %{_sysconfdir}/apt/sources.list
 %config(noreplace) %{_sysconfdir}/apt/vendors.list
 # NOTE: no noreplace on these because we WANT to be able to change the defaults
@@ -327,6 +300,7 @@
 %{_bindir}/apt-config
 %{_bindir}/apt-shell
 %{_bindir}/apt-get
+%{_bindir}/countpkglist
 %{_bindir}/genpkglist
 %{_bindir}/gensrclist
 %{_bindir}/genbasedir
@@ -360,6 +334,11 @@
 
 
 %changelog
+* Sat Mar 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.15cnc7-1
+- 0.5.15cnc7, drop patches applied upstream.
+- Fix groupinstall config file permissions.
+- Various specfile and build cleanups and typo fixes.
+
 * Wed Feb 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.15cnc6-16.r362
 - Make mirror-select.lua write commented out rpm-src entries for Extras (Panu).
 - Add Extras GPG key (Panu), and add it to fedora-vendors.list.
@@ -399,7 +378,7 @@
 
 * Wed Aug 18 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r362
 - revision r362
-- add rpmprioties file for rawhide 
+- add rpmpriorities file for rawhide
 
 * Sat Aug 14 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r361
 - update to revision r361
@@ -407,7 +386,7 @@
 - provide apt-mirrorselect so repo-configs can depend on it
 - preliminary fixes for x86_64:
   - put scripts to /usr/share/apt/scripts instead of /usr/lib
-  - build python bindings with -fPIC 
+  - build python bindings with -fPIC
 
 * Thu Aug 12 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r360
 - update to revision r360
@@ -433,7 +412,7 @@
 - add new subpackage for groupinstall (to avoid dependening on comps and rhpl
   for core apt)
 - update to revision 353 from upstream for various bugfixes and enhancements,
-  drop merged patches 
+  drop merged patches
 - remove NOISY=1 from make, hasn't done anything in ages..
 
 * Thu Jun 17 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.13
@@ -492,7 +471,7 @@
 - Ville's docbook building fix
 
 * Tue Mar 30 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.4
-- add upgrade-virtual=true back to default.conf 
+- add upgrade-virtual=true back to default.conf
 - updated version of upgradevirt.lua, fixed kernel-module package handling
 
 * Mon Mar 29 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.3
@@ -510,7 +489,7 @@
 - remember to set kernel::module-prefix in default.conf
 - add upgradevirt.lua to all the necessary new slot
 - move kernel from Essential priority to Important in rpmpriorities, allow-
-  duplicated packages don't behave well with Essential priority 
+  duplicated packages don't behave well with Essential priority
 
 * Mon Mar 22 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.1
 - update to 0.5.15cnc6
@@ -531,14 +510,14 @@
 
 * Fri Feb 13 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.8
 - Pull patch for revs 266-274 from upstream, containing various important
-  fixes (epoch handling, build system related etc) 
+  fixes (epoch handling, build system related etc)
 
 * Thu Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.7
 - Fix build on FC2-test1 (conditional libselinux-devel buildreq)
 
 * Mon Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.6
 - automatically handle fedora.us style kernel-module packages with kernel
-  updates 
+  updates
 - don't run mirror-selector if quiet mode set (== non-interactive)
 - don't trash sources.list on upgrade, only if user chooses to do so
 
@@ -557,7 +536,7 @@
 
 * Mon Jan 19 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.3
 - make rpm manifest usage configurable per Enricos request (patch 4)
-- use mirror lists on fedora.us 
+- use mirror lists on fedora.us
 - include Fedora Legacy gpg key
 
 * Tue Jan 06 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.2
@@ -581,7 +560,7 @@
 - drop patches merged upstream
 
 * Tue Dec 23 2003 Panu Matilainen <pmatilai at welho.com>
-- remove extranuous mirror-select configs from default.conf 
+- remove extraneous mirror-select configs from default.conf
 - updated mirror-select script
 
 * Fri Dec 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.4
@@ -650,7 +629,7 @@
 * Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.1
 - update rpmlib patch to -7 which has more sensible error reporting
 
-* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com> 
+* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com>
 - update to 0.5.15cnc2
 - remove patches 6-9, they're merged upstream now
 - use fedora-style buildroot
@@ -749,12 +728,12 @@
 - drop patches merged upstream
 
 * Tue Jun 10 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.9
-- patch from upstream to fix a security problem where lua-scripts can get 
+- patch from upstream to fix a security problem where lua-scripts can get
   accidentally executed from cwd
 
 * Mon Jun 09 2003 Panu Matilainen <pmatilai at welho.com>
 - apt doesn't like build deps on versioned virtual provides -> only RH7.3
-  package buildrequires python2-devel, newer ones have python-devel 
+  package buildrequires python2-devel, newer ones have python-devel
 
 * Thu Jun 05 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.8
 - fix the proxy template format in apt.conf
@@ -778,11 +757,11 @@
 - fix #259
 - add missing ncurses-devel buildreq (for apt-shell)
 
-* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com> 
+* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com>
 - add missing libelf-devel buildreq for RH8.0 (#254)
 - add missing readline-devel buildreq (for apt-shell)
 
-* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com> 
+* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com>
 - add /etc/apt/scripts directory (for Lua scripts)
 
 * Tue Apr 22 2003 Warren Togami <warren at togami.com> 0.5.5cnc5-0.fdr.5
@@ -802,7 +781,7 @@
 * Wed Apr 16 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.1
 - patch to speed up apt startup and genbasedir
 - drop "counting sheep" patch, not needed anymore
-- include current mirrors in sources.list 
+- include current mirrors in sources.list
 - autodetect RH version
 
 * Tue Apr 15 2003 Panu Matilainen <pmatilai at welho.com>
@@ -824,7 +803,7 @@
 - add epoch to requires =, >= too
 
 * Thu Apr 03 2003 Panu Matilainen <pmatilai at welho.com>
-- fix segfault if rpm-dir index is a broken symlink 
+- fix segfault if rpm-dir index is a broken symlink
 - rpmpriorities generated from comps.xml
 - dont tag the various keys as %dir :-/
 


Index: mirror-select.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-3/mirror-select.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mirror-select.conf	17 Jan 2005 22:01:26 -0000	1.3
+++ mirror-select.conf	27 Mar 2005 12:10:13 -0000	1.4
@@ -3,5 +3,5 @@
 Scripts::AptGet::Help::Command:: "mirror-select.lua";
 Dir::Etc::sourceparts::mirrorsource "mirror-select.list";
 Dir::State::mirrors "mirrors.list";
-Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fcFCREL-mirrors.list";
-Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fcFCREL-mirrors.list";
+Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fc3-mirrors.list";
+Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fc3-mirrors.list";


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:04:37 -0000	1.3
+++ sources	27 Mar 2005 12:10:13 -0000	1.4
@@ -1 +1 @@
-134575fd06c8c84d46766a65ed8a26af  apt-0.5.15cnc6.tar.bz2
+9e44ec1503fa96832bbd9b532543e4de  apt-0.5.15cnc7.tar.bz2


--- apt-0.5.15cnc6-docbook.patch DELETED ---


--- apt-0.5.15cnc6-pymake.patch DELETED ---


--- apt-0.5.15cnc6-python-update.patch DELETED ---


--- apt-0.5.15cnc6-r362.patch DELETED ---


--- apt-0.5.15cnc6-scriptdir.patch DELETED ---


--- gpg-checker.lua DELETED ---


--- gpg-import.lua DELETED ---


--- rpmpriorities.1 DELETED ---


--- rpmpriorities.2 DELETED ---


--- rpmpriorities.3 DELETED ---


--- rpmpriorities.Rawhide DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar 27 12:17:00 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 27 Mar 2005 07:17:00 -0500
Subject: rpms/apt/devel rpmpriorities,1.3,1.4
Message-ID: <200503271217.j2RCH0RJ025787@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25781

Modified Files:
	rpmpriorities 
Log Message:
udev is probably Essential here too.


Index: rpmpriorities
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/rpmpriorities,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmpriorities	27 Mar 2005 12:08:38 -0000	1.3
+++ rpmpriorities	27 Mar 2005 12:16:58 -0000	1.4
@@ -34,3 +34,4 @@
   initscripts
   filesystem
   fedora-release
+  udev



From fedora-extras-commits at redhat.com  Sun Mar 27 14:17:33 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Sun, 27 Mar 2005 09:17:33 -0500
Subject: rpms/anthy/devel .cvsignore, 1.3, 1.4 anthy.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200503271417.j2REHX8Z027769@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/anthy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27763

Modified Files:
	.cvsignore anthy.spec sources 
Log Message:
* Sun Mar 27 2005 Akira TAGOH <tagoh at redhat.com> - 6300d-2
- real updates (#152203)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anthy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Feb 2005 14:31:30 -0000	1.3
+++ .cvsignore	27 Mar 2005 14:17:31 -0000	1.4
@@ -3,3 +3,4 @@
 *.rpm
 anthy-6024.tar.gz
 anthy-6131.tar.gz
+anthy-6300d.tar.gz


Index: anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- anthy.spec	23 Mar 2005 06:32:38 -0000	1.5
+++ anthy.spec	27 Mar 2005 14:17:31 -0000	1.6
@@ -1,8 +1,8 @@
-%define	version	6131
+%define	version	6300d
 
 Name:		anthy
 Version:	%{version}
-Release:	1
+Release:	2
 License:	GPL
 Group:		System Environment/Libraries
 URL:		http://sourceforge.jp/projects/anthy/
@@ -110,6 +110,9 @@
 %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el
 
 %changelog
+* Sun Mar 27 2005 Akira TAGOH <tagoh at redhat.com> - 6300d-2
+- real updates (#152203)
+
 * Sun Mar 20 2005 Akira TAGOH <tagoh at redhat.com> - 6300d-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anthy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Feb 2005 14:31:31 -0000	1.3
+++ sources	27 Mar 2005 14:17:31 -0000	1.4
@@ -1 +1 @@
-ee094243b33fc75f144da56f5ebb580e  anthy-6131.tar.gz
+7bbb58cb2c759ca065dad40b194ff118  anthy-6300d.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 28 04:55:03 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 27 Mar 2005 23:55:03 -0500
Subject: rpms/xfwm4/devel xfwm4-focus-bug.patch,NONE,1.1 xfwm4.spec,1.5,1.6
Message-ID: <200503280455.j2S4t3CJ008611@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8605

Modified Files:
	xfwm4.spec 
Added Files:
	xfwm4-focus-bug.patch 
Log Message:
Add patch for focus issue (bug #152299)


xfwm4-focus-bug.patch:

--- NEW FILE xfwm4-focus-bug.patch ---
diff -Nur xfwm4-4.2.1.orig/src/client.c xfwm4-4.2.1/src/client.c
--- xfwm4-4.2.1.orig/src/client.c	2005-03-14 13:11:55.000000000 -0700
+++ xfwm4-4.2.1/src/client.c	2005-03-27 21:10:57.241200236 -0700
@@ -1,4 +1,4 @@
-/*      $Id: client.c,v 1.461.2.11 2005/03/14 19:48:50 olivier Exp $
+/*      $Id: client.c,v 1.461.2.12 2005/03/16 20:38:45 olivier Exp $
  
         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
@@ -3130,18 +3130,14 @@
     g1 = myScreenGrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
     g2 = myScreenGrabPointer (screen_info, ButtonMotionMask | ButtonReleaseMask, 
                               cursor, myDisplayGetCurrentTime (display_info));
-    if (((passdata.use_keys) && !g1) || !g2)
+    if (!g1 || !g2)
     {
         TRACE ("grab failed in clientMove");
+
         gdk_beep ();
-        if ((passdata.use_keys) && g1)
-        {
-            myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
-        }
-        if (g2)
-        {
-            myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
-        }
+        myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
+        myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
+
         return;
     }
 
@@ -3592,18 +3588,14 @@
                               myDisplayGetCursorResize(display_info, passdata.corner), 
                               myDisplayGetCurrentTime (display_info));
 
-    if (((passdata.use_keys) && !g1) || !g2)
+    if (!g1 || !g2)
     {
         TRACE ("grab failed in clientResize");
+
         gdk_beep ();
-        if ((passdata.use_keys) && (g1 == GrabSuccess))
-        {
-            myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
-        }
-        if (g2 == GrabSuccess)
-        {
-            myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
-        }
+        myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
+        myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
+
         return;
     }
 
@@ -3799,15 +3791,11 @@
     if (!g1 || !g2)
     {
         TRACE ("grab failed in clientCycle");
+
         gdk_beep ();
-        if (g1 == GrabSuccess)
-        {
-            myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
-        }
-        if (g2 == GrabSuccess)
-        {
-            myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
-        }
+        myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
+        myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
+
         return;
     }
 
diff -Nur xfwm4-4.2.1.orig/src/events.c xfwm4-4.2.1/src/events.c
--- xfwm4-4.2.1.orig/src/events.c	2005-02-12 14:29:37.000000000 -0700
+++ xfwm4-4.2.1/src/events.c	2005-03-27 21:10:57.244199772 -0700
@@ -1,4 +1,4 @@
-/*      $Id: events.c,v 1.297.2.2 2005/02/12 21:29:37 olivier Exp $
+/*      $Id: events.c,v 1.297.2.3 2005/03/22 22:37:42 olivier Exp $
  
         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
@@ -205,6 +205,7 @@
     {
         TRACE ("grab failed in typeOfClick");
         gdk_beep ();
+        myScreenUngrabPointer (screen_info, ev->xbutton.time);
         return XFWM_BUTTON_UNDEFINED;
     }
 
diff -Nur xfwm4-4.2.1.orig/src/stacking.c xfwm4-4.2.1/src/stacking.c
--- xfwm4-4.2.1.orig/src/stacking.c	2005-02-08 15:16:11.000000000 -0700
+++ xfwm4-4.2.1/src/stacking.c	2005-03-27 21:10:57.245199617 -0700
@@ -1,4 +1,4 @@
-/*      $Id: stacking.c,v 1.26.2.2 2005/02/08 22:16:11 olivier Exp $
+/*      $Id: stacking.c,v 1.26.2.3 2005/03/27 19:32:37 olivier Exp $
  
         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
@@ -240,7 +240,7 @@
     Client *c = NULL;
     Client *c2 = NULL;
 
-    TRACE ("entering clientAtPos");
+    TRACE ("entering clientAtPosition");
 
     for (index = g_list_last (screen_info->windows_stack); index; index = g_list_previous (index))
     {
@@ -252,8 +252,8 @@
                 && (c2 != exclude))
             {
                 c = c2;
+        	break;
             }
-            break;
         }
     }
 


Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfwm4.spec	25 Mar 2005 21:14:14 -0000	1.5
+++ xfwm4.spec	28 Mar 2005 04:55:01 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.2.1
-Release: 4.fc4
+Release: 5.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2
@@ -9,6 +9,7 @@
 # Change default for Fedora
 Patch0: xfwm4-bluecurve-prep.patch
 Patch1: xfwm4-bluecurve.patch
+Patch2: xfwm4-focus-bug.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +29,7 @@
 
 %patch0 -p1 -b .bluecurve-prep
 %patch1 -p1 -b .bluecurve
+%patch2 -p1 -b .focus
 
 %build
 %configure
@@ -58,6 +60,9 @@
 %{_datadir}/themes
 
 %changelog
+* Sun Mar 27 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-5.fc4
+- Add patch for focus issue (bug #152299)
+
 * Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
 - lowercase Release
 



From fedora-extras-commits at redhat.com  Mon Mar 28 09:27:49 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 28 Mar 2005 04:27:49 -0500
Subject: devel/jabberd jabberd.sysconfig,NONE,1.1
Message-ID: <200503280927.j2S9RnnT014306@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14300

Added Files:
	jabberd.sysconfig 
Log Message:
/etc/sysconfig/jabberd



--- NEW FILE jabberd.sysconfig ---
# __SYSCONF__/jabberd
# this files controls which daemons are started by the jabberd startscript
#
# the following example shows a configuration for a startup of jabberd daemons
# necessary for a jabberd server running on one host
# START_DAEMONS="router resolver sm c2s s2s"
START_DAEMONS="router resolver sm c2s s2s"



From fedora-extras-commits at redhat.com  Mon Mar 28 15:23:39 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 28 Mar 2005 10:23:39 -0500
Subject: rpms/enchant/devel enchant.spec, 1.1,
	1.2 enchant-1.1.5-manpage.patch, 1.1, NONE
Message-ID: <200503281523.j2SFNdiV020423@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20413

Modified Files:
	enchant.spec 
Removed Files:
	enchant-1.1.5-manpage.patch 
Log Message:
Update enchant to 1.1.6




Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/enchant.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- enchant.spec	14 Mar 2005 22:34:59 -0000	1.1
+++ enchant.spec	28 Mar 2005 15:23:37 -0000	1.2
@@ -1,19 +1,17 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.1.5
-Release: 3
+Version: 1.1.6
+Release: 1
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
-Source: http://prdownloads.sourceforge.net/abiword/enchant-%{version}.tar.gz
+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
 
-Patch0: enchant-1.1.5-manpage.patch
-
 %description
 A library that wraps other spell checking backends.
 
@@ -27,7 +25,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .manpage
 
 %build
 %configure --disable-ispell
@@ -64,13 +61,18 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
-* Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.15-3
+* Mon Mar 28 2005 Marc Maurer <uwog at abisource.com> 1:1.1.6-1
+- update to 1.1.6
+- drop the manpage patch (RH#145010#)
+- fix version numbers in the spec changelog
+
+* Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.5-3
 - rebuild with gcc4
 
-* Fri Jan 14 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.15-2
+* Fri Jan 14 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.5-2
 - RH#145010# misformatted manpage
 
-* Mon Dec 20 2004 Caolan McNamara <caolanm at redhat.com> 1:1.1.15-1
+* Mon Dec 20 2004 Caolan McNamara <caolanm at redhat.com> 1:1.1.5-1
 - initial fedora import
 
 * Sun Aug 24 2003 Rui Miguel Seabra <rms at 1407.org>


--- enchant-1.1.5-manpage.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 28 15:26:01 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 28 Mar 2005 10:26:01 -0500
Subject: rpms/enchant/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200503281526.j2SFQ10B020470@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20464

Modified Files:
	.cvsignore sources 
Log Message:
Add enchant-1.1.6.tar.gz




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2005 22:34:59 -0000	1.2
+++ .cvsignore	28 Mar 2005 15:25:59 -0000	1.3
@@ -1 +1,2 @@
 enchant-1.1.5.tar.gz
+enchant-1.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2005 22:34:59 -0000	1.2
+++ sources	28 Mar 2005 15:25:59 -0000	1.3
@@ -1 +1,2 @@
 b7f266ca9241797839929972395a76cf  enchant-1.1.5.tar.gz
+57727c23059e260a2c116c40f005439c  enchant-1.1.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 28 16:27:45 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 28 Mar 2005 11:27:45 -0500
Subject: rpms/tla/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tla.spec, 1.9,
	1.10
Message-ID: <200503281627.j2SGRjCO021545@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/tla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21526

Modified Files:
	.cvsignore sources tla.spec 
Log Message:
Update to 1.3.1-fix-1 for segfault fix



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Mar 2005 20:01:07 -0000	1.5
+++ .cvsignore	28 Mar 2005 16:27:43 -0000	1.6
@@ -1,2 +1,2 @@
-tla-1.3.1.tar.gz
-tla-1.3.1.tar.gz.sig
+tla-1.3.1-fix-1.tar.gz
+tla-1.3.1-fix-1.tar.gz.sig


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Mar 2005 20:01:07 -0000	1.5
+++ sources	28 Mar 2005 16:27:43 -0000	1.6
@@ -1,2 +1,2 @@
-e3e2a92b9ddd9221d70bdd9134ae45d6  tla-1.3.1.tar.gz
-c199bae883584950cd1464ea69e25077  tla-1.3.1.tar.gz.sig
+bab3b300176c5d038e190602eac40e86  tla-1.3.1-fix-1.tar.gz
+3c24ed067763fec10a3bdb22f8a78665  tla-1.3.1-fix-1.tar.gz.sig


Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tla.spec	23 Mar 2005 15:52:29 -0000	1.9
+++ tla.spec	28 Mar 2005 16:27:43 -0000	1.10
@@ -1,13 +1,13 @@
 Name:           tla
 Version:        1.3.1
-Release:        3
+Release:        4.fix.1
 Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://www.gnu.org/software/gnu-arch/
-Source0:        http://ftp.gnu.org/gnu/gnu-arch/%{name}-%{version}.tar.gz
-Source1:        http://ftp.gnu.org/gnu/gnu-arch/%{name}-%{version}.tar.gz.sig
+Source0:        http://ftp.gnu.org/gnu/gnu-arch/tla-1.3.1-fix-1.tar.gz
+Source1:        http://ftp.gnu.org/gnu/gnu-arch/tla-1.3.1-fix-1.tar.gz.sig
 # Patch0 from SuSE 9.1's tla-1.2-15
 Patch0:         tla-1.2pre0-posix.patch
 # Patch1,3 from ALT Linux's tla-1.2-alt6
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n tla-1.3.1-fix-1
 cd src
 %patch0 -p0
 cd ..
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Mar 28 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.1-4.fix.1
+- Update to 1.3.1-fix-1 (hopefully fix PPC segfault)
+
 * Wed Mar 23 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.1-3
 - gcc4 build fixes
 



From fedora-extras-commits at redhat.com  Mon Mar 28 17:34:06 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 28 Mar 2005 12:34:06 -0500
Subject: devel/jabberd jabberd.sysconfig,1.1,1.2
Message-ID: <200503281734.j2SHY6B7022578@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22570

Modified Files:
	jabberd.sysconfig 
Log Message:
added some information about the different jabberd processes



Index: jabberd.sysconfig
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jabberd.sysconfig	28 Mar 2005 09:27:47 -0000	1.1
+++ jabberd.sysconfig	28 Mar 2005 17:34:04 -0000	1.2
@@ -4,4 +4,12 @@
 # the following example shows a configuration for a startup of jabberd daemons
 # necessary for a jabberd server running on one host
 # START_DAEMONS="router resolver sm c2s s2s"
+#
+# a jabberd server consists of:
+# * router
+# * resolver
+# * sm (Session Manager)
+# * c2s (Client to Server)
+# * s2s (Server to Server)
+#
 START_DAEMONS="router resolver sm c2s s2s"



From fedora-extras-commits at redhat.com  Mon Mar 28 17:35:05 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 28 Mar 2005 12:35:05 -0500
Subject: devel/jabberd jabberd.spec,1.6,1.7
Message-ID: <200503281735.j2SHZ5Iq022615@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22609

Modified Files:
	jabberd.spec 
Log Message:
* combined some of the sed magic
* added a jabberd file in sysconfig to control if all daemons should be started



Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jabberd.spec	26 Mar 2005 08:47:53 -0000	1.6
+++ jabberd.spec	28 Mar 2005 17:35:03 -0000	1.7
@@ -6,6 +6,7 @@
 Group: System Environment/Daemons
 Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s6.tar.gz
 Source1: jabberd
+Source2: jabberd.sysconfig
 URL: http://jabberd.jabberstudio.org/2/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel libidn-devel
@@ -63,16 +64,20 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 %{__install} -p -m 644 tools/db-setup.mysql $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -p -m 644 tools/db-setup.pgsql $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -p -m 644 tools/migrate.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -p -m 644 tools/pipe-auth.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
+%{__install} -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
 
 %{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
             -e "s,__ETCDIR__,%{sysconfdir},g" \
             -e "s,__PIDDIR__,%{_var}/lib/jabberd/pid,g" \
-		$RPM_BUILD_ROOT%{_initrddir}/%{name}
+            -e "s,__SYSCONF__,%{_sysconfdir}/sysconfig,g" \
+		$RPM_BUILD_ROOT%{_initrddir}/%{name} \
+		$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
 
 %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/jabberd << END
 #%PAM-1.0
@@ -83,23 +88,20 @@
 END
 
 #default driver for storage
-%{__sed} -i -e "s,<driver>mysql</driver>,<driver>db</driver>,g" \
-	$RPM_BUILD_ROOT%{sysconfdir}/sm.xml
+#the default pam backend needs auto creation of accounts
+%{__sed} -i -e ':a;N;$!ba' \
+            -e 's,<driver>mysql</driver>,<driver>db</driver>,g' \
+            -e 's,<!--\n    <auto-create/>\n    -->,<auto-create/>,g' \
+		$RPM_BUILD_ROOT%{sysconfdir}/sm.xml
 
 #default authentication backend
-%{__sed} -i -e "s,<module>mysql</module>,<module>pam</module>,g" \
-	$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
-
 #enable SSL certificate
-%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <pemfile>/etc/jabberd/server.pem</pemfile>\n    -->,<pemfile>/etc/jabberd/server.pem</pemfile>,g' $RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
-
-#the default pam backend needs auto creation of accounts
-%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <auto-create/>\n    -->,<auto-create/>,g' \
-	$RPM_BUILD_ROOT%{sysconfdir}/sm.xml
-
 #clients must do STARTTLS
-%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <require-startls/>\n    -->,<require-startls/>,g' \
-	$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
+%{__sed} -i -e ':a;N;$!ba' \
+            -e 's,<module>mysql</module>,<module>pam</module>,g' \
+            -e 's,<!--\n    <pemfile>/etc/jabberd/server.pem</pemfile>\n    -->,<pemfile>/etc/jabberd/server.pem</pemfile>,g' \
+            -e 's,<!--\n    <require-starttls/>\n    -->,<require-starttls/>,g' \
+		$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
 
 #ghost file
 touch $RPM_BUILD_ROOT%{sysconfdir}/server.pem
@@ -168,6 +170,7 @@
 %{_datadir}/%{name}/
 %config %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/pam.d/jabberd
+%config(noreplace) %{_sysconfdir}/sysconfig/jabberd
 %attr(-,jabber,jabber) %{_var}/lib/jabberd
 %ghost %{_sysconfdir}/jabberd/server.pem
 
@@ -180,6 +183,9 @@
 - removed noreplace for start script
 - make backends optional during build
 - use -p with the install command
+- combined some of the sed magic
+- added a jabberd file in sysconfig to control if all daemons
+  should be started
 
 * Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
 - made password more random (/dev/random)



From fedora-extras-commits at redhat.com  Mon Mar 28 17:35:58 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 28 Mar 2005 12:35:58 -0500
Subject: devel/jabberd jabberd,1.3,1.4
Message-ID: <200503281735.j2SHZwAV022652@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22646

Modified Files:
	jabberd 
Log Message:
script reads config file from sysconfig



Index: jabberd
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jabberd	22 Mar 2005 12:18:13 -0000	1.3
+++ jabberd	28 Mar 2005 17:35:56 -0000	1.4
@@ -8,16 +8,18 @@
 # chkconfig: 2345 85 15
 #
 
-if [ -f /etc/init.d/functions ]; then
-	. /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ]; then
-	. /etc/rc.d/init.d/functions
-else
-	echo "jabberd: unable to locate functions lib. Cannot continue."
-	exit -1
+# source function library
+. /etc/rc.d/init.d/functions
+
+# pull in sysconfig settings
+[ -f __SYSCONF__/jabberd ] && . __SYSCONF__/jabberd
+
+if [ -z "$START_DAEMONS" ]; then
+	START_DAEMONS="router resolver sm c2s s2s"
 fi
+
 #
-progs="router resolver sm c2s s2s"
+progs="$START_DAEMONS"
 progsPath="__BINDIR__"
 confPath="__ETCDIR__"
 pidPath="__PIDDIR__"



From fedora-extras-commits at redhat.com  Mon Mar 28 19:47:56 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 28 Mar 2005 14:47:56 -0500
Subject: devel/pam_mysql pam_mysql.spec,1.3,1.4
Message-ID: <200503281947.j2SJlu6C024979@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/pam_mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24973

Modified Files:
	pam_mysql.spec 
Log Message:
Added zlib-devel to BuildRequires


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/devel/pam_mysql/pam_mysql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pam_mysql.spec	23 Mar 2005 23:22:38 -0000	1.3
+++ pam_mysql.spec	28 Mar 2005 19:47:54 -0000	1.4
@@ -1,13 +1,13 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
 Name:		pam_mysql
 Version:	0.50
-Release:	4
+Release:	5
 License:	GPL
 Group:		Base
 Source0:	http://dl.sf.net/pam-mysql/pam_mysql-0.5.tar.gz
 Patch:		pam_mysql-0.5-vars.patch
 URL:		http://sf.net/projects/pam-mysql/
-BuildRequires:	pam-devel mysql-devel
+BuildRequires:	pam-devel mysql-devel zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,6 +34,9 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Man Mar 28 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-5
+- Added zlib-devel to BuildRequires
+
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-4
 - Fixed build on x86_64
 



From fedora-extras-commits at redhat.com  Mon Mar 28 19:58:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 28 Mar 2005 14:58:30 -0500
Subject: rpms/pam_mysql/FC-3 pam_mysql.spec,1.3,1.4
Message-ID: <200503281958.j2SJwUnE025075@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25069

Modified Files:
	pam_mysql.spec 
Log Message:
Added zlib-devel to BuildRequires


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/FC-3/pam_mysql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pam_mysql.spec	24 Mar 2005 12:43:45 -0000	1.3
+++ pam_mysql.spec	28 Mar 2005 19:58:28 -0000	1.4
@@ -1,13 +1,13 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
 Name:		pam_mysql
 Version:	0.50
-Release:	4
+Release:	5
 License:	GPL
 Group:		Base
 Source0:	http://dl.sf.net/pam-mysql/pam_mysql-0.5.tar.gz
 Patch:		pam_mysql-0.5-vars.patch
 URL:		http://sf.net/projects/pam-mysql/
-BuildRequires:	pam-devel mysql-devel
+BuildRequires:	pam-devel mysql-devel zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,6 +34,9 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Man Mar 28 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-5
+- Added zlib-devel to BuildRequires
+
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-4
 - Fixed build on x86_64
 



From fedora-extras-commits at redhat.com  Mon Mar 28 20:02:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 28 Mar 2005 15:02:39 -0500
Subject: rpms/kphone/FC-3 kphone.spec,1.9,1.10
Message-ID: <200503282002.j2SK2d51025860@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25852

Modified Files:
	kphone.spec 
Log Message:
Import devel changes


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-3/kphone.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kphone.spec	22 Mar 2005 20:48:34 -0000	1.9
+++ kphone.spec	28 Mar 2005 20:02:37 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        9
+Release:        11
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -9,6 +9,7 @@
 Source0:        http://www.wirlab.net/kphone/kphone-4.1.0.tar.gz
 Source1:        kphone.desktop
 Patch0:         kphone-4.1.0-po-hacks.patch
+Patch1:         kphone-4.1.0-endian.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
@@ -22,6 +23,7 @@
 %prep
 %setup -q -n kphone
 %patch -p1 -b .po-hacks
+%patch1 -p1 -b .endian
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -32,11 +34,12 @@
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 install -D -m 0644 icons/large-kphone.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kphone.png
-desktop-file-install --vendor=Fedora \
+desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
   --add-category Application \
   --add-category Internet \
+  --add-category Network \
   --add-category Telephony \
   --add-category Qt \
   %{SOURCE1}
@@ -53,8 +56,14 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Mar 26 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-11
+- Added Network category to desktop entry
+
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-10
+- First attempt to get it working properly on PPC
+
 * Tue Mar 22 2005 Seth Vidal <skvidal at phy.duke.edu> 4.1.0-9
-- add required openssl-devel to buildreqs
+- add openssl-devel to buildreqs
 
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-8
 - %%



From fedora-extras-commits at redhat.com  Mon Mar 28 20:02:51 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Mon, 28 Mar 2005 15:02:51 -0500
Subject: rpms/pam_mysql/FC-3 pam_mysql.spec,1.4,1.5
Message-ID: <200503282002.j2SK2pMg025888@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/pam_mysql/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25871

Modified Files:
	pam_mysql.spec 
Log Message:

fix typo in Changelog: Man->Mon



Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/FC-3/pam_mysql.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pam_mysql.spec	28 Mar 2005 19:58:28 -0000	1.4
+++ pam_mysql.spec	28 Mar 2005 20:02:49 -0000	1.5
@@ -34,7 +34,7 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
-* Man Mar 28 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-5
+* Mon Mar 28 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-5
 - Added zlib-devel to BuildRequires
 
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-4



From fedora-extras-commits at redhat.com  Mon Mar 28 20:03:24 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 28 Mar 2005 15:03:24 -0500
Subject: rpms/kphone/FC-3 kphone-4.1.0-endian.patch,NONE,1.1
Message-ID: <200503282003.j2SK3O2h025941@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25935

Added Files:
	kphone-4.1.0-endian.patch 
Log Message:
Need the patch too

kphone-4.1.0-endian.patch:

--- NEW FILE kphone-4.1.0-endian.patch ---
--- kphone/kphone/rtpdataheader.h.orig	2005-03-23 20:50:01.904726865 -0500
+++ kphone/kphone/rtpdataheader.h	2005-03-23 20:52:47.669099809 -0500
@@ -1,25 +1,24 @@
 #ifndef RTPDATAHEADER_H
 #define RTPDATAHEADER_H
 
+#include <endian.h>
+
 // For 32bit intel machines
 typedef short int16;
 typedef int   int32;
 typedef unsigned int u_int32;
 typedef unsigned short u_int16;
 
-#define RTP_BIG_ENDIAN 0
-#define RTP_LITTLE_ENDIAN 1
-
 //  RTP data header
 typedef __attribute__ ((__packed__)) struct {
-#if RTP_BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
 	unsigned int version:2;         // protocol version
 	unsigned int p:1;               // padding flag
 	unsigned int x:1;               // header extension flag
 	unsigned int cc:4;              // CSRC count
 	unsigned int m:1;               // marker bit
 	unsigned int pt:7;              // payload type
-#elif RTP_LITTLE_ENDIAN
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
 	unsigned int cc:4;              // CSRC count
 	unsigned int x:1;               // header extension flag
 	unsigned int p:1;               // padding flag
@@ -27,7 +26,7 @@
 	unsigned int pt:7;              // payload type
 	unsigned int m:1;               // marker bit
 #else
-#error Define one of RTP_LITTLE_ENDIAN or RTP_BIG_ENDIAN
+#error Unusable endianness detected
 #endif
 	unsigned int seq:16;            // sequence number
 	u_int32 ts;                     // timestamp 32bits



From fedora-extras-commits at redhat.com  Mon Mar 28 20:09:08 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 28 Mar 2005 15:09:08 -0500
Subject: rpms/pam_mysql/devel pam_mysql.spec,1.4,1.5
Message-ID: <200503282009.j2SK98Ce026094@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26088/devel

Modified Files:
	pam_mysql.spec 
Log Message:
Yes, it's Monday. How did you guess?


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/devel/pam_mysql.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pam_mysql.spec	28 Mar 2005 19:47:54 -0000	1.4
+++ pam_mysql.spec	28 Mar 2005 20:09:06 -0000	1.5
@@ -34,7 +34,7 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
-* Man Mar 28 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-5
+* Mon Mar 28 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-5
 - Added zlib-devel to BuildRequires
 
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-4



From fedora-extras-commits at redhat.com  Mon Mar 28 20:51:14 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 28 Mar 2005 15:51:14 -0500
Subject: rpms/ktrack/FC-3 ktrack.spec,1.9,1.10
Message-ID: <200503282051.j2SKpEcB026239@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/ktrack/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26233

Modified Files:
	ktrack.spec 
Log Message:
* Sat Mar 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.3.0-9.rc1.fc3
- Pass Qt library/header location to configure script to work around
  broken Qt detection on x86_64.




Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/rpms/ktrack/FC-3/ktrack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ktrack.spec	26 Mar 2005 17:35:01 -0000	1.9
+++ ktrack.spec	28 Mar 2005 20:51:11 -0000	1.10
@@ -1,13 +1,12 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 8.rc1
+Release: 9.rc1.fc3
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
 Patch: ktrack-headers.patch
 BuildRequires: desktop-file-utils kdelibs-devel >= 3.3 hamlib-devel
-BuildRequires: qt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -22,13 +21,14 @@
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-%configure --disable-rpath
+%configure --disable-rpath \
+    --with-qt-libraries=${QTDIR}/lib --with-qt-includes=${QTDIR}/include
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-desktop-file-install --vendor=Fedora \
+desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
   --add-category Application \
@@ -54,11 +54,15 @@
 %{_datadir}/icons/locolor/32x32/apps/ktrack.png
 %{_datadir}/locale/de/LC_MESSAGES/ktrack.mo
 %{_datadir}/locale/fr/LC_MESSAGES/ktrack.mo
-%{_datadir}/applications/Fedora-ktrack.desktop
+%{_datadir}/applications/fedora-ktrack.desktop
 %{_datadir}/pixmaps/ktrack.png
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Sat Mar 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.3.0-9.rc1.fc3
+- Pass Qt library/header location to configure script to work around
+  broken Qt detection on x86_64.
+
 * Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-8.rc1
 - Use $QTDIR instead of hard-coding paths
 



From fedora-extras-commits at redhat.com  Mon Mar 28 20:52:04 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 28 Mar 2005 15:52:04 -0500
Subject: devel/ktrack ktrack.spec,1.9,1.10
Message-ID: <200503282052.j2SKq4xu026269@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26263

Modified Files:
	ktrack.spec 
Log Message:
ktrack is available for FC3 Extras, too, so release versions should differ


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ktrack.spec	26 Mar 2005 19:24:55 -0000	1.9
+++ ktrack.spec	28 Mar 2005 20:52:02 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 9.rc1
+Release: 9.rc1.fc4
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -59,7 +59,7 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
-* Sat Mar 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.3.0-9.rc1
+* Sat Mar 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.3.0-9.rc1.fc4
 - Pass Qt library/header location to configure script to work around
   broken Qt detection on x86_64.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 14:21:18 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 29 Mar 2005 09:21:18 -0500
Subject: rpms/tetex-xcolor/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tetex-xcolor.spec, 1.1, 1.2
Message-ID: <200503291421.j2TELIEu013234@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13224/FC-3

Modified Files:
	.cvsignore sources tetex-xcolor.spec 
Log Message:
Update to 2.02.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Mar 2005 02:03:24 -0000	1.2
+++ .cvsignore	29 Mar 2005 14:21:16 -0000	1.3
@@ -1 +1 @@
-xcolor-2.01-20050323.tar.gz
+xcolor-2.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Mar 2005 02:03:24 -0000	1.2
+++ sources	29 Mar 2005 14:21:16 -0000	1.3
@@ -1 +1 @@
-d60c7a02fc9f04b785f31c96c1fd8d4d  xcolor-2.01-20050323.tar.gz
+d0520f50a8f8aebabe3a7a39b73a1f24  xcolor-2.02.tar.gz


Index: tetex-xcolor.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/tetex-xcolor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tetex-xcolor.spec	24 Mar 2005 02:03:24 -0000	1.1
+++ tetex-xcolor.spec	29 Mar 2005 14:21:16 -0000	1.2
@@ -5,7 +5,7 @@
 %define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        2.01
+Version:        2.02
 Release:        1
 Summary:        Driver-independent color extensions for LaTeX and pdfLaTeX
 
@@ -14,7 +14,7 @@
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/xcolor.html
 # DANTE generates CTAN packages tarballs on-the-fly
 # ftp://ftp.dante.de/tex-archive/macros/latex/contrib/xcolor.tar.gz
-Source0:        xcolor-2.01-20050323.tar.gz
+Source0:        xcolor-2.02.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Mar 28 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.02-1
+- Update to 2.02.
+
 * Wed Mar 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.01-1
 - Update to 2.01.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 14:21:18 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 29 Mar 2005 09:21:18 -0500
Subject: rpms/tetex-xcolor/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tetex-xcolor.spec, 1.1, 1.2
Message-ID: <200503291421.j2TELIjn013239@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13224/devel

Modified Files:
	.cvsignore sources tetex-xcolor.spec 
Log Message:
Update to 2.02.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Mar 2005 02:03:24 -0000	1.2
+++ .cvsignore	29 Mar 2005 14:21:16 -0000	1.3
@@ -1 +1 @@
-xcolor-2.01-20050323.tar.gz
+xcolor-2.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Mar 2005 02:03:24 -0000	1.2
+++ sources	29 Mar 2005 14:21:16 -0000	1.3
@@ -1 +1 @@
-d60c7a02fc9f04b785f31c96c1fd8d4d  xcolor-2.01-20050323.tar.gz
+d0520f50a8f8aebabe3a7a39b73a1f24  xcolor-2.02.tar.gz


Index: tetex-xcolor.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/devel/tetex-xcolor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tetex-xcolor.spec	24 Mar 2005 02:03:24 -0000	1.1
+++ tetex-xcolor.spec	29 Mar 2005 14:21:16 -0000	1.2
@@ -5,7 +5,7 @@
 %define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        2.01
+Version:        2.02
 Release:        1
 Summary:        Driver-independent color extensions for LaTeX and pdfLaTeX
 
@@ -14,7 +14,7 @@
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/xcolor.html
 # DANTE generates CTAN packages tarballs on-the-fly
 # ftp://ftp.dante.de/tex-archive/macros/latex/contrib/xcolor.tar.gz
-Source0:        xcolor-2.01-20050323.tar.gz
+Source0:        xcolor-2.02.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Mar 28 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.02-1
+- Update to 2.02.
+
 * Wed Mar 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.01-1
 - Update to 2.01.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 14:51:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 29 Mar 2005 09:51:21 -0500
Subject: rpms/perl-ExtUtils-ParseXS/FC-3 .cvsignore, 1.2,
	1.3 perl-ExtUtils-ParseXS.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200503291451.j2TEpL5J013420@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13410/FC-3

Modified Files:
	.cvsignore perl-ExtUtils-ParseXS.spec sources 
Log Message:
Update to 2.09.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:59:56 -0000	1.2
+++ .cvsignore	29 Mar 2005 14:51:18 -0000	1.3
@@ -1 +1 @@
-ExtUtils-ParseXS-2.08.tar.gz
+ExtUtils-ParseXS-2.09.tar.gz


Index: perl-ExtUtils-ParseXS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-3/perl-ExtUtils-ParseXS.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-ExtUtils-ParseXS.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-ExtUtils-ParseXS.spec	29 Mar 2005 14:51:18 -0000	1.5
@@ -1,15 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-ExtUtils-ParseXS
-Version:        2.08
-Release:        2
-Epoch:          0
+Version:        2.09
+Release:        1
 Summary:        Module and a script for converting Perl XS code into C code
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-ParseXS/
-Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-2.08.tar.gz
+Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-2.09.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -56,6 +55,9 @@
 
 
 %changelog
+* Tue Mar 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-1
+- Update to 2.09.
+
 * Sat May 15 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:2.08-0.fdr.2
 - Avoid creation of the perllocal.pod file (make pure_install).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:59:56 -0000	1.2
+++ sources	29 Mar 2005 14:51:18 -0000	1.3
@@ -1 +1 @@
-96a63d75e5ff2e2665ee97370690068a  ExtUtils-ParseXS-2.08.tar.gz
+6320ff9a597d9fdf1660a35724d7f3c1  ExtUtils-ParseXS-2.09.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 29 14:51:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 29 Mar 2005 09:51:21 -0500
Subject: rpms/perl-ExtUtils-ParseXS/devel .cvsignore, 1.2,
	1.3 perl-ExtUtils-ParseXS.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200503291451.j2TEpLKn013425@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13410/devel

Modified Files:
	.cvsignore perl-ExtUtils-ParseXS.spec sources 
Log Message:
Update to 2.09.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:59:56 -0000	1.2
+++ .cvsignore	29 Mar 2005 14:51:18 -0000	1.3
@@ -1 +1 @@
-ExtUtils-ParseXS-2.08.tar.gz
+ExtUtils-ParseXS-2.09.tar.gz


Index: perl-ExtUtils-ParseXS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/perl-ExtUtils-ParseXS.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-ExtUtils-ParseXS.spec	3 Mar 2005 23:46:26 -0000	1.5
+++ perl-ExtUtils-ParseXS.spec	29 Mar 2005 14:51:18 -0000	1.6
@@ -1,14 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-ExtUtils-ParseXS
-Version:        2.08
-Release:        2
+Version:        2.09
+Release:        1
 Summary:        Module and a script for converting Perl XS code into C code
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-ParseXS/
-Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-2.08.tar.gz
+Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-2.09.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Tue Mar 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-1
+- Update to 2.09.
+
 * Sat May 15 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:2.08-0.fdr.2
 - Avoid creation of the perllocal.pod file (make pure_install).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:59:56 -0000	1.2
+++ sources	29 Mar 2005 14:51:19 -0000	1.3
@@ -1 +1 @@
-96a63d75e5ff2e2665ee97370690068a  ExtUtils-ParseXS-2.08.tar.gz
+6320ff9a597d9fdf1660a35724d7f3c1  ExtUtils-ParseXS-2.09.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 29 15:04:44 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 29 Mar 2005 10:04:44 -0500
Subject: rpms/perl-Test-Manifest/FC-3 .cvsignore, 1.4,
	1.5 perl-Test-Manifest.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200503291504.j2TF4iZ7014454@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Manifest/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14444/FC-3

Modified Files:
	.cvsignore perl-Test-Manifest.spec sources 
Log Message:
Update to 1.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Mar 2005 13:00:42 -0000	1.4
+++ .cvsignore	29 Mar 2005 15:04:42 -0000	1.5
@@ -1 +1 @@
-Test-Manifest-1.13.tar.gz
+Test-Manifest-1.14.tar.gz


Index: perl-Test-Manifest.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/FC-3/perl-Test-Manifest.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-Manifest.spec	23 Mar 2005 13:00:42 -0000	1.5
+++ perl-Test-Manifest.spec	29 Mar 2005 15:04:42 -0000	1.6
@@ -1,14 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Test-Manifest
-Version:        1.13
+Version:        1.14
 Release:        1
 Summary:        Test case module for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Test-Manifest/
-Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.13.tar.gz
+Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.14.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Mar 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-1
+- Update to 1.14.
+
 * Wed Mar 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
 - Update to 1.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Mar 2005 13:00:42 -0000	1.4
+++ sources	29 Mar 2005 15:04:42 -0000	1.5
@@ -1 +1 @@
-620d7172ff66a9dbe8f08c629ab5e521  Test-Manifest-1.13.tar.gz
+4b0a8c9789b65647024e62cd1ee1fb8f  Test-Manifest-1.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 29 15:04:44 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 29 Mar 2005 10:04:44 -0500
Subject: rpms/perl-Test-Manifest/devel .cvsignore, 1.4,
	1.5 perl-Test-Manifest.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200503291504.j2TF4iCO014459@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Manifest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14444/devel

Modified Files:
	.cvsignore perl-Test-Manifest.spec sources 
Log Message:
Update to 1.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Mar 2005 13:00:42 -0000	1.4
+++ .cvsignore	29 Mar 2005 15:04:42 -0000	1.5
@@ -1 +1 @@
-Test-Manifest-1.13.tar.gz
+Test-Manifest-1.14.tar.gz


Index: perl-Test-Manifest.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/perl-Test-Manifest.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Test-Manifest.spec	23 Mar 2005 13:00:42 -0000	1.7
+++ perl-Test-Manifest.spec	29 Mar 2005 15:04:42 -0000	1.8
@@ -1,14 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Test-Manifest
-Version:        1.13
+Version:        1.14
 Release:        1
 Summary:        Test case module for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Test-Manifest/
-Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.13.tar.gz
+Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.14.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Mar 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-1
+- Update to 1.14.
+
 * Wed Mar 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
 - Update to 1.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Mar 2005 13:00:42 -0000	1.4
+++ sources	29 Mar 2005 15:04:42 -0000	1.5
@@ -1 +1 @@
-620d7172ff66a9dbe8f08c629ab5e521  Test-Manifest-1.13.tar.gz
+4b0a8c9789b65647024e62cd1ee1fb8f  Test-Manifest-1.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 29 15:27:25 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 29 Mar 2005 10:27:25 -0500
Subject: rpms/pure-ftpd/devel pure-ftpd.pure-ftpwho.consoleapp, NONE,
	1.1 pure-ftpd.pure-ftpwho.pam, NONE, 1.1
Message-ID: <200503291527.j2TFROow014646@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14636/devel

Added Files:
	pure-ftpd.pure-ftpwho.consoleapp pure-ftpd.pure-ftpwho.pam 
Log Message:
- add missing usermode files



--- NEW FILE pure-ftpd.pure-ftpwho.consoleapp ---
USER=root
PROGRAM=/usr/sbin/pure-ftpwho
GUI=no


--- NEW FILE pure-ftpd.pure-ftpwho.pam ---
#%PAM-1.0
auth       sufficient   pam_rootok.so
auth       required     pam_localuser.so
account    required     pam_permit.so



From fedora-extras-commits at redhat.com  Tue Mar 29 15:27:53 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 29 Mar 2005 10:27:53 -0500
Subject: devel/ufraw ufraw.spec,1.3,1.4
Message-ID: <200503291527.j2TFRr1S014676@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/devel/ufraw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14652

Modified Files:
	ufraw.spec 
Log Message:
buildreq for libtiff-devel and libjpeg-devel




Index: ufraw.spec
===================================================================
RCS file: /cvs/extras/devel/ufraw/ufraw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ufraw.spec	24 Mar 2005 14:34:10 -0000	1.3
+++ ufraw.spec	29 Mar 2005 15:27:51 -0000	1.4
@@ -13,6 +13,8 @@
 BuildRequires: gimp-devel >= 2.0
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: lcms-devel
+BuildRequires: libtiff-devel 
+BuildRequires: libjpeg-devel
 BuildRequires: pkgconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 
@@ -41,6 +43,9 @@
 %{gimpplugindir}/ufraw-gimp
 
 %changelog
+* Tue Mar 29 2005 Seth Vidal <skvidal at phy.duke.edu> - 0.4-1
+- buildrequire libtiff-devel and libjpeg-devel
+
 * Thu Mar 24 2005 Nils Philippsen <nphilipp at redhat.com> - 0.4-1
 - buildrequire lcms-devel
 - trim summary



From fedora-extras-commits at redhat.com  Tue Mar 29 15:39:11 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 29 Mar 2005 10:39:11 -0500
Subject: extras-buildsys-temp/scripts mach.in,1.2,1.3
Message-ID: <200503291539.j2TFdBsj014737@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/extras-buildsys-temp/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14724/scripts

Modified Files:
	mach.in 
Log Message:

make output on failure a little more useful



Index: mach.in
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/scripts/mach.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mach.in	24 Mar 2005 05:03:58 -0000	1.2
+++ mach.in	29 Mar 2005 15:39:09 -0000	1.3
@@ -524,7 +524,7 @@
         
         if message and not progress: self.stdout('\n')
         if status != 0:
-            raise self.Error, "Could not run: %s" % command
+            raise self.Error, "Could not run: %s output was:\n %s" % (command, output)
 
     def group_installer (self, groups, message = None,
                 progress = False, interactive = False):



From fedora-extras-commits at redhat.com  Tue Mar 29 17:37:45 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 29 Mar 2005 12:37:45 -0500
Subject: rpms/alsa-tools/FC-3 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200503291737.j2THbj8C017085@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/alsa-tools/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17079

Modified Files:
	.cvsignore sources 
Log Message:
Add missing sources; sorry skvidal for missing them on the first commit


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:01:52 -0000	1.2
+++ .cvsignore	29 Mar 2005 17:37:43 -0000	1.3
@@ -1 +1 @@
-alsa-tools-1.0.4.tar.bz2
+alsa-tools-1.0.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:01:52 -0000	1.2
+++ sources	29 Mar 2005 17:37:43 -0000	1.3
@@ -1 +1 @@
-c901a79e60a42f82f07f7a77cb45691a  alsa-tools-1.0.4.tar.bz2
+d8047c270d7033c00f1f64cde0f67d99  alsa-tools-1.0.6.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar 29 18:13:40 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 29 Mar 2005 13:13:40 -0500
Subject: rpms/contact-lookup-applet import.log,1.2,1.3
Message-ID: <200503291813.j2TIDexc018140@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18131

Modified Files:
	import.log 
Log Message:
auto-import contact-lookup-applet-0.11-1 on branch devel from contact-lookup-applet-0.11-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	24 Mar 2005 18:58:55 -0000	1.2
+++ import.log	29 Mar 2005 18:13:38 -0000	1.3
@@ -1 +1,2 @@
 contact-lookup-applet-0_10-2:HEAD:contact-lookup-applet-0.10-2.src.rpm:1111690728
+contact-lookup-applet-0_11-1:HEAD:contact-lookup-applet-0.11-1.src.rpm:1112120013



From fedora-extras-commits at redhat.com  Tue Mar 29 18:13:40 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 29 Mar 2005 13:13:40 -0500
Subject: rpms/contact-lookup-applet/devel .cvsignore, 1.2,
	1.3 contact-lookup-applet.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200503291813.j2TIDeEU018144@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-serv18131/devel

Modified Files:
	.cvsignore contact-lookup-applet.spec sources 
Log Message:
auto-import contact-lookup-applet-0.11-1 on branch devel from contact-lookup-applet-0.11-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Mar 2005 18:58:55 -0000	1.2
+++ .cvsignore	29 Mar 2005 18:13:38 -0000	1.3
@@ -1 +1 @@
-contact-lookup-applet-0.10.tar.gz
+contact-lookup-applet-0.11.tar.gz


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- contact-lookup-applet.spec	24 Mar 2005 18:58:55 -0000	1.1
+++ contact-lookup-applet.spec	29 Mar 2005 18:13:38 -0000	1.2
@@ -1,19 +1,18 @@
-Name:           contact-lookup-applet
-Version:        0.10
-Release:        2
-Summary:        Contact Lookup Applet
-
-Group:          Applications/Communications
-License:        GPL
-URL:            http://www.burtonini.com/blog/2004/Oct/27/
-Source0:        http://www.burtonini.com/computing/contact-lookup-applet-0.10.tar.gz        
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gtk2-devel >= 2.4.0
-BuildRequires:  libgnomeui-devel >= 2.7.92
-BuildRequires:  gnome-panel-devel >= 2.7.90
-BuildRequires:  evolution-data-server-devel >= 1.0.0
-BuildRequires: 	gettext
+Name:		contact-lookup-applet
+Version:	0.11
+Release:	1
+Summary:	Contact Lookup Applet
+
+Group:		Applications/Communications
+License:	GPL
+URL:		http://www.burtonini.com/blog/computers/contact-lookup-applet-0.11
+Source0:	http://www.burtonini.com/computing/contact-lookup-applet-0.11.tar.gz       
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	libgnomeui-devel >= 2.7.92
+BuildRequires:	gnome-panel-devel >= 2.9.4
+BuildRequires:	evolution-data-server-devel >= 1.2.0
+BuildRequires:	gettext
 
 %description
 This applet allows you to search your Evolution 2 address book for people. To
@@ -45,6 +44,11 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Tue Mar 29 2005 Brian Pepple <bdpepple at ameritech.net> - 0.11-1
+- Updated to 0.11.
+- Drop BuildRequires for gtk2-devel.
+- Bump gnome-panel-devel & evolution-data-server-devel versions to minimum needed.
+
 * Mon Mar 21 2005 Brian Pepple <bdpepple at ameritech.net> - 0.10-2
 - fixed ownership of %%{_datadir}.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Mar 2005 18:58:55 -0000	1.2
+++ sources	29 Mar 2005 18:13:38 -0000	1.3
@@ -1 +1 @@
-d0a14459676a0f64e871d28dd334f5f8  contact-lookup-applet-0.10.tar.gz
+bb7567971fa807326600b686ce366bc3  contact-lookup-applet-0.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 29 19:19:12 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 29 Mar 2005 14:19:12 -0500
Subject: rpms/fslint import.log,1.4,1.5
Message-ID: <200503291919.j2TJJCgp019415@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fslint
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19406

Modified Files:
	import.log 
Log Message:
auto-import fslint-2.11-1 on branch FC-3 from fslint-2.11-1.src.rpm
http://bugzilla.fedora.us/show_bug.cgi?id=1572


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fslint/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 04:20:50 -0000	1.4
+++ import.log	29 Mar 2005 19:19:10 -0000	1.5
@@ -1,3 +1,4 @@
 fslint-2_02-0_fdr_2_rh90:HEAD:fslint-2.02-0.fdr.2.rh90.src.rpm:1099887632
 fslint-2_02-0_fdr_2_1:HEAD:fslint-2.02-0.fdr.2.1.src.rpm:1099887638
 fslint-2_02-0_fdr_2_2:HEAD:fslint-2.02-0.fdr.2.2.src.rpm:1099887650
+fslint-2_11-1:FC-3:fslint-2.11-1.src.rpm:1112123943



From fedora-extras-commits at redhat.com  Tue Mar 29 19:19:12 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 29 Mar 2005 14:19:12 -0500
Subject: rpms/fslint/FC-3 .cvsignore, 1.2, 1.3 fslint.spec, 1.4, 1.5 sources,
	1.2, 1.3 fslint-desktop.patch, 1.1, NONE
Message-ID: <200503291919.j2TJJCZw019420@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fslint/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19406/FC-3

Modified Files:
	.cvsignore fslint.spec sources 
Removed Files:
	fslint-desktop.patch 
Log Message:
auto-import fslint-2.11-1 on branch FC-3 from fslint-2.11-1.src.rpm
http://bugzilla.fedora.us/show_bug.cgi?id=1572


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:20:32 -0000	1.2
+++ .cvsignore	29 Mar 2005 19:19:10 -0000	1.3
@@ -1 +1 @@
-FSlint-2.02.tar.gz
+FSlint-2.11.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-3/fslint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fslint.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ fslint.spec	29 Mar 2005 19:19:10 -0000	1.5
@@ -1,35 +1,30 @@
-%define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pysitedir %{_libdir}/python%{pyver}/site-packages
-
 Name:           fslint
-Version:        2.02
-Release:        2
+Version:        2.11
+Release:        1
 Epoch:          0
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.pixelbeat.org/fslint/
-Source0:        http://www.pixelbeat.org/fslint/FSlint-2.02.tar.gz
-Patch0:         %{name}-desktop.patch
+Source0:        http://www.pixelbeat.org/fslint/FSlint-2.11.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
+BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 0:%{pyver}, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
-FSlint is a toolkit to find all redundant disk usage.  It includes a
-GUI as well as a command line interface.
+FSlint is a toolkit to find all redundant disk usage (duplicate files
+for e.g.). It includes a GUI as well as a command line interface.
 
 
 %prep
 %setup -q -n FSlint-%{version}
-%patch0 -p0
+%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' FSlint
+%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' FSlint
 mv fslint/fstool/README README.fstool
 mv fslint/rmlint/README README.rmlint
-echo "liblocation = '%{_datadir}/%{name}'" > __init__.py
-perl -pi -e 's|^Icon=(.*)$|Icon=%{_datadir}/%{name}/$1|' fslint.desktop
 
 
 %build
@@ -38,29 +33,28 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -p -m 0755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
-install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/{fstool,rmlint}
-install -p -m 0644 fslint.glade fslint_icon.png \
+install -Dpm 755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
+ln -s FSlint $RPM_BUILD_ROOT%{_bindir}/fslint
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,rmlint}
+install -pm 644 fslint.glade fslint_icon.png \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -p -m 0755 fslint/{find*,fsl*,get*,zipdir} \
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ln -s %{_datadir}/%{name}/fslint_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -pm 755 fslint/{find*,fsl*,get*,zipdir} \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint
-install -p -m 0755 fslint/fstool/* \
+install -pm 755 fslint/fstool/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/fstool
-install -p -m 0755 fslint/rmlint/* \
+install -pm 755 fslint/rmlint/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/rmlint
 
 make -C po DESTDIR=$RPM_BUILD_ROOT LOCALEDIR=%{_datadir}/locale install
 
-install -D -p -m 0644 __init__.py \
-  $RPM_BUILD_ROOT%{pysitedir}/FSlint/__init__.py
-touch $RPM_BUILD_ROOT%{pysitedir}/FSlint/__init__.py{c,o}
-
 desktop-file-install \
   --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode 0644 \
+  --mode 644 \
   --add-category X-Fedora \
-  fslint.desktop
+  %{name}.desktop
 
 %find_lang %{name}
 
@@ -72,15 +66,31 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc doc/* README.*
-%{_bindir}/*
-%dir %{pysitedir}/FSlint
-%{pysitedir}/FSlint/*.py
-%ghost %{pysitedir}/FSlint/*.py?
+%{_bindir}/*lint
 %{_datadir}/%{name}
-%{_datadir}/applications/*
+%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/pixmaps/fslint_icon.png
 
 
 %changelog
+* Fri Mar 18 2005 P??draig Brady <P at draigBrady.com> - 0:2.11-1
+- Update to 2.11
+
+* Wed Mar 16 2005 P??draig Brady <P at draigBrady.com> - 0:2.10-0.fdr.2
+- Update to 2.10
+
+* Tue Sep  9 2004 P??draig Brady <P at draigBrady.com> - 0:2.08-0.fdr.2
+- Fix locale support broken in previous version
+
+* Wed Sep  1 2004 P??draig Brady <P at draigBrady.com> - 0:2.08-0.fdr.1
+- Update to 2.08.
+- Remove redundant patch.
+
+* Wed May  5 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.06-0.fdr.1
+- Update to 2.06.
+- Add %%{_bindir}/fslint symlink.
+- Make installation Python version independent.
+
 * Thu Aug 28 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.02-0.fdr.2
 - Requires: cpio, remove redundant findutils dependency (bug 539).
 - Fix version in dependency on python.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:20:32 -0000	1.2
+++ sources	29 Mar 2005 19:19:10 -0000	1.3
@@ -1 +1 @@
-24d101f560d9018161ee10e1eb12ec37  FSlint-2.02.tar.gz
+518ef710828f6b55adf7fc665e9146f9  FSlint-2.11.tar.gz


--- fslint-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Mar 29 19:19:17 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 29 Mar 2005 14:19:17 -0500
Subject: rpms/contact-lookup-applet/FC-3 contact-lookup-applet.spec,1.1,1.2
Message-ID: <200503291919.j2TJJHse019453@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19446

Modified Files:
	contact-lookup-applet.spec 
Log Message:
Remove gtk2-devel BR.


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-3/contact-lookup-applet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- contact-lookup-applet.spec	24 Mar 2005 18:58:55 -0000	1.1
+++ contact-lookup-applet.spec	29 Mar 2005 19:19:15 -0000	1.2
@@ -1,19 +1,18 @@
-Name:           contact-lookup-applet
-Version:        0.10
-Release:        2
-Summary:        Contact Lookup Applet
-
-Group:          Applications/Communications
-License:        GPL
-URL:            http://www.burtonini.com/blog/2004/Oct/27/
-Source0:        http://www.burtonini.com/computing/contact-lookup-applet-0.10.tar.gz        
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gtk2-devel >= 2.4.0
-BuildRequires:  libgnomeui-devel >= 2.7.92
-BuildRequires:  gnome-panel-devel >= 2.7.90
-BuildRequires:  evolution-data-server-devel >= 1.0.0
-BuildRequires: 	gettext
+Name:		contact-lookup-applet
+Version:	0.10
+Release:	3
+Summary:	Contact Lookup Applet
+
+Group:		Applications/Communications
+License:	GPL
+URL:		http://www.burtonini.com/blog/2004/Oct/27/
+Source0:	http://www.burtonini.com/computing/contact-lookup-applet-0.10.tar.gz        
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	libgnomeui-devel >= 2.7.92
+BuildRequires:	gnome-panel-devel >= 2.7.90
+BuildRequires:	evolution-data-server-devel >= 1.0.0
+BuildRequires:	gettext
 
 %description
 This applet allows you to search your Evolution 2 address book for people. To
@@ -45,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Tue Mar 29 2005 Brian Pepple <bdpepple at ameritech.net> - 0.10-3
+- Drop BuldRequires for gtk2-devel.
+
 * Mon Mar 21 2005 Brian Pepple <bdpepple at ameritech.net> - 0.10-2
 - fixed ownership of %%{_datadir}.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 19:20:09 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 29 Mar 2005 14:20:09 -0500
Subject: rpms/fslint import.log,1.5,1.6
Message-ID: <200503291920.j2TJK9RK019572@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fslint
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19563

Modified Files:
	import.log 
Log Message:
auto-import fslint-2.11-2 on branch devel from fslint-2.11-2.src.rpm
http://bugzilla.fedora.us/show_bug.cgi?id=1572


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fslint/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	29 Mar 2005 19:19:10 -0000	1.5
+++ import.log	29 Mar 2005 19:20:07 -0000	1.6
@@ -2,3 +2,4 @@
 fslint-2_02-0_fdr_2_1:HEAD:fslint-2.02-0.fdr.2.1.src.rpm:1099887638
 fslint-2_02-0_fdr_2_2:HEAD:fslint-2.02-0.fdr.2.2.src.rpm:1099887650
 fslint-2_11-1:FC-3:fslint-2.11-1.src.rpm:1112123943
+fslint-2_11-2:HEAD:fslint-2.11-2.src.rpm:1112123998



From fedora-extras-commits at redhat.com  Tue Mar 29 19:20:09 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 29 Mar 2005 14:20:09 -0500
Subject: rpms/fslint/devel .cvsignore, 1.2, 1.3 fslint.spec, 1.5, 1.6 sources,
	1.2, 1.3 fslint-desktop.patch, 1.1, NONE
Message-ID: <200503291920.j2TJK9IC019576@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fslint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19563/devel

Modified Files:
	.cvsignore fslint.spec sources 
Removed Files:
	fslint-desktop.patch 
Log Message:
auto-import fslint-2.11-2 on branch devel from fslint-2.11-2.src.rpm
http://bugzilla.fedora.us/show_bug.cgi?id=1572


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:20:32 -0000	1.2
+++ .cvsignore	29 Mar 2005 19:20:07 -0000	1.3
@@ -1 +1 @@
-FSlint-2.02.tar.gz
+FSlint-2.11.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/fslint.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fslint.spec	3 Mar 2005 20:33:53 -0000	1.5
+++ fslint.spec	29 Mar 2005 19:20:07 -0000	1.6
@@ -1,34 +1,29 @@
-%define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pysitedir %{_libdir}/python%{pyver}/site-packages
-
 Name:           fslint
-Version:        2.02
+Version:        2.11
 Release:        2
-Summary:        Utility to find and clean "lint" on a filesystem
+Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.pixelbeat.org/fslint/
-Source0:        http://www.pixelbeat.org/fslint/FSlint-2.02.tar.gz
-Patch0:         %{name}-desktop.patch
+Source0:        http://www.pixelbeat.org/fslint/FSlint-2.11.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
+BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= %{pyver}, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
-FSlint is a toolkit to find all redundant disk usage.  It includes a
-GUI as well as a command line interface.
+FSlint is a toolkit to find all redundant disk usage (duplicate files
+for e.g.). It includes a GUI as well as a command line interface.
 
 
 %prep
 %setup -q -n FSlint-%{version}
-%patch0 -p0
+%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' FSlint
+%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' FSlint
 mv fslint/fstool/README README.fstool
 mv fslint/rmlint/README README.rmlint
-echo "liblocation = '%{_datadir}/%{name}'" > __init__.py
-perl -pi -e 's|^Icon=(.*)$|Icon=%{_datadir}/%{name}/$1|' fslint.desktop
 
 
 %build
@@ -37,29 +32,28 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -p -m 0755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
-install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/{fstool,rmlint}
-install -p -m 0644 fslint.glade fslint_icon.png \
+install -Dpm 755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
+ln -s FSlint $RPM_BUILD_ROOT%{_bindir}/fslint
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,rmlint}
+install -pm 644 fslint.glade fslint_icon.png \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -p -m 0755 fslint/{find*,fsl*,get*,zipdir} \
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ln -s %{_datadir}/%{name}/fslint_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -pm 755 fslint/{find*,fsl*,get*,zipdir} \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint
-install -p -m 0755 fslint/fstool/* \
+install -pm 755 fslint/fstool/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/fstool
-install -p -m 0755 fslint/rmlint/* \
+install -pm 755 fslint/rmlint/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/rmlint
 
 make -C po DESTDIR=$RPM_BUILD_ROOT LOCALEDIR=%{_datadir}/locale install
 
-install -D -p -m 0644 __init__.py \
-  $RPM_BUILD_ROOT%{pysitedir}/FSlint/__init__.py
-touch $RPM_BUILD_ROOT%{pysitedir}/FSlint/__init__.py{c,o}
-
 desktop-file-install \
   --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode 0644 \
+  --mode 644 \
   --add-category X-Fedora \
-  fslint.desktop
+  %{name}.desktop
 
 %find_lang %{name}
 
@@ -71,15 +65,31 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc doc/* README.*
-%{_bindir}/*
-%dir %{pysitedir}/FSlint
-%{pysitedir}/FSlint/*.py
-%ghost %{pysitedir}/FSlint/*.py?
+%{_bindir}/*lint
 %{_datadir}/%{name}
-%{_datadir}/applications/*
+%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/pixmaps/fslint_icon.png
 
 
 %changelog
+* Fri Mar 18 2005 P??draig Brady <P at draigBrady.com> - 2.11-2
+- Update to 2.11
+
+* Wed Mar 16 2005 P??draig Brady <P at draigBrady.com> - 0:2.10-0.fdr.2
+- Update to 2.10
+
+* Tue Sep  9 2004 P??draig Brady <P at draigBrady.com> - 0:2.08-0.fdr.2
+- Fix locale support broken in previous version
+
+* Wed Sep  1 2004 P??draig Brady <P at draigBrady.com> - 0:2.08-0.fdr.1
+- Update to 2.08.
+- Remove redundant patch.
+
+* Wed May  5 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.06-0.fdr.1
+- Update to 2.06.
+- Add %%{_bindir}/fslint symlink.
+- Make installation Python version independent.
+
 * Thu Aug 28 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.02-0.fdr.2
 - Requires: cpio, remove redundant findutils dependency (bug 539).
 - Fix version in dependency on python.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:20:32 -0000	1.2
+++ sources	29 Mar 2005 19:20:07 -0000	1.3
@@ -1 +1 @@
-24d101f560d9018161ee10e1eb12ec37  FSlint-2.02.tar.gz
+518ef710828f6b55adf7fc665e9146f9  FSlint-2.11.tar.gz


--- fslint-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Mar 29 19:36:51 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 29 Mar 2005 14:36:51 -0500
Subject: common Makefile.common,1.5,1.6
Message-ID: <200503291936.j2TJapWT019953@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19938

Modified Files:
	Makefile.common 
Log Message:
add tag target



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.common	3 Mar 2005 20:02:52 -0000	1.5
+++ Makefile.common	29 Mar 2005 19:36:49 -0000	1.6
@@ -276,6 +276,13 @@
 verrel:
 	@echo $(NAME)-$(VERSION)-$(RELEASE)
 
+# If you build a new version into the tree, first do "make tag",
+# then "make srpm", then build the package.  
+tag::    $(SPECFILE)
+	cvs tag $(TAG_OPTS) -c $(TAG)
+	@echo "Tagged with: $(TAG)"
+	@echo
+
 # "make new | less" to see what has changed since the last tag was assigned
 new:
 	- at cvs diff -u -r$$(cvs log Makefile 2>/dev/null | awk '/^symbolic names:$$/ {getline; sub(/^[ \t]*/, "") ; sub (/:.*$$/, ""); print; exit 0}')



From fedora-extras-commits at redhat.com  Tue Mar 29 19:48:36 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 29 Mar 2005 14:48:36 -0500
Subject: devel/kover kover.spec,1.7,1.8
Message-ID: <200503291948.j2TJma2r020069@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/kover
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20028

Modified Files:
	kover.spec 
Log Message:
add --disable-rpath to configure



Index: kover.spec
===================================================================
RCS file: /cvs/extras/devel/kover/kover.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kover.spec	3 Mar 2005 21:56:40 -0000	1.7
+++ kover.spec	29 Mar 2005 19:48:34 -0000	1.8
@@ -1,7 +1,7 @@
 Name: kover
 Summary: WYSIWYG CD cover printer with CDDB support
 Version: 2.9.6
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Publishing
 Source0 http://lisas.de/kover/kover-2.9.6.tar.gz
@@ -20,7 +20,7 @@
 
 %build
 [ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
-%configure --with-xinerama
+%configure --with-xinerama --disable-rpath
 %{__make} %{?_smp_mflags}
 
 %clean
@@ -58,6 +58,9 @@
 %attr(755,root,root)%{_bindir}/cd-text
 
 %changelog
+* Tue Mar 29 2005 Adrian Reber <adrian at lisas.de> - 0:2.9.6-2
+- add --disable-rpath to configure
+
 * Sun Feb 13 2005 Adrian Reber <adrian at lisas.de> - 0:2.9.6-1
 - updated to 2.9.6 to hopefully fix x86_64 build
 



From fedora-extras-commits at redhat.com  Tue Mar 29 20:24:52 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 29 Mar 2005 15:24:52 -0500
Subject: devel/sopwith sopwith-gcc4.patch,NONE,1.1 sopwith.spec,1.5,1.6
Message-ID: <200503292024.j2TKOqb7021260@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/sopwith
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21251

Modified Files:
	sopwith.spec 
Added Files:
	sopwith-gcc4.patch 
Log Message:
fix gcc4 compiler error


sopwith-gcc4.patch:

--- NEW FILE sopwith-gcc4.patch ---
--- sdl_sopwith-1.7.1/src/swmain.h	2003-06-08 20:20:30.000000000 +0200
+++ sdl_sopwith-1.7.1.new/src/swmain.h	2005-03-29 22:17:32.000000000 +0200
@@ -46,7 +46,7 @@
 extern int     targrnge;
 extern BOOL    hires;
 extern BOOL    disppos;
-extern BOOL    titleflg;
+static BOOL    titleflg;
 extern int     dispdbg;
 extern BOOL    soundflg;
 extern BOOL    repflag;


Index: sopwith.spec
===================================================================
RCS file: /cvs/extras/devel/sopwith/sopwith.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sopwith.spec	5 Mar 2005 19:28:28 -0000	1.5
+++ sopwith.spec	29 Mar 2005 20:24:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           sopwith
 Version:        1.7.1
-Release:        1
+Release:        2
 Summary:        SDL port of the sopwith game
 
 Group:          Amusements/Games
@@ -8,6 +8,7 @@
 URL:            http://sdl-sopwith.sourceforge.net/
 Source0:        http://dl.sf.net/sdl-sopwith/sdl_sopwith-1.7.1.tar.gz
 Source1:        sopwith.png
+Patch0:         sopwith-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q -n sdl_sopwith-%{version}
+%patch0 -p1
 
 
 %build
@@ -68,6 +70,9 @@
 
 
 %changelog
+* Tue Mar 29 2005 Adrian Reber <adrian at lisas.de> - 1.7.1-2
+- added patch to fix gcc4 compiler error
+
 * Wed Jun 18 2003 Adrian Reber <adrian at lisas.de> - 0:1.7.1-0.fdr.1
 - updated to 1.7.1
 - changed category from desktop entry from "Games" to "Game"



From fedora-extras-commits at redhat.com  Tue Mar 29 20:38:06 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 29 Mar 2005 15:38:06 -0500
Subject: devel/cvsup cvsup-gcc4.patch,NONE,1.1
Message-ID: <200503292038.j2TKc6LF021317@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/cvsup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21309

Added Files:
	cvsup-gcc4.patch 
Log Message:
gcc4 patch


cvsup-gcc4.patch:

--- NEW FILE cvsup-gcc4.patch ---
--- cvsup-snap-16.1h/ezm3-1.2/language/modula3/m3compiler/m3cc/gcc/include/obstack.h	2003-01-11 21:58:43.000000000 +0100
+++ cvsup-snap-16.1h.new/ezm3-1.2/language/modula3/m3compiler/m3cc/gcc/include/obstack.h	2005-03-26 18:44:03.000000000 +0100
@@ -423,7 +423,8 @@
 ({ struct obstack *__o = (OBSTACK);					\
    if (__o->next_free + sizeof (void *) > __o->chunk_limit)		\
      _obstack_newchunk (__o, sizeof (void *));				\
-   *((void **)__o->next_free)++ = ((void *)datum);			\
+   *((void **)__o->next_free) = ((void *)datum);			\
+   __o->next_free += sizeof(void *);					\
    (void) 0; })
 
 # define obstack_int_grow(OBSTACK,datum)				\



From fedora-extras-commits at redhat.com  Tue Mar 29 20:41:06 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 29 Mar 2005 15:41:06 -0500
Subject: devel/cvsup cvsup.spec,1.7,1.8
Message-ID: <200503292041.j2TKf6Hi021377@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/cvsup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21371

Modified Files:
	cvsup.spec 
Log Message:
added gcc4 patch



Index: cvsup.spec
===================================================================
RCS file: /cvs/extras/devel/cvsup/cvsup.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cvsup.spec	3 Mar 2005 20:08:37 -0000	1.7
+++ cvsup.spec	29 Mar 2005 20:41:04 -0000	1.8
@@ -7,7 +7,7 @@
 Summary: CVS-Optimized General-Purpose Network File Distribution System client
 Name: cvsup
 Version: 16.1
-Release: 7.h
+Release: 8.h
 URL: http://www.polstra.com/projects/freeware/CVSup/
 License: BSD
 Group: Applications/Internet
@@ -27,6 +27,7 @@
 Patch5: ezm3-1.2-PPC-setjmp.patch
 # ... and this should be the real fix. Unfortunately it doesn't work..
 Patch6: ezm3-1.2-ppc-jmpbufsize.patch
+Patch7: cvsup-gcc4.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: mktemp, sed, XFree86-devel, zlib-devel
@@ -96,6 +97,7 @@
 %patch5 -p1
 #%patch6 -p1
 popd
+%patch7 -p1
 
 %build
 # ------------------------- Begin hackery ------------------------- #
@@ -202,6 +204,9 @@
 %doc Acknowledgments Announce Blurb ChangeLog Install License doc examples
 
 %changelog
+* Tue Mar 28 2005 Adrian Reber <adrian at lisas.de> - 0.16.1-8h
+- added gcc4 patch
+
 * Sun Feb 13 2005 David Woodhouse <dwmw2 at infradead.org> - 0.16.1-7h
 - Add PPC support. My brain hurts.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 20:55:16 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Tue, 29 Mar 2005 15:55:16 -0500
Subject: rpms/python-bibtex/devel python-bibtex.spec,1.5,1.6
Message-ID: <200503292055.j2TKtGne021466@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/python-bibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21460

Modified Files:
	python-bibtex.spec 
Log Message:
minor update for rebuild


Index: python-bibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/python-bibtex/devel/python-bibtex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-bibtex.spec	3 Mar 2005 23:53:13 -0000	1.5
+++ python-bibtex.spec	29 Mar 2005 20:55:14 -0000	1.6
@@ -5,7 +5,7 @@
 Summary: Python extension to parse BibTeX files
 Name: python-bibtex
 Version: 1.2.1
-Release: 1
+Release: 2
 License: GPL
 Group: Development/Libraries
 Source: http://dl.sf.net/pybliographer/python-bibtex-1.2.1.tar.gz
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Mar 29 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.1-2
+- rebuild for python 2.4
+
 * Tue Aug 17 2004 Zoltan Kota <z.kota at gmx.net> - 0:1.2.1-0.fdr.1
 - update to 1.2.1
 - using macro for python and sitearch



From fedora-extras-commits at redhat.com  Tue Mar 29 21:55:52 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 29 Mar 2005 16:55:52 -0500
Subject: rpms/contact-lookup-applet/FC-3 contact-lookup-applet.spec,1.2,1.3
Message-ID: <200503292155.j2TLtq0u022562@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22553/FC-3

Modified Files:
	contact-lookup-applet.spec 
Log Message:
added dist tags


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-3/contact-lookup-applet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- contact-lookup-applet.spec	29 Mar 2005 19:19:15 -0000	1.2
+++ contact-lookup-applet.spec	29 Mar 2005 21:55:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.10
-Release:	3
+Release:	4.fc3
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Tue Mar 29 2005 Brian Pepple <bdpepple at ameritech.net> - 0.10-4.fc3
+- Add dist tag.
+
 * Tue Mar 29 2005 Brian Pepple <bdpepple at ameritech.net> - 0.10-3
 - Drop BuldRequires for gtk2-devel.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 21:55:52 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 29 Mar 2005 16:55:52 -0500
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, 1.2,
	1.3
Message-ID: <200503292155.j2TLtq9w022566@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-serv22553/devel

Modified Files:
	contact-lookup-applet.spec 
Log Message:
added dist tags


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- contact-lookup-applet.spec	29 Mar 2005 18:13:38 -0000	1.2
+++ contact-lookup-applet.spec	29 Mar 2005 21:55:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.11
-Release:	1
+Release:	2.fc4
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Tue Mar 29 2005 Brian Pepple <bdpepple at ameritech.net> - 0.11-2.fc4
+- Added dist tag.
+
 * Tue Mar 29 2005 Brian Pepple <bdpepple at ameritech.net> - 0.11-1
 - Updated to 0.11.
 - Drop BuildRequires for gtk2-devel.



From fedora-extras-commits at redhat.com  Tue Mar 29 22:05:52 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 29 Mar 2005 17:05:52 -0500
Subject: rpms/xmms-lirc/FC-3 xmms-lirc.spec,1.5,1.6
Message-ID: <200503292205.j2TM5qY9023532@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xmms-lirc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23515/FC-3

Modified Files:
	xmms-lirc.spec 
Log Message:
BR lirc-devel


Index: xmms-lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-lirc/FC-3/xmms-lirc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmms-lirc.spec	13 Jan 2005 18:17:29 -0000	1.5
+++ xmms-lirc.spec	29 Mar 2005 22:05:32 -0000	1.6
@@ -4,14 +4,14 @@
 Summary: X MultiMedia System control plugin to use infrared devices
 Name: xmms-lirc
 Version: 1.4
-Release: 4
+Release: 4.1
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.lirc.org/
 Source: http://dl.sf.net/lirc/lirc-xmms-plugin-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xmms >= 1.0.0, glib >= 1.2.7, gtk+ >= 1.2.7, lirc
-BuildRequires: xmms-devel, glib-devel >= 1.2.7, gtk+-devel >= 1.2.7, lirc
+BuildRequires: xmms-devel, glib-devel >= 1.2.7, gtk+-devel >= 1.2.7, lirc-devel
 
 
 %description
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.4-4.1
+- BuildRequire lirc-devel.
+
 * Thu Jan 13 2005 Matthias Saou <http://freshrpms.net/> 1.4-4
 - Bump release for upgrade path.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 22:05:52 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 29 Mar 2005 17:05:52 -0500
Subject: rpms/xmms-lirc/devel xmms-lirc.spec,1.5,1.6
Message-ID: <200503292205.j2TM5qa7023529@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xmms-lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23515/devel

Modified Files:
	xmms-lirc.spec 
Log Message:
BR lirc-devel


Index: xmms-lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-lirc/devel/xmms-lirc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmms-lirc.spec	13 Jan 2005 18:17:29 -0000	1.5
+++ xmms-lirc.spec	29 Mar 2005 22:05:50 -0000	1.6
@@ -4,14 +4,14 @@
 Summary: X MultiMedia System control plugin to use infrared devices
 Name: xmms-lirc
 Version: 1.4
-Release: 4
+Release: 5
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.lirc.org/
 Source: http://dl.sf.net/lirc/lirc-xmms-plugin-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xmms >= 1.0.0, glib >= 1.2.7, gtk+ >= 1.2.7, lirc
-BuildRequires: xmms-devel, glib-devel >= 1.2.7, gtk+-devel >= 1.2.7, lirc
+BuildRequires: xmms-devel, glib-devel >= 1.2.7, gtk+-devel >= 1.2.7, lirc-devel
 
 
 %description
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.4-5
+- BuildRequire lirc-devel.
+
 * Thu Jan 13 2005 Matthias Saou <http://freshrpms.net/> 1.4-4
 - Bump release for upgrade path.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 22:27:41 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 29 Mar 2005 17:27:41 -0500
Subject: rpms/ip-sentinel/devel sources, 1.2, 1.3 ip-sentinel.spec, 1.3,
	1.4 .cvsignore, 1.2, 1.3
Message-ID: <200503292227.j2TMRfHK023729@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23723/devel

Modified Files:
	sources ip-sentinel.spec .cvsignore 
Log Message:
version 0.12



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Feb 2005 23:21:16 -0000	1.2
+++ sources	29 Mar 2005 22:27:39 -0000	1.3
@@ -1,2 +1,2 @@
-4cf7988f8e7eff68c535dec50ba79ba3  ip-sentinel-0.11.tar.bz2
-f8e4e911ec72bc28ba3c09bd39456b39  ip-sentinel-0.11.tar.bz2.asc
+eb83cda53fcfed7d9826eab1640a2d2a  ip-sentinel-0.12.tar.bz2
+d00e5e0c6ea8354d2c1ba1257e8f5cf3  ip-sentinel-0.12.tar.bz2.sig


Index: ip-sentinel.spec
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ip-sentinel.spec	3 Mar 2005 21:46:22 -0000	1.3
+++ ip-sentinel.spec	29 Mar 2005 22:27:39 -0000	1.4
@@ -1,6 +1,6 @@
 ## $id: ip-sentinel.spec.in,v 1.3 2003/05/26 21:53:02 ensc Exp $		--*- rpm-spec -*--
 
-# Copyright (C) 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
+# Copyright (C) 2004,2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 #  
 # 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
@@ -17,9 +17,9 @@
 
 
 ## This package understands the following switches:
-## --without dietlibc        ...   disable usage of dietlibc
-## --without minit           ...   disable creation of 'minit' subpackage
-## --with    fedora          ...   enable fedora.us specific parts
+## --without dietlibc	     ...   disable usage of dietlibc
+## --without minit	     ...   disable creation of 'minit' subpackage
+## --with    fedora	     ...   enable fedora.us specific parts
 ## --define  username\ name  ...   set the name of the user running the daemon
 
 
@@ -29,32 +29,32 @@
 ##
 
 
-%define uid		1
-%define useradd		/usr/sbin/%{?_with_fedora:fedora-}useradd  %{?_with_fedora:%uid }
-%define groupadd	/usr/sbin/%{?_with_fedora:fedora-}groupadd %{?_with_fedora:%uid}
-%define userdel		/usr/sbin/%{?_with_fedora:fedora-}userdel
-%define groupdel	/usr/sbin/%{?_with_fedora:fedora-}groupdel
+%global uid		1
+%global useradd		/usr/sbin/%{?_with_fedora:fedora-}useradd  %{?_with_fedora:%uid }
+%global groupadd	/usr/sbin/%{?_with_fedora:fedora-}groupadd %{?_with_fedora:%uid}
+%global userdel		/usr/sbin/%{?_with_fedora:fedora-}userdel
+%global groupdel	/usr/sbin/%{?_with_fedora:fedora-}groupdel
 
 %{!?username:%global username	ip-sentinel}
-%define service		ip-sentinel
-%define homedir		%_var/lib/ip-sentinel
-%define minitdir	%_sysconfdir/minit
-%define minitsvcdir	%minitdir/services/%name
+%global service		ip-sentinel
+%global homedir		%_var/lib/ip-sentinel
+%global minitdir	%_sysconfdir/minit
+%global minitsvcdir	%minitdir/services/%name
 
 
-%{!?release_func:%global release_func() %1}
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	Tool to prevent unauthorized usage of IP addresses
 Name:		ip-sentinel
-Version:	0.11
+Version:	0.12
 Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Daemons
-URL:		http://www.tu-chemnitz.de/~ensc/ip-sentinel
-Source0:	http://www.tu-chemnitz.de/~ensc/ip-sentinel/files/%name-%version.tar.bz2
-Source1:	http://www.tu-chemnitz.de/~ensc/ip-sentinel/files/%name-%version.tar.bz2.asc
+URL:		http://www.nongnu.org/ip-sentinel/
+Source0:	http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2
+Source1:	http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2.sig
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
-Requires:	init(ip-sentinel)
+Requires:		init(ip-sentinel)
 
 %{!?_without_dietlibc:BuildRequires:	dietlibc}
 
@@ -81,7 +81,7 @@
 Summary:		minit initscripts for ip-sentinel
 Group:			System Environment/Base
 Provides:		init(ip-sentinel)
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(pre):		minit-setup
 Requires(postun):	minit-setup
 
@@ -111,23 +111,17 @@
 with the minit initconcept.
 
 
-
-
 %prep
 %setup -q
 
 
-
-
 %build
 %configure --enable-release \
-           --with-initrddir=%{_initrddir} \
-           --with-username=%username %{?_without_dietlibc:--disable-dietlibc}
+	   --with-initrddir=%_initrddir \
+	   --with-username=%username %{?_without_dietlibc:--disable-dietlibc}
 %__make %{?_smp_mflags} all
 
 
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -137,20 +131,14 @@
 %{?_without_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 
 
-
-
 %check
 %__make check
 
 
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-
-
 %pre
 %groupadd -r %username &>/dev/null || :
 %useradd  -r -s /sbin/nologin -M -d %homedir		\
@@ -176,7 +164,6 @@
 test "$1" = 0 || %_initrddir/%service condrestart &>/dev/null
 
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS
@@ -204,6 +191,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.12-1
+- updated to 0.12
+
 * Thu Aug 19 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.10.2-0
 - added support for 'fedora-usermgmt' (enabled with '--with fedora' switch)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Feb 2005 23:21:16 -0000	1.2
+++ .cvsignore	29 Mar 2005 22:27:39 -0000	1.3
@@ -1 +1,2 @@
 ip-sentinel*.tar.bz2*
+ip-sentinel*.tar.bz2.asc



From fedora-extras-commits at redhat.com  Tue Mar 29 22:29:13 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 29 Mar 2005 17:29:13 -0500
Subject: rpms/ip-sentinel/devel .cvsignore,1.3,1.4
Message-ID: <200503292229.j2TMTDUs023776@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23767/devel

Modified Files:
	.cvsignore 
Log Message:
added *.sig



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Mar 2005 22:27:39 -0000	1.3
+++ .cvsignore	29 Mar 2005 22:29:11 -0000	1.4
@@ -1,2 +1,3 @@
 ip-sentinel*.tar.bz2*
 ip-sentinel*.tar.bz2.asc
+ip-sentinel*.tar.bz2.sig



From fedora-extras-commits at redhat.com  Tue Mar 29 23:52:50 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 29 Mar 2005 18:52:50 -0500
Subject: rpms/clamav/devel clamav.spec,1.10,1.11
Message-ID: <200503292352.j2TNqoJx024807@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24801/devel

Modified Files:
	clamav.spec 
Log Message:
use %global instead of %define



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- clamav.spec	3 Mar 2005 21:23:41 -0000	1.10
+++ clamav.spec	29 Mar 2005 23:52:48 -0000	1.11
@@ -8,16 +8,16 @@
 ##
 
 
-%define username	clamav
-%define homedir		%_var/lib/clamav
-%define freshclamlog	%_var/log/freshclam.log
-%define milterlog	%_var/log/clamd.milter
-%define milteruser	clamilt
-%define milterstatedir	%_var/run/clamav-milter
-%define pkgdatadir	%_datadir/%name
+%global username	clamav
+%global homedir		%_var/lib/clamav
+%global freshclamlog	%_var/log/freshclam.log
+%global milterlog	%_var/log/clamd.milter
+%global milteruser	clamilt
+%global milterstatedir	%_var/run/clamav-milter
+%global pkgdatadir	%_datadir/%name
 
 
-%{!?release_func:%define release_func() %1}
+%{!?release_func:%global release_func() %1}
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav



From fedora-extras-commits at redhat.com  Wed Mar 30 09:56:45 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 30 Mar 2005 04:56:45 -0500
Subject: rpms/xca/FC-3 xca-0.5.1-langinst.patch, NONE,
	1.1 xca-0.5.1-gcc4.patch, NONE, 1.1 xca-0.5.1-db43.patch, NONE,
	1.1 xca.spec, 1.4, 1.5 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3
Message-ID: <200503300956.j2U9ujjq004002@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3996

Modified Files:
	xca.spec sources .cvsignore 
Added Files:
	xca-0.5.1-langinst.patch xca-0.5.1-gcc4.patch 
	xca-0.5.1-db43.patch 
Log Message:
copied from devel branch


xca-0.5.1-langinst.patch:

--- NEW FILE xca-0.5.1-langinst.patch ---
--- lang/Makefile~	2004-02-18 19:29:50.000000000 +0200
+++ lang/Makefile	2004-08-27 20:09:02.910204474 +0300
@@ -3,7 +3,7 @@
 
 install:
 	install -m 755 -d $(destdir)$(prefix)/share/xca
-	install -m 644 lang/xca_??.qm $(destdir)$(prefix)/share/xca || true
+	install -m 644 xca_??.qm $(destdir)$(prefix)/share/xca || true
 
 include $(TOPDIR)/Local.mak
 

xca-0.5.1-gcc4.patch:

--- NEW FILE xca-0.5.1-gcc4.patch ---
===================================================================
RCS file: /cvsroot/xca/xca/widgets/clicklabel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xca/xca/widgets/clicklabel.cpp	2003/11/26 22:03:18	1.3
+++ xca/xca/widgets/clicklabel.cpp	2005/02/07 21:56:27	1.4
@@ -45,7 +45,7 @@
  * http://www.hohnstaedt.de/xca
  * email: christian at hohnstaedt.de
  *
- * $Id: clicklabel.cpp,v 1.3 2003/11/26 22:03:18 chris2511 Exp $ 
+ * $Id: clicklabel.cpp,v 1.4 2005/02/07 21:56:27 chris2511 Exp $ 
  *
  */                           
 
@@ -58,9 +58,9 @@
 ClickLabel::ClickLabel( QWidget* parent,  const char* name, WFlags f )
 	:QLabel( parent, name, f )
 {
-	QFont font( font() );
-	font.setBold(true);
-	setFont( font );
+	QFont fnt( font() );
+	fnt.setBold(true);
+	setFont( fnt );
 	setFrameShape( QLabel::Panel );
 	setFrameShadow( QLabel::Sunken );
 	setAlignment( int( QLabel::AlignCenter ) );

xca-0.5.1-db43.patch:

--- NEW FILE xca-0.5.1-db43.patch ---
--- xca-0.5.1/widgets/MainWindow.h.db43	2004-04-15 01:36:56.000000000 +0200
+++ xca-0.5.1/widgets/MainWindow.h	2005-03-08 17:36:26.000000000 +0100
@@ -105,6 +105,10 @@ class MainWindow: public MainWindow_UI
 	static int passRead(char *buf, int size, int rwflag, void *userdata);
 	static int passWrite(char *buf, int size, int rwflag, void *userdata);
 	static void dberr(const char *errpfx, char *msg);
+	static void dberr(DbEnv const *, const char *errpfx, char const *msg)
+	{
+	  dberr(errpfx, const_cast<char *>(msg));
+	}
 	static NewX509 *newX509();
 	static QString md5passwd(const char *pass);
 	static void Error(errorEx &err);


Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/FC-3/xca.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xca.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ xca.spec	30 Mar 2005 09:56:43 -0000	1.5
@@ -1,24 +1,24 @@
-## For RHL7.3 compile with '--without desktop' flag
+## $Id$
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
-Version:	0.4.6
-Release:	1
-Epoch:		0
+Version:	0.5.1
+Release:	%release_func 0
 License:	BSD
 Group:		Applications/Productivity
 URL:		http://www.hohnstaedt.de/xca.html
-Source0:	http://download.sourceforge.net/sourceforge/xca/%{name}-%{version}.tar.gz
-Source1:	http://www.hohnstaedt.de/xca/cxx_common.h
-Source2:	http://www.hohnstaedt.de/xca/cxx_except.h
-# http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/MainWindow.cpp?r1=1.33&r2=1.34&diff_format=u
-Patch0:		xca-0.4.6-gcc3.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source0:	http://download.sourceforge.net/sourceforge/xca/%name-%version.tar.gz
+Patch0:		%name-0.5.1-langinst.patch
+# http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/clicklabel.cpp?r1=1.3&r2=1.4&diff_format=u
+Patch1:		%name-0.5.1-gcc4.patch
+Patch2:		%name-0.5.1-db43.patch
+BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt-devel openssl-devel
 BuildRequires:	/usr/include/db.h
-%if 0%{!?_without_desktop:1}
 BuildRequires:	desktop-file-utils
-%endif
+
 
 %description
 The Program uses a Berkeley db for storage and supports RSA keys.
@@ -28,73 +28,66 @@
 can be imported and exported in several formats like PKCS#7, PKCS#12,
 PEM, DER, PKCS#8.
 
-#-----------------------
 
 %prep
 %setup -q
-%patch0 -p2 -b .gcc3
+%patch0 -p0 -b .langinst
+%patch1 -p2 -b .gcc4
+%patch2 -p1 -b .db43
 
-#-----------------------
-
-%build
-test -n "$QTDIR" || . %{_sysconfdir}/profile.d/qt.sh
+sed -i 's! db_cxx-4 ! db_cxx-4 db_cxx-4.3 !g' configure
 
-db_inc=/usr/include/db
-rpm -q db3-devel && db_inc=/usr/include/db3 || :
-rpm -q db4-devel && db_inc=/usr/include/db4 || :
-
-## Hacky workaround for broken db[34]-devel package:
-## https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=59759
-echo '#include "db_cxx.h"' | g++ -x c++ -E -I $db_inc - &>/dev/null || {
-	cp -a %{SOURCE1} %{SOURCE2} .
-	export CPPFLAGS="-I`pwd`"
-}
 
+%build
+test -n "$QTDIR" || . %_sysconfdir/profile.d/qt.sh
 CC='%__cc' LD='%__ld' CFLAGS="$RPM_OPT_FLAGS" STRIP=: prefix=%_prefix \
 ./configure
-%__make
+%__make %{?_smp_mflags}
+lrelease xca.pro
 
-#-----------------------
 
 %install
-rm -rf "$RPM_BUILD_ROOT" _doc
-%{__make} destdir="$RPM_BUILD_ROOT" install
+rm -rf "$RPM_BUILD_ROOT"
+%__make destdir="$RPM_BUILD_ROOT" mandir=share/man install
 
-%{__install} -d -m755 _doc/html $RPM_BUILD_ROOT%{_datadir}/applications
-%{__install} -p -m644 doc/*.html _doc/html/
+%__install -d -m755 $RPM_BUILD_ROOT%_datadir/applications
 
-%if 0%{!?_without_desktop:1}
 desktop-file-install --vendor fedora -m644 --delete-original	\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
+  --dir $RPM_BUILD_ROOT%_datadir/applications			\
   --add-category X-Fedora					\
-  $RPM_BUILD_ROOT%{_datadir}/applications/xca.desktop
-%endif
+  $RPM_BUILD_ROOT%_datadir/applications/xca.desktop
 
-#-----------------------
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
-#-----------------------
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYRIGHT _doc/html
+%doc AUTHORS COPYRIGHT
 %doc debian/changelog
-%{_bindir}/*
+%_bindir/*
+%_mandir/*/*
 %dir %{_datadir}/xca
-%{_datadir}/xca/*.png
-%{_datadir}/pixmaps/*.xpm
-%lang(de) %{_datadir}/xca/xca_de.qm
-%lang(es) %{_datadir}/xca/xca_es.qm
-
-%if 0%{!?_without_desktop:1}
-%{_datadir}/applications/*
-%endif
+%_datadir/xca/*.png
+%_datadir/xca/*.txt
+%_datadir/xca/*.html
+%_datadir/pixmaps/*.xpm
+%lang(de) %_datadir/xca/xca_de.qm
+%lang(es) %_datadir/xca/xca_es.qm
+
+%_datadir/applications/*
 
-#-----------------------
 
 %changelog
+* Tue Mar  8 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.1
+- updated to 0.5.1
+- (re)enabled parallel build
+- applied -langinst patch and other ideas from
+  https://bugzilla.fedora.us/show_bug.cgi?id=2019 (Ville Skytt??)
+- fixed build with gcc4 and db43
+- removed old cruft from the specfile
+
 * Sat Dec 13 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.4.6-0.fdr.1
 - changed compile/install commands to work with the new, yet-another configure system
 - removed libpthread test since it went upstream
@@ -104,7 +97,7 @@
 - removed desktop patch which went upstream
 
 * Fri Aug 15 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:0.4.5-0.fdr.2
-- applied Ville Skytt??'s patch to add categories and to fix encoding of desktop-file 
+- applied Ville Skytt??'s patch to add categories and to fix encoding of desktop-file
   (http://sourceforge.net/tracker/index.php?func=detail&aid=789374&group_id=62274&atid=500027)
 - removed '--add-category ...' options which become obsoleted by this
   patch
@@ -150,5 +143,5 @@
 - added dbpriv patch
 - added desktop entry
 
-* Fri Jun  6 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 
+* Fri Jun  6 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xca/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:33:36 -0000	1.2
+++ sources	30 Mar 2005 09:56:43 -0000	1.3
@@ -1 +1 @@
-3defe69788b9e0eb738f374143be6e12  xca-0.4.6.tar.gz
+24e0289c189b8db2f1f15a4ddac1b1c3  xca-0.5.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xca/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:33:36 -0000	1.2
+++ .cvsignore	30 Mar 2005 09:56:43 -0000	1.3
@@ -1 +1,3 @@
-xca-0.4.6.tar.gz
+xca-*.tar.gz
+xca-*.*.rpm
+i386



From fedora-extras-commits at redhat.com  Wed Mar 30 10:00:23 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 30 Mar 2005 05:00:23 -0500
Subject: rpms/xca/FC-3 cxx_common.h, 1.1, NONE cxx_except.h, 1.1,
	NONE xca-0.4.6-gcc3.patch, 1.1, NONE
Message-ID: <200503301000.j2UA0NwF004070@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4064

Removed Files:
	cxx_common.h cxx_except.h xca-0.4.6-gcc3.patch 
Log Message:
copied from devel branch


--- cxx_common.h DELETED ---


--- cxx_except.h DELETED ---


--- xca-0.4.6-gcc3.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar 30 10:29:52 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Wed, 30 Mar 2005 05:29:52 -0500
Subject: rpms/pybliographer/devel pybliographer.spec,1.7,1.8
Message-ID: <200503301029.j2UATqAZ005052@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5046

Modified Files:
	pybliographer.spec 
Log Message:
update for rebuild


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pybliographer.spec	25 Mar 2005 22:49:04 -0000	1.7
+++ pybliographer.spec	30 Mar 2005 10:29:50 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
 Version: 1.2.6.2
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.6.2.tar.gz
@@ -155,6 +155,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.6.2-3
+- rebuild
+
 * Fri Mar 25 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.6.2-2
 - add patch for gnome help display
 - update gnome-python2 requirements



From fedora-extras-commits at redhat.com  Wed Mar 30 10:45:15 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 30 Mar 2005 05:45:15 -0500
Subject: rpms/python-dialog/devel python-dialog.spec,1.4,1.5
Message-ID: <200503301045.j2UAjFaf005145@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/python-dialog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5138

Modified Files:
	python-dialog.spec 
Log Message:
- change release tag for FC4



Index: python-dialog.spec
===================================================================
RCS file: /cvs/extras/rpms/python-dialog/devel/python-dialog.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-dialog.spec	3 Mar 2005 23:53:13 -0000	1.4
+++ python-dialog.spec	30 Mar 2005 10:45:13 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:           python-dialog
 Version:        2.7
-Release:        1
+Release:        1.fc4
 Summary:        Python interface to the Unix dialog utility
 
 Group:          Development/Languages
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Wed Mar 30 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7-1.fc4
+- change release tag for FC4
+- drop Epoch
+
 * Thu Feb 10 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.7-1
 - update to version 2.7
 - update URL



From fedora-extras-commits at redhat.com  Wed Mar 30 11:25:18 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 30 Mar 2005 06:25:18 -0500
Subject: devel/putty putty.spec,1.8,1.9
Message-ID: <200503301125.j2UBPIvW006093@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/putty
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6087

Modified Files:
	putty.spec 
Log Message:
fix build with gcc4



Index: putty.spec
===================================================================
RCS file: /cvs/extras/devel/putty/putty.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- putty.spec	3 Mar 2005 23:53:13 -0000	1.8
+++ putty.spec	30 Mar 2005 11:25:16 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		putty
 Version:	0.57
-Release:	1
+Release:	2
 Summary:	SSH, Telnet and Rlogin client
 License:	MIT
 Group:		Applications/Internet
@@ -23,7 +23,9 @@
 %build
 ./mkfiles.pl
 pushd unix
-perl -pi -e "s,-O2,$RPM_OPT_FLAGS,g;s,/usr/local,%{_prefix},g" Makefile.gtk
+%{__sed} -i -e "s/-O2 -Wall -Werror/$RPM_OPT_FLAGS/g" \
+            -e "s,/usr/local,%{_prefix},g" \
+            Makefile.gtk
 ln -s Makefile.gtk Makefile
 make %{?_smp_mflags}
 popd
@@ -62,6 +64,9 @@
 
 
 %changelog
+* Tue Feb 29 2005 Adrian Reber <adrian at lisas.de> - 0.57-2
+- fix build with gcc4
+
 * Mon Feb 21 2005 Adrian Reber <adrian at lisas.de> - 0.57-1
 - Updated to 0.57
 



From fedora-extras-commits at redhat.com  Wed Mar 30 12:22:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 30 Mar 2005 07:22:55 -0500
Subject: rpms/easytag/FC-3 .cvsignore, 1.2, 1.3 easytag.spec, 1.6,
	1.7 sources, 1.2, 1.3 easytag-0.30.2-desktop.patch, 1.1, NONE
Message-ID: <200503301222.j2UCMtUv007161@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/easytag/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7155

Modified Files:
	.cvsignore easytag.spec sources 
Removed Files:
	easytag-0.30.2-desktop.patch 
Log Message:
Update to 1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/easytag/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:15:14 -0000	1.2
+++ .cvsignore	30 Mar 2005 12:22:53 -0000	1.3
@@ -1 +1 @@
-easytag-0.31.tar.bz2
+easytag-1.0.tar.bz2


Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/FC-3/easytag.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- easytag.spec	10 Dec 2004 20:20:47 -0000	1.6
+++ easytag.spec	30 Mar 2005 12:22:53 -0000	1.7
@@ -1,18 +1,14 @@
-Name:           easytag
-Version:        0.31
-Release:        1
-Summary:        Tag editor for MP3, MP2, FLAC and OGG files
-
-Group:          Applications/Multimedia
-License:        GPL
-URL:            http://easytag.sourceforge.net/
-Source0:        http://dl.sf.net/easytag/easytag-%{version}.tar.bz2
-Patch0:         easytag-0.30.2-desktop.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gtk+-devel, id3lib-devel >= 0:3.7.12
-BuildRequires:  libvorbis-devel >= 0:1.0, flac-devel, gettext
-BuildRequires:  desktop-file-utils
+Summary: Tag editor for mp3, ogg, flac and other music files
+Name: easytag
+Version: 1.0
+Release: 2
+License: GPL
+Group: Applications/Multimedia
+URL: http://easytag.sourceforge.net/
+Source: http://dl.sf.net/easytag/easytag-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: gtk+-devel >= 1.2.7, id3lib-devel >= 3.7.12
+BuildRequires: libvorbis-devel >= 1.0, flac-devel, gettext
 
 %description
 EasyTAG is a utility for viewing, editing and writing the tags of MP3,
@@ -21,43 +17,38 @@
 
 %prep
 %setup -q
-%patch -p2
 
 
 %build
 %configure
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 %makeinstall
 %find_lang %{name}
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --add-category Application \
-  --add-category AudioVideo \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
+%defattr(-, root, root, 0755)
 %doc COPYING ChangeLog README TODO THANKS USERS-GUIDE
 %{_bindir}/easytag
-%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/easytag
+%{_datadir}/applications/easytag.desktop
+%{_datadir}/easytag/
 %{_datadir}/pixmaps/*
-%{_mandir}/man[^3]/*
+%{_mandir}/man?/*
 
 
 %changelog
+* Wed Mar 30 2005 Matthias Saou <http://freshrpms.net/> 1.0-2
+- Update again to 1.0.
+- Remove desktop file patch, the original is now UTF-8.
+
 * Fri Dec 10 2004 Michael Schwendt <mschwendt[AT]users.sf.et> - 0.31-1
 - Downgrade version again until somebody really updates the
   entire package contents.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/easytag/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:15:14 -0000	1.2
+++ sources	30 Mar 2005 12:22:53 -0000	1.3
@@ -1 +1 @@
-9cfb29a81f251891ec4dbae4cd39821d  easytag-0.31.tar.bz2
+2edda10af47a52c7f74c77fa0b45cd38  easytag-1.0.tar.bz2


--- easytag-0.30.2-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar 30 12:24:12 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 30 Mar 2005 07:24:12 -0500
Subject: rpms/easytag/devel .cvsignore, 1.2, 1.3 easytag.spec, 1.7,
	1.8 sources, 1.2, 1.3 easytag-0.30.2-desktop.patch, 1.1, NONE
Message-ID: <200503301224.j2UCOCeC007212@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/easytag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7205

Modified Files:
	.cvsignore easytag.spec sources 
Removed Files:
	easytag-0.30.2-desktop.patch 
Log Message:
Update to 1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:15:14 -0000	1.2
+++ .cvsignore	30 Mar 2005 12:24:10 -0000	1.3
@@ -1 +1 @@
-easytag-0.31.tar.bz2
+easytag-1.0.tar.bz2


Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/easytag.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- easytag.spec	5 Mar 2005 21:10:21 -0000	1.7
+++ easytag.spec	30 Mar 2005 12:24:10 -0000	1.8
@@ -1,18 +1,14 @@
-Name:           easytag
-Version:        0.31
-Release:        1
-Summary:        Tag editor for MP3, MP2, FLAC and OGG files
-
-Group:          Applications/Multimedia
-License:        GPL
-URL:            http://easytag.sourceforge.net/
-Source0:        http://dl.sf.net/easytag/easytag-%{version}.tar.bz2
-Patch0:         easytag-0.30.2-desktop.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gtk+-devel, id3lib-devel >= 3.7.12
-BuildRequires:  libvorbis-devel >= 1.0, flac-devel, gettext
-BuildRequires:  desktop-file-utils
+Summary: Tag editor for mp3, ogg, flac and other music files
+Name: easytag
+Version: 1.0
+Release: 3
+License: GPL
+Group: Applications/Multimedia
+URL: http://easytag.sourceforge.net/
+Source: http://dl.sf.net/easytag/easytag-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: gtk+-devel >= 1.2.7, id3lib-devel >= 3.7.12
+BuildRequires: libvorbis-devel >= 1.0, flac-devel, gettext
 
 %description
 EasyTAG is a utility for viewing, editing and writing the tags of MP3,
@@ -21,43 +17,38 @@
 
 %prep
 %setup -q
-%patch -p2
 
 
 %build
 %configure
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 %makeinstall
 %find_lang %{name}
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --add-category Application \
-  --add-category AudioVideo \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
+%defattr(-, root, root, 0755)
 %doc COPYING ChangeLog README TODO THANKS USERS-GUIDE
 %{_bindir}/easytag
-%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/easytag
+%{_datadir}/applications/easytag.desktop
+%{_datadir}/easytag/
 %{_datadir}/pixmaps/*
-%{_mandir}/man[^3]/*
+%{_mandir}/man?/*
 
 
 %changelog
+* Wed Mar 30 2005 Matthias Saou <http://freshrpms.net/> 1.0-3
+- Update again to 1.0.
+- Remove desktop file patch, the original is now UTF-8.
+
 * Fri Dec 10 2004 Michael Schwendt <mschwendt[AT]users.sf.et> - 0.31-1
 - Downgrade version again until somebody really updates the
   entire package contents.
@@ -87,7 +78,7 @@
 - Updated to 0.28.
 
 * Sat May 24 2003 Marius J??hndal <mariuslj at ifi.uio.no> 0:0.27-0.fdr.3.a
-- Removed version from BuildRequires: gtk+-devel (RH 7.0 and newer ship with
+- Removed version from BuildRequires: gtk+-devel (RH 7.0 and newer ship with 
   gtk+-devel >= 1.2.8).
 
 * Mon May 19 2003 Marius J??hndal <mariuslj at ifi.uio.no> 0:0.27-0.fdr.2.a


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:15:14 -0000	1.2
+++ sources	30 Mar 2005 12:24:10 -0000	1.3
@@ -1 +1 @@
-9cfb29a81f251891ec4dbae4cd39821d  easytag-0.31.tar.bz2
+2edda10af47a52c7f74c77fa0b45cd38  easytag-1.0.tar.bz2


--- easytag-0.30.2-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar 30 14:30:38 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 30 Mar 2005 09:30:38 -0500
Subject: rpms/htmltmpl/devel htmltmpl.spec,1.8,1.9
Message-ID: <200503301430.j2UEUcUH009470@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/htmltmpl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9460/htmltmpl/devel

Modified Files:
	htmltmpl.spec 
Log Message:
Rebuild with Python 2.4.


Index: htmltmpl.spec
===================================================================
RCS file: /cvs/extras/rpms/htmltmpl/devel/htmltmpl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- htmltmpl.spec	3 Mar 2005 21:46:21 -0000	1.8
+++ htmltmpl.spec	30 Mar 2005 14:30:36 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           htmltmpl
 Version:        1.22
-Release:        5
+Release:        6
 Summary:        Templating engine for separation of code and HTML
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.22-6
+- Rebuild with Python 2.4.
+
 * Thu Dec 16 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.22-5
 - Sync with Python spec template from fedora-rpmdevtools.
 



From fedora-extras-commits at redhat.com  Wed Mar 30 14:30:39 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 30 Mar 2005 09:30:39 -0500
Subject: rpms/id3-py/devel id3-py.spec,1.7,1.8
Message-ID: <200503301430.j2UEUdoD009473@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/id3-py/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9460/id3-py/devel

Modified Files:
	id3-py.spec 
Log Message:
Rebuild with Python 2.4.


Index: id3-py.spec
===================================================================
RCS file: /cvs/extras/rpms/id3-py/devel/id3-py.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- id3-py.spec	3 Mar 2005 21:46:21 -0000	1.7
+++ id3-py.spec	30 Mar 2005 14:30:36 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           id3-py
 Version:        1.2
-Release:        6
+Release:        7
 Summary:        Python ID3 tag library
 
 Group:          Development/Libraries
@@ -10,8 +10,8 @@
 URL:            http://id3-py.sourceforge.net/
 Source0:        http://download.sourceforge.net/id3-py/id3-py_1.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
+BuildArch:      noarch
 BuildRequires:  python-devel
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.2-7
+- Rebuild with Python 2.4.
+
 * Thu Dec 16 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2-6
 - Sync with Python spec template from fedora-rpmdevtools.
 - Improve description.



From fedora-extras-commits at redhat.com  Wed Mar 30 14:32:45 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 30 Mar 2005 09:32:45 -0500
Subject: devel/most most.spec,1.5,1.6
Message-ID: <200503301432.j2UEWj7d009526@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/most
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9520

Modified Files:
	most.spec 
Log Message:
fix build on ppc/ppc64



Index: most.spec
===================================================================
RCS file: /cvs/extras/devel/most/most.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- most.spec	3 Mar 2005 23:01:24 -0000	1.5
+++ most.spec	30 Mar 2005 14:32:43 -0000	1.6
@@ -1,9 +1,7 @@
-# $Id$
-
 Summary:	more, less, most
 Name:		most
 Version:	4.9.5
-Release:	3
+Release:	4
 License:	GPL
 URL:		ftp://space.mit.edu/pub/davis/most/
 Group:		Applications/Text
@@ -22,7 +20,7 @@
 
 %build
 sed -i 's!s\%@RPATH@\%.*!s\%@RPATH@\%\%g!' configure
-%ifarch x86_64
+%ifarch x86_64 ppc ppc64
 sed -i 's|/usr/lib|%{_libdir}|g' configure
 %endif
 chmod +x configure
@@ -45,6 +43,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Adrian Reber <adrian at lisas.de> - 4.9.5-4
+- fix build on ppc/ppc64
+
 * Sat Feb 12 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 4.9.5-3
 - sed -i 's|/usr/lib|%%{_libdir}|g' configure fixes x86_64 build;
 



From fedora-extras-commits at redhat.com  Wed Mar 30 15:01:08 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 30 Mar 2005 10:01:08 -0500
Subject: rpms/bzflag/devel bzflag.spec,1.6,1.7
Message-ID: <200503301501.j2UF18v5010326@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10319

Modified Files:
	bzflag.spec 
Log Message:
work around missing dependency in xorg-x11-devel



Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bzflag.spec	23 Mar 2005 15:52:40 -0000	1.6
+++ bzflag.spec	30 Mar 2005 15:01:06 -0000	1.7
@@ -12,6 +12,8 @@
 Source1: bzflag.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: xorg-x11-devel
+# work around missing dependency in xorg-x11-devel:
+BuildRequires: libGL.so.1 libGLU.so.1
 BuildRequires: gcc-c++
 BuildRequires: desktop-file-utils
 BuildRequires: SDL-devel
@@ -66,6 +68,9 @@
 
 %changelog
 * Wed Mar 23 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.2-1
+- work around missing dependency in xorg-x11-devel
+
+* Wed Mar 23 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 2.0.2
 
 * Tue Mar 15 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-4



From fedora-extras-commits at redhat.com  Wed Mar 30 15:11:22 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:11:22 -0500
Subject: rpms/python-elementtree - New directory
Message-ID: <200503301511.j2UFBMY1010735@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-elementtree
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10728/python-elementtree

Log Message:
Directory /cvs/extras/rpms/python-elementtree added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 30 15:11:22 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:11:22 -0500
Subject: rpms/python-elementtree/devel - New directory
Message-ID: <200503301511.j2UFBMrX010738@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-elementtree/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10728/python-elementtree/devel

Log Message:
Directory /cvs/extras/rpms/python-elementtree/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 30 15:11:36 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:11:36 -0500
Subject: rpms/python-elementtree Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503301511.j2UFBa8o010800@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-elementtree
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10791

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-elementtree


--- NEW FILE Makefile ---
# Top level Makefile for module python-elementtree
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 30 15:11:36 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:11:36 -0500
Subject: rpms/python-elementtree/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503301511.j2UFBa1A010803@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-elementtree/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10791/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-elementtree


--- 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 Mar 30 15:12:00 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:12:00 -0500
Subject: rpms/python-elementtree import.log,1.1,1.2
Message-ID: <200503301512.j2UFC0oJ010911@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-elementtree
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10902

Modified Files:
	import.log 
Log Message:
auto-import python-elementtree-1.2.6-3 on branch devel from python-elementtree-1.2.6-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-elementtree/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Mar 2005 15:11:34 -0000	1.1
+++ import.log	30 Mar 2005 15:11:58 -0000	1.2
@@ -0,0 +1 @@
+python-elementtree-1_2_6-3:HEAD:python-elementtree-1.2.6-3.src.rpm:1112195689



From fedora-extras-commits at redhat.com  Wed Mar 30 15:12:00 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:12:00 -0500
Subject: rpms/python-elementtree/devel cElementTree-system-expat-setup.py,
	NONE, 1.1 python-elementtree.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503301512.j2UFC093010915@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-elementtree/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10902/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cElementTree-system-expat-setup.py python-elementtree.spec 
Log Message:
auto-import python-elementtree-1.2.6-3 on branch devel from python-elementtree-1.2.6-3.src.rpm


--- NEW FILE cElementTree-system-expat-setup.py ---
#!/usr/bin/env python
#
# Setup script for the cElementTree accelerator
# $Id: setup.py 2294 2005-02-13 12:09:00Z fredrik $
#
# Usage: python setup.py install
#

from distutils.core import setup, Extension
from distutils import sysconfig

# --------------------------------------------------------------------
# identification

NAME = "cElementTree"
VERSION = "1.0.2-20050302"
DESCRIPTION = "A fast C implementation of the ElementTree API."
AUTHOR = "Fredrik Lundh", "fredrik at pythonware.com"
HOMEPAGE = "http://www.effbot.org/zone/celementtree.htm"
DOWNLOAD = "http://effbot.org/downloads#celementtree"

# --------------------------------------------------------------------
# distutils declarations

celementtree_module = Extension(
    "cElementTree", ["cElementTree.c"],
    include_dirs=['/usr/include'],
    libraries=['expat']
    )

try:
    # add classifiers and download_url syntax to distutils
    from distutils.dist import DistributionMetadata
    DistributionMetadata.classifiers = None
    DistributionMetadata.download_url = None
except:
    pass

setup(
    author=AUTHOR[0],
    author_email=AUTHOR[1],
    classifiers=[
        "Development Status :: 5 - Production/Stable",
        "Operating System :: OS Independent",
        "Topic :: Text Processing :: Markup :: XML",
        ],
    description=DESCRIPTION,
    download_url=DOWNLOAD,
    ext_modules = [celementtree_module],
    license="Python (MIT style)",
    long_description=DESCRIPTION,
    name=NAME,
    platforms="Python 2.1 and later.",
    url=HOMEPAGE,
    version=VERSION,
    )


--- NEW FILE python-elementtree.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)")}

%define     _upstream_nvr   elementtree-1.2.6-20050316
%define     _upstream_cnvr  cElementTree-1.0.2-20050302    

Name:           python-elementtree
Version:        1.2.6
Release:        3
Summary:        Fast XML parser and writer

Group:          Development/Libraries
License:        PSF
URL:            http://effbot.org/zone/element-index.htm
Source0:        http://effbot.org/downloads/%{_upstream_nvr}.zip
Source1:        http://effbot.org/downloads/%{_upstream_cnvr}.zip
Source2:        cElementTree-system-expat-setup.py
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

BuildRequires:  expat-devel, python-devel
Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
The Element type is a simple but flexible container object, designed
to store hierarchical data structures, such as simplified XML
infosets, in memory. The element type can be described as a cross
between a Python list and a Python dictionary.

This package also includes the C implementation, %{_upstream_cnvr}.

%prep
%setup -q -n %{_upstream_nvr}
## Take care of cElementTree
%{__unzip} %{SOURCE1}
pushd %{_upstream_cnvr}
mv -f setup.py setup.py-orig
cp -f %{SOURCE2} setup.py
cp -f README ../README-cElementTree
cp -f CHANGES ../CHANGES-cElementTree
popd


%build
%{__python} setup.py build
pushd %{_upstream_cnvr}
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
popd


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
pushd %{_upstream_cnvr}
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs samples README* CHANGES* benchmark.py
%dir %{python_sitelib}/elementtree
%{python_sitelib}/elementtree/*.py
%{python_sitelib}/elementtree/*.pyc
%ghost %{python_sitelib}/elementtree/*.pyo
%{python_sitearch}/*.so

%changelog
* Tue Mar 30 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 1.2.6-3
- Use python_sitearch for the C library.

* Tue Mar 29 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 1.2.6-2
- Use python_sitelib
- Own the elementtree dir in site-packages
- BuildRequire python-devel
- Do not namely require expat
- Do not use INSTALLED_FILES (safer)
- Use ghosting for .pyo

* Thu Mar 17 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 1.2.6-1
- Version 1.2.6 of ElementTree.

* Thu Mar 10 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 1.2.5-1
- Rename as python-elementtree.

* Sat Mar  5 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 1.2.5-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-elementtree/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Mar 2005 15:11:34 -0000	1.1
+++ .cvsignore	30 Mar 2005 15:11:58 -0000	1.2
@@ -0,0 +1,2 @@
+cElementTree-1.0.2-20050302.zip
+elementtree-1.2.6-20050316.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-elementtree/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Mar 2005 15:11:34 -0000	1.1
+++ sources	30 Mar 2005 15:11:58 -0000	1.2
@@ -0,0 +1,2 @@
+aba87db5932ac46fd7a75cfbc711f6ba  cElementTree-1.0.2-20050302.zip
+6751a9005efbd2c543ef32905d4a0acd  elementtree-1.2.6-20050316.zip



From fedora-extras-commits at redhat.com  Wed Mar 30 15:15:12 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:15:12 -0500
Subject: rpms/python-kid - New directory
Message-ID: <200503301515.j2UFFC6C011061@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11054/python-kid

Log Message:
Directory /cvs/extras/rpms/python-kid added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 30 15:15:12 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:15:12 -0500
Subject: rpms/python-kid/devel - New directory
Message-ID: <200503301515.j2UFFCi9011064@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11054/python-kid/devel

Log Message:
Directory /cvs/extras/rpms/python-kid/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 30 15:15:26 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:15:26 -0500
Subject: rpms/python-kid Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503301515.j2UFFQhp011126@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11117

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-kid


--- NEW FILE Makefile ---
# Top level Makefile for module python-kid
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 30 15:15:26 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:15:26 -0500
Subject: rpms/python-kid/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503301515.j2UFFQnI011129@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11117/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-kid


--- 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 Mar 30 15:15:46 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:15:46 -0500
Subject: rpms/python-kid import.log,1.1,1.2
Message-ID: <200503301515.j2UFFk0D011234@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11225

Modified Files:
	import.log 
Log Message:
auto-import python-kid-0.6.3-2 on branch devel from python-kid-0.6.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-kid/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Mar 2005 15:15:24 -0000	1.1
+++ import.log	30 Mar 2005 15:15:44 -0000	1.2
@@ -0,0 +1 @@
+python-kid-0_6_3-2:HEAD:python-kid-0.6.3-2.src.rpm:1112195916



From fedora-extras-commits at redhat.com  Wed Mar 30 15:15:46 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:15:46 -0500
Subject: rpms/python-kid/devel python-kid.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503301515.j2UFFkD2011239@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11225/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-kid.spec 
Log Message:
auto-import python-kid-0.6.3-2 on branch devel from python-kid-0.6.3-2.src.rpm


--- NEW FILE python-kid.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-kid
Version:        0.6.3
Release:        2
Summary:        Kid - A simple and pythonic XML template language

Group:          Applications/Publishing
License:        MIT
URL:            http://www.lesscode.org/projects/kid
Source0:        http://lesscode.org/dist/kid/kid-0.6.3.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch:      noarch

BuildRequires:  python-devel
Requires:       python-elementtree
Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
Kid is a simple Python based template language for generating and
transforming XML vocabularies. Templates are compiled to native Python 
byte-code and may be imported and used like normal Python modules.


%prep
%setup -q -n kid-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT/%{python_sitelib}/kid/test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING HISTORY README doc test
%dir %{python_sitelib}/kid
%{python_sitelib}/kid/*.py
%{python_sitelib}/kid/*.pyc
%ghost %{python_sitelib}/kid/*.pyo
%{_bindir}/*


%changelog
* Tue Mar 29 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 0.6.3-2
- Add docs and list files instead of using INSTALLED_FILES (safer)
- Trim description a little
- Require python-abi
- BuildRequire python-devel
- Use python_sitelib
- Remove test directory from site_packages
- Use ghosting for .pyo

* Mon Mar 14 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 0.6.3-1
- Version 0.6.3

* Thu Mar 10 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 0.6.2-1
- Initial build in Fedora Extras format.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-kid/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Mar 2005 15:15:24 -0000	1.1
+++ .cvsignore	30 Mar 2005 15:15:44 -0000	1.2
@@ -0,0 +1 @@
+kid-0.6.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-kid/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Mar 2005 15:15:24 -0000	1.1
+++ sources	30 Mar 2005 15:15:44 -0000	1.2
@@ -0,0 +1 @@
+ddc1db3b7d17372d18f095680e0992c8  kid-0.6.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 30 15:15:54 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 30 Mar 2005 10:15:54 -0500
Subject: devel/linux_logo linux_logo-gcc4.patch, NONE, 1.1 linux_logo.spec,
	1.5, 1.6
Message-ID: <200503301515.j2UFFsGc011307@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/linux_logo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11218

Modified Files:
	linux_logo.spec 
Added Files:
	linux_logo-gcc4.patch 
Log Message:
added gcc4 patch


linux_logo-gcc4.patch:

--- NEW FILE linux_logo-gcc4.patch ---
diff -ur linux_logo-4.09/linux_logo.c linux_logo-4.09.new/linux_logo.c
--- linux_logo-4.09/linux_logo.c	2004-03-17 16:01:00.000000000 -0500
+++ linux_logo-4.09.new/linux_logo.c	2029-02-21 03:21:23.569055000 -0500
@@ -106,7 +106,7 @@
       if (logo_start) {
 	 size+=strlen(temp_st);
 	 if (new_logo->logo==NULL) {
-	    (char *)new_logo->logo=strdup(temp_st);
+	    new_logo->logo=(char **)strdup(temp_st);
 	 }
 	 else {
 	    new_logo->logo=realloc(new_logo->logo,size+1);
@@ -117,7 +117,7 @@
       if (ascii_logo_start) {
          ascii_size+=strlen(temp_st);
 	 if (new_logo->ascii_logo==NULL) {
-	    (char *)new_logo->ascii_logo=strdup(temp_st);
+	    new_logo->ascii_logo=(char **)strdup(temp_st);
 	 }
 	 else {
 	    new_logo->ascii_logo=realloc(new_logo->ascii_logo,ascii_size+1);
diff -ur linux_logo-4.09/parse_logos.c linux_logo-4.09.new/parse_logos.c
--- linux_logo-4.09/parse_logos.c	2004-03-14 00:45:53.000000000 -0500
+++ linux_logo-4.09.new/parse_logos.c	2029-02-21 03:23:34.462989000 -0500
@@ -37,7 +37,7 @@
       if (logo_start) {
 	 size+=strlen(temp_st);
 	 if (new_logo->logo==NULL) {
-	    (char *)new_logo->logo=strdup(temp_st);
+	    new_logo->logo=(char **)strdup(temp_st);
 	 }
 	 else {
 	    new_logo->logo=realloc(new_logo->logo,size+1);
@@ -48,7 +48,7 @@
       if (ascii_logo_start) {
          ascii_size+=strlen(temp_st);
 	 if (new_logo->ascii_logo==NULL) {
-	    (char *)new_logo->ascii_logo=strdup(temp_st);
+	    new_logo->ascii_logo=(char **)strdup(temp_st);
 	 }
 	 else {
 	    new_logo->ascii_logo=realloc(new_logo->ascii_logo,ascii_size+1);
@@ -69,7 +69,7 @@
 	 }
 	 if (!strncmp(temp_st,"DESCRIPTION_STRING",18)) {
 	    new_logo->description=strdup(temp_st+19);	   
-	    (char)(new_logo->description)[strlen(new_logo->description)-1]
+	    new_logo->description[strlen(new_logo->description)-1]
 	      ='\0';
 	 }
       }
@@ -173,11 +173,11 @@
 	  
 	  fprintf(ggg,"\tnew_logo->description=strdup(\"%s\");\n",
 		      logo_info_temp->description);
-	  fprintf(ggg,"\t(char *)new_logo->logo=strdup(\"");
+	  fprintf(ggg,"\tnew_logo->logo=(char **)strdup(\"");
 	  sanitize_print_string((char *)logo_info_temp->logo,ggg);
 	  fprintf(ggg,"\");\n");
 	  fprintf(ggg,"\tnew_logo->ysize=%d;\n",logo_info_temp->ysize);
-	  fprintf(ggg,"\t(char *)new_logo->ascii_logo=strdup(\"");
+	  fprintf(ggg,"\tnew_logo->ascii_logo=(char **)strdup(\"");
 	  sanitize_print_string((char *)logo_info_temp->ascii_logo,ggg);
 	  fprintf(ggg,"\");\n");
 	  fprintf(ggg,"\tnew_logo->ascii_ysize=%d;\n",


Index: linux_logo.spec
===================================================================
RCS file: /cvs/extras/devel/linux_logo/linux_logo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux_logo.spec	16 Nov 2004 17:52:18 -0000	1.5
+++ linux_logo.spec	30 Mar 2005 15:15:52 -0000	1.6
@@ -3,11 +3,12 @@
 Summary: The linux logo - a colorful console penguin logo
 Name: linux_logo
 Version: 4.09
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/System
 URL: http://www.deater.net/weave/vmwprod/linux_logo/
 Source: http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-%{version}.tar.gz
+Patch0: linux_logo-gcc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gettext
 
@@ -17,7 +18,7 @@
 
 %prep
 %setup
-
+%patch0 -p1
 
 %build
 for logo in ./logos/*.logo ./logos/*/*.logo; do
@@ -43,12 +44,16 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
-%doc CHANGES COPYING README LINUX_LOGO.FAQ README* TODO USAGE
+%doc CHANGES COPYING LINUX_LOGO.FAQ README* TODO USAGE
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 
 
 %changelog
+* Wed Mar 30 2005 Adrian Reber <adrian at lisas.de> 4.09-3
+- Added gcc4 patch
+- Fixed a warning
+
 * Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 4.09-2
 - Bump release to provide Extras upgrade path.
 



From fedora-extras-commits at redhat.com  Wed Mar 30 15:17:26 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:17:26 -0500
Subject: rpms/repoview - New directory
Message-ID: <200503301517.j2UFHQPa011392@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11385/repoview

Log Message:
Directory /cvs/extras/rpms/repoview added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 30 15:17:26 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:17:26 -0500
Subject: rpms/repoview/devel - New directory
Message-ID: <200503301517.j2UFHQts011395@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11385/repoview/devel

Log Message:
Directory /cvs/extras/rpms/repoview/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 30 15:17:40 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:17:40 -0500
Subject: rpms/repoview Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503301517.j2UFHeC3011457@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11448

Added Files:
	Makefile import.log 
Log Message:
Setup of module repoview


--- NEW FILE Makefile ---
# Top level Makefile for module repoview
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 30 15:17:40 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:17:40 -0500
Subject: rpms/repoview/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503301517.j2UFHeZM011460@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11448/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module repoview


--- 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 Mar 30 15:18:02 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:18:02 -0500
Subject: rpms/repoview import.log,1.1,1.2
Message-ID: <200503301518.j2UFI2IS011559@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11550

Modified Files:
	import.log 
Log Message:
auto-import repoview-0.3-2 on branch devel from repoview-0.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/repoview/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Mar 2005 15:17:38 -0000	1.1
+++ import.log	30 Mar 2005 15:18:00 -0000	1.2
@@ -0,0 +1 @@
+repoview-0_3-2:HEAD:repoview-0.3-2.src.rpm:1112196051



From fedora-extras-commits at redhat.com  Wed Mar 30 15:18:02 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:18:02 -0500
Subject: rpms/repoview/devel repoview.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503301518.j2UFI2MG011563@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11550/devel

Modified Files:
	.cvsignore sources 
Added Files:
	repoview.spec 
Log Message:
auto-import repoview-0.3-2 on branch devel from repoview-0.3-2.src.rpm


--- NEW FILE repoview.spec ---
Name:           repoview
Version:        0.3
Release:        2
Summary:        Creates a set of static HTML pages in a yum repository

Group:          Applications/System
License:        GPL
URL:            http://linux.duke.edu/projects/mini/repoview
Source0:        http://linux.duke.edu/projects/mini/repoview/download/repoview-0.3.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-root
BuildArch:      noarch

BuildRequires:  sed >= 4
Requires:       python-kid >= 0.6.3, python-elementtree

%description
RepoView creates a set of static HTML pages in a yum repository for easy
browsing.


%prep
%setup -q
##
# Fix version and default templates dir.
#
sed -i -e \
    "s|^VERSION =.*|VERSION = '%{version}-%{release}'|g" repoview.py
sed -i -e \
    "s|^DEFAULT_TEMPLATEDIR =.*|DEFAULT_TEMPLATEDIR = '%{_datadir}/%{name}/templates'|g" \
    repoview.py

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p -m 755                         \
    $RPM_BUILD_ROOT/%{_datadir}/%{name} \
    $RPM_BUILD_ROOT/%{_bindir}          \
    $RPM_BUILD_ROOT/%{_mandir}/man8
install -p -m 755 repoview.py  $RPM_BUILD_ROOT/%{_bindir}/repoview
install -p -m 644 repoview.8   $RPM_BUILD_ROOT/%{_mandir}/man8/
cp -rp templates               $RPM_BUILD_ROOT/%{_datadir}/%{name}/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog
%{_datadir}/%{name}
%{_bindir}/*
%{_mandir}/man*/*


%changelog
* Tue Mar 29 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 0.3-2
- Preserve timestamps on installed files
- Do not use macros in source tags
- Omit Epoch

* Fri Mar 25 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 0.3-1
- Version 0.3

* Thu Mar 10 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 0.2-1
- Version 0.2
- Fix URL
- Comply with fedora extras specfile format.
- Depend on python-elementtree and python-kid -- the names in extras.

* Thu Mar 03 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 0.1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Mar 2005 15:17:38 -0000	1.1
+++ .cvsignore	30 Mar 2005 15:18:00 -0000	1.2
@@ -0,0 +1 @@
+repoview-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Mar 2005 15:17:38 -0000	1.1
+++ sources	30 Mar 2005 15:18:00 -0000	1.2
@@ -0,0 +1 @@
+03a14fccdb7cae46d3a6da9f1069ca14  repoview-0.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 30 15:40:00 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 30 Mar 2005 10:40:00 -0500
Subject: rpms/gnome-blog/FC-3 gnome-blog.spec,1.4,1.5
Message-ID: <200503301540.j2UFe0gu011735@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11726/FC-3

Modified Files:
	gnome-blog.spec 
Log Message:
add dist tags, and rebuild FC4 for python 2.4


Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/FC-3/gnome-blog.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-blog.spec	13 Mar 2005 02:58:17 -0000	1.4
+++ gnome-blog.spec	30 Mar 2005 15:39:58 -0000	1.5
@@ -5,7 +5,7 @@
 
 Name:		gnome-blog
 Version:	0.8
-Release:	5
+Release:	6.fc3
 Summary:	GNOME panel object for posting blog entries
 
 Group:		Applications/Internet
@@ -93,6 +93,9 @@
 %ghost %{python_sitelib}/gnomeblog/*.pyo
 
 %changelog
+* Wed Mar 30 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-6.fc3
+- Add dist tag.
+
 * Tue Mar  1 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-5
 - Add build requires: intltool
 - Drop epoch: 0.



From fedora-extras-commits at redhat.com  Wed Mar 30 15:40:00 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 30 Mar 2005 10:40:00 -0500
Subject: rpms/gnome-blog/devel gnome-blog.spec,1.6,1.7
Message-ID: <200503301540.j2UFe0lw011739@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11726/devel

Modified Files:
	gnome-blog.spec 
Log Message:
add dist tags, and rebuild FC4 for python 2.4


Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/gnome-blog.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-blog.spec	13 Mar 2005 02:02:33 -0000	1.6
+++ gnome-blog.spec	30 Mar 2005 15:39:58 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name:		gnome-blog
 Version:	0.8
-Release:	5
+Release:	6.fc4
 Summary:	GNOME panel object for posting blog entries
 
 Group:		Applications/Internet
@@ -93,6 +93,10 @@
 %ghost %{python_sitelib}/gnomeblog/*.pyo
 
 %changelog
+* Wed Mar 30 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-6.fc4
+- Rebuild with Python 2.4.
+- Add dist tag.
+
 * Tue Mar  1 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-5
 - Add build requires: intltool
 - Drop epoch: 0.



From fedora-extras-commits at redhat.com  Wed Mar 30 16:13:01 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 30 Mar 2005 11:13:01 -0500
Subject: rpms/python-reportlab import.log,1.3,1.4
Message-ID: <200503301613.j2UGD1Om012754@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-reportlab
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12744

Modified Files:
	import.log 
Log Message:
auto-import python-reportlab-1.20-1.fc4 on branch devel from python-reportlab-1.20-1.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 05:16:13 -0000	1.3
+++ import.log	30 Mar 2005 16:12:59 -0000	1.4
@@ -1,2 +1,3 @@
 python-reportlab-1_19-0_fdr_2_1:HEAD:python-reportlab-1.19-0.fdr.2.1.src.rpm:1099890957
 python-reportlab-1_19-0_fdr_2_2:HEAD:python-reportlab-1.19-0.fdr.2.2.src.rpm:1099890973
+python-reportlab-1_20-1_fc4:HEAD:python-reportlab-1.20-1.fc4.src.rpm:1112199175



From fedora-extras-commits at redhat.com  Wed Mar 30 16:13:01 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 30 Mar 2005 11:13:01 -0500
Subject: rpms/python-reportlab/devel .cvsignore, 1.2,
	1.3 python-reportlab.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200503301613.j2UGD16J012757@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-reportlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12744/devel

Modified Files:
	.cvsignore python-reportlab.spec sources 
Log Message:
auto-import python-reportlab-1.20-1.fc4 on branch devel from python-reportlab-1.20-1.fc4.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:15:57 -0000	1.2
+++ .cvsignore	30 Mar 2005 16:12:59 -0000	1.3
@@ -1 +1 @@
-ReportLab_1_19.tgz
+ReportLab_1_20.tgz


Index: python-reportlab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/devel/python-reportlab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-reportlab.spec	3 Mar 2005 23:53:13 -0000	1.4
+++ python-reportlab.spec	30 Mar 2005 16:12:59 -0000	1.5
@@ -1,27 +1,27 @@
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pynext %(python -c 'print %{pyver} + 0.1')
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-Name:           python-reportlab
-Version:        1.19
-Release:        2
-Summary:        Python PDF generation library
-
-Group:          Development/Libraries
-License:        BSD
-URL:            http://www.reportlab.org/
-Source0:        http://www.reportlab.org/ftp/ReportLab_1_19.tgz
+Name:		python-reportlab
+Version:	1.20
+Release:	1.fc4
+Summary:	Python PDF generation library
+
+Group:		Development/Libraries
+License:	BSD
+URL:		http://www.reportlab.org/
+Source0:	http://www.reportlab.org/ftp/ReportLab_1_20.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel >= 2.2
-Requires:       python >= %{pyver}, python < %{pynext}
+BuildRequires:	python-devel >= 2.2
+Requires:	python-abi = %{pyver}
 
 %description
 Python PDF generation library.
 
 
 %prep
-%setup -q -n reportlab-1_19
+%setup -q -n reportlab_1_20
 
 
 %build
@@ -34,9 +34,9 @@
 cd ./reportlab
 %{__python} setup.py install --root $RPM_BUILD_ROOT
 
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{pyver}/reportlab/README
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{pyver}/reportlab/changes
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{pyver}/reportlab/license.txt
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/README
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/changes
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/license.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,10 +45,16 @@
 %files
 %defattr(-,root,root,-)
 %doc reportlab/README reportlab/changes reportlab/license.txt
-%{_libdir}/python%{pyver}/*
+%{python_sitelib}/*
 
 
 %changelog
+* Wed Mar 30 2005 Brian Pepple <bdpepple at ameritech.net> - 1.20-1.fc4
+- Rebuild for Python 2.4.
+- Update to 1.20.
+- Switch to the new python macros for python-abi
+- Add dist tag.
+
 * Sat Apr 24 2004 Brian Pepple <bdpepple at ameritech.net> 0:1.19-0.fdr.2
 - Removed %ghosts.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:15:57 -0000	1.2
+++ sources	30 Mar 2005 16:12:59 -0000	1.3
@@ -1 +1 @@
-02eeec6481f71918bf469a78edc4437c  ReportLab_1_19.tgz
+8d374b9b6f7db3fc0821082347d5e6b5  ReportLab_1_20.tgz



From fedora-extras-commits at redhat.com  Wed Mar 30 16:17:06 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 30 Mar 2005 11:17:06 -0500
Subject: rpms/python-reportlab/FC-3 python-reportlab.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200503301617.j2UGH6ax012853@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-reportlab/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12847

Modified Files:
	python-reportlab.spec sources 
Log Message:
update to 1.20


Index: python-reportlab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/FC-3/python-reportlab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-reportlab.spec	10 Dec 2004 22:03:10 -0000	1.3
+++ python-reportlab.spec	30 Mar 2005 16:17:03 -0000	1.4
@@ -1,28 +1,27 @@
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pynext %(python -c 'print %{pyver} + 0.1')
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-Name:           python-reportlab
-Version:        1.19
-Release:        2
-Epoch:          0
-Summary:        Python PDF generation library
-
-Group:          Development/Libraries
-License:        BSD
-URL:            http://www.reportlab.org/
-Source0:        http://www.reportlab.org/ftp/ReportLab_1_19.tgz
-         
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		python-reportlab
+Version:	1.20
+Release:	1.fc3
+Summary:	Python PDF generation library
+
+Group:		Development/Libraries
+License:	BSD
+URL:		http://www.reportlab.org/
+Source0:	http://www.reportlab.org/ftp/ReportLab_1_20.tgz
 
-BuildRequires:  python-devel >= 0:2.2  
-Requires:       python >= 0:%{pyver}, python < 0:%{pynext}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	python-devel >= 2.2
+Requires:	python-abi = %{pyver}
 
 %description
 Python PDF generation library.
 
 
 %prep
-%setup -q -n reportlab-1_19
+%setup -q -n reportlab_1_20
 
 
 %build
@@ -35,9 +34,9 @@
 cd ./reportlab
 %{__python} setup.py install --root $RPM_BUILD_ROOT
 
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{pyver}/reportlab/README
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{pyver}/reportlab/changes
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{pyver}/reportlab/license.txt
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/README
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/changes
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/license.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -46,10 +45,15 @@
 %files
 %defattr(-,root,root,-)
 %doc reportlab/README reportlab/changes reportlab/license.txt
-%{_libdir}/python%{pyver}/*
+%{python_sitelib}/*
 
 
 %changelog
+* Wed Mar 30 2005 Brian Pepple <bdpepple at ameritech.net> - 1.20-1.fc3
+- Update to 1.20.
+- Switch to the new python macros for python-abi
+- Add dist tag.
+
 * Sat Apr 24 2004 Brian Pepple <bdpepple at ameritech.net> 0:1.19-0.fdr.2
 - Removed %ghosts.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:15:57 -0000	1.2
+++ sources	30 Mar 2005 16:17:03 -0000	1.3
@@ -1 +1 @@
-02eeec6481f71918bf469a78edc4437c  ReportLab_1_19.tgz
+8d374b9b6f7db3fc0821082347d5e6b5  ReportLab_1_20.tgz



From fedora-extras-commits at redhat.com  Wed Mar 30 16:33:40 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 30 Mar 2005 11:33:40 -0500
Subject: rpms/revelation/FC-3 revelation.spec,1.4,1.5
Message-ID: <200503301633.j2UGXeOF012995@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/revelation/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12986/FC-3

Modified Files:
	revelation.spec 
Log Message:
* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.2-2
- Devel rebuild

* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.2-1
- Update to 0.4.2



Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/FC-3/revelation.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- revelation.spec	2 Mar 2005 19:05:15 -0000	1.4
+++ revelation.spec	30 Mar 2005 16:33:38 -0000	1.5
@@ -3,12 +3,12 @@
 
 Summary:	Password manager for GNOME 2
 Name: 		revelation
-Version: 	0.4.0
+Version: 	0.4.2
 Epoch: 		0
 Release: 	1
 License: 	GPL
 Group: 		Applications/Productivity
-Source: 	ftp://oss.codepoet.no/revelation/revelation-0.4.0.tar.bz2
+Source: 	ftp://oss.codepoet.no/revelation/revelation-0.4.2.tar.bz2
 URL: 		http://oss.codepoet.no/revelation/
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	python-crypto >= 0:2.0
@@ -82,10 +82,12 @@
 %{_datadir}/revelation/
 %{_datadir}/icons/hicolor/??x??/mimetypes/gnome-mime-application-x-revelation.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/filesystems/%{name}*
+# the next two entries should be python_sitearch, but the packages currently does it
+# wrong on install and during execution. So leave them in {python_sitelib} for now
 #dir %{python_sitearch}/revelation/
-# the next entry should be python_sitearch, but the packages currently does it 
-# wrong on install and during execution. So leave it in {python_sitelib} for now
 %{python_sitelib}/revelation/authmanager.so
+%{python_sitelib}/revelation/crack.so
 %dir %{python_sitelib}/revelation/
 %dir %{python_sitelib}/revelation/datahandler/
 %{_datadir}/mime/packages/*
@@ -97,6 +99,9 @@
 %ghost %{python_sitelib}/revelation/datahandler/*.pyo
 
 %changelog
+* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.2-1
+- Update to 0.4.2
+
 * Tue Mar 01 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.0-1
 - Update to 0.4.0 - depends on gtk 2.4 now
 - Uses configure now



From fedora-extras-commits at redhat.com  Wed Mar 30 16:33:40 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 30 Mar 2005 11:33:40 -0500
Subject: rpms/revelation/devel .cvsignore, 1.4, 1.5 revelation.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200503301633.j2UGXeqx012999@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/revelation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12986/devel

Modified Files:
	.cvsignore revelation.spec sources 
Log Message:
* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.2-2
- Devel rebuild

* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.2-1
- Update to 0.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Mar 2005 19:05:15 -0000	1.4
+++ .cvsignore	30 Mar 2005 16:33:38 -0000	1.5
@@ -1 +1 @@
-revelation-0.4.0.tar.bz2
+revelation-0.4.2.tar.bz2


Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- revelation.spec	4 Mar 2005 00:05:42 -0000	1.6
+++ revelation.spec	30 Mar 2005 16:33:38 -0000	1.7
@@ -3,11 +3,11 @@
 
 Summary:	Password manager for GNOME 2
 Name:		revelation
-Version:	0.4.0
-Release:	1
+Version:	0.4.2
+Release:	2
 License:	GPL
 Group:		Applications/Productivity
-Source:		ftp://oss.codepoet.no/revelation/revelation-0.4.0.tar.bz2
+Source:		ftp://oss.codepoet.no/revelation/revelation-0.4.2.tar.bz2
 URL:		http://oss.codepoet.no/revelation/
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	python-crypto >= 2.0
@@ -81,10 +81,12 @@
 %{_datadir}/revelation/
 %{_datadir}/icons/hicolor/??x??/mimetypes/gnome-mime-application-x-revelation.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/filesystems/%{name}*
+# the next two entries should be python_sitearch, but the packages currently does it
+# wrong on install and during execution. So leave them in {python_sitelib} for now
 #dir %{python_sitearch}/revelation/
-# the next entry should be python_sitearch, but the packages currently does it
-# wrong on install and during execution. So leave it in {python_sitelib} for now
 %{python_sitelib}/revelation/authmanager.so
+%{python_sitelib}/revelation/crack.so
 %dir %{python_sitelib}/revelation/
 %dir %{python_sitelib}/revelation/datahandler/
 %{_datadir}/mime/packages/*
@@ -96,6 +98,12 @@
 %ghost %{python_sitelib}/revelation/datahandler/*.pyo
 
 %changelog
+* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.2-2
+- Devel rebuild
+
+* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.2-1
+- Update to 0.4.2
+
 * Tue Mar 01 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.0-1
 - Update to 0.4.0 - depends on gtk 2.4 now
 - Uses configure now


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Mar 2005 19:05:15 -0000	1.4
+++ sources	30 Mar 2005 16:33:38 -0000	1.5
@@ -1 +1 @@
-d00dd223a1c35472e573fb11d758cd98  revelation-0.4.0.tar.bz2
+a2e58904072a58473245037976cca569  revelation-0.4.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar 30 16:35:50 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 30 Mar 2005 11:35:50 -0500
Subject: rpms/notemeister/devel notemeister.spec,1.3,1.4
Message-ID: <200503301635.j2UGZo3M013054@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/notemeister/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13048

Modified Files:
	notemeister.spec 
Log Message:
* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0.1.7-3
- Devel rebuild




Index: notemeister.spec
===================================================================
RCS file: /cvs/extras/rpms/notemeister/devel/notemeister.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- notemeister.spec	3 Mar 2005 23:01:24 -0000	1.3
+++ notemeister.spec	30 Mar 2005 16:35:48 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           notemeister
 Version:        0.1.7
-Release:        2
+Release:        3
 Summary:        Small, simple note organizer made for the GNOME2 desktop
 
 Group:          Applications/Productivity
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0.1.7-3
+- Devel rebuild
+
 * Fri Nov 19 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.1.7-0.fdr.2
 - Don't ship empty NEWS file
 - Point Source0 to sourceforge download redirector



From fedora-extras-commits at redhat.com  Wed Mar 30 16:57:03 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 30 Mar 2005 11:57:03 -0500
Subject: rpms/revelation/FC-3 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200503301657.j2UGv3RX013217@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/revelation/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13207

Modified Files:
	.cvsignore sources 
Log Message:
forgot sources update on FC-3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/revelation/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Mar 2005 19:05:15 -0000	1.4
+++ .cvsignore	30 Mar 2005 16:57:01 -0000	1.5
@@ -1 +1 @@
-revelation-0.4.0.tar.bz2
+revelation-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/revelation/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Mar 2005 19:05:15 -0000	1.4
+++ sources	30 Mar 2005 16:57:01 -0000	1.5
@@ -1 +1 @@
-d00dd223a1c35472e573fb11d758cd98  revelation-0.4.0.tar.bz2
+a2e58904072a58473245037976cca569  revelation-0.4.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar 30 17:47:30 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 30 Mar 2005 12:47:30 -0500
Subject: web - Imported sources
Message-ID: <200503301747.j2UHlUT5014280@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/web
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14267

Log Message:
Import into public repo

Status:

Vendor Tag:	FEDORA
Release Tags:	V1_1
		
N web/Makefile
N web/TODO
N web/website-architecture
N web/website-sitemap
N web/config/HOWTO-DOCS
N web/config/HOWTO
N web/config/HOWTO-LIVE
N web/config/httpd.conf
N web/config/php.ini
N web/config/tux.mime.types
N web/config/tux.sysconfig
N web/html/common.inc
N web/html/404.php
N web/html/index.php
N web/html/about/index.php
N web/html/about/leadership.php
N web/html/about/name.php
N web/html/about/objectives.php
N web/html/about/rhel.php
N web/html/about/faq/index.php
N web/html/about/history/index.php
N web/html/about/security/1CDDBCA9.txt
N web/html/about/security/30C9ECF8.txt
N web/html/about/security/4F2A6FD2.txt
N web/html/about/security/8DF56D05.txt
N web/html/about/security/index.php
N web/html/about/trademarks/common.inc
N web/html/about/trademarks/index.php
N web/html/about/trademarks/trademark_usage.pdf
N web/html/about/trademarks/guidelines/common.inc
N web/html/about/trademarks/guidelines/index.php
N web/html/about/trademarks/guidelines/page1.php
N web/html/about/trademarks/guidelines/page2.php
N web/html/about/trademarks/guidelines/page3.php
N web/html/about/trademarks/guidelines/page4.php
N web/html/about/trademarks/guidelines/page5.php
N web/html/about/trademarks/guidelines/page6.php
N web/html/about/trademarks/guidelines/page7.php
N web/html/css/content.css
N web/html/css/docbook.css
N web/html/css/layout.css
N web/html/css/print.css
N web/html/docs/index.php
N web/html/docs/severn-announce.php
N web/html/docs/jargon-buster/fedora-glossary.php
N web/html/docs/jargon-buster/index.php
N web/html/docs/jargon-buster/ln-legalnotice.php
N web/html/docs/package-list/index.php
N web/html/docs/package-list/fc2/index.php
N web/html/docs/package-list/fc2/package.list
N web/html/docs/release-notes/common.inc
N web/html/docs/release-notes/index.php
N web/html/docs/release-notes/fc2/x86/common.inc
N web/html/docs/release-notes/fc2/x86/index.php
N web/html/docs/release-notes/fc2/x86_64/common.inc
N web/html/docs/release-notes/fc2/x86_64/index.php
N web/html/docs/release-notes/fc3/x86/common.inc
N web/html/docs/release-notes/fc3/x86/index.php
N web/html/docs/release-notes/fc3/x86_64/common.inc
N web/html/docs/release-notes/fc3/x86_64/index.php
N web/html/docs/selinux-apache-fc3/index.php
N web/html/docs/selinux-apache-fc3/ln-legalnotice.php
N web/html/docs/selinux-apache-fc3/sn-debugging-and-customizing.php
N web/html/docs/selinux-apache-fc3/sn-further-approaches.php
N web/html/docs/selinux-apache-fc3/sn-getting-started.php
N web/html/docs/selinux-apache-fc3/sn-security-overview.php
N web/html/docs/selinux-apache-fc3/sn-simple-setup.php
N web/html/docs/selinux-apache-fc3/sn-strict-policy.php
N web/html/docs/selinux-apache-fc3/sn-suexec-and-cgi-scripts.php
N web/html/docs/selinux-apache-fc3/sn-user-homedir.php
N web/html/docs/selinux-apache-fc3/sn-using-other-types.php
N web/html/docs/selinux-apache-fc3/stylesheet-images/caution.png
N web/html/docs/selinux-apache-fc3/stylesheet-images/important.png
N web/html/docs/selinux-apache-fc3/stylesheet-images/note.png
N web/html/docs/selinux-apache-fc3/stylesheet-images/tip.png
N web/html/docs/selinux-apache-fc3/stylesheet-images/warning.png
N web/html/docs/selinux-faq/index.php
N web/html/docs/selinux-faq-fc2/common.inc
N web/html/docs/selinux-faq-fc2/index.php
N web/html/docs/selinux-faq-fc2/ln-legalnotice.php
N web/html/docs/selinux-faq-fc2/stylesheet-images/caution.png
N web/html/docs/selinux-faq-fc2/stylesheet-images/important.png
N web/html/docs/selinux-faq-fc2/stylesheet-images/note.png
N web/html/docs/selinux-faq-fc2/stylesheet-images/tip.png
N web/html/docs/selinux-faq-fc2/stylesheet-images/warning.png
N web/html/docs/selinux-faq-fc3/index.php
N web/html/docs/selinux-faq-fc3/ln-legalnotice.php
N web/html/docs/selinux-faq-fc3/stylesheet-images/caution.png
N web/html/docs/selinux-faq-fc3/stylesheet-images/important.png
N web/html/docs/selinux-faq-fc3/stylesheet-images/note.png
N web/html/docs/selinux-faq-fc3/stylesheet-images/tip.png
N web/html/docs/selinux-faq-fc3/stylesheet-images/warning.png
N web/html/docs/selinux-faq-fc3test2/index.php
N web/html/docs/selinux-faq-fc3test2/ln-legalnotice.php
N web/html/docs/selinux-faq-fc3test2/stylesheet-images/caution.png
N web/html/docs/selinux-faq-fc3test2/stylesheet-images/important.png
N web/html/docs/selinux-faq-fc3test2/stylesheet-images/note.png
N web/html/docs/selinux-faq-fc3test2/stylesheet-images/tip.png
N web/html/docs/selinux-faq-fc3test2/stylesheet-images/warning.png
N web/html/docs/stateless/index.php
N web/html/docs/stateless/ln-legalnotice.php
N web/html/docs/stateless/sn-caching-clients.php
N web/html/docs/stateless/sn-diskless-clients.php
N web/html/docs/stateless/sn-live-cd.php
N web/html/docs/stateless/sn-managing-protosystems.php
N web/html/docs/stateless/sn-protosystem-setup.php
N web/html/docs/stateless/sn-server-setup.php
N web/html/docs/stateless/sn-snapshot-setup.php
N web/html/docs/stateless/stylesheet-images/caution.png
N web/html/docs/stateless/stylesheet-images/important.png
N web/html/docs/stateless/stylesheet-images/note.png
N web/html/docs/stateless/stylesheet-images/tip.png
N web/html/docs/stateless/stylesheet-images/warning.png
N web/html/docs/udev/index.php
N web/html/docs/updates/fedora.css
N web/html/docs/updates/generated-index.php
N web/html/docs/updates/index.php
N web/html/docs/updates/ln-legalnotice.php
N web/html/docs/updates/refs.php
N web/html/docs/updates/update-sources.php
N web/html/docs/updates/updating-sources.php
N web/html/docs/updates/using-yum.php
N web/html/download/index.php
N web/html/download/mirrors.php
N web/html/download/test.php
N web/html/download/updates.php
N web/html/download/vendors.list
N web/html/download/vendors.php
N web/html/download/mirrors/fedora-core-1
N web/html/download/mirrors/fedora-core-1.at
N web/html/download/mirrors/fedora-core-1.au
N web/html/download/mirrors/fedora-core-1.br
N web/html/download/mirrors/fedora-core-1.cz
N web/html/download/mirrors/fedora-core-1.de
N web/html/download/mirrors/fedora-core-1.ee
N web/html/download/mirrors/fedora-core-1.es
N web/html/download/mirrors/fedora-core-1.fr
N web/html/download/mirrors/fedora-core-1.gr
N web/html/download/mirrors/fedora-core-1.ie
N web/html/download/mirrors/fedora-core-1.is
N web/html/download/mirrors/fedora-core-1.jp
N web/html/download/mirrors/fedora-core-1.ro
N web/html/download/mirrors/fedora-core-1.ru
N web/html/download/mirrors/fedora-core-1.uk
N web/html/download/mirrors/fedora-core-1.us.east
N web/html/download/mirrors/fedora-core-1.us.west
N web/html/download/mirrors/fedora-core-2
N web/html/download/mirrors/fedora-core-2.at
N web/html/download/mirrors/fedora-core-2.au
N web/html/download/mirrors/fedora-core-2.br
N web/html/download/mirrors/fedora-core-2.cz
N web/html/download/mirrors/fedora-core-2.de
N web/html/download/mirrors/fedora-core-2.ee
N web/html/download/mirrors/fedora-core-2.es
N web/html/download/mirrors/fedora-core-2.fr
N web/html/download/mirrors/fedora-core-2.gr
N web/html/download/mirrors/fedora-core-2.ie
N web/html/download/mirrors/fedora-core-2.is
N web/html/download/mirrors/fedora-core-2.jp
N web/html/download/mirrors/fedora-core-2.ro
N web/html/download/mirrors/fedora-core-2.ru
N web/html/download/mirrors/fedora-core-2.uk
N web/html/download/mirrors/fedora-core-2.us.east
N web/html/download/mirrors/fedora-core-2.us.west
N web/html/download/mirrors/fedora-core-3
N web/html/download/mirrors/fedora-core-3.at
N web/html/download/mirrors/fedora-core-3.br
N web/html/download/mirrors/fedora-core-3.ca
N web/html/download/mirrors/fedora-core-3.ch
N web/html/download/mirrors/fedora-core-3.cl
N web/html/download/mirrors/fedora-core-3.cz
N web/html/download/mirrors/fedora-core-3.de
N web/html/download/mirrors/fedora-core-3.dk
N web/html/download/mirrors/fedora-core-3.fr
N web/html/download/mirrors/fedora-core-3.hk
N web/html/download/mirrors/fedora-core-3.ie
N web/html/download/mirrors/fedora-core-3.is
N web/html/download/mirrors/fedora-core-3.jp
N web/html/download/mirrors/fedora-core-3.pl
N web/html/download/mirrors/fedora-core-3.ro
N web/html/download/mirrors/fedora-core-3.ru
N web/html/download/mirrors/fedora-core-3.tw
N web/html/download/mirrors/fedora-core-3.uk
N web/html/download/mirrors/fedora-core-3.us.east
N web/html/download/mirrors/fedora-core-3.us.west
N web/html/download/mirrors/fedora-core-3.yu
N web/html/download/mirrors/fedora-core-rawhide
N web/html/download/mirrors/fedora-core-rawhide.at
N web/html/download/mirrors/fedora-core-rawhide.au
N web/html/download/mirrors/fedora-core-rawhide.br
N web/html/download/mirrors/fedora-core-rawhide.cz
N web/html/download/mirrors/fedora-core-rawhide.de
N web/html/download/mirrors/fedora-core-rawhide.ee
N web/html/download/mirrors/fedora-core-rawhide.es
N web/html/download/mirrors/fedora-core-rawhide.fr
N web/html/download/mirrors/fedora-core-rawhide.gr
N web/html/download/mirrors/fedora-core-rawhide.ie
N web/html/download/mirrors/fedora-core-rawhide.is
N web/html/download/mirrors/fedora-core-rawhide.jp
N web/html/download/mirrors/fedora-core-rawhide.ro
N web/html/download/mirrors/fedora-core-rawhide.ru
N web/html/download/mirrors/fedora-core-rawhide.uk
N web/html/download/mirrors/fedora-core-rawhide.us.east
N web/html/download/mirrors/fedora-core-rawhide.us.west
N web/html/download/mirrors/index.php
N web/html/download/mirrors/updates-released
N web/html/download/mirrors/updates-released-fc1
N web/html/download/mirrors/updates-released-fc1.at
N web/html/download/mirrors/updates-released-fc1.au
N web/html/download/mirrors/updates-released-fc1.br
N web/html/download/mirrors/updates-released-fc1.de
N web/html/download/mirrors/updates-released-fc1.ee
N web/html/download/mirrors/updates-released-fc1.es
N web/html/download/mirrors/updates-released-fc1.fr
N web/html/download/mirrors/updates-released-fc1.gr
N web/html/download/mirrors/updates-released-fc1.ie
N web/html/download/mirrors/updates-released-fc1.is
N web/html/download/mirrors/updates-released-fc1.jp
N web/html/download/mirrors/updates-released-fc1.ro
N web/html/download/mirrors/updates-released-fc1.ru
N web/html/download/mirrors/updates-released-fc1.uk
N web/html/download/mirrors/updates-released-fc1.us.east
N web/html/download/mirrors/updates-released-fc1.us.west
N web/html/download/mirrors/updates-released-fc2
N web/html/download/mirrors/updates-released-fc2.br
N web/html/download/mirrors/updates-released-fc2.cz
N web/html/download/mirrors/updates-released-fc2.de
N web/html/download/mirrors/updates-released-fc2.ee
N web/html/download/mirrors/updates-released-fc2.es
N web/html/download/mirrors/updates-released-fc2.fr
N web/html/download/mirrors/updates-released-fc2.gr
N web/html/download/mirrors/updates-released-fc2.ie
N web/html/download/mirrors/updates-released-fc2.is
N web/html/download/mirrors/updates-released-fc2.jp
N web/html/download/mirrors/updates-released-fc2.ro
N web/html/download/mirrors/updates-released-fc2.ru
N web/html/download/mirrors/updates-released-fc2.uk
N web/html/download/mirrors/updates-released-fc2.us.east
N web/html/download/mirrors/updates-released-fc2.us.west
N web/html/download/mirrors/updates-released-fc3
N web/html/download/mirrors/updates-released-fc3.at
N web/html/download/mirrors/updates-released-fc3.br
N web/html/download/mirrors/updates-released-fc3.ca
N web/html/download/mirrors/updates-released-fc3.ch
N web/html/download/mirrors/updates-released-fc3.cl
N web/html/download/mirrors/updates-released-fc3.cz
N web/html/download/mirrors/updates-released-fc3.de
N web/html/download/mirrors/updates-released-fc3.dk
N web/html/download/mirrors/updates-released-fc3.fr
N web/html/download/mirrors/updates-released-fc3.hk
N web/html/download/mirrors/updates-released-fc3.ie
N web/html/download/mirrors/updates-released-fc3.is
N web/html/download/mirrors/updates-released-fc3.jp
N web/html/download/mirrors/updates-released-fc3.pl
N web/html/download/mirrors/updates-released-fc3.ro
N web/html/download/mirrors/updates-released-fc3.ru
N web/html/download/mirrors/updates-released-fc3.tw
N web/html/download/mirrors/updates-released-fc3.uk
N web/html/download/mirrors/updates-released-fc3.us.east
N web/html/download/mirrors/updates-released-fc3.us.west
N web/html/download/mirrors/updates-released-fc3.yu
N web/html/download/mirrors/updates-released.at
N web/html/download/mirrors/updates-released.au
N web/html/download/mirrors/updates-released.br
N web/html/download/mirrors/updates-released.de
N web/html/download/mirrors/updates-released.ee
N web/html/download/mirrors/updates-released.es
N web/html/download/mirrors/updates-released.fr
N web/html/download/mirrors/updates-released.gr
N web/html/download/mirrors/updates-released.ie
N web/html/download/mirrors/updates-released.is
N web/html/download/mirrors/updates-released.jp
N web/html/download/mirrors/updates-released.ro
N web/html/download/mirrors/updates-released.ru
N web/html/download/mirrors/updates-released.uk
N web/html/download/mirrors/updates-released.us.east
N web/html/download/mirrors/updates-released.us.west
N web/html/download/mirrors/updates-testing
N web/html/download/mirrors/updates-testing-fc1
N web/html/download/mirrors/updates-testing-fc1.at
N web/html/download/mirrors/updates-testing-fc1.au
N web/html/download/mirrors/updates-testing-fc1.br
N web/html/download/mirrors/updates-testing-fc1.cz
N web/html/download/mirrors/updates-testing-fc1.de
N web/html/download/mirrors/updates-testing-fc1.ee
N web/html/download/mirrors/updates-testing-fc1.es
N web/html/download/mirrors/updates-testing-fc1.fr
N web/html/download/mirrors/updates-testing-fc1.gr
N web/html/download/mirrors/updates-testing-fc1.ie
N web/html/download/mirrors/updates-testing-fc1.is
N web/html/download/mirrors/updates-testing-fc1.jp
N web/html/download/mirrors/updates-testing-fc1.ro
N web/html/download/mirrors/updates-testing-fc1.ru
N web/html/download/mirrors/updates-testing-fc1.uk
N web/html/download/mirrors/updates-testing-fc1.us.east
N web/html/download/mirrors/updates-testing-fc1.us.west
N web/html/download/mirrors/updates-testing-fc2
N web/html/download/mirrors/updates-testing-fc2.at
N web/html/download/mirrors/updates-testing-fc2.au
N web/html/download/mirrors/updates-testing-fc2.br
N web/html/download/mirrors/updates-testing-fc2.cz
N web/html/download/mirrors/updates-testing-fc2.de
N web/html/download/mirrors/updates-testing-fc2.ee
N web/html/download/mirrors/updates-testing-fc2.es
N web/html/download/mirrors/updates-testing-fc2.fr
N web/html/download/mirrors/updates-testing-fc2.gr
N web/html/download/mirrors/updates-testing-fc2.ie
N web/html/download/mirrors/updates-testing-fc2.is
N web/html/download/mirrors/updates-testing-fc2.jp
N web/html/download/mirrors/updates-testing-fc2.ro
N web/html/download/mirrors/updates-testing-fc2.ru
N web/html/download/mirrors/updates-testing-fc2.uk
N web/html/download/mirrors/updates-testing-fc2.us.east
N web/html/download/mirrors/updates-testing-fc2.us.west
N web/html/download/mirrors/updates-testing-fc3
N web/html/download/mirrors/updates-testing-fc3.at
N web/html/download/mirrors/updates-testing-fc3.br
N web/html/download/mirrors/updates-testing-fc3.ca
N web/html/download/mirrors/updates-testing-fc3.ch
N web/html/download/mirrors/updates-testing-fc3.cl
N web/html/download/mirrors/updates-testing-fc3.cz
N web/html/download/mirrors/updates-testing-fc3.de
N web/html/download/mirrors/updates-testing-fc3.dk
N web/html/download/mirrors/updates-testing-fc3.fr
N web/html/download/mirrors/updates-testing-fc3.hk
N web/html/download/mirrors/updates-testing-fc3.ie
N web/html/download/mirrors/updates-testing-fc3.is
N web/html/download/mirrors/updates-testing-fc3.jp
N web/html/download/mirrors/updates-testing-fc3.pl
N web/html/download/mirrors/updates-testing-fc3.ro
N web/html/download/mirrors/updates-testing-fc3.ru
N web/html/download/mirrors/updates-testing-fc3.tw
N web/html/download/mirrors/updates-testing-fc3.uk
N web/html/download/mirrors/updates-testing-fc3.us.east
N web/html/download/mirrors/updates-testing-fc3.us.west
N web/html/download/mirrors/updates-testing-fc3.yu
N web/html/download/mirrors/updates-testing.at
N web/html/download/mirrors/updates-testing.au
N web/html/download/mirrors/updates-testing.br
N web/html/download/mirrors/updates-testing.cz
N web/html/download/mirrors/updates-testing.de
N web/html/download/mirrors/updates-testing.ee
N web/html/download/mirrors/updates-testing.es
N web/html/download/mirrors/updates-testing.fr
N web/html/download/mirrors/updates-testing.gr
N web/html/download/mirrors/updates-testing.ie
N web/html/download/mirrors/updates-testing.is
N web/html/download/mirrors/updates-testing.jp
N web/html/download/mirrors/updates-testing.ro
N web/html/download/mirrors/updates-testing.ru
N web/html/download/mirrors/updates-testing.uk
N web/html/download/mirrors/updates-testing.us.east
N web/html/download/mirrors/updates-testing.us.west
N web/html/download/up2date-mirrors/fedora-core-1
N web/html/download/up2date-mirrors/fedora-core-1.at
N web/html/download/up2date-mirrors/fedora-core-1.au
N web/html/download/up2date-mirrors/fedora-core-1.br
N web/html/download/up2date-mirrors/fedora-core-1.cz
N web/html/download/up2date-mirrors/fedora-core-1.de
N web/html/download/up2date-mirrors/fedora-core-1.ee
N web/html/download/up2date-mirrors/fedora-core-1.es
N web/html/download/up2date-mirrors/fedora-core-1.fr
N web/html/download/up2date-mirrors/fedora-core-1.gr
N web/html/download/up2date-mirrors/fedora-core-1.ie
N web/html/download/up2date-mirrors/fedora-core-1.is
N web/html/download/up2date-mirrors/fedora-core-1.jp
N web/html/download/up2date-mirrors/fedora-core-1.ro
N web/html/download/up2date-mirrors/fedora-core-1.ru
N web/html/download/up2date-mirrors/fedora-core-1.uk
N web/html/download/up2date-mirrors/fedora-core-1.us.east
N web/html/download/up2date-mirrors/fedora-core-1.us.west
N web/html/download/up2date-mirrors/fedora-core-2
N web/html/download/up2date-mirrors/fedora-core-2.at
N web/html/download/up2date-mirrors/fedora-core-2.au
N web/html/download/up2date-mirrors/fedora-core-2.br
N web/html/download/up2date-mirrors/fedora-core-2.cz
N web/html/download/up2date-mirrors/fedora-core-2.de
N web/html/download/up2date-mirrors/fedora-core-2.ee
N web/html/download/up2date-mirrors/fedora-core-2.es
N web/html/download/up2date-mirrors/fedora-core-2.fr
N web/html/download/up2date-mirrors/fedora-core-2.gr
N web/html/download/up2date-mirrors/fedora-core-2.ie
N web/html/download/up2date-mirrors/fedora-core-2.is
N web/html/download/up2date-mirrors/fedora-core-2.jp
N web/html/download/up2date-mirrors/fedora-core-2.ro
N web/html/download/up2date-mirrors/fedora-core-2.ru
N web/html/download/up2date-mirrors/fedora-core-2.uk
N web/html/download/up2date-mirrors/fedora-core-2.us.east
N web/html/download/up2date-mirrors/fedora-core-2.us.west
N web/html/download/up2date-mirrors/fedora-core-3
N web/html/download/up2date-mirrors/fedora-core-3.at
N web/html/download/up2date-mirrors/fedora-core-3.br
N web/html/download/up2date-mirrors/fedora-core-3.ca
N web/html/download/up2date-mirrors/fedora-core-3.ch
N web/html/download/up2date-mirrors/fedora-core-3.cl
N web/html/download/up2date-mirrors/fedora-core-3.cz
N web/html/download/up2date-mirrors/fedora-core-3.de
N web/html/download/up2date-mirrors/fedora-core-3.dk
N web/html/download/up2date-mirrors/fedora-core-3.fr
N web/html/download/up2date-mirrors/fedora-core-3.hk
N web/html/download/up2date-mirrors/fedora-core-3.ie
N web/html/download/up2date-mirrors/fedora-core-3.is
N web/html/download/up2date-mirrors/fedora-core-3.jp
N web/html/download/up2date-mirrors/fedora-core-3.pl
N web/html/download/up2date-mirrors/fedora-core-3.ro
N web/html/download/up2date-mirrors/fedora-core-3.ru
N web/html/download/up2date-mirrors/fedora-core-3.tw
N web/html/download/up2date-mirrors/fedora-core-3.uk
N web/html/download/up2date-mirrors/fedora-core-3.us.east
N web/html/download/up2date-mirrors/fedora-core-3.us.west
N web/html/download/up2date-mirrors/fedora-core-3.yu
N web/html/download/up2date-mirrors/fedora-core-rawhide
N web/html/download/up2date-mirrors/fedora-core-rawhide.at
N web/html/download/up2date-mirrors/fedora-core-rawhide.au
N web/html/download/up2date-mirrors/fedora-core-rawhide.br
N web/html/download/up2date-mirrors/fedora-core-rawhide.cz
N web/html/download/up2date-mirrors/fedora-core-rawhide.de
N web/html/download/up2date-mirrors/fedora-core-rawhide.ee
N web/html/download/up2date-mirrors/fedora-core-rawhide.es
N web/html/download/up2date-mirrors/fedora-core-rawhide.fr
N web/html/download/up2date-mirrors/fedora-core-rawhide.gr
N web/html/download/up2date-mirrors/fedora-core-rawhide.ie
N web/html/download/up2date-mirrors/fedora-core-rawhide.is
N web/html/download/up2date-mirrors/fedora-core-rawhide.jp
N web/html/download/up2date-mirrors/fedora-core-rawhide.ro
N web/html/download/up2date-mirrors/fedora-core-rawhide.ru
N web/html/download/up2date-mirrors/fedora-core-rawhide.uk
N web/html/download/up2date-mirrors/fedora-core-rawhide.us.east
N web/html/download/up2date-mirrors/fedora-core-rawhide.us.west
N web/html/download/up2date-mirrors/index.php
N web/html/download/up2date-mirrors/updates-released
N web/html/download/up2date-mirrors/updates-released-fc1
N web/html/download/up2date-mirrors/updates-released-fc1.at
N web/html/download/up2date-mirrors/updates-released-fc1.au
N web/html/download/up2date-mirrors/updates-released-fc1.br
N web/html/download/up2date-mirrors/updates-released-fc1.de
N web/html/download/up2date-mirrors/updates-released-fc1.ee
N web/html/download/up2date-mirrors/updates-released-fc1.es
N web/html/download/up2date-mirrors/updates-released-fc1.fr
N web/html/download/up2date-mirrors/updates-released-fc1.gr
N web/html/download/up2date-mirrors/updates-released-fc1.ie
N web/html/download/up2date-mirrors/updates-released-fc1.is
N web/html/download/up2date-mirrors/updates-released-fc1.jp
N web/html/download/up2date-mirrors/updates-released-fc1.ro
N web/html/download/up2date-mirrors/updates-released-fc1.ru
N web/html/download/up2date-mirrors/updates-released-fc1.uk
N web/html/download/up2date-mirrors/updates-released-fc1.us.east
N web/html/download/up2date-mirrors/updates-released-fc1.us.west
N web/html/download/up2date-mirrors/updates-released-fc2
N web/html/download/up2date-mirrors/updates-released-fc2.br
N web/html/download/up2date-mirrors/updates-released-fc2.cz
N web/html/download/up2date-mirrors/updates-released-fc2.de
N web/html/download/up2date-mirrors/updates-released-fc2.ee
N web/html/download/up2date-mirrors/updates-released-fc2.es
N web/html/download/up2date-mirrors/updates-released-fc2.fr
N web/html/download/up2date-mirrors/updates-released-fc2.gr
N web/html/download/up2date-mirrors/updates-released-fc2.ie
N web/html/download/up2date-mirrors/updates-released-fc2.is
N web/html/download/up2date-mirrors/updates-released-fc2.jp
N web/html/download/up2date-mirrors/updates-released-fc2.ro
N web/html/download/up2date-mirrors/updates-released-fc2.ru
N web/html/download/up2date-mirrors/updates-released-fc2.uk
N web/html/download/up2date-mirrors/updates-released-fc2.us.east
N web/html/download/up2date-mirrors/updates-released-fc2.us.west
N web/html/download/up2date-mirrors/updates-released-fc3
N web/html/download/up2date-mirrors/updates-released-fc3.at
N web/html/download/up2date-mirrors/updates-released-fc3.br
N web/html/download/up2date-mirrors/updates-released-fc3.ca
N web/html/download/up2date-mirrors/updates-released-fc3.ch
N web/html/download/up2date-mirrors/updates-released-fc3.cl
N web/html/download/up2date-mirrors/updates-released-fc3.cz
N web/html/download/up2date-mirrors/updates-released-fc3.de
N web/html/download/up2date-mirrors/updates-released-fc3.dk
N web/html/download/up2date-mirrors/updates-released-fc3.fr
N web/html/download/up2date-mirrors/updates-released-fc3.hk
N web/html/download/up2date-mirrors/updates-released-fc3.ie
N web/html/download/up2date-mirrors/updates-released-fc3.is
N web/html/download/up2date-mirrors/updates-released-fc3.jp
N web/html/download/up2date-mirrors/updates-released-fc3.pl
N web/html/download/up2date-mirrors/updates-released-fc3.ro
N web/html/download/up2date-mirrors/updates-released-fc3.ru
N web/html/download/up2date-mirrors/updates-released-fc3.tw
N web/html/download/up2date-mirrors/updates-released-fc3.uk
N web/html/download/up2date-mirrors/updates-released-fc3.us.east
N web/html/download/up2date-mirrors/updates-released-fc3.us.west
N web/html/download/up2date-mirrors/updates-released-fc3.yu
N web/html/download/up2date-mirrors/updates-released.at
N web/html/download/up2date-mirrors/updates-released.au
N web/html/download/up2date-mirrors/updates-released.br
N web/html/download/up2date-mirrors/updates-released.de
N web/html/download/up2date-mirrors/updates-released.ee
N web/html/download/up2date-mirrors/updates-released.es
N web/html/download/up2date-mirrors/updates-released.fr
N web/html/download/up2date-mirrors/updates-released.gr
N web/html/download/up2date-mirrors/updates-released.ie
N web/html/download/up2date-mirrors/updates-released.is
N web/html/download/up2date-mirrors/updates-released.jp
N web/html/download/up2date-mirrors/updates-released.ro
N web/html/download/up2date-mirrors/updates-released.ru
N web/html/download/up2date-mirrors/updates-released.uk
N web/html/download/up2date-mirrors/updates-released.us.east
N web/html/download/up2date-mirrors/updates-released.us.west
N web/html/download/up2date-mirrors/updates-testing
N web/html/download/up2date-mirrors/updates-testing-fc1
N web/html/download/up2date-mirrors/updates-testing-fc1.at
N web/html/download/up2date-mirrors/updates-testing-fc1.au
N web/html/download/up2date-mirrors/updates-testing-fc1.br
N web/html/download/up2date-mirrors/updates-testing-fc1.cz
N web/html/download/up2date-mirrors/updates-testing-fc1.de
N web/html/download/up2date-mirrors/updates-testing-fc1.ee
N web/html/download/up2date-mirrors/updates-testing-fc1.es
N web/html/download/up2date-mirrors/updates-testing-fc1.fr
N web/html/download/up2date-mirrors/updates-testing-fc1.gr
N web/html/download/up2date-mirrors/updates-testing-fc1.ie
N web/html/download/up2date-mirrors/updates-testing-fc1.is
N web/html/download/up2date-mirrors/updates-testing-fc1.jp
N web/html/download/up2date-mirrors/updates-testing-fc1.ro
N web/html/download/up2date-mirrors/updates-testing-fc1.ru
N web/html/download/up2date-mirrors/updates-testing-fc1.uk
N web/html/download/up2date-mirrors/updates-testing-fc1.us.east
N web/html/download/up2date-mirrors/updates-testing-fc1.us.west
N web/html/download/up2date-mirrors/updates-testing-fc2
N web/html/download/up2date-mirrors/updates-testing-fc2.at
N web/html/download/up2date-mirrors/updates-testing-fc2.au
N web/html/download/up2date-mirrors/updates-testing-fc2.br
N web/html/download/up2date-mirrors/updates-testing-fc2.cz
N web/html/download/up2date-mirrors/updates-testing-fc2.de
N web/html/download/up2date-mirrors/updates-testing-fc2.ee
N web/html/download/up2date-mirrors/updates-testing-fc2.es
N web/html/download/up2date-mirrors/updates-testing-fc2.fr
N web/html/download/up2date-mirrors/updates-testing-fc2.gr
N web/html/download/up2date-mirrors/updates-testing-fc2.ie
N web/html/download/up2date-mirrors/updates-testing-fc2.is
N web/html/download/up2date-mirrors/updates-testing-fc2.jp
N web/html/download/up2date-mirrors/updates-testing-fc2.ro
N web/html/download/up2date-mirrors/updates-testing-fc2.ru
N web/html/download/up2date-mirrors/updates-testing-fc2.uk
N web/html/download/up2date-mirrors/updates-testing-fc2.us.east
N web/html/download/up2date-mirrors/updates-testing-fc2.us.west
N web/html/download/up2date-mirrors/updates-testing-fc3
N web/html/download/up2date-mirrors/updates-testing-fc3.at
N web/html/download/up2date-mirrors/updates-testing-fc3.br
N web/html/download/up2date-mirrors/updates-testing-fc3.ca
N web/html/download/up2date-mirrors/updates-testing-fc3.ch
N web/html/download/up2date-mirrors/updates-testing-fc3.cl
N web/html/download/up2date-mirrors/updates-testing-fc3.cz
N web/html/download/up2date-mirrors/updates-testing-fc3.de
N web/html/download/up2date-mirrors/updates-testing-fc3.dk
N web/html/download/up2date-mirrors/updates-testing-fc3.fr
N web/html/download/up2date-mirrors/updates-testing-fc3.hk
N web/html/download/up2date-mirrors/updates-testing-fc3.ie
N web/html/download/up2date-mirrors/updates-testing-fc3.is
N web/html/download/up2date-mirrors/updates-testing-fc3.jp
N web/html/download/up2date-mirrors/updates-testing-fc3.pl
N web/html/download/up2date-mirrors/updates-testing-fc3.ro
N web/html/download/up2date-mirrors/updates-testing-fc3.ru
N web/html/download/up2date-mirrors/updates-testing-fc3.tw
N web/html/download/up2date-mirrors/updates-testing-fc3.uk
N web/html/download/up2date-mirrors/updates-testing-fc3.us.east
N web/html/download/up2date-mirrors/updates-testing-fc3.us.west
N web/html/download/up2date-mirrors/updates-testing-fc3.yu
N web/html/download/up2date-mirrors/updates-testing.at
N web/html/download/up2date-mirrors/updates-testing.au
N web/html/download/up2date-mirrors/updates-testing.br
N web/html/download/up2date-mirrors/updates-testing.cz
N web/html/download/up2date-mirrors/updates-testing.de
N web/html/download/up2date-mirrors/updates-testing.ee
N web/html/download/up2date-mirrors/updates-testing.es
N web/html/download/up2date-mirrors/updates-testing.fr
N web/html/download/up2date-mirrors/updates-testing.gr
N web/html/download/up2date-mirrors/updates-testing.ie
N web/html/download/up2date-mirrors/updates-testing.is
N web/html/download/up2date-mirrors/updates-testing.jp
N web/html/download/up2date-mirrors/updates-testing.ro
N web/html/download/up2date-mirrors/updates-testing.ru
N web/html/download/up2date-mirrors/updates-testing.uk
N web/html/download/up2date-mirrors/updates-testing.us.east
N web/html/download/up2date-mirrors/updates-testing.us.west
N web/html/images/corner-bl.png
N web/html/images/corner-br.png
N web/html/images/corner-tl.png
N web/html/images/corner-tr.png
N web/html/images/favicon.ico
N web/html/images/header-download.png
N web/html/images/header-faq.png
N web/html/images/header-fedora_logo.png
N web/html/images/header-fedora_text.png
N web/html/images/header-projects.png
N web/html/images/header-search.png
N web/html/images/intro-computer.png
N web/html/images/intro-download.png
N web/html/images/intro-participate.png
N web/html/images/link-offsite-content.png
N web/html/images/link-offsite-side.png
N web/html/images/printable.png
N web/html/legal/common.inc
N web/html/legal/index.php
N web/html/licenses/beta_eula.php
N web/html/licenses/common.inc
N web/html/licenses/eula.php
N web/html/licenses/index.php
N web/html/licenses/export/common.inc
N web/html/licenses/export/index.php
N web/html/participate/common.inc
N web/html/participate/index.php
N web/html/participate/terminology.php
N web/html/participate/artwork-guide/common.inc
N web/html/participate/artwork-guide/index.php
N web/html/participate/communicate/index.php
N web/html/participate/developers-guide/ch-console-access.php
N web/html/participate/developers-guide/ch-cvs.php
N web/html/participate/developers-guide/ch-guidelines.php
N web/html/participate/developers-guide/ch-menus.php
N web/html/participate/developers-guide/ch-package-versions.php
N web/html/participate/developers-guide/ch-rpm-building.php
N web/html/participate/developers-guide/ch-ui-guidelines.php
N web/html/participate/developers-guide/common.inc
N web/html/participate/developers-guide/index.php
N web/html/participate/developers-guide/ln-legalnotice.php
N web/html/participate/developers-guide/s1-cvs-configure.php
N web/html/participate/developers-guide/s1-cvs-cvscommands.php
N web/html/participate/developers-guide/s1-rpm-guidelines.php
N web/html/participate/developers-guide/s1-rpm-more-guidelines.php
N web/html/participate/developers-guide/s1-ui-get-details.php
N web/html/participate/developers-guide/s1-ui-get-religion.php
N web/html/participate/developers-guide/s1-ui-gnome-guidelines.php
N web/html/participate/developers-guide/s1-ui-more-suggestions.php
N web/html/participate/developers-guide/s1-ui-scaling.php
N web/html/participate/developers-guide/stylesheet-images/caution.png
N web/html/participate/developers-guide/stylesheet-images/important.png
N web/html/participate/developers-guide/stylesheet-images/note.png
N web/html/participate/developers-guide/stylesheet-images/tip.png
N web/html/participate/developers-guide/stylesheet-images/warning.png
N web/html/participate/documentation-faq/index.php
N web/html/participate/documentation-guide/acknowledgments.php
N web/html/participate/documentation-guide/ch-converting.php
N web/html/participate/documentation-guide/ch-cvs.php
N web/html/participate/documentation-guide/ch-emacs-nxml.php
N web/html/participate/documentation-guide/ch-emacs.php
N web/html/participate/documentation-guide/ch-getting-files.php
N web/html/participate/documentation-guide/ch-intro.php
N web/html/participate/documentation-guide/ch-rh-guidelines.php
N web/html/participate/documentation-guide/ch-tutorial.php
N web/html/participate/documentation-guide/ch-vim.php
N web/html/participate/documentation-guide/ch-xml-tags.php
N web/html/participate/documentation-guide/common.inc
N web/html/participate/documentation-guide/generated-index.php
N web/html/participate/documentation-guide/index.php
N web/html/participate/documentation-guide/ln-legalnotice.php
N web/html/participate/documentation-guide/s1-cvs-configure.php
N web/html/participate/documentation-guide/s1-cvs-cvscommands.php
N web/html/participate/documentation-guide/s1-diagrams-images.php
N web/html/participate/documentation-guide/s1-emacs-additional-resources.php
N web/html/participate/documentation-guide/s1-emacs-basic-commands.php
N web/html/participate/documentation-guide/s1-emacs-cedfile.php
N web/html/participate/documentation-guide/s1-emacs-colors.php
N web/html/participate/documentation-guide/s1-emacs-examples.php
N web/html/participate/documentation-guide/s1-emacs-loadced.php
N web/html/participate/documentation-guide/s1-emacs-nxml-additional-resources.php
N web/html/participate/documentation-guide/s1-emacs-nxml-readme.php
N web/html/participate/documentation-guide/s1-nxml-examples.php
N web/html/participate/documentation-guide/s1-screenshots.php
N web/html/participate/documentation-guide/s1-tutorial-license.php
N web/html/participate/documentation-guide/s1-vim-additional-resources.php
N web/html/participate/documentation-guide/s1-vim-keymapping.php
N web/html/participate/documentation-guide/s1-xml-admon.php
N web/html/participate/documentation-guide/s1-xml-guidelines-header.php
N web/html/participate/documentation-guide/s1-xml-tag-sulink.php
N web/html/participate/documentation-guide/s1-xml-tags-application.php
N web/html/participate/documentation-guide/s1-xml-tags-chapter.php
N web/html/participate/documentation-guide/s1-xml-tags-citetitle.php
N web/html/participate/documentation-guide/s1-xml-tags-command.php
N web/html/participate/documentation-guide/s1-xml-tags-compoutput.php
N web/html/participate/documentation-guide/s1-xml-tags-emphasis.php
N web/html/participate/documentation-guide/s1-xml-tags-example.php
N web/html/participate/documentation-guide/s1-xml-tags-figure.php
N web/html/participate/documentation-guide/s1-xml-tags-filename.php
N web/html/participate/documentation-guide/s1-xml-tags-firstterm.php
N web/html/participate/documentation-guide/s1-xml-tags-footnote.php
N web/html/participate/documentation-guide/s1-xml-tags-gui.php
N web/html/participate/documentation-guide/s1-xml-tags-indexing.php
N web/html/participate/documentation-guide/s1-xml-tags-keycap.php
N web/html/participate/documentation-guide/s1-xml-tags-lists.php
N web/html/participate/documentation-guide/s1-xml-tags-option.php
N web/html/participate/documentation-guide/s1-xml-tags-para.php
N web/html/participate/documentation-guide/s1-xml-tags-part.php
N web/html/participate/documentation-guide/s1-xml-tags-prompt.php
N web/html/participate/documentation-guide/s1-xml-tags-replaceable.php
N web/html/participate/documentation-guide/s1-xml-tags-screen.php
N web/html/participate/documentation-guide/s1-xml-tags-sections.php
N web/html/participate/documentation-guide/s1-xml-tags-table.php
N web/html/participate/documentation-guide/s1-xml-tags-trademark.php
N web/html/participate/documentation-guide/s1-xml-tags-userinput.php
N web/html/participate/documentation-guide/s1-xml-tags-wordasword.php
N web/html/participate/documentation-guide/s1-xml-tags-xref.php
N web/html/participate/documentation-guide/stylesheet-images/caution.png
N web/html/participate/documentation-guide/stylesheet-images/important.png
N web/html/participate/documentation-guide/stylesheet-images/note.png
N web/html/participate/documentation-guide/stylesheet-images/tip.png
N web/html/participate/documentation-guide/stylesheet-images/warning.png
N web/html/participate/documentation-quick-start/index.php
N web/html/participate/qa-guide/ch-intro.php
N web/html/participate/qa-guide/common.inc
N web/html/participate/qa-guide/general-applications.php
N web/html/participate/qa-guide/index.php
N web/html/participate/qa-guide/individual-packages.php
N web/html/participate/qa-guide/infrastructure.php
N web/html/participate/qa-guide/installation.php
N web/html/participate/qa-guide/kernel.php
N web/html/participate/qa-guide/ln-legalnotice.php
N web/html/participate/qa-guide/qa-guide.pdf
N web/html/participate/qa-guide/release-engineering.php
N web/html/participate/qa-guide/toolchain.php
N web/html/participate/roadmap/index.php
N web/html/participate/schedule/fedora-project.ics
N web/html/participate/schedule/index.php
N web/html/participate/translation-faq/index.php
N web/html/participate/translation-guide/common.inc
N web/html/participate/translation-guide/index.php
N web/html/participate/translation-windows/fedora.css
N web/html/participate/translation-windows/generated-index.php
N web/html/participate/translation-windows/index.php
N web/html/participate/translation-windows/ln-legalnotice.php
N web/html/participate/translation-windows/s1-cvs.php
N web/html/participate/translation-windows/s1-cycle.php
N web/html/participate/translation-windows/s1-poedit.php
N web/html/participate/translation-windows/s1-reg.php
N web/html/participate/translation-windows/s1-resource.php
N web/html/participate/translation-windows/s1-setup.php
N web/html/participate/translation-windows/s1-ssh.php
N web/html/participate/translation-windows/figs/account/image001.jpg
N web/html/participate/translation-windows/figs/account/image002.jpg
N web/html/participate/translation-windows/figs/account/image003.jpg
N web/html/participate/translation-windows/figs/cycle/conflict.jpg
N web/html/participate/translation-windows/figs/cycle/cvs_up.jpg
N web/html/participate/translation-windows/figs/cycle/cvs_up_commit.jpg
N web/html/participate/translation-windows/figs/cycle/cvs_up_finish.jpg
N web/html/participate/translation-windows/figs/cycle/cvs_up_menu_commit.jpg
N web/html/participate/translation-windows/figs/cycle/cvs_up_modified.jpg
N web/html/participate/translation-windows/figs/cycle/fedora_assign_to_you.jpg
N web/html/participate/translation-windows/figs/cycle/fedora_assigned.jpg
N web/html/participate/translation-windows/figs/cycle/fedora_auth_denied.jpg
N web/html/participate/translation-windows/figs/cycle/fedora_login.jpg
N web/html/participate/translation-windows/figs/cycle/fedora_released.jpg
N web/html/participate/translation-windows/figs/cycle/fedora_take.jpg
N web/html/participate/translation-windows/figs/key/image001.jpg
N web/html/participate/translation-windows/figs/key/image002.jpg
N web/html/participate/translation-windows/figs/key/image003.jpg
N web/html/participate/translation-windows/figs/key/image004.jpg
N web/html/participate/translation-windows/figs/poedit/image001.jpg
N web/html/participate/translation-windows/figs/poedit/image002.jpg
N web/html/participate/translation-windows/figs/poedit/image003.jpg
N web/html/participate/translation-windows/figs/poedit/image004.jpg
N web/html/participate/translation-windows/figs/poedit/image005.jpg
N web/html/participate/translation-windows/figs/poedit/image006.jpg
N web/html/participate/translation-windows/figs/poedit/image007.jpg
N web/html/participate/translation-windows/figs/poedit/image008.jpg
N web/html/participate/translation-windows/figs/poedit/menu_preferences.jpg
N web/html/participate/translation-windows/figs/poedit/poEdit_start.jpg
N web/html/participate/translation-windows/figs/poedit/preferences.jpg
N web/html/participate/translation-windows/figs/setup/image001.jpg
N web/html/participate/translation-windows/figs/setup/image002.jpg
N web/html/participate/translation-windows/figs/setup/image003.jpg
N web/html/participate/translation-windows/figs/tortoise/cvs20.jpg
N web/html/participate/translation-windows/figs/tortoise/cvs_co.jpg
N web/html/participate/translation-windows/figs/tortoise/cvs_commit.jpg
N web/html/participate/translation-windows/figs/tortoise/cvs_cvsroot_module.jpg
N web/html/participate/translation-windows/figs/tortoise/cvs_right_click_menu.jpg
N web/html/participate/translation-windows/figs/tortoise/cvs_tortoisePlink.jpg
N web/html/participate/translation-windows/figs/tortoise/image001.jpg
N web/html/participate/translation-windows/figs/tortoise/image002.jpg
N web/html/participate/translation-windows/figs/tortoise/image003.jpg
N web/html/participate/translation-windows/figs/tortoise/image004.jpg
N web/html/participate/translation-windows/figs/tortoise/image005.jpg
N web/html/participate/translation-windows/stylesheet-images/caution.png
N web/html/participate/translation-windows/stylesheet-images/important.png
N web/html/participate/translation-windows/stylesheet-images/note.png
N web/html/participate/translation-windows/stylesheet-images/tip.png
N web/html/participate/translation-windows/stylesheet-images/warning.png
N web/html/projects/index.php
N web/html/projects/artwork/index.php
N web/html/projects/artwork/redhat-artwork.todo
N web/html/projects/additional-projects/index.php
N web/html/projects/additional-projects/benchmarks/benchmarks.todo
N web/html/projects/additional-projects/benchmarks/index.php
N web/html/projects/additional-projects/initscripts/index.php
N web/html/projects/additional-projects/kudzu/index.php
N web/html/projects/additional-projects/rhgb/index.php
N web/html/projects/anaconda-installer/common.inc
N web/html/projects/anaconda-installer/comps.php
N web/html/projects/anaconda-installer/index.php
N web/html/projects/anaconda-installer/manualtest.php
N web/html/projects/anaconda-installer/mediacheck.php
N web/html/projects/anaconda-installer/update-disks.php
N web/html/projects/anaconda-installer/images/screenshot-0000-thumb.png
N web/html/projects/anaconda-installer/images/screenshot-0000.png
N web/html/projects/anaconda-installer/images/screenshot-0001-thumb.png
N web/html/projects/anaconda-installer/images/screenshot-0001.png
N web/html/projects/anaconda-installer/images/screenshot-0002-thumb.png
N web/html/projects/anaconda-installer/images/screenshot-0002.png
N web/html/projects/anaconda-installer/images/screenshot-0003-thumb.png
N web/html/projects/anaconda-installer/images/screenshot-0003.png
N web/html/projects/anaconda-installer/images/screenshot-0004.png
N web/html/projects/config-tools/authconfig.php
N web/html/projects/config-tools/common.inc
N web/html/projects/config-tools/firstboot.php
N web/html/projects/config-tools/hwbrowser.php
N web/html/projects/config-tools/index.php
N web/html/projects/config-tools/redhat-config-bind.php
N web/html/projects/config-tools/redhat-config-date.php
N web/html/projects/config-tools/redhat-config-httpd.php
N web/html/projects/config-tools/redhat-config-keyboard.php
N web/html/projects/config-tools/redhat-config-kickstart.php
N web/html/projects/config-tools/redhat-config-language.php
N web/html/projects/config-tools/redhat-config-mouse.php
N web/html/projects/config-tools/redhat-config-network.php
N web/html/projects/config-tools/redhat-config-nfs.php
N web/html/projects/config-tools/redhat-config-packages.php
N web/html/projects/config-tools/redhat-config-printer.php
N web/html/projects/config-tools/redhat-config-rootpassword.php
N web/html/projects/config-tools/redhat-config-samba.php
N web/html/projects/config-tools/redhat-config-securitylevel.php
N web/html/projects/config-tools/redhat-config-services.php
N web/html/projects/config-tools/redhat-config-soundcard.php
N web/html/projects/config-tools/redhat-config-users.php
N web/html/projects/config-tools/redhat-config-xfree86.php
N web/html/projects/config-tools/redhat-logviewer.php
N web/html/projects/config-tools/redhat-template.todo
N web/html/projects/config-tools/template.php
N web/html/projects/config-tools/images/authconfig1-thumb.png
N web/html/projects/config-tools/images/authconfig1.png
N web/html/projects/config-tools/images/authconfig2-thumb.png
N web/html/projects/config-tools/images/authconfig2.png
N web/html/projects/config-tools/images/authconfig3-thumb.png
N web/html/projects/config-tools/images/authconfig3.png
N web/html/projects/config-tools/images/authconfig4-thumb.png
N web/html/projects/config-tools/images/authconfig4.png
N web/html/projects/config-tools/images/firstboot1-thumb.png
N web/html/projects/config-tools/images/firstboot1.png
N web/html/projects/config-tools/images/firstboot2-thumb.png
N web/html/projects/config-tools/images/firstboot2.png
N web/html/projects/config-tools/images/firstboot3-thumb.png
N web/html/projects/config-tools/images/firstboot3.png
N web/html/projects/config-tools/images/firstboot4-thumb.png
N web/html/projects/config-tools/images/firstboot4.png
N web/html/projects/config-tools/images/firstboot5-thumb.png
N web/html/projects/config-tools/images/firstboot5.png
N web/html/projects/config-tools/images/hwbrowser-thumb.png
N web/html/projects/config-tools/images/hwbrowser.png
N web/html/projects/config-tools/images/redhat-config-bind-thumb.png
N web/html/projects/config-tools/images/redhat-config-bind.png
N web/html/projects/config-tools/images/redhat-config-date1-thumb.png
N web/html/projects/config-tools/images/redhat-config-date1.png
N web/html/projects/config-tools/images/redhat-config-date2-thumb.png
N web/html/projects/config-tools/images/redhat-config-date2.png
N web/html/projects/config-tools/images/redhat-config-httpd1-thumb.png
N web/html/projects/config-tools/images/redhat-config-httpd1.png
N web/html/projects/config-tools/images/redhat-config-httpd2-thumb.png
N web/html/projects/config-tools/images/redhat-config-httpd2.png
N web/html/projects/config-tools/images/redhat-config-httpd3-thumb.png
N web/html/projects/config-tools/images/redhat-config-httpd3.png
N web/html/projects/config-tools/images/redhat-config-httpd4-thumb.png
N web/html/projects/config-tools/images/redhat-config-httpd4.png
N web/html/projects/config-tools/images/redhat-config-keyboard-thumb.png
N web/html/projects/config-tools/images/redhat-config-keyboard.png
N web/html/projects/config-tools/images/redhat-config-kickstart1-thumb.png
N web/html/projects/config-tools/images/redhat-config-kickstart1.png
N web/html/projects/config-tools/images/redhat-config-kickstart2-thumb.png
N web/html/projects/config-tools/images/redhat-config-kickstart2.png
N web/html/projects/config-tools/images/redhat-config-kickstart3-thumb.png
N web/html/projects/config-tools/images/redhat-config-kickstart3.png
N web/html/projects/config-tools/images/redhat-config-kickstart4-thumb.png
N web/html/projects/config-tools/images/redhat-config-kickstart4.png
N web/html/projects/config-tools/images/redhat-config-kickstart5-thumb.png
N web/html/projects/config-tools/images/redhat-config-kickstart5.png
N web/html/projects/config-tools/images/redhat-config-kickstart6-thumb.png
N web/html/projects/config-tools/images/redhat-config-kickstart6.png
N web/html/projects/config-tools/images/redhat-config-language-thumb.png
N web/html/projects/config-tools/images/redhat-config-language.png
N web/html/projects/config-tools/images/redhat-config-mouse-thumb.png
N web/html/projects/config-tools/images/redhat-config-mouse.png
N web/html/projects/config-tools/images/redhat-config-network1-thumb.png
N web/html/projects/config-tools/images/redhat-config-network1.png
N web/html/projects/config-tools/images/redhat-config-network2-thumb.png
N web/html/projects/config-tools/images/redhat-config-network2.png
N web/html/projects/config-tools/images/redhat-config-network3-thumb.png
N web/html/projects/config-tools/images/redhat-config-network3.png
N web/html/projects/config-tools/images/redhat-config-network4-thumb.png
N web/html/projects/config-tools/images/redhat-config-network4.png
N web/html/projects/config-tools/images/redhat-config-nfs-thumb.png
N web/html/projects/config-tools/images/redhat-config-nfs.png
N web/html/projects/config-tools/images/redhat-config-packages-thumb.png
N web/html/projects/config-tools/images/redhat-config-packages.png
N web/html/projects/config-tools/images/redhat-config-printer-thumb.png
N web/html/projects/config-tools/images/redhat-config-printer.png
N web/html/projects/config-tools/images/redhat-config-rootpassword-thumb.png
N web/html/projects/config-tools/images/redhat-config-rootpassword.png
N web/html/projects/config-tools/images/redhat-config-samba-thumb.png
N web/html/projects/config-tools/images/redhat-config-samba.png
N web/html/projects/config-tools/images/redhat-config-securitylevel-thumb.png
N web/html/projects/config-tools/images/redhat-config-securitylevel.png
N web/html/projects/config-tools/images/redhat-config-services-thumb.png
N web/html/projects/config-tools/images/redhat-config-services.png
N web/html/projects/config-tools/images/redhat-config-soundcard1-thumb.png
N web/html/projects/config-tools/images/redhat-config-soundcard1.png
N web/html/projects/config-tools/images/redhat-config-soundcard2-thumb.png
N web/html/projects/config-tools/images/redhat-config-soundcard2.png
N web/html/projects/config-tools/images/redhat-config-users-thumb.png
N web/html/projects/config-tools/images/redhat-config-users.png
N web/html/projects/config-tools/images/redhat-config-xfree86-1-thumb.png
N web/html/projects/config-tools/images/redhat-config-xfree86-1.png
N web/html/projects/config-tools/images/redhat-config-xfree86-2-thumb.png
N web/html/projects/config-tools/images/redhat-config-xfree86-2.png
N web/html/projects/config-tools/images/redhat-config-xfree86-3-thumb.png
N web/html/projects/config-tools/images/redhat-config-xfree86-3.png
N web/html/projects/config-tools/images/redhat-logviewer-thumb.png
N web/html/projects/config-tools/images/redhat-logviewer.png
N web/html/projects/config-tools/specs/redhat-config-packages/AddGroup.png
N web/html/projects/config-tools/specs/redhat-config-packages/AddPackage.png
N web/html/projects/config-tools/specs/redhat-config-packages/RemovePackage.png
N web/html/projects/config-tools/specs/redhat-config-packages/index.php
N web/html/projects/config-tools/specs/redhat-config-packages/preferences-locations.png
N web/html/projects/config-tools/specs/redhat-config-packages/preferences-noupgrade.png
N web/html/projects/config-tools/specs/redhat-config-packages/preferences-proxy.png
N web/html/projects/config-tools/specs/redhat-config-packages/redhat-config-packages-flowchart.png
N web/html/projects/config-tools/specs/redhat-config-packages/software-updates.png
N web/html/projects/desktop/common.inc
N web/html/projects/desktop/defaults.php
N web/html/projects/desktop/index.php
N web/html/projects/desktop/mozilla/index.php
N web/html/projects/desktop/mozilla/plugins-fc1.php
N web/html/projects/docs/index.php
N web/html/projects/i18n/iiimf-faq.php
N web/html/projects/i18n/index.php
N web/html/projects/qa/index.php
N web/html/projects/selinux/index.php
N web/html/projects/stateless/index.php
N web/html/projects/translations/index.php
N web/html/projects/virtualisation/index.php
N web/html/projects/virtualization/index.php
N web/html/stylesheet-images/caution.png
N web/html/stylesheet-images/important.png
N web/html/stylesheet-images/note.png
N web/html/stylesheet-images/tip.png
N web/html/stylesheet-images/warning.png
N web/include/navigation.inc
N web/include/project.inc
N web/include/site.inc
N web/include/template.inc
N web/include/utils.inc
N web/include/vendors.inc
N web/include/widgets.inc
N web/scripts/docbookhtml2php.py
N web/scripts/dotphp2dothtml.sh
N web/scripts/listnotice.py
N web/scripts/makehtml.sh
N web/scripts/makepackagelist.sh
N web/scripts/mangle.sh
N web/scripts/test-html.sh
N web/scripts/websync
N web/template-mockup/column_1.html
N web/template-mockup/column_2.html
N web/template-mockup/column_3.html
N web/template-mockup/corner-bl.png
N web/template-mockup/corner-br.png
N web/template-mockup/corner-tl.png
N web/template-mockup/corner-tr.png
N web/template-mockup/layout.css
N web/template-mockup/style.css

No conflicts created by this import




From fedora-extras-commits at redhat.com  Wed Mar 30 17:52:20 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 30 Mar 2005 12:52:20 -0500
Subject: CVSROOT config,1.1,1.2
Message-ID: <200503301752.j2UHqKbv014448@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14436

Modified Files:
	config 
Log Message:
sync





From fedora-extras-commits at redhat.com  Wed Mar 30 18:17:03 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 30 Mar 2005 13:17:03 -0500
Subject: CVSROOT avail,1.1,1.2
Message-ID: <200503301817.j2UIH3on015450@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15438

Modified Files:
	avail 
Log Message:


Add ACLs for 'web' module.



Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avail	25 Feb 2005 00:23:03 -0000	1.1
+++ avail	30 Mar 2005 18:17:01 -0000	1.2
@@ -16,3 +16,27 @@
 avail | gafton,notting,sopwith,wtogami,katzj | CVSROOT
 # trusted developers that can add modules
 avail | | CVSROOT/modules
+
+# Fedora Web site
+unavail | | web
+avail | gafton,tfox,notting,sopwith,gdk | web
+avail | havill,hp,bennet | web
+avail | katzj | web/html/projects/anaconda-installer
+avail | bfox | web/html/projects/config-tools
+avail | blizzard,krh | web/html/projects/desktop
+avail | wcohen | web/html/projects/additional-projects/benchmarks
+avail | sopwith,dwalsh,kwade | web/html/projects/selinux
+avail | ezannoni | web/html/projects/additional-projects/gdb
+avail | alikins | web/html/download
+avail | llch | web/html/projects/i18n
+avail | sarahs | web/html/projects/translations
+avail | harald | web/html/projects/config-tools
+avail | kwade | web/html/docs
+avail | sarahs | web/html/participate/translation-faq
+avail | sarahs | web/html/participate/translation-guide
+avail | sarahs | web/html/participate/translation-windows
+avail | dmalcolm | web/html/projects/stateless
+avail | dmalcolm | web/html/docs/stateless
+avail | riel | web/html/docs/virtualisation
+avail | riel | web/html/projects/virtualisation
+avail | harald | web/html/docs/udev



From fedora-extras-commits at redhat.com  Wed Mar 30 19:46:33 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 30 Mar 2005 14:46:33 -0500
Subject: devel/jabberd jabberd, 1.4, 1.5 jabberd.spec, 1.7,
	1.8 jabberd.sysconfig, 1.2, 1.3
Message-ID: <200503301946.j2UJkXQj016568@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16562

Modified Files:
	jabberd jabberd.spec jabberd.sysconfig 
Log Message:
* c2s isn't suid anymore
* added option to start as root if required



Index: jabberd
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jabberd	28 Mar 2005 17:35:56 -0000	1.4
+++ jabberd	30 Mar 2005 19:46:31 -0000	1.5
@@ -71,7 +71,15 @@
 		rm -f /var/lock/subsys/${prog}
 		rm -f ${pidPath}/${prog}.pid
 		args="-c ${confPath}/${prog}.xml"
-		daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
+		if [ ${prog} == "c2s" -a ! -z "$C2S_AS_ROOT" ]; then
+			if [ $C2S_AS_ROOT == "yes" ]; then
+				daemon --user root "${progsPath}/${prog} ${args} & 2> /dev/null"
+			else
+				daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
+			fi
+		else
+			daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
+		fi
 		retval=$?
 		echo
 		if [ ${retval} == 0 ]; then


Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jabberd.spec	28 Mar 2005 17:35:03 -0000	1.7
+++ jabberd.spec	30 Mar 2005 19:46:31 -0000	1.8
@@ -109,6 +109,9 @@
 # we have our own start script
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/jabberd
 
+# we have our own start script
+%{__rm} $RPM_BUILD_ROOT%{sysconfdir}/jabberd.cfg*
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -159,11 +162,7 @@
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README PROTOCOL TODO
-%attr(4755, root, root) %{_bindir}/c2s
-%{_bindir}/router
-%{_bindir}/resolver
-%{_bindir}/s2s
-%{_bindir}/sm
+%{_bindir}/*
 %attr(750, jabber, jabber) %dir %{sysconfdir}/
 %attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/*
 %{_datadir}/man/man8/*
@@ -186,6 +185,8 @@
 - combined some of the sed magic
 - added a jabberd file in sysconfig to control if all daemons
   should be started
+- don't suid c2s and add config option in sysconfig/jabberd
+  to start c2s as root if required to authenticate against pam/shadow
 
 * Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
 - made password more random (/dev/random)


Index: jabberd.sysconfig
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jabberd.sysconfig	28 Mar 2005 17:34:04 -0000	1.2
+++ jabberd.sysconfig	30 Mar 2005 19:46:31 -0000	1.3
@@ -13,3 +13,7 @@
 # * s2s (Server to Server)
 #
 START_DAEMONS="router resolver sm c2s s2s"
+
+# set C2S_AS_ROOT to "yes" to start c2s as root
+# this can be necessary if c2s needs to authenticate against pam/shadow
+C2S_AS_ROOT="no"



From fedora-extras-commits at redhat.com  Wed Mar 30 20:16:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 15:16:01 -0500
Subject: devel/fyre fyre.spec,1.2,1.3
Message-ID: <200503302016.j2UKG1YU017515@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/fyre
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17508

Modified Files:
	fyre.spec 
Log Message:
Disabled OpenEXR and GNet and removed gtk2-devel from BuildRequires


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/devel/fyre/fyre.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fyre.spec	25 Mar 2005 16:40:16 -0000	1.2
+++ fyre.spec	30 Mar 2005 20:15:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           fyre
 Version:        1.0.0
-Release:        3
+Release:        4
 Summary:        A tool for creating artwork from chaotic functions
 
 Group:          Amusements/Graphics
@@ -10,7 +10,7 @@
 Patch:          fyre-1.0.0-apps.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel libglade2-devel desktop-file-utils
+BuildRequires:  libglade2-devel desktop-file-utils
 Requires(post): desktop-file-utils shared-mime-info
 Requires(postun): desktop-file-utils shared-mime-info
 
@@ -26,7 +26,7 @@
 %patch -p 1 -b .apps
 
 %build
-%configure
+%configure --disable-openexr --disable-gnet
 make %{?_smp_mflags}
 
 %install
@@ -61,6 +61,10 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Wed Mar 30 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-4
+- Disabled OpenEXR and GNet in %%configure
+- Removed gtk2-devel from BuildRequires
+
 * Fri Mar 25 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-3
 - Removed NEWS
 - Added || : to %%post* commands



From fedora-extras-commits at redhat.com  Wed Mar 30 20:18:28 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 15:18:28 -0500
Subject: rpms/python-amara/FC-3 python-amara.spec,1.6,1.7
Message-ID: <200503302018.j2UKIS93017559@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17549/FC-3

Modified Files:
	python-amara.spec 
Log Message:
Added disttag


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/rpms/python-amara/FC-3/python-amara.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-amara.spec	19 Mar 2005 17:52:45 -0000	1.6
+++ python-amara.spec	30 Mar 2005 20:18:26 -0000	1.7
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        0.9.4
-Release:        6
+Release:        6.fc3
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 %doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
+* Wed Mar 30 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-6.fc3
+- Added disttag
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-6
 - %%
 



From fedora-extras-commits at redhat.com  Wed Mar 30 20:18:28 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 15:18:28 -0500
Subject: rpms/python-amara/devel python-amara.spec,1.6,1.7
Message-ID: <200503302018.j2UKIS1h017562@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17549/devel

Modified Files:
	python-amara.spec 
Log Message:
Added disttag


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/rpms/python-amara/devel/python-amara.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-amara.spec	19 Mar 2005 17:52:45 -0000	1.6
+++ python-amara.spec	30 Mar 2005 20:18:26 -0000	1.7
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        0.9.4
-Release:        6
+Release:        6.fc4
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 %doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
+* Wed Mar 30 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-6.fc4
+- Added disttag
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-6
 - %%
 



From fedora-extras-commits at redhat.com  Wed Mar 30 20:20:45 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 15:20:45 -0500
Subject: rpms/python-HTMLgen/FC-3 python-HTMLgen.spec,1.7,1.8
Message-ID: <200503302020.j2UKKjcM017618@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17609/FC-3

Modified Files:
	python-HTMLgen.spec 
Log Message:
Added disttag


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/rpms/python-HTMLgen/FC-3/python-HTMLgen.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-HTMLgen.spec	19 Mar 2005 17:52:45 -0000	1.7
+++ python-HTMLgen.spec	30 Mar 2005 20:20:43 -0000	1.8
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        2.2.2
-Release:        6
+Release:        6.fc3
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 %{python_sitelib}/*.py[co]
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-6.fc3
+- Added disttag
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-6
 - %%
 



From fedora-extras-commits at redhat.com  Wed Mar 30 20:20:45 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 15:20:45 -0500
Subject: rpms/python-HTMLgen/devel python-HTMLgen.spec,1.7,1.8
Message-ID: <200503302020.j2UKKjXs017622@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17609/devel

Modified Files:
	python-HTMLgen.spec 
Log Message:
Added disttag


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/rpms/python-HTMLgen/devel/python-HTMLgen.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-HTMLgen.spec	19 Mar 2005 17:52:45 -0000	1.7
+++ python-HTMLgen.spec	30 Mar 2005 20:20:43 -0000	1.8
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        2.2.2
-Release:        6
+Release:        6.fc4
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 %{python_sitelib}/*.py[co]
 
 %changelog
+* Wed Mar 30 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-6.fc4
+- Added disttag
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-6
 - %%
 



From ivazquez at ivazquez.net  Wed Mar 30 21:06:03 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Wed, 30 Mar 2005 16:06:03 -0500
Subject: APPROVED: fyre
Message-ID: <1112216763.8866.15.camel@ignacio.ignacio.lan>

fyre: A tool for creating artwork from chaotic functions

Fyre is a tool for producing computational artwork based on histograms
of iterated chaotic functions. At the moment, it implements the Peter de
Jong map in a fixed-function pipeline with an interactive GTK+ frontend
and a command line interface for easy and efficient rendering of high-
resolution, high quality images.

Reviewers: Kevin Fenzi, Brian Pepple
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/

gpg --keyserver hkp://subkeys.pgp.net --recv-key 38028b72
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050330/59da5198/attachment.sig>

From fedora-extras-commits at redhat.com  Thu Mar 31 00:30:54 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 30 Mar 2005 19:30:54 -0500
Subject: rpms/sylpheed/devel .cvsignore, 1.3.2.1, 1.3.2.2 sources, 1.3.2.1,
	1.3.2.2 sylpheed.spec, 1.6.2.1,
	1.6.2.2 sylpheed-1.0.3-draftsegf.patch, 1.1, NONE
Message-ID: <200503310030.j2V0UsiI022234@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22228

Modified Files:
      Tag: sylpheed-1_9_6-devel
	.cvsignore sources sylpheed.spec 
Removed Files:
      Tag: sylpheed-1_9_6-devel
	sylpheed-1.0.3-draftsegf.patch 
Log Message:
* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.7-1
- Update to 1.9.7.
- Patch4 (draftsegf) merged upstream.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- .cvsignore	21 Mar 2005 21:44:51 -0000	1.3.2.1
+++ .cvsignore	31 Mar 2005 00:30:52 -0000	1.3.2.2
@@ -1 +1 @@
-sylpheed-1.9.6.tar.bz2
+sylpheed-1.9.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- sources	21 Mar 2005 21:44:51 -0000	1.3.2.1
+++ sources	31 Mar 2005 00:30:52 -0000	1.3.2.2
@@ -1 +1 @@
-1cdee69bd724f20786e5390891eb4c23  sylpheed-1.9.6.tar.bz2
+ef5ddd410cf19007a502f44274bee04c  sylpheed-1.9.7.tar.bz2


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- sylpheed.spec	21 Mar 2005 21:44:51 -0000	1.6.2.1
+++ sylpheed.spec	31 Mar 2005 00:30:52 -0000	1.6.2.2
@@ -4,7 +4,7 @@
 
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 1.9.6
+Version: 1.9.7
 Release: 1
 License: GPL
 URL: http://sylpheed.good-day.net/
@@ -24,7 +24,6 @@
 Patch1: sylpheed-1.9.6-ssl.patch
 Patch2: sylpheed-default-browser.patch
 Patch3: sylpheed-1.0.3-desktop.patch
-Patch4: sylpheed-1.0.3-draftsegf.patch
 
 %description
 This program is an X based fast email client which has features
@@ -47,7 +46,6 @@
 %patch1 -p1 -b .ssl
 %patch2 -p1 -b .default-browser
 %patch3 -p1 -b .desktop
-%patch4 -p1 -b .draftsegf
 
 %build
 autoconf
@@ -89,6 +87,10 @@
 %{_mandir}/man1
 
 %changelog
+* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.7-1
+- Update to 1.9.7.
+- Patch4 (draftsegf) merged upstream.
+
 * Sun Mar 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.6-1
 - Update to 1.9.6 development release for testing purposes.
 


--- sylpheed-1.0.3-draftsegf.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar 31 02:52:56 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 21:52:56 -0500
Subject: rpms/feh - New directory
Message-ID: <200503310252.j2V2qui6024565@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/feh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24558/feh

Log Message:
Directory /cvs/extras/rpms/feh added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 31 02:52:56 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 21:52:56 -0500
Subject: rpms/feh/devel - New directory
Message-ID: <200503310252.j2V2qutb024568@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/feh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24558/feh/devel

Log Message:
Directory /cvs/extras/rpms/feh/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 31 02:53:10 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 21:53:10 -0500
Subject: rpms/feh Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503310253.j2V2rAUa024633@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/feh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24624

Added Files:
	Makefile import.log 
Log Message:
Setup of module feh


--- NEW FILE Makefile ---
# Top level Makefile for module feh
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 31 02:53:10 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 21:53:10 -0500
Subject: rpms/feh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503310253.j2V2rAZU024636@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/feh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24624/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module feh


--- 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 Mar 31 02:53:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 21:53:39 -0500
Subject: rpms/feh import.log,1.1,1.2
Message-ID: <200503310253.j2V2rdda024736@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/feh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24726

Modified Files:
	import.log 
Log Message:
auto-import feh-1.3.0-2 on branch devel from feh-1.3.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/feh/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Mar 2005 02:53:08 -0000	1.1
+++ import.log	31 Mar 2005 02:53:37 -0000	1.2
@@ -0,0 +1 @@
+feh-1_3_0-2:HEAD:feh-1.3.0-2.src.rpm:1112237613



From fedora-extras-commits at redhat.com  Thu Mar 31 02:53:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 21:53:39 -0500
Subject: rpms/feh/devel feh.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200503310253.j2V2rdNA024739@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/feh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24726/devel

Modified Files:
	.cvsignore sources 
Added Files:
	feh.spec 
Log Message:
auto-import feh-1.3.0-2 on branch devel from feh-1.3.0-2.src.rpm


--- NEW FILE feh.spec ---
Name:         	feh 
Version:        1.3.0
Release:        2
Summary:        Image viewer using Imlib2

Group:          Applications/Multimedia
License:        BSD
URL:            http://linuxbrit.co.uk/feh/
Source0:        http://linuxbrit.co.uk/feh/feh-1.3.0.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: giblib-devel imlib2-devel libjpeg-devel libpng-devel

%description
feh is a versatile and fast image viewer using imlib2, the
premier image file handling library. feh has many features,
from simple single file viewing, to multiple file modes using
a slideshow or multiple windows. feh supports the creation of
montages as index prints with many user-configurable options.

%prep
%setup -q


%build
%configure
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 {} ';'
rm -rf $RPM_BUILD_ROOT/usr/doc

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/man[^3]/*

%changelog
* Wed May 30 2005 Aaron Kurtz <a.kurtz at hardsun.net> - 0:1.3.0-2
  Spec file cleanup, plus would upgrade linuxbrit rpm.

* Fri May 25 2005 Aaron Kurtz <a.kurtz at hardsun.net> - 0:1.3.0-1
- Initial Fedora RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/feh/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Mar 2005 02:53:08 -0000	1.1
+++ .cvsignore	31 Mar 2005 02:53:37 -0000	1.2
@@ -0,0 +1 @@
+feh-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/feh/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Mar 2005 02:53:08 -0000	1.1
+++ sources	31 Mar 2005 02:53:37 -0000	1.2
@@ -0,0 +1 @@
+41cbfbd0c1535a7162d199cf2d448f5b  feh-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 31 03:04:06 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 30 Mar 2005 22:04:06 -0500
Subject: devel/gnotime gnotime-gtkhtml3.6-qof.patch, NONE, 1.1 gnotime.spec,
	1.4, 1.5 gnotime-gtkhtml3-qof.patch, 1.1, NONE
Message-ID: <200503310304.j2V3466k025718@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/devel/gnotime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25712

Modified Files:
	gnotime.spec 
Added Files:
	gnotime-gtkhtml3.6-qof.patch 
Removed Files:
	gnotime-gtkhtml3-qof.patch 
Log Message:
* Fix scriptlets for gconf schema install/uninstall.
* Fix gtkhtml3 detection so 3.6 is detected.


gnotime-gtkhtml3.6-qof.patch:

--- NEW FILE gnotime-gtkhtml3.6-qof.patch ---
Index: configure.in
===================================================================
RCS file: /cvsroot/gttr/gnotime/configure.in,v
retrieving revision 1.44
diff -u -r1.44 configure.in
--- configure.in	23 May 2004 21:15:00 -0000	1.44
+++ configure.in	20 Jul 2004 18:36:02 -0000
@@ -50,6 +50,8 @@
 LIBGTKHTML_REQUIRED=3.0.0
 LIBXML2_REQUIRED=2.0.0
 SCROLLKEEPER_BUILD_REQUIRED=0.3.5
+LIBQOF_REQUIRED_MIN=0.5.0
+LIBQOF_REQUIRED_MAX=0.5.0
 
 dnl *******************************
 dnl Guile checks
@@ -167,7 +169,12 @@
 dnl gtkhtml
 dnl *******************************
 
-PKG_CHECK_MODULES(LIBGTKHTML, libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED)
+for GTKHTMLVER in 3.6 3.5 3.4 3.2 3.1 3.0; do
+  if $PKG_CONFIG --exists libgtkhtml-$GTKHTMLVER; then
+    PKG_CHECK_MODULES(LIBGTKHTML, libgtkhtml-$GTKHTMLVER >= $LIBGTKHTML_REQUIRED)
+    break
+  fi
+done
 AC_SUBST(LIBGTKHTML_CFLAGS)
 AC_SUBST(LIBGTKHTML_LIBS)
 
@@ -182,6 +189,42 @@
 AC_SUBST(LIBXML2_LIBS)
 
 dnl *****************************
+dnl libqof
+dnl *****************************
+
+AC_ARG_WITH(system-qof,
+AC_HELP_STRING([--with-system-qof],
+[use installed libqof rather than the bundled one.  If not specified, configure will use the system qof if installed, otherwise its own.]),
+
+[
+if test x$withval = "xyes"; then
+	PKG_CHECK_MODULES(LIBQOF, qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX)
+	qofbuild=no
+else
+	AC_MSG_NOTICE([Using internal libqof])
+	LIBQOF_CFLAGS='-I$(top_srcdir)/lib -I$(top_srcdir)/lib/qof'
+	LIBQOF_LIBS='$(top_builddir)/lib/qof/libqof.la $(top_builddir)/lib/libqofsql/libqofsql.la'
+	qofbuild=yes
+fi
+],
+[
+if $PKG_CONFIG --exists "qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX"; then
+	PKG_CHECK_MODULES(LIBQOF, qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX)
+	qofbuild=no
+else
+	AC_MSG_NOTICE([Using internal libqof])
+	LIBQOF_CFLAGS='-I$(top_srcdir)/lib -I$(top_srcdir)/lib/qof'
+	LIBQOF_LIBS='$(top_builddir)/lib/qof/libqof.la $(top_builddir)/lib/libqofsql/libqofsql.la'
+	qofbuild=yes
+fi
+])
+
+AM_CONDITIONAL(QOFBUILD, test x$qofbuild = xyes)
+
+AC_SUBST(LIBQOF_CFLAGS)
+AC_SUBST(LIBQOF_LIBS)
+
+dnl *****************************
 dnl scrollkeeper
 dnl *****************************
 dnl To substitute into the gnotime.spec
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/gttr/gnotime/src/Makefile.am,v
retrieving revision 1.28
--- src/Makefile.am	24 Apr 2004 00:39:56 -0000	1.28
+++ src/Makefile.am	20 Jul 2004 18:36:02 -0000
@@ -91,11 +91,10 @@
 	${LIBGNOMEVFS_CFLAGS} \
 	${LIBGTKHTML_CFLAGS}  \
 	${LIBGLADE_CFLAGS}    \
+	${LIBQOF_CFLAGS}      \
 	${LIBXML2_CFLAGS}
 
 INCLUDES =                                   \
-	-I../lib                                  \
-	-I../lib/qof                              \
 	-I$(includedir)                           \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"  \
 	-DGTTGLADEDIR=\""$(datadir)/gnotime"\"    \
@@ -109,8 +108,7 @@
 						 
 gnotime_LDADD =         \
 	$(GNOTIME_LIBS)      \
-	../lib/qof/libqof.la \
-	../lib/libqofsql/libqofsql.la \
+	$(LIBQOF_LIBS)	     \
 	$(LIBGLADE_LIBS)     \
 	$(LIBGTKHTML_LIBS)   \
 	${LIBGNOMEVFS_LIBS}  \
@@ -125,7 +123,3 @@
 	down.xpm		\
 	left.xpm		\
 	design.txt
-
-
-                                                                                
-
Index: lib/libqofsql/Makefile.am
===================================================================
RCS file: /cvsroot/gttr/gnotime/lib/libqofsql/Makefile.am,v
retrieving revision 1.1
--- lib/libqofsql/Makefile.am	9 Apr 2004 04:58:52 -0000	1.1
+++ lib/libqofsql/Makefile.am	20 Jul 2004 18:36:02 -0000
@@ -1,6 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 
+if QOFBUILD
 lib_LTLIBRARIES = libqofsql.la
+noinst_PROGRAMS = sql_parse_test
+endif
 
 libqofsql_la_SOURCES = \
 	parser.c \
@@ -15,9 +18,11 @@
 	sql_tree.h
 
 qofsqlincludedir = ${pkgincludedir}
+if QOFBUILD
 qofsqlinclude_HEADERS = sql_parser.h
-
-noinst_PROGRAMS = sql_parse_test
+else
+noinst_HEADERS = sql_parser.h
+endif
 
 EXTRA_DIST =       \
 	.cvsignore      \
Index: lib/qof/Makefile.am
===================================================================
RCS file: /cvsroot/gttr/gnotime/lib/qof/Makefile.am,v
retrieving revision 1.7
--- lib/qof/Makefile.am	3 May 2004 03:46:59 -0000	1.7
+++ lib/qof/Makefile.am	20 Jul 2004 18:36:03 -0000
@@ -1,7 +1,8 @@
 
 # pkglib_LTLIBRARIES = libqof.la
-
+if QOFBUILD
 lib_LTLIBRARIES = libqof.la
+endif
 
 libqof_la_SOURCES =  \
    gnc-date.c        \
@@ -28,7 +29,7 @@
    qofsql.c
 
 qofincludedir = ${pkgincludedir}
-qofinclude_HEADERS = \
+public_headers = \
    gnc-date.h        \
    gnc-engine-util.h \
    gnc-numeric.h     \
@@ -67,7 +68,14 @@
    qofquerycore-p.h   \
    qofsession-p.h
 
-   
+if QOFBUILD
+qofinclude_HEADERS = \
+	$(public_headers)
+else
+noinst_HEADERS += \
+	$(public_headers)
+endif
+
 EXTRA_DIST =          \
 	README             \
    .cvsignore
@@ -83,6 +91,3 @@
    -I$(includedir)             \
    -DPREFIX=\""$(prefix)"\"    \
    -DDATADIR=\""$(datadir)"\" 
-                   
-
-


Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/devel/gnotime/gnotime.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnotime.spec	5 Mar 2005 21:10:21 -0000	1.4
+++ gnotime.spec	31 Mar 2005 03:04:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.2.1
-Release:        5
+Release:        6
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
@@ -14,7 +14,7 @@
 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-qof.patch
+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.
@@ -100,16 +100,34 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule \
+    %{_syscondir}/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
+
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCES
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/gnotime.schemas &>/dev/null || :
+unset GCONF_CONFIG_SOURCE
+killall -HUP gconfd-2 || :
 scrollkeeper-update -q -o %{_datadir}/omf/gnotime || :
 
 %preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCE
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule \
+    %{_sysconfdir}/gconf/schemas/gnotime.schemas &> /dev/null || :
+  unset GCONF_CONFIG_SOURCE
+  killall -HUP gconfd-2 || :
+fi
 
 %postun
 scrollkeeper-update -q || :
@@ -125,6 +143,12 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sat Mar 19 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-6
+- Rebuild for FC4t1
+- Fix up scriptlets to properly install and uninstall gconf schemas via
+  gconftool-2.
+- Fix gtkhtml3 detection so 3.6 (as used in FC4) is detected.
+
 * Sat Nov 27 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-5
 - Patch to fix a crash when invoking gnome_help.
 - Patch to wordwrap diary notes.


--- gnotime-gtkhtml3-qof.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar 31 03:48:10 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 30 Mar 2005 22:48:10 -0500
Subject: devel/gnotime gnotime.spec,1.5,1.6
Message-ID: <200503310348.j2V3mAR7025867@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/devel/gnotime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25861

Modified Files:
	gnotime.spec 
Log Message:
Correct typo in %pre.



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/devel/gnotime/gnotime.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnotime.spec	31 Mar 2005 03:04:04 -0000	1.5
+++ gnotime.spec	31 Mar 2005 03:48:08 -0000	1.6
@@ -104,7 +104,7 @@
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
-    %{_syscondir}/gconf/schemas/gnotime.schemas &> /dev/null || :
+    %{_sysconfdir}/gconf/schemas/gnotime.schemas &> /dev/null || :
   # If applicable:
   # gconftool-2 --makefile-uninstall-rule \
   #  %{_sysconfdir}/gconf/schemas/OLDSCHEMA.schemas &> /dev/null || :



From fedora-extras-commits at redhat.com  Thu Mar 31 03:56:05 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 30 Mar 2005 22:56:05 -0500
Subject: devel/gnotime gnotime.spec,1.6,1.7
Message-ID: <200503310356.j2V3u5S5025943@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/devel/gnotime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25935

Modified Files:
	gnotime.spec 
Log Message:
Bump release to 2.2.1-7 as I can't seem to move the 2.2.1-6 tag to HEAD.



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/devel/gnotime/gnotime.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnotime.spec	31 Mar 2005 03:48:08 -0000	1.6
+++ gnotime.spec	31 Mar 2005 03:56:03 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.2.1
-Release:        6
+Release:        7
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
@@ -143,8 +143,11 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Wed Mar 30 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-7
+- Rebuild for FC4t1.
+- Fix typo in the %%pre scriptlet.
+  
 * Sat Mar 19 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-6
-- Rebuild for FC4t1
 - Fix up scriptlets to properly install and uninstall gconf schemas via
   gconftool-2.
 - Fix gtkhtml3 detection so 3.6 (as used in FC4) is detected.



From fedora-extras-commits at redhat.com  Thu Mar 31 04:08:13 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 30 Mar 2005 23:08:13 -0500
Subject: devel/gnotime gnotime.spec,1.7,1.8
Message-ID: <200503310408.j2V48DeT026929@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/devel/gnotime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26923

Modified Files:
	gnotime.spec 
Log Message:
Requires(pre) GConf2



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/devel/gnotime/gnotime.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnotime.spec	31 Mar 2005 03:56:03 -0000	1.7
+++ gnotime.spec	31 Mar 2005 04:08:11 -0000	1.8
@@ -42,6 +42,7 @@
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
+Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -146,6 +147,7 @@
 * Wed Mar 30 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-7
 - Rebuild for FC4t1.
 - Fix typo in the %%pre scriptlet.
+- Require(pre): GConf2.
   
 * Sat Mar 19 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-6
 - Fix up scriptlets to properly install and uninstall gconf schemas via



From fedora-extras-commits at redhat.com  Thu Mar 31 10:53:16 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 31 Mar 2005 05:53:16 -0500
Subject: devel/sylpheed-claws .cvsignore, 1.4, 1.5 sources, 1.5,
	1.6 sylpheed-claws.spec, 1.9, 1.10
Message-ID: <200503311053.j2VArGDM002174@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/devel/sylpheed-claws
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2168

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- Version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Mar 2005 23:44:32 -0000	1.4
+++ .cvsignore	31 Mar 2005 10:53:14 -0000	1.5
@@ -1 +1 @@
-sylpheed-claws-1.0.3.tar.bz2
+sylpheed-claws-1.0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Mar 2005 23:44:32 -0000	1.5
+++ sources	31 Mar 2005 10:53:14 -0000	1.6
@@ -1 +1 @@
-dba57595e89eef963a932ed5ea39c2a2  sylpheed-claws-1.0.3.tar.bz2
+ac473de7189a4a9baecf16b72c34dff4  sylpheed-claws-1.0.4.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/sylpheed-claws.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sylpheed-claws.spec	23 Mar 2005 23:44:32 -0000	1.9
+++ sylpheed-claws.spec	31 Mar 2005 10:53:14 -0000	1.10
@@ -4,13 +4,13 @@
 %define         aspellver     %(rpm -q --qf "%%{version}" aspell)
 
 Name:           sylpheed-claws
-Version:        1.0.3
+Version:        1.0.4
 Release:        1
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.3.tar.bz2
+Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.4.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -113,9 +113,14 @@
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 
 %changelog
+* Thu Mar 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.0.4-1
+- Version upgrade
+
 * Wed Mar 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.0.3-1
 - Version upgrade
+
 * Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.1-3
 - Don't include static libs in plugin directory.
 - Set --with-gpgme-prefix to use relocated gpgme03 package contents.



From fedora-extras-commits at redhat.com  Thu Mar 31 19:11:55 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Thu, 31 Mar 2005 14:11:55 -0500
Subject: extras-buildsys-temp/etc/dist.d fedora-3-i386, 1.1.1.1,
	1.2 fedora-3-x86_64, 1.1.1.1, 1.2 fedora-development-i386, 1.2,
	1.3 fedora-development-ppc, 1.1.1.1,
	1.2 fedora-development-x86_64, 1.2, 1.3
Message-ID: <200503311911.j2VJBtHU011748@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/fedora/extras-buildsys-temp/etc/dist.d
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11728

Modified Files:
	fedora-3-i386 fedora-3-x86_64 fedora-development-i386 
	fedora-development-ppc fedora-development-x86_64 
Log Message:
add -extras config for 3, change name from -extras-stable to -extras to match
more with current naming



Index: fedora-3-i386
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/etc/dist.d/fedora-3-i386,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-3-i386	21 Mar 2005 20:49:35 -0000	1.1.1.1
+++ fedora-3-i386	31 Mar 2005 19:11:53 -0000	1.2
@@ -30,5 +30,13 @@
 
 # FC3 roots should use runuser instead of su
 config['fedora-3-i386-core'] = {'runuser': '/sbin/runuser'}
+config['fedora-3-i386-extras'] = {'runuser': '/sbin/runuser'}
+
+# Fedora Core 3 with Extras
+packages['fedora-3-i386-extras'] = packages['fedora-3-i386-core'].copy ()
+groups['fedora-3-i386-extras'] = groups['fedora-3-i386-core'].copy ()
+sourceslist['fedora-3-i386-extras'] = {
+    'fedoracore-3-i386': ('core', 'buildgroups', 'extras', )
+
 
 


Index: fedora-3-x86_64
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/etc/dist.d/fedora-3-x86_64,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-3-x86_64	21 Mar 2005 20:49:35 -0000	1.1.1.1
+++ fedora-3-x86_64	31 Mar 2005 19:11:53 -0000	1.2
@@ -30,5 +30,12 @@
 
 # FC3 roots should use runuser instead of su
 config['fedora-3-x86_64-core'] = {'runuser': '/sbin/runuser'}
+config['fedora-3-x86_64-extras'] = {'runuser': '/sbin/runuser'}
+
+# Fedora Core 3 with Extras
+packages['fedora-3-x86_64-extras'] = packages['fedora-3-x86_64-core'].copy ()
+groups['fedora-3-x86_64-extras'] = groups['fedora-3-x86_64-core'].copy ()
+sourceslist['fedora-3-x86_64-extras'] = {
+    'fedoracore-3-x86_64': ('core', 'buildgroups', 'extras', )
 
 


Index: fedora-development-i386
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/etc/dist.d/fedora-development-i386,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-development-i386	21 Mar 2005 21:51:45 -0000	1.2
+++ fedora-development-i386	31 Mar 2005 19:11:53 -0000	1.3
@@ -28,11 +28,11 @@
 }
 
 config['fedora-development-i386-core'] = {'runuser': '/sbin/runuser'}
-config['fedora-development-i386-extras-stable'] = {'runuser': '/sbin/runuser'}
+config['fedora-development-i386-extras'] = {'runuser': '/sbin/runuser'}
 
 # Fedora Core development with Extras
-packages['fedora-development-i386-extras-stable'] = packages['fedora-development-i386-core'].copy ()
-groups['fedora-development-i386-extras-stable'] = groups['fedora-development-i386-core'].copy ()
-sourceslist['fedora-development-i386-extras-stable'] = {
+packages['fedora-development-i386-extras'] = packages['fedora-development-i386-core'].copy ()
+groups['fedora-development-i386-extras'] = groups['fedora-development-i386-core'].copy ()
+sourceslist['fedora-development-i386-extras'] = {
     'fedora-development-i386': ('core', 'buildgroups', 'extras', )
 }


Index: fedora-development-ppc
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/etc/dist.d/fedora-development-ppc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-development-ppc	21 Mar 2005 20:49:35 -0000	1.1.1.1
+++ fedora-development-ppc	31 Mar 2005 19:11:53 -0000	1.2
@@ -30,8 +30,8 @@
 config['fedora-development-ppc-core'] = {'runuser': '/sbin/runuser'}
 
 # Fedora Core development with Extras
-packages['fedora-development-ppc-extras-stable'] = packages['fedora-development-ppc-core'].copy ()
-groups['fedora-development-ppc-extras-stable'] = groups['fedora-development-ppc-core'].copy ()
-sourceslist['fedora-development-ppc-extras-stable'] = {
+packages['fedora-development-ppc-extras'] = packages['fedora-development-ppc-core'].copy ()
+groups['fedora-development-ppc-extras'] = groups['fedora-development-ppc-core'].copy ()
+sourceslist['fedora-development-ppc-extras'] = {
     'fedora-development-ppc': ('core', 'buildgroups', 'extras', )
 }


Index: fedora-development-x86_64
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/etc/dist.d/fedora-development-x86_64,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-development-x86_64	21 Mar 2005 22:07:23 -0000	1.2
+++ fedora-development-x86_64	31 Mar 2005 19:11:53 -0000	1.3
@@ -28,11 +28,11 @@
 }
 
 config['fedora-development-x86_64-core'] = {'runuser': '/sbin/runuser'}
-config['fedora-development-x86_64-extras-stable'] = {'runuser': '/sbin/runuser'}
+config['fedora-development-x86_64-extras'] = {'runuser': '/sbin/runuser'}
 
 # Fedora Core development with Extras
-packages['fedora-development-x86_64-extras-stable'] = packages['fedora-development-x86_64-core'].copy ()
-groups['fedora-development-x86_64-extras-stable'] = groups['fedora-development-x86_64-core'].copy ()
-sourceslist['fedora-development-x86_64-extras-stable'] = {
+packages['fedora-development-x86_64-extras'] = packages['fedora-development-x86_64-core'].copy ()
+groups['fedora-development-x86_64-extras'] = groups['fedora-development-x86_64-core'].copy ()
+sourceslist['fedora-development-x86_64-extras'] = {
     'fedora-development-x86_64': ('core', 'buildgroups', 'extras', )
 }



From fedora-extras-commits at redhat.com  Thu Mar 31 19:15:27 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 31 Mar 2005 14:15:27 -0500
Subject: devel/gnome-theme-clearlooks .cvsignore, 1.2,
	1.3 gnome-theme-clearlooks.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200503311915.j2VJFRH3011841@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/gnome-theme-clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11835

Modified Files:
	.cvsignore gnome-theme-clearlooks.spec sources 
Log Message:
Updated Metacity theme to 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/gnome-theme-clearlooks/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Mar 2005 22:16:03 -0000	1.2
+++ .cvsignore	31 Mar 2005 19:15:25 -0000	1.3
@@ -1,2 +1,2 @@
-21237-clearlooks-metacity-0.5.tar.gz
+21237-clearlooks-metacity-0.5.1.tar.gz
 clearlooks-0.5.tar.bz2


Index: gnome-theme-clearlooks.spec
===================================================================
RCS file: /cvs/extras/devel/gnome-theme-clearlooks/gnome-theme-clearlooks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-theme-clearlooks.spec	21 Mar 2005 22:16:03 -0000	1.1
+++ gnome-theme-clearlooks.spec	31 Mar 2005 19:15:25 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           gnome-theme-clearlooks
 Version:        0.5
-Release:        2
+Release:        3
 Summary:        An attractive GTK+ 2 engine with a focus on usability
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://clearlooks.sourceforge.net/screenshots/
 Source0:        http://prdownloads.sourceforge.net/clearlooks/clearlooks-0.5.tar.bz2
-Source1:        http://www.gnome-look.org/content/files/21237-clearlooks-metacity-0.5.tar.gz
+Source1:        http://www.gnome-look.org/content/files/21237-clearlooks-metacity-0.5.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel libgnome-devel
 
@@ -38,6 +38,9 @@
 %{_libdir}/gtk-2.0/2.4.0/engines/*
 
 %changelog
+* Thu Mar 31 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5-3
+- Updated Metacity theme to 0.5.1
+
 * Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5-2
 - Name changed from "clearlooks" to "gnome-theme-clearlooks"
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/gnome-theme-clearlooks/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Mar 2005 22:16:03 -0000	1.2
+++ sources	31 Mar 2005 19:15:25 -0000	1.3
@@ -1,2 +1,2 @@
-7cad4d05b820260b61d63d3cb361877b  21237-clearlooks-metacity-0.5.tar.gz
+8274a3f363a72577097d682e113abed0  21237-clearlooks-metacity-0.5.1.tar.gz
 16ad9981ebbd816d7adfe05aadb0503b  clearlooks-0.5.tar.bz2



From fedora-extras-commits at redhat.com  Thu Mar 31 19:55:20 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu, 31 Mar 2005 14:55:20 -0500
Subject: web/html/participate naming.php,NONE,1.1
Message-ID: <200503311955.j2VJtKkx012113@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/web/html/participate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12101

Added Files:
	naming.php 
Log Message:
add naming.php


***** Error reading new file: [Errno 2] No such file or directory: 'naming.php'



From fedora-extras-commits at redhat.com  Thu Mar 31 20:31:00 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 31 Mar 2005 15:31:00 -0500
Subject: rpms/amarok/FC-3 .cvsignore, 1.7, 1.8 amarok.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <200503312031.j2VKV0Rv013105@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13095/FC-3

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.2.3
- add libtool to BuildRequirements (libtool-ltdl-devel for FC4)
- change release tag for FC3/FC4
- add new akode subpackage for FC4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2005 15:36:12 -0000	1.7
+++ .cvsignore	31 Mar 2005 20:30:57 -0000	1.8
@@ -1 +1 @@
-amarok-1.2.2.tar.bz2
+amarok-1.2.3.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/amarok.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- amarok.spec	15 Mar 2005 15:36:12 -0000	1.9
+++ amarok.spec	31 Mar 2005 20:30:57 -0000	1.10
@@ -6,13 +6,13 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.2.2
-Release:    1
+Version:    1.2.3
+Release:    1.fc3
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.2.2.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.2.3.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -22,6 +22,7 @@
 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
 
 %if  0%{?use_xine}
 BuildRequires:  xine-lib-devel >= 0:1.0.0
@@ -175,6 +176,11 @@
 
 
 %changelog
+* Tue Mar 29 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.3-1
+- version 1.2.3
+- add libtool to BuildRequirements
+- change release tag for FC3
+
 * Mon Mar 14 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.2-1
 - version 1.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Mar 2005 15:36:12 -0000	1.7
+++ sources	31 Mar 2005 20:30:57 -0000	1.8
@@ -1 +1 @@
-af3bd552fbc61168a894a9cd447d2b2e  amarok-1.2.2.tar.bz2
+0082f47cb4503afc7d8e671cfd5cb983  amarok-1.2.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Mar 31 20:31:00 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 31 Mar 2005 15:31:00 -0500
Subject: rpms/amarok/devel .cvsignore, 1.7, 1.8 amarok.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <200503312031.j2VKV01T013111@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13095/devel

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.2.3
- add libtool to BuildRequirements (libtool-ltdl-devel for FC4)
- change release tag for FC3/FC4
- add new akode subpackage for FC4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2005 15:36:12 -0000	1.7
+++ .cvsignore	31 Mar 2005 20:30:58 -0000	1.8
@@ -1 +1 @@
-amarok-1.2.2.tar.bz2
+amarok-1.2.3.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- amarok.spec	15 Mar 2005 15:36:12 -0000	1.11
+++ amarok.spec	31 Mar 2005 20:30:58 -0000	1.12
@@ -6,13 +6,13 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.2.2
-Release:    1
+Version:    1.2.3
+Release:    1.fc4
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.2.2.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.2.3.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -22,6 +22,7 @@
 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
 
 %if  0%{?use_xine}
 BuildRequires:  xine-lib-devel >= 0:1.0.0
@@ -60,6 +61,16 @@
 enables it.
 
 
+%package akode
+Summary:    AKode engine for Amarok
+Group:      Applications/Multimedia
+Requires:   %{name} = %{version}
+
+%description akode
+Amarok can also use the akode engine to decode sound. This package
+enables it.
+
+
 %if 0%{?use_xine}
 %package xine
 Summary:    Xine engine for Amarok
@@ -165,6 +176,12 @@
 %{_datadir}/services/amarok_artsengine_plugin.desktop
 
 
+%files akode
+%defattr(-,root,root)
+%{_libdir}/kde3/libamarok_aKode-engine.*
+%{_datadir}/services/amarok_aKode-engine.desktop
+
+
 %if 0%{?use_xine}
 %files xine
 %defattr(-,root,root)
@@ -175,6 +192,12 @@
 
 
 %changelog
+* Tue Mar 29 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.3-1.fc4
+- version 1.2.3
+- add libtool to BuildRequirements
+- change release tag for FC4
+- add a subpackage for aKode engine
+
 * Mon Mar 14 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.2-1
 - version 1.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Mar 2005 15:36:12 -0000	1.7
+++ sources	31 Mar 2005 20:30:58 -0000	1.8
@@ -1 +1 @@
-af3bd552fbc61168a894a9cd447d2b2e  amarok-1.2.2.tar.bz2
+0082f47cb4503afc7d8e671cfd5cb983  amarok-1.2.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Mar 31 21:02:39 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Thu, 31 Mar 2005 16:02:39 -0500
Subject: common tobuild,NONE,1.1 Makefile.common,1.6,1.7
Message-ID: <200503312102.j2VL2dN1014324@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14312

Modified Files:
	Makefile.common 
Added Files:
	tobuild 
Log Message:
first pass build: target and build control file.

NOTE: THIS DOES NOT DO ANYTHING YET.  YOU MUST STILL UPDATE THE WIKI
TO GET BUILDS COMPLETED.



--- NEW FILE tobuild ---
# this is the build control file.  the format is
# user	repo	tag	target	status
# 


Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.common	29 Mar 2005 19:36:49 -0000	1.6
+++ Makefile.common	31 Mar 2005 21:02:37 -0000	1.7
@@ -283,6 +283,25 @@
 	@echo "Tagged with: $(TAG)"
 	@echo
 
+define find-common-dir
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then echo "$$d"; break ; fi ; done
+endef
+COMMON_DIR := $(shell $(find-common-dir))
+
+define find-user
+if [ `cat CVS/Root |grep -c @` -ne 0 ]; then cat CVS/Root  |cut -d @ -f 1 |  sed 's/:.*://' ; else echo $(USER); fi
+endef
+USER := $(shell $(find-user))
+
+build: 
+	@if [ -z "$(TARGET)" ]; then echo "Must specify a target to build into"; exit 1; fi
+	@(pushd $(COMMON_DIR) >/dev/null ;\
+	cvs -Q update ;\
+	echo -e "$(USER)\t$(CVS_REPOSITORY)\t$(TAG)\t$(TARGET)" >> tobuild ;\
+	cvs commit -m"request build of $(CVS_REPOSITORY) $(TAG) for $(TARGET)" tobuild ;\
+	popd >/dev/null)
+
+
 # "make new | less" to see what has changed since the last tag was assigned
 new:
 	- at cvs diff -u -r$$(cvs log Makefile 2>/dev/null | awk '/^symbolic names:$$/ {getline; sub(/^[ \t]*/, "") ; sub (/:.*$$/, ""); print; exit 0}')



From fedora-extras-commits at redhat.com  Thu Mar 31 21:19:52 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 31 Mar 2005 16:19:52 -0500
Subject: rpms/aiksaurus/devel aiksaurus.spec,1.1,1.2
Message-ID: <200503312119.j2VLJqeO014635@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aiksaurus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14629

Modified Files:
	aiksaurus.spec 
Log Message:
* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.2.1-6
- add dep gtk2-devel for pkgconfig in -gtk-devel sub-package 
- include %{_includedir}/Aiksaurus dir in -devel sub-package
- remove redundant deps "gtk2" and "Aiksaurus" in -gtk sub-package




Index: aiksaurus.spec
===================================================================
RCS file: /cvs/extras/rpms/aiksaurus/devel/aiksaurus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aiksaurus.spec	14 Mar 2005 22:33:24 -0000	1.1
+++ aiksaurus.spec	31 Mar 2005 21:19:50 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: An English-language thesaurus library.
 Name: aiksaurus
 Version: 1.2.1
-Release: 5
+Release: 6
 Epoch: 1
 Group: System Environment/Libraries
 License: GPL
@@ -28,10 +28,8 @@
 
 %package gtk
 Requires: aiksaurus >= %{version}
-Requires: gtk2
 Summary: A GTK+ frontend to aiksaurus.
 Group: System Environment/Libraries
-Requires: aiksaurus
 
 %description gtk
 AiksaurusGTK is a GTK+ interface to the Aiksaurus library.  
@@ -42,6 +40,7 @@
 %package gtk-devel
 Requires: aiksaurus-gtk
 Requires: aiksaurus-devel >= %{version}
+Requires: gtk2-devel
 Summary: Files for developing with aiksaurus-gtk.
 Group: Development/Libraries
                                                                                 
@@ -78,6 +77,7 @@
 
 %files devel
 %defattr(-, root, root)
+%dir %{_includedir}/Aiksaurus
 %{_includedir}/Aiksaurus/Aiksaurus.h
 %{_includedir}/Aiksaurus/AiksaurusC.h
 %{_libdir}/*Aiksaurus.so
@@ -104,6 +104,11 @@
 %{_libdir}/pkgconfig/gaiksaurus-1.0.pc
 
 %changelog
+* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.2.1-6
+- add dep gtk2-devel for pkgconfig in -gtk-devel sub-package 
+- include %%{_includedir}/Aiksaurus dir in -devel sub-package
+- remove redundant deps "gtk2" and "Aiksaurus" in -gtk sub-package
+
 * Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1.2.1-5
 - rebuild with gcc4
 



From fedora-extras-commits at redhat.com  Thu Mar 31 21:20:53 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 31 Mar 2005 16:20:53 -0500
Subject: rpms/enchant/devel enchant.spec,1.2,1.3
Message-ID: <200503312120.j2VLKr5W014712@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14702

Modified Files:
	enchant.spec 
Log Message:
* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1:1.1.6-2
- add dep glib2-devel for pkgconfig in -devel package
- include %{_libdir}/enchant dir in main package
- make -devel package require exact VR of main package
- use -p /sbin/ldconfig in scriptlets




Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/enchant.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- enchant.spec	28 Mar 2005 15:23:37 -0000	1.2
+++ enchant.spec	31 Mar 2005 21:20:51 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
 Version: 1.1.6
-Release: 1
+Release: 2
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -18,7 +18,8 @@
 %package devel
 Summary: Support files necessary to compile applications with libenchant.
 Group: Development/Libraries
-Requires: enchant
+Requires: enchant = %{version}-%{release}
+Requires: glib2-devel
 
 %description devel
 Libraries, headers, and support files necessary to compile applications using libenchant.
@@ -40,6 +41,7 @@
 %doc AUTHORS COPYING.LIB README
 %{_bindir}/*
 %{_libdir}/lib*.so.*
+%dir %{_libdir}/enchant
 %{_libdir}/enchant/lib*.so*
 %{_mandir}/man1/enchant.1.gz
 
@@ -51,16 +53,20 @@
 %{_libdir}/pkgconfig/enchant.pc
 %{_includedir}/enchant
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1:1.1.6-2
+- add dep glib2-devel for pkgconfig in -devel package
+- include %%{_libdir}/enchant dir in main package
+- make -devel package require exact VR of main package
+- use -p /sbin/ldconfig in scriptlets
+
 * Mon Mar 28 2005 Marc Maurer <uwog at abisource.com> 1:1.1.6-1
 - update to 1.1.6
 - drop the manpage patch (RH#145010#)



From fedora-extras-commits at redhat.com  Thu Mar 31 21:21:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 31 Mar 2005 16:21:50 -0500
Subject: rpms/gmime/devel gmime.spec,1.3,1.4
Message-ID: <200503312121.j2VLLoQ0014776@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gmime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14767

Modified Files:
	gmime.spec 
Log Message:
* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.1.9-4
- add dep glib2-devel for pkgconfig in -devel package




Index: gmime.spec
===================================================================
RCS file: /cvs/extras/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gmime.spec	3 Mar 2005 21:26:03 -0000	1.3
+++ gmime.spec	31 Mar 2005 21:21:48 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gmime
 Version:        2.1.9
-Release:        3
+Release:        4
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -22,6 +22,7 @@
 Summary:        Header files to develop libgmime applications
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       glib2-devel
 
 %description    devel
 The GMime suite provides a core library and set of utilities which may be
@@ -74,6 +75,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.1.9-4
+- add dep glib2-devel for pkgconfig in -devel package
+
 * Mon Oct 18 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.1.9-0.fdr.3
 - Remove ldconfig from Requires pre and post
 



From fedora-extras-commits at redhat.com  Thu Mar 31 21:22:35 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 31 Mar 2005 16:22:35 -0500
Subject: rpms/gstreamer-python/devel gstreamer-python.spec,1.4,1.5
Message-ID: <200503312122.j2VLMZIr014834@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gstreamer-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14828

Modified Files:
	gstreamer-python.spec 
Log Message:
* 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




Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/devel/gstreamer-python.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gstreamer-python.spec	10 Feb 2005 19:15:26 -0000	1.4
+++ gstreamer-python.spec	31 Mar 2005 21:22:33 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:           %{gstreamer}-python
 Version:        0.8.1
-Release:        1
+Release:        2
 Summary:        Python bindings for GStreamer.
 
 Group:          Development/Languages
@@ -35,6 +35,8 @@
 
 # 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
@@ -67,6 +69,9 @@
 %{_libdir}/pkgconfig/gst-python-0.8.pc
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Thu Mar 31 21:27:43 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 31 Mar 2005 16:27:43 -0500
Subject: devel/aiksaurus aiksaurus.spec,1.2,1.3
Message-ID: <200503312127.j2VLRhe8014936@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/aiksaurus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14930

Modified Files:
	aiksaurus.spec 
Log Message:
fix typo in changelog entry


Index: aiksaurus.spec
===================================================================
RCS file: /cvs/extras/devel/aiksaurus/aiksaurus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aiksaurus.spec	31 Mar 2005 21:19:50 -0000	1.2
+++ aiksaurus.spec	31 Mar 2005 21:27:41 -0000	1.3
@@ -107,7 +107,7 @@
 * Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.2.1-6
 - add dep gtk2-devel for pkgconfig in -gtk-devel sub-package 
 - include %%{_includedir}/Aiksaurus dir in -devel sub-package
-- remove redundant deps "gtk2" and "Aiksaurus" in -gtk sub-package
+- remove redundant deps "gtk2" and "aiksaurus" in -gtk sub-package
 
 * Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1.2.1-5
 - rebuild with gcc4



From fedora-extras-commits at redhat.com  Tue Mar  1 08:19:15 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 1 Mar 2005 03:19:15 -0500
Subject: rpms/gnome-themes-extras/FC-3
	gnome-themes-extras-0.8.0-fix-subscript-out-of-range.patch,
	NONE, 1.1 gnome-themes-extras.spec, 1.5, 1.6
Message-ID: <200503010819.j218JFFm030423@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/gnome-themes-extras/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30416

Modified Files:
	gnome-themes-extras.spec 
Added Files:
	gnome-themes-extras-0.8.0-fix-subscript-out-of-range.patch 
Log Message:
need to remember to check in changes also on FC-3 branch


gnome-themes-extras-0.8.0-fix-subscript-out-of-range.patch:

--- NEW FILE gnome-themes-extras-0.8.0-fix-subscript-out-of-range.patch ---
diff -ur gnome-themes-extras-0.8.0-orig/Smooth/smooth_style.c gnome-themes-extras-0.8.0/Smooth/smooth_style.c
--- gnome-themes-extras-0.8.0-orig/Smooth/smooth_style.c	2005-02-27 18:15:17.000000000 +0100
+++ gnome-themes-extras-0.8.0/Smooth/smooth_style.c	2005-02-28 17:15:08.000000000 +0100
@@ -1369,7 +1369,7 @@
 	
 	/* draw inner shadow line(s)  */	
 	{
-	  GdkGC		*gc[3], *use_gc=NULL, *mid_gc=NULL, *bg_gc=style->bg_gc[state_type];
+	  GdkGC		*gc[4], *use_gc=NULL, *mid_gc=NULL, *bg_gc=style->bg_gc[state_type];
 	  gdouble		angle;
 	  gint		j,i, x1,y1, x2,y2, xt, yt, mx=0,my=0, sign;
 	


Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-3/gnome-themes-extras.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-themes-extras.spec	2 Feb 2005 13:59:16 -0000	1.5
+++ gnome-themes-extras.spec	1 Mar 2005 08:19:13 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           gnome-themes-extras
 Version:        0.8.0
-Release:        1
+Release:        2
 Summary:        Collection of metathemes for the GNOME desktop environment
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://librsvg.sourceforge.net/theme.php
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.8/gnome-themes-extras-0.8.0.tar.bz2
+Patch0:         gnome-themes-extras-0.8.0-fix-subscript-out-of-range.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  librsvg2-devel >= 2.1.3
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure
@@ -37,6 +39,7 @@
 
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/gtk-2.0/2.4.0/engines/*.la
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/gtk-2.0/2.4.0/engines/*.a
+# part of gnome-themes
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/gtk-2.0/2.4.0/engines/libsmooth.so
 
 %clean
@@ -54,6 +57,9 @@
 
 
 %changelog
+* Mon Feb 28 2005 Adrian Reber <adrian at lisas.de> - 0.8.0-2
+- added a patch with a fix for compiler warnings (bug #149713)
+
 * Fri Nov 26 2004 Adrian Reber <adrian at lisas.de> - 0:0.8.0-0.fdr.1
 - updated to 0.8.0
 - changed gtk-2.0/2.2 to gtk-2.0/2.4



From adrian at lisas.de  Tue Mar  1 16:55:36 2005
From: adrian at lisas.de (Adrian Reber)
Date: Tue, 1 Mar 2005 17:55:36 +0100
Subject: APPROVED: vnstat
Message-ID: <20050301165536.GA3057@lisas.de>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

https://www.redhat.com/archives/fedora-extras-list/2005-February/msg00591.html
vnstat: A console-based network traffic monitor

Maintainer: Adrian Reber
Reviewed by: Matthias Saou
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)

iD8DBQFCJJ5stzAqCj7W8DQRAkNbAKDM2In2eCxbOFpADAl/y+v27xkKlQCgrLjR
eiSTdQ3ZaPMTIZIv64I71Mw=
=hc+a
-----END PGP SIGNATURE-----



From fedora-extras-commits at redhat.com  Tue Mar  1 18:26:13 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Mar 2005 13:26:13 -0500
Subject: rpms/lighttpd/devel lighttpd.spec,1.1,1.2
Message-ID: <200503011826.j21IQDMt012315@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12303/devel

Modified Files:
	lighttpd.spec 
Log Message:
Fix missing defattr in sub-packages.



Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lighttpd.spec	23 Feb 2005 00:12:23 -0000	1.1
+++ lighttpd.spec	1 Mar 2005 18:26:10 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.3.11
-Release: 1
+Release: 2
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -147,11 +147,13 @@
 %{webroot}/
 
 %files mod_mysql_vhost
+%defattr(-, root, root, 0755)
 %doc doc/mysqlvhost.txt
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
 %files fastcgi
+%defattr(-, root, root, 0755)
 %doc doc/fastcgi*.txt
 %config(noreplace) %{_sysconfdir}/php.d/lighttpd.ini
 %{_bindir}/spawn-fcgi
@@ -160,6 +162,9 @@
 
 
 %changelog
+* Tue Mar  1 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-2
+- Add missing defattr to sub-packages (#150018).
+
 * Mon Feb 21 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-0
 - Update to 1.3.11.
 - Remove cleanconf and init.d patches (merged upstream).



From fedora-extras-commits at redhat.com  Tue Mar  1 18:26:13 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 1 Mar 2005 13:26:13 -0500
Subject: rpms/lighttpd/FC-3 lighttpd.spec,1.1,1.2
Message-ID: <200503011826.j21IQDPI012312@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12303/FC-3

Modified Files:
	lighttpd.spec 
Log Message:
Fix missing defattr in sub-packages.



Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-3/lighttpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lighttpd.spec	23 Feb 2005 00:12:23 -0000	1.1
+++ lighttpd.spec	1 Mar 2005 18:26:10 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.3.11
-Release: 1
+Release: 2
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -147,11 +147,13 @@
 %{webroot}/
 
 %files mod_mysql_vhost
+%defattr(-, root, root, 0755)
 %doc doc/mysqlvhost.txt
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
 %files fastcgi
+%defattr(-, root, root, 0755)
 %doc doc/fastcgi*.txt
 %config(noreplace) %{_sysconfdir}/php.d/lighttpd.ini
 %{_bindir}/spawn-fcgi
@@ -160,6 +162,9 @@
 
 
 %changelog
+* Tue Mar  1 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-2
+- Add missing defattr to sub-packages (#150018).
+
 * Mon Feb 21 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-0
 - Update to 1.3.11.
 - Remove cleanconf and init.d patches (merged upstream).



From fedora-extras-commits at redhat.com  Tue Mar  1 18:36:30 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 1 Mar 2005 13:36:30 -0500
Subject: rpms/vnstat - New directory
Message-ID: <200503011836.j21IaUhs012415@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/vnstat
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12408/vnstat

Log Message:
Directory /cvs/extras/rpms/vnstat added to the repository




From fedora-extras-commits at redhat.com  Tue Mar  1 18:36:30 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 1 Mar 2005 13:36:30 -0500
Subject: rpms/vnstat/devel - New directory
Message-ID: <200503011836.j21IaUjh012418@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/vnstat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12408/vnstat/devel

Log Message:
Directory /cvs/extras/rpms/vnstat/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar  1 18:36:51 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 1 Mar 2005 13:36:51 -0500
Subject: rpms/vnstat Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503011836.j21IapjZ012477@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/vnstat
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12468

Added Files:
	Makefile import.log 
Log Message:
Setup of module vnstat


--- NEW FILE Makefile ---
# Top level Makefile for module vnstat
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  1 18:36:51 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 1 Mar 2005 13:36:51 -0500
Subject: rpms/vnstat/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503011836.j21IapNg012480@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/vnstat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12468/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vnstat


--- 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 Mar  1 18:37:44 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 1 Mar 2005 13:37:44 -0500
Subject: rpms/vnstat import.log,1.1,1.2
Message-ID: <200503011837.j21Ibihd012580@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/vnstat
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12570

Modified Files:
	import.log 
Log Message:
auto-import vnstat-1.4-3 on branch devel from vnstat-1.4-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vnstat/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Mar 2005 18:36:49 -0000	1.1
+++ import.log	1 Mar 2005 18:37:42 -0000	1.2
@@ -0,0 +1 @@
+vnstat-1_4-3:HEAD:vnstat-1.4-3.src.rpm:1109702252



From fedora-extras-commits at redhat.com  Tue Mar  1 18:37:44 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 1 Mar 2005 13:37:44 -0500
Subject: rpms/vnstat/devel FAQ.vnstat, NONE, 1.1 vnstat.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503011837.j21IbieV012583@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/vnstat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12570/devel

Modified Files:
	.cvsignore sources 
Added Files:
	FAQ.vnstat vnstat.spec 
Log Message:
auto-import vnstat-1.4-3 on branch devel from vnstat-1.4-3.src.rpm


--- NEW FILE FAQ.vnstat ---
vnStat FAQ (for version 1.4+, 15.4.2004)


1. How should dialup users use vnStat? There's some errors
because the interface isn't available when offline.

 That's all explained at the end of the README. The idea
 is to include vnStat with enable/disable parameters in
 scripts related with the used interface. Example scripts
 can be found from the pppd directory that came with the
 source package.

2. Does vnStat work for PPPOE users?

 Although I haven't tested it, it's been reported to work
 if the supplied ppp scripts are installed correctly. As
 always, see the README and the man page.

3. How do I uninstall vnStat?

 You only need to run 'make uninstall' in the directory that
 comes when the .tar.gz is extracted. Just make sure it's
 the same version you have installed.

4. What does the 'estimated' value mean?

 The estimated value is an calculated average that tries to
 guess the total traffic for the current day/month based on
 previous traffic. This estimate works fairly well if the
 monitored interface has constant traffic of the same
 magnitude (like game servers). It can't predic peaks but
 the accuracy usually gets better by the end of the day/month.

5. Why isn't the estimated value shown with --dumpdb?

 That features only dumps the database and since the estimate
 is always calculated in realtime, there's no reason to write
 it into the database.

6. How is the estimated value calculated?

 estimate = ( x / y ) * z

   x = traffic so far for the day/month
   y = passed minutes/hours ...
   z = total minutes/hours ...

7. Why does vnStat show sometimes multiple GB of traffic although
my network connection can't even transfer that much?
     OR
Each update adds the complete amount of traffic and 'vnstat -u -D'
claims that the system has been rebooted between updates.

 That's most likely a broken kernel. Run with --testkernel
 (version 1.2+ required) and see the result. See the next question
 for some explanation.

8. Why is there problems with most 2.4.18 kernels?

 Every current kernel has a btime (boot time) value in /proc/stat
 that indicates when the system was booted. vnStat uses this to
 know when the interface counters in the database should be
 reseted. Unfortunately, some kernels don't keep the btime value
 static even when the system isn't rebooted.

9. warning: integer constant is too large for "long" type -messages
during compiling with gcc 3.xx?

 Like that message says, that's only a warning, not an error.

10. About bug reports

 Any bug report should at least include an explanation about
 how the bug can be reproduced. Having output dumps usually
 helps and the --dumpdb feature should be used if there's some
 reason to assume the bug has something to do with the database.
 Also include information about the used distribution, kernel
 (uname -a), compiler (gcc --version) and network interface
 card. Read the report again before sending it. :)


--- NEW FILE vnstat.spec ---
Summary: 	Console-based network traffic monitor
Name: 		vnstat
Version: 	1.4
Release: 	3
License: 	GPL
Group: 		System Environment/Daemons
URL: 		http://humdi.net/vnstat/
Source0: 	http://humdi.net/vnstat/vnstat-%{version}.tar.gz
Source1: 	FAQ.vnstat
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
vnStat is a console-based network traffic monitor that uses the
/proc -filesystem to get the needed information. This means that vnStat wont
actually be sniffing any traffic. See the webpage for few 'screenshots'.

%prep
%setup -q
%{__cp} %{SOURCE1} FAQ

%build
%{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
%{__mkdir_p} $RPM_BUILD_ROOT%{_sbindir}
%{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/man1
%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig

%{__install} -m 644 man/vnstat.1 $RPM_BUILD_ROOT%{_mandir}/man1
%{__install} -m 755 src/vnstat $RPM_BUILD_ROOT%{_bindir}

%{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/%{name} << END
MAILTO=root
# to enable intrerface monitoring via vnstat remove comment on next line
# */5 * * * *  vnstat %{_sbindir}/%{name}.cron
END

%{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} << END
# see also: vnstat(1)
# the following sets vnstat up to monitor eth0
VNSTAT_OPTIONS="-u -i eth0"
END

%{__cat} >> $RPM_BUILD_ROOT%{_sbindir}/%{name}.cron << END
#!/bin/bash
# this script (%{_sbindir}/%{name}.cron) reads %{_sysconfdir}/sysconfig/%{name}
# to start %{_bindir}/%{name}.
# example for %{_sysconfdir}/sysconfig/%{name}:
# VNSTAT_OPTIONS="-u -i eth0"
# see also: vnstat(1)

VNSTAT_CONF=%{_sysconfdir}/sysconfig/%{name}

if [ ! -f $VNSTAT_CONF ]; then
        exit 0
fi

. \$VNSTAT_CONF

%{_bindir}/%{name} \$VNSTAT_OPTIONS
END

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%pre
useradd -r -s /sbin/nologin -d %{_localstatedir}/lib/%{name} -c 'vnstat user' %{name} >/dev/null 2>&1 ||:

%preun
if [ "$1" -eq "0" ]; then
        userdel %{name}
fi

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING FAQ README INSTALL cron pppd
%config(noreplace) %{_sysconfdir}/cron.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_mandir}/man1/*
%{_bindir}/%{name}
%attr(755,root,root)%{_sbindir}/%{name}.cron
%attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name}

%changelog
* Mon Feb 28 2005 Adrian Reber <adrian at lisas.de> 1.4-3
- removed occurences of VNSTAT_DISABLED in
  %{_sysconfdir}/sysconfig/%{name} and
  %{_sbindir}/%{name}.cron 

* Thu Feb 24 2005 Adrian Reber <adrian at lisas.de> 1.4-2
- removed "#--------------"
- added %%{version} to Source0
- replaced almost empty FAQ with the one from the web
- added INSTALL to %%doc
- added %{_sysconfdir}/sysconfig/%{name}
  and %{_sbindir}/%{name}.cron to allow flexible configuration
- cron script and configuration file defaults to vnstat disabled
- added example scripts from cron/* and pppd/* to %%doc

* Wed Jul 21 2004 Adrian Reber <adrian at lisas.de> 1.4-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vnstat/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Mar 2005 18:36:49 -0000	1.1
+++ .cvsignore	1 Mar 2005 18:37:42 -0000	1.2
@@ -0,0 +1 @@
+vnstat-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vnstat/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Mar 2005 18:36:49 -0000	1.1
+++ sources	1 Mar 2005 18:37:42 -0000	1.2
@@ -0,0 +1 @@
+9184f79b5e60499bc059f670032291e5  vnstat-1.4.tar.gz



From adrian at lisas.de  Tue Mar  1 19:06:02 2005
From: adrian at lisas.de (Adrian Reber)
Date: Tue, 1 Mar 2005 20:06:02 +0100
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <20050227024321.73e1a839.bugs.michael@gmx.net>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
Message-ID: <20050301190602.GA14804@lisas.de>

On Sun, Feb 27, 2005 at 02:43:21AM +0100, Michael Schwendt wrote:
> > > > Packages imported using cvs-import.sh seem to appear in devel only?
> > > > What is the procedure for managing packages in both FC-3 and devel.
> > > 
> > > "cvs-import -b FC-3 ..." or to check out the FC-3 branch directory
> > > of the module you want to edit, e.g. "cvs co foo/FC-3".
> > Hmmm...
> > Checking out the modules file...
> > ERROR: You have requested to import a package into the branch FC-3 of
> > the
> > module graveman, but according to the modules file this branch does not
> > exist.
> 
> That is because cvs-import.sh can only create new modules in the "devel"
> branch.
> 
> Effectively, after the FC-3-split, we now cannot import new packages
> into the FC-3 tree like we could not import new packages into FC-2,
> FC-1, RHL-9 before (we have tracked all those deferred updates on the
> FC3Status page).

Just to make sure I understand this correctly: All newly imported packages
after branching CVS cannot be available for FC-3 and there is no way around it?

		Adrian



From skvidal at phy.duke.edu  Tue Mar  1 19:12:20 2005
From: skvidal at phy.duke.edu (seth vidal)
Date: Tue, 01 Mar 2005 14:12:20 -0500
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <20050301190602.GA14804@lisas.de>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
Message-ID: <1109704340.31304.16.camel@cutter>


>Just to make sure I understand this correctly: All newly imported packages
>after branching CVS cannot be available for FC-3 and there is no way around it?

I think that was just a problem with a script. 

Michael, didn't you fix that with your patches from the other day?

-sv




From gafton at redhat.com  Tue Mar  1 19:11:35 2005
From: gafton at redhat.com (Cristian Gafton)
Date: Tue, 1 Mar 2005 14:11:35 -0500 (EST)
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <20050301190602.GA14804@lisas.de>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
Message-ID: <Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>

On Tue, 1 Mar 2005, Adrian Reber wrote:

>> Effectively, after the FC-3-split, we now cannot import new packages
>> into the FC-3 tree like we could not import new packages into FC-2,
>> FC-1, RHL-9 before (we have tracked all those deferred updates on the
>> FC3Status page).
>
> Just to make sure I understand this correctly: All newly imported packages
> after branching CVS cannot be available for FC-3 and there is no way around it?

There is a way around it - for now it requires manual intervention. People 
need to understand that this is a consequence of using the same scripts we 
have for branching internally the fedora core package set. In the FC case, 
once we branch there are no package changes committed to the branch - thus 
the reason why cvs-import can not create new branches.

I realize that for FE this is not the case, and I am working on a solution 
that will allow branches to be created at the cvs-import time.

For now, please use cvs-import to import the new packages and once the 
import is done ask on this list for a branch to be created for your new 
import. We'll wade through this manual process until I adapt the scripts.

Cristian
-- 
----------------------------------------------------------------------
Cristian Gafton     --     gafton at redhat.com      --     Red Hat, Inc.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"Linux is a leprosy; and is having a deleterious effect on the U.S. IT
industry because it is steadily depreciating the value of the software
industry sector."
     -- Kenneth Brown, President, Alexis de Tocqueville Institution



From gafton at redhat.com  Tue Mar  1 19:13:25 2005
From: gafton at redhat.com (Cristian Gafton)
Date: Tue, 1 Mar 2005 14:13:25 -0500 (EST)
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <1109704340.31304.16.camel@cutter>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<1109704340.31304.16.camel@cutter>
Message-ID: <Pine.LNX.4.61.0503011411550.26940@alien.devel.redhat.com>

On Tue, 1 Mar 2005, seth vidal wrote:

> I think that was just a problem with a script.

Yes, the script does not support it.

> Michael, didn't you fix that with your patches from the other day?

He can not - cvs-import does not have access to the cvs layout in a way 
that would allow it to create branches. It requires cooperation from the 
backend.

Cristian
-- 
----------------------------------------------------------------------
Cristian Gafton     --     gafton at redhat.com      --     Red Hat, Inc.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"Linux is a leprosy; and is having a deleterious effect on the U.S. IT
industry because it is steadily depreciating the value of the software
industry sector."
     -- Kenneth Brown, President, Alexis de Tocqueville Institution



From skvidal at phy.duke.edu  Tue Mar  1 19:19:48 2005
From: skvidal at phy.duke.edu (seth vidal)
Date: Tue, 01 Mar 2005 14:19:48 -0500
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011411550.26940@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de> <1109704340.31304.16.camel@cutter>
	<Pine.LNX.4.61.0503011411550.26940@alien.devel.redhat.com>
Message-ID: <1109704788.31304.18.camel@cutter>

On Tue, 2005-03-01 at 14:13 -0500, Cristian Gafton wrote:
>On Tue, 1 Mar 2005, seth vidal wrote:
>
>> I think that was just a problem with a script.
>
>Yes, the script does not support it.
>
>> Michael, didn't you fix that with your patches from the other day?
>
>He can not - cvs-import does not have access to the cvs layout in a way 
>that would allow it to create branches. It requires cooperation from the 
>backend.

ah, okay. thanks for the explanation, glad it's not a permanent problem,
though.

-sv




From adrian at lisas.de  Tue Mar  1 19:19:27 2005
From: adrian at lisas.de (Adrian Reber)
Date: Tue, 1 Mar 2005 20:19:27 +0100
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
Message-ID: <20050301191927.GA3916@lisas.de>

On Tue, Mar 01, 2005 at 02:11:35PM -0500, Cristian Gafton wrote:
> >Just to make sure I understand this correctly: All newly imported packages
> >after branching CVS cannot be available for FC-3 and there is no way 
> >around it?
> 
> There is a way around it - for now it requires manual intervention. People 
> need to understand that this is a consequence of using the same scripts we 
> have for branching internally the fedora core package set. In the FC case, 
> once we branch there are no package changes committed to the branch - thus 
> the reason why cvs-import can not create new branches.
> 
> I realize that for FE this is not the case, and I am working on a solution 
> that will allow branches to be created at the cvs-import time.
> 
> For now, please use cvs-import to import the new packages and once the 
> import is done ask on this list for a branch to be created for your new 
> import. We'll wade through this manual process until I adapt the scripts.

Ah, okay. Thanks for that information.

		Adrian



From skvidal at phy.duke.edu  Tue Mar  1 19:25:31 2005
From: skvidal at phy.duke.edu (seth vidal)
Date: Tue, 01 Mar 2005 14:25:31 -0500
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <20050301191927.GA3916@lisas.de>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<20050301191927.GA3916@lisas.de>
Message-ID: <1109705131.31304.24.camel@cutter>

>Ah, okay. Thanks for that information.
>

Adrian,
 would you mind adding this information and how you solved it to the CVS
Faq on http://fedoraproject.org/wiki/Extras/UsingCvsFaq

thanks,
-sv




From bugs.michael at gmx.net  Tue Mar  1 19:23:06 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Tue, 1 Mar 2005 20:23:06 +0100
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011411550.26940@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<1109704340.31304.16.camel@cutter>
	<Pine.LNX.4.61.0503011411550.26940@alien.devel.redhat.com>
Message-ID: <20050301202306.28880baa.bugs.michael@gmx.net>

On Tue, 1 Mar 2005 14:13:25 -0500 (EST), Cristian Gafton wrote:

> On Tue, 1 Mar 2005, seth vidal wrote:
> 
> > I think that was just a problem with a script.
> 
> Yes, the script does not support it.
> 
> > Michael, didn't you fix that with your patches from the other day?
> 
> He can not - cvs-import does not have access to the cvs layout in a way 
> that would allow it to create branches. It requires cooperation from the 
> backend.

What I fixed with regard to the FC-3 branch can be seen in the
CVSROOT/modules changelog. cvs-import failed for existing modules in the
FC-3 branch.



From adrian at lisas.de  Tue Mar  1 19:30:46 2005
From: adrian at lisas.de (Adrian Reber)
Date: Tue, 1 Mar 2005 20:30:46 +0100
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <1109705131.31304.24.camel@cutter>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<20050301191927.GA3916@lisas.de> <1109705131.31304.24.camel@cutter>
Message-ID: <20050301193046.GA7637@lisas.de>

On Tue, Mar 01, 2005 at 02:25:31PM -0500, seth vidal wrote:
> >Ah, okay. Thanks for that information.
> 
> Adrian,
>  would you mind adding this information and how you solved it to the CVS
> Faq on http://fedoraproject.org/wiki/Extras/UsingCvsFaq

If you mean by "how you solved it" that I know now that I have to
request it on this mailinglist I can add it of course.

		Adrian



From ville.skytta at iki.fi  Tue Mar  1 19:46:53 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Tue, 01 Mar 2005 21:46:53 +0200
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
Message-ID: <1109706413.15077.126.camel@bobcat.mine.nu>

On Tue, 2005-03-01 at 14:11 -0500, Cristian Gafton wrote:

> For now, please use cvs-import to import the new packages and once the 
> import is done ask on this list for a branch to be created for your new 
> import. We'll wade through this manual process until I adapt the scripts.

Related: there's a pretty long list at
http://fedoraproject.org/wiki/Extras_2fCVSSyncNeeded , but all of those
are (for now) for < FC3 fedora.us updates, as far as I can tell.  These
can probably wait at least until the script can take care of things.



From gafton at redhat.com  Tue Mar  1 21:09:29 2005
From: gafton at redhat.com (Cristian Gafton)
Date: Tue, 1 Mar 2005 16:09:29 -0500 (EST)
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <1109706413.15077.126.camel@bobcat.mine.nu>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<1109706413.15077.126.camel@bobcat.mine.nu>
Message-ID: <Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>

On Tue, 1 Mar 2005, Ville [ISO-8859-1] Skytt? wrote:

>> For now, please use cvs-import to import the new packages and once the
>> import is done ask on this list for a branch to be created for your new
>> import. We'll wade through this manual process until I adapt the scripts.
>
> Related: there's a pretty long list at
> http://fedoraproject.org/wiki/Extras_2fCVSSyncNeeded , but all of those
> are (for now) for < FC3 fedora.us updates, as far as I can tell.  These
> can probably wait at least until the script can take care of things.

I can create the branches for all those. I assume that if the branch 
source is devel/ everything would be fine?

Cristian
-- 
----------------------------------------------------------------------
Cristian Gafton     --     gafton at redhat.com      --     Red Hat, Inc.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"Linux is a leprosy; and is having a deleterious effect on the U.S. IT
industry because it is steadily depreciating the value of the software
industry sector."
     -- Kenneth Brown, President, Alexis de Tocqueville Institution

From fedora-extras-commits at redhat.com  Tue Mar  1 21:09:27 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 1 Mar 2005 16:09:27 -0500
Subject: rpms/libol/FC-3 .cvsignore, 1.2, 1.3 libol.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <200503012109.j21L9R2x015336@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libol/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15330

Modified Files:
	.cvsignore libol.spec sources 
Log Message:
Update to 0.3.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:55 -0000	1.2
+++ .cvsignore	1 Mar 2005 21:09:25 -0000	1.3
@@ -1 +1 @@
-libol-0.3.13.tar.gz
+libol-0.3.15.tar.gz


Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-3/libol.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libol.spec	10 Dec 2004 22:03:05 -0000	1.4
+++ libol.spec	1 Mar 2005 21:09:25 -0000	1.5
@@ -1,31 +1,35 @@
-Summary:   Support library for syslog-ng
-Name:      libol
-Version:   0.3.13
-Release:   2
-Epoch:     0
-License:   GPL
-Group:     System Environment/Libraries
-Url:       http://www.balabit.hu/products/syslog-ng/
-Source:    http://www.balabit.hu/downloads/syslog-ng/libol/0.3/libol-0.3.13.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
-Requires(post,postun): /sbin/ldconfig
+#
+# Before changing the macro below see the README file included in
+# the syslog-ng package.
+#
+%define with_scheme_preprocessor 0
+
+Name:           libol
+Version:        0.3.15
+Release:        2
+Epoch:          0
+Summary:        Support library for syslog-ng
+
+Group:          Development/Libraries
+License:        GPL
+Url:            http://www.balabit.com/products/syslog-ng/
+Source:         http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.15.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{with_scheme_preprocessor}
+BuildRequires:  scsh
+%endif
 
 %description
 Support library for syslog-ng.
 
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
 
 %package devel
-Summary: Support library libol for syslog-ng headers and libraries
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary:        Support library for syslog-ng: headers and libraries
+Group:          Development/Libraries
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
-Support library libol for syslog-ng headers and libraries
-
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
+Support library for syslog-ng: headers and libraries.
 
 
 %prep
@@ -33,21 +37,14 @@
 
 %build
 %configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-#
-# make_class
-#   -- this file is installed without an interpreter
-#   -- doesn't appear to be required to build syslog-ng
-#   -> file manually removed
-#
-rm ${RPM_BUILD_ROOT}%{_bindir}/make_class
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -56,13 +53,18 @@
 
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING
 %{_libdir}/libol.so.0
 %{_libdir}/libol.so.0.0.0
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%if %{with_scheme_preprocessor}
+%{_bindir}/make_class
+%else
+%exclude %{_bindir}/make_class
+%endif
 %{_bindir}/libol-config
 %{_libdir}/libol.a
 %{_libdir}/libol.la
@@ -71,32 +73,43 @@
 
 
 %changelog
-* Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
+* Tue Mar 01 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3.15-2
+- Remove redundant explicit /sbin/ldconfig dependency.
+
+* Sat Feb 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.15-0.fdr.1
+- Update to 0.3.15.
+
+* Wed Aug 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.14-0.fdr.1
+- Update to 0.3.14.
+- Merged upstream specfile changes.
+- Upstream configure.in has been patched (make CFLAGS no longer needed).
+
+* Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
 - building with CFLAGS="$RPM_OPT_FLAGS"
 
-* Sat Feb 28 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.1
+* Sat Feb 28 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.1
 - removed blockers listed in the first comment of bugzilla entry 1331
 - https://bugzilla.fedora.us/show_bug.cgi?id=1331
 
-* Fri Feb 27 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.0.1
+* Fri Feb 27 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.0.1
 - updated to version 0.3.13
 
-* Sat Feb  7 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.3
+* Sat Feb  7 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.3
 - make %{?_smp_mflags}
 
-* Sun Jan 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.2
+* Sun Jan 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.2
 - moved files libol-config and libol.so into the devel RPM
 
-* Sat Jan 10 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.1
+* Sat Jan 10 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.1
 - first spec for fedora.us
 
-* Tue Oct  7 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Tue Oct  7 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - updated to version 0.3.11
 
-* Tue Apr 15 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Tue Apr 15 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - included missing file: /usr/bin/make_class (caused problems in RH9)
  
-* Thu Apr 10 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Thu Apr 10 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - specfile reformated 
 - replaced hard coded values by RPM macros
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:55 -0000	1.2
+++ sources	1 Mar 2005 21:09:25 -0000	1.3
@@ -1 +1 @@
-b66e21769e21ac9b953cbafe517630fd  libol-0.3.13.tar.gz
+1c8d6a9c72a9200738a04d68e5a7b439  libol-0.3.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  1 21:12:45 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 1 Mar 2005 16:12:45 -0500
Subject: rpms/libol/devel .cvsignore, 1.2, 1.3 libol.spec, 1.5, 1.6 sources,
	1.2, 1.3
Message-ID: <200503012112.j21LCjTv015448@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15442

Modified Files:
	.cvsignore libol.spec sources 
Log Message:
Update to 0.3.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libol/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:55 -0000	1.2
+++ .cvsignore	1 Mar 2005 21:12:43 -0000	1.3
@@ -1 +1 @@
-libol-0.3.13.tar.gz
+libol-0.3.15.tar.gz


Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/devel/libol.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libol.spec	26 Feb 2005 18:40:12 -0000	1.5
+++ libol.spec	1 Mar 2005 21:12:43 -0000	1.6
@@ -1,30 +1,35 @@
-Summary:   Support library for syslog-ng
-Name:      libol
-Version:   0.3.13
-Release:   3
-Epoch:     0
-License:   GPL
-Group:     System Environment/Libraries
-Url:       http://www.balabit.hu/products/syslog-ng/
-Source:    http://www.balabit.hu/downloads/syslog-ng/libol/0.3/libol-0.3.13.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+#
+# Before changing the macro below see the README file included in
+# the syslog-ng package.
+#
+%define with_scheme_preprocessor 0
+
+Name:           libol
+Version:        0.3.15
+Release:        2
+Epoch:          0
+Summary:        Support library for syslog-ng
+
+Group:          Development/Libraries
+License:        GPL
+Url:            http://www.balabit.com/products/syslog-ng/
+Source:         http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.15.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{with_scheme_preprocessor}
+BuildRequires:  scsh
+%endif
 
 %description
 Support library for syslog-ng.
 
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
 
 %package devel
-Summary: Support library libol for syslog-ng headers and libraries
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary:        Support library for syslog-ng: headers and libraries
+Group:          Development/Libraries
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
-Support library libol for syslog-ng headers and libraries
-
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
+Support library for syslog-ng: headers and libraries.
 
 
 %prep
@@ -32,21 +37,14 @@
 
 %build
 %configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-#
-# make_class
-#   -- this file is installed without an interpreter
-#   -- doesn't appear to be required to build syslog-ng
-#   -> file manually removed
-#
-rm ${RPM_BUILD_ROOT}%{_bindir}/make_class
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -55,13 +53,18 @@
 
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING
 %{_libdir}/libol.so.0
 %{_libdir}/libol.so.0.0.0
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%if %{with_scheme_preprocessor}
+%{_bindir}/make_class
+%else
+%exclude %{_bindir}/make_class
+%endif
 %{_bindir}/libol-config
 %{_libdir}/libol.a
 %{_libdir}/libol.la
@@ -70,35 +73,43 @@
 
 
 %changelog
-* Sat Feb 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3.13-3
+* Tue Mar 01 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3.15-2
 - Remove redundant explicit /sbin/ldconfig dependency.
 
-* Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
+* Sat Feb 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.15-0.fdr.1
+- Update to 0.3.15.
+
+* Wed Aug 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.14-0.fdr.1
+- Update to 0.3.14.
+- Merged upstream specfile changes.
+- Upstream configure.in has been patched (make CFLAGS no longer needed).
+
+* Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
 - building with CFLAGS="$RPM_OPT_FLAGS"
 
-* Sat Feb 28 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.1
+* Sat Feb 28 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.1
 - removed blockers listed in the first comment of bugzilla entry 1331
 - https://bugzilla.fedora.us/show_bug.cgi?id=1331
 
-* Fri Feb 27 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.0.1
+* Fri Feb 27 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.0.1
 - updated to version 0.3.13
 
-* Sat Feb  7 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.3
+* Sat Feb  7 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.3
 - make %{?_smp_mflags}
 
-* Sun Jan 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.2
+* Sun Jan 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.2
 - moved files libol-config and libol.so into the devel RPM
 
-* Sat Jan 10 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.1
+* Sat Jan 10 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.11-0.fdr.1
 - first spec for fedora.us
 
-* Tue Oct  7 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Tue Oct  7 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - updated to version 0.3.11
 
-* Tue Apr 15 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Tue Apr 15 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - included missing file: /usr/bin/make_class (caused problems in RH9)
  
-* Thu Apr 10 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
+* Thu Apr 10 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - specfile reformated 
 - replaced hard coded values by RPM macros
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libol/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:55 -0000	1.2
+++ sources	1 Mar 2005 21:12:43 -0000	1.3
@@ -1 +1 @@
-b66e21769e21ac9b953cbafe517630fd  libol-0.3.13.tar.gz
+1c8d6a9c72a9200738a04d68e5a7b439  libol-0.3.15.tar.gz



From ville.skytta at iki.fi  Tue Mar  1 21:44:02 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Tue, 01 Mar 2005 23:44:02 +0200
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<1109706413.15077.126.camel@bobcat.mine.nu>
	<Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
Message-ID: <1109713442.15077.181.camel@bobcat.mine.nu>

On Tue, 2005-03-01 at 16:09 -0500, Cristian Gafton wrote:
> On Tue, 1 Mar 2005, Ville [ISO-8859-1] Skytt wrote:
> 
> >> For now, please use cvs-import to import the new packages and once the
> >> import is done ask on this list for a branch to be created for your new
> >> import. We'll wade through this manual process until I adapt the scripts.
> >
> > Related: there's a pretty long list at
> > http://fedoraproject.org/wiki/Extras_2fCVSSyncNeeded , but all of those
> > are (for now) for < FC3 fedora.us updates, as far as I can tell.  These
> > can probably wait at least until the script can take care of things.
> 
> I can create the branches for all those.

Cool, thanks.

> I assume that if the branch 
> source is devel/ everything would be fine?

Hm, I'm not sure I follow, but I think it'd be best to just create the
empty branches if possible, and then use cvs-import.sh with the actual
packages from download.fedora.us to bring in the contents.  There are
some differences between the current devel/ and the older distro
branches in all of them.  When the branches are there, I can take care
of the imports.



From gafton at redhat.com  Tue Mar  1 22:04:00 2005
From: gafton at redhat.com (Cristian Gafton)
Date: Tue, 1 Mar 2005 17:04:00 -0500 (EST)
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<1109706413.15077.126.camel@bobcat.mine.nu>
	<Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
Message-ID: <Pine.LNX.4.61.0503011643380.12801@alien.devel.redhat.com>

On Tue, 1 Mar 2005, Cristian Gafton wrote:

> I can create the branches for all those. I assume that if the branch source 
> is devel/ everything would be fine?

Branches created.

Cristian
-- 
----------------------------------------------------------------------
Cristian Gafton     --     gafton at redhat.com      --     Red Hat, Inc.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"Linux is a leprosy; and is having a deleterious effect on the U.S. IT
industry because it is steadily depreciating the value of the software
industry sector."
     -- Kenneth Brown, President, Alexis de Tocqueville Institution



From fedora-extras-commits at redhat.com  Tue Mar  1 22:05:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 1 Mar 2005 17:05:06 -0500
Subject: rpms/pth/devel pth-2.0.3.tar.gz.sig,1.1,NONE
Message-ID: <200503012205.j21M569g023553@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23543

Removed Files:
	pth-2.0.3.tar.gz.sig 
Log Message:
remove file left over since previous commit


--- pth-2.0.3.tar.gz.sig DELETED ---



From fedora-extras-commits at redhat.com  Tue Mar  1 22:05:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:05:11 -0500
Subject: rpms/xemacs/devel - New directory
Message-ID: <200503012205.j21M5Bo4023585@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23575/xemacs/devel

Log Message:
Directory /cvs/extras/rpms/xemacs/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar  1 22:05:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:05:11 -0500
Subject: rpms/xemacs - New directory
Message-ID: <200503012205.j21M5BVS023582@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23575/xemacs

Log Message:
Directory /cvs/extras/rpms/xemacs added to the repository




From fedora-extras-commits at redhat.com  Tue Mar  1 22:05:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:05:26 -0500
Subject: rpms/xemacs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503012205.j21M5Q56023644@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23635

Added Files:
	Makefile import.log 
Log Message:
Setup of module xemacs


--- NEW FILE Makefile ---
# Top level Makefile for module xemacs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  1 22:05:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:05:26 -0500
Subject: rpms/xemacs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503012205.j21M5QRp023647@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23635/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xemacs


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From gafton at redhat.com  Tue Mar  1 22:06:35 2005
From: gafton at redhat.com (Cristian Gafton)
Date: Tue, 1 Mar 2005 17:06:35 -0500 (EST)
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <1109713442.15077.181.camel@bobcat.mine.nu>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<1109706413.15077.126.camel@bobcat.mine.nu>
	<Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
	<1109713442.15077.181.camel@bobcat.mine.nu>
Message-ID: <Pine.LNX.4.61.0503011704210.12801@alien.devel.redhat.com>

On Tue, 1 Mar 2005, Ville [ISO-8859-1] Skytt? wrote:

>> I assume that if the branch
>> source is devel/ everything would be fine?
>
> Hm, I'm not sure I follow, but I think it'd be best to just create the
> empty branches if possible, and then use cvs-import.sh with the actual
> packages from download.fedora.us to bring in the contents.  There are
> some differences between the current devel/ and the older distro
> branches in all of them.  When the branches are there, I can take care
> of the imports.

You can think of "branching" as basically a "cp -r $src $dst". In most 
cases, we branch the devel/ directory as FC-3/ (kind of like a snapshot).

For things like RHL-9 and FC-1 and whatnot, "devel/" might be too 
comples/advanced/whatever. subsequent cvs-imports into those branches will 
clear things out, so this is only a matter of pedantery as far as choosing 
the initial branch point.

Cristian
-- 
----------------------------------------------------------------------
Cristian Gafton     --     gafton at redhat.com      --     Red Hat, Inc.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"Linux is a leprosy; and is having a deleterious effect on the U.S. IT
industry because it is steadily depreciating the value of the software
industry sector."
     -- Kenneth Brown, President, Alexis de Tocqueville Institution

From fedora-extras-commits at redhat.com  Tue Mar  1 22:11:38 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:11:38 -0500
Subject: rpms/xemacs import.log,1.1,1.2
Message-ID: <200503012211.j21MBcND024115@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24106

Modified Files:
	import.log 
Log Message:
auto-import xemacs-21.4.17-2 on branch devel from xemacs-21.4.17-2.src.rpm
Latest from Core devel CVS adapted to Extras + some improvements.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xemacs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Mar 2005 22:05:24 -0000	1.1
+++ import.log	1 Mar 2005 22:11:36 -0000	1.2
@@ -0,0 +1 @@
+xemacs-21_4_17-2:HEAD:xemacs-21.4.17-2.src.rpm:1109715087



From fedora-extras-commits at redhat.com  Tue Mar  1 22:11:38 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:11:38 -0500
Subject: rpms/xemacs/devel default.el, NONE, 1.1 delprevline.py, NONE,
	1.1 dotxemacs-init.el, NONE, 1.1 menubar-games.patch, NONE,
	1.1 movemail-mktemp.patch, NONE, 1.1 xemacs-21-cursor.patch,
	NONE, 1.1 xemacs-21.4.10-find-paths-pkgdir.patch, NONE,
	1.1 xemacs-21.4.12-find-paths-libexec-lib64.patch, NONE,
	1.1 xemacs-21.4.12-mk-nochk-features.patch, NONE,
	1.1 xemacs-21.4.13-dump-paths-lispdir.patch, NONE,
	1.1 xemacs-21.4.13-utf8-fontsets.patch, NONE,
	1.1 xemacs-21.4.15-wnnfix-128362.patch, NONE,
	1.1 xemacs-debian-docdir-dump.patch, NONE,
	1.1 xemacs-no-expdyn-ia64-106744.patch, NONE,
	1.1 xemacs-sitestart.el, NONE, 1.1 xemacs.desktop, NONE,
	1.1 xemacs.png, NONE, 1.1 xemacs.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503012211.j21MBc5C024119@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24106/devel

Modified Files:
	.cvsignore sources 
Added Files:
	default.el delprevline.py dotxemacs-init.el 
	menubar-games.patch movemail-mktemp.patch 
	xemacs-21-cursor.patch xemacs-21.4.10-find-paths-pkgdir.patch 
	xemacs-21.4.12-find-paths-libexec-lib64.patch 
	xemacs-21.4.12-mk-nochk-features.patch 
	xemacs-21.4.13-dump-paths-lispdir.patch 
	xemacs-21.4.13-utf8-fontsets.patch 
	xemacs-21.4.15-wnnfix-128362.patch 
	xemacs-debian-docdir-dump.patch 
	xemacs-no-expdyn-ia64-106744.patch xemacs-sitestart.el 
	xemacs.desktop xemacs.png xemacs.spec 
Log Message:
auto-import xemacs-21.4.17-2 on branch devel from xemacs-21.4.17-2.src.rpm
Latest from Core devel CVS adapted to Extras + some improvements.


--- NEW FILE default.el ---
;;; default.el - loaded at startup after "~/.xemacs/init.el" by default
;;;
;;; Setting `inhibit-default-init' non-nil in "~/.xemacs/init.el"
;;; prevents loading of this file.  The "-q" option to xemacs
;;; prevents "~/.xemacs/init.el" *and* this file from being loaded
;;; at startup.

;; enable wheelmouse support by default
(when window-system
  (mwheel-install))

;; make gnus save articles be mbox format not rmail format
(defvar gnus-default-article-saver 'gnus-summary-save-in-file)

;; use terminfo by default
(defvar system-uses-terminfo t)


--- NEW FILE delprevline.py ---
#!/usr/bin/python

import string
import sys

match="(japanese)"
file=open(sys.argv[1])
lines=file.readlines()
file.close
lines2=[]
for line in lines:
    if string.find(line,match)>0:
        lines2.pop()
    else:
        lines2.append(line)
file=open(sys.argv[1],"w")
file.writelines(lines2)





--- NEW FILE dotxemacs-init.el ---
;;; .xemacs/init.el

;;; uncomment this line to disable loading of "default.el" at startup
;; (setq inhibit-default-init t)

;; default to unified diffs
(setq diff-switches "-u")

menubar-games.patch:

--- NEW FILE menubar-games.patch ---
--- xemacs-21.4.12/lisp/menubar-items.el~	2003-01-17 04:46:27.000000000 +0900
+++ xemacs-21.4.12/lisp/menubar-items.el	2003-01-17 04:46:27.000000000 +0900
@@ -627,8 +627,8 @@
       ("Ga%_mes"
        ["%_Mine Game" xmine
 	:active (fboundp 'xmine)]
-       ["%_Tetris" tetris
-	:active (fboundp 'tetris)]
+;;        ["%_Tetris" tetris
+;; 	:active (fboundp 'tetris)]
        ["%_Sokoban" sokoban
 	:active (fboundp 'sokoban)]
        ["Quote from %_Zippy" yow

movemail-mktemp.patch:

--- NEW FILE movemail-mktemp.patch ---
--- xemacs-21.4.10/lib-src/movemail.c.mktemp	2002-08-20 20:34:22.000000000 +0900
+++ xemacs-21.4.10/lib-src/movemail.c	2002-12-18 22:09:11.000000000 +0900
@@ -588,7 +588,7 @@
     p--;
   *p = 0;
   strcpy (p, "EXXXXXX");
-  mktemp (tempname);
+  mkstemp (tempname);
   unlink (tempname);
 
   for (;;)

xemacs-21-cursor.patch:

--- NEW FILE xemacs-21-cursor.patch ---
--- gtk-xemacs/src/redisplay-tty.c.cursor	Tue Nov 28 18:24:15 2000
+++ gtk-xemacs/src/redisplay-tty.c	Tue Nov 28 18:25:09 2000
@@ -1236,7 +1236,7 @@
     }
 
   TTY_SD (c).cursor_visible = tgetstr ("ve", &bufptr);
-  TTY_SD (c).cursor_normal = tgetstr ("vs", &bufptr);
+  TTY_SD (c).cursor_normal = tgetstr ("ve", &bufptr);
   TTY_SD (c).init_motion = tgetstr ("ti", &bufptr);
   TTY_SD (c).end_motion = tgetstr ("te", &bufptr);
   TTY_SD (c).keypad_on = tgetstr ("ks", &bufptr);

xemacs-21.4.10-find-paths-pkgdir.patch:

--- NEW FILE xemacs-21.4.10-find-paths-pkgdir.patch ---
diff -u xemacs-21.4.10/lisp/find-paths.el~ xemacs-21.4.10/lisp/find-paths.el
--- xemacs-21.4.10/lisp/find-paths.el~	2002-12-21 08:56:42.000000000 +0900
+++ xemacs-21.4.10/lisp/find-paths.el	2002-12-21 08:56:42.000000000 +0900
@@ -103,8 +103,8 @@
   (or
    ;; installed
    (paths-file-readable-directory-p (paths-construct-path (list directory
-								"lib"
-								emacs-program-name)))
+								"share"
+								(construct-emacs-version-name))))
    ;; in-place or windows-nt
    (and
     (paths-file-readable-directory-p (paths-construct-path (list directory "lisp")))
@@ -211,7 +211,7 @@
   (paths-find-emacs-directory roots
 			      (file-name-as-directory
 			       (paths-construct-path (list
-						      "lib"
+						      "share"
 						      emacs-program-name)))
 			      base
 			      envvar default

xemacs-21.4.12-find-paths-libexec-lib64.patch:

--- NEW FILE xemacs-21.4.12-find-paths-libexec-lib64.patch ---
--- xemacs-21.4.12/lisp/find-paths.el.pkgdir	2003-01-21 18:37:30.000000000 +0900
+++ xemacs-21.4.12/lisp/find-paths.el	2003-01-21 18:37:30.000000000 +0900
@@ -225,7 +225,7 @@
   (paths-find-emacs-directory roots
 			      (file-name-as-directory
 			       (paths-construct-path
-				(list "lib"
+				(list "lib64"
 				      (construct-emacs-version-name))))
 			      base
 			      envvar default

xemacs-21.4.12-mk-nochk-features.patch:

--- NEW FILE xemacs-21.4.12-mk-nochk-features.patch ---
--- xemacs-21.4.12/Makefile.in.in~	2003-02-08 00:28:44.000000000 +0900
+++ xemacs-21.4.12/Makefile.in.in	2003-02-08 00:28:44.000000000 +0900
@@ -407,7 +407,7 @@
 
 install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep
 
-install: all check-features install-arch-dep install-arch-indep
+install: all install-arch-dep install-arch-indep
 
 install-arch-dep: mkdir
 	for subdir in ${INSTALL_ARCH_DEP_SUBDIR}; do \

xemacs-21.4.13-dump-paths-lispdir.patch:

--- NEW FILE xemacs-21.4.13-dump-paths-lispdir.patch ---
diff -u xemacs-21.4.13/lisp/dump-paths.el.dump-path xemacs-21.4.13/lisp/dump-paths.el
--- xemacs-21.4.13/lisp/dump-paths.el.dump-path	2003-06-26 23:33:42.000000000 +0900
+++ xemacs-21.4.13/lisp/dump-paths.el	2003-06-26 23:33:42.000000000 +0900
@@ -58,15 +58,14 @@
 		       late-packages late-package-load-path)
 	       'external-debugging-output)))
 
-  (setq lisp-directory (paths-find-lisp-directory roots))
+  (setq lisp-directory "@srcdir@/lisp")
   (if debug-paths
       (princ (format "lisp-directory:\n%S\n" lisp-directory)
 	     'external-debugging-output))
   (if (featurep 'mule)
       (progn
 	(setq mule-lisp-directory
-	      (paths-find-mule-lisp-directory roots
-					      lisp-directory))
+	      "@srcdir@/lisp/mule")
 	(if debug-paths
 	    (princ (format "mule-lisp-directory:\n%S\n"
 			   mule-lisp-directory)

xemacs-21.4.13-utf8-fontsets.patch:

--- NEW FILE xemacs-21.4.13-utf8-fontsets.patch ---
--- xemacs-21.4.13/etc/Emacs.ad~	2002-12-12 08:21:12.000000000 +0200
+++ xemacs-21.4.13/etc/Emacs.ad	2003-07-13 19:47:48.000000000 +0300
@@ -203,11 +203,13 @@
 *menubar*FontSet:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
 			-*-*-*-*-*-*-*-120-*-iso10646-1, \
 			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
-			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0
+			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \
+			-*-*-*-*-*-*-*-120-*-*-*
 *popup*FontSet:		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
 			-*-*-*-*-*-*-*-120-*-iso10646-1, \
 			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
-			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0
+			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \
+			-*-*-*-*-*-*-*-120-*-*-*
 
 ! Gui elements share this font
 !

xemacs-21.4.15-wnnfix-128362.patch:

--- NEW FILE xemacs-21.4.15-wnnfix-128362.patch ---
--- xemacs-21.4.15/src/mule-wnnfns.c.orig	2004-07-22 15:34:28.473317319 +0900
+++ xemacs-21.4.15/src/mule-wnnfns.c	2004-07-22 15:34:38.932537998 +0900
@@ -318,7 +318,7 @@
 Lisp_Object	Qwnn_jisho, Qwnn_sbn, Qwnn_dbn_len, Qwnn_sbn_cnt, Qwnn_suuji;
 Lisp_Object	Qwnn_kana, Qwnn_eisuu, Qwnn_kigou, Qwnn_toji_kakko, Qwnn_fuzokogo, Qwnn_kaikakko;
 Lisp_Object	Vwnn_server_type;
-Lisp_Object	Vcwnn_zhuyin;
+//Lisp_Object	Vcwnn_zhuyin;
 Lisp_Object	Vwnnenv_sticky;
 Lisp_Object	Vwnn_uniq_level;
 Fixnum		lb_sisheng;
@@ -1899,9 +1899,11 @@
   DEFVAR_LISP ("wnn-server-type", &Vwnn_server_type /*
 *jserver, cserver ..
 */ );
-  DEFVAR_LISP ("cwnn-zhuyin", &Vcwnn_zhuyin /*
+#if 0
+   DEFVAR_LISP ("cwnn-zhuyin", &Vcwnn_zhuyin /*
 *pinyin or zhuyin
 */ );
+#endif
   DEFVAR_LISP ("wnnenv-sticky", &Vwnnenv_sticky /*
 *If non-nil, make environment sticky
 */ );
@@ -1910,7 +1912,7 @@
 */ );
 
   Vwnn_server_type = Qjserver;
-  Vcwnn_zhuyin = Qnil;
+  //Vcwnn_zhuyin = Qnil;
   Vwnnenv_sticky = Qnil;
 
   Vwnn_uniq_level = Qwnn_uniq;
@@ -1932,10 +1934,14 @@
 	case 0x80:
 	  if (EQ(Vwnn_server_type, Qcserver))
 	    {
+#if 0
 	      len = cwnn_yincod_pzy (pzy, wc,
 				     NILP (Vcwnn_zhuyin)
 				     ? CWNN_PINYIN
 				     : CWNN_ZHUYIN);
+#else
+	      len = 0;
+#endif
 	      for (i = 0; i < len; i++)
 		{
 		  if (pzy[i] & 0x80)
@@ -2038,8 +2044,12 @@
       else	       *pin = *w;
       w++; pin++;
     }
+#if 0
   len = cwnn_pzy_yincod (ybuf, pbuf,
 			 NILP (Vcwnn_zhuyin) ? CWNN_PINYIN : CWNN_ZHUYIN);
+#else
+  return;
+#endif
   if (len <= 0)
     return;
 

xemacs-debian-docdir-dump.patch:

--- NEW FILE xemacs-debian-docdir-dump.patch ---
--- xemacs21-21.4.15.orig/src/config.h.in
+++ xemacs21-21.4.15/src/config.h.in
@@ -905,6 +905,7 @@
 #undef MODULEDIR_USER_DEFINED
 #undef SITEMODULEDIR_USER_DEFINED
 #undef DOCDIR_USER_DEFINED
+#undef DOCDIR
 #undef LISPDIR_USER_DEFINED
 #undef PACKAGE_PATH_USER_DEFINED
 #undef SITELISPDIR_USER_DEFINED
--- xemacs-21.4.15/configure.in~	2004-04-06 21:05:13.000000000 +0900
+++ xemacs-21.4.15/configure.in	2004-04-06 21:05:13.000000000 +0900
@@ -4856,6 +4856,7 @@
   esac
 done
 AC_SUBST(DOCDIR)
+AC_DEFINE_UNQUOTED(DOCDIR, "$docdir")
 
 AC_SUBST(archlibdir)
 AC_SUBST(ARCHLIBDIR_USER_DEFINED)
--- xemacs21-21.4.15.orig/src/dumper.c
+++ xemacs21-21.4.15/src/dumper.c
@@ -1322,9 +1322,24 @@
 }
 #endif /* !WIN32_NATIVE */
 
+static int
+pdump_file_doc_dir_try (char *exe_path)
+{
+  char *w = exe_path + strlen (exe_path);
+
+  sprintf (w, "%s", "DUMP");
+
+  if (pdump_file_get (exe_path))
+    {
+      if (pdump_load_check ())
+        return 1;
+      pdump_free ();
+    }
+  return 0;
+}
 
 static int
-pdump_file_try (char *exe_path)
+pdump_file_exe_path_try (char *exe_path)
 {
   char *w = exe_path + strlen (exe_path);
 
@@ -1439,9 +1454,16 @@
 
   /* Save exe_path because pdump_file_try() modifies it */
   strcpy(real_exe_path, exe_path);
-  if (pdump_file_try (exe_path)
+  if (pdump_file_exe_path_try (exe_path)
       || (xrealpath(real_exe_path, real_exe_path)
-	  && pdump_file_try (real_exe_path)))
+	  && pdump_file_exe_path_try (real_exe_path)))
+    {
+      pdump_load_finish ();
+      return 1;
+    }
+
+  sprintf(exe_path, "%s", DOCDIR);
+  if (pdump_file_doc_dir_try (exe_path))
     {
       pdump_load_finish ();
       return 1;

xemacs-no-expdyn-ia64-106744.patch:

--- NEW FILE xemacs-no-expdyn-ia64-106744.patch ---
diff -u xemacs-21.4.15/aclocal.m4~ xemacs-21.4.15/aclocal.m4
--- xemacs-21.4.15/aclocal.m4~	2004-05-07 07:55:22.000000000 -0400
+++ xemacs-21.4.15/aclocal.m4	2004-05-07 07:55:22.000000000 -0400
@@ -530,11 +530,12 @@
 dnl usually need to be prefix with ${wl} or some other such thing.
 dnl
 
-if test "$xe_gnu_ld" = yes; then
-  if test "$ld_shlibs" = yes; then
-    ld_dynamic_link_flags="${wl}-export-dynamic"
-  fi
-fi
+dnl dnl avoid -export-dynamic on ia64
+dnl if test "$xe_gnu_ld" = yes; then
+dnl   if test "$ld_shlibs" = yes; then
+dnl     ld_dynamic_link_flags="${wl}-export-dynamic"
+dnl   fi
+dnl fi
 
 if test -z "$ld_dynamic_link_flags"; then
   case "$xehost_os" in


--- NEW FILE xemacs-sitestart.el ---
;;; site-start.el - loaded at startup before "~/.xemacs/init.el"
;;;
;;; The "-no-site-file" option to xemacs prevents this file from being loaded.

;; fix default info path
(setq Info-directory-list '("/usr/share/info/"
			    "/usr/share/xemacs/xemacs-packages/info/"
			    "/usr/share/xemacs/mule-packages/info/"))

;;; psgml catalog list
(setq sgml-catalog-files
	      (if (getenv "SGML_CATALOG_FILES")
		  (split-path (getenv "SGML_CATALOG_FILES"))
		(list "CATALOG" "catalog"
		      "/etc/sgml/catalog"
		      "/etc/xml/catalog"
		      (locate-data-file "CATALOG"))))

;; default to non-kerberos ftp
(setq efs-ftp-program-name "/usr/bin/ftp")

;; load .el files in "site-start.d/"
(let ((files (directory-files "/usr/share/xemacs/site-packages/lisp/site-start.d" t "\\.el$")))
  (mapc 'load-file files))

;; fix default courier italics
;; for courier, oblique usually produces better results than italic
(setq try-oblique-before-italic-fonts t)
(when window-system
  (make-face-italic 'italic)
  (make-face-italic 'bold-italic))

;; setup coding-systems
(when (featurep 'mule)
  (let* ((locale (or (getenv "LC_ALL")
		   (getenv "LC_CTYPE")
		   (getenv "LANG")))
       (lang-region (and locale
			 (substring locale 0 (min 5 (length locale)))))
       (lang (and lang-region
		  (substring lang-region 0 (min 2 (length lang-region))))))
  (cond ((equal lang "ja")
	 (set-language-environment "Japanese"))
	((equal lang "ko")
	 (set-language-environment "Korean"))
	((equal lang-region "zh_CN")
	 (set-language-environment "Chinese-GB"))
	((equal lang-region "zh_TW")
	 (set-language-environment "Chinese-BIG5")))
  (cond ((and locale (string-match "UTF-8" locale))
	 (require 'un-define)
	 (set-default-coding-systems 'utf-8)
	 (set-coding-priority-list '(utf-8))
	 (set-coding-category-system 'utf-8 'utf-8))
	((equal lang "ja")
	 (set-default-coding-systems 'euc-jp))
	((equal lang "ko")
	 (set-default-coding-systems 'euc-kr))
	((equal lang-region "zh_CN")
	 (set-default-coding-systems 'cn-gb-2312))
	((equal lang-region "zh_TW")
	 (set-default-coding-systems 'big5)))
  ;; register available Input Methods
  (load "leim-list")
  (when (member lang '("ja" "ko" "zh"))
    ;; ispell doesn't support CJK
    (setq-default ispell-local-dictionary "english"))))

;; try to preserve user/group when saving files
(setq-default backup-by-copying-when-mismatch t)

;; when saving a buffer always end it with a newline
(setq-default require-final-newline t)



--- NEW FILE xemacs.desktop ---
[Desktop Entry]
Name=XEmacs Text Editor
Name[bg]=???????????????? XEmacs
Name[ca]=Editor XEmacs
Name[cs]=Editor XEmacs
Name[da]=XEmacs tekstredigerer
Name[de]=XEmacs Texteditor
Name[eo]=La redaktilo XEmakso
Name[es]=Emacs para X
Name[et]=Emacs X'i kasutajaliidesega
Name[fi]=XEmacs editori
Name[fr]=??diteur XEmacs
Name[hu]=XEmacs sz??vegszerkeszt??
Name[is]=XEmacs-ritill
Name[it]=Emacs per X
Name[ja]=XEmacs ??????????????????????????????
Name[mk]=?????????????????????????????? XEmacs ????????????????
Name[no]=XEmacs-tekstredigerer
Name[pt]=Editor XEmacs
Name[ro]=Editorul XEmacs
Name[ru]=???????????????? XEmacs
Name[sk]=Editor XEmacs
Name[sl]=Urejevalnik XEmacs
Name[uk]=???????????????? XEmacs
GenericName=Text Editor
Comment=Edit text
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
Exec=xemacs %f
Icon=xemacs
Type=Application
Terminal=false
Categories=Application;Development;TextEditor;X-Red-Hat-Extra;
Encoding=UTF-8
StartupWMClass=Emacs


--- NEW FILE xemacs.spec ---
Summary: A different version of Emacs.
Name: xemacs
Version: 21.4.17
Release: 2
License: GPL
Group: Applications/Editors
Source0: ftp://ftp.xemacs.org/xemacs-21.4/xemacs-%{version}.tar.bz2
Source1: %{name}.png
Source6: xemacs.desktop
Source9: xemacs-sitestart.el
#Used for cleaning finder-inf.el when it needs compilation
Source22: delprevline.py
Source23: dotxemacs-init.el
Source24: default.el
Patch5: xemacs-21-cursor.patch
Patch10: xemacs-21.4.10-find-paths-pkgdir.patch
Patch11: movemail-mktemp.patch
Patch14: menubar-games.patch
Patch15: xemacs-21.4.12-find-paths-libexec-lib64.patch
Patch16: xemacs-21.4.12-mk-nochk-features.patch
Patch18: xemacs-21.4.13-dump-paths-lispdir.patch
Patch19: xemacs-21.4.13-utf8-fontsets.patch
Patch21: xemacs-debian-docdir-dump.patch
Patch23: xemacs-no-expdyn-ia64-106744.patch
Patch24: xemacs-21.4.15-wnnfix-128362.patch
URL: http://www.xemacs.org/
Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: perl python autoconf213
BuildRequires: XFree86-devel ncurses-devel gpm-devel
BuildRequires: pam-devel zlib-devel libjpeg-devel glibc-devel compface
BuildRequires: libpng-devel libtiff-devel Canna-devel
#BuildRequires: postgresql-devel db4-devel openldap-devel krb5-devel
%{?_with_gtk:BuildRequires: gtk+-devel libglade-devel}
%{!?_with_gtk:BuildRequires: Xaw3d-devel}
Requires: xemacs-sumo >= 20050118-2, xemacs-common = %{version}-%{release}
Obsoletes: xemacs-extras xemacs-noX xemacs-X11 xemacs-mule xemacs-static

%description 
XEmacs is a highly customizable open source text editor and
application development system. It is protected under the
GNU General Public License and related to other versions of Emacs,
in particular GNU Emacs. Its emphasis is on modern graphical
user interface support and an open software development
model, similar to Linux.

This package contains xemacs built for X Windows with MULE support.

%package common
Summary: The byte-compiled lisp files and other common files for XEmacs.
Group: Applications/Editors
PreReq: %{_sbindir}/alternatives

%description common
XEmacs is a highly customizable open source text editor and
application development system. It is protected under the
GNU General Public License and related to other versions of Emacs,
in particular GNU Emacs. Its emphasis is on modern graphical
user interface support and an open software development
model, similar to Linux.

This package contains byte-compiled lisp and other common files for XEmacs.

%package nox
Summary: A different version of Emacs built without X Windows Support.
Group: Applications/Editors
# Note: no xemacs-sumo dependency here, we need -nox to build the sumo package.
Requires: xemacs-common = %{version}-%{release}

%description nox
XEmacs is a highly customizable open source text editor and
application development system. It is protected under the
GNU General Public License and related to other versions of Emacs,
in particular GNU Emacs. Its emphasis is on modern graphical
user interface support and an open software development
model, similar to Linux.

This package contains XEmacs built without X Windows support.

%package el
Summary: The .el source files for XEmacs.
Group: Applications/Editors

%description el
XEmacs is a highly customizable open source text editor and
application development system. It is protected under the
GNU General Public License and related to other versions of Emacs,
in particular GNU Emacs. Its emphasis is on modern graphical
user interface support and an open software development
model, similar to Linux.

This package contains the lisp source files for XEmacs.

%package info
Summary: Information files for XEmacs.
Group: Applications/Editors
PreReq: /sbin/install-info

%description info
XEmacs is a highly customizable open source text editor and
application development system. It is protected under the
GNU General Public License and related to other versions of Emacs,
in particular GNU Emacs. Its emphasis is on modern graphical
user interface support and an open software development
model, similar to Linux.

This package contains the XEmacs manuals in info format.


%define pkgdir %{_datadir}/xemacs
%define exectop %{_libdir}/xemacs-%{version}


%prep
%setup -q

## Lisp patches ## 
# make find-paths.el look in datadir
rm lisp/find-paths.elc
%patch10 -p1
# fix "libexec" on multilib
%ifarch x86_64 s390x
%patch15 -p1 -b .lib64
%endif
# remove game we shouldn't ship
%patch14 -p1
# make lisp dir and mule-lisp dir be the source lisp dirs (not in datadir)
%patch18 -p1
rm lisp/dump-paths.elc
sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el

## non-Lisp patches ##
%patch5 -p1 -b .cursor
# movemail
%patch11 -p1 -b .mkstemp
# skip redundant check-features
%patch16 -p1 -b .feature-chk
# fix missing charsets warning with Xaw/UTF-8
%patch19 -p1
# look for dump file docdir/DUMP as well as bindir/xemacs.dmp
%patch21 -p1 -b .docdmp
%ifarch ia64
# don't link with -dynamic-export on ia64
%patch23 -p1 -b .dyn-exp
%endif
# remove cwnn symbols
%patch24 -p1 -b .cwnn

# patch21 touch configure.in, and patch23 touches aclocal.m4
autoconf-2.13


%build
export CFLAGS="${CFLAGS:-%optflags}"

# XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir,
#   --includedir, --libexecdir, --localstatedir, --sharedstatedir
# NB datadir has to be defined because it defaults to /usr/lib
common_options="
	%{_target_platform}
	--prefix=%{_prefix}
	--datadir=%{_datadir}
	--infodir=%{_infodir}
	--libdir=%{_libdir}
	--mandir=%{_mandir}/man1
	--with-gpm=yes
	--with-pop
	--mail-locking=lockf
	--with-clash-detection
	--with-database=no
	--with-postgresql=no
	--with-ldap=no
	--with-hesiod=no
	--with-msw=no
	--pdump
	--debug=%{?_without_debug:no}%{!?_without_debug:yes}
	%{!?_without_mule:--with-mule=yes}
%ifarch alpha ia64 ppc64
	--with-system-malloc
%endif
%ifarch ia64
	--without-modules
%endif
"

## build without X
#
# NB docdir requires trailing slash
./configure $common_options \
	--docdir=%{exectop}/doc-nox/ \
	--with-sound=no \
	--with-x11=no \
	--with-canna=no \
	--with-wnn=no \
	--with-xim=no
# toplevel smp build fails
make %{?_smp_mflags} -C lib-src
#make src/Emacs.ad.h
make %{?_smp_mflags} -C src
EMACSLOADPATH=$PWD/lisp make # EMACSDEBUGPATHS=yes
mv lib-src/DOC{,-nox}
mv src/xemacs{,-nox-%{version}}
mv src/{xemacs.dmp,DUMP-nox}
mv lib-src/config.values{,-nox}

#make clean

## build with X
#
# NB docdir requires trailing slash
./configure $common_options \
	--docdir=%{exectop}/doc/ \
	--with-sound=native \
	%{!?_without_mule:--with-canna=yes --with-xim=xlib} \
	%{?_with_gtk: --with-gtk --with-gnome} \
	%{!?_with_gtk: --with-athena=3d --with-widgets=athena --with-menubars=lucid --with-scrollbars=lucid --with-dialogs=athena } \
	--with-xfs=no
# toplevel smp build fails
make %{?_smp_mflags} -C lib-src
make src/Emacs.ad.h
make %{?_smp_mflags} -C src
EMACSLOADPATH=$PWD/lisp make # EMACSDEBUGPATHS=yes


%install
rm -rf %buildroot
# adjust mandir
export EMACSLOADPATH=$PWD/lisp
# make docdir
mkdir -p %buildroot%{exectop}/doc
%makeinstall mandir=%buildroot%{_mandir}/man1 docdir=%buildroot%{exectop}/doc/

# install nox files
mkdir -p %buildroot%{exectop}/doc-nox
cp -p src/xemacs-nox-%{version} %buildroot%{_bindir}
ln -s xemacs-nox-%{version} %buildroot%{_bindir}/xemacs-nox
cp -p src/DUMP-nox %buildroot%{exectop}/doc-nox/DUMP
cp -p lib-src/DOC-nox %buildroot%{exectop}/doc-nox/DOC
cp -p lib-src/config.values-nox %buildroot%{exectop}/doc-nox/config.values

mv %buildroot%{_bindir}/xemacs-%{version}-*.dmp %buildroot%{exectop}/doc/DUMP

# these clash with GNU Emacs
mv %buildroot%{_bindir}/{etags,etags.xemacs}
rm -f %buildroot%{_bindir}/{ctags,rcs-checkin,b2m}
rm %buildroot%{_mandir}/man1/{etags.1,ctags.1}

rm -f %buildroot%{_infodir}/dir

#These clash with other packages
rm -f %buildroot%{_infodir}/info*
rm -f %buildroot%{_infodir}/standards*
rm -f %buildroot%{_infodir}/termcap*

install -m 755 -d %buildroot%{_datadir}/applications
install -m 644 %SOURCE6 %buildroot%{_datadir}/applications/net-xemacs.desktop

# Lockdir
mkdir -p %buildroot%{_localstatedir}/lock/xemacs

# site-start.el
mkdir -p %buildroot%{pkgdir}/site-packages/lisp/site-start.d/
install -m 644 %SOURCE9 %buildroot%{pkgdir}/site-packages/lisp/site-start.el

# default.el
install -m 644 %SOURCE24 %buildroot%{pkgdir}/site-packages/lisp

# default user init file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs
install -m 0644 %SOURCE23 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el

# icon
install -Dpm 644 %{SOURCE1} %buildroot%{_datadir}/pixmaps/xemacs.png

# Make sure nothing is 0400
chmod -R a+rX  %buildroot%{_prefix}

# filter out buildroot from finder-inf.el
sed -i -e "s|%buildroot||" %buildroot%{_datadir}/xemacs-%{version}/lisp/finder-inf.el
[ -x %{_bindir}/xemacs ] && python %SOURCE22 %buildroot%{_datadir}/xemacs-%{version}/lisp/finder-inf.el

# separate files
rm -f *.files base-files el-files info-files
echo "%defattr(-,root,root)" > base-files
echo "%defattr(-,root,root)" > el-files
echo "%defattr(-,root,root)" > info-files

find %buildroot%{_datadir}/xemacs-%{version} %buildroot%{pkgdir} \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \( -type d -name info -fprint info.files -prune \) -o \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o -fprint base-el-not-bytecomped.files \) \)

# remove buildroot prefix from files
sed -i -e "s|%buildroot||" *.files
# make site-packages lisp files config files
perl -pe 's|^(.+/site-packages/lisp/.+)$|%%config $1|' base-el-not-bytecomped.files
# combine the file lists
cat base-*.files dir.files >> base-files
cat el-*.files dir.files >> el-files
cat info.files >> info-files


%clean
rm -rf %buildroot


%post common
alternatives --install %{_bindir}/etags etags %{_bindir}/etags.xemacs 40

%preun common
if [ "$1" = 0 ]; then
  alternatives --remove etags %{_bindir}/etags.xemacs
fi

%post info
for file in xemacs cl internals lispref new-users-guide; do
  /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir
done
 
%preun info
if [ "$1" = "0" ]; then
  for file in xemacs cl internals lispref new-users-guide; do
    /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir
  done
fi


%files
%defattr(-, root, root)
%{_bindir}/xemacs
%{_bindir}/xemacs-%{version}
%{_bindir}/gnuclient
%{exectop}/*/gnuserv
%{exectop}/doc
%{_datadir}/applications/*

%files nox
%defattr(-, root, root)
%{_bindir}/xemacs-nox
%{_bindir}/xemacs-nox-%{version}
%{exectop}/doc-nox

%files common -f base-files
%defattr(-, root, root)
%doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release
%doc etc/NEWS etc/MAILINGLISTS BUGS README.packages
%doc etc/TUTORIAL
%exclude %{_bindir}/xemacs*
# needs X libs
%exclude %{_bindir}/gnuclient
%{_bindir}
%exclude %{exectop}/doc*
# needs X libs
%exclude %{exectop}/*/gnuserv
%{exectop}
%{_datadir}/pixmaps/xemacs.png
%config %{_sysconfdir}/skel/.xemacs
%{_mandir}/*/*
%attr(1777, root, root) %{_localstatedir}/lock/xemacs

%files el -f el-files
%defattr(-, root, root)

%files info -f info-files
%defattr(-, root, root)
%{_infodir}/*


%changelog
* Tue Mar  1 2005 Ville Skytt?? <scop at xemacs.org> - 21.4.17-2
- Drop xemacs-sumo build dependency and -nox install time dependency on it
  to solve chicken-egg bootstrap problem.
- Include X-Face support.
- Include Glade support when built with GTK.
- Include prettier icon, based on upstream xemacs.xpm.
- Drop FreeWnn-devel build dependency.
- Drop main package dependency from -info.
- Require updated -sumo.
- Avoid shipping patch backups.
- Improve package summaries and descriptions.
- Trim pre-XEmacs-21.4 %%changelog entries.
- Some specfile maintainablity improvements and cleanups.

* Fri Feb 25 2005 Jens Petersen <petersen at redhat.com>
- use PreReq not Requires(post,preun) for install and uninstall script 
  requirements (Axel Thimm, 147791)
- use sed instead of perl to fixup filelists

* Mon Feb  7 2005 Jens Petersen <petersen at redhat.com> - 21.4.17-1
- update to 21.4.17
  - fixes movemail format string vulnerability (CAN-2005-0100, 146705)
  - xemacs-21.4.16-xutil-keysym-144601.patch no longer needed

* Tue Jan 25 2005 Jens Petersen <petersen at redhat.com> - 21.4.16-2
- workaround xorg-x11 issue with iso-level3-shift (Ville Skytt??, 144601)
  - add xemacs-21.4.16-xutil-keysym-144601.patch

* Mon Dec 13 2004 Jens Petersen <petersen at redhat.com> - 21.4.16-1
- update to new stable release
  - no longer need configure-ppc-ldscript.patch and
    xemacs-21.4.15-pui-120437.patch
- default to unified diff in .xemacs/init.el

* Thu Nov 18 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-10
- show xemacs again in the desktop menu (132567)

* Mon Oct 18 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-9
- fix etag alternatives removal when uninstalling (Karsten Hopp, 136137)

* Wed Oct  6 2004 Jens Petersen <petersen at redhat.com>
- xemacs-el no longer requires xemacs for -nox users
  (Lars Hupfeldt Nielsen, 134479)

* Thu Sep 30 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-8
- cleanup and update .desktop file
- make xemacs not appear in the desktop menu (Seth Nickell,132567)
- move the desktop file from -common to main package
- etags is now handled by alternatives (92256)
- no longer require ctags
- turn back on wnn support and add xemacs-21.4.15-wnnfix-128362.patch
  (Yukihiro Nakai, 128362)

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Jun  7 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-6
- don't link with -export-dynamic on ia64 to stop dumped function pointers from
  breaking (Roland McGrath & Jakub Jelinek, #106744)
- disable dynamic module support on ia64
- change the xemacs-info uninstall script from %%postun to %%preun and move
  the post/preun install-info requires to xemacs-info
- simplify coding-system setup somewhat in site-start.el
- fix up the desktop file (Ville Skytt??, 123135)
- xemacs-nox now requires xemacs-sumo
- build without xfs since it seems to cause some problem with fonts missing

* Wed May  5 2004 Jens Petersen <petersen at redhat.com>
- move install-info requirement to xemacs-info
- drop unnecessary Canna-libs requirement

* Fri Apr  9 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-5
- add xemacs-21.4.15-pui-120437.patch to fix pui problems in 21.4.15
  (Ville Skytt??)
- buildrequire gpm-devel and build xemacs-nox with gpm (Ville Skytt??,120437)
- separate patches into lisp and non-lisp patches
- move gnuclient and gnuserv from xemacs-common to xemacs since they
  require X libs (Ville Skytt??,110649)

* Wed Apr  7 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-4
- add xemacs-nox subpackage (Jamie Zawinski, #110649) and xemacs-common
  - add xemacs-debian-docdir-dump.patch and put dump files in docdir
  - xemacs and xemacs-nox require xemacs-common
  - define exectop and use it
  - one configure and build for xemacs-nox and one for xemacs
- update package descriptions
- don't create backup of patched Emacs.ad since it gets installed, and
  drop Canna-devel version requirement (Ville Skytt??, #115270)
- default ispell dictionary to english for CJK locale, since aspell doesn't
  support widechars (#103145)
- rebuild against latest Canna built with xorg-x11 xmkmf (Kaj Niemi, #119562)
- simplify coding-system setup
- enable gpm for xemacs package

* Tue Mar 16 2004 Mike A. Harris <mharris at redhat.com> 21.4.15-3
- Removed bogus Requires: XFree86-libs, and other similar library runtime
  dependancies, because rpm find-requires automatically puts dependancy info
  in the binary rpms which are on the .so files rather than a specific
  package.  The XFree86-libs removal is necessary in order to replace XFree86
  with xorg-x11 in an X11 implementation agnostic fashion.  (#118483)
- Changed "Requires(post,preun): info" dependancy to
  "Requires(post,postun): /sbin/install-info"

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Feb  5 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-1
- update to 21.4.15
- improve language and coding-system startup in site-start.el like
  lang-coding-systems-init.el in emacs package
- build without wnn support
- drop xemacs-21.4.13-regexp-stack-overflow-107402.patch

* Sat Dec 27 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-6
- set EMACSLOADPATH during final make and install so that it is buildable
  even when xemacs isn't installed
- disable ldap, postgresql and dbm support for now (#110649) [jwz]

* Sat Dec 13 2003 Jeff Johnson <jbj at jbj.org>
- rebuild against db-4.2.52.

* Fri Nov  7 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-5
- add a "--without mule" rpmbuild option for the 8bit dead-hards (#102718)
  which disables mule and Input Method support
- only load un-define in site-start.el when there is mule support

* Thu Nov  6 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-4
- increase regexp re_max_failures to 40000 in
  xemacs-21.4.13-regexp-stack-overflow-107402.patch (#107402) [Rik Faith]

* Mon Oct 27 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-3
- no longer obsolete xemacs-sumo-el for xemacs-el [thanks to Axel Thimm]
- fix "Stack overflow in regexp matcher" (#107402) [reported by Rik Faith,
  patch by Stephen J. Turnbull]

* Fri Oct 17 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-2
- require Canna-libs not Canna
- move CJK X resource files to xemacs-sumo
- no longer need to define ispell program to be aspell

* Thu Sep 25 2003 Jeff Johnson <jbj at jbj.org> - 21.4.14-1.1
- rebuild against db-4.2.42.

* Mon Sep  8 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-1
- update to 21.4.14
- default require-final-newline to t in site-start.el (#102022)

* Tue Sep  2 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-5
- default require-final-newline to ask in site-start.el
  and remove redundant setting of next-line-add-newlines to nil in default.el
  (#102022) [reported by Ville Skytt??]

* Mon Jul 14 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-4
- build with --debug=yes by default (suggested by Ville Skytt??)

* Sun Jul 13 2003 Ville Skytt?? <scop at xemacs.org>
- add xemacs-21.4.13-utf8-fontsets.patch to eliminate warning about missing
  charsets in utf-8 locale with Xaw
- motif-specific xemacs-21.4.13-EmacsFrame-fontlock.patch no longer needed

* Fri Jun 27 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-3
- add xemacs-21.4.13-dump-paths-lispdir.patch, so that the source lisp files
  get re-bytecompiled and dumped, not the installed ones
- use Athena/Xaw3d instead of motif for dialogs and widgets
- buildrequirements fixes
- use _localstatedir

* Sat May 31 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-2
- add xemacs-21.4.13-EmacsFrame-fontlock.patch to stop font-lock being
  very slow (Ville Skytt??)

* Fri May 30 2003 Ville Skytt?? <scop at xemacs.org>
- Use upstream icon in desktop entry, add missing semicolon to Categories.
- Have backup-by-copying-when-mismatch default to true in site-start.el.
- Mark init files as %%config.

* Thu May 29 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-1
- update to 21.4.13
  - rcs2log-update.patch no longer needed
- buildrequire recent xemacs-sumo
- set system-uses-terminfo in default.el (#76102)
- use defvar in default.el not to override user's settings
- default gnus-default-article-saver to mbox format (#90604)
- add aspell as ispell program in site-start.el (#88262)
- add rpmbuild option "--with gtk" allowing building with gtk
- exclude s390x temporarily

* Mon May 12 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-12
- sumo packages moved to separate xemacs-sumo package

* Sat May 10 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-11
- build with system malloc on ppc64

* Tue Apr 22 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-10
- obsoletes ruby-mode-xemacs (#84673)
- move obsoletes xemacs-sumo-el to -el subpackage
- fix links in jde html documentation (#89499)

* Tue Apr 15 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-8
- comment out ja and ko menubar translations in X resource files for now,
  to avoid startup hanging in utf-8 locale (#88860)
- use default menubar font in ja and ko locale
- in a UTF-8 locale set default coding systems to utf-8 (partly #77130
  and #74227)
- set Info-directory-list in site-start.el again
- move psgml setup into site-start.el
- move previous contents of "dotxemacs-init.el" to new "default.el"

* Mon Mar 31 2003 Akira TAGOH <tagoh at redhat.com> 21.4.12-7
- Rebuild against the latest Canna.

* Thu Feb 20 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-6
- default browse-url to use htmlview and update psgml-html browser
  defaults (#84262)

* Tue Feb 11 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-5
- build with system-malloc on alpha and ia64
- skip redundant check-features target

* Thu Feb  6 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-4
- fix "libexec dir" to be under lib64 on multilib archs
- set default ftp to be non-kerberos in site-start.el
- update sumos to 2003-02-05
- mspec patch and rpm-spec-mode update no longer needed
- buildrequire autoconf213
- add ".xemacs/init.el" to /etc/skel
- skip redundant check-features target on s390 and s390x

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Tue Jan 21 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-2
- fix `paths-emacs-root-p' (find-paths.el) to look in share not lib
- don't generate backup files when updating autoloads
- try startup notification in desktop file
- cleanup desktop file to use name XEmacs and add encoding key

* Fri Jan 17 2003 Jens Petersen <petersen at redhat.com> 21.4.12-1
- update to 21.4.12 bugfix release (21.4 series now declared stable branch)
- renumbered sumo package patches to be greater than 100
- install sumo packages by copying rather than moving
- patch sh-script.el to append m?spec entry to auto-mode-alist 
- avoid ppc.ldscript and build on ppc
- remove games that we shouldn't ship
- update to latest rcs2log
- update to latest rpm-spec-mode.el
- use _smp_mflags for lib-src and src
- run batch-update-directory and batch-byte-recompile-directory on sumo lisp
  dirs
- improve datadir/xemacs-version/ ownership

* Sat Jan  4 2003 Jens Petersen <petersen at redhat.com> 21.4.11-1
- update to 21.4.11
- don't configure with union-type, since it causes runtime problems apparently
- only do postun info dir deletions when uninstalling

* Wed Jan  1 2003 Jens Petersen <petersen at redhat.com> 21.4.10-6
- move apel to separate package and require it
- renamed psgml-init.el-xemacs to xemacs-psgml-init.el
- use datadir in site-start.el
- really include the movemail mkstemp patch
- use mapc to load site-start.d files

* Tue Dec 31 2002 Ville Skytt?? <scop at xemacs.org>
- New Sumos (2002-12-30).
- Use `construct-emacs-version-name' in `paths-emacs-root-p' (find-paths.el),
  fixing "Couldn't find obvious default for XEmacs hierarchy" warnings
  (as in XEmacs 21.5).
- Move site-start stuff to site-packages.
- Don't set Info-directory-list in site-start.el.
- Don't use --pkgdir, it's ignored.  Don't pass pkgdir to makeinstall.
- Fix source tarball URLs.
- Don't override the defcustom in psgml-init.el, set its default value instead.
- Add rpmbuild option: "--with debug" for building a debug-enabled XEmacs.

* Sun Dec 29 2002 Jens Petersen <petersen at redhat.com>
- updates package sumos to 2002-12-26 release

* Mon Dec 23 2002 Jens Petersen <petersen at redhat.com> 21.4.10-5
- patch find-paths.el to search in datadir
- setup lisp packages under datadir not libdir
- use buildroot macro instead of RPM_BUILD_ROOT
- drop local configure macro
- fix buildrequires and requires
- list configure options one-per-line
- improve psgml-init.el catalog setup
- remove and add lisp packages with package-admin
- rebyte-compile lisp packages
- keep etags as etags.xemacs (#78106)
- don't bother removing non-existent udp2tcp nor .cvsignore files
- simply filelist generation to a single find search pass
- put core .el files in -el package
- put package info files into -info package
- don't create backup files when patching in lisp packages tree
- don't explicitly gzip lisp package info files
- don't mark the applications files noreplace
- exclude ppc, since __init_array_start undefined

* Wed Dec 18 2002 Jens Petersen <petersen at redhat.com>
- patch egg-wnn to default to unix domain socket (#79826)
  [patch from ynakai at redhat.com]
- add ia64 patch from SuSE
- use mkstemp in movemail

* Tue Nov 19 2002 Jens Petersen <petersen at redhat.com>
- apply jlatex autodetect patch correctly and drop append to tex-site.el
- default to pTeX and pLaTeX for Japanese TeX and LaTeX

* Mon Nov 18 2002 Jens Petersen <petersen at redhat.com> 21.4.10-3
- backout uncommenting of deactivate-mark (#77696)
- update psgml dtd catalog path in psgml-init.el (#78022)
  [reported by ville.skytta at iki.fi]
- build with --use-union-type (#78024)
  [suggested by ville.skytta at iki.fi]

* Fri Nov 15 2002 Jens Petersen <petersen at redhat.com>
- fix autodetection of jlatex (#69129)

* Tue Nov 12 2002 Elliot Lee <sopwith at redhat.com> 21.4.10-2
- build on x86_64

* Mon Nov 11 2002 Jens Petersen <petersen at redhat.com> 21.4.10-1
- update to 21.4.10
- update sumos to 2002-09-19
- no longer backout mule-ucs package
- encode this file in utf-8
- xemacs-21.1.14-xfs.patch no longer needed
- use _libdir, _datadir, _bindir, _prefix
- exclude x86_64 (requires Canna)
- own /usr/lib/xemacs/{,mule-packages} and /usr/X11R6/lib/X11/<locale> (#73982)
  [reported by enrico.scholz at informatik.tu-chemnitz.de]
- fix default italic font size (#75275)
  [reported with fix by ville.skytta at iki.fi]
- update ja menubar translations in ja locale X resource file (#76068)
  [from ynakai at redhat.com]
- update ko locale X resource file (#76072) [from ynakai at redhat.com]
- add pkgdir rpm macro for packages dir
- uncomment deactivate-mark in simple.el (#77696)

* Mon Aug 26 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-16
- some cleanups - and remove the info tarball, it's now part 
  of the base tarball. Wow, the package gets smaller. (#72480)

* Mon Aug 19 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-15
- Bug in specfile from -14 gave bug on startup (#71743)

* Thu Aug 15 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-14
- Use utf-8 by default for input/output (#71584 )
- Make it not segfault when handling utf-8 (#71589)

* Wed Aug  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-13
- Add openmotif-devel to buildrequires, as it will use it for widgets 
  if it finds it

* Fri Aug  2 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-12
- Don't package po-mode separately, it's now in sumo
- Compile with drag'n'drop support
- Use the bundled rpm-spec-mode, it has some adaptions for XEmacs

* Wed Jul 31 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-11
- Don't use a separate ispell.el file anymore - the included one is newer
- Fix html-mode (#64826)

* Tue Jul 23 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-10
- Update lisp tarballs
- desktop file fixes (#69542)
- Add bdb support (#65640)

* Mon Jul  8 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-9
- Make it provide ruby-mode-xemacs (request from tagoh)

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Mon Jun 17 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-7
- #66835

* Wed May 29 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-6
- Make it build... Evil.
- Exclude IA64
- Upgrade sumo tarballs to 2002-05-22

* Fri May 24 2002 Jens Petersen <petersen at xemacs.org> 21.4.8-5
- Build using portable dumper, so that build with glibc-2.3 malloc is ok

* Mon May 13 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-2
- Remove the s390 patches so it builds on s390 :)

* Fri May 10 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-1
- 21.4.8

* Tue May  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-9
- Rebuild... chmod -x pstogif to work around an rpm bug until 
  it's fixed (#64320)

* Tue Apr 23 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-8
- New sumo packages

* Thu Feb 21 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-7
- Rebuild

* Tue Jan 29 2002 Jens Petersen <petersen at redhat.com> 21.4.6-6
- Remove skk package, since it conflicts with ddskk-xemacs (newer)

* Thu Jan 24 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-5
- New sumos

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Dec 19 2001 Jens Petersen <petersen at redhat.com> 21.4.6-3
- Fix fontlist pattern in Emacs.ad.Japanese.
- CHANGES-beta is now CHANGES-release.
- Obsolete xemacs-sumo xemacs-sumo-el

* Wed Dec 19 2001 Jens Petersen <petersen at redhat.com> 21.4.6-2
- Don't obsolete flim.

* Mon Dec 17 2001 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-1
- 21.4.6
- New sumo packages
- disable alpha

* Wed Nov 14 2001 Jens Petersen <petersen at redhat.com> 21.4.5-2
- Add -znocombreloc configure option to override new ld default.

* Tue Nov  6 2001 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.5-1
- 21.4.5. It builds on IA64 and fixes #55578


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Mar 2005 22:05:24 -0000	1.1
+++ .cvsignore	1 Mar 2005 22:11:36 -0000	1.2
@@ -0,0 +1 @@
+xemacs-21.4.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Mar 2005 22:05:24 -0000	1.1
+++ sources	1 Mar 2005 22:11:36 -0000	1.2
@@ -0,0 +1 @@
+a207e106138c085711160855d78b72a2  xemacs-21.4.17.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar  1 22:15:20 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:15:20 -0500
Subject: rpms/xemacs-sumo - New directory
Message-ID: <200503012215.j21MFKVu024339@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24332/xemacs-sumo

Log Message:
Directory /cvs/extras/rpms/xemacs-sumo added to the repository




From fedora-extras-commits at redhat.com  Tue Mar  1 22:15:20 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:15:20 -0500
Subject: rpms/xemacs-sumo/devel - New directory
Message-ID: <200503012215.j21MFKwF024342@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24332/xemacs-sumo/devel

Log Message:
Directory /cvs/extras/rpms/xemacs-sumo/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar  1 22:15:39 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:15:39 -0500
Subject: rpms/xemacs-sumo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503012215.j21MFdO3024403@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24394

Added Files:
	Makefile import.log 
Log Message:
Setup of module xemacs-sumo


--- NEW FILE Makefile ---
# Top level Makefile for module xemacs-sumo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  1 22:15:39 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:15:39 -0500
Subject: rpms/xemacs-sumo/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503012215.j21MFdL1024406@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24394/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xemacs-sumo


--- 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 Mar  1 22:31:06 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:31:06 -0500
Subject: rpms/xemacs-sumo import.log,1.1,1.2
Message-ID: <200503012231.j21MV6DK024791@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24781

Modified Files:
	import.log 
Log Message:
auto-import xemacs-sumo-20050118-2 on branch devel from xemacs-sumo-20050118-2.src.rpm
Latest from Core devel CVS adapted to Extras + some improvements.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Mar 2005 22:15:37 -0000	1.1
+++ import.log	1 Mar 2005 22:31:04 -0000	1.2
@@ -0,0 +1 @@
+xemacs-sumo-20050118-2:HEAD:xemacs-sumo-20050118-2.src.rpm:1109716216



From fedora-extras-commits at redhat.com  Tue Mar  1 22:31:06 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 1 Mar 2005 17:31:06 -0500
Subject: rpms/xemacs-sumo/devel Emacs.ad.ja_JP.UTF-8, NONE,
	1.1 Emacs.ad.ja_JP.eucJP, NONE, 1.1 Emacs.ad.ko_KR.UTF-8, NONE,
	1.1 Emacs.ad.ko_KR.eucKR, NONE, 1.1 Emacs.ad.zh_CN.GB2312,
	NONE, 1.1 Emacs.ad.zh_CN.UTF-8, NONE, 1.1 Emacs.ad.zh_TW.Big5,
	NONE, 1.1 Emacs.ad.zh_TW.UTF-8, NONE,
	1.1 auctex-texjp-platex.patch, NONE,
	1.1 auctex-texsite-jlatex-detect-69129.patch, NONE,
	1.1 avoid-catch-error-65346.patch, NONE,
	1.1 browse-url-htmlview-84262.patch, NONE,
	1.1 egg-wnn-host-unix-79826.patch, NONE,
	1.1 jde-ug-rel-links.patch, NONE,
	1.1 jde-ug-section-links-89499.patch, NONE,
	1.1 mh-e-7.4.2-toolbar-100764.patch, NONE,
	1.1 psgml-browsers-84262.patch, NONE, 1.1 xemacs-sumo.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503012231.j21MV6Sv024794@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24781/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Emacs.ad.ja_JP.UTF-8 Emacs.ad.ja_JP.eucJP Emacs.ad.ko_KR.UTF-8 
	Emacs.ad.ko_KR.eucKR Emacs.ad.zh_CN.GB2312 
	Emacs.ad.zh_CN.UTF-8 Emacs.ad.zh_TW.Big5 Emacs.ad.zh_TW.UTF-8 
	auctex-texjp-platex.patch 
	auctex-texsite-jlatex-detect-69129.patch 
	avoid-catch-error-65346.patch browse-url-htmlview-84262.patch 
	egg-wnn-host-unix-79826.patch jde-ug-rel-links.patch 
	jde-ug-section-links-89499.patch 
	mh-e-7.4.2-toolbar-100764.patch psgml-browsers-84262.patch 
	xemacs-sumo.spec 
Log Message:
auto-import xemacs-sumo-20050118-2 on branch devel from xemacs-sumo-20050118-2.src.rpm
Latest from Core devel CVS adapted to Extras + some improvements.


--- NEW FILE Emacs.ad.ja_JP.UTF-8 ---
! XEmacs 21.x ?????????????????????????????????????????? (??????????????????)
!
!              MATSUBAYASHI 'Shaolin' Kohji (shaolin at rins.st.ryukoku.ac.jp)
!              Yukihiro Nakai <ynakai at redhat.com>
!                                   Time-stamp: <03/10/17 21:08:54 petersen>
!
!
! This is the app-defaults file for XEmacs.
!
! This used to be identical to sample.Xdefaults, but the resources
! below have been rewritten to be as general as possible to avoid
! overriding user resources.  Other than the form rewriting, both
! files should be kept in sync. 
! 
! The resources below are loaded into the XEmacs executable at compile-time:
! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
! effect.
! 
! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
! (or whatever the standard app-defaults directory is at your site) to cause
! it to be consulted at run-time.  (Do this only for site-wide customizations:
! personal customizations should be put into ~/.Xdefaults instead.)
! Note that the file must be named Emacs, not XEmacs.
! 
! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of
! the various resources and the syntax for setting them.
! 
! Energize users: note that this is not the same app-defaults file that is
! used with the Energize-specific version of XEmacs.


! Colors and backgrounds.
! ======================
! The contrasts of these colors will cause them to map to the appropriate
! one of "black" or "white" on monochrome systems.
! 
! The valid color names on your system can be found by looking in the file
! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/.

! ! Set the modeline colors.
! Emacs.modeline*attributeForeground:	Black
! Emacs.modeline*attributeBackground:	Gray75

! ! Set the color of the text cursor.
! Emacs.text-cursor*attributeBackground:	Red3

! If you want to set the color of the mouse pointer, do this:
! Emacs.pointer*attributeForeground:	Black
! If you want to set the background of the mouse pointer, do this:
! Emacs.pointer*attributeBackground:	White
! Note that by default, the pointer foreground and background are the same
! as the default face.

! Set the menubar colors.  This overrides the default foreground and
! background colors specified above.
*menubar*Foreground:			Gray30
*menubar*Background:			Gray80
! This is for buttons in the menubar.  
! Yellow would be better, but that would map to white on monochrome.
*menubar*buttonForeground:		Blue
*XlwMenu*highlightForeground:		Red
*XlwMenu*titleForeground:		Maroon
*XlwMenu*selectColor:			ForestGreen
*XmToggleButton*selectColor:		ForestGreen

! Specify the colors of popup menus.
*popup*Foreground:			Black
*popup*Background:			Gray80

! Specify the colors of the various sub-widgets of the dialog boxes.
*dialog*Foreground:			Black
! #A5C0C1 is a shade of blue
*dialog*Background:			#A5C0C1
! The following three are for Motif dialog boxes ...
*dialog*XmTextField*Background:		WhiteSmoke
*dialog*XmText*Background:		WhiteSmoke
*dialog*XmList*Background:		WhiteSmoke
! While this one is for Athena dialog boxes.
*dialog*Command*Background:		WhiteSmoke

! Xlw Scrollbar colors
*XlwScrollBar*Foreground:		Gray30
*XlwScrollBar*Background:		Gray80
*XmScrollBar*Foreground:		Gray30
*XmScrollBar*Background:		Gray80

!
! The Lucid Scrollbar supports two added resources, SliderStyle is either
! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
! of the slider that depresses when the slider is clicked on.  ArrowPosition is
! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
! of the scrollbar, same puts both arrows at the same end, like the Amiga.
!
Emacs*XlwScrollBar.SliderStyle:    dimple
! Emacs*XlwScrollBar.ArrowPosition:  opposite

!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

! *topToolBarShadowColor:		Gray90
! *bottomToolBarShadowColor:		Gray40
! *backgroundToolBarColor:		Gray80
! *toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
Emacs.default.attributeFont:  -misc-fixed-medium-r-*-*-14-*-*-*-*-*-*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
! *menubar*Font: 			-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*popup*Font:			-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*

! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:	-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*XmTextField*FontList:		-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*XmText*FontList:		-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*XmList*FontList:		-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField*translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton*translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! ! XIM fontset (defaults to system fontset default)
! ! *EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
! !    Japanese localization resources for XEmacs.
! ! @(#)Emacs	1.3 96/09/22
! !    Copyright (C) 1996 Sun Microsystems, Inc.
! !!
! ! This file is part of XEmacs.
! ! 
! ! XEmacs is free software; you can redistribute it and/or modify it
! ! under the terms of the GNU General Public License as published by the
! ! Free Software Foundation; either version 2, or (at your option) any
! ! later version.
! ! XEmacs 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 XEmacs; see the file COPYING.  If not, write to the
! ! Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! ! Boston, MA 02111-1307, USA.
! ! Copyright (C) 1996 Sun Microsystems Inc.
! !
! ! Japanese Resources to be placed in etc/app-defaults/ja/Emacs
! ! for xemacs-mule.  It is same on another languages such like fr,
! ! if you want to have French menu label, place it on
! ! etc/app-defaults/fr/Emacs.
! 
! ! ! Pulldown menu internationalization.  The first line of the file
! ! ! "*XlwMenu.resourceLabels: True" has to be there to make sure
! ! ! all the labelString will be read and displayed by X.
! ! *XlwMenu.resourceLabels: True
! 
! ! CDE doesn't require this but OpenWindows does.
! ! Note that this `gothic' font family is effective just for Japanese.
! ! And fontList is just used under Motif menubar.
! *fontList: -misc-fixed-medium-r-normal--14-*:
! !! FontSet for menus when you use --with-xfs or --with-xim=xlib.
! *fontSet: -*-fixed-medium-r-normal--14-*
! ! 
! ! ! ! Starting below here are menu label string which can be translated to
! ! ! ! different languages. 
! ! ! ! Example: *XlwMenu.file.labelString: File  
! ! ! ! Characters before the ":" sign, "Example: *XlwMenu.file.labelString"
! ! ! ! can not be changed. They must stay exactly the way they are.
! ! ! ! The only string to be translated is the string, "File".
! ! ! ! Some resource names such as "file", "quit" have been used in several
! ! ! ! places.  However, each of them only has to be translated once in this X
! ! ! ! resource file.
! ! ! ! Emacs*XlwMenu.file.labelString:	%_File
! ! ! Emacs*XlwMenu.file.labelString:		????????????(%_F)
! ! ! ! Emacs*XlwMenu.edit.labelString:	%_Edit
! ! ! Emacs*XlwMenu.edit.labelString:		??????(%_E)
! ! ! ! Emacs*XlwMenu.view.labelString:	%_View
! ! ! Emacs*XlwMenu.view.labelString:		??????(%_V)
! ! ! ! Emacs*XlwMenu.c_mds.labelString:	C%_mds
! ! ! Emacs*XlwMenu.c_mds.labelString:	????????????(%_M)
! ! ! ! Emacs*XlwMenu.tools.labelString:	%_Tools
! ! ! Emacs*XlwMenu.tools.labelString:	?????????(%_T)
! ! ! ! Emacs*XlwMenu.options.labelString:	%_Options
! ! ! Emacs*XlwMenu.options.labelString:	???????????????(%_O)
! ! ! ! Emacs*XlwMenu.buffers.labelString:	%_Buffers
! ! ! Emacs*XlwMenu.buffers.labelString:	????????????(%_B)
! ! ! ! Emacs*XlwMenu.help.labelString:	%_Help
! ! ! Emacs*XlwMenu.help.labelString:		?????????(%_H)
! ! ! ! Emacs*XlwMenu.lisp.labelString:	%_Lisp
! ! ! Emacs*XlwMenu.lisp.labelString:		%_Lisp
! ! ! ! Emacs*XlwMenu.open___.labelString:	%_Open...
! ! ! Emacs*XlwMenu.open___.labelString:	??????(%_O)...
! ! ! ! Emacs*XlwMenu.openInOtherWindow___.labelString:	Open in Other %_Window...
! ! ! Emacs*XlwMenu.openInOtherWindow___.labelString:		??????????????????????????????(%_W)...
! ! ! ! Emacs*XlwMenu.openInNewFrame___.labelString:	Open in New %_Frame...
! ! ! Emacs*XlwMenu.openInNewFrame___.labelString:	??????????????????????????????(%_F)...
! ! ! ! Emacs*XlwMenu.hexEditFile___.labelString:	%_Hex Edit File...
! ! ! Emacs*XlwMenu.hexEditFile___.labelString:	16??????????????????(%_H)...
! ! ! ! Emacs*XlwMenu.insertFile___.labelString:	%_Insert File...
! ! ! Emacs*XlwMenu.insertFile___.labelString:	?????????????????????(%_I)...
! ! ! ! Emacs*XlwMenu.viewFile___.labelString:	%_View File...
! ! ! Emacs*XlwMenu.viewFile___.labelString:		?????????????????????(%_V)...
! ! ! ! Emacs*XlwMenu.save.labelString:	%_Save
! ! ! Emacs*XlwMenu.save.labelString:		??????(%_S)
! ! ! ! Emacs*XlwMenu.saveAs___.labelString:	Save %_As...
! ! ! Emacs*XlwMenu.saveAs___.labelString:	???????????????(%_A)...
! ! ! ! Emacs*XlwMenu.saveSo_meBuffers.labelString:	Save So%_me Buffers
! ! ! Emacs*XlwMenu.saveSo_meBuffers.labelString:	??????????????????????????????(%_M)
! ! ! ! Emacs*XlwMenu.print.labelString:	%_Print
! ! ! Emacs*XlwMenu.print.labelString:	??????(%_P)
! ! ! ! Emacs*XlwMenu.prett_yPrint.labelString:	Prett%_y-Print
! ! ! Emacs*XlwMenu.prett_yPrint.labelString:		????????????(%_Y)
! ! ! ! Emacs*XlwMenu.revertBuffer.labelString:	%_Revert Buffer
! ! ! Emacs*XlwMenu.revertBuffer.labelString:		??????????????????(%_R)
! ! ! ! Emacs*XlwMenu.re_coverFile___.labelString:	Re%_cover File...
! ! ! Emacs*XlwMenu.re_coverFile___.labelString:	??????????????????(%_C)...
! ! ! ! Emacs*XlwMenu.recoverS_ession___.labelString:	Recover S%_ession...
! ! ! Emacs*XlwMenu.recoverS_ession___.labelString:	????????????????????????(%_S)...
! ! ! ! Emacs*XlwMenu.e_xitXEmacs.labelString:	E%_xit XEmacs
! ! ! Emacs*XlwMenu.e_xitXEmacs.labelString:		XEmacs?????????(%_X)
! ! ! ! Emacs*XlwMenu.undo.labelString:	%_Undo
! ! ! Emacs*XlwMenu.undo.labelString:		????????????(%_U)
! ! ! ! Emacs*XlwMenu.cu_t.labelString:	Cu%_t
! ! ! Emacs*XlwMenu.cu_t.labelString:		????????????(%_T)
! ! ! ! Emacs*XlwMenu.copy.labelString:	%_Copy
! ! ! Emacs*XlwMenu.copy.labelString:		?????????(%_C)
! ! ! ! Emacs*XlwMenu.paste.labelString:	%_Paste
! ! ! Emacs*XlwMenu.paste.labelString:	????????????(%_P)
! ! ! ! Emacs*XlwMenu.delete.labelString:	%_Delete
! ! ! Emacs*XlwMenu.delete.labelString:	??????(%_D)
! ! ! ! Emacs*XlwMenu.selectAll.labelString:	Select %_All
! ! ! Emacs*XlwMenu.selectAll.labelString:	??????????????????(%_A)
! ! ! ! Emacs*XlwMenu.selectPa_ge.labelString:	Select Pa%_ge
! ! ! Emacs*XlwMenu.selectPa_ge.labelString:	??????????????????(%_G)
! ! ! ! Emacs*XlwMenu.find___.labelString:	%_Find...
! ! ! Emacs*XlwMenu.find___.labelString:	??????(%_F)...
! ! ! ! Emacs*XlwMenu.r_eplace___.labelString:	R%_eplace...
! ! ! Emacs*XlwMenu.r_eplace___.labelString:		??????(%_E)...
! ! ! ! Emacs*XlwMenu.replaceRege_xp___.labelString:	Replace (Rege%_xp)...
! ! ! Emacs*XlwMenu.replaceRege_xp___.labelString:	?????? (????????????)(%_X)...
! ! ! ! Emacs*XlwMenu.listMatchingLines___.labelString:	%_List Matching Lines...
! ! ! Emacs*XlwMenu.listMatchingLines___.labelString:		????????????????????????(%_L)...
! ! ! ! Emacs*XlwMenu.multilingualMule.labelString:	%_Multilingual ("Mule")
! ! ! Emacs*XlwMenu.multilingualMule.labelString:	?????????(%_M) ("Mule")
! ! ! ! Emacs*XlwMenu.t_oggleInputMethod.labelString:	T%_oggle Input Method
! ! ! Emacs*XlwMenu.t_oggleInputMethod.labelString:	??????????????????????????????(%_O)
! ! ! ! Emacs*XlwMenu.selectInputMethod.labelString:	Select %_Input Method
! ! ! Emacs*XlwMenu.selectInputMethod.labelString:	???????????????????????????(%_I)
! ! ! ! Emacs*XlwMenu.d_escribeInputMethod.labelString:	D%_escribe Input Method
! ! ! Emacs*XlwMenu.d_escribeInputMethod.labelString:	???????????????????????????(%_E)
! ! ! ! Emacs*XlwMenu.describeCurrentCodingSystems.labelString:	Describe Current %_Coding Systems
! ! ! Emacs*XlwMenu.describeCurrentCodingSystems.labelString:		????????????????????????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.setCodingSystemOfBufferFile___.labelString:	Set Coding System of %_Buffer File...
! ! ! Emacs*XlwMenu.setCodingSystemOfBufferFile___.labelString:	?????????????????????????????????????????????????????????????????????(%_B)...
! ! ! ! Emacs*XlwMenu.setCodingSystemOfTerminal___.labelString:	Set Coding System of %_Terminal...
! ! ! Emacs*XlwMenu.setCodingSystemOfTerminal___.labelString:		????????????????????????????????????????????????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.setCodingSystemOfKeyboard___.labelString:	Set Coding System of %_Keyboard...
! ! ! Emacs*XlwMenu.setCodingSystemOfKeyboard___.labelString:		????????????????????????????????????????????????????????????(%_K)...
! ! ! ! Emacs*XlwMenu.setCodingSystemOfProcess___.labelString:	Set Coding System of %_Process...
! ! ! Emacs*XlwMenu.setCodingSystemOfProcess___.labelString:		?????????????????????????????????????????????????????????(%_P)...
! ! ! ! Emacs*XlwMenu.showCha_racterTable.labelString:	Show Cha%_racter Table
! ! ! Emacs*XlwMenu.showCha_racterTable.labelString:		????????????????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.showDia_gnosisForMULE.labelString:	Show Dia%_gnosis for MULE
! ! ! Emacs*XlwMenu.showDia_gnosisForMULE.labelString:	MULE??????????????????(%_G)
! ! ! ! Emacs*XlwMenu.showHelloInManyLanguages.labelString:	Show "%_hello" in Many Languages
! ! ! Emacs*XlwMenu.showHelloInManyLanguages.labelString:	????????????"Hello"?????????(%_H)
! ! ! ! Emacs*XlwMenu.newFrame.labelString:	%_New Frame
! ! ! Emacs*XlwMenu.newFrame.labelString:			??????????????????(%_N)
! ! ! ! Emacs*XlwMenu.frameOnOtherDispla_y___.labelString:	Frame on Other Displa%_y...
! ! ! Emacs*XlwMenu.frameOnOtherDispla_y___.labelString:	???????????????????????????????????????(%_Y)...
! ! ! ! Emacs*XlwMenu.deleteFrame.labelString:	%_Delete Frame
! ! ! Emacs*XlwMenu.deleteFrame.labelString:		?????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.splitWindow.labelString:	%_Split Window
! ! ! Emacs*XlwMenu.splitWindow.labelString:		????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.s_plitWindowSideBySide.labelString:	S%_plit Window (Side by Side)
! ! ! Emacs*XlwMenu.s_plitWindowSideBySide.labelString:	????????????????????????(???)(%_P)
! ! ! ! Emacs*XlwMenu.unSplitKeepThis.labelString:	%_Un-Split (Keep This)
! ! ! Emacs*XlwMenu.unSplitKeepThis.labelString:	?????????????????????(%_U) (???????????????)
! ! ! ! Emacs*XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep %_Others)
! ! ! Emacs*XlwMenu.unSplitKeepOthers.labelString:	?????????????????????(%_O) (????????????)
! ! ! ! Emacs*XlwMenu.n_arrow.labelString:	N%_arrow
! ! ! Emacs*XlwMenu.n_arrow.labelString:	N%_arrow
! ! ! ! Emacs*XlwMenu.showMessageLog.labelString:	Show Message %_Log
! ! ! Emacs*XlwMenu.showMessageLog.labelString:	??????????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.gotoLine___.labelString:	%_Goto Line...
! ! ! Emacs*XlwMenu.gotoLine___.labelString:		????????????(%_G)...
! ! ! ! Emacs*XlwMenu.whatLine.labelString:	%_What Line
! ! ! Emacs*XlwMenu.whatLine.labelString:	???????????????(%_W)
! ! ! ! Emacs*XlwMenu.bookmarks.labelString:	%_Bookmarks
! ! ! Emacs*XlwMenu.bookmarks.labelString:	??????????????????(%_B)
! ! ! ! Emacs*XlwMenu.jumpToPreviousMark.labelString:	%_Jump to Previous Mark
! ! ! Emacs*XlwMenu.jumpToPreviousMark.labelString:	????????????????????????(%_J)
! ! ! ! Emacs*XlwMenu.narrowToRegion.labelString:	%_Narrow to Region
! ! ! Emacs*XlwMenu.narrowToRegion.labelString:	%_Narrow to Region
! ! ! ! Emacs*XlwMenu.narrowToPage.labelString:	Narrow to %_Page
! ! ! Emacs*XlwMenu.narrowToPage.labelString:		Narrow to %_Page
! ! ! ! Emacs*XlwMenu.narrowToDefun.labelString:	Narrow to %_Defun
! ! ! Emacs*XlwMenu.narrowToDefun.labelString:	Narrow to %_Defun
! ! ! ! Emacs*XlwMenu.widen.labelString:	%_Widen
! ! ! Emacs*XlwMenu.widen.labelString:	%_Widen
! ! ! ! Emacs*XlwMenu.jumpToBookmark.labelString:	%_Jump to Bookmark
! ! ! Emacs*XlwMenu.jumpToBookmark.labelString:	???????????????????????????(%_J)
! ! ! ! Emacs*XlwMenu.setBookmark.labelString:	Set %_Bookmark
! ! ! Emacs*XlwMenu.setBookmark.labelString:		???????????????????????????(%_B)
! ! ! ! Emacs*XlwMenu.insertContents.labelString:	Insert %_Contents
! ! ! Emacs*XlwMenu.insertContents.labelString:	????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.insertL_ocation.labelString:	Insert L%_ocation
! ! ! Emacs*XlwMenu.insertL_ocation.labelString:	???????????????(%_L)
! ! ! ! Emacs*XlwMenu.renameBookmark.labelString:	%_Rename Bookmark
! ! ! Emacs*XlwMenu.renameBookmark.labelString:	?????????????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.deleteBookmark.labelString:	%_Delete Bookmark
! ! ! Emacs*XlwMenu.deleteBookmark.labelString:	???????????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.editBookmarkList.labelString:	%_Edit Bookmark List
! ! ! Emacs*XlwMenu.editBookmarkList.labelString:	????????????????????????????????????(%_E)
! ! ! ! Emacs*XlwMenu.saveBookmarks.labelString:	%_Save Bookmarks
! ! ! Emacs*XlwMenu.saveBookmarks.labelString:	???????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.saveBookmarksAs___.labelString:	Save Bookmarks %_As...
! ! ! Emacs*XlwMenu.saveBookmarksAs___.labelString:	????????????????????????????????????(%_A)...
! ! ! ! Emacs*XlwMenu.loadABookmarkFile.labelString:	%_Load a Bookmark File
! ! ! Emacs*XlwMenu.loadABookmarkFile.labelString:	?????????????????????????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.repeatLastComplexCommand___.labelString:	Repeat %_Last Complex Command...
! ! ! Emacs*XlwMenu.repeatLastComplexCommand___.labelString:	??????????????????????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.e_valuateLispExpression___.labelString:	E%_valuate Lisp Expression...
! ! ! Emacs*XlwMenu.e_valuateLispExpression___.labelString:	Lisp????????????????????? (%_V)
! ! ! ! Emacs*XlwMenu.executeNamedCommand___.labelString:	Execute %_Named Command...
! ! ! Emacs*XlwMenu.executeNamedCommand___.labelString:	?????????????????????????????????(%_N)
! ! ! ! Emacs*XlwMenu.startMacroRecording.labelString:	Start %_Macro Recording
! ! ! Emacs*XlwMenu.startMacroRecording.labelString:		????????????????????????(%_M)
! ! ! ! Emacs*XlwMenu.e_xecuteLastMacro.labelString:	E%_xecute Last Macro
! ! ! Emacs*XlwMenu.e_xecuteLastMacro.labelString:	??????????????????????????? (%_X)
! ! ! ! Emacs*XlwMenu.otherMacro.labelString:	%_Other Macro
! ! ! Emacs*XlwMenu.otherMacro.labelString:	????????????????????????(%_O)
! ! ! ! Emacs*XlwMenu.abbrev.labelString:	%_Abbrev
! ! ! Emacs*XlwMenu.abbrev.labelString:	??????(%_A)
! ! ! ! Emacs*XlwMenu.register.labelString:	%_Register
! ! ! Emacs*XlwMenu.register.labelString:	??????(%_R)
! ! ! ! Emacs*XlwMenu.r_ectangles.labelString:	R%_ectangles
! ! ! Emacs*XlwMenu.r_ectangles.labelString:		??????(%_E)
! ! ! ! Emacs*XlwMenu.sort.labelString:	%_Sort
! ! ! Emacs*XlwMenu.sort.labelString:		?????????(%_S)
! ! ! ! Emacs*XlwMenu.changeCase.labelString:	%_Change Case
! ! ! Emacs*XlwMenu.changeCase.labelString:	?????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.ce_nter.labelString:	Ce%_nter
! ! ! Emacs*XlwMenu.ce_nter.labelString:	??????????????????(%_N)
! ! ! ! Emacs*XlwMenu.indent.labelString:	%_Indent
! ! ! Emacs*XlwMenu.indent.labelString:	???????????????(%_I)
! ! ! ! Emacs*XlwMenu.s_pellCheck.labelString:	S%_pell-Check
! ! ! Emacs*XlwMenu.s_pellCheck.labelString:		?????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.footnotes.labelString:	%_Footnotes
! ! ! Emacs*XlwMenu.footnotes.labelString:	??????(%_F)
! ! ! ! Emacs*XlwMenu.d_ynamicAbbrevExpand.labelString:	D%_ynamic Abbrev Expand
! ! ! Emacs*XlwMenu.d_ynamicAbbrevExpand.labelString:		?????????????????????????????????(%_Y)
! ! ! ! Emacs*XlwMenu.dynamicAbbrevComplete.labelString:	Dynamic Abbrev %_Complete
! ! ! Emacs*XlwMenu.dynamicAbbrevComplete.labelString:	?????????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.dynamicAbbrevCompleteInAllBuffers.labelString:	Dynamic Abbrev Complete in %_All Buffers
! ! ! Emacs*XlwMenu.dynamicAbbrevCompleteInAllBuffers.labelString:	?????????????????????????????????????????????????????????(%_A)
! ! ! ! Emacs*XlwMenu.defineGlobalAbbrevFor.labelString:	%_Define Global Abbrev for 
! ! ! Emacs*XlwMenu.defineGlobalAbbrevFor.labelString:	??????????????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.defineModeSpecificAbbrevFor.labelString:	Define %_Mode-Specific Abbrev for 
! ! ! Emacs*XlwMenu.defineModeSpecificAbbrevFor.labelString:		?????????????????????????????????(%_M)
! ! ! ! Emacs*XlwMenu.defineGlobalEx_pansionFor.labelString:	Define Global Ex%_pansion for 
! ! ! Emacs*XlwMenu.defineGlobalEx_pansionFor.labelString:	??????????????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.defineModeSpecificExpa_nsionFor.labelString:	Define Mode-Specific Expa%_nsion for 
! ! ! Emacs*XlwMenu.defineModeSpecificExpa_nsionFor.labelString:	?????????????????????????????????(%_N)
! ! ! ! Emacs*XlwMenu.e_xpandAbbrev.labelString:	E%_xpand Abbrev
! ! ! Emacs*XlwMenu.e_xpandAbbrev.labelString:	???????????????(%_X)
! ! ! ! Emacs*XlwMenu.expandAbbrevsInRe_gion.labelString:	Expand Abbrevs in Re%_gion
! ! ! Emacs*XlwMenu.expandAbbrevsInRe_gion.labelString:	????????????????????????????????????(%_G)
! ! ! ! Emacs*XlwMenu.unexpandLastAbbrev.labelString:	%_Unexpand Last Abbrev
! ! ! Emacs*XlwMenu.unexpandLastAbbrev.labelString:	?????????????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.killAllAbbrevs.labelString:	%_Kill All Abbrevs
! ! ! Emacs*XlwMenu.killAllAbbrevs.labelString:	???????????????????????????(%_K)
! ! ! ! Emacs*XlwMenu.insertAllAbbrevsIntoBuffer.labelString:	%_Insert All Abbrevs into Buffer
! ! ! Emacs*XlwMenu.insertAllAbbrevsIntoBuffer.labelString:	??????????????????????????????????????????(%_I)
! ! ! ! Emacs*XlwMenu.listAbbrevs.labelString:	%_List Abbrevs
! ! ! Emacs*XlwMenu.listAbbrevs.labelString:		???????????????(%_L)
! ! ! ! Emacs*XlwMenu.editAbbrevs.labelString:	%_Edit Abbrevs
! ! ! Emacs*XlwMenu.editAbbrevs.labelString:		???????????????(%_L)
! ! ! ! Emacs*XlwMenu.redefineAbbrevsFromBuffer.labelString:	%_Redefine Abbrevs from Buffer
! ! ! Emacs*XlwMenu.redefineAbbrevsFromBuffer.labelString:	????????????????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.saveAbbrevsAs___.labelString:	%_Save Abbrevs As...
! ! ! Emacs*XlwMenu.saveAbbrevsAs___.labelString:	????????????????????????(%_S)...
! ! ! ! Emacs*XlwMenu.l_oadAbbrevs___.labelString:	L%_oad Abbrevs...
! ! ! Emacs*XlwMenu.l_oadAbbrevs___.labelString:	?????????????????????(%_O)...
! ! ! ! Emacs*XlwMenu.copyToRegister___.labelString:	%_Copy to Register...
! ! ! Emacs*XlwMenu.copyToRegister___.labelString:	????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.pasteRegister___.labelString:	%_Paste Register...
! ! ! Emacs*XlwMenu.pasteRegister___.labelString:	??????????????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.savePointToRegister.labelString:	%_Save Point to Register
! ! ! Emacs*XlwMenu.savePointToRegister.labelString:		????????????????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.jumpToRegister.labelString:	%_Jump to Register
! ! ! Emacs*XlwMenu.jumpToRegister.labelString:	?????????????????????(%_J)
! ! ! ! Emacs*XlwMenu.killRectangle.labelString:	%_Kill Rectangle
! ! ! Emacs*XlwMenu.killRectangle.labelString:	???????????????(%_K)
! ! ! ! Emacs*XlwMenu.yankRectangle.labelString:	%_Yank Rectangle
! ! ! Emacs*XlwMenu.yankRectangle.labelString:	??????????????????(%_Y)
! ! ! ! Emacs*XlwMenu.rectangleToRegister.labelString:	Rectangle %_to Register
! ! ! Emacs*XlwMenu.rectangleToRegister.labelString:		??????????????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.rectangleFromRegister.labelString:	Rectangle %_from Register
! ! ! Emacs*XlwMenu.rectangleFromRegister.labelString:	?????????????????????????????????(%_F)
! ! ! ! Emacs*XlwMenu.clearRectangle.labelString:	%_Clear Rectangle
! ! ! Emacs*XlwMenu.clearRectangle.labelString:	??????????????????(%_C)
! ! ! ! Emacs*XlwMenu.openRectangle.labelString:	%_Open Rectangle
! ! ! Emacs*XlwMenu.openRectangle.labelString:	???????????????(%_O)
! ! ! ! Emacs*XlwMenu.prefixRectangle___.labelString:	%_Prefix Rectangle...
! ! ! Emacs*XlwMenu.prefixRectangle___.labelString:	?????????????????????(%_P)...
! ! ! ! Emacs*XlwMenu.rectangleMousing.labelString:	Rectangle %_Mousing
! ! ! Emacs*XlwMenu.rectangleMousing.labelString:	??????????????????(%_M)
! ! ! ! Emacs*XlwMenu.linesInRegion.labelString:	%_Lines in Region
! ! ! Emacs*XlwMenu.linesInRegion.labelString:	???????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.paragraphsInRegion.labelString:	%_Paragraphs in Region
! ! ! Emacs*XlwMenu.paragraphsInRegion.labelString:	??????????????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.p_agesInRegion.labelString:	P%_ages in Region
! ! ! Emacs*XlwMenu.p_agesInRegion.labelString:	?????????????????????????????????(%_A)
! ! ! ! Emacs*XlwMenu.columnsInRegion.labelString:	%_Columns in Region
! ! ! Emacs*XlwMenu.columnsInRegion.labelString:	?????????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.regexp___.labelString:	%_Regexp...
! ! ! Emacs*XlwMenu.regexp___.labelString:	????????????(%_R)...
! ! ! ! Emacs*XlwMenu.upcaseRegion.labelString:	%_Upcase Region
! ! ! Emacs*XlwMenu.upcaseRegion.labelString:		?????????????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.downcaseRegion.labelString:	%_Downcase Region
! ! ! Emacs*XlwMenu.downcaseRegion.labelString:	?????????????????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.capitalizeRegion.labelString:	%_Capitalize Region
! ! ! Emacs*XlwMenu.capitalizeRegion.labelString:	??????????????????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.titleCaseRegion.labelString:	%_Title-Case Region
! ! ! Emacs*XlwMenu.titleCaseRegion.labelString:	??????????????????????????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.line.labelString:	%_Line
! ! ! Emacs*XlwMenu.line.labelString:		?????????(%_L)
! ! ! ! Emacs*XlwMenu.paragraph.labelString:	%_Paragraph
! ! ! Emacs*XlwMenu.paragraph.labelString:	??????(%_P)
! ! ! ! Emacs*XlwMenu.region.labelString:	%_Region
! ! ! Emacs*XlwMenu.region.labelString:	???????????????(%_R)
! ! ! ! Emacs*XlwMenu.asPreviousLine.labelString:	%_As Previous Line
! ! ! Emacs*XlwMenu.asPreviousLine.labelString:	????????????(%_A)
! ! ! ! Emacs*XlwMenu.toColumn___.labelString:	%_To Column...
! ! ! Emacs*XlwMenu.toColumn___.labelString:		??????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.balancedExpression.labelString:	%_Balanced Expression
! ! ! Emacs*XlwMenu.balancedExpression.labelString:	????????????(%_B)
! ! ! ! Emacs*XlwMenu.cExpression.labelString:	%_C Expression
! ! ! Emacs*XlwMenu.cExpression.labelString:		C???(%_C)
! ! ! ! Emacs*XlwMenu.buffer.labelString:	%_Buffer
! ! ! Emacs*XlwMenu.buffer.labelString:	????????????(%_B)
! ! ! ! Emacs*XlwMenu.word.labelString:	%_Word
! ! ! Emacs*XlwMenu.word.labelString:		?????????(%_W)
! ! ! ! Emacs*XlwMenu.completeWord.labelString:	%_Complete Word
! ! ! Emacs*XlwMenu.completeWord.labelString:		???????????????(%_C)
! ! ! ! Emacs*XlwMenu.addFootnote.labelString:	%_Add Footnote
! ! ! Emacs*XlwMenu.addFootnote.labelString:		???????????????(%_A)
! ! ! ! Emacs*XlwMenu.deleteFootnote.labelString:	%_Delete Footnote
! ! ! Emacs*XlwMenu.deleteFootnote.labelString:	??????????????? (%_D)
! ! ! ! Emacs*XlwMenu.gotoFootnote.labelString:	%_Goto Footnote
! ! ! Emacs*XlwMenu.gotoFootnote.labelString:		???????????????(%_G)
! ! ! ! Emacs*XlwMenu.backToMessage.labelString:	%_Back to Message
! ! ! Emacs*XlwMenu.backToMessage.labelString:	????????????????????????(%_B)
! ! ! ! Emacs*XlwMenu.renumberFootnotes.labelString:	%_Renumber Footnotes
! ! ! Emacs*XlwMenu.renumberFootnotes.labelString:	??????????????????(%_R)
! ! ! ! Emacs*XlwMenu.setFootnoteStyle.labelString:	%_Set Footnote Style
! ! ! Emacs*XlwMenu.setFootnoteStyle.labelString:	???????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.cycleFootnoteStyle.labelString:	%_Cycle Footnote Style
! ! ! Emacs*XlwMenu.cycleFootnoteStyle.labelString:	?????????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.packages.labelString:	%_Packages
! ! ! Emacs*XlwMenu.packages.labelString:	???????????????(%_P)
! ! ! ! Emacs*XlwMenu.internet.labelString:	%_Internet
! ! ! Emacs*XlwMenu.internet.labelString:	?????????????????????(%_I)
! ! ! ! Emacs*XlwMenu.grep.labelString:	%_Grep
! ! ! Emacs*XlwMenu.grep.labelString:		%_Grep
! ! ! ! Emacs*XlwMenu.compile.labelString:	%_Compile
! ! ! Emacs*XlwMenu.compile.labelString:	???????????????(%_C)
! ! ! ! Emacs*XlwMenu.debug.labelString:	%_Debug
! ! ! Emacs*XlwMenu.debug.labelString:	????????????(%_D)
! ! ! ! Emacs*XlwMenu.shell.labelString:	%_Shell
! ! ! Emacs*XlwMenu.shell.labelString:	?????????(%_S)
! ! ! ! Emacs*XlwMenu.tags.labelString:	%_Tags
! ! ! Emacs*XlwMenu.tags.labelString:		??????(%_T)
! ! ! ! Emacs*XlwMenu.ca_lendar.labelString:	Ca%_lendar
! ! ! Emacs*XlwMenu.ca_lendar.labelString:	????????????(%_L)
! ! ! ! Emacs*XlwMenu.ga_mes.labelString:	Ga%_mes
! ! ! Emacs*XlwMenu.ga_mes.labelString:	?????????(%_M)
! ! ! ! Emacs*XlwMenu.vC.labelString:	%_VC
! ! ! Emacs*XlwMenu.vC.labelString:	%_VC
! ! ! ! Emacs*XlwMenu.compare.labelString:	%_Compare
! ! ! Emacs*XlwMenu.compare.labelString:	??????(%_C)
! ! ! ! Emacs*XlwMenu.merge.labelString:	%_Merge
! ! ! Emacs*XlwMenu.merge.labelString:	?????????(%_M)
! ! ! ! Emacs*XlwMenu.applyPatch.labelString:	%_Apply Patch
! ! ! Emacs*XlwMenu.applyPatch.labelString:	??????????????????(%_A)
! ! ! ! Emacs*XlwMenu.ediffMiscellanea.labelString:	%_Ediff Miscellanea
! ! ! Emacs*XlwMenu.ediffMiscellanea.labelString:	%_Ediff?????????
! ! ! ! Emacs*XlwMenu.directorySearch.labelString:	%_Directory Search
! ! ! Emacs*XlwMenu.directorySearch.labelString:	????????????(%_D)
! ! ! ! Emacs*XlwMenu.pCLCVS.labelString:	%_PCL CVS
! ! ! Emacs*XlwMenu.pCLCVS.labelString:	%_PCL CVS
! ! ! ! Emacs*XlwMenu.addDownloadSite.labelString:	%_Add Download Site
! ! ! Emacs*XlwMenu.addDownloadSite.labelString:	????????????????????????????????????(%_A)
! ! ! ! Emacs*XlwMenu.updatePackageIndex.labelString:	%_Update Package Index
! ! ! Emacs*XlwMenu.updatePackageIndex.labelString:	???????????????????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.listAndInstall.labelString:	%_List and Install
! ! ! Emacs*XlwMenu.listAndInstall.labelString:	?????????????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.u_pdateInstalledPackages.labelString:	U%_pdate Installed Packages
! ! ! Emacs*XlwMenu.u_pdateInstalledPackages.labelString:	?????????????????????????????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.usingCustom.labelString:	Using %_Custom
! ! ! Emacs*XlwMenu.usingCustom.labelString:		?????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.1PreReleases.labelString:	%_1 Pre-Releases
! ! ! Emacs*XlwMenu.1PreReleases.labelString:		%_1 ??????????????????
! ! ! ! Emacs*XlwMenu.2Xemacs_org.labelString:	%_2 xemacs.org
! ! ! Emacs*XlwMenu.2Xemacs_org.labelString:		%_2 xemacs.org
! ! ! ! Emacs*XlwMenu.3Crc_caCanada.labelString:	%_3 crc.ca (Canada)
! ! ! Emacs*XlwMenu.3Crc_caCanada.labelString:	%_3 crc.ca (?????????)
! ! ! ! Emacs*XlwMenu.4Ualberta_caCanada.labelString:	%_4 ualberta.ca (Canada)
! ! ! Emacs*XlwMenu.4Ualberta_caCanada.labelString:	%_4 ualberta.ca (?????????)
! ! ! ! Emacs*XlwMenu.5Uiuc_eduUnitedStates.labelString:	%_5 uiuc.edu (United States)
! ! ! Emacs*XlwMenu.5Uiuc_eduUnitedStates.labelString:	%_5 uiuc.edu (?????????)
! ! ! ! Emacs*XlwMenu.6Unc_eduUnitedStates.labelString:	%_6 unc.edu (United States)
! ! ! Emacs*XlwMenu.6Unc_eduUnitedStates.labelString:		%_6 unc.edu (?????????)
! ! ! ! Emacs*XlwMenu.7Utk_eduUnitedStates.labelString:	%_7 utk.edu (United States)
! ! ! Emacs*XlwMenu.7Utk_eduUnitedStates.labelString:		%_7 utk.edu (?????????)
! ! ! ! Emacs*XlwMenu.8Unicamp_brBrazil.labelString:	%_8 unicamp.br (Brazil)
! ! ! Emacs*XlwMenu.8Unicamp_brBrazil.labelString:	%_8 unicamp.br (????????????)
! ! ! ! Emacs*XlwMenu.9Tuwien_ac_atAustria.labelString:	%_9 tuwien.ac.at (Austria)
! ! ! Emacs*XlwMenu.9Tuwien_ac_atAustria.labelString:		tuwien.ac.at (??????????????????)
! ! ! ! Emacs*XlwMenu.0Auc_dkDenmark.labelString:	%_0 auc.dk (Denmark)
! ! ! Emacs*XlwMenu.0Auc_dkDenmark.labelString:	%_0 auc.dk (???????????????)
! ! ! ! Emacs*XlwMenu.aDoc_ic_ac_ukEngland.labelString:	%_a doc.ic.ac.uk (England)
! ! ! Emacs*XlwMenu.aDoc_ic_ac_ukEngland.labelString:		%_a doc.ic.ac.uk (????????????)
! ! ! ! Emacs*XlwMenu.bFunet_fiFinland.labelString:	%_b funet.fi (Finland)
! ! ! Emacs*XlwMenu.bFunet_fiFinland.labelString:	%_b funet.fi (??????????????????)
! ! ! ! Emacs*XlwMenu.cCenatls_cena_dgac_frFrance.labelString:	%_c cenatls.cena.dgac.fr (France)
! ! ! Emacs*XlwMenu.cCenatls_cena_dgac_frFrance.labelString:	%_c cenatls.cena.dgac.fr (????????????)
! ! ! ! Emacs*XlwMenu.dPasteur_frFrance.labelString:	%_d pasteur.fr (France)
! ! ! Emacs*XlwMenu.dPasteur_frFrance.labelString:	%_d pasteur.fr (????????????)
! ! ! ! Emacs*XlwMenu.eTuDarmstadt_deGermany.labelString:	%_e tu-darmstadt.de (Germany)
! ! ! Emacs*XlwMenu.eTuDarmstadt_deGermany.labelString:	%_e tu-darmstadt.de (?????????)
! ! ! ! Emacs*XlwMenu.fKfki_huHungary.labelString:	%_f kfki.hu (Hungary)
! ! ! Emacs*XlwMenu.fKfki_huHungary.labelString:	%_f kfki.hu (???????????????)
! ! ! ! Emacs*XlwMenu.gEunet_ieIreland.labelString:	%_g eunet.ie (Ireland)
! ! ! Emacs*XlwMenu.gEunet_ieIreland.labelString:	%_g eunet.ie (??????????????????)
! ! ! ! Emacs*XlwMenu.hUniroma2_itItaly.labelString:	%_h uniroma2.it (Italy)
! ! ! Emacs*XlwMenu.hUniroma2_itItaly.labelString:	%_h uniroma2.it (????????????)
! ! ! ! Emacs*XlwMenu.iUio_noNorway.labelString:	%_i uio.no (Norway)
! ! ! Emacs*XlwMenu.iUio_noNorway.labelString:	%_i uio.no (???????????????)
! ! ! ! Emacs*XlwMenu.jIcm_edu_plPoland.labelString:	%_j icm.edu.pl (Poland)
! ! ! Emacs*XlwMenu.jIcm_edu_plPoland.labelString:	%_j icm.edu.pl (???????????????)
! ! ! ! Emacs*XlwMenu.kSrcc_msu_suRussia.labelString:	%_k srcc.msu.su (Russia)
! ! ! Emacs*XlwMenu.kSrcc_msu_suRussia.labelString:	%_k srcc.msu.su (?????????)
! ! ! ! Emacs*XlwMenu.lSunet_seSweden.labelString:	%_l sunet.se (Sweden)
! ! ! Emacs*XlwMenu.lSunet_seSweden.labelString:	%_l sunet.se (??????????????????)
! ! ! ! Emacs*XlwMenu.mCnlabSwitch_chSwitzerland.labelString:	%_m cnlab-switch.ch (Switzerland)
! ! ! Emacs*XlwMenu.mCnlabSwitch_chSwitzerland.labelString:	%_m cnlab-switch.ch (?????????)
! ! ! ! Emacs*XlwMenu.nAist_go_jpJapan.labelString:	%_n aist.go.jp (Japan)
! ! ! Emacs*XlwMenu.nAist_go_jpJapan.labelString:	%_n aist.go.jp (??????)
! ! ! ! Emacs*XlwMenu.oAsahiNet_or_jpJapan.labelString:	%_o asahi-net.or.jp (Japan)
! ! ! Emacs*XlwMenu.oAsahiNet_or_jpJapan.labelString:	%_o asahi-net.or.jp (??????)
! ! ! ! Emacs*XlwMenu.pDti_ad_jpJapan.labelString:	%_p dti.ad.jp (Japan)
! ! ! Emacs*XlwMenu.pDti_ad_jpJapan.labelString:	%_p dti.ad.jp (??????)
! ! ! ! Emacs*XlwMenu.qJaist_ac_jpJapan.labelString:	%_q jaist.ac.jp (Japan)
! ! ! Emacs*XlwMenu.qJaist_ac_jpJapan.labelString:	%_q jaist.ac.jp (??????)
! ! ! ! Emacs*XlwMenu.rNucba_ac_jpJapan.labelString:	%_r nucba.ac.jp (Japan)
! ! ! Emacs*XlwMenu.rNucba_ac_jpJapan.labelString:	%_r nucba.ac.jp (??????)
! ! ! ! Emacs*XlwMenu.sSut_ac_jpJapan.labelString:	%_s sut.ac.jp (Japan)
! ! ! Emacs*XlwMenu.sSut_ac_jpJapan.labelString:	%_s sut.ac.jp (??????)
! ! ! ! Emacs*XlwMenu.tTsukuba_ac_jpJapan.labelString:	%_t tsukuba.ac.jp (Japan)
! ! ! Emacs*XlwMenu.tTsukuba_ac_jpJapan.labelString:		%_t tsukuba.ac.jp (??????)
! ! ! ! Emacs*XlwMenu.uKreonet_re_krKorea.labelString:	%_u kreonet.re.kr (Korea)
! ! ! Emacs*XlwMenu.uKreonet_re_krKorea.labelString:		%_u kreonet.re.kr (??????)
! ! ! ! Emacs*XlwMenu.vNctu_edu_twTaiwan.labelString:	%_v nctu.edu.tw (Taiwan)
! ! ! Emacs*XlwMenu.vNctu_edu_twTaiwan.labelString:		%_v nctu.edu.tw (??????)
! ! ! ! Emacs*XlwMenu.wSun_ac_zaSouthAfrica.labelString:	%_w sun.ac.za (South Africa)
! ! ! Emacs*XlwMenu.wSun_ac_zaSouthAfrica.labelString:	%_w sun.ac.za (???????????????)
! ! ! ! Emacs*XlwMenu.xIsu_net_saSaudiArabia.labelString:	%_x isu.net.sa (Saudi Arabia)
! ! ! Emacs*XlwMenu.xIsu_net_saSaudiArabia.labelString:	%_x isu.net.sa (?????????????????????)
! ! ! ! Emacs*XlwMenu.yAarnet_edu_auAustralia.labelString:	%_y aarnet.edu.au (Australia)
! ! ! Emacs*XlwMenu.yAarnet_edu_auAustralia.labelString:	%_y aarnet.edu.au (?????????????????????)
! ! ! ! Emacs*XlwMenu.pleaseLoadPackageIndex.labelString:	Please load Package Index
! ! ! Emacs*XlwMenu.pleaseLoadPackageIndex.labelString:	????????????????????????????????????????????????????????????
! ! ! ! Emacs*XlwMenu.readMail1VM___.labelString:	Read Mail %_1 (VM)...
! ! ! Emacs*XlwMenu.readMail1VM___.labelString:	??????????????????(%_1)(VM)...
! ! ! ! Emacs*XlwMenu.readMail2MH___.labelString:	Read Mail %_2 (MH)...
! ! ! Emacs*XlwMenu.readMail2MH___.labelString:	??????????????????(%_2)(MH)...
! ! ! ! Emacs*XlwMenu.sendMail___.labelString:	Send %_Mail...
! ! ! Emacs*XlwMenu.sendMail___.labelString:		??????????????????(%_M)...
! ! ! ! Emacs*XlwMenu.usenetNews.labelString:	Usenet %_News
! ! ! Emacs*XlwMenu.usenetNews.labelString:	Usenet????????????(%_N)
! ! ! ! Emacs*XlwMenu.browseTheWeb.labelString:	Browse the %_Web
! ! ! Emacs*XlwMenu.browseTheWeb.labelString:		????????????????????????(%_W)
! ! ! ! Emacs*XlwMenu.grep___.labelString:	%_Grep...
! ! ! Emacs*XlwMenu.grep___.labelString:	%_Grep...
! ! ! ! Emacs*XlwMenu.killGrep.labelString:	%_Kill Grep
! ! ! Emacs*XlwMenu.killGrep.labelString:	Grep?????????(%_K)
! ! ! ! Emacs*XlwMenu.grepAllFilesInCurrentDirectory___.labelString:	Grep %_All Files in Current Directory...
! ! ! Emacs*XlwMenu.grepAllFilesInCurrentDirectory___.labelString:	????????????????????????????????????????????????????????????grep(%_A)
! ! ! ! Emacs*XlwMenu.grepCAndCHeaderFilesInCurrentDirectory___.labelString:	Grep %_C and C Header Files in Current Directory...
! ! ! Emacs*XlwMenu.grepCAndCHeaderFilesInCurrentDirectory___.labelString:	?????????????????????????????????C???C???????????????????????????grep(%_C)
! ! ! ! Emacs*XlwMenu.grepCHea_derFilesInCurrentDirectory___.labelString:	Grep C Hea%_der Files in Current Directory...
! ! ! Emacs*XlwMenu.grepCHea_derFilesInCurrentDirectory___.labelString:	?????????????????????????????????C????????????????????????grep(%_H)
! ! ! ! Emacs*XlwMenu.grepELispFilesInCurrentDirectory___.labelString:	Grep %_E-Lisp Files in Current Directory...
! ! ! Emacs*XlwMenu.grepELispFilesInCurrentDirectory___.labelString:	?????????????????????????????????E-Lisp???????????????grep(%_E)
! ! ! ! Emacs*XlwMenu.grepPerlFilesInCurrentDirectory___.labelString:	Grep %_Perl Files in Current Directory...
! ! ! Emacs*XlwMenu.grepPerlFilesInCurrentDirectory___.labelString:	?????????????????????????????????Perl???????????????grep(%_P)
! ! ! ! Emacs*XlwMenu.grepHTMLFilesInCurrentDirectory___.labelString:	Grep %_HTML Files in Current Directory...
! ! ! Emacs*XlwMenu.grepHTMLFilesInCurrentDirectory___.labelString:	?????????????????????????????????HTML???????????????grep(%_H)
! ! ! ! Emacs*XlwMenu.nextMatch.labelString:	%_Next Match
! ! ! Emacs*XlwMenu.nextMatch.labelString:	???????????????(%_N)
! ! ! ! Emacs*XlwMenu.pre_viousMatch.labelString:	Pre%_vious Match
! ! ! Emacs*XlwMenu.pre_viousMatch.labelString:	???????????????(%_V)
! ! ! ! Emacs*XlwMenu.firstMatch.labelString:	%_First Match
! ! ! Emacs*XlwMenu.firstMatch.labelString:	??????????????????(%_F)
! ! ! ! Emacs*XlwMenu.g_otoMatch.labelString:	G%_oto Match
! ! ! Emacs*XlwMenu.g_otoMatch.labelString:	???????????????(%_G)
! ! ! ! Emacs*XlwMenu.setGrepCommand___.labelString:	%_Set Grep Command...
! ! ! Emacs*XlwMenu.setGrepCommand___.labelString:	grep?????????????????????(%_S)...
! ! ! ! Emacs*XlwMenu.compile___.labelString:	%_Compile...
! ! ! Emacs*XlwMenu.compile___.labelString:	???????????????(%_C)
! ! ! ! Emacs*XlwMenu.repeatCompilation.labelString:	%_Repeat Compilation
! ! ! Emacs*XlwMenu.repeatCompilation.labelString:	??????????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.killCompilation.labelString:	%_Kill Compilation
! ! ! Emacs*XlwMenu.killCompilation.labelString:	??????????????????????????????(%_K)
! ! ! ! Emacs*XlwMenu.nextError.labelString:	%_Next Error
! ! ! Emacs*XlwMenu.nextError.labelString:	??????????????????(%_N)
! ! ! ! Emacs*XlwMenu.pre_viousError.labelString:	Pre%_vious Error
! ! ! Emacs*XlwMenu.pre_viousError.labelString:	??????????????????(%_V)
! ! ! ! Emacs*XlwMenu.firstError.labelString:	%_First Error
! ! ! Emacs*XlwMenu.firstError.labelString:	?????????????????????(%_F)
! ! ! ! Emacs*XlwMenu.g_otoError.labelString:	G%_oto Error
! ! ! Emacs*XlwMenu.g_otoError.labelString:	??????????????????(%_O)
! ! ! ! Emacs*XlwMenu.gDB___.labelString:	%_GDB...
! ! ! Emacs*XlwMenu.gDB___.labelString:	%_GDB...
! ! ! ! Emacs*XlwMenu.dBX___.labelString:	%_DBX...
! ! ! Emacs*XlwMenu.dBX___.labelString:	%_DBX...
! ! ! ! Emacs*XlwMenu.s_hellCommand___.labelString:	S%_hell Command...
! ! ! Emacs*XlwMenu.s_hellCommand___.labelString:	?????????????????????(%_H)...
! ! ! ! Emacs*XlwMenu.shellCommandOnRegion___.labelString:	Shell Command on %_Region...
! ! ! Emacs*XlwMenu.shellCommandOnRegion___.labelString:	????????????????????????????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.findTag___.labelString:	%_Find Tag...
! ! ! Emacs*XlwMenu.findTag___.labelString:	???????????????(%_F)...
! ! ! ! Emacs*XlwMenu.findOtherWindow___.labelString:	Find %_Other Window...
! ! ! Emacs*XlwMenu.findOtherWindow___.labelString:	??????????????????????????????(%_O)
! ! ! ! Emacs*XlwMenu.nextTag___.labelString:	%_Next Tag...
! ! ! Emacs*XlwMenu.nextTag___.labelString:	???????????????(%_N)...
! ! ! ! Emacs*XlwMenu.n_extOtherWindow___.labelString:	N%_ext Other Window...
! ! ! Emacs*XlwMenu.n_extOtherWindow___.labelString:	?????????????????????????????????(%_E)...
! ! ! ! Emacs*XlwMenu.nextFile.labelString:	Next %_File
! ! ! Emacs*XlwMenu.nextFile.labelString:	??????????????????(%_F)
! ! ! ! Emacs*XlwMenu.tagsSearch___.labelString:	Tags %_Search...
! ! ! Emacs*XlwMenu.tagsSearch___.labelString:	????????????(%_S)...
! ! ! ! Emacs*XlwMenu.tagsReplace___.labelString:	Tags %_Replace...
! ! ! Emacs*XlwMenu.tagsReplace___.labelString:	????????????(%_R)...
! ! ! ! Emacs*XlwMenu.continueSearchReplace.labelString:	%_Continue Search/Replace
! ! ! Emacs*XlwMenu.continueSearchReplace.labelString:	??????/??????????????????(%_C)
! ! ! ! Emacs*XlwMenu.popStack.labelString:	%_Pop stack
! ! ! Emacs*XlwMenu.popStack.labelString:	???????????????pop(%_P)
! ! ! ! Emacs*XlwMenu.apropos___.labelString:	%_Apropos...
! ! ! Emacs*XlwMenu.apropos___.labelString:	%_Apropos...
! ! ! ! Emacs*XlwMenu.setTagsTableFile___.labelString:	%_Set Tags Table File...
! ! ! Emacs*XlwMenu.setTagsTableFile___.labelString:	???????????????????????????????????????(%_S)...
! ! ! ! Emacs*XlwMenu.3MonthCalendar.labelString:	%_3-Month Calendar
! ! ! Emacs*XlwMenu.3MonthCalendar.labelString:	3??????????????????(%_3)
! ! ! ! Emacs*XlwMenu.diary.labelString:	%_Diary
! ! ! Emacs*XlwMenu.diary.labelString:	??????(%_D)
! ! ! ! Emacs*XlwMenu.holidays.labelString:	%_Holidays
! ! ! Emacs*XlwMenu.holidays.labelString:	??????(%_H)
! ! ! ! Emacs*XlwMenu.phasesOfTheMoon.labelString:	%_Phases of the Moon
! ! ! Emacs*XlwMenu.phasesOfTheMoon.labelString:	??????(%_P)
! ! ! ! Emacs*XlwMenu.sunriseSunset.labelString:	%_Sunrise/Sunset
! ! ! Emacs*XlwMenu.sunriseSunset.labelString:	?????????/?????????(%_S)
! ! ! ! Emacs*XlwMenu.mineGame.labelString:	%_Mine Game
! ! ! Emacs*XlwMenu.mineGame.labelString:	???????????????(%_M)
! ! ! ! Emacs*XlwMenu.tetris.labelString:	%_Tetris
! ! ! Emacs*XlwMenu.tetris.labelString:	????????????(%_T)
! ! ! ! Emacs*XlwMenu.sokoban.labelString:	%_Sokoban
! ! ! Emacs*XlwMenu.sokoban.labelString:	?????????(%_S)
! ! ! ! Emacs*XlwMenu.quoteFromZippy.labelString:	Quote from %_Zippy
! ! ! Emacs*XlwMenu.quoteFromZippy.labelString:	Zippy?????????(%_Z)
! ! ! ! Emacs*XlwMenu.psychoanalyst.labelString:	%_Psychoanalyst
! ! ! Emacs*XlwMenu.psychoanalyst.labelString:	XEmacs????????????(%_P)
! ! ! ! Emacs*XlwMenu.ps_ychoanalyzeZippy.labelString:	Ps%_ychoanalyze Zippy!
! ! ! Emacs*XlwMenu.ps_ychoanalyzeZippy.labelString:	Zippy???????????????!(%_Y)
! ! ! ! Emacs*XlwMenu.randomFlames.labelString:	%_Random Flames
! ! ! Emacs*XlwMenu.randomFlames.labelString:		??????????????????(%_R)
! ! ! ! Emacs*XlwMenu.dunnetAdventure.labelString:	%_Dunnet (Adventure)
! ! ! Emacs*XlwMenu.dunnetAdventure.labelString:	Dunnet(?????????????????????)(%_D)
! ! ! ! Emacs*XlwMenu.towersOfHanoi.labelString:	Towers of %_Hanoi
! ! ! Emacs*XlwMenu.towersOfHanoi.labelString:	???????????????(%_H)
! ! ! ! Emacs*XlwMenu.gameOfLife.labelString:	Game of %_Life
! ! ! Emacs*XlwMenu.gameOfLife.labelString:	??????????????????(%_L)
! ! ! ! Emacs*XlwMenu.m_ultiplicationPuzzle.labelString:	M%_ultiplication Puzzle
! ! ! Emacs*XlwMenu.m_ultiplicationPuzzle.labelString:	??????????????????(%_U)
! ! ! ! Emacs*XlwMenu.loadVC.labelString:	%_Load VC
! ! ! Emacs*XlwMenu.loadVC.labelString:	VC???????????????(%_L)
! ! ! ! Emacs*XlwMenu.twoFiles___.labelString:	%_Two Files...
! ! ! Emacs*XlwMenu.twoFiles___.labelString:		2????????????(%_T)...
! ! ! ! Emacs*XlwMenu.twoBuffers___.labelString:	%_Two Buffers...
! ! ! Emacs*XlwMenu.twoBuffers___.labelString:	2????????????(%_T)...
! ! ! ! Emacs*XlwMenu.threeFiles___.labelString:	%_Three Files...
! ! ! Emacs*XlwMenu.threeFiles___.labelString:	3????????????(%_T)...
! ! ! ! Emacs*XlwMenu.threeBuffers___.labelString:	%_Three Buffers...
! ! ! Emacs*XlwMenu.threeBuffers___.labelString:	3????????????(%_T)...
! ! ! ! Emacs*XlwMenu.twoDirectories___.labelString:	%_Two Directories...
! ! ! Emacs*XlwMenu.twoDirectories___.labelString:	2??????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.threeDirectories___.labelString:	%_Three Directories...
! ! ! Emacs*XlwMenu.threeDirectories___.labelString:	3??????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.fileWithRevision___.labelString:	%_File with Revision...
! ! ! Emacs*XlwMenu.fileWithRevision___.labelString:	?????????????????????????????????(%_F)...
! ! ! ! Emacs*XlwMenu.directoryRevisions___.labelString:	%_Directory Revisions...
! ! ! Emacs*XlwMenu.directoryRevisions___.labelString:	?????????????????????????????????(%_D)...
! ! ! ! Emacs*XlwMenu.windowsWordByWord___.labelString:	%_Windows Word-by-word...
! ! ! Emacs*XlwMenu.windowsWordByWord___.labelString:	?????????????????????????????????(%_W)...
! ! ! ! Emacs*XlwMenu.windowsLineByLine___.labelString:	%_Windows Line-by-line...
! ! ! Emacs*XlwMenu.windowsLineByLine___.labelString:	???????????????????????????(%_W)...
! ! ! ! Emacs*XlwMenu.regionsWordByWord___.labelString:	%_Regions Word-by-word...
! ! ! Emacs*XlwMenu.regionsWordByWord___.labelString:	?????????????????????????????????(%_R)...
! ! ! ! Emacs*XlwMenu.regionsLineByLine___.labelString:	%_Regions Line-by-line...
! ! ! Emacs*XlwMenu.regionsLineByLine___.labelString:	???????????????????????????(%_R)...
! ! ! ! Emacs*XlwMenu.files___.labelString:	%_Files...
! ! ! Emacs*XlwMenu.files___.labelString:	????????????(%_F)...
! ! ! ! Emacs*XlwMenu.filesWithAncestor___.labelString:	%_Files with Ancestor...
! ! ! Emacs*XlwMenu.filesWithAncestor___.labelString:	???????????????????????????(%_F)...
! ! ! ! Emacs*XlwMenu.buffers___.labelString:	%_Buffers...
! ! ! Emacs*XlwMenu.buffers___.labelString:	????????????(%_B)...
! ! ! ! Emacs*XlwMenu.buffersWithAncestor___.labelString:	%_Buffers with Ancestor...
! ! ! Emacs*XlwMenu.buffersWithAncestor___.labelString:	???????????????????????????(%_B)...
! ! ! ! Emacs*XlwMenu.directories___.labelString:	%_Directories...
! ! ! Emacs*XlwMenu.directories___.labelString:	??????????????????(%_D)...
! ! ! ! Emacs*XlwMenu.directoriesWithAncestor___.labelString:	%_Directories with Ancestor...
! ! ! Emacs*XlwMenu.directoriesWithAncestor___.labelString:	?????????????????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.revisions___.labelString:	%_Revisions...
! ! ! Emacs*XlwMenu.revisions___.labelString:	???????????????(%_R)...
! ! ! ! Emacs*XlwMenu.revisionsWithAncestor___.labelString:	%_Revisions with Ancestor...
! ! ! Emacs*XlwMenu.revisionsWithAncestor___.labelString:	??????????????????????????????(%_R)...
! ! ! ! Emacs*XlwMenu.directoryRevisionsWithAncestor___.labelString:	%_Directory Revisions with Ancestor...
! ! ! Emacs*XlwMenu.directoryRevisionsWithAncestor___.labelString:	????????????????????????????????????????????????(%_D)...
! ! ! ! Emacs*XlwMenu.toAFile___.labelString:	%_To a file...
! ! ! Emacs*XlwMenu.toAFile___.labelString:	?????????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.toABuffer___.labelString:	%_To a buffer...
! ! ! Emacs*XlwMenu.toABuffer___.labelString:	?????????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.ediffManual___.labelString:	%_Ediff Manual...
! ! ! Emacs*XlwMenu.ediffManual___.labelString:	??????????????????ediff(%_E)...
! ! ! ! Emacs*XlwMenu.customizeEdiff___.labelString:	%_Customize Ediff...
! ! ! Emacs*XlwMenu.customizeEdiff___.labelString:	ediff?????????????????????(%_C)...
! ! ! ! Emacs*XlwMenu.listEdiffSessions___.labelString:	%_List Ediff Sessions...
! ! ! Emacs*XlwMenu.listEdiffSessions___.labelString:	ediff????????????????????????(%_L)...
! ! ! ! Emacs*XlwMenu.useSeparateFrameForEdiffControlBuffer___.labelString:	%_Use separate frame for Ediff control buffer...
! ! ! Emacs*XlwMenu.useSeparateFrameForEdiffControlBuffer___.labelString:	ediff????????????????????????????????????????????????????????????(%_U)...
! ! ! ! Emacs*XlwMenu.useAToolbarWithEdiffControlBuffer.labelString:	%_Use a toolbar with Ediff control buffer
! ! ! Emacs*XlwMenu.useAToolbarWithEdiffControlBuffer.labelString:	ediff?????????????????????????????????????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.loadHotlistOfServers.labelString:	%_Load Hotlist of Servers
! ! ! Emacs*XlwMenu.loadHotlistOfServers.labelString:	?????????????????????????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.newServer.labelString:	%_New Server
! ! ! Emacs*XlwMenu.newServer.labelString:	???????????????(%_N)
! ! ! ! Emacs*XlwMenu.queryWithForm.labelString:	%_Query with Form
! ! ! Emacs*XlwMenu.queryWithForm.labelString:	???????????????????????????(%_Q)
! ! ! ! Emacs*XlwMenu.expandInlineQuery.labelString:	%_Expand Inline Query
! ! ! Emacs*XlwMenu.expandInlineQuery.labelString:	????????????????????????????????????(%_E)
! ! ! ! Emacs*XlwMenu.getEmail.labelString:	%_Get Email
! ! ! Emacs*XlwMenu.getEmail.labelString:	????????????????????????(%_G)
! ! ! ! Emacs*XlwMenu.getPhone.labelString:	%_Get Phone
! ! ! Emacs*XlwMenu.getPhone.labelString:	?????????????????????(%_G)
! ! ! ! Emacs*XlwMenu.updateDirectory.labelString:	%_Update Directory
! ! ! Emacs*XlwMenu.updateDirectory.labelString:	???????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.examineDirectory.labelString:	%_Examine Directory
! ! ! Emacs*XlwMenu.examineDirectory.labelString:	???????????????????????????(%_E)
! ! ! ! Emacs*XlwMenu.statusDirectory.labelString:	%_Status Directory
! ! ! Emacs*XlwMenu.statusDirectory.labelString:	?????????????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.checkoutModule.labelString:	%_Checkout Module
! ! ! Emacs*XlwMenu.checkoutModule.labelString:	???????????????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.advancedCustomize.labelString:	%_Advanced (Customize)
! ! ! Emacs*XlwMenu.advancedCustomize.labelString:	??????(??????????????????)(%_A)
! ! ! ! Emacs*XlwMenu.editing.labelString:	%_Editing
! ! ! Emacs*XlwMenu.editing.labelString:	??????(%_E)
! ! ! ! Emacs*XlwMenu.keyboardAndMouse.labelString:	%_Keyboard and Mouse
! ! ! Emacs*XlwMenu.keyboardAndMouse.labelString:	???????????????????????????(%_K)
! ! ! ! Emacs*XlwMenu.printing.labelString:	%_Printing
! ! ! Emacs*XlwMenu.printing.labelString:	??????(%_P)
! ! ! ! Emacs*XlwMenu.troubleshooting.labelString:	%_Troubleshooting
! ! ! Emacs*XlwMenu.troubleshooting.labelString:	?????????????????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.display.labelString:	%_Display
! ! ! Emacs*XlwMenu.display.labelString:	??????????????????(%_D)
! ! ! ! Emacs*XlwMenu.menubars.labelString:	%_Menubars
! ! ! Emacs*XlwMenu.menubars.labelString:	??????????????????(%_M)
! ! ! ! Emacs*XlwMenu.s_yntaxHighlighting.labelString:	S%_yntax Highlighting
! ! ! Emacs*XlwMenu.s_yntaxHighlighting.labelString:	????????????????????????(%_Y)
! ! ! ! Emacs*XlwMenu.font.labelString:	%_Font
! ! ! Emacs*XlwMenu.font.labelString:		????????????(%_F)
! ! ! ! Emacs*XlwMenu.fontSi_ze.labelString:	Font Si%_ze
! ! ! Emacs*XlwMenu.fontSi_ze.labelString:	?????????????????????(%_Z)
! ! ! ! Emacs*XlwMenu.editFa_ces___.labelString:	Edit Fa%_ces...
! ! ! Emacs*XlwMenu.editFa_ces___.labelString:	???????????????(%_C)...
! ! ! ! Emacs*XlwMenu.editI_nitFile.labelString:	Edit I%_nit File
! ! ! Emacs*XlwMenu.editI_nitFile.labelString:	init?????????????????????(%_I)
! ! ! ! Emacs*XlwMenu.saveOptionsToInitFile.labelString:	%_Save Options to Init File
! ! ! Emacs*XlwMenu.saveOptionsToInitFile.labelString:	??????????????????init?????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.thisBufferReadOnly.labelString:	This Buffer %_Read Only
! ! ! Emacs*XlwMenu.thisBufferReadOnly.labelString:	???????????????????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.yankKillInteractWithClipboard.labelString:	%_Yank/Kill Interact With Clipboard
! ! ! Emacs*XlwMenu.yankKillInteractWithClipboard.labelString:	?????????????????????????????????/Kill?????????
! ! ! ! Emacs*XlwMenu.overstrike.labelString:	%_Overstrike
! ! ! Emacs*XlwMenu.overstrike.labelString:	????????????(%_O)
! ! ! ! Emacs*XlwMenu.abbrevMode.labelString:	%_Abbrev Mode
! ! ! Emacs*XlwMenu.abbrevMode.labelString:	???????????????(%_A)
! ! ! ! Emacs*XlwMenu.activeRe_gions.labelString:	Active Re%_gions
! ! ! Emacs*XlwMenu.activeRe_gions.labelString:	????????????????????????????????????(%_G)
! ! ! ! Emacs*XlwMenu.caseSensitiveSearch.labelString:	%_Case Sensitive Search
! ! ! Emacs*XlwMenu.caseSensitiveSearch.labelString:	?????????/??????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.caseMatchingReplace.labelString:	Case %_Matching Replace
! ! ! Emacs*XlwMenu.caseMatchingReplace.labelString:	?????????/??????????????????????????????(%_M)
! ! ! ! Emacs*XlwMenu.newlineAtEndOfFile___.labelString:	%_Newline at End of File...
! ! ! Emacs*XlwMenu.newlineAtEndOfFile___.labelString:	??????????????????????????????(%_N)
! ! ! ! Emacs*XlwMenu.addNewlineWhenMovingPastEnd.labelString:	Add Newline When Moving Past %_End
! ! ! Emacs*XlwMenu.addNewlineWhenMovingPastEnd.labelString:	???????????????????????????????????????(_E)
! ! ! ! Emacs*XlwMenu.donTRequire.labelString:	%_Don't Require
! ! ! Emacs*XlwMenu.donTRequire.labelString:	??????????????????(%_D)
! ! ! ! Emacs*XlwMenu.require.labelString:	%_Require
! ! ! Emacs*XlwMenu.require.labelString:	???????????????(%_R)
! ! ! ! Emacs*XlwMenu.ask.labelString:	%_Ask
! ! ! Emacs*XlwMenu.ask.labelString:		????????????(%_A)
! ! ! ! Emacs*XlwMenu.deleteKeyDeletesSelection.labelString:	%_Delete Key Deletes Selection
! ! ! Emacs*XlwMenu.deleteKeyDeletesSelection.labelString:	Delete??????????????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.killLineKillsWholeLineAtBeg.labelString:	`%_kill-line' Kills Whole Line at %_Beg
! ! ! Emacs*XlwMenu.killLineKillsWholeLineAtBeg.labelString:	'kill-line'?????????????????????????????????(%_B)
! ! ! ! Emacs*XlwMenu.sizeForBlockMovementCommands___.labelString:	Size for %_Block-Movement Commands...
! ! ! Emacs*XlwMenu.sizeForBlockMovementCommands___.labelString:	??????????????????????????????????????????(%_B)
! ! ! ! Emacs*XlwMenu.vIEmulation.labelString:	%_VI Emulation
! ! ! Emacs*XlwMenu.vIEmulation.labelString:	VI???????????????????????? (%_V)
! ! ! ! Emacs*XlwMenu.s_hiftedMotionKeysSelectRegion.labelString:	S%_hifted Motion Keys Select Region
! ! ! Emacs*XlwMenu.s_hiftedMotionKeysSelectRegion.labelString:	??????????????????????????????????????????(%_H)
! ! ! ! Emacs*XlwMenu.afterShiftedMotionUnshiftedMotionKeysDeselect.labelString:	%_After Shifted Motion, Unshifted Motion Keys Deselect
! ! ! Emacs*XlwMenu.afterShiftedMotionUnshiftedMotionKeysDeselect.labelString:	?????????????????????????????????????????????????????????(%_A)
! ! ! ! Emacs*XlwMenu.setKey___.labelString:	%_Set Key...
! ! ! Emacs*XlwMenu.setKey___.labelString:	???????????????(%_S)...
! ! ! ! Emacs*XlwMenu.unsetKey___.labelString:	%_Unset Key...
! ! ! Emacs*XlwMenu.unsetKey___.labelString:	?????????????????????(%_U)...
! ! ! ! Emacs*XlwMenu.mousePasteAtTextCursorNotClickedLocation.labelString:	%_Mouse Paste at Text Cursor (not Clicked Location)
! ! ! Emacs*XlwMenu.mousePasteAtTextCursorNotClickedLocation.labelString:	???????????????????????????????????????????????????(????????????????????????????????????)(%_M)
! ! ! ! Emacs*XlwMenu.teachExtendedCommands.labelString:	%_Teach Extended Commands
! ! ! Emacs*XlwMenu.teachExtendedCommands.labelString:	??????????????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.setPrinterNameForGenericPrintSupport___.labelString:	Set Printer %_Name for Generic Print Support...
! ! ! Emacs*XlwMenu.setPrinterNameForGenericPrintSupport___.labelString:	????????????????????????????????????????????????????????????????????????(%_N)
! ! ! ! Emacs*XlwMenu.commandLineSwitchesForLprLp___.labelString:	Command-Line %_Switches for `lpr'/`lp'...
! ! ! Emacs*XlwMenu.commandLineSwitchesForLprLp___.labelString:	'lpr'/'lp'????????????????????????????????????...
! ! ! ! Emacs*XlwMenu.prettyPrintPaperSize.labelString:	%_Pretty-Print Paper Size
! ! ! Emacs*XlwMenu.prettyPrintPaperSize.labelString:	??????????????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.colorPrinting.labelString:	%_Color Printing
! ! ! Emacs*XlwMenu.colorPrinting.labelString:	???????????????(%_C)
! ! ! ! Emacs*XlwMenu.letter.labelString:	%_Letter
! ! ! Emacs*XlwMenu.letter.labelString:	?????????(%_L)
! ! ! ! Emacs*XlwMenu.lette_rSmall.labelString:	Lette%_r-Small
! ! ! Emacs*XlwMenu.lette_rSmall.labelString:	????????????(%_R)
! ! ! ! Emacs*XlwMenu.le_gal.labelString:	Le%_gal
! ! ! Emacs*XlwMenu.le_gal.labelString:	????????????(%_G)
! ! ! ! Emacs*XlwMenu.statement.labelString:	%_Statement
! ! ! Emacs*XlwMenu.statement.labelString:	?????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.executive.labelString:	%_Executive
! ! ! Emacs*XlwMenu.executive.labelString:	?????????????????????(%_E)
! ! ! ! Emacs*XlwMenu.tabloid.labelString:	%_Tabloid
! ! ! Emacs*XlwMenu.tabloid.labelString:	??????????????? (%_T)
! ! ! ! Emacs*XlwMenu.le_dger.labelString:	Le%_dger
! ! ! Emacs*XlwMenu.le_dger.labelString:	??????(%_D)
! ! ! ! Emacs*XlwMenu.a_3.labelString:	A%_3
! ! ! Emacs*XlwMenu.a_3.labelString:		A%_3
! ! ! ! Emacs*XlwMenu.a4.labelString:	%_A4
! ! ! Emacs*XlwMenu.a4.labelString:	%_A4
! ! ! ! Emacs*XlwMenu.a4s_mall.labelString:	A4s%_mall
! ! ! Emacs*XlwMenu.a4s_mall.labelString:	A4???(%_M)
! ! ! ! Emacs*XlwMenu.b_4.labelString:	B%_4
! ! ! Emacs*XlwMenu.b_4.labelString:		B%_4
! ! ! ! Emacs*XlwMenu.b5.labelString:	%_B5
! ! ! Emacs*XlwMenu.b5.labelString:	%_B5
! ! ! ! Emacs*XlwMenu.composeMailWith.labelString:	%_Compose Mail With
! ! ! Emacs*XlwMenu.composeMailWith.labelString:	???????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.setMyEmailAddress___.labelString:	Set My %_Email Address...
! ! ! Emacs*XlwMenu.setMyEmailAddress___.labelString:	????????????????????????????????????(%_E)...
! ! ! ! Emacs*XlwMenu.setMachineEmailName___.labelString:	Set %_Machine Email Name...
! ! ! Emacs*XlwMenu.setMachineEmailName___.labelString:	???????????????????????????????????????(%_M)
! ! ! ! Emacs*XlwMenu.setSMTPServer___.labelString:	Set %_SMTP Server...
! ! ! Emacs*XlwMenu.setSMTPServer___.labelString:	SMTP??????????????????(%_S)...
! ! ! ! Emacs*XlwMenu.sMTPDebugInfo.labelString:	SMTP %_Debug Info
! ! ! Emacs*XlwMenu.sMTPDebugInfo.labelString:	SMTP??????????????????(%_D)...
! ! ! ! Emacs*XlwMenu.openURLsWith.labelString:	%_Open URLs With
! ! ! Emacs*XlwMenu.openURLsWith.labelString:		URL??????????????????(%_O)
! ! ! ! Emacs*XlwMenu.defaultEmacsMailer.labelString:	%_Default Emacs Mailer
! ! ! Emacs*XlwMenu.defaultEmacsMailer.labelString:	???????????????Emacs?????????(%_D)
! ! ! ! Emacs*XlwMenu.mH.labelString:	%_MH
! ! ! Emacs*XlwMenu.mH.labelString:	%_MH
! ! ! ! Emacs*XlwMenu.gNUS.labelString:	%_GNUS
! ! ! Emacs*XlwMenu.gNUS.labelString:	%_GNUS
! ! ! ! Emacs*XlwMenu.emacsW3.labelString:	%_Emacs-W3
! ! ! Emacs*XlwMenu.emacsW3.labelString:	%_Emacs-W3
! ! ! ! Emacs*XlwMenu.netscape.labelString:	%_Netscape
! ! ! Emacs*XlwMenu.netscape.labelString:	%_Netscape
! ! ! ! Emacs*XlwMenu.mosaic.labelString:	%_Mosaic
! ! ! Emacs*XlwMenu.mosaic.labelString:	%_Mosaic
! ! ! ! Emacs*XlwMenu.mosaicCCI.labelString:	Mosaic (%_CCI)
! ! ! Emacs*XlwMenu.mosaicCCI.labelString:	Mosaic (%_CCI)
! ! ! ! Emacs*XlwMenu.iXIMosaic.labelString:	%_IXI Mosaic
! ! ! Emacs*XlwMenu.iXIMosaic.labelString:	%_IXI Mosaic
! ! ! ! Emacs*XlwMenu.lynxXterm.labelString:	%_Lynx (xterm)
! ! ! Emacs*XlwMenu.lynxXterm.labelString:	%_Lynx (xterm)
! ! ! ! Emacs*XlwMenu.l_ynxXemacs.labelString:	L%_ynx (xemacs)
! ! ! Emacs*XlwMenu.l_ynxXemacs.labelString:	L%_ynx (xemacs)
! ! ! ! Emacs*XlwMenu.grail.labelString:	%_Grail
! ! ! Emacs*XlwMenu.grail.labelString:	%_Grail
! ! ! ! Emacs*XlwMenu.kfm.labelString:	%_Kfm
! ! ! Emacs*XlwMenu.kfm.labelString:		%_Kfm
! ! ! ! Emacs*XlwMenu.debugOnError.labelString:	%_Debug on Error
! ! ! Emacs*XlwMenu.debugOnError.labelString:	????????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.debugOnQuit.labelString:	Debug on %_Quit
! ! ! Emacs*XlwMenu.debugOnQuit.labelString:	?????????????????????(%_Q)
! ! ! ! Emacs*XlwMenu.debugOnS_ignal.labelString:	Debug on S%_ignal
! ! ! Emacs*XlwMenu.debugOnS_ignal.labelString:	???????????????????????????(%_I)
! ! ! ! Emacs*XlwMenu.stackTraceOnError.labelString:	%_Stack Trace on Error
! ! ! Emacs*XlwMenu.stackTraceOnError.labelString:	????????????????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.stackTraceOnSi_gnal.labelString:	Stack Trace on Si%_gnal
! ! ! Emacs*XlwMenu.stackTraceOnSi_gnal.labelString:	???????????????????????????????????????(%_G)
! ! ! ! Emacs*XlwMenu.scrollbars.labelString:	%_Scrollbars
! ! ! Emacs*XlwMenu.scrollbars.labelString:	?????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.wrapLongLines.labelString:	%_Wrap Long Lines
! ! ! Emacs*XlwMenu.wrapLongLines.labelString:	????????????????????????(%_W)
! ! ! ! Emacs*XlwMenu.3DModeline.labelString:	%_3D Modeline
! ! ! Emacs*XlwMenu.3DModeline.labelString:	3D??????????????????(%_3)
! ! ! ! Emacs*XlwMenu.modelineHorizontalScrolling.labelString:	Modeline %_Horizontal Scrolling
! ! ! Emacs*XlwMenu.modelineHorizontalScrolling.labelString:	??????????????????????????????????????????(%_H)
! ! ! ! Emacs*XlwMenu.toolbarsVisible.labelString:	%_Toolbars Visible
! ! ! Emacs*XlwMenu.toolbarsVisible.labelString:	????????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.toolbarsCa_ptioned.labelString:	Toolbars Ca%_ptioned
! ! ! Emacs*XlwMenu.toolbarsCa_ptioned.labelString:	??????????????????????????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.defaultToolba_rLocation.labelString:	Default Toolba%_r Location
! ! ! Emacs*XlwMenu.defaultToolba_rLocation.labelString:	???????????????????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.b_uffersTabVisible.labelString:	B%_uffers Tab Visible
! ! ! Emacs*XlwMenu.b_uffersTabVisible.labelString:	???????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.defaultGutterLocation.labelString:	Default %_Gutter Location
! ! ! Emacs*XlwMenu.defaultGutterLocation.labelString:	?????????????????????????????????(%_G)
! ! ! ! Emacs*XlwMenu.blinkingCursor.labelString:	%_Blinking Cursor
! ! ! Emacs*XlwMenu.blinkingCursor.labelString:	?????????????????????(%_B)
! ! ! ! Emacs*XlwMenu.bl_ockCursor.labelString:	Bl%_ock Cursor
! ! ! Emacs*XlwMenu.bl_ockCursor.labelString:	????????????????????????(%_O)
! ! ! ! Emacs*XlwMenu.barCursor1Pixel.labelString:	Bar Cursor (%_1 Pixel)
! ! ! Emacs*XlwMenu.barCursor1Pixel.labelString:	??????????????????(%_1????????????)
! ! ! ! Emacs*XlwMenu.barCursor2Pixels.labelString:	Bar Cursor (%_2 Pixels)
! ! ! Emacs*XlwMenu.barCursor2Pixels.labelString:	??????????????????(%_2????????????)
! ! ! ! Emacs*XlwMenu.pa_renHighlighting.labelString:	Pa%_ren Highlighting
! ! ! Emacs*XlwMenu.pa_renHighlighting.labelString:	?????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.lineNumbers.labelString:	%_Line Numbers
! ! ! Emacs*XlwMenu.lineNumbers.labelString:		?????????(%_L)
! ! ! ! Emacs*XlwMenu.columnNumbers.labelString:	%_Column Numbers
! ! ! Emacs*XlwMenu.columnNumbers.labelString:	???????????????(%_C)
! ! ! ! Emacs*XlwMenu.otherWindowLocation.labelString:	"Other %_Window" Location
! ! ! Emacs*XlwMenu.otherWindowLocation.labelString:	"?????????????????????"??????(%_W)
! ! ! ! Emacs*XlwMenu.none.labelString:	%_None
! ! ! Emacs*XlwMenu.none.labelString:	??????(%_N)
! ! ! ! Emacs*XlwMenu.asText.labelString:	As %_Text
! ! ! Emacs*XlwMenu.asText.labelString:	?????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.asScrollbar.labelString:	As %_Scrollbar
! ! ! Emacs*XlwMenu.asScrollbar.labelString:	??????????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.top.labelString:	%_Top
! ! ! Emacs*XlwMenu.top.labelString:	???(%_T)
! ! ! ! Emacs*XlwMenu.bottom.labelString:	%_Bottom
! ! ! Emacs*XlwMenu.bottom.labelString:	???(%_B)
! ! ! ! Emacs*XlwMenu.left.labelString:	%_Left
! ! ! Emacs*XlwMenu.left.labelString:		???(%_L)
! ! ! ! Emacs*XlwMenu.right.labelString:	%_Right
! ! ! Emacs*XlwMenu.right.labelString:	???(%_R)
! ! ! ! Emacs*XlwMenu.blinkingParen.labelString:	%_Blinking Paren
! ! ! Emacs*XlwMenu.blinkingParen.labelString:	???????????????(%_B)
! ! ! ! Emacs*XlwMenu.steadyParen.labelString:	%_Steady Paren
! ! ! Emacs*XlwMenu.steadyParen.labelString:		????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.expression.labelString:	%_Expression
! ! ! Emacs*XlwMenu.expression.labelString:	???(%_E)
! ! ! ! Emacs*XlwMenu.alwaysInSameFrame.labelString:	%_Always in Same Frame
! ! ! Emacs*XlwMenu.alwaysInSameFrame.labelString:	???????????????????????????(%_A)
! ! ! ! Emacs*XlwMenu.otherFrame2FramesMax.labelString:	Other Frame (%_2 Frames Max)
! ! ! Emacs*XlwMenu.otherFrame2FramesMax.labelString:	??????????????????(??????%_2????????????)
! ! ! ! Emacs*XlwMenu.otherFrame3FramesMax.labelString:	Other Frame (%_3 Frames Max)
! ! ! Emacs*XlwMenu.otherFrame3FramesMax.labelString:	??????????????????(??????%_3????????????)
! ! ! ! Emacs*XlwMenu.otherFrame4FramesMax.labelString:	Other Frame (%_4 Frames Max)
! ! ! Emacs*XlwMenu.otherFrame4FramesMax.labelString:	??????????????????(??????%_4????????????)
! ! ! ! Emacs*XlwMenu.otherFrame5FramesMax.labelString:	Other Frame (%_5 Frames Max)
! ! ! Emacs*XlwMenu.otherFrame5FramesMax.labelString:	??????????????????(??????(%_5????????????)
! ! ! ! Emacs*XlwMenu.alwaysCreateNewFrame.labelString:	Always Create %_New Frame
! ! ! Emacs*XlwMenu.alwaysCreateNewFrame.labelString:	?????????????????????????????????
! ! ! ! Emacs*XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	%_Temp Buffers Always in Same Frame
! ! ! Emacs*XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	????????????????????????????????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.tempBuffersLikeOtherBuffers.labelString:	Temp Buffers %_Like Other Buffers
! ! ! Emacs*XlwMenu.tempBuffersLikeOtherBuffers.labelString:	???????????????????????????????????????????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.makeCurrentFrameGnuservTarget.labelString:	%_Make Current Frame Gnuserv Target
! ! ! Emacs*XlwMenu.makeCurrentFrameGnuservTarget.labelString:	????????????????????????Gnuserv??????????????????(%_M)
! ! ! ! Emacs*XlwMenu.frameLocalFontMenu.labelString:	%_Frame-Local Font Menu
! ! ! Emacs*XlwMenu.frameLocalFontMenu.labelString:	???????????????????????????????????????????????????(%_F)
! ! ! ! Emacs*XlwMenu.altMetaSelectsMenuItems.labelString:	%_Alt/Meta Selects Menu Items
! ! ! Emacs*XlwMenu.altMetaSelectsMenuItems.labelString:	Alt/Meta????????????????????????????????????(%_A)
! ! ! ! Emacs*XlwMenu.buffersMenuLength___.labelString:	Buffers Menu %_Length...
! ! ! Emacs*XlwMenu.buffersMenuLength___.labelString:		?????????????????????????????????(%_L)...
! ! ! ! Emacs*XlwMenu.multiOperationBuffersSubMenus.labelString:	%_Multi-Operation Buffers Sub-Menus
! ! ! Emacs*XlwMenu.multiOperationBuffersSubMenus.labelString:	????????????????????????????????????????????????????????????(%_M)
! ! ! ! Emacs*XlwMenu.s_ubmenusForBufferGroups.labelString:	S%_ubmenus for Buffer Groups
! ! ! Emacs*XlwMenu.s_ubmenusForBufferGroups.labelString:	?????????????????????????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.verboseBufferMenuEntries.labelString:	%_Verbose Buffer Menu Entries
! ! ! Emacs*XlwMenu.verboseBufferMenuEntries.labelString:	??????????????????????????????????????????(%_V)
! ! ! ! Emacs*XlwMenu.buffersMenuSorting.labelString:	Buffers Menu %_Sorting
! ! ! Emacs*XlwMenu.buffersMenuSorting.labelString:	????????????????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.ignoreScaledFonts.labelString:	%_Ignore Scaled Fonts
! ! ! Emacs*XlwMenu.ignoreScaledFonts.labelString:	???????????????????????????(%_I)
! ! ! ! Emacs*XlwMenu.inThisBuffer.labelString:	%_In This Buffer
! ! ! Emacs*XlwMenu.inThisBuffer.labelString:	??????????????????(%_I)
! ! ! ! Emacs*XlwMenu.automatic.labelString:	%_Automatic
! ! ! Emacs*XlwMenu.automatic.labelString:	??????(%_A)
! ! ! ! Emacs*XlwMenu.forceRehighlightInThisBuffer.labelString:	Force %_Rehighlight in this Buffer
! ! ! Emacs*XlwMenu.forceRehighlightInThisBuffer.labelString:	????????????????????????????????????
! ! ! ! Emacs*XlwMenu.fonts.labelString:	%_Fonts
! ! ! Emacs*XlwMenu.fonts.labelString:	????????????(%_F)
! ! ! ! Emacs*XlwMenu.colors.labelString:	%_Colors
! ! ! Emacs*XlwMenu.colors.labelString:	?????????(%_C)
! ! ! ! Emacs*XlwMenu.1Least.labelString:	%_1 Least
! ! ! Emacs*XlwMenu.1Least.labelString:	%_1 ??????
! ! ! ! Emacs*XlwMenu.2More.labelString:	%_2 More
! ! ! Emacs*XlwMenu.2More.labelString:	%_2 ???????????????
! ! ! ! Emacs*XlwMenu.3EvenMore.labelString:	%_3 Even More
! ! ! Emacs*XlwMenu.3EvenMore.labelString:	%_3 ?????????
! ! ! ! Emacs*XlwMenu.4Most.labelString:	%_4 Most
! ! ! Emacs*XlwMenu.4Most.labelString:	%_4 ??????
! ! ! ! Emacs*XlwMenu.lazyLock.labelString:	Lazy %_Lock
! ! ! Emacs*XlwMenu.lazyLock.labelString:	?????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.lazyShot.labelString:	Lazy %_Shot
! ! ! Emacs*XlwMenu.lazyShot.labelString:	????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.cac_hing.labelString:	Cac%_hing
! ! ! Emacs*XlwMenu.cac_hing.labelString:	??????????????????(%_H)
! ! ! ! Emacs*XlwMenu.1Anagnostiko___Avantgarde.labelString:	%_1 Anagnostiko  ... Avantgarde
! ! ! Emacs*XlwMenu.1Anagnostiko___Avantgarde.labelString:	%_1 Anagnostiko  ... Avantgarde
! ! ! ! Emacs*XlwMenu.2Bookman___Chimera.labelString:	%_2 Bookman      ... Chimera
! ! ! Emacs*XlwMenu.2Bookman___Chimera.labelString:	%_2 Bookman      ... Chimera
! ! ! ! Emacs*XlwMenu.3Courier___Helvetica.labelString:	%_3 Courier      ... Helvetica
! ! ! Emacs*XlwMenu.3Courier___Helvetica.labelString:	%_3 Courier      ... Helvetica
! ! ! ! Emacs*XlwMenu.4Kathimerini___LuxiSans.labelString:	%_4 Kathimerini  ... Luxi Sans
! ! ! Emacs*XlwMenu.4Kathimerini___LuxiSans.labelString:	%_4 Kathimerini  ... Luxi Sans
! ! ! ! Emacs*XlwMenu.5LuxiSerif___Palatino.labelString:	%_5 Luxi Serif   ... Palatino
! ! ! Emacs*XlwMenu.5LuxiSerif___Palatino.labelString:	%_5 Luxi Serif   ... Palatino
! ! ! ! Emacs*XlwMenu.6PalladioL___Zysong18030.labelString:	%_6 Palladio L   ... Zysong18030
! ! ! Emacs*XlwMenu.6PalladioL___Zysong18030.labelString:	%_6 Palladio L   ... Zysong18030
! ! ! ! Emacs*XlwMenu.15.labelString:	%_1 5
! ! ! Emacs*XlwMenu.15.labelString:	%_1 5
! ! ! ! Emacs*XlwMenu.26.labelString:	%_2 6
! ! ! Emacs*XlwMenu.26.labelString:	%_2 6
! ! ! ! Emacs*XlwMenu.37.labelString:	%_3 7
! ! ! Emacs*XlwMenu.37.labelString:	%_3 7
! ! ! ! Emacs*XlwMenu.48.labelString:	%_4 8
! ! ! Emacs*XlwMenu.48.labelString:	%_4 8
! ! ! ! Emacs*XlwMenu.59.labelString:	%_5 9
! ! ! Emacs*XlwMenu.59.labelString:	%_5 9
! ! ! ! Emacs*XlwMenu.610.labelString:	%_6 10
! ! ! Emacs*XlwMenu.610.labelString:	%_6 10
! ! ! ! Emacs*XlwMenu.711.labelString:	%_7 11
! ! ! Emacs*XlwMenu.711.labelString:	%_7 11
! ! ! ! Emacs*XlwMenu.812.labelString:	%_8 12
! ! ! Emacs*XlwMenu.812.labelString:	%_8 12
! ! ! ! Emacs*XlwMenu.913.labelString:	%_9 13
! ! ! Emacs*XlwMenu.913.labelString:	%_9 13
! ! ! ! Emacs*XlwMenu.014.labelString:	%_0 14
! ! ! Emacs*XlwMenu.014.labelString:	%_0 14
! ! ! ! Emacs*XlwMenu.a15.labelString:	%_a 15
! ! ! Emacs*XlwMenu.a15.labelString:	%_a 15
! ! ! ! Emacs*XlwMenu.b16.labelString:	%_b 16
! ! ! Emacs*XlwMenu.b16.labelString:	%_b 16
! ! ! ! Emacs*XlwMenu.c17.labelString:	%_c 17
! ! ! Emacs*XlwMenu.c17.labelString:	%_c 17
! ! ! ! Emacs*XlwMenu.d18.labelString:	%_d 18
! ! ! Emacs*XlwMenu.d18.labelString:	%_d 18
! ! ! ! Emacs*XlwMenu.e19.labelString:	%_e 19
! ! ! Emacs*XlwMenu.e19.labelString:	%_e 19
! ! ! ! Emacs*XlwMenu.f20.labelString:	%_f 20
! ! ! Emacs*XlwMenu.f20.labelString:	%_f 20
! ! ! ! Emacs*XlwMenu.g23.labelString:	%_g 23
! ! ! Emacs*XlwMenu.g23.labelString:	%_g 23
! ! ! ! Emacs*XlwMenu.h24.labelString:	%_h 24
! ! ! Emacs*XlwMenu.h24.labelString:	%_h 24
! ! ! ! Emacs*XlwMenu.goToPreviousBuffer.labelString:	Go To %_Previous Buffer
! ! ! Emacs*XlwMenu.goToPreviousBuffer.labelString:	???????????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.goToBuffer___.labelString:	Go To %_Buffer...
! ! ! Emacs*XlwMenu.goToBuffer___.labelString:	?????????????????????(%_B)...
! ! ! ! Emacs*XlwMenu.listAllBuffers.labelString:	%_List All Buffers
! ! ! Emacs*XlwMenu.listAllBuffers.labelString:	???????????????????????????????????????(%_L)
! ! ! ! Emacs*XlwMenu.deleteBuffer.labelString:	%_Delete Buffer
! ! ! Emacs*XlwMenu.deleteBuffer.labelString:	?????????????????????(%_D)
! ! ! ! Emacs*XlwMenu..labelString:	%_
! ! ! Emacs*XlwMenu..labelString:	%_
! ! ! ! Emacs*XlwMenu.evaluateRegionOrDefun.labelString:	%_Evaluate Region or Defun
! ! ! Emacs*XlwMenu.evaluateRegionOrDefun.labelString:	??????????????????defun?????????(%_E)
! ! ! ! Emacs*XlwMenu.evaluateWholeBuffer.labelString:	Evaluate %_Whole Buffer
! ! ! Emacs*XlwMenu.evaluateWholeBuffer.labelString:		???????????????????????????(%_W)
! ! ! ! Emacs*XlwMenu.evaluateLastSExpression.labelString:	Evaluate Last %_S-expression
! ! ! Emacs*XlwMenu.evaluateLastSExpression.labelString:	?????????S????????????(%_S)
! ! ! ! Emacs*XlwMenu.findFunction___.labelString:	Find %_Function...
! ! ! Emacs*XlwMenu.findFunction___.labelString:	???????????????(%_F)...
! ! ! ! Emacs*XlwMenu.findVariable___.labelString:	Find %_Variable...
! ! ! Emacs*XlwMenu.findVariable___.labelString:	???????????????(%_V)...
! ! ! ! Emacs*XlwMenu.helpOnFunction___.labelString:	%_Help on Function...
! ! ! Emacs*XlwMenu.helpOnFunction___.labelString:	????????????????????????(%_H)...
! ! ! ! Emacs*XlwMenu.hel_pOnVariable___.labelString:	Hel%_p on Variable...
! ! ! Emacs*XlwMenu.hel_pOnVariable___.labelString:	????????????????????????(%_P)...
! ! ! ! Emacs*XlwMenu.instrumentThisDefunForDebugging.labelString:	Instrument This Defun for %_Debugging
! ! ! Emacs*XlwMenu.instrumentThisDefunForDebugging.labelString:	??????defun????????????????????????(%_D)
! ! ! ! Emacs*XlwMenu.traceFunction___.labelString:	%_Trace Function...
! ! ! Emacs*XlwMenu.traceFunction___.labelString:	?????????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.untraceAllFunctions.labelString:	%_Untrace All Functions
! ! ! Emacs*XlwMenu.untraceAllFunctions.labelString:	?????????????????????????????????????????????(%_U)
! ! ! ! Emacs*XlwMenu.commentOutRegion.labelString:	%_Comment Out Region
! ! ! Emacs*XlwMenu.commentOutRegion.labelString:	???????????????????????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.indentRegionOrBalancedExpression.labelString:	%_Indent Region or Balanced Expression
! ! ! Emacs*XlwMenu.indentRegionOrBalancedExpression.labelString:	?????????????????????????????????(%_I)
! ! ! ! Emacs*XlwMenu.i_ndentDefun.labelString:	I%_ndent Defun
! ! ! Emacs*XlwMenu.i_ndentDefun.labelString:	defun??????????????????(%_N)
! ! ! ! Emacs*XlwMenu.lookForDebugOnErrorUnderOptionsTroubleshooting.labelString:	Look for debug-on-error under Options->Troubleshooting
! ! ! Emacs*XlwMenu.lookForDebugOnErrorUnderOptionsTroubleshooting.labelString:	[???????????????]-[?????????????????????????????????]???[????????????????????????]???????????????????????????
! ! ! ! Emacs*XlwMenu.aboutXEmacs___.labelString:	%_About XEmacs...
! ! ! Emacs*XlwMenu.aboutXEmacs___.labelString:	XEmacs????????????(%_A)...
! ! ! ! Emacs*XlwMenu.whatSNewInXEmacs.labelString:	What's %_New in XEmacs
! ! ! Emacs*XlwMenu.whatSNewInXEmacs.labelString:	XEmacs????????????(%_N)
! ! ! ! Emacs*XlwMenu.obtainingXEmacs.labelString:	%_Obtaining XEmacs
! ! ! Emacs*XlwMenu.obtainingXEmacs.labelString:	XEmacs?????????????????????(%_O)
! ! ! ! Emacs*XlwMenu.infoOnlineDocs.labelString:	%_Info (Online Docs)
! ! ! Emacs*XlwMenu.infoOnlineDocs.labelString:	%_Info (???????????????doc)
! ! ! ! Emacs*XlwMenu.xEmacsFAQ.labelString:	XEmacs %_FAQ
! ! ! Emacs*XlwMenu.xEmacsFAQ.labelString:	XEmacs %_FAQ
! ! ! ! Emacs*XlwMenu.tutorials.labelString:	%_Tutorials
! ! ! Emacs*XlwMenu.tutorials.labelString:	?????????????????????(%_T)
! ! ! ! Emacs*XlwMenu.samples.labelString:	%_Samples
! ! ! Emacs*XlwMenu.samples.labelString:	????????????(%_S)
! ! ! ! Emacs*XlwMenu.commandsKeys.labelString:	%_Commands & Keys
! ! ! Emacs*XlwMenu.commandsKeys.labelString:	?????????????????????(%_C)
! ! ! ! Emacs*XlwMenu.recentMessages.labelString:	%_Recent Messages
! ! ! Emacs*XlwMenu.recentMessages.labelString:	????????????????????????(%_R)
! ! ! ! Emacs*XlwMenu.misc.labelString:	%_Misc
! ! ! Emacs*XlwMenu.misc.labelString:	?????????(%_M)
! ! ! ! Emacs*XlwMenu.sendBugReport___.labelString:	Send %_Bug Report...
! ! ! Emacs*XlwMenu.sendBugReport___.labelString:	???????????????????????????(%_B)...
! ! ! ! Emacs*XlwMenu.infoContents.labelString:	%_Info Contents
! ! ! Emacs*XlwMenu.infoContents.labelString:	Info???????????????(%_I)
! ! ! ! Emacs*XlwMenu.lookupKeyBinding___.labelString:	Lookup %_Key Binding...
! ! ! Emacs*XlwMenu.lookupKeyBinding___.labelString:	?????????????????????????????????(%_K)...
! ! ! ! Emacs*XlwMenu.lookupCommand___.labelString:	Lookup %_Command...
! ! ! Emacs*XlwMenu.lookupCommand___.labelString:	??????????????????(%_C)...
! ! ! ! Emacs*XlwMenu.lookupFunction___.labelString:	Lookup %_Function...
! ! ! Emacs*XlwMenu.lookupFunction___.labelString:	????????????(%_F)...
! ! ! ! Emacs*XlwMenu.lookupTopic___.labelString:	Lookup %_Topic...
! ! ! Emacs*XlwMenu.lookupTopic___.labelString:	??????????????????(%_T)...
! ! ! ! Emacs*XlwMenu.fAQLocal.labelString:	%_FAQ (local)
! ! ! Emacs*XlwMenu.fAQLocal.labelString:	%_FAQ (????????????)
! ! ! ! Emacs*XlwMenu.fAQViaWWW.labelString:	FAQ via %_WWW
! ! ! Emacs*XlwMenu.fAQViaWWW.labelString:	WWW??????FAQ(%_W)
! ! ! ! Emacs*XlwMenu.homePage.labelString:	%_Home Page
! ! ! Emacs*XlwMenu.homePage.labelString:	??????????????????(%_H)
! ! ! ! Emacs*XlwMenu.defaultJapanese.labelString:	%_Default (Japanese)
! ! ! Emacs*XlwMenu.defaultJapanese.labelString:	???????????????(%_D) (?????????)
! ! ! ! Emacs*XlwMenu.1ThaiXTIS.labelString:	%_1 Thai-XTIS
! ! ! Emacs*XlwMenu.1ThaiXTIS.labelString:	%_1 ?????????-XTIS
! ! ! ! Emacs*XlwMenu.2Korean.labelString:	%_2 Korean
! ! ! Emacs*XlwMenu.2Korean.labelString:	%_2 ?????????
! ! ! ! Emacs*XlwMenu.3Slovenian.labelString:	%_3 Slovenian
! ! ! Emacs*XlwMenu.3Slovenian.labelString:	%_3 ??????????????????
! ! ! ! Emacs*XlwMenu.4German.labelString:	%_4 German
! ! ! Emacs*XlwMenu.4German.labelString:	%_4 ????????????
! ! ! ! Emacs*XlwMenu.5Czech.labelString:	%_5 Czech
! ! ! Emacs*XlwMenu.5Czech.labelString:	%_5 ????????????
! ! ! ! Emacs*XlwMenu.6Romanian.labelString:	%_6 Romanian
! ! ! Emacs*XlwMenu.6Romanian.labelString:	%_6 ??????????????????
! ! ! ! Emacs*XlwMenu.7Polish.labelString:	%_7 Polish
! ! ! Emacs*XlwMenu.7Polish.labelString:	%_7 ??????????????????
! ! ! ! Emacs*XlwMenu.8Croatian.labelString:	%_8 Croatian
! ! ! Emacs*XlwMenu.8Croatian.labelString:	%_8 ??????????????????
! ! ! ! Emacs*XlwMenu.9Norwegian.labelString:	%_9 Norwegian
! ! ! Emacs*XlwMenu.9Norwegian.labelString:	%_9 ??????????????????
! ! ! ! Emacs*XlwMenu.0French.labelString:	%_0 French
! ! ! Emacs*XlwMenu.0French.labelString:	%_0 ???????????????
! ! ! ! Emacs*XlwMenu.aEnglish.labelString:	%_a English
! ! ! Emacs*XlwMenu.aEnglish.labelString:	%_a ??????
! ! ! ! Emacs*XlwMenu.bCyrillicALT.labelString:	%_b Cyrillic-ALT
! ! ! Emacs*XlwMenu.bCyrillicALT.labelString:	%_b ???????????????-ALT
! ! ! ! Emacs*XlwMenu.cCyrillicWin.labelString:	%_c Cyrillic-Win
! ! ! Emacs*XlwMenu.cCyrillicWin.labelString: %_c ???????????????-Win
! ! ! ! Emacs*XlwMenu.dCyrillicKOI8.labelString:	%_d Cyrillic-KOI8
! ! ! Emacs*XlwMenu.dCyrillicKOI8.labelString: %_d ???????????????-KOI8
! ! ! ! Emacs*XlwMenu.eCyrillicISO.labelString:	%_e Cyrillic-ISO
! ! ! Emacs*XlwMenu.eCyrillicISO.labelString: %_d ???????????????-ISO
! ! ! ! Emacs*XlwMenu.sampleInit_el.labelString:	Sample %_init.el
! ! ! Emacs*XlwMenu.sampleInit_el.labelString:	????????????init.el(%_I)
! ! ! ! Emacs*XlwMenu.sample__Xdefaults.labelString:	Sample .%_Xdefaults
! ! ! Emacs*XlwMenu.sample__Xdefaults.labelString:	????????????.Xdefaults(%_X)
! ! ! ! Emacs*XlwMenu.sampleEnriched.labelString:	Sample %_enriched
! ! ! Emacs*XlwMenu.sampleEnriched.labelString:	????????????enriched(%_E)
! ! ! ! Emacs*XlwMenu.mode.labelString:	%_Mode
! ! ! Emacs*XlwMenu.mode.labelString:	?????????(%_M)
! ! ! ! Emacs*XlwMenu.aproposDocs___.labelString:	Apropos %_Docs...
! ! ! Emacs*XlwMenu.aproposDocs___.labelString:	Apropos??????????????????(%_D)...
! ! ! ! Emacs*XlwMenu.key___.labelString:	%_Key...
! ! ! Emacs*XlwMenu.key___.labelString:	??????(%_I)...
! ! ! ! Emacs*XlwMenu.bindings.labelString:	%_Bindings
! ! ! Emacs*XlwMenu.bindings.labelString:	?????????????????????(%_B)
! ! ! ! Emacs*XlwMenu.mouseBindings.labelString:	%_Mouse Bindings
! ! ! Emacs*XlwMenu.mouseBindings.labelString:	??????????????????????????????(%_M)
! ! ! ! Emacs*XlwMenu.recentKeys.labelString:	%_Recent Keys
! ! ! Emacs*XlwMenu.recentKeys.labelString:	???????????????(%_R)
! ! ! ! Emacs*XlwMenu.function___.labelString:	%_Function...
! ! ! Emacs*XlwMenu.function___.labelString:	??????(%_F)...
! ! ! ! Emacs*XlwMenu.variable___.labelString:	%_Variable...
! ! ! Emacs*XlwMenu.variable___.labelString:	??????(%_V)...
! ! ! ! Emacs*XlwMenu.locateCommand___.labelString:	%_Locate Command...
! ! ! Emacs*XlwMenu.locateCommand___.labelString:	???????????????locate(%_L)...
! ! ! ! Emacs*XlwMenu.currentInstallationInfo.labelString:	%_Current Installation Info
! ! ! Emacs*XlwMenu.currentInstallationInfo.labelString:	????????????????????????????????????Info(%_C)
! ! ! ! Emacs*XlwMenu.noWarranty.labelString:	%_No Warranty
! ! ! Emacs*XlwMenu.noWarranty.labelString:	?????????(%_N)
! ! ! ! Emacs*XlwMenu.xEmacsLicense.labelString:	XEmacs %_License
! ! ! Emacs*XlwMenu.xEmacsLicense.labelString:	XEmacs???????????????(%_L)
! ! ! ! Emacs*XlwMenu.findPackages.labelString:	Find %_Packages
! ! ! Emacs*XlwMenu.findPackages.labelString:	?????????????????????(%_P)
! ! ! ! Emacs*XlwMenu.viewSplashScreen.labelString:	View %_Splash Screen
! ! ! Emacs*XlwMenu.viewSplashScreen.labelString:	??????????????????????????????????????????(%_S)
! ! ! ! Emacs*XlwMenu.unixManual___.labelString:	%_Unix Manual...
! ! ! Emacs*XlwMenu.unixManual___.labelString:	Unix???????????????(%_U)...


--- NEW FILE Emacs.ad.ja_JP.eucJP ---
! XEmacs 21.x ???????????????????????????? (????????????)
!
!              MATSUBAYASHI 'Shaolin' Kohji (shaolin at rins.st.ryukoku.ac.jp)
!              Yukihiro Nakai <ynakai at redhat.com>
!                                   Time-stamp: <03/10/17 21:51:24 petersen>
!
!
! This is the app-defaults file for XEmacs.
!
! This used to be identical to sample.Xdefaults, but the resources
! below have been rewritten to be as general as possible to avoid
! overriding user resources.  Other than the form rewriting, both
! files should be kept in sync. 
! 
! The resources below are loaded into the XEmacs executable at compile-time:
! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
! effect.
! 
! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
! (or whatever the standard app-defaults directory is at your site) to cause
! it to be consulted at run-time.  (Do this only for site-wide customizations:
! personal customizations should be put into ~/.Xdefaults instead.)
! Note that the file must be named Emacs, not XEmacs.
! 
! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of
! the various resources and the syntax for setting them.
! 
! Energize users: note that this is not the same app-defaults file that is
! used with the Energize-specific version of XEmacs.


! Colors and backgrounds.
! ======================
! The contrasts of these colors will cause them to map to the appropriate
! one of "black" or "white" on monochrome systems.
! 
! The valid color names on your system can be found by looking in the file
! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/.

! ! Set the modeline colors.
! Emacs.modeline*attributeForeground:	Black
! Emacs.modeline*attributeBackground:	Gray75

! ! Set the color of the text cursor.
! Emacs.text-cursor*attributeBackground:	Red3

! If you want to set the color of the mouse pointer, do this:
! Emacs.pointer*attributeForeground:	Black
! If you want to set the background of the mouse pointer, do this:
! Emacs.pointer*attributeBackground:	White
! Note that by default, the pointer foreground and background are the same
! as the default face.

! Set the menubar colors.  This overrides the default foreground and
! background colors specified above.
*menubar*Foreground:			Gray30
*menubar*Background:			Gray80
! This is for buttons in the menubar.  
! Yellow would be better, but that would map to white on monochrome.
*menubar*buttonForeground:		Blue
*XlwMenu*highlightForeground:		Red
*XlwMenu*titleForeground:		Maroon
*XlwMenu*selectColor:			ForestGreen
*XmToggleButton*selectColor:		ForestGreen

! Specify the colors of popup menus.
*popup*Foreground:			Black
*popup*Background:			Gray80

! Specify the colors of the various sub-widgets of the dialog boxes.
*dialog*Foreground:			Black
! #A5C0C1 is a shade of blue
*dialog*Background:			#A5C0C1
! The following three are for Motif dialog boxes ...
*dialog*XmTextField*Background:		WhiteSmoke
*dialog*XmText*Background:		WhiteSmoke
*dialog*XmList*Background:		WhiteSmoke
! While this one is for Athena dialog boxes.
*dialog*Command*Background:		WhiteSmoke

! Xlw Scrollbar colors
*XlwScrollBar*Foreground:		Gray30
*XlwScrollBar*Background:		Gray80
*XmScrollBar*Foreground:		Gray30
*XmScrollBar*Background:		Gray80

!
! The Lucid Scrollbar supports two added resources, SliderStyle is either
! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
! of the slider that depresses when the slider is clicked on.  ArrowPosition is
! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
! of the scrollbar, same puts both arrows at the same end, like the Amiga.
!
Emacs*XlwScrollBar.SliderStyle:    dimple
! Emacs*XlwScrollBar.ArrowPosition:  opposite

!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

! *topToolBarShadowColor:		Gray90
! *bottomToolBarShadowColor:		Gray40
! *backgroundToolBarColor:		Gray80
! *toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
Emacs.default.attributeFont:  -misc-fixed-medium-r-*-*-14-*-*-*-*-*-*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
*menubar*Font: 			-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*popup*Font:			-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*

! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:	-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*XmTextField*FontList:		-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*XmText*FontList:		-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*
*XmList*FontList:		-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField*translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton*translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! XIM fontset (defaults to system fontset default)
! *EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
!    Japanese localization resources for XEmacs.
! @(#)Emacs	1.3 96/09/22
!    Copyright (C) 1996 Sun Microsystems, Inc.
!!
! This file is part of XEmacs.
! 
! XEmacs is free software; you can redistribute it and/or modify it
! under the terms of the GNU General Public License as published by the
! Free Software Foundation; either version 2, or (at your option) any
! later version.
! XEmacs 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 XEmacs; see the file COPYING.  If not, write to the
! Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! Boston, MA 02111-1307, USA.
! Copyright (C) 1996 Sun Microsystems Inc.
!
! Japanese Resources to be placed in etc/app-defaults/ja/Emacs
! for xemacs-mule.  It is same on another languages such like fr,
! if you want to have French menu label, place it on
! etc/app-defaults/fr/Emacs.

! Pulldown menu internationalization.  The first line of the file
! "*XlwMenu.resourceLabels: True" has to be there to make sure
! all the labelString will be read and displayed by X.
*XlwMenu.resourceLabels: True

! CDE doesn't require this but OpenWindows does.
! Note that this `gothic' font family is effective just for Japanese.
! And fontList is just used under Motif menubar.
*fontList: -misc-fixed-medium-r-normal--14-*:
!! FontSet for menus when you use --with-xfs or --with-xim=xlib.
*fontSet: -*-fixed-medium-r-normal--14-*

! Starting below here are menu label string which can be translated to
! different languages. 
! Example: *XlwMenu.file.labelString: File  
! Characters before the ":" sign, "Example: *XlwMenu.file.labelString"
! can not be changed. They must stay exactly the way they are.
! The only string to be translated is the string, "File".
! Some resource names such as "file", "quit" have been used in several
! places.  However, each of them only has to be translated once in this X
! resource file.
! Emacs*XlwMenu.file.labelString:	%_File
Emacs*XlwMenu.file.labelString:		????????(%_F)
! Emacs*XlwMenu.edit.labelString:	%_Edit
Emacs*XlwMenu.edit.labelString:		????(%_E)
! Emacs*XlwMenu.view.labelString:	%_View
Emacs*XlwMenu.view.labelString:		????(%_V)
! Emacs*XlwMenu.c_mds.labelString:	C%_mds
Emacs*XlwMenu.c_mds.labelString:	????????(%_M)
! Emacs*XlwMenu.tools.labelString:	%_Tools
Emacs*XlwMenu.tools.labelString:	??????(%_T)
! Emacs*XlwMenu.options.labelString:	%_Options
Emacs*XlwMenu.options.labelString:	??????????(%_O)
! Emacs*XlwMenu.buffers.labelString:	%_Buffers
Emacs*XlwMenu.buffers.labelString:	????????(%_B)
! Emacs*XlwMenu.help.labelString:	%_Help
Emacs*XlwMenu.help.labelString:		??????(%_H)
! Emacs*XlwMenu.lisp.labelString:	%_Lisp
Emacs*XlwMenu.lisp.labelString:		%_Lisp
! Emacs*XlwMenu.open___.labelString:	%_Open...
Emacs*XlwMenu.open___.labelString:	????(%_O)...
! Emacs*XlwMenu.openInOtherWindow___.labelString:	Open in Other %_Window...
Emacs*XlwMenu.openInOtherWindow___.labelString:		????????????????????(%_W)...
! Emacs*XlwMenu.openInNewFrame___.labelString:	Open in New %_Frame...
Emacs*XlwMenu.openInNewFrame___.labelString:	????????????????????(%_F)...
! Emacs*XlwMenu.hexEditFile___.labelString:	%_Hex Edit File...
Emacs*XlwMenu.hexEditFile___.labelString:	16????????????(%_H)...
! Emacs*XlwMenu.insertFile___.labelString:	%_Insert File...
Emacs*XlwMenu.insertFile___.labelString:	??????????????(%_I)...
! Emacs*XlwMenu.viewFile___.labelString:	%_View File...
Emacs*XlwMenu.viewFile___.labelString:		??????????????(%_V)...
! Emacs*XlwMenu.save.labelString:	%_Save
Emacs*XlwMenu.save.labelString:		????(%_S)
! Emacs*XlwMenu.saveAs___.labelString:	Save %_As...
Emacs*XlwMenu.saveAs___.labelString:	??????????(%_A)...
! Emacs*XlwMenu.saveSo_meBuffers.labelString:	Save So%_me Buffers
Emacs*XlwMenu.saveSo_meBuffers.labelString:	????????????????????(%_M)
! Emacs*XlwMenu.print.labelString:	%_Print
Emacs*XlwMenu.print.labelString:	????(%_P)
! Emacs*XlwMenu.prett_yPrint.labelString:	Prett%_y-Print
Emacs*XlwMenu.prett_yPrint.labelString:		????????(%_Y)
! Emacs*XlwMenu.revertBuffer.labelString:	%_Revert Buffer
Emacs*XlwMenu.revertBuffer.labelString:		????????????(%_R)
! Emacs*XlwMenu.re_coverFile___.labelString:	Re%_cover File...
Emacs*XlwMenu.re_coverFile___.labelString:	????????????(%_C)...
! Emacs*XlwMenu.recoverS_ession___.labelString:	Recover S%_ession...
Emacs*XlwMenu.recoverS_ession___.labelString:	????????????????(%_S)...
! Emacs*XlwMenu.e_xitXEmacs.labelString:	E%_xit XEmacs
Emacs*XlwMenu.e_xitXEmacs.labelString:		XEmacs??????(%_X)
! Emacs*XlwMenu.undo.labelString:	%_Undo
Emacs*XlwMenu.undo.labelString:		????????(%_U)
! Emacs*XlwMenu.cu_t.labelString:	Cu%_t
Emacs*XlwMenu.cu_t.labelString:		????????(%_T)
! Emacs*XlwMenu.copy.labelString:	%_Copy
Emacs*XlwMenu.copy.labelString:		??????(%_C)
! Emacs*XlwMenu.paste.labelString:	%_Paste
Emacs*XlwMenu.paste.labelString:	????????(%_P)
! Emacs*XlwMenu.delete.labelString:	%_Delete
Emacs*XlwMenu.delete.labelString:	????(%_D)
! Emacs*XlwMenu.selectAll.labelString:	Select %_All
Emacs*XlwMenu.selectAll.labelString:	????????????(%_A)
! Emacs*XlwMenu.selectPa_ge.labelString:	Select Pa%_ge
Emacs*XlwMenu.selectPa_ge.labelString:	????????????(%_G)
! Emacs*XlwMenu.find___.labelString:	%_Find...
Emacs*XlwMenu.find___.labelString:	????(%_F)...
! Emacs*XlwMenu.r_eplace___.labelString:	R%_eplace...
Emacs*XlwMenu.r_eplace___.labelString:		????(%_E)...
! Emacs*XlwMenu.replaceRege_xp___.labelString:	Replace (Rege%_xp)...
Emacs*XlwMenu.replaceRege_xp___.labelString:	???? (????????)(%_X)...
! Emacs*XlwMenu.listMatchingLines___.labelString:	%_List Matching Lines...
Emacs*XlwMenu.listMatchingLines___.labelString:		????????????????(%_L)...
! Emacs*XlwMenu.multilingualMule.labelString:	%_Multilingual ("Mule")
Emacs*XlwMenu.multilingualMule.labelString:	??????(%_M) ("Mule")
! Emacs*XlwMenu.t_oggleInputMethod.labelString:	T%_oggle Input Method
Emacs*XlwMenu.t_oggleInputMethod.labelString:	????????????????????(%_O)
! Emacs*XlwMenu.selectInputMethod.labelString:	Select %_Input Method
Emacs*XlwMenu.selectInputMethod.labelString:	??????????????????(%_I)
! Emacs*XlwMenu.d_escribeInputMethod.labelString:	D%_escribe Input Method
Emacs*XlwMenu.d_escribeInputMethod.labelString:	??????????????????(%_E)
! Emacs*XlwMenu.describeCurrentCodingSystems.labelString:	Describe Current %_Coding Systems
Emacs*XlwMenu.describeCurrentCodingSystems.labelString:		????????????????????????????????(%_C)
! Emacs*XlwMenu.setCodingSystemOfBufferFile___.labelString:	Set Coding System of %_Buffer File...
Emacs*XlwMenu.setCodingSystemOfBufferFile___.labelString:	??????????????????????????????????????????????(%_B)...
! Emacs*XlwMenu.setCodingSystemOfTerminal___.labelString:	Set Coding System of %_Terminal...
Emacs*XlwMenu.setCodingSystemOfTerminal___.labelString:		????????????????????????????????????????(%_T)...
! Emacs*XlwMenu.setCodingSystemOfKeyboard___.labelString:	Set Coding System of %_Keyboard...
Emacs*XlwMenu.setCodingSystemOfKeyboard___.labelString:		????????????????????????????????????????(%_K)...
! Emacs*XlwMenu.setCodingSystemOfProcess___.labelString:	Set Coding System of %_Process...
Emacs*XlwMenu.setCodingSystemOfProcess___.labelString:		??????????????????????????????????????(%_P)...
! Emacs*XlwMenu.showCha_racterTable.labelString:	Show Cha%_racter Table
Emacs*XlwMenu.showCha_racterTable.labelString:		????????????????????????(%_R)
! Emacs*XlwMenu.showDia_gnosisForMULE.labelString:	Show Dia%_gnosis for MULE
Emacs*XlwMenu.showDia_gnosisForMULE.labelString:	MULE????????????(%_G)
! Emacs*XlwMenu.showHelloInManyLanguages.labelString:	Show "%_hello" in Many Languages
Emacs*XlwMenu.showHelloInManyLanguages.labelString:	????????"Hello"??????(%_H)
! Emacs*XlwMenu.newFrame.labelString:	%_New Frame
Emacs*XlwMenu.newFrame.labelString:			????????????(%_N)
! Emacs*XlwMenu.frameOnOtherDispla_y___.labelString:	Frame on Other Displa%_y...
Emacs*XlwMenu.frameOnOtherDispla_y___.labelString:	??????????????????????????(%_Y)...
! Emacs*XlwMenu.deleteFrame.labelString:	%_Delete Frame
Emacs*XlwMenu.deleteFrame.labelString:		??????????????(%_D)
! Emacs*XlwMenu.splitWindow.labelString:	%_Split Window
Emacs*XlwMenu.splitWindow.labelString:		????????????????(%_S)
! Emacs*XlwMenu.s_plitWindowSideBySide.labelString:	S%_plit Window (Side by Side)
Emacs*XlwMenu.s_plitWindowSideBySide.labelString:	????????????????(??)(%_P)
! Emacs*XlwMenu.unSplitKeepThis.labelString:	%_Un-Split (Keep This)
Emacs*XlwMenu.unSplitKeepThis.labelString:	??????????????(%_U) (??????????)
! Emacs*XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep %_Others)
Emacs*XlwMenu.unSplitKeepOthers.labelString:	??????????????(%_O) (????????)
! Emacs*XlwMenu.n_arrow.labelString:	N%_arrow
Emacs*XlwMenu.n_arrow.labelString:	N%_arrow
! Emacs*XlwMenu.showMessageLog.labelString:	Show Message %_Log
Emacs*XlwMenu.showMessageLog.labelString:	????????????????????(%_L)
! Emacs*XlwMenu.gotoLine___.labelString:	%_Goto Line...
Emacs*XlwMenu.gotoLine___.labelString:		????????(%_G)...
! Emacs*XlwMenu.whatLine.labelString:	%_What Line
Emacs*XlwMenu.whatLine.labelString:	??????????(%_W)
! Emacs*XlwMenu.bookmarks.labelString:	%_Bookmarks
Emacs*XlwMenu.bookmarks.labelString:	????????????(%_B)
! Emacs*XlwMenu.jumpToPreviousMark.labelString:	%_Jump to Previous Mark
Emacs*XlwMenu.jumpToPreviousMark.labelString:	????????????????(%_J)
! Emacs*XlwMenu.narrowToRegion.labelString:	%_Narrow to Region
Emacs*XlwMenu.narrowToRegion.labelString:	%_Narrow to Region
! Emacs*XlwMenu.narrowToPage.labelString:	Narrow to %_Page
Emacs*XlwMenu.narrowToPage.labelString:		Narrow to %_Page
! Emacs*XlwMenu.narrowToDefun.labelString:	Narrow to %_Defun
Emacs*XlwMenu.narrowToDefun.labelString:	Narrow to %_Defun
! Emacs*XlwMenu.widen.labelString:	%_Widen
Emacs*XlwMenu.widen.labelString:	%_Widen
! Emacs*XlwMenu.jumpToBookmark.labelString:	%_Jump to Bookmark
Emacs*XlwMenu.jumpToBookmark.labelString:	??????????????????(%_J)
! Emacs*XlwMenu.setBookmark.labelString:	Set %_Bookmark
Emacs*XlwMenu.setBookmark.labelString:		??????????????????(%_B)
! Emacs*XlwMenu.insertContents.labelString:	Insert %_Contents
Emacs*XlwMenu.insertContents.labelString:	????????????????(%_C)
! Emacs*XlwMenu.insertL_ocation.labelString:	Insert L%_ocation
Emacs*XlwMenu.insertL_ocation.labelString:	??????????(%_L)
! Emacs*XlwMenu.renameBookmark.labelString:	%_Rename Bookmark
Emacs*XlwMenu.renameBookmark.labelString:	??????????????????????(%_R)
! Emacs*XlwMenu.deleteBookmark.labelString:	%_Delete Bookmark
Emacs*XlwMenu.deleteBookmark.labelString:	??????????????????(%_D)
! Emacs*XlwMenu.editBookmarkList.labelString:	%_Edit Bookmark List
Emacs*XlwMenu.editBookmarkList.labelString:	????????????????????????(%_E)
! Emacs*XlwMenu.saveBookmarks.labelString:	%_Save Bookmarks
Emacs*XlwMenu.saveBookmarks.labelString:	??????????????????(%_S)
! Emacs*XlwMenu.saveBookmarksAs___.labelString:	Save Bookmarks %_As...
Emacs*XlwMenu.saveBookmarksAs___.labelString:	????????????????????????(%_A)...
! Emacs*XlwMenu.loadABookmarkFile.labelString:	%_Load a Bookmark File
Emacs*XlwMenu.loadABookmarkFile.labelString:	??????????????????????????????(%_L)
! Emacs*XlwMenu.repeatLastComplexCommand___.labelString:	Repeat %_Last Complex Command...
Emacs*XlwMenu.repeatLastComplexCommand___.labelString:	????????????????????????????(%_L)
! Emacs*XlwMenu.e_valuateLispExpression___.labelString:	E%_valuate Lisp Expression...
Emacs*XlwMenu.e_valuateLispExpression___.labelString:	Lisp?????????????? (%_V)
! Emacs*XlwMenu.executeNamedCommand___.labelString:	Execute %_Named Command...
Emacs*XlwMenu.executeNamedCommand___.labelString:	??????????????????????(%_N)
! Emacs*XlwMenu.startMacroRecording.labelString:	Start %_Macro Recording
Emacs*XlwMenu.startMacroRecording.labelString:		????????????????(%_M)
! Emacs*XlwMenu.e_xecuteLastMacro.labelString:	E%_xecute Last Macro
Emacs*XlwMenu.e_xecuteLastMacro.labelString:	?????????????????? (%_X)
! Emacs*XlwMenu.otherMacro.labelString:	%_Other Macro
Emacs*XlwMenu.otherMacro.labelString:	????????????????(%_O)
! Emacs*XlwMenu.abbrev.labelString:	%_Abbrev
Emacs*XlwMenu.abbrev.labelString:	????(%_A)
! Emacs*XlwMenu.register.labelString:	%_Register
Emacs*XlwMenu.register.labelString:	????(%_R)
! Emacs*XlwMenu.r_ectangles.labelString:	R%_ectangles
Emacs*XlwMenu.r_ectangles.labelString:		????(%_E)
! Emacs*XlwMenu.sort.labelString:	%_Sort
Emacs*XlwMenu.sort.labelString:		??????(%_S)
! Emacs*XlwMenu.changeCase.labelString:	%_Change Case
Emacs*XlwMenu.changeCase.labelString:	??????????????(%_C)
! Emacs*XlwMenu.ce_nter.labelString:	Ce%_nter
Emacs*XlwMenu.ce_nter.labelString:	????????????(%_N)
! Emacs*XlwMenu.indent.labelString:	%_Indent
Emacs*XlwMenu.indent.labelString:	??????????(%_I)
! Emacs*XlwMenu.s_pellCheck.labelString:	S%_pell-Check
Emacs*XlwMenu.s_pellCheck.labelString:		??????????????(%_P)
! Emacs*XlwMenu.footnotes.labelString:	%_Footnotes
Emacs*XlwMenu.footnotes.labelString:	????(%_F)
! Emacs*XlwMenu.d_ynamicAbbrevExpand.labelString:	D%_ynamic Abbrev Expand
Emacs*XlwMenu.d_ynamicAbbrevExpand.labelString:		??????????????????????(%_Y)
! Emacs*XlwMenu.dynamicAbbrevComplete.labelString:	Dynamic Abbrev %_Complete
Emacs*XlwMenu.dynamicAbbrevComplete.labelString:	??????????????????????(%_C)
! Emacs*XlwMenu.dynamicAbbrevCompleteInAllBuffers.labelString:	Dynamic Abbrev Complete in %_All Buffers
Emacs*XlwMenu.dynamicAbbrevCompleteInAllBuffers.labelString:	??????????????????????????????????????(%_A)
! Emacs*XlwMenu.defineGlobalAbbrevFor.labelString:	%_Define Global Abbrev for 
Emacs*XlwMenu.defineGlobalAbbrevFor.labelString:	????????????????????(%_D)
! Emacs*XlwMenu.defineModeSpecificAbbrevFor.labelString:	Define %_Mode-Specific Abbrev for 
Emacs*XlwMenu.defineModeSpecificAbbrevFor.labelString:		??????????????????????(%_M)
! Emacs*XlwMenu.defineGlobalEx_pansionFor.labelString:	Define Global Ex%_pansion for 
Emacs*XlwMenu.defineGlobalEx_pansionFor.labelString:	????????????????????(%_P)
! Emacs*XlwMenu.defineModeSpecificExpa_nsionFor.labelString:	Define Mode-Specific Expa%_nsion for 
Emacs*XlwMenu.defineModeSpecificExpa_nsionFor.labelString:	??????????????????????(%_N)
! Emacs*XlwMenu.e_xpandAbbrev.labelString:	E%_xpand Abbrev
Emacs*XlwMenu.e_xpandAbbrev.labelString:	??????????(%_X)
! Emacs*XlwMenu.expandAbbrevsInRe_gion.labelString:	Expand Abbrevs in Re%_gion
Emacs*XlwMenu.expandAbbrevsInRe_gion.labelString:	????????????????????????(%_G)
! Emacs*XlwMenu.unexpandLastAbbrev.labelString:	%_Unexpand Last Abbrev
Emacs*XlwMenu.unexpandLastAbbrev.labelString:	??????????????????????(%_U)
! Emacs*XlwMenu.killAllAbbrevs.labelString:	%_Kill All Abbrevs
Emacs*XlwMenu.killAllAbbrevs.labelString:	??????????????????(%_K)
! Emacs*XlwMenu.insertAllAbbrevsIntoBuffer.labelString:	%_Insert All Abbrevs into Buffer
Emacs*XlwMenu.insertAllAbbrevsIntoBuffer.labelString:	????????????????????????????(%_I)
! Emacs*XlwMenu.listAbbrevs.labelString:	%_List Abbrevs
Emacs*XlwMenu.listAbbrevs.labelString:		??????????(%_L)
! Emacs*XlwMenu.editAbbrevs.labelString:	%_Edit Abbrevs
Emacs*XlwMenu.editAbbrevs.labelString:		??????????(%_L)
! Emacs*XlwMenu.redefineAbbrevsFromBuffer.labelString:	%_Redefine Abbrevs from Buffer
Emacs*XlwMenu.redefineAbbrevsFromBuffer.labelString:	????????????????????????(%_R)
! Emacs*XlwMenu.saveAbbrevsAs___.labelString:	%_Save Abbrevs As...
Emacs*XlwMenu.saveAbbrevsAs___.labelString:	????????????????(%_S)...
! Emacs*XlwMenu.l_oadAbbrevs___.labelString:	L%_oad Abbrevs...
Emacs*XlwMenu.l_oadAbbrevs___.labelString:	??????????????(%_O)...
! Emacs*XlwMenu.copyToRegister___.labelString:	%_Copy to Register...
Emacs*XlwMenu.copyToRegister___.labelString:	????????????????(%_C)
! Emacs*XlwMenu.pasteRegister___.labelString:	%_Paste Register...
Emacs*XlwMenu.pasteRegister___.labelString:	????????????????????(%_P)
! Emacs*XlwMenu.savePointToRegister.labelString:	%_Save Point to Register
Emacs*XlwMenu.savePointToRegister.labelString:		????????????????????????(%_S)
! Emacs*XlwMenu.jumpToRegister.labelString:	%_Jump to Register
Emacs*XlwMenu.jumpToRegister.labelString:	??????????????(%_J)
! Emacs*XlwMenu.killRectangle.labelString:	%_Kill Rectangle
Emacs*XlwMenu.killRectangle.labelString:	??????????(%_K)
! Emacs*XlwMenu.yankRectangle.labelString:	%_Yank Rectangle
Emacs*XlwMenu.yankRectangle.labelString:	????????????(%_Y)
! Emacs*XlwMenu.rectangleToRegister.labelString:	Rectangle %_to Register
Emacs*XlwMenu.rectangleToRegister.labelString:		????????????????????(%_T)
! Emacs*XlwMenu.rectangleFromRegister.labelString:	Rectangle %_from Register
Emacs*XlwMenu.rectangleFromRegister.labelString:	??????????????????????(%_F)
! Emacs*XlwMenu.clearRectangle.labelString:	%_Clear Rectangle
Emacs*XlwMenu.clearRectangle.labelString:	????????????(%_C)
! Emacs*XlwMenu.openRectangle.labelString:	%_Open Rectangle
Emacs*XlwMenu.openRectangle.labelString:	??????????(%_O)
! Emacs*XlwMenu.prefixRectangle___.labelString:	%_Prefix Rectangle...
Emacs*XlwMenu.prefixRectangle___.labelString:	??????????????(%_P)...
! Emacs*XlwMenu.rectangleMousing.labelString:	Rectangle %_Mousing
Emacs*XlwMenu.rectangleMousing.labelString:	????????????(%_M)
! Emacs*XlwMenu.linesInRegion.labelString:	%_Lines in Region
Emacs*XlwMenu.linesInRegion.labelString:	??????????????????(%_L)
! Emacs*XlwMenu.paragraphsInRegion.labelString:	%_Paragraphs in Region
Emacs*XlwMenu.paragraphsInRegion.labelString:	????????????????????(%_P)
! Emacs*XlwMenu.p_agesInRegion.labelString:	P%_ages in Region
Emacs*XlwMenu.p_agesInRegion.labelString:	??????????????????????(%_A)
! Emacs*XlwMenu.columnsInRegion.labelString:	%_Columns in Region
Emacs*XlwMenu.columnsInRegion.labelString:	??????????????????????(%_C)
! Emacs*XlwMenu.regexp___.labelString:	%_Regexp...
Emacs*XlwMenu.regexp___.labelString:	????????(%_R)...
! Emacs*XlwMenu.upcaseRegion.labelString:	%_Upcase Region
Emacs*XlwMenu.upcaseRegion.labelString:		??????????????????????(%_U)
! Emacs*XlwMenu.downcaseRegion.labelString:	%_Downcase Region
Emacs*XlwMenu.downcaseRegion.labelString:	??????????????????????(%_D)
! Emacs*XlwMenu.capitalizeRegion.labelString:	%_Capitalize Region
Emacs*XlwMenu.capitalizeRegion.labelString:	????????????????????????????(%_C)
! Emacs*XlwMenu.titleCaseRegion.labelString:	%_Title-Case Region
Emacs*XlwMenu.titleCaseRegion.labelString:	????????????????????????????(%_T)
! Emacs*XlwMenu.line.labelString:	%_Line
Emacs*XlwMenu.line.labelString:		??????(%_L)
! Emacs*XlwMenu.paragraph.labelString:	%_Paragraph
Emacs*XlwMenu.paragraph.labelString:	????(%_P)
! Emacs*XlwMenu.region.labelString:	%_Region
Emacs*XlwMenu.region.labelString:	??????????(%_R)
! Emacs*XlwMenu.asPreviousLine.labelString:	%_As Previous Line
Emacs*XlwMenu.asPreviousLine.labelString:	????????(%_A)
! Emacs*XlwMenu.toColumn___.labelString:	%_To Column...
Emacs*XlwMenu.toColumn___.labelString:		????????????(%_T)...
! Emacs*XlwMenu.balancedExpression.labelString:	%_Balanced Expression
Emacs*XlwMenu.balancedExpression.labelString:	????????(%_B)
! Emacs*XlwMenu.cExpression.labelString:	%_C Expression
Emacs*XlwMenu.cExpression.labelString:		C??(%_C)
! Emacs*XlwMenu.buffer.labelString:	%_Buffer
Emacs*XlwMenu.buffer.labelString:	????????(%_B)
! Emacs*XlwMenu.word.labelString:	%_Word
Emacs*XlwMenu.word.labelString:		??????(%_W)
! Emacs*XlwMenu.completeWord.labelString:	%_Complete Word
Emacs*XlwMenu.completeWord.labelString:		??????????(%_C)
! Emacs*XlwMenu.addFootnote.labelString:	%_Add Footnote
Emacs*XlwMenu.addFootnote.labelString:		??????????(%_A)
! Emacs*XlwMenu.deleteFootnote.labelString:	%_Delete Footnote
Emacs*XlwMenu.deleteFootnote.labelString:	?????????? (%_D)
! Emacs*XlwMenu.gotoFootnote.labelString:	%_Goto Footnote
Emacs*XlwMenu.gotoFootnote.labelString:		??????????(%_G)
! Emacs*XlwMenu.backToMessage.labelString:	%_Back to Message
Emacs*XlwMenu.backToMessage.labelString:	????????????????(%_B)
! Emacs*XlwMenu.renumberFootnotes.labelString:	%_Renumber Footnotes
Emacs*XlwMenu.renumberFootnotes.labelString:	????????????(%_R)
! Emacs*XlwMenu.setFootnoteStyle.labelString:	%_Set Footnote Style
Emacs*XlwMenu.setFootnoteStyle.labelString:	??????????????????(%_S)
! Emacs*XlwMenu.cycleFootnoteStyle.labelString:	%_Cycle Footnote Style
Emacs*XlwMenu.cycleFootnoteStyle.labelString:	??????????????????????(%_C)
! Emacs*XlwMenu.packages.labelString:	%_Packages
Emacs*XlwMenu.packages.labelString:	??????????(%_P)
! Emacs*XlwMenu.internet.labelString:	%_Internet
Emacs*XlwMenu.internet.labelString:	??????????????(%_I)
! Emacs*XlwMenu.grep.labelString:	%_Grep
Emacs*XlwMenu.grep.labelString:		%_Grep
! Emacs*XlwMenu.compile.labelString:	%_Compile
Emacs*XlwMenu.compile.labelString:	??????????(%_C)
! Emacs*XlwMenu.debug.labelString:	%_Debug
Emacs*XlwMenu.debug.labelString:	????????(%_D)
! Emacs*XlwMenu.shell.labelString:	%_Shell
Emacs*XlwMenu.shell.labelString:	??????(%_S)
! Emacs*XlwMenu.tags.labelString:	%_Tags
Emacs*XlwMenu.tags.labelString:		????(%_T)
! Emacs*XlwMenu.ca_lendar.labelString:	Ca%_lendar
Emacs*XlwMenu.ca_lendar.labelString:	????????(%_L)
! Emacs*XlwMenu.ga_mes.labelString:	Ga%_mes
Emacs*XlwMenu.ga_mes.labelString:	??????(%_M)
! Emacs*XlwMenu.vC.labelString:	%_VC
Emacs*XlwMenu.vC.labelString:	%_VC
! Emacs*XlwMenu.compare.labelString:	%_Compare
Emacs*XlwMenu.compare.labelString:	????(%_C)
! Emacs*XlwMenu.merge.labelString:	%_Merge
Emacs*XlwMenu.merge.labelString:	??????(%_M)
! Emacs*XlwMenu.applyPatch.labelString:	%_Apply Patch
Emacs*XlwMenu.applyPatch.labelString:	????????????(%_A)
! Emacs*XlwMenu.ediffMiscellanea.labelString:	%_Ediff Miscellanea
Emacs*XlwMenu.ediffMiscellanea.labelString:	%_Ediff??????
! Emacs*XlwMenu.directorySearch.labelString:	%_Directory Search
Emacs*XlwMenu.directorySearch.labelString:	????????(%_D)
! Emacs*XlwMenu.pCLCVS.labelString:	%_PCL CVS
Emacs*XlwMenu.pCLCVS.labelString:	%_PCL CVS
! Emacs*XlwMenu.addDownloadSite.labelString:	%_Add Download Site
Emacs*XlwMenu.addDownloadSite.labelString:	????????????????????????(%_A)
! Emacs*XlwMenu.updatePackageIndex.labelString:	%_Update Package Index
Emacs*XlwMenu.updatePackageIndex.labelString:	??????????????????????????(%_U)
! Emacs*XlwMenu.listAndInstall.labelString:	%_List and Install
Emacs*XlwMenu.listAndInstall.labelString:	??????????????????????(%_L)
! Emacs*XlwMenu.u_pdateInstalledPackages.labelString:	U%_pdate Installed Packages
Emacs*XlwMenu.u_pdateInstalledPackages.labelString:	??????????????????????????????(%_P)
! Emacs*XlwMenu.usingCustom.labelString:	Using %_Custom
Emacs*XlwMenu.usingCustom.labelString:		??????????????(%_C)
! Emacs*XlwMenu.1PreReleases.labelString:	%_1 Pre-Releases
Emacs*XlwMenu.1PreReleases.labelString:		%_1 ????????????
! Emacs*XlwMenu.2Xemacs_org.labelString:	%_2 xemacs.org
Emacs*XlwMenu.2Xemacs_org.labelString:		%_2 xemacs.org
! Emacs*XlwMenu.3Crc_caCanada.labelString:	%_3 crc.ca (Canada)
Emacs*XlwMenu.3Crc_caCanada.labelString:	%_3 crc.ca (??????)
! Emacs*XlwMenu.4Ualberta_caCanada.labelString:	%_4 ualberta.ca (Canada)
Emacs*XlwMenu.4Ualberta_caCanada.labelString:	%_4 ualberta.ca (??????)
! Emacs*XlwMenu.5Uiuc_eduUnitedStates.labelString:	%_5 uiuc.edu (United States)
Emacs*XlwMenu.5Uiuc_eduUnitedStates.labelString:	%_5 uiuc.edu (??????)
! Emacs*XlwMenu.6Unc_eduUnitedStates.labelString:	%_6 unc.edu (United States)
Emacs*XlwMenu.6Unc_eduUnitedStates.labelString:		%_6 unc.edu (??????)
! Emacs*XlwMenu.7Utk_eduUnitedStates.labelString:	%_7 utk.edu (United States)
Emacs*XlwMenu.7Utk_eduUnitedStates.labelString:		%_7 utk.edu (??????)
! Emacs*XlwMenu.8Unicamp_brBrazil.labelString:	%_8 unicamp.br (Brazil)
Emacs*XlwMenu.8Unicamp_brBrazil.labelString:	%_8 unicamp.br (????????)
! Emacs*XlwMenu.9Tuwien_ac_atAustria.labelString:	%_9 tuwien.ac.at (Austria)
Emacs*XlwMenu.9Tuwien_ac_atAustria.labelString:		tuwien.ac.at (????????????)
! Emacs*XlwMenu.0Auc_dkDenmark.labelString:	%_0 auc.dk (Denmark)
Emacs*XlwMenu.0Auc_dkDenmark.labelString:	%_0 auc.dk (??????????)
! Emacs*XlwMenu.aDoc_ic_ac_ukEngland.labelString:	%_a doc.ic.ac.uk (England)
Emacs*XlwMenu.aDoc_ic_ac_ukEngland.labelString:		%_a doc.ic.ac.uk (????????)
! Emacs*XlwMenu.bFunet_fiFinland.labelString:	%_b funet.fi (Finland)
Emacs*XlwMenu.bFunet_fiFinland.labelString:	%_b funet.fi (????????????)
! Emacs*XlwMenu.cCenatls_cena_dgac_frFrance.labelString:	%_c cenatls.cena.dgac.fr (France)
Emacs*XlwMenu.cCenatls_cena_dgac_frFrance.labelString:	%_c cenatls.cena.dgac.fr (????????)
! Emacs*XlwMenu.dPasteur_frFrance.labelString:	%_d pasteur.fr (France)
Emacs*XlwMenu.dPasteur_frFrance.labelString:	%_d pasteur.fr (????????)
! Emacs*XlwMenu.eTuDarmstadt_deGermany.labelString:	%_e tu-darmstadt.de (Germany)
Emacs*XlwMenu.eTuDarmstadt_deGermany.labelString:	%_e tu-darmstadt.de (??????)
! Emacs*XlwMenu.fKfki_huHungary.labelString:	%_f kfki.hu (Hungary)
Emacs*XlwMenu.fKfki_huHungary.labelString:	%_f kfki.hu (??????????)
! Emacs*XlwMenu.gEunet_ieIreland.labelString:	%_g eunet.ie (Ireland)
Emacs*XlwMenu.gEunet_ieIreland.labelString:	%_g eunet.ie (????????????)
! Emacs*XlwMenu.hUniroma2_itItaly.labelString:	%_h uniroma2.it (Italy)
Emacs*XlwMenu.hUniroma2_itItaly.labelString:	%_h uniroma2.it (????????)
! Emacs*XlwMenu.iUio_noNorway.labelString:	%_i uio.no (Norway)
Emacs*XlwMenu.iUio_noNorway.labelString:	%_i uio.no (??????????)
! Emacs*XlwMenu.jIcm_edu_plPoland.labelString:	%_j icm.edu.pl (Poland)
Emacs*XlwMenu.jIcm_edu_plPoland.labelString:	%_j icm.edu.pl (??????????)
! Emacs*XlwMenu.kSrcc_msu_suRussia.labelString:	%_k srcc.msu.su (Russia)
Emacs*XlwMenu.kSrcc_msu_suRussia.labelString:	%_k srcc.msu.su (??????)
! Emacs*XlwMenu.lSunet_seSweden.labelString:	%_l sunet.se (Sweden)
Emacs*XlwMenu.lSunet_seSweden.labelString:	%_l sunet.se (????????????)
! Emacs*XlwMenu.mCnlabSwitch_chSwitzerland.labelString:	%_m cnlab-switch.ch (Switzerland)
Emacs*XlwMenu.mCnlabSwitch_chSwitzerland.labelString:	%_m cnlab-switch.ch (??????)
! Emacs*XlwMenu.nAist_go_jpJapan.labelString:	%_n aist.go.jp (Japan)
Emacs*XlwMenu.nAist_go_jpJapan.labelString:	%_n aist.go.jp (????)
! Emacs*XlwMenu.oAsahiNet_or_jpJapan.labelString:	%_o asahi-net.or.jp (Japan)
Emacs*XlwMenu.oAsahiNet_or_jpJapan.labelString:	%_o asahi-net.or.jp (????)
! Emacs*XlwMenu.pDti_ad_jpJapan.labelString:	%_p dti.ad.jp (Japan)
Emacs*XlwMenu.pDti_ad_jpJapan.labelString:	%_p dti.ad.jp (????)
! Emacs*XlwMenu.qJaist_ac_jpJapan.labelString:	%_q jaist.ac.jp (Japan)
Emacs*XlwMenu.qJaist_ac_jpJapan.labelString:	%_q jaist.ac.jp (????)
! Emacs*XlwMenu.rNucba_ac_jpJapan.labelString:	%_r nucba.ac.jp (Japan)
Emacs*XlwMenu.rNucba_ac_jpJapan.labelString:	%_r nucba.ac.jp (????)
! Emacs*XlwMenu.sSut_ac_jpJapan.labelString:	%_s sut.ac.jp (Japan)
Emacs*XlwMenu.sSut_ac_jpJapan.labelString:	%_s sut.ac.jp (????)
! Emacs*XlwMenu.tTsukuba_ac_jpJapan.labelString:	%_t tsukuba.ac.jp (Japan)
Emacs*XlwMenu.tTsukuba_ac_jpJapan.labelString:		%_t tsukuba.ac.jp (????)
! Emacs*XlwMenu.uKreonet_re_krKorea.labelString:	%_u kreonet.re.kr (Korea)
Emacs*XlwMenu.uKreonet_re_krKorea.labelString:		%_u kreonet.re.kr (????)
! Emacs*XlwMenu.vNctu_edu_twTaiwan.labelString:	%_v nctu.edu.tw (Taiwan)
Emacs*XlwMenu.vNctu_edu_twTaiwan.labelString:		%_v nctu.edu.tw (????)
! Emacs*XlwMenu.wSun_ac_zaSouthAfrica.labelString:	%_w sun.ac.za (South Africa)
Emacs*XlwMenu.wSun_ac_zaSouthAfrica.labelString:	%_w sun.ac.za (??????????)
! Emacs*XlwMenu.xIsu_net_saSaudiArabia.labelString:	%_x isu.net.sa (Saudi Arabia)
Emacs*XlwMenu.xIsu_net_saSaudiArabia.labelString:	%_x isu.net.sa (??????????????)
! Emacs*XlwMenu.yAarnet_edu_auAustralia.labelString:	%_y aarnet.edu.au (Australia)
Emacs*XlwMenu.yAarnet_edu_auAustralia.labelString:	%_y aarnet.edu.au (??????????????)
! Emacs*XlwMenu.pleaseLoadPackageIndex.labelString:	Please load Package Index
Emacs*XlwMenu.pleaseLoadPackageIndex.labelString:	????????????????????????????????????????
! Emacs*XlwMenu.readMail1VM___.labelString:	Read Mail %_1 (VM)...
Emacs*XlwMenu.readMail1VM___.labelString:	????????????(%_1)(VM)...
! Emacs*XlwMenu.readMail2MH___.labelString:	Read Mail %_2 (MH)...
Emacs*XlwMenu.readMail2MH___.labelString:	????????????(%_2)(MH)...
! Emacs*XlwMenu.sendMail___.labelString:	Send %_Mail...
Emacs*XlwMenu.sendMail___.labelString:		????????????(%_M)...
! Emacs*XlwMenu.usenetNews.labelString:	Usenet %_News
Emacs*XlwMenu.usenetNews.labelString:	Usenet????????(%_N)
! Emacs*XlwMenu.browseTheWeb.labelString:	Browse the %_Web
Emacs*XlwMenu.browseTheWeb.labelString:		????????????????(%_W)
! Emacs*XlwMenu.grep___.labelString:	%_Grep...
Emacs*XlwMenu.grep___.labelString:	%_Grep...
! Emacs*XlwMenu.killGrep.labelString:	%_Kill Grep
Emacs*XlwMenu.killGrep.labelString:	Grep??????(%_K)
! Emacs*XlwMenu.grepAllFilesInCurrentDirectory___.labelString:	Grep %_All Files in Current Directory...
Emacs*XlwMenu.grepAllFilesInCurrentDirectory___.labelString:	????????????????????????????????????????grep(%_A)
! Emacs*XlwMenu.grepCAndCHeaderFilesInCurrentDirectory___.labelString:	Grep %_C and C Header Files in Current Directory...
Emacs*XlwMenu.grepCAndCHeaderFilesInCurrentDirectory___.labelString:	??????????????????????C??C??????????????????grep(%_C)
! Emacs*XlwMenu.grepCHea_derFilesInCurrentDirectory___.labelString:	Grep C Hea%_der Files in Current Directory...
Emacs*XlwMenu.grepCHea_derFilesInCurrentDirectory___.labelString:	??????????????????????C????????????????grep(%_H)
! Emacs*XlwMenu.grepELispFilesInCurrentDirectory___.labelString:	Grep %_E-Lisp Files in Current Directory...
Emacs*XlwMenu.grepELispFilesInCurrentDirectory___.labelString:	??????????????????????E-Lisp??????????grep(%_E)
! Emacs*XlwMenu.grepPerlFilesInCurrentDirectory___.labelString:	Grep %_Perl Files in Current Directory...
Emacs*XlwMenu.grepPerlFilesInCurrentDirectory___.labelString:	??????????????????????Perl??????????grep(%_P)
! Emacs*XlwMenu.grepHTMLFilesInCurrentDirectory___.labelString:	Grep %_HTML Files in Current Directory...
Emacs*XlwMenu.grepHTMLFilesInCurrentDirectory___.labelString:	??????????????????????HTML??????????grep(%_H)
! Emacs*XlwMenu.nextMatch.labelString:	%_Next Match
Emacs*XlwMenu.nextMatch.labelString:	??????????(%_N)
! Emacs*XlwMenu.pre_viousMatch.labelString:	Pre%_vious Match
Emacs*XlwMenu.pre_viousMatch.labelString:	??????????(%_V)
! Emacs*XlwMenu.firstMatch.labelString:	%_First Match
Emacs*XlwMenu.firstMatch.labelString:	????????????(%_F)
! Emacs*XlwMenu.g_otoMatch.labelString:	G%_oto Match
Emacs*XlwMenu.g_otoMatch.labelString:	??????????(%_G)
! Emacs*XlwMenu.setGrepCommand___.labelString:	%_Set Grep Command...
Emacs*XlwMenu.setGrepCommand___.labelString:	grep??????????????(%_S)...
! Emacs*XlwMenu.compile___.labelString:	%_Compile...
Emacs*XlwMenu.compile___.labelString:	??????????(%_C)
! Emacs*XlwMenu.repeatCompilation.labelString:	%_Repeat Compilation
Emacs*XlwMenu.repeatCompilation.labelString:	????????????????????(%_R)
! Emacs*XlwMenu.killCompilation.labelString:	%_Kill Compilation
Emacs*XlwMenu.killCompilation.labelString:	????????????????????(%_K)
! Emacs*XlwMenu.nextError.labelString:	%_Next Error
Emacs*XlwMenu.nextError.labelString:	????????????(%_N)
! Emacs*XlwMenu.pre_viousError.labelString:	Pre%_vious Error
Emacs*XlwMenu.pre_viousError.labelString:	????????????(%_V)
! Emacs*XlwMenu.firstError.labelString:	%_First Error
Emacs*XlwMenu.firstError.labelString:	??????????????(%_F)
! Emacs*XlwMenu.g_otoError.labelString:	G%_oto Error
Emacs*XlwMenu.g_otoError.labelString:	????????????(%_O)
! Emacs*XlwMenu.gDB___.labelString:	%_GDB...
Emacs*XlwMenu.gDB___.labelString:	%_GDB...
! Emacs*XlwMenu.dBX___.labelString:	%_DBX...
Emacs*XlwMenu.dBX___.labelString:	%_DBX...
! Emacs*XlwMenu.s_hellCommand___.labelString:	S%_hell Command...
Emacs*XlwMenu.s_hellCommand___.labelString:	??????????????(%_H)...
! Emacs*XlwMenu.shellCommandOnRegion___.labelString:	Shell Command on %_Region...
Emacs*XlwMenu.shellCommandOnRegion___.labelString:	????????????????????????????????(%_R)
! Emacs*XlwMenu.findTag___.labelString:	%_Find Tag...
Emacs*XlwMenu.findTag___.labelString:	??????????(%_F)...
! Emacs*XlwMenu.findOtherWindow___.labelString:	Find %_Other Window...
Emacs*XlwMenu.findOtherWindow___.labelString:	????????????????????(%_O)
! Emacs*XlwMenu.nextTag___.labelString:	%_Next Tag...
Emacs*XlwMenu.nextTag___.labelString:	??????????(%_N)...
! Emacs*XlwMenu.n_extOtherWindow___.labelString:	N%_ext Other Window...
Emacs*XlwMenu.n_extOtherWindow___.labelString:	??????????????????????(%_E)...
! Emacs*XlwMenu.nextFile.labelString:	Next %_File
Emacs*XlwMenu.nextFile.labelString:	????????????(%_F)
! Emacs*XlwMenu.tagsSearch___.labelString:	Tags %_Search...
Emacs*XlwMenu.tagsSearch___.labelString:	????????(%_S)...
! Emacs*XlwMenu.tagsReplace___.labelString:	Tags %_Replace...
Emacs*XlwMenu.tagsReplace___.labelString:	????????(%_R)...
! Emacs*XlwMenu.continueSearchReplace.labelString:	%_Continue Search/Replace
Emacs*XlwMenu.continueSearchReplace.labelString:	????/????????????(%_C)
! Emacs*XlwMenu.popStack.labelString:	%_Pop stack
Emacs*XlwMenu.popStack.labelString:	??????????pop(%_P)
! Emacs*XlwMenu.apropos___.labelString:	%_Apropos...
Emacs*XlwMenu.apropos___.labelString:	%_Apropos...
! Emacs*XlwMenu.setTagsTableFile___.labelString:	%_Set Tags Table File...
Emacs*XlwMenu.setTagsTableFile___.labelString:	??????????????????????????(%_S)...
! Emacs*XlwMenu.3MonthCalendar.labelString:	%_3-Month Calendar
Emacs*XlwMenu.3MonthCalendar.labelString:	3????????????(%_3)
! Emacs*XlwMenu.diary.labelString:	%_Diary
Emacs*XlwMenu.diary.labelString:	????(%_D)
! Emacs*XlwMenu.holidays.labelString:	%_Holidays
Emacs*XlwMenu.holidays.labelString:	????(%_H)
! Emacs*XlwMenu.phasesOfTheMoon.labelString:	%_Phases of the Moon
Emacs*XlwMenu.phasesOfTheMoon.labelString:	????(%_P)
! Emacs*XlwMenu.sunriseSunset.labelString:	%_Sunrise/Sunset
Emacs*XlwMenu.sunriseSunset.labelString:	??????/??????(%_S)
! Emacs*XlwMenu.mineGame.labelString:	%_Mine Game
Emacs*XlwMenu.mineGame.labelString:	??????????(%_M)
! Emacs*XlwMenu.tetris.labelString:	%_Tetris
Emacs*XlwMenu.tetris.labelString:	????????(%_T)
! Emacs*XlwMenu.sokoban.labelString:	%_Sokoban
Emacs*XlwMenu.sokoban.labelString:	??????(%_S)
! Emacs*XlwMenu.quoteFromZippy.labelString:	Quote from %_Zippy
Emacs*XlwMenu.quoteFromZippy.labelString:	Zippy??????(%_Z)
! Emacs*XlwMenu.psychoanalyst.labelString:	%_Psychoanalyst
Emacs*XlwMenu.psychoanalyst.labelString:	XEmacs????????(%_P)
! Emacs*XlwMenu.ps_ychoanalyzeZippy.labelString:	Ps%_ychoanalyze Zippy!
Emacs*XlwMenu.ps_ychoanalyzeZippy.labelString:	Zippy??????????!(%_Y)
! Emacs*XlwMenu.randomFlames.labelString:	%_Random Flames
Emacs*XlwMenu.randomFlames.labelString:		????????????(%_R)
! Emacs*XlwMenu.dunnetAdventure.labelString:	%_Dunnet (Adventure)
Emacs*XlwMenu.dunnetAdventure.labelString:	Dunnet(??????????????)(%_D)
! Emacs*XlwMenu.towersOfHanoi.labelString:	Towers of %_Hanoi
Emacs*XlwMenu.towersOfHanoi.labelString:	??????????(%_H)
! Emacs*XlwMenu.gameOfLife.labelString:	Game of %_Life
Emacs*XlwMenu.gameOfLife.labelString:	????????????(%_L)
! Emacs*XlwMenu.m_ultiplicationPuzzle.labelString:	M%_ultiplication Puzzle
Emacs*XlwMenu.m_ultiplicationPuzzle.labelString:	????????????(%_U)
! Emacs*XlwMenu.loadVC.labelString:	%_Load VC
Emacs*XlwMenu.loadVC.labelString:	VC??????????(%_L)
! Emacs*XlwMenu.twoFiles___.labelString:	%_Two Files...
Emacs*XlwMenu.twoFiles___.labelString:		2????????(%_T)...
! Emacs*XlwMenu.twoBuffers___.labelString:	%_Two Buffers...
Emacs*XlwMenu.twoBuffers___.labelString:	2????????(%_T)...
! Emacs*XlwMenu.threeFiles___.labelString:	%_Three Files...
Emacs*XlwMenu.threeFiles___.labelString:	3????????(%_T)...
! Emacs*XlwMenu.threeBuffers___.labelString:	%_Three Buffers...
Emacs*XlwMenu.threeBuffers___.labelString:	3????????(%_T)...
! Emacs*XlwMenu.twoDirectories___.labelString:	%_Two Directories...
Emacs*XlwMenu.twoDirectories___.labelString:	2????????????(%_T)...
! Emacs*XlwMenu.threeDirectories___.labelString:	%_Three Directories...
Emacs*XlwMenu.threeDirectories___.labelString:	3????????????(%_T)...
! Emacs*XlwMenu.fileWithRevision___.labelString:	%_File with Revision...
Emacs*XlwMenu.fileWithRevision___.labelString:	??????????????????????(%_F)...
! Emacs*XlwMenu.directoryRevisions___.labelString:	%_Directory Revisions...
Emacs*XlwMenu.directoryRevisions___.labelString:	??????????????????????(%_D)...
! Emacs*XlwMenu.windowsWordByWord___.labelString:	%_Windows Word-by-word...
Emacs*XlwMenu.windowsWordByWord___.labelString:	??????????????????????(%_W)...
! Emacs*XlwMenu.windowsLineByLine___.labelString:	%_Windows Line-by-line...
Emacs*XlwMenu.windowsLineByLine___.labelString:	??????????????????(%_W)...
! Emacs*XlwMenu.regionsWordByWord___.labelString:	%_Regions Word-by-word...
Emacs*XlwMenu.regionsWordByWord___.labelString:	??????????????????????(%_R)...
! Emacs*XlwMenu.regionsLineByLine___.labelString:	%_Regions Line-by-line...
Emacs*XlwMenu.regionsLineByLine___.labelString:	??????????????????(%_R)...
! Emacs*XlwMenu.files___.labelString:	%_Files...
Emacs*XlwMenu.files___.labelString:	????????(%_F)...
! Emacs*XlwMenu.filesWithAncestor___.labelString:	%_Files with Ancestor...
Emacs*XlwMenu.filesWithAncestor___.labelString:	??????????????????(%_F)...
! Emacs*XlwMenu.buffers___.labelString:	%_Buffers...
Emacs*XlwMenu.buffers___.labelString:	????????(%_B)...
! Emacs*XlwMenu.buffersWithAncestor___.labelString:	%_Buffers with Ancestor...
Emacs*XlwMenu.buffersWithAncestor___.labelString:	??????????????????(%_B)...
! Emacs*XlwMenu.directories___.labelString:	%_Directories...
Emacs*XlwMenu.directories___.labelString:	????????????(%_D)...
! Emacs*XlwMenu.directoriesWithAncestor___.labelString:	%_Directories with Ancestor...
Emacs*XlwMenu.directoriesWithAncestor___.labelString:	??????????????????????(%_D)
! Emacs*XlwMenu.revisions___.labelString:	%_Revisions...
Emacs*XlwMenu.revisions___.labelString:	??????????(%_R)...
! Emacs*XlwMenu.revisionsWithAncestor___.labelString:	%_Revisions with Ancestor...
Emacs*XlwMenu.revisionsWithAncestor___.labelString:	????????????????????(%_R)...
! Emacs*XlwMenu.directoryRevisionsWithAncestor___.labelString:	%_Directory Revisions with Ancestor...
Emacs*XlwMenu.directoryRevisionsWithAncestor___.labelString:	????????????????????????????????(%_D)...
! Emacs*XlwMenu.toAFile___.labelString:	%_To a file...
Emacs*XlwMenu.toAFile___.labelString:	??????????????(%_T)...
! Emacs*XlwMenu.toABuffer___.labelString:	%_To a buffer...
Emacs*XlwMenu.toABuffer___.labelString:	??????????????(%_T)...
! Emacs*XlwMenu.ediffManual___.labelString:	%_Ediff Manual...
Emacs*XlwMenu.ediffManual___.labelString:	????????????ediff(%_E)...
! Emacs*XlwMenu.customizeEdiff___.labelString:	%_Customize Ediff...
Emacs*XlwMenu.customizeEdiff___.labelString:	ediff??????????????(%_C)...
! Emacs*XlwMenu.listEdiffSessions___.labelString:	%_List Ediff Sessions...
Emacs*XlwMenu.listEdiffSessions___.labelString:	ediff????????????????(%_L)...
! Emacs*XlwMenu.useSeparateFrameForEdiffControlBuffer___.labelString:	%_Use separate frame for Ediff control buffer...
Emacs*XlwMenu.useSeparateFrameForEdiffControlBuffer___.labelString:	ediff????????????????????????????????????????(%_U)...
! Emacs*XlwMenu.useAToolbarWithEdiffControlBuffer.labelString:	%_Use a toolbar with Ediff control buffer
Emacs*XlwMenu.useAToolbarWithEdiffControlBuffer.labelString:	ediff??????????????????????????????????????(%_U)
! Emacs*XlwMenu.loadHotlistOfServers.labelString:	%_Load Hotlist of Servers
Emacs*XlwMenu.loadHotlistOfServers.labelString:	??????????????????????????????(%_L)
! Emacs*XlwMenu.newServer.labelString:	%_New Server
Emacs*XlwMenu.newServer.labelString:	??????????(%_N)
! Emacs*XlwMenu.queryWithForm.labelString:	%_Query with Form
Emacs*XlwMenu.queryWithForm.labelString:	??????????????????(%_Q)
! Emacs*XlwMenu.expandInlineQuery.labelString:	%_Expand Inline Query
Emacs*XlwMenu.expandInlineQuery.labelString:	????????????????????????(%_E)
! Emacs*XlwMenu.getEmail.labelString:	%_Get Email
Emacs*XlwMenu.getEmail.labelString:	????????????????(%_G)
! Emacs*XlwMenu.getPhone.labelString:	%_Get Phone
Emacs*XlwMenu.getPhone.labelString:	??????????????(%_G)
! Emacs*XlwMenu.updateDirectory.labelString:	%_Update Directory
Emacs*XlwMenu.updateDirectory.labelString:	??????????????????(%_U)
! Emacs*XlwMenu.examineDirectory.labelString:	%_Examine Directory
Emacs*XlwMenu.examineDirectory.labelString:	??????????????????(%_E)
! Emacs*XlwMenu.statusDirectory.labelString:	%_Status Directory
Emacs*XlwMenu.statusDirectory.labelString:	??????????????????????(%_S)
! Emacs*XlwMenu.checkoutModule.labelString:	%_Checkout Module
Emacs*XlwMenu.checkoutModule.labelString:	??????????????????????????(%_C)
! Emacs*XlwMenu.advancedCustomize.labelString:	%_Advanced (Customize)
Emacs*XlwMenu.advancedCustomize.labelString:	????(????????????)(%_A)
! Emacs*XlwMenu.editing.labelString:	%_Editing
Emacs*XlwMenu.editing.labelString:	????(%_E)
! Emacs*XlwMenu.keyboardAndMouse.labelString:	%_Keyboard and Mouse
Emacs*XlwMenu.keyboardAndMouse.labelString:	??????????????????(%_K)
! Emacs*XlwMenu.printing.labelString:	%_Printing
Emacs*XlwMenu.printing.labelString:	????(%_P)
! Emacs*XlwMenu.troubleshooting.labelString:	%_Troubleshooting
Emacs*XlwMenu.troubleshooting.labelString:	??????????????????????(%_T)
! Emacs*XlwMenu.display.labelString:	%_Display
Emacs*XlwMenu.display.labelString:	????????????(%_D)
! Emacs*XlwMenu.menubars.labelString:	%_Menubars
Emacs*XlwMenu.menubars.labelString:	????????????(%_M)
! Emacs*XlwMenu.s_yntaxHighlighting.labelString:	S%_yntax Highlighting
Emacs*XlwMenu.s_yntaxHighlighting.labelString:	????????????????(%_Y)
! Emacs*XlwMenu.font.labelString:	%_Font
Emacs*XlwMenu.font.labelString:		????????(%_F)
! Emacs*XlwMenu.fontSi_ze.labelString:	Font Si%_ze
Emacs*XlwMenu.fontSi_ze.labelString:	??????????????(%_Z)
! Emacs*XlwMenu.editFa_ces___.labelString:	Edit Fa%_ces...
Emacs*XlwMenu.editFa_ces___.labelString:	??????????(%_C)...
! Emacs*XlwMenu.editI_nitFile.labelString:	Edit I%_nit File
Emacs*XlwMenu.editI_nitFile.labelString:	init??????????????(%_I)
! Emacs*XlwMenu.saveOptionsToInitFile.labelString:	%_Save Options to Init File
Emacs*XlwMenu.saveOptionsToInitFile.labelString:	????????????init??????????????(%_S)
! Emacs*XlwMenu.thisBufferReadOnly.labelString:	This Buffer %_Read Only
Emacs*XlwMenu.thisBufferReadOnly.labelString:	??????????????????????????(%_R)
! Emacs*XlwMenu.yankKillInteractWithClipboard.labelString:	%_Yank/Kill Interact With Clipboard
Emacs*XlwMenu.yankKillInteractWithClipboard.labelString:	??????????????????????/Kill??????
! Emacs*XlwMenu.overstrike.labelString:	%_Overstrike
Emacs*XlwMenu.overstrike.labelString:	????????(%_O)
! Emacs*XlwMenu.abbrevMode.labelString:	%_Abbrev Mode
Emacs*XlwMenu.abbrevMode.labelString:	??????????(%_A)
! Emacs*XlwMenu.activeRe_gions.labelString:	Active Re%_gions
Emacs*XlwMenu.activeRe_gions.labelString:	????????????????????????(%_G)
! Emacs*XlwMenu.caseSensitiveSearch.labelString:	%_Case Sensitive Search
Emacs*XlwMenu.caseSensitiveSearch.labelString:	??????/????????????????????(%_C)
! Emacs*XlwMenu.caseMatchingReplace.labelString:	Case %_Matching Replace
Emacs*XlwMenu.caseMatchingReplace.labelString:	??????/????????????????????(%_M)
! Emacs*XlwMenu.newlineAtEndOfFile___.labelString:	%_Newline at End of File...
Emacs*XlwMenu.newlineAtEndOfFile___.labelString:	????????????????????(%_N)
! Emacs*XlwMenu.addNewlineWhenMovingPastEnd.labelString:	Add Newline When Moving Past %_End
Emacs*XlwMenu.addNewlineWhenMovingPastEnd.labelString:	??????????????????????????(_E)
! Emacs*XlwMenu.donTRequire.labelString:	%_Don't Require
Emacs*XlwMenu.donTRequire.labelString:	????????????(%_D)
! Emacs*XlwMenu.require.labelString:	%_Require
Emacs*XlwMenu.require.labelString:	??????????(%_R)
! Emacs*XlwMenu.ask.labelString:	%_Ask
Emacs*XlwMenu.ask.labelString:		????????(%_A)
! Emacs*XlwMenu.deleteKeyDeletesSelection.labelString:	%_Delete Key Deletes Selection
Emacs*XlwMenu.deleteKeyDeletesSelection.labelString:	Delete????????????????????(%_D)
! Emacs*XlwMenu.killLineKillsWholeLineAtBeg.labelString:	`%_kill-line' Kills Whole Line at %_Beg
Emacs*XlwMenu.killLineKillsWholeLineAtBeg.labelString:	'kill-line'??????????????????????(%_B)
! Emacs*XlwMenu.sizeForBlockMovementCommands___.labelString:	Size for %_Block-Movement Commands...
Emacs*XlwMenu.sizeForBlockMovementCommands___.labelString:	????????????????????????????(%_B)
! Emacs*XlwMenu.vIEmulation.labelString:	%_VI Emulation
Emacs*XlwMenu.vIEmulation.labelString:	VI???????????????? (%_V)
! Emacs*XlwMenu.s_hiftedMotionKeysSelectRegion.labelString:	S%_hifted Motion Keys Select Region
Emacs*XlwMenu.s_hiftedMotionKeysSelectRegion.labelString:	????????????????????????????(%_H)
! Emacs*XlwMenu.afterShiftedMotionUnshiftedMotionKeysDeselect.labelString:	%_After Shifted Motion, Unshifted Motion Keys Deselect
Emacs*XlwMenu.afterShiftedMotionUnshiftedMotionKeysDeselect.labelString:	??????????????????????????????????????(%_A)
! Emacs*XlwMenu.setKey___.labelString:	%_Set Key...
Emacs*XlwMenu.setKey___.labelString:	??????????(%_S)...
! Emacs*XlwMenu.unsetKey___.labelString:	%_Unset Key...
Emacs*XlwMenu.unsetKey___.labelString:	??????????????(%_U)...
! Emacs*XlwMenu.mousePasteAtTextCursorNotClickedLocation.labelString:	%_Mouse Paste at Text Cursor (not Clicked Location)
Emacs*XlwMenu.mousePasteAtTextCursorNotClickedLocation.labelString:	??????????????????????????????????(????????????????????????)(%_M)
! Emacs*XlwMenu.teachExtendedCommands.labelString:	%_Teach Extended Commands
Emacs*XlwMenu.teachExtendedCommands.labelString:	????????????????????(%_T)
! Emacs*XlwMenu.setPrinterNameForGenericPrintSupport___.labelString:	Set Printer %_Name for Generic Print Support...
Emacs*XlwMenu.setPrinterNameForGenericPrintSupport___.labelString:	????????????????????????????????????????????????(%_N)
! Emacs*XlwMenu.commandLineSwitchesForLprLp___.labelString:	Command-Line %_Switches for `lpr'/`lp'...
Emacs*XlwMenu.commandLineSwitchesForLprLp___.labelString:	'lpr'/'lp'????????????????????????...
! Emacs*XlwMenu.prettyPrintPaperSize.labelString:	%_Pretty-Print Paper Size
Emacs*XlwMenu.prettyPrintPaperSize.labelString:	????????????????????(%_P)
! Emacs*XlwMenu.colorPrinting.labelString:	%_Color Printing
Emacs*XlwMenu.colorPrinting.labelString:	??????????(%_C)
! Emacs*XlwMenu.letter.labelString:	%_Letter
Emacs*XlwMenu.letter.labelString:	??????(%_L)
! Emacs*XlwMenu.lette_rSmall.labelString:	Lette%_r-Small
Emacs*XlwMenu.lette_rSmall.labelString:	????????(%_R)
! Emacs*XlwMenu.le_gal.labelString:	Le%_gal
Emacs*XlwMenu.le_gal.labelString:	????????(%_G)
! Emacs*XlwMenu.statement.labelString:	%_Statement
Emacs*XlwMenu.statement.labelString:	??????????????(%_S)
! Emacs*XlwMenu.executive.labelString:	%_Executive
Emacs*XlwMenu.executive.labelString:	??????????????(%_E)
! Emacs*XlwMenu.tabloid.labelString:	%_Tabloid
Emacs*XlwMenu.tabloid.labelString:	?????????? (%_T)
! Emacs*XlwMenu.le_dger.labelString:	Le%_dger
Emacs*XlwMenu.le_dger.labelString:	????(%_D)
! Emacs*XlwMenu.a_3.labelString:	A%_3
Emacs*XlwMenu.a_3.labelString:		A%_3
! Emacs*XlwMenu.a4.labelString:	%_A4
Emacs*XlwMenu.a4.labelString:	%_A4
! Emacs*XlwMenu.a4s_mall.labelString:	A4s%_mall
Emacs*XlwMenu.a4s_mall.labelString:	A4??(%_M)
! Emacs*XlwMenu.b_4.labelString:	B%_4
Emacs*XlwMenu.b_4.labelString:		B%_4
! Emacs*XlwMenu.b5.labelString:	%_B5
Emacs*XlwMenu.b5.labelString:	%_B5
! Emacs*XlwMenu.composeMailWith.labelString:	%_Compose Mail With
Emacs*XlwMenu.composeMailWith.labelString:	??????????????????(%_C)
! Emacs*XlwMenu.setMyEmailAddress___.labelString:	Set My %_Email Address...
Emacs*XlwMenu.setMyEmailAddress___.labelString:	????????????????????????(%_E)...
! Emacs*XlwMenu.setMachineEmailName___.labelString:	Set %_Machine Email Name...
Emacs*XlwMenu.setMachineEmailName___.labelString:	??????????????????????????(%_M)
! Emacs*XlwMenu.setSMTPServer___.labelString:	Set %_SMTP Server...
Emacs*XlwMenu.setSMTPServer___.labelString:	SMTP????????????(%_S)...
! Emacs*XlwMenu.sMTPDebugInfo.labelString:	SMTP %_Debug Info
Emacs*XlwMenu.sMTPDebugInfo.labelString:	SMTP????????????(%_D)...
! Emacs*XlwMenu.openURLsWith.labelString:	%_Open URLs With
Emacs*XlwMenu.openURLsWith.labelString:		URL????????????(%_O)
! Emacs*XlwMenu.defaultEmacsMailer.labelString:	%_Default Emacs Mailer
Emacs*XlwMenu.defaultEmacsMailer.labelString:	??????????Emacs??????(%_D)
! Emacs*XlwMenu.mH.labelString:	%_MH
Emacs*XlwMenu.mH.labelString:	%_MH
! Emacs*XlwMenu.gNUS.labelString:	%_GNUS
Emacs*XlwMenu.gNUS.labelString:	%_GNUS
! Emacs*XlwMenu.emacsW3.labelString:	%_Emacs-W3
Emacs*XlwMenu.emacsW3.labelString:	%_Emacs-W3
! Emacs*XlwMenu.netscape.labelString:	%_Netscape
Emacs*XlwMenu.netscape.labelString:	%_Netscape
! Emacs*XlwMenu.mosaic.labelString:	%_Mosaic
Emacs*XlwMenu.mosaic.labelString:	%_Mosaic
! Emacs*XlwMenu.mosaicCCI.labelString:	Mosaic (%_CCI)
Emacs*XlwMenu.mosaicCCI.labelString:	Mosaic (%_CCI)
! Emacs*XlwMenu.iXIMosaic.labelString:	%_IXI Mosaic
Emacs*XlwMenu.iXIMosaic.labelString:	%_IXI Mosaic
! Emacs*XlwMenu.lynxXterm.labelString:	%_Lynx (xterm)
Emacs*XlwMenu.lynxXterm.labelString:	%_Lynx (xterm)
! Emacs*XlwMenu.l_ynxXemacs.labelString:	L%_ynx (xemacs)
Emacs*XlwMenu.l_ynxXemacs.labelString:	L%_ynx (xemacs)
! Emacs*XlwMenu.grail.labelString:	%_Grail
Emacs*XlwMenu.grail.labelString:	%_Grail
! Emacs*XlwMenu.kfm.labelString:	%_Kfm
Emacs*XlwMenu.kfm.labelString:		%_Kfm
! Emacs*XlwMenu.debugOnError.labelString:	%_Debug on Error
Emacs*XlwMenu.debugOnError.labelString:	????????????????(%_D)
! Emacs*XlwMenu.debugOnQuit.labelString:	Debug on %_Quit
Emacs*XlwMenu.debugOnQuit.labelString:	??????????????(%_Q)
! Emacs*XlwMenu.debugOnS_ignal.labelString:	Debug on S%_ignal
Emacs*XlwMenu.debugOnS_ignal.labelString:	??????????????????(%_I)
! Emacs*XlwMenu.stackTraceOnError.labelString:	%_Stack Trace on Error
Emacs*XlwMenu.stackTraceOnError.labelString:	????????????????????????(%_S)
! Emacs*XlwMenu.stackTraceOnSi_gnal.labelString:	Stack Trace on Si%_gnal
Emacs*XlwMenu.stackTraceOnSi_gnal.labelString:	??????????????????????????(%_G)
! Emacs*XlwMenu.scrollbars.labelString:	%_Scrollbars
Emacs*XlwMenu.scrollbars.labelString:	??????????????(%_S)
! Emacs*XlwMenu.wrapLongLines.labelString:	%_Wrap Long Lines
Emacs*XlwMenu.wrapLongLines.labelString:	????????????????(%_W)
! Emacs*XlwMenu.3DModeline.labelString:	%_3D Modeline
Emacs*XlwMenu.3DModeline.labelString:	3D????????????(%_3)
! Emacs*XlwMenu.modelineHorizontalScrolling.labelString:	Modeline %_Horizontal Scrolling
Emacs*XlwMenu.modelineHorizontalScrolling.labelString:	????????????????????????????(%_H)
! Emacs*XlwMenu.toolbarsVisible.labelString:	%_Toolbars Visible
Emacs*XlwMenu.toolbarsVisible.labelString:	????????????????(%_T)
! Emacs*XlwMenu.toolbarsCa_ptioned.labelString:	Toolbars Ca%_ptioned
Emacs*XlwMenu.toolbarsCa_ptioned.labelString:	????????????????????????????(%_P)
! Emacs*XlwMenu.defaultToolba_rLocation.labelString:	Default Toolba%_r Location
Emacs*XlwMenu.defaultToolba_rLocation.labelString:	??????????????????????????(%_R)
! Emacs*XlwMenu.b_uffersTabVisible.labelString:	B%_uffers Tab Visible
Emacs*XlwMenu.b_uffersTabVisible.labelString:	??????????????????(%_U)
! Emacs*XlwMenu.defaultGutterLocation.labelString:	Default %_Gutter Location
Emacs*XlwMenu.defaultGutterLocation.labelString:	??????????????????????(%_G)
! Emacs*XlwMenu.blinkingCursor.labelString:	%_Blinking Cursor
Emacs*XlwMenu.blinkingCursor.labelString:	??????????????(%_B)
! Emacs*XlwMenu.bl_ockCursor.labelString:	Bl%_ock Cursor
Emacs*XlwMenu.bl_ockCursor.labelString:	????????????????(%_O)
! Emacs*XlwMenu.barCursor1Pixel.labelString:	Bar Cursor (%_1 Pixel)
Emacs*XlwMenu.barCursor1Pixel.labelString:	????????????(%_1????????)
! Emacs*XlwMenu.barCursor2Pixels.labelString:	Bar Cursor (%_2 Pixels)
Emacs*XlwMenu.barCursor2Pixels.labelString:	????????????(%_2????????)
! Emacs*XlwMenu.pa_renHighlighting.labelString:	Pa%_ren Highlighting
Emacs*XlwMenu.pa_renHighlighting.labelString:	??????????????(%_R)
! Emacs*XlwMenu.lineNumbers.labelString:	%_Line Numbers
Emacs*XlwMenu.lineNumbers.labelString:		??????(%_L)
! Emacs*XlwMenu.columnNumbers.labelString:	%_Column Numbers
Emacs*XlwMenu.columnNumbers.labelString:	??????????(%_C)
! Emacs*XlwMenu.otherWindowLocation.labelString:	"Other %_Window" Location
Emacs*XlwMenu.otherWindowLocation.labelString:	"??????????????"????(%_W)
! Emacs*XlwMenu.none.labelString:	%_None
Emacs*XlwMenu.none.labelString:	????(%_N)
! Emacs*XlwMenu.asText.labelString:	As %_Text
Emacs*XlwMenu.asText.labelString:	??????????????(%_T)
! Emacs*XlwMenu.asScrollbar.labelString:	As %_Scrollbar
Emacs*XlwMenu.asScrollbar.labelString:	????????????????????(%_S)
! Emacs*XlwMenu.top.labelString:	%_Top
Emacs*XlwMenu.top.labelString:	??(%_T)
! Emacs*XlwMenu.bottom.labelString:	%_Bottom
Emacs*XlwMenu.bottom.labelString:	??(%_B)
! Emacs*XlwMenu.left.labelString:	%_Left
Emacs*XlwMenu.left.labelString:		??(%_L)
! Emacs*XlwMenu.right.labelString:	%_Right
Emacs*XlwMenu.right.labelString:	??(%_R)
! Emacs*XlwMenu.blinkingParen.labelString:	%_Blinking Paren
Emacs*XlwMenu.blinkingParen.labelString:	??????????(%_B)
! Emacs*XlwMenu.steadyParen.labelString:	%_Steady Paren
Emacs*XlwMenu.steadyParen.labelString:		????????????????(%_S)
! Emacs*XlwMenu.expression.labelString:	%_Expression
Emacs*XlwMenu.expression.labelString:	??(%_E)
! Emacs*XlwMenu.alwaysInSameFrame.labelString:	%_Always in Same Frame
Emacs*XlwMenu.alwaysInSameFrame.labelString:	??????????????????(%_A)
! Emacs*XlwMenu.otherFrame2FramesMax.labelString:	Other Frame (%_2 Frames Max)
Emacs*XlwMenu.otherFrame2FramesMax.labelString:	????????????(????%_2????????)
! Emacs*XlwMenu.otherFrame3FramesMax.labelString:	Other Frame (%_3 Frames Max)
Emacs*XlwMenu.otherFrame3FramesMax.labelString:	????????????(????%_3????????)
! Emacs*XlwMenu.otherFrame4FramesMax.labelString:	Other Frame (%_4 Frames Max)
Emacs*XlwMenu.otherFrame4FramesMax.labelString:	????????????(????%_4????????)
! Emacs*XlwMenu.otherFrame5FramesMax.labelString:	Other Frame (%_5 Frames Max)
Emacs*XlwMenu.otherFrame5FramesMax.labelString:	????????????(????(%_5????????)
! Emacs*XlwMenu.alwaysCreateNewFrame.labelString:	Always Create %_New Frame
Emacs*XlwMenu.alwaysCreateNewFrame.labelString:	??????????????????????
! Emacs*XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	%_Temp Buffers Always in Same Frame
Emacs*XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	????????????????????????????????(%_T)
! Emacs*XlwMenu.tempBuffersLikeOtherBuffers.labelString:	Temp Buffers %_Like Other Buffers
Emacs*XlwMenu.tempBuffersLikeOtherBuffers.labelString:	??????????????????????????????????????????(%_L)
! Emacs*XlwMenu.makeCurrentFrameGnuservTarget.labelString:	%_Make Current Frame Gnuserv Target
Emacs*XlwMenu.makeCurrentFrameGnuservTarget.labelString:	????????????????Gnuserv????????????(%_M)
! Emacs*XlwMenu.frameLocalFontMenu.labelString:	%_Frame-Local Font Menu
Emacs*XlwMenu.frameLocalFontMenu.labelString:	??????????????????????????????????(%_F)
! Emacs*XlwMenu.altMetaSelectsMenuItems.labelString:	%_Alt/Meta Selects Menu Items
Emacs*XlwMenu.altMetaSelectsMenuItems.labelString:	Alt/Meta????????????????????????(%_A)
! Emacs*XlwMenu.buffersMenuLength___.labelString:	Buffers Menu %_Length...
Emacs*XlwMenu.buffersMenuLength___.labelString:		??????????????????????(%_L)...
! Emacs*XlwMenu.multiOperationBuffersSubMenus.labelString:	%_Multi-Operation Buffers Sub-Menus
Emacs*XlwMenu.multiOperationBuffersSubMenus.labelString:	????????????????????????????????????????(%_M)
! Emacs*XlwMenu.s_ubmenusForBufferGroups.labelString:	S%_ubmenus for Buffer Groups
Emacs*XlwMenu.s_ubmenusForBufferGroups.labelString:	??????????????????????????????(%_U)
! Emacs*XlwMenu.verboseBufferMenuEntries.labelString:	%_Verbose Buffer Menu Entries
Emacs*XlwMenu.verboseBufferMenuEntries.labelString:	????????????????????????????(%_V)
! Emacs*XlwMenu.buffersMenuSorting.labelString:	Buffers Menu %_Sorting
Emacs*XlwMenu.buffersMenuSorting.labelString:	????????????????????????(%_S)
! Emacs*XlwMenu.ignoreScaledFonts.labelString:	%_Ignore Scaled Fonts
Emacs*XlwMenu.ignoreScaledFonts.labelString:	??????????????????(%_I)
! Emacs*XlwMenu.inThisBuffer.labelString:	%_In This Buffer
Emacs*XlwMenu.inThisBuffer.labelString:	????????????(%_I)
! Emacs*XlwMenu.automatic.labelString:	%_Automatic
Emacs*XlwMenu.automatic.labelString:	????(%_A)
! Emacs*XlwMenu.forceRehighlightInThisBuffer.labelString:	Force %_Rehighlight in this Buffer
Emacs*XlwMenu.forceRehighlightInThisBuffer.labelString:	????????????????????????
! Emacs*XlwMenu.fonts.labelString:	%_Fonts
Emacs*XlwMenu.fonts.labelString:	????????(%_F)
! Emacs*XlwMenu.colors.labelString:	%_Colors
Emacs*XlwMenu.colors.labelString:	??????(%_C)
! Emacs*XlwMenu.1Least.labelString:	%_1 Least
Emacs*XlwMenu.1Least.labelString:	%_1 ????
! Emacs*XlwMenu.2More.labelString:	%_2 More
Emacs*XlwMenu.2More.labelString:	%_2 ??????????
! Emacs*XlwMenu.3EvenMore.labelString:	%_3 Even More
Emacs*XlwMenu.3EvenMore.labelString:	%_3 ??????
! Emacs*XlwMenu.4Most.labelString:	%_4 Most
Emacs*XlwMenu.4Most.labelString:	%_4 ????
! Emacs*XlwMenu.lazyLock.labelString:	Lazy %_Lock
Emacs*XlwMenu.lazyLock.labelString:	??????????????(%_L)
! Emacs*XlwMenu.lazyShot.labelString:	Lazy %_Shot
Emacs*XlwMenu.lazyShot.labelString:	????????????????(%_S)
! Emacs*XlwMenu.cac_hing.labelString:	Cac%_hing
Emacs*XlwMenu.cac_hing.labelString:	????????????(%_H)
! Emacs*XlwMenu.1Anagnostiko___Avantgarde.labelString:	%_1 Anagnostiko  ... Avantgarde
Emacs*XlwMenu.1Anagnostiko___Avantgarde.labelString:	%_1 Anagnostiko  ... Avantgarde
! Emacs*XlwMenu.2Bookman___Chimera.labelString:	%_2 Bookman      ... Chimera
Emacs*XlwMenu.2Bookman___Chimera.labelString:	%_2 Bookman      ... Chimera
! Emacs*XlwMenu.3Courier___Helvetica.labelString:	%_3 Courier      ... Helvetica
Emacs*XlwMenu.3Courier___Helvetica.labelString:	%_3 Courier      ... Helvetica
! Emacs*XlwMenu.4Kathimerini___LuxiSans.labelString:	%_4 Kathimerini  ... Luxi Sans
Emacs*XlwMenu.4Kathimerini___LuxiSans.labelString:	%_4 Kathimerini  ... Luxi Sans
! Emacs*XlwMenu.5LuxiSerif___Palatino.labelString:	%_5 Luxi Serif   ... Palatino
Emacs*XlwMenu.5LuxiSerif___Palatino.labelString:	%_5 Luxi Serif   ... Palatino
! Emacs*XlwMenu.6PalladioL___Zysong18030.labelString:	%_6 Palladio L   ... Zysong18030
Emacs*XlwMenu.6PalladioL___Zysong18030.labelString:	%_6 Palladio L   ... Zysong18030
! Emacs*XlwMenu.15.labelString:	%_1 5
Emacs*XlwMenu.15.labelString:	%_1 5
! Emacs*XlwMenu.26.labelString:	%_2 6
Emacs*XlwMenu.26.labelString:	%_2 6
! Emacs*XlwMenu.37.labelString:	%_3 7
Emacs*XlwMenu.37.labelString:	%_3 7
! Emacs*XlwMenu.48.labelString:	%_4 8
Emacs*XlwMenu.48.labelString:	%_4 8
! Emacs*XlwMenu.59.labelString:	%_5 9
Emacs*XlwMenu.59.labelString:	%_5 9
! Emacs*XlwMenu.610.labelString:	%_6 10
Emacs*XlwMenu.610.labelString:	%_6 10
! Emacs*XlwMenu.711.labelString:	%_7 11
Emacs*XlwMenu.711.labelString:	%_7 11
! Emacs*XlwMenu.812.labelString:	%_8 12
Emacs*XlwMenu.812.labelString:	%_8 12
! Emacs*XlwMenu.913.labelString:	%_9 13
Emacs*XlwMenu.913.labelString:	%_9 13
! Emacs*XlwMenu.014.labelString:	%_0 14
Emacs*XlwMenu.014.labelString:	%_0 14
! Emacs*XlwMenu.a15.labelString:	%_a 15
Emacs*XlwMenu.a15.labelString:	%_a 15
! Emacs*XlwMenu.b16.labelString:	%_b 16
Emacs*XlwMenu.b16.labelString:	%_b 16
! Emacs*XlwMenu.c17.labelString:	%_c 17
Emacs*XlwMenu.c17.labelString:	%_c 17
! Emacs*XlwMenu.d18.labelString:	%_d 18
Emacs*XlwMenu.d18.labelString:	%_d 18
! Emacs*XlwMenu.e19.labelString:	%_e 19
Emacs*XlwMenu.e19.labelString:	%_e 19
! Emacs*XlwMenu.f20.labelString:	%_f 20
Emacs*XlwMenu.f20.labelString:	%_f 20
! Emacs*XlwMenu.g23.labelString:	%_g 23
Emacs*XlwMenu.g23.labelString:	%_g 23
! Emacs*XlwMenu.h24.labelString:	%_h 24
Emacs*XlwMenu.h24.labelString:	%_h 24
! Emacs*XlwMenu.goToPreviousBuffer.labelString:	Go To %_Previous Buffer
Emacs*XlwMenu.goToPreviousBuffer.labelString:	??????????????????(%_P)
! Emacs*XlwMenu.goToBuffer___.labelString:	Go To %_Buffer...
Emacs*XlwMenu.goToBuffer___.labelString:	??????????????(%_B)...
! Emacs*XlwMenu.listAllBuffers.labelString:	%_List All Buffers
Emacs*XlwMenu.listAllBuffers.labelString:	??????????????????????????(%_L)
! Emacs*XlwMenu.deleteBuffer.labelString:	%_Delete Buffer
Emacs*XlwMenu.deleteBuffer.labelString:	??????????????(%_D)
! Emacs*XlwMenu..labelString:	%_
Emacs*XlwMenu..labelString:	%_
! Emacs*XlwMenu.evaluateRegionOrDefun.labelString:	%_Evaluate Region or Defun
Emacs*XlwMenu.evaluateRegionOrDefun.labelString:	????????????defun??????(%_E)
! Emacs*XlwMenu.evaluateWholeBuffer.labelString:	Evaluate %_Whole Buffer
Emacs*XlwMenu.evaluateWholeBuffer.labelString:		??????????????????(%_W)
! Emacs*XlwMenu.evaluateLastSExpression.labelString:	Evaluate Last %_S-expression
Emacs*XlwMenu.evaluateLastSExpression.labelString:	??????S????????(%_S)
! Emacs*XlwMenu.findFunction___.labelString:	Find %_Function...
Emacs*XlwMenu.findFunction___.labelString:	??????????(%_F)...
! Emacs*XlwMenu.findVariable___.labelString:	Find %_Variable...
Emacs*XlwMenu.findVariable___.labelString:	??????????(%_V)...
! Emacs*XlwMenu.helpOnFunction___.labelString:	%_Help on Function...
Emacs*XlwMenu.helpOnFunction___.labelString:	????????????????(%_H)...
! Emacs*XlwMenu.hel_pOnVariable___.labelString:	Hel%_p on Variable...
Emacs*XlwMenu.hel_pOnVariable___.labelString:	????????????????(%_P)...
! Emacs*XlwMenu.instrumentThisDefunForDebugging.labelString:	Instrument This Defun for %_Debugging
Emacs*XlwMenu.instrumentThisDefunForDebugging.labelString:	????defun????????????????(%_D)
! Emacs*XlwMenu.traceFunction___.labelString:	%_Trace Function...
Emacs*XlwMenu.traceFunction___.labelString:	??????????????(%_T)...
! Emacs*XlwMenu.untraceAllFunctions.labelString:	%_Untrace All Functions
Emacs*XlwMenu.untraceAllFunctions.labelString:	??????????????????????????????(%_U)
! Emacs*XlwMenu.commentOutRegion.labelString:	%_Comment Out Region
Emacs*XlwMenu.commentOutRegion.labelString:	??????????????????????????(%_C)
! Emacs*XlwMenu.indentRegionOrBalancedExpression.labelString:	%_Indent Region or Balanced Expression
Emacs*XlwMenu.indentRegionOrBalancedExpression.labelString:	??????????????????????(%_I)
! Emacs*XlwMenu.i_ndentDefun.labelString:	I%_ndent Defun
Emacs*XlwMenu.i_ndentDefun.labelString:	defun????????????(%_N)
! Emacs*XlwMenu.lookForDebugOnErrorUnderOptionsTroubleshooting.labelString:	Look for debug-on-error under Options->Troubleshooting
Emacs*XlwMenu.lookForDebugOnErrorUnderOptionsTroubleshooting.labelString:	[??????????]-[??????????????????????]??[????????????????]??????????????????
! Emacs*XlwMenu.aboutXEmacs___.labelString:	%_About XEmacs...
Emacs*XlwMenu.aboutXEmacs___.labelString:	XEmacs????????(%_A)...
! Emacs*XlwMenu.whatSNewInXEmacs.labelString:	What's %_New in XEmacs
Emacs*XlwMenu.whatSNewInXEmacs.labelString:	XEmacs????????(%_N)
! Emacs*XlwMenu.obtainingXEmacs.labelString:	%_Obtaining XEmacs
Emacs*XlwMenu.obtainingXEmacs.labelString:	XEmacs??????????????(%_O)
! Emacs*XlwMenu.infoOnlineDocs.labelString:	%_Info (Online Docs)
Emacs*XlwMenu.infoOnlineDocs.labelString:	%_Info (??????????doc)
! Emacs*XlwMenu.xEmacsFAQ.labelString:	XEmacs %_FAQ
Emacs*XlwMenu.xEmacsFAQ.labelString:	XEmacs %_FAQ
! Emacs*XlwMenu.tutorials.labelString:	%_Tutorials
Emacs*XlwMenu.tutorials.labelString:	??????????????(%_T)
! Emacs*XlwMenu.samples.labelString:	%_Samples
Emacs*XlwMenu.samples.labelString:	????????(%_S)
! Emacs*XlwMenu.commandsKeys.labelString:	%_Commands & Keys
Emacs*XlwMenu.commandsKeys.labelString:	??????????????(%_C)
! Emacs*XlwMenu.recentMessages.labelString:	%_Recent Messages
Emacs*XlwMenu.recentMessages.labelString:	????????????????(%_R)
! Emacs*XlwMenu.misc.labelString:	%_Misc
Emacs*XlwMenu.misc.labelString:	??????(%_M)
! Emacs*XlwMenu.sendBugReport___.labelString:	Send %_Bug Report...
Emacs*XlwMenu.sendBugReport___.labelString:	??????????????????(%_B)...
! Emacs*XlwMenu.infoContents.labelString:	%_Info Contents
Emacs*XlwMenu.infoContents.labelString:	Info??????????(%_I)
! Emacs*XlwMenu.lookupKeyBinding___.labelString:	Lookup %_Key Binding...
Emacs*XlwMenu.lookupKeyBinding___.labelString:	??????????????????????(%_K)...
! Emacs*XlwMenu.lookupCommand___.labelString:	Lookup %_Command...
Emacs*XlwMenu.lookupCommand___.labelString:	????????????(%_C)...
! Emacs*XlwMenu.lookupFunction___.labelString:	Lookup %_Function...
Emacs*XlwMenu.lookupFunction___.labelString:	????????(%_F)...
! Emacs*XlwMenu.lookupTopic___.labelString:	Lookup %_Topic...
Emacs*XlwMenu.lookupTopic___.labelString:	????????????(%_T)...
! Emacs*XlwMenu.fAQLocal.labelString:	%_FAQ (local)
Emacs*XlwMenu.fAQLocal.labelString:	%_FAQ (????????)
! Emacs*XlwMenu.fAQViaWWW.labelString:	FAQ via %_WWW
Emacs*XlwMenu.fAQViaWWW.labelString:	WWW????FAQ(%_W)
! Emacs*XlwMenu.homePage.labelString:	%_Home Page
Emacs*XlwMenu.homePage.labelString:	????????????(%_H)
! Emacs*XlwMenu.defaultJapanese.labelString:	%_Default (Japanese)
Emacs*XlwMenu.defaultJapanese.labelString:	??????????(%_D) (??????)
! Emacs*XlwMenu.1ThaiXTIS.labelString:	%_1 Thai-XTIS
Emacs*XlwMenu.1ThaiXTIS.labelString:	%_1 ??????-XTIS
! Emacs*XlwMenu.2Korean.labelString:	%_2 Korean
Emacs*XlwMenu.2Korean.labelString:	%_2 ??????
! Emacs*XlwMenu.3Slovenian.labelString:	%_3 Slovenian
Emacs*XlwMenu.3Slovenian.labelString:	%_3 ????????????
! Emacs*XlwMenu.4German.labelString:	%_4 German
Emacs*XlwMenu.4German.labelString:	%_4 ????????
! Emacs*XlwMenu.5Czech.labelString:	%_5 Czech
Emacs*XlwMenu.5Czech.labelString:	%_5 ????????
! Emacs*XlwMenu.6Romanian.labelString:	%_6 Romanian
Emacs*XlwMenu.6Romanian.labelString:	%_6 ????????????
! Emacs*XlwMenu.7Polish.labelString:	%_7 Polish
Emacs*XlwMenu.7Polish.labelString:	%_7 ????????????
! Emacs*XlwMenu.8Croatian.labelString:	%_8 Croatian
Emacs*XlwMenu.8Croatian.labelString:	%_8 ????????????
! Emacs*XlwMenu.9Norwegian.labelString:	%_9 Norwegian
Emacs*XlwMenu.9Norwegian.labelString:	%_9 ????????????
! Emacs*XlwMenu.0French.labelString:	%_0 French
Emacs*XlwMenu.0French.labelString:	%_0 ??????????
! Emacs*XlwMenu.aEnglish.labelString:	%_a English
Emacs*XlwMenu.aEnglish.labelString:	%_a ????
! Emacs*XlwMenu.bCyrillicALT.labelString:	%_b Cyrillic-ALT
Emacs*XlwMenu.bCyrillicALT.labelString:	%_b ??????????-ALT
! Emacs*XlwMenu.cCyrillicWin.labelString:	%_c Cyrillic-Win
Emacs*XlwMenu.cCyrillicWin.labelString: %_c ??????????-Win
! Emacs*XlwMenu.dCyrillicKOI8.labelString:	%_d Cyrillic-KOI8
Emacs*XlwMenu.dCyrillicKOI8.labelString: %_d ??????????-KOI8
! Emacs*XlwMenu.eCyrillicISO.labelString:	%_e Cyrillic-ISO
Emacs*XlwMenu.eCyrillicISO.labelString: %_d ??????????-ISO
! Emacs*XlwMenu.sampleInit_el.labelString:	Sample %_init.el
Emacs*XlwMenu.sampleInit_el.labelString:	????????init.el(%_I)
! Emacs*XlwMenu.sample__Xdefaults.labelString:	Sample .%_Xdefaults
Emacs*XlwMenu.sample__Xdefaults.labelString:	????????.Xdefaults(%_X)
! Emacs*XlwMenu.sampleEnriched.labelString:	Sample %_enriched
Emacs*XlwMenu.sampleEnriched.labelString:	????????enriched(%_E)
! Emacs*XlwMenu.mode.labelString:	%_Mode
Emacs*XlwMenu.mode.labelString:	??????(%_M)
! Emacs*XlwMenu.aproposDocs___.labelString:	Apropos %_Docs...
Emacs*XlwMenu.aproposDocs___.labelString:	Apropos????????????(%_D)...
! Emacs*XlwMenu.key___.labelString:	%_Key...
Emacs*XlwMenu.key___.labelString:	????(%_I)...
! Emacs*XlwMenu.bindings.labelString:	%_Bindings
Emacs*XlwMenu.bindings.labelString:	??????????????(%_B)
! Emacs*XlwMenu.mouseBindings.labelString:	%_Mouse Bindings
Emacs*XlwMenu.mouseBindings.labelString:	????????????????????(%_M)
! Emacs*XlwMenu.recentKeys.labelString:	%_Recent Keys
Emacs*XlwMenu.recentKeys.labelString:	??????????(%_R)
! Emacs*XlwMenu.function___.labelString:	%_Function...
Emacs*XlwMenu.function___.labelString:	????(%_F)...
! Emacs*XlwMenu.variable___.labelString:	%_Variable...
Emacs*XlwMenu.variable___.labelString:	????(%_V)...
! Emacs*XlwMenu.locateCommand___.labelString:	%_Locate Command...
Emacs*XlwMenu.locateCommand___.labelString:	??????????locate(%_L)...
! Emacs*XlwMenu.currentInstallationInfo.labelString:	%_Current Installation Info
Emacs*XlwMenu.currentInstallationInfo.labelString:	????????????????????????Info(%_C)
! Emacs*XlwMenu.noWarranty.labelString:	%_No Warranty
Emacs*XlwMenu.noWarranty.labelString:	??????(%_N)
! Emacs*XlwMenu.xEmacsLicense.labelString:	XEmacs %_License
Emacs*XlwMenu.xEmacsLicense.labelString:	XEmacs??????????(%_L)
! Emacs*XlwMenu.findPackages.labelString:	Find %_Packages
Emacs*XlwMenu.findPackages.labelString:	??????????????(%_P)
! Emacs*XlwMenu.viewSplashScreen.labelString:	View %_Splash Screen
Emacs*XlwMenu.viewSplashScreen.labelString:	????????????????????????????(%_S)
! Emacs*XlwMenu.unixManual___.labelString:	%_Unix Manual...
Emacs*XlwMenu.unixManual___.labelString:	Unix??????????(%_U)...


--- NEW FILE Emacs.ad.ko_KR.UTF-8 ---
! XEmacs 21.x ??? ?????? (??????)
!
!	Xiaolin Park <xlpark at kankou.cs.uec.ac.jp>
!			Time-stamp: <03/10/17 21:10:54 petersen>
!
! This is the app-defaults file for XEmacs.
!
! This used to be identical to sample.Xdefaults, but the resources
! below have been rewritten to be as general as possible to avoid
! overriding user resources.  Other than the form rewriting, both
! files should be kept in sync. 
! 
! The resources below are loaded into the XEmacs executable at compile-time:
! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
! effect.
! 
! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
! (or whatever the standard app-defaults directory is at your site) to cause
! it to be consulted at run-time.  (Do this only for site-wide customizations:
! personal customizations should be put into ~/.Xdefaults instead.)
! Note that the file must be named Emacs, not XEmacs.
! 
! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of
! the various resources and the syntax for setting them.
! 
! Energize users: note that this is not the same app-defaults file that is
! used with the Energize-specific version of XEmacs.


! Colors and backgrounds.
! ======================
! The contrasts of these colors will cause them to map to the appropriate
! one of "black" or "white" on monochrome systems.
! 
! The valid color names on your system can be found by looking in the file
! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/.

! ! Set the modeline colors.
! Emacs.modeline*attributeForeground:	Black
! Emacs.modeline*attributeBackground:	Gray75

! ! Set the color of the text cursor.
! Emacs.text-cursor*attributeBackground:	Red3

! If you want to set the color of the mouse pointer, do this:
! Emacs.pointer*attributeForeground:	Black
! If you want to set the background of the mouse pointer, do this:
! Emacs.pointer*attributeBackground:	White
! Note that by default, the pointer foreground and background are the same
! as the default face.

! Set the menubar colors.  This overrides the default foreground and
! background colors specified above.
*menubar*Foreground:			Gray30
*menubar*Background:			Gray80
! This is for buttons in the menubar.  
! Yellow would be better, but that would map to white on monochrome.
*menubar*buttonForeground:		Blue
*XlwMenu*highlightForeground:		Red
*XlwMenu*titleForeground:		Maroon
*XlwMenu*selectColor:			ForestGreen
*XmToggleButton*selectColor:		ForestGreen

! Specify the colors of popup menus.
*popup*Foreground:			Black
*popup*Background:			Gray80

! Specify the colors of the various sub-widgets of the dialog boxes.
*dialog*Foreground:			Black
! #A5C0C1 is a shade of blue
*dialog*Background:			#A5C0C1
! The following three are for Motif dialog boxes ...
*dialog*XmTextField*Background:		WhiteSmoke
*dialog*XmText*Background:		WhiteSmoke
*dialog*XmList*Background:		WhiteSmoke
! While this one is for Athena dialog boxes.
*dialog*Command*Background:		WhiteSmoke

! Xlw Scrollbar colors
*XlwScrollBar*Foreground:		Gray30
*XlwScrollBar*Background:		Gray80
*XmScrollBar*Foreground:		Gray30
*XmScrollBar*Background:		Gray80

!
! The Lucid Scrollbar supports two added resources, SliderStyle is either
! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
! of the slider that depresses when the slider is clicked on.  ArrowPosition is
! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
! of the scrollbar, same puts both arrows at the same end, like the Amiga.
!
Emacs*XlwScrollBar.SliderStyle:    dimple
! Emacs*XlwScrollBar.ArrowPosition:  opposite

!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

! *topToolBarShadowColor:		Gray90
! *bottomToolBarShadowColor:		Gray40
! *backgroundToolBarColor:		Gray80
! *toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
Emacs.default.attributeFont:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
*menubar*Font:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*popup*Font:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*XmTextField*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*XmText*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*XmList*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField*translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton*translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! ! XIM fontset (defaults to system fontset default)
! ! *EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
! !    Japanese localization resources for XEmacs.
! ! @(#)Emacs	1.3 96/09/22
! !    Copyright (C) 1996 Sun Microsystems, Inc.
! !!
! ! This file is part of XEmacs.
! ! 
! ! XEmacs is free software; you can redistribute it and/or modify it
! ! under the terms of the GNU General Public License as published by the
! ! Free Software Foundation; either version 2, or (at your option) any
! ! later version.
! ! XEmacs 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 XEmacs; see the file COPYING.  If not, write to the
! ! Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! ! Boston, MA 02111-1307, USA.
! ! Copyright (C) 1996 Sun Microsystems Inc.
! !
! ! Japanese Resources to be placed in etc/app-defaults/ja/Emacs
! ! for xemacs-mule.  It is same on another languages such like fr,
! ! if you want to have French menu label, place it on
! ! etc/app-defaults/fr/Emacs.
! 
! ! Pulldown menu internationalization.  The first line of the file
! ! "*XlwMenu.resourceLabels: True" has to be there to make sure
! ! all the labelString will be read and displayed by X.
! *XlwMenu.resourceLabels: True
! 
! ! CDE doesn't require this but OpenWindows does.
! ! Note that this `gothic' font family is effective just for Japanese.
! ! And fontList is just used under Motif menubar.
! !*fontList: -misc-fixed-medium-r-normal--16-*-*-*-*-*-*-*:
! *fontList: -*-gothic-medium-r-normal--16-*-*-*-*-*-*-*:
! !! FontSet for menus when you use --with-xfs or --with-xim=xlib.
! *fontSet: -daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*
! 
! ! Starting below here are menu label string which can be translated to
! ! different languages. 
! ! Example: *XlwMenu.file.labelString: File  
! ! Characters before the ":" sign, "Example: *XlwMenu.file.labelString"
! ! can not be changed. They must stay exactly the way they are.
! ! The only string to be translated is the string, "File".
! ! Some resource names such as "file", "quit" have been used in several
! ! places.  However, each of them only has to be translated once in this X
! ! resource file.
! ! *XlwMenu.readMailVM___.labelString:	Read Mail (VM)...
! *XlwMenu.readMailVM___.labelString:	????????? ?????? (VM)...
! ! *XlwMenu.readMailMH___.labelString:	Read Mail (MH)...
! *XlwMenu.readMailMH___.labelString:	????????? ?????? (MH)...
! ! *XlwMenu.sendMail___.labelString:	Send mail...
! *XlwMenu.sendMail___.labelString:	????????? ?????????
! ! *XlwMenu.usenetNews.labelString:	Usenet News
! *XlwMenu.usenetNews.labelString:	?????? ??????
! ! *XlwMenu.browseTheWeb.labelString:	Browse the Web
! *XlwMenu.browseTheWeb.labelString:	????????? ??????
! ! *XlwMenu.gopher.labelString:	Gopher
! *XlwMenu.gopher.labelString:	Gopher
! ! *XlwMenu.hyperbole___.labelString:	Hyperbole...
! *XlwMenu.hyperbole___.labelString:	Hyperbole...
! ! *XlwMenu.spellCheckBuffer.labelString:	Spell-Check Buffer
! *XlwMenu.spellCheckBuffer.labelString:	???????????? ????????????
! ! *XlwMenu.toggleVIEmulation.labelString:	Toggle VI emulation
! *XlwMenu.toggleVIEmulation.labelString: 	VI ????????? ?????????
! ! *XlwMenu.calendar.labelString:	Calendar
! *XlwMenu.calendar.labelString:		??????
! ! *XlwMenu.games.labelString:	Games
! *XlwMenu.games.labelString:	??????
! ! *XlwMenu.3MonthCalendar.labelString:	3-Month Calendar
! *XlwMenu.3MonthCalendar.labelString:	?????? ??????
! ! *XlwMenu.diary.labelString:	Diary
! *XlwMenu.diary.labelString:	??????
! ! *XlwMenu.holidays.labelString:	Holidays
! *XlwMenu.holidays.labelString:		??????
! ! *XlwMenu.phasesOfTheMoon.labelString:	Phases of the Moon
! *XlwMenu.phasesOfTheMoon.labelString:	??????
! ! *XlwMenu.sunriseSunset.labelString:	Sunrise/Sunset
! *XlwMenu.sunriseSunset.labelString:	????????????/????????????
! ! *XlwMenu.mineGame.labelString:	Mine Game 
! *XlwMenu.mineGame.labelString:		Mine ??????
! ! *XlwMenu.tetris.labelString:	Tetris
! *XlwMenu.tetris.labelString:	????????????
! ! *XlwMenu.quoteFromZippy.labelString:	Quote from Zippy
! *XlwMenu.quoteFromZippy.labelString:	Zippy ??? ??????
! ! *XlwMenu.psychoanalyst.labelString:	Psychoanalyst
! *XlwMenu.psychoanalyst.labelString:	????????????
! ! *XlwMenu.psychoanalyzeZippy.labelString:	Psychoanalyze Zippy!
! *XlwMenu.psychoanalyzeZippy.labelString:	Zippy ??? ????????????
! ! *XlwMenu.randomFlames.labelString:	Random Flames
! *XlwMenu.randomFlames.labelString:	????????????
! ! *XlwMenu.dunnetAdventure.labelString:	Dunnet (Adventure)
! *XlwMenu.dunnetAdventure.labelString:	Dunnet (??????)
! ! *XlwMenu.towersOfHanoi.labelString:	Towers of Hanoi
! *XlwMenu.towersOfHanoi.labelString:	Hanoi ??? ???
! ! *XlwMenu.gameOfLife.labelString:	Game of Life
! *XlwMenu.gameOfLife.labelString:	????????????
! ! *XlwMenu.multiplicationPuzzle.labelString:	Multiplication Puzzle
! *XlwMenu.multiplicationPuzzle.labelString:	?????? ????????????
! ! *XlwMenu.listAllBuffers.labelString:	List All Buffers
! *XlwMenu.listAllBuffers.labelString:	?????? ????????? ??????
! ! *XlwMenu..labelString:	
! ! *XlwMenu..labelString:
! ! *XlwMenu.emacs.labelString:	Emacs
! ! *XlwMenu.emacs.labelString:
! ! *XlwMenu.group___.labelString:	Group...
! ! *XlwMenu.group___.labelString:	??????...
! ! *XlwMenu.variable___.labelString:	Variable...
! ! *XlwMenu.variable___.labelString:	??????...
! ! *XlwMenu.face___.labelString:	Face...
! ! *XlwMenu.face___.labelString:	???...
! ! *XlwMenu.saved___.labelString:	Saved...
! ! *XlwMenu.saved___.labelString:	???????????? ??????...
! ! *XlwMenu.set___.labelString:	Set...
! ! *XlwMenu.set___.labelString:	??????...
! ! *XlwMenu.apropos___.labelString:	Apropos...
! ! *XlwMenu.apropos___.labelString:	????????? ??????...
! ! *XlwMenu.browse___.labelString:	Browse...
! ! *XlwMenu.browse___.labelString:	????????????...
! ! *XlwMenu.emacs___.labelString:	Emacs...
! ! *XlwMenu.emacs___.labelString:
! ! *XlwMenu.editing.labelString:	Editing
! *XlwMenu.editing.labelString:	??????
! ! *XlwMenu.external.labelString:	External
! *XlwMenu.external.labelString:		??????
! ! *XlwMenu.programming.labelString:	Programming
! *XlwMenu.programming.labelString:	??????????????????
! ! *XlwMenu.applications.labelString:	Applications
! *XlwMenu.applications.labelString:	??????
! ! *XlwMenu.development.labelString:	Development
! *XlwMenu.development.labelString:	??????
! ! *XlwMenu.environment.labelString:	Environment
! *XlwMenu.environment.labelString:	??????
! ! *XlwMenu.data.labelString:	Data
! *XlwMenu.data.labelString:	?????????
! ! *XlwMenu.files.labelString:	Files
! *XlwMenu.files.labelString:	??????
! ! *XlwMenu.wp.labelString:	Wp
! *XlwMenu.wp.labelString:	????????????
! ! *XlwMenu.faces.labelString:	Faces
! *XlwMenu.faces.labelString:	???
! ! *XlwMenu.hypermedia.labelString:	Hypermedia
! *XlwMenu.hypermedia.labelString:	?????????
! ! *XlwMenu.help.labelString:	Help
! ! *XlwMenu.help.labelString:	?????????
! ! *XlwMenu.local.labelString:	Local
! *XlwMenu.local.labelString:	??????
! ! *XlwMenu.undo.labelString:	Undo
! *XlwMenu.undo.labelString:	?????? ??????
! ! *XlwMenu.cut.labelString:	Cut
! *XlwMenu.cut.labelString:	?????????
! ! *XlwMenu.copy.labelString:	Copy
! *XlwMenu.copy.labelString:	??????
! ! *XlwMenu.paste.labelString:	Paste
! *XlwMenu.paste.labelString:	?????????
! ! *XlwMenu.clear.labelString:	Clear
! *XlwMenu.clear.labelString:	?????????
! ! *XlwMenu.search___.labelString:	Search...
! *XlwMenu.search___.labelString:		??????...
! ! *XlwMenu.searchBackward___.labelString:	Search Backward...
! *XlwMenu.searchBackward___.labelString:		????????? ??????
! ! *XlwMenu.replace___.labelString:	Replace...
! *XlwMenu.replace___.labelString:	?????????
! ! *XlwMenu.searchRegexp___.labelString:	Search (Regexp)...
! *XlwMenu.searchRegexp___.labelString:	?????? (Regexp)...
! ! *XlwMenu.searchBackwardRegexp___.labelString:	Search Backward (Regexp)...
! *XlwMenu.searchBackwardRegexp___.labelString:	????????? ?????? (Regexp)...
! ! *XlwMenu.replaceRegexp___.labelString:	Replace (Regexp)...
! *XlwMenu.replaceRegexp___.labelString:		????????? (Regexp)...
! ! *XlwMenu.gotoLine___.labelString:	Goto Line...
! *XlwMenu.gotoLine___.labelString:	????????? ????????? ??????	
! ! *XlwMenu.whatLine.labelString:	What Line
! *XlwMenu.whatLine.labelString:		?????????
! ! *XlwMenu.bookmarks.labelString:	Bookmarks
! *XlwMenu.bookmarks.labelString:		?????????
! ! *XlwMenu.startMacroRecording.labelString:	Start Macro Recording
! *XlwMenu.startMacroRecording.labelString:	????????? ?????? ??????
! ! *XlwMenu.endMacroRecording.labelString:	End Macro Recording
! *XlwMenu.endMacroRecording.labelString:		????????? ?????? ??????
! ! *XlwMenu.executeLastMacro.labelString:	Execute Last Macro
! *XlwMenu.executeLastMacro.labelString:		?????? ????????? ??????
! ! *XlwMenu.showMessageLog.labelString:	Show Message Log
! *XlwMenu.showMessageLog.labelString:	????????? ?????? ??????
! ! *XlwMenu.jumpToBookmark.labelString:	Jump to Bookmark
! *XlwMenu.jumpToBookmark.labelString:	???????????? ??????
! ! *XlwMenu.setBookmark.labelString:	Set bookmark
! *XlwMenu.setBookmark.labelString:	????????? ??????
! ! *XlwMenu.insertContents.labelString:	Insert contents
! *XlwMenu.insertContents.labelString:	????????? ????????????
! ! *XlwMenu.insertLocation.labelString:	Insert location
! *XlwMenu.insertLocation.labelString:	????????? ????????????
! ! *XlwMenu.renameBookmark.labelString:	Rename bookmark
! *XlwMenu.renameBookmark.labelString:	????????? ?????? ?????????
! ! *XlwMenu.deleteBookmark.labelString:	Delete Bookmark
! *XlwMenu.deleteBookmark.labelString:	????????? ?????????
! ! *XlwMenu.editBookmarkList.labelString:	Edit Bookmark List
! *XlwMenu.editBookmarkList.labelString:		????????? ???????????????
! ! *XlwMenu.saveBookmarks.labelString:	Save bookmarks
! *XlwMenu.saveBookmarks.labelString:	????????? ??????
! ! *XlwMenu.saveBookmarksAs___.labelString:	Save bookmarks as...
! *XlwMenu.saveBookmarksAs___.labelString:	???????????? ?????? ???????????? ??????
! ! *XlwMenu.loadABookmarkFile.labelString:	Load a bookmark file
! *XlwMenu.loadABookmarkFile.labelString:		????????? ?????? ???????????????
! ! *XlwMenu.open___.labelString:	Open...
! *XlwMenu.open___.labelString:	??????...
! ! *XlwMenu.openInOtherWindow___.labelString:	Open in Other Window...
! *XlwMenu.openInOtherWindow___.labelString:	?????? ???????????? ??????
! ! *XlwMenu.openInNewFrame___.labelString:	Open in New Frame...
! *XlwMenu.openInNewFrame___.labelString:		??? ??????????????? ??????
! ! *XlwMenu.insertFile___.labelString:	Insert File...
! *XlwMenu.insertFile___.labelString:	?????? ????????????...
! ! *XlwMenu.viewFile___.labelString:	View File...
! *XlwMenu.viewFile___.labelString:	?????? ??????...
! ! *XlwMenu.save.labelString:	Save
! *XlwMenu.save.labelString:	??????
! ! *XlwMenu.saveAs___.labelString:	Save As...
! *XlwMenu.saveAs___.labelString:		?????? ???????????? ??????
! ! *XlwMenu.saveSomeBuffers.labelString:	Save Some Buffers
! *XlwMenu.saveSomeBuffers.labelString:	????????? ???????????? ??????
! ! *XlwMenu.printBuffer.labelString:	Print Buffer
! *XlwMenu.printBuffer.labelString:	????????? ??????
! ! *XlwMenu.prettyPrintBuffer.labelString:	Pretty-Print Buffer
! *XlwMenu.prettyPrintBuffer.labelString:		???????????? ????????????
! ! *XlwMenu.newFrame.labelString:	New Frame
! *XlwMenu.newFrame.labelString:		??? ?????????
! ! *XlwMenu.frameOnOtherDisplay___.labelString:	Frame on Other Display...
! *XlwMenu.frameOnOtherDisplay___.labelString: ?????? ????????????????????? ?????????...
! ! *XlwMenu.deleteFrame.labelString:	Delete Frame
! *XlwMenu.deleteFrame.labelString:	????????? ?????????
! ! *XlwMenu.splitWindow.labelString:	Split Window
! *XlwMenu.splitWindow.labelString:	????????? ??????
! ! *XlwMenu.unSplitKeepThis.labelString:	Un-Split (Keep This)
! *XlwMenu.unSplitKeepThis.labelString:	???????????? (????????? ??????)
! ! *XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep Others)
! *XlwMenu.unSplitKeepOthers.labelString:		???????????? (???????????? ??????)
! ! *XlwMenu.revertBuffer.labelString:	Revert Buffer
! *XlwMenu.revertBuffer.labelString:	????????? ??????
! ! *XlwMenu.deleteBuffer.labelString:	Delete Buffer
! *XlwMenu.deleteBuffer.labelString:	????????? ?????????
! ! *XlwMenu.exitXEmacs.labelString:	Exit XEmacs
! *XlwMenu.exitXEmacs.labelString:	XEmacs ??????
! ! *XlwMenu.aboutXEmacs___.labelString:	About XEmacs...
! *XlwMenu.aboutXEmacs___.labelString:	XEmacs ??? ?????????
! ! *XlwMenu.basics.labelString:	Basics
! *XlwMenu.basics.labelString:	??????
! ! *XlwMenu.xEmacsFAQ.labelString:	XEmacs FAQ
! *XlwMenu.xEmacsFAQ.labelString:	XEmacs FAQ
! ! *XlwMenu.samples.labelString:	Samples
! *XlwMenu.samples.labelString:	??????
! ! *XlwMenu.lookupInInfo.labelString:	Lookup in Info
! *XlwMenu.lookupInInfo.labelString:	Info?????? ??????
! ! *XlwMenu.manuals.labelString:	Manuals
! *XlwMenu.manuals.labelString:	?????????
! ! *XlwMenu.commandsKeys.labelString:	Commands & Keys
! *XlwMenu.commandsKeys.labelString:	?????? & ???
! ! *XlwMenu.recentMessages.labelString:	Recent Messages
! *XlwMenu.recentMessages.labelString:	?????? ?????????
! ! *XlwMenu.misc.labelString:	Misc
! *XlwMenu.misc.labelString:	???????????????
! ! *XlwMenu.submitBugReport.labelString:	Submit Bug Report
! *XlwMenu.submitBugReport.labelString:	???Bug Report ??????
! ! *XlwMenu.tutorial.labelString:	Tutorial
! *XlwMenu.tutorial.labelString:	?????????
! ! *XlwMenu.news.labelString:	News
! *XlwMenu.news.labelString:	??????
! ! *XlwMenu.packages.labelString:	Packages
! *XlwMenu.packages.labelString:		?????????
! ! *XlwMenu.splash.labelString:	Splash
! *XlwMenu.splash.labelString:	Splash
! ! *XlwMenu.fAQLocal.labelString:	FAQ (local)
! *XlwMenu.fAQLocal.labelString:	FAQ (local)
! ! *XlwMenu.fAQViaWWW.labelString:	FAQ via WWW
! *XlwMenu.fAQViaWWW.labelString:		FAQ (WWW ??????)
! ! *XlwMenu.homePage.labelString:	Home Page
! *XlwMenu.homePage.labelString:		Home Page
! ! *XlwMenu.sample.labelString:	Sample
! *XlwMenu.sample.labelString:	??????
! ! *XlwMenu.keyBinding___.labelString:	Key Binding...
! *XlwMenu.keyBinding___.labelString: ?????????...
! ! *XlwMenu.command___.labelString:	Command...
! *XlwMenu.command___.labelString:	??????...
! ! *XlwMenu.function___.labelString:	Function...
! *XlwMenu.function___.labelString:	??????...
! ! *XlwMenu.topic___.labelString:	Topic...
! *XlwMenu.topic___.labelString:		??????...
! ! *XlwMenu.info.labelString:	Info
! *XlwMenu.info.labelString:	Info
! ! *XlwMenu.unixManual___.labelString:	Unix Manual...
! *XlwMenu.unixManual___.labelString:	Unix Manual...
! ! *XlwMenu.mode.labelString:	Mode
! *XlwMenu.mode.labelString:	??????
! ! *XlwMenu.apropos___.labelString:	Apropos...
! ! *XlwMenu.apropos___.labelString:	????????? ??????...
! ! *XlwMenu.aproposDocs___.labelString:	Apropos Docs...
! *XlwMenu.aproposDocs___.labelString:	???????????? ????????? ??????...
! ! *XlwMenu.key___.labelString:	Key...
! *XlwMenu.key___.labelString:	???...
! ! *XlwMenu.bindings.labelString:	Bindings
! *XlwMenu.bindings.labelString:		??????
! ! *XlwMenu.mouseBindings.labelString:	Mouse Bindings
! *XlwMenu.mouseBindings.labelString:	Mouse ??????
! ! *XlwMenu.recentKeys.labelString:	Recent Keys
! *XlwMenu.recentKeys.labelString:	?????????
! ! *XlwMenu.variable___.labelString:	Variable...
! ! *XlwMenu.variable___.labelString:
! ! *XlwMenu.locateCommand___.labelString:	Locate Command...
! *XlwMenu.locateCommand___.labelString:	????????? ??????...
! ! *XlwMenu.noWarranty.labelString:	No Warranty
! *XlwMenu.noWarranty.labelString:	?????????
! ! *XlwMenu.xEmacsLicense.labelString:	XEmacs License
! *XlwMenu.xEmacsLicense.labelString:	XEmacs ?????????
! ! *XlwMenu.theLatestVersion.labelString:	The Latest Version
! *XlwMenu.theLatestVersion.labelString:	?????? ??????
! ! *XlwMenu.evaluateLastSExpression.labelString:	Evaluate Last S-expression
! *XlwMenu.evaluateLastSExpression.labelString:	?????? S?????? ??????
! ! *XlwMenu.evaluateEntireBuffer.labelString:	Evaluate Entire Buffer
! *XlwMenu.evaluateEntireBuffer.labelString:	?????????????????? ??????
! ! *XlwMenu.evaluateRegion.labelString:	Evaluate Region
! *XlwMenu.evaluateRegion.labelString:	?????? ??????
! ! *XlwMenu.evaluateThisDefun.labelString:	Evaluate This Defun
! *XlwMenu.evaluateThisDefun.labelString:	??? Defun??? ??????
! ! *XlwMenu.debugThisDefun.labelString:	Debug This Defun
! *XlwMenu.debugThisDefun.labelString:	??? Defun??? ?????????
! ! *XlwMenu.traceAFunction.labelString:	Trace a Function
! *XlwMenu.traceAFunction.labelString:	????????? ??????
! ! *XlwMenu.untraceAllFunctions.labelString:	Untrace All Functions
! *XlwMenu.untraceAllFunctions.labelString:	?????? ????????? ?????????
! ! *XlwMenu.commentOutRegion.labelString:	Comment Out Region
! *XlwMenu.commentOutRegion.labelString:	??????????????? ?????????
! ! *XlwMenu.indentRegion.labelString:	Indent Region
! *XlwMenu.indentRegion.labelString:	?????? ?????????
! ! *XlwMenu.indentLine.labelString:	Indent Line
! *XlwMenu.indentLine.labelString:	??? ?????????
! ! *XlwMenu.debugOnError.labelString:	Debug On Error
! ! *XlwMenu.debugOnError.labelString:	????????? ??? ?????????
! ! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
! ! *XlwMenu.debugOnQuit.labelString:	???????????? ?????????
! ! *XlwMenu.debugOnSignal.labelString:	Debug on Signal
! *XlwMenu.debugOnSignal.labelString: ????????? ?????????
! ! *XlwMenu.describeLanguageSupport.labelString:	Describe language support
! *XlwMenu.describeLanguageSupport.labelString:	?????? ???????????? ??????
! ! *XlwMenu.setLanguageEnvironment.labelString:	Set language environment
! *XlwMenu.setLanguageEnvironment.labelString:	??????????????? ??????
! ! *XlwMenu.toggleInputMethod.labelString:	Toggle input method
! *XlwMenu.toggleInputMethod.labelString:		??????????????? ?????????
! ! *XlwMenu.selectInputMethod.labelString:	Select input method
! *XlwMenu.selectInputMethod.labelString:	???????????? ??????
! ! *XlwMenu.describeInputMethod.labelString:	Describe input method
! *XlwMenu.describeInputMethod.labelString:???????????? ??????
! ! *XlwMenu.describeCurrentCodingSystems.labelString:	Describe current coding systems
! *XlwMenu.describeCurrentCodingSystems.labelString:	?????? ?????? ???????????? ??????
! ! *XlwMenu.setCodingSystemOfBufferFile.labelString:	Set coding system of buffer file
! *XlwMenu.setCodingSystemOfBufferFile.labelString:	????????? ?????? ?????? ????????? ??????
! ! *XlwMenu.setCodingSystemOfTerminal.labelString:	Set coding system of terminal
! *XlwMenu.setCodingSystemOfTerminal.labelString:		????????? ?????? ????????? ??????
! ! *XlwMenu.setCodingSystemOfKeyboard.labelString:	Set coding system of keyboard
! *XlwMenu.setCodingSystemOfKeyboard.labelString:	????????? ?????? ????????? ??????
! ! *XlwMenu.setCodingSystemOfProcess.labelString:	Set coding system of process
! *XlwMenu.setCodingSystemOfProcess.labelString:	???????????? ?????? ????????? ??????
! ! *XlwMenu.showCharacterTable.labelString:	Show character table
! *XlwMenu.showCharacterTable.labelString:	???????????? ??????
! ! *XlwMenu.showDiagnosisForMULE.labelString:	Show diagnosis for MULE
! *XlwMenu.showDiagnosisForMULE.labelString:	MULE??? ????????????
! ! *XlwMenu.showManyLanguages.labelString:	Show many languages
! *XlwMenu.showManyLanguages.labelString:	?????? ????????????
! ! *XlwMenu.chineseGB.labelString:	Chinese-GB
! *XlwMenu.chineseGB.labelString:		?????????-GB
! ! *XlwMenu.chineseBIG5.labelString:	Chinese-BIG5
! *XlwMenu.chineseBIG5.labelString:	?????????-BIG5
! ! *XlwMenu.cyrillicISO.labelString:	Cyrillic-ISO
! *XlwMenu.cyrillicISO.labelString:	??????-ISO
! ! *XlwMenu.cyrillicKOI8.labelString:	Cyrillic-KOI8
! *XlwMenu.cyrillicKOI8.labelString:	??????-KOI8
! ! *XlwMenu.cyrillicALT.labelString:	Cyrillic-ALT
! *XlwMenu.cyrillicALT.labelString:	??????-ALT
! ! *XlwMenu.cyrillic.labelString:	Cyrillic
! *XlwMenu.cyrillic.labelString:	??????
! ! ! *XlwMenu.english.labelString:	English
! *XlwMenu.english.labelString:		??????
! ! *XlwMenu.aSCII.labelString:	ASCII
! ! *XlwMenu.aSCII.labelString:
! ! *XlwMenu.latin1.labelString:	Latin-1
! *XlwMenu.latin1.labelString:	??????-1
! ! *XlwMenu.german.labelString:	German
! *XlwMenu.german.labelString:	?????????
! ! *XlwMenu.french.labelString:	French
! *XlwMenu.french.labelString:	????????????
! ! *XlwMenu.norwegian.labelString:	Norwegian
! *XlwMenu.norwegian.labelString:		???????????????
! ! *XlwMenu.latin2.labelString:	Latin-2
! *XlwMenu.latin2.labelString:	??????-2
! ! *XlwMenu.croatian.labelString:	Croatian
! *XlwMenu.croatian.labelString:		???????????????
! ! *XlwMenu.polish.labelString:	Polish
! *XlwMenu.polish.labelString:	????????????
! ! *XlwMenu.latin3.labelString:	Latin-3
! *XlwMenu.latin3.labelString:	??????-3
! ! *XlwMenu.latin4.labelString:	Latin-4
! *XlwMenu.latin4.labelString:	??????-4
! ! *XlwMenu.latin5.labelString:	Latin-5
! *XlwMenu.latin5.labelString:	??????-5
! ! *XlwMenu.greek.labelString:	Greek
! *XlwMenu.greek.labelString:	????????????
! ! *XlwMenu.hebrew.labelString:	Hebrew
! *XlwMenu.hebrew.labelString:	???????????????
! ! *XlwMenu.japanese.labelString:	Japanese
! *XlwMenu.japanese.labelString:		?????????
! ! *XlwMenu.korean.labelString:	Korean
! *XlwMenu.korean.labelString:	??????
! ! *XlwMenu.iPA.labelString:	IPA
! ! *XlwMenu.iPA.labelString:
! ! *XlwMenu.customize.labelString:	Customize
! *XlwMenu.customize.labelString:	??????????????????
! ! *XlwMenu.readOnly.labelString:	Read Only
! *XlwMenu.readOnly.labelString:	?????? ????????? ??????
! ! *XlwMenu.editingOptions.labelString:	Editing Options
! *XlwMenu.editingOptions.labelString:	?????? ????????????
! ! *XlwMenu.generalOptions.labelString:	General Options
! *XlwMenu.generalOptions.labelString:	?????? ????????????
! ! *XlwMenu.printingOptions.labelString:	Printing Options
! *XlwMenu.printingOptions.labelString:	?????? ????????????
! ! *XlwMenu.otherWindowLocation.labelString:	"Other Window" Location
! *XlwMenu.otherWindowLocation.labelString:	?????? ????????? ????????????
! ! *XlwMenu.syntaxHighlighting.labelString:	Syntax Highlighting
! *XlwMenu.syntaxHighlighting.labelString:	????????? ??????
! ! *XlwMenu.parenHighlighting.labelString:	Paren Highlighting
! *XlwMenu.parenHighlighting.labelString:	????????? ??????
! ! *XlwMenu.frameAppearance.labelString:	Frame Appearance
! *XlwMenu.frameAppearance.labelString:	????????? ??????
! ! *XlwMenu.menubarAppearance.labelString:	Menubar Appearance
! *XlwMenu.menubarAppearance.labelString: ????????? ??????
! ! *XlwMenu.toolbarAppearance.labelString:	Toolbar Appearance
! *XlwMenu.toolbarAppearance.labelString:	????????? ??????
! ! *XlwMenu.mouse.labelString:	Mouse
! *XlwMenu.mouse.labelString:	Mouse
! ! *XlwMenu.openURLsWith.labelString:	Open URLs With
! *XlwMenu.openURLsWith.labelString:	URLs ??????
! ! *XlwMenu.browseFaces___.labelString:	Browse Faces...
! *XlwMenu.browseFaces___.labelString: ?????? ??????
! ! *XlwMenu.font.labelString:	Font
! *XlwMenu.font.labelString:	?????????
! ! *XlwMenu.size.labelString:	Size
! *XlwMenu.size.labelString:	??????
! ! *XlwMenu.weight.labelString:	Weight
! *XlwMenu.weight.labelString:	??????
! ! *XlwMenu.saveOptions.labelString:	Save Options
! *XlwMenu.saveOptions.labelString: ?????? Options
! ! *XlwMenu.emacs.labelString:	Emacs
! ! *XlwMenu.emacs.labelString:
! ! *XlwMenu.group___.labelString:	Group...
! *XlwMenu.group___.labelString:	??????...
! ! *XlwMenu.variable___.labelString:	Variable...
! *XlwMenu.variable___.labelString:	??????...
! ! *XlwMenu.face___.labelString:	Face...
! *XlwMenu.face___.labelString:	???...
! ! *XlwMenu.saved___.labelString:	Saved...
! *XlwMenu.saved___.labelString:		???????????? ??????...
! ! *XlwMenu.set___.labelString:	Set...
! *XlwMenu.set___.labelString:	??????...
! ! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	????????? ??????...
! ! *XlwMenu.browse___.labelString:	Browse...
! *XlwMenu.browse___.labelString:		????????????...
! !! *XlwMenu.overstrike.labelString:	Overstrike
! *XlwMenu.overstrike.labelString:	???????????? ??????
! ! *XlwMenu.caseSensitiveSearch.labelString:	Case Sensitive Search
! *XlwMenu.caseSensitiveSearch.labelString:	??? ???????????? ??????????????? ??????
! ! *XlwMenu.caseMatchingReplace.labelString:	Case Matching Replace
! *XlwMenu.caseMatchingReplace.labelString:	??? ???????????? ??????????????? ?????????
! ! *XlwMenu.autoDeleteSelection.labelString:	Auto Delete Selection
! *XlwMenu.autoDeleteSelection.labelString:	??????????????? ???????????????
! ! *XlwMenu.activeRegions.labelString:	Active Regions
! *XlwMenu.activeRegions.labelString:	????????? ???????????? ??????
! ! *XlwMenu.mousePasteAtTextCursor.labelString:	Mouse Paste At Text Cursor
! *XlwMenu.mousePasteAtTextCursor.labelString: ????????? ?????? ???????????? Mouse ?????????
! ! *XlwMenu.requireNewlineAtEnd.labelString:	Require Newline At End
! *XlwMenu.requireNewlineAtEnd.labelString:	????????? ??????????????? ??????
! ! *XlwMenu.addNewlineWhenMovingPastEnd.labelString:	Add Newline When Moving Past End
! *XlwMenu.addNewlineWhenMovingPastEnd.labelString: ????????? ????????? ?????? ??????????????? ??????
! ! *XlwMenu.teachExtendedCommands.labelString:	Teach Extended Commands
! *XlwMenu.teachExtendedCommands.labelString:	???????????? ??????
! ! *XlwMenu.debugOnError.labelString:	Debug On Error
! *XlwMenu.debugOnError.labelString:	???????????? ?????????
! ! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
! *XlwMenu.debugOnQuit.labelString:	???????????? ?????????
! ! *XlwMenu.commandLineSwitchesForLprLp___.labelString:	Command-Line Switches for `lpr'/`lp'...
! *XlwMenu.commandLineSwitchesForLprLp___.labelString:	`lpr'/`lp' ??????????????? ?????????
! ! *XlwMenu.prettyPrintPaperSize.labelString:	Pretty-Print Paper Size
! *XlwMenu.prettyPrintPaperSize.labelString:	????????? ??????????????? ????????????
! ! *XlwMenu.colorPrinting.labelString:	Color Printing
! *XlwMenu.colorPrinting.labelString:	?????? ??????
! ! *XlwMenu.letter.labelString:	Letter
! ! *XlwMenu.letter.labelString:
! ! *XlwMenu.letterSmall.labelString:	Letter-small
! ! *XlwMenu.letterSmall.labelString:
! ! *XlwMenu.legal.labelString:	Legal
! ! *XlwMenu.legal.labelString:
! ! *XlwMenu.statement.labelString:	Statement
! ! *XlwMenu.statement.labelString:
! ! *XlwMenu.executive.labelString:	Executive
! ! *XlwMenu.executive.labelString:
! ! *XlwMenu.tabloid.labelString:	Tabloid
! ! *XlwMenu.tabloid.labelString:
! ! *XlwMenu.ledger.labelString:	Ledger
! ! *XlwMenu.ledger.labelString:
! ! *XlwMenu.a3.labelString:	A3
! ! *XlwMenu.a3.labelString:
! ! *XlwMenu.a4.labelString:	A4
! ! *XlwMenu.a4.labelString:
! ! *XlwMenu.a4small.labelString:	A4small
! ! *XlwMenu.a4small.labelString:
! ! *XlwMenu.b4.labelString:	B4
! ! *XlwMenu.b4.labelString:
! ! *XlwMenu.b5.labelString:	B5
! ! *XlwMenu.b5.labelString:
! ! *XlwMenu.alwaysInSameFrame.labelString:	Always in Same Frame
! *XlwMenu.alwaysInSameFrame.labelString:		?????? ?????? ?????????
! ! *XlwMenu.otherFrame2FramesMax.labelString:	Other Frame (2 Frames Max)
! *XlwMenu.otherFrame2FramesMax.labelString:	?????? ????????? (?????? 2 ?????????)
! ! *XlwMenu.otherFrame3FramesMax.labelString:	Other Frame (3 Frames Max)
! *XlwMenu.otherFrame3FramesMax.labelString:	?????? ????????? (?????? 3 ?????????)
! ! *XlwMenu.otherFrame4FramesMax.labelString:	Other Frame (4 Frames Max)
! *XlwMenu.otherFrame4FramesMax.labelString:	?????? ????????? (?????? 4 ?????????)
! ! *XlwMenu.otherFrame5FramesMax.labelString:	Other Frame (5 Frames Max)
! *XlwMenu.otherFrame5FramesMax.labelString:	?????? ????????? (?????? 5 ?????????)
! ! *XlwMenu.alwaysCreateNewFrame.labelString:	Always Create New Frame
! *XlwMenu.alwaysCreateNewFrame.labelString:??? ??? ???????????? ??????
! ! *XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	Temp Buffers Always in Same Frame
! *XlwMenu.tempBuffersAlwaysInSameFrame.labelString: ?????? ???????????? ????????? ?????? ???????????????
! ! *XlwMenu.tempBuffersLikeOtherBuffers.labelString:	Temp Buffers Like Other Buffers
! *XlwMenu.tempBuffersLikeOtherBuffers.labelString: ?????? ???????????? ?????? ???????????? ??????
! ! *XlwMenu.makeCurrentFrameGnuservTarget.labelString:	Make current frame gnuserv target
! *XlwMenu.makeCurrentFrameGnuservTarget.labelString:??? ???????????? gnuserv ??? ?????????
! ! *XlwMenu.inThisBuffer.labelString:	In This Buffer
! *XlwMenu.inThisBuffer.labelString:	??? ???????????????
! ! *XlwMenu.automatic.labelString:	Automatic
! *XlwMenu.automatic.labelString:		??????
! ! *XlwMenu.fonts.labelString:	Fonts
! *XlwMenu.fonts.labelString:	?????????
! ! *XlwMenu.colors.labelString:	Colors
! *XlwMenu.colors.labelString:	???
! ! *XlwMenu.least.labelString:	Least
! *XlwMenu.least.labelString:	??????
! ! *XlwMenu.more.labelString:	More
! *XlwMenu.more.labelString:	??? ???
! ! *XlwMenu.evenMore.labelString:	Even More
! *XlwMenu.evenMore.labelString:?????? ??????
! ! *XlwMenu.most.labelString:	Most
! *XlwMenu.most.labelString:	??????
! ! *XlwMenu.lazy.labelString:	Lazy
! *XlwMenu.lazy.labelString:	????????????
! ! *XlwMenu.caching.labelString:	Caching
! *XlwMenu.caching.labelString: Caching
! ! *XlwMenu.none.labelString:	None
! *XlwMenu.none.labelString:	??????
! ! *XlwMenu.blinkingParen.labelString:	Blinking Paren
! *XlwMenu.blinkingParen.labelString:	????????????
! ! *XlwMenu.steadyParen.labelString:	Steady Paren
! *XlwMenu.steadyParen.labelString:	????????? ??????
! ! *XlwMenu.expression.labelString:	Expression
! *XlwMenu.expression.labelString:	?????? ??????
! ! *XlwMenu.scrollbars.labelString:	Scrollbars
! *XlwMenu.scrollbars.labelString:	???????????????
! ! *XlwMenu.3DModeline.labelString:	3D Modeline
! *XlwMenu.3DModeline.labelString:	???????????? ?????????
! ! *XlwMenu.truncateLines.labelString:	Truncate Lines
! *XlwMenu.truncateLines.labelString:	?????? ????????? ?????????
! ! *XlwMenu.barCursor.labelString:	Bar Cursor
! *XlwMenu.barCursor.labelString:		??? ??????
! ! *XlwMenu.blinkingCursor.labelString:	Blinking Cursor
! *XlwMenu.blinkingCursor.labelString:	???????????? ??????
! ! *XlwMenu.frameLocalFontMenu.labelString:	Frame-Local Font Menu
! *XlwMenu.frameLocalFontMenu.labelString: ??????????????? ???????????????
! ! *XlwMenu.buffersMenuLength___.labelString:	Buffers Menu Length...
! *XlwMenu.buffersMenuLength___.labelString:	??????????????? ??????
! ! *XlwMenu.multiOperationBuffersSubMenus.labelString:	Multi-Operation Buffers Sub-Menus
! *XlwMenu.multiOperationBuffersSubMenus.labelString:	?????????????????? ????????????
! ! *XlwMenu.buffersMenuSorting.labelString:	Buffers Menu Sorting
! *XlwMenu.buffersMenuSorting.labelString:	??????????????? ??????
! ! *XlwMenu.submenusForBufferGroups.labelString:	Submenus for Buffer Groups
! *XlwMenu.submenusForBufferGroups.labelString: ????????? ????????? ????????????
! ! *XlwMenu.ignoreScaledFonts.labelString:	Ignore Scaled Fonts
! *XlwMenu.ignoreScaledFonts.labelString:	?????? ???????????? ??????
! ! *XlwMenu.mostRecentlyUsed.labelString:	Most Recently Used
! *XlwMenu.mostRecentlyUsed.labelString:		?????? ????????????
! ! *XlwMenu.alphabetically.labelString:	Alphabetically
! *XlwMenu.alphabetically.labelString:	????????????
! ! *XlwMenu.byMajorModeThenAlphabetically.labelString:	By Major Mode, Then Alphabetically
! *XlwMenu.byMajorModeThenAlphabetically.labelString: ???????????????????????? ????????????
! ! *XlwMenu.visible.labelString:	Visible
! *XlwMenu.visible.labelString:	??????
! ! *XlwMenu.captioned.labelString:	Captioned
! *XlwMenu.captioned.labelString:	?????? ??????
! ! *XlwMenu.defaultLocation.labelString:	Default Location
! *XlwMenu.defaultLocation.labelString: Default ??????
! ! *XlwMenu.top.labelString:	Top
! *XlwMenu.top.labelString:	???
! ! *XlwMenu.bottom.labelString:	Bottom
! *XlwMenu.bottom.labelString:	???
! ! *XlwMenu.left.labelString:	Left
! *XlwMenu.left.labelString:	??????
! ! *XlwMenu.right.labelString:	Right
! *XlwMenu.right.labelString:	?????????
! ! *XlwMenu.avoidText.labelString:	Avoid-Text
! *XlwMenu.avoidText.labelString:		????????? ?????????
! ! *XlwMenu.strokesMode.labelString:	strokes-mode
! *XlwMenu.strokesMode.labelString:	strokes-??????
! ! *XlwMenu.emacsW3.labelString:	Emacs-W3
! ! *XlwMenu.emacsW3.labelString:
! ! *XlwMenu.netscape.labelString:	Netscape
! ! *XlwMenu.netscape.labelString:
! ! *XlwMenu.mosaic.labelString:	Mosaic
! ! *XlwMenu.mosaic.labelString:
! ! *XlwMenu.mosaicCCI.labelString:	Mosaic (CCI)
! ! *XlwMenu.mosaicCCI.labelString:
! ! *XlwMenu.iXIMosaic.labelString:	IXI Mosaic
! ! *XlwMenu.iXIMosaic.labelString:
! ! *XlwMenu.lynxXterm.labelString:	Lynx (xterm)
! ! *XlwMenu.lynxXterm.labelString:
! ! *XlwMenu.lynxXemacs.labelString:	Lynx (xemacs)
! ! *XlwMenu.lynxXemacs.labelString:
! ! *XlwMenu.grail.labelString:	Grail
! ! *XlwMenu.grail.labelString:
! ! *XlwMenu.charter.labelString:	Charter
! ! *XlwMenu.charter.labelString:
! ! *XlwMenu.clean.labelString:	Clean
! ! *XlwMenu.clean.labelString:
! ! *XlwMenu.courier.labelString:	Courier
! ! *XlwMenu.courier.labelString:
! ! *XlwMenu.fixed.labelString:	Fixed
! ! *XlwMenu.fixed.labelString:
! ! *XlwMenu.helvetica.labelString:	Helvetica
! ! *XlwMenu.helvetica.labelString:
! ! *XlwMenu.lucida.labelString:	Lucida
! ! *XlwMenu.lucida.labelString:
! ! *XlwMenu.lucidabright.labelString:	Lucidabright
! ! *XlwMenu.lucidabright.labelString:
! ! *XlwMenu.lucidatypewriter.labelString:	Lucidatypewriter
! ! *XlwMenu.lucidatypewriter.labelString:
! ! *XlwMenu.newCenturySchoolbook.labelString:	New Century Schoolbook
! ! *XlwMenu.newCenturySchoolbook.labelString:
! ! *XlwMenu.terminal.labelString:	Terminal
! ! *XlwMenu.terminal.labelString:
! ! *XlwMenu.times.labelString:	Times
! ! *XlwMenu.times.labelString:
! ! *XlwMenu.utopia.labelString:	Utopia
! ! *XlwMenu.utopia.labelString:
! ! *XlwMenu.5.labelString:	5
! ! *XlwMenu.5.labelString:
! ! *XlwMenu.6.labelString:	6
! ! *XlwMenu.6.labelString:
! ! *XlwMenu.7.labelString:	7
! ! *XlwMenu.7.labelString:
! ! *XlwMenu.8.labelString:	8
! ! *XlwMenu.8.labelString:
! ! *XlwMenu.9.labelString:	9
! ! *XlwMenu.9.labelString:
! ! *XlwMenu.10.labelString:	10
! ! *XlwMenu.10.labelString:
! ! *XlwMenu.11.labelString:	11
! ! *XlwMenu.11.labelString:
! ! *XlwMenu.12.labelString:	12
! ! *XlwMenu.12.labelString:
! ! *XlwMenu.13.labelString:	13
! ! *XlwMenu.13.labelString:
! ! *XlwMenu.14.labelString:	14
! ! *XlwMenu.14.labelString:
! ! *XlwMenu.15.labelString:	15
! ! *XlwMenu.15.labelString:
! ! *XlwMenu.16.labelString:	16
! ! *XlwMenu.16.labelString:
! ! *XlwMenu.17.labelString:	17
! ! *XlwMenu.17.labelString:
! ! *XlwMenu.18.labelString:	18
! ! *XlwMenu.18.labelString:
! ! *XlwMenu.19.labelString:	19
! ! *XlwMenu.19.labelString:
! ! *XlwMenu.20.labelString:	20
! ! *XlwMenu.20.labelString:
! ! *XlwMenu.23.labelString:	23
! ! *XlwMenu.23.labelString:
! ! *XlwMenu.24.labelString:	24
! ! *XlwMenu.24.labelString:
! ! *XlwMenu.black.labelString:	Black
! ! *XlwMenu.black.labelString:
! ! *XlwMenu.bold.labelString:	Bold
! ! *XlwMenu.bold.labelString:
! ! *XlwMenu.demibold.labelString:	Demibold
! ! *XlwMenu.demibold.labelString:
! ! *XlwMenu.medium.labelString:	Medium
! ! *XlwMenu.medium.labelString:
! ! *XlwMenu.regular.labelString:	Regular
! ! *XlwMenu.regular.labelString:
! ! *XlwMenu.grep___.labelString:	Grep...
! ! *XlwMenu.grep___.labelString:
! ! *XlwMenu.compile___.labelString:	Compile...
! *XlwMenu.compile___.labelString:	?????????...
! ! *XlwMenu.shell.labelString:	Shell
! *XlwMenu.shell.labelString:	??????
! ! *XlwMenu.shellCommand___.labelString:	Shell Command...
! *XlwMenu.shellCommand___.labelString:	?????? ??????...
! ! *XlwMenu.shellCommandOnRegion___.labelString:	Shell Command on Region...
! *XlwMenu.shellCommandOnRegion___.labelString:	???????????? ??????????????? ??????...
! ! *XlwMenu.debugGDB___.labelString:	Debug (GDB)...
! *XlwMenu.debugGDB___.labelString:	????????? (GDB)...
! ! *XlwMenu.debugDBX___.labelString:	Debug (DBX)...
! *XlwMenu.debugDBX___.labelString:	????????? (DBX)...
! ! *XlwMenu.oOBrowser___.labelString:	OO-Browser...
! *XlwMenu.oOBrowser___.labelString:	OO-?????????...
! ! *XlwMenu.tags.labelString:	Tags
! *XlwMenu.tags.labelString:	??????
! ! *XlwMenu.vC.labelString:	VC
! ! *XlwMenu.vC.labelString:
! ! *XlwMenu.findTag___.labelString:	Find Tag...
! *XlwMenu.findTag___.labelString:	????????? ??????...
! ! *XlwMenu.findOtherWindow___.labelString:	Find Other Window...
! *XlwMenu.findOtherWindow___.labelString:	????????? ??????????????? ??????...
! ! *XlwMenu.nextTag___.labelString:	Next Tag...
! *XlwMenu.nextTag___.labelString:	????????? ??????...
! ! *XlwMenu.nextOtherWindow___.labelString:	Next Other Window...
! *XlwMenu.nextOtherWindow___.labelString:	????????? ??????????????? ????????? ????????????...
! ! *XlwMenu.nextFile.labelString:	Next File
! *XlwMenu.nextFile.labelString:		????????? ??????
! ! *XlwMenu.tagsSearch___.labelString:	Tags Search...
! *XlwMenu.tagsSearch___.labelString:	?????? ??????...
! ! *XlwMenu.tagsReplace___.labelString:	Tags Replace...
! *XlwMenu.tagsReplace___.labelString:	?????? ?????????...
! ! *XlwMenu.continueSearchReplace.labelString:	Continue Search/Replace
! *XlwMenu.continueSearchReplace.labelString:	??????/????????? ??????
! ! *XlwMenu.popStack.labelString:	Pop stack
! *XlwMenu.popStack.labelString:		???????????? ??????
! ! *XlwMenu.apropos___.labelString:	Apropos...
! ! *XlwMenu.apropos___.labelString:	???????????? ??????...
! ! *XlwMenu.setTagsTableFile___.labelString:	Set Tags Table File...
! *XlwMenu.setTagsTableFile___.labelString:	????????? ????????? ??????...
! ! *XlwMenu.registerFile.labelString:	Register File
! *XlwMenu.registerFile.labelString:	?????? ??????
! ! *XlwMenu.revertToLastRevision.labelString:	Revert to Last Revision
! *XlwMenu.revertToLastRevision.labelString:	????????? ??????????????? ??????
! ! *XlwMenu.cancelLastCheckin.labelString:	Cancel Last Checkin
! *XlwMenu.cancelLastCheckin.labelString:		????????? Checkin ??? ?????????
! ! *XlwMenu.renameFile.labelString:	Rename File
! *XlwMenu.renameFile.labelString:	????????? ?????? ?????????
! ! *XlwMenu.diffAgainstLastVersion.labelString:	Diff Against Last Version
! *XlwMenu.diffAgainstLastVersion.labelString:	??????????????? diff
! ! *XlwMenu.diffBetweenRevisions___.labelString:	Diff Between Revisions...
! *XlwMenu.diffBetweenRevisions___.labelString:	????????? ??????????????? diff...
! ! *XlwMenu.visitOtherVersion___.labelString:	Visit Other Version...
! *XlwMenu.visitOtherVersion___.labelString:	??????  ????????????...
! ! *XlwMenu.showEditHistory.labelString:	Show Edit History
! *XlwMenu.showEditHistory.labelString:	??????????????? ??????
! ! *XlwMenu.listLockedFilesAnyUser.labelString:	List Locked Files Any User
! *XlwMenu.listLockedFilesAnyUser.labelString:	????????? ????????? ??????
! ! *XlwMenu.createSnapshot.labelString:	Create Snapshot
! *XlwMenu.createSnapshot.labelString:	???????????? ?????????
! ! *XlwMenu.retrieveSnapshot.labelString:	Retrieve Snapshot
! *XlwMenu.retrieveSnapshot.labelString:	???????????? ?????????
! ! *XlwMenu.cVSUpdateDirectory.labelString:	CVS Update Directory
! *XlwMenu.cVSUpdateDirectory.labelString:	CVS ?????? ??????
! ! *XlwMenu.file.labelString:	File
! *XlwMenu.file.labelString:	??????
! ! *XlwMenu.edit.labelString:	Edit
! *XlwMenu.edit.labelString:	??????
! ! *XlwMenu.mule.labelString:	Mule
! ! *XlwMenu.mule.labelString:
! ! *XlwMenu.apps.labelString:	Apps
! *XlwMenu.apps.labelString:	??????
! ! *XlwMenu.options.labelString:	Options
! *XlwMenu.options.labelString:	??????
! ! *XlwMenu.buffers.labelString:	Buffers
! *XlwMenu.buffers.labelString:	?????????
! ! *XlwMenu.tools.labelString:	Tools
! *XlwMenu.tools.labelString:	??????
! ! *XlwMenu.lispInteraction.labelString:	Lisp-Interaction
! *XlwMenu.lispInteraction.labelString:	Lisp-??????
! ! *XlwMenu.load_emacs.labelString:	Load .emacs
! *XlwMenu.load_emacs.labelString:	.emacs ??? ???????????????
! ! *XlwMenu.help.labelString:	Help
! *XlwMenu.help.labelString:	?????????


--- NEW FILE Emacs.ad.ko_KR.eucKR ---
! XEmacs 21.x ?? ???? (????)
!
!	Xiaolin Park <xlpark at kankou.cs.uec.ac.jp>
!			Time-stamp: <03/10/17 21:15:10 petersen>
!
! This is the app-defaults file for XEmacs.
!
! This used to be identical to sample.Xdefaults, but the resources
! below have been rewritten to be as general as possible to avoid
! overriding user resources.  Other than the form rewriting, both
! files should be kept in sync. 
! 
! The resources below are loaded into the XEmacs executable at compile-time:
! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
! effect.
! 
! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
! (or whatever the standard app-defaults directory is at your site) to cause
! it to be consulted at run-time.  (Do this only for site-wide customizations:
! personal customizations should be put into ~/.Xdefaults instead.)
! Note that the file must be named Emacs, not XEmacs.
! 
! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of
! the various resources and the syntax for setting them.
! 
! Energize users: note that this is not the same app-defaults file that is
! used with the Energize-specific version of XEmacs.


! Colors and backgrounds.
! ======================
! The contrasts of these colors will cause them to map to the appropriate
! one of "black" or "white" on monochrome systems.
! 
! The valid color names on your system can be found by looking in the file
! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/.

! ! Set the modeline colors.
! Emacs.modeline*attributeForeground:	Black
! Emacs.modeline*attributeBackground:	Gray75

! ! Set the color of the text cursor.
! Emacs.text-cursor*attributeBackground:	Red3

! If you want to set the color of the mouse pointer, do this:
! Emacs.pointer*attributeForeground:	Black
! If you want to set the background of the mouse pointer, do this:
! Emacs.pointer*attributeBackground:	White
! Note that by default, the pointer foreground and background are the same
! as the default face.

! Set the menubar colors.  This overrides the default foreground and
! background colors specified above.
*menubar*Foreground:			Gray30
*menubar*Background:			Gray80
! This is for buttons in the menubar.  
! Yellow would be better, but that would map to white on monochrome.
*menubar*buttonForeground:		Blue
*XlwMenu*highlightForeground:		Red
*XlwMenu*titleForeground:		Maroon
*XlwMenu*selectColor:			ForestGreen
*XmToggleButton*selectColor:		ForestGreen

! Specify the colors of popup menus.
*popup*Foreground:			Black
*popup*Background:			Gray80

! Specify the colors of the various sub-widgets of the dialog boxes.
*dialog*Foreground:			Black
! #A5C0C1 is a shade of blue
*dialog*Background:			#A5C0C1
! The following three are for Motif dialog boxes ...
*dialog*XmTextField*Background:		WhiteSmoke
*dialog*XmText*Background:		WhiteSmoke
*dialog*XmList*Background:		WhiteSmoke
! While this one is for Athena dialog boxes.
*dialog*Command*Background:		WhiteSmoke

! Xlw Scrollbar colors
*XlwScrollBar*Foreground:		Gray30
*XlwScrollBar*Background:		Gray80
*XmScrollBar*Foreground:		Gray30
*XmScrollBar*Background:		Gray80

!
! The Lucid Scrollbar supports two added resources, SliderStyle is either
! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
! of the slider that depresses when the slider is clicked on.  ArrowPosition is
! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
! of the scrollbar, same puts both arrows at the same end, like the Amiga.
!
Emacs*XlwScrollBar.SliderStyle:    dimple
! Emacs*XlwScrollBar.ArrowPosition:  opposite

!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

! *topToolBarShadowColor:		Gray90
! *bottomToolBarShadowColor:		Gray40
! *backgroundToolBarColor:		Gray80
! *toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
Emacs.default.attributeFont:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
! *menubar*Font:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*popup*Font:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*XmTextField*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*XmText*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*
*XmList*FontList:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:-daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*,*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField*translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton*translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! XIM fontset (defaults to system fontset default)
! *EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
!    Japanese localization resources for XEmacs.
! @(#)Emacs	1.3 96/09/22
!    Copyright (C) 1996 Sun Microsystems, Inc.
!!
! This file is part of XEmacs.
! 
! XEmacs is free software; you can redistribute it and/or modify it
! under the terms of the GNU General Public License as published by the
! Free Software Foundation; either version 2, or (at your option) any
! later version.
! XEmacs 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 XEmacs; see the file COPYING.  If not, write to the
! Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! Boston, MA 02111-1307, USA.
! Copyright (C) 1996 Sun Microsystems Inc.
!
! Japanese Resources to be placed in etc/app-defaults/ja/Emacs
! for xemacs-mule.  It is same on another languages such like fr,
! if you want to have French menu label, place it on
! etc/app-defaults/fr/Emacs.

! Pulldown menu internationalization.  The first line of the file
! "*XlwMenu.resourceLabels: True" has to be there to make sure
! all the labelString will be read and displayed by X.
*XlwMenu.resourceLabels: True

! CDE doesn't require this but OpenWindows does.
! Note that this `gothic' font family is effective just for Japanese.
! And fontList is just used under Motif menubar.
!*fontList: -misc-fixed-medium-r-normal--16-*-*-*-*-*-*-*:
*fontList: -*-gothic-medium-r-normal--16-*-*-*-*-*-*-*:
!! FontSet for menus when you use --with-xfs or --with-xim=xlib.
*fontSet: -daewoo-gothic-medium-r-normal--16-*-*-*-*-*-*-*

! Starting below here are menu label string which can be translated to
! different languages. 
! Example: *XlwMenu.file.labelString: File  
! Characters before the ":" sign, "Example: *XlwMenu.file.labelString"
! can not be changed. They must stay exactly the way they are.
! The only string to be translated is the string, "File".
! Some resource names such as "file", "quit" have been used in several
! places.  However, each of them only has to be translated once in this X
! resource file.
! *XlwMenu.readMailVM___.labelString:	Read Mail (VM)...
*XlwMenu.readMailVM___.labelString:	?????? ???? (VM)...
! *XlwMenu.readMailMH___.labelString:	Read Mail (MH)...
*XlwMenu.readMailMH___.labelString:	?????? ???? (MH)...
! *XlwMenu.sendMail___.labelString:	Send mail...
*XlwMenu.sendMail___.labelString:	?????? ??????
! *XlwMenu.usenetNews.labelString:	Usenet News
*XlwMenu.usenetNews.labelString:	???? ????
! *XlwMenu.browseTheWeb.labelString:	Browse the Web
*XlwMenu.browseTheWeb.labelString:	?????? ????
! *XlwMenu.gopher.labelString:	Gopher
*XlwMenu.gopher.labelString:	Gopher
! *XlwMenu.hyperbole___.labelString:	Hyperbole...
*XlwMenu.hyperbole___.labelString:	Hyperbole...
! *XlwMenu.spellCheckBuffer.labelString:	Spell-Check Buffer
*XlwMenu.spellCheckBuffer.labelString:	???????? ????????
! *XlwMenu.toggleVIEmulation.labelString:	Toggle VI emulation
*XlwMenu.toggleVIEmulation.labelString: 	VI ?????? ??????
! *XlwMenu.calendar.labelString:	Calendar
*XlwMenu.calendar.labelString:		????
! *XlwMenu.games.labelString:	Games
*XlwMenu.games.labelString:	????
! *XlwMenu.3MonthCalendar.labelString:	3-Month Calendar
*XlwMenu.3MonthCalendar.labelString:	???? ????
! *XlwMenu.diary.labelString:	Diary
*XlwMenu.diary.labelString:	????
! *XlwMenu.holidays.labelString:	Holidays
*XlwMenu.holidays.labelString:		????
! *XlwMenu.phasesOfTheMoon.labelString:	Phases of the Moon
*XlwMenu.phasesOfTheMoon.labelString:	????
! *XlwMenu.sunriseSunset.labelString:	Sunrise/Sunset
*XlwMenu.sunriseSunset.labelString:	????????/????????
! *XlwMenu.mineGame.labelString:	Mine Game 
*XlwMenu.mineGame.labelString:		Mine ????
! *XlwMenu.tetris.labelString:	Tetris
*XlwMenu.tetris.labelString:	????????
! *XlwMenu.quoteFromZippy.labelString:	Quote from Zippy
*XlwMenu.quoteFromZippy.labelString:	Zippy ?? ????
! *XlwMenu.psychoanalyst.labelString:	Psychoanalyst
*XlwMenu.psychoanalyst.labelString:	????????
! *XlwMenu.psychoanalyzeZippy.labelString:	Psychoanalyze Zippy!
*XlwMenu.psychoanalyzeZippy.labelString:	Zippy ?? ????????
! *XlwMenu.randomFlames.labelString:	Random Flames
*XlwMenu.randomFlames.labelString:	????????
! *XlwMenu.dunnetAdventure.labelString:	Dunnet (Adventure)
*XlwMenu.dunnetAdventure.labelString:	Dunnet (????)
! *XlwMenu.towersOfHanoi.labelString:	Towers of Hanoi
*XlwMenu.towersOfHanoi.labelString:	Hanoi ?? ??
! *XlwMenu.gameOfLife.labelString:	Game of Life
*XlwMenu.gameOfLife.labelString:	????????
! *XlwMenu.multiplicationPuzzle.labelString:	Multiplication Puzzle
*XlwMenu.multiplicationPuzzle.labelString:	???? ????????
! *XlwMenu.listAllBuffers.labelString:	List All Buffers
*XlwMenu.listAllBuffers.labelString:	???? ?????? ????
! *XlwMenu..labelString:	
! *XlwMenu..labelString:
! *XlwMenu.emacs.labelString:	Emacs
! *XlwMenu.emacs.labelString:
! *XlwMenu.group___.labelString:	Group...
! *XlwMenu.group___.labelString:	????...
! *XlwMenu.variable___.labelString:	Variable...
! *XlwMenu.variable___.labelString:	????...
! *XlwMenu.face___.labelString:	Face...
! *XlwMenu.face___.labelString:	??...
! *XlwMenu.saved___.labelString:	Saved...
! *XlwMenu.saved___.labelString:	???????? ????...
! *XlwMenu.set___.labelString:	Set...
! *XlwMenu.set___.labelString:	????...
! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	?????? ????...
! *XlwMenu.browse___.labelString:	Browse...
! *XlwMenu.browse___.labelString:	????????...
! *XlwMenu.emacs___.labelString:	Emacs...
! *XlwMenu.emacs___.labelString:
! *XlwMenu.editing.labelString:	Editing
*XlwMenu.editing.labelString:	????
! *XlwMenu.external.labelString:	External
*XlwMenu.external.labelString:		????
! *XlwMenu.programming.labelString:	Programming
*XlwMenu.programming.labelString:	????????????
! *XlwMenu.applications.labelString:	Applications
*XlwMenu.applications.labelString:	????
! *XlwMenu.development.labelString:	Development
*XlwMenu.development.labelString:	????
! *XlwMenu.environment.labelString:	Environment
*XlwMenu.environment.labelString:	????
! *XlwMenu.data.labelString:	Data
*XlwMenu.data.labelString:	??????
! *XlwMenu.files.labelString:	Files
*XlwMenu.files.labelString:	????
! *XlwMenu.wp.labelString:	Wp
*XlwMenu.wp.labelString:	????????
! *XlwMenu.faces.labelString:	Faces
*XlwMenu.faces.labelString:	??
! *XlwMenu.hypermedia.labelString:	Hypermedia
*XlwMenu.hypermedia.labelString:	??????
! *XlwMenu.help.labelString:	Help
! *XlwMenu.help.labelString:	??????
! *XlwMenu.local.labelString:	Local
*XlwMenu.local.labelString:	????
! *XlwMenu.undo.labelString:	Undo
*XlwMenu.undo.labelString:	???? ????
! *XlwMenu.cut.labelString:	Cut
*XlwMenu.cut.labelString:	??????
! *XlwMenu.copy.labelString:	Copy
*XlwMenu.copy.labelString:	????
! *XlwMenu.paste.labelString:	Paste
*XlwMenu.paste.labelString:	??????
! *XlwMenu.clear.labelString:	Clear
*XlwMenu.clear.labelString:	??????
! *XlwMenu.search___.labelString:	Search...
*XlwMenu.search___.labelString:		????...
! *XlwMenu.searchBackward___.labelString:	Search Backward...
*XlwMenu.searchBackward___.labelString:		?????? ????
! *XlwMenu.replace___.labelString:	Replace...
*XlwMenu.replace___.labelString:	??????
! *XlwMenu.searchRegexp___.labelString:	Search (Regexp)...
*XlwMenu.searchRegexp___.labelString:	???? (Regexp)...
! *XlwMenu.searchBackwardRegexp___.labelString:	Search Backward (Regexp)...
*XlwMenu.searchBackwardRegexp___.labelString:	?????? ???? (Regexp)...
! *XlwMenu.replaceRegexp___.labelString:	Replace (Regexp)...
*XlwMenu.replaceRegexp___.labelString:		?????? (Regexp)...
! *XlwMenu.gotoLine___.labelString:	Goto Line...
*XlwMenu.gotoLine___.labelString:	?????? ?????? ????	
! *XlwMenu.whatLine.labelString:	What Line
*XlwMenu.whatLine.labelString:		??????
! *XlwMenu.bookmarks.labelString:	Bookmarks
*XlwMenu.bookmarks.labelString:		??????
! *XlwMenu.startMacroRecording.labelString:	Start Macro Recording
*XlwMenu.startMacroRecording.labelString:	?????? ???? ????
! *XlwMenu.endMacroRecording.labelString:	End Macro Recording
*XlwMenu.endMacroRecording.labelString:		?????? ???? ????
! *XlwMenu.executeLastMacro.labelString:	Execute Last Macro
*XlwMenu.executeLastMacro.labelString:		???? ?????? ????
! *XlwMenu.showMessageLog.labelString:	Show Message Log
*XlwMenu.showMessageLog.labelString:	?????? ???? ????
! *XlwMenu.jumpToBookmark.labelString:	Jump to Bookmark
*XlwMenu.jumpToBookmark.labelString:	???????? ????
! *XlwMenu.setBookmark.labelString:	Set bookmark
*XlwMenu.setBookmark.labelString:	?????? ????
! *XlwMenu.insertContents.labelString:	Insert contents
*XlwMenu.insertContents.labelString:	?????? ????????
! *XlwMenu.insertLocation.labelString:	Insert location
*XlwMenu.insertLocation.labelString:	?????? ????????
! *XlwMenu.renameBookmark.labelString:	Rename bookmark
*XlwMenu.renameBookmark.labelString:	?????? ???? ??????
! *XlwMenu.deleteBookmark.labelString:	Delete Bookmark
*XlwMenu.deleteBookmark.labelString:	?????? ??????
! *XlwMenu.editBookmarkList.labelString:	Edit Bookmark List
*XlwMenu.editBookmarkList.labelString:		?????? ??????????
! *XlwMenu.saveBookmarks.labelString:	Save bookmarks
*XlwMenu.saveBookmarks.labelString:	?????? ????
! *XlwMenu.saveBookmarksAs___.labelString:	Save bookmarks as...
*XlwMenu.saveBookmarksAs___.labelString:	???????? ???? ???????? ????
! *XlwMenu.loadABookmarkFile.labelString:	Load a bookmark file
*XlwMenu.loadABookmarkFile.labelString:		?????? ???? ??????????
! *XlwMenu.open___.labelString:	Open...
*XlwMenu.open___.labelString:	????...
! *XlwMenu.openInOtherWindow___.labelString:	Open in Other Window...
*XlwMenu.openInOtherWindow___.labelString:	???? ???????? ????
! *XlwMenu.openInNewFrame___.labelString:	Open in New Frame...
*XlwMenu.openInNewFrame___.labelString:		?? ?????????? ????
! *XlwMenu.insertFile___.labelString:	Insert File...
*XlwMenu.insertFile___.labelString:	???? ????????...
! *XlwMenu.viewFile___.labelString:	View File...
*XlwMenu.viewFile___.labelString:	???? ????...
! *XlwMenu.save.labelString:	Save
*XlwMenu.save.labelString:	????
! *XlwMenu.saveAs___.labelString:	Save As...
*XlwMenu.saveAs___.labelString:		???? ???????? ????
! *XlwMenu.saveSomeBuffers.labelString:	Save Some Buffers
*XlwMenu.saveSomeBuffers.labelString:	?????? ???????? ????
! *XlwMenu.printBuffer.labelString:	Print Buffer
*XlwMenu.printBuffer.labelString:	?????? ????
! *XlwMenu.prettyPrintBuffer.labelString:	Pretty-Print Buffer
*XlwMenu.prettyPrintBuffer.labelString:		???????? ????????
! *XlwMenu.newFrame.labelString:	New Frame
*XlwMenu.newFrame.labelString:		?? ??????
! *XlwMenu.frameOnOtherDisplay___.labelString:	Frame on Other Display...
*XlwMenu.frameOnOtherDisplay___.labelString: ???? ?????????????? ??????...
! *XlwMenu.deleteFrame.labelString:	Delete Frame
*XlwMenu.deleteFrame.labelString:	?????? ??????
! *XlwMenu.splitWindow.labelString:	Split Window
*XlwMenu.splitWindow.labelString:	?????? ????
! *XlwMenu.unSplitKeepThis.labelString:	Un-Split (Keep This)
*XlwMenu.unSplitKeepThis.labelString:	???????? (?????? ????)
! *XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep Others)
*XlwMenu.unSplitKeepOthers.labelString:		???????? (???????? ????)
! *XlwMenu.revertBuffer.labelString:	Revert Buffer
*XlwMenu.revertBuffer.labelString:	?????? ????
! *XlwMenu.deleteBuffer.labelString:	Delete Buffer
*XlwMenu.deleteBuffer.labelString:	?????? ??????
! *XlwMenu.exitXEmacs.labelString:	Exit XEmacs
*XlwMenu.exitXEmacs.labelString:	XEmacs ????
! *XlwMenu.aboutXEmacs___.labelString:	About XEmacs...
*XlwMenu.aboutXEmacs___.labelString:	XEmacs ?? ??????
! *XlwMenu.basics.labelString:	Basics
*XlwMenu.basics.labelString:	????
! *XlwMenu.xEmacsFAQ.labelString:	XEmacs FAQ
*XlwMenu.xEmacsFAQ.labelString:	XEmacs FAQ
! *XlwMenu.samples.labelString:	Samples
*XlwMenu.samples.labelString:	????
! *XlwMenu.lookupInInfo.labelString:	Lookup in Info
*XlwMenu.lookupInInfo.labelString:	Info???? ????
! *XlwMenu.manuals.labelString:	Manuals
*XlwMenu.manuals.labelString:	??????
! *XlwMenu.commandsKeys.labelString:	Commands & Keys
*XlwMenu.commandsKeys.labelString:	???? & ??
! *XlwMenu.recentMessages.labelString:	Recent Messages
*XlwMenu.recentMessages.labelString:	???? ??????
! *XlwMenu.misc.labelString:	Misc
*XlwMenu.misc.labelString:	??????????
! *XlwMenu.submitBugReport.labelString:	Submit Bug Report
*XlwMenu.submitBugReport.labelString:	??Bug Report ????
! *XlwMenu.tutorial.labelString:	Tutorial
*XlwMenu.tutorial.labelString:	??????
! *XlwMenu.news.labelString:	News
*XlwMenu.news.labelString:	????
! *XlwMenu.packages.labelString:	Packages
*XlwMenu.packages.labelString:		??????
! *XlwMenu.splash.labelString:	Splash
*XlwMenu.splash.labelString:	Splash
! *XlwMenu.fAQLocal.labelString:	FAQ (local)
*XlwMenu.fAQLocal.labelString:	FAQ (local)
! *XlwMenu.fAQViaWWW.labelString:	FAQ via WWW
*XlwMenu.fAQViaWWW.labelString:		FAQ (WWW ????)
! *XlwMenu.homePage.labelString:	Home Page
*XlwMenu.homePage.labelString:		Home Page
! *XlwMenu.sample.labelString:	Sample
*XlwMenu.sample.labelString:	????
! *XlwMenu.keyBinding___.labelString:	Key Binding...
*XlwMenu.keyBinding___.labelString: ??????...
! *XlwMenu.command___.labelString:	Command...
*XlwMenu.command___.labelString:	????...
! *XlwMenu.function___.labelString:	Function...
*XlwMenu.function___.labelString:	????...
! *XlwMenu.topic___.labelString:	Topic...
*XlwMenu.topic___.labelString:		????...
! *XlwMenu.info.labelString:	Info
*XlwMenu.info.labelString:	Info
! *XlwMenu.unixManual___.labelString:	Unix Manual...
*XlwMenu.unixManual___.labelString:	Unix Manual...
! *XlwMenu.mode.labelString:	Mode
*XlwMenu.mode.labelString:	????
! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	?????? ????...
! *XlwMenu.aproposDocs___.labelString:	Apropos Docs...
*XlwMenu.aproposDocs___.labelString:	???????? ?????? ????...
! *XlwMenu.key___.labelString:	Key...
*XlwMenu.key___.labelString:	??...
! *XlwMenu.bindings.labelString:	Bindings
*XlwMenu.bindings.labelString:		????
! *XlwMenu.mouseBindings.labelString:	Mouse Bindings
*XlwMenu.mouseBindings.labelString:	Mouse ????
! *XlwMenu.recentKeys.labelString:	Recent Keys
*XlwMenu.recentKeys.labelString:	??????
! *XlwMenu.variable___.labelString:	Variable...
! *XlwMenu.variable___.labelString:
! *XlwMenu.locateCommand___.labelString:	Locate Command...
*XlwMenu.locateCommand___.labelString:	?????? ????...
! *XlwMenu.noWarranty.labelString:	No Warranty
*XlwMenu.noWarranty.labelString:	??????
! *XlwMenu.xEmacsLicense.labelString:	XEmacs License
*XlwMenu.xEmacsLicense.labelString:	XEmacs ??????
! *XlwMenu.theLatestVersion.labelString:	The Latest Version
*XlwMenu.theLatestVersion.labelString:	???? ????
! *XlwMenu.evaluateLastSExpression.labelString:	Evaluate Last S-expression
*XlwMenu.evaluateLastSExpression.labelString:	???? S???? ????
! *XlwMenu.evaluateEntireBuffer.labelString:	Evaluate Entire Buffer
*XlwMenu.evaluateEntireBuffer.labelString:	???????????? ????
! *XlwMenu.evaluateRegion.labelString:	Evaluate Region
*XlwMenu.evaluateRegion.labelString:	???? ????
! *XlwMenu.evaluateThisDefun.labelString:	Evaluate This Defun
*XlwMenu.evaluateThisDefun.labelString:	?? Defun?? ????
! *XlwMenu.debugThisDefun.labelString:	Debug This Defun
*XlwMenu.debugThisDefun.labelString:	?? Defun?? ??????
! *XlwMenu.traceAFunction.labelString:	Trace a Function
*XlwMenu.traceAFunction.labelString:	?????? ????
! *XlwMenu.untraceAllFunctions.labelString:	Untrace All Functions
*XlwMenu.untraceAllFunctions.labelString:	???? ?????? ??????
! *XlwMenu.commentOutRegion.labelString:	Comment Out Region
*XlwMenu.commentOutRegion.labelString:	?????????? ??????
! *XlwMenu.indentRegion.labelString:	Indent Region
*XlwMenu.indentRegion.labelString:	???? ??????
! *XlwMenu.indentLine.labelString:	Indent Line
*XlwMenu.indentLine.labelString:	?? ??????
! *XlwMenu.debugOnError.labelString:	Debug On Error
! *XlwMenu.debugOnError.labelString:	?????? ?? ??????
! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
! *XlwMenu.debugOnQuit.labelString:	???????? ??????
! *XlwMenu.debugOnSignal.labelString:	Debug on Signal
*XlwMenu.debugOnSignal.labelString: ?????? ??????
! *XlwMenu.describeLanguageSupport.labelString:	Describe language support
*XlwMenu.describeLanguageSupport.labelString:	???? ???????? ????
! *XlwMenu.setLanguageEnvironment.labelString:	Set language environment
*XlwMenu.setLanguageEnvironment.labelString:	?????????? ????
! *XlwMenu.toggleInputMethod.labelString:	Toggle input method
*XlwMenu.toggleInputMethod.labelString:		?????????? ??????
! *XlwMenu.selectInputMethod.labelString:	Select input method
*XlwMenu.selectInputMethod.labelString:	???????? ????
! *XlwMenu.describeInputMethod.labelString:	Describe input method
*XlwMenu.describeInputMethod.labelString:???????? ????
! *XlwMenu.describeCurrentCodingSystems.labelString:	Describe current coding systems
*XlwMenu.describeCurrentCodingSystems.labelString:	???? ???? ???????? ????
! *XlwMenu.setCodingSystemOfBufferFile.labelString:	Set coding system of buffer file
*XlwMenu.setCodingSystemOfBufferFile.labelString:	?????? ???? ???? ?????? ????
! *XlwMenu.setCodingSystemOfTerminal.labelString:	Set coding system of terminal
*XlwMenu.setCodingSystemOfTerminal.labelString:		?????? ???? ?????? ????
! *XlwMenu.setCodingSystemOfKeyboard.labelString:	Set coding system of keyboard
*XlwMenu.setCodingSystemOfKeyboard.labelString:	?????? ???? ?????? ????
! *XlwMenu.setCodingSystemOfProcess.labelString:	Set coding system of process
*XlwMenu.setCodingSystemOfProcess.labelString:	???????? ???? ?????? ????
! *XlwMenu.showCharacterTable.labelString:	Show character table
*XlwMenu.showCharacterTable.labelString:	???????? ????
! *XlwMenu.showDiagnosisForMULE.labelString:	Show diagnosis for MULE
*XlwMenu.showDiagnosisForMULE.labelString:	MULE?? ????????
! *XlwMenu.showManyLanguages.labelString:	Show many languages
*XlwMenu.showManyLanguages.labelString:	???? ????????
! *XlwMenu.chineseGB.labelString:	Chinese-GB
*XlwMenu.chineseGB.labelString:		??????-GB
! *XlwMenu.chineseBIG5.labelString:	Chinese-BIG5
*XlwMenu.chineseBIG5.labelString:	??????-BIG5
! *XlwMenu.cyrillicISO.labelString:	Cyrillic-ISO
*XlwMenu.cyrillicISO.labelString:	????-ISO
! *XlwMenu.cyrillicKOI8.labelString:	Cyrillic-KOI8
*XlwMenu.cyrillicKOI8.labelString:	????-KOI8
! *XlwMenu.cyrillicALT.labelString:	Cyrillic-ALT
*XlwMenu.cyrillicALT.labelString:	????-ALT
! *XlwMenu.cyrillic.labelString:	Cyrillic
*XlwMenu.cyrillic.labelString:	????
! ! *XlwMenu.english.labelString:	English
*XlwMenu.english.labelString:		????
! *XlwMenu.aSCII.labelString:	ASCII
! *XlwMenu.aSCII.labelString:
! *XlwMenu.latin1.labelString:	Latin-1
*XlwMenu.latin1.labelString:	????-1
! *XlwMenu.german.labelString:	German
*XlwMenu.german.labelString:	??????
! *XlwMenu.french.labelString:	French
*XlwMenu.french.labelString:	????????
! *XlwMenu.norwegian.labelString:	Norwegian
*XlwMenu.norwegian.labelString:		??????????
! *XlwMenu.latin2.labelString:	Latin-2
*XlwMenu.latin2.labelString:	????-2
! *XlwMenu.croatian.labelString:	Croatian
*XlwMenu.croatian.labelString:		??????????
! *XlwMenu.polish.labelString:	Polish
*XlwMenu.polish.labelString:	????????
! *XlwMenu.latin3.labelString:	Latin-3
*XlwMenu.latin3.labelString:	????-3
! *XlwMenu.latin4.labelString:	Latin-4
*XlwMenu.latin4.labelString:	????-4
! *XlwMenu.latin5.labelString:	Latin-5
*XlwMenu.latin5.labelString:	????-5
! *XlwMenu.greek.labelString:	Greek
*XlwMenu.greek.labelString:	????????
! *XlwMenu.hebrew.labelString:	Hebrew
*XlwMenu.hebrew.labelString:	??????????
! *XlwMenu.japanese.labelString:	Japanese
*XlwMenu.japanese.labelString:		??????
! *XlwMenu.korean.labelString:	Korean
*XlwMenu.korean.labelString:	????
! *XlwMenu.iPA.labelString:	IPA
! *XlwMenu.iPA.labelString:
! *XlwMenu.customize.labelString:	Customize
*XlwMenu.customize.labelString:	????????????
! *XlwMenu.readOnly.labelString:	Read Only
*XlwMenu.readOnly.labelString:	???? ?????? ????
! *XlwMenu.editingOptions.labelString:	Editing Options
*XlwMenu.editingOptions.labelString:	???? ????????
! *XlwMenu.generalOptions.labelString:	General Options
*XlwMenu.generalOptions.labelString:	???? ????????
! *XlwMenu.printingOptions.labelString:	Printing Options
*XlwMenu.printingOptions.labelString:	???? ????????
! *XlwMenu.otherWindowLocation.labelString:	"Other Window" Location
*XlwMenu.otherWindowLocation.labelString:	???? ?????? ????????
! *XlwMenu.syntaxHighlighting.labelString:	Syntax Highlighting
*XlwMenu.syntaxHighlighting.labelString:	?????? ????
! *XlwMenu.parenHighlighting.labelString:	Paren Highlighting
*XlwMenu.parenHighlighting.labelString:	?????? ????
! *XlwMenu.frameAppearance.labelString:	Frame Appearance
*XlwMenu.frameAppearance.labelString:	?????? ????
! *XlwMenu.menubarAppearance.labelString:	Menubar Appearance
*XlwMenu.menubarAppearance.labelString: ?????? ????
! *XlwMenu.toolbarAppearance.labelString:	Toolbar Appearance
*XlwMenu.toolbarAppearance.labelString:	?????? ????
! *XlwMenu.mouse.labelString:	Mouse
*XlwMenu.mouse.labelString:	Mouse
! *XlwMenu.openURLsWith.labelString:	Open URLs With
*XlwMenu.openURLsWith.labelString:	URLs ????
! *XlwMenu.browseFaces___.labelString:	Browse Faces...
*XlwMenu.browseFaces___.labelString: ???? ????
! *XlwMenu.font.labelString:	Font
*XlwMenu.font.labelString:	??????
! *XlwMenu.size.labelString:	Size
*XlwMenu.size.labelString:	????
! *XlwMenu.weight.labelString:	Weight
*XlwMenu.weight.labelString:	????
! *XlwMenu.saveOptions.labelString:	Save Options
*XlwMenu.saveOptions.labelString: ???? Options
! *XlwMenu.emacs.labelString:	Emacs
! *XlwMenu.emacs.labelString:
! *XlwMenu.group___.labelString:	Group...
*XlwMenu.group___.labelString:	????...
! *XlwMenu.variable___.labelString:	Variable...
*XlwMenu.variable___.labelString:	????...
! *XlwMenu.face___.labelString:	Face...
*XlwMenu.face___.labelString:	??...
! *XlwMenu.saved___.labelString:	Saved...
*XlwMenu.saved___.labelString:		???????? ????...
! *XlwMenu.set___.labelString:	Set...
*XlwMenu.set___.labelString:	????...
! *XlwMenu.apropos___.labelString:	Apropos...
*XlwMenu.apropos___.labelString:	?????? ????...
! *XlwMenu.browse___.labelString:	Browse...
*XlwMenu.browse___.labelString:		????????...
!! *XlwMenu.overstrike.labelString:	Overstrike
*XlwMenu.overstrike.labelString:	???????? ????
! *XlwMenu.caseSensitiveSearch.labelString:	Case Sensitive Search
*XlwMenu.caseSensitiveSearch.labelString:	?? ???????? ?????????? ????
! *XlwMenu.caseMatchingReplace.labelString:	Case Matching Replace
*XlwMenu.caseMatchingReplace.labelString:	?? ???????? ?????????? ??????
! *XlwMenu.autoDeleteSelection.labelString:	Auto Delete Selection
*XlwMenu.autoDeleteSelection.labelString:	?????????? ??????????
! *XlwMenu.activeRegions.labelString:	Active Regions
*XlwMenu.activeRegions.labelString:	?????? ???????? ????
! *XlwMenu.mousePasteAtTextCursor.labelString:	Mouse Paste At Text Cursor
*XlwMenu.mousePasteAtTextCursor.labelString: ?????? ???? ???????? Mouse ??????
! *XlwMenu.requireNewlineAtEnd.labelString:	Require Newline At End
*XlwMenu.requireNewlineAtEnd.labelString:	?????? ?????????? ????
! *XlwMenu.addNewlineWhenMovingPastEnd.labelString:	Add Newline When Moving Past End
*XlwMenu.addNewlineWhenMovingPastEnd.labelString: ?????? ?????? ???? ?????????? ????
! *XlwMenu.teachExtendedCommands.labelString:	Teach Extended Commands
*XlwMenu.teachExtendedCommands.labelString:	???????? ????
! *XlwMenu.debugOnError.labelString:	Debug On Error
*XlwMenu.debugOnError.labelString:	???????? ??????
! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
*XlwMenu.debugOnQuit.labelString:	???????? ??????
! *XlwMenu.commandLineSwitchesForLprLp___.labelString:	Command-Line Switches for `lpr'/`lp'...
*XlwMenu.commandLineSwitchesForLprLp___.labelString:	`lpr'/`lp' ?????????? ??????
! *XlwMenu.prettyPrintPaperSize.labelString:	Pretty-Print Paper Size
*XlwMenu.prettyPrintPaperSize.labelString:	?????? ?????????? ????????
! *XlwMenu.colorPrinting.labelString:	Color Printing
*XlwMenu.colorPrinting.labelString:	???? ????
! *XlwMenu.letter.labelString:	Letter
! *XlwMenu.letter.labelString:
! *XlwMenu.letterSmall.labelString:	Letter-small
! *XlwMenu.letterSmall.labelString:
! *XlwMenu.legal.labelString:	Legal
! *XlwMenu.legal.labelString:
! *XlwMenu.statement.labelString:	Statement
! *XlwMenu.statement.labelString:
! *XlwMenu.executive.labelString:	Executive
! *XlwMenu.executive.labelString:
! *XlwMenu.tabloid.labelString:	Tabloid
! *XlwMenu.tabloid.labelString:
! *XlwMenu.ledger.labelString:	Ledger
! *XlwMenu.ledger.labelString:
! *XlwMenu.a3.labelString:	A3
! *XlwMenu.a3.labelString:
! *XlwMenu.a4.labelString:	A4
! *XlwMenu.a4.labelString:
! *XlwMenu.a4small.labelString:	A4small
! *XlwMenu.a4small.labelString:
! *XlwMenu.b4.labelString:	B4
! *XlwMenu.b4.labelString:
! *XlwMenu.b5.labelString:	B5
! *XlwMenu.b5.labelString:
! *XlwMenu.alwaysInSameFrame.labelString:	Always in Same Frame
*XlwMenu.alwaysInSameFrame.labelString:		???? ???? ??????
! *XlwMenu.otherFrame2FramesMax.labelString:	Other Frame (2 Frames Max)
*XlwMenu.otherFrame2FramesMax.labelString:	???? ?????? (???? 2 ??????)
! *XlwMenu.otherFrame3FramesMax.labelString:	Other Frame (3 Frames Max)
*XlwMenu.otherFrame3FramesMax.labelString:	???? ?????? (???? 3 ??????)
! *XlwMenu.otherFrame4FramesMax.labelString:	Other Frame (4 Frames Max)
*XlwMenu.otherFrame4FramesMax.labelString:	???? ?????? (???? 4 ??????)
! *XlwMenu.otherFrame5FramesMax.labelString:	Other Frame (5 Frames Max)
*XlwMenu.otherFrame5FramesMax.labelString:	???? ?????? (???? 5 ??????)
! *XlwMenu.alwaysCreateNewFrame.labelString:	Always Create New Frame
*XlwMenu.alwaysCreateNewFrame.labelString:?? ?? ???????? ????
! *XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	Temp Buffers Always in Same Frame
*XlwMenu.tempBuffersAlwaysInSameFrame.labelString: ???? ???????? ?????? ???? ??????????
! *XlwMenu.tempBuffersLikeOtherBuffers.labelString:	Temp Buffers Like Other Buffers
*XlwMenu.tempBuffersLikeOtherBuffers.labelString: ???? ???????? ???? ???????? ????
! *XlwMenu.makeCurrentFrameGnuservTarget.labelString:	Make current frame gnuserv target
*XlwMenu.makeCurrentFrameGnuservTarget.labelString:?? ???????? gnuserv ?? ??????
! *XlwMenu.inThisBuffer.labelString:	In This Buffer
*XlwMenu.inThisBuffer.labelString:	?? ??????????
! *XlwMenu.automatic.labelString:	Automatic
*XlwMenu.automatic.labelString:		????
! *XlwMenu.fonts.labelString:	Fonts
*XlwMenu.fonts.labelString:	??????
! *XlwMenu.colors.labelString:	Colors
*XlwMenu.colors.labelString:	??
! *XlwMenu.least.labelString:	Least
*XlwMenu.least.labelString:	????
! *XlwMenu.more.labelString:	More
*XlwMenu.more.labelString:	?? ??
! *XlwMenu.evenMore.labelString:	Even More
*XlwMenu.evenMore.labelString:???? ????
! *XlwMenu.most.labelString:	Most
*XlwMenu.most.labelString:	????
! *XlwMenu.lazy.labelString:	Lazy
*XlwMenu.lazy.labelString:	????????
! *XlwMenu.caching.labelString:	Caching
*XlwMenu.caching.labelString: Caching
! *XlwMenu.none.labelString:	None
*XlwMenu.none.labelString:	????
! *XlwMenu.blinkingParen.labelString:	Blinking Paren
*XlwMenu.blinkingParen.labelString:	????????
! *XlwMenu.steadyParen.labelString:	Steady Paren
*XlwMenu.steadyParen.labelString:	?????? ????
! *XlwMenu.expression.labelString:	Expression
*XlwMenu.expression.labelString:	???? ????
! *XlwMenu.scrollbars.labelString:	Scrollbars
*XlwMenu.scrollbars.labelString:	??????????
! *XlwMenu.3DModeline.labelString:	3D Modeline
*XlwMenu.3DModeline.labelString:	???????? ??????
! *XlwMenu.truncateLines.labelString:	Truncate Lines
*XlwMenu.truncateLines.labelString:	???? ?????? ??????
! *XlwMenu.barCursor.labelString:	Bar Cursor
*XlwMenu.barCursor.labelString:		?? ????
! *XlwMenu.blinkingCursor.labelString:	Blinking Cursor
*XlwMenu.blinkingCursor.labelString:	???????? ????
! *XlwMenu.frameLocalFontMenu.labelString:	Frame-Local Font Menu
*XlwMenu.frameLocalFontMenu.labelString: ?????????? ??????????
! *XlwMenu.buffersMenuLength___.labelString:	Buffers Menu Length...
*XlwMenu.buffersMenuLength___.labelString:	?????????? ????
! *XlwMenu.multiOperationBuffersSubMenus.labelString:	Multi-Operation Buffers Sub-Menus
*XlwMenu.multiOperationBuffersSubMenus.labelString:	???????????? ????????
! *XlwMenu.buffersMenuSorting.labelString:	Buffers Menu Sorting
*XlwMenu.buffersMenuSorting.labelString:	?????????? ????
! *XlwMenu.submenusForBufferGroups.labelString:	Submenus for Buffer Groups
*XlwMenu.submenusForBufferGroups.labelString: ?????? ?????? ????????
! *XlwMenu.ignoreScaledFonts.labelString:	Ignore Scaled Fonts
*XlwMenu.ignoreScaledFonts.labelString:	???? ???????? ????
! *XlwMenu.mostRecentlyUsed.labelString:	Most Recently Used
*XlwMenu.mostRecentlyUsed.labelString:		???? ????????
! *XlwMenu.alphabetically.labelString:	Alphabetically
*XlwMenu.alphabetically.labelString:	????????
! *XlwMenu.byMajorModeThenAlphabetically.labelString:	By Major Mode, Then Alphabetically
*XlwMenu.byMajorModeThenAlphabetically.labelString: ???????????????? ????????
! *XlwMenu.visible.labelString:	Visible
*XlwMenu.visible.labelString:	????
! *XlwMenu.captioned.labelString:	Captioned
*XlwMenu.captioned.labelString:	???? ????
! *XlwMenu.defaultLocation.labelString:	Default Location
*XlwMenu.defaultLocation.labelString: Default ????
! *XlwMenu.top.labelString:	Top
*XlwMenu.top.labelString:	??
! *XlwMenu.bottom.labelString:	Bottom
*XlwMenu.bottom.labelString:	??
! *XlwMenu.left.labelString:	Left
*XlwMenu.left.labelString:	????
! *XlwMenu.right.labelString:	Right
*XlwMenu.right.labelString:	??????
! *XlwMenu.avoidText.labelString:	Avoid-Text
*XlwMenu.avoidText.labelString:		?????? ??????
! *XlwMenu.strokesMode.labelString:	strokes-mode
*XlwMenu.strokesMode.labelString:	strokes-????
! *XlwMenu.emacsW3.labelString:	Emacs-W3
! *XlwMenu.emacsW3.labelString:
! *XlwMenu.netscape.labelString:	Netscape
! *XlwMenu.netscape.labelString:
! *XlwMenu.mosaic.labelString:	Mosaic
! *XlwMenu.mosaic.labelString:
! *XlwMenu.mosaicCCI.labelString:	Mosaic (CCI)
! *XlwMenu.mosaicCCI.labelString:
! *XlwMenu.iXIMosaic.labelString:	IXI Mosaic
! *XlwMenu.iXIMosaic.labelString:
! *XlwMenu.lynxXterm.labelString:	Lynx (xterm)
! *XlwMenu.lynxXterm.labelString:
! *XlwMenu.lynxXemacs.labelString:	Lynx (xemacs)
! *XlwMenu.lynxXemacs.labelString:
! *XlwMenu.grail.labelString:	Grail
! *XlwMenu.grail.labelString:
! *XlwMenu.charter.labelString:	Charter
! *XlwMenu.charter.labelString:
! *XlwMenu.clean.labelString:	Clean
! *XlwMenu.clean.labelString:
! *XlwMenu.courier.labelString:	Courier
! *XlwMenu.courier.labelString:
! *XlwMenu.fixed.labelString:	Fixed
! *XlwMenu.fixed.labelString:
! *XlwMenu.helvetica.labelString:	Helvetica
! *XlwMenu.helvetica.labelString:
! *XlwMenu.lucida.labelString:	Lucida
! *XlwMenu.lucida.labelString:
! *XlwMenu.lucidabright.labelString:	Lucidabright
! *XlwMenu.lucidabright.labelString:
! *XlwMenu.lucidatypewriter.labelString:	Lucidatypewriter
! *XlwMenu.lucidatypewriter.labelString:
! *XlwMenu.newCenturySchoolbook.labelString:	New Century Schoolbook
! *XlwMenu.newCenturySchoolbook.labelString:
! *XlwMenu.terminal.labelString:	Terminal
! *XlwMenu.terminal.labelString:
! *XlwMenu.times.labelString:	Times
! *XlwMenu.times.labelString:
! *XlwMenu.utopia.labelString:	Utopia
! *XlwMenu.utopia.labelString:
! *XlwMenu.5.labelString:	5
! *XlwMenu.5.labelString:
! *XlwMenu.6.labelString:	6
! *XlwMenu.6.labelString:
! *XlwMenu.7.labelString:	7
! *XlwMenu.7.labelString:
! *XlwMenu.8.labelString:	8
! *XlwMenu.8.labelString:
! *XlwMenu.9.labelString:	9
! *XlwMenu.9.labelString:
! *XlwMenu.10.labelString:	10
! *XlwMenu.10.labelString:
! *XlwMenu.11.labelString:	11
! *XlwMenu.11.labelString:
! *XlwMenu.12.labelString:	12
! *XlwMenu.12.labelString:
! *XlwMenu.13.labelString:	13
! *XlwMenu.13.labelString:
! *XlwMenu.14.labelString:	14
! *XlwMenu.14.labelString:
! *XlwMenu.15.labelString:	15
! *XlwMenu.15.labelString:
! *XlwMenu.16.labelString:	16
! *XlwMenu.16.labelString:
! *XlwMenu.17.labelString:	17
! *XlwMenu.17.labelString:
! *XlwMenu.18.labelString:	18
! *XlwMenu.18.labelString:
! *XlwMenu.19.labelString:	19
! *XlwMenu.19.labelString:
! *XlwMenu.20.labelString:	20
! *XlwMenu.20.labelString:
! *XlwMenu.23.labelString:	23
! *XlwMenu.23.labelString:
! *XlwMenu.24.labelString:	24
! *XlwMenu.24.labelString:
! *XlwMenu.black.labelString:	Black
! *XlwMenu.black.labelString:
! *XlwMenu.bold.labelString:	Bold
! *XlwMenu.bold.labelString:
! *XlwMenu.demibold.labelString:	Demibold
! *XlwMenu.demibold.labelString:
! *XlwMenu.medium.labelString:	Medium
! *XlwMenu.medium.labelString:
! *XlwMenu.regular.labelString:	Regular
! *XlwMenu.regular.labelString:
! *XlwMenu.grep___.labelString:	Grep...
! *XlwMenu.grep___.labelString:
! *XlwMenu.compile___.labelString:	Compile...
*XlwMenu.compile___.labelString:	??????...
! *XlwMenu.shell.labelString:	Shell
*XlwMenu.shell.labelString:	????
! *XlwMenu.shellCommand___.labelString:	Shell Command...
*XlwMenu.shellCommand___.labelString:	???? ????...
! *XlwMenu.shellCommandOnRegion___.labelString:	Shell Command on Region...
*XlwMenu.shellCommandOnRegion___.labelString:	???????? ?????????? ????...
! *XlwMenu.debugGDB___.labelString:	Debug (GDB)...
*XlwMenu.debugGDB___.labelString:	?????? (GDB)...
! *XlwMenu.debugDBX___.labelString:	Debug (DBX)...
*XlwMenu.debugDBX___.labelString:	?????? (DBX)...
! *XlwMenu.oOBrowser___.labelString:	OO-Browser...
*XlwMenu.oOBrowser___.labelString:	OO-??????...
! *XlwMenu.tags.labelString:	Tags
*XlwMenu.tags.labelString:	????
! *XlwMenu.vC.labelString:	VC
! *XlwMenu.vC.labelString:
! *XlwMenu.findTag___.labelString:	Find Tag...
*XlwMenu.findTag___.labelString:	?????? ????...
! *XlwMenu.findOtherWindow___.labelString:	Find Other Window...
*XlwMenu.findOtherWindow___.labelString:	?????? ?????????? ????...
! *XlwMenu.nextTag___.labelString:	Next Tag...
*XlwMenu.nextTag___.labelString:	?????? ????...
! *XlwMenu.nextOtherWindow___.labelString:	Next Other Window...
*XlwMenu.nextOtherWindow___.labelString:	?????? ?????????? ?????? ????????...
! *XlwMenu.nextFile.labelString:	Next File
*XlwMenu.nextFile.labelString:		?????? ????
! *XlwMenu.tagsSearch___.labelString:	Tags Search...
*XlwMenu.tagsSearch___.labelString:	???? ????...
! *XlwMenu.tagsReplace___.labelString:	Tags Replace...
*XlwMenu.tagsReplace___.labelString:	???? ??????...
! *XlwMenu.continueSearchReplace.labelString:	Continue Search/Replace
*XlwMenu.continueSearchReplace.labelString:	????/?????? ????
! *XlwMenu.popStack.labelString:	Pop stack
*XlwMenu.popStack.labelString:		???????? ????
! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	???????? ????...
! *XlwMenu.setTagsTableFile___.labelString:	Set Tags Table File...
*XlwMenu.setTagsTableFile___.labelString:	?????? ?????? ????...
! *XlwMenu.registerFile.labelString:	Register File
*XlwMenu.registerFile.labelString:	???? ????
! *XlwMenu.revertToLastRevision.labelString:	Revert to Last Revision
*XlwMenu.revertToLastRevision.labelString:	?????? ?????????? ????
! *XlwMenu.cancelLastCheckin.labelString:	Cancel Last Checkin
*XlwMenu.cancelLastCheckin.labelString:		?????? Checkin ?? ??????
! *XlwMenu.renameFile.labelString:	Rename File
*XlwMenu.renameFile.labelString:	?????? ???? ??????
! *XlwMenu.diffAgainstLastVersion.labelString:	Diff Against Last Version
*XlwMenu.diffAgainstLastVersion.labelString:	?????????? diff
! *XlwMenu.diffBetweenRevisions___.labelString:	Diff Between Revisions...
*XlwMenu.diffBetweenRevisions___.labelString:	?????? ?????????? diff...
! *XlwMenu.visitOtherVersion___.labelString:	Visit Other Version...
*XlwMenu.visitOtherVersion___.labelString:	????  ????????...
! *XlwMenu.showEditHistory.labelString:	Show Edit History
*XlwMenu.showEditHistory.labelString:	?????????? ????
! *XlwMenu.listLockedFilesAnyUser.labelString:	List Locked Files Any User
*XlwMenu.listLockedFilesAnyUser.labelString:	?????? ?????? ????
! *XlwMenu.createSnapshot.labelString:	Create Snapshot
*XlwMenu.createSnapshot.labelString:	???????? ??????
! *XlwMenu.retrieveSnapshot.labelString:	Retrieve Snapshot
*XlwMenu.retrieveSnapshot.labelString:	???????? ??????
! *XlwMenu.cVSUpdateDirectory.labelString:	CVS Update Directory
*XlwMenu.cVSUpdateDirectory.labelString:	CVS ???? ????
! *XlwMenu.file.labelString:	File
*XlwMenu.file.labelString:	????
! *XlwMenu.edit.labelString:	Edit
*XlwMenu.edit.labelString:	????
! *XlwMenu.mule.labelString:	Mule
! *XlwMenu.mule.labelString:
! *XlwMenu.apps.labelString:	Apps
*XlwMenu.apps.labelString:	????
! *XlwMenu.options.labelString:	Options
*XlwMenu.options.labelString:	????
! *XlwMenu.buffers.labelString:	Buffers
*XlwMenu.buffers.labelString:	??????
! *XlwMenu.tools.labelString:	Tools
*XlwMenu.tools.labelString:	????
! *XlwMenu.lispInteraction.labelString:	Lisp-Interaction
*XlwMenu.lispInteraction.labelString:	Lisp-????
! *XlwMenu.load_emacs.labelString:	Load .emacs
*XlwMenu.load_emacs.labelString:	.emacs ?? ??????????
! *XlwMenu.help.labelString:	Help
*XlwMenu.help.labelString:	??????


--- NEW FILE Emacs.ad.zh_CN.GB2312 ---
! XEmacs 21.x ??????????????(????????????gb2312)
! 
!              Donald Park 'Piao Xiaolin' <xlpark at kankou.cs.uec.ac.jp>
!                                   Time-stamp: <01/06/13 20:00:00 park>
!
! This is the app-defaults file for XEmacs.
!
! This used to be identical to sample.Xdefaults, but the resources
! below have been rewritten to be as general as possible to avoid
! overriding user resources.  Other than the form rewriting, both
! files should be kept in sync. 
! 
! The resources below are loaded into the XEmacs executable at compile-time:
! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
! effect.
! 
! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
! (or whatever the standard app-defaults directory is at your site) to cause
! it to be consulted at run-time.  (Do this only for site-wide customizations:
! personal customizations should be put into ~/.Xdefaults instead.)
! Note that the file must be named Emacs, not XEmacs.
! 
! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of
! the various resources and the syntax for setting them.
! 
! Energize users: note that this is not the same app-defaults file that is
! used with the Energize-specific version of XEmacs.


! Colors and backgrounds.
! ======================
! The contrasts of these colors will cause them to map to the appropriate
! one of "black" or "white" on monochrome systems.
! 
! The valid color names on your system can be found by looking in the file
! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/.

! Set the modeline colors.
Emacs.modeline*attributeForeground:	Black
Emacs.modeline*attributeBackground:	Gray75

! Set the color of the text cursor.
Emacs.text-cursor*attributeBackground:	Red3

! If you want to set the color of the mouse pointer, do this:
! Emacs.pointer*attributeForeground:	Black
! If you want to set the background of the mouse pointer, do this:
! Emacs.pointer*attributeBackground:	White
! Note that by default, the pointer foreground and background are the same
! as the default face.

! Set the menubar colors.  This overrides the default foreground and
! background colors specified above.
*menubar*Foreground:			Gray30
*menubar*Background:			Gray80
! This is for buttons in the menubar.  
! Yellow would be better, but that would map to white on monochrome.
*menubar*buttonForeground:		Blue
*XlwMenu*highlightForeground:		Red
*XlwMenu*titleForeground:		Maroon
*XlwMenu*selectColor:			ForestGreen
*XmToggleButton*selectColor:		ForestGreen

! Specify the colors of popup menus.
*popup*Foreground:			Black
*popup*Background:			Gray80

! Specify the colors of the various sub-widgets of the dialog boxes.
*dialog*Foreground:			Black
! #A5C0C1 is a shade of blue
*dialog*Background:			#A5C0C1
! The following three are for Motif dialog boxes ...
*dialog*XmTextField*Background:		WhiteSmoke
*dialog*XmText*Background:		WhiteSmoke
*dialog*XmList*Background:		WhiteSmoke
! While this one is for Athena dialog boxes.
*dialog*Command*Background:		WhiteSmoke

! Xlw Scrollbar colors
*XlwScrollBar*Foreground:		Gray30
*XlwScrollBar*Background:		Gray80
*XmScrollBar*Foreground:		Gray30
*XmScrollBar*Background:		Gray80

!
! The Lucid Scrollbar supports two added resources, SliderStyle is either
! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
! of the slider that depresses when the slider is clicked on.  ArrowPosition is
! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
! of the scrollbar, same puts both arrows at the same end, like the Amiga.
!
Emacs*XlwScrollBar.SliderStyle:    dimple
Emacs*XlwScrollBar.ArrowPosition:  opposite


!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

*topToolBarShadowColor:			Gray90
*bottomToolBarShadowColor:		Gray40
*backgroundToolBarColor:		Gray80
*toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
Emacs.default.attributeFont:  -isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
*menubar*Font: 		-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*
*popup*Font:		-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*

! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*
*XmTextField*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*
*XmText*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*
*XmList*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField*translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton*translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! XIM fontset (defaults to system fontset default)
! *EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
!    Japanese localization resources for XEmacs.
! @(#)Emacs	1.3 96/09/22
!    Copyright (C) 1996 Sun Microsystems, Inc.
!!
! This file is part of XEmacs.
! 
! XEmacs is free software; you can redistribute it and/or modify it
! under the terms of the GNU General Public License as published by the
! Free Software Foundation; either version 2, or (at your option) any
! later version.
! XEmacs 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 XEmacs; see the file COPYING.  If not, write to the
! Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! Boston, MA 02111-1307, USA.
! Copyright (C) 1996 Sun Microsystems Inc.
!
! Japanese Resources to be placed in etc/app-defaults/ja/Emacs
! for xemacs-mule.  It is same on another languages such like fr,
! if you want to have French menu label, place it on
! etc/app-defaults/fr/Emacs.

! Pulldown menu internationalization.  The first line of the file
! "*XlwMenu.resourceLabels: True" has to be there to make sure
! all the labelString will be read and displayed by X.
*XlwMenu.resourceLabels: True

! CDE doesn't require this but OpenWindows does.
! Note that this `gothic' font family is effective just for Japanese.
! And fontList is just used under Motif menubar.
*fontList: -*-gothic-medium-r-normal--14-120-75-75-c-*-*-*:
!! FontSet for menus when you use --with-xfs or --with-xim=xlib.
*fontSet: -isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*

! Starting below here are menu label string which can be translated to
! different languages. 
! Example: *XlwMenu.file.labelString: File  
! Characters before the ":" sign, "Example: *XlwMenu.file.labelString"
! can not be changed. They must stay exactly the way they are.
! The only string to be translated is the string, "File".
! Some resource names such as "file", "quit" have been used in several
! places.  However, each of them only has to be translated once in this X
! resource file.
! *XlwMenu.readMailVM___.labelString:	Read Mail (VM)...
*XlwMenu.readMailVM___.labelString:	?????????? (VM)...
! *XlwMenu.readMailMH___.labelString:	Read Mail (MH)...
*XlwMenu.readMailMH___.labelString:	?????????? (MH)...
! *XlwMenu.sendMail___.labelString:	Send mail...
*XlwMenu.sendMail___.labelString:	??????????...
! *XlwMenu.usenetNews.labelString:	Usenet News
*XlwMenu.usenetNews.labelString:	????????
! *XlwMenu.browseTheWeb.labelString:	Browse the Web
*XlwMenu.browseTheWeb.labelString:	????????
! *XlwMenu.gopher.labelString:	Gopher
*XlwMenu.gopher.labelString:	Gopher
! *XlwMenu.hyperbole___.labelString:	Hyperbole...
*XlwMenu.hyperbole___.labelString:	????????...
! *XlwMenu.spellCheckBuffer.labelString:	Spell-Check Buffer
*XlwMenu.spellCheckBuffer.labelString:	??????????????
! *XlwMenu.toggleVIEmulation.labelString:	Toggle VI emulation
*XlwMenu.toggleVIEmulation.labelString:	?????? VI ??????????
! *XlwMenu.calendar.labelString:	Calendar
*XlwMenu.calendar.labelString:	????
! *XlwMenu.games.labelString:	Games
*XlwMenu.games.labelString:	????
! *XlwMenu.3MonthCalendar.labelString:	3-Month Calendar
*XlwMenu.3MonthCalendar.labelString:	3????????
! *XlwMenu.diary.labelString:	Diary
*XlwMenu.diary.labelString:	????
! *XlwMenu.holidays.labelString:	Holidays
*XlwMenu.holidays.labelString:	??????
! *XlwMenu.phasesOfTheMoon.labelString:	Phases of the Moon
*XlwMenu.phasesOfTheMoon.labelString:	????
! *XlwMenu.sunriseSunset.labelString:	Sunrise/Sunset
*XlwMenu.sunriseSunset.labelString:	????/????
! *XlwMenu.mineGame.labelString:	Mine Game
*XlwMenu.mineGame.labelString:	??????????
! *XlwMenu.tetris.labelString:	Tetris
*XlwMenu.tetris.labelString:	??????????	
! *XlwMenu.quoteFromZippy.labelString:	Quote from Zippy
*XlwMenu.quoteFromZippy.labelString:	Zippy ??????
! *XlwMenu.psychoanalyst.labelString:	Psychoanalyst
*XlwMenu.psychoanalyst.labelString:	????????
! *XlwMenu.psychoanalyzeZippy.labelString:	Psychoanalyze Zippy!
*XlwMenu.psychoanalyzeZippy.labelString:	???????? Zippy!
! *XlwMenu.randomFlames.labelString:	Random Flames
*XlwMenu.randomFlames.labelString:	????????
! *XlwMenu.dunnetAdventure.labelString:	Dunnet (Adventure)
*XlwMenu.dunnetAdventure.labelString:	Dunnet (????)
! *XlwMenu.towersOfHanoi.labelString:	Towers of Hanoi
*XlwMenu.towersOfHanoi.labelString:	Hanoi ??
! *XlwMenu.gameOfLife.labelString:	Game of Life
*XlwMenu.gameOfLife.labelString:	????????
! *XlwMenu.multiplicationPuzzle.labelString:	Multiplication Puzzle
*XlwMenu.multiplicationPuzzle.labelString:	????????????
! *XlwMenu.listAllBuffers.labelString:	List All Buffers
*XlwMenu.listAllBuffers.labelString:	??????????????
! *XlwMenu..labelString:	
! *XlwMenu..labelString:
! *XlwMenu.emacs.labelString:	Emacs
! *XlwMenu.emacs.labelString:
! *XlwMenu.group___.labelString:	Group...
! *XlwMenu.group___.labelString:	??...
! *XlwMenu.variable___.labelString:	Variable...
! *XlwMenu.variable___.labelString:	????...
! *XlwMenu.face___.labelString:	Face...
! *XlwMenu.face___.labelString:	??...
! *XlwMenu.saved___.labelString:	Saved...
! *XlwMenu.saved___.labelString:	????...
! *XlwMenu.set___.labelString:	Set...
! *XlwMenu.set___.labelString:	????...
! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	????????...
! *XlwMenu.browse___.labelString:	Browse...
! *XlwMenu.browse___.labelString:	????...
! *XlwMenu.emacs___.labelString:	Emacs...
! *XlwMenu.emacs___.labelString:
! *XlwMenu.editing.labelString:	Editing
*XlwMenu.editing.labelString:	????
! *XlwMenu.external.labelString:	External
*XlwMenu.external.labelString:	????
! *XlwMenu.programming.labelString:	Programming
*XlwMenu.programming.labelString:	????
! *XlwMenu.applications.labelString:	Applications
*XlwMenu.applications.labelString:	????
! *XlwMenu.development.labelString:	Development
*XlwMenu.development.labelString:	????
! *XlwMenu.environment.labelString:	Environment
*XlwMenu.environment.labelString:	????
! *XlwMenu.data.labelString:	Data
*XlwMenu.data.labelString:	????
! *XlwMenu.files.labelString:	Files
*XlwMenu.files.labelString:	????
! *XlwMenu.wp.labelString:	Wp
*XlwMenu.wp.labelString:	????????
! *XlwMenu.faces.labelString:	Faces
*XlwMenu.faces.labelString:	??
! *XlwMenu.hypermedia.labelString:	Hypermedia
*XlwMenu.hypermedia.labelString:	??????
! *XlwMenu.help.labelString:	Help
! *XlwMenu.help.labelString:	????
! *XlwMenu.local.labelString:	Local
*XlwMenu.local.labelString:	????
! *XlwMenu.undo.labelString:	Undo
*XlwMenu.undo.labelString:	????
! *XlwMenu.cut.labelString:	Cut
*XlwMenu.cut.labelString:	????
! *XlwMenu.copy.labelString:	Copy
*XlwMenu.copy.labelString:	????
! *XlwMenu.paste.labelString:	Paste
*XlwMenu.paste.labelString:	????
! *XlwMenu.clear.labelString:	Clear
*XlwMenu.clear.labelString:	????
! *XlwMenu.search___.labelString:	Search...
*XlwMenu.search___.labelString:	????...
! *XlwMenu.searchBackward___.labelString:	Search Backward...
*XlwMenu.searchBackward___.labelString:	??????????
! *XlwMenu.replace___.labelString:	Replace...
*XlwMenu.replace___.labelString:	????...
! *XlwMenu.searchRegexp___.labelString:	Search (Regexp)...
*XlwMenu.searchRegexp___.labelString:	???? (????) ...
! *XlwMenu.searchBackwardRegexp___.labelString:	Search Backward (Regexp)...
*XlwMenu.searchBackwardRegexp___.labelString:	?????????? (????) ...
! *XlwMenu.replaceRegexp___.labelString:	Replace (Regexp)...
*XlwMenu.replaceRegexp___.labelString:	???? (????) ...
! *XlwMenu.gotoLine___.labelString:	Goto Line...
*XlwMenu.gotoLine___.labelString:	??????????...
! *XlwMenu.whatLine.labelString:	What Line
*XlwMenu.whatLine.labelString:	??????????
! *XlwMenu.bookmarks.labelString:	Bookmarks
*XlwMenu.bookmarks.labelString:	????
! *XlwMenu.startMacroRecording.labelString:	Start Macro Recording
*XlwMenu.startMacroRecording.labelString:	??????????
! *XlwMenu.endMacroRecording.labelString:	End Macro Recording
*XlwMenu.endMacroRecording.labelString:	??????????
! *XlwMenu.executeLastMacro.labelString:	Execute Last Macro
*XlwMenu.executeLastMacro.labelString:	??????????????
! *XlwMenu.showMessageLog.labelString:	Show Message Log
*XlwMenu.showMessageLog.labelString:	????????????
! *XlwMenu.jumpToBookmark.labelString:	Jump to Bookmark
*XlwMenu.jumpToBookmark.labelString:	????????
! *XlwMenu.setBookmark.labelString:	Set bookmark
*XlwMenu.setBookmark.labelString:	????????
! *XlwMenu.insertContents.labelString:	Insert contents
*XlwMenu.insertContents.labelString:	????????
! *XlwMenu.insertLocation.labelString:	Insert location
*XlwMenu.insertLocation.labelString:	????????
! *XlwMenu.renameBookmark.labelString:	Rename bookmark
*XlwMenu.renameBookmark.labelString:	????????
! *XlwMenu.deleteBookmark.labelString:	Delete Bookmark
*XlwMenu.deleteBookmark.labelString:	????????
! *XlwMenu.editBookmarkList.labelString:	Edit Bookmark List
*XlwMenu.editBookmarkList.labelString:	????????????
! *XlwMenu.saveBookmarks.labelString:	Save bookmarks
*XlwMenu.saveBookmarks.labelString:	????????
! *XlwMenu.saveBookmarksAs___.labelString:	Save bookmarks as...
*XlwMenu.saveBookmarksAs___.labelString:	????????????...
! *XlwMenu.loadABookmarkFile.labelString:	Load a bookmark file
*XlwMenu.loadABookmarkFile.labelString:	????????????
! *XlwMenu.open___.labelString:	Open...
*XlwMenu.open___.labelString:	????...
! *XlwMenu.openInOtherWindow___.labelString:	Open in Other Window...
*XlwMenu.openInOtherWindow___.labelString:	????????????????...
! *XlwMenu.openInNewFrame___.labelString:	Open in New Frame...
*XlwMenu.openInNewFrame___.labelString:	????????????...
! *XlwMenu.insertFile___.labelString:	Insert File...
*XlwMenu.insertFile___.labelString:	????????...
! *XlwMenu.viewFile___.labelString:	View File...
*XlwMenu.viewFile___.labelString:	????????...
! *XlwMenu.save.labelString:	Save
*XlwMenu.save.labelString:	????
! *XlwMenu.saveAs___.labelString:	Save As...
*XlwMenu.saveAs___.labelString:	??????...
! *XlwMenu.saveSomeBuffers.labelString:	Save Some Buffers
*XlwMenu.saveSomeBuffers.labelString:	??????????
! *XlwMenu.printBuffer.labelString:	Print Buffer
*XlwMenu.printBuffer.labelString:	??????????
! *XlwMenu.prettyPrintBuffer.labelString:	Pretty-Print Buffer
*XlwMenu.prettyPrintBuffer.labelString:	??????????
! *XlwMenu.newFrame.labelString:	New Frame
*XlwMenu.newFrame.labelString:	????
! *XlwMenu.frameOnOtherDisplay___.labelString:	Frame on Other Display...
*XlwMenu.frameOnOtherDisplay___.labelString:	????????????????...
! *XlwMenu.deleteFrame.labelString:	Delete Frame
*XlwMenu.deleteFrame.labelString:	??????
! *XlwMenu.splitWindow.labelString:	Split Window
*XlwMenu.splitWindow.labelString:	????????
! *XlwMenu.unSplitKeepThis.labelString:	Un-Split (Keep This)
*XlwMenu.unSplitKeepThis.labelString:	??????????
! *XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep Others)
*XlwMenu.unSplitKeepOthers.labelString:	??????????
! *XlwMenu.revertBuffer.labelString:	Revert Buffer
*XlwMenu.revertBuffer.labelString:	??????????
! *XlwMenu.deleteBuffer.labelString:	Delete Buffer
*XlwMenu.deleteBuffer.labelString:	??????????
! *XlwMenu.exitXEmacs.labelString:	Exit XEmacs
*XlwMenu.exitXEmacs.labelString:	???? XEmacs
! *XlwMenu.aboutXEmacs___.labelString:	About XEmacs...
*XlwMenu.aboutXEmacs___.labelString:	???? XEmacs...
! *XlwMenu.basics.labelString:	Basics
*XlwMenu.basics.labelString:	????
! *XlwMenu.xEmacsFAQ.labelString:	XEmacs FAQ
*XlwMenu.xEmacsFAQ.labelString:	XEmacs ????????????????
! *XlwMenu.samples.labelString:	Samples
*XlwMenu.samples.labelString:	????
! *XlwMenu.lookupInInfo.labelString:	Lookup in Info
*XlwMenu.lookupInInfo.labelString:	?? Info ??????
! *XlwMenu.manuals.labelString:	Manuals
*XlwMenu.manuals.labelString:	????
! *XlwMenu.commandsKeys.labelString:	Commands & Keys
*XlwMenu.commandsKeys.labelString:	????????
! *XlwMenu.recentMessages.labelString:	Recent Messages
*XlwMenu.recentMessages.labelString:	??????????
! *XlwMenu.misc.labelString:	Misc
*XlwMenu.misc.labelString:	????
! *XlwMenu.submitBugReport.labelString:	Submit Bug Report
*XlwMenu.submitBugReport.labelString:	?? Bug ????
! *XlwMenu.tutorial.labelString:	Tutorial
*XlwMenu.tutorial.labelString:	????
! *XlwMenu.news.labelString:	News
*XlwMenu.news.labelString:	????
! *XlwMenu.packages.labelString:	Packages
*XlwMenu.packages.labelString:	??
! *XlwMenu.splash.labelString:	Splash
*XlwMenu.splash.labelString:	Splash
! *XlwMenu.fAQLocal.labelString:	FAQ (local)
*XlwMenu.fAQLocal.labelString:	???????????????? (????)
! *XlwMenu.fAQViaWWW.labelString:	FAQ via WWW
*XlwMenu.fAQViaWWW.labelString:	???????????????? (????WWW)
! *XlwMenu.homePage.labelString:	Home Page
*XlwMenu.homePage.labelString:	????
! *XlwMenu.sample.labelString:	Sample
*XlwMenu.sample.labelString:	????
! *XlwMenu.keyBinding___.labelString:	Key Binding...
*XlwMenu.keyBinding___.labelString:	????????...
! *XlwMenu.command___.labelString:	Command...
*XlwMenu.command___.labelString:	????...
! *XlwMenu.function___.labelString:	Function...
*XlwMenu.function___.labelString:	????...
! *XlwMenu.topic___.labelString:	Topic...
*XlwMenu.topic___.labelString:	????...
! *XlwMenu.info.labelString:	Info
*XlwMenu.info.labelString:	Info
! *XlwMenu.unixManual___.labelString:	Unix Manual...
*XlwMenu.unixManual___.labelString:	Unix ????...
! *XlwMenu.mode.labelString:	Mode
*XlwMenu.mode.labelString:	????
! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	????????...
! *XlwMenu.aproposDocs___.labelString:	Apropos Docs...
*XlwMenu.aproposDocs___.labelString:	????????????????...
! *XlwMenu.key___.labelString:	Key...
*XlwMenu.key___.labelString:	??...
! *XlwMenu.bindings.labelString:	Bindings
*XlwMenu.bindings.labelString:	????
! *XlwMenu.mouseBindings.labelString:	Mouse Bindings
*XlwMenu.mouseBindings.labelString:	????????
! *XlwMenu.recentKeys.labelString:	Recent Keys
*XlwMenu.recentKeys.labelString:	????????
! *XlwMenu.variable___.labelString:	Variable...
! *XlwMenu.variable___.labelString:	????...
! *XlwMenu.locateCommand___.labelString:	Locate Command...
*XlwMenu.locateCommand___.labelString:	????????...
! *XlwMenu.noWarranty.labelString:	No Warranty
*XlwMenu.noWarranty.labelString:	????????
! *XlwMenu.xEmacsLicense.labelString:	XEmacs License
*XlwMenu.xEmacsLicense.labelString:	XEmacs ??????
! *XlwMenu.theLatestVersion.labelString:	The Latest Version
*XlwMenu.theLatestVersion.labelString:	????????
! *XlwMenu.evaluateLastSExpression.labelString:	Evaluate Last S-expression
*XlwMenu.evaluateLastSExpression.labelString:	?????????? S ??????
! *XlwMenu.evaluateEntireBuffer.labelString:	Evaluate Entire Buffer
*XlwMenu.evaluateEntireBuffer.labelString:	??????????????
! *XlwMenu.evaluateRegion.labelString:	Evaluate Region
*XlwMenu.evaluateRegion.labelString:	????????
! *XlwMenu.evaluateThisDefun.labelString:	Evaluate This Defun
*XlwMenu.evaluateThisDefun.labelString:	???????? Defun
! *XlwMenu.debugThisDefun.labelString:	Debug This Defun
*XlwMenu.debugThisDefun.labelString:	???????? Defun
! *XlwMenu.traceAFunction.labelString:	Trace a Function
*XlwMenu.traceAFunction.labelString:	????????????
! *XlwMenu.untraceAllFunctions.labelString:	Untrace All Functions
*XlwMenu.untraceAllFunctions.labelString:	??????????????
! *XlwMenu.commentOutRegion.labelString:	Comment Out Region
*XlwMenu.commentOutRegion.labelString:	????????
! *XlwMenu.indentRegion.labelString:	Indent Region
*XlwMenu.indentRegion.labelString:	????????
! *XlwMenu.indentLine.labelString:	Indent Line
*XlwMenu.indentLine.labelString:	????????
! *XlwMenu.debugOnError.labelString:	Debug On Error
! *XlwMenu.debugOnError.labelString:	??????????????
! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
! *XlwMenu.debugOnQuit.labelString:	??????????
! *XlwMenu.debugOnSignal.labelString:	Debug on Signal
*XlwMenu.debugOnSignal.labelString:	????????
! *XlwMenu.describeLanguageSupport.labelString:	Describe language support
*XlwMenu.describeLanguageSupport.labelString:	????????????
! *XlwMenu.setLanguageEnvironment.labelString:	Set language environment
*XlwMenu.setLanguageEnvironment.labelString:	????????????
! *XlwMenu.toggleInputMethod.labelString:	Toggle input method
*XlwMenu.toggleInputMethod.labelString:	??????????
! *XlwMenu.selectInputMethod.labelString:	Select input method
*XlwMenu.selectInputMethod.labelString:	??????????
! *XlwMenu.describeInputMethod.labelString:	Describe input method
*XlwMenu.describeInputMethod.labelString:	??????????
! *XlwMenu.describeCurrentCodingSystems.labelString:	Describe current coding systems
*XlwMenu.describeCurrentCodingSystems.labelString:	????????????????
! *XlwMenu.setCodingSystemOfBufferFile.labelString:	Set coding system of buffer file
*XlwMenu.setCodingSystemOfBufferFile.labelString:	????????????????????????
! *XlwMenu.setCodingSystemOfTerminal.labelString:	Set coding system of terminal
*XlwMenu.setCodingSystemOfTerminal.labelString:	??????????????????
! *XlwMenu.setCodingSystemOfKeyboard.labelString:	Set coding system of keyboard
*XlwMenu.setCodingSystemOfKeyboard.labelString:	??????????????????
! *XlwMenu.setCodingSystemOfProcess.labelString:	Set coding system of process
*XlwMenu.setCodingSystemOfProcess.labelString:	??????????????????
! *XlwMenu.showCharacterTable.labelString:	Show character table
*XlwMenu.showCharacterTable.labelString:	??????????
! *XlwMenu.showDiagnosisForMULE.labelString:	Show diagnosis for MULE
*XlwMenu.showDiagnosisForMULE.labelString:	???? MULE ??????????
! *XlwMenu.showManyLanguages.labelString:	Show many languages
*XlwMenu.showManyLanguages.labelString:	??????????
! *XlwMenu.chineseGB.labelString:	Chinese-GB
*XlwMenu.chineseGB.labelString:	???? GB ??
! *XlwMenu.chineseBIG5.labelString:	Chinese-BIG5
*XlwMenu.chineseBIG5.labelString:	???? BIG5 ??
! *XlwMenu.cyrillicISO.labelString:	Cyrillic-ISO
!*XlwMenu.cyrillicISO.labelString:
! *XlwMenu.cyrillicKOI8.labelString:	Cyrillic-KOI8
!*XlwMenu.cyrillicKOI8.labelString:
! *XlwMenu.cyrillicALT.labelString:	Cyrillic-ALT
!*XlwMenu.cyrillicALT.labelString:
! *XlwMenu.cyrillic.labelString:	Cyrillic
!*XlwMenu.cyrillic.labelString:
! ! *XlwMenu.english.labelString:	English
*XlwMenu.english.labelString:	????
! *XlwMenu.aSCII.labelString:	ASCII
! *XlwMenu.aSCII.labelString:
! *XlwMenu.latin1.labelString:	Latin-1
*XlwMenu.latin1.labelString:	??????-1
! *XlwMenu.german.labelString:	German
*XlwMenu.german.labelString:	????
! *XlwMenu.french.labelString:	French
*XlwMenu.french.labelString:	????
! *XlwMenu.norwegian.labelString:	Norwegian
*XlwMenu.norwegian.labelString:	??????
! *XlwMenu.latin2.labelString:	Latin-2
*XlwMenu.latin2.labelString:	??????-2
! *XlwMenu.croatian.labelString:	Croatian
*XlwMenu.croatian.labelString:	??????????
! *XlwMenu.polish.labelString:	Polish
*XlwMenu.polish.labelString:	??????
! *XlwMenu.latin3.labelString:	Latin-3
*XlwMenu.latin3.labelString:	??????-3
! *XlwMenu.latin4.labelString:	Latin-4
*XlwMenu.latin4.labelString:	??????-4
! *XlwMenu.latin5.labelString:	Latin-5
*XlwMenu.latin5.labelString:	??????-5
! *XlwMenu.greek.labelString:	Greek
*XlwMenu.greek.labelString:	??????
! *XlwMenu.hebrew.labelString:	Hebrew
*XlwMenu.hebrew.labelString:	Hebrew
! *XlwMenu.japanese.labelString:	Japanese
*XlwMenu.japanese.labelString:	????
! *XlwMenu.korean.labelString:	Korean
*XlwMenu.korean.labelString:	??????
! *XlwMenu.iPA.labelString:	IPA
! *XlwMenu.iPA.labelString:
! *XlwMenu.customize.labelString:	Customize
*XlwMenu.customize.labelString:	????
! *XlwMenu.readOnly.labelString:	Read Only
*XlwMenu.readOnly.labelString:	????
! *XlwMenu.editingOptions.labelString:	Editing Options
*XlwMenu.editingOptions.labelString:	????????
! *XlwMenu.generalOptions.labelString:	General Options
*XlwMenu.generalOptions.labelString:	????????
! *XlwMenu.printingOptions.labelString:	Printing Options
*XlwMenu.printingOptions.labelString:	????????
! *XlwMenu.otherWindowLocation.labelString:	"Other Window" Location
*XlwMenu.otherWindowLocation.labelString:	"????????"????
! *XlwMenu.syntaxHighlighting.labelString:	Syntax Highlighting
*XlwMenu.syntaxHighlighting.labelString:	????????????
! *XlwMenu.parenHighlighting.labelString:	Paren Highlighting
*XlwMenu.parenHighlighting.labelString:	????????????
! *XlwMenu.frameAppearance.labelString:	Frame Appearance
*XlwMenu.frameAppearance.labelString:	??????
! *XlwMenu.menubarAppearance.labelString:	Menubar Appearance
*XlwMenu.menubarAppearance.labelString:	??????????
! *XlwMenu.toolbarAppearance.labelString:	Toolbar Appearance
*XlwMenu.toolbarAppearance.labelString:	??????????
! *XlwMenu.mouse.labelString:	Mouse
*XlwMenu.mouse.labelString:	????
! *XlwMenu.openURLsWith.labelString:	Open URLs With
*XlwMenu.openURLsWith.labelString:	??????????
! *XlwMenu.browseFaces___.labelString:	Browse Faces...
*XlwMenu.browseFaces___.labelString:	??????...
! *XlwMenu.font.labelString:	Font
*XlwMenu.font.labelString:	????
! *XlwMenu.size.labelString:	Size
*XlwMenu.size.labelString:	????
! *XlwMenu.weight.labelString:	Weight
*XlwMenu.weight.labelString:	????


! *XlwMenu.saveOptions.labelString:	Save Options
*XlwMenu.saveOptions.labelString:	????????
!
! described by menu-customize?
! *XlwMenu.emacs.labelString:	Emacs
! *XlwMenu.emacs.labelString:
! *XlwMenu.group___.labelString:	Group...
*XlwMenu.group___.labelString:	??...
! *XlwMenu.variable___.labelString:	Variable...
*XlwMenu.variable___.labelString:	????...
! *XlwMenu.face___.labelString:	Face...
*XlwMenu.face___.labelString:	??...
! *XlwMenu.saved___.labelString:	Saved...
*XlwMenu.saved___.labelString:	????...
! *XlwMenu.set___.labelString:	Set...
*XlwMenu.set___.labelString:	????...
! *XlwMenu.apropos___.labelString:	Apropos...
*XlwMenu.apropos___.labelString:	????????...
!
! *XlwMenu.browse___.labelString:	Browse...
*XlwMenu.browse___.labelString:	????...
!! *XlwMenu.overstrike.labelString:	Overstrike
*XlwMenu.overstrike.labelString:	????
! *XlwMenu.caseSensitiveSearch.labelString:	Case Sensitive Search
*XlwMenu.caseSensitiveSearch.labelString:	??????????????
! *XlwMenu.caseMatchingReplace.labelString:	Case Matching Replace
*XlwMenu.caseMatchingReplace.labelString:	??????????????
! *XlwMenu.autoDeleteSelection.labelString:	Auto Delete Selection
*XlwMenu.autoDeleteSelection.labelString:	????????????
! *XlwMenu.activeRegions.labelString:	Active Regions
*XlwMenu.activeRegions.labelString:	????????
! *XlwMenu.mousePasteAtTextCursor.labelString:	Mouse Paste At Text Cursor
*XlwMenu.mousePasteAtTextCursor.labelString:	??????????????????????
! *XlwMenu.requireNewlineAtEnd.labelString:	Require Newline At End
*XlwMenu.requireNewlineAtEnd.labelString:	????????????????????
! *XlwMenu.addNewlineWhenMovingPastEnd.labelString:	Add Newline When Moving Past End
*XlwMenu.addNewlineWhenMovingPastEnd.labelString:	????????????????????????
! *XlwMenu.teachExtendedCommands.labelString:	Teach Extended Commands
*XlwMenu.teachExtendedCommands.labelString:	????????????
! *XlwMenu.debugOnError.labelString:	Debug On Error
*XlwMenu.debugOnError.labelString:	????????????
! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
*XlwMenu.debugOnQuit.labelString:	????????????
! *XlwMenu.commandLineSwitchesForLprLp___.labelString:	Command-Line Switches for `lpr'/`lp'...
*XlwMenu.commandLineSwitchesForLprLp___.labelString:	?????? lpr/lp ??????
! *XlwMenu.prettyPrintPaperSize.labelString:	Pretty-Print Paper Size
*XlwMenu.prettyPrintPaperSize.labelString:	????????????
! *XlwMenu.colorPrinting.labelString:	Color Printing
*XlwMenu.colorPrinting.labelString:	????????
! *XlwMenu.letter.labelString:	Letter
! *XlwMenu.letter.labelString:
! *XlwMenu.letterSmall.labelString:	Letter-small
! *XlwMenu.letterSmall.labelString:
! *XlwMenu.legal.labelString:	Legal
! *XlwMenu.legal.labelString:
! *XlwMenu.statement.labelString:	Statement
! *XlwMenu.statement.labelString:
! *XlwMenu.executive.labelString:	Executive
! *XlwMenu.executive.labelString:
! *XlwMenu.tabloid.labelString:	Tabloid
! *XlwMenu.tabloid.labelString:
! *XlwMenu.ledger.labelString:	Ledger
! *XlwMenu.ledger.labelString:
! *XlwMenu.a3.labelString:	A3
! *XlwMenu.a3.labelString:
! *XlwMenu.a4.labelString:	A4
! *XlwMenu.a4.labelString:
! *XlwMenu.a4small.labelString:	A4small
! *XlwMenu.a4small.labelString:
! *XlwMenu.b4.labelString:	B4
! *XlwMenu.b4.labelString:
! *XlwMenu.b5.labelString:	B5
! *XlwMenu.b5.labelString:
! *XlwMenu.alwaysInSameFrame.labelString:	Always in Same Frame
*XlwMenu.alwaysInSameFrame.labelString:	????????????
! *XlwMenu.otherFrame2FramesMax.labelString:	Other Frame (2 Frames Max)
*XlwMenu.otherFrame2FramesMax.labelString:	?????? (????2??)
! *XlwMenu.otherFrame3FramesMax.labelString:	Other Frame (3 Frames Max)
*XlwMenu.otherFrame3FramesMax.labelString:	?????? (????3??)
! *XlwMenu.otherFrame4FramesMax.labelString:	Other Frame (4 Frames Max)
*XlwMenu.otherFrame4FramesMax.labelString:	?????? (????4??)
! *XlwMenu.otherFrame5FramesMax.labelString:	Other Frame (5 Frames Max)
*XlwMenu.otherFrame5FramesMax.labelString:	?????? (????5??)
! *XlwMenu.alwaysCreateNewFrame.labelString:	Always Create New Frame
*XlwMenu.alwaysCreateNewFrame.labelString:	????????????
! *XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	Temp Buffers Always in Same Frame
*XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	??????????????????????
! *XlwMenu.tempBuffersLikeOtherBuffers.labelString:	Temp Buffers Like Other Buffers
*XlwMenu.tempBuffersLikeOtherBuffers.labelString: ??????????????????????????
! *XlwMenu.makeCurrentFrameGnuservTarget.labelString:	Make current frame gnuserv target
*XlwMenu.makeCurrentFrameGnuservTarget.labelString:?????????????? gnuserv ??????
! *XlwMenu.inThisBuffer.labelString:	In This Buffer
*XlwMenu.inThisBuffer.labelString:	??????????????
! *XlwMenu.automatic.labelString:	Automatic
*XlwMenu.automatic.labelString:	????
! *XlwMenu.fonts.labelString:	Fonts
*XlwMenu.fonts.labelString:	????
! *XlwMenu.colors.labelString:	Colors
*XlwMenu.colors.labelString:    ????
! *XlwMenu.least.labelString:	Least
*XlwMenu.least.labelString:	????
! *XlwMenu.more.labelString:	More
*XlwMenu.more.labelString:	??
! *XlwMenu.evenMore.labelString:	Even More
*XlwMenu.evenMore.labelString:	????
! *XlwMenu.most.labelString:	Most
*XlwMenu.most.labelString:	????
! *XlwMenu.lazy.labelString:	Lazy
*XlwMenu.lazy.labelString:	????
! *XlwMenu.caching.labelString:	Caching
*XlwMenu.caching.labelString:	????????
! *XlwMenu.none.labelString:	None
*XlwMenu.none.labelString:	??
! *XlwMenu.blinkingParen.labelString:	Blinking Paren
*XlwMenu.blinkingParen.labelString:	????????
! *XlwMenu.steadyParen.labelString:	Steady Paren
*XlwMenu.steadyParen.labelString:	????????
! *XlwMenu.expression.labelString:	Expression
*XlwMenu.expression.labelString:	??????????
! *XlwMenu.scrollbars.labelString:	Scrollbars
*XlwMenu.scrollbars.labelString:	??????
! *XlwMenu.3DModeline.labelString:	3D Modeline
*XlwMenu.3DModeline.labelString:	3 ????????
! *XlwMenu.truncateLines.labelString:	Truncate Lines
*XlwMenu.truncateLines.labelString:	??????
! *XlwMenu.barCursor.labelString:	Bar Cursor
*XlwMenu.barCursor.labelString:	????????
! *XlwMenu.blinkingCursor.labelString:	Blinking Cursor
*XlwMenu.blinkingCursor.labelString:	????????
! *XlwMenu.frameLocalFontMenu.labelString:	Frame-Local Font Menu
*XlwMenu.frameLocalFontMenu.labelString:	??????????????
! *XlwMenu.buffersMenuLength___.labelString:	Buffers Menu Length...
*XlwMenu.buffersMenuLength___.labelString:	??????????????...
! *XlwMenu.multiOperationBuffersSubMenus.labelString:	Multi-Operation Buffers Sub-Menus
*XlwMenu.multiOperationBuffersSubMenus.labelString:	??????????????????
! *XlwMenu.buffersMenuSorting.labelString:	Buffers Menu Sorting
*XlwMenu.buffersMenuSorting.labelString:	??????????????
! *XlwMenu.submenusForBufferGroups.labelString:	Submenus for Buffer Groups
*XlwMenu.submenusForBufferGroups.labelString:	??????????????????????
! *XlwMenu.ignoreScaledFonts.labelString:	Ignore Scaled Fonts
*XlwMenu.ignoreScaledFonts.labelString:	????????????
! *XlwMenu.mostRecentlyUsed.labelString:	Most Recently Used
*XlwMenu.mostRecentlyUsed.labelString:	??????????????
! *XlwMenu.alphabetically.labelString:	Alphabetically
*XlwMenu.alphabetically.labelString:	????????
! *XlwMenu.byMajorModeThenAlphabetically.labelString:	By Major Mode, Then Alphabetically
*XlwMenu.byMajorModeThenAlphabetically.labelString:	????????, ??????????
! *XlwMenu.visible.labelString:	Visible
*XlwMenu.visible.labelString:	????
! *XlwMenu.captioned.labelString:	Captioned
*XlwMenu.captioned.labelString:	??????
! *XlwMenu.defaultLocation.labelString:	Default Location
*XlwMenu.defaultLocation.labelString:	????????
! *XlwMenu.top.labelString:	Top
*XlwMenu.top.labelString:	??
! *XlwMenu.bottom.labelString:	Bottom
*XlwMenu.bottom.labelString:	??
! *XlwMenu.left.labelString:	Left
*XlwMenu.left.labelString:	??
! *XlwMenu.right.labelString:	Right
*XlwMenu.right.labelString:	??
! *XlwMenu.avoidText.labelString:	Avoid-Text
*XlwMenu.avoidText.labelString:	????????
! *XlwMenu.strokesMode.labelString:	strokes-mode
*XlwMenu.strokesMode.labelString:	strokes ????
! *XlwMenu.emacsW3.labelString:	Emacs-W3
! *XlwMenu.emacsW3.labelString:
! *XlwMenu.netscape.labelString:	Netscape
! *XlwMenu.netscape.labelString:
! *XlwMenu.mosaic.labelString:	Mosaic
! *XlwMenu.mosaic.labelString:
! *XlwMenu.mosaicCCI.labelString:	Mosaic (CCI)
! *XlwMenu.mosaicCCI.labelString:
! *XlwMenu.iXIMosaic.labelString:	IXI Mosaic
! *XlwMenu.iXIMosaic.labelString:
! *XlwMenu.lynxXterm.labelString:	Lynx (xterm)
! *XlwMenu.lynxXterm.labelString:
! *XlwMenu.lynxXemacs.labelString:	Lynx (xemacs)
! *XlwMenu.lynxXemacs.labelString:
! *XlwMenu.grail.labelString:	Grail
! *XlwMenu.grail.labelString:
! *XlwMenu.charter.labelString:	Charter
! *XlwMenu.charter.labelString:
! *XlwMenu.clean.labelString:	Clean
! *XlwMenu.clean.labelString:
! *XlwMenu.courier.labelString:	Courier
! *XlwMenu.courier.labelString:
! *XlwMenu.fixed.labelString:	Fixed
! *XlwMenu.fixed.labelString:
! *XlwMenu.helvetica.labelString:	Helvetica
! *XlwMenu.helvetica.labelString:
! *XlwMenu.lucida.labelString:	Lucida
! *XlwMenu.lucida.labelString:
! *XlwMenu.lucidabright.labelString:	Lucidabright
! *XlwMenu.lucidabright.labelString:
! *XlwMenu.lucidatypewriter.labelString:	Lucidatypewriter
! *XlwMenu.lucidatypewriter.labelString:
! *XlwMenu.newCenturySchoolbook.labelString:	New Century Schoolbook
! *XlwMenu.newCenturySchoolbook.labelString:
! *XlwMenu.terminal.labelString:	Terminal
! *XlwMenu.terminal.labelString:
! *XlwMenu.times.labelString:	Times
! *XlwMenu.times.labelString:
! *XlwMenu.utopia.labelString:	Utopia
! *XlwMenu.utopia.labelString:
! *XlwMenu.5.labelString:	5
! *XlwMenu.5.labelString:
! *XlwMenu.6.labelString:	6
! *XlwMenu.6.labelString:
! *XlwMenu.7.labelString:	7
! *XlwMenu.7.labelString:
! *XlwMenu.8.labelString:	8
! *XlwMenu.8.labelString:
! *XlwMenu.9.labelString:	9
! *XlwMenu.9.labelString:
! *XlwMenu.10.labelString:	10
! *XlwMenu.10.labelString:
! *XlwMenu.11.labelString:	11
! *XlwMenu.11.labelString:
! *XlwMenu.12.labelString:	12
! *XlwMenu.12.labelString:
! *XlwMenu.13.labelString:	13
! *XlwMenu.13.labelString:
! *XlwMenu.14.labelString:	14
! *XlwMenu.14.labelString:
! *XlwMenu.15.labelString:	15
! *XlwMenu.15.labelString:
! *XlwMenu.16.labelString:	16
! *XlwMenu.16.labelString:
! *XlwMenu.17.labelString:	17
! *XlwMenu.17.labelString:
! *XlwMenu.18.labelString:	18
! *XlwMenu.18.labelString:
! *XlwMenu.19.labelString:	19
! *XlwMenu.19.labelString:
! *XlwMenu.20.labelString:	20
! *XlwMenu.20.labelString:
! *XlwMenu.23.labelString:	23
! *XlwMenu.23.labelString:
! *XlwMenu.24.labelString:	24
! *XlwMenu.24.labelString:
! *XlwMenu.black.labelString:	Black
! *XlwMenu.black.labelString:
! *XlwMenu.bold.labelString:	Bold
! *XlwMenu.bold.labelString:
! *XlwMenu.demibold.labelString:	Demibold
! *XlwMenu.demibold.labelString:
! *XlwMenu.medium.labelString:	Medium
! *XlwMenu.medium.labelString:
! *XlwMenu.regular.labelString:	Regular
! *XlwMenu.regular.labelString:
! *XlwMenu.grep___.labelString:	Grep...
! *XlwMenu.grep___.labelString:
! *XlwMenu.compile___.labelString:	Compile...
*XlwMenu.compile___.labelString:	????...
! *XlwMenu.shell.labelString:	Shell
*XlwMenu.shell.labelString:	??
! *XlwMenu.shellCommand___.labelString:	Shell Command...
*XlwMenu.shellCommand___.labelString:	??????...
! *XlwMenu.shellCommandOnRegion___.labelString:	Shell Command on Region...
*XlwMenu.shellCommandOnRegion___.labelString:	??????????????????...
! *XlwMenu.debugGDB___.labelString:	Debug (GDB)...
*XlwMenu.debugGDB___.labelString:	???? (GDB)...
! *XlwMenu.debugDBX___.labelString:	Debug (DBX)...
*XlwMenu.debugDBX___.labelString:	???? (DBX)...
! *XlwMenu.oOBrowser___.labelString:	OO-Browser...
*XlwMenu.oOBrowser___.labelString:	OO-??????...
! *XlwMenu.tags.labelString:	Tags
*XlwMenu.tags.labelString:	????
! *XlwMenu.vC.labelString:	VC
! *XlwMenu.vC.labelString:	VC
! *XlwMenu.findTag___.labelString:	Find Tag...
*XlwMenu.findTag___.labelString:	????????...
! *XlwMenu.findOtherWindow___.labelString:	Find Other Window...
*XlwMenu.findOtherWindow___.labelString:	??????????????...
! *XlwMenu.nextTag___.labelString:	Next Tag...
*XlwMenu.nextTag___.labelString:	??????????...
! *XlwMenu.nextOtherWindow___.labelString:	Next Other Window...
*XlwMenu.nextOtherWindow___.labelString:	??????????????...
! *XlwMenu.nextFile.labelString:	Next File
*XlwMenu.nextFile.labelString:	??????????
! *XlwMenu.tagsSearch___.labelString:	Tags Search...
*XlwMenu.tagsSearch___.labelString:	????????...
! *XlwMenu.tagsReplace___.labelString:	Tags Replace...
*XlwMenu.tagsReplace___.labelString:	????????...
! *XlwMenu.continueSearchReplace.labelString:	Continue Search/Replace
*XlwMenu.continueSearchReplace.labelString:	????????/????
! *XlwMenu.popStack.labelString:	Pop stack
*XlwMenu.popStack.labelString:	??????
! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	????????...
! *XlwMenu.setTagsTableFile___.labelString:	Set Tags Table File...
*XlwMenu.setTagsTableFile___.labelString:	??????????????...
! *XlwMenu.registerFile.labelString:	Register File
*XlwMenu.registerFile.labelString:	????????
! *XlwMenu.revertToLastRevision.labelString:	Revert to Last Revision
*XlwMenu.revertToLastRevision.labelString:	????????????????
! *XlwMenu.cancelLastCheckin.labelString:	Cancel Last Checkin
*XlwMenu.cancelLastCheckin.labelString:	?????????? Checkin
! *XlwMenu.renameFile.labelString:	Rename File
*XlwMenu.renameFile.labelString:	????????
! *XlwMenu.diffAgainstLastVersion.labelString:	Diff Against Last Version
*XlwMenu.diffAgainstLastVersion.labelString:	????????????????????
! *XlwMenu.diffBetweenRevisions___.labelString:	Diff Between Revisions...
*XlwMenu.diffBetweenRevisions___.labelString:	????????????????????...
! *XlwMenu.visitOtherVersion___.labelString:	Visit Other Version...
*XlwMenu.visitOtherVersion___.labelString:	????????????...
! *XlwMenu.showEditHistory.labelString:	Show Edit History
*XlwMenu.showEditHistory.labelString:	????????????
! *XlwMenu.listLockedFilesAnyUser.labelString:	List Locked Files Any User
*XlwMenu.listLockedFilesAnyUser.labelString:	??????????????
! *XlwMenu.createSnapshot.labelString:	Create Snapshot
*XlwMenu.createSnapshot.labelString:	????????
! *XlwMenu.retrieveSnapshot.labelString:	Retrieve Snapshot
*XlwMenu.retrieveSnapshot.labelString:	????????
! *XlwMenu.cVSUpdateDirectory.labelString:	CVS Update Directory
*XlwMenu.cVSUpdateDirectory.labelString:	CVS ????????
! *XlwMenu.file.labelString:	File
*XlwMenu.file.labelString:	????
! *XlwMenu.edit.labelString:	Edit
*XlwMenu.edit.labelString:	????
! *XlwMenu.mule.labelString:	Mule
! *XlwMenu.mule.labelString:
! *XlwMenu.apps.labelString:	Apps
*XlwMenu.apps.labelString:	????
! *XlwMenu.options.labelString:	Options
*XlwMenu.options.labelString:	??????
! *XlwMenu.buffers.labelString:	Buffers
*XlwMenu.buffers.labelString:   ??????
! *XlwMenu.tools.labelString:	Tools
*XlwMenu.tools.labelString:	????
! *XlwMenu.lispInteraction.labelString:	Lisp-Interaction
*XlwMenu.lispInteraction.labelString:	??????Lisp
! *XlwMenu.load_emacs.labelString:	Load .emacs
*XlwMenu.load_emacs.labelString:	???? .emacs
! *XlwMenu.help.labelString:	Help
*XlwMenu.help.labelString:	????


--- NEW FILE Emacs.ad.zh_CN.UTF-8 ---
! XEmacs 21.x ?????????????????????(??????????????????gb2312)
! 
!              Donald Park 'Piao Xiaolin' <xlpark at kankou.cs.uec.ac.jp>
!                                   Time-stamp: <03/10/17 21:30:00 petersen>
!
! This is the app-defaults file for XEmacs.
!
! This used to be identical to sample.Xdefaults, but the resources
! below have been rewritten to be as general as possible to avoid
! overriding user resources.  Other than the form rewriting, both
! files should be kept in sync. 
! 
! The resources below are loaded into the XEmacs executable at compile-time:
! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
! effect.
! 
! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
! (or whatever the standard app-defaults directory is at your site) to cause
! it to be consulted at run-time.  (Do this only for site-wide customizations:
! personal customizations should be put into ~/.Xdefaults instead.)
! Note that the file must be named Emacs, not XEmacs.
! 
! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of
! the various resources and the syntax for setting them.
! 
! Energize users: note that this is not the same app-defaults file that is
! used with the Energize-specific version of XEmacs.


! Colors and backgrounds.
! ======================
! The contrasts of these colors will cause them to map to the appropriate
! one of "black" or "white" on monochrome systems.
! 
! The valid color names on your system can be found by looking in the file
! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/.

! Set the modeline colors.
Emacs.modeline*attributeForeground:	Black
Emacs.modeline*attributeBackground:	Gray75

! Set the color of the text cursor.
Emacs.text-cursor*attributeBackground:	Red3

! If you want to set the color of the mouse pointer, do this:
! Emacs.pointer*attributeForeground:	Black
! If you want to set the background of the mouse pointer, do this:
! Emacs.pointer*attributeBackground:	White
! Note that by default, the pointer foreground and background are the same
! as the default face.

! Set the menubar colors.  This overrides the default foreground and
! background colors specified above.
*menubar*Foreground:			Gray30
*menubar*Background:			Gray80
! This is for buttons in the menubar.  
! Yellow would be better, but that would map to white on monochrome.
*menubar*buttonForeground:		Blue
*XlwMenu*highlightForeground:		Red
*XlwMenu*titleForeground:		Maroon
*XlwMenu*selectColor:			ForestGreen
*XmToggleButton*selectColor:		ForestGreen

! Specify the colors of popup menus.
*popup*Foreground:			Black
*popup*Background:			Gray80

! Specify the colors of the various sub-widgets of the dialog boxes.
*dialog*Foreground:			Black
! #A5C0C1 is a shade of blue
*dialog*Background:			#A5C0C1
! The following three are for Motif dialog boxes ...
*dialog*XmTextField*Background:		WhiteSmoke
*dialog*XmText*Background:		WhiteSmoke
*dialog*XmList*Background:		WhiteSmoke
! While this one is for Athena dialog boxes.
*dialog*Command*Background:		WhiteSmoke

! Xlw Scrollbar colors
*XlwScrollBar*Foreground:		Gray30
*XlwScrollBar*Background:		Gray80
*XmScrollBar*Foreground:		Gray30
*XmScrollBar*Background:		Gray80

!
! The Lucid Scrollbar supports two added resources, SliderStyle is either
! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
! of the slider that depresses when the slider is clicked on.  ArrowPosition is
! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
! of the scrollbar, same puts both arrows at the same end, like the Amiga.
!
Emacs*XlwScrollBar.SliderStyle:    dimple
Emacs*XlwScrollBar.ArrowPosition:  opposite


!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

*topToolBarShadowColor:			Gray90
*bottomToolBarShadowColor:		Gray40
*backgroundToolBarColor:		Gray80
*toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
Emacs.default.attributeFont:  -isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
*menubar*Font: 		-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*
*popup*Font:		-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*

! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*
*XmTextField*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*
*XmText*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*
*XmList*FontList:-isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField*translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton*translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! ! XIM fontset (defaults to system fontset default)
! ! *EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
! !    Japanese localization resources for XEmacs.
! ! @(#)Emacs	1.3 96/09/22
! !    Copyright (C) 1996 Sun Microsystems, Inc.
! !!
! ! This file is part of XEmacs.
! ! 
! ! XEmacs is free software; you can redistribute it and/or modify it
! ! under the terms of the GNU General Public License as published by the
! ! Free Software Foundation; either version 2, or (at your option) any
! ! later version.
! ! XEmacs 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 XEmacs; see the file COPYING.  If not, write to the
! ! Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! ! Boston, MA 02111-1307, USA.
! ! Copyright (C) 1996 Sun Microsystems Inc.
! !
! ! Japanese Resources to be placed in etc/app-defaults/ja/Emacs
! ! for xemacs-mule.  It is same on another languages such like fr,
! ! if you want to have French menu label, place it on
! ! etc/app-defaults/fr/Emacs.
! 
! ! Pulldown menu internationalization.  The first line of the file
! ! "*XlwMenu.resourceLabels: True" has to be there to make sure
! ! all the labelString will be read and displayed by X.
! *XlwMenu.resourceLabels: True
! 
! ! CDE doesn't require this but OpenWindows does.
! ! Note that this `gothic' font family is effective just for Japanese.
! ! And fontList is just used under Motif menubar.
! *fontList: -*-gothic-medium-r-normal--14-120-75-75-c-*-*-*:
! !! FontSet for menus when you use --with-xfs or --with-xim=xlib.
! *fontSet: -isas-fangsong ti-medium-r-normal--16-*-*-*-*-*-*,*
! 
! ! Starting below here are menu label string which can be translated to
! ! different languages. 
! ! Example: *XlwMenu.file.labelString: File  
! ! Characters before the ":" sign, "Example: *XlwMenu.file.labelString"
! ! can not be changed. They must stay exactly the way they are.
! ! The only string to be translated is the string, "File".
! ! Some resource names such as "file", "quit" have been used in several
! ! places.  However, each of them only has to be translated once in this X
! ! resource file.
! ! *XlwMenu.readMailVM___.labelString:	Read Mail (VM)...
! *XlwMenu.readMailVM___.labelString:	??????????????? (VM)...
! ! *XlwMenu.readMailMH___.labelString:	Read Mail (MH)...
! *XlwMenu.readMailMH___.labelString:	??????????????? (MH)...
! ! *XlwMenu.sendMail___.labelString:	Send mail...
! *XlwMenu.sendMail___.labelString:	???????????????...
! ! *XlwMenu.usenetNews.labelString:	Usenet News
! *XlwMenu.usenetNews.labelString:	????????????
! ! *XlwMenu.browseTheWeb.labelString:	Browse the Web
! *XlwMenu.browseTheWeb.labelString:	????????????
! ! *XlwMenu.gopher.labelString:	Gopher
! *XlwMenu.gopher.labelString:	Gopher
! ! *XlwMenu.hyperbole___.labelString:	Hyperbole...
! *XlwMenu.hyperbole___.labelString:	????????????...
! ! *XlwMenu.spellCheckBuffer.labelString:	Spell-Check Buffer
! *XlwMenu.spellCheckBuffer.labelString:	?????????????????????
! ! *XlwMenu.toggleVIEmulation.labelString:	Toggle VI emulation
! *XlwMenu.toggleVIEmulation.labelString:	????????? VI ???????????????
! ! *XlwMenu.calendar.labelString:	Calendar
! *XlwMenu.calendar.labelString:	??????
! ! *XlwMenu.games.labelString:	Games
! *XlwMenu.games.labelString:	??????
! ! *XlwMenu.3MonthCalendar.labelString:	3-Month Calendar
! *XlwMenu.3MonthCalendar.labelString:	3????????????
! ! *XlwMenu.diary.labelString:	Diary
! *XlwMenu.diary.labelString:	??????
! ! *XlwMenu.holidays.labelString:	Holidays
! *XlwMenu.holidays.labelString:	?????????
! ! *XlwMenu.phasesOfTheMoon.labelString:	Phases of the Moon
! *XlwMenu.phasesOfTheMoon.labelString:	??????
! ! *XlwMenu.sunriseSunset.labelString:	Sunrise/Sunset
! *XlwMenu.sunriseSunset.labelString:	??????/??????
! ! *XlwMenu.mineGame.labelString:	Mine Game
! *XlwMenu.mineGame.labelString:	???????????????
! ! *XlwMenu.tetris.labelString:	Tetris
! *XlwMenu.tetris.labelString:	???????????????	
! ! *XlwMenu.quoteFromZippy.labelString:	Quote from Zippy
! *XlwMenu.quoteFromZippy.labelString:	Zippy ?????????
! ! *XlwMenu.psychoanalyst.labelString:	Psychoanalyst
! *XlwMenu.psychoanalyst.labelString:	????????????
! ! *XlwMenu.psychoanalyzeZippy.labelString:	Psychoanalyze Zippy!
! *XlwMenu.psychoanalyzeZippy.labelString:	???????????? Zippy!
! ! *XlwMenu.randomFlames.labelString:	Random Flames
! *XlwMenu.randomFlames.labelString:	????????????
! ! *XlwMenu.dunnetAdventure.labelString:	Dunnet (Adventure)
! *XlwMenu.dunnetAdventure.labelString:	Dunnet (??????)
! ! *XlwMenu.towersOfHanoi.labelString:	Towers of Hanoi
! *XlwMenu.towersOfHanoi.labelString:	Hanoi ???
! ! *XlwMenu.gameOfLife.labelString:	Game of Life
! *XlwMenu.gameOfLife.labelString:	????????????
! ! *XlwMenu.multiplicationPuzzle.labelString:	Multiplication Puzzle
! *XlwMenu.multiplicationPuzzle.labelString:	??????????????????
! ! *XlwMenu.listAllBuffers.labelString:	List All Buffers
! *XlwMenu.listAllBuffers.labelString:	?????????????????????
! ! *XlwMenu..labelString:	
! ! *XlwMenu..labelString:
! ! *XlwMenu.emacs.labelString:	Emacs
! ! *XlwMenu.emacs.labelString:
! ! *XlwMenu.group___.labelString:	Group...
! ! *XlwMenu.group___.labelString:	???...
! ! *XlwMenu.variable___.labelString:	Variable...
! ! *XlwMenu.variable___.labelString:	??????...
! ! *XlwMenu.face___.labelString:	Face...
! ! *XlwMenu.face___.labelString:	???...
! ! *XlwMenu.saved___.labelString:	Saved...
! ! *XlwMenu.saved___.labelString:	??????...
! ! *XlwMenu.set___.labelString:	Set...
! ! *XlwMenu.set___.labelString:	??????...
! ! *XlwMenu.apropos___.labelString:	Apropos...
! ! *XlwMenu.apropos___.labelString:	????????????...
! ! *XlwMenu.browse___.labelString:	Browse...
! ! *XlwMenu.browse___.labelString:	??????...
! ! *XlwMenu.emacs___.labelString:	Emacs...
! ! *XlwMenu.emacs___.labelString:
! ! *XlwMenu.editing.labelString:	Editing
! *XlwMenu.editing.labelString:	??????
! ! *XlwMenu.external.labelString:	External
! *XlwMenu.external.labelString:	??????
! ! *XlwMenu.programming.labelString:	Programming
! *XlwMenu.programming.labelString:	??????
! ! *XlwMenu.applications.labelString:	Applications
! *XlwMenu.applications.labelString:	??????
! ! *XlwMenu.development.labelString:	Development
! *XlwMenu.development.labelString:	??????
! ! *XlwMenu.environment.labelString:	Environment
! *XlwMenu.environment.labelString:	??????
! ! *XlwMenu.data.labelString:	Data
! *XlwMenu.data.labelString:	??????
! ! *XlwMenu.files.labelString:	Files
! *XlwMenu.files.labelString:	??????
! ! *XlwMenu.wp.labelString:	Wp
! *XlwMenu.wp.labelString:	????????????
! ! *XlwMenu.faces.labelString:	Faces
! *XlwMenu.faces.labelString:	???
! ! *XlwMenu.hypermedia.labelString:	Hypermedia
! *XlwMenu.hypermedia.labelString:	?????????
! ! *XlwMenu.help.labelString:	Help
! ! *XlwMenu.help.labelString:	??????
! ! *XlwMenu.local.labelString:	Local
! *XlwMenu.local.labelString:	??????
! ! *XlwMenu.undo.labelString:	Undo
! *XlwMenu.undo.labelString:	??????
! ! *XlwMenu.cut.labelString:	Cut
! *XlwMenu.cut.labelString:	??????
! ! *XlwMenu.copy.labelString:	Copy
! *XlwMenu.copy.labelString:	??????
! ! *XlwMenu.paste.labelString:	Paste
! *XlwMenu.paste.labelString:	??????
! ! *XlwMenu.clear.labelString:	Clear
! *XlwMenu.clear.labelString:	??????
! ! *XlwMenu.search___.labelString:	Search...
! *XlwMenu.search___.labelString:	??????...
! ! *XlwMenu.searchBackward___.labelString:	Search Backward...
! *XlwMenu.searchBackward___.labelString:	???????????????
! ! *XlwMenu.replace___.labelString:	Replace...
! *XlwMenu.replace___.labelString:	??????...
! ! *XlwMenu.searchRegexp___.labelString:	Search (Regexp)...
! *XlwMenu.searchRegexp___.labelString:	?????? (??????) ...
! ! *XlwMenu.searchBackwardRegexp___.labelString:	Search Backward (Regexp)...
! *XlwMenu.searchBackwardRegexp___.labelString:	??????????????? (??????) ...
! ! *XlwMenu.replaceRegexp___.labelString:	Replace (Regexp)...
! *XlwMenu.replaceRegexp___.labelString:	?????? (??????) ...
! ! *XlwMenu.gotoLine___.labelString:	Goto Line...
! *XlwMenu.gotoLine___.labelString:	???????????????...
! ! *XlwMenu.whatLine.labelString:	What Line
! *XlwMenu.whatLine.labelString:	???????????????
! ! *XlwMenu.bookmarks.labelString:	Bookmarks
! *XlwMenu.bookmarks.labelString:	??????
! ! *XlwMenu.startMacroRecording.labelString:	Start Macro Recording
! *XlwMenu.startMacroRecording.labelString:	???????????????
! ! *XlwMenu.endMacroRecording.labelString:	End Macro Recording
! *XlwMenu.endMacroRecording.labelString:	???????????????
! ! *XlwMenu.executeLastMacro.labelString:	Execute Last Macro
! *XlwMenu.executeLastMacro.labelString:	?????????????????????
! ! *XlwMenu.showMessageLog.labelString:	Show Message Log
! *XlwMenu.showMessageLog.labelString:	??????????????????
! ! *XlwMenu.jumpToBookmark.labelString:	Jump to Bookmark
! *XlwMenu.jumpToBookmark.labelString:	????????????
! ! *XlwMenu.setBookmark.labelString:	Set bookmark
! *XlwMenu.setBookmark.labelString:	????????????
! ! *XlwMenu.insertContents.labelString:	Insert contents
! *XlwMenu.insertContents.labelString:	????????????
! ! *XlwMenu.insertLocation.labelString:	Insert location
! *XlwMenu.insertLocation.labelString:	????????????
! ! *XlwMenu.renameBookmark.labelString:	Rename bookmark
! *XlwMenu.renameBookmark.labelString:	????????????
! ! *XlwMenu.deleteBookmark.labelString:	Delete Bookmark
! *XlwMenu.deleteBookmark.labelString:	????????????
! ! *XlwMenu.editBookmarkList.labelString:	Edit Bookmark List
! *XlwMenu.editBookmarkList.labelString:	??????????????????
! ! *XlwMenu.saveBookmarks.labelString:	Save bookmarks
! *XlwMenu.saveBookmarks.labelString:	????????????
! ! *XlwMenu.saveBookmarksAs___.labelString:	Save bookmarks as...
! *XlwMenu.saveBookmarksAs___.labelString:	??????????????????...
! ! *XlwMenu.loadABookmarkFile.labelString:	Load a bookmark file
! *XlwMenu.loadABookmarkFile.labelString:	??????????????????
! ! *XlwMenu.open___.labelString:	Open...
! *XlwMenu.open___.labelString:	??????...
! ! *XlwMenu.openInOtherWindow___.labelString:	Open in Other Window...
! *XlwMenu.openInOtherWindow___.labelString:	????????????????????????...
! ! *XlwMenu.openInNewFrame___.labelString:	Open in New Frame...
! *XlwMenu.openInNewFrame___.labelString:	??????????????????...
! ! *XlwMenu.insertFile___.labelString:	Insert File...
! *XlwMenu.insertFile___.labelString:	????????????...
! ! *XlwMenu.viewFile___.labelString:	View File...
! *XlwMenu.viewFile___.labelString:	????????????...
! ! *XlwMenu.save.labelString:	Save
! *XlwMenu.save.labelString:	??????
! ! *XlwMenu.saveAs___.labelString:	Save As...
! *XlwMenu.saveAs___.labelString:	?????????...
! ! *XlwMenu.saveSomeBuffers.labelString:	Save Some Buffers
! *XlwMenu.saveSomeBuffers.labelString:	???????????????
! ! *XlwMenu.printBuffer.labelString:	Print Buffer
! *XlwMenu.printBuffer.labelString:	???????????????
! ! *XlwMenu.prettyPrintBuffer.labelString:	Pretty-Print Buffer
! *XlwMenu.prettyPrintBuffer.labelString:	???????????????
! ! *XlwMenu.newFrame.labelString:	New Frame
! *XlwMenu.newFrame.labelString:	??????
! ! *XlwMenu.frameOnOtherDisplay___.labelString:	Frame on Other Display...
! *XlwMenu.frameOnOtherDisplay___.labelString:	????????????????????????...
! ! *XlwMenu.deleteFrame.labelString:	Delete Frame
! *XlwMenu.deleteFrame.labelString:	?????????
! ! *XlwMenu.splitWindow.labelString:	Split Window
! *XlwMenu.splitWindow.labelString:	????????????
! ! *XlwMenu.unSplitKeepThis.labelString:	Un-Split (Keep This)
! *XlwMenu.unSplitKeepThis.labelString:	???????????????
! ! *XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep Others)
! *XlwMenu.unSplitKeepOthers.labelString:	???????????????
! ! *XlwMenu.revertBuffer.labelString:	Revert Buffer
! *XlwMenu.revertBuffer.labelString:	???????????????
! ! *XlwMenu.deleteBuffer.labelString:	Delete Buffer
! *XlwMenu.deleteBuffer.labelString:	???????????????
! ! *XlwMenu.exitXEmacs.labelString:	Exit XEmacs
! *XlwMenu.exitXEmacs.labelString:	?????? XEmacs
! ! *XlwMenu.aboutXEmacs___.labelString:	About XEmacs...
! *XlwMenu.aboutXEmacs___.labelString:	?????? XEmacs...
! ! *XlwMenu.basics.labelString:	Basics
! *XlwMenu.basics.labelString:	??????
! ! *XlwMenu.xEmacsFAQ.labelString:	XEmacs FAQ
! *XlwMenu.xEmacsFAQ.labelString:	XEmacs ????????????????????????
! ! *XlwMenu.samples.labelString:	Samples
! *XlwMenu.samples.labelString:	??????
! ! *XlwMenu.lookupInInfo.labelString:	Lookup in Info
! *XlwMenu.lookupInInfo.labelString:	??? Info ?????????
! ! *XlwMenu.manuals.labelString:	Manuals
! *XlwMenu.manuals.labelString:	??????
! ! *XlwMenu.commandsKeys.labelString:	Commands & Keys
! *XlwMenu.commandsKeys.labelString:	????????????
! ! *XlwMenu.recentMessages.labelString:	Recent Messages
! *XlwMenu.recentMessages.labelString:	???????????????
! ! *XlwMenu.misc.labelString:	Misc
! *XlwMenu.misc.labelString:	??????
! ! *XlwMenu.submitBugReport.labelString:	Submit Bug Report
! *XlwMenu.submitBugReport.labelString:	??? Bug ??????
! ! *XlwMenu.tutorial.labelString:	Tutorial
! *XlwMenu.tutorial.labelString:	??????
! ! *XlwMenu.news.labelString:	News
! *XlwMenu.news.labelString:	??????
! ! *XlwMenu.packages.labelString:	Packages
! *XlwMenu.packages.labelString:	???
! ! *XlwMenu.splash.labelString:	Splash
! *XlwMenu.splash.labelString:	Splash
! ! *XlwMenu.fAQLocal.labelString:	FAQ (local)
! *XlwMenu.fAQLocal.labelString:	???????????????????????? (??????)
! ! *XlwMenu.fAQViaWWW.labelString:	FAQ via WWW
! *XlwMenu.fAQViaWWW.labelString:	???????????????????????? (??????WWW)
! ! *XlwMenu.homePage.labelString:	Home Page
! *XlwMenu.homePage.labelString:	??????
! ! *XlwMenu.sample.labelString:	Sample
! *XlwMenu.sample.labelString:	??????
! ! *XlwMenu.keyBinding___.labelString:	Key Binding...
! *XlwMenu.keyBinding___.labelString:	????????????...
! ! *XlwMenu.command___.labelString:	Command...
! *XlwMenu.command___.labelString:	??????...
! ! *XlwMenu.function___.labelString:	Function...
! *XlwMenu.function___.labelString:	??????...
! ! *XlwMenu.topic___.labelString:	Topic...
! *XlwMenu.topic___.labelString:	??????...
! ! *XlwMenu.info.labelString:	Info
! *XlwMenu.info.labelString:	Info
! ! *XlwMenu.unixManual___.labelString:	Unix Manual...
! *XlwMenu.unixManual___.labelString:	Unix ??????...
! ! *XlwMenu.mode.labelString:	Mode
! *XlwMenu.mode.labelString:	??????
! ! *XlwMenu.apropos___.labelString:	Apropos...
! ! *XlwMenu.apropos___.labelString:	????????????...
! ! *XlwMenu.aproposDocs___.labelString:	Apropos Docs...
! *XlwMenu.aproposDocs___.labelString:	????????????????????????...
! ! *XlwMenu.key___.labelString:	Key...
! *XlwMenu.key___.labelString:	???...
! ! *XlwMenu.bindings.labelString:	Bindings
! *XlwMenu.bindings.labelString:	??????
! ! *XlwMenu.mouseBindings.labelString:	Mouse Bindings
! *XlwMenu.mouseBindings.labelString:	????????????
! ! *XlwMenu.recentKeys.labelString:	Recent Keys
! *XlwMenu.recentKeys.labelString:	????????????
! ! *XlwMenu.variable___.labelString:	Variable...
! ! *XlwMenu.variable___.labelString:	??????...
! ! *XlwMenu.locateCommand___.labelString:	Locate Command...
! *XlwMenu.locateCommand___.labelString:	????????????...
! ! *XlwMenu.noWarranty.labelString:	No Warranty
! *XlwMenu.noWarranty.labelString:	????????????
! ! *XlwMenu.xEmacsLicense.labelString:	XEmacs License
! *XlwMenu.xEmacsLicense.labelString:	XEmacs ?????????
! ! *XlwMenu.theLatestVersion.labelString:	The Latest Version
! *XlwMenu.theLatestVersion.labelString:	????????????
! ! *XlwMenu.evaluateLastSExpression.labelString:	Evaluate Last S-expression
! *XlwMenu.evaluateLastSExpression.labelString:	??????????????? S ?????????
! ! *XlwMenu.evaluateEntireBuffer.labelString:	Evaluate Entire Buffer
! *XlwMenu.evaluateEntireBuffer.labelString:	?????????????????????
! ! *XlwMenu.evaluateRegion.labelString:	Evaluate Region
! *XlwMenu.evaluateRegion.labelString:	????????????
! ! *XlwMenu.evaluateThisDefun.labelString:	Evaluate This Defun
! *XlwMenu.evaluateThisDefun.labelString:	???????????? Defun
! ! *XlwMenu.debugThisDefun.labelString:	Debug This Defun
! *XlwMenu.debugThisDefun.labelString:	???????????? Defun
! ! *XlwMenu.traceAFunction.labelString:	Trace a Function
! *XlwMenu.traceAFunction.labelString:	??????????????????
! ! *XlwMenu.untraceAllFunctions.labelString:	Untrace All Functions
! *XlwMenu.untraceAllFunctions.labelString:	?????????????????????
! ! *XlwMenu.commentOutRegion.labelString:	Comment Out Region
! *XlwMenu.commentOutRegion.labelString:	????????????
! ! *XlwMenu.indentRegion.labelString:	Indent Region
! *XlwMenu.indentRegion.labelString:	????????????
! ! *XlwMenu.indentLine.labelString:	Indent Line
! *XlwMenu.indentLine.labelString:	????????????
! ! *XlwMenu.debugOnError.labelString:	Debug On Error
! ! *XlwMenu.debugOnError.labelString:	?????????????????????
! ! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
! ! *XlwMenu.debugOnQuit.labelString:	???????????????
! ! *XlwMenu.debugOnSignal.labelString:	Debug on Signal
! *XlwMenu.debugOnSignal.labelString:	????????????
! ! *XlwMenu.describeLanguageSupport.labelString:	Describe language support
! *XlwMenu.describeLanguageSupport.labelString:	??????????????????
! ! *XlwMenu.setLanguageEnvironment.labelString:	Set language environment
! *XlwMenu.setLanguageEnvironment.labelString:	??????????????????
! ! *XlwMenu.toggleInputMethod.labelString:	Toggle input method
! *XlwMenu.toggleInputMethod.labelString:	???????????????
! ! *XlwMenu.selectInputMethod.labelString:	Select input method
! *XlwMenu.selectInputMethod.labelString:	???????????????
! ! *XlwMenu.describeInputMethod.labelString:	Describe input method
! *XlwMenu.describeInputMethod.labelString:	???????????????
! ! *XlwMenu.describeCurrentCodingSystems.labelString:	Describe current coding systems
! *XlwMenu.describeCurrentCodingSystems.labelString:	????????????????????????
! ! *XlwMenu.setCodingSystemOfBufferFile.labelString:	Set coding system of buffer file
! *XlwMenu.setCodingSystemOfBufferFile.labelString:	????????????????????????????????????
! ! *XlwMenu.setCodingSystemOfTerminal.labelString:	Set coding system of terminal
! *XlwMenu.setCodingSystemOfTerminal.labelString:	???????????????????????????
! ! *XlwMenu.setCodingSystemOfKeyboard.labelString:	Set coding system of keyboard
! *XlwMenu.setCodingSystemOfKeyboard.labelString:	???????????????????????????
! ! *XlwMenu.setCodingSystemOfProcess.labelString:	Set coding system of process
! *XlwMenu.setCodingSystemOfProcess.labelString:	???????????????????????????
! ! *XlwMenu.showCharacterTable.labelString:	Show character table
! *XlwMenu.showCharacterTable.labelString:	???????????????
! ! *XlwMenu.showDiagnosisForMULE.labelString:	Show diagnosis for MULE
! *XlwMenu.showDiagnosisForMULE.labelString:	?????? MULE ???????????????
! ! *XlwMenu.showManyLanguages.labelString:	Show many languages
! *XlwMenu.showManyLanguages.labelString:	???????????????
! ! *XlwMenu.chineseGB.labelString:	Chinese-GB
! *XlwMenu.chineseGB.labelString:	?????? GB ???
! ! *XlwMenu.chineseBIG5.labelString:	Chinese-BIG5
! *XlwMenu.chineseBIG5.labelString:	?????? BIG5 ???
! ! *XlwMenu.cyrillicISO.labelString:	Cyrillic-ISO
! !*XlwMenu.cyrillicISO.labelString:
! ! *XlwMenu.cyrillicKOI8.labelString:	Cyrillic-KOI8
! !*XlwMenu.cyrillicKOI8.labelString:
! ! *XlwMenu.cyrillicALT.labelString:	Cyrillic-ALT
! !*XlwMenu.cyrillicALT.labelString:
! ! *XlwMenu.cyrillic.labelString:	Cyrillic
! !*XlwMenu.cyrillic.labelString:
! ! ! *XlwMenu.english.labelString:	English
! *XlwMenu.english.labelString:	??????
! ! *XlwMenu.aSCII.labelString:	ASCII
! ! *XlwMenu.aSCII.labelString:
! ! *XlwMenu.latin1.labelString:	Latin-1
! *XlwMenu.latin1.labelString:	?????????-1
! ! *XlwMenu.german.labelString:	German
! *XlwMenu.german.labelString:	??????
! ! *XlwMenu.french.labelString:	French
! *XlwMenu.french.labelString:	??????
! ! *XlwMenu.norwegian.labelString:	Norwegian
! *XlwMenu.norwegian.labelString:	?????????
! ! *XlwMenu.latin2.labelString:	Latin-2
! *XlwMenu.latin2.labelString:	?????????-2
! ! *XlwMenu.croatian.labelString:	Croatian
! *XlwMenu.croatian.labelString:	???????????????
! ! *XlwMenu.polish.labelString:	Polish
! *XlwMenu.polish.labelString:	?????????
! ! *XlwMenu.latin3.labelString:	Latin-3
! *XlwMenu.latin3.labelString:	?????????-3
! ! *XlwMenu.latin4.labelString:	Latin-4
! *XlwMenu.latin4.labelString:	?????????-4
! ! *XlwMenu.latin5.labelString:	Latin-5
! *XlwMenu.latin5.labelString:	?????????-5
! ! *XlwMenu.greek.labelString:	Greek
! *XlwMenu.greek.labelString:	?????????
! ! *XlwMenu.hebrew.labelString:	Hebrew
! *XlwMenu.hebrew.labelString:	Hebrew
! ! *XlwMenu.japanese.labelString:	Japanese
! *XlwMenu.japanese.labelString:	??????
! ! *XlwMenu.korean.labelString:	Korean
! *XlwMenu.korean.labelString:	?????????
! ! *XlwMenu.iPA.labelString:	IPA
! ! *XlwMenu.iPA.labelString:
! ! *XlwMenu.customize.labelString:	Customize
! *XlwMenu.customize.labelString:	??????
! ! *XlwMenu.readOnly.labelString:	Read Only
! *XlwMenu.readOnly.labelString:	??????
! ! *XlwMenu.editingOptions.labelString:	Editing Options
! *XlwMenu.editingOptions.labelString:	????????????
! ! *XlwMenu.generalOptions.labelString:	General Options
! *XlwMenu.generalOptions.labelString:	????????????
! ! *XlwMenu.printingOptions.labelString:	Printing Options
! *XlwMenu.printingOptions.labelString:	????????????
! ! *XlwMenu.otherWindowLocation.labelString:	"Other Window" Location
! *XlwMenu.otherWindowLocation.labelString:	"????????????"??????
! ! *XlwMenu.syntaxHighlighting.labelString:	Syntax Highlighting
! *XlwMenu.syntaxHighlighting.labelString:	??????????????????
! ! *XlwMenu.parenHighlighting.labelString:	Paren Highlighting
! *XlwMenu.parenHighlighting.labelString:	??????????????????
! ! *XlwMenu.frameAppearance.labelString:	Frame Appearance
! *XlwMenu.frameAppearance.labelString:	?????????
! ! *XlwMenu.menubarAppearance.labelString:	Menubar Appearance
! *XlwMenu.menubarAppearance.labelString:	???????????????
! ! *XlwMenu.toolbarAppearance.labelString:	Toolbar Appearance
! *XlwMenu.toolbarAppearance.labelString:	???????????????
! ! *XlwMenu.mouse.labelString:	Mouse
! *XlwMenu.mouse.labelString:	??????
! ! *XlwMenu.openURLsWith.labelString:	Open URLs With
! *XlwMenu.openURLsWith.labelString:	???????????????
! ! *XlwMenu.browseFaces___.labelString:	Browse Faces...
! *XlwMenu.browseFaces___.labelString:	?????????...
! ! *XlwMenu.font.labelString:	Font
! *XlwMenu.font.labelString:	??????
! ! *XlwMenu.size.labelString:	Size
! *XlwMenu.size.labelString:	??????
! ! *XlwMenu.weight.labelString:	Weight
! *XlwMenu.weight.labelString:	??????
! 
! 
! ! *XlwMenu.saveOptions.labelString:	Save Options
! *XlwMenu.saveOptions.labelString:	????????????
! !
! ! described by menu-customize?
! ! *XlwMenu.emacs.labelString:	Emacs
! ! *XlwMenu.emacs.labelString:
! ! *XlwMenu.group___.labelString:	Group...
! *XlwMenu.group___.labelString:	???...
! ! *XlwMenu.variable___.labelString:	Variable...
! *XlwMenu.variable___.labelString:	??????...
! ! *XlwMenu.face___.labelString:	Face...
! *XlwMenu.face___.labelString:	???...
! ! *XlwMenu.saved___.labelString:	Saved...
! *XlwMenu.saved___.labelString:	??????...
! ! *XlwMenu.set___.labelString:	Set...
! *XlwMenu.set___.labelString:	??????...
! ! *XlwMenu.apropos___.labelString:	Apropos...
! *XlwMenu.apropos___.labelString:	????????????...
! !
! ! *XlwMenu.browse___.labelString:	Browse...
! *XlwMenu.browse___.labelString:	??????...
! !! *XlwMenu.overstrike.labelString:	Overstrike
! *XlwMenu.overstrike.labelString:	??????
! ! *XlwMenu.caseSensitiveSearch.labelString:	Case Sensitive Search
! *XlwMenu.caseSensitiveSearch.labelString:	?????????????????????
! ! *XlwMenu.caseMatchingReplace.labelString:	Case Matching Replace
! *XlwMenu.caseMatchingReplace.labelString:	?????????????????????
! ! *XlwMenu.autoDeleteSelection.labelString:	Auto Delete Selection
! *XlwMenu.autoDeleteSelection.labelString:	??????????????????
! ! *XlwMenu.activeRegions.labelString:	Active Regions
! *XlwMenu.activeRegions.labelString:	????????????
! ! *XlwMenu.mousePasteAtTextCursor.labelString:	Mouse Paste At Text Cursor
! *XlwMenu.mousePasteAtTextCursor.labelString:	?????????????????????????????????
! ! *XlwMenu.requireNewlineAtEnd.labelString:	Require Newline At End
! *XlwMenu.requireNewlineAtEnd.labelString:	??????????????????????????????
! ! *XlwMenu.addNewlineWhenMovingPastEnd.labelString:	Add Newline When Moving Past End
! *XlwMenu.addNewlineWhenMovingPastEnd.labelString:	????????????????????????????????????
! ! *XlwMenu.teachExtendedCommands.labelString:	Teach Extended Commands
! *XlwMenu.teachExtendedCommands.labelString:	??????????????????
! ! *XlwMenu.debugOnError.labelString:	Debug On Error
! *XlwMenu.debugOnError.labelString:	??????????????????
! ! *XlwMenu.debugOnQuit.labelString:	Debug On Quit
! *XlwMenu.debugOnQuit.labelString:	??????????????????
! ! *XlwMenu.commandLineSwitchesForLprLp___.labelString:	Command-Line Switches for `lpr'/`lp'...
! *XlwMenu.commandLineSwitchesForLprLp___.labelString:	????????? lpr/lp ?????????
! ! *XlwMenu.prettyPrintPaperSize.labelString:	Pretty-Print Paper Size
! *XlwMenu.prettyPrintPaperSize.labelString:	??????????????????
! ! *XlwMenu.colorPrinting.labelString:	Color Printing
! *XlwMenu.colorPrinting.labelString:	????????????
! ! *XlwMenu.letter.labelString:	Letter
! ! *XlwMenu.letter.labelString:
! ! *XlwMenu.letterSmall.labelString:	Letter-small
! ! *XlwMenu.letterSmall.labelString:
! ! *XlwMenu.legal.labelString:	Legal
! ! *XlwMenu.legal.labelString:
! ! *XlwMenu.statement.labelString:	Statement
! ! *XlwMenu.statement.labelString:
! ! *XlwMenu.executive.labelString:	Executive
! ! *XlwMenu.executive.labelString:
! ! *XlwMenu.tabloid.labelString:	Tabloid
! ! *XlwMenu.tabloid.labelString:
! ! *XlwMenu.ledger.labelString:	Ledger
! ! *XlwMenu.ledger.labelString:
! ! *XlwMenu.a3.labelString:	A3
! ! *XlwMenu.a3.labelString:
! ! *XlwMenu.a4.labelString:	A4
! ! *XlwMenu.a4.labelString:
! ! *XlwMenu.a4small.labelString:	A4small
! ! *XlwMenu.a4small.labelString:
! ! *XlwMenu.b4.labelString:	B4
! ! *XlwMenu.b4.labelString:
! ! *XlwMenu.b5.labelString:	B5
! ! *XlwMenu.b5.labelString:
! ! *XlwMenu.alwaysInSameFrame.labelString:	Always in Same Frame
! *XlwMenu.alwaysInSameFrame.labelString:	??????????????????
! ! *XlwMenu.otherFrame2FramesMax.labelString:	Other Frame (2 Frames Max)
! *XlwMenu.otherFrame2FramesMax.labelString:	????????? (??????2???)
! ! *XlwMenu.otherFrame3FramesMax.labelString:	Other Frame (3 Frames Max)
! *XlwMenu.otherFrame3FramesMax.labelString:	????????? (??????3???)
! ! *XlwMenu.otherFrame4FramesMax.labelString:	Other Frame (4 Frames Max)
! *XlwMenu.otherFrame4FramesMax.labelString:	????????? (??????4???)
! ! *XlwMenu.otherFrame5FramesMax.labelString:	Other Frame (5 Frames Max)
! *XlwMenu.otherFrame5FramesMax.labelString:	????????? (??????5???)
! ! *XlwMenu.alwaysCreateNewFrame.labelString:	Always Create New Frame
! *XlwMenu.alwaysCreateNewFrame.labelString:	??????????????????
! ! *XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	Temp Buffers Always in Same Frame
! *XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	?????????????????????????????????
! ! *XlwMenu.tempBuffersLikeOtherBuffers.labelString:	Temp Buffers Like Other Buffers
! *XlwMenu.tempBuffersLikeOtherBuffers.labelString: ???????????????????????????????????????
! ! *XlwMenu.makeCurrentFrameGnuservTarget.labelString:	Make current frame gnuserv target
! *XlwMenu.makeCurrentFrameGnuservTarget.labelString:????????????????????? gnuserv ?????????
! ! *XlwMenu.inThisBuffer.labelString:	In This Buffer
! *XlwMenu.inThisBuffer.labelString:	?????????????????????
! ! *XlwMenu.automatic.labelString:	Automatic
! *XlwMenu.automatic.labelString:	??????
! ! *XlwMenu.fonts.labelString:	Fonts
! *XlwMenu.fonts.labelString:	??????
! ! *XlwMenu.colors.labelString:	Colors
! *XlwMenu.colors.labelString:    ??????
! ! *XlwMenu.least.labelString:	Least
! *XlwMenu.least.labelString:	??????
! ! *XlwMenu.more.labelString:	More
! *XlwMenu.more.labelString:	???
! ! *XlwMenu.evenMore.labelString:	Even More
! *XlwMenu.evenMore.labelString:	??????
! ! *XlwMenu.most.labelString:	Most
! *XlwMenu.most.labelString:	??????
! ! *XlwMenu.lazy.labelString:	Lazy
! *XlwMenu.lazy.labelString:	??????
! ! *XlwMenu.caching.labelString:	Caching
! *XlwMenu.caching.labelString:	????????????
! ! *XlwMenu.none.labelString:	None
! *XlwMenu.none.labelString:	???
! ! *XlwMenu.blinkingParen.labelString:	Blinking Paren
! *XlwMenu.blinkingParen.labelString:	????????????
! ! *XlwMenu.steadyParen.labelString:	Steady Paren
! *XlwMenu.steadyParen.labelString:	????????????
! ! *XlwMenu.expression.labelString:	Expression
! *XlwMenu.expression.labelString:	???????????????
! ! *XlwMenu.scrollbars.labelString:	Scrollbars
! *XlwMenu.scrollbars.labelString:	?????????
! ! *XlwMenu.3DModeline.labelString:	3D Modeline
! *XlwMenu.3DModeline.labelString:	3 ????????????
! ! *XlwMenu.truncateLines.labelString:	Truncate Lines
! *XlwMenu.truncateLines.labelString:	?????????
! ! *XlwMenu.barCursor.labelString:	Bar Cursor
! *XlwMenu.barCursor.labelString:	????????????
! ! *XlwMenu.blinkingCursor.labelString:	Blinking Cursor
! *XlwMenu.blinkingCursor.labelString:	????????????
! ! *XlwMenu.frameLocalFontMenu.labelString:	Frame-Local Font Menu
! *XlwMenu.frameLocalFontMenu.labelString:	?????????????????????
! ! *XlwMenu.buffersMenuLength___.labelString:	Buffers Menu Length...
! *XlwMenu.buffersMenuLength___.labelString:	?????????????????????...
! ! *XlwMenu.multiOperationBuffersSubMenus.labelString:	Multi-Operation Buffers Sub-Menus
! *XlwMenu.multiOperationBuffersSubMenus.labelString:	???????????????????????????
! ! *XlwMenu.buffersMenuSorting.labelString:	Buffers Menu Sorting
! *XlwMenu.buffersMenuSorting.labelString:	?????????????????????
! ! *XlwMenu.submenusForBufferGroups.labelString:	Submenus for Buffer Groups
! *XlwMenu.submenusForBufferGroups.labelString:	?????????????????????????????????
! ! *XlwMenu.ignoreScaledFonts.labelString:	Ignore Scaled Fonts
! *XlwMenu.ignoreScaledFonts.labelString:	??????????????????
! ! *XlwMenu.mostRecentlyUsed.labelString:	Most Recently Used
! *XlwMenu.mostRecentlyUsed.labelString:	?????????????????????
! ! *XlwMenu.alphabetically.labelString:	Alphabetically
! *XlwMenu.alphabetically.labelString:	????????????
! ! *XlwMenu.byMajorModeThenAlphabetically.labelString:	By Major Mode, Then Alphabetically
! *XlwMenu.byMajorModeThenAlphabetically.labelString:	????????????, ???????????????
! ! *XlwMenu.visible.labelString:	Visible
! *XlwMenu.visible.labelString:	??????
! ! *XlwMenu.captioned.labelString:	Captioned
! *XlwMenu.captioned.labelString:	?????????
! ! *XlwMenu.defaultLocation.labelString:	Default Location
! *XlwMenu.defaultLocation.labelString:	????????????
! ! *XlwMenu.top.labelString:	Top
! *XlwMenu.top.labelString:	???
! ! *XlwMenu.bottom.labelString:	Bottom
! *XlwMenu.bottom.labelString:	???
! ! *XlwMenu.left.labelString:	Left
! *XlwMenu.left.labelString:	???
! ! *XlwMenu.right.labelString:	Right
! *XlwMenu.right.labelString:	???
! ! *XlwMenu.avoidText.labelString:	Avoid-Text
! *XlwMenu.avoidText.labelString:	????????????
! ! *XlwMenu.strokesMode.labelString:	strokes-mode
! *XlwMenu.strokesMode.labelString:	strokes ??????
! ! *XlwMenu.emacsW3.labelString:	Emacs-W3
! ! *XlwMenu.emacsW3.labelString:
! ! *XlwMenu.netscape.labelString:	Netscape
! ! *XlwMenu.netscape.labelString:
! ! *XlwMenu.mosaic.labelString:	Mosaic
! ! *XlwMenu.mosaic.labelString:
! ! *XlwMenu.mosaicCCI.labelString:	Mosaic (CCI)
! ! *XlwMenu.mosaicCCI.labelString:
! ! *XlwMenu.iXIMosaic.labelString:	IXI Mosaic
! ! *XlwMenu.iXIMosaic.labelString:
! ! *XlwMenu.lynxXterm.labelString:	Lynx (xterm)
! ! *XlwMenu.lynxXterm.labelString:
! ! *XlwMenu.lynxXemacs.labelString:	Lynx (xemacs)
! ! *XlwMenu.lynxXemacs.labelString:
! ! *XlwMenu.grail.labelString:	Grail
! ! *XlwMenu.grail.labelString:
! ! *XlwMenu.charter.labelString:	Charter
! ! *XlwMenu.charter.labelString:
! ! *XlwMenu.clean.labelString:	Clean
! ! *XlwMenu.clean.labelString:
! ! *XlwMenu.courier.labelString:	Courier
! ! *XlwMenu.courier.labelString:
! ! *XlwMenu.fixed.labelString:	Fixed
! ! *XlwMenu.fixed.labelString:
! ! *XlwMenu.helvetica.labelString:	Helvetica
! ! *XlwMenu.helvetica.labelString:
! ! *XlwMenu.lucida.labelString:	Lucida
! ! *XlwMenu.lucida.labelString:
! ! *XlwMenu.lucidabright.labelString:	Lucidabright
! ! *XlwMenu.lucidabright.labelString:
! ! *XlwMenu.lucidatypewriter.labelString:	Lucidatypewriter
! ! *XlwMenu.lucidatypewriter.labelString:
! ! *XlwMenu.newCenturySchoolbook.labelString:	New Century Schoolbook
! ! *XlwMenu.newCenturySchoolbook.labelString:
! ! *XlwMenu.terminal.labelString:	Terminal
! ! *XlwMenu.terminal.labelString:
! ! *XlwMenu.times.labelString:	Times
! ! *XlwMenu.times.labelString:
! ! *XlwMenu.utopia.labelString:	Utopia
! ! *XlwMenu.utopia.labelString:
! ! *XlwMenu.5.labelString:	5
! ! *XlwMenu.5.labelString:
! ! *XlwMenu.6.labelString:	6
! ! *XlwMenu.6.labelString:
! ! *XlwMenu.7.labelString:	7
! ! *XlwMenu.7.labelString:
! ! *XlwMenu.8.labelString:	8
! ! *XlwMenu.8.labelString:
! ! *XlwMenu.9.labelString:	9
! ! *XlwMenu.9.labelString:
! ! *XlwMenu.10.labelString:	10
! ! *XlwMenu.10.labelString:
! ! *XlwMenu.11.labelString:	11
! ! *XlwMenu.11.labelString:
! ! *XlwMenu.12.labelString:	12
! ! *XlwMenu.12.labelString:
! ! *XlwMenu.13.labelString:	13
! ! *XlwMenu.13.labelString:
! ! *XlwMenu.14.labelString:	14
! ! *XlwMenu.14.labelString:
! ! *XlwMenu.15.labelString:	15
! ! *XlwMenu.15.labelString:
! ! *XlwMenu.16.labelString:	16
! ! *XlwMenu.16.labelString:
! ! *XlwMenu.17.labelString:	17
! ! *XlwMenu.17.labelString:
! ! *XlwMenu.18.labelString:	18
! ! *XlwMenu.18.labelString:
! ! *XlwMenu.19.labelString:	19
! ! *XlwMenu.19.labelString:
! ! *XlwMenu.20.labelString:	20
! ! *XlwMenu.20.labelString:
! ! *XlwMenu.23.labelString:	23
! ! *XlwMenu.23.labelString:
! ! *XlwMenu.24.labelString:	24
! ! *XlwMenu.24.labelString:
! ! *XlwMenu.black.labelString:	Black
! ! *XlwMenu.black.labelString:
! ! *XlwMenu.bold.labelString:	Bold
! ! *XlwMenu.bold.labelString:
! ! *XlwMenu.demibold.labelString:	Demibold
! ! *XlwMenu.demibold.labelString:
! ! *XlwMenu.medium.labelString:	Medium
! ! *XlwMenu.medium.labelString:
! ! *XlwMenu.regular.labelString:	Regular
! ! *XlwMenu.regular.labelString:
! ! *XlwMenu.grep___.labelString:	Grep...
! ! *XlwMenu.grep___.labelString:
! ! *XlwMenu.compile___.labelString:	Compile...
! *XlwMenu.compile___.labelString:	??????...
! ! *XlwMenu.shell.labelString:	Shell
! *XlwMenu.shell.labelString:	???
! ! *XlwMenu.shellCommand___.labelString:	Shell Command...
! *XlwMenu.shellCommand___.labelString:	?????????...
! ! *XlwMenu.shellCommandOnRegion___.labelString:	Shell Command on Region...
! *XlwMenu.shellCommandOnRegion___.labelString:	???????????????????????????...
! ! *XlwMenu.debugGDB___.labelString:	Debug (GDB)...
! *XlwMenu.debugGDB___.labelString:	?????? (GDB)...
! ! *XlwMenu.debugDBX___.labelString:	Debug (DBX)...
! *XlwMenu.debugDBX___.labelString:	?????? (DBX)...
! ! *XlwMenu.oOBrowser___.labelString:	OO-Browser...
! *XlwMenu.oOBrowser___.labelString:	OO-?????????...
! ! *XlwMenu.tags.labelString:	Tags
! *XlwMenu.tags.labelString:	??????
! ! *XlwMenu.vC.labelString:	VC
! ! *XlwMenu.vC.labelString:	VC
! ! *XlwMenu.findTag___.labelString:	Find Tag...
! *XlwMenu.findTag___.labelString:	????????????...
! ! *XlwMenu.findOtherWindow___.labelString:	Find Other Window...
! *XlwMenu.findOtherWindow___.labelString:	?????????????????????...
! ! *XlwMenu.nextTag___.labelString:	Next Tag...
! *XlwMenu.nextTag___.labelString:	???????????????...
! ! *XlwMenu.nextOtherWindow___.labelString:	Next Other Window...
! *XlwMenu.nextOtherWindow___.labelString:	?????????????????????...
! ! *XlwMenu.nextFile.labelString:	Next File
! *XlwMenu.nextFile.labelString:	???????????????
! ! *XlwMenu.tagsSearch___.labelString:	Tags Search...
! *XlwMenu.tagsSearch___.labelString:	????????????...
! ! *XlwMenu.tagsReplace___.labelString:	Tags Replace...
! *XlwMenu.tagsReplace___.labelString:	????????????...
! ! *XlwMenu.continueSearchReplace.labelString:	Continue Search/Replace
! *XlwMenu.continueSearchReplace.labelString:	????????????/??????
! ! *XlwMenu.popStack.labelString:	Pop stack
! *XlwMenu.popStack.labelString:	?????????
! ! *XlwMenu.apropos___.labelString:	Apropos...
! ! *XlwMenu.apropos___.labelString:	????????????...
! ! *XlwMenu.setTagsTableFile___.labelString:	Set Tags Table File...
! *XlwMenu.setTagsTableFile___.labelString:	?????????????????????...
! ! *XlwMenu.registerFile.labelString:	Register File
! *XlwMenu.registerFile.labelString:	????????????
! ! *XlwMenu.revertToLastRevision.labelString:	Revert to Last Revision
! *XlwMenu.revertToLastRevision.labelString:	????????????????????????
! ! *XlwMenu.cancelLastCheckin.labelString:	Cancel Last Checkin
! *XlwMenu.cancelLastCheckin.labelString:	??????????????? Checkin
! ! *XlwMenu.renameFile.labelString:	Rename File
! *XlwMenu.renameFile.labelString:	????????????
! ! *XlwMenu.diffAgainstLastVersion.labelString:	Diff Against Last Version
! *XlwMenu.diffAgainstLastVersion.labelString:	??????????????????????????????
! ! *XlwMenu.diffBetweenRevisions___.labelString:	Diff Between Revisions...
! *XlwMenu.diffBetweenRevisions___.labelString:	??????????????????????????????...
! ! *XlwMenu.visitOtherVersion___.labelString:	Visit Other Version...
! *XlwMenu.visitOtherVersion___.labelString:	??????????????????...
! ! *XlwMenu.showEditHistory.labelString:	Show Edit History
! *XlwMenu.showEditHistory.labelString:	??????????????????
! ! *XlwMenu.listLockedFilesAnyUser.labelString:	List Locked Files Any User
! *XlwMenu.listLockedFilesAnyUser.labelString:	?????????????????????
! ! *XlwMenu.createSnapshot.labelString:	Create Snapshot
! *XlwMenu.createSnapshot.labelString:	????????????
! ! *XlwMenu.retrieveSnapshot.labelString:	Retrieve Snapshot
! *XlwMenu.retrieveSnapshot.labelString:	????????????
! ! *XlwMenu.cVSUpdateDirectory.labelString:	CVS Update Directory
! *XlwMenu.cVSUpdateDirectory.labelString:	CVS ????????????
! ! *XlwMenu.file.labelString:	File
! *XlwMenu.file.labelString:	??????
! ! *XlwMenu.edit.labelString:	Edit
! *XlwMenu.edit.labelString:	??????
! ! *XlwMenu.mule.labelString:	Mule
! ! *XlwMenu.mule.labelString:
! ! *XlwMenu.apps.labelString:	Apps
! *XlwMenu.apps.labelString:	??????
! ! *XlwMenu.options.labelString:	Options
! *XlwMenu.options.labelString:	?????????
! ! *XlwMenu.buffers.labelString:	Buffers
! *XlwMenu.buffers.labelString:   ?????????
! ! *XlwMenu.tools.labelString:	Tools
! *XlwMenu.tools.labelString:	??????
! ! *XlwMenu.lispInteraction.labelString:	Lisp-Interaction
! *XlwMenu.lispInteraction.labelString:	?????????Lisp
! ! *XlwMenu.load_emacs.labelString:	Load .emacs
! *XlwMenu.load_emacs.labelString:	?????? .emacs
! ! *XlwMenu.help.labelString:	Help
! *XlwMenu.help.labelString:	??????


--- NEW FILE Emacs.ad.zh_TW.Big5 ---
! Last Updated on 98/09/19
! Chinese localization resources for XEmacs
! Author: Clem Chuang (b5506056 at csie.ntu.edu.tw)
! modify from /usr/local/lib/xemacs-20.4/etc/app-defaults/ja/Emacs
! ??????????????!  ?Y???????N???B?]???s?????A?O?b?I???B?? :)
! ???O?q?????????????????A?o?????G???I???F?A???? XEmacs ?????W???w?g???F
! ???H?????????S???? ?Y?A?????????X?? Just do it!
! Fix not to affect emacs 2001/01/21 Yukihiro Nakai <ynakai at redhat.com>

! this is just to set the default fonts
!Emacs.default.attributeFont:  -*-courier-medium-r-*-*-*-140-*-*-*-*-iso8859-*
!Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-140-*-*-*-*-iso8859-*

.default.attributeFont: -*-courier-medium-r-*-*-*-*-*-*-*-80-iso8859-

! pulldown menu internationalization.  The first line of the file
! "Emacs*XlwMenu.resourceLabels: True" has to be there to make sure
! all the labelString will be read and displayed by X.
*XlwMenu.resourceLabels: True

*fontList: -*-gothic-medium-r-normal--14-120-75-75-c-*-*-*:
!! FontSet for the window frame and menus when you use USE_XFONTSET
!Emacs*fontSet: -*-fixed-medium-r-normal--16-*
*fontSet: -*-fixed-medium-r-normal--16-* 

! Starting below here are menu label string which can be translated to
! different languages. 
! Example: Emacs*XlwMenu.file.labelString: File  
! Characters before the ":" sign, "Example: Emacs*XlwMenu.file.labelString"
! can not be changed. They must stay exactly the way they are.
! The only string to be translated is the string, "File".
! Some resource names such as "file", "quit" have been used in several
! places.  However, each of them only has to be translated once in this X
! resource file.
!!! Default Menubar Top Level

! Emacs*XlwMenu.file.labelString:	File
*XlwMenu.file.labelString:	????
! Emacs*XlwMenu.edit.labelString:	Edit
*XlwMenu.edit.labelString:	?s??
! Emacs*XlwMenu.edit.labelString:	Mule
*XlwMenu.mule.labelString:	?y??
! Emacs*XlwMenu.apps.labelString:	Apps
*XlwMenu.apps.labelString:	?????n??
! Emacs*XlwMenu.options.labelString:	Options
*XlwMenu.options.labelString:	????
! Emacs*XlwMenu.buffers.labelString:	Buffers
*XlwMenu.buffers.labelString:	Buffers
! Emacs*XlwMenu.tools.labelString:	Tools
*XlwMenu.tools.labelString:	?u??
! Emacs*XlwMenu.help.labelString:	Help
*XlwMenu.help.labelString:	????

!! File menu

! Emacs*XlwMenu.open___.labelString:	Open...
*XlwMenu.open___.labelString:	?}??...
! Emacs*XlwMenu.openInOtherWindow___.labelString:	Open in Other Window...
*XlwMenu.openInOtherWindow___.labelString:	?}???b?s Window ??...
! Emacs*XlwMenu.openInNewFrame___.labelString:	Open in New Frame...
*XlwMenu.openInNewFrame___.labelString:	?}???b?s Frame ??...
! Emacs*XlwMenu.insertFile___.labelString:	Insert File...
*XlwMenu.insertFile___.labelString:	???J????...
! Emacs*XlwMenu.viewFile___.labelString:	View File...
*XlwMenu.viewFile___.labelString:	?[??????...
! Emacs*XlwMenu.save.labelString:	Save
*XlwMenu.save.labelString:	?s??:
! Emacs*XlwMenu.saveAs___.labelString:	Save As...
*XlwMenu.saveAs___.labelString:	?s???s??
! Emacs*XlwMenu.saveSomeBuffers.labelString:	Save Some Buffers
*XlwMenu.saveSomeBuffers.labelString:	???????x?s
! Emacs*XlwMenu.printBuffer.labelString:	Print Buffer
*XlwMenu.printBuffer.labelString:	?C?L:
! Emacs*XlwMenu.prettyPrintBuffer.labelString:	Pretty-Print Buffer
*XlwMenu.prettyPrintBuffer.labelString:	???~???C?L:
! Emacs*XlwMenu.newFrame.labelString:	New Frame
*XlwMenu.newFrame.labelString:	?}?s Frame
! Emacs*XlwMenu.frameOnOtherDisplay___.labelString:	Frame on Other Display...
*XlwMenu.frameOnOtherDisplay___.labelString:	?b?O?? Display ?W?}?s Frame
! Emacs*XlwMenu.deleteFrame.labelString:	Delete Frame
*XlwMenu.deleteFrame.labelString:	???? Frame
! Emacs*XlwMenu.splitWindow.labelString:	Split Window
*XlwMenu.splitWindow.labelString:	???? Window
! Emacs*XlwMenu.unSplitKeepThis.labelString:	Un-Split (Keep This)
*XlwMenu.unSplitKeepThis.labelString:	???j?o?? Window
! Emacs*XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep Others)
*XlwMenu.unSplitKeepOthers.labelString:	?Y?p?o?? Window
! Emacs*XlwMenu.revertBuffer.labelString:	Revert Buffer
*XlwMenu.revertBuffer.labelString:	?_???^??????:
! Emacs*XlwMenu.deleteBuffer.labelString:	Delete Buffer
*XlwMenu.deleteBuffer.labelString:	?M?? buffer:
! Emacs*XlwMenu.exitXEmacs.labelString:	Exit XEmacs
*XlwMenu.exitXEmacs.labelString:	???} XEmacs 

!! Edit menu

! Emacs*XlwMenu.undo.labelString:	Undo
*XlwMenu.undo.labelString:	?_??
! Emacs*XlwMenu.cut.labelString:	Cut
*XlwMenu.cut.labelString: ???U
! Emacs*XlwMenu.copy.labelString:	Copy
*XlwMenu.copy.labelString:	???s
! Emacs*XlwMenu.paste.labelString:	Paste
*XlwMenu.paste.labelString:	?K?W
! Emacs*XlwMenu.clear.labelString:	Clear
*XlwMenu.clear.labelString:	???h
! Emacs*XlwMenu.search___.labelString:	Search...
*XlwMenu.search___.labelString:	?j??...
! Emacs*XlwMenu.searchBackward___.labelString:	Search Backward...
*XlwMenu.searchBackward___.labelString:	?V???j??...
! Emacs*XlwMenu.replace___.labelString:	Replace...
*XlwMenu.replace___.labelString:	?m??...
! Emacs*XlwMenu.searchRegexp___.labelString:	Search (Regexp)...
*XlwMenu.searchRegexp___.labelString:	?j??(Regexp)...
! Emacs*XlwMenu.searchBackwardRegexp___.labelString:	Search Backward (Regexp)...
*XlwMenu.searchBackwardRegexp___.labelString:	?V???j??(Regexp)...
! Emacs*XlwMenu.replaceRegexp___.labelString:	Replace (Regexp)...
*XlwMenu.replaceRegexp___.labelString:	?m??(Regexp)...
! Emacs*XlwMenu.bookmarks.labelString:	Bookmarks
*XlwMenu.bookmarks.labelString:	????
! Emacs*XlwMenu.gotoLine___.labelString:	Goto Line...
*XlwMenu.gotoLine___.labelString:	?????Y?@??...
! Emacs*XlwMenu.whatLine.labelString:	What Line
*XlwMenu.whatLine.labelString:	???e????
! Emacs*XlwMenu.startMacroRecording.labelString:	Start Macro Recording
*XlwMenu.startMacroRecording.labelString:	?}?l?? Macro
! Emacs*XlwMenu.endMacroRecording.labelString:	End Macro Recording
*XlwMenu.endMacroRecording.labelString:	?????? Macro
*XlwMenu.showMessageLog.labelString:	?????T??????
! Emacs*XlwMenu.executeLastMacro.labelString:	Execute Last Macro
*XlwMenu.executeLastMacro.labelString:	??????????
! Emacs*XlwMenu.jumpToBookmark.labelString:	Jump to bookmark
*XlwMenu.jumpToBookmark.labelString:	????????
! Emacs*XlwMenu.setBookmark.labelString:	Set bookmark
*XlwMenu.setBookmark.labelString:	?]?w????
! Emacs*XlwMenu.insertContents.labelString:	Insert contents
*XlwMenu.insertContents.labelString:	???J???e
! Emacs*XlwMenu.insertLocation.labelString:	Insert location
*XlwMenu.insertLocation.labelString:	???J???m
! Emacs*XlwMenu.renameBookmark.labelString:	Rename bookmark
*XlwMenu.renameBookmark.labelString:	???s?R?W
! Emacs*XlwMenu.deleteBookmark.labelString:	Delete bookmark
*XlwMenu.deleteBookmark.labelString:	?R??
! Emacs*XlwMenu.editBookmarkList.labelString:	Edit Bookmark List
*XlwMenu.editBookmarkList.labelString:	?s???????C??
! Emacs*XlwMenu.saveBookmarks.labelString:	Save bookmarks
*XlwMenu.saveBookmarks.labelString:	?x?s????
! Emacs*XlwMenu.saveBookmarksAs___.labelString:	Save bookmarks as...
*XlwMenu.saveBookmarksAs___.labelString:	?N?????s??...
! Emacs*XlwMenu.loadABookmarkFile.labelString:	Load a bookmark file
*XlwMenu.loadABookmarkFile.labelString:	???J??????

!! Apps menu

! Emacs*XlwMenu.readMailVM___.labelString:	Read Mail (VM)...
*XlwMenu.readMailVM___.labelString:	???H (???? VM)...
! Emacs*XlwMenu.readMailMH___.labelString:	Read Mail (MH)...
*XlwMenu.readMailMH___.labelString:	???H (???? MH)...
! Emacs*XlwMenu.sendMail___.labelString:	Send mail...
*XlwMenu.sendMail___.labelString:	?H?H...
! Emacs*XlwMenu.usenetNews.labelString:	Usenet News
*XlwMenu.usenetNews.labelString:	Usenet News
! Emacs*XlwMenu.browseTheWeb.labelString:	Browse the Web
*XlwMenu.browseTheWeb.labelString:	?y?? WWW
! Emacs*XlwMenu.gopher.labelString:	Gopher
*XlwMenu.gopher.labelString:	Gopher
! Emacs*XlwMenu.hyperbole___.labelString:	Hyperbole...
*XlwMenu.hyperbole___.labelString:	Hyperbole...
! Emacs*XlwMenu.spellCheckBuffer.labelString:	Spell-Check Buffer
*XlwMenu.spellCheckBuffer.labelString:	???r???d?{??
! Emacs*XlwMenu.emulateVI.labelString:	Emulate VI
*XlwMenu.toggleVIEmulation.labelString:	???? vi
! Emacs*XlwMenu.calendar.labelString:	Calendar
*XlwMenu.calendar.labelString:	????
! Emacs*XlwMenu.games.labelString:	Games
*XlwMenu.games.labelString:	?C??
! Emacs*XlwMenu.3MonthCalendar.labelString:	3-Month Calendar
*XlwMenu.3MonthCalendar.labelString:	?????T????
! Emacs*XlwMenu.diary.labelString:	Diary
*XlwMenu.diary.labelString:	???O
! Emacs*XlwMenu.holidays.labelString:	Holidays
*XlwMenu.holidays.labelString:	?`??
! Emacs*XlwMenu.phasesOfTheMoon.labelString:	Phases of the Moon
*XlwMenu.phasesOfTheMoon.labelString:	???G
! Emacs*XlwMenu.sunriseSunset.labelString:	Sunrise/Sunset
*XlwMenu.sunriseSunset.labelString:	???X/????
! Emacs*XlwMenu.quoteFromZippy.labelString:	Quote from Zippy
*XlwMenu.quoteFromZippy.labelString:	Zippy ??????
! Emacs*XlwMenu.psychoanalyst.labelString:	Psychoanalyst
*XlwMenu.psychoanalyst.labelString:	????????
*XlwMenu.mineGame.labelString:	???a?p
! Emacs*XlwMenu.tetris.abelString:	Tetris
*XlwMenu.tetris.labelString:	?X????????
! Emacs*XlwMenu.psychoanalyzeZippy.labelString:	Psychoanalyze Zippy!
*XlwMenu.psychoanalyzeZippy.labelString:	???????R Zippy!
! Emacs*XlwMenu.randomFlames.labelString:	Random Flames
*XlwMenu.randomFlames.labelString:	???o???@??
! Emacs*XlwMenu.dunnetAdventure.labelString:	Dunnet (Adventure)
*XlwMenu.dunnetAdventure.labelString:	Dunnet (?_?I)
[...2178 lines suppressed...]
! Emacs*XlwScrollBar.ArrowPosition:  opposite


!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

*topToolBarShadowColor:		Gray90
*bottomToolBarShadowColor:		Gray40
*backgroundToolBarColor:		Gray75
*toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
! Emacs.default.attributeFont:  -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
!*menubar*Font: 		-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*
!*popup*Font:		-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*


! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:	-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*
*XmTextField*FontList:	-*-courier-medium-r-*-*-*-160-*-*-*-*-iso8859-*
*XmText*FontList:		-*-courier-medium-r-*-*-*-160-*-*-*-*-iso8859-*
*XmList*FontList:		-*-courier-medium-r-*-*-*-160-*-*-*-*-iso8859-*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:		-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField.translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton.translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! XIM fontset (defaults to system fontset default)
! Emacs*EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*

.geometry: 80x25


--- NEW FILE Emacs.ad.zh_TW.UTF-8 ---
! Last Updated on 98/09/19
! Chinese localization resources for XEmacs
! Author: Clem Chuang (b5506056 at csie.ntu.edu.tw)
! modify from /usr/local/lib/xemacs-20.4/etc/app-defaults/ja/Emacs
! ?????????????????????!  ????????????????????????????????????????????????????????? :)
! ????????????????????????????????????????????????????????????????????? XEmacs ????????????????????????
! ??????????????????????????? ???????????????????????? Just do it!
! Fix not to affect emacs 2001/01/21 Yukihiro Nakai <ynakai at redhat.com>

! this is just to set the default fonts
!Emacs.default.attributeFont:  -*-courier-medium-r-*-*-*-140-*-*-*-*-iso8859-*
!Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-140-*-*-*-*-iso8859-*

.default.attributeFont: -*-courier-medium-r-*-*-*-*-*-*-*-80-iso8859-

! ! pulldown menu internationalization.  The first line of the file
! ! "Emacs*XlwMenu.resourceLabels: True" has to be there to make sure
! ! all the labelString will be read and displayed by X.
! *XlwMenu.resourceLabels: True
! 
! *fontList: -*-gothic-medium-r-normal--14-120-75-75-c-*-*-*:
! !! FontSet for the window frame and menus when you use USE_XFONTSET
! !Emacs*fontSet: -*-fixed-medium-r-normal--16-*
! *fontSet: -*-fixed-medium-r-normal--16-* 
! 
! ! Starting below here are menu label string which can be translated to
! ! different languages. 
! ! Example: Emacs*XlwMenu.file.labelString: File  
! ! Characters before the ":" sign, "Example: Emacs*XlwMenu.file.labelString"
! ! can not be changed. They must stay exactly the way they are.
! ! The only string to be translated is the string, "File".
! ! Some resource names such as "file", "quit" have been used in several
! ! places.  However, each of them only has to be translated once in this X
! ! resource file.
! !!! Default Menubar Top Level
! 
! ! Emacs*XlwMenu.file.labelString:	File
! *XlwMenu.file.labelString:	??????
! ! Emacs*XlwMenu.edit.labelString:	Edit
! *XlwMenu.edit.labelString:	??????
! ! Emacs*XlwMenu.edit.labelString:	Mule
! *XlwMenu.mule.labelString:	??????
! ! Emacs*XlwMenu.apps.labelString:	Apps
! *XlwMenu.apps.labelString:	????????????
! ! Emacs*XlwMenu.options.labelString:	Options
! *XlwMenu.options.labelString:	??????
! ! Emacs*XlwMenu.buffers.labelString:	Buffers
! *XlwMenu.buffers.labelString:	Buffers
! ! Emacs*XlwMenu.tools.labelString:	Tools
! *XlwMenu.tools.labelString:	??????
! ! Emacs*XlwMenu.help.labelString:	Help
! *XlwMenu.help.labelString:	??????
! 
! !! File menu
! 
! ! Emacs*XlwMenu.open___.labelString:	Open...
! *XlwMenu.open___.labelString:	??????...
! ! Emacs*XlwMenu.openInOtherWindow___.labelString:	Open in Other Window...
! *XlwMenu.openInOtherWindow___.labelString:	???????????? Window ???...
! ! Emacs*XlwMenu.openInNewFrame___.labelString:	Open in New Frame...
! *XlwMenu.openInNewFrame___.labelString:	???????????? Frame ???...
! ! Emacs*XlwMenu.insertFile___.labelString:	Insert File...
! *XlwMenu.insertFile___.labelString:	????????????...
! ! Emacs*XlwMenu.viewFile___.labelString:	View File...
! *XlwMenu.viewFile___.labelString:	????????????...
! ! Emacs*XlwMenu.save.labelString:	Save
! *XlwMenu.save.labelString:	??????:
! ! Emacs*XlwMenu.saveAs___.labelString:	Save As...
! *XlwMenu.saveAs___.labelString:	????????????
! ! Emacs*XlwMenu.saveSomeBuffers.labelString:	Save Some Buffers
! *XlwMenu.saveSomeBuffers.labelString:	???????????????
! ! Emacs*XlwMenu.printBuffer.labelString:	Print Buffer
! *XlwMenu.printBuffer.labelString:	??????:
! ! Emacs*XlwMenu.prettyPrintBuffer.labelString:	Pretty-Print Buffer
! *XlwMenu.prettyPrintBuffer.labelString:	???????????????:
! ! Emacs*XlwMenu.newFrame.labelString:	New Frame
! *XlwMenu.newFrame.labelString:	?????? Frame
! ! Emacs*XlwMenu.frameOnOtherDisplay___.labelString:	Frame on Other Display...
! *XlwMenu.frameOnOtherDisplay___.labelString:	????????? Display ????????? Frame
! ! Emacs*XlwMenu.deleteFrame.labelString:	Delete Frame
! *XlwMenu.deleteFrame.labelString:	?????? Frame
! ! Emacs*XlwMenu.splitWindow.labelString:	Split Window
! *XlwMenu.splitWindow.labelString:	?????? Window
! ! Emacs*XlwMenu.unSplitKeepThis.labelString:	Un-Split (Keep This)
! *XlwMenu.unSplitKeepThis.labelString:	???????????? Window
! ! Emacs*XlwMenu.unSplitKeepOthers.labelString:	Un-Split (Keep Others)
! *XlwMenu.unSplitKeepOthers.labelString:	???????????? Window
! ! Emacs*XlwMenu.revertBuffer.labelString:	Revert Buffer
! *XlwMenu.revertBuffer.labelString:	??????????????????:
! ! Emacs*XlwMenu.deleteBuffer.labelString:	Delete Buffer
! *XlwMenu.deleteBuffer.labelString:	?????? buffer:
! ! Emacs*XlwMenu.exitXEmacs.labelString:	Exit XEmacs
! *XlwMenu.exitXEmacs.labelString:	?????? XEmacs 
! 
! !! Edit menu
! 
! ! Emacs*XlwMenu.undo.labelString:	Undo
! *XlwMenu.undo.labelString:	??????
! ! Emacs*XlwMenu.cut.labelString:	Cut
! *XlwMenu.cut.labelString: ??????
! ! Emacs*XlwMenu.copy.labelString:	Copy
! *XlwMenu.copy.labelString:	??????
! ! Emacs*XlwMenu.paste.labelString:	Paste
! *XlwMenu.paste.labelString:	??????
! ! Emacs*XlwMenu.clear.labelString:	Clear
! *XlwMenu.clear.labelString:	??????
! ! Emacs*XlwMenu.search___.labelString:	Search...
! *XlwMenu.search___.labelString:	??????...
! ! Emacs*XlwMenu.searchBackward___.labelString:	Search Backward...
! *XlwMenu.searchBackward___.labelString:	????????????...
! ! Emacs*XlwMenu.replace___.labelString:	Replace...
! *XlwMenu.replace___.labelString:	??????...
! ! Emacs*XlwMenu.searchRegexp___.labelString:	Search (Regexp)...
! *XlwMenu.searchRegexp___.labelString:	??????(Regexp)...
! ! Emacs*XlwMenu.searchBackwardRegexp___.labelString:	Search Backward (Regexp)...
! *XlwMenu.searchBackwardRegexp___.labelString:	????????????(Regexp)...
! ! Emacs*XlwMenu.replaceRegexp___.labelString:	Replace (Regexp)...
! *XlwMenu.replaceRegexp___.labelString:	??????(Regexp)...
! ! Emacs*XlwMenu.bookmarks.labelString:	Bookmarks
! *XlwMenu.bookmarks.labelString:	??????
! ! Emacs*XlwMenu.gotoLine___.labelString:	Goto Line...
! *XlwMenu.gotoLine___.labelString:	???????????????...
! ! Emacs*XlwMenu.whatLine.labelString:	What Line
! *XlwMenu.whatLine.labelString:	????????????
! ! Emacs*XlwMenu.startMacroRecording.labelString:	Start Macro Recording
! *XlwMenu.startMacroRecording.labelString:	????????? Macro
! ! Emacs*XlwMenu.endMacroRecording.labelString:	End Macro Recording
! *XlwMenu.endMacroRecording.labelString:	????????? Macro
! *XlwMenu.showMessageLog.labelString:	??????????????????
! ! Emacs*XlwMenu.executeLastMacro.labelString:	Execute Last Macro
! *XlwMenu.executeLastMacro.labelString:	???????????????
! ! Emacs*XlwMenu.jumpToBookmark.labelString:	Jump to bookmark
! *XlwMenu.jumpToBookmark.labelString:	????????????
! ! Emacs*XlwMenu.setBookmark.labelString:	Set bookmark
! *XlwMenu.setBookmark.labelString:	????????????
! ! Emacs*XlwMenu.insertContents.labelString:	Insert contents
! *XlwMenu.insertContents.labelString:	????????????
! ! Emacs*XlwMenu.insertLocation.labelString:	Insert location
! *XlwMenu.insertLocation.labelString:	????????????
! ! Emacs*XlwMenu.renameBookmark.labelString:	Rename bookmark
! *XlwMenu.renameBookmark.labelString:	????????????
! ! Emacs*XlwMenu.deleteBookmark.labelString:	Delete bookmark
! *XlwMenu.deleteBookmark.labelString:	??????
! ! Emacs*XlwMenu.editBookmarkList.labelString:	Edit Bookmark List
! *XlwMenu.editBookmarkList.labelString:	??????????????????
! ! Emacs*XlwMenu.saveBookmarks.labelString:	Save bookmarks
! *XlwMenu.saveBookmarks.labelString:	????????????
! ! Emacs*XlwMenu.saveBookmarksAs___.labelString:	Save bookmarks as...
! *XlwMenu.saveBookmarksAs___.labelString:	???????????????...
! ! Emacs*XlwMenu.loadABookmarkFile.labelString:	Load a bookmark file
! *XlwMenu.loadABookmarkFile.labelString:	???????????????
! 
! !! Apps menu
! 
! ! Emacs*XlwMenu.readMailVM___.labelString:	Read Mail (VM)...
! *XlwMenu.readMailVM___.labelString:	?????? (?????? VM)...
! ! Emacs*XlwMenu.readMailMH___.labelString:	Read Mail (MH)...
! *XlwMenu.readMailMH___.labelString:	?????? (?????? MH)...
! ! Emacs*XlwMenu.sendMail___.labelString:	Send mail...
! *XlwMenu.sendMail___.labelString:	??????...
! ! Emacs*XlwMenu.usenetNews.labelString:	Usenet News
! *XlwMenu.usenetNews.labelString:	Usenet News
! ! Emacs*XlwMenu.browseTheWeb.labelString:	Browse the Web
! *XlwMenu.browseTheWeb.labelString:	?????? WWW
! ! Emacs*XlwMenu.gopher.labelString:	Gopher
! *XlwMenu.gopher.labelString:	Gopher
! ! Emacs*XlwMenu.hyperbole___.labelString:	Hyperbole...
! *XlwMenu.hyperbole___.labelString:	Hyperbole...
! ! Emacs*XlwMenu.spellCheckBuffer.labelString:	Spell-Check Buffer
! *XlwMenu.spellCheckBuffer.labelString:	??????????????????
! ! Emacs*XlwMenu.emulateVI.labelString:	Emulate VI
! *XlwMenu.toggleVIEmulation.labelString:	?????? vi
! ! Emacs*XlwMenu.calendar.labelString:	Calendar
! *XlwMenu.calendar.labelString:	??????
! ! Emacs*XlwMenu.games.labelString:	Games
! *XlwMenu.games.labelString:	??????
! ! Emacs*XlwMenu.3MonthCalendar.labelString:	3-Month Calendar
! *XlwMenu.3MonthCalendar.labelString:	???????????????
! ! Emacs*XlwMenu.diary.labelString:	Diary
! *XlwMenu.diary.labelString:	??????
! ! Emacs*XlwMenu.holidays.labelString:	Holidays
! *XlwMenu.holidays.labelString:	??????
! ! Emacs*XlwMenu.phasesOfTheMoon.labelString:	Phases of the Moon
! *XlwMenu.phasesOfTheMoon.labelString:	??????
! ! Emacs*XlwMenu.sunriseSunset.labelString:	Sunrise/Sunset
! *XlwMenu.sunriseSunset.labelString:	??????/??????
! ! Emacs*XlwMenu.quoteFromZippy.labelString:	Quote from Zippy
! *XlwMenu.quoteFromZippy.labelString:	Zippy ?????????
! ! Emacs*XlwMenu.psychoanalyst.labelString:	Psychoanalyst
! *XlwMenu.psychoanalyst.labelString:	????????????
! *XlwMenu.mineGame.labelString:	?????????
! ! Emacs*XlwMenu.tetris.abelString:	Tetris
! *XlwMenu.tetris.labelString:	???????????????
! ! Emacs*XlwMenu.psychoanalyzeZippy.labelString:	Psychoanalyze Zippy!
! *XlwMenu.psychoanalyzeZippy.labelString:	???????????? Zippy!
! ! Emacs*XlwMenu.randomFlames.labelString:	Random Flames
! *XlwMenu.randomFlames.labelString:	???????????????
! ! Emacs*XlwMenu.dunnetAdventure.labelString:	Dunnet (Adventure)
! *XlwMenu.dunnetAdventure.labelString:	Dunnet (??????)
[...2178 lines suppressed...]
! Emacs*XlwScrollBar.ArrowPosition:  opposite


!
! If you want to turn off a toolbar, set its height or width to 0.
! The correct size value is not really arbitrary.  We only control it
! this way in order to avoid excess frame resizing when turning the
! toolbars on and off.
!
! To change the heights and widths of the toolbars:
!
! Emacs.topToolBarHeight:		37
! Emacs.bottomToolBarHeight:		0
! Emacs.leftToolBarWidth:		0
! Emacs.rightToolBarWidth:		0

*topToolBarShadowColor:		Gray90
*bottomToolBarShadowColor:		Gray40
*backgroundToolBarColor:		Gray75
*toolBarShadowThickness:		2


! If you want to turn off vertical scrollbars, or change the default
! pixel width of the vertical scrollbars, do it like this (0 width
! means no vertical scrollbars):
! 
! Emacs.scrollBarWidth: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarWidth: 0


! If you want to turn off horizontal scrollbars, or change the default
! pixel height of the horizontal scrollbars, do it like this (0 height
! means no horizontal scrollbars):
! 
! Emacs.scrollBarHeight: 0
! 
! To change it for a particular frame, do this:
! 
! Emacs*FRAME-NAME.scrollBarHeight: 0


! To dynamically change the labels used for menubar buttons...
! 
! Emacs*XlwMenu.resourceLabels: True
! Emacs*XlwMenu.newFrame.labelString: Open Another Window

! To have the Motif scrollbars on the left instead of the right, do this:
! 
! Emacs*scrollBarPlacement: BOTTOM_LEFT
!
! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead

! To have Motif scrollbars act more like Xt scrollbars...
!
! Emacs*XmScrollBar.translations: #override \n\
!     <Btn1Down>:     PageDownOrRight(0)    \n\
!     <Btn3Down>:     PageUpOrLeft(0)

! Fonts.
! ======
! XEmacs requires the use of XLFD (X Logical Font Description) format font
! names, which look like
! 
! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! 
! if you use any of the other, less strict font name formats, some of which
! look like
! 		lucidasanstypewriter-12
! and		fixed
! and		9x13
! 
! then XEmacs won't be able to guess the names of the bold and italic versions.
! All X fonts can be referred to via XLFD-style names, so you should use those
! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).


! The default font for the text area of XEmacs is chosen at run-time
! by lisp code which tries a number of different possibilities in order
! of preference.  If you wish to override it, use this:
! 
! Emacs.default.attributeFont:  -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*

! If you choose a font which does not have an italic version, you can specify
! some other font to use for it here:
! 
! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
!
! And here is how you would set the background color of the `highlight' face,
! but only on the screen named `debugger':
! 
! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
! 
! See the NEWS file (C-h n) for a more complete description of the resource
! syntax of faces.


! Font of the modeline, menubar and pop-up menus.
! Note that the menubar resources do not use the `face' syntax, since they
! are X toolkit widgets and thus outside the domain of XEmacs proper.
! 
!*menubar*Font: 		-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*
!*popup*Font:		-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*


! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
! know why you probably don't want to.)
! 
*XmDialogShell*FontList:	-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*
*XmTextField*FontList:	-*-courier-medium-r-*-*-*-160-*-*-*-*-iso8859-*
*XmText*FontList:		-*-courier-medium-r-*-*-*-160-*-*-*-*-iso8859-*
*XmList*FontList:		-*-courier-medium-r-*-*-*-160-*-*-*-*-iso8859-*

! Font in the Athena dialog boxes.
! I think 14-point looks nicer than 12-point.
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.

*Dialog*Font:		-*-helvetica-bold-r-*-*-*-160-*-*-*-*-iso8859-*

! Dialog box translations.
! =======================

! This accelerator binds <return> in a dialog box to <activate> on button1
*dialog*button1.accelerators:#override\
<KeyPress>Return: ArmAndActivate()\n\
<KeyPress>KP_Enter: ArmAndActivate()\n\
Ctrl<KeyPress>m: ArmAndActivate()\n

! Translations to make the TextField widget behave more like XEmacs
*XmTextField.translations: #override\n\
	!<Key>osfBackSpace:	delete-previous-character()\n\
	!<Key>osfDelete:	delete-previous-character()\n\
	!Ctrl<Key>h: 		delete-previous-character()\n\
	!Ctrl<Key>d: 		delete-next-character()\n\
	!Meta<Key>osfDelete:	delete-previous-word()\n\
	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
	!Meta<Key>d:		delete-next-word()\n\
	!Ctrl<Key>k:		delete-to-end-of-line()\n\
	!Ctrl<Key>g:		process-cancel()\n\
	!Ctrl<Key>b:		backward-character()\n\
	!<Key>osfLeft:		backward-character()\n\
	!Ctrl<Key>f:		forward-character()\n\
	!<Key>osfRight:		forward-character()\n\
	!Meta<Key>b:		backward-word()\n\
	!Meta<Key>osfLeft:	backward-word()\n\
	!Meta<Key>f:		forward-word()\n\
	!Meta<Key>osfRight:	forward-word()\n\
	!Ctrl<Key>e:		end-of-line()\n\
	!Ctrl<Key>a:		beginning-of-line()\n\
	!Ctrl<Key>w:		cut-clipboard()\n\
	!Meta<Key>w:		copy-clipboard()\n\
	<Btn2Up>:		copy-primary()\n

! With the XEmacs typeahead it's better to not have space be bound to
! ArmAndActivate() for buttons that appear in dialog boxes.  This is
! not 100% Motif compliant but the benefits far outweight the
! compliancy problem.  
*dialog*XmPushButton.translations:#override\n\
    <Btn1Down>:         Arm()\n\
    <Btn1Down>,<Btn1Up>: Activate()\
			Disarm()\n\
    <Btn1Down>(2+):     MultiArm()\n\
    <Btn1Up>(2+):       MultiActivate()\n\
    <Btn1Up>:           Activate()\
		        Disarm()\n\
    <Key>osfSelect:  	ArmAndActivate()\n\
    <Key>osfActivate:   ArmAndActivate()\n\
    <Key>osfHelp:	Help()\n\
    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
    <EnterWindow>:      Enter()\n\
    <LeaveWindow>:      Leave()\n

! XIM input method style 
! ======================= 

! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
! order of user's preference.  
! Choose a subset of the following styles or reorder to taste
*ximStyles: XIMPreeditPosition|XIMStatusArea\
            XIMPreeditPosition|XIMStatusNothing\
            XIMPreeditPosition|XIMStatusNone\
            XIMPreeditNothing|XIMStatusArea\
            XIMPreeditNothing|XIMStatusNothing\
            XIMPreeditNothing|XIMStatusNone\
            XIMPreeditNone|XIMStatusArea\
            XIMPreeditNone|XIMStatusNothing\
            XIMPreeditNone|XIMStatusNone

! XIM Preedit and Status foreground and background
*EmacsFrame.ximForeground: black
*EmacsFrame.ximBackground: white

! XIM fontset (defaults to system fontset default)
! Emacs*EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*

.geometry: 80x25

auctex-texjp-platex.patch:

--- NEW FILE auctex-texjp-platex.patch ---
diff -u xemacs-sumo-20050118/xemacs-packages/lisp/auctex/tex-jp.el.orig xemacs-sumo-20050118/xemacs-packages/lisp/auctex/tex-jp.el
--- xemacs-sumo-20050118/xemacs-packages/lisp/auctex/tex-jp.el.orig	2005-01-20 12:27:27.948972184 +0900
+++ xemacs-sumo-20050118/xemacs-packages/lisp/auctex/tex-jp.el	2005-01-20 12:27:27.954970759 +0900
@@ -115,7 +115,7 @@
   :type 'string)
   (make-variable-buffer-local 'japanese-TeX-command-default)
 
-(defcustom japanese-LaTeX-command-default "LaTeX"
+(defcustom japanese-LaTeX-command-default "pLaTeX"
   "*The default command for TeX-command in the japanese-LaTeX mode."
   :group 'AUCTeX-jp
   :type 'string)

auctex-texsite-jlatex-detect-69129.patch:

--- NEW FILE auctex-texsite-jlatex-detect-69129.patch ---
diff -u xemacs-packages/lisp/auctex/tex-site.el~ xemacs-packages/lisp/auctex/tex-site.el
--- xemacs-packages/lisp/auctex/tex-site.el~	2002-11-15 12:48:22.000000000 +0900
+++ xemacs-packages/lisp/auctex/tex-site.el	2002-11-15 12:48:22.000000000 +0900
@@ -78,6 +78,35 @@
   ;; Try to make life easy for MikTeX users.
   (require 'tex-mik))
 
+;; Where to find style files
+(defvar TeX-macro-global '("/usr/share/texmf/tex/")
+  "*The TeX installation directory, where to find site wide style files.")
+
+;; fix to assume jlatex only for the standard Japanese classes 
+(defvar TeX-format-list
+  '(("JLATEX" japanese-latex-mode
+     ;; "\\\\\\(documentstyle[^%\n]*{j\\|documentclass[^%\n]*{j\\)")
+     "\\\\document\\(style\\|class\\)[^%\n]*{\\(j\\|t\\)\\(article\\|book\\|report\\)")
+    ("JTEX" japanese-plain-tex-mode
+     "-- string likely in Japanese TeX --")
+    ("AMSTEX" ams-tex-mode
+     "\\\\document\\b")
+    ("LATEX" latex-mode 
+     "\\\\\\(begin\\|section\\|chapter\\|documentstyle\\|documentclass\\)\\b")
+    ("TEX" plain-tex-mode "."))
+  "*List of format packages to consider when choosing a TeX mode.
+
+A list with a entry for each format package available at the site.
+
+Each entry is a list with three elements.
+
+1. The name of the format package.
+2. The name of the major mode.
+3. A regexp typically matched in the beginning of the file.
+
+When entering tex-mode, each regexp is tried in turn in order to find
+when major mode to enter.")
+
 (provide 'tex-site)
 
 ;;; tex-site.el ends here

avoid-catch-error-65346.patch:

--- NEW FILE avoid-catch-error-65346.patch ---
diff -u xemacs-packages/lisp/edit-utils/avoid.el~ xemacs-packages/lisp/edit-utils/avoid.el
--- xemacs-packages/lisp/edit-utils/avoid.el~	2003-05-19 17:54:30.000000000 +0900
+++ xemacs-packages/lisp/edit-utils/avoid.el	2003-05-19 17:54:30.000000000 +0900
@@ -173,13 +173,15 @@
 (defun mouse-avoidance-too-close-p (mouse)
   ;;  Return t if mouse pointer and point cursor are too close.
   ;; Acceptable distance is defined by mouse-avoidance-threshold.
+ (condition-case nil
   (let ((point (mouse-avoidance-point-position)))
     (and (eq (car mouse) (car point))
 	 (car (cdr mouse))
 	 (< (abs (- (car (cdr mouse)) (car (cdr point))))
 	    mouse-avoidance-threshold)
 	 (< (abs (- (cdr (cdr mouse)) (cdr (cdr point))))
-	    mouse-avoidance-threshold))))
+	    mouse-avoidance-threshold)))
+  (error nil)))
 
 (defun mouse-avoidance-banish-destination ()
   "The position to which mouse-avoidance-mode `banish' moves the mouse.

browse-url-htmlview-84262.patch:

--- NEW FILE browse-url-htmlview-84262.patch ---
--- xemacs-packages/lisp/mail-lib/browse-url.el~	2003-02-20 22:35:23.000000000 +0900
+++ xemacs-packages/lisp/mail-lib/browse-url.el	2003-02-20 22:35:23.000000000 +0900
@@ -831,7 +831,7 @@
   :group 'browse-url)
 
 ;;;###autoload
-(defcustom browse-url-generic-program nil
+(defcustom browse-url-generic-program "htmlview"
   "*The name of the browser program used by `browse-url-generic'."
   :type '(choice string (const :tag "None" nil))
   :group 'browse-url)
@@ -880,12 +880,12 @@
 :type 'number
 :group 'browse-url)
 
-(defcustom browse-url-kde-program "kfmclient"
+(defcustom browse-url-kde-program "konqueror"
   "*The name by which to invoke the KDE web browser."
   :type 'string
   :group 'browse-url)
 
-(defcustom browse-url-kde-args '("openURL")
+(defcustom browse-url-kde-args nil
   "*A list of strings defining options for `browse-url-kde-program'."
   :type '(repeat (string :tag "Argument"))
   :group 'browse-url)
@@ -838,6 +838,7 @@
 and then W3."
   (apply
     (cond
+     (browse-url-generic-program 'browse-url-generic)
      ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz)
      ((executable-find browse-url-mozilla-program) 'browse-url-mozilla)
      ((executable-find browse-url-galeon-program) 'browse-url-galeon)

egg-wnn-host-unix-79826.patch:

--- NEW FILE egg-wnn-host-unix-79826.patch ---
--- mule-packages/lisp/egg-its/egg-wnn.el.orig	2002-12-17 14:32:07.000000000 +0900
+++ mule-packages/lisp/egg-its/egg-wnn.el	2002-12-17 14:32:39.000000000 +0900
@@ -699,7 +699,7 @@
   (let ((wnn-server-type 'jserver)) (close-wnn))
   (setq jserver-list
 	(make-host-list
-	 name (or jserver-list (list (or wnn-host-name (getenv "JSERVER") "localhost"))))))
+	 name (or jserver-list (list (or wnn-host-name (getenv "JSERVER") "unix"))))))
 
 (fset 'set-jserver-host-name (symbol-function 'set-wnn-host-name))
 
@@ -709,7 +709,7 @@
   (let ((wnn-server-type 'cserver)) (close-wnn))
   (setq cserver-list
 	(make-host-list
-	 name (or cserver-list (list (or cwnn-host-name (getenv "CSERVER") "localhost"))))))
+	 name (or cserver-list (list (or cwnn-host-name (getenv "CSERVER") "unix"))))))
 
 (fset 'set-cserver-host-name (symbol-function 'set-cwnn-host-name))
 
@@ -719,7 +719,7 @@
   (let ((wnn-server-type 'kserver)) (close-wnn))
   (setq kserver-list
 	(make-host-list
-	 name (or kserver-list (list (or kwnn-host-name (getenv "KSERVER") "localhost"))))))
+	 name (or kserver-list (list (or kwnn-host-name (getenv "KSERVER") "unix"))))))
 
 (fset 'set-kserver-host-name (symbol-function 'set-kwnn-host-name))
 
@@ -728,13 +728,13 @@
       (let ((hostlist
 	     (cond ((eq wnn-server-type 'jserver)
 		    (or jserver-list
-			(list (or wnn-host-name (getenv "JSERVER") "localhost"))))
+			(list (or wnn-host-name (getenv "JSERVER") "unix"))))
 		   ((eq wnn-server-type 'cserver)
 		    (or cserver-list
-			(list (or cwnn-host-name (getenv "CSERVER") "localhost"))))
+			(list (or cwnn-host-name (getenv "CSERVER") "unix"))))
 		   ((eq wnn-server-type 'kserver)
 		    (or kserver-list
-			(list (or kwnn-host-name (getenv "KSERVER") "localhost"))))))
+			(list (or kwnn-host-name (getenv "KSERVER") "unix"))))))
 	    (loginname (user-login-name)))
 	(catch 'succ
 	  (while hostlist

jde-ug-rel-links.patch:

--- NEW FILE jde-ug-rel-links.patch ---
diff -u -r1.4 jde-ug-content.html
--- xemacs-packages/etc/jde/doc/html/jde-ug/jde-ug-content.html.orig	2002/11/14 05:18:31	1.4
+++ xemacs-packages/etc/jde/doc/html/jde-ug/jde-ug-content.html	2003/04/24 06:31:05
@@ -70,54 +70,54 @@
       </p><div class="itemizedlist"><ul type="disc"><li><p> 
 
 
-	    <a href="../../../lisp/jde.el"><tt>jde.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde.el"><tt>jde.el</tt></a>. 
 	    Defines jde-mode, a major Emacs mode for developing Java code.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-run.el"><tt>jde-run.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-run.el"><tt>jde-run.el</tt></a>. 
 	    Runs Java applications and applets
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-db.el"><tt>jde-db.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-db.el"><tt>jde-db.el</tt></a>. 
 	    Interfaces Emacs to <b>jdb</b>, the command-line debugger that
 	    comes with the JDK.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-gen.el"><tt>jde-gen.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-gen.el"><tt>jde-gen.el</tt></a>. 
 	    Contains code generation templates.
 	  </p></li><li><p>
 	    <tt>bsh.jar</tt>. Compiled files for the
 	    <a href="http://www.beanshell.org/">BeanShell</a>,
 	    a Java source code interpreter developed by Pat Neimeyer.
 	  </p></li><li><p>
-	    <a href="../../../lisp/beanshell.el"><tt>beanshell.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/beanshell.el"><tt>beanshell.el</tt></a>. 
 	    Provides an Emacs interface to the BeanShell interpreter.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-wiz.el"><tt>jde-wiz.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-wiz.el"><tt>jde-wiz.el</tt></a>. 
 	    Provides "wizards" that generate skeleton
 	    implementations of interfaces and skeleton overrides of
 	    methods declared by superclasses.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-complete.el"><tt>jde-complete.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-complete.el"><tt>jde-complete.el</tt></a>. 
 	    Automatic field and method completion package.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-parse.el"><tt>jde-parse.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-parse.el"><tt>jde-parse.el</tt></a>. 
 	    Java parser package.</p></li><li><p>
-	    <a href="../../../lisp/java.bnf"><tt>java.bnf</tt></a>. 
+	    <a href="../../../../../lisp/jde/java.bnf"><tt>java.bnf</tt></a>. 
 	    Java grammar used to generate the JDE's lisp-based Java parser.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-bug.el"><tt>jde-bug.el
+	    <a href="../../../../../lisp/jde/jde-bug.el"><tt>jde-bug.el
 	      </tt></a>. 
 	    JDEbug user interface package.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-dbs.el"><tt>jde-dbs.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-dbs.el"><tt>jde-dbs.el</tt></a>. 
 	    JDEbug low-level command interface package.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jde-dbo.el"><tt>jde-dbo.el</tt></a>. 
+	    <a href="../../../../../lisp/jde/jde-dbo.el"><tt>jde-dbo.el</tt></a>. 
 	    JDEbug output processing functions.
 	  </p></li><li><p>
 	    source code, jar files, and documentation for the <a href="../../java/">Java components</a> of the
-	    JDE.</p></li><li><p><a href="../../../lisp/jtags"><tt>jtags</tt></a> 
+	    JDE.</p></li><li><p><a href="../../../../../lisp/jde/jtags"><tt>jtags</tt></a> 
 	    is a bash shell script that tags Java source hierarchies.
 	  </p></li><li><p>
-	    <a href="../../../lisp/jtags.csh"><tt>jtags.csh</tt></a> 
+	    <a href="../../../../../lisp/jde/jtags.csh"><tt>jtags.csh</tt></a> 
 	    is a c shell script that tags Java source heierarchies.
 	  </p></li></ul></div></div><div class="sect3"><div class="titlepage"><div><h4 class="title"><a name="d0e264"></a><a name="LatestVersion"></a>Latest Version</h4></div></div><p>See <a href="http://jdee.sunsite.dk/rootpage.html#Downloading">
 	  Downloading the JDE</a> on the JDE website for instructions on

jde-ug-section-links-89499.patch:

--- NEW FILE jde-ug-section-links-89499.patch ---
diff -u xemacs-packages/etc/jde/doc/html/jde-ug/jde-ug-toc.html~ xemacs-packages/etc/jde/doc/html/jde-ug/jde-ug-toc.html
--- xemacs-packages/etc/jde/doc/html/jde-ug/jde-ug-toc.html~	2003-04-25 16:54:27.000000000 +0900
+++ xemacs-packages/etc/jde/doc/html/jde-ug/jde-ug-toc.html	2003-04-25 16:54:27.000000000 +0900
@@ -20,67 +20,67 @@
          <table border="0" width="100%" cols="1">
             <tbody>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Introduction</a></td>
+                  <td><a href="jde-ug-content.html#Intro" target="content">Introduction</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Registering and Selecting a JDK</a></td>
+                  <td><a href="jde-ug-content.html#RegisterSelectJDK" target="content">Registering and Selecting a JDK</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Editing Java Source Files</a></td>
+                  <td><a href="jde-ug-content.html#EditingJavaSourceFiles" target="content">Editing Java Source Files</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Documenting Code</a></td>
+                  <td><a href="jde-ug-content.html#DocumentingCode" target="content">Documenting Code</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Abbreviations</a></td>
+                  <td><a href="jde-ug-content.html#Abbrevs" target="content">Abbreviations</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Completing Expressions</a></td>
+                  <td><a href="jde-ug-content.html#CodeCompletion" target="content">Completing Expressions</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Generating Code</a></td>
+                  <td><a href="jde-ug-content.html#GeneratingCode" target="content">Generating Code</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Checking Coding Style</a></td>
+                  <td><a href="jde-ug-content.html#CheckStyle" target="content">Checking Coding Style</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Compiling Java Programs</a></td>
+                  <td><a href="jde-ug-content.html#CompilingJavaPrograms" target="content">Compiling Java Programs</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Building Java Applications</a></td>
+                  <td><a href="jde-ug-content.html#BuildingJavaApplications" target="content">Building Java Applications</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Running Java
+                  <td><a href="jde-ug-content.html#RunningJavaApps" target="content">Running Java
                               Applications</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content"> Working with Applets</a></td>
+                  <td><a href="jde-ug-content.html#WorkingWithApplets" target="content"> Working with Applets</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Debugging Applications</a></td>
+                  <td><a href="jde-ug-content.html#DebuggingApplets" target="content">Debugging Applications</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Specifying
+                  <td><a href="jde-ug-content.html#SpecifyingClasspaths" target="content">Specifying
                               Classpaths</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Using Project Files</a></td>
+                  <td><a href="jde-ug-content.html#UsingProjectFiles" target="content">Using Project Files</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content"> Displaying Java Documentation</a></td>
+                  <td><a href="jde-ug-content.html#DisplayingDoc" target="content"> Displaying Java Documentation</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Browsing Source Code</a></td>
+                  <td><a href="jde-ug-content.html#BrowsingSourceCode" target="content">Browsing Source Code</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Searching Source Code</a></td>
+                  <td><a href="jde-ug-content.html#SearchSource" target="content">Searching Source Code</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content">Customizing the JDE</a></td>
+                  <td><a href="jde-ug-content.html#CustomizingJDE" target="content">Customizing the JDE</a></td>
                </tr>
                <tr>
-                  <td><a href="jde-ug-content.html#" target="content"> Customizing jde-mode</a></td>
+                  <td><a href="jde-ug-content.html#Customizingjde_mode" target="content"> Customizing jde-mode</a></td>
                </tr>
             </tbody>
          </table></applet></body>
-</html>
\ ?????????????????????????????????????????????
+</html>

mh-e-7.4.2-toolbar-100764.patch:

--- NEW FILE mh-e-7.4.2-toolbar-100764.patch ---
diff -u xemacs-packages/lisp/mh-e/mh-xemacs-icons.el~ xemacs-packages/lisp/mh-e/mh-xemacs-icons.el
--- xemacs-packages/lisp/mh-e/mh-xemacs-icons.el~	2003-10-18 09:37:49.000000000 +0900
+++ xemacs-packages/lisp/mh-e/mh-xemacs-icons.el	2003-10-18 09:37:49.000000000 +0900
@@ -42,6 +42,8 @@
 ;; Avoid compiler warning
 (eval-and-compile
   (require 'mh-utils)
+  ;; See http://list-archive.xemacs.org/xemacs-beta/200307/msg00138.html
+  (require 'toolbar)
   (defvar mh-xemacs-toolbar-folder-toolbar nil)
   (defvar mh-xemacs-toolbar-letter-toolbar nil))
 

psgml-browsers-84262.patch:

--- NEW FILE psgml-browsers-84262.patch ---
--- xemacs-packages/lisp/psgml/psgml-html.el~	2003-02-20 22:47:29.000000000 +0900
+++ xemacs-packages/lisp/psgml/psgml-html.el	2003-02-20 22:47:29.000000000 +0900
@@ -927,12 +927,12 @@
 
 (defvar sgml-html-menu
   (cons "HTML"
-	(append '(["View in Netscape" sgml-html-netscape-file
-		   (buffer-file-name
-		    (current-buffer))]
-		  ["View in W3" w3-preview-this-buffer t]
-		  ["View in kfm" sgml-html-kfm-file
+	(append '(["View in default browser" browse-url-of-buffer t]
+		  ["View in mozilla" sgml-html-netscape-file
+		   (buffer-file-name (current-buffer))]
+		  ["View in konqueror" sgml-html-kfm-file
 		   (buffer-file-name (current-buffer))]
+		  ["View in W3" w3-preview-this-buffer t]
 		  "---"
 		  ["HTML-Quote Region" html-quote-region t]
 		  "---")
@@ -941,13 +941,13 @@
 (defun sgml-html-netscape-file ()
   "Preview the file for the current buffer in Netscape."
   (interactive)
-  (highlight-headers-follow-url-netscape
+  (browse-url-mozilla
    (concat "file:" (buffer-file-name (current-buffer)))))
 
 (defun sgml-html-kfm-file ()
   "Preview the file for the current buffer in kfm."
   (interactive)
-  (highlight-headers-follow-url-kfm
+  (browse-url-kde
    (concat "file:" (buffer-file-name (current-buffer)))))
 
 ;;;###autoload(add-to-list 'auto-mode-alist '("\\.[sj]?html?\\'" . html-mode))


--- NEW FILE xemacs-sumo.spec ---
%define sumo_ver 2005-01-18

Summary: XEmacs Lisp packages
Name: xemacs-sumo
Version: %(echo %{sumo_ver} | tr -d -)
Release: 2
License: GPL
Group: Applications/Editors
Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2
Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo_ver}.tar.bz2 
Source10: Emacs.ad.ja_JP.eucJP
Source11: Emacs.ad.ko_KR.eucKR
Source12: Emacs.ad.zh_CN.GB2312
Source13: Emacs.ad.zh_TW.Big5
Source14: Emacs.ad.ja_JP.UTF-8
Source15: Emacs.ad.ko_KR.UTF-8
Source16: Emacs.ad.zh_CN.UTF-8
Source17: Emacs.ad.zh_TW.UTF-8
URL: http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball
Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: xemacs-nox perl /sbin/install-info
Requires: xemacs-common
Conflicts: xemacs < 21.4.12-12
BuildArch: noarch
Provides:  ruby-mode-xemacs
Obsoletes: ruby-mode-xemacs tm
# Provides/Obsoletes for upgradeability from the latest FC version, needed
# until (if?) there will be separate apel, mew, and ddskk packages for
# XEmacs again.  ddskk-xemacs is not provided because the
# version shipping here is the original skk, not ddskk.  It is obsoleted
# anyway to for the sake of smooth upgrades.
Provides: apel-xemacs = 10.2 mew-xemacs = 1.94.2
Obsoletes: apel-xemacs < 10.6-6 mew-xemacs < 4.1-2 ddskk-xemacs < 12.2.0-5
Patch6: auctex-texsite-jlatex-detect-69129.patch
Patch7: auctex-texjp-platex.patch
Patch8: egg-wnn-host-unix-79826.patch
Patch11: browse-url-htmlview-84262.patch
Patch12: psgml-browsers-84262.patch
Patch13: jde-ug-rel-links.patch
Patch14: jde-ug-section-links-89499.patch
Patch15: avoid-catch-error-65346.patch
Patch16: mh-e-7.4.2-toolbar-100764.patch

%description
XEmacs (like GNU Emacs) is a self-documenting, customizable,
extensible, real-time display editor. XEmacs is self-documenting
because at any time you can type control-h to find out what your
options are or find out what a command does. XEmacs is customizable
because you can change the definitions of XEmacs commands. XEmacs is
extensible because you can write entirely new commands-programs in the
Lisp language to be run by Emacs' own Lisp interpreter. XEmacs
includes a real-time display, which means that the text being edited
is visible on the screen and is updated very frequently (usually after
every character or pair of characters) as you type.

The XEmacs Sumo packages contain a large collection of useful
Lisp packages for XEmacs including mailreaders, programming modes
and utilities, and mule related packages.

%package el
Summary: The .el source files for the XEmacs Sumo packages.
Group: Applications/Editors
Requires: xemacs-sumo = %{version}
Conflicts: xemacs-el < 21.4.12-12

%description el
xemacs-sumo-el is not needed to run XEmacs. You only need to install it if
you are planning to incorporate some Lisp programming into your XEmacs
experience.

%package info
Summary: Information files for XEmacs.
Group: Applications/Editors
Conflicts: xemacs-info < 21.4.12-12

%description info
This package contains optional info files that are distributed
with the XEmacs Sumo packages.

%define pkgdir %{_datadir}/xemacs

%prep
%setup -q -c xemacs-sumo-%{version} -a1

# fix jlatex autodetection
%patch6 -p0
# use ptex rather jtex by default for Japanese
%patch7 -p1
# make egg-wnn use unix domain socket by default
%patch8 -p0
# default to htmlview as generic browse-url browser
%patch11 -p0
# update psgml-html preview menu to modern browsers
%patch12 -p0
# fix relative links to elisp in user-guide html doc
%patch13 -p0
# and section links in toc
%patch14 -p0
# catch harmless errors in mouse-avoidance-too-close-p (avoid.el)
%patch15 -p0
# fix toolbar specifier error
%patch16 -p0

# avoid spurious dependencies
chmod -x xemacs-packages/lisp/erc/*ChangeLog*


%build
%define _xemacs_batch xemacs-nox -batch -vanilla

# remove game we shouldn't ship
rm xemacs-packages/lisp/games/tetris.el*

%_xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/*
%_xemacs_batch -f batch-byte-recompile-directory xemacs-packages/lisp mule-packages/lisp


%install
rm -rf %buildroot

# install packages in buildroot
mkdir -p %buildroot%{pkgdir}
cp -rp xemacs-packages mule-packages %buildroot%{pkgdir}

( cd %buildroot%{pkgdir}/mule-packages/etc/app-defaults
  mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,zh_CN,zh_TW}.UTF-8 ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5
  iconv -f ISO-8859-1 -t UTF-8 de/Emacs > de_DE.UTF-8/Emacs
  iconv -f ISO-8859-1 -t UTF-8 fr/Emacs > fr_FR.UTF-8/Emacs
  iconv -f ISO-8859-16 -t UTF-8 ro/Emacs > ro_RO.UTF-8/Emacs
  mv de de_DE
  mv fr fr_FR
  mv ro ro_RO
  install -m 644 %SOURCE10 ja_JP.eucJP/Emacs
  install -m 644 %SOURCE11 ko_KR.eucKR/Emacs
  install -m 644 %SOURCE12 zh_CN.GB2312/Emacs
  install -m 644 %SOURCE13 zh_TW.Big5/Emacs
  install -m 644 %SOURCE14 ja_JP.UTF-8/Emacs
  install -m 644 %SOURCE15 ko_KR.UTF-8/Emacs
  install -m 644 %SOURCE16 zh_CN.UTF-8/Emacs
  install -m 644 %SOURCE17 zh_TW.UTF-8/Emacs
## don't seem to appear in manifest
#  ln -s ja_JP.eucJP ja_JP
#  ln -s ko_KR.eucKR ko_KR
#  ln -s zh_CN.GB2312 zh_CN
#  ln -s zh_TW.Big5 zh_TW
)

# so as not to require /usr/local/bin/perl[5]
( cd %buildroot%{pkgdir}/xemacs-packages
  perl -pi -e "s|/usr/local/bin/perl5|/usr/bin/perl|g; s|/usr/local/bin/perl|/usr/bin/perl|g;" \
	lisp/hyperbole/file-newer \
	etc/bbdb/*.pl
)

# the header of this file is weird... and confuses dependency checking
chmod 0644 %buildroot%{pkgdir}/xemacs-packages/lib-src/pstogif

# Make sure nothing is 0400
chmod -R a+rX  %buildroot/usr

# info docs: pre-generate "dir"s and compress files
for file in %buildroot%{pkgdir}/*-packages/info/*.info ; do
  /sbin/install-info $file `dirname $file`/dir
done
find %buildroot%{pkgdir} -type f -name '*.info*' | xargs -r gzip -9

# separate files
rm -f *.files base-files el-files info-files
echo "%defattr(-,root,root)" > base-files
echo "%defattr(-,root,root)" > el-files
echo "%defattr(-,root,root)" > info-files

find %buildroot%{pkgdir}/* \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \( -type d -name info -fprint info.files -prune \) -o \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o -fprint base-el-not-bytecomped.files \) \)

perl -pi -e "s|%buildroot||" *.files
cat base-*.files dir.files >> base-files
cat el-*.files dir.files >> el-files
cat info.files >> info-files


%clean
rm -rf %buildroot


%files -f base-files

%files el -f el-files

%files info -f info-files


%changelog
* Tue Mar  1 2005 Ville Skytt?? <scop at xemacs.org> - 20050118-2
- Revert back to bundled apel, mew and skk in the sumo.
- Drop xemacs-packages* Obsoletes.
- Build with xemacs-nox to fix chicken-egg bootstrap problem.
- Require xemacs-common.
- Remove pre-XEmacs-21.4 %%changelog entries.

* Wed Jan 19 2005 Jens Petersen <petersen at redhat.com> 20050118-1
- update to new sumos
  - update auctex-texjp-platex.patch
  - auctex-texsite-lisp-dir.patch no longer needed
  - auc-tex.info is now correctly auctex.info
- physically remove .el.orig patch backup files

* Tue Dec 14 2004 Jens Petersen <petersen at redhat.com>
- add auctex-texsite-lisp-dir.patch to initialise auctex TeX-lisp-directory
- exclude .orig backup files

* Wed Oct  6 2004 Jens Petersen <petersen at redhat.com> - 20040818-2
- rename auc-tex.info to auctex.info (Francis Tang, 134624)

* Wed Aug 18 2004 Jens Petersen <petersen at redhat.com> 20040818-1
- update to 2004-08-18 sumos
  - no longer need to replace xlib and xwem packages
  - cvs.el-history-log.patch is now upstream

* Mon Aug 16 2004 Ville Skytt?? <scop at xemacs.org> - 20040517-4
- replace xlib-autoload-startup-msg-125415.patch with xlib and xwem pre-release
  pkgs to really make them quiet at startup (125415,130019)
- pre-generate package info dir files and compress all the info files (130019)

* Mon Aug  9 2004 Jens Petersen <petersen at redhat.com> - 20040517-3
- default cvs-no-log-option to nil since cvs no longer accepts "-l" option
  with cvs.el-history-log.patch
- silence startup messages from xlib and xwem (125415) with
  xlib-autoload-startup-msg-125415.patch

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 20 2004 Jens Petersen <petersen at redhat.com> 20040517-1
- update to 2004-05-17 release

* Fri May  7 2004 Jens Petersen <petersen at redhat.com> - 20040202-4
- do not require xemacs, so that it is installable with xemacs-nox

* Thu Apr  1 2004 Jens Petersen <petersen at redhat.com> - 20040202-3
- remove executable flags from erc Changelog files [Ville Skytt??]

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Feb  4 2004 Jens Petersen <petersen at redhat.com> - 20040202-1
- update to 2004-02-02 sumos
- update browse-url-htmlview-84262.patch
- subtract 100 from all patch numbers

* Tue Nov 18 2003 Jens Petersen <petersen at redhat.com> - 20031113-1
- update to 2003-11-13 release

* Sat Oct 18 2003 Jens Petersen <petersen at redhat.com> - 20031003-3
- fix mh-e toolbar error (#100764) [reported by vonbrand at inf.utfsm.cl,
  fix by Stephen J. Turnbull]

* Fri Oct 17 2003 Jens Petersen <petersen at redhat.com> - 20031003-2
- generate X resource files in utf-8 for de, fr and ro (#107310) [frh at gmx.de]
- move our CJK X resource files here from xemacs with one file for
  native encoding and one for utf-8
- re-enable menubar translations for native CJK encodings (part of #106994)
  [Yukihiro Nakai]

* Mon Oct  6 2003 Jens Petersen <petersen at redhat.com> - 20031003-1
- update to 2003-10-03 release

* Mon Sep  1 2003 Jens Petersen <petersen at redhat.com> - 20030831-1
- update to 2003-08-31 release
- simplify /usr/local/bin/perl cleaning

* Tue Jul  1 2003 Jens Petersen <petersen at redhat.com> - 20030629-1
- update to 2003-06-29 release
- catch harmless mouse-avoidance-mode errors (#65346)
  [suggested by Reuben Thomas]

* Mon May 12 2003 Jens Petersen <petersen at redhat.com> - 20030414-1
- new package to separate xemacs-sumo and xemacs-mule-sumo from
  main xemacs package


* Sat May 10 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-11
- build with system malloc on ppc64

* Tue Apr 22 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-10
- obsoletes ruby-mode-xemacs (#84673)
- move obsoletes xemacs-sumo-el to -el subpackage
- fix links in jde html documentation (#89499)

* Tue Apr 15 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-8
- comment out ja and ko menubar translations in X resource files for now,
  to avoid startup hanging in utf-8 locale (#88860)
- use default menubar font in ja and ko locale
- in a UTF-8 locale set default coding systems to utf-8 (partly #77130
  and #74227)
- set Info-directory-list in site-start.el again
- move psgml setup into site-start.el
- move previous contents of "dotxemacs-init.el" to new "default.el"

* Mon Mar 31 2003 Akira TAGOH <tagoh at redhat.com> 21.4.12-7
- Rebuild against the latest Canna.

* Thu Feb 20 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-6
- default browse-url to use htmlview and update psgml-html browser
  defaults (#84262)

* Tue Feb 11 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-5
- build with system-malloc on alpha and ia64
- skip redundant check-features target

* Thu Feb  6 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-4
- fix "libexec dir" to be under lib64 on multilib archs
- set default ftp to be non-kerberos in site-start.el
- update sumos to 2003-02-05
- mspec patch and rpm-spec-mode update no longer needed
- buildrequire autoconf213
- add ".xemacs/init.el" to /etc/skel
- skip redundant check-features target on s390 and s390x

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Tue Jan 21 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-2
- fix `paths-emacs-root-p' (find-paths.el) to look in share not lib
- don't generate backup files when updating autoloads
- try startup notification in desktop file
- cleanup desktop file to use name XEmacs and add encoding key

* Fri Jan 17 2003 Jens Petersen <petersen at redhat.com> 21.4.12-1
- update to 21.4.12 bugfix release (21.4 series now declared stable branch)
- renumbered sumo package patches to be greater than 100
- install sumo packages by copying rather than moving
- patch sh-script.el to append m?spec entry to auto-mode-alist 
- avoid ppc.ldscript and build on ppc
- remove games that we shouldn't ship
- update to latest rcs2log
- update to latest rpm-spec-mode.el
- use _smp_mflags for lib-src and src
- run batch-update-directory and batch-byte-recompile-directory on sumo lisp
  dirs
- improve datadir/xemacs-version/ ownership

* Sat Jan  4 2003 Jens Petersen <petersen at redhat.com> 21.4.11-1
- update to 21.4.11
- don't configure with union-type, since it causes runtime problems apparently
- only do postun info dir deletions when uninstalling

* Wed Jan  1 2003 Jens Petersen <petersen at redhat.com> 21.4.10-6
- move apel to separate package and require it
- renamed psgml-init.el-xemacs to xemacs-psgml-init.el
- use datadir in site-start.el
- really include the movemail mkstemp patch
- use mapc to load site-start.d files

* Tue Dec 31 2002 Ville Skytt?? <scop at xemacs.org>
- New Sumos (2002-12-30).
- Use `construct-emacs-version-name' in `paths-emacs-root-p' (find-paths.el),
  fixing "Couldn't find obvious default for XEmacs hierarchy" warnings
  (as in XEmacs 21.5).
- Move site-start stuff to site-packages.
- Don't set Info-directory-list in site-start.el.
- Don't use --pkgdir, it's ignored.  Don't pass pkgdir to makeinstall.
- Fix source tarball URLs.
- Don't override the defcustom in psgml-init.el, set its default value instead.
- Add rpmbuild option: "--with debug" for building a debug-enabled XEmacs.

* Sun Dec 29 2002 Jens Petersen <petersen at redhat.com>
- updates package sumos to 2002-12-26 release

* Mon Dec 23 2002 Jens Petersen <petersen at redhat.com> 21.4.10-5
- patch find-paths.el to search in datadir
- setup lisp packages under datadir not libdir
- use buildroot macro instead of RPM_BUILD_ROOT
- drop local configure macro
- fix buildrequires and requires
- list configure options one-per-line
- improve psgml-init.el catalog setup
- remove and add lisp packages with package-admin
- rebyte-compile lisp packages
- keep etags as etags.xemacs (#78106)
- don't bother removing non-existent udp2tcp nor .cvsignore files
- simply filelist generation to a single find search pass
- put core .el files in -el package
- put package info files into -info package
- don't create backup files when patching in lisp packages tree
- don't explicitly gzip lisp package info files
- don't mark the applications files noreplace
- exclude ppc, since __init_array_start undefined

* Wed Dec 18 2002 Jens Petersen <petersen at redhat.com>
- patch egg-wnn to default to unix domain socket (#79826)
  [patch from ynakai at redhat.com]
- add ia64 patch from SuSE
- use mkstemp in movemail

* Tue Nov 19 2002 Jens Petersen <petersen at redhat.com>
- apply jlatex autodetect patch correctly and drop append to tex-site.el
- default to pTeX and pLaTeX for Japanese TeX and LaTeX

* Mon Nov 18 2002 Jens Petersen <petersen at redhat.com> 21.4.10-3
- backout uncommenting of deactivate-mark (#77696)
- update psgml dtd catalog path in psgml-init.el (#78022)
  [reported by ville.skytta at iki.fi]
- build with --use-union-type (#78024)
  [suggested by ville.skytta at iki.fi]

* Fri Nov 15 2002 Jens Petersen <petersen at redhat.com>
- fix autodetection of jlatex (#69129)

* Tue Nov 12 2002 Elliot Lee <sopwith at redhat.com> 21.4.10-2
- build on x86_64

* Mon Nov 11 2002 Jens Petersen <petersen at redhat.com> 21.4.10-1
- update to 21.4.10
- update sumos to 2002-09-19
- no longer backout mule-ucs package
- encode this file in utf-8
- xemacs-21.1.14-xfs.patch no longer needed
- use _libdir, _datadir, _bindir, _prefix
- exclude x86_64 (requires Canna)
- own /usr/lib/xemacs/{,mule-packages} and /usr/X11R6/lib/X11/<locale> (#73982)
  [reported by enrico.scholz at informatik.tu-chemnitz.de]
- fix default italic font size (#75275)
  [reported with fix by ville.skytta at iki.fi]
- update ja menubar translations in ja locale X resource file (#76068)
  [from ynakai at redhat.com]
- update ko locale X resource file (#76072) [from ynakai at redhat.com]
- add pkgdir rpm macro for packages dir
- uncomment deactivate-mark in simple.el (#77696)

* Mon Aug 26 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-16
- some cleanups - and remove the info tarball, it's now part 
  of the base tarball. Wow, the package gets smaller. (#72480)

* Mon Aug 19 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-15
- Bug in specfile from -14 gave bug on startup (#71743)

* Thu Aug 15 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-14
- Use utf-8 by default for input/output (#71584 )
- Make it not segfault when handling utf-8 (#71589)

* Wed Aug  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-13
- Add openmotif-devel to buildrequires, as it will use it for widgets 
  if it finds it

* Fri Aug  2 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-12
- Don't package po-mode separately, it's now in sumo
- Compile with drag'n'drop support
- Use the bundled rpm-spec-mode, it has some adaptions for XEmacs

* Wed Jul 31 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-11
- Don't use a separate ispell.el file anymore - the included one is newer
- Fix html-mode (#64826)

* Tue Jul 23 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-10
- Update lisp tarballs
- desktop file fixes (#69542)
- Add bdb support (#65640)

* Mon Jul  8 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-9
- Make it provide ruby-mode-xemacs (request from tagoh)

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Mon Jun 17 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-7
- #66835

* Wed May 29 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-6
- Make it build... Evil.
- Exclude IA64
- Upgrade sumo tarballs to 2002-05-22

* Fri May 24 2002 Jens Petersen <petersen at xemacs.org> 21.4.8-5
- Build using portable dumper, so that build with glibc-2.3 malloc is ok

* Mon May 13 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-2
- Remove the s390 patches so it builds on s390 :)

* Fri May 10 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-1
- 21.4.8

* Tue May  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-9
- Rebuild... chmod -x pstogif to work around an rpm bug until 
  it's fixed (#64320)

* Tue Apr 23 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-8
- New sumo packages

* Thu Feb 21 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-7
- Rebuild

* Tue Jan 29 2002 Jens Petersen <petersen at redhat.com> 21.4.6-6
- Remove skk package, since it conflicts with ddskk-xemacs (newer)

* Thu Jan 24 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-5
- New sumos

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Dec 19 2001 Jens Petersen <petersen at redhat.com> 21.4.6-3
- Fix fontlist pattern in Emacs.ad.Japanese.
- CHANGES-beta is now CHANGES-release.
- Obsolete xemacs-sumo xemacs-sumo-el

* Wed Dec 19 2001 Jens Petersen <petersen at redhat.com> 21.4.6-2
- Don't obsolete flim.

* Mon Dec 17 2001 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-1
- 21.4.6
- New sumo packages
- disable alpha

* Wed Nov 14 2001 Jens Petersen <petersen at redhat.com> 21.4.5-2
- Add -znocombreloc configure option to override new ld default.

* Tue Nov  6 2001 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.5-1
- 21.4.5. It builds on IA64 and fixes #55578


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Mar 2005 22:15:37 -0000	1.1
+++ .cvsignore	1 Mar 2005 22:31:04 -0000	1.2
@@ -0,0 +1,2 @@
+xemacs-mule-sumo-2005-01-18.tar.bz2
+xemacs-sumo-2005-01-18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Mar 2005 22:15:37 -0000	1.1
+++ sources	1 Mar 2005 22:31:04 -0000	1.2
@@ -0,0 +1,2 @@
+8c902131842ecaafeba6682ae956e554  xemacs-mule-sumo-2005-01-18.tar.bz2
+d30cbe9069121e035a42e73e4133ccee  xemacs-sumo-2005-01-18.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar  2 07:10:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:10:32 -0500
Subject: rpms/i810switch/RHL-9 i810switch.spec,1.1,1.2
Message-ID: <200503020710.j227AWAH032522@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/i810switch/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32509/RHL-9

Modified Files:
	i810switch.spec 
Log Message:
auto-import i810switch-0.6.2-0.fdr.3.rh90 on branch RHL-9 from i810switch-0.6.2-0.fdr.3.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/RHL-9/i810switch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- i810switch.spec	25 Jan 2005 16:49:20 -0000	1.1
+++ i810switch.spec	2 Mar 2005 07:10:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.2
-Release: 3
+Release: 0.fdr.3.rh90
 Epoch: 0
 Summary: A utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -40,7 +40,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Tue Jan 18 2005 David Kaplan <dmk at localhost.localdomain> - 0:0.6.2-3
+* Tue Jan 18 2005 David Kaplan <dmk at localhost.localdomain> - 0:0.6.2-0.fdr.3
 - Added back INSTALL file to rpm because it explains how to SUID root
   the executable so that all users can use i810switch.
 



From fedora-extras-commits at redhat.com  Wed Mar  2 07:10:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:10:32 -0500
Subject: rpms/i810switch import.log,1.2,1.3
Message-ID: <200503020710.j227AW7I032518@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/i810switch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32509

Modified Files:
	import.log 
Log Message:
auto-import i810switch-0.6.2-0.fdr.3.rh90 on branch RHL-9 from i810switch-0.6.2-0.fdr.3.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/i810switch/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	25 Jan 2005 16:49:20 -0000	1.2
+++ import.log	2 Mar 2005 07:10:30 -0000	1.3
@@ -1 +1,2 @@
 i810switch-0_6_2-3:HEAD:i810switch-0.6.2-3.src.rpm:1106671753
+i810switch-0_6_2-0_fdr_3_rh90:RHL-9:i810switch-0.6.2-0.fdr.3.rh90.src.rpm:1109747422



From fedora-extras-commits at redhat.com  Wed Mar  2 07:11:54 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:11:54 -0500
Subject: rpms/perl-Error import.log,1.2,1.3
Message-ID: <200503020711.j227BsPw032625@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Error
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32615

Modified Files:
	import.log 
Log Message:
auto-import perl-Error-0.15-0.fdr.1.rh90 on branch RHL-9 from perl-Error-0.15-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	21 Dec 2004 16:29:48 -0000	1.2
+++ import.log	2 Mar 2005 07:11:52 -0000	1.3
@@ -1 +1,2 @@
 perl-Error-0_15-0_fdr_1:HEAD:perl-Error-0.15-0.fdr.1.src.rpm:1103646600
+perl-Error-0_15-0_fdr_1_rh90:RHL-9:perl-Error-0.15-0.fdr.1.rh90.src.rpm:1109747504



From fedora-extras-commits at redhat.com  Wed Mar  2 07:11:54 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:11:54 -0500
Subject: rpms/perl-Error/RHL-9 perl-Error.spec,1.2,1.3
Message-ID: <200503020711.j227Bs4t032628@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Error/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32615/RHL-9

Modified Files:
	perl-Error.spec 
Log Message:
auto-import perl-Error-0.15-0.fdr.1.rh90 on branch RHL-9 from perl-Error-0.15-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/RHL-9/perl-Error.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Error.spec	21 Dec 2004 16:33:00 -0000	1.2
+++ perl-Error.spec	2 Mar 2005 07:11:52 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-Error
 Version:        0.15
-Release:        1
+Release:        0.fdr.1.rh90
 Epoch:          0
 Summary:        Error Perl module
 License:        GPL or Artistic
@@ -49,5 +49,5 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Jun 11 2004 Steven Pritchard <steve at kspei.com> 0:0.15-1
+* Fri Jun 11 2004 Steven Pritchard <steve at kspei.com> 0:0.15-0.fdr.1
 - Specfile autogenerated.



From fedora-extras-commits at redhat.com  Wed Mar  2 07:13:02 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:13:02 -0500
Subject: rpms/perl-FreezeThaw import.log,1.2,1.3
Message-ID: <200503020713.j227D2H5032749@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-FreezeThaw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32739

Modified Files:
	import.log 
Log Message:
auto-import perl-FreezeThaw-0.43-0.fdr.1.rh90 on branch RHL-9 from perl-FreezeThaw-0.43-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Dec 2004 17:41:54 -0000	1.2
+++ import.log	2 Mar 2005 07:13:00 -0000	1.3
@@ -1 +1,2 @@
 perl-FreezeThaw-0_43-0_fdr_1_2:HEAD:perl-FreezeThaw-0.43-0.fdr.1.2.src.rpm:1102527774
+perl-FreezeThaw-0_43-0_fdr_1_rh90:RHL-9:perl-FreezeThaw-0.43-0.fdr.1.rh90.src.rpm:1109747568



From fedora-extras-commits at redhat.com  Wed Mar  2 07:13:02 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:13:02 -0500
Subject: rpms/perl-FreezeThaw/RHL-9 perl-FreezeThaw.spec,1.2,1.3
Message-ID: <200503020713.j227D2YR032752@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-FreezeThaw/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32739/RHL-9

Modified Files:
	perl-FreezeThaw.spec 
Log Message:
auto-import perl-FreezeThaw-0.43-0.fdr.1.rh90 on branch RHL-9 from perl-FreezeThaw-0.43-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-FreezeThaw.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/RHL-9/perl-FreezeThaw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-FreezeThaw.spec	10 Dec 2004 22:03:08 -0000	1.2
+++ perl-FreezeThaw.spec	2 Mar 2005 07:13:00 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-FreezeThaw
 Version:        0.43
-Release:        1
+Release:        0.fdr.1.rh90
 Epoch:          0
 Summary:        Convert Perl structures to strings and back
 



From fedora-extras-commits at redhat.com  Wed Mar  2 07:14:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:14:31 -0500
Subject: rpms/perl-Gtk2 import.log,1.2,1.3
Message-ID: <200503020714.j227EVAx000402@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Gtk2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv392

Modified Files:
	import.log 
Log Message:
auto-import perl-Gtk2-1.061-0.fdr.2.rh90 on branch RHL-9 from perl-Gtk2-1.061-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Dec 2004 17:45:08 -0000	1.2
+++ import.log	2 Mar 2005 07:14:29 -0000	1.3
@@ -1 +1,2 @@
 perl-Gtk2-1_061-0_fdr_2_2:HEAD:perl-Gtk2-1.061-0.fdr.2.2.src.rpm:1102527968
+perl-Gtk2-1_061-0_fdr_2_rh90:RHL-9:perl-Gtk2-1.061-0.fdr.2.rh90.src.rpm:1109747662



From fedora-extras-commits at redhat.com  Wed Mar  2 07:14:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:14:31 -0500
Subject: rpms/perl-Gtk2/RHL-9 .cvsignore, 1.3, 1.4 perl-Gtk2.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200503020714.j227EVDS000405@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Gtk2/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv392/RHL-9

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
auto-import perl-Gtk2-1.061-0.fdr.2.rh90 on branch RHL-9 from perl-Gtk2-1.061-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/RHL-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2005 03:21:00 -0000	1.3
+++ .cvsignore	2 Mar 2005 07:14:29 -0000	1.4
@@ -1 +1 @@
-Gtk2-1.062.tar.gz
+Gtk2-1.061.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/RHL-9/perl-Gtk2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Gtk2.spec	15 Feb 2005 03:30:46 -0000	1.4
+++ perl-Gtk2.spec	2 Mar 2005 07:14:29 -0000	1.5
@@ -1,19 +1,19 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Gtk2
-Version:        1.062
-Release:        1
+Version:        1.061
+Release:        0.fdr.2.rh90
 Epoch:          0
 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.062.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.061.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.062
+BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.061
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -62,9 +62,6 @@
 
 
 %changelog
-* Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.062-1
-- Update to 1.062.
-
 * Mon Oct 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.061-0.fdr.2
 - Removed irrelevant or duplicated documentation files.
 - Description simplified (as suggested by Ville Skytt??).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/RHL-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 03:21:00 -0000	1.3
+++ sources	2 Mar 2005 07:14:29 -0000	1.4
@@ -1 +1 @@
-cbca72d71fa470157d139c2bf659c040  Gtk2-1.062.tar.gz
+f7a14ff2e86dc66c9a06539613b70576  Gtk2-1.061.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar  2 07:15:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:15:27 -0500
Subject: rpms/perl-HTML-Tree import.log,1.2,1.3
Message-ID: <200503020715.j227FRxq000513@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-HTML-Tree
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv504

Modified Files:
	import.log 
Log Message:
auto-import perl-HTML-Tree-3.18-0.fdr.2.rh90 on branch RHL-9 from perl-HTML-Tree-3.18-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	13 Feb 2005 19:36:38 -0000	1.2
+++ import.log	2 Mar 2005 07:15:25 -0000	1.3
@@ -1 +1,2 @@
 perl-HTML-Tree-3_18-2:HEAD:perl-HTML-Tree-3.18-2.src.rpm:1108323387
+perl-HTML-Tree-3_18-0_fdr_2_rh90:RHL-9:perl-HTML-Tree-3.18-0.fdr.2.rh90.src.rpm:1109747718



From fedora-extras-commits at redhat.com  Wed Mar  2 07:15:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:15:27 -0500
Subject: rpms/perl-HTML-Tree/RHL-9 perl-HTML-Tree.spec,1.1,1.2
Message-ID: <200503020715.j227FRfW000518@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-HTML-Tree/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv504/RHL-9

Modified Files:
	perl-HTML-Tree.spec 
Log Message:
auto-import perl-HTML-Tree-3.18-0.fdr.2.rh90 on branch RHL-9 from perl-HTML-Tree-3.18-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/RHL-9/perl-HTML-Tree.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Tree.spec	13 Feb 2005 19:36:38 -0000	1.1
+++ perl-HTML-Tree.spec	2 Mar 2005 07:15:25 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-HTML-Tree
 Version:        3.18
-Release:        2
+Release:        0.fdr.2.rh90
 Epoch:          0
 Summary:        HTML tree handling modules for Perl
 
@@ -58,7 +58,7 @@
 
 
 %changelog
-* Tue Jan  4 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-2
+* Tue Jan  4 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-0.fdr.2
 - Don't install htmltree into %%{_bindir} but include it in docs.
 
 * Sat Dec  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-0.fdr.1



From fedora-extras-commits at redhat.com  Wed Mar  2 07:16:28 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:16:28 -0500
Subject: rpms/perl-IO-Socket-SSL import.log,1.2,1.3
Message-ID: <200503020716.j227GS4P000631@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-IO-Socket-SSL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv622

Modified Files:
	import.log 
Log Message:
auto-import perl-IO-Socket-SSL-0.96-0.fdr.3.rh90 on branch RHL-9 from perl-IO-Socket-SSL-0.96-0.fdr.3.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	9 Jan 2005 11:59:30 -0000	1.2
+++ import.log	2 Mar 2005 07:16:26 -0000	1.3
@@ -1 +1,2 @@
 perl-IO-Socket-SSL-0_96-3:HEAD:perl-IO-Socket-SSL-0.96-3.src.rpm:1105271963
+perl-IO-Socket-SSL-0_96-0_fdr_3_rh90:RHL-9:perl-IO-Socket-SSL-0.96-0.fdr.3.rh90.src.rpm:1109747778



From fedora-extras-commits at redhat.com  Wed Mar  2 07:16:28 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:16:28 -0500
Subject: rpms/perl-IO-Socket-SSL/RHL-9 perl-IO-Socket-SSL.spec,1.1,1.2
Message-ID: <200503020716.j227GS6x000635@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-IO-Socket-SSL/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv622/RHL-9

Modified Files:
	perl-IO-Socket-SSL.spec 
Log Message:
auto-import perl-IO-Socket-SSL-0.96-0.fdr.3.rh90 on branch RHL-9 from perl-IO-Socket-SSL-0.96-0.fdr.3.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/RHL-9/perl-IO-Socket-SSL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-IO-Socket-SSL.spec	9 Jan 2005 11:59:30 -0000	1.1
+++ perl-IO-Socket-SSL.spec	2 Mar 2005 07:16:26 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-IO-Socket-SSL
 Version:        0.96
-Release:        3
+Release:        0.fdr.3.rh90
 Epoch:          0
 Summary:        Perl library for transparent SSL
 
@@ -62,7 +62,7 @@
 
 
 %changelog
-* Tue Oct 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-3
+* Tue Oct 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-0.fdr.3
 - Disable session test suite even if Net::SSLeay >= 1.26 is available.
 
 * Wed Jul  7 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-0.fdr.2



From fedora-extras-commits at redhat.com  Wed Mar  2 07:18:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:18:32 -0500
Subject: rpms/perl-MLDBM import.log,1.2,1.3
Message-ID: <200503020718.j227IWMK000783@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MLDBM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv772

Modified Files:
	import.log 
Log Message:
auto-import perl-MLDBM-2.01-0.fdr.1.rh90 on branch RHL-9 from perl-MLDBM-2.01-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	11 Dec 2004 16:03:28 -0000	1.2
+++ import.log	2 Mar 2005 07:18:30 -0000	1.3
@@ -1 +1,2 @@
 perl-MLDBM-2_01-0_fdr_1_2:HEAD:perl-MLDBM-2.01-0.fdr.1.2.src.rpm:1102781000
+perl-MLDBM-2_01-0_fdr_1_rh90:RHL-9:perl-MLDBM-2.01-0.fdr.1.rh90.src.rpm:1109747903



From fedora-extras-commits at redhat.com  Wed Mar  2 07:18:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:18:32 -0500
Subject: rpms/perl-MLDBM/RHL-9 perl-MLDBM.spec,1.2,1.3
Message-ID: <200503020718.j227IWlq000787@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MLDBM/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv772/RHL-9

Modified Files:
	perl-MLDBM.spec 
Log Message:
auto-import perl-MLDBM-2.01-0.fdr.1.rh90 on branch RHL-9 from perl-MLDBM-2.01-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-MLDBM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/RHL-9/perl-MLDBM.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-MLDBM.spec	28 Jan 2005 17:36:45 -0000	1.2
+++ perl-MLDBM.spec	2 Mar 2005 07:18:30 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-MLDBM
 Version:        2.01
-Release:        1
+Release:        0.fdr.1.rh90
 Epoch:          0
 Summary:        Store multi-level hash structure in single level tied hash
 



From fedora-extras-commits at redhat.com  Wed Mar  2 07:19:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:19:31 -0500
Subject: rpms/perl-Module-CoreList import.log,1.2,1.3
Message-ID: <200503020719.j227JVEH000896@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Module-CoreList
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv886

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-CoreList-1.98-0.fdr.2.rh90 on branch RHL-9 from perl-Module-CoreList-1.98-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	5 Jan 2005 19:33:24 -0000	1.2
+++ import.log	2 Mar 2005 07:19:29 -0000	1.3
@@ -1 +1,2 @@
 perl-Module-CoreList-1_98-2:HEAD:perl-Module-CoreList-1.98-2.src.rpm:1104953598
+perl-Module-CoreList-1_98-0_fdr_2_rh90:RHL-9:perl-Module-CoreList-1.98-0.fdr.2.rh90.src.rpm:1109747962



From fedora-extras-commits at redhat.com  Wed Mar  2 07:19:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:19:31 -0500
Subject: rpms/perl-Module-CoreList/RHL-9 perl-Module-CoreList.spec,1.1,1.2
Message-ID: <200503020719.j227JVGM000899@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Module-CoreList/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv886/RHL-9

Modified Files:
	perl-Module-CoreList.spec 
Log Message:
auto-import perl-Module-CoreList-1.98-0.fdr.2.rh90 on branch RHL-9 from perl-Module-CoreList-1.98-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-Module-CoreList.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/RHL-9/perl-Module-CoreList.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Module-CoreList.spec	5 Jan 2005 19:33:24 -0000	1.1
+++ perl-Module-CoreList.spec	2 Mar 2005 07:19:29 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Module-CoreList
 Version:        1.98
-Release:        2
+Release:        0.fdr.2.rh90
 Epoch:          0
 Summary:        Perl core modules indexed by perl versions
 
@@ -57,7 +57,7 @@
 
 
 %changelog
-* Tue Jan 04 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-2
+* Tue Jan 04 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-0.fdr.2
 - BuildRequires: perl(Module::Build) (#2362).
 
 * Mon Jan 03 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-0.fdr.1



From fedora-extras-commits at redhat.com  Wed Mar  2 07:20:29 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:20:29 -0500
Subject: rpms/perl-Net-SSLeay import.log,1.2,1.3
Message-ID: <200503020720.j227KTcI001009@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Net-SSLeay
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1000

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-SSLeay-1.26-0.fdr.2.rh90 on branch RHL-9 from perl-Net-SSLeay-1.26-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	20 Dec 2004 17:25:07 -0000	1.2
+++ import.log	2 Mar 2005 07:20:27 -0000	1.3
@@ -1 +1,2 @@
 perl-Net-SSLeay-1_26-1:HEAD:perl-Net-SSLeay-1.26-1.src.rpm:1103563499
+perl-Net-SSLeay-1_26-0_fdr_2_rh90:RHL-9:perl-Net-SSLeay-1.26-0.fdr.2.rh90.src.rpm:1109748019



From fedora-extras-commits at redhat.com  Wed Mar  2 07:20:29 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:20:29 -0500
Subject: rpms/perl-Net-SSLeay/RHL-9 perl-Net-SSLeay.spec,1.1,1.2
Message-ID: <200503020720.j227KTeV001013@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Net-SSLeay/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1000/RHL-9

Modified Files:
	perl-Net-SSLeay.spec 
Log Message:
auto-import perl-Net-SSLeay-1.26-0.fdr.2.rh90 on branch RHL-9 from perl-Net-SSLeay-1.26-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/RHL-9/perl-Net-SSLeay.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-SSLeay.spec	20 Dec 2004 17:25:07 -0000	1.1
+++ perl-Net-SSLeay.spec	2 Mar 2005 07:20:27 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Net-SSLeay
 Version:        1.26
-Release:        1
+Release:        0.fdr.2.rh90
 Epoch:          0
 Summary:        Perl extension for using OpenSSL
 
@@ -66,9 +66,6 @@
 
 
 %changelog
-* Mon Dec 20 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.26-1
-- Drop fedora.us release prefix and suffix.
-
 * Mon Oct 25 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.26-0.fdr.2
 - Convert manual page to UTF-8.
 



From fedora-extras-commits at redhat.com  Wed Mar  2 07:21:28 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:21:28 -0500
Subject: rpms/perl-Test-Pod-Coverage import.log,1.2,1.3
Message-ID: <200503020721.j227LSZv001131@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1122

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-Pod-Coverage-1.06-0.fdr.1.rh90 on branch RHL-9 from perl-Test-Pod-Coverage-1.06-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	13 Jan 2005 19:51:56 -0000	1.2
+++ import.log	2 Mar 2005 07:21:26 -0000	1.3
@@ -1 +1,2 @@
 perl-Test-Pod-Coverage-1_06-1:HEAD:perl-Test-Pod-Coverage-1.06-1.src.rpm:1105645910
+perl-Test-Pod-Coverage-1_06-0_fdr_1_rh90:RHL-9:perl-Test-Pod-Coverage-1.06-0.fdr.1.rh90.src.rpm:1109748079



From fedora-extras-commits at redhat.com  Wed Mar  2 07:21:28 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:21:28 -0500
Subject: rpms/perl-Test-Pod-Coverage/RHL-9 perl-Test-Pod-Coverage.spec, 1.1,
	1.2
Message-ID: <200503020721.j227LSnp001135@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1122/RHL-9

Modified Files:
	perl-Test-Pod-Coverage.spec 
Log Message:
auto-import perl-Test-Pod-Coverage-1.06-0.fdr.1.rh90 on branch RHL-9 from perl-Test-Pod-Coverage-1.06-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-Test-Pod-Coverage.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/RHL-9/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	2 Mar 2005 07:21:26 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Test-Pod-Coverage
 Version:        1.06
-Release:        1
+Release:        0.fdr.1.rh90
 Epoch:          0
 Summary:        Check for pod coverage in your distribution
 
@@ -55,7 +55,7 @@
 
 
 %changelog
-* Thu Jun 24 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.06-1
+* Thu Jun 24 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.06-0.fdr.1
 - Update to 1.06.
 
 * Wed Jun 02 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.04-0.fdr.1



From fedora-extras-commits at redhat.com  Wed Mar  2 07:22:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:22:26 -0500
Subject: rpms/perl-XML-RSS import.log,1.2,1.3
Message-ID: <200503020722.j227MQpO001247@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-RSS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1237

Modified Files:
	import.log 
Log Message:
auto-import perl-XML-RSS-1.05-0.fdr.1.rh90 on branch RHL-9 from perl-XML-RSS-1.05-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-RSS/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	1 Jan 2005 11:10:17 -0000	1.2
+++ import.log	2 Mar 2005 07:22:24 -0000	1.3
@@ -1 +1,2 @@
 perl-XML-RSS-1_05-1:HEAD:perl-XML-RSS-1.05-1.src.rpm:1104577827
+perl-XML-RSS-1_05-0_fdr_1_rh90:RHL-9:perl-XML-RSS-1.05-0.fdr.1.rh90.src.rpm:1109748137



From fedora-extras-commits at redhat.com  Wed Mar  2 07:22:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:22:26 -0500
Subject: rpms/perl-XML-RSS/RHL-9 perl-XML-RSS.spec,1.1,1.2
Message-ID: <200503020722.j227MQT3001252@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-RSS/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1237/RHL-9

Modified Files:
	perl-XML-RSS.spec 
Log Message:
auto-import perl-XML-RSS-1.05-0.fdr.1.rh90 on branch RHL-9 from perl-XML-RSS-1.05-0.fdr.1.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-XML-RSS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-RSS/RHL-9/perl-XML-RSS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-RSS.spec	1 Jan 2005 11:10:17 -0000	1.1
+++ perl-XML-RSS.spec	2 Mar 2005 07:22:24 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-XML-RSS
 Version:        1.05
-Release:        1
+Release:        0.fdr.1.rh90
 Epoch:          0
 Summary:        Perl module for managing RDF Site Summary (RSS) files
 



From fedora-extras-commits at redhat.com  Wed Mar  2 07:23:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:23:27 -0500
Subject: rpms/perl-XML-XPath import.log,1.2,1.3
Message-ID: <200503020723.j227NR5O001367@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-XPath
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1356

Modified Files:
	import.log 
Log Message:
auto-import perl-XML-XPath-1.13-0.fdr.2.rh90 on branch RHL-9 from perl-XML-XPath-1.13-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPath/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	10 Feb 2005 20:29:37 -0000	1.2
+++ import.log	2 Mar 2005 07:23:25 -0000	1.3
@@ -1 +1,2 @@
 perl-XML-XPath-1_13-2:HEAD:perl-XML-XPath-1.13-2.src.rpm:1108067370
+perl-XML-XPath-1_13-0_fdr_2_rh90:RHL-9:perl-XML-XPath-1.13-0.fdr.2.rh90.src.rpm:1109748197



From fedora-extras-commits at redhat.com  Wed Mar  2 07:23:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:23:27 -0500
Subject: rpms/perl-XML-XPath/RHL-9 perl-XML-XPath.spec,1.1,1.2
Message-ID: <200503020723.j227NR04001371@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-XPath/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1356/RHL-9

Modified Files:
	perl-XML-XPath.spec 
Log Message:
auto-import perl-XML-XPath-1.13-0.fdr.2.rh90 on branch RHL-9 from perl-XML-XPath-1.13-0.fdr.2.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: perl-XML-XPath.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPath/RHL-9/perl-XML-XPath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-XPath.spec	10 Feb 2005 20:29:37 -0000	1.1
+++ perl-XML-XPath.spec	2 Mar 2005 07:23:25 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-XML-XPath
 Version:        1.13
-Release:        2
+Release:        0.fdr.2.rh90
 Epoch:          0
 Summary:        XPath parser and evaluator for Perl
 
@@ -57,7 +57,7 @@
 
 
 %changelog
-* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-2
+* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-0.fdr.2
 - Bring up to date with current fedora.us Perl spec template.
 
 * Sun Oct 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-0.fdr.1



From fedora-extras-commits at redhat.com  Wed Mar  2 07:24:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:24:25 -0500
Subject: rpms/proj import.log,1.2,1.3
Message-ID: <200503020724.j227OPuo001517@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/proj
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1508

Modified Files:
	import.log 
Log Message:
auto-import proj-4.4.8-0.fdr.4.rh90 on branch RHL-9 from proj-4.4.8-0.fdr.4.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/proj/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	14 Jan 2005 09:45:21 -0000	1.2
+++ import.log	2 Mar 2005 07:24:23 -0000	1.3
@@ -1 +1,2 @@
 proj-4_4_8-4:HEAD:proj-4.4.8-4.src.rpm:1105695966
+proj-4_4_8-0_fdr_4_rh90:RHL-9:proj-4.4.8-0.fdr.4.rh90.src.rpm:1109748255



From fedora-extras-commits at redhat.com  Wed Mar  2 07:24:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:24:25 -0500
Subject: rpms/proj/RHL-9 proj.spec,1.1,1.2
Message-ID: <200503020724.j227OPN9001521@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/proj/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1508/RHL-9

Modified Files:
	proj.spec 
Log Message:
auto-import proj-4.4.8-0.fdr.4.rh90 on branch RHL-9 from proj-4.4.8-0.fdr.4.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: proj.spec
===================================================================
RCS file: /cvs/extras/rpms/proj/RHL-9/proj.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proj.spec	14 Jan 2005 09:45:21 -0000	1.1
+++ proj.spec	2 Mar 2005 07:24:23 -0000	1.2
@@ -1,6 +1,10 @@
-Name: proj
-Version: 4.4.8
-Release: 4
+%define name proj
+%define version 4.4.8
+%define release 0.fdr.4
+
+Name: %name
+Version: %version
+Release: %release.rh90
 Epoch: 0
 Summary: Cartographic projection software (PROJ.4)
 
@@ -89,13 +93,13 @@
 %{_datadir}/%{name}
 
 %changelog
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-4
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.4
 - Added testvarious to nad distribution
 
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-0.fdr.3
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.3
 - Added patch for test scripts so that they will work in installed rpm
 
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-0.fdr.2
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.2
 - Fixed permissions on nad27 and nad83
 - Included test27 and test83 in the nad rpm and made them executable
 



From fedora-extras-commits at redhat.com  Wed Mar  2 07:26:05 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:26:05 -0500
Subject: rpms/shapelib/RHL-9 shapelib-1.2.10.patch, 1.2, 1.3 shapelib.spec,
	1.2, 1.3 shapelib-1.2.10-endian.patch, 1.1, NONE
Message-ID: <200503020726.j227Q5SZ001701@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/shapelib/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1681/RHL-9

Modified Files:
	shapelib-1.2.10.patch shapelib.spec 
Removed Files:
	shapelib-1.2.10-endian.patch 
Log Message:
auto-import shapelib-1.2.10-0.fdr.5.rh90 on branch RHL-9 from shapelib-1.2.10-0.fdr.5.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.

shapelib-1.2.10.patch:

Index: shapelib-1.2.10.patch
===================================================================
RCS file: /cvs/extras/rpms/shapelib/RHL-9/shapelib-1.2.10.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib-1.2.10.patch	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib-1.2.10.patch	2 Mar 2005 07:25:43 -0000	1.3
@@ -91,8 +91,7 @@
  
  # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN
 +CC = gcc
--ENDIAN	=	-D_LITTLE_ENDIAN
-+#ENDIAN	=	-D_LITTLE_ENDIAN
+ ENDIAN	=	-D_LITTLE_ENDIAN
  
 -CFLAGS	=	-g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
 +EXTRACFLAGS   =      -g


Index: shapelib.spec
===================================================================
RCS file: /cvs/extras/rpms/shapelib/RHL-9/shapelib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib.spec	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib.spec	2 Mar 2005 07:25:43 -0000	1.3
@@ -2,12 +2,11 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.2.10
-Release: 6
+Release: 0.fdr.5.rh90
 Epoch: 0
 URL: http://shapelib.maptools.org/
 Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz
 Patch0: shapelib-%{version}.patch
-Patch1: shapelib-1.2.10-endian.patch
 License: LGPL/MIT
 Group: Development/Libraries
 Buildrequires: libtool
@@ -31,7 +30,6 @@
 %prep
 %setup -q -T -b 0
 %patch -p1 -b .buildroot 
-%patch1 -p1 -b .endian
 
 %build
 make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" lib
@@ -72,10 +70,7 @@
 %exclude %{_libdir}/libshp.la
 
 %changelog
-* Sun Feb 13 2005 David Woodhouse <dwmw2 at infradead.org> 0:1.2.10-6
-- Don't hard-code endianness; just use endian.h
-
-* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:1.2.10-5
+* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:1.2.10-0.fdr.5
 - Patched patch and spec file according to suggestions of Michael Schwendt
 - In particular, this separates the building from the installing in the rpm.
 


--- shapelib-1.2.10-endian.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar  2 07:26:05 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:26:05 -0500
Subject: rpms/shapelib import.log,1.2,1.3
Message-ID: <200503020726.j227Q5ur001697@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/shapelib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1681

Modified Files:
	import.log 
Log Message:
auto-import shapelib-1.2.10-0.fdr.5.rh90 on branch RHL-9 from shapelib-1.2.10-0.fdr.5.rh90.src.rpm
Bring in stuff from fedora.us RH9/stable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/shapelib/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	14 Jan 2005 09:47:27 -0000	1.2
+++ import.log	2 Mar 2005 07:25:43 -0000	1.3
@@ -1 +1,2 @@
 shapelib-1_2_10-5:HEAD:shapelib-1.2.10-5.src.rpm:1105696087
+shapelib-1_2_10-0_fdr_5_rh90:RHL-9:shapelib-1.2.10-0.fdr.5.rh90.src.rpm:1109748327



From fedora-extras-commits at redhat.com  Wed Mar  2 07:28:08 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:28:08 -0500
Subject: rpms/qtparted import.log,1.3,1.4
Message-ID: <200503020728.j227S8Rh001881@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/qtparted
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1872

Modified Files:
	import.log 
Log Message:
auto-import qtparted-0.4.4-0.fdr.1.2 on branch FC-2 from qtparted-0.4.4-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/unstable.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qtparted/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 05:17:37 -0000	1.3
+++ import.log	2 Mar 2005 07:28:06 -0000	1.4
@@ -1,2 +1,3 @@
 qtparted-0_3_2-0_fdr_5_rh90:HEAD:qtparted-0.3.2-0.fdr.5.rh90.src.rpm:1099891051
 qtparted-0_3_2-0_fdr_5_1:HEAD:qtparted-0.3.2-0.fdr.5.1.src.rpm:1099891057
+qtparted-0_4_4-0_fdr_1_2:FC-2:qtparted-0.4.4-0.fdr.1.2.src.rpm:1109748478



From fedora-extras-commits at redhat.com  Wed Mar  2 07:28:08 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 2 Mar 2005 02:28:08 -0500
Subject: rpms/qtparted/FC-2 qtparted.spec,1.4,1.5
Message-ID: <200503020728.j227S8Vo001885@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/qtparted/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1872/FC-2

Modified Files:
	qtparted.spec 
Log Message:
auto-import qtparted-0.4.4-0.fdr.1.2 on branch FC-2 from qtparted-0.4.4-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/unstable.


Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/FC-2/qtparted.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qtparted.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ qtparted.spec	2 Mar 2005 07:28:06 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.4
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 



From fedora-extras-commits at redhat.com  Wed Mar  2 08:47:15 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 03:47:15 -0500
Subject: rpms/grip - New directory
Message-ID: <200503020847.j228lFsj003255@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3248/grip

Log Message:
Directory /cvs/extras/rpms/grip added to the repository




From fedora-extras-commits at redhat.com  Wed Mar  2 08:47:15 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 03:47:15 -0500
Subject: rpms/grip/devel - New directory
Message-ID: <200503020847.j228lFIl003258@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3248/grip/devel

Log Message:
Directory /cvs/extras/rpms/grip/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar  2 08:47:35 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 03:47:35 -0500
Subject: rpms/grip Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503020847.j228lZdK003319@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3308

Added Files:
	Makefile import.log 
Log Message:
Setup of module grip


--- NEW FILE Makefile ---
# Top level Makefile for module grip
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  2 08:47:35 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 03:47:35 -0500
Subject: rpms/grip/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503020847.j228lZJJ003322@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3308/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module grip


--- 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 Mar  2 08:48:42 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 03:48:42 -0500
Subject: rpms/grip import.log,1.1,1.2
Message-ID: <200503020848.j228mg7r003462@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3453

Modified Files:
	import.log 
Log Message:
auto-import grip-3.2.0-3 on branch devel from grip-3.2.0-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/grip/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Mar 2005 08:47:33 -0000	1.1
+++ import.log	2 Mar 2005 08:48:40 -0000	1.2
@@ -0,0 +1 @@
+grip-3_2_0-3:HEAD:grip-3.2.0-3.src.rpm:1109753311



From fedora-extras-commits at redhat.com  Wed Mar  2 08:48:42 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 03:48:42 -0500
Subject: rpms/grip/devel grip-3.0.7-cdparanoia.patch, NONE,
	1.1 grip-3.0.7-locking.patch, NONE,
	1.1 grip-3.2.0-default.patch, NONE, 1.1 grip-3.2.0-rh1.patch,
	NONE, 1.1 grip.desktop, NONE, 1.1 grip.spec, NONE,
	1.1 gripicon.png, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503020848.j228mgNV003466@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3453/devel

Modified Files:
	.cvsignore sources 
Added Files:
	grip-3.0.7-cdparanoia.patch grip-3.0.7-locking.patch 
	grip-3.2.0-default.patch grip-3.2.0-rh1.patch grip.desktop 
	grip.spec gripicon.png 
Log Message:
auto-import grip-3.2.0-3 on branch devel from grip-3.2.0-3.src.rpm

grip-3.0.7-cdparanoia.patch:

--- NEW FILE grip-3.0.7-cdparanoia.patch ---
diff -ru grip-3.0.7/config.h.in grip-3.0.7-fixed/config.h.in
--- grip-3.0.7/config.h.in	2003-01-04 14:04:06.000000000 -0500
+++ grip-3.0.7-fixed/config.h.in	2003-08-18 20:33:19.000000000 -0400
@@ -38,10 +38,10 @@
 #undef HAVE_ARGZ_H
 
 /* Define to 1 if you have the <cdda_interface.h> header file. */
-#undef HAVE_CDDA_INTERFACE_H
+#undef HAVE_CDDA_CDDA_INTERFACE_H
 
 /* Define to 1 if you have the <cdda_paranoia.h> header file. */
-#undef HAVE_CDDA_PARANOIA_H
+#undef HAVE_CDDA_CDDA_PARANOIA_H
 
 /* Define to 1 if you have the `dcgettext' function. */
 #undef HAVE_DCGETTEXT
diff -ru grip-3.0.7/configure.in grip-3.0.7-fixed/configure.in
--- grip-3.0.7/configure.in	2003-04-22 22:33:27.000000000 -0400
+++ grip-3.0.7-fixed/configure.in	2003-08-18 20:26:30.000000000 -0400
@@ -52,7 +52,7 @@
 if test "$enable_cdpar" = "yes"; then
   LIBS="$LIBS -lm"
 
-  AC_CHECK_HEADERS(cdda_interface.h cdda_paranoia.h)
+  AC_CHECK_HEADERS(cdda/cdda_interface.h cdda/cdda_paranoia.h)
   AC_CHECK_LIB(cdda_interface,main,
     if test "$enable_shared_cdpar" = "yes"; then
       echo "using shared cdparanoia libraries"
diff -ru grip-3.0.7/src/cdpar.c grip-3.0.7-fixed/src/cdpar.c
--- grip-3.0.7/src/cdpar.c	2003-01-04 14:04:08.000000000 -0500
+++ grip-3.0.7-fixed/src/cdpar.c	2003-08-18 20:34:33.000000000 -0400
@@ -25,7 +25,7 @@
 
 #include "grip.h"
 
-#ifdef HAVE_CDDA_INTERFACE_H
+#ifdef HAVE_CDDA_CDDA_INTERFACE_H
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -44,8 +44,8 @@
 #define size16 short
 #define size32 int
 
-#include <cdda_interface.h>
-#include <cdda_paranoia.h>
+#include <cdda/cdda_interface.h>
+#include <cdda/cdda_paranoia.h>
 
 static void PutNum(long num,int f,int endianness,int bytes);
 static void WriteWav(int f,long bytes);
diff -ru grip-3.0.7/src/grip.h grip-3.0.7-fixed/src/grip.h
--- grip-3.0.7/src/grip.h	2003-01-04 14:04:08.000000000 -0500
+++ grip-3.0.7-fixed/src/grip.h	2003-08-18 20:33:39.000000000 -0400
@@ -31,7 +31,7 @@
 #include "pthread.h"
 #include "launch.h"
 
-#ifdef HAVE_CDDA_INTERFACE_H
+#ifdef HAVE_CDDA_CDDA_INTERFACE_H
 #define CDPAR
 #endif
 
diff -ru grip-3.0.7/src/rip.c grip-3.0.7-fixed/src/rip.c
--- grip-3.0.7/src/rip.c	2003-01-11 18:00:00.000000000 -0500
+++ grip-3.0.7-fixed/src/rip.c	2003-08-18 20:43:11.000000000 -0400
@@ -50,8 +50,8 @@
 #include "gain_analysis.h"
 #define size32 gint32
 #define size16 gint16
-#include <cdda_interface.h>
-#include <cdda_paranoia.h>
+#include <cdda/cdda_interface.h>
+#include <cdda/cdda_paranoia.h>
 extern int rip_smile_level;
 #endif
 

grip-3.0.7-locking.patch:

--- NEW FILE grip-3.0.7-locking.patch ---
diff -ru grip-3.0.7/src/rip.c grip-3.0.7-fixed/src/rip.c
--- grip-3.0.7/src/rip.c	2003-01-11 18:00:00.000000000 -0500
+++ grip-3.0.7-fixed/src/rip.c	2003-08-18 20:43:11.000000000 -0400
@@ -1220,6 +1220,10 @@
 
   CDStop(&(ginfo->disc));
   ginfo->stopped=TRUE;
+  
+  /* Close the device so locking works sanely */
+  close(ginfo->disc.cd_desc);
+  ginfo->disc.cd_desc = -1;
     
   if(ginfo->ripping) {
     ginfo->doencode=FALSE;

grip-3.2.0-default.patch:

--- NEW FILE grip-3.2.0-default.patch ---
--- grip-3.2.0/src/gripcfg.c.rh-default-encoder	2004-04-15 20:20:15.000000000 +0200
+++ grip-3.2.0/src/gripcfg.c	2004-06-20 01:54:41.052531992 +0200
@@ -47,16 +47,16 @@
   {"",""}
 };
 
-static MP3Encoder encoder_defaults[]={{"bladeenc","-%b -QUIT %w %m","mp3"},
+static MP3Encoder encoder_defaults[]={{"oggenc",
+				       "-o %m -a %a -l %d -t %n -b %b %w -N %t -G %g -d %y",
+				       "ogg"},
+                                      {"bladeenc","-%b -QUIT %w %m"},
 				      {"lame","-h -b %b %w %m","mp3"},
 				      {"l3enc","-br %b %w %m","mp3"},
 				      {"xingmp3enc","-B %b -Q %w","mp3"},
 				      {"mp3encode","-p 2 -l 3 -b %b %w %m",
 				       "mp3"},
 				      {"gogo","-b %b %w %m","mp3"},
-				      {"oggenc",
-				       "-o %m -a %a -l %d -t %n -b %b %w -N %t -G %g -d %y",
-				       "ogg"},
 				      {"flac","-V -o %m %w","flac"},
 				      {"other","",""},
 				      {"",""}
--- grip-3.2.0/src/grip.c.rh-default-encoder	2004-04-15 20:23:54.000000000 +0200
+++ grip-3.2.0/src/grip.c	2004-06-20 01:51:47.994840760 +0200
@@ -832,7 +832,7 @@
   ginfo->using_builtin_cdp=FALSE;
 #endif
   ginfo->in_rip_thread=FALSE;
-  strcpy(ginfo->ripfileformat,"~/mp3/%A/%d/%n.wav");
+  strcpy(ginfo->ripfileformat,"~/ogg/%A/%d/%n.wav");
 #ifdef __linux__
   FindExeInPath("cdparanoia", ginfo->ripexename, sizeof(ginfo->ripexename));
   strcpy(ginfo->ripcmdline,"-d %c %t:[.%s]-%t:[.%e] %w");
@@ -856,9 +856,9 @@
   *ginfo->wav_filter_cmd='\0';
   *ginfo->disc_filter_cmd='\0';
   ginfo->selected_encoder=1;
-  strcpy(ginfo->mp3cmdline,"-h -b %b %w %m");
-  FindExeInPath("lame", ginfo->mp3exename, sizeof(ginfo->mp3exename));
-  strcpy(ginfo->mp3fileformat,"~/mp3/%A/%d/%n.%x");
+  strcpy(ginfo->mp3cmdline,"-o %m -a %a -l %d -t %n -N %t -G %G -d %y -q 4 %w");
+  FindExeInPath("oggenc", ginfo->mp3exename, sizeof(ginfo->mp3exename));
+  strcpy(ginfo->mp3fileformat,"~/ogg/%A/%d/%n.ogg");
   strcpy(ginfo->mp3extension,"mp3");
   ginfo->mp3nice=0;
   *ginfo->mp3_filter_cmd='\0';
@@ -866,7 +866,7 @@
   ginfo->add_to_db=FALSE;
   ginfo->add_m3u=TRUE;
   ginfo->rel_m3u=TRUE;
-  strcpy(ginfo->m3ufileformat,"~/mp3/%A-%d.m3u");
+  strcpy(ginfo->m3ufileformat,"~/ogg/%A-%d.m3u");
   ginfo->kbits_per_sec=128;
   ginfo->edit_num_cpu=1;
   ginfo->doid3=TRUE;

grip-3.2.0-rh1.patch:

--- NEW FILE grip-3.2.0-rh1.patch ---
--- grip-3.2.0/Makefile.in.rh1	2004-06-20 02:21:06.831456952 +0200
+++ grip-3.2.0/Makefile.in	2004-06-20 02:22:40.643195400 +0200
@@ -113,7 +113,7 @@
 	grip.spec.in
 
 
-Applicationsdir = $(datadir)/applications
+Applicationsdir = $(datadir)/gnome/apps/Multimedia
 Applications_DATA = grip.desktop
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4


--- NEW FILE grip.desktop ---
[Desktop Entry]
Name=Grip
Name[ca]=Grip
Name[es]=Grip
Comment=CD player/ripper
Comment[ca]=Reproductor/extractor de CD d'audio
Comment[es]=Reproductor/extractor de CDs de audio
Comment[fr]=Lecteur/extracteur de CD audio
Exec=grip
Icon=gripicon.png
Type=Application


--- NEW FILE grip.spec ---
Summary: A front-end for CD rippers and Ogg Vorbis encoders.
Name: grip
Version: 3.2.0
Release: 3
Serial: 1
Copyright: GPL
Group: Applications/Multimedia
Source: http://www.nostatic/grip/%{name}-%{version}.tar.gz
Source1: gripicon.png
Source2: grip.desktop
Patch1: grip-3.2.0-default.patch
Patch2: grip-3.0.7-cdparanoia.patch
Patch3: grip-3.0.7-locking.patch
Patch4: grip-3.2.0-rh1.patch
URL: http://www.nostatic.org/grip
Buildroot: %{_tmppath}/%{name}-root
Requires: vorbis-tools
BuildPrereq: vte-devel cdparanoia-devel autoconf >= 2.52
BuildPrereq: libgnomeui-devel, curl-devel, desktop-file-utils
ExcludeArch: s390 s390x

%description
Grip is a GTK+ based front-end for CD rippers (such as cdparanoia and
cdda2wav) and Ogg Vorbis encoders.  Grip allows you to rip entire tracks or
just a section of a track.  Grip supports the CDDB protocol for
accessing track information on disc database servers.

%prep
%setup -q
%patch1 -p1 -b .rh-default-encoder
#%patch2 -p1 -b .cdparanoia
#%patch3 -p1 -b .locking
%patch4 -p1 -b .rh1


%build
autoconf
%configure
make

%install
rm -rf %{buildroot}
cp -f %{SOURCE2} .

make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT install-am

install $RPM_SOURCE_DIR/gripicon.png %{buildroot}%{_datadir}/pixmaps

desktop-file-install \
	--vendor=net \
	--dir $RPM_BUILD_ROOT/%{_datadir}/applications \
	--delete-original \
	--add-category X-Red-Hat-Extra \
	--add-category Application \
	--add-category AudioVideo \
	%{buildroot}%{_datadir}/gnome/apps/Multimedia/grip.desktop
cat >> %{buildroot}%{_datadir}/applications/net-grip.desktop << EOF
StartupWMClass=Grip
EOF
%find_lang %{name}-2.2

%clean
rm -rf %{buildroot}


%files -f %{name}-2.2.lang
%defattr(-,root,root)
%doc README ChangeLog CREDITS COPYING INSTALL NEWS AUTHORS TODO
%{_bindir}/grip
%{_datadir}/pixmaps/gripicon.png
%{_datadir}/gnome/help/grip
%{_datadir}/applications/*

%changelog
* Fri Oct  8 2004 Bill Nottingham <notting at redhat.com> 3.2.0-3
- add a passel of buildreqs (#135045)

* Wed Jul 28 2004 Adrian Havill <havill at redhat.com> 3.2.0-2
- rebuilt
- add vte-devel to BuildRequires

* Sun Jun 20 2004 Karsten Hopp <karsten at redhat.de> 3.2.0-1 
- update to latest stable version
- remove obsolete locking and cdparanoia patches

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Aug 18 2003 Bill Nottingham <notting at redhat.com> 1:3.0.7-3
- fix it so it actually uses cdparanoia libraries
- close the cd device before ripping so locking works (#102051)

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 29 2003 Bill Nottingham <notting at redhat.com> 1:3.0.7-1
- update to 3.0.7

* Tue Feb 18 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-5
- fix default encoder (#83647)

* Wed Feb  5 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-4
- desktop file fixing

* Wed Jan 29 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-3
- fix debuginfo-induced desktop file weirdness (#82905)

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Tue Jan  7 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-1
- update to 3.0.4

* Mon Dec 23 2002 Tim Powers <timp at redhat.com> 1:3.0.1-5
- bump and rebuild

* Thu Dec 12 2002 Tim Powers <timp at redhat.com> 1:3.0.1-4
- rebuild on all arches

* Wed Aug 21 2002 Bill Nottingham <notting at redhat.com> 3.0.1-4
- fix encode options (#72156)

* Mon Aug 19 2002 Bill Nottingham <notting at redhat.com> 3.0.1-3
- rebuild (#71899)

* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 3.0.1-2
- build using gcc-3.2-0.1

* Mon Jun 24 2002 Bill Nottingham <notting at redhat.com> 3.0.1-1
- update to 3.0.1

* 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 Apr 10 2002 Bill Nottingham <notting at redhat.com>
- fix default encoder opts (#62551)

* Wed Jul 18 2001 Bill Nottingham <notting at redhat.com>
- update to 2.96

* Mon May 21 2001 Tim Powers <timp at redhat.com>
- applied patches from alane at geeksrus.net in bug #41490

* Mon May 14 2001 Tim Powers <timp at redhat.com>
- updated to 2.95
- requires vorbis
- patched to use oggenc by default (since we ship it)
- changed location of the desktop file

* Wed Aug 9 2000 Tim Powers <timp at redhat.com>
- added Serial so that we can upgrade from the Helix packages for 6.2

* Mon Jul 24 2000 Prospector <prospector at redhat.com>
- rebuilt

* Wed Jul 12 2000 Than Ngo <than at redhat.de>
- rebuilt

* Fri Jun 16 2000 Preston Brown <pbrown at redhat.com>
- include icon properly
- fix up man path patch

* Wed Jun 7 2000 Tim Powers <timp at redhat.com>
- fixed manpage location
- use %%makeinstall and other predefined macros wherever possible

* Fri May 12 2000 Tim Powers <timp at redhat.com>
- updated to 2.94

* Sun Feb 06 2000 Preston Brown <pbrown at redhat.com>
- fix more problems w/man page because of gzip

* Sun Jan 16 2000 Preston Brown <pbrown at redhat.com>
- 2.91
- fix man page symlink

* Thu Nov 11 1999 Tim Powers <timp at redhat.com>
- updated to 2.8
- no longer need separate cdparanoia source
- gzip man pages
- added desktop entry

* Mon Aug 30 1999 Bill Nottingham <notting at redhat.com>
- update to 2.6

* Thu Jul 15 1999 Tim Powers <timp at redhat.com>
- updated grip source
- included cdparanoia source, builds during the build routine so
  we can have a complete grip build
- and all were happy when it twas built for 6.1

* Sat Apr 18 1999 Michael Maher <mike at redhat.com>
- built package for 6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Mar 2005 08:47:33 -0000	1.1
+++ .cvsignore	2 Mar 2005 08:48:40 -0000	1.2
@@ -0,0 +1 @@
+grip-3.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Mar 2005 08:47:33 -0000	1.1
+++ sources	2 Mar 2005 08:48:40 -0000	1.2
@@ -0,0 +1 @@
+9b51933a03dd7d7ddfbb3643fc82c2d0  grip-3.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar  2 09:22:03 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 04:22:03 -0500
Subject: rpms/grip/devel grip.spec,1.1,1.2
Message-ID: <200503020922.j229M3uH005205@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5199

Modified Files:
	grip.spec 
Log Message:
first try to make grip.spec compliant with the package guidelines



Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grip.spec	2 Mar 2005 08:48:40 -0000	1.1
+++ grip.spec	2 Mar 2005 09:22:01 -0000	1.2
@@ -1,23 +1,19 @@
-Summary: A front-end for CD rippers and Ogg Vorbis encoders.
+Summary: A front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 3
-Serial: 1
-Copyright: GPL
+Release: 4
+Epoch: 1
+License: GPL
 Group: Applications/Multimedia
-Source: http://www.nostatic/grip/%{name}-%{version}.tar.gz
-Source1: gripicon.png
-Source2: grip.desktop
+Source: http://www.nostatic/grip/grip-%{version}.tar.gz
 Patch1: grip-3.2.0-default.patch
-Patch2: grip-3.0.7-cdparanoia.patch
-Patch3: grip-3.0.7-locking.patch
-Patch4: grip-3.2.0-rh1.patch
-URL: http://www.nostatic.org/grip
-Buildroot: %{_tmppath}/%{name}-root
+URL: http://www.nostatic.org/grip/
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: vorbis-tools
-BuildPrereq: vte-devel cdparanoia-devel autoconf >= 2.52
-BuildPrereq: libgnomeui-devel, curl-devel, desktop-file-utils
-ExcludeArch: s390 s390x
+BuildRequires: vte-devel cdparanoia-devel
+BuildRequires: libgnomeui-devel curl-devel
+BuildRequires: gettext id3lib-devel
+BuildRequires: desktop-file-utils
 
 %description
 Grip is a GTK+ based front-end for CD rippers (such as cdparanoia and
@@ -28,51 +24,66 @@
 %prep
 %setup -q
 %patch1 -p1 -b .rh-default-encoder
-#%patch2 -p1 -b .cdparanoia
-#%patch3 -p1 -b .locking
-%patch4 -p1 -b .rh1
-
 
 %build
-autoconf
 %configure
-make
+%{__make} %{_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-cp -f %{SOURCE2} .
+rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 make DESTDIR=$RPM_BUILD_ROOT install-am
 
-install $RPM_SOURCE_DIR/gripicon.png %{buildroot}%{_datadir}/pixmaps
+cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF
+StartupWMClass=Grip
+Encoding=UTF-8
+EOF
+iconv -f ISO-8859-1 -t UTF-8 \
+	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop > \
+	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new
+
+mv	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new \
+	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop
 
 desktop-file-install \
-	--vendor=net \
+	--vendor=fedora \
 	--dir $RPM_BUILD_ROOT/%{_datadir}/applications \
 	--delete-original \
-	--add-category X-Red-Hat-Extra \
+	--add-category X-Fedora \
 	--add-category Application \
 	--add-category AudioVideo \
-	%{buildroot}%{_datadir}/gnome/apps/Multimedia/grip.desktop
-cat >> %{buildroot}%{_datadir}/applications/net-grip.desktop << EOF
-StartupWMClass=Grip
-EOF
+	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop
 %find_lang %{name}-2.2
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %files -f %{name}-2.2.lang
 %defattr(-,root,root)
-%doc README ChangeLog CREDITS COPYING INSTALL NEWS AUTHORS TODO
+%doc README ChangeLog CREDITS COPYING AUTHORS TODO
 %{_bindir}/grip
 %{_datadir}/pixmaps/gripicon.png
 %{_datadir}/gnome/help/grip
 %{_datadir}/applications/*
 
 %changelog
+* Wed Mar 02 2005 Adrian Reber <adrian at lisas.de> - 1:3.2.0-4
+- s/Copyright/License/
+- s/Serial/Epoch/
+- cosmetic changes to quiet rpmlint
+- removed grip.png and grip.desktop (Source1 and Source2) as
+  it is already included in the tarball
+- removed unused patches
+- removed ExcludeArch: s390 s390x
+- renamed BuildPrereq to BuildRequires
+- added id3lib-devel to BuildRequires
+- use %%{_smp_mflags}
+- changed .desktop file creation and installation
+- removed INSTALL and NEWS from %%doc
+- delete changelog entries older than 2004
+
 * Fri Oct  8 2004 Bill Nottingham <notting at redhat.com> 3.2.0-3
 - add a passel of buildreqs (#135045)
 
@@ -89,112 +100,3 @@
 
 * Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
 - rebuilt
-
-* Mon Aug 18 2003 Bill Nottingham <notting at redhat.com> 1:3.0.7-3
-- fix it so it actually uses cdparanoia libraries
-- close the cd device before ripping so locking works (#102051)
-
-* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Thu May 29 2003 Bill Nottingham <notting at redhat.com> 1:3.0.7-1
-- update to 3.0.7
-
-* Tue Feb 18 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-5
-- fix default encoder (#83647)
-
-* Wed Feb  5 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-4
-- desktop file fixing
-
-* Wed Jan 29 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-3
-- fix debuginfo-induced desktop file weirdness (#82905)
-
-* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
-- rebuilt
-
-* Tue Jan  7 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-1
-- update to 3.0.4
-
-* Mon Dec 23 2002 Tim Powers <timp at redhat.com> 1:3.0.1-5
-- bump and rebuild
-
-* Thu Dec 12 2002 Tim Powers <timp at redhat.com> 1:3.0.1-4
-- rebuild on all arches
-
-* Wed Aug 21 2002 Bill Nottingham <notting at redhat.com> 3.0.1-4
-- fix encode options (#72156)
-
-* Mon Aug 19 2002 Bill Nottingham <notting at redhat.com> 3.0.1-3
-- rebuild (#71899)
-
-* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 3.0.1-2
-- build using gcc-3.2-0.1
-
-* Mon Jun 24 2002 Bill Nottingham <notting at redhat.com> 3.0.1-1
-- update to 3.0.1
-
-* 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 Apr 10 2002 Bill Nottingham <notting at redhat.com>
-- fix default encoder opts (#62551)
-
-* Wed Jul 18 2001 Bill Nottingham <notting at redhat.com>
-- update to 2.96
-
-* Mon May 21 2001 Tim Powers <timp at redhat.com>
-- applied patches from alane at geeksrus.net in bug #41490
-
-* Mon May 14 2001 Tim Powers <timp at redhat.com>
-- updated to 2.95
-- requires vorbis
-- patched to use oggenc by default (since we ship it)
-- changed location of the desktop file
-
-* Wed Aug 9 2000 Tim Powers <timp at redhat.com>
-- added Serial so that we can upgrade from the Helix packages for 6.2
-
-* Mon Jul 24 2000 Prospector <prospector at redhat.com>
-- rebuilt
-
-* Wed Jul 12 2000 Than Ngo <than at redhat.de>
-- rebuilt
-
-* Fri Jun 16 2000 Preston Brown <pbrown at redhat.com>
-- include icon properly
-- fix up man path patch
-
-* Wed Jun 7 2000 Tim Powers <timp at redhat.com>
-- fixed manpage location
-- use %%makeinstall and other predefined macros wherever possible
-
-* Fri May 12 2000 Tim Powers <timp at redhat.com>
-- updated to 2.94
-
-* Sun Feb 06 2000 Preston Brown <pbrown at redhat.com>
-- fix more problems w/man page because of gzip
-
-* Sun Jan 16 2000 Preston Brown <pbrown at redhat.com>
-- 2.91
-- fix man page symlink
-
-* Thu Nov 11 1999 Tim Powers <timp at redhat.com>
-- updated to 2.8
-- no longer need separate cdparanoia source
-- gzip man pages
-- added desktop entry
-
-* Mon Aug 30 1999 Bill Nottingham <notting at redhat.com>
-- update to 2.6
-
-* Thu Jul 15 1999 Tim Powers <timp at redhat.com>
-- updated grip source
-- included cdparanoia source, builds during the build routine so
-  we can have a complete grip build
-- and all were happy when it twas built for 6.1
-
-* Sat Apr 18 1999 Michael Maher <mike at redhat.com>
-- built package for 6.0



From fedora-extras-commits at redhat.com  Wed Mar  2 09:22:50 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 04:22:50 -0500
Subject: rpms/grip/devel grip-3.0.7-cdparanoia.patch, 1.1,
	NONE grip-3.0.7-locking.patch, 1.1, NONE grip-3.2.0-rh1.patch,
	1.1, NONE grip.desktop, 1.1, NONE gripicon.png, 1.1, NONE
Message-ID: <200503020922.j229MoiU005247@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5236

Removed Files:
	grip-3.0.7-cdparanoia.patch grip-3.0.7-locking.patch 
	grip-3.2.0-rh1.patch grip.desktop gripicon.png 
Log Message:
removed unneeded files



--- grip-3.0.7-cdparanoia.patch DELETED ---


--- grip-3.0.7-locking.patch DELETED ---


--- grip-3.2.0-rh1.patch DELETED ---


--- grip.desktop DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar  2 11:08:33 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:08:33 -0500
Subject: rpms/gnotime import.log,1.2,1.3
Message-ID: <200503021108.j22B8XZV009048@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnotime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9039

Modified Files:
	import.log 
Log Message:
auto-import gnotime-2.2.1-0.fdr.5.1 on branch FC-1 from gnotime-2.2.1-0.fdr.5.1.src.rpm
Bring in stuff from fedora.us FC1/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnotime/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	16 Dec 2004 17:34:07 -0000	1.2
+++ import.log	2 Mar 2005 11:08:31 -0000	1.3
@@ -1 +1,2 @@
 gnotime-2_2_1-0_fdr_5_2:HEAD:gnotime-2.2.1-0.fdr.5.2.src.rpm:1103218431
+gnotime-2_2_1-0_fdr_5_1:FC-1:gnotime-2.2.1-0.fdr.5.1.src.rpm:1109761713



From fedora-extras-commits at redhat.com  Wed Mar  2 11:08:33 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:08:33 -0500
Subject: rpms/gnotime/FC-1 gnotime.spec,1.2,1.3
Message-ID: <200503021108.j22B8XhS009052@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnotime/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9039/FC-1

Modified Files:
	gnotime.spec 
Log Message:
auto-import gnotime-2.2.1-0.fdr.5.1 on branch FC-1 from gnotime-2.2.1-0.fdr.5.1.src.rpm
Bring in stuff from fedora.us FC1/testing


Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/FC-1/gnotime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnotime.spec	16 Dec 2004 18:07:34 -0000	1.2
+++ gnotime.spec	2 Mar 2005 11:08:31 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.2.1
-Release:        5
+Release:        0.fdr.5.1
 Epoch:          0
 Summary:        Tracks and reports time spent
 
@@ -129,7 +129,7 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
-* Sat Nov 27 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-5
+* Sat Nov 27 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-0.fdr.5
 - Patch to fix a crash when invoking gnome_help.
 - Patch to wordwrap diary notes.
   



From fedora-extras-commits at redhat.com  Wed Mar  2 11:09:29 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:09:29 -0500
Subject: rpms/gnotime import.log,1.3,1.4
Message-ID: <200503021109.j22B9TMH009156@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnotime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9147

Modified Files:
	import.log 
Log Message:
auto-import gnotime-2.2.1-0.fdr.5.2 on branch FC-2 from gnotime-2.2.1-0.fdr.5.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnotime/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 11:08:31 -0000	1.3
+++ import.log	2 Mar 2005 11:09:27 -0000	1.4
@@ -1,2 +1,3 @@
 gnotime-2_2_1-0_fdr_5_2:HEAD:gnotime-2.2.1-0.fdr.5.2.src.rpm:1103218431
 gnotime-2_2_1-0_fdr_5_1:FC-1:gnotime-2.2.1-0.fdr.5.1.src.rpm:1109761713
+gnotime-2_2_1-0_fdr_5_2:FC-2:gnotime-2.2.1-0.fdr.5.2.src.rpm:1109761769



From fedora-extras-commits at redhat.com  Wed Mar  2 11:09:29 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:09:29 -0500
Subject: rpms/gnotime/FC-2 gnotime.spec,1.2,1.3
Message-ID: <200503021109.j22B9TbY009160@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnotime/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9147/FC-2

Modified Files:
	gnotime.spec 
Log Message:
auto-import gnotime-2.2.1-0.fdr.5.2 on branch FC-2 from gnotime-2.2.1-0.fdr.5.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/FC-2/gnotime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnotime.spec	16 Dec 2004 18:07:34 -0000	1.2
+++ gnotime.spec	2 Mar 2005 11:09:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.2.1
-Release:        5
+Release:        0.fdr.5.2
 Epoch:          0
 Summary:        Tracks and reports time spent
 
@@ -129,7 +129,7 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
-* Sat Nov 27 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-5
+* Sat Nov 27 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-0.fdr.5
 - Patch to fix a crash when invoking gnome_help.
 - Patch to wordwrap diary notes.
   



From fedora-extras-commits at redhat.com  Wed Mar  2 11:10:24 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:10:24 -0500
Subject: rpms/gai import.log,1.5,1.6
Message-ID: <200503021110.j22BAO3w009278@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9269

Modified Files:
	import.log 
Log Message:
auto-import gai-0.5.8-0.fdr.2.2 on branch FC-2 from gai-0.5.8-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gai/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	27 Feb 2005 05:28:13 -0000	1.5
+++ import.log	2 Mar 2005 11:10:22 -0000	1.6
@@ -2,3 +2,4 @@
 gai-0_5_0-0_fdr_0_4_pre4_1:HEAD:gai-0.5.0-0.fdr.0.4.pre4.1.src.rpm:1099887672
 gai-0_5_0-0_fdr_0_4_pre4_2:HEAD:gai-0.5.0-0.fdr.0.4.pre4.2.src.rpm:1099887678
 gai-0_5_8-4:HEAD:gai-0.5.8-4.src.rpm:1109482089
+gai-0_5_8-0_fdr_2_2:FC-2:gai-0.5.8-0.fdr.2.2.src.rpm:1109761827



From fedora-extras-commits at redhat.com  Wed Mar  2 11:10:24 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:10:24 -0500
Subject: rpms/gai/FC-2 .cvsignore, 1.2, 1.3 gai.spec, 1.3, 1.4 sources, 1.2,
	1.3 gai-0.5.0pre4.patch, 1.1, NONE
Message-ID: <200503021110.j22BAOe3009282@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9269/FC-2

Modified Files:
	.cvsignore gai.spec sources 
Removed Files:
	gai-0.5.0pre4.patch 
Log Message:
auto-import gai-0.5.8-0.fdr.2.2 on branch FC-2 from gai-0.5.8-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gai/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:21:05 -0000	1.2
+++ .cvsignore	2 Mar 2005 11:10:22 -0000	1.3
@@ -1 +1 @@
-gai-0.5.0pre4.tar.bz2
+gai-0.5.8.tar.bz2


Index: gai.spec
===================================================================
RCS file: /cvs/extras/rpms/gai/FC-2/gai.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gai.spec	8 Nov 2004 04:21:18 -0000	1.3
+++ gai.spec	2 Mar 2005 11:10:22 -0000	1.4
@@ -1,25 +1,22 @@
-%define prerelease pre4
-
 Name:		gai
-Version:	0.5.0
-Release:	0.fdr.0.4.%{prerelease}.2
+Version:	0.5.8
+Release:	0.fdr.2.2
 Epoch:		0
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://gai.sourceforge.net
-Source0:	http://download.sf.net/gai/gai-0.5.0pre4.tar.bz2
-Patch0:		gai-0.5.0pre4.patch
+Source0:	http://download.sf.net/gai/gai-0.5.8.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libgnomeui-devel, gtk2-devel >= 0:2.2, gnome-panel
+BuildRequires:	libgnomeui-devel, gtk2-devel >= 0:2.2, gnome-panel-devel
 
 %package	devel
 Summary:	Library and headers for Generic Applet Interface
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel, libgnomeui-devel
+Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel-devel, libgnomeui-devel
 
 %description
 This library provides a generic interface for developing applets for Gnome 2
@@ -35,8 +32,7 @@
 GAI applets.
 
 %prep
-%setup -q -n %{name}-%{version}%{prerelease}
-%patch0 -p1
+%setup -q
 
 %build
 %configure
@@ -65,6 +61,12 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Mon Nov 22 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-0.fdr.2
+- s/gnome-panel/gnome-panel-devel/g for FC2.
+
+* Sat Nov  6 2004 Michel Alexandre Salim <michel.salim at gmail.com> - 0.5.8-0.fdr.1
+- Updated to latest release
+
 * Fri Oct 31 2003 Michel Alexandre Salim <salimma[AT]users.sf.net> - 0.5.0-0.fdr.0.4.pre4
 - BuildRequires: gnome-panel added
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gai/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:21:05 -0000	1.2
+++ sources	2 Mar 2005 11:10:22 -0000	1.3
@@ -1 +1 @@
-264f153ab232b2c8284e3d3240b0046e  gai-0.5.0pre4.tar.bz2
+29d90cb37fe5341009b27ffd09f871cb  gai-0.5.8.tar.bz2


--- gai-0.5.0pre4.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar  2 11:11:22 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:11:22 -0500
Subject: rpms/gai-pal import.log,1.4,1.5
Message-ID: <200503021111.j22BBMWd009409@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai-pal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9400

Modified Files:
	import.log 
Log Message:
auto-import gai-pal-0.7-0.fdr.1.2 on branch FC-2 from gai-pal-0.7-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gai-pal/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	27 Feb 2005 05:29:08 -0000	1.4
+++ import.log	2 Mar 2005 11:11:20 -0000	1.5
@@ -1,3 +1,4 @@
 gai-pal-0_4-0_fdr_1_rh90:HEAD:gai-pal-0.4-0.fdr.1.rh90.src.rpm:1099887662
 gai-pal-0_4-0_fdr_1_1:HEAD:gai-pal-0.4-0.fdr.1.1.src.rpm:1099887668
 gai-pal-0_7-4:HEAD:gai-pal-0.7-4.src.rpm:1109482145
+gai-pal-0_7-0_fdr_1_2:FC-2:gai-pal-0.7-0.fdr.1.2.src.rpm:1109761886



From fedora-extras-commits at redhat.com  Wed Mar  2 11:11:22 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:11:22 -0500
Subject: rpms/gai-pal/FC-2 gai-pal.spec, 1.6, 1.7 gai-pal-0.7-typo.patch, 1.1,
	NONE gai-pal-0.7-xosd-empty-msg.patch, 1.1, NONE
Message-ID: <200503021111.j22BBM7W009413@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai-pal/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9400/FC-2

Modified Files:
	gai-pal.spec 
Removed Files:
	gai-pal-0.7-typo.patch gai-pal-0.7-xosd-empty-msg.patch 
Log Message:
auto-import gai-pal-0.7-0.fdr.1.2 on branch FC-2 from gai-pal-0.7-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: gai-pal.spec
===================================================================
RCS file: /cvs/extras/rpms/gai-pal/FC-2/gai-pal.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gai-pal.spec	27 Feb 2005 05:29:08 -0000	1.6
+++ gai-pal.spec	2 Mar 2005 11:11:20 -0000	1.7
@@ -1,31 +1,28 @@
+%define name gai-pal
+%define version 0.7
+%define release 0.fdr.1
 %define gaiver 0:0.5.8
 
 Summary:	GAI Pal applet
-Name:		gai-pal
-Version:	0.7
-Release:	4
+Name:		%{name}
+Version:	%{version}
+Release:	%{release}.2
 Epoch:		0
 Source0:	%{name}-%{version}.tar.bz2
-Patch0:		gai-pal-0.7-xosd-empty-msg.patch
-Patch1:		gai-pal-0.7-typo.patch
+#Patch0:		%{name}-%{version}.patch
 URL:		http://gai.sourceforge.net
 License:	GPL
 Group:		User Interface/Desktops
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gai-devel >= %{gaiver}
-BuildRequires:	xosd-devel
 
 %description
 A GAI applet, providing a friend that always has something wise
-or funny to say.
+or funny to say
 
 %prep
 %setup -q
-%patch -p1 -b .xosd-empty-msg
-%patch1 -p1 -b .typo
-%ifarch x86_64
-sed -i 's!/lib/!/%{_lib}/!' Makefile.in
-%endif
+#%patch0 -p1
 
 %build
 %configure
@@ -46,18 +43,6 @@
 %{_datadir}/pixmaps/*
 
 %changelog
-* Sun Feb 27 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7-4
-- BR xosd-devel
-- fix xosd crash if fortune program missing or message is empty
-- fix message in fortune preferences window
-- drop confusing usage of macros in NVR (fixes release tag!)
-
-* Sat Feb 26 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-3
-- a "sed -i 's!/lib/!/%%{_lib}/!' Makefile.in" fixes x86_64
-
-* Sat Nov  6 2004 Michel Alexandre Salim <salimma[AT]users.sourceforge.net> - 0.7-1
-- Updated to 0.7, require gai 0.5.8
-
 * Mon Oct 27 2003 Michel Alexandre Salim <salimma[AT]users.sourceforge.net> - 0.4-0.fdr.1
 - Updated to 0.4, require gai 0.5
 


--- gai-pal-0.7-typo.patch DELETED ---


--- gai-pal-0.7-xosd-empty-msg.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar  2 11:12:15 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:12:15 -0500
Subject: rpms/hping2 import.log,1.3,1.4
Message-ID: <200503021112.j22BCFdB009527@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/hping2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9518

Modified Files:
	import.log 
Log Message:
auto-import hping2-2.0.0-0.fdr.0.2.rc3.2 on branch FC-2 from hping2-2.0.0-0.fdr.0.2.rc3.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/hping2/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 04:32:58 -0000	1.3
+++ import.log	2 Mar 2005 11:12:13 -0000	1.4
@@ -1,2 +1,3 @@
 hping2-2_0_0-0_fdr_0_2_rc2_rh90:HEAD:hping2-2.0.0-0.fdr.0.2.rc2.rh90.src.rpm:1099888372
 hping2-2_0_0-0_fdr_0_2_rc2_1:HEAD:hping2-2.0.0-0.fdr.0.2.rc2.1.src.rpm:1099888378
+hping2-2_0_0-0_fdr_0_2_rc3_2:FC-2:hping2-2.0.0-0.fdr.0.2.rc3.2.src.rpm:1109761939



From fedora-extras-commits at redhat.com  Wed Mar  2 11:12:15 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:12:15 -0500
Subject: rpms/hping2/FC-2 hping2.spec,1.4,1.5 hping2-x86_64.patch,1.1,NONE
Message-ID: <200503021112.j22BCFHF009531@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/hping2/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9518/FC-2

Modified Files:
	hping2.spec 
Removed Files:
	hping2-x86_64.patch 
Log Message:
auto-import hping2-2.0.0-0.fdr.0.2.rc3.2 on branch FC-2 from hping2-2.0.0-0.fdr.0.2.rc3.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: hping2.spec
===================================================================
RCS file: /cvs/extras/rpms/hping2/FC-2/hping2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hping2.spec	13 Feb 2005 11:49:15 -0000	1.4
+++ hping2.spec	2 Mar 2005 11:12:13 -0000	1.5
@@ -1,6 +1,6 @@
 Name:    hping2
 Version: 2.0.0
-Release: 0.3.rc3
+Release: 0.fdr.0.2.rc3.2
 Epoch:   0 
 Summary: A software to do TCP/IP stack auditing and much more
 
@@ -9,7 +9,6 @@
 URL: http://www.hping.org/	
 Source0: http://www.hping.org/hping2.0.0-rc3.tar.gz
 Patch0: hping2-include.patch
-Patch1: hping2-x86_64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libpcap
 
@@ -22,7 +21,6 @@
 %prep
 %setup -q -n hping2-rc3
 %patch0 -p0
-%patch1 -p0
 
 %build
 %configure --force-libpcap
@@ -50,10 +48,7 @@
 %doc docs/HPING2-IS-OPEN docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt
 
 %changelog
-* Sun Feb 13 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 2.0.0-0.3.rc3
-- Add patch to fix build on x86_64
-
-* Wed Dec 08 2004 Adrian Reber <adrian at lisas.de> - 0:2.0.0-0.2.rc3
+* Wed Dec 08 2004 Adrian Reber <adrian at lisas.de> - 0:2.0.0-0.fdr.0.2.rc3
 - fixed compile bug (fedora.us bug #1700)
 - updated to 2.0.0-rc3
 - changed buildroot


--- hping2-x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar  2 11:13:13 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:13:13 -0500
Subject: rpms/libkexif import.log,1.3,1.4
Message-ID: <200503021113.j22BDDsG009631@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libkexif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9621

Modified Files:
	import.log 
Log Message:
auto-import libkexif-0.2.1-0.fdr.1.2 on branch FC-2 from libkexif-0.2.1-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libkexif/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	29 Jan 2005 23:32:25 -0000	1.3
+++ import.log	2 Mar 2005 11:13:11 -0000	1.4
@@ -1,2 +1,3 @@
 libkexif-0_1-2:HEAD:libkexif-0.1-2.src.rpm:1105560811
 libkexif-0_2_1-1:HEAD:libkexif-0.2.1-1.src.rpm:1107041539
+libkexif-0_2_1-0_fdr_1_2:FC-2:libkexif-0.2.1-0.fdr.1.2.src.rpm:1109761996



From fedora-extras-commits at redhat.com  Wed Mar  2 11:13:13 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:13:13 -0500
Subject: rpms/libkexif/FC-2 libkexif.spec,1.2,1.3
Message-ID: <200503021113.j22BDD56009634@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libkexif/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9621/FC-2

Modified Files:
	libkexif.spec 
Log Message:
auto-import libkexif-0.2.1-0.fdr.1.2 on branch FC-2 from libkexif-0.2.1-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: libkexif.spec
===================================================================
RCS file: /cvs/extras/rpms/libkexif/FC-2/libkexif.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libkexif.spec	29 Jan 2005 23:32:25 -0000	1.2
+++ libkexif.spec	2 Mar 2005 11:13:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libkexif
 Version:        0.2.1
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Allow Kipi plugins to extract EXIF information
 
@@ -71,7 +71,7 @@
 
 
 %changelog
-* Mon Jan 24 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.2.1-1
+* Mon Jan 24 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.2.1-0.fdr.1
 - version 0.2.1
 - update URL tag
 



From fedora-extras-commits at redhat.com  Wed Mar  2 11:13:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:13:57 -0500
Subject: rpms/libkipi import.log,1.2,1.3
Message-ID: <200503021113.j22BDv1R009737@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libkipi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9728

Modified Files:
	import.log 
Log Message:
auto-import libkipi-0.1-0.fdr.2.2 on branch FC-2 from libkipi-0.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libkipi/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Jan 2005 20:09:34 -0000	1.2
+++ import.log	2 Mar 2005 11:13:55 -0000	1.3
@@ -1 +1,2 @@
 libkipi-0_1-2:HEAD:libkipi-0.1-2.src.rpm:1105560609
+libkipi-0_1-0_fdr_2_2:FC-2:libkipi-0.1-0.fdr.2.2.src.rpm:1109762041



From fedora-extras-commits at redhat.com  Wed Mar  2 11:13:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:13:57 -0500
Subject: rpms/libkipi/FC-2 libkipi.spec,1.1,1.2
Message-ID: <200503021113.j22BDvvE009741@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libkipi/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9728/FC-2

Modified Files:
	libkipi.spec 
Log Message:
auto-import libkipi-0.1-0.fdr.2.2 on branch FC-2 from libkipi-0.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: libkipi.spec
===================================================================
RCS file: /cvs/extras/rpms/libkipi/FC-2/libkipi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libkipi.spec	12 Jan 2005 20:09:34 -0000	1.1
+++ libkipi.spec	2 Mar 2005 11:13:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libkipi
 Version:        0.1
-Release:        2
+Release:        0.fdr.2.2
 Epoch:          0
 Summary:        Common plugin infrastructure for KDE image applications
 
@@ -77,7 +77,7 @@
 
 
 %changelog
-* Wed Jan 05 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.1-2
+* Wed Jan 05 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.1-0.fdr.2
 - Fix libkipi-devel requirements
 - Reduce hicolor icon directory ownership bloat
 - Switch group "System Environment/Libraries"



From fedora-extras-commits at redhat.com  Wed Mar  2 11:14:41 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:14:41 -0500
Subject: rpms/mail-notification import.log,1.3,1.4
Message-ID: <200503021114.j22BEfWw009843@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/mail-notification
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9834

Modified Files:
	import.log 
Log Message:
auto-import mail-notification-1.0-0.fdr.1.2 on branch FC-2 from mail-notification-1.0-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Dec 2004 18:43:31 -0000	1.3
+++ import.log	2 Mar 2005 11:14:39 -0000	1.4
@@ -1,2 +1,3 @@
 mail-notification-0_99-0_fdr_1_2:HEAD:mail-notification-0.99-0.fdr.1.2.src.rpm:1102521310
 mail-notification-1_0-0_fdr_1_2:HEAD:mail-notification-1.0-0.fdr.1.2.src.rpm:1102531471
+mail-notification-1_0-0_fdr_1_2:FC-2:mail-notification-1.0-0.fdr.1.2.src.rpm:1109762084



From fedora-extras-commits at redhat.com  Wed Mar  2 11:14:41 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:14:41 -0500
Subject: rpms/mail-notification/FC-2 mail-notification.spec,1.3,1.4
Message-ID: <200503021114.j22BEf2G009848@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/mail-notification/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9834/FC-2

Modified Files:
	mail-notification.spec 
Log Message:
auto-import mail-notification-1.0-0.fdr.1.2 on branch FC-2 from mail-notification-1.0-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/FC-2/mail-notification.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mail-notification.spec	10 Dec 2004 22:03:07 -0000	1.3
+++ mail-notification.spec	2 Mar 2005 11:14:39 -0000	1.4
@@ -3,7 +3,7 @@
 Name:           mail-notification
 Epoch:          0
 Version:        1.0
-Release:        1
+Release:        0.fdr.1.2
 Summary:        Mail Notification is a status icon that informs you if you have new mail.
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 11:15:41 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:15:41 -0500
Subject: rpms/p0f import.log,1.3,1.4
Message-ID: <200503021115.j22BFfjv009958@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/p0f
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9948

Modified Files:
	import.log 
Log Message:
auto-import p0f-2.0.5-0.fdr.1.2 on branch FC-2 from p0f-2.0.5-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/p0f/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 04:56:50 -0000	1.3
+++ import.log	2 Mar 2005 11:15:39 -0000	1.4
@@ -1,2 +1,3 @@
 p0f-2_0_2-0_fdr_1_rh90:HEAD:p0f-2.0.2-0.fdr.1.rh90.src.rpm:1099889791
 p0f-2_0_2-0_fdr_1_1:HEAD:p0f-2.0.2-0.fdr.1.1.src.rpm:1099889810
+p0f-2_0_5-0_fdr_1_2:FC-2:p0f-2.0.5-0.fdr.1.2.src.rpm:1109762144



From fedora-extras-commits at redhat.com  Wed Mar  2 11:15:41 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:15:41 -0500
Subject: rpms/p0f/FC-2 p0f.spec,1.3,1.4
Message-ID: <200503021115.j22BFfbt009962@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/p0f/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9948/FC-2

Modified Files:
	p0f.spec 
Log Message:
auto-import p0f-2.0.5-0.fdr.1.2 on branch FC-2 from p0f-2.0.5-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: p0f.spec
===================================================================
RCS file: /cvs/extras/rpms/p0f/FC-2/p0f.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- p0f.spec	2 Dec 2004 01:10:15 -0000	1.3
+++ p0f.spec	2 Mar 2005 11:15:39 -0000	1.4
@@ -1,6 +1,6 @@
 Name: p0f
 Version: 2.0.5
-Release: 1
+Release: 0.fdr.1.2
 Epoch:	0
 Summary: A versatile passive OS fingerprinting tool.
 Group: Applications/Internet
@@ -52,7 +52,7 @@
 %{_mandir}/man1/p0f.1.gz
 
 %changelog
-* Tue Oct 26 2004 Adrian Reber <adrian at lisas.de> - 0:2.0.5-1
+* Tue Oct 26 2004 Adrian Reber <adrian at lisas.de> - 0:2.0.5-0.fdr.1
 - updated to 2.0.5
 - fixed build on FC2
 - bring specfile up to date with current spec templates



From fedora-extras-commits at redhat.com  Wed Mar  2 11:16:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:16:57 -0500
Subject: rpms/showimg import.log,1.2,1.3
Message-ID: <200503021116.j22BGvQj010068@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/showimg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10059

Modified Files:
	import.log 
Log Message:
auto-import showimg-0.9.4.1-0.fdr.2.2 on branch FC-2 from showimg-0.9.4.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/showimg/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	29 Jan 2005 23:49:56 -0000	1.2
+++ import.log	2 Mar 2005 11:16:54 -0000	1.3
@@ -1 +1,2 @@
 showimg-0_9_4_1-2:HEAD:showimg-0.9.4.1-2.src.rpm:1107042589
+showimg-0_9_4_1-0_fdr_2_2:FC-2:showimg-0.9.4.1-0.fdr.2.2.src.rpm:1109762219



From fedora-extras-commits at redhat.com  Wed Mar  2 11:16:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:16:57 -0500
Subject: rpms/showimg/FC-2 showimg.spec,1.1,1.2
Message-ID: <200503021116.j22BGv8D010072@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/showimg/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10059/FC-2

Modified Files:
	showimg.spec 
Log Message:
auto-import showimg-0.9.4.1-0.fdr.2.2 on branch FC-2 from showimg-0.9.4.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-2/showimg.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- showimg.spec	29 Jan 2005 23:49:56 -0000	1.1
+++ showimg.spec	2 Mar 2005 11:16:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.4.1
-Release:        2
+Release:        0.fdr.2.2
 Epoch:          0
 Summary:        Feature-rich image viewer for KDE.
 
@@ -83,7 +83,7 @@
 
 
 %changelog
-* Mon Jan 24 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.9.4.1-2
+* Mon Jan 24 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.9.4.1-0.fdr.2
 - rebuild for libkexif 0.2.1
 
 * Thu Jan 20 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.9.4.1-0.fdr.1



From fedora-extras-commits at redhat.com  Wed Mar  2 11:17:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:17:49 -0500
Subject: rpms/sylpheed-claws import.log,1.5,1.6
Message-ID: <200503021117.j22BHns1010181@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed-claws
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10172

Modified Files:
	import.log 
Log Message:
auto-import sylpheed-claws-0.9.12-0.fdr.1.2 on branch FC-2 from sylpheed-claws-0.9.12-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	4 Dec 2004 12:37:30 -0000	1.5
+++ import.log	2 Mar 2005 11:17:47 -0000	1.6
@@ -2,3 +2,4 @@
 sylpheed-claws-0_9_8-0_fdr_1_1:HEAD:sylpheed-claws-0.9.8-0.fdr.1.1.src.rpm:1099891455
 sylpheed-claws-0_9_12-0_fdr_1_1:FC-1:sylpheed-claws-0.9.12-0.fdr.1.1.src.rpm:1102163686
 sylpheed-claws-0_9_12-0_fdr_1_rh90:RHL-9:sylpheed-claws-0.9.12-0.fdr.1.rh90.src.rpm:1102163738
+sylpheed-claws-0_9_12-0_fdr_1_2:FC-2:sylpheed-claws-0.9.12-0.fdr.1.2.src.rpm:1109762271



From fedora-extras-commits at redhat.com  Wed Mar  2 11:17:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:17:49 -0500
Subject: rpms/sylpheed-claws/FC-2 .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 sylpheed-claws.spec, 1.4, 1.5
Message-ID: <200503021117.j22BHnrG010185@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed-claws/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10172/FC-2

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
auto-import sylpheed-claws-0.9.12-0.fdr.1.2 on branch FC-2 from sylpheed-claws-0.9.12-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-2/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Feb 2005 12:41:13 -0000	1.3
+++ .cvsignore	2 Mar 2005 11:17:47 -0000	1.4
@@ -1 +1 @@
-sylpheed-claws-1.0.1.tar.bz2
+sylpheed-claws-0.9.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-2/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2005 12:41:14 -0000	1.4
+++ sources	2 Mar 2005 11:17:47 -0000	1.5
@@ -1 +1 @@
-c297d397f99d97234df787dca61aa48e  sylpheed-claws-1.0.1.tar.bz2
+798f25bb5dae7fd4959fbcb38868bef0  sylpheed-claws-0.9.12.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-2/sylpheed-claws.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sylpheed-claws.spec	13 Feb 2005 12:41:14 -0000	1.4
+++ sylpheed-claws.spec	2 Mar 2005 11:17:47 -0000	1.5
@@ -4,31 +4,29 @@
 %define         aspellver     %(rpm -q --qf "%%{version}" aspell)
 
 Name:           sylpheed-claws
-Version:        1.0.1
-Release:        1
+Version:        0.9.12
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.1.tar.bz2
+Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-0.9.12.tar.bz2
 Source1:        sylpheed.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  flex, bison
 BuildRequires:  glib-devel
 BuildRequires:  gtk+-devel
+BuildRequires:  flex, bison
+BuildRequires:  gdk-pixbuf-devel, imlib-devel
 BuildRequires:  compface
 BuildRequires:  openssl-devel
-BuildRequires:  openldap-devel
-BuildRequires:  aspell-devel
-BuildRequires:  pilot-link-devel
-BuildRequires:  gdk-pixbuf-devel
+BuildRequires:  gnupg >= 0:1.2.0, gpgme03-devel >= 0:0.3.10
 BuildRequires:  clamav-devel
-BuildRequires:  gnupg >= 0:1.2.1, gpgme03-devel >= 0:0.3.12
+BuildRequires:  pilot-link-devel
+BuildRequires:  openldap-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig
-Requires:  spamassassin
-Requires:  dillo
+BuildRequires:  aspell-devel
 
 Conflicts: sylpheed
 
@@ -60,10 +58,11 @@
 MY_OPENSSL_CFLAGS=`pkg-config openssl --cflags`
 %endif
 CFLAGS="${MY_OPENSSL_CFLAGS} ${RPM_OPT_FLAGS}" \
-%configure --enable-openssl --enable-ipv6 \
+%configure --enable-openssl --enable-ipv6 --enable-gpgme \
            --enable-ldap --enable-jpilot \
-           --enable-spamassassin-plugin \
-           --disable-mathml-viewer-plugin \
+           --enable-trayicon-plugin --enable-spamassassin-plugin \
+           --enable-clamav-plugin --enable-dillo-viewer-plugin \
+           --enable-demo-plugin \
 %if "%{aspellver}" >= "0.50"
 	   --enable-aspell \
 %endif
@@ -101,9 +100,9 @@
 
 %files -f sylpheed-claws.lang
 %defattr(-,root,root,-)
-%doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws COPYING
-%doc NEWS README README.claws RELEASE_NOTES.claws 
-%doc TODO
+%doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws ChangeLog.jp COPYING
+%doc NEWS README README.claws README.jp RELEASE_NOTES.claws 
+%doc TODO TODO.claws TODO.jp
 %{_bindir}/*
 %dir %{_libdir}/sylpheed-claws/
 %dir %{_libdir}/sylpheed-claws/plugins/
@@ -123,19 +122,8 @@
 # -----------------------------------------------------------------------------
 
 %changelog
-* Wed Feb 09 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0:1.0.1-1
-- version upgrade
-- cleaned up BuildRequires/Requires and configure options
-
-* Tue Dec 21 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0:0.9.13-1
-- version upgrade
-- remove old configure options for GnuPG support (moved to a new plugin now)
-- enable new pgpmime-plugin
-
 * Tue Jul 20 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0:0.9.12-1
+0:0.9.12-0.fdr.1
 - version upgrade
 - lots of s/sylpheed/sylpheed-claws/
 



From fedora-extras-commits at redhat.com  Wed Mar  2 11:18:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:18:38 -0500
Subject: rpms/Macaulay2 import.log,1.2,1.3
Message-ID: <200503021118.j22BIcde010290@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/Macaulay2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10280

Modified Files:
	import.log 
Log Message:
auto-import Macaulay2-0.9.2-0.fdr.13.2 on branch FC-2 from Macaulay2-0.9.2-0.fdr.13.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Dec 2004 16:15:35 -0000	1.2
+++ import.log	2 Mar 2005 11:18:36 -0000	1.3
@@ -1 +1,2 @@
 Macaulay2-0_9_2-0_fdr_13_2:HEAD:Macaulay2-0.9.2-0.fdr.13.2.src.rpm:1102522594
+Macaulay2-0_9_2-0_fdr_13_2:FC-2:Macaulay2-0.9.2-0.fdr.13.2.src.rpm:1109762320



From fedora-extras-commits at redhat.com  Wed Mar  2 11:18:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 2 Mar 2005 06:18:38 -0500
Subject: rpms/Macaulay2/FC-2 Macaulay2.spec,1.2,1.3
Message-ID: <200503021118.j22BIcjh010293@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/Macaulay2/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10280/FC-2

Modified Files:
	Macaulay2.spec 
Log Message:
auto-import Macaulay2-0.9.2-0.fdr.13.2 on branch FC-2 from Macaulay2-0.9.2-0.fdr.13.2.src.rpm
Bring in stuff from fedora.us FC2/testing


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/FC-2/Macaulay2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Macaulay2.spec	10 Dec 2004 22:03:01 -0000	1.2
+++ Macaulay2.spec	2 Mar 2005 11:18:36 -0000	1.3
@@ -4,7 +4,7 @@
 Name:    Macaulay2 
 Epoch:	 0
 Version: 0.9.2
-Release: 13%{?dist_tag}
+Release: 0.fdr.13%{?dist_tag}.2
 License: GPL 
 Group:   Applications/Engineering
 URL:	 http://www.math.uiuc.edu/Macaulay2/



From fedora-extras-commits at redhat.com  Wed Mar  2 18:40:37 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 2 Mar 2005 13:40:37 -0500
Subject: devel/grip grip.spec,1.2,1.3
Message-ID: <200503021840.j22IebVk016660@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/grip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16654

Modified Files:
	grip.spec 
Log Message:
* fixed "Source"
* removed some spaces
* updated changelog



Index: grip.spec
===================================================================
RCS file: /cvs/extras/devel/grip/grip.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grip.spec	2 Mar 2005 09:22:01 -0000	1.2
+++ grip.spec	2 Mar 2005 18:40:35 -0000	1.3
@@ -5,7 +5,7 @@
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
-Source: http://www.nostatic/grip/grip-%{version}.tar.gz
+Source: http://dl.sf.net/grip/grip-%{version}.tar.gz
 Patch1: grip-3.2.0-default.patch
 URL: http://www.nostatic.org/grip/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,8 +17,8 @@
 
 %description
 Grip is a GTK+ based front-end for CD rippers (such as cdparanoia and
-cdda2wav) and Ogg Vorbis encoders.  Grip allows you to rip entire tracks or
-just a section of a track.  Grip supports the CDDB protocol for
+cdda2wav) and Ogg Vorbis encoders. Grip allows you to rip entire tracks or
+just a section of a track. Grip supports the CDDB protocol for
 accessing track information on disc database servers.
 
 %prep
@@ -82,7 +82,8 @@
 - use %%{_smp_mflags}
 - changed .desktop file creation and installation
 - removed INSTALL and NEWS from %%doc
-- delete changelog entries older than 2004
+- deleted changelog entries older than 2004
+- changed Source line to be valid
 
 * Fri Oct  8 2004 Bill Nottingham <notting at redhat.com> 3.2.0-3
 - add a passel of buildreqs (#135045)



From fedora-extras-commits at redhat.com  Wed Mar  2 19:05:17 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 2 Mar 2005 14:05:17 -0500
Subject: rpms/revelation/FC-3 .cvsignore, 1.3, 1.4 revelation.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200503021905.j22J5H4M017426@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/revelation/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17417/FC-3

Modified Files:
	.cvsignore revelation.spec sources 
Log Message:
Update to 0.4.0; heavy changes on BR and Req, use shared-mime-info and desktop-file-utils; x86_64 suboptimal for now, but working


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/revelation/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:17:52 -0000	1.3
+++ .cvsignore	2 Mar 2005 19:05:15 -0000	1.4
@@ -1 +1 @@
-revelation-0.3.4.tar.bz2
+revelation-0.4.0.tar.bz2


Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/FC-3/revelation.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- revelation.spec	10 Dec 2004 22:03:10 -0000	1.3
+++ revelation.spec	2 Mar 2005 19:05:15 -0000	1.4
@@ -1,30 +1,32 @@
-%define pyver %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")
 %{!?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)")}
 
 Summary:	Password manager for GNOME 2
 Name: 		revelation
-Version: 	0.3.4
+Version: 	0.4.0
 Epoch: 		0
 Release: 	1
 License: 	GPL
 Group: 		Applications/Productivity
-Source: 	ftp://oss.codepoet.no/revelation/revelation-0.3.4.tar.bz2
+Source: 	ftp://oss.codepoet.no/revelation/revelation-0.4.0.tar.bz2
 URL: 		http://oss.codepoet.no/revelation/
+Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	python-crypto >= 0:2.0
-Requires:	gtk2 >= 0:2.2
-Requires:	pygtk2 >= 0:2.2
-Requires:	gnome-python2 >= 0:2.0
+Requires:	pygtk2 >= 0:2.4
 Requires:	gnome-python2-gconf >= 0:2.0
-Requires:       python-abi = %{pyver}
+Requires:	gnome-python2-gnomevfs >= 0:2.6
 BuildRequires:  python >= 0:2.2
-BuildRequires:  python-devel >= 0:2.2
+BuildRequires:  python-devel >= 0:2.3
+BuildRequires:  pygtk2-devel >= 0:2.4
 BuildRequires:	gnome-python2-gconf >= 0:2.0
-BuildRequires:  desktop-file-utils
+BuildRequires:	libgnomeui-devel >= 0:2.8
+BuildRequires:	gnome-keyring-devel >= 0:0.4.0
+BuildRequires:	desktop-file-utils 
+BuildRequires:	python-crypto >= 0:2.0
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n)
-Requires(post):	GConf2
-Requires(preun):GConf2
-BuildArch:      noarch
+Requires(post):	 GConf2 shared-mime-info desktop-file-utils
+Requires(preun): GConf2
+Requires(postun):shared-mime-info desktop-file-utils
 
 %description
 Revelation is a password manager. It organizes accounts in
@@ -34,13 +36,14 @@
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%configure --disable-desktop-update --disable-mime-update 
+make %{?_smp_mflags}
+
 
 %install
 %{__rm} -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
   --vendor fedora \
@@ -53,12 +56,17 @@
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCES
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
  
 %preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCES
+
+%postun
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean
@@ -71,18 +79,34 @@
 %config %{_sysconfdir}/gconf/schemas/*.schemas
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*.png
 %{_datadir}/revelation/
+%{_datadir}/icons/hicolor/??x??/mimetypes/gnome-mime-application-x-revelation.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+#dir %{python_sitearch}/revelation/
+# the next entry should be python_sitearch, but the packages currently does it 
+# wrong on install and during execution. So leave it in {python_sitelib} for now
+%{python_sitelib}/revelation/authmanager.so
+%dir %{python_sitelib}/revelation/
+%dir %{python_sitelib}/revelation/datahandler/
+%{_datadir}/mime/packages/*
 %{python_sitelib}/revelation/*.py
 %{python_sitelib}/revelation/*.pyc
-%ghost %{python_sitelib}/revelation/*.pyo                                                                                             
+%ghost %{python_sitelib}/revelation/*.pyo
 %{python_sitelib}/revelation/datahandler/*.py
 %{python_sitelib}/revelation/datahandler/*.pyc
-%ghost %{python_sitelib}/revelation/datahandler/*.pyo                                                                                             
-%dir %{python_sitelib}/revelation/
-%dir %{python_sitelib}/revelation/datahandler/
+%ghost %{python_sitelib}/revelation/datahandler/*.pyo
 
 %changelog
+* Tue Mar 01 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.0-1
+- Update to 0.4.0 - depends on gtk 2.4 now
+- Uses configure now
+- add BR pygtk2-devel gnome-keyring-devel
+- use shared-mime-info and desktop-file-utils
+- Remove unneeded explicit Requires 
+- not a noarch package anymore
+- on x86_64 it currently installs and needs authmanager.so in %%{python_sitelib}
+  will report upstream
+
 * Wed Sep 29 2004 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.3.4-0.fdr.1
 - Update to 0.3.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/revelation/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:17:52 -0000	1.3
+++ sources	2 Mar 2005 19:05:15 -0000	1.4
@@ -1 +1 @@
-1b5d3b02bf5cce6568082c39cf74f9e6  revelation-0.3.4.tar.bz2
+d00dd223a1c35472e573fb11d758cd98  revelation-0.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar  2 19:05:17 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 2 Mar 2005 14:05:17 -0500
Subject: rpms/revelation/devel .cvsignore, 1.3, 1.4 revelation.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200503021905.j22J5HP8017432@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/revelation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17417/devel

Modified Files:
	.cvsignore revelation.spec sources 
Log Message:
Update to 0.4.0; heavy changes on BR and Req, use shared-mime-info and desktop-file-utils; x86_64 suboptimal for now, but working


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:17:52 -0000	1.3
+++ .cvsignore	2 Mar 2005 19:05:15 -0000	1.4
@@ -1 +1 @@
-revelation-0.3.4.tar.bz2
+revelation-0.4.0.tar.bz2


Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- revelation.spec	28 Feb 2005 21:12:57 -0000	1.4
+++ revelation.spec	2 Mar 2005 19:05:15 -0000	1.5
@@ -1,30 +1,32 @@
-%define pyver %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")
 %{!?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)")}
 
 Summary:	Password manager for GNOME 2
 Name: 		revelation
-Version: 	0.3.4
+Version: 	0.4.0
 Epoch: 		0
 Release: 	1
 License: 	GPL
 Group: 		Applications/Productivity
-Source: 	ftp://oss.codepoet.no/revelation/revelation-0.3.4.tar.bz2
+Source: 	ftp://oss.codepoet.no/revelation/revelation-0.4.0.tar.bz2
 URL: 		http://oss.codepoet.no/revelation/
+Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	python-crypto >= 0:2.0
-Requires:	gtk2 >= 0:2.2
-Requires:	pygtk2 >= 0:2.2
-Requires:	gnome-python2 >= 0:2.0
+Requires:	pygtk2 >= 0:2.4
 Requires:	gnome-python2-gconf >= 0:2.0
-Requires:       python-abi = %{pyver}
+Requires:	gnome-python2-gnomevfs >= 0:2.6
 BuildRequires:  python >= 0:2.2
-BuildRequires:  python-devel >= 0:2.2
+BuildRequires:  python-devel >= 0:2.3
+BuildRequires:  pygtk2-devel >= 0:2.4
 BuildRequires:	gnome-python2-gconf >= 0:2.0
-BuildRequires:  desktop-file-utils
+BuildRequires:	libgnomeui-devel >= 0:2.8
+BuildRequires:	gnome-keyring-devel >= 0:0.4.0
+BuildRequires:	desktop-file-utils 
+BuildRequires:	python-crypto >= 0:2.0
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n)
-Requires(post):	GConf2
-Requires(preun):GConf2
-BuildArch:      noarch
+Requires(post):	 GConf2 shared-mime-info desktop-file-utils
+Requires(preun): GConf2
+Requires(postun):shared-mime-info desktop-file-utils
 
 %description
 Revelation is a password manager. It organizes accounts in
@@ -34,13 +36,14 @@
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%configure --disable-desktop-update --disable-mime-update 
+make %{?_smp_mflags}
+
 
 %install
 %{__rm} -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
   --vendor fedora \
@@ -53,12 +56,17 @@
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCES
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
  
 %preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCES
+
+%postun
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean
@@ -71,18 +79,34 @@
 %config %{_sysconfdir}/gconf/schemas/*.schemas
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*.png
 %{_datadir}/revelation/
+%{_datadir}/icons/hicolor/??x??/mimetypes/gnome-mime-application-x-revelation.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+#dir %{python_sitearch}/revelation/
+# the next entry should be python_sitearch, but the packages currently does it 
+# wrong on install and during execution. So leave it in {python_sitelib} for now
+%{python_sitelib}/revelation/authmanager.so
+%dir %{python_sitelib}/revelation/
+%dir %{python_sitelib}/revelation/datahandler/
+%{_datadir}/mime/packages/*
 %{python_sitelib}/revelation/*.py
 %{python_sitelib}/revelation/*.pyc
 %ghost %{python_sitelib}/revelation/*.pyo
 %{python_sitelib}/revelation/datahandler/*.py
 %{python_sitelib}/revelation/datahandler/*.pyc
 %ghost %{python_sitelib}/revelation/datahandler/*.pyo
-%dir %{python_sitelib}/revelation/
-%dir %{python_sitelib}/revelation/datahandler/
 
 %changelog
+* Tue Mar 01 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.0-1
+- Update to 0.4.0 - depends on gtk 2.4 now
+- Uses configure now
+- add BR pygtk2-devel gnome-keyring-devel
+- use shared-mime-info and desktop-file-utils
+- Remove unneeded explicit Requires 
+- not a noarch package anymore
+- on x86_64 it currently installs and needs authmanager.so in %%{python_sitelib}
+  will report upstream
+
 * Wed Sep 29 2004 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.3.4-0.fdr.1
 - Update to 0.3.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:17:52 -0000	1.3
+++ sources	2 Mar 2005 19:05:15 -0000	1.4
@@ -1 +1 @@
-1b5d3b02bf5cce6568082c39cf74f9e6  revelation-0.3.4.tar.bz2
+d00dd223a1c35472e573fb11d758cd98  revelation-0.4.0.tar.bz2



From ville.skytta at iki.fi  Wed Mar  2 19:34:42 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Wed, 02 Mar 2005 21:34:42 +0200
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011704210.12801@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<1109706413.15077.126.camel@bobcat.mine.nu>
	<Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
	<1109713442.15077.181.camel@bobcat.mine.nu>
	<Pine.LNX.4.61.0503011704210.12801@alien.devel.redhat.com>
Message-ID: <1109792082.15077.236.camel@bobcat.mine.nu>

On Tue, 2005-03-01 at 17:06 -0500, Cristian Gafton wrote:

> For things like RHL-9 and FC-1 and whatnot, "devel/" might be too 
> comples/advanced/whatever. subsequent cvs-imports into those branches will 
> clear things out, so this is only a matter of pedantery as far as choosing 
> the initial branch point.

Right, got it.  Thanks again for creating the branches.



From fedora-extras-commits at redhat.com  Wed Mar  2 20:42:20 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 15:42:20 -0500
Subject: common Makefile,1.1,1.2
Message-ID: <200503022042.j22KgK1k018480@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18461/common

Modified Files:
	Makefile 
Log Message:


Test commit.



Index: Makefile
===================================================================
RCS file: /cvs/extras/common/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	24 Nov 2004 02:55:45 -0000	1.1
+++ Makefile	2 Mar 2005 20:42:18 -0000	1.2
@@ -1,4 +1,4 @@
-# lame duck Makefile that exists for the sole purpose of "make clean"
+# lame duck Makefile that exists for the sole purpose of "make clean" 
 
 all:
 



From fedora-extras-commits at redhat.com  Wed Mar  2 20:42:20 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 15:42:20 -0500
Subject: rpms/lft/devel lft.spec,1.6,1.7
Message-ID: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/lft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18461/devel

Modified Files:
	lft.spec 
Log Message:


Test commit.



Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lft.spec	15 Jan 2005 11:10:43 -0000	1.6
+++ lft.spec	2 Mar 2005 20:42:18 -0000	1.7
@@ -1,7 +1,6 @@
 Name:           lft
 Version:        2.3
 Release:        1
-Epoch:          0
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 20:54:27 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 15:54:27 -0500
Subject: common Makefile,1.2,1.3
Message-ID: <200503022054.j22KsRNk018636@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18604/common

Modified Files:
	Makefile 
Log Message:
testing 123


Index: Makefile
===================================================================
RCS file: /cvs/extras/common/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	2 Mar 2005 20:42:18 -0000	1.2
+++ Makefile	2 Mar 2005 20:54:25 -0000	1.3
@@ -1,4 +1,4 @@
-# lame duck Makefile that exists for the sole purpose of "make clean" 
+# lame duck Makefile that exists for the sole purpose of "make clean"
 
 all:
 



From fedora-extras-commits at redhat.com  Wed Mar  2 20:54:28 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 15:54:28 -0500
Subject: rpms/lft/devel lft.spec,1.7,1.8
Message-ID: <200503022054.j22KsSKC018641@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/lft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18604/devel

Modified Files:
	lft.spec 
Log Message:
testing 123


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lft.spec	2 Mar 2005 20:42:18 -0000	1.7
+++ lft.spec	2 Mar 2005 20:54:25 -0000	1.8
@@ -15,7 +15,7 @@
 Obsoletes:      fft
 
 %description
-LFT, short for Layer Four Traceroute, is a sort of 'traceroute' that
+LFT, short for Layer Four Traceroute, is a 'traceroute' utility that
 often works much faster (than the commonly-used Van Jacobson method)
 and goes through many configurations of packet-filter based
 firewalls. More importantly, LFT implements numerous other features



From ville.skytta at iki.fi  Wed Mar  2 20:57:24 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Wed, 02 Mar 2005 22:57:24 +0200
Subject: rpms/lft/devel lft.spec,1.6,1.7
In-Reply-To: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
Message-ID: <1109797044.15077.271.camel@bobcat.mine.nu>

On Wed, 2005-03-02 at 15:42 -0500, Elliot Lee wrote:

> Test commit.
[...]
> @@ -1,7 +1,6 @@
>  Name:           lft
>  Version:        2.3
>  Release:        1
> -Epoch:          0

Removal of "Epoch: 0" will break "rpm -F" updating from earlier
revisions, please revert.

https://bugzilla.redhat.com/beta/show_bug.cgi?id=143301
https://www.redhat.com/archives/fedora-packaging/2005-February/msg00134.html



From fedora-extras-commits at redhat.com  Wed Mar  2 20:59:23 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 15:59:23 -0500
Subject: rpms/lft/FC-2 lft.spec,1.4,1.5
Message-ID: <200503022059.j22KxNJH018753@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/lft/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18726/FC-2

Modified Files:
	lft.spec 
Log Message:
Testing again


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/FC-2/lft.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lft.spec	8 Nov 2004 04:41:18 -0000	1.4
+++ lft.spec	2 Mar 2005 20:59:21 -0000	1.5
@@ -1,7 +1,6 @@
 Name:           lft
 Version:        2.2
 Release:        0.fdr.2.2
-Epoch:          0
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 20:59:23 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 15:59:23 -0500
Subject: rpms/lft/FC-3 lft.spec,1.6,1.7
Message-ID: <200503022059.j22KxNaX018757@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/lft/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18726/FC-3

Modified Files:
	lft.spec 
Log Message:
Testing again


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/FC-3/lft.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lft.spec	15 Jan 2005 11:10:43 -0000	1.6
+++ lft.spec	2 Mar 2005 20:59:21 -0000	1.7
@@ -1,7 +1,6 @@
 Name:           lft
 Version:        2.3
 Release:        1
-Epoch:          0
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 21:21:07 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:21:07 -0500
Subject: rpms/lft/devel lft.spec,1.8,1.9
Message-ID: <200503022121.j22LL7Bd019614@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/lft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19571/lft/devel

Modified Files:
	lft.spec 
Log Message:
I have proved that people read commits list! Another excuse to test the log script.


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lft.spec	2 Mar 2005 20:54:25 -0000	1.8
+++ lft.spec	2 Mar 2005 21:21:05 -0000	1.9
@@ -1,6 +1,7 @@
 Name:           lft
 Version:        2.3
 Release:        1
+Epoch:		0
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 21:21:07 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:21:07 -0500
Subject: rpms/zope/FC-3 zope.spec,1.2,1.3
Message-ID: <200503022121.j22LL7qa019618@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/zope/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19571/zope/FC-3

Modified Files:
	zope.spec 
Log Message:
I have proved that people read commits list! Another excuse to test the log script.


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/zope.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zope.spec	29 Jan 2005 22:57:17 -0000	1.2
+++ zope.spec	2 Mar 2005 21:21:05 -0000	1.3
@@ -14,6 +14,7 @@
 Summary: Web application server for flexible content management applications
 Version: 2.7.4
 Release: 1
+Epoch:	 0
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:	 http://www.zope.org/



From fedora-extras-commits at redhat.com  Wed Mar  2 21:21:07 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:21:07 -0500
Subject: rpms/lft/FC-3 lft.spec,1.7,1.8
Message-ID: <200503022121.j22LL7cC019609@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/lft/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19571/lft/FC-3

Modified Files:
	lft.spec 
Log Message:
I have proved that people read commits list! Another excuse to test the log script.


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/FC-3/lft.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lft.spec	2 Mar 2005 20:59:21 -0000	1.7
+++ lft.spec	2 Mar 2005 21:21:04 -0000	1.8
@@ -1,6 +1,7 @@
 Name:           lft
 Version:        2.3
 Release:        1
+Epoch:		0
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 21:21:06 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:21:06 -0500
Subject: rpms/lft/FC-2 lft.spec,1.5,1.6
Message-ID: <200503022121.j22LL69B019606@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/lft/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19571/lft/FC-2

Modified Files:
	lft.spec 
Log Message:
I have proved that people read commits list! Another excuse to test the log script.


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/FC-2/lft.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lft.spec	2 Mar 2005 20:59:21 -0000	1.5
+++ lft.spec	2 Mar 2005 21:21:04 -0000	1.6
@@ -1,6 +1,7 @@
 Name:           lft
 Version:        2.2
 Release:        0.fdr.2.2
+Epoch:		0
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 21:21:07 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:21:07 -0500
Subject: rpms/zope/devel zope.spec,1.2,1.3
Message-ID: <200503022121.j22LL7co019621@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/zope/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19571/zope/devel

Modified Files:
	zope.spec 
Log Message:
I have proved that people read commits list! Another excuse to test the log script.


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zope.spec	29 Jan 2005 22:57:17 -0000	1.2
+++ zope.spec	2 Mar 2005 21:21:05 -0000	1.3
@@ -14,6 +14,7 @@
 Summary: Web application server for flexible content management applications
 Version: 2.7.4
 Release: 1
+Epoch:	 0
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:	 http://www.zope.org/



From fedora-extras-commits at redhat.com  Wed Mar  2 21:27:39 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:27:39 -0500
Subject: rpms/lft/FC-3 lft.spec,1.8,1.9
Message-ID: <200503022127.j22LRdwt019800@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/lft/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19772/lft/FC-3

Modified Files:
	lft.spec 
Log Message:
another test


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/FC-3/lft.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lft.spec	2 Mar 2005 21:21:04 -0000	1.8
+++ lft.spec	2 Mar 2005 21:27:35 -0000	1.9
@@ -1,3 +1,4 @@
+# Layer Four Traceroute
 Name:           lft
 Version:        2.3
 Release:        1



From fedora-extras-commits at redhat.com  Wed Mar  2 21:27:39 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:27:39 -0500
Subject: rpms/lft/devel lft.spec,1.9,1.10
Message-ID: <200503022127.j22LRdOW019803@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/lft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19772/lft/devel

Modified Files:
	lft.spec 
Log Message:
another test


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lft.spec	2 Mar 2005 21:21:05 -0000	1.9
+++ lft.spec	2 Mar 2005 21:27:36 -0000	1.10
@@ -1,3 +1,4 @@
+# lft = Layer Four Traceroute
 Name:           lft
 Version:        2.3
 Release:        1



From fedora-extras-commits at redhat.com  Wed Mar  2 21:27:39 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:27:39 -0500
Subject: rpms/zope/devel zope.spec,1.3,1.4
Message-ID: <200503022127.j22LRdJK019806@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/zope/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19772/zope/devel

Modified Files:
	zope.spec 
Log Message:
another test


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zope.spec	2 Mar 2005 21:21:05 -0000	1.3
+++ zope.spec	2 Mar 2005 21:27:36 -0000	1.4
@@ -1,3 +1,5 @@
+# Zope application server
+
 %define python_minver 2.3.3
 
 %define zope_user      zope



From fedora-extras-commits at redhat.com  Wed Mar  2 21:36:07 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:36:07 -0500
Subject: rpms/zope/devel zope.spec,1.4,1.5
Message-ID: <200503022136.j22La7Rp020027@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/zope/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19986/zope/devel

Modified Files:
	zope.spec 
Log Message:
yet another test 25930


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zope.spec	2 Mar 2005 21:27:36 -0000	1.4
+++ zope.spec	2 Mar 2005 21:36:05 -0000	1.5
@@ -1,5 +1,3 @@
-# Zope application server
-
 %define python_minver 2.3.3
 
 %define zope_user      zope



From fedora-extras-commits at redhat.com  Wed Mar  2 21:36:07 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:36:07 -0500
Subject: rpms/lft/devel lft.spec,1.10,1.11
Message-ID: <200503022136.j22La7Qr020023@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/lft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19986/lft/devel

Modified Files:
	lft.spec 
Log Message:
yet another test 25930


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lft.spec	2 Mar 2005 21:27:36 -0000	1.10
+++ lft.spec	2 Mar 2005 21:36:05 -0000	1.11
@@ -1,4 +1,3 @@
-# lft = Layer Four Traceroute
 Name:           lft
 Version:        2.3
 Release:        1



From fedora-extras-commits at redhat.com  Wed Mar  2 21:36:07 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:36:07 -0500
Subject: rpms/lft/FC-3 lft.spec,1.9,1.10
Message-ID: <200503022136.j22La792020019@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/lft/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19986/lft/FC-3

Modified Files:
	lft.spec 
Log Message:
yet another test 25930


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/FC-3/lft.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lft.spec	2 Mar 2005 21:27:35 -0000	1.9
+++ lft.spec	2 Mar 2005 21:36:05 -0000	1.10
@@ -1,4 +1,3 @@
-# Layer Four Traceroute
 Name:           lft
 Version:        2.3
 Release:        1



From fedora-extras-commits at redhat.com  Wed Mar  2 21:39:59 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:39:59 -0500
Subject: rpms/lft/devel lft.spec,1.11,1.12
Message-ID: <200503022139.j22Ldxt6020164@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/lft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20137/lft/devel

Modified Files:
	lft.spec 
Log Message:
the final test?


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lft.spec	2 Mar 2005 21:36:05 -0000	1.11
+++ lft.spec	2 Mar 2005 21:39:57 -0000	1.12
@@ -1,7 +1,7 @@
 Name:           lft
+Epoch:		0
 Version:        2.3
 Release:        1
-Epoch:		0
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Wed Mar  2 21:39:59 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 2 Mar 2005 16:39:59 -0500
Subject: rpms/zope/devel zope.spec,1.5,1.6
Message-ID: <200503022139.j22Ldx1a020168@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/zope/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20137/zope/devel

Modified Files:
	zope.spec 
Log Message:
the final test?


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- zope.spec	2 Mar 2005 21:36:05 -0000	1.5
+++ zope.spec	2 Mar 2005 21:39:57 -0000	1.6
@@ -12,9 +12,9 @@
 
 Name: 	 zope
 Summary: Web application server for flexible content management applications
+Epoch:	 0
 Version: 2.7.4
 Release: 1
-Epoch:	 0
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:	 http://www.zope.org/



From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net  Wed Mar  2 22:53:25 2005
From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou)
Date: Wed, 2 Mar 2005 23:53:25 +0100
Subject: rpms/lft/devel lft.spec,1.6,1.7
In-Reply-To: <1109797044.15077.271.camel@bobcat.mine.nu>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
Message-ID: <20050302235325.2fc6a141@python2>

Ville Skytt? wrote :

> On Wed, 2005-03-02 at 15:42 -0500, Elliot Lee wrote:
> 
> > Test commit.
> [...]
> > @@ -1,7 +1,6 @@
> >  Name:           lft
> >  Version:        2.3
> >  Release:        1
> > -Epoch:          0
> 
> Removal of "Epoch: 0" will break "rpm -F" updating from earlier
> revisions, please revert.
> 
> https://bugzilla.redhat.com/beta/show_bug.cgi?id=143301
>
https://www.redhat.com/archives/fedora-packaging/2005-February/msg00134.html

Grrr... still, we seemed to have agreed to remove all zero epochs before
FC3 Extras build... but you and Michael seem to have opposed it enough...
now we're still stuck with issues... is this _never_ going to end? :-(

Matthias

-- 
Clean custom Red Hat Linux rpm packages : http://freshrpms.net/
Fedora Core release 3 (Heidelberg) - Linux kernel 2.6.10-1.770_FC3
Load : 0.18 0.72 1.00



From gafton at redhat.com  Wed Mar  2 23:15:16 2005
From: gafton at redhat.com (Cristian Gafton)
Date: Wed, 2 Mar 2005 18:15:16 -0500 (EST)
Subject: rpms/lft/devel lft.spec,1.6,1.7
In-Reply-To: <20050302235325.2fc6a141@python2>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
Message-ID: <Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>

On Wed, 2 Mar 2005, Matthias Saou wrote:

> Grrr... still, we seemed to have agreed to remove all zero epochs before
> FC3 Extras build... but you and Michael seem to have opposed it enough...
> now we're still stuck with issues... is this _never_ going to end? :-(

Frankly I could not give a damn about the fact that we break Freshen - 
these things are fed through yum from a yum repository, so I really
don't care that rpm -F might fail in some weird conditions.

Epoch: 0 is stupid, useless and moronic.

Cristian
-- 
----------------------------------------------------------------------
Cristian Gafton     --     gafton at redhat.com      --     Red Hat, Inc.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"Linux is a leprosy; and is having a deleterious effect on the U.S. IT
industry because it is steadily depreciating the value of the software
industry sector."
     -- Kenneth Brown, President, Alexis de Tocqueville Institution



From dgregor at redhat.com  Tue Mar  1 21:21:32 2005
From: dgregor at redhat.com (Dennis Gregorovic)
Date: Tue, 01 Mar 2005 16:21:32 -0500
Subject: cvs-import.sh: FC-3 or devel?
In-Reply-To: <Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
References: <1109462273.20537.1.camel@scriabin.tannenrauch.ch>
	<20050227010802.0848b591.bugs.michael@gmx.net>
	<1109466448.9485.0.camel@scriabin.tannenrauch.ch>
	<20050227024321.73e1a839.bugs.michael@gmx.net>
	<20050301190602.GA14804@lisas.de>
	<Pine.LNX.4.61.0503011407320.26940@alien.devel.redhat.com>
	<1109706413.15077.126.camel@bobcat.mine.nu>
	<Pine.LNX.4.61.0503011609020.12801@alien.devel.redhat.com>
Message-ID: <1109712093.24822.78.camel@localhost.localdomain>

I don't have write access to that page, but I would appreciate it if an
FC-3 branch could be created for perl-Class-MethodMaker.

-- Dennis

On Tue, 2005-03-01 at 16:09 -0500, Cristian Gafton wrote:
> On Tue, 1 Mar 2005, Ville [ISO-8859-1] Skytt wrote:
> 
> >> For now, please use cvs-import to import the new packages and once the
> >> import is done ask on this list for a branch to be created for your new
> >> import. We'll wade through this manual process until I adapt the scripts.
> >
> > Related: there's a pretty long list at
> > http://fedoraproject.org/wiki/Extras_2fCVSSyncNeeded , but all of those
> > are (for now) for < FC3 fedora.us updates, as far as I can tell.  These
> > can probably wait at least until the script can take care of things.
> 
> I can create the branches for all those. I assume that if the branch 
> source is devel/ everything would be fine?
> 
> Cristian
> -- 
> ----------------------------------------------------------------------
> Cristian Gafton     --     gafton at redhat.com      --     Red Hat, Inc.
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> "Linux is a leprosy; and is having a deleterious effect on the U.S. IT
> industry because it is steadily depreciating the value of the software
> industry sector."
>      -- Kenneth Brown, President, Alexis de Tocqueville Institution
> -- fedora-extras-commits mailing list fedora-extras-commits at redhat.com http://www.redhat.com/mailman/listinfo/fedora-extras-commits



From dag at wieers.com  Wed Mar  2 23:17:33 2005
From: dag at wieers.com (Dag Wieers)
Date: Thu, 3 Mar 2005 00:17:33 +0100 (CET)
Subject: rpms/lft/devel lft.spec,1.6,1.7
In-Reply-To: <Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
Message-ID: <Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>

On Wed, 2 Mar 2005, Cristian Gafton wrote:

> On Wed, 2 Mar 2005, Matthias Saou wrote:
> 
> > Grrr... still, we seemed to have agreed to remove all zero epochs before
> > FC3 Extras build... but you and Michael seem to have opposed it enough...
> > now we're still stuck with issues... is this _never_ going to end? :-(
> 
> Frankly I could not give a damn about the fact that we break Freshen - these
> things are fed through yum from a yum repository, so I really
> don't care that rpm -F might fail in some weird conditions.
> 
> Epoch: 0 is stupid, useless and moronic.

Where were you 2 years ago ? We needed you back then :)

--   dag wieers,  dag at wieers.com,  http://dag.wieers.com/   --
[all I want is a warm bed and a kind word and unlimited power]



From bugs.michael at gmx.net  Thu Mar  3 09:00:00 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 10:00:00 +0100
Subject: rpms/lft/devel lft.spec,1.6,1.7
In-Reply-To: <Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
Message-ID: <20050303100000.2268863a.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 00:17:33 +0100 (CET), Dag Wieers wrote:

> On Wed, 2 Mar 2005, Cristian Gafton wrote:
> 
> > On Wed, 2 Mar 2005, Matthias Saou wrote:
> > 
> > > Grrr... still, we seemed to have agreed to remove all zero epochs before
> > > FC3 Extras build... but you and Michael seem to have opposed it enough...
> > > now we're still stuck with issues... is this _never_ going to end? :-(

No, it's never going to end, because attempts at removing zero epochs have
been half-hearted so far. We sort of agreed on removing them, but package
owners was given enough freedom to choose whether to keep them. And with
the added -Fvh breakage, the topic died. Also, explicit epochs in
BuildRequires and Requires are still used, too.  

The Epoch indecision is going to end finally if somebody said: "Remove all
explicit zero epochs from CVS till March, 14th" or so. Then we all remove
them, and it won't be just individuals who break rpm -Fvh or who upset
users, who rebuild packages for older platforms and old RPM releases.

> > Frankly I could not give a damn about the fact that we break Freshen - these
> > things are fed through yum from a yum repository, so I really
> > don't care that rpm -F might fail in some weird conditions.
> > 
> > Epoch: 0 is stupid, useless and moronic.
> 
> Where were you 2 years ago ? We needed you back then :)

Two years ago, explicit Epoch 0 made sense.

Nowadays, the supported versions of RPM no longer require it.

-- 
Fedora Core release 3 (Heidelberg) - Linux 2.6.10-1.770_FC3
loadavg: 0.10 0.06 0.09



From dag at wieers.com  Thu Mar  3 12:17:44 2005
From: dag at wieers.com (Dag Wieers)
Date: Thu, 3 Mar 2005 13:17:44 +0100 (CET)
Subject: rpms/lft/devel lft.spec,1.6,1.7
In-Reply-To: <20050303100000.2268863a.bugs.michael@gmx.net>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
Message-ID: <Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>

On Thu, 3 Mar 2005, Michael Schwendt wrote:

> On Thu, 3 Mar 2005 00:17:33 +0100 (CET), Dag Wieers wrote:
> 
> > On Wed, 2 Mar 2005, Cristian Gafton wrote:
> > 
> > > Frankly I could not give a damn about the fact that we break Freshen - these
> > > things are fed through yum from a yum repository, so I really
> > > don't care that rpm -F might fail in some weird conditions.
> > > 
> > > Epoch: 0 is stupid, useless and moronic.
> > 
> > Where were you 2 years ago ? We needed you back then :)
> 
> Two years ago, explicit Epoch 0 made sense.
> 
> Nowadays, the supported versions of RPM no longer require it.

Explicit Epoch 0 never made sense, we never required it for anything, Red 
Hat never required it and JBJ admits he was misquoted on the subject.

But please do include your line of thought.

--   dag wieers,  dag at wieers.com,  http://dag.wieers.com/   --
[all I want is a warm bed and a kind word and unlimited power]



From bugs.michael at gmx.net  Thu Mar  3 13:15:32 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 14:15:32 +0100
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
Message-ID: <20050303141532.679168a7.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 13:17:44 +0100 (CET), Dag Wieers wrote:

> > > > Frankly I could not give a damn about the fact that we break Freshen - these
> > > > things are fed through yum from a yum repository, so I really
> > > > don't care that rpm -F might fail in some weird conditions.
> > > > 
> > > > Epoch: 0 is stupid, useless and moronic.
> > > 
> > > Where were you 2 years ago ? We needed you back then :)
> > 
> > Two years ago, explicit Epoch 0 made sense.
> > 
> > Nowadays, the supported versions of RPM no longer require it.
> 
> Explicit Epoch 0 never made sense, we never required it for anything, Red 
> Hat never required it and JBJ admits he was misquoted on the subject.
> 
> But please do include your line of thought.

My line of thought is the following:

I was not involved in making explicit Epoch 0 a policy. I understood the
problems with missing Epoch and RPM < 4.1.1. I didn't see the explicit
Epoch 0 rule as a burden. A burden so high that I would complain forever
and rather choose to boycott a community project than get productive.

There was at least one case (modplug is the one I remember) where the
explicit Epoch 0 rule avoided upgrade problems. Since I knew we would be
save, I didn't track any other corner-cases, which would be affected by
the Epoch problem. The good effect of the explicit Epoch 0 rule was, we
didn't need to care about related upgrade problems.

I don't remember that jbj was ever quoted on it. I didn't pursue some
of the controversial subjects as much as a few individuals did.
I only remember that jbj's comment on "%buildroot vs $RPM_BUILD_ROOT" was
misinterpreted.

And as a final comment on the subject, personal opinion is not what
counts.  Decisions are needed. You can evaluate personal opinions and
consider them in a decision. However, it's the final decision that
counts. How to arrive at a decision is another subject. And I hope the
Fedora Extras Steering Committee can bring about a decision in this
matter, too.



From fedora-extras-commits at redhat.com  Thu Mar  3 13:44:00 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 08:44:00 -0500
Subject: rpms/hunt/devel .cvsignore,1.2,1.3
Message-ID: <200503031344.j23Di07Z002991@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/hunt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2983

Modified Files:
	.cvsignore 
Log Message:
updated



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hunt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:33:43 -0000	1.2
+++ .cvsignore	3 Mar 2005 13:43:58 -0000	1.3
@@ -1 +1,3 @@
+*.src.rpm
+*.i386.rpm
 hunt-1.5.tgz



From fedora-extras-commits at redhat.com  Thu Mar  3 13:44:46 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 08:44:46 -0500
Subject: rpms/hunt/devel hunt-1.5-signness.patch, NONE,
	1.1 hunt-1.5-listlen.patch, NONE, 1.1 hunt-1.5-cleanup.patch,
	NONE, 1.1 hunt-1.5-badcmp.patch, NONE,
	1.1 hunt-1.5-arridx.patch, NONE, 1.1 hunt.spec, 1.4, 1.5
Message-ID: <200503031344.j23DikL7003025@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/hunt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3018

Modified Files:
	hunt.spec 
Added Files:
	hunt-1.5-signness.patch hunt-1.5-listlen.patch 
	hunt-1.5-cleanup.patch hunt-1.5-badcmp.patch 
	hunt-1.5-arridx.patch 
Log Message:
- fixed out-of-range array subscript (BZ #149777)
- fixed lots of warnings regarding different signedness
- fixed some minor compilation warnings
- fixed bad handling of hosts-lists when start-host > end-host


hunt-1.5-signness.patch:

--- NEW FILE hunt-1.5-signness.patch ---
--- hunt-1.5/addpolicy.c.signness	1999-02-13 13:23:15.000000000 +0100
+++ hunt-1.5/addpolicy.c	2005-03-03 14:36:18.000000000 +0100
@@ -105,7 +105,7 @@ void addpolicy_add_item(void)
 	struct add_policy_info *api;
 	unsigned int src_ip, dst_ip;
 	unsigned int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	int nr;
 
 
@@ -138,7 +138,7 @@ void addpolicy_mod_item(void)
 	struct add_policy_info *api;
 	unsigned int src_ip, dst_ip;
 	unsigned int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	int nr;
 	
 	addpolicy_list_items();
--- hunt-1.5/arphijack.c.signness	1999-06-13 16:53:20.000000000 +0200
+++ hunt-1.5/arphijack.c	2005-03-03 14:36:18.000000000 +0100
@@ -23,8 +23,8 @@
  *
  */
 
-int user_arp_hijack(struct user_conn_info *uci, char *src_fake_mac,
-		    char *dst_fake_mac, int input_mode)
+int user_arp_hijack(struct user_conn_info *uci, unsigned char *src_fake_mac,
+		    unsigned char *dst_fake_mac, int input_mode)
 {
 	struct conn_info *ci;
 	int retval;
@@ -44,7 +44,7 @@ int user_arp_hijack(struct user_conn_inf
  */
 
 struct watch_tty_data {
-	char *src_fake_mac;
+	unsigned char *src_fake_mac;
 	struct conn_info *ci;
 	int input_mode;
 };
@@ -100,7 +100,7 @@ static struct arp_spoof_info *asi_src; /
 static struct arp_spoof_info *asi_dst; /* dst in src host */
 static struct arp_dont_relay *dont_relay;
 
-int arp_hijack(struct conn_info *ci, char *src_fake_mac, char *dst_fake_mac,
+int arp_hijack(struct conn_info *ci, unsigned char *src_fake_mac, unsigned char *dst_fake_mac,
 	       int input_mode)
 {
 	struct iphdr *iph;
@@ -253,12 +253,12 @@ int arp_hijack(struct conn_info *ci, cha
 }
 
 
-void user_arp_hijack_done(char *src_fake_mac, char *dst_fake_mac)
+void user_arp_hijack_done(unsigned char *src_fake_mac, unsigned char *dst_fake_mac)
 {
 	arp_hijack_done(src_fake_mac, dst_fake_mac);
 }
 
-void arp_hijack_done(char *src_fake_mac, char *dst_fake_mac)
+void arp_hijack_done(unsigned char *src_fake_mac, unsigned char *dst_fake_mac)
 {
 	arp_dont_relay_remove(dont_relay);
 	if (asi_src && src_fake_mac) {
--- hunt-1.5/arpspoof.c.signness	2000-05-26 13:29:29.000000000 +0200
+++ hunt-1.5/arpspoof.c	2005-03-03 14:36:18.000000000 +0100
@@ -22,7 +22,7 @@ struct arp_spoof_range {
 	unsigned int 	dst_start_addr;
 	unsigned int 	dst_end_addr;
 	unsigned int	src_addr;
-	char 		src_fake_mac[ETH_ALEN];
+	unsigned char	src_fake_mac[ETH_ALEN];
 	int		refresh;
 	int		can_forward;
 	struct arp_spoof_range *next;
@@ -395,7 +395,7 @@ static void asi_wait_for_release(struct 
 
 struct arp_spoof_info *start_arp_spoof(unsigned int src_addr,
 				       unsigned int dst_addr,
-		char *src_mac, char *dst_mac, char *src_fake_mac,
+		unsigned char *src_mac, unsigned char *dst_mac, unsigned char *src_fake_mac,
 		int refresh, int can_forward, int in_range)
 {
 	struct arp_spoof_info *asi, *tmp;
--- hunt-1.5/hostup.c.signness	1999-06-03 12:10:35.000000000 +0200
+++ hunt-1.5/hostup.c	2005-03-03 14:36:18.000000000 +0100
@@ -118,7 +118,7 @@ static void perform_ping(struct host_up_
 	printf("\n");
 }
 
-static void send_arp_message(unsigned int ip, char *dst_mac)
+static void send_arp_message(unsigned int ip, unsigned char *dst_mac)
 {
 	struct arp_spec as;
 	
@@ -226,7 +226,8 @@ void host_up(void)
 	struct host_up_info *hui;
 	struct timespec ts;
 	unsigned int len;
-	unsigned char buf_mac[BUFSIZE], fake_mac[ETH_ALEN];
+	char buf_mac[BUFSIZE];
+	unsigned char fake_mac[ETH_ALEN];
 	
 	if ((start_ip = menu_choose_hostname("start ip addr", host_lookup(start_ip_def, HL_MODE_NR))) == -1)
 		return;
--- hunt-1.5/hunt.c.signness	2000-05-26 15:56:35.000000000 +0200
+++ hunt-1.5/hunt.c	2005-03-03 14:36:18.000000000 +0100
@@ -644,7 +644,7 @@ static inline void fast_tcp_process(stru
 	list_unlock(&l_ifunc_fast_tcp);
 }
 
-static void mac_table_update(unsigned int ip, char *mac)
+static void mac_table_update(unsigned int ip, unsigned char *mac)
 {
 	struct mac_info *mi;
 	
@@ -685,7 +685,7 @@ void mac_info_release(struct mac_info *m
 static void mac_arp_learn(struct packet *p)
 {
 	unsigned int ip;
-	char *mac;
+	unsigned char *mac;
 	struct arpeth_hdr *arpethh;
 
 	arpethh = (struct arpeth_hdr *)(p->p_arph + 1);
@@ -704,7 +704,7 @@ static void mac_arp_learn(struct packet 
 static void mac_ip_learn(struct packet *p)
 {
 	unsigned int ip;
-	char *mac;
+	unsigned char *mac;
 	
 	ip = p->p_iph->saddr;
 	mac = p->p_ethh->h_source;
--- hunt-1.5/hunt.h.signness	2005-03-03 14:36:18.000000000 +0100
+++ hunt-1.5/hunt.h	2005-03-03 14:36:32.000000000 +0100
@@ -235,7 +235,7 @@ struct arpeth_hdr {
 };
 
 struct mac_info {
-	char mac[ETH_ALEN];
+	unsigned char mac[ETH_ALEN];
 	pthread_mutex_t mutex;
 };
 
@@ -355,7 +355,7 @@ int menu_choose_string(char *label, char
 int menu(char *head, char *str_menu, char *label, char *opt, char dfl);
 void press_key(char *label);
 unsigned int menu_choose_hostname(char *label, char *dfl);
-int menu_choose_ports(char *label, int *ret_ports, char *dfl);
+int menu_choose_ports(char *label, unsigned int *ret_ports, char *dfl);
 int menu_choose_mac(char *label, unsigned char *mac_ret, char *dfl);
 int menu_choose_sdb(char *label, char dfl);
 
@@ -363,7 +363,7 @@ int menu_choose_host_mask_ports(char *la
 		unsigned int *ret_mask, unsigned int *ret_ports, char *dfl);
 int menu_choose_host_mask_ports_dfl(char *label, unsigned int *ret_ip,
 		unsigned int *ret_mask, unsigned int *ret_ports,
-		unsigned int dfl_ip, unsigned int dfl_mask, int *dfl_ports);
+		unsigned int dfl_ip, unsigned int dfl_mask, unsigned int *dfl_ports);
 
 void clear_new_conn_ind(void);
 void print_new_conn_ind(int add_new);
@@ -415,9 +415,9 @@ int print_eth_mac(unsigned char *mac);
 int sprintf_eth_mac(char *b, unsigned char *mac);
 int tap(char *device, int promisc_mode);
 int rawsock(void);
-int get_ifc_info(char *ifc_name, unsigned int *ip, char *mac);
+int get_ifc_info(char *ifc_name, unsigned int *ip, unsigned char *mac);
 
-int port_match(int port, unsigned int *db_ports);
+int port_match(unsigned int port, unsigned int *db_ports);
 void port_htons(unsigned int *db_ports);
 
 extern unsigned char __suggest_mac[ETH_ALEN];
@@ -493,11 +493,11 @@ void func_hijack_src(struct packet *p, s
 #define INPUT_MODE_RAW		0
 #define INPUT_MODE_LINEECHOR	1
 #define INPUT_MODE_LINEECHO	2
-int user_arp_hijack(struct user_conn_info *uci, char *src_fake_mac,
-		    char *dst_fake_mac, int input_mode);
-void user_arp_hijack_done(char *src_fake_mac, char *dst_fake_mac);
-int arp_hijack(struct conn_info *ci, char *src_fake_mac, char *dst_fake_mac, int input_mode);
-void arp_hijack_done(char *src_fake_mac, char *dst_fake_mac);
+int user_arp_hijack(struct user_conn_info *uci, unsigned char *src_fake_mac,
+		    unsigned char *dst_fake_mac, int input_mode);
+void user_arp_hijack_done(unsigned char *src_fake_mac, unsigned char *dst_fake_mac);
+int arp_hijack(struct conn_info *ci, unsigned char *src_fake_mac, unsigned char *dst_fake_mac, int input_mode);
+void arp_hijack_done(unsigned char *src_fake_mac, unsigned char *dst_fake_mac);
 
 /*
  * synchijack
@@ -512,7 +512,7 @@ extern unsigned char mac_broadcast[ETH_A
 extern unsigned char mac_zero[ETH_ALEN];
 struct arp_spoof_info *start_arp_spoof(unsigned int src_addr,
 				       unsigned int dst_addr,
-		char *src_mac, char *dst_mac, char *src_fake_mac,
+		unsigned char *src_mac, unsigned char *dst_mac, unsigned char *src_fake_mac,
 		int refresh, int can_forward, int in_range);
 struct arp_spoof_info *get_arp_spoof(unsigned int src_addr, unsigned int dst_addr);
 void stop_arp_spoof(struct arp_spoof_info *asi);
@@ -650,8 +650,8 @@ struct tcp_spec {
 	unsigned long daddr;
 	unsigned short sport;
 	unsigned short dport;
-	char *src_mac;
-	char *dst_mac;
+	unsigned char *src_mac;
+	unsigned char *dst_mac;
 	unsigned long seq;
 	unsigned long ack_seq;
 	unsigned short window;
@@ -669,8 +669,8 @@ int send_tcp_packet(struct tcp_spec *ts)
 struct icmp_spec {
 	unsigned int src_addr;
 	unsigned int dst_addr;
-	char *src_mac;
-	char *dst_mac;
+	unsigned char *src_mac;
+	unsigned char *dst_mac;
 	
 	short type;
 	short code;
@@ -688,19 +688,19 @@ struct icmp_spec {
 
 int send_icmp_packet(struct icmp_spec *is);
 void send_icmp_request(unsigned int src_addr, unsigned int dst_addr,
-		       char *src_mac, char *dst_mac, unsigned short seq);
+		       unsigned char *src_mac, unsigned char *dst_mac, unsigned short seq);
 int is_icmp_reply(struct packet *p, unsigned int src_addr, unsigned int dst_addr,
-		  char *src_mac, char *dst_mac);
+		  unsigned char *src_mac, unsigned char *dst_mac);
 
 
 struct arp_spec {
-	char *src_mac;
-	char *dst_mac;
+	unsigned char *src_mac;
+	unsigned char *dst_mac;
 	
 	int oper;
-	char *sender_mac;
+	unsigned char *sender_mac;
 	unsigned long sender_addr;
-	char *target_mac;
+	unsigned char *target_mac;
 	unsigned long target_addr;
 };
 
--- hunt-1.5/menu.c.signness	1999-06-06 18:04:00.000000000 +0200
+++ hunt-1.5/menu.c	2005-03-03 14:36:18.000000000 +0100
@@ -170,7 +170,7 @@ unsigned int parse_hostname(char *buf)
 	}
 }
 
-int parse_mac(char *buf, char *mac_ret)
+int parse_mac(char *buf, unsigned char *mac_ret)
 {
 	unsigned char mac[ETH_ALEN];
 	char *p, *tmp, *buf_p;
@@ -271,7 +271,7 @@ unsigned int menu_choose_hostname(char *
 }
 
 
-int menu_choose_ports(char *label, int *ret_ports, char *dfl)
+int menu_choose_ports(char *label, unsigned int *ret_ports, char *dfl)
 {
 	char buf[BUFSIZE];
 	
@@ -336,7 +336,7 @@ int menu_choose_host_mask_ports(char *la
 
 int menu_choose_host_mask_ports_dfl(char *label, unsigned int *ret_ip,
 		unsigned int *ret_mask, unsigned int *ret_ports,
-		unsigned int dfl_ip, unsigned int dfl_mask, int *dfl_ports)
+		unsigned int dfl_ip, unsigned int dfl_mask, unsigned int *dfl_ports)
 {
 	char dfl[256], *buf_p;
 	
--- hunt-1.5/net.c.signness	1999-06-08 14:18:42.000000000 +0200
+++ hunt-1.5/net.c	2005-03-03 14:36:18.000000000 +0100
@@ -162,7 +162,7 @@ int send_icmp_packet(struct icmp_spec *i
 }
 
 void send_icmp_request(unsigned int src_addr, unsigned int dst_addr,
-		       char *src_mac, char *dst_mac, unsigned short seq)
+		       unsigned char *src_mac, unsigned char *dst_mac, unsigned short seq)
 {
 	struct icmp_spec icmp;
 	
@@ -181,7 +181,7 @@ void send_icmp_request(unsigned int src_
 }
 
 int is_icmp_reply(struct packet *p, unsigned int src_addr, unsigned int dst_addr,
-		  char *src_mac, char *dst_mac)
+		  unsigned char *src_mac, unsigned char *dst_mac)
 {
 	struct iphdr *iph = p->p_iph;
 	struct icmphdr *icmph = p->p_hdr.p_icmph;
--- hunt-1.5/pktrelay.c.signness	1999-11-12 11:09:18.000000000 +0100
+++ hunt-1.5/pktrelay.c	2005-03-03 14:36:18.000000000 +0100
@@ -259,9 +259,9 @@ static void relay_add_item(void)
 	struct relay_item *ri;
 	unsigned int src_ip, dst_ip;
 	unsigned int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	char name_buf[128], name_buf2[256];
-	char ethtap_mac[ETH_ALEN];
+	unsigned char ethtap_mac[ETH_ALEN];
 	int flags_c;
 	int nr, ethtap_fd;
 
@@ -318,7 +318,7 @@ static void relay_mod_item(void)
 	struct relay_item *ri;
 	unsigned int src_ip, dst_ip;
 	unsigned int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	char name_buf[128], name_buf2[256];
 	int nr;
 	char flags_dfl;
--- hunt-1.5/rstd.c.signness	1999-07-13 09:22:57.000000000 +0200
+++ hunt-1.5/rstd.c	2005-03-03 14:36:18.000000000 +0100
@@ -256,7 +256,7 @@ static void rst_add_item(void)
 	struct rst_db_item *dbi;
 	unsigned int src_ip, dst_ip;
 	unsigned int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	int mode, syn_mode;
 	int nr;
 
@@ -301,7 +301,7 @@ static void rst_mod_item(void)
 	struct rst_db_item *dbi;
 	unsigned int src_ip, dst_ip;
 	unsigned int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	int mode, syn_mode;
 	int nr;
 	
--- hunt-1.5/sniff.c.signness	1999-04-02 13:58:48.000000000 +0200
+++ hunt-1.5/sniff.c	2005-03-03 14:36:18.000000000 +0100
@@ -42,8 +42,8 @@ struct sniff_info {
 	unsigned int dst_addr;
 	int src_mask;
 	int dst_mask;
-	int src_ports[MAX_PORTS + 1];
-	int dst_ports[MAX_PORTS + 1];
+	unsigned int src_ports[MAX_PORTS + 1];
+	unsigned int dst_ports[MAX_PORTS + 1];
 	
 	int srch_mode;
 	char *search;
@@ -653,8 +653,8 @@ static void sniff_add_item(void)
 	char file_name[BUFSIZE], file_name_buf[BUFSIZE];
 	struct sniff_info *si;
 	unsigned int src_ip, dst_ip;
-	int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_mask, dst_mask;
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	int srch_mode, len;
 	int log_mode, log_bytes;
 	int nr;
@@ -732,8 +732,8 @@ static void sniff_mod_item(void)
 	struct sniff_info *si;
 	struct sniff_log *slog;
 	unsigned int src_ip, dst_ip;
-	int src_mask, dst_mask;
-	int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
+	unsigned int src_mask, dst_mask;
+	unsigned int src_ports[MAX_PORTS + 1], dst_ports[MAX_PORTS + 1];
 	int srch_mode, len;
 	int log_mode, log_bytes;
 	int nr;
--- hunt-1.5/tap.c.signness	1999-09-23 13:55:38.000000000 +0200
+++ hunt-1.5/tap.c	2005-03-03 14:36:18.000000000 +0100
@@ -107,7 +107,7 @@ int tap(char *device, int promisc_mode)
 	}
 }
 
-int get_ifc_info(char *ifc_name, unsigned int *ip, char *mac)
+int get_ifc_info(char *ifc_name, unsigned int *ip, unsigned char *mac)
 {
 	int fd;				
 	struct ifreq ifr;
--- hunt-1.5/util.c.signness	2005-03-03 14:36:18.000000000 +0100
+++ hunt-1.5/util.c	2005-03-03 14:37:23.000000000 +0100
@@ -286,7 +286,7 @@ int sprintf_db_ports(unsigned int *ports
 	return buf - buf_orig;
 }
 
-int port_match(int port, unsigned int *db_ports)
+int port_match(unsigned int port, unsigned int *db_ports)
 {
 	int start, end;
 	int pass;

hunt-1.5-listlen.patch:

--- NEW FILE hunt-1.5-listlen.patch ---
2005-03-03 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
	* hostup.c: make the len of the host-list to be checked signed;
	  else the 'len < 0' check would be always false

--- hunt-1.5/hostup.c.listlen	2005-03-03 14:07:54.000000000 +0100
+++ hunt-1.5/hostup.c	2005-03-03 14:13:38.000000000 +0100
@@ -225,7 +225,7 @@ void host_up(void)
 	struct ifunc_item ifunc_arp;
 	struct host_up_info *hui;
 	struct timespec ts;
-	unsigned int len;
+	int len;
 	char buf_mac[BUFSIZE];
 	unsigned char fake_mac[ETH_ALEN];
 	

hunt-1.5-cleanup.patch:

--- NEW FILE hunt-1.5-cleanup.patch ---
2005-03-03 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
	* util.c, hunt.h: remove unused log2() function as it conflicts
	  with the built-in log2(3) one
	* timer.c: include <stdlib.h> for declaration of exit(3)

--- hunt-1.5/util.c.cleanup	2000-05-30 15:02:27.000000000 +0200
+++ hunt-1.5/util.c	2005-03-03 13:35:26.000000000 +0100
@@ -70,23 +70,6 @@ int is_power2(unsigned int i)
 	return i ? 0 : 1;
 }
 
-int log2(unsigned int i)
-{
-	int l = 0;
-
-	if (!i)
-		return -1;
-	while (!(i & 1)) {
-		l++;
-		i >>= 1;
-	}
-	i >>= 1;
-	if (i)
-		return 0;
-	else
-		return l;
-}
-
 int count_mask(unsigned int mask)
 {
 	int retval;
--- hunt-1.5/hunt.h.cleanup	2000-05-30 14:54:54.000000000 +0200
+++ hunt-1.5/hunt.h	2005-03-03 13:35:26.000000000 +0100
@@ -401,7 +401,6 @@ void set_tty_color(enum TTY_COLOR color)
 void set_tty_color_bg(enum TTY_COLOR fg, enum TTY_COLOR bg);
 
 int is_power2(unsigned int i);
-int log2(unsigned int i);
 int count_mask(unsigned int mask);
 
 
--- hunt-1.5/timer.c.cleanup	1999-02-15 14:31:20.000000000 +0100
+++ hunt-1.5/timer.c	2005-03-03 13:36:16.000000000 +0100
@@ -8,6 +8,7 @@
  */
 #include <stdio.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include "hunt.h"
 
 struct list timejob_list = LIST_INIT(struct timejob, j_next);

hunt-1.5-badcmp.patch:

--- NEW FILE hunt-1.5-badcmp.patch ---
2005-03-03 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
	* fixed various places where signed and unsigned variables are
	  compared; most if them cause compiler warnings also, bad
	  other might cause buffer overflows also

diff -ur hunt-1.5badcmp/arphijack.c hunt-1.5/arphijack.c
--- hunt-1.5badcmp/arphijack.c	2005-03-03 14:21:00.000000000 +0100
+++ hunt-1.5/arphijack.c	2005-03-03 14:27:29.000000000 +0100
@@ -57,7 +57,7 @@
 
 	if (wtd->input_mode == INPUT_MODE_RAW)
 		tty_raw(0, 1, 0);
-	while ((nr = read(0, buf, sizeof(buf)))) {
+	while ((nr = read(0, buf, sizeof(buf)))>0) {
 		if (buf[0] == 29)	/* ^] */
 			break;
 		if (wtd->input_mode == INPUT_MODE_LINEECHO || 
@@ -67,7 +67,7 @@
 				break;
 			
 			if (wtd->input_mode == INPUT_MODE_LINEECHOR && 
-			    nr < sizeof(buf) && buf[nr - 1] == '\n') {
+			    (size_t)nr < sizeof(buf) && buf[nr - 1] == '\n') {
 				buf[nr - 1] = '\r';
 				buf[nr++] = '\n';
 			}
diff -ur hunt-1.5badcmp/arpspoof.c hunt-1.5/arpspoof.c
--- hunt-1.5badcmp/arpspoof.c	2005-03-03 14:21:00.000000000 +0100
+++ hunt-1.5/arpspoof.c	2005-03-03 14:31:43.000000000 +0100
@@ -970,7 +970,7 @@
 	char buf[BUFSIZE];
 	int refresh, can_forward;
 	
-	if ((src_ip = menu_choose_hostname("host to spoof", NULL)) == -1)
+	if ((src_ip = menu_choose_hostname("host to spoof", NULL)) == (unsigned int)(-1))
 		return;
 	sprintf_eth_mac(buf, suggest_mac());
 	if (menu_choose_mac("fake mac", src_fake_mac, buf) < 0)
@@ -980,7 +980,7 @@
 			return;
 	} else
 		can_forward = 1;
-	if ((dst_ip = menu_choose_hostname("target - where to insert the spoof", NULL)) == -1)
+	if ((dst_ip = menu_choose_hostname("target - where to insert the spoof", NULL)) == (unsigned int)(-1))
 		return;
 	if ((refresh = menu_choose_unr("refresh interval sec", 0, 100000, 0)) < 0)
 		return;
@@ -1024,7 +1024,7 @@
 	char buf[BUFSIZE];
 	int refresh, can_forward;
 	
-	if ((src_ip = menu_choose_hostname("host to spoof", NULL)) == -1)
+	if ((src_ip = menu_choose_hostname("host to spoof", NULL)) == (unsigned int)(-1))
 		return;
 	sprintf_eth_mac(buf, suggest_mac());
 	if (menu_choose_mac("fake mac", src_fake_mac, buf) < 0)
@@ -1034,9 +1034,9 @@
 			return;
 	} else
 		can_forward = 1;
-	if ((dst_start_ip = menu_choose_hostname("start target where to insert the spoof", NULL)) == -1)
+	if ((dst_start_ip = menu_choose_hostname("start target where to insert the spoof", NULL)) == (unsigned int)(-1))
 		return;
-	if ((dst_end_ip = menu_choose_hostname("end target where to insert the spoof", NULL)) == -1)
+	if ((dst_end_ip = menu_choose_hostname("end target where to insert the spoof", NULL)) == (unsigned int)(-1))
 		return;
 	if ((refresh = menu_choose_unr("refresh interval sec", 0, 100000, 0)) < 0)
 		return;
@@ -1120,7 +1120,7 @@
 	struct mac_info *mi_src, *mi_dst;
 	int refresh, src_can_forward, dst_can_forward;
 	
-	if ((src_ip = menu_choose_hostname("src/dst host1 to arp spoof", NULL)) == -1)
+	if ((src_ip = menu_choose_hostname("src/dst host1 to arp spoof", NULL)) == (unsigned int)(-1))
 		return;
 	sprintf_eth_mac(buf, suggest_mac());
 	if (menu_choose_mac("host1 fake mac", src_fake_mac, buf) < 0)
@@ -1130,7 +1130,7 @@
 			return;
 	} else
 		src_can_forward = 1;
-	if ((dst_ip = menu_choose_hostname("src/dst host2 to arp spoof", NULL)) == -1)
+	if ((dst_ip = menu_choose_hostname("src/dst host2 to arp spoof", NULL)) == (unsigned int)(-1))
 		return;
 	sprintf_eth_mac(buf, suggest_mac());
 	if (menu_choose_mac("host2 fake mac", dst_fake_mac, buf) < 0)
@@ -1183,9 +1183,9 @@
 	i = menu_choose_unr("item nr. with src/dst or [cr]", 0,
 			    arp_spoof_count() - 1, -1);
 	if (i < 0) {
-		if ((ip1 = menu_choose_hostname("src/dst host1 to remove", NULL)) == -1)
+		if ((ip1 = menu_choose_hostname("src/dst host1 to remove", NULL)) == (unsigned int)(-1))
 			return;
-		if ((ip2 = menu_choose_hostname("src/dst host2 to remove", NULL)) == -1)
+		if ((ip2 = menu_choose_hostname("src/dst host2 to remove", NULL)) == (unsigned int)(-1))
 			return;
 	} else {
 		asi = list_at(&l_arp_spoof, i);
@@ -1257,17 +1257,17 @@
 	if (range_test)
 		dst_addr = (unsigned int) -1;
 	else
-		if ((dst_addr = menu_choose_hostname("host to test", NULL)) == -1)
+		if ((dst_addr = menu_choose_hostname("host to test", NULL)) == (unsigned int)(-1))
 			return;
 	for (i = 0; i < asr->asi_count; i++) {
-		if (dst_addr == -1 && asr->asi[i]->dst_mac_valid)
+	  if (dst_addr == (unsigned int)(-1) && asr->asi[i]->dst_mac_valid)
 			do_test_or_refresh(asr->asi[i]);
 		else if (asr->asi[i]->dst_addr == dst_addr) {
 			do_test_or_refresh(asr->asi[i]);
 			break;
 		}
 	}
-	if (dst_addr != -1 && i >= asr->asi_count)
+	if (dst_addr != (unsigned int)(-1) && i >= asr->asi_count)
 		printf("host not found in range database\n");
 }
 
diff -ur hunt-1.5badcmp/hostup.c hunt-1.5/hostup.c
--- hunt-1.5badcmp/hostup.c	2005-03-03 14:21:00.000000000 +0100
+++ hunt-1.5/hostup.c	2005-03-03 14:24:44.000000000 +0100
@@ -229,9 +229,9 @@
 	char buf_mac[BUFSIZE];
 	unsigned char fake_mac[ETH_ALEN];
 	
-	if ((start_ip = menu_choose_hostname("start ip addr", host_lookup(start_ip_def, HL_MODE_NR))) == -1)
+	if ((start_ip = menu_choose_hostname("start ip addr", host_lookup(start_ip_def, HL_MODE_NR))) == (unsigned int)(-1))
 		return;
-	if ((end_ip = menu_choose_hostname("end ip addr", host_lookup(end_ip_def, HL_MODE_NR))) == -1)
+	if ((end_ip = menu_choose_hostname("end ip addr", host_lookup(end_ip_def, HL_MODE_NR))) == (unsigned int)(-1))
 		return;
 	if ((len = ntohl(end_ip) - ntohl(start_ip) + 1) < 0) {
 		printf("bad addresses\n");
diff -ur hunt-1.5badcmp/hunt.h hunt-1.5/hunt.h
--- hunt-1.5badcmp/hunt.h	2005-03-03 14:21:00.000000000 +0100
+++ hunt-1.5/hunt.h	2005-03-03 14:25:04.000000000 +0100
@@ -566,7 +566,7 @@
  * macdisc
  */
 void mac_discover(unsigned int ip, int count);
-void mac_discover_range(unsigned int start_ip, unsigned int end_ip, int count);
+void mac_discover_range(unsigned int start_ip, unsigned int end_ip, unsigned int count);
 void mac_disc_menu(void);
 void print_mac_daemon();
 
diff -ur hunt-1.5badcmp/macdisc.c hunt-1.5/macdisc.c
--- hunt-1.5badcmp/macdisc.c	1999-02-21 20:21:37.000000000 +0100
+++ hunt-1.5/macdisc.c	2005-03-03 14:24:44.000000000 +0100
@@ -14,7 +14,7 @@
 #include <assert.h>
 #include <errno.h>
 
-void mac_discover_range(unsigned int start_ip, unsigned int end_ip, int count)
+void mac_discover_range(unsigned int start_ip, unsigned int end_ip, unsigned int count)
 {
 	unsigned int addr, j;
 	struct timespec ts;
@@ -184,9 +184,9 @@
 	struct mac_disc_info *mdi;
 	unsigned int start_ip, end_ip;
 	
-	if ((start_ip = menu_choose_hostname("start ip addr", NULL)) == -1)
+	if ((start_ip = menu_choose_hostname("start ip addr", NULL)) == (unsigned int)(-1))
 		return;
-	if ((end_ip = menu_choose_hostname("end ip addr", NULL)) == -1)
+	if ((end_ip = menu_choose_hostname("end ip addr", NULL)) == (unsigned int)(-1))
 		return;
 	mdi = malloc(sizeof(struct mac_disc_info));
 	assert(mdi);
@@ -207,9 +207,9 @@
 	if (!(mdi = list_at(&l_mdi, nr)))
 		return;
 
-	if ((start_ip = menu_choose_hostname("start ip addr", host_lookup(mdi->start_addr, hl_mode))) == -1)
+	if ((start_ip = menu_choose_hostname("start ip addr", host_lookup(mdi->start_addr, hl_mode))) == (unsigned int)(-1))
 		return;
-	if ((end_ip = menu_choose_hostname("end ip addr", host_lookup(mdi->end_addr, hl_mode))) == -1)
+	if ((end_ip = menu_choose_hostname("end ip addr", host_lookup(mdi->end_addr, hl_mode))) == (unsigned int)(-1))
 		return;
 	mdi->start_addr = start_ip;
 	mdi->end_addr = end_ip;
diff -ur hunt-1.5badcmp/main.c hunt-1.5/main.c
--- hunt-1.5badcmp/main.c	2000-05-26 16:06:39.000000000 +0200
+++ hunt-1.5/main.c	2005-03-03 14:31:19.000000000 +0100
@@ -145,7 +145,7 @@
 		 * packet from source
 		 */
 		if (!dst_packet && p->p_data_len && !same_chars) {
-			pbuf_len = p->p_data_len < sizeof(pbuf) ? p->p_data_len : sizeof(pbuf);
+			pbuf_len = ((size_t)(p->p_data_len) < sizeof(pbuf)) ? (size_t)p->p_data_len : sizeof(pbuf);
 			memcpy(pbuf, p->p_data, pbuf_len);
 		} else
 			pbuf_len = 0;
diff -ur hunt-1.5badcmp/menu.c hunt-1.5/menu.c
--- hunt-1.5badcmp/menu.c	2005-03-03 14:21:00.000000000 +0100
+++ hunt-1.5/menu.c	2005-03-03 14:24:44.000000000 +0100
@@ -264,7 +264,7 @@
 	while (1) {
 		if (menu_prompt(label, buf, sizeof(buf), dfl) < 0)
 			return -1;
-		if ((ip = parse_hostname(buf)) != -1)
+		if ((ip = parse_hostname(buf)) != (unsigned int)(-1))
 			break;
 	}
 	return ip;
@@ -302,7 +302,7 @@
 		
 		if (!(host_name = strtok(buf, " /\t\n")))
 			continue;
-		if ((ip = parse_hostname(host_name)) == -1)
+		if ((ip = parse_hostname(host_name)) == (unsigned int)(-1))
 			continue;
 		if (with_mask) {
 			if (!(mask_str = strtok(NULL, " \t\n")))
diff -ur hunt-1.5badcmp/resolv.c hunt-1.5/resolv.c
--- hunt-1.5badcmp/resolv.c	1999-02-14 13:59:13.000000000 +0100
+++ hunt-1.5/resolv.c	2005-03-03 14:30:37.000000000 +0100
@@ -411,10 +411,10 @@
 char *host_lookup(unsigned int in, int use_mode)
 {
  	static char hostname_buf[BUFSIZE] = {0};
-	static int hostname_idx = 0;
+	static unsigned int hostname_idx = 0;
 	struct in_addr addr;
 	char *name, *retval;
-	int len;
+	size_t len;
 	struct hostent *host_ent;
 	struct resolv_item *r;
 	
@@ -495,10 +495,10 @@
 char *port_lookup(unsigned short serv, int use_mode)
 {
  	static char servname_buf[BUFSIZE] = {0};
-	static int servname_idx = 0;
+	static unsigned int servname_idx = 0;
 	char name_buf[64];
 	char *name, *retval;
-	int len;
+	size_t len;
 	struct servent *serv_ent;
 
 	if (serv == 0)
diff -ur hunt-1.5badcmp/synchijack.c hunt-1.5/synchijack.c
--- hunt-1.5badcmp/synchijack.c	1999-02-21 21:04:36.000000000 +0100
+++ hunt-1.5/synchijack.c	2005-03-03 14:30:37.000000000 +0100
@@ -197,7 +197,7 @@
 {
 	struct tcp_spec ts;
 	char buf[1400];
-	int len;
+	unsigned int len;
 
 	/*
 	 * well - after sending something we get usualy ack storm
@@ -257,7 +257,7 @@
 			memset(buf, ' ', len);
 #else
 		len = need_write;
-		if (len > sizeof(buf)) {
+		if ((size_t)len > sizeof(buf)) {
 			len = sizeof(buf);
 			memset(buf, ' ', len);
 		} else {
@@ -377,7 +377,7 @@
 			print_data_packet(p, p->p_data_len, 0, 0);
 		if (last_read_ack == p->p_hdr.p_tcph->ack_seq && p->p_data_len) {
 			len = p->p_data_len;
-			if (len > sizeof(buf))
+			if ((size_t)len > sizeof(buf))
 				len = sizeof(buf);
 			memcpy(buf, p->p_data, len);
 			w_data = buf;

hunt-1.5-arridx.patch:

--- NEW FILE hunt-1.5-arridx.patch ---
2005-03-03 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
	* c/hash.c: fixed out-of-range array subscript; reported in
	  https://bugzilla.redhat.com/beta/show_bug.cgi?id=149777

--- hunt-1.5/c/hash.c.arridx	2000-02-16 10:26:14.000000000 +0100
+++ hunt-1.5/c/hash.c	2005-03-03 13:26:09.000000000 +0100
@@ -26,7 +26,7 @@ static int __chose_table_size(int size)
 	int i;
 	
 	if (size >= ht_size[sizeof(ht_size) / sizeof(ht_size[0]) - 1])
-	    return ht_size[sizeof(ht_size) / sizeof(ht_size[0])];
+	    return ht_size[sizeof(ht_size) / sizeof(ht_size[0]) - 1];
 	for (i = 0; ht_size[i] < size; i++)
 	    ;
 	return ht_size[i];


Index: hunt.spec
===================================================================
RCS file: /cvs/extras/rpms/hunt/devel/hunt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hunt.spec	10 Dec 2004 22:03:03 -0000	1.4
+++ hunt.spec	3 Mar 2005 13:44:44 -0000	1.5
@@ -1,11 +1,20 @@
+## $Id$
+
+%{!?release_func:%define release_func() %1%{?disttag}}
+
 Summary:	A tool for demonstrating well known weaknesses in the TCP/IP protocol suite.
 Name:		hunt
 Version:	1.5
-Release:	2
+Release:	%release_func 3
 Epoch:		0
 License:	GPL
 Group:		Applications/Internet
 Source:		http://lin.fsid.cvut.cz/~kra/hunt/%{name}-%{version}.tgz
+Patch0:		hunt-1.5-arridx.patch
+Patch1:		hunt-1.5-cleanup.patch
+Patch2:		hunt-1.5-signness.patch
+Patch3:		hunt-1.5-listlen.patch
+Patch4:		hunt-1.5-badcmp.patch
 URL:		http://lin.fsid.cvut.cz/~kra/index.html
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -27,6 +36,11 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .arridx
+%patch1 -p1 -b .cleanup
+%patch2 -p1 -b .signness
+%patch3 -p1 -b .listlen
+%patch4 -p1 -b .badcmp
 
 
 %build
@@ -58,6 +72,12 @@
 
 
 %changelog
+* Thu Mar  3 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.5-3
+- fixed out-of-range array subscript (BZ #149777)
+- fixed lots of warnings regarding different signedness
+- fixed some minor compilation warnings
+- fixed bad handling of hosts-lists when start-host > end-host
+
 * Fri May  9 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:1.5-0.fdr.2
 - updated source-url
 



From fedora-extras-commits at redhat.com  Thu Mar  3 13:52:06 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 08:52:06 -0500
Subject: rpms/hunt/devel hunt-1.5-signness.patch,1.1,1.2
Message-ID: <200503031352.j23Dq6O9003217@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/hunt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3209

Modified Files:
	hunt-1.5-signness.patch 
Log Message:
added doc


hunt-1.5-signness.patch:

Index: hunt-1.5-signness.patch
===================================================================
RCS file: /cvs/extras/rpms/hunt/devel/hunt-1.5-signness.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hunt-1.5-signness.patch	3 Mar 2005 13:44:44 -0000	1.1
+++ hunt-1.5-signness.patch	3 Mar 2005 13:52:04 -0000	1.2
@@ -1,3 +1,7 @@
+2005-03-03 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
+	* use consistently 'unsigned' for mac buffers and for port
+	  numbers
+
 --- hunt-1.5/addpolicy.c.signness	1999-02-13 13:23:15.000000000 +0100
 +++ hunt-1.5/addpolicy.c	2005-03-03 14:36:18.000000000 +0100
 @@ -105,7 +105,7 @@ void addpolicy_add_item(void)



From dag at wieers.com  Thu Mar  3 14:22:22 2005
From: dag at wieers.com (Dag Wieers)
Date: Thu, 3 Mar 2005 15:22:22 +0100 (CET)
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <20050303141532.679168a7.bugs.michael@gmx.net>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
	<20050303141532.679168a7.bugs.michael@gmx.net>
Message-ID: <Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>

On Thu, 3 Mar 2005, Michael Schwendt wrote:

> On Thu, 3 Mar 2005 13:17:44 +0100 (CET), Dag Wieers wrote:
> 
> > > > > Frankly I could not give a damn about the fact that we break Freshen - these
> > > > > things are fed through yum from a yum repository, so I really
> > > > > don't care that rpm -F might fail in some weird conditions.
> > > > > 
> > > > > Epoch: 0 is stupid, useless and moronic.
> > > > 
> > > > Where were you 2 years ago ? We needed you back then :)
> > > 
> > > Two years ago, explicit Epoch 0 made sense.
> > > 
> > > Nowadays, the supported versions of RPM no longer require it.
> > 
> > Explicit Epoch 0 never made sense, we never required it for anything, Red 
> > Hat never required it and JBJ admits he was misquoted on the subject.
> > 
> > But please do include your line of thought.
> 
> My line of thought is the following:
> 
> I was not involved in making explicit Epoch 0 a policy. I understood the
> problems with missing Epoch and RPM < 4.1.1. I didn't see the explicit
> Epoch 0 rule as a burden. A burden so high that I would complain forever
> and rather choose to boycott a community project than get productive.

It's funny how your interpretation differs from mine. The Epoch 0 problem 
is one of the several indications of how decisions were taken against the 
majority of the community and lack of arguments in favor, and those were 
enough for me to consider not being part of that community anylonger.
(Communication largely took place on IRC and bugzilla)

(And I'm only repeating this because you imply things about me that are 
incorrect or shortsighted.)

Decisions are seldom important in itself, but the consequences of 
decisions are important. So yes, I object to this and a few other 
decisions, not because of the decisions in itself, but how they came to 
exist. And what they resulted in.

I also fail to see how I have boycotted the aformentioned community 
project. Was it because I didn't join or because I voiced my opinion ? I 
hope I can still voice my opinion, even when it's not shared by you or the 
decision makers. You probably do not agree, but I consider that 
contributing too.

Ignoring things would have been much easier than arguing (believe me), 
still it affects me enough to try to prevent some of the decisions.


> There was at least one case (modplug is the one I remember) where the
> explicit Epoch 0 rule avoided upgrade problems. Since I knew we would be
> save, I didn't track any other corner-cases, which would be affected by
> the Epoch problem. The good effect of the explicit Epoch 0 rule was, we
> didn't need to care about related upgrade problems.

A missing epoch is considered to be 0 (implicit epoch 0), so an explicit 
epoch 0 is plain silly. We have iterated over this many times, there's no 
way to ratify this. Maybe there was a bug somewhere that should have been 
fixed, but we're not basing our policy on bugs ! And the aim was to be 
compatible with Red Hat all along, and they were not doing it...

--   dag wieers,  dag at wieers.com,  http://dag.wieers.com/   --
[all I want is a warm bed and a kind word and unlimited power]



From skvidal at phy.duke.edu  Thu Mar  3 14:29:19 2005
From: skvidal at phy.duke.edu (seth vidal)
Date: Thu, 03 Mar 2005 09:29:19 -0500
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
	<20050303141532.679168a7.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
Message-ID: <1109860159.21434.23.camel@cutter>

> Ignoring things would have been much easier than arguing (believe me), 
> still it affects me enough to try to prevent some of the decisions.
> 

Okay everyone, Stop it.

do not open this discussion again.

it's pointless.

I agree with gafton, screw rpm -Fvh and let's forget about all this
crap.

rehashing the past will do no one any good and let's just stop it.

-sv




From bugs.michael at gmx.net  Thu Mar  3 15:16:33 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 16:16:33 +0100
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
	<20050303141532.679168a7.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
Message-ID: <20050303161633.2c4603a3.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 15:22:22 +0100 (CET), Dag Wieers wrote:

> (And I'm only repeating this because you imply things about me that are 
> incorrect or shortsighted.)

I don't imply anything about you, I did not even refer to you
specifically.

> I hope I can still voice my opinion, even when it's not shared by you
> or the decision makers. You probably do not agree,

What's that assumption based on?

> but I consider that contributing too.



On Thu, 03 Mar 2005 09:29:19 -0500, seth vidal wrote:

> it's pointless.
>
> I agree with gafton, screw rpm -Fvh and let's forget about all this
> crap.

Earlier:

> Like I said before, I don't feel strongly about it.

Even earlier:

> but like I said - I don't have any strong feelings about it.
> 
> -sv



> rehashing the past will do no one any good and let's just stop it.

Oh, rehashing the past can be very valuable in avoiding repeating old
mistakes.

There has been an earlier thread about removal of Epoch zero (hint: Nov
10th), from which I quoted you above. I didn't participate in that quite
long thread. But the thread turned long because there was initial
disagreement and no mandatory action required by packagers. I now highly
recommend revisiting that thread and then to decide on the fate of
explicit Epoch zero, in an official way which is announced/documented
somewhere, so every packager will know about it.



From dag at wieers.com  Thu Mar  3 15:27:13 2005
From: dag at wieers.com (Dag Wieers)
Date: Thu, 3 Mar 2005 16:27:13 +0100 (CET)
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <20050303161633.2c4603a3.bugs.michael@gmx.net>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
	<20050303141532.679168a7.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
	<20050303161633.2c4603a3.bugs.michael@gmx.net>
Message-ID: <Pine.LNX.4.61.0503031623440.921@horsea.3ti.be>

On Thu, 3 Mar 2005, Michael Schwendt wrote:

> On Thu, 3 Mar 2005 15:22:22 +0100 (CET), Dag Wieers wrote:
> 
> > (And I'm only repeating this because you imply things about me that are 
> > incorrect or shortsighted.)
> 
> I don't imply anything about you, I did not even refer to you
> specifically.

Well, sorry Michael, but you did say:

	"A burden so high that I would complain forever and rather choose 
	to boycott a community project than get productive."

and I can't do anything else than interprete this as addressing me. If it 
wasn't, I have a hard time to put this into another context.

Kind regards,
--   dag wieers,  dag at wieers.com,  http://dag.wieers.com/   --
[all I want is a warm bed and a kind word and unlimited power]



From bugs.michael at gmx.net  Thu Mar  3 15:43:18 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 16:43:18 +0100
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <Pine.LNX.4.61.0503031623440.921@horsea.3ti.be>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
	<20050303141532.679168a7.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
	<20050303161633.2c4603a3.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031623440.921@horsea.3ti.be>
Message-ID: <20050303164318.6d5e4480.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 16:27:13 +0100 (CET), Dag Wieers wrote:

> On Thu, 3 Mar 2005, Michael Schwendt wrote:
> 
> > On Thu, 3 Mar 2005 15:22:22 +0100 (CET), Dag Wieers wrote:
> > 
> > > (And I'm only repeating this because you imply things about me that are 
> > > incorrect or shortsighted.)
> > 
> > I don't imply anything about you, I did not even refer to you
> > specifically.
> 
> Well, sorry Michael, but you did say:
> 
> 	"A burden so high that I would complain forever and rather choose 
> 	to boycott a community project than get productive."
> 
> and I can't do anything else than interprete this as addressing me. If it 
> wasn't, I have a hard time to put this into another context.

The hint is still in there (even after you had cut off the rest of the
context):

  [...] that _I_ would [...]

You asked for my "line of thought", I gave it. No idea why you feel the
need to take something personal.



From gemi at bluewin.ch  Thu Mar  3 15:54:27 2005
From: gemi at bluewin.ch (=?ISO-8859-1?Q?G=E9rard?= Milmeister)
Date: Thu, 03 Mar 2005 16:54:27 +0100
Subject: Branch FC-3 for graveman
Message-ID: <1109865268.11139.0.camel@scriabin.tannenrauch.ch>

Please create the FC-3 branch of graveman in devel
-- 
G?rard Milmeister
Langackerstrasse 49
CH-8057 Z?rich



From dag at wieers.com  Thu Mar  3 16:01:04 2005
From: dag at wieers.com (Dag Wieers)
Date: Thu, 3 Mar 2005 17:01:04 +0100 (CET)
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <20050303164318.6d5e4480.bugs.michael@gmx.net>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
	<20050303141532.679168a7.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
	<20050303161633.2c4603a3.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031623440.921@horsea.3ti.be>
	<20050303164318.6d5e4480.bugs.michael@gmx.net>
Message-ID: <Pine.LNX.4.61.0503031645530.921@horsea.3ti.be>

On Thu, 3 Mar 2005, Michael Schwendt wrote:

> On Thu, 3 Mar 2005 16:27:13 +0100 (CET), Dag Wieers wrote:
> 
> > On Thu, 3 Mar 2005, Michael Schwendt wrote:
> > 
> > > On Thu, 3 Mar 2005 15:22:22 +0100 (CET), Dag Wieers wrote:
> > > 
> > > > (And I'm only repeating this because you imply things about me that are 
> > > > incorrect or shortsighted.)
> > > 
> > > I don't imply anything about you, I did not even refer to you
> > > specifically.
> > 
> > Well, sorry Michael, but you did say:
> > 
> > 	"A burden so high that I would complain forever and rather choose 
> > 	to boycott a community project than get productive."
> > 
> > and I can't do anything else than interprete this as addressing me. If it 
> > wasn't, I have a hard time to put this into another context.
> 
> The hint is still in there (even after you had cut off the rest of the
> context):
> 
>   [...] that _I_ would [...]
> 
> You asked for my "line of thought", I gave it. No idea why you feel the
> need to take something personal.

Michael, a little honesty here. It served no other purpose than implying 
something. The context does not matter. In language it's a construct to 
say what you would (or would not) do to imply that someone else (in this 
case me) is doing. It can't be interpreted any other way. 'Implied' means 
that it is not explicitly said.

If this was not the intent, it has no purpose to even mention it. 
So of course I feel the need to defend myself. It's predictable.

Kind regards,
--   dag wieers,  dag at wieers.com,  http://dag.wieers.com/   --
[all I want is a warm bed and a kind word and unlimited power]



From notting at redhat.com  Thu Mar  3 16:25:41 2005
From: notting at redhat.com (Bill Nottingham)
Date: Thu, 3 Mar 2005 11:25:41 -0500
Subject: Branch FC-3 for graveman
In-Reply-To: <1109865268.11139.0.camel@scriabin.tannenrauch.ch>
References: <1109865268.11139.0.camel@scriabin.tannenrauch.ch>
Message-ID: <20050303162541.GD5992@nostromo.devel.redhat.com>

G?rard Milmeister (gemi at bluewin.ch) said: 
> Please create the FC-3 branch of graveman in devel

Done.

Bill



From fedora-extras-commits at redhat.com  Thu Mar  3 16:32:52 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:32:52 -0500
Subject: rpms/libassuan import.log,1.3,1.4
Message-ID: <200503031632.j23GWqas006136@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libassuan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6127

Modified Files:
	import.log 
Log Message:
auto-import libassuan-0.6.7-0.fdr.3.1 on branch FC-1 from libassuan-0.6.7-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libassuan/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	1 Feb 2005 19:30:20 -0000	1.3
+++ import.log	3 Mar 2005 16:32:50 -0000	1.4
@@ -1,2 +1,3 @@
 libassuan-0_6_7-0_fdr_3_2:HEAD:libassuan-0.6.7-0.fdr.3.2.src.rpm:1102524362
 libassuan-0_6_9-1:HEAD:libassuan-0.6.9-1.src.rpm:1107286225
+libassuan-0_6_7-0_fdr_3_1:FC-1:libassuan-0.6.7-0.fdr.3.1.src.rpm:1109867578



From fedora-extras-commits at redhat.com  Thu Mar  3 16:32:52 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:32:52 -0500
Subject: rpms/libassuan/FC-1 libassuan-0.6.7.tar.gz.sig, 1.2, 1.3 .cvsignore,
	1.3, 1.4 libassuan.spec, 1.4, 1.5 sources, 1.3,
	1.4 libassuan-0.6.9.tar.gz.sig, 1.1, NONE
Message-ID: <200503031632.j23GWqA8006140@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libassuan/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6127/FC-1

Modified Files:
	.cvsignore libassuan.spec sources 
Added Files:
	libassuan-0.6.7.tar.gz.sig 
Removed Files:
	libassuan-0.6.9.tar.gz.sig 
Log Message:
auto-import libassuan-0.6.7-0.fdr.3.1 on branch FC-1 from libassuan-0.6.7-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: libassuan-0.6.7.tar.gz.sig
===================================================================
RCS file: libassuan-0.6.7.tar.gz.sig
diff -N libassuan-0.6.7.tar.gz.sig
Binary files /dev/null and /tmp/cvsBU2Cr3 differ


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-1/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2005 19:30:20 -0000	1.3
+++ .cvsignore	3 Mar 2005 16:32:50 -0000	1.4
@@ -1 +1 @@
-libassuan-0.6.9.tar.gz
+libassuan-0.6.7.tar.gz


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-1/libassuan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libassuan.spec	3 Feb 2005 12:34:21 -0000	1.4
+++ libassuan.spec	3 Mar 2005 16:32:50 -0000	1.5
@@ -1,10 +1,10 @@
 
 Summary: GnuPG IPC library 
 Name:	 libassuan
-Version: 0.6.9
-Release: 2%{?dist_tag}
-Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz
-Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig
+Version: 0.6.7
+Release: 0.fdr.3%{?dist_tag}.1
+Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz
+Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz.sig
 URL:	 http://www.gnupg.org/
 License: GPL
 Group: 	 System Environment/Libraries
@@ -33,7 +33,7 @@
 %build
 %configure
 
-make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
@@ -79,12 +79,6 @@
 
 
 %changelog
-* Thu Feb  3 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.6.9-2
-- Build PIC to fix x86_64 linking.
-
-* Thu Jan 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.6.9-1
-- 0.6.9
-
 * Sat Oct 23 2004 Rex Dieter <rexdieter[AT]users.sf.net> - 0.6.7-0.fdr.3
 - *really* fix description this time.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-1/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2005 19:30:20 -0000	1.3
+++ sources	3 Mar 2005 16:32:50 -0000	1.4
@@ -1 +1 @@
-7f8aff75d034159b84faf2358263f444  libassuan-0.6.9.tar.gz
+db4e6939fafbaae80cab11a67f28771d  libassuan-0.6.7.tar.gz


--- libassuan-0.6.9.tar.gz.sig DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 16:33:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:33:50 -0500
Subject: rpms/shapelib import.log,1.3,1.4
Message-ID: <200503031633.j23GXotU006251@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/shapelib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6242

Modified Files:
	import.log 
Log Message:
auto-import shapelib-1.2.10-0.fdr.5.1 on branch FC-1 from shapelib-1.2.10-0.fdr.5.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/shapelib/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:25:43 -0000	1.3
+++ import.log	3 Mar 2005 16:33:48 -0000	1.4
@@ -1,2 +1,3 @@
 shapelib-1_2_10-5:HEAD:shapelib-1.2.10-5.src.rpm:1105696087
 shapelib-1_2_10-0_fdr_5_rh90:RHL-9:shapelib-1.2.10-0.fdr.5.rh90.src.rpm:1109748327
+shapelib-1_2_10-0_fdr_5_1:FC-1:shapelib-1.2.10-0.fdr.5.1.src.rpm:1109867635



From fedora-extras-commits at redhat.com  Thu Mar  3 16:33:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:33:50 -0500
Subject: rpms/shapelib/FC-1 shapelib-1.2.10.patch, 1.2, 1.3 shapelib.spec,
	1.2, 1.3 shapelib-1.2.10-endian.patch, 1.1, NONE
Message-ID: <200503031633.j23GXoai006255@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/shapelib/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6242/FC-1

Modified Files:
	shapelib-1.2.10.patch shapelib.spec 
Removed Files:
	shapelib-1.2.10-endian.patch 
Log Message:
auto-import shapelib-1.2.10-0.fdr.5.1 on branch FC-1 from shapelib-1.2.10-0.fdr.5.1.src.rpm
Bring in stuff from fedora.us FC1/stable

shapelib-1.2.10.patch:

Index: shapelib-1.2.10.patch
===================================================================
RCS file: /cvs/extras/rpms/shapelib/FC-1/shapelib-1.2.10.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib-1.2.10.patch	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib-1.2.10.patch	3 Mar 2005 16:33:48 -0000	1.3
@@ -91,8 +91,7 @@
  
  # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN
 +CC = gcc
--ENDIAN	=	-D_LITTLE_ENDIAN
-+#ENDIAN	=	-D_LITTLE_ENDIAN
+ ENDIAN	=	-D_LITTLE_ENDIAN
  
 -CFLAGS	=	-g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
 +EXTRACFLAGS   =      -g


Index: shapelib.spec
===================================================================
RCS file: /cvs/extras/rpms/shapelib/FC-1/shapelib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib.spec	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib.spec	3 Mar 2005 16:33:48 -0000	1.3
@@ -2,12 +2,11 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.2.10
-Release: 6
+Release: 0.fdr.5.1
 Epoch: 0
 URL: http://shapelib.maptools.org/
 Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz
 Patch0: shapelib-%{version}.patch
-Patch1: shapelib-1.2.10-endian.patch
 License: LGPL/MIT
 Group: Development/Libraries
 Buildrequires: libtool
@@ -31,7 +30,6 @@
 %prep
 %setup -q -T -b 0
 %patch -p1 -b .buildroot 
-%patch1 -p1 -b .endian
 
 %build
 make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" lib
@@ -72,10 +70,7 @@
 %exclude %{_libdir}/libshp.la
 
 %changelog
-* Sun Feb 13 2005 David Woodhouse <dwmw2 at infradead.org> 0:1.2.10-6
-- Don't hard-code endianness; just use endian.h
-
-* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:1.2.10-5
+* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:1.2.10-0.fdr.5
 - Patched patch and spec file according to suggestions of Michael Schwendt
 - In particular, this separates the building from the installing in the rpm.
 


--- shapelib-1.2.10-endian.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 16:34:36 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:34:36 -0500
Subject: rpms/proj import.log,1.3,1.4
Message-ID: <200503031634.j23GYax0006361@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/proj
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6352

Modified Files:
	import.log 
Log Message:
auto-import proj-4.4.8-0.fdr.4.1 on branch FC-1 from proj-4.4.8-0.fdr.4.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/proj/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:24:23 -0000	1.3
+++ import.log	3 Mar 2005 16:34:34 -0000	1.4
@@ -1,2 +1,3 @@
 proj-4_4_8-4:HEAD:proj-4.4.8-4.src.rpm:1105695966
 proj-4_4_8-0_fdr_4_rh90:RHL-9:proj-4.4.8-0.fdr.4.rh90.src.rpm:1109748255
+proj-4_4_8-0_fdr_4_1:FC-1:proj-4.4.8-0.fdr.4.1.src.rpm:1109867681



From fedora-extras-commits at redhat.com  Thu Mar  3 16:34:36 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:34:36 -0500
Subject: rpms/proj/FC-1 proj.spec,1.1,1.2
Message-ID: <200503031634.j23GYa1t006365@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/proj/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6352/FC-1

Modified Files:
	proj.spec 
Log Message:
auto-import proj-4.4.8-0.fdr.4.1 on branch FC-1 from proj-4.4.8-0.fdr.4.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: proj.spec
===================================================================
RCS file: /cvs/extras/rpms/proj/FC-1/proj.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proj.spec	14 Jan 2005 09:45:21 -0000	1.1
+++ proj.spec	3 Mar 2005 16:34:34 -0000	1.2
@@ -1,6 +1,10 @@
-Name: proj
-Version: 4.4.8
-Release: 4
+%define name proj
+%define version 4.4.8
+%define release 0.fdr.4
+
+Name: %name
+Version: %version
+Release: %release.1
 Epoch: 0
 Summary: Cartographic projection software (PROJ.4)
 
@@ -89,13 +93,13 @@
 %{_datadir}/%{name}
 
 %changelog
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-4
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.4
 - Added testvarious to nad distribution
 
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-0.fdr.3
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.3
 - Added patch for test scripts so that they will work in installed rpm
 
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-0.fdr.2
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.2
 - Fixed permissions on nad27 and nad83
 - Included test27 and test83 in the nad rpm and made them executable
 



From fedora-extras-commits at redhat.com  Thu Mar  3 16:38:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:38:21 -0500
Subject: rpms/brightside import.log,1.2,1.3
Message-ID: <200503031638.j23GcLAU006467@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/brightside
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6458

Modified Files:
	import.log 
Log Message:
auto-import brightside-1.4.0-0.fdr.3.2 on branch FC-2 from brightside-1.4.0-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/brightside/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Dec 2004 21:15:21 -0000	1.2
+++ import.log	3 Mar 2005 16:38:19 -0000	1.3
@@ -1 +1,2 @@
 brightside-1_4_0-0_fdr_3_2:HEAD:brightside-1.4.0-0.fdr.3.2.src.rpm:1102886113
+brightside-1_4_0-0_fdr_3_2:FC-2:brightside-1.4.0-0.fdr.3.2.src.rpm:1109867907



From fedora-extras-commits at redhat.com  Thu Mar  3 16:38:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:38:21 -0500
Subject: rpms/brightside/FC-2 brightside.spec,1.2,1.3
Message-ID: <200503031638.j23GcLYQ006471@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/brightside/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6458/FC-2

Modified Files:
	brightside.spec 
Log Message:
auto-import brightside-1.4.0-0.fdr.3.2 on branch FC-2 from brightside-1.4.0-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: brightside.spec
===================================================================
RCS file: /cvs/extras/rpms/brightside/FC-2/brightside.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- brightside.spec	12 Dec 2004 21:33:41 -0000	1.2
+++ brightside.spec	3 Mar 2005 16:38:19 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           brightside
 Version:        1.4.0
-Release:        3
+Release:        0.fdr.3.2
 Epoch:          0
 Summary:        Add reactivity to the corners and edges of your GNOME desktop.
 
@@ -80,7 +80,7 @@
 
 
 %changelog
-* Wed Dec 08 2004 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info> - 0:1.4.0-3
+* Wed Dec 08 2004 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info> - 0:1.4.0-0.fdr.3
 - BR intltool
 
 * Sun Dec 05 2004 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info> - 0:1.4.0-0.fdr.2



From fedora-extras-commits at redhat.com  Thu Mar  3 16:39:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:39:50 -0500
Subject: rpms/geomview import.log,1.2,1.3
Message-ID: <200503031639.j23GdoXS006580@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/geomview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6571

Modified Files:
	import.log 
Log Message:
auto-import geomview-1.8.1-0.fdr.10.2 on branch FC-2 from geomview-1.8.1-0.fdr.10.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geomview/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	24 Dec 2004 11:58:48 -0000	1.2
+++ import.log	3 Mar 2005 16:39:48 -0000	1.3
@@ -1 +1,2 @@
 geomview-1_8_1-10:HEAD:geomview-1.8.1-10.src.rpm:1103889514
+geomview-1_8_1-0_fdr_10_2:FC-2:geomview-1.8.1-0.fdr.10.2.src.rpm:1109867988



From fedora-extras-commits at redhat.com  Thu Mar  3 16:39:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:39:50 -0500
Subject: rpms/geomview/FC-2 geomview.spec,1.1,1.2
Message-ID: <200503031639.j23Gdohm006584@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/geomview/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6571/FC-2

Modified Files:
	geomview.spec 
Log Message:
auto-import geomview-1.8.1-0.fdr.10.2 on branch FC-2 from geomview-1.8.1-0.fdr.10.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-2/geomview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview.spec	24 Dec 2004 11:58:48 -0000	1.1
+++ geomview.spec	3 Mar 2005 16:39:48 -0000	1.2
@@ -8,7 +8,7 @@
 Summary: An interactive 3D viewing program
 Epoch:	 0
 Version: 1.8.1
-Release: 10%{?dist_tag}
+Release: 0.fdr.10%{?dist_tag}.2
 License: LGPL
 Url:     http://www.geomview.org/
 #Url:	 http://sourceforge.net/projects/geomview/
@@ -227,7 +227,7 @@
 
 
 %changelog
-* Mon Sep 20 2004 Rex Dieter <rexdieter at sf.net> 0:1.8.1-10
+* Mon Sep 20 2004 Rex Dieter <rexdieter at sf.net> 0:1.8.1-0.fdr.10
 - update Source URL
 - fix un-owned /usr/share/geomview/modules
 - Requires(post,preun): /sbin-install-info



From fedora-extras-commits at redhat.com  Thu Mar  3 16:40:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:40:42 -0500
Subject: rpms/gmpc import.log,1.2,1.3
Message-ID: <200503031640.j23Geg6t006718@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gmpc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6709

Modified Files:
	import.log 
Log Message:
auto-import gmpc-0.11.2-0.fdr.1.2 on branch FC-2 from gmpc-0.11.2-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gmpc/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Dec 2004 16:35:27 -0000	1.2
+++ import.log	3 Mar 2005 16:40:40 -0000	1.3
@@ -1 +1,2 @@
 gmpc-0_11_2-0_fdr_1_2:HEAD:gmpc-0.11.2-0.fdr.1.2.src.rpm:1102523788
+gmpc-0_11_2-0_fdr_1_2:FC-2:gmpc-0.11.2-0.fdr.1.2.src.rpm:1109868048



From fedora-extras-commits at redhat.com  Thu Mar  3 16:40:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:40:42 -0500
Subject: rpms/gmpc/FC-2 gmpc.spec,1.2,1.3
Message-ID: <200503031640.j23Gegcu006722@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gmpc/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6709/FC-2

Modified Files:
	gmpc.spec 
Log Message:
auto-import gmpc-0.11.2-0.fdr.1.2 on branch FC-2 from gmpc-0.11.2-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: gmpc.spec
===================================================================
RCS file: /cvs/extras/rpms/gmpc/FC-2/gmpc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gmpc.spec	10 Dec 2004 22:03:03 -0000	1.2
+++ gmpc.spec	3 Mar 2005 16:40:40 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           gmpc
 Summary:        GNOME frontend for the MPD
 Version:        0.11.2
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 License:        GPL
 Group:          Applications/Multimedia



From fedora-extras-commits at redhat.com  Thu Mar  3 16:41:56 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:41:56 -0500
Subject: rpms/jasper import.log,1.2,1.3
Message-ID: <200503031641.j23GfuRU006865@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/jasper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6856

Modified Files:
	import.log 
Log Message:
auto-import jasper-1.701.0-0.fdr.3.2 on branch FC-2 from jasper-1.701.0-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/jasper/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Dec 2004 16:40:10 -0000	1.2
+++ import.log	3 Mar 2005 16:41:54 -0000	1.3
@@ -1 +1,2 @@
 jasper-1_701_0-0_fdr_3_2:HEAD:jasper-1.701.0-0.fdr.3.2.src.rpm:1102524071
+jasper-1_701_0-0_fdr_3_2:FC-2:jasper-1.701.0-0.fdr.3.2.src.rpm:1109868122



From fedora-extras-commits at redhat.com  Thu Mar  3 16:41:56 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:41:56 -0500
Subject: rpms/jasper/FC-2 jasper.spec,1.2,1.3
Message-ID: <200503031641.j23GfupQ006869@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/jasper/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6856/FC-2

Modified Files:
	jasper.spec 
Log Message:
auto-import jasper-1.701.0-0.fdr.3.2 on branch FC-2 from jasper-1.701.0-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-2/jasper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jasper.spec	10 Dec 2004 22:03:04 -0000	1.2
+++ jasper.spec	3 Mar 2005 16:41:54 -0000	1.3
@@ -12,7 +12,7 @@
 Group:	 System Environment/Libraries
 Epoch:	 0
 Version: 1.701.0
-Release: 3%{?dist_tag}
+Release: 0.fdr.3%{?dist_tag}.2
 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



From fedora-extras-commits at redhat.com  Thu Mar  3 16:43:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:43:05 -0500
Subject: rpms/kile-i18n import.log,1.2,1.3
Message-ID: <200503031643.j23Gh5Dw007016@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/kile-i18n
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7004

Modified Files:
	import.log 
Log Message:
auto-import kile-i18n-1.7-0.fdr.3.2 on branch FC-2 from kile-i18n-1.7-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kile-i18n/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	13 Jan 2005 15:39:01 -0000	1.2
+++ import.log	3 Mar 2005 16:43:03 -0000	1.3
@@ -1 +1,2 @@
 kile-i18n-1_7-3:HEAD:kile-i18n-1.7-3.src.rpm:1105630781
+kile-i18n-1_7-0_fdr_3_2:FC-2:kile-i18n-1.7-0.fdr.3.2.src.rpm:1109868191



From fedora-extras-commits at redhat.com  Thu Mar  3 16:43:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:43:05 -0500
Subject: rpms/kile-i18n/FC-2 kile-i18n.spec,1.1,1.2
Message-ID: <200503031643.j23Gh5gi007017@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/kile-i18n/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7004/FC-2

Modified Files:
	kile-i18n.spec 
Log Message:
auto-import kile-i18n-1.7-0.fdr.3.2 on branch FC-2 from kile-i18n-1.7-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: kile-i18n.spec
===================================================================
RCS file: /cvs/extras/rpms/kile-i18n/FC-2/kile-i18n.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kile-i18n.spec	13 Jan 2005 15:39:01 -0000	1.1
+++ kile-i18n.spec	3 Mar 2005 16:43:03 -0000	1.2
@@ -4,7 +4,7 @@
 Name: 	 kile-i18n 
 Group:	 Applications/Office
 Version: 1.7
-Release: 3
+Release: 0.fdr.3.2
 Source:  http://dl.sourceforge.net/sourceforge/kile/kile-i18n-1.7.tar.bz2 
 URL:     http://kile.sourceforge.net/
 License: GPL
@@ -73,7 +73,7 @@
 
 
 %changelog
-* Wed Nov 21 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.7-3
+* Wed Nov 21 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.7-0.fdr.3
 - BR: gettext
 
 * Tue Nov 20 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.7-0.fdr.2



From fedora-extras-commits at redhat.com  Thu Mar  3 16:44:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:44:05 -0500
Subject: rpms/libassuan import.log,1.4,1.5
Message-ID: <200503031644.j23Gi5sS007140@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libassuan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7131

Modified Files:
	import.log 
Log Message:
auto-import libassuan-0.6.7-0.fdr.3.2 on branch FC-2 from libassuan-0.6.7-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libassuan/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 16:32:50 -0000	1.4
+++ import.log	3 Mar 2005 16:44:03 -0000	1.5
@@ -1,3 +1,4 @@
 libassuan-0_6_7-0_fdr_3_2:HEAD:libassuan-0.6.7-0.fdr.3.2.src.rpm:1102524362
 libassuan-0_6_9-1:HEAD:libassuan-0.6.9-1.src.rpm:1107286225
 libassuan-0_6_7-0_fdr_3_1:FC-1:libassuan-0.6.7-0.fdr.3.1.src.rpm:1109867578
+libassuan-0_6_7-0_fdr_3_2:FC-2:libassuan-0.6.7-0.fdr.3.2.src.rpm:1109868252



From fedora-extras-commits at redhat.com  Thu Mar  3 16:44:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:44:05 -0500
Subject: rpms/libassuan/FC-2 libassuan-0.6.7.tar.gz.sig, 1.2, 1.3 .cvsignore,
	1.3, 1.4 libassuan.spec, 1.4, 1.5 sources, 1.3,
	1.4 libassuan-0.6.9.tar.gz.sig, 1.1, NONE
Message-ID: <200503031644.j23Gi5wK007144@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libassuan/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7131/FC-2

Modified Files:
	.cvsignore libassuan.spec sources 
Added Files:
	libassuan-0.6.7.tar.gz.sig 
Removed Files:
	libassuan-0.6.9.tar.gz.sig 
Log Message:
auto-import libassuan-0.6.7-0.fdr.3.2 on branch FC-2 from libassuan-0.6.7-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: libassuan-0.6.7.tar.gz.sig
===================================================================
RCS file: libassuan-0.6.7.tar.gz.sig
diff -N libassuan-0.6.7.tar.gz.sig
Binary files /dev/null and /tmp/cvsUo5yva differ


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-2/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2005 19:30:20 -0000	1.3
+++ .cvsignore	3 Mar 2005 16:44:03 -0000	1.4
@@ -1 +1 @@
-libassuan-0.6.9.tar.gz
+libassuan-0.6.7.tar.gz


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-2/libassuan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libassuan.spec	3 Feb 2005 12:34:21 -0000	1.4
+++ libassuan.spec	3 Mar 2005 16:44:03 -0000	1.5
@@ -1,10 +1,10 @@
 
 Summary: GnuPG IPC library 
 Name:	 libassuan
-Version: 0.6.9
-Release: 2%{?dist_tag}
-Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz
-Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig
+Version: 0.6.7
+Release: 0.fdr.3%{?dist_tag}.2
+Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz
+Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz.sig
 URL:	 http://www.gnupg.org/
 License: GPL
 Group: 	 System Environment/Libraries
@@ -33,7 +33,7 @@
 %build
 %configure
 
-make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
@@ -79,12 +79,6 @@
 
 
 %changelog
-* Thu Feb  3 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.6.9-2
-- Build PIC to fix x86_64 linking.
-
-* Thu Jan 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.6.9-1
-- 0.6.9
-
 * Sat Oct 23 2004 Rex Dieter <rexdieter[AT]users.sf.net> - 0.6.7-0.fdr.3
 - *really* fix description this time.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-2/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2005 19:30:20 -0000	1.3
+++ sources	3 Mar 2005 16:44:03 -0000	1.4
@@ -1 +1 @@
-7f8aff75d034159b84faf2358263f444  libassuan-0.6.9.tar.gz
+db4e6939fafbaae80cab11a67f28771d  libassuan-0.6.7.tar.gz


--- libassuan-0.6.9.tar.gz.sig DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 16:45:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:45:42 -0500
Subject: rpms/libsigsegv import.log,1.2,1.3
Message-ID: <200503031645.j23GjgaI007316@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsigsegv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7307

Modified Files:
	import.log 
Log Message:
auto-import libsigsegv-2.1-0.fdr.2.2 on branch FC-2 from libsigsegv-2.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Dec 2004 16:49:10 -0000	1.2
+++ import.log	3 Mar 2005 16:45:40 -0000	1.3
@@ -1 +1,2 @@
 libsigsegv-2_1-0_fdr_2_2:HEAD:libsigsegv-2.1-0.fdr.2.2.src.rpm:1102524610
+libsigsegv-2_1-0_fdr_2_2:FC-2:libsigsegv-2.1-0.fdr.2.2.src.rpm:1109868348



From fedora-extras-commits at redhat.com  Thu Mar  3 16:45:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:45:42 -0500
Subject: rpms/libsigsegv/FC-2 libsigsegv.spec,1.2,1.3
Message-ID: <200503031645.j23Gjgoo007320@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsigsegv/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7307/FC-2

Modified Files:
	libsigsegv.spec 
Log Message:
auto-import libsigsegv-2.1-0.fdr.2.2 on branch FC-2 from libsigsegv-2.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-2/libsigsegv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libsigsegv.spec	10 Dec 2004 22:03:06 -0000	1.2
+++ libsigsegv.spec	3 Mar 2005 16:45:40 -0000	1.3
@@ -4,7 +4,7 @@
 Name:    libsigsegv
 Epoch:	 0
 Version: 2.1
-Release: 2%{?dist_tag}
+Release: 0.fdr.2%{?dist_tag}.2
 License: GPL	
 URL:	 http://libsigsegv.sourceforge.net/
 Source:  ftp://ftp.gnu.org/pub/gnu/libsigsegv/libsigsegv-2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 16:46:56 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:46:56 -0500
Subject: rpms/proj import.log,1.4,1.5
Message-ID: <200503031646.j23Gkuc3007460@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/proj
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7450

Modified Files:
	import.log 
Log Message:
auto-import proj-4.4.8-0.fdr.4.2 on branch FC-2 from proj-4.4.8-0.fdr.4.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/proj/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 16:34:34 -0000	1.4
+++ import.log	3 Mar 2005 16:46:54 -0000	1.5
@@ -1,3 +1,4 @@
 proj-4_4_8-4:HEAD:proj-4.4.8-4.src.rpm:1105695966
 proj-4_4_8-0_fdr_4_rh90:RHL-9:proj-4.4.8-0.fdr.4.rh90.src.rpm:1109748255
 proj-4_4_8-0_fdr_4_1:FC-1:proj-4.4.8-0.fdr.4.1.src.rpm:1109867681
+proj-4_4_8-0_fdr_4_2:FC-2:proj-4.4.8-0.fdr.4.2.src.rpm:1109868421



From fedora-extras-commits at redhat.com  Thu Mar  3 16:46:56 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:46:56 -0500
Subject: rpms/proj/FC-2 proj.spec,1.1,1.2
Message-ID: <200503031646.j23Gku2N007463@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/proj/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7450/FC-2

Modified Files:
	proj.spec 
Log Message:
auto-import proj-4.4.8-0.fdr.4.2 on branch FC-2 from proj-4.4.8-0.fdr.4.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: proj.spec
===================================================================
RCS file: /cvs/extras/rpms/proj/FC-2/proj.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proj.spec	14 Jan 2005 09:45:21 -0000	1.1
+++ proj.spec	3 Mar 2005 16:46:54 -0000	1.2
@@ -1,6 +1,10 @@
-Name: proj
-Version: 4.4.8
-Release: 4
+%define name proj
+%define version 4.4.8
+%define release 0.fdr.4
+
+Name: %name
+Version: %version
+Release: %release.2
 Epoch: 0
 Summary: Cartographic projection software (PROJ.4)
 
@@ -89,13 +93,13 @@
 %{_datadir}/%{name}
 
 %changelog
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-4
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.4
 - Added testvarious to nad distribution
 
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-0.fdr.3
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.3
 - Added patch for test scripts so that they will work in installed rpm
 
-* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-0.fdr.2
+* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.2
 - Fixed permissions on nad27 and nad83
 - Included test27 and test83 in the nad rpm and made them executable
 



From fedora-extras-commits at redhat.com  Thu Mar  3 16:47:40 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:47:40 -0500
Subject: rpms/qca import.log,1.2,1.3
Message-ID: <200503031647.j23Glen5007572@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/qca
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7563

Modified Files:
	import.log 
Log Message:
auto-import qca-1.0-0.fdr.3.2 on branch FC-2 from qca-1.0-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qca/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	13 Jan 2005 18:24:21 -0000	1.2
+++ import.log	3 Mar 2005 16:47:38 -0000	1.3
@@ -1 +1,2 @@
 qca-1_0-3:HEAD:qca-1.0-3.src.rpm:1105640702
+qca-1_0-0_fdr_3_2:FC-2:qca-1.0-0.fdr.3.2.src.rpm:1109868466



From fedora-extras-commits at redhat.com  Thu Mar  3 16:47:40 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:47:40 -0500
Subject: rpms/qca/FC-2 qca.spec,1.1,1.2
Message-ID: <200503031647.j23GleJ3007576@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/qca/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7563/FC-2

Modified Files:
	qca.spec 
Log Message:
auto-import qca-1.0-0.fdr.3.2 on branch FC-2 from qca-1.0-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: qca.spec
===================================================================
RCS file: /cvs/extras/rpms/qca/FC-2/qca.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qca.spec	13 Jan 2005 18:24:21 -0000	1.1
+++ qca.spec	3 Mar 2005 16:47:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           qca
 Version:        1.0
-Release:        3
+Release:        0.fdr.3.2
 Epoch:          0
 Summary:        Qt Cryptographic Architecture
 
@@ -68,7 +68,7 @@
 
 
 %changelog
-* Thu Jan 13 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0-3
+* Thu Jan 13 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0-0.fdr.3
 - fix Category
 - fix build on x86_64
 



From fedora-extras-commits at redhat.com  Thu Mar  3 16:48:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:48:42 -0500
Subject: rpms/shapelib import.log,1.4,1.5
Message-ID: <200503031648.j23GmgPE007689@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/shapelib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7679

Modified Files:
	import.log 
Log Message:
auto-import shapelib-1.2.10-0.fdr.5.2 on branch FC-2 from shapelib-1.2.10-0.fdr.5.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/shapelib/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 16:33:48 -0000	1.4
+++ import.log	3 Mar 2005 16:48:40 -0000	1.5
@@ -1,3 +1,4 @@
 shapelib-1_2_10-5:HEAD:shapelib-1.2.10-5.src.rpm:1105696087
 shapelib-1_2_10-0_fdr_5_rh90:RHL-9:shapelib-1.2.10-0.fdr.5.rh90.src.rpm:1109748327
 shapelib-1_2_10-0_fdr_5_1:FC-1:shapelib-1.2.10-0.fdr.5.1.src.rpm:1109867635
+shapelib-1_2_10-0_fdr_5_2:FC-2:shapelib-1.2.10-0.fdr.5.2.src.rpm:1109868527



From fedora-extras-commits at redhat.com  Thu Mar  3 16:48:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:48:42 -0500
Subject: rpms/shapelib/FC-2 shapelib-1.2.10.patch, 1.2, 1.3 shapelib.spec,
	1.2, 1.3 shapelib-1.2.10-endian.patch, 1.1, NONE
Message-ID: <200503031648.j23GmgPT007692@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/shapelib/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7679/FC-2

Modified Files:
	shapelib-1.2.10.patch shapelib.spec 
Removed Files:
	shapelib-1.2.10-endian.patch 
Log Message:
auto-import shapelib-1.2.10-0.fdr.5.2 on branch FC-2 from shapelib-1.2.10-0.fdr.5.2.src.rpm
Bring in stuff from fedora.us FC2/stable

shapelib-1.2.10.patch:

Index: shapelib-1.2.10.patch
===================================================================
RCS file: /cvs/extras/rpms/shapelib/FC-2/shapelib-1.2.10.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib-1.2.10.patch	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib-1.2.10.patch	3 Mar 2005 16:48:40 -0000	1.3
@@ -91,8 +91,7 @@
  
  # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN
 +CC = gcc
--ENDIAN	=	-D_LITTLE_ENDIAN
-+#ENDIAN	=	-D_LITTLE_ENDIAN
+ ENDIAN	=	-D_LITTLE_ENDIAN
  
 -CFLAGS	=	-g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
 +EXTRACFLAGS   =      -g


Index: shapelib.spec
===================================================================
RCS file: /cvs/extras/rpms/shapelib/FC-2/shapelib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib.spec	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib.spec	3 Mar 2005 16:48:40 -0000	1.3
@@ -2,12 +2,11 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.2.10
-Release: 6
+Release: 0.fdr.5.2
 Epoch: 0
 URL: http://shapelib.maptools.org/
 Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz
 Patch0: shapelib-%{version}.patch
-Patch1: shapelib-1.2.10-endian.patch
 License: LGPL/MIT
 Group: Development/Libraries
 Buildrequires: libtool
@@ -31,7 +30,6 @@
 %prep
 %setup -q -T -b 0
 %patch -p1 -b .buildroot 
-%patch1 -p1 -b .endian
 
 %build
 make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" lib
@@ -72,10 +70,7 @@
 %exclude %{_libdir}/libshp.la
 
 %changelog
-* Sun Feb 13 2005 David Woodhouse <dwmw2 at infradead.org> 0:1.2.10-6
-- Don't hard-code endianness; just use endian.h
-
-* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:1.2.10-5
+* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:1.2.10-0.fdr.5
 - Patched patch and spec file according to suggestions of Michael Schwendt
 - In particular, this separates the building from the installing in the rpm.
 


--- shapelib-1.2.10-endian.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 16:49:27 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:49:27 -0500
Subject: rpms/zope import.log,1.3,1.4
Message-ID: <200503031649.j23GnRqd007800@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/zope
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7791

Modified Files:
	import.log 
Log Message:
auto-import zope-2.7.4-0.fdr.1.2 on branch FC-2 from zope-2.7.4-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/zope/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	29 Jan 2005 22:57:17 -0000	1.3
+++ import.log	3 Mar 2005 16:49:25 -0000	1.4
@@ -1,2 +1,3 @@
 zope-2_7_3-6:HEAD:zope-2.7.3-6.src.rpm:1105272558
 zope-2_7_4-1:HEAD:zope-2.7.4-1.src.rpm:1107039430
+zope-2_7_4-0_fdr_1_2:FC-2:zope-2.7.4-0.fdr.1.2.src.rpm:1109868572



From fedora-extras-commits at redhat.com  Thu Mar  3 16:49:27 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 11:49:27 -0500
Subject: rpms/zope/FC-2 zope.spec,1.2,1.3
Message-ID: <200503031649.j23GnRLF007805@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/zope/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7791/FC-2

Modified Files:
	zope.spec 
Log Message:
auto-import zope-2.7.4-0.fdr.1.2 on branch FC-2 from zope-2.7.4-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-2/zope.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zope.spec	29 Jan 2005 22:57:17 -0000	1.2
+++ zope.spec	3 Mar 2005 16:49:25 -0000	1.3
@@ -13,7 +13,7 @@
 Name: 	 zope
 Summary: Web application server for flexible content management applications
 Version: 2.7.4
-Release: 1
+Release: 0.fdr.1.2
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:	 http://www.zope.org/
@@ -180,7 +180,7 @@
 
 
 %changelog
-* Wed Jan 26 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.4-1
+* Wed Jan 26 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.4-0.fdr.1
 - version 2.7.4
 - flag the documentation as %%doc
 - make %%zope_home go+rx to allow users to create instances and to allow



From fedora-extras-commits at redhat.com  Thu Mar  3 17:53:12 2005
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Thu, 3 Mar 2005 12:53:12 -0500
Subject: rpms/libfwbuilder/FC-3 .cvsignore, 1.2, 1.3 libfwbuilder.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200503031753.j23HrCdA008849@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/extras/rpms/libfwbuilder/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8843

Modified Files:
	.cvsignore libfwbuilder.spec sources 
Log Message:
* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jan 2005 05:37:37 -0000	1.2
+++ .cvsignore	3 Mar 2005 17:53:10 -0000	1.3
@@ -1 +1,2 @@
 libfwbuilder-2.0.5.tar.gz
+libfwbuilder-2.0.6.tar.gz


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/FC-3/libfwbuilder.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libfwbuilder.spec	9 Feb 2005 07:51:11 -0000	1.3
+++ libfwbuilder.spec	3 Mar 2005 17:53:10 -0000	1.4
@@ -1,7 +1,7 @@
 Name:           libfwbuilder
 Summary: 	Firewall Builder API
-Version:        2.0.5
-Release:        3
+Version:        2.0.6
+Release:        1
 License: 	GPL
 Group:  	System Environment/Libraries
 Url: 		http://www.fwbuilder.org/
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
+- New upstream version
+
 * Sun Feb  6 2005 Ville Skytt?? <ville.skytta at iki.fi> - 2.0.5-3
 - Remove extra quotes from Group tag in -devel.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jan 2005 05:37:37 -0000	1.2
+++ sources	3 Mar 2005 17:53:10 -0000	1.3
@@ -1 +1,2 @@
 7fe07b07e13d21e20d10185276c2318e  libfwbuilder-2.0.5.tar.gz
+d53a69f5774fc987779ac0df4e54beb6  libfwbuilder-2.0.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 17:55:28 2005
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Thu, 3 Mar 2005 12:55:28 -0500
Subject: rpms/fwbuilder/FC-3 .cvsignore, 1.2, 1.3 fwbuilder.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200503031755.j23HtS2m008956@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/extras/rpms/fwbuilder/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8950

Modified Files:
	.cvsignore fwbuilder.spec sources 
Log Message:
* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jan 2005 05:40:01 -0000	1.2
+++ .cvsignore	3 Mar 2005 17:55:26 -0000	1.3
@@ -1 +1,2 @@
 fwbuilder-2.0.5.tar.gz
+fwbuilder-2.0.6.tar.gz


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-3/fwbuilder.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fwbuilder.spec	23 Jan 2005 16:54:41 -0000	1.3
+++ fwbuilder.spec	3 Mar 2005 17:55:26 -0000	1.4
@@ -152,6 +152,9 @@
 %{_mandir}/man1/fwb_ipt.1*
 
 %changelog
+* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
+- New upstream version
+
 * Sun Jan 23 2005 Warren Togami <wtogami at redhat.com> 2.0.5-3
 - Typo fix (#145887 Stefan Hoelldampf) 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jan 2005 05:40:01 -0000	1.2
+++ sources	3 Mar 2005 17:55:26 -0000	1.3
@@ -1 +1,2 @@
 03fe6aaa6f8c7728bd3015a4df187c70  fwbuilder-2.0.5.tar.gz
+41554801c43e14a48b19ade91e5a14cd  fwbuilder-2.0.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 18:05:01 2005
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Thu, 3 Mar 2005 13:05:01 -0500
Subject: rpms/libfwbuilder/devel .cvsignore, 1.2, 1.3 libfwbuilder.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200503031805.j23I51fe009782@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9776

Modified Files:
	.cvsignore libfwbuilder.spec sources 
Log Message:
* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jan 2005 05:37:37 -0000	1.2
+++ .cvsignore	3 Mar 2005 18:04:58 -0000	1.3
@@ -1 +1,2 @@
 libfwbuilder-2.0.5.tar.gz
+libfwbuilder-2.0.6.tar.gz


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libfwbuilder.spec	9 Feb 2005 07:51:11 -0000	1.3
+++ libfwbuilder.spec	3 Mar 2005 18:04:58 -0000	1.4
@@ -1,7 +1,7 @@
 Name:           libfwbuilder
 Summary: 	Firewall Builder API
-Version:        2.0.5
-Release:        3
+Version:        2.0.6
+Release:        1
 License: 	GPL
 Group:  	System Environment/Libraries
 Url: 		http://www.fwbuilder.org/
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
+- New upstream version
+
 * Sun Feb  6 2005 Ville Skytt?? <ville.skytta at iki.fi> - 2.0.5-3
 - Remove extra quotes from Group tag in -devel.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jan 2005 05:37:37 -0000	1.2
+++ sources	3 Mar 2005 18:04:58 -0000	1.3
@@ -1 +1,2 @@
 7fe07b07e13d21e20d10185276c2318e  libfwbuilder-2.0.5.tar.gz
+d53a69f5774fc987779ac0df4e54beb6  libfwbuilder-2.0.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 18:05:59 2005
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Thu, 3 Mar 2005 13:05:59 -0500
Subject: rpms/fwbuilder/devel .cvsignore, 1.2, 1.3 fwbuilder.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200503031805.j23I5xQF009823@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/extras/rpms/fwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9817

Modified Files:
	.cvsignore fwbuilder.spec sources 
Log Message:
* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jan 2005 05:40:01 -0000	1.2
+++ .cvsignore	3 Mar 2005 18:05:57 -0000	1.3
@@ -1 +1,2 @@
 fwbuilder-2.0.5.tar.gz
+fwbuilder-2.0.6.tar.gz


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fwbuilder.spec	23 Jan 2005 16:54:41 -0000	1.3
+++ fwbuilder.spec	3 Mar 2005 18:05:57 -0000	1.4
@@ -152,6 +152,9 @@
 %{_mandir}/man1/fwb_ipt.1*
 
 %changelog
+* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
+- New upstream version
+
 * Sun Jan 23 2005 Warren Togami <wtogami at redhat.com> 2.0.5-3
 - Typo fix (#145887 Stefan Hoelldampf) 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jan 2005 05:40:01 -0000	1.2
+++ sources	3 Mar 2005 18:05:57 -0000	1.3
@@ -1 +1,2 @@
 03fe6aaa6f8c7728bd3015a4df187c70  fwbuilder-2.0.5.tar.gz
+41554801c43e14a48b19ade91e5a14cd  fwbuilder-2.0.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 18:08:59 2005
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Thu, 3 Mar 2005 13:08:59 -0500
Subject: rpms/fwbuilder/devel fwbuilder.spec,1.4,1.5
Message-ID: <200503031808.j23I8x2N009866@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/extras/rpms/fwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9860

Modified Files:
	fwbuilder.spec 
Log Message:
* Thu Mar  3 2005 Steve Grubb <sgrubb at redhat.com> 2.0.6-1
- New upstream version



Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fwbuilder.spec	3 Mar 2005 18:05:57 -0000	1.4
+++ fwbuilder.spec	3 Mar 2005 18:08:57 -0000	1.5
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
-Version:        2.0.5
-Release:        3
+Version:        2.0.6
+Release:        1
 License:        GPL
 Group:          Applications/System
 URL:            http://www.fwbuilder.org/
@@ -10,7 +10,7 @@
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  qt-devel >= 1:3.0.0
 BuildRequires:	desktop-file-utils
-BuildRequires:  libfwbuilder-devel = 2.0.5
+BuildRequires:  libfwbuilder-devel = 2.0.6
 
 %description
 Firewall Builder consists of a GUI and set of policy compilers for



From bugs.michael at gmx.net  Thu Mar  3 18:34:06 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 19:34:06 +0100
Subject: rpms/proj/FC-2 proj.spec,1.1,1.2
In-Reply-To: <200503031646.j23Gku2N007463@cvs-int.fedora.redhat.com>
References: <200503031646.j23Gku2N007463@cvs-int.fedora.redhat.com>
Message-ID: <20050303193406.0d5262b6.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 11:46:56 -0500, Michael Schwendt (mschwendt) wrote:

>  %changelog
> -* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-4
> +* Wed Dec 29 2004 David Kaplan <dmk at localhost.localdomain> - 0:4.4.8-0.fdr.4
>  - Added testvarious to nad distribution

To those people who have been paying attention, above change is the result
of an auto-imported src.rpm. The 4.4.8-4 release for FC-3 was fixed after
initial import. The older packages from fedora.us still contain that crap
in the changelog.



From fedora-extras-commits at redhat.com  Thu Mar  3 18:46:55 2005
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Thu, 3 Mar 2005 13:46:55 -0500
Subject: rpms/fwbuilder/FC-3 fwbuilder.spec,1.4,1.5
Message-ID: <200503031846.j23IktI0009958@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/extras/rpms/fwbuilder/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9950

Modified Files:
	fwbuilder.spec 
Log Message:
Correct version number



Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-3/fwbuilder.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fwbuilder.spec	3 Mar 2005 17:55:26 -0000	1.4
+++ fwbuilder.spec	3 Mar 2005 18:46:53 -0000	1.5
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
-Version:        2.0.5
-Release:        3
+Version:        2.0.6
+Release:        1
 License:        GPL
 Group:          Applications/System
 URL:            http://www.fwbuilder.org/
@@ -10,7 +10,7 @@
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  qt-devel >= 1:3.0.0
 BuildRequires:	desktop-file-utils
-BuildRequires:  libfwbuilder-devel = 2.0.5
+BuildRequires:  libfwbuilder-devel = 2.0.6
 
 %description
 Firewall Builder consists of a GUI and set of policy compilers for



From fedora-extras-commits at redhat.com  Thu Mar  3 18:58:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 13:58:38 -0500
Subject: rpms/vice/RHL-9 .cvsignore, 1.2, NONE Makefile, 1.2, NONE branch,
	1.1, NONE sources, 1.2, NONE vice-1.14-mkstemp.patch, 1.1,
	NONE vice.spec, 1.1, NONE
Message-ID: <200503031858.j23IwcUW010109@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/vice/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10085/RHL-9

Removed Files:
	.cvsignore Makefile branch sources vice-1.14-mkstemp.patch 
	vice.spec 
Log Message:
Delete also the other branches because of legal concerns.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- vice-1.14-mkstemp.patch DELETED ---


--- vice.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 18:58:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 13:58:38 -0500
Subject: rpms/vice/FC-1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE branch, 1.1,
	NONE sources, 1.2, NONE vice-1.14-mkstemp.patch, 1.1,
	NONE vice.spec, 1.2, NONE
Message-ID: <200503031858.j23IwcRt010100@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/vice/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10085/FC-1

Removed Files:
	.cvsignore Makefile branch sources vice-1.14-mkstemp.patch 
	vice.spec 
Log Message:
Delete also the other branches because of legal concerns.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- vice-1.14-mkstemp.patch DELETED ---


--- vice.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 18:58:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 13:58:38 -0500
Subject: rpms/vice/FC-2 .cvsignore, 1.2, NONE Makefile, 1.2, NONE branch, 1.1,
	NONE sources, 1.2, NONE vice-1.14-mkstemp.patch, 1.1,
	NONE vice.spec, 1.3, NONE
Message-ID: <200503031858.j23IwcnI010103@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/vice/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10085/FC-2

Removed Files:
	.cvsignore Makefile branch sources vice-1.14-mkstemp.patch 
	vice.spec 
Log Message:
Delete also the other branches because of legal concerns.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- vice-1.14-mkstemp.patch DELETED ---


--- vice.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 18:58:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 13:58:38 -0500
Subject: rpms/vice/FC-3 branch,1.1,NONE
Message-ID: <200503031858.j23IwcwJ010106@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/vice/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10085/FC-3

Removed Files:
	branch 
Log Message:
Delete also the other branches because of legal concerns.


--- branch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 18:59:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 13:59:21 -0500
Subject: rpms/k3b-ape/FC-1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE branch,
	1.1, NONE k3b-ape.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <200503031859.j23IxLts010191@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/k3b-ape/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10179/FC-1

Removed Files:
	.cvsignore Makefile branch k3b-ape.spec sources 
Log Message:
Removed also older branches due to licence conflicts and hence legal
concerns. Author of included SDK could not be reached after several
attempts at contacting him by e-mail and in his message board. Recent
mails bounced:

    /bin/sh: line 1: /dev/null: Permission denied
    I'm not going to try again; this message has been in the queue too long.

Plans on changing the licence of the SDK to either LGPL or GPL
don't seem to move forward either.



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- k3b-ape.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 18:59:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 13:59:21 -0500
Subject: rpms/k3b-ape/RHL-9 .cvsignore, 1.2, NONE Makefile, 1.2, NONE branch,
	1.1, NONE k3b-ape.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200503031859.j23IxLvC010197@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/k3b-ape/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10179/RHL-9

Removed Files:
	.cvsignore Makefile branch k3b-ape.spec sources 
Log Message:
Removed also older branches due to licence conflicts and hence legal
concerns. Author of included SDK could not be reached after several
attempts at contacting him by e-mail and in his message board. Recent
mails bounced:

    /bin/sh: line 1: /dev/null: Permission denied
    I'm not going to try again; this message has been in the queue too long.

Plans on changing the licence of the SDK to either LGPL or GPL
don't seem to move forward either.



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- k3b-ape.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 18:59:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 13:59:21 -0500
Subject: rpms/k3b-ape/FC-2 .cvsignore, 1.2, NONE Makefile, 1.2, NONE branch,
	1.1, NONE k3b-ape.spec, 1.3, NONE sources, 1.2, NONE
Message-ID: <200503031859.j23IxLps010194@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/k3b-ape/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10179/FC-2

Removed Files:
	.cvsignore Makefile branch k3b-ape.spec sources 
Log Message:
Removed also older branches due to licence conflicts and hence legal
concerns. Author of included SDK could not be reached after several
attempts at contacting him by e-mail and in his message board. Recent
mails bounced:

    /bin/sh: line 1: /dev/null: Permission denied
    I'm not going to try again; this message has been in the queue too long.

Plans on changing the licence of the SDK to either LGPL or GPL
don't seem to move forward either.



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- k3b-ape.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 19:01:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:01:05 -0500
Subject: rpms/ccid import.log,1.2,1.3
Message-ID: <200503031901.j23J15bT010898@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/ccid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10889

Modified Files:
	import.log 
Log Message:
auto-import ccid-0.4.1-0.fdr.4.2 on branch FC-2 from ccid-0.4.1-0.fdr.4.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ccid/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	25 Feb 2005 20:09:05 -0000	1.2
+++ import.log	3 Mar 2005 19:01:03 -0000	1.3
@@ -1 +1,2 @@
 ccid-0_4_1-4:HEAD:ccid-0.4.1-4.src.rpm:1109362138
+ccid-0_4_1-0_fdr_4_2:FC-2:ccid-0.4.1-0.fdr.4.2.src.rpm:1109876470



From fedora-extras-commits at redhat.com  Thu Mar  3 19:01:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:01:05 -0500
Subject: rpms/ccid/FC-2 ccid.spec,1.2,1.3
Message-ID: <200503031901.j23J15Ur010903@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/ccid/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10889/FC-2

Modified Files:
	ccid.spec 
Log Message:
auto-import ccid-0.4.1-0.fdr.4.2 on branch FC-2 from ccid-0.4.1-0.fdr.4.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: ccid.spec
===================================================================
RCS file: /cvs/extras/rpms/ccid/FC-2/ccid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ccid.spec	25 Feb 2005 20:22:00 -0000	1.2
+++ ccid.spec	3 Mar 2005 19:01:03 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           ccid
 Version:        0.4.1
-Release:        4
-Summary:        Generic USB CCID smart card reader driver
+Release:        0.fdr.4.2
+Summary:        Generic USB CCID driver
 
 Group:          System Environment/Libraries
 License:        GPL
@@ -24,7 +24,7 @@
 
 
 %build
-%configure --disable-dependency-tracking \
+%configure \
   --enable-usbdropdir=%{_libdir}/pcsc/drivers \
   --enable-ccidtwindir=%{_libdir}/pcsc/drivers/serial
 make %{?_smp_mflags}
@@ -57,10 +57,8 @@
 
 
 %changelog
-* Fri Feb 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.4.1-4
+* Fri Feb 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.4.1-0.fdr.4
 - Drop Epoch: 0.
-- Improve summary.
-- Build with dependency tracking disabled.
 
 * Thu Jul  1 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.4.1-0.fdr.3
 - Restart pcscd in post(un)install phase if it's available and running.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:01:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:01:55 -0500
Subject: rpms/i810switch import.log,1.3,1.4
Message-ID: <200503031901.j23J1tql011076@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/i810switch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11066

Modified Files:
	import.log 
Log Message:
auto-import i810switch-0.6.2-0.fdr.3.2 on branch FC-2 from i810switch-0.6.2-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/i810switch/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:10:30 -0000	1.3
+++ import.log	3 Mar 2005 19:01:53 -0000	1.4
@@ -1,2 +1,3 @@
 i810switch-0_6_2-3:HEAD:i810switch-0.6.2-3.src.rpm:1106671753
 i810switch-0_6_2-0_fdr_3_rh90:RHL-9:i810switch-0.6.2-0.fdr.3.rh90.src.rpm:1109747422
+i810switch-0_6_2-0_fdr_3_2:FC-2:i810switch-0.6.2-0.fdr.3.2.src.rpm:1109876521



From fedora-extras-commits at redhat.com  Thu Mar  3 19:01:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:01:55 -0500
Subject: rpms/i810switch/FC-2 i810switch.spec,1.1,1.2
Message-ID: <200503031901.j23J1t4K011079@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/i810switch/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11066/FC-2

Modified Files:
	i810switch.spec 
Log Message:
auto-import i810switch-0.6.2-0.fdr.3.2 on branch FC-2 from i810switch-0.6.2-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/FC-2/i810switch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- i810switch.spec	25 Jan 2005 16:49:20 -0000	1.1
+++ i810switch.spec	3 Mar 2005 19:01:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.2
-Release: 3
+Release: 0.fdr.3.2
 Epoch: 0
 Summary: A utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -40,7 +40,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Tue Jan 18 2005 David Kaplan <dmk at localhost.localdomain> - 0:0.6.2-3
+* Tue Jan 18 2005 David Kaplan <dmk at localhost.localdomain> - 0:0.6.2-0.fdr.3
 - Added back INSTALL file to rpm because it explains how to SUID root
   the executable so that all users can use i810switch.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:02:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:02:42 -0500
Subject: rpms/mpc/FC-2 mpc.spec,1.2,1.3
Message-ID: <200503031902.j23J2gID011191@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/mpc/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11178/FC-2

Modified Files:
	mpc.spec 
Log Message:
auto-import mpc-0.11.1-0.fdr.2.2 on branch FC-2 from mpc-0.11.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: mpc.spec
===================================================================
RCS file: /cvs/extras/rpms/mpc/FC-2/mpc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mpc.spec	12 Dec 2004 21:23:43 -0000	1.2
+++ mpc.spec	3 Mar 2005 19:02:40 -0000	1.3
@@ -1,7 +1,7 @@
 Name:             mpc
 Summary:          Command-line client for MPD
 Version:          0.11.1
-Release:          2
+Release:          0.fdr.2.2
 Epoch:            0
 License:          GPL
 Group:            Applications/Multimedia
@@ -47,7 +47,7 @@
 
 
 %changelog
-* Wed Dec 08 2004 Aurelien Bompard <gauret[AT]free.fr> 0:0.11.1-2
+* Wed Dec 08 2004 Aurelien Bompard <gauret[AT]free.fr> 0:0.11.1-0.fdr.2
 - put the bash_completion file in %%_datadir instead of %%_docdir
 
 * Fri Nov 05 2004 Aurelien Bompard <gauret[AT]free.fr> 0:0.11.1-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:02:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:02:42 -0500
Subject: rpms/mpc import.log,1.2,1.3
Message-ID: <200503031902.j23J2gtB011187@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/mpc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11178

Modified Files:
	import.log 
Log Message:
auto-import mpc-0.11.1-0.fdr.2.2 on branch FC-2 from mpc-0.11.1-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mpc/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Dec 2004 21:12:03 -0000	1.2
+++ import.log	3 Mar 2005 19:02:40 -0000	1.3
@@ -1 +1,2 @@
 mpc-0_11_1-0_fdr_2_2:HEAD:mpc-0.11.1-0.fdr.2.2.src.rpm:1102885915
+mpc-0_11_1-0_fdr_2_2:FC-2:mpc-0.11.1-0.fdr.2.2.src.rpm:1109876568



From fedora-extras-commits at redhat.com  Thu Mar  3 19:03:59 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:03:59 -0500
Subject: rpms/pcsc-lite import.log,1.2,1.3
Message-ID: <200503031903.j23J3xwl011337@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-lite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11323

Modified Files:
	import.log 
Log Message:
auto-import pcsc-lite-1.2.0-0.fdr.10.2 on branch FC-2 from pcsc-lite-1.2.0-0.fdr.10.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	7 Jan 2005 19:57:18 -0000	1.2
+++ import.log	3 Mar 2005 19:03:57 -0000	1.3
@@ -1 +1,2 @@
 pcsc-lite-1_2_0-10:HEAD:pcsc-lite-1.2.0-10.src.rpm:1105127825
+pcsc-lite-1_2_0-0_fdr_10_2:FC-2:pcsc-lite-1.2.0-0.fdr.10.2.src.rpm:1109876644



From fedora-extras-commits at redhat.com  Thu Mar  3 19:03:59 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:03:59 -0500
Subject: rpms/pcsc-lite/FC-2 pcsc-lite.spec,1.1,1.2
Message-ID: <200503031903.j23J3xdt011341@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-lite/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11323/FC-2

Modified Files:
	pcsc-lite.spec 
Log Message:
auto-import pcsc-lite-1.2.0-0.fdr.10.2 on branch FC-2 from pcsc-lite-1.2.0-0.fdr.10.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/FC-2/pcsc-lite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcsc-lite.spec	7 Jan 2005 19:57:18 -0000	1.1
+++ pcsc-lite.spec	3 Mar 2005 19:03:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pcsc-lite
 Version:        1.2.0
-Release:        10
+Release:        0.fdr.10.2
 Epoch:          0
 Summary:        PC/SC Lite smart card framework and applications
 
@@ -138,7 +138,7 @@
 
 
 %changelog
-* Tue Aug 17 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2.0-10
+* Tue Aug 17 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2.0-0.fdr.10
 - Disable dependency tracking to speed up the build.
 - Drop reader.conf patch, it's not needed any more.
 - Rename update-reader-conf to update-reader.conf for consistency with Debian,



From fedora-extras-commits at redhat.com  Thu Mar  3 19:05:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:05:05 -0500
Subject: rpms/pcsc-perl import.log,1.2,1.3
Message-ID: <200503031905.j23J55PI011467@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11453

Modified Files:
	import.log 
Log Message:
auto-import pcsc-perl-1.3.1-0.fdr.3.2 on branch FC-2 from pcsc-perl-1.3.1-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pcsc-perl/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	7 Jan 2005 20:15:46 -0000	1.2
+++ import.log	3 Mar 2005 19:05:03 -0000	1.3
@@ -1 +1,2 @@
 pcsc-perl-1_3_1-4:HEAD:pcsc-perl-1.3.1-4.src.rpm:1105128940
+pcsc-perl-1_3_1-0_fdr_3_2:FC-2:pcsc-perl-1.3.1-0.fdr.3.2.src.rpm:1109876710



From fedora-extras-commits at redhat.com  Thu Mar  3 19:05:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:05:05 -0500
Subject: rpms/pcsc-perl/FC-2 pcsc-perl.spec,1.1,1.2
Message-ID: <200503031905.j23J55ZZ011471@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-perl/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11453/FC-2

Modified Files:
	pcsc-perl.spec 
Log Message:
auto-import pcsc-perl-1.3.1-0.fdr.3.2 on branch FC-2 from pcsc-perl-1.3.1-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: pcsc-perl.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-perl/FC-2/pcsc-perl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcsc-perl.spec	7 Jan 2005 20:15:46 -0000	1.1
+++ pcsc-perl.spec	3 Mar 2005 19:05:03 -0000	1.2
@@ -3,9 +3,9 @@
 
 Name:           pcsc-perl
 Version:        1.3.1
-Release:        4
+Release:        0.fdr.3.2
 Epoch:          0
-Summary:        Perl interface to the PC/SC smart card library
+Summary:        PC/SC library for Perl
 
 Group:          Development/Libraries
 License:        GPL
@@ -18,8 +18,8 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-This package contains a Perl interface to the PC/SC smart card
-library.
+This library allows to intercate with a smart card and pcsc-lite using
+the Perl language.
 
 
 %prep
@@ -28,16 +28,15 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor INC= \
-  DEFINE=-Wall
+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' -a -size 0 -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
+  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
@@ -59,10 +58,6 @@
 
 
 %changelog
-* Fri Jan  7 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.3.1-4
-- Honor $RPM_OPT_FLAGS, remove (some) extra include dirs from build (#1281).
-- Improve summary and description.
-
 * Wed May 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.3.1-0.fdr.3
 - BuildRequire perl >= 1:5.6.1 for vendor install dir support.
 - Use pure_install to avoid perllocal.pod workarounds.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:05:12 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:05:12 -0500
Subject: rpms/perl-Chart import.log,1.2,1.3
Message-ID: <200503031905.j23J5CH7011522@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Chart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11496

Modified Files:
	import.log 
Log Message:
auto-import perl-Chart-2.3-0.fdr.2.2 on branch FC-2 from perl-Chart-2.3-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Jan 2005 21:07:15 -0000	1.2
+++ import.log	3 Mar 2005 19:05:10 -0000	1.3
@@ -1 +1,2 @@
 perl-Chart-2_3-2:HEAD:perl-Chart-2.3-2.src.rpm:1105996029
+perl-Chart-2_3-0_fdr_2_2:FC-2:perl-Chart-2.3-0.fdr.2.2.src.rpm:1109876718



From fedora-extras-commits at redhat.com  Thu Mar  3 19:05:12 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:05:12 -0500
Subject: rpms/perl-Chart/FC-2 perl-Chart.spec,1.1,1.2
Message-ID: <200503031905.j23J5CL0011526@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Chart/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11496/FC-2

Modified Files:
	perl-Chart.spec 
Log Message:
auto-import perl-Chart-2.3-0.fdr.2.2 on branch FC-2 from perl-Chart-2.3-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-Chart.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/FC-2/perl-Chart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Chart.spec	17 Jan 2005 21:07:15 -0000	1.1
+++ perl-Chart.spec	3 Mar 2005 19:05:10 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Chart
 Version:        2.3
-Release:        2
+Release:        0.fdr.2.2
 Epoch:          0
 Summary:        Perl module for producing many types of charts
 
@@ -53,7 +53,7 @@
 
 
 %changelog
-* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.3-2
+* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.3-0.fdr.2
 - Bring up to date with current fedora.us Perl Spec template.
 
 * Thu Jan 15 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.3-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:05:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:05:55 -0500
Subject: rpms/perl-Error import.log,1.3,1.4
Message-ID: <200503031905.j23J5txv011673@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Error
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11661

Modified Files:
	import.log 
Log Message:
auto-import perl-Error-0.15-0.fdr.1.2 on branch FC-2 from perl-Error-0.15-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:11:52 -0000	1.3
+++ import.log	3 Mar 2005 19:05:53 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Error-0_15-0_fdr_1:HEAD:perl-Error-0.15-0.fdr.1.src.rpm:1103646600
 perl-Error-0_15-0_fdr_1_rh90:RHL-9:perl-Error-0.15-0.fdr.1.rh90.src.rpm:1109747504
+perl-Error-0_15-0_fdr_1_2:FC-2:perl-Error-0.15-0.fdr.1.2.src.rpm:1109876759



From fedora-extras-commits at redhat.com  Thu Mar  3 19:05:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:05:55 -0500
Subject: rpms/perl-Error/FC-2 perl-Error.spec,1.2,1.3
Message-ID: <200503031905.j23J5t3q011678@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Error/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11661/FC-2

Modified Files:
	perl-Error.spec 
Log Message:
auto-import perl-Error-0.15-0.fdr.1.2 on branch FC-2 from perl-Error-0.15-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-2/perl-Error.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Error.spec	21 Dec 2004 16:33:00 -0000	1.2
+++ perl-Error.spec	3 Mar 2005 19:05:53 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-Error
 Version:        0.15
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Error Perl module
 License:        GPL or Artistic
@@ -49,5 +49,5 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Jun 11 2004 Steven Pritchard <steve at kspei.com> 0:0.15-1
+* Fri Jun 11 2004 Steven Pritchard <steve at kspei.com> 0:0.15-0.fdr.1
 - Specfile autogenerated.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:06:09 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:06:09 -0500
Subject: rpms/perl-FreezeThaw import.log,1.3,1.4
Message-ID: <200503031906.j23J69Ng011762@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-FreezeThaw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11753

Modified Files:
	import.log 
Log Message:
auto-import perl-FreezeThaw-0.43-0.fdr.1.2 on branch FC-2 from perl-FreezeThaw-0.43-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:13:00 -0000	1.3
+++ import.log	3 Mar 2005 19:06:07 -0000	1.4
@@ -1,2 +1,3 @@
 perl-FreezeThaw-0_43-0_fdr_1_2:HEAD:perl-FreezeThaw-0.43-0.fdr.1.2.src.rpm:1102527774
 perl-FreezeThaw-0_43-0_fdr_1_rh90:RHL-9:perl-FreezeThaw-0.43-0.fdr.1.rh90.src.rpm:1109747568
+perl-FreezeThaw-0_43-0_fdr_1_2:FC-2:perl-FreezeThaw-0.43-0.fdr.1.2.src.rpm:1109876774



From fedora-extras-commits at redhat.com  Thu Mar  3 19:06:09 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:06:09 -0500
Subject: rpms/perl-FreezeThaw/FC-2 perl-FreezeThaw.spec,1.2,1.3
Message-ID: <200503031906.j23J69jK011766@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-FreezeThaw/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11753/FC-2

Modified Files:
	perl-FreezeThaw.spec 
Log Message:
auto-import perl-FreezeThaw-0.43-0.fdr.1.2 on branch FC-2 from perl-FreezeThaw-0.43-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-FreezeThaw.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/FC-2/perl-FreezeThaw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-FreezeThaw.spec	10 Dec 2004 22:03:08 -0000	1.2
+++ perl-FreezeThaw.spec	3 Mar 2005 19:06:07 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-FreezeThaw
 Version:        0.43
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Convert Perl structures to strings and back
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:06:51 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:06:51 -0500
Subject: rpms/perl-Gtk2 import.log,1.3,1.4
Message-ID: <200503031906.j23J6phY011882@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Gtk2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11873

Modified Files:
	import.log 
Log Message:
auto-import perl-Gtk2-1.061-0.fdr.2.2 on branch FC-2 from perl-Gtk2-1.061-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:14:29 -0000	1.3
+++ import.log	3 Mar 2005 19:06:49 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Gtk2-1_061-0_fdr_2_2:HEAD:perl-Gtk2-1.061-0.fdr.2.2.src.rpm:1102527968
 perl-Gtk2-1_061-0_fdr_2_rh90:RHL-9:perl-Gtk2-1.061-0.fdr.2.rh90.src.rpm:1109747662
+perl-Gtk2-1_061-0_fdr_2_2:FC-2:perl-Gtk2-1.061-0.fdr.2.2.src.rpm:1109876816



From fedora-extras-commits at redhat.com  Thu Mar  3 19:06:51 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:06:51 -0500
Subject: rpms/perl-Gtk2/FC-2 .cvsignore, 1.3, 1.4 perl-Gtk2.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200503031906.j23J6pZr011886@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Gtk2/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11873/FC-2

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
auto-import perl-Gtk2-1.061-0.fdr.2.2 on branch FC-2 from perl-Gtk2-1.061-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-2/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2005 03:21:00 -0000	1.3
+++ .cvsignore	3 Mar 2005 19:06:49 -0000	1.4
@@ -1 +1 @@
-Gtk2-1.062.tar.gz
+Gtk2-1.061.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-2/perl-Gtk2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Gtk2.spec	15 Feb 2005 03:30:46 -0000	1.4
+++ perl-Gtk2.spec	3 Mar 2005 19:06:49 -0000	1.5
@@ -1,19 +1,19 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Gtk2
-Version:        1.062
-Release:        1
+Version:        1.061
+Release:        0.fdr.2.2
 Epoch:          0
 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.062.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.061.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.062
+BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.061
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -62,9 +62,6 @@
 
 
 %changelog
-* Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.062-1
-- Update to 1.062.
-
 * Mon Oct 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.061-0.fdr.2
 - Removed irrelevant or duplicated documentation files.
 - Description simplified (as suggested by Ville Skytt??).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-2/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 03:21:00 -0000	1.3
+++ sources	3 Mar 2005 19:06:49 -0000	1.4
@@ -1 +1 @@
-cbca72d71fa470157d139c2bf659c040  Gtk2-1.062.tar.gz
+f7a14ff2e86dc66c9a06539613b70576  Gtk2-1.061.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 19:07:54 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:07:54 -0500
Subject: rpms/perl-HTML-Tree import.log,1.3,1.4
Message-ID: <200503031907.j23J7spI012059@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-HTML-Tree
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12050

Modified Files:
	import.log 
Log Message:
auto-import perl-HTML-Tree-3.18-0.fdr.2.2 on branch FC-2 from perl-HTML-Tree-3.18-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:15:25 -0000	1.3
+++ import.log	3 Mar 2005 19:07:52 -0000	1.4
@@ -1,2 +1,3 @@
 perl-HTML-Tree-3_18-2:HEAD:perl-HTML-Tree-3.18-2.src.rpm:1108323387
 perl-HTML-Tree-3_18-0_fdr_2_rh90:RHL-9:perl-HTML-Tree-3.18-0.fdr.2.rh90.src.rpm:1109747718
+perl-HTML-Tree-3_18-0_fdr_2_2:FC-2:perl-HTML-Tree-3.18-0.fdr.2.2.src.rpm:1109876879



From fedora-extras-commits at redhat.com  Thu Mar  3 19:07:54 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:07:54 -0500
Subject: rpms/perl-HTML-Tree/FC-2 perl-HTML-Tree.spec,1.1,1.2
Message-ID: <200503031907.j23J7scg012063@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-HTML-Tree/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12050/FC-2

Modified Files:
	perl-HTML-Tree.spec 
Log Message:
auto-import perl-HTML-Tree-3.18-0.fdr.2.2 on branch FC-2 from perl-HTML-Tree-3.18-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/FC-2/perl-HTML-Tree.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Tree.spec	13 Feb 2005 19:36:38 -0000	1.1
+++ perl-HTML-Tree.spec	3 Mar 2005 19:07:52 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-HTML-Tree
 Version:        3.18
-Release:        2
+Release:        0.fdr.2.2
 Epoch:          0
 Summary:        HTML tree handling modules for Perl
 
@@ -58,7 +58,7 @@
 
 
 %changelog
-* Tue Jan  4 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-2
+* Tue Jan  4 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-0.fdr.2
 - Don't install htmltree into %%{_bindir} but include it in docs.
 
 * Sat Dec  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:08:54 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:08:54 -0500
Subject: rpms/python-imaging import.log,1.2,1.3
Message-ID: <200503031908.j23J8saH012170@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/python-imaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12160

Modified Files:
	import.log 
Log Message:
auto-import python-imaging-1.1.4-0.fdr.6.2 on branch FC-2 from python-imaging-1.1.4-0.fdr.6.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Nov 2004 05:15:21 -0000	1.2
+++ import.log	3 Mar 2005 19:08:52 -0000	1.3
@@ -1 +1,2 @@
 python-imaging-1_1_4-0_fdr_4_rh90:HEAD:python-imaging-1.1.4-0.fdr.4.rh90.src.rpm:1099890921
+python-imaging-1_1_4-0_fdr_6_2:FC-2:python-imaging-1.1.4-0.fdr.6.2.src.rpm:1109876937



From fedora-extras-commits at redhat.com  Thu Mar  3 19:08:54 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:08:54 -0500
Subject: rpms/python-imaging/FC-2 python-imaging.spec,1.3,1.4
Message-ID: <200503031908.j23J8ssO012173@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/python-imaging/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12160/FC-2

Modified Files:
	python-imaging.spec 
Log Message:
auto-import python-imaging-1.1.4-0.fdr.6.2 on branch FC-2 from python-imaging-1.1.4-0.fdr.6.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-2/python-imaging.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-imaging.spec	11 Feb 2005 13:17:58 -0000	1.3
+++ python-imaging.spec	3 Mar 2005 19:08:52 -0000	1.4
@@ -6,7 +6,7 @@
 Name: python-imaging
 Epoch: 0
 Version: 1.1.4
-Release: 7
+Release: 0.fdr.6.2
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-1.1.4.tar.gz
@@ -59,12 +59,7 @@
 %build
 cd libImaging
 %configure
-make \
-%ifarch x86_64
-   CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \
-%endif
-   %{?_smp_mflags}
-
+make %{?_smp_mflags}
 cd ..
 %{__python} setup.py build
 
@@ -104,10 +99,7 @@
 %doc Doc Scripts Images Sane
 
 %changelog
-* Mon Feb  7 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.1.4-7
-- Build PIC on x86_64 to fix x86_64 linking.
-
-* Sat Oct  9 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.1.4-6
+* Sat Oct  9 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.1.4-0.fdr.6
 - Borrow parts from patch in Debian's 1.1.4-3 to fix issues in bug 1038 as
   well as a bunch of others.
 - Bring up to date with current fedora.us Python spec template recommendations.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:09:48 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:09:48 -0500
Subject: rpms/perl-IO-Socket-SSL import.log,1.3,1.4
Message-ID: <200503031909.j23J9mJ8012274@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-IO-Socket-SSL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12265

Modified Files:
	import.log 
Log Message:
auto-import perl-IO-Socket-SSL-0.96-0.fdr.3.2 on branch FC-2 from perl-IO-Socket-SSL-0.96-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:16:26 -0000	1.3
+++ import.log	3 Mar 2005 19:09:46 -0000	1.4
@@ -1,2 +1,3 @@
 perl-IO-Socket-SSL-0_96-3:HEAD:perl-IO-Socket-SSL-0.96-3.src.rpm:1105271963
 perl-IO-Socket-SSL-0_96-0_fdr_3_rh90:RHL-9:perl-IO-Socket-SSL-0.96-0.fdr.3.rh90.src.rpm:1109747778
+perl-IO-Socket-SSL-0_96-0_fdr_3_2:FC-2:perl-IO-Socket-SSL-0.96-0.fdr.3.2.src.rpm:1109876993



From fedora-extras-commits at redhat.com  Thu Mar  3 19:09:48 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:09:48 -0500
Subject: rpms/perl-IO-Socket-SSL/FC-2 perl-IO-Socket-SSL.spec,1.1,1.2
Message-ID: <200503031909.j23J9m5h012278@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-IO-Socket-SSL/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12265/FC-2

Modified Files:
	perl-IO-Socket-SSL.spec 
Log Message:
auto-import perl-IO-Socket-SSL-0.96-0.fdr.3.2 on branch FC-2 from perl-IO-Socket-SSL-0.96-0.fdr.3.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/FC-2/perl-IO-Socket-SSL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-IO-Socket-SSL.spec	9 Jan 2005 11:59:30 -0000	1.1
+++ perl-IO-Socket-SSL.spec	3 Mar 2005 19:09:46 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-IO-Socket-SSL
 Version:        0.96
-Release:        3
+Release:        0.fdr.3.2
 Epoch:          0
 Summary:        Perl library for transparent SSL
 
@@ -62,7 +62,7 @@
 
 
 %changelog
-* Tue Oct 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-3
+* Tue Oct 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-0.fdr.3
 - Disable session test suite even if Net::SSLeay >= 1.26 is available.
 
 * Wed Jul  7 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-0.fdr.2



From fedora-extras-commits at redhat.com  Thu Mar  3 19:10:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:10:38 -0500
Subject: rpms/perl-MLDBM/FC-2 perl-MLDBM.spec,1.2,1.3
Message-ID: <200503031910.j23JAcXV012389@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-MLDBM/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12375/FC-2

Modified Files:
	perl-MLDBM.spec 
Log Message:
auto-import perl-MLDBM-2.01-0.fdr.1.2 on branch FC-2 from perl-MLDBM-2.01-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-MLDBM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/FC-2/perl-MLDBM.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-MLDBM.spec	28 Jan 2005 17:36:45 -0000	1.2
+++ perl-MLDBM.spec	3 Mar 2005 19:10:36 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-MLDBM
 Version:        2.01
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Store multi-level hash structure in single level tied hash
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:10:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:10:38 -0500
Subject: rpms/perl-MLDBM import.log,1.3,1.4
Message-ID: <200503031910.j23JAcrs012384@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-MLDBM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12375

Modified Files:
	import.log 
Log Message:
auto-import perl-MLDBM-2.01-0.fdr.1.2 on branch FC-2 from perl-MLDBM-2.01-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:18:30 -0000	1.3
+++ import.log	3 Mar 2005 19:10:36 -0000	1.4
@@ -1,2 +1,3 @@
 perl-MLDBM-2_01-0_fdr_1_2:HEAD:perl-MLDBM-2.01-0.fdr.1.2.src.rpm:1102781000
 perl-MLDBM-2_01-0_fdr_1_rh90:RHL-9:perl-MLDBM-2.01-0.fdr.1.rh90.src.rpm:1109747903
+perl-MLDBM-2_01-0_fdr_1_2:FC-2:perl-MLDBM-2.01-0.fdr.1.2.src.rpm:1109877043



From fedora-extras-commits at redhat.com  Thu Mar  3 19:11:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:11:49 -0500
Subject: rpms/perl-Module-CoreList import.log,1.3,1.4
Message-ID: <200503031911.j23JBn7t012537@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Module-CoreList
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12528

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-CoreList-1.98-0.fdr.2.2 on branch FC-2 from perl-Module-CoreList-1.98-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:19:29 -0000	1.3
+++ import.log	3 Mar 2005 19:11:47 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Module-CoreList-1_98-2:HEAD:perl-Module-CoreList-1.98-2.src.rpm:1104953598
 perl-Module-CoreList-1_98-0_fdr_2_rh90:RHL-9:perl-Module-CoreList-1.98-0.fdr.2.rh90.src.rpm:1109747962
+perl-Module-CoreList-1_98-0_fdr_2_2:FC-2:perl-Module-CoreList-1.98-0.fdr.2.2.src.rpm:1109877114



From fedora-extras-commits at redhat.com  Thu Mar  3 19:11:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:11:49 -0500
Subject: rpms/perl-Module-CoreList/FC-2 perl-Module-CoreList.spec,1.1,1.2
Message-ID: <200503031911.j23JBnWc012541@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Module-CoreList/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12528/FC-2

Modified Files:
	perl-Module-CoreList.spec 
Log Message:
auto-import perl-Module-CoreList-1.98-0.fdr.2.2 on branch FC-2 from perl-Module-CoreList-1.98-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-Module-CoreList.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-2/perl-Module-CoreList.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Module-CoreList.spec	5 Jan 2005 19:33:24 -0000	1.1
+++ perl-Module-CoreList.spec	3 Mar 2005 19:11:47 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Module-CoreList
 Version:        1.98
-Release:        2
+Release:        0.fdr.2.2
 Epoch:          0
 Summary:        Perl core modules indexed by perl versions
 
@@ -57,7 +57,7 @@
 
 
 %changelog
-* Tue Jan 04 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-2
+* Tue Jan 04 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-0.fdr.2
 - BuildRequires: perl(Module::Build) (#2362).
 
 * Mon Jan 03 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:12:48 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:12:48 -0500
Subject: rpms/perl-Net-SSLeay import.log,1.3,1.4
Message-ID: <200503031912.j23JCm7E012643@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Net-SSLeay
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12634

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-SSLeay-1.26-0.fdr.2.2 on branch FC-2 from perl-Net-SSLeay-1.26-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:20:27 -0000	1.3
+++ import.log	3 Mar 2005 19:12:46 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Net-SSLeay-1_26-1:HEAD:perl-Net-SSLeay-1.26-1.src.rpm:1103563499
 perl-Net-SSLeay-1_26-0_fdr_2_rh90:RHL-9:perl-Net-SSLeay-1.26-0.fdr.2.rh90.src.rpm:1109748019
+perl-Net-SSLeay-1_26-0_fdr_2_2:FC-2:perl-Net-SSLeay-1.26-0.fdr.2.2.src.rpm:1109877174



From fedora-extras-commits at redhat.com  Thu Mar  3 19:12:48 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:12:48 -0500
Subject: rpms/perl-Net-SSLeay/FC-2 perl-Net-SSLeay.spec,1.1,1.2
Message-ID: <200503031912.j23JCmKY012647@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Net-SSLeay/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12634/FC-2

Modified Files:
	perl-Net-SSLeay.spec 
Log Message:
auto-import perl-Net-SSLeay-1.26-0.fdr.2.2 on branch FC-2 from perl-Net-SSLeay-1.26-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/FC-2/perl-Net-SSLeay.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-SSLeay.spec	20 Dec 2004 17:25:07 -0000	1.1
+++ perl-Net-SSLeay.spec	3 Mar 2005 19:12:46 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Net-SSLeay
 Version:        1.26
-Release:        1
+Release:        0.fdr.2.2
 Epoch:          0
 Summary:        Perl extension for using OpenSSL
 
@@ -66,9 +66,6 @@
 
 
 %changelog
-* Mon Dec 20 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.26-1
-- Drop fedora.us release prefix and suffix.
-
 * Mon Oct 25 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.26-0.fdr.2
 - Convert manual page to UTF-8.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:13:44 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:13:44 -0500
Subject: rpms/perl-Test-Pod-Coverage import.log,1.3,1.4
Message-ID: <200503031913.j23JDipB012751@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12742

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-Pod-Coverage-1.06-0.fdr.1.2 on branch FC-2 from perl-Test-Pod-Coverage-1.06-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:21:26 -0000	1.3
+++ import.log	3 Mar 2005 19:13:42 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Test-Pod-Coverage-1_06-1:HEAD:perl-Test-Pod-Coverage-1.06-1.src.rpm:1105645910
 perl-Test-Pod-Coverage-1_06-0_fdr_1_rh90:RHL-9:perl-Test-Pod-Coverage-1.06-0.fdr.1.rh90.src.rpm:1109748079
+perl-Test-Pod-Coverage-1_06-0_fdr_1_2:FC-2:perl-Test-Pod-Coverage-1.06-0.fdr.1.2.src.rpm:1109877230



From fedora-extras-commits at redhat.com  Thu Mar  3 19:13:44 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:13:44 -0500
Subject: rpms/perl-Test-Pod-Coverage/FC-2 perl-Test-Pod-Coverage.spec, 1.1,
	1.2
Message-ID: <200503031913.j23JDikn012755@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12742/FC-2

Modified Files:
	perl-Test-Pod-Coverage.spec 
Log Message:
auto-import perl-Test-Pod-Coverage-1.06-0.fdr.1.2 on branch FC-2 from perl-Test-Pod-Coverage-1.06-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-Test-Pod-Coverage.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-2/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	3 Mar 2005 19:13:42 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Test-Pod-Coverage
 Version:        1.06
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Check for pod coverage in your distribution
 
@@ -55,7 +55,7 @@
 
 
 %changelog
-* Thu Jun 24 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.06-1
+* Thu Jun 24 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.06-0.fdr.1
 - Update to 1.06.
 
 * Wed Jun 02 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.04-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:14:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:14:49 -0500
Subject: rpms/perl-XML-RSS/FC-2 perl-XML-RSS.spec,1.1,1.2
Message-ID: <200503031914.j23JEnPR012865@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-RSS/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12852/FC-2

Modified Files:
	perl-XML-RSS.spec 
Log Message:
auto-import perl-XML-RSS-1.05-0.fdr.1.2 on branch FC-2 from perl-XML-RSS-1.05-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-XML-RSS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-RSS/FC-2/perl-XML-RSS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-RSS.spec	1 Jan 2005 11:10:17 -0000	1.1
+++ perl-XML-RSS.spec	3 Mar 2005 19:14:47 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-XML-RSS
 Version:        1.05
-Release:        1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Perl module for managing RDF Site Summary (RSS) files
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:14:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:14:49 -0500
Subject: rpms/perl-XML-RSS import.log,1.3,1.4
Message-ID: <200503031914.j23JEnxc012861@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-RSS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12852

Modified Files:
	import.log 
Log Message:
auto-import perl-XML-RSS-1.05-0.fdr.1.2 on branch FC-2 from perl-XML-RSS-1.05-0.fdr.1.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-RSS/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:22:24 -0000	1.3
+++ import.log	3 Mar 2005 19:14:47 -0000	1.4
@@ -1,2 +1,3 @@
 perl-XML-RSS-1_05-1:HEAD:perl-XML-RSS-1.05-1.src.rpm:1104577827
 perl-XML-RSS-1_05-0_fdr_1_rh90:RHL-9:perl-XML-RSS-1.05-0.fdr.1.rh90.src.rpm:1109748137
+perl-XML-RSS-1_05-0_fdr_1_2:FC-2:perl-XML-RSS-1.05-0.fdr.1.2.src.rpm:1109877294



From fedora-extras-commits at redhat.com  Thu Mar  3 19:16:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:16:55 -0500
Subject: rpms/perl-XML-XPath import.log,1.3,1.4
Message-ID: <200503031916.j23JGtUv012967@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-XPath
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12958

Modified Files:
	import.log 
Log Message:
auto-import perl-XML-XPath-1.13-0.fdr.2.2 on branch FC-2 from perl-XML-XPath-1.13-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPath/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Mar 2005 07:23:25 -0000	1.3
+++ import.log	3 Mar 2005 19:16:53 -0000	1.4
@@ -1,2 +1,3 @@
 perl-XML-XPath-1_13-2:HEAD:perl-XML-XPath-1.13-2.src.rpm:1108067370
 perl-XML-XPath-1_13-0_fdr_2_rh90:RHL-9:perl-XML-XPath-1.13-0.fdr.2.rh90.src.rpm:1109748197
+perl-XML-XPath-1_13-0_fdr_2_2:FC-2:perl-XML-XPath-1.13-0.fdr.2.2.src.rpm:1109877420



From fedora-extras-commits at redhat.com  Thu Mar  3 19:16:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:16:55 -0500
Subject: rpms/perl-XML-XPath/FC-2 perl-XML-XPath.spec,1.1,1.2
Message-ID: <200503031916.j23JGtVY012971@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-XPath/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12958/FC-2

Modified Files:
	perl-XML-XPath.spec 
Log Message:
auto-import perl-XML-XPath-1.13-0.fdr.2.2 on branch FC-2 from perl-XML-XPath-1.13-0.fdr.2.2.src.rpm
Bring in stuff from fedora.us FC2/stable


Index: perl-XML-XPath.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPath/FC-2/perl-XML-XPath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-XPath.spec	10 Feb 2005 20:29:37 -0000	1.1
+++ perl-XML-XPath.spec	3 Mar 2005 19:16:53 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-XML-XPath
 Version:        1.13
-Release:        2
+Release:        0.fdr.2.2
 Epoch:          0
 Summary:        XPath parser and evaluator for Perl
 
@@ -57,7 +57,7 @@
 
 
 %changelog
-* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-2
+* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-0.fdr.2
 - Bring up to date with current fedora.us Perl spec template.
 
 * Sun Oct 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/apg/devel apg.spec,1.4,1.5
Message-ID: <200503031930.j23JU1Vl013153@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/apg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/apg/devel

Modified Files:
	apg.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: apg.spec
===================================================================
RCS file: /cvs/extras/rpms/apg/devel/apg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apg.spec	11 Nov 2004 19:21:36 -0000	1.4
+++ apg.spec	3 Mar 2005 19:29:59 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           apg
 Version:        2.2.3
 Release:        3
-Epoch:          0
-Summary:        Automated Password Generator for random password generation.
+Summary:        Automated Password Generator for random password generation
 
 Group:          System Environment/Base
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/arc/devel arc.spec,1.4,1.5
Message-ID: <200503031930.j23JU1gV013161@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/arc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/arc/devel

Modified Files:
	arc.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: arc.spec
===================================================================
RCS file: /cvs/extras/rpms/arc/devel/arc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- arc.spec	10 Dec 2004 22:03:01 -0000	1.4
+++ arc.spec	3 Mar 2005 19:29:59 -0000	1.5
@@ -1,10 +1,9 @@
-Name:    arc
-Version: 5.21j
-Release: 1
-Epoch:   0
-Summary: Arc archiver 
+Name:      arc
+Version:   5.21j
+Release:   1
+Summary:   Arc archiver
 
-Group:     Applications/Archiving 
+Group:     Applications/Archiving
 License:   GPL
 URL:       ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/
 Source:    ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/%{name}-%{version}.tar.gz
@@ -15,7 +14,7 @@
 but useful if you have old .arc files you need to unpack.
 
 %prep
-%setup 
+%setup
 
 %build
 make %{?_smp_mflags}



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/alsa-tools/devel alsa-tools.spec,1.2,1.3
Message-ID: <200503031930.j23JU1TB013137@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/alsa-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/alsa-tools/devel

Modified Files:
	alsa-tools.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: alsa-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/alsa-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-tools.spec	2 Dec 2004 01:11:34 -0000	1.2
+++ alsa-tools.spec	3 Mar 2005 19:29:59 -0000	1.3
@@ -2,7 +2,6 @@
 Name: 		alsa-tools
 Version: 	1.0.4
 Release: 	1.1
-Epoch: 		0
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -10,7 +9,7 @@
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk+-devel alsa-driver fltk-devel automake
 BuildRequires:	alsa-lib-devel >= 0:1.0.4
-Buildrequires:  desktop-file-utils
+Buildrequires:	desktop-file-utils
 
 %package firmware
 Summary: 	Alsa-Tool to upload the firmware (needed for some soundcards)
@@ -18,8 +17,6 @@
 Requires:	hotplug alsa-firmware
 
 
-# -----------------------------------------------------------------------------
-
 %description
 This package contains several tools which can be used together with
 ALSA-Drivers and -Libs. Some of this tools are only needed for special
@@ -42,8 +39,6 @@
 usx2yloader  - Second Phase Firmware loader for Tascam USX2Y USB soundcards
 
 
-# -----------------------------------------------------------------------------
-
 %prep
 echo "
 --------------------------------------------------------------
@@ -51,9 +46,8 @@
 Needs decision on whether to drop it.
 --------------------------------------------------------------" > /dev/null
 exit 1
-%setup -q -n %{name}-%{version}
+%setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
 mv seq/sbiload . ; rmdir seq
@@ -64,7 +58,6 @@
   cd ..
 done
 
-# -----------------------------------------------------------------------------
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -72,20 +65,20 @@
 [ -f debugsources.list ] && rm debugsources.list
 
 for i in *
-do 
+do
    case $i in
       hdspconf)
-	(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+        (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
         ;;
       hdspmixer)
-	(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+        (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
         ;;
       usx2yloader)
-	(cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
+        (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
         ;;
       *) (cd $i ; %makeinstall) || exit 1
    esac
-   if [[ -s "${i}"/README ]] 
+   if [[ -s "${i}"/README ]]
    then
       if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]]
       then
@@ -93,7 +86,7 @@
       fi
       cp "${i}"/README "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
    fi
-   if [[ -s "${i}"/COPYING ]] 
+   if [[ -s "${i}"/COPYING ]]
    then
       if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]]
       then
@@ -102,7 +95,7 @@
       cp "${i}"/COPYING "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
    fi
 
-  
+
 done
 
 for f in ${RPM_BUILD_ROOT}%{_datadir}/applications/*.desktop; do
@@ -113,12 +106,10 @@
       $f
 done
 
-# -----------------------------------------------------------------------------
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
@@ -162,7 +153,6 @@
 %{_bindir}/usx2yloader
 %{_bindir}/vxloader
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Sat Apr 03 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.4-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/aide/devel aide.spec,1.5,1.6
Message-ID: <200503031930.j23JU1lU013125@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/aide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/aide/devel

Modified Files:
	aide.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aide.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ aide.spec	3 Mar 2005 19:29:59 -0000	1.6
@@ -1,8 +1,7 @@
-Summary: Intrusion detection environment.
+Summary: Intrusion detection environment
 Name: aide
 Version: 0.10
 Release: 1
-Epoch: 0
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System
@@ -12,13 +11,13 @@
 Patch1: aide-useless-includes.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Buildrequires: mhash-devel zlib-devel
-Buildrequires: flex bison 
+Buildrequires: flex bison
 # Red Hat bug #108655, bison requires m4
 Buildrequires: m4
 # Postgresql support doesn't build.
 Buildconflicts: postgresql-devel
 
-%description 
+%description
 AIDE (Advanced Intrusion Detection Environment) is a file integrity
 checker and intrusion detection program.
 
@@ -35,7 +34,7 @@
 
 %configure --with-config_file=%{_sysconfdir}/aide.conf \
            --with-zlib \
-           --with-mhash --enable-mhash 
+           --with-mhash --enable-mhash
 
 # Adjust default database paths.
 perl -pi -e 's!%{_sysconfdir}/aide.db!%{_localstatedir}/lib/aide.db!' config.h



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/atitvout/devel atitvout.spec,1.5,1.6
Message-ID: <200503031930.j23JU1fw013169@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/atitvout/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/atitvout/devel

Modified Files:
	atitvout.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: atitvout.spec
===================================================================
RCS file: /cvs/extras/rpms/atitvout/devel/atitvout.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- atitvout.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ atitvout.spec	3 Mar 2005 19:29:59 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           atitvout
 Version:        0.4
 Release:        3
-Epoch:          0
 Summary:        ATI Rage/Radeon TV Out configuration program
 
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/alsa-firmware/devel alsa-firmware.spec,1.2,1.3
Message-ID: <200503031930.j23JU1SF013134@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/alsa-firmware/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/alsa-firmware/devel

Modified Files:
	alsa-firmware.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: alsa-firmware.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-firmware/devel/alsa-firmware.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-firmware.spec	2 Dec 2004 01:11:22 -0000	1.2
+++ alsa-firmware.spec	3 Mar 2005 19:29:59 -0000	1.3
@@ -2,7 +2,6 @@
 Name: 		alsa-firmware
 Version: 	1.0.4
 Release: 	1.1
-Epoch: 		0
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -10,14 +9,12 @@
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	alsa-tools-firmware >= 0:1.0.4
 
-# -----------------------------------------------------------------------------
 
 %description
-This package contains the firmware binaries for each ALSA-loader program 
-included in alsa-tools package.  
+This package contains the firmware binaries for each ALSA-loader program
+included in alsa-tools package.
 
 
-# -----------------------------------------------------------------------------
 
 %prep
 echo "
@@ -26,9 +23,8 @@
 Needs decision on whether to drop it.
 --------------------------------------------------------------" > /dev/null
 exit 1
-%setup -q -n %{name}-%{version}
+%setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure
@@ -38,25 +34,21 @@
   mv ${i}/README README.${i}
 done
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
-# -----------------------------------------------------------------------------
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING README README.hdsploader README.mixartloader README.usx2yloader README.vxloader
 %{_datadir}/alsa/firmware
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Sat Apr 03 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.4-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/aterm/devel aterm.spec,1.5,1.6
Message-ID: <200503031930.j23JU1AY013165@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/aterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/aterm/devel

Modified Files:
	aterm.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: aterm.spec
===================================================================
RCS file: /cvs/extras/rpms/aterm/devel/aterm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aterm.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ aterm.spec	3 Mar 2005 19:29:59 -0000	1.6
@@ -1,8 +1,7 @@
 Name:           aterm
 Version:        0.4.2
 Release:        5
-Epoch:          0
-Summary:        Aterm (Afterstep XVT) - a VT102 emulator for the X window system
+Summary:        Afterstep XVT, VT102 emulator for the X Window system
 Group:          User Interface/X
 License:        GPL
 URL:            http://aterm.sourceforge.net
@@ -32,16 +31,16 @@
 %build
 %configure --enable-utmp \
            --enable-wtmp \
-			  --enable-background-image \
-			  --enable-transparency \
-			  --enable-fading \
-			  --enable-menubar \
-			  --enable-graphics \
-			  --enable-next-scroll \
-			  --enable-xgetdefault \
-			  --with-term=xterm \
-			  --with-x \
-			  --with-xpm
+           --enable-background-image \
+           --enable-transparency \
+           --enable-fading \
+           --enable-menubar \
+           --enable-graphics \
+           --enable-next-scroll \
+           --enable-xgetdefault \
+           --with-term=xterm \
+           --with-x \
+           --with-xpm
 make %{?_smp_mflags}
 
 
@@ -62,7 +61,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog doc/BUGS doc/FAQ doc/README.menu doc/README.Unix98PTY 
+%doc ChangeLog doc/BUGS doc/FAQ doc/README.menu doc/README.Unix98PTY
 %doc doc/README.xvt doc/TODO doc/ChangeLog.rxvt
 %doc doc/menu/*
 %doc doc/*.html



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/autotrace/devel autotrace.spec,1.3,1.4
Message-ID: <200503031930.j23JU1sY013177@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/autotrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/autotrace/devel

Modified Files:
	autotrace.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/devel/autotrace.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autotrace.spec	28 Nov 2004 04:36:14 -0000	1.3
+++ autotrace.spec	3 Mar 2005 19:29:59 -0000	1.4
@@ -1,8 +1,7 @@
 Name:           autotrace
 Version:        0.31.1
 Release:        3
-Epoch:          0
-Summary:        A utility for converting bitmaps to vector graphics
+Summary:        Utility for converting bitmaps to vector graphics
 
 Group:          Applications/Multimedia
 License:        GPL/LGPL
@@ -27,12 +26,12 @@
 %package devel
 Summary:        Header files and static libraries for autotrace
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       ImageMagick-devel
 #Requires:       pstoedit-devel
 
- 
+
 %description devel
 This package contains header files and static libraries for autotrace.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/abe/devel abe.spec,1.4,1.5
Message-ID: <200503031930.j23JU19x013117@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/abe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/abe/devel

Modified Files:
	abe.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: abe.spec
===================================================================
RCS file: /cvs/extras/rpms/abe/devel/abe.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- abe.spec	10 Dec 2004 22:03:01 -0000	1.4
+++ abe.spec	3 Mar 2005 19:29:59 -0000	1.5
@@ -1,19 +1,18 @@
 Name:           abe
 Version:        1.0
 Release:        3
-Epoch:          0
 Summary:        A scrolling, platform-jumping, ancient pyramid exploring game.
 Group:          Amusements/Games
 License:        GPL
 URL:            http://abe.sourceforge.net/
 Source0:        http://download.sourceforge.net/abe/abe-1_0.tar.gz
-Source1:		%{name}.png
-Patch0:			%{name}-%{version}-datapath.patch
-Patch1:			%{name}-%{version}-tmppath.patch
+Source1:        %{name}.png
+Patch0:         %{name}-%{version}-datapath.patch
+Patch1:         %{name}-%{version}-tmppath.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 0:1.2.3, SDL_mixer-devel >= 0:1.2.3
-BuildRequires:	desktop-file-utils
+BuildRequires:  desktop-file-utils
 
 %description
 A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game,
@@ -62,7 +61,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README 
+%doc COPYING README
 %{_bindir}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/adns/devel adns.spec,1.4,1.5
Message-ID: <200503031930.j23JU1RZ013122@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/adns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/adns/devel

Modified Files:
	adns.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: adns.spec
===================================================================
RCS file: /cvs/extras/rpms/adns/devel/adns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- adns.spec	10 Dec 2004 22:03:01 -0000	1.4
+++ adns.spec	3 Mar 2005 19:29:59 -0000	1.5
@@ -1,7 +1,6 @@
 Name:		adns
 Version:	1.1
 Release:	4
-Epoch:		0
 Summary:	Advanced, easy to use, asynchronous-capable DNS client library
 
 Group:		System Environment/Libraries
@@ -13,7 +12,7 @@
 Patch2:		adns-1.1-semicolon.patch
 Patch3:		adns-1.1-parsedomain.patch
 BuildRequires:	autoconf213 automake15
-BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 adns is a resolver library for C (and C++) programs. In contrast with
@@ -47,7 +46,7 @@
 %package devel
 Summary:	Asynchronous-capable DNS client library - development files
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}
+Requires:	%{name} = %{version}
 
 %description devel
 Asynchronous-capable DNS client library - development files.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/apt/devel apt.spec,1.9,1.10
Message-ID: <200503031930.j23JU1oU013157@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/apt/devel

Modified Files:
	apt.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apt.spec	18 Feb 2005 22:14:10 -0000	1.9
+++ apt.spec	3 Mar 2005 19:29:59 -0000	1.10
@@ -18,7 +18,6 @@
 Name: apt
 Version: 0.5.15cnc6
 Release: 16.%{svnver}
-Epoch: 0
 Group: System Environment/Base
 URL: https://moin.conectiva.com.br/AptRpm
 License: GPL
@@ -92,7 +91,7 @@
 BuildRequires: python-devel >= 0:2.2
 BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext
 BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel
-# for version detection to work 
+# for version detection to work
 BuildRequires: fedora-release
 %if %{generate_rpmpriorities}
 BuildRequires: %{_bindir}/xsltproc, %{comps}
@@ -120,14 +119,14 @@
 
 %description
 A port of Debian's apt tools for RPM based distributions.
-It provides the apt-get utility that provides a simpler, safer way to 
-install and upgrade packages. APT features complete installation ordering, 
+It provides the apt-get utility that provides a simpler, safer way to
+install and upgrade packages. APT features complete installation ordering,
 multiple source capability and several other unique features.
 
 %package devel
 Summary: Development files and documentation for APT's libapt-pkg.
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: rpm-devel
 %description devel
 This package contains the header files and static libraries for developing
@@ -136,7 +135,7 @@
 %package python
 Summary: Python bindings for libapt-pkg
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 %description python
 The apt-python package contains a module which allows python programs
@@ -145,7 +144,7 @@
 %package groupinstall
 Summary: Add commands to install and remove package groups.
 Group: System Environment/Base
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: rhpl, comps
 %description groupinstall
 This package adds four new commands to apt for installing, removing and viewing
@@ -156,7 +155,7 @@
 apt-get groupremove <groupname> [<groupname2> ..]
 
 The group information is retrieved from comps.xml used by anaconda (the
-system installer) and other package management tools of RHL/RHEL/FC 
+system installer) and other package management tools of RHL/RHEL/FC
 distributions.
 
 
@@ -184,7 +183,7 @@
 %configure --disable-dependency-tracking
 
 SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 # prevent re-generation of the python wrapper, requires a patched swig :(
 #touch python/apt.py python/apt_wrap.cxx
@@ -285,10 +284,10 @@
 fi
 exit 0
 
-%post 
+%post
 /sbin/ldconfig
 if [ ! -f %{_sysconfdir}/apt/apt.conf ]; then
-	echo "// User customizable configuration goes here" > %{_sysconfdir}/apt/apt.conf
+ echo "// User customizable configuration goes here" > %{_sysconfdir}/apt/apt.conf
 fi
 /sbin/chkconfig --add apt
 
@@ -310,7 +309,7 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/apt
 %config(noreplace) %{_sysconfdir}/apt/rpmpriorities
 %config(noreplace) %{_sysconfdir}/apt/preferences
-%config(noreplace) %{_sysconfdir}/apt/apt.conf 
+%config(noreplace) %{_sysconfdir}/apt/apt.conf
 %config(noreplace) %{_sysconfdir}/apt/sources.list
 %config(noreplace) %{_sysconfdir}/apt/vendors.list
 # NOTE: no noreplace on these because we WANT to be able to change the defaults
@@ -399,7 +398,7 @@
 
 * Wed Aug 18 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r362
 - revision r362
-- add rpmprioties file for rawhide 
+- add rpmprioties file for rawhide
 
 * Sat Aug 14 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r361
 - update to revision r361
@@ -407,7 +406,7 @@
 - provide apt-mirrorselect so repo-configs can depend on it
 - preliminary fixes for x86_64:
   - put scripts to /usr/share/apt/scripts instead of /usr/lib
-  - build python bindings with -fPIC 
+  - build python bindings with -fPIC
 
 * Thu Aug 12 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r360
 - update to revision r360
@@ -433,7 +432,7 @@
 - add new subpackage for groupinstall (to avoid dependening on comps and rhpl
   for core apt)
 - update to revision 353 from upstream for various bugfixes and enhancements,
-  drop merged patches 
+  drop merged patches
 - remove NOISY=1 from make, hasn't done anything in ages..
 
 * Thu Jun 17 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.13
@@ -492,7 +491,7 @@
 - Ville's docbook building fix
 
 * Tue Mar 30 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.4
-- add upgrade-virtual=true back to default.conf 
+- add upgrade-virtual=true back to default.conf
 - updated version of upgradevirt.lua, fixed kernel-module package handling
 
 * Mon Mar 29 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.3
@@ -510,7 +509,7 @@
 - remember to set kernel::module-prefix in default.conf
 - add upgradevirt.lua to all the necessary new slot
 - move kernel from Essential priority to Important in rpmpriorities, allow-
-  duplicated packages don't behave well with Essential priority 
+  duplicated packages don't behave well with Essential priority
 
 * Mon Mar 22 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.1
 - update to 0.5.15cnc6
@@ -531,14 +530,14 @@
 
 * Fri Feb 13 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.8
 - Pull patch for revs 266-274 from upstream, containing various important
-  fixes (epoch handling, build system related etc) 
+  fixes (epoch handling, build system related etc)
 
 * Thu Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.7
 - Fix build on FC2-test1 (conditional libselinux-devel buildreq)
 
 * Mon Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.6
 - automatically handle fedora.us style kernel-module packages with kernel
-  updates 
+  updates
 - don't run mirror-selector if quiet mode set (== non-interactive)
 - don't trash sources.list on upgrade, only if user chooses to do so
 
@@ -557,7 +556,7 @@
 
 * Mon Jan 19 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.3
 - make rpm manifest usage configurable per Enricos request (patch 4)
-- use mirror lists on fedora.us 
+- use mirror lists on fedora.us
 - include Fedora Legacy gpg key
 
 * Tue Jan 06 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.2
@@ -581,7 +580,7 @@
 - drop patches merged upstream
 
 * Tue Dec 23 2003 Panu Matilainen <pmatilai at welho.com>
-- remove extranuous mirror-select configs from default.conf 
+- remove extranuous mirror-select configs from default.conf
 - updated mirror-select script
 
 * Fri Dec 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.4
@@ -650,7 +649,7 @@
 * Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.1
 - update rpmlib patch to -7 which has more sensible error reporting
 
-* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com> 
+* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com>
 - update to 0.5.15cnc2
 - remove patches 6-9, they're merged upstream now
 - use fedora-style buildroot
@@ -749,12 +748,12 @@
 - drop patches merged upstream
 
 * Tue Jun 10 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.9
-- patch from upstream to fix a security problem where lua-scripts can get 
+- patch from upstream to fix a security problem where lua-scripts can get
   accidentally executed from cwd
 
 * Mon Jun 09 2003 Panu Matilainen <pmatilai at welho.com>
 - apt doesn't like build deps on versioned virtual provides -> only RH7.3
-  package buildrequires python2-devel, newer ones have python-devel 
+  package buildrequires python2-devel, newer ones have python-devel
 
 * Thu Jun 05 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.8
 - fix the proxy template format in apt.conf
@@ -778,11 +777,11 @@
 - fix #259
 - add missing ncurses-devel buildreq (for apt-shell)
 
-* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com> 
+* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com>
 - add missing libelf-devel buildreq for RH8.0 (#254)
 - add missing readline-devel buildreq (for apt-shell)
 
-* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com> 
+* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com>
 - add /etc/apt/scripts directory (for Lua scripts)
 
 * Tue Apr 22 2003 Warren Togami <warren at togami.com> 0.5.5cnc5-0.fdr.5
@@ -802,7 +801,7 @@
 * Wed Apr 16 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.1
 - patch to speed up apt startup and genbasedir
 - drop "counting sheep" patch, not needed anymore
-- include current mirrors in sources.list 
+- include current mirrors in sources.list
 - autodetect RH version
 
 * Tue Apr 15 2003 Panu Matilainen <pmatilai at welho.com>
@@ -824,7 +823,7 @@
 - add epoch to requires =, >= too
 
 * Thu Apr 03 2003 Panu Matilainen <pmatilai at welho.com>
-- fix segfault if rpm-dir index is a broken symlink 
+- fix segfault if rpm-dir index is a broken symlink
 - rpmpriorities generated from comps.xml
 - dont tag the various keys as %dir :-/
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/anjuta/devel anjuta.spec,1.6,1.7
Message-ID: <200503031930.j23JU1ee013145@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/anjuta/devel

Modified Files:
	anjuta.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- anjuta.spec	10 Feb 2005 20:01:13 -0000	1.6
+++ anjuta.spec	3 Mar 2005 19:29:59 -0000	1.7
@@ -26,10 +26,10 @@
 Requires(postun): scrollkeeper
 
 %description
-Anjuta is a versatile Integrated Development Environment (IDE) for C and C++. 
-It has been written for GTK/GNOME, and features a number of advanced 
-programming facilities. It is basically a GUI interface for the collection 
-of command line programming utilities and tools available for the GNU system. 
+Anjuta is a versatile Integrated Development Environment (IDE) for C and C++.
+It has been written for GTK/GNOME, and features a number of advanced
+programming facilities. It is basically a GUI interface for the collection
+of command line programming utilities and tools available for the GNU system.
 These are usually run via a text console, and can be unfriendly to use.
 
 This package includes anjuta_create_global_tags.sh, which will allow you to
@@ -52,7 +52,7 @@
 
 
 %build
-# configure option --enable-final does not work corretly on x86_64; Use 
+# configure option --enable-final does not work corretly on x86_64; Use
 # -DNDEBUG in CFLAGS
 export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 %configure
@@ -123,7 +123,7 @@
 
 %changelog
 * Thu Feb 10 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.2.2-6
-- configure option --enable-final does not work correctly on x86_64; 
+- configure option --enable-final does not work correctly on x86_64;
   Use -DNDEBUG in CFLAGS as suggested my Michael Schwendt;
   Fixes x86_64 crash (#147010)
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/allegro/devel allegro.spec,1.7,1.8
Message-ID: <200503031930.j23JU12h013129@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/allegro/devel

Modified Files:
	allegro.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- allegro.spec	13 Feb 2005 22:10:46 -0000	1.7
+++ allegro.spec	3 Mar 2005 19:29:59 -0000	1.8
@@ -1,7 +1,6 @@
 Name:           allegro
 Version:        4.0.3
 Release:        9
-Epoch:          0
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
 Summary(fr):    Une librairie de programmation de jeux
@@ -40,7 +39,7 @@
 Summary(fr):    Une librairie de programmation de jeux
 Summary(it):    Una libreria per la programmazione di videogiochi
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}, XFree86-devel
+Requires:       %{name} = %{version}-%{release}, XFree86-devel
 Requires(post,preun): /sbin/install-info
 
 %description devel



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/amaya/devel amaya.spec,1.3,1.4
Message-ID: <200503031930.j23JU1bZ013141@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/amaya/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/amaya/devel

Modified Files:
	amaya.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- amaya.spec	10 Dec 2004 22:03:01 -0000	1.3
+++ amaya.spec	3 Mar 2005 19:29:59 -0000	1.4
@@ -1,18 +1,17 @@
 Name:		amaya
-Version: 	8.5
-Release: 	2
-Epoch:      0
-Summary: 	W3C's browser/web authoring tool
-Group:   	Applications/Internet
-Source0: 	http://www.w3.org/Amaya/Distribution/amaya-src-8.5.tgz
-Source1:    amaya.png
-License: 	W3C Software License
-Url:     	http://www.w3.org/Amaya
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: 	libungif-devel libjpeg-devel libpng-devel zlib-devel
-BuildRequires: 	gtk+-devel perl bison flex imlib-devel
+Version:	8.5
+Release:	2
+Summary:	W3C's browser/web authoring tool
+Group:		Applications/Internet
+Source0:	http://www.w3.org/Amaya/Distribution/amaya-src-8.5.tgz
+Source1:	amaya.png
+License:	W3C Software License
+Url:		http://www.w3.org/Amaya
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libungif-devel libjpeg-devel libpng-devel zlib-devel
+BuildRequires:	gtk+-devel perl bison flex imlib-devel
 BuildRequires:	XFree86-devel freetype-devel >= 2.0
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 
 %description
 Amaya is a WYSIWYG browser/web authoring tool from the W3C.
@@ -31,7 +30,7 @@
              --prefix=$RPM_BUILD_ROOT%_libdir \
              --exec-prefix=$RPM_BUILD_ROOT/%_prefix \
              --libdir=%_libdir
-make 
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/antiword/devel antiword.spec,1.6,1.7
Message-ID: <200503031930.j23JU1uj013149@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/antiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/antiword/devel

Modified Files:
	antiword.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: antiword.spec
===================================================================
RCS file: /cvs/extras/rpms/antiword/devel/antiword.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- antiword.spec	11 Feb 2005 19:21:32 -0000	1.6
+++ antiword.spec	3 Mar 2005 19:29:59 -0000	1.7
@@ -4,34 +4,29 @@
 Name:       antiword
 Version:    0.36
 Release:    1
-Epoch:      0
 Source:     http://www.winfield.demon.nl/linux/%{name}-%{version}.tar.gz
 URL:        http://www.winfield.demon.nl/
 Patch0:     antiword-0.32-fix-flags.patch
-License:    GPL 
+License:    GPL
 Group:      Applications/Text
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#---------------------------------------------------------------------
 
 %description
 Antiword is a free MS-Word reader for Linux, BeOS and RISC OS. It converts
 the documets from Word 6, 7, 97 and 2000 to ASCII and Postscript. Antiword
 tries to keep the layout of the document intact.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
 %patch0 -p0
 %{__chmod} a+r * Resources/* Docs/*
 
-#---------------------------------------------------------------------
 
 %build
 OPT="$RPM_OPT_FLAGS" make all %{?_smp_mflags}
 
-#---------------------------------------------------------------------
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -42,23 +37,20 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/man1
 %{__cp} Docs/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root)
-%doc Docs/COPYING Docs/FAQ Docs/ReadMe Docs/Netscape Docs/ChangeLog 
+%doc Docs/COPYING Docs/FAQ Docs/ReadMe Docs/Netscape Docs/ChangeLog
 %doc Docs/Exmh Docs/Mozilla Docs/QandA Docs/Mutt Docs/antiword.php
-%doc Docs/Emacs Docs/History 
+%doc Docs/Emacs Docs/History
 %{_bindir}/*
 %{_mandir}/*/*
 %{_datadir}/%{name}
 
-#---------------------------------------------------------------------
 
 %changelog
 * Thu Feb 03 2005 Adrian Reber <adrian at lisas.de> - 0:0.36-1
@@ -78,7 +70,7 @@
 
 * Tue Feb 25 2003 Adrian Reber <adrian at lisas.de> - 0.33-0.fdr.1
 - applied fedora naming conventions
- 
+
 * Sun Dec 22 2002 Adrian Reber <adrian at lisas.de>
 - updated to 0.33
 - demandrakefied



From fedora-extras-commits at redhat.com  Thu Mar  3 19:30:01 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:30:01 -0500
Subject: rpms/audacity/devel audacity.spec,1.5,1.6
Message-ID: <200503031930.j23JU1IQ013173@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/audacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/audacity/devel

Modified Files:
	audacity.spec 
Log Message:
Mass letter "a" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- audacity.spec	4 Dec 2004 16:24:36 -0000	1.5
+++ audacity.spec	3 Mar 2005 19:29:59 -0000	1.6
@@ -1,7 +1,6 @@
 Name:		audacity
 Version:	1.2.3
 Release:	1
-Epoch:		0
 Summary: 	A multitrack audio editor
 
 Group: 		Applications/Multimedia
@@ -10,16 +9,16 @@
 Source: 	http://dl.sf.net/sourceforge/audacity/audacity-src-1.2.3.tar.gz
 Source1:	audacity.png
 Patch1:		audacity-1.2.2-aboutdialog.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libogg-devel, libvorbis-devel, zlib-devel, perl
-BuildRequires: 	gettext, zip, flac-devel, ladspa-devel
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libogg-devel, libvorbis-devel, zlib-devel, perl
+BuildRequires:	gettext, zip, flac-devel, ladspa-devel
 BuildRequires:	libsamplerate-devel, libsndfile-devel
 BuildRequires:	libid3tag-devel, desktop-file-utils
 %{?_with_mp3:BuildRequires: libmad-devel}
 %{?_with_gtk2:BuildRequires: wxGTK2-devel}
 %{!?_with_gtk2:BuildRequires: wxGTK-devel}
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
+Requires(post):		desktop-file-utils
+Requires(postun):	desktop-file-utils
 
 # Compile options:
 # --with mp3          : enable mp3 support



From bugs.michael at gmx.net  Thu Mar  3 19:36:56 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 20:36:56 +0100
Subject: rpms/alsa-tools/devel alsa-tools.spec,1.2,1.3
In-Reply-To: <200503031930.j23JU1TB013137@cvs-int.fedora.redhat.com>
References: <200503031930.j23JU1TB013137@cvs-int.fedora.redhat.com>
Message-ID: <20050303203656.007e703c.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 14:30:01 -0500, Matthias Saou (thias) wrote:

> Author: thias
> 
> Update of /cvs/extras/rpms/alsa-tools/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066/alsa-tools/devel
> 
> Modified Files:
> 	alsa-tools.spec 
> Log Message:
> Mass letter "a" update, one or more apply :
> - Drop epoch: 0
> - Remove %{epoch} requirements in sub-packages
> - Remove trailing white spaces
> - Keep consistent between spaces and tabs



>  BuildRequires:	alsa-lib-devel >= 0:1.0.4

What about that Epoch?


$ rpmepoch alsa-lib-devel
(none)



From fedora-extras-commits at redhat.com  Thu Mar  3 19:45:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:45:28 -0500
Subject: rpms/alsa-tools/devel alsa-tools.spec,1.3,1.4
Message-ID: <200503031945.j23JjS39013481@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/alsa-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13475/alsa-tools/devel

Modified Files:
	alsa-tools.spec 
Log Message:
Remove missed alsa-lib-devel zero epoch spotted by Michael.



Index: alsa-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/alsa-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alsa-tools.spec	3 Mar 2005 19:29:59 -0000	1.3
+++ alsa-tools.spec	3 Mar 2005 19:45:26 -0000	1.4
@@ -8,7 +8,7 @@
 Source0: 	%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk+-devel alsa-driver fltk-devel automake
-BuildRequires:	alsa-lib-devel >= 0:1.0.4
+BuildRequires:	alsa-lib-devel >= 1.0.4
 Buildrequires:	desktop-file-utils
 
 %package firmware



From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net  Thu Mar  3 19:46:00 2005
From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou)
Date: Thu, 3 Mar 2005 20:46:00 +0100
Subject: rpms/alsa-tools/devel alsa-tools.spec,1.2,1.3
In-Reply-To: <20050303203656.007e703c.bugs.michael@gmx.net>
References: <200503031930.j23JU1TB013137@cvs-int.fedora.redhat.com>
	<20050303203656.007e703c.bugs.michael@gmx.net>
Message-ID: <20050303204600.7c070358@python2>

Michael Schwendt wrote :

> >  BuildRequires:	alsa-lib-devel >= 0:1.0.4
> 
> What about that Epoch?
> 
> 
> $ rpmepoch alsa-lib-devel
> (none)

Fixed, thanks for spotting.

Matthias

-- 
Clean custom Red Hat Linux rpm packages : http://freshrpms.net/
Fedora Core release 3 (Heidelberg) - Linux kernel 2.6.10-1.770_FC3
Load : 0.81 0.38 0.38



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:46:21 -0500
Subject: rpms/ccid import.log,1.3,1.4
Message-ID: <200503031946.j23JkLd6013538@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/ccid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13528

Modified Files:
	import.log 
Log Message:
auto-import ccid-0.4.1-0.fdr.4.1 on branch FC-1 from ccid-0.4.1-0.fdr.4.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ccid/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Mar 2005 19:01:03 -0000	1.3
+++ import.log	3 Mar 2005 19:46:19 -0000	1.4
@@ -1,2 +1,3 @@
 ccid-0_4_1-4:HEAD:ccid-0.4.1-4.src.rpm:1109362138
 ccid-0_4_1-0_fdr_4_2:FC-2:ccid-0.4.1-0.fdr.4.2.src.rpm:1109876470
+ccid-0_4_1-0_fdr_4_1:FC-1:ccid-0.4.1-0.fdr.4.1.src.rpm:1109879187



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:46:21 -0500
Subject: rpms/ccid/FC-1 ccid.spec,1.2,1.3
Message-ID: <200503031946.j23JkL8t013543@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/ccid/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13528/FC-1

Modified Files:
	ccid.spec 
Log Message:
auto-import ccid-0.4.1-0.fdr.4.1 on branch FC-1 from ccid-0.4.1-0.fdr.4.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: ccid.spec
===================================================================
RCS file: /cvs/extras/rpms/ccid/FC-1/ccid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ccid.spec	25 Feb 2005 20:22:00 -0000	1.2
+++ ccid.spec	3 Mar 2005 19:46:19 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           ccid
 Version:        0.4.1
-Release:        4
-Summary:        Generic USB CCID smart card reader driver
+Release:        0.fdr.4.1
+Summary:        Generic USB CCID driver
 
 Group:          System Environment/Libraries
 License:        GPL
@@ -24,7 +24,7 @@
 
 
 %build
-%configure --disable-dependency-tracking \
+%configure \
   --enable-usbdropdir=%{_libdir}/pcsc/drivers \
   --enable-ccidtwindir=%{_libdir}/pcsc/drivers/serial
 make %{?_smp_mflags}
@@ -57,10 +57,8 @@
 
 
 %changelog
-* Fri Feb 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.4.1-4
+* Fri Feb 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.4.1-0.fdr.4
 - Drop Epoch: 0.
-- Improve summary.
-- Build with dependency tracking disabled.
 
 * Thu Jul  1 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.4.1-0.fdr.3
 - Restart pcscd in post(un)install phase if it's available and running.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bittorrent/devel bittorrent.spec,1.6,1.7
Message-ID: <200503031946.j23JkfAQ013664@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/bittorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13565/bittorrent/devel

Modified Files:
	bittorrent.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bittorrent.spec	14 Jan 2005 20:00:29 -0000	1.6
+++ bittorrent.spec	3 Mar 2005 19:46:39 -0000	1.7
@@ -3,7 +3,6 @@
 Name:           bittorrent
 Version:        3.4.1
 Release:        3.a
-Epoch:          0
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
@@ -14,7 +13,7 @@
 
 BuildRequires:  python-devel
 Requires:       python
-Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 BuildArch:      noarch
 
@@ -29,9 +28,9 @@
 Summary:        GUI versions of the BitTorrent file transfer tool
 Group:          Applications/Internet
 Requires:       wxPython
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
-%description    gui 
+%description    gui
 This package contains the GUI versions of the BitTorrent file transfer
 tool.
 
@@ -109,7 +108,7 @@
 - adapted to Doors Linux
 
 * Sun Mar 30 2003 G??tz Waschk <waschk at linux-mandrake.com> 3.2.1b-1mdk
-- split out gui tools to remove wxPythonGTK dep from the main package 
+- split out gui tools to remove wxPythonGTK dep from the main package
 - new version
 
 * Fri Mar 28 2003 Frederic Lepied <flepied at mandrakesoft.com> 3.2-1mdk



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bash-completion/devel bash-completion.spec,1.6,1.7
Message-ID: <200503031946.j23JkfHK013652@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/bash-completion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13565/bash-completion/devel

Modified Files:
	bash-completion.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bash-completion.spec	26 Feb 2005 18:50:09 -0000	1.6
+++ bash-completion.spec	3 Mar 2005 19:46:39 -0000	1.7
@@ -1,13 +1,12 @@
 Name:           bash-completion
 Version:        20050121
 Release:        2
-Epoch:          0
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
 License:        GPL
 URL:            http://www.caliban.org/bash/
-Source0:     http://www.caliban.org/files/bash/bash-completion-20050121.tar.bz2
+Source0:        http://www.caliban.org/files/bash/bash-completion-20050121.tar.bz2
 Source1:        %{name}.profile
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bchunk/devel bchunk.spec,1.5,1.6
Message-ID: <200503031946.j23Jkf1F013656@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/bchunk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13565/bchunk/devel

Modified Files:
	bchunk.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bchunk.spec
===================================================================
RCS file: /cvs/extras/rpms/bchunk/devel/bchunk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bchunk.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ bchunk.spec	3 Mar 2005 19:46:39 -0000	1.6
@@ -2,7 +2,6 @@
 Name: bchunk
 Version: 1.2.0
 Release: 1
-Epoch: 0
 URL: http://he.fi/bchunk/
 License: GPL
 Group: Applications/Archiving



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/blt/devel blt.spec,1.6,1.7
Message-ID: <200503031946.j23Jkf3X013672@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/blt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13565/blt/devel

Modified Files:
	blt.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: blt.spec
===================================================================
RCS file: /cvs/extras/rpms/blt/devel/blt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- blt.spec	17 Dec 2004 18:47:50 -0000	1.6
+++ blt.spec	3 Mar 2005 19:46:39 -0000	1.7
@@ -2,18 +2,17 @@
 Name: blt
 Version: 2.4
 Release: 10.z
-Epoch: 0
 License: MIT
 Group: Development/Libraries
 Source: http://download.sourceforge.net/blt/BLT2.4z.tar.gz
 Patch0: http://download.sourceforge.net/blt/blt2.4z-patch-2
 Patch1: http://jfontain.free.fr/blt2.4z-patch-64
 URL: http://sourceforge.net/projects/blt/
-BuildRequires: XFree86-devel >= 0:4, tk >= 0:8.3.1
+BuildRequires: XFree86-devel, tk >= 8.3.1
 # work around tcl-devel and tk-devel packages non existence in RH 8.0 and 9:
 BuildRequires: %{_includedir}/tk.h, %{_includedir}/tcl.h
-Requires: tk >= 0:8.3.1
-BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
+Requires: tk >= 8.3.1
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 
 %description
 BLT is a very powerful extension to Tk. It adds plotting widgets
@@ -25,18 +24,18 @@
 with Tcl/Tk versions after and including 8.3.1.
 
 %prep
-%setup -q -n %name%{version}z
+%setup -q -n %{name}%{version}z
 %patch0 -p1
 %patch1 -p1
 
 %build
-%configure --with-tcl=%_libdir --with-tk=%_libdir
+%configure --with-tcl=%{_libdir} --with-tk=%{_libdir}
 cd src/shared
 %__make SHLIB_LD_FLAGS=-shared # no _smp_mflags; race conditions.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-DIRECTORY=$RPM_BUILD_ROOT%_libdir/%name%version
+DIRECTORY=$RPM_BUILD_ROOT%{_libdir}/%{name}%{version}
 install -d $DIRECTORY
 install -m 755 -p src/shared/libBLT24.so src/shared/libBLTlite24.so $DIRECTORY
 install -m 644 -p library/*.{pro,tcl,xbm} library/tclIndex $DIRECTORY
@@ -48,9 +47,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,0755)
 %doc README INSTALL PROBLEMS html/
-%_libdir/%name%{version}
+%{_libdir}/%{name}%{version}/
 
 %changelog
 * Fri Nov 5 2004 Jean-Luc Fontaine <jfontain at free.fr> 0:2.4-10.z



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bochs/devel bochs.spec,1.4,1.5
Message-ID: <200503031946.j23JkfUX013680@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/bochs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13565/bochs/devel

Modified Files:
	bochs.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bochs.spec	5 Dec 2004 16:23:17 -0000	1.4
+++ bochs.spec	3 Mar 2005 19:46:39 -0000	1.5
@@ -1,7 +1,6 @@
 Name:           bochs
 Version:        2.1.1
 Release:        1
-Epoch:          0
 Summary:        Bochs Project x86 PC Emulator
 
 Group:          Applications/Emulators
@@ -30,7 +29,7 @@
 %package        dlxlinux
 Summary:        DLX Linux hard disk image for Bochs
 Group:          Applications/Emulators
-Requires:       %{name} >= 0:2.0
+Requires:       %{name} >= 2.0
 
 %description    dlxlinux
 DLX is a version of Linux which was small enough to distribute along



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bin2iso/devel bin2iso.spec,1.5,1.6
Message-ID: <200503031946.j23Jkfd6013660@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/bin2iso/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13565/bin2iso/devel

Modified Files:
	bin2iso.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bin2iso.spec
===================================================================
RCS file: /cvs/extras/rpms/bin2iso/devel/bin2iso.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bin2iso.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ bin2iso.spec	3 Mar 2005 19:46:39 -0000	1.6
@@ -1,52 +1,44 @@
-Summary: 	Convert ".bin" files into ISO or WAV.
-Name: 		bin2iso
-Version: 	1.9
-Release: 	1.b
-Epoch: 		0
-License: 	Distributable (Unknown)
-Group: 		Applications/File
-URL: 		http://users.andara.com/~doiron/bin2iso/
-Source0: 	http://users.eastlink.ca/~doiron/bin2iso/linux/bin2iso19b_linux.c
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Summary:	Convert ".bin" files into ISO or WAV
+Name:		bin2iso
+Version:	1.9
+Release:	1.b
+License:	Distributable (Unknown)
+Group:		Applications/File
+URL:		http://users.andara.com/~doiron/bin2iso/
+Source0:	http://users.eastlink.ca/~doiron/bin2iso/linux/bin2iso19b_linux.c
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-# -----------------------------------------------------------------------------
 
 %description
 A program to convert ".bin" images into iso or wav files.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -c -T
 
-# -----------------------------------------------------------------------------
 
 %build
 %{__cc} $RPM_OPT_FLAGS -o %{name} %{SOURCE0}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
 %{__install} -m 0755 %{name} $RPM_BUILD_ROOT/%{_bindir}
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Tue Jul  8 2003 Dams <anvil[AT]livna.org> 0:1.9-0.fdr.1.b
 - Fixed typo in version
 
-* Fri Jul  4 2003 Dams <anvil[AT]livna.org> 
+* Fri Jul  4 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bonnie++/devel bonnie++.spec,1.6,1.7
Message-ID: <200503031946.j23Jkfm9013684@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/bonnie++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13565/bonnie++/devel

Modified Files:
	bonnie++.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bonnie++.spec
===================================================================
RCS file: /cvs/extras/rpms/bonnie++/devel/bonnie++.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bonnie++.spec	1 Jan 2005 12:15:07 -0000	1.6
+++ bonnie++.spec	3 Mar 2005 19:46:39 -0000	1.7
@@ -1,25 +1,24 @@
 Name:           bonnie++
 Version:        1.03a
 Release:        3
-Epoch:          0
-Summary:        Bonnie++ filesystem and disk benchmark & burn-in suite
+Summary:        Filesystem and disk benchmark & burn-in suite
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.coker.com.au/bonnie++/
 Source0:        http://www.coker.com.au/bonnie++/bonnie++-1.03a.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 Patch0:         bonnie++-1.03a-mandir.patch
 
 %description
-bonnie++ filesystem and disk benchmark suite aggressively reads & writes 
-in various ways on your filesystem then outputs useful benchmark performance 
-data.  bonnie++ is also useful as a hardware, disk, and filesystem stability 
+bonnie++ filesystem and disk benchmark suite aggressively reads & writes
+in various ways on your filesystem then outputs useful benchmark performance
+data.  bonnie++ is also useful as a hardware, disk, and filesystem stability
 test, exposing some types of hardware or kernel failures that would otherwise
 be difficult to detect.
 
-Do not leave bonnie++ installed on a production system.  Use only while you 
+Do not leave bonnie++ installed on a production system.  Use only while you
 test servers.
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bluefish/devel bluefish.spec,1.8,1.9
Message-ID: <200503031946.j23JkfKd013676@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/bluefish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13565/bluefish/devel

Modified Files:
	bluefish.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bluefish.spec
===================================================================
RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bluefish.spec	20 Feb 2005 16:45:59 -0000	1.8
+++ bluefish.spec	3 Mar 2005 19:46:39 -0000	1.9
@@ -1,7 +1,7 @@
 Name:           bluefish
 Version:        1.0
 Release:        2
-Summary:        A GTK2 web development application for experienced users.
+Summary:        GTK2 web development application for experienced users
 
 Group:          Development/Tools
 License:        GPL
@@ -10,11 +10,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  aspell-devel >= 0.5
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 BuildRequires:  gnome-vfs2-devel
-BuildRequires:	gtk2-devel >= 2.0.6
-BuildRequires:	pcre-devel >= 3.9
+BuildRequires:  gtk2-devel >= 2.0.6
+BuildRequires:  pcre-devel >= 3.9
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/blender/devel blender.spec,1.5,1.6
Message-ID: <200503031946.j23JkfKW013668@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13565/blender/devel

Modified Files:
	blender.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blender.spec	25 Nov 2004 16:49:43 -0000	1.5
+++ blender.spec	3 Mar 2005 19:46:39 -0000	1.6
@@ -1,26 +1,26 @@
 Name:           blender
 Version:        2.35
 Release:        1
-Summary:        3D modeling, animation, rendering and post-production.
+Summary:        3D modeling, animation, rendering and post-production
 
-Group: 	        Applications/Multimedia
+Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.blender.org
 Source0:        http://download.blender.org/source/blender-2.35.tar.bz2
 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
+Source3:        blender.png
+Source4:        blender.desktop
 Source5:        blender.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:	esound-devel
-BuildRequires:  freeglut-devel 
-BuildRequires:	gettext
-BuildRequires:  libjpeg-devel 
-BuildRequires:	libogg-devel
-BuildRequires:  libpng-devel 
+BuildRequires:  esound-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  gettext
+BuildRequires:  libjpeg-devel
+BuildRequires:  libogg-devel
+BuildRequires:  libpng-devel
 BuildRequires:	libtool
 BuildRequires:	libvorbis-devel
 BuildRequires:  openal-devel
@@ -28,7 +28,7 @@
 BuildRequires:  python-devel
 BuildRequires:  scons
 BuildRequires:	SDL-devel
-BuildRequires:	zlib-devel 
+BuildRequires:	zlib-devel
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
@@ -71,12 +71,12 @@
 
 
 %post
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : 
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %postun
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : 
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
@@ -135,7 +135,7 @@
 - enable-international.
 
 * Tue Nov 18 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:2.30-0.fdr.1
-- Updated to 2.30. 
+- Updated to 2.30.
 
 * Fri Oct 10 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:2.28-0.fdr.5.c
 - Updated to 2.28c.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/brightside/devel brightside.spec,1.2,1.3
Message-ID: <200503031946.j23JkfHV013688@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/brightside/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13565/brightside/devel

Modified Files:
	brightside.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: brightside.spec
===================================================================
RCS file: /cvs/extras/rpms/brightside/devel/brightside.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- brightside.spec	12 Dec 2004 21:33:41 -0000	1.2
+++ brightside.spec	3 Mar 2005 19:46:39 -0000	1.3
@@ -1,17 +1,16 @@
 Name:           brightside
 Version:        1.4.0
 Release:        3
-Epoch:          0
-Summary:        Add reactivity to the corners and edges of your GNOME desktop.
+Summary:        Add reactivity to the corners and edges of your GNOME desktop
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://home.jesus.ox.ac.uk/~ecatmur/brightside/
 Source0:        http://home.jesus.ox.ac.uk/~ecatmur/brightside/download/brightside-1.4.0.tar.bz2
-Patch0:		%{name}-gconf-mouse-speed.patch
+Patch0:         %{name}-gconf-mouse-speed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(pre):  GConf2 
+Requires(pre):  GConf2
 Requires(post): GConf2
 BuildRequires:  intltool
 BuildRequires:  gettext
@@ -21,15 +20,15 @@
 
 
 %description
-Brightside provides "edge flipping" to allow you to switch to the adjacent 
+Brightside provides "edge flipping" to allow you to switch to the adjacent
 workspace simply by pressing your mouse against the edge of the screen.
 
-Besides that Brightside also allows you to assign configurable actions to 
+Besides that Brightside also allows you to assign configurable actions to
 occur while you rest the mouse in a corner of the screen.
 
 %prep
 %setup -q
-%patch0 -b .patch0 
+%patch0 -b .patch0
 
 
 %build
@@ -71,7 +70,7 @@
 
 %files -f Brightside.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README 
+%doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_sysconfdir}/gconf/schemas/brightside.schemas



From fedora-extras-commits at redhat.com  Thu Mar  3 19:46:41 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 14:46:41 -0500
Subject: rpms/bwbar/devel bwbar.spec,1.3,1.4
Message-ID: <200503031946.j23Jkf96013693@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/bwbar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13565/bwbar/devel

Modified Files:
	bwbar.spec 
Log Message:
Mass letter "b" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: bwbar.spec
===================================================================
RCS file: /cvs/extras/rpms/bwbar/devel/bwbar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bwbar.spec	10 Dec 2004 22:03:01 -0000	1.3
+++ bwbar.spec	3 Mar 2005 19:46:39 -0000	1.4
@@ -1,10 +1,9 @@
 # $Id$
 
-Summary:       A program that generates a readout of the current bandwidth use
+Summary:       Generate a readout of the current bandwidth use
 Name:          bwbar
 Version:       1.2.2
 Release:       2
-Epoch:         0
 License:       GPL
 Group:         System Environment/Base
 Source0:       http://www.kernel.org/pub/software/web/bwbar/bwbar-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 19:47:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:47:06 -0500
Subject: rpms/i810switch import.log,1.4,1.5
Message-ID: <200503031947.j23Jl6aj013902@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/i810switch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13893

Modified Files:
	import.log 
Log Message:
auto-import i810switch-0.6.2-0.fdr.3.1 on branch FC-1 from i810switch-0.6.2-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/i810switch/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:01:53 -0000	1.4
+++ import.log	3 Mar 2005 19:47:04 -0000	1.5
@@ -1,3 +1,4 @@
 i810switch-0_6_2-3:HEAD:i810switch-0.6.2-3.src.rpm:1106671753
 i810switch-0_6_2-0_fdr_3_rh90:RHL-9:i810switch-0.6.2-0.fdr.3.rh90.src.rpm:1109747422
 i810switch-0_6_2-0_fdr_3_2:FC-2:i810switch-0.6.2-0.fdr.3.2.src.rpm:1109876521
+i810switch-0_6_2-0_fdr_3_1:FC-1:i810switch-0.6.2-0.fdr.3.1.src.rpm:1109879231



From fedora-extras-commits at redhat.com  Thu Mar  3 19:47:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:47:06 -0500
Subject: rpms/i810switch/FC-1 i810switch.spec,1.1,1.2
Message-ID: <200503031947.j23Jl68H013906@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/i810switch/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13893/FC-1

Modified Files:
	i810switch.spec 
Log Message:
auto-import i810switch-0.6.2-0.fdr.3.1 on branch FC-1 from i810switch-0.6.2-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/FC-1/i810switch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- i810switch.spec	25 Jan 2005 16:49:20 -0000	1.1
+++ i810switch.spec	3 Mar 2005 19:47:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.2
-Release: 3
+Release: 0.fdr.3.1
 Epoch: 0
 Summary: A utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -40,7 +40,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Tue Jan 18 2005 David Kaplan <dmk at localhost.localdomain> - 0:0.6.2-3
+* Tue Jan 18 2005 David Kaplan <dmk at localhost.localdomain> - 0:0.6.2-0.fdr.3
 - Added back INSTALL file to rpm because it explains how to SUID root
   the executable so that all users can use i810switch.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:49:20 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:49:20 -0500
Subject: rpms/pcsc-lite import.log,1.3,1.4
Message-ID: <200503031949.j23JnK9W014032@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-lite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14023

Modified Files:
	import.log 
Log Message:
auto-import pcsc-lite-1.2.0-0.fdr.10.1 on branch FC-1 from pcsc-lite-1.2.0-0.fdr.10.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Mar 2005 19:03:57 -0000	1.3
+++ import.log	3 Mar 2005 19:49:18 -0000	1.4
@@ -1,2 +1,3 @@
 pcsc-lite-1_2_0-10:HEAD:pcsc-lite-1.2.0-10.src.rpm:1105127825
 pcsc-lite-1_2_0-0_fdr_10_2:FC-2:pcsc-lite-1.2.0-0.fdr.10.2.src.rpm:1109876644
+pcsc-lite-1_2_0-0_fdr_10_1:FC-1:pcsc-lite-1.2.0-0.fdr.10.1.src.rpm:1109879364



From fedora-extras-commits at redhat.com  Thu Mar  3 19:49:20 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:49:20 -0500
Subject: rpms/pcsc-lite/FC-1 pcsc-lite.spec,1.1,1.2
Message-ID: <200503031949.j23JnK0X014036@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-lite/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14023/FC-1

Modified Files:
	pcsc-lite.spec 
Log Message:
auto-import pcsc-lite-1.2.0-0.fdr.10.1 on branch FC-1 from pcsc-lite-1.2.0-0.fdr.10.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/FC-1/pcsc-lite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcsc-lite.spec	7 Jan 2005 19:57:18 -0000	1.1
+++ pcsc-lite.spec	3 Mar 2005 19:49:18 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pcsc-lite
 Version:        1.2.0
-Release:        10
+Release:        0.fdr.10.1
 Epoch:          0
 Summary:        PC/SC Lite smart card framework and applications
 
@@ -138,7 +138,7 @@
 
 
 %changelog
-* Tue Aug 17 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2.0-10
+* Tue Aug 17 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2.0-0.fdr.10
 - Disable dependency tracking to speed up the build.
 - Drop reader.conf patch, it's not needed any more.
 - Rename update-reader-conf to update-reader.conf for consistency with Debian,



From fedora-extras-commits at redhat.com  Thu Mar  3 19:50:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:50:06 -0500
Subject: rpms/pcsc-perl import.log,1.3,1.4
Message-ID: <200503031950.j23Jo6Rl014138@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14129

Modified Files:
	import.log 
Log Message:
auto-import pcsc-perl-1.3.1-0.fdr.3.1 on branch FC-1 from pcsc-perl-1.3.1-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pcsc-perl/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Mar 2005 19:05:03 -0000	1.3
+++ import.log	3 Mar 2005 19:50:04 -0000	1.4
@@ -1,2 +1,3 @@
 pcsc-perl-1_3_1-4:HEAD:pcsc-perl-1.3.1-4.src.rpm:1105128940
 pcsc-perl-1_3_1-0_fdr_3_2:FC-2:pcsc-perl-1.3.1-0.fdr.3.2.src.rpm:1109876710
+pcsc-perl-1_3_1-0_fdr_3_1:FC-1:pcsc-perl-1.3.1-0.fdr.3.1.src.rpm:1109879411



From fedora-extras-commits at redhat.com  Thu Mar  3 19:50:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:50:06 -0500
Subject: rpms/pcsc-perl/FC-1 pcsc-perl.spec,1.1,1.2
Message-ID: <200503031950.j23Jo6V6014142@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pcsc-perl/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14129/FC-1

Modified Files:
	pcsc-perl.spec 
Log Message:
auto-import pcsc-perl-1.3.1-0.fdr.3.1 on branch FC-1 from pcsc-perl-1.3.1-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: pcsc-perl.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-perl/FC-1/pcsc-perl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcsc-perl.spec	7 Jan 2005 20:15:46 -0000	1.1
+++ pcsc-perl.spec	3 Mar 2005 19:50:04 -0000	1.2
@@ -3,9 +3,9 @@
 
 Name:           pcsc-perl
 Version:        1.3.1
-Release:        4
+Release:        0.fdr.3.1
 Epoch:          0
-Summary:        Perl interface to the PC/SC smart card library
+Summary:        PC/SC library for Perl
 
 Group:          Development/Libraries
 License:        GPL
@@ -18,8 +18,8 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-This package contains a Perl interface to the PC/SC smart card
-library.
+This library allows to intercate with a smart card and pcsc-lite using
+the Perl language.
 
 
 %prep
@@ -28,16 +28,15 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor INC= \
-  DEFINE=-Wall
+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' -a -size 0 -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
+  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
@@ -59,10 +58,6 @@
 
 
 %changelog
-* Fri Jan  7 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.3.1-4
-- Honor $RPM_OPT_FLAGS, remove (some) extra include dirs from build (#1281).
-- Improve summary and description.
-
 * Wed May 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.3.1-0.fdr.3
 - BuildRequire perl >= 1:5.6.1 for vendor install dir support.
 - Use pure_install to avoid perllocal.pod workarounds.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:50:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:50:55 -0500
Subject: rpms/perl-Chart import.log,1.3,1.4
Message-ID: <200503031950.j23Jot2Q014244@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Chart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14235

Modified Files:
	import.log 
Log Message:
auto-import perl-Chart-2.3-0.fdr.2.1 on branch FC-1 from perl-Chart-2.3-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Mar 2005 19:05:10 -0000	1.3
+++ import.log	3 Mar 2005 19:50:53 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Chart-2_3-2:HEAD:perl-Chart-2.3-2.src.rpm:1105996029
 perl-Chart-2_3-0_fdr_2_2:FC-2:perl-Chart-2.3-0.fdr.2.2.src.rpm:1109876718
+perl-Chart-2_3-0_fdr_2_1:FC-1:perl-Chart-2.3-0.fdr.2.1.src.rpm:1109879460



From fedora-extras-commits at redhat.com  Thu Mar  3 19:50:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:50:55 -0500
Subject: rpms/perl-Chart/FC-1 perl-Chart.spec,1.1,1.2
Message-ID: <200503031950.j23JotU6014248@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Chart/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14235/FC-1

Modified Files:
	perl-Chart.spec 
Log Message:
auto-import perl-Chart-2.3-0.fdr.2.1 on branch FC-1 from perl-Chart-2.3-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-Chart.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/FC-1/perl-Chart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Chart.spec	17 Jan 2005 21:07:15 -0000	1.1
+++ perl-Chart.spec	3 Mar 2005 19:50:53 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Chart
 Version:        2.3
-Release:        2
+Release:        0.fdr.2.1
 Epoch:          0
 Summary:        Perl module for producing many types of charts
 
@@ -53,7 +53,7 @@
 
 
 %changelog
-* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.3-2
+* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.3-0.fdr.2
 - Bring up to date with current fedora.us Perl Spec template.
 
 * Thu Jan 15 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.3-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:51:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:51:49 -0500
Subject: rpms/perl-Error import.log,1.4,1.5
Message-ID: <200503031951.j23JpnZ4014350@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Error
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14341

Modified Files:
	import.log 
Log Message:
auto-import perl-Error-0.15-0.fdr.1.1 on branch FC-1 from perl-Error-0.15-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:05:53 -0000	1.4
+++ import.log	3 Mar 2005 19:51:47 -0000	1.5
@@ -1,3 +1,4 @@
 perl-Error-0_15-0_fdr_1:HEAD:perl-Error-0.15-0.fdr.1.src.rpm:1103646600
 perl-Error-0_15-0_fdr_1_rh90:RHL-9:perl-Error-0.15-0.fdr.1.rh90.src.rpm:1109747504
 perl-Error-0_15-0_fdr_1_2:FC-2:perl-Error-0.15-0.fdr.1.2.src.rpm:1109876759
+perl-Error-0_15-0_fdr_1_1:FC-1:perl-Error-0.15-0.fdr.1.1.src.rpm:1109879514



From fedora-extras-commits at redhat.com  Thu Mar  3 19:51:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:51:49 -0500
Subject: rpms/perl-Error/FC-1 perl-Error.spec,1.2,1.3
Message-ID: <200503031951.j23JpnaP014355@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Error/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14341/FC-1

Modified Files:
	perl-Error.spec 
Log Message:
auto-import perl-Error-0.15-0.fdr.1.1 on branch FC-1 from perl-Error-0.15-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-1/perl-Error.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Error.spec	21 Dec 2004 16:33:00 -0000	1.2
+++ perl-Error.spec	3 Mar 2005 19:51:47 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-Error
 Version:        0.15
-Release:        1
+Release:        0.fdr.1.1
 Epoch:          0
 Summary:        Error Perl module
 License:        GPL or Artistic
@@ -49,5 +49,5 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Jun 11 2004 Steven Pritchard <steve at kspei.com> 0:0.15-1
+* Fri Jun 11 2004 Steven Pritchard <steve at kspei.com> 0:0.15-0.fdr.1
 - Specfile autogenerated.



From fedora-extras-commits at redhat.com  Thu Mar  3 19:52:33 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:52:33 -0500
Subject: rpms/perl-FreezeThaw import.log,1.4,1.5
Message-ID: <200503031952.j23JqXg6014456@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-FreezeThaw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14447

Modified Files:
	import.log 
Log Message:
auto-import perl-FreezeThaw-0.43-0.fdr.1.1 on branch FC-1 from perl-FreezeThaw-0.43-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:06:07 -0000	1.4
+++ import.log	3 Mar 2005 19:52:31 -0000	1.5
@@ -1,3 +1,4 @@
 perl-FreezeThaw-0_43-0_fdr_1_2:HEAD:perl-FreezeThaw-0.43-0.fdr.1.2.src.rpm:1102527774
 perl-FreezeThaw-0_43-0_fdr_1_rh90:RHL-9:perl-FreezeThaw-0.43-0.fdr.1.rh90.src.rpm:1109747568
 perl-FreezeThaw-0_43-0_fdr_1_2:FC-2:perl-FreezeThaw-0.43-0.fdr.1.2.src.rpm:1109876774
+perl-FreezeThaw-0_43-0_fdr_1_1:FC-1:perl-FreezeThaw-0.43-0.fdr.1.1.src.rpm:1109879558



From fedora-extras-commits at redhat.com  Thu Mar  3 19:52:33 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:52:33 -0500
Subject: rpms/perl-FreezeThaw/FC-1 perl-FreezeThaw.spec,1.2,1.3
Message-ID: <200503031952.j23JqXWX014460@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-FreezeThaw/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14447/FC-1

Modified Files:
	perl-FreezeThaw.spec 
Log Message:
auto-import perl-FreezeThaw-0.43-0.fdr.1.1 on branch FC-1 from perl-FreezeThaw-0.43-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-FreezeThaw.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/FC-1/perl-FreezeThaw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-FreezeThaw.spec	10 Dec 2004 22:03:08 -0000	1.2
+++ perl-FreezeThaw.spec	3 Mar 2005 19:52:31 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-FreezeThaw
 Version:        0.43
-Release:        1
+Release:        0.fdr.1.1
 Epoch:          0
 Summary:        Convert Perl structures to strings and back
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:53:28 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:53:28 -0500
Subject: rpms/perl-Gtk2 import.log,1.4,1.5
Message-ID: <200503031953.j23JrS2D014569@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Gtk2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14560

Modified Files:
	import.log 
Log Message:
auto-import perl-Gtk2-1.061-0.fdr.2.1 on branch FC-1 from perl-Gtk2-1.061-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:06:49 -0000	1.4
+++ import.log	3 Mar 2005 19:53:26 -0000	1.5
@@ -1,3 +1,4 @@
 perl-Gtk2-1_061-0_fdr_2_2:HEAD:perl-Gtk2-1.061-0.fdr.2.2.src.rpm:1102527968
 perl-Gtk2-1_061-0_fdr_2_rh90:RHL-9:perl-Gtk2-1.061-0.fdr.2.rh90.src.rpm:1109747662
 perl-Gtk2-1_061-0_fdr_2_2:FC-2:perl-Gtk2-1.061-0.fdr.2.2.src.rpm:1109876816
+perl-Gtk2-1_061-0_fdr_2_1:FC-1:perl-Gtk2-1.061-0.fdr.2.1.src.rpm:1109879614



From fedora-extras-commits at redhat.com  Thu Mar  3 19:53:28 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:53:28 -0500
Subject: rpms/perl-Gtk2/FC-1 .cvsignore, 1.3, 1.4 perl-Gtk2.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200503031953.j23JrSZO014573@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Gtk2/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14560/FC-1

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
auto-import perl-Gtk2-1.061-0.fdr.2.1 on branch FC-1 from perl-Gtk2-1.061-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-1/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2005 03:21:00 -0000	1.3
+++ .cvsignore	3 Mar 2005 19:53:26 -0000	1.4
@@ -1 +1 @@
-Gtk2-1.062.tar.gz
+Gtk2-1.061.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-1/perl-Gtk2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Gtk2.spec	15 Feb 2005 03:30:46 -0000	1.4
+++ perl-Gtk2.spec	3 Mar 2005 19:53:26 -0000	1.5
@@ -1,19 +1,19 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Gtk2
-Version:        1.062
-Release:        1
+Version:        1.061
+Release:        0.fdr.2.1
 Epoch:          0
 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.062.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.061.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.062
+BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.061
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -62,9 +62,6 @@
 
 
 %changelog
-* Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.062-1
-- Update to 1.062.
-
 * Mon Oct 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.061-0.fdr.2
 - Removed irrelevant or duplicated documentation files.
 - Description simplified (as suggested by Ville Skytt??).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-1/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 03:21:00 -0000	1.3
+++ sources	3 Mar 2005 19:53:26 -0000	1.4
@@ -1 +1 @@
-cbca72d71fa470157d139c2bf659c040  Gtk2-1.062.tar.gz
+f7a14ff2e86dc66c9a06539613b70576  Gtk2-1.061.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 19:54:16 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:54:16 -0500
Subject: rpms/perl-HTML-Tree import.log,1.4,1.5
Message-ID: <200503031954.j23JsGdq014679@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-HTML-Tree
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14669

Modified Files:
	import.log 
Log Message:
auto-import perl-HTML-Tree-3.18-0.fdr.2.1 on branch FC-1 from perl-HTML-Tree-3.18-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:07:52 -0000	1.4
+++ import.log	3 Mar 2005 19:54:14 -0000	1.5
@@ -1,3 +1,4 @@
 perl-HTML-Tree-3_18-2:HEAD:perl-HTML-Tree-3.18-2.src.rpm:1108323387
 perl-HTML-Tree-3_18-0_fdr_2_rh90:RHL-9:perl-HTML-Tree-3.18-0.fdr.2.rh90.src.rpm:1109747718
 perl-HTML-Tree-3_18-0_fdr_2_2:FC-2:perl-HTML-Tree-3.18-0.fdr.2.2.src.rpm:1109876879
+perl-HTML-Tree-3_18-0_fdr_2_1:FC-1:perl-HTML-Tree-3.18-0.fdr.2.1.src.rpm:1109879661



From fedora-extras-commits at redhat.com  Thu Mar  3 19:54:16 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:54:16 -0500
Subject: rpms/perl-HTML-Tree/FC-1 perl-HTML-Tree.spec,1.1,1.2
Message-ID: <200503031954.j23JsGLf014682@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-HTML-Tree/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14669/FC-1

Modified Files:
	perl-HTML-Tree.spec 
Log Message:
auto-import perl-HTML-Tree-3.18-0.fdr.2.1 on branch FC-1 from perl-HTML-Tree-3.18-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/FC-1/perl-HTML-Tree.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Tree.spec	13 Feb 2005 19:36:38 -0000	1.1
+++ perl-HTML-Tree.spec	3 Mar 2005 19:54:14 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-HTML-Tree
 Version:        3.18
-Release:        2
+Release:        0.fdr.2.1
 Epoch:          0
 Summary:        HTML tree handling modules for Perl
 
@@ -58,7 +58,7 @@
 
 
 %changelog
-* Tue Jan  4 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-2
+* Tue Jan  4 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-0.fdr.2
 - Don't install htmltree into %%{_bindir} but include it in docs.
 
 * Sat Dec  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.18-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 19:55:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:55:06 -0500
Subject: rpms/perl-IO-Socket-SSL import.log,1.4,1.5
Message-ID: <200503031955.j23Jt6lC014787@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-IO-Socket-SSL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14778

Modified Files:
	import.log 
Log Message:
auto-import perl-IO-Socket-SSL-0.96-0.fdr.3.1 on branch FC-1 from perl-IO-Socket-SSL-0.96-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:09:46 -0000	1.4
+++ import.log	3 Mar 2005 19:55:04 -0000	1.5
@@ -1,3 +1,4 @@
 perl-IO-Socket-SSL-0_96-3:HEAD:perl-IO-Socket-SSL-0.96-3.src.rpm:1105271963
 perl-IO-Socket-SSL-0_96-0_fdr_3_rh90:RHL-9:perl-IO-Socket-SSL-0.96-0.fdr.3.rh90.src.rpm:1109747778
 perl-IO-Socket-SSL-0_96-0_fdr_3_2:FC-2:perl-IO-Socket-SSL-0.96-0.fdr.3.2.src.rpm:1109876993
+perl-IO-Socket-SSL-0_96-0_fdr_3_1:FC-1:perl-IO-Socket-SSL-0.96-0.fdr.3.1.src.rpm:1109879710



From fedora-extras-commits at redhat.com  Thu Mar  3 19:55:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:55:06 -0500
Subject: rpms/perl-IO-Socket-SSL/FC-1 perl-IO-Socket-SSL.spec,1.1,1.2
Message-ID: <200503031955.j23Jt6Bw014791@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-IO-Socket-SSL/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14778/FC-1

Modified Files:
	perl-IO-Socket-SSL.spec 
Log Message:
auto-import perl-IO-Socket-SSL-0.96-0.fdr.3.1 on branch FC-1 from perl-IO-Socket-SSL-0.96-0.fdr.3.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/FC-1/perl-IO-Socket-SSL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-IO-Socket-SSL.spec	9 Jan 2005 11:59:30 -0000	1.1
+++ perl-IO-Socket-SSL.spec	3 Mar 2005 19:55:04 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-IO-Socket-SSL
 Version:        0.96
-Release:        3
+Release:        0.fdr.3.1
 Epoch:          0
 Summary:        Perl library for transparent SSL
 
@@ -62,7 +62,7 @@
 
 
 %changelog
-* Tue Oct 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-3
+* Tue Oct 12 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-0.fdr.3
 - Disable session test suite even if Net::SSLeay >= 1.26 is available.
 
 * Wed Jul  7 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.96-0.fdr.2



From fedora-extras-commits at redhat.com  Thu Mar  3 19:56:03 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:56:03 -0500
Subject: rpms/perl-MLDBM/FC-1 perl-MLDBM.spec,1.2,1.3
Message-ID: <200503031956.j23Ju3Ir014899@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-MLDBM/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14886/FC-1

Modified Files:
	perl-MLDBM.spec 
Log Message:
auto-import perl-MLDBM-2.01-0.fdr.1.1 on branch FC-1 from perl-MLDBM-2.01-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-MLDBM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/FC-1/perl-MLDBM.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-MLDBM.spec	28 Jan 2005 17:36:45 -0000	1.2
+++ perl-MLDBM.spec	3 Mar 2005 19:55:55 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-MLDBM
 Version:        2.01
-Release:        1
+Release:        0.fdr.1.1
 Epoch:          0
 Summary:        Store multi-level hash structure in single level tied hash
 



From fedora-extras-commits at redhat.com  Thu Mar  3 19:55:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:55:57 -0500
Subject: rpms/perl-MLDBM import.log,1.4,1.5
Message-ID: <200503031955.j23JtvUD014894@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-MLDBM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14886

Modified Files:
	import.log 
Log Message:
auto-import perl-MLDBM-2.01-0.fdr.1.1 on branch FC-1 from perl-MLDBM-2.01-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:10:36 -0000	1.4
+++ import.log	3 Mar 2005 19:55:54 -0000	1.5
@@ -1,3 +1,4 @@
 perl-MLDBM-2_01-0_fdr_1_2:HEAD:perl-MLDBM-2.01-0.fdr.1.2.src.rpm:1102781000
 perl-MLDBM-2_01-0_fdr_1_rh90:RHL-9:perl-MLDBM-2.01-0.fdr.1.rh90.src.rpm:1109747903
 perl-MLDBM-2_01-0_fdr_1_2:FC-2:perl-MLDBM-2.01-0.fdr.1.2.src.rpm:1109877043
+perl-MLDBM-2_01-0_fdr_1_1:FC-1:perl-MLDBM-2.01-0.fdr.1.1.src.rpm:1109879758



From fedora-extras-commits at redhat.com  Thu Mar  3 19:57:27 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:57:27 -0500
Subject: rpms/perl-Module-CoreList import.log,1.4,1.5
Message-ID: <200503031957.j23JvR1Q015004@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Module-CoreList
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14995

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-CoreList-1.98-0.fdr.2.1 on branch FC-1 from perl-Module-CoreList-1.98-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:11:47 -0000	1.4
+++ import.log	3 Mar 2005 19:57:25 -0000	1.5
@@ -1,3 +1,4 @@
 perl-Module-CoreList-1_98-2:HEAD:perl-Module-CoreList-1.98-2.src.rpm:1104953598
 perl-Module-CoreList-1_98-0_fdr_2_rh90:RHL-9:perl-Module-CoreList-1.98-0.fdr.2.rh90.src.rpm:1109747962
 perl-Module-CoreList-1_98-0_fdr_2_2:FC-2:perl-Module-CoreList-1.98-0.fdr.2.2.src.rpm:1109877114
+perl-Module-CoreList-1_98-0_fdr_2_1:FC-1:perl-Module-CoreList-1.98-0.fdr.2.1.src.rpm:1109879852



From fedora-extras-commits at redhat.com  Thu Mar  3 19:57:27 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 14:57:27 -0500
Subject: rpms/perl-Module-CoreList/FC-1 perl-Module-CoreList.spec,1.1,1.2
Message-ID: <200503031957.j23JvRjP015009@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Module-CoreList/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14995/FC-1

Modified Files:
	perl-Module-CoreList.spec 
Log Message:
auto-import perl-Module-CoreList-1.98-0.fdr.2.1 on branch FC-1 from perl-Module-CoreList-1.98-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-Module-CoreList.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-1/perl-Module-CoreList.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Module-CoreList.spec	5 Jan 2005 19:33:24 -0000	1.1
+++ perl-Module-CoreList.spec	3 Mar 2005 19:57:25 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Module-CoreList
 Version:        1.98
-Release:        2
+Release:        0.fdr.2.1
 Epoch:          0
 Summary:        Perl core modules indexed by perl versions
 
@@ -57,7 +57,7 @@
 
 
 %changelog
-* Tue Jan 04 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-2
+* Tue Jan 04 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-0.fdr.2
 - BuildRequires: perl(Module::Build) (#2362).
 
 * Mon Jan 03 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.98-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 20:02:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:02:21 -0500
Subject: rpms/perl-Net-SSLeay/FC-1 perl-Net-SSLeay.spec,1.1,1.2
Message-ID: <200503032002.j23K2LY1015816@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Net-SSLeay/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15803/FC-1

Modified Files:
	perl-Net-SSLeay.spec 
Log Message:
auto-import perl-Net-SSLeay-1.26-0.fdr.2.1 on branch FC-1 from perl-Net-SSLeay-1.26-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/FC-1/perl-Net-SSLeay.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-SSLeay.spec	20 Dec 2004 17:25:07 -0000	1.1
+++ perl-Net-SSLeay.spec	3 Mar 2005 20:02:19 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-Net-SSLeay
 Version:        1.26
-Release:        1
+Release:        0.fdr.2.1
 Epoch:          0
 Summary:        Perl extension for using OpenSSL
 
@@ -66,9 +66,6 @@
 
 
 %changelog
-* Mon Dec 20 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.26-1
-- Drop fedora.us release prefix and suffix.
-
 * Mon Oct 25 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.26-0.fdr.2
 - Convert manual page to UTF-8.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:02:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:02:21 -0500
Subject: rpms/perl-Net-SSLeay import.log,1.4,1.5
Message-ID: <200503032002.j23K2LKc015813@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Net-SSLeay
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15803

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-SSLeay-1.26-0.fdr.2.1 on branch FC-1 from perl-Net-SSLeay-1.26-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:12:46 -0000	1.4
+++ import.log	3 Mar 2005 20:02:19 -0000	1.5
@@ -1,3 +1,4 @@
 perl-Net-SSLeay-1_26-1:HEAD:perl-Net-SSLeay-1.26-1.src.rpm:1103563499
 perl-Net-SSLeay-1_26-0_fdr_2_rh90:RHL-9:perl-Net-SSLeay-1.26-0.fdr.2.rh90.src.rpm:1109748019
 perl-Net-SSLeay-1_26-0_fdr_2_2:FC-2:perl-Net-SSLeay-1.26-0.fdr.2.2.src.rpm:1109877174
+perl-Net-SSLeay-1_26-0_fdr_2_1:FC-1:perl-Net-SSLeay-1.26-0.fdr.2.1.src.rpm:1109880145



From fedora-extras-commits at redhat.com  Thu Mar  3 20:02:54 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu, 3 Mar 2005 15:02:54 -0500
Subject: common Makefile.common,1.4,1.5 cvs-import.sh,1.5,1.6
Message-ID: <200503032002.j23K2sgd015906@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15774

Modified Files:
	Makefile.common cvs-import.sh 
Log Message:


Apply Makefile.common changes to have 
curl allow cached files, as per https://www.redhat.com/archives/fedora-extras-list/2005-February/msg00448.html

Apply Ville's cvs-import.sh patch to allow messages, http://home.arcor.de/ms2002sep/tmp/cvs-import.patch



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.common	24 Nov 2004 02:17:31 -0000	1.4
+++ Makefile.common	3 Mar 2005 20:02:52 -0000	1.5
@@ -63,7 +63,7 @@
 
 # We define CURL and WGET in a way that makes if possible to have them
 # overwritten from the module's Makefiles. Then CLIENT picks CURL, otherwise WGET
-CURL	?= $(shell if test -f /usr/bin/curl ; then echo "curl -O -R -S --fail --show-error" ; fi)
+CURL	?= $(shell if test -f /usr/bin/curl ; then echo "curl -H Pragma: -O -R -S --fail --show-error" ; fi)
 WGET	?= $(shell if test -f /usr/bin/wget ; then echo "wget -nd -m" ; fi)
 CLIENT	?= $(if $(CURL),$(CURL),$(if $(WGET),$(WGET)))
 


Index: cvs-import.sh
===================================================================
RCS file: /cvs/extras/common/cvs-import.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cvs-import.sh	3 Feb 2005 00:30:33 -0000	1.5
+++ cvs-import.sh	3 Mar 2005 20:02:52 -0000	1.6
@@ -28,7 +28,7 @@
     cat <<EOF
 Usage:
 
-    $0 [-b <branch>] <package>
+    $0 [-b <branch>] [-m <message>] <package>
 
 Imports a package into the cvs repository. Will use the following defaults:
 CVSROOT    = $CVSROOT
@@ -42,6 +42,7 @@
 
 # Parse arguments
 BRANCH=
+MESSAGE=
 while [ -n "$1" ] ; do
     case "$1" in 
 	# import the package on the given branch. If the branch does
@@ -61,6 +62,11 @@
 	    fi
 	    ;;
 
+	-m | --message )
+	    shift
+	    MESSAGE="$1"
+	    ;;
+
 	# the always helpful help message
 	-h | --help )
 	    Usage
@@ -344,7 +350,8 @@
 echo "$LOG_ENTRY:$(date +%s)" >> ./import.log
 
 # prepare the commit message
-MESSAGE="auto-import $NAME-$VERSION-$RELEASE ${BRANCH:+on branch $BRANCH} from $(basename $PACKAGE)"
+MESSAGE="auto-import $NAME-$VERSION-$RELEASE ${BRANCH:+on branch $BRANCH} from $(basename $PACKAGE)
+$MESSAGE"
 cvs -Q update && \
     echo "cvs commit..." && \
     cvs -Q commit -m "$MESSAGE" >/dev/null && echo "Commit Complete" && \



From fedora-extras-commits at redhat.com  Thu Mar  3 20:03:07 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:03:07 -0500
Subject: rpms/perl-Pod-Coverage import.log,1.4,1.5
Message-ID: <200503032003.j23K37Un015945@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Pod-Coverage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15936

Modified Files:
	import.log 
Log Message:
auto-import perl-Pod-Coverage-0.17-0.fdr.1.1 on branch FC-1 from perl-Pod-Coverage-0.17-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Coverage/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 05:07:08 -0000	1.4
+++ import.log	3 Mar 2005 20:03:05 -0000	1.5
@@ -1,3 +1,4 @@
 perl-Pod-Coverage-0_14-0_fdr_1_rh90:HEAD:perl-Pod-Coverage-0.14-0.fdr.1.rh90.src.rpm:1099890416
 perl-Pod-Coverage-0_14-0_fdr_1_1:HEAD:perl-Pod-Coverage-0.14-0.fdr.1.1.src.rpm:1099890422
 perl-Pod-Coverage-0_14-0_fdr_1_2:HEAD:perl-Pod-Coverage-0.14-0.fdr.1.2.src.rpm:1099890428
+perl-Pod-Coverage-0_17-0_fdr_1_1:FC-1:perl-Pod-Coverage-0.17-0.fdr.1.1.src.rpm:1109880192



From fedora-extras-commits at redhat.com  Thu Mar  3 20:03:07 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:03:07 -0500
Subject: rpms/perl-Pod-Coverage/FC-1 .cvsignore,1.3,1.4
Message-ID: <200503032003.j23K379g015949@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Pod-Coverage/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15936/FC-1

Modified Files:
	.cvsignore 
Log Message:
auto-import perl-Pod-Coverage-0.17-0.fdr.1.1 on branch FC-1 from perl-Pod-Coverage-0.17-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Coverage/FC-1/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Dec 2004 20:06:30 -0000	1.3
+++ .cvsignore	3 Mar 2005 20:03:05 -0000	1.4
@@ -1,2 +1 @@
-Pod-Coverage-0.14.tar.gz
 Pod-Coverage-0.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar  3 20:04:04 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:04:04 -0500
Subject: rpms/perl-XML-RSS import.log,1.4,1.5
Message-ID: <200503032004.j23K44GC016054@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-RSS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16045

Modified Files:
	import.log 
Log Message:
auto-import perl-XML-RSS-1.05-0.fdr.1.1 on branch FC-1 from perl-XML-RSS-1.05-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-RSS/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:14:47 -0000	1.4
+++ import.log	3 Mar 2005 20:04:02 -0000	1.5
@@ -1,3 +1,4 @@
 perl-XML-RSS-1_05-1:HEAD:perl-XML-RSS-1.05-1.src.rpm:1104577827
 perl-XML-RSS-1_05-0_fdr_1_rh90:RHL-9:perl-XML-RSS-1.05-0.fdr.1.rh90.src.rpm:1109748137
 perl-XML-RSS-1_05-0_fdr_1_2:FC-2:perl-XML-RSS-1.05-0.fdr.1.2.src.rpm:1109877294
+perl-XML-RSS-1_05-0_fdr_1_1:FC-1:perl-XML-RSS-1.05-0.fdr.1.1.src.rpm:1109880247



From fedora-extras-commits at redhat.com  Thu Mar  3 20:04:04 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:04:04 -0500
Subject: rpms/perl-XML-RSS/FC-1 perl-XML-RSS.spec,1.1,1.2
Message-ID: <200503032004.j23K44aW016058@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-RSS/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16045/FC-1

Modified Files:
	perl-XML-RSS.spec 
Log Message:
auto-import perl-XML-RSS-1.05-0.fdr.1.1 on branch FC-1 from perl-XML-RSS-1.05-0.fdr.1.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-XML-RSS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-RSS/FC-1/perl-XML-RSS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-RSS.spec	1 Jan 2005 11:10:17 -0000	1.1
+++ perl-XML-RSS.spec	3 Mar 2005 20:04:02 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-XML-RSS
 Version:        1.05
-Release:        1
+Release:        0.fdr.1.1
 Epoch:          0
 Summary:        Perl module for managing RDF Site Summary (RSS) files
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:05:09 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:05:09 -0500
Subject: rpms/perl-XML-XPath import.log,1.4,1.5
Message-ID: <200503032005.j23K594J016162@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-XPath
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16151

Modified Files:
	import.log 
Log Message:
auto-import perl-XML-XPath-1.13-0.fdr.2.1 on branch FC-1 from perl-XML-XPath-1.13-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPath/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Mar 2005 19:16:53 -0000	1.4
+++ import.log	3 Mar 2005 20:05:07 -0000	1.5
@@ -1,3 +1,4 @@
 perl-XML-XPath-1_13-2:HEAD:perl-XML-XPath-1.13-2.src.rpm:1108067370
 perl-XML-XPath-1_13-0_fdr_2_rh90:RHL-9:perl-XML-XPath-1.13-0.fdr.2.rh90.src.rpm:1109748197
 perl-XML-XPath-1_13-0_fdr_2_2:FC-2:perl-XML-XPath-1.13-0.fdr.2.2.src.rpm:1109877420
+perl-XML-XPath-1_13-0_fdr_2_1:FC-1:perl-XML-XPath-1.13-0.fdr.2.1.src.rpm:1109880316



From fedora-extras-commits at redhat.com  Thu Mar  3 20:05:09 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:05:09 -0500
Subject: rpms/perl-XML-XPath/FC-1 perl-XML-XPath.spec,1.1,1.2
Message-ID: <200503032005.j23K59HK016165@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-XPath/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16151/FC-1

Modified Files:
	perl-XML-XPath.spec 
Log Message:
auto-import perl-XML-XPath-1.13-0.fdr.2.1 on branch FC-1 from perl-XML-XPath-1.13-0.fdr.2.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: perl-XML-XPath.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPath/FC-1/perl-XML-XPath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-XPath.spec	10 Feb 2005 20:29:37 -0000	1.1
+++ perl-XML-XPath.spec	3 Mar 2005 20:05:07 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-XML-XPath
 Version:        1.13
-Release:        2
+Release:        0.fdr.2.1
 Epoch:          0
 Summary:        XPath parser and evaluator for Perl
 
@@ -57,7 +57,7 @@
 
 
 %changelog
-* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-2
+* Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-0.fdr.2
 - Bring up to date with current fedora.us Perl spec template.
 
 * Sun Oct 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.13-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 20:07:15 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:07:15 -0500
Subject: rpms/python-imaging import.log,1.3,1.4
Message-ID: <200503032007.j23K7FUv016294@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/python-imaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16283

Modified Files:
	import.log 
Log Message:
auto-import python-imaging-1.1.4-0.fdr.6.1 on branch FC-1 from python-imaging-1.1.4-0.fdr.6.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Mar 2005 19:08:52 -0000	1.3
+++ import.log	3 Mar 2005 20:07:13 -0000	1.4
@@ -1,2 +1,3 @@
 python-imaging-1_1_4-0_fdr_4_rh90:HEAD:python-imaging-1.1.4-0.fdr.4.rh90.src.rpm:1099890921
 python-imaging-1_1_4-0_fdr_6_2:FC-2:python-imaging-1.1.4-0.fdr.6.2.src.rpm:1109876937
+python-imaging-1_1_4-0_fdr_6_1:FC-1:python-imaging-1.1.4-0.fdr.6.1.src.rpm:1109880440



From fedora-extras-commits at redhat.com  Thu Mar  3 20:07:15 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:07:15 -0500
Subject: rpms/python-imaging/FC-1 python-imaging.spec,1.3,1.4
Message-ID: <200503032007.j23K7FK7016298@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/python-imaging/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16283/FC-1

Modified Files:
	python-imaging.spec 
Log Message:
auto-import python-imaging-1.1.4-0.fdr.6.1 on branch FC-1 from python-imaging-1.1.4-0.fdr.6.1.src.rpm
Bring in stuff from fedora.us FC1/stable


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-1/python-imaging.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-imaging.spec	11 Feb 2005 13:17:58 -0000	1.3
+++ python-imaging.spec	3 Mar 2005 20:07:13 -0000	1.4
@@ -6,7 +6,7 @@
 Name: python-imaging
 Epoch: 0
 Version: 1.1.4
-Release: 7
+Release: 0.fdr.6.1
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-1.1.4.tar.gz
@@ -59,12 +59,7 @@
 %build
 cd libImaging
 %configure
-make \
-%ifarch x86_64
-   CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \
-%endif
-   %{?_smp_mflags}
-
+make %{?_smp_mflags}
 cd ..
 %{__python} setup.py build
 
@@ -104,10 +99,7 @@
 %doc Doc Scripts Images Sane
 
 %changelog
-* Mon Feb  7 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.1.4-7
-- Build PIC on x86_64 to fix x86_64 linking.
-
-* Sat Oct  9 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.1.4-6
+* Sat Oct  9 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.1.4-0.fdr.6
 - Borrow parts from patch in Debian's 1.1.4-3 to fix issues in bug 1038 as
   well as a bunch of others.
 - Bring up to date with current fedora.us Python spec template recommendations.



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/camstream/devel camstream.spec,1.5,1.6
Message-ID: <200503032008.j23K8cXd016444@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/camstream/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/camstream/devel

Modified Files:
	camstream.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: camstream.spec
===================================================================
RCS file: /cvs/extras/rpms/camstream/devel/camstream.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- camstream.spec	10 Feb 2005 17:39:50 -0000	1.5
+++ camstream.spec	3 Mar 2005 20:08:36 -0000	1.6
@@ -1,17 +1,16 @@
 Name:           camstream
 Version:        0.26.3
 Release:        5
-Epoch:          0
-Summary:        CamStream - a set of programs to make use of your webcam
+Summary:        Set of programs to make use of your webcam
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.smcc.demon.nl/camstream/
 Source0:        http://www.smcc.demon.nl/camstream/download/camstream-0.26.3.tar.gz
 Source1:        %{name}.desktop
-Source2:	%{name}.png
+Source2:        %{name}.png
 Patch0:         %{name}-makefiles.patch
-Patch1:		%{name}-%{version}-x86_64-asm.patch
+Patch1:         %{name}-%{version}-x86_64-asm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, libjpeg-devel, libpng-devel, autoconf, XFree86-devel



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/blender/devel blender.spec,1.6,1.7
Message-ID: <200503032008.j23K8cNJ016440@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/blender/devel

Modified Files:
	blender.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- blender.spec	3 Mar 2005 19:46:39 -0000	1.6
+++ blender.spec	3 Mar 2005 20:08:36 -0000	1.7
@@ -21,14 +21,14 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  libogg-devel
 BuildRequires:  libpng-devel
-BuildRequires:	libtool
-BuildRequires:	libvorbis-devel
+BuildRequires:  libtool
+BuildRequires:  libvorbis-devel
 BuildRequires:  openal-devel
 BuildRequires:  openssl-devel
 BuildRequires:  python-devel
 BuildRequires:  scons
-BuildRequires:	SDL-devel
-BuildRequires:	zlib-devel
+BuildRequires:  SDL-devel
+BuildRequires:  zlib-devel
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
@@ -61,7 +61,7 @@
 install -p -D -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/blender.png
 install -p -D -m0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/blender.xml
 desktop-file-install --vendor fedora                    \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
   %{SOURCE4}
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/ccache/devel ccache.spec,1.6,1.7
Message-ID: <200503032008.j23K8ctj016448@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ccache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/ccache/devel

Modified Files:
	ccache.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ccache.spec
===================================================================
RCS file: /cvs/extras/rpms/ccache/devel/ccache.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ccache.spec	10 Dec 2004 22:03:01 -0000	1.6
+++ ccache.spec	3 Mar 2005 20:08:36 -0000	1.7
@@ -4,14 +4,13 @@
 Name:		ccache
 Version:	2.4
 Release:	1
-Epoch:          0
 Summary:	Compiler cache
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://ccache.samba.org/
 Source0:	http://ccache.samba.org/ftp/ccache/ccache-2.4.tar.gz
-Patch0:         %{name}-html-links.patch
+Patch0:		%{name}-html-links.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/chkrootkit/devel chkrootkit.spec,1.7,1.8
Message-ID: <200503032008.j23K8cR0016464@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/chkrootkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/chkrootkit/devel

Modified Files:
	chkrootkit.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: chkrootkit.spec
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/devel/chkrootkit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- chkrootkit.spec	24 Feb 2005 15:13:53 -0000	1.7
+++ chkrootkit.spec	3 Mar 2005 20:08:36 -0000	1.8
@@ -1,8 +1,7 @@
 Name:           chkrootkit
 Version:        0.45
 Release:        1
-Epoch:          0
-Summary:        A tool to locally check for signs of a rootkit
+Summary:        Tool to locally check for signs of a rootkit
 
 Group:          Applications/System
 License:        BSD-like
@@ -32,7 +31,7 @@
  * chkwtmp: checks for wtmp deletions.
  * chkproc: checks for signs of LKM trojans.
  * chkdirs: checks for signs of LKM trojans.
- * strings: quick and dirty strings replacement. 
+ * strings: quick and dirty strings replacement.
  * chkutmp: checks for utmp deletions.
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:39 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:39 -0500
Subject: rpms/cvsup/devel cvsup.spec,1.6,1.7
Message-ID: <200503032008.j23K8dAE016514@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cvsup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/cvsup/devel

Modified Files:
	cvsup.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cvsup.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsup/devel/cvsup.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cvsup.spec	13 Feb 2005 02:48:53 -0000	1.6
+++ cvsup.spec	3 Mar 2005 20:08:37 -0000	1.7
@@ -8,7 +8,6 @@
 Name: cvsup
 Version: 16.1
 Release: 7.h
-Epoch: 0
 URL: http://www.polstra.com/projects/freeware/CVSup/
 License: BSD
 Group: Applications/Internet



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/clamav/devel clamav.spec,1.8,1.9
Message-ID: <200503032008.j23K8cm7016477@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/clamav/devel

Modified Files:
	clamav.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- clamav.spec	15 Feb 2005 08:40:51 -0000	1.8
+++ clamav.spec	3 Mar 2005 20:08:36 -0000	1.9
@@ -23,7 +23,6 @@
 Name:		clamav
 Version:	0.83
 Release:	%release_func 1
-Epoch:		0
 License:	GPL
 Group:		Applications/File
 URL:		http://www.clamav.net
@@ -40,7 +39,7 @@
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:	clamav-lib = %{epoch}:%{version}-%{release}
+Requires:	clamav-lib = %{version}-%{release}
 Requires:	data(clamav)
 BuildRequires:	zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel
 BuildRequires:	bc
@@ -51,44 +50,44 @@
 Requires:	data(clamav)
 
 %package devel
-Summary:	Headerfiles and libraries for the Clam Antivirus scanner
+Summary:	Header files and libraries for the Clam Antivirus scanner
 Group:		Development/Libraries
 Source100:	clamd-gen
-Requires:	clamav-lib = %{epoch}:%{version}-%{release}
+Requires:	clamav-lib = %{version}-%{release}
 Requires(pre):	%_libdir/pkgconfig
 
 %package data
-Summary:	The virus-signatures for clamav
+Summary:	Virus signature data for the Clam Antivirus scanner
 Group:		Applications/File
 Provides:	data(clamav)
 Requires(pre):		fedora-usermgmt >= 0:0.7
 Requires(postun):	fedora-usermgmt >= 0:0.7
 
 %package update
-Summary:	Auto-updater for clamav data-files
+Summary:	Auto-updater for the Clam Antivirus scanner data-files
 Group:		Applications/File
-Requires:	clamav-data = %epoch:%version-%release
+Requires:	clamav-data = %{version}-%{release}
 Requires(pre):		/etc/cron.d
 Requires(postun):	/etc/cron.d
 Requires(post):		%{__chown} %{__chmod}
 
 %package server
-Summary:	The clamav server
+Summary:	Clam Antivirus scanner server
 Group:		System Environment/Daemons
-Provides:	clamav-daemon = %epoch:%version-%release
-Obsoletes:	clamav-daemon < %epoch:%version-%release
-Conflicts:	clamav-daemon > %epoch:%version-%release
+Provides:	clamav-daemon = %{version}-%{release}
+Obsoletes:	clamav-daemon < %{version}-%{release}
+Conflicts:	clamav-daemon > %{version}-%{release}
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-server)
 Provides:	init(clamav-server)
 Requires:	data(clamav)
-Requires:	clamav-lib = %{epoch}:%{version}-%{release}
+Requires:	clamav-lib = %{version}-%{release}
 Requires(pre):		%_initrddir
 Requires(postun):	%_initrddir
 
 %package milter
-Summary:	A sendmail-milter for clamav
+Summary:	Sendmail-milter for the Clam Antivirus scanner
 Group:		System Environment/Daemons
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
@@ -626,5 +625,5 @@
 * Tue Oct 29 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0.52-1
 - updated to 0.52
 
-* Tue Sep 17 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 
+* Tue Sep 17 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/cfengine/devel cfengine.spec,1.6,1.7
Message-ID: <200503032008.j23K8cbe016457@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cfengine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/cfengine/devel

Modified Files:
	cfengine.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cfengine.spec	15 Dec 2004 19:33:17 -0000	1.6
+++ cfengine.spec	3 Mar 2005 20:08:36 -0000	1.7
@@ -1,6 +1,5 @@
-Summary: GNU cfengine - a systems administration tool for networks
+Summary: Systems administration tool for networks
 Name: cfengine
-Epoch: 0
 Version: 2.1.9
 Release: 2
 License: GPL
@@ -22,12 +21,10 @@
 configurations. Cfengine is designed to be a part of a computer immune
 system.
 
-#---------------------------------------------------------------------
 
 %prep
-%setup -n %{name}-%{version}
+%setup
 
-#---------------------------------------------------------------------
 
 %build
 # Since /usr is managed by rpmdb, we can build stuff in there
@@ -38,7 +35,7 @@
 
 # Some of the example files have execute bit for some reason.
 chmod 644 inputs/*example
-#---------------------------------------------------------------------
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -50,7 +47,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name}
 for i in ppkeys inputs outputs
 do
- 	mkdir -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/%{name}/$i
+	mkdir -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/%{name}/$i
 done
 
 # It's ugly, but thats the way Mark wants to have it. :(
@@ -81,7 +78,7 @@
 # All this stuff is pushed into doc directory.
 #
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} 
-#---------------------------------------------------------------------
+
 
 %post
 # cfagent won't run nicely, unless your host has keys.
@@ -99,21 +96,19 @@
 fi
 %preun
 if [ "$1" = "0" ]; then
-        /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
+	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
 	chkconfig --del cfenvd
 	chkconfig --del cfexecd
 	chkconfig --del cfservd
 fi
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root, 0755)
 %doc AUTHORS ChangeLog COPYING README TODO
 %doc contrib
 %doc inputs
@@ -132,7 +127,6 @@
 %dir %{_localstatedir}/%{name}/outputs
 %dir %{_localstatedir}/%{name}/ppkeys
 
-#---------------------------------------------------------------------
 
 %changelog
 * Sun Aug 15 2004 Juha Ylitalo <jylitalo at iki.fi> - 0:2.1.9-2



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/compface/devel compface.spec,1.6,1.7
Message-ID: <200503032008.j23K8coP016481@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/compface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/compface/devel

Modified Files:
	compface.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: compface.spec
===================================================================
RCS file: /cvs/extras/rpms/compface/devel/compface.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- compface.spec	17 Dec 2004 17:23:02 -0000	1.6
+++ compface.spec	3 Mar 2005 20:08:36 -0000	1.7
@@ -1,7 +1,6 @@
 Name:           compface
 Version:        1.4
 Release:        4
-Epoch:          0
 Summary:        Library for handling X-Faces
 
 Group:          System Environment/Libraries
@@ -13,7 +12,7 @@
 Patch1:         %{name}-nostrip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Provides:       %{name}-devel = %{epoch}:%{version}-%{release}
+Provides:       %{name}-devel = %{version}-%{release}
 
 %description
 Library for handling X-Faces and Bitblit icons.



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/cook/devel cook.spec,1.5,1.6
Message-ID: <200503032008.j23K8ctK016489@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/cook/devel

Modified Files:
	cook.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cook.spec
===================================================================
RCS file: /cvs/extras/rpms/cook/devel/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	3 Mar 2005 20:08:36 -0000	1.6
@@ -1,15 +1,14 @@
 Name:		cook
 Version:	2.25
 Release:	1
-Epoch:		0
-Summary: 	A file construction tool
+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
 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



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:39 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:39 -0500
Subject: rpms/cvsgraph/devel cvsgraph.spec,1.6,1.7
Message-ID: <200503032008.j23K8cKq016506@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cvsgraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/cvsgraph/devel

Modified Files:
	cvsgraph.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cvsgraph.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsgraph/devel/cvsgraph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cvsgraph.spec	26 Jan 2005 20:08:42 -0000	1.6
+++ cvsgraph.spec	3 Mar 2005 20:08:36 -0000	1.7
@@ -1,8 +1,7 @@
 Name:           cvsgraph
 Version:        1.5.1
 Release:        1
-Epoch:          0
-Summary:        A CVS/RCS repository grapher
+Summary:        CVS/RCS repository grapher
 
 Group:          Development/Tools
 License:        GPL
@@ -14,7 +13,7 @@
 
 BuildRequires:  gd-devel, byacc, flex, freetype-devel, libpng-devel, zlib-devel
 BuildRequires:  libjpeg-devel, %{__perl}
-Obsoletes:      cvsgraph-web < 0:1.5.1
+Obsoletes:      cvsgraph-web < 1.5.1
 
 %description
 CvsGraph is a utility to make a graphical representation of all



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/cksfv/devel cksfv.spec,1.5,1.6
Message-ID: <200503032008.j23K8c8R016469@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cksfv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/cksfv/devel

Modified Files:
	cksfv.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cksfv.spec
===================================================================
RCS file: /cvs/extras/rpms/cksfv/devel/cksfv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cksfv.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ cksfv.spec	3 Mar 2005 20:08:36 -0000	1.6
@@ -2,13 +2,12 @@
 Name:             cksfv
 Version:          1.3
 Release:          2
-Epoch:            0
 URL:              http://www.fodder.org/cksfv
 License:          GPL
 Group:            Applications/File
 Source0:          http://www.fodder.org/cksfv/cksfv-1.3.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
-Prefix:           %{_prefix} 
+Prefix:           %{_prefix}
 
 %description
 cksfv is a utility that can create and use SFV files. SFV (Simple File



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/cdiff/devel cdiff.spec,1.3,1.4
Message-ID: <200503032008.j23K8crh016452@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cdiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/cdiff/devel

Modified Files:
	cdiff.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cdiff.spec
===================================================================
RCS file: /cvs/extras/rpms/cdiff/devel/cdiff.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cdiff.spec	10 Dec 2004 22:03:01 -0000	1.3
+++ cdiff.spec	3 Mar 2005 20:08:36 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           cdiff
 Version:        1.4
 Release:        4
-Epoch:          0
 Summary:        Diff readability enhancer for color terminals
 
 Group:          Applications/Text



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/cfs/devel cfs.spec,1.4,1.5
Message-ID: <200503032008.j23K8cXY016460@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/cfs/devel

Modified Files:
	cfs.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cfs.spec
===================================================================
RCS file: /cvs/extras/rpms/cfs/devel/cfs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cfs.spec	10 Dec 2004 22:03:01 -0000	1.4
+++ cfs.spec	3 Mar 2005 20:08:36 -0000	1.5
@@ -1,10 +1,9 @@
 %define debpatch_version	10
 
-Summary:	An userspace crypto-filesystem
+Summary:	Userspace crypto-filesystem
 Name:		cfs
 Version:	1.4.1
 Release:	3
-Epoch:		0
 License:	BSD like
 Group:		System Environment/Daemons
 URL:		http://www.crypto.com/software
@@ -30,7 +29,7 @@
 %package utils
 Summary:	Some (inofficial) utilities for cfs
 Group:		Applications/System
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	openssh-askpass procmail
 
 %description utils
@@ -72,8 +71,8 @@
 %{__install} -d $RPM_BUILD_ROOT{/.cfsfs,%{_bindir},%{_sbindir}} 	\
 		$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig			\
 		$RPM_BUILD_ROOT%{_initrddir}				\
-   	        $RPM_BUILD_ROOT%{_mandir}/man{1,8}/		      	\
-		$RPM_BUILD_ROOT%{_libdir}/%{name}		      	\
+		$RPM_BUILD_ROOT%{_mandir}/man{1,8}/			\
+		$RPM_BUILD_ROOT%{_libdir}/%{name}			\
 		$RPM_BUILD_ROOT/mnt/crypt
 
 D=$RPM_BUILD_ROOT
@@ -166,7 +165,7 @@
 * Sat Sep 15 2001 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 1.4.0.beta2-6
 - Prepared for rhcontrib
 - Added mcrypt-script + INSTALL file
- 
+
 * Tue Sep 12 2000 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - initial build
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/configure-thinkpad/devel configure-thinkpad.spec,1.7,1.8
Message-ID: <200503032008.j23K8c7O016485@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/configure-thinkpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/configure-thinkpad/devel

Modified Files:
	configure-thinkpad.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: configure-thinkpad.spec
===================================================================
RCS file: /cvs/extras/rpms/configure-thinkpad/devel/configure-thinkpad.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure-thinkpad.spec	12 Feb 2005 19:00:05 -0000	1.7
+++ configure-thinkpad.spec	3 Mar 2005 20:08:36 -0000	1.8
@@ -1,7 +1,6 @@
 Name:           configure-thinkpad
 Version:        0.9
 Release:        1
-Epoch:          0
 Summary:        Graphical ThinkPad configuration utility
 
 Group:          Applications/System
@@ -12,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
-BuildRequires:  libgnomeui-devel >= 0:2, gettext
+BuildRequires:  libgnomeui-devel >= 2, gettext
 Requires:       tpctl
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:38 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:38 -0500
Subject: rpms/cpan2rpm/devel cpan2rpm.spec,1.2,1.3
Message-ID: <200503032008.j23K8coK016495@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cpan2rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/cpan2rpm/devel

Modified Files:
	cpan2rpm.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cpan2rpm.spec
===================================================================
RCS file: /cvs/extras/rpms/cpan2rpm/devel/cpan2rpm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cpan2rpm.spec	10 Dec 2004 22:03:02 -0000	1.2
+++ cpan2rpm.spec	3 Mar 2005 20:08:36 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           cpan2rpm
 Version:        2.026
 Release:        1
-Epoch:          0
 Summary:        Perl module packager
 
 Group:          Applications/System



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:39 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:39 -0500
Subject: rpms/cvsweb/devel cvsweb.spec,1.2,1.3
Message-ID: <200503032008.j23K8dXG016518@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cvsweb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/cvsweb/devel

Modified Files:
	cvsweb.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cvsweb.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsweb/devel/cvsweb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cvsweb.spec	27 Nov 2004 16:30:31 -0000	1.2
+++ cvsweb.spec	3 Mar 2005 20:08:37 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           cvsweb
 Version:        3.0.4
 Release:        1
-Epoch:          0
 Summary:        Web interface for CVS repositories
 
 License:        BSD



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:39 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:39 -0500
Subject: rpms/cvsplot/devel cvsplot.spec,1.2,1.3
Message-ID: <200503032008.j23K8dxY016510@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cvsplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/cvsplot/devel

Modified Files:
	cvsplot.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cvsplot.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsplot/devel/cvsplot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cvsplot.spec	6 Dec 2004 20:48:26 -0000	1.2
+++ cvsplot.spec	3 Mar 2005 20:08:36 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           cvsplot
 Version:        1.7.4
 Release:        1
-Epoch:          0
-Summary:        Cvsplot collects statistics from CVS controlled files
+Summary:        Collect statistics from CVS controlled files
 
 License:        GPL
 Group:          Development/Tools
@@ -11,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Requires:       cvs >= 0:1.11.1, gnuplot, perl-DateManip >= 0:5.42
+Requires:       cvs >= 1.11.1, gnuplot, perl-DateManip >= 5.42
 Requires:       perl(String::ShellQuote)
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 20:08:39 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:08:39 -0500
Subject: rpms/cvs2cl/devel cvs2cl.spec,1.6,1.7
Message-ID: <200503032008.j23K8cfD016499@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cvs2cl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373/cvs2cl/devel

Modified Files:
	cvs2cl.spec 
Log Message:
Mass letter "c" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: cvs2cl.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs2cl/devel/cvs2cl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cvs2cl.spec	23 Jan 2005 16:29:02 -0000	1.6
+++ cvs2cl.spec	3 Mar 2005 20:08:36 -0000	1.7
@@ -1,8 +1,7 @@
 Name:           cvs2cl
 Version:        2.58
 Release:        1
-Epoch:          0
-Summary:        Utility which generates ChangeLogs from CVS working copies
+Summary:        Generate ChangeLogs from CVS working copies
 
 Group:          Development/Tools
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:16 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:16 -0500
Subject: rpms/dhcp-forwarder/devel dhcp-forwarder.spec,1.5,1.6
Message-ID: <200503032020.j23KKGRP016939@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904/dhcp-forwarder/devel

Modified Files:
	dhcp-forwarder.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dhcp-forwarder.spec	2 Feb 2005 21:37:56 -0000	1.5
+++ dhcp-forwarder.spec	3 Mar 2005 20:20:14 -0000	1.6
@@ -24,18 +24,17 @@
 
 %{!?release_func:%define release_func() %1}
 
-Summary:	A DHCP relay agent
+Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.7
 Release:	%release_func 1
-Epoch:		0
 License:	GPL
 Group:		System Environment/Daemons
 URL:		http://www.tu-chemnitz.de/~ensc/dhcp-fwd
 Source0:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2
 Source1:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2.asc
 BuildRoot:	%_tmppath/%name-%version-%release-root
-Requires:		init(dhcp-forwarder)
+Requires:	init(dhcp-forwarder)
 
 %{!?_without_dietlibc:BuildRequires:	dietlibc}
 
@@ -50,7 +49,7 @@
 Summary:		SysV initscripts for dhcp-forwarder
 Group:			System Environment/Base
 Provides:		init(dhcp-forwarder) = sysv
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(preun):	%name initscripts
 Requires(postun):	%name initscripts
 Requires(post):		/sbin/chkconfig
@@ -61,7 +60,7 @@
 Summary:		minit initscripts for dhcp-forwarder
 Group:			System Environment/Base
 Provides:		init(dhcp-forwarder) = minit
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(pre):		minit-setup
 Requires(postun):	minit-setup
 
@@ -95,26 +94,20 @@
 with the minit initconcept.
 
 
-##---------------------------------------------
-
 
 %prep
 %setup -q
 
 
-##---------------------------------------------
-
 
 %build
 %configure \
 	--enable-release \
-        --with-initrddir=%_initrddir \
+	--with-initrddir=%_initrddir \
 	%{?_without_dietlibc:--disable-dietlibc}
 %__make %{?_smp_mflags}
 
 
-##---------------------------------------------
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -125,15 +118,11 @@
 %{?_without_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 
 
-##---------------------------------------------
-
 
 %check
 %__make check
 
 
-##---------------------------------------------
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -141,8 +130,8 @@
 
 %pre
 %groupadd -r %username &>/dev/null || :
-%useradd  -r -s /sbin/nologin -M -c 'DHCP Forwarder user'	\
-	  -d %homedir -g %username %username &>/dev/null || :
+%useradd  -r -s /sbin/nologin -M -c 'DHCP Forwarder user' \
+          -d %homedir -g %username %username &>/dev/null || :
 
 
 %postun
@@ -162,7 +151,7 @@
 fi
 
 %postun sysv
-test "$1" = 0 || %_initrddir/%service condrestart &>/dev/null
+test "$1" = "0" || %_initrddir/%service condrestart &>/dev/null
 
 
 %files



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:15 -0500
Subject: rpms/ddclient/devel ddclient.spec,1.3,1.4
Message-ID: <200503032020.j23KKFNK016931@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ddclient/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904/ddclient/devel

Modified Files:
	ddclient.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ddclient.spec
===================================================================
RCS file: /cvs/extras/rpms/ddclient/devel/ddclient.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ddclient.spec	10 Dec 2004 22:03:02 -0000	1.3
+++ ddclient.spec	3 Mar 2005 20:20:13 -0000	1.4
@@ -1,8 +1,7 @@
 Name:           ddclient
 Version:        3.6.3
 Release:        4
-Epoch:          0
-Summary:        A client to update dynamic DNS host entries.
+Summary:        Client to update dynamic DNS host entries
 
 Group:          System Environment/Daemons
 License:        GPL
@@ -20,17 +19,14 @@
 ddclient is a Perl client used to update dynamic DNS entries for accounts
 on many dynamic DNS services.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
 %patch -p1
 
-# -----------------------------------------------------------------------------
 
 %build
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -45,12 +41,10 @@
 mkdir -p $RPM_BUILD_ROOT/var/cache
 touch $RPM_BUILD_ROOT/var/cache/ddclient.cache
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %post
 /sbin/chkconfig --add ddclient
@@ -58,7 +52,7 @@
 chmod 0600 /var/cache/ddclient.cache
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
         /sbin/service ddclient stop > /dev/null 2>&1
         /sbin/chkconfig --del ddclient
 fi
@@ -74,7 +68,6 @@
 %ghost %attr(0600, root, root) /var/cache/ddclient.cache
 %{_initrddir}/ddclient
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Mon Apr 05 2004 Toshio Kuratomi <toshio[+]tiki-lounge.com> - 0:3.6.3-0.fdr.4.fc1



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:16 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:16 -0500
Subject: rpms/dillo/devel dillo.spec,1.6,1.7
Message-ID: <200503032020.j23KKGkf016943@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/dillo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904/dillo/devel

Modified Files:
	dillo.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: dillo.spec
===================================================================
RCS file: /cvs/extras/rpms/dillo/devel/dillo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dillo.spec	9 Feb 2005 23:44:00 -0000	1.6
+++ dillo.spec	3 Mar 2005 20:20:14 -0000	1.7
@@ -1,7 +1,6 @@
 Name:           dillo
 Version:        0.8.4
 Release:        2
-Epoch:          0
 Summary:        Very small and fast GUI web browser
 
 Group:          Applications/Internet
@@ -10,29 +9,32 @@
 Source0:        http://www.dillo.org/download/dillo-0.8.4.tar.bz2
 Source1:        %{name}.desktop
 Source2:        %{name}.png
-Patch0:		dillo-0.8.0-nodebug.patch
+Patch0:         dillo-0.8.0-nodebug.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk+-devel 
+BuildRequires:  gtk+-devel
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  libpng-devel >= 0:1.2.0
-BuildRequires:  libjpeg-devel = 0:6b
-Requires:	wget
-Provides:	webclient
+BuildRequires:  libpng-devel >= 1.2.0
+BuildRequires:  libjpeg-devel = 6b
+Requires:       wget
+Provides:       webclient
 
 %description
 Dillo is a very small and fast web browser using GTK.
 Currently: no frames,https,javascript.
 
+
 %prep
 %setup -q
 %patch0
 
+
 %build
 %configure --disable-dependency-tracking --enable-ipv6
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -40,8 +42,8 @@
 rm -f doc/Makefile*
 
 %{__install} -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
-desktop-file-install --vendor fedora  \
-        --add-category X-Fedora				\
+desktop-file-install --vendor fedora \
+        --add-category X-Fedora \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications  \
         %{SOURCE1}
 %{__install} -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/dillo.png
@@ -51,10 +53,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog doc
-%config(noreplace) %{_sysconfdir}/*    
+%config(noreplace) %{_sysconfdir}/*
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/dillo.png



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:16 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:16 -0500
Subject: rpms/duplicity/devel duplicity.spec,1.4,1.5
Message-ID: <200503032020.j23KKGYw016955@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/duplicity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904/duplicity/devel

Modified Files:
	duplicity.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/duplicity.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- duplicity.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ duplicity.spec	3 Mar 2005 20:20:14 -0000	1.5
@@ -5,14 +5,13 @@
 Summary: Untrusted/encrypted backup using rsync algorithm
 Name: duplicity
 Release: 3
-Epoch: 0
 URL: http://www.nongnu.org/duplicity/
 Source: http://savannah.nongnu.org/download/duplicity/%{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/Archiving
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: python >= 0:%{PYTHON_VERSION}, python < 0:%{NEXT_PYTHON_VERSION}, gnupg >= 0:1.0.6
-BuildRequires: python-devel >= 0:2.2, librsync-devel >= 0:0.9.6
+Requires: python >= %{PYTHON_VERSION}, python < %{NEXT_PYTHON_VERSION}, gnupg >= 1.0.6
+BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6
 
 %description
 Duplicity incrementally backs up files and directory by encrypting
@@ -55,7 +54,9 @@
 %changelog
 * Sun Oct 05 2003 Ben Escoto <bescoto at stanford.edu> - 0:0.4.1-0.fdr.3
 - More hints from Fedora QA (ville.skytta at iki.fi)
+
 * Sat Aug 09 2003 Ben Escoto <bescoto at stanford.edu> - 0:0.4.1-0.fdr.2
 - Repackaging for Fedora
+
 * Sun Aug 30 2002 Ben Escoto <bescoto at stanford.edu>
 - Initial RPM



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:16 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:16 -0500
Subject: rpms/dosbox/devel dosbox.spec,1.6,1.7
Message-ID: <200503032020.j23KKGdY016951@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/dosbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904/dosbox/devel

Modified Files:
	dosbox.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: dosbox.spec
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dosbox.spec	13 Feb 2005 11:56:55 -0000	1.6
+++ dosbox.spec	3 Mar 2005 20:20:14 -0000	1.7
@@ -1,15 +1,14 @@
 Name:           dosbox
 Version:        0.63
 Release:        1
-Epoch:          0
-Summary:        An x86/DOS emulator with sound/graphics
+Summary:        x86/DOS emulator with sound and graphics
 
 Group:          Applications/Emulators
 License:        GPL
 URL:            http://dosbox.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        dosbox.desktop
-Source2:	dosbox.png
+Source2:        dosbox.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  libpng-devel
@@ -37,6 +36,8 @@
 %configure --enable-shots
 %{__make}
 
+
+%check
 %{__make} check
 
 
@@ -53,6 +54,7 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 install -p -m 0644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -65,6 +67,7 @@
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/dosbox.png
 
+
 %changelog
 * Thu Nov 25 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0:0.63-1



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:16 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:16 -0500
Subject: rpms/ddrescue/devel ddrescue.spec,1.5,1.6
Message-ID: <200503032020.j23KKGqh016935@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ddrescue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904/ddrescue/devel

Modified Files:
	ddrescue.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ddrescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/devel/ddrescue.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ddrescue.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ ddrescue.spec	3 Mar 2005 20:20:13 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           ddrescue
 Version:        1.10
 Release:        1
-Epoch:          0
 Summary:        Fault tolerant "dd" utility for rescuing data from bad media
 
 Group:          Applications/System
@@ -23,7 +22,7 @@
 
 %build
 #rm dd_rescue
-#EXTRA_CFLAGS="$RPM_OPT_FLAGS" 
+#EXTRA_CFLAGS="$RPM_OPT_FLAGS"
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 cp README.dd_rescue README
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:16 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:16 -0500
Subject: rpms/doctorj/devel doctorj.spec,1.7,1.8
Message-ID: <200503032020.j23KKGnK016947@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/doctorj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904/doctorj/devel

Modified Files:
	doctorj.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/devel/doctorj.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- doctorj.spec	13 Feb 2005 17:07:40 -0000	1.7
+++ doctorj.spec	3 Mar 2005 20:20:14 -0000	1.8
@@ -1,7 +1,6 @@
 Name:           doctorj
 Version:        4.0.2
 Release:        4
-Epoch:          0
 Summary:        Java source code analyzer
 
 Group:          Development/Tools



From fedora-extras-commits at redhat.com  Thu Mar  3 20:20:16 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:20:16 -0500
Subject: rpms/dxpc/devel dxpc.spec,1.4,1.5
Message-ID: <200503032020.j23KKG0k016959@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/dxpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904/dxpc/devel

Modified Files:
	dxpc.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: dxpc.spec
===================================================================
RCS file: /cvs/extras/rpms/dxpc/devel/dxpc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dxpc.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ dxpc.spec	3 Mar 2005 20:20:14 -0000	1.5
@@ -1,20 +1,16 @@
-## kde-redhat macros
-%define rhversion %(perl -pe '/(\\d+)\\.?(\\d)?/; $_="$1".($2||0)' /etc/redhat-release)
-
-Summary: A Differential X Protocol Compressor
-Name:	 dxpc
-Epoch:	 0
+Summary: Differential X Protocol Compressor
+Name:    dxpc
 Version: 3.8.2
 Release: 1
-Source:	 http://www.vigor.nu/dxpc/%{version}/dxpc-%{version}.tar.gz
+Source:  http://www.vigor.nu/dxpc/%{version}/dxpc-%{version}.tar.gz
 License: BSD
 Group:   User Interface/X
-URL:	 http://www.vigor.nu/dxpc/
+URL:     http://www.vigor.nu/dxpc/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:	lzo-devel >= 0:1.08
-BuildRequires:	XFree86-devel
-Requires:	lzo >= 0:1.08
+BuildRequires: lzo-devel >= 1.08
+BuildRequires: XFree86-devel
+Requires:      lzo >= 1.08
 
 Patch1:  dxpc-3.8.2-mandir.patch
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:24:04 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 15:24:04 -0500
Subject: rpms/alsa-firmware/devel alsa-firmware.spec,1.3,1.4
Message-ID: <200503032024.j23KO4Tt017137@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/alsa-firmware/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17131

Modified Files:
	alsa-firmware.spec 
Log Message:
 


Index: alsa-firmware.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-firmware/devel/alsa-firmware.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alsa-firmware.spec	3 Mar 2005 19:29:59 -0000	1.3
+++ alsa-firmware.spec	3 Mar 2005 20:24:02 -0000	1.4
@@ -7,7 +7,7 @@
 URL: 		http://www.alsa-project.org/
 Source0: 	%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	alsa-tools-firmware >= 0:1.0.4
+Requires:	alsa-tools-firmware >= 1.0.4
 
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/firestarter/devel firestarter.spec,1.8,1.9
Message-ID: <200503032033.j23KXtPn017270@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/firestarter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/firestarter/devel

Modified Files:
	firestarter.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: firestarter.spec
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/firestarter.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- firestarter.spec	28 Feb 2005 21:12:57 -0000	1.8
+++ firestarter.spec	3 Mar 2005 20:33:53 -0000	1.9
@@ -1,27 +1,27 @@
-Name: 		firestarter
-Version: 	1.0.3
-Release: 	1
-Summary: 	The Firestarter firewall tool for GNOME
-
-Group: 		Applications/Internet
-License: 	GPL
-URL: 		http://firestarter.sourceforge.net
+Name:		firestarter
+Version:	1.0.3
+Release:	1
+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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	glib2-devel >= 2.4
 BuildRequires:	gnome-vfs2-devel >= 2.6.0
 BuildRequires:	gtk2-devel >= 2.4
 BuildRequires:	libglade2-devel >= 2.3.6
 BuildRequires:	libgnomeui-devel
-BuildRequires:  perl-XML-Parser
+BuildRequires:	perl(XML::Parser)
 
-Requires:       iptables
-Requires:       usermode-gtk
-Requires(post):  GConf2
-Requires(preun): GConf2
+Requires:	iptables
+Requires:	usermode-gtk
+Requires(post):		GConf2
+Requires(preun):	GConf2
 
 %description
 Firestarter is an easy-to-use, yet powerful, Linux firewall tool for GNOME.
@@ -31,7 +31,7 @@
 
 
 %prep
-%setup -q 
+%setup -q
 
 
 %build
@@ -74,7 +74,7 @@
 
 %find_lang %{name}
 
-install -p -D -m0644 firestarter.pam ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/firestarter 
+install -p -D -m0644 firestarter.pam ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/firestarter
 install -p -D -m0644 firestarter.console  ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/firestarter
 install -p -D -m0755 fedora.init ${RPM_BUILD_ROOT}%{_initrddir}/firestarter
 
@@ -246,7 +246,7 @@
 - Cleaned up spec
 
 * Wed Feb 26 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0.9.1-1.fedora.1
-- Initial Fedora release (0.9.1). 
+- Initial Fedora release (0.9.1).
 
 * Tue Aug 06 2002 Tomas Junnonen <majix at sci.fi>
 - Updated requirements to GNOME2 level
@@ -255,7 +255,7 @@
 * Tue Jun 25 2002 Paul Drain <pd at cipherfunk.org>
 - Merged some compatible cleanups from the FreshRPMS (http://freshrpms.net)
   specfile.
-  
+
 * Wed Apr 24 2002 Paul Drain <pd at cipherfunk.org>
 - build dependancy cleanups
 
@@ -276,7 +276,7 @@
 - preun now doesn't explicitly delete the init script,
   caused problem with package upgrades.
 - Moved the init scripts to external files
-  
+
 * Tue Oct 23 2001 Paul Drain <pd at cipherfunk.org>
 - Added sgmltools and openjade to build requirements
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fbdesk/devel fbdesk.spec,1.6,1.7
Message-ID: <200503032033.j23KXt0m017254@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fbdesk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/fbdesk/devel

Modified Files:
	fbdesk.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fbdesk.spec
===================================================================
RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fbdesk.spec	13 Feb 2005 11:02:17 -0000	1.6
+++ fbdesk.spec	3 Mar 2005 20:33:52 -0000	1.7
@@ -1,11 +1,10 @@
 Name:           fbdesk
 Version:        1.2.1
 Release:        1
-Epoch:          0
 Summary:        Icon Manager for Fluxbox
 
-Group:          User Interface/Desktops 
-License:        MIT 
+Group:          User Interface/Desktops
+License:        MIT
 URL:            http://fluxbox.sourceforge.net/fbdesk/
 Source0:        http://fluxbox.sourceforge.net/download/fbdesk-1.2.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:54 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:54 -0500
Subject: rpms/elmo/devel elmo.spec,1.3,1.4
Message-ID: <200503032033.j23KXsog017242@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/elmo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/elmo/devel

Modified Files:
	elmo.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: elmo.spec
===================================================================
RCS file: /cvs/extras/rpms/elmo/devel/elmo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- elmo.spec	10 Dec 2004 22:03:02 -0000	1.3
+++ elmo.spec	3 Mar 2005 20:33:52 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           elmo
 Version:        1.2.0
 Release:        2
-Epoch:          0
 Summary:        Terminal-based mail client
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:54 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:54 -0500
Subject: rpms/factory/devel factory.spec,1.6,1.7
Message-ID: <200503032033.j23KXsLr017250@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/factory/devel

Modified Files:
	factory.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/devel/factory.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- factory.spec	4 Dec 2004 09:54:42 -0000	1.6
+++ factory.spec	3 Mar 2005 20:33:52 -0000	1.7
@@ -1,19 +1,18 @@
 # $Id$
 
-Summary: A C++ class library for multivariate polynomial data	
-Name:    factory	
-Epoch:	 0
+Summary: C++ class library for multivariate polynomial data
+Name:    factory
 Version: 2.0.5
-Release: 3%{?dist_tag}
-License: GPL	
-Url:   	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
-Source:	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz
-Group:   System Environment/Libraries	
+Release: 3
+License: GPL
+URL:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
+Source:  http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz
+Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Patch1: factory-2.0.5-gcc34.patch
 
-BuildRequires:	gmp-devel
+BuildRequires: gmp-devel
 
 %description
 Factory is a C++ class library that implements a recursive representation
@@ -24,8 +23,8 @@
 Summary: %{summary}
 Group:   Development/Libraries
 Requires: gmp-devel
-Obsoletes: %{name} < %{epoch}:%{version}-%{release}
-Provides:  %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name} < %{version}-%{release}
+Provides:  %{name} = %{version}-%{release}
 %description devel
 Factory is a C++ class library that implements a recursive representation
 of multivariate polynomial data.
@@ -43,7 +42,7 @@
 %configure --disable-streamio
 
 # smp broken?
-make 
+make
 
 
 %install
@@ -74,7 +73,7 @@
 
 %changelog
 * Wed Oct 06 2004 Rex Dieter <rexdieter at sf.net> 0:2.0.5-3
-- (2nd try at) gcc34 patch 
+- (2nd try at) gcc34 patch
 
 * Wed Oct 06 2004 Rex Dieter <rexdieter at sf.net> 0:2.0.5-0.fdr.2
 - gcc34 patch



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/freedroidrpg/devel freedroidrpg.spec,1.5,1.6
Message-ID: <200503032033.j23KXtdT017294@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/freedroidrpg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/freedroidrpg/devel

Modified Files:
	freedroidrpg.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: freedroidrpg.spec
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- freedroidrpg.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ freedroidrpg.spec	3 Mar 2005 20:33:53 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           freedroidrpg
 Version:        0.9.12
 Release:        1
-Epoch:          0
 Summary:        Role playing game with Freedroid theme and Tux as the hero
 
 Group:          Amusements/Games



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fslint/devel fslint.spec,1.4,1.5
Message-ID: <200503032033.j23KXtXS017298@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fslint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/fslint/devel

Modified Files:
	fslint.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/fslint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fslint.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ fslint.spec	3 Mar 2005 20:33:53 -0000	1.5
@@ -4,8 +4,7 @@
 Name:           fslint
 Version:        2.02
 Release:        2
-Epoch:          0
-Summary:        FSlint - a utility to find and clean "lint" on a filesystem
+Summary:        Utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
 License:        GPL
@@ -16,7 +15,7 @@
 BuildArch:      noarch
 
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 0:%{pyver}, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= %{pyver}, pygtk2, pygtk2-libglade, cpio
 
 %description
 FSlint is a toolkit to find all redundant disk usage.  It includes a



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fontforge/devel fontforge.spec,1.7,1.8
Message-ID: <200503032033.j23KXtHh017282@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fontforge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/fontforge/devel

Modified Files:
	fontforge.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fontforge.spec	29 Jan 2005 21:20:57 -0000	1.7
+++ fontforge.spec	3 Mar 2005 20:33:53 -0000	1.8
@@ -1,8 +1,7 @@
 Name:           fontforge
 Version:        0.0
 Release:        2.20041231
-Epoch:          0
-Summary:        An outline and bitmap font editor
+Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
 License:        BSD
@@ -25,7 +24,7 @@
 BuildRequires:  libuninameslist-devel
 Obsoletes:      pfaedit
 
-%description 
+%description
 FontForge (former PfaEdit) is a font editor for outline and bitmap
 fonts. It supports a range of font formats, including PostScript
 (ASCII and binary Type 1, some Type 3 and Type 0), TrueType, OpenType
@@ -42,7 +41,7 @@
 mkdir cidmaps
 tar xzf htdocs/cidmaps.tgz -C cidmaps
 
-find . -name "CVS" -type d -print | xargs rm -r 
+find . -name "CVS" -type d -print | xargs rm -r
 
 for i in fontforge/fontforge.1 fontforge/sfddiff.1 ; do
   iconv -f iso-8859-1 -t utf-8 $i -o $i.utf8 ; mv $i.utf8 $i
@@ -185,7 +184,7 @@
 - Updated to 031012.
 - Removed .so links.
 - Removed empty AUTHORS file.
-- Removed the samples subpackage. 
+- Removed the samples subpackage.
 
 * Mon Sep 22 2003 Marius L. J??hndal <mariuslj at ifi.uio.no> 0:0.0-0.fdr.1.030904
 - Updated to 030904.



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/foobillard/devel foobillard.spec,1.6,1.7
Message-ID: <200503032033.j23KXt05017286@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/foobillard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/foobillard/devel

Modified Files:
	foobillard.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: foobillard.spec
===================================================================
RCS file: /cvs/extras/rpms/foobillard/devel/foobillard.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- foobillard.spec	16 Feb 2005 17:19:10 -0000	1.6
+++ foobillard.spec	3 Mar 2005 20:33:53 -0000	1.7
@@ -1,22 +1,21 @@
 Name:           foobillard
 Version:        3.0a
 Release:        1
-Epoch:          0
-Summary:        A free OpenGL game of playing billard.
+Summary:        OpenGL billard game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://foobillard.sunsite.dk/
 Source0:        http://foobillard.sunsite.dk/dnl/foobillard-3.0a.tar.gz
-Source1:	foobillard.desktop
-Patch0:		foobillard-3.0a-nonv.patch
+Source1:        foobillard.desktop
+Patch0:         foobillard-3.0a-nonv.patch
 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
 
 %description
-FooBillard is an attempt to create a free OpenGL-billard for Linux. 
+FooBillard is an attempt to create a free OpenGL-billard for Linux.
 FooBillard is still under development but the main physics is implemented.
 
 
@@ -35,7 +34,7 @@
 %makeinstall
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 install -pm 644 %{_sourcedir}/foobillard.desktop \
-	$RPM_BUILD_ROOT%{_datadir}/applications/fedora-foobillard.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/fedora-foobillard.desktop
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
 install -pm 644 foobillard.6 $RPM_BUILD_ROOT%{_mandir}/man6
 install -D -p -m 644 foobillard.png \



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fluxconf/devel fluxconf.spec,1.3,1.4
Message-ID: <200503032033.j23KXtXb017279@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fluxconf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/fluxconf/devel

Modified Files:
	fluxconf.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fluxconf.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/devel/fluxconf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fluxconf.spec	10 Dec 2004 22:03:02 -0000	1.3
+++ fluxconf.spec	3 Mar 2005 20:33:53 -0000	1.4
@@ -1,13 +1,11 @@
 Name:		fluxconf
 Version:	0.9.7
 Release:	1
-Epoch:		0
 Summary:	Configuration utility for fluxbox
 
-Group:          User Interface/Desktops 
+Group:		User Interface/Desktops 
 License:	GPL
-Url:		http://devaux.fabien.free.fr/flux
-
+URL:		http://devaux.fabien.free.fr/flux
 
 Source:		http://devaux.fabien.free.fr/flux/fluxconf-0.9.7.tar.gz
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fftw/devel fftw.spec,1.5,1.6
Message-ID: <200503032033.j23KXtLL017266@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fftw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/fftw/devel

Modified Files:
	fftw.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fftw.spec
===================================================================
RCS file: /cvs/extras/rpms/fftw/devel/fftw.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fftw.spec	11 Nov 2004 19:21:36 -0000	1.5
+++ fftw.spec	3 Mar 2005 20:33:53 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           fftw
 Version:        2.1.5
 Release:        5
-Summary:        Fast Fourier Transform library.
+Summary:        Fast Fourier Transform library
 
 Group:          System Environment/Libraries
 License:        GPL
@@ -21,7 +21,7 @@
 
 
 %package        devel
-Summary:        Headers, libraries and docs for the FFTW library.
+Summary:        Headers, libraries and docs for the FFTW library
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:54 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:54 -0500
Subject: rpms/ez-ipupdate/devel ez-ipupdate.spec,1.5,1.6
Message-ID: <200503032033.j23KXsW0017246@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ez-ipupdate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/ez-ipupdate/devel

Modified Files:
	ez-ipupdate.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ez-ipupdate.spec
===================================================================
RCS file: /cvs/extras/rpms/ez-ipupdate/devel/ez-ipupdate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ez-ipupdate.spec	27 Nov 2004 11:21:02 -0000	1.5
+++ ez-ipupdate.spec	3 Mar 2005 20:33:52 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           ez-ipupdate
 Version:        3.0.11
 Release:        0.7.b8
-Epoch:          0
 Summary:        Client for Dynamic DNS Services
 
 Group:          Applications/Internet
@@ -20,7 +19,7 @@
 
 %description
 ez-ipupdate is a small utility for updating your host name for any of the
-dynamic DNS service offered at: 
+dynamic DNS service offered at:
   * http://www.ez-ip.net
   * http://www.justlinux.com
   * http://www.dhs.org



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fedora-usermgmt/devel fedora-usermgmt.spec,1.5,1.6
Message-ID: <200503032033.j23KXtX1017262@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fedora-usermgmt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/fedora-usermgmt/devel

Modified Files:
	fedora-usermgmt.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/fedora-usermgmt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-usermgmt.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ fedora-usermgmt.spec	3 Mar 2005 20:33:53 -0000	1.6
@@ -8,7 +8,6 @@
 Name:		fedora-usermgmt
 Version:	0.7
 Release:	2
-Epoch:		0
 License:	GPL
 BuildArch:	noarch
 Group:		Applications/System
@@ -40,7 +39,7 @@
 Source20:	fedora-usermgmt-groupadd.legacy
 Source21:	fedora-usermgmt-useradd.legacy
 Provides:	instance(fedora-usermgmt)
-Requires:	%name = %epoch:%version-%release
+Requires:	%name = %version-%release
 Requires(pre):		%confdir
 Requires(postun):	%confdir
 Requires(post):		%alternatives
@@ -113,8 +112,8 @@
 
 
 %preun shadow-utils
-test "$1" != 0 || %alternatives --remove %name %confdir/scripts.shadow-utils
-test "$1" != 0 || %alternatives --remove %name %confdir/scripts.legacy
+test "$1" != "0" || %alternatives --remove %name %confdir/scripts.shadow-utils
+test "$1" != "0" || %alternatives --remove %name %confdir/scripts.legacy
 
 
 %clean



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fedora-rpmdevtools/devel fedora-rpmdevtools.spec,1.6,1.7
Message-ID: <200503032033.j23KXt8d017258@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fedora-rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/fedora-rpmdevtools/devel

Modified Files:
	fedora-rpmdevtools.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-rpmdevtools.spec	9 Feb 2005 22:12:33 -0000	1.6
+++ fedora-rpmdevtools.spec	3 Mar 2005 20:33:52 -0000	1.7
@@ -4,7 +4,6 @@
 Name:           fedora-rpmdevtools
 Version:        0.3.1
 Release:        1
-Epoch:          0
 Summary:        Fedora RPM Development Tools
 
 Group:          Development/Tools
@@ -15,7 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Provides:       %{name}-emacs = %{epoch}:%{version}-%{release}
+Provides:       %{name}-emacs = %{version}-%{release}
 Obsoletes:      %{name}-emacs < 0:0.1.9
 # Required for tool operations
 Requires:       rpm-python, python, cpio, sed, perl



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/freedroid/devel freedroid.spec,1.4,1.5
Message-ID: <200503032033.j23KXt9m017290@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/freedroid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/freedroid/devel

Modified Files:
	freedroid.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: freedroid.spec
===================================================================
RCS file: /cvs/extras/rpms/freedroid/devel/freedroid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- freedroid.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ freedroid.spec	3 Mar 2005 20:33:53 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           freedroid
 Version:        1.0.2
 Release:        2
-Epoch:          0
-Summary:        Clone of the C64 Game Paradroid
+Summary:        Clone of the C64 game Paradroid
 
 Group:          Amusements/Games
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 20:33:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 15:33:55 -0500
Subject: rpms/fltk/devel fltk.spec,1.5,1.6
Message-ID: <200503032033.j23KXtcG017274@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17194/fltk/devel

Modified Files:
	fltk.spec 
Log Message:
Mass letters "e" and "f" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fltk.spec
===================================================================
RCS file: /cvs/extras/rpms/fltk/devel/fltk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fltk.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ fltk.spec	3 Mar 2005 20:33:53 -0000	1.6
@@ -1,29 +1,27 @@
-Summary: 	A C++ user interface toolkit for X11, Win32, and MacOS X
-Name: 		fltk
-Version: 	1.1.4
-Release: 	8
-Epoch: 		0
-License: 	LGPL with exceptions
-Group: 		System Environment/Libraries
-URL: 		http://www.fltk.org/
-Source0: 	%{name}-%{version}%{?extraversion}-source.tar.bz2
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Summary:	C++ user interface toolkit for X11, Win32, and MacOS X
+Name:		fltk
+Version:	1.1.4
+Release:	8
+License:	LGPL with exceptions
+Group:		System Environment/Libraries
+URL:		http://www.fltk.org/
+Source0:	%{name}-%{version}%{?extraversion}-source.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	libjpeg-devel zlib-devel libpng-devel XFree86-devel
 BuildRequires:	/usr/lib/pkgconfig/xft.pc pkgconfig
 BuildRequires:	ImageMagick desktop-file-utils man
 
 %package devel
-Summary: 	Development package for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
+Summary:	Development package for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 Requires:	XFree86-devel libstdc++-devel /usr/lib/pkgconfig/xft.pc
 
 %package fluid
-Summary: 	Fast Light User Interface Designer
-Group: 		Development/Tools
-Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Summary:	Fast Light User Interface Designer
+Group:		Development/Tools
+Requires:	%{name}-devel = %{version}-%{release}
 
-# -----------------------------------------------------------------------------
 
 %description
 FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
@@ -44,12 +42,10 @@
 fluid stands for the Fast Light User Interface Designer. It is an
 interactive GUI designer for FLTK. 
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 
-# -----------------------------------------------------------------------------
 
 %build
 perl -pi -e "s^\\\$prefix/share/doc/fltk^$RPM_DOC_DIR/%{name}-devel-%{version}^" configure
@@ -58,7 +54,6 @@
 %configure --enable-shared --enable-threads --enable-xdbe --enable-xft
 make %{?_smp_mflags} 
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT __documentation
@@ -85,14 +80,12 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 convert -resize 48x48 documentation/FL.gif \
-  $RPM_BUILD_ROOT%{_datadir}/pixmaps/fluid.png
+    $RPM_BUILD_ROOT%{_datadir}/pixmaps/fluid.png
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -129,7 +122,6 @@
 %{_datadir}/applications/*fluid.desktop
 %{_datadir}/pixmaps/fluid.png
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Thu Nov 20 2003 Dams <anvil[AT]livna.org> 0:1.1.4-0.fdr.8



From fedora-extras-commits at redhat.com  Thu Mar  3 21:23:43 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 16:23:43 -0500
Subject: rpms/clamav/devel clamav.spec,1.9,1.10
Message-ID: <200503032123.j23LNho7018298@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18292

Modified Files:
	clamav.spec 
Log Message:
 


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- clamav.spec	3 Mar 2005 20:08:36 -0000	1.9
+++ clamav.spec	3 Mar 2005 21:23:41 -0000	1.10
@@ -60,8 +60,8 @@
 Summary:	Virus signature data for the Clam Antivirus scanner
 Group:		Applications/File
 Provides:	data(clamav)
-Requires(pre):		fedora-usermgmt >= 0:0.7
-Requires(postun):	fedora-usermgmt >= 0:0.7
+Requires(pre):		fedora-usermgmt >= 0.7
+Requires(postun):	fedora-usermgmt >= 0.7
 
 %package update
 Summary:	Auto-updater for the Clam Antivirus scanner data-files
@@ -101,8 +101,8 @@
 Requires(preun):	chkconfig
 Requires(preun):	initscripts
 Requires(postun):	initscripts
-Requires(pre):		fedora-usermgmt >= 0:0.7
-Requires(postun):	fedora-usermgmt >= 0:0.7
+Requires(pre):		fedora-usermgmt >= 0.7
+Requires(postun):	fedora-usermgmt >= 0.7
 
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gkrellmms/devel gkrellmms.spec,1.3,1.4
Message-ID: <200503032126.j23LQ4Nt018556@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gkrellmms/devel

Modified Files:
	gkrellmms.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gkrellmms.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/devel/gkrellmms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gkrellmms.spec	10 Dec 2004 22:03:02 -0000	1.3
+++ gkrellmms.spec	3 Mar 2005 21:26:02 -0000	1.4
@@ -3,7 +3,6 @@
 Name:           gkrellmms
 Version:        2.1.19
 Release:        1
-Epoch:          0
 Summary:        GKrellM XMMS plugin
 
 Group:          Applications/Multimedia
@@ -12,24 +11,21 @@
 Source0:        http://gkrellm.luon.net/files/gkrellmms-2.1.19.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-BuildRequires:  gtk+-devel >= 1:1.2.10, gtk2-devel >= 0:2.0.1, xmms-devel >= 1:1.2.8
-BuildRequires:	gkrellm-devel, gettext
-Requires:       gkrellm >= 0:2.0, xmms >= 1:1.2.8
+BuildRequires:  gtk+-devel >= 1:1.2.10, gtk2-devel >= 2.0.1, xmms-devel >= 1:1.2.8
+BuildRequires:  gkrellm-devel, gettext
+Requires:       gkrellm >= 2.0, xmms >= 1:1.2.8
 
 %description
 GKrellM plugin for controlling XMMS.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}
 
-# -----------------------------------------------------------------------------
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} enable_nls=1
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -41,19 +37,16 @@
   enable_nls=1
 %find_lang %{name}
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc Changelog README Themes FAQ
 %{plugdir}/*
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Fri May  7 2004 Brian Pepple <bdpepple at ameritech.net> 0:2.1.19-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gkrellm-hddtemp/devel gkrellm-hddtemp.spec,1.4,1.5
Message-ID: <200503032126.j23LQ4Fk018552@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gkrellm-hddtemp/devel

Modified Files:
	gkrellm-hddtemp.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gkrellm-hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-hddtemp/devel/gkrellm-hddtemp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gkrellm-hddtemp.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ gkrellm-hddtemp.spec	3 Mar 2005 21:26:02 -0000	1.5
@@ -1,7 +1,6 @@
 Name:           gkrellm-hddtemp
 Version:        0.2
 Release:        0.2.beta
-Epoch:          0
 Summary:        Hard disk temperature plugin for GKrellM
 
 Group:          Applications/System
@@ -10,43 +9,37 @@
 Source:         http://coredump.free.fr/linux/gkrellm-hddtemp-0.2-beta.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel, gkrellm-devel >= 0:2
-Requires:       hddtemp >= 0:0.3, gkrellm >= 0:2
+BuildRequires:  gtk2-devel, gkrellm-devel >= 2
+Requires:       hddtemp >= 0.3, gkrellm >= 2
 
 %description
 %{summary}.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}-%{version}-beta
 perl -pi -e "s|^(CFLAGS=.+?)$|\$1 $RPM_OPT_FLAGS|" Makefile
 
-# -----------------------------------------------------------------------------
 
 %build
 make %{?_smp_mflags} gkrellm2
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gkrellm2/plugins
 cp -p *.so $RPM_BUILD_ROOT%{_libdir}/gkrellm2/plugins
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(0644,root,root,0755)
 %doc COPYING README
 %attr(0755,root,root) %{_libdir}/gkrellm2/plugins/*
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Fri May 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.2-0.fdr.0.2.beta



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gtkglext/devel gtkglext.spec,1.3,1.4
Message-ID: <200503032126.j23LQ53Y018655@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gtkglext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gtkglext/devel

Modified Files:
	gtkglext.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gtkglext.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglext/devel/gtkglext.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkglext.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gtkglext.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -3,25 +3,24 @@
 %define base_version		1.0.6
 %define api_version		1.0
 
-Summary: 	OpenGL Extension to GTK
-Name: 		gtkglext
-Version: 	%{base_version}
-Epoch: 		0
-Release: 	1
-License: 	LGPL
-Group: 		System Environment/Libraries
-URL: 		http://gtkglext.sourceforge.net/
-Source0: 	ftp://dl.sourceforge.net/pub/sourceforge/gtkglext/gtkglext-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:	OpenGL Extension to GTK
+Name:		gtkglext
+Version:	%{base_version}
+Release:	1
+License:	LGPL
+Group:		System Environment/Libraries
+URL:		http://gtkglext.sourceforge.net/
+Source0:	ftp://dl.sourceforge.net/pub/sourceforge/gtkglext/gtkglext-%{version}.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtk2-devel
-BuildRequires: Mesa, libGL.so.1, libGLU.so.1
+BuildRequires:	gtk2-devel
+BuildRequires:	Mesa, libGL.so.1, libGLU.so.1
 
-Requires(postun): /sbin/ldconfig
-Requires(post):	/sbin/ldconfig
+Requires(postun):	/sbin/ldconfig
+Requires(post):		/sbin/ldconfig
 
 # Work around to the broken libtool being used
-BuildRequires: gcc-c++
+BuildRequires:	gcc-c++
 
 %description
 GtkGLExt is an OpenGL extension to GTK. It provides the GDK objects
@@ -29,11 +28,11 @@
 make GTK+ widgets OpenGL-capable.
 
 %package devel
-Summary: Development tools for GTK-based OpenGL applications
-Group: Development/Libraries
+Summary:	Development tools for GTK-based OpenGL applications
+Group:		Development/Libraries
 
-Requires: %{name} = %{epoch}:%{version}
-Requires: gtk2-devel
+Requires:	%{name} = %{version}
+Requires:	gtk2-devel
 
 %description devel
 The gtkglext-devel package contains the header files, static libraries,



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/global/devel global.spec,1.4,1.5
Message-ID: <200503032126.j23LQ5kJ018584@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/global/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/global/devel

Modified Files:
	global.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: global.spec
===================================================================
RCS file: /cvs/extras/rpms/global/devel/global.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- global.spec	11 Feb 2005 23:27:42 -0000	1.4
+++ global.spec	3 Mar 2005 21:26:03 -0000	1.5
@@ -1,13 +1,12 @@
 Name:           global
 Version:        4.8.2
 Release:        1
-Epoch:          0
-Summary:        A source code tag system
+Summary:        Source code tag system
 
-Group:		Development/Tools
-License:	GPL/BSD
-URL:		http://www.gnu.org/software/global
-Source:		http://tamacom.com/global/global-4.8.2.tar.gz
+Group:          Development/Tools
+License:        GPL/BSD
+URL:            http://www.gnu.org/software/global
+Source:         http://tamacom.com/global/global-4.8.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -39,18 +38,18 @@
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info \
     %{_infodir}/dir 2>/dev/null || :
 fi
 
 %files
 %defattr(-,root,root,-)
+%doc README THANKS LICENSE AUTHORS COPYING FAQ globash.rc gtags.el
 %{_bindir}/*
 %{_infodir}/*
 %{_mandir}/man*/*
 %{_datadir}/gtags
-%doc README THANKS LICENSE AUTHORS COPYING FAQ globash.rc gtags.el
 
 %changelog
 * Mon Dec 27 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:4.8.2-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/amarok/devel amarok.spec,1.6,1.7
Message-ID: <200503032126.j23LQ4Q7018512@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/amarok/devel

Modified Files:
	amarok.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- amarok.spec	14 Feb 2005 21:57:39 -0000	1.6
+++ amarok.spec	3 Mar 2005 21:26:02 -0000	1.7
@@ -16,10 +16,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
-BuildRequires:  taglib-devel >= 0:1.3, esound-devel
+BuildRequires:  taglib-devel >= 1.3, esound-devel
 BuildRequires:  desktop-file-utils, gettext
 BuildRequires:  xorg-x11-Mesa-libGL
-BuildRequires:  gstreamer-plugins-devel >= 0:0.8.4
+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
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/fedora-rpmdevtools/devel fedora-rpmdevtools.spec,1.7,1.8
Message-ID: <200503032126.j23LQ4UW018516@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fedora-rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/fedora-rpmdevtools/devel

Modified Files:
	fedora-rpmdevtools.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-rpmdevtools.spec	3 Mar 2005 20:33:52 -0000	1.7
+++ fedora-rpmdevtools.spec	3 Mar 2005 21:26:02 -0000	1.8
@@ -15,7 +15,7 @@
 
 BuildArch:      noarch
 Provides:       %{name}-emacs = %{version}-%{release}
-Obsoletes:      %{name}-emacs < 0:0.1.9
+Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
 Requires:       rpm-python, python, cpio, sed, perl
 # Minimal RPM build requirements



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gconfmm26/devel gconfmm.spec,1.2,1.3
Message-ID: <200503032126.j23LQ43o018544@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gconfmm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gconfmm26/devel

Modified Files:
	gconfmm.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gconfmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gconfmm26/devel/gconfmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gconfmm.spec	10 Dec 2004 22:03:02 -0000	1.2
+++ gconfmm.spec	3 Mar 2005 21:26:02 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           gconfmm26
 Version:        2.6.1
 Release:        1
-Epoch:          0
-Summary:        A C++ wrapper for GConf2
+Summary:        C++ wrapper for GConf2
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -25,7 +24,7 @@
 %package devel
 Summary:        Headers for developing programs that will use gconfmm
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       glibmm24-devel
 Requires:       gtkmm24-devel
 Requires:       GConf2-devel



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/glibmm24/devel glibmm.spec,1.2,1.3
Message-ID: <200503032126.j23LQ5R7018580@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/glibmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/glibmm24/devel

Modified Files:
	glibmm.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: glibmm.spec
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glibmm.spec	7 Dec 2004 22:32:32 -0000	1.2
+++ glibmm.spec	3 Mar 2005 21:26:03 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           glibmm24
 Version:        2.4.5
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for GTK2 (a GUI library for X).
+Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -12,8 +11,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  libsigc++20-devel >= 0:2.0.0
-BuildRequires:  glib2-devel >= 0:2.4.0
+BuildRequires:  libsigc++20-devel >= 2.0.0
+BuildRequires:  glib2-devel >= 2.4.0
 
 %description
 gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2.
@@ -22,9 +21,9 @@
 quickly create complex user interfaces.
 
 %package devel
-Summary:        Headers for developing programs that will use %{name}.
+Summary:        Headers for developing programs that will use %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       glib2-devel
 Requires:       libsigc++20-devel
 
@@ -53,17 +52,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-
 %post
 /sbin/ldconfig
 
 
-
 %postun
 /sbin/ldconfig
 
 
-
 %files
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gnome-blog/devel gnome-blog.spec,1.3,1.4
Message-ID: <200503032126.j23LQ57R018600@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnome-blog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gnome-blog/devel

Modified Files:
	gnome-blog.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/gnome-blog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-blog.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gnome-blog.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -5,7 +5,6 @@
 Name:		gnome-blog
 Version:	0.7
 Release:	7
-Epoch:		0
 Summary:	GNOME panel object for posting blog entries
 
 Group:		User Interface/Desktops
@@ -15,36 +14,33 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-Requires:	gnome-python2-applet >= 0:%{gnome_python2_version}
-Requires:	gnome-python2-gconf  >= 0:%{gnome_python2_version}
-Requires:	pygtk2 >= 0:%{gnome_python2_version}
-Requires:	python >= 0:%{pyver}, python <= 0:%{pynext}
+Requires:	gnome-python2-applet >= %{gnome_python2_version}
+Requires:	gnome-python2-gconf  >= %{gnome_python2_version}
+Requires:	pygtk2 >= %{gnome_python2_version}
+Requires:	python >= %{pyver}, python <= %{pynext}
 
-Requires(post,preun): GConf2
+Requires(post,preun):	GConf2
 
-BuildRequires:  pygtk2-devel >= 0:%{gnome_python2_version}
+BuildRequires:	pygtk2-devel >= %{gnome_python2_version}
 BuildRequires:	glib2-devel
-BuildRequires: 	gettext
+BuildRequires:	gettext
 BuildRequires:	GConf2
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 
 %description
 GNOME panel object that allows convenient posting of blog entries to
 any blog that supports the bloggerAPI.
 
-# ---------------------------------------------------------------------------------------------
 
 %prep
 %setup -q
 %{__sed} -i 's|\(<oaf_server iid="OAFIID:GNOME_BlogApplet_Factory" type="exe" location="\)\(blog_applet.py">\)|\1%{_libexecdir}/\2|' GNOME_BlogApplet.server.in
 
-# ---------------------------------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-# ---------------------------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,24 +57,21 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
 %{__mv} $RPM_BUILD_ROOT%{_bindir}/blog_applet.py $RPM_BUILD_ROOT%{_libexecdir}
 
-# ---------------------------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# ---------------------------------------------------------------------------------------------
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
 unset GCONF_CONFIG_SOURCES
- 
+
 %preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
 unset GCONF_CONFIG_SOURCES
 
-# ---------------------------------------------------------------------------------------------
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -96,7 +89,6 @@
 %{_libdir}/python%{pyver}/site-packages/gnomeblog/*.pyc
 %ghost %{_libdir}/python*/site-packages/gnomeblog/*.pyo
 
-# ---------------------------------------------------------------------------------------------
 
 %changelog
 * Tue Feb  3 2004 Brian Pepple <bdpepple at ameritech.net> 0:0.7-0.fdr.7



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gai/devel gai.spec,1.7,1.8
Message-ID: <200503032126.j23LQ49k018520@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gai/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gai/devel

Modified Files:
	gai.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gai.spec
===================================================================
RCS file: /cvs/extras/rpms/gai/devel/gai.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gai.spec	27 Feb 2005 05:28:13 -0000	1.7
+++ gai.spec	3 Mar 2005 21:26:02 -0000	1.8
@@ -1,7 +1,6 @@
 Name:		gai
 Version:	0.5.8
 Release:	4
-Epoch:		0
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -11,13 +10,13 @@
 Patch0:		gai-0.5.8-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libgnomeui-devel, gtk2-devel >= 0:2.2, gnome-panel-devel
+BuildRequires:	libgnomeui-devel, gtk2-devel >= 2.2, gnome-panel-devel
 BuildRequires:	SDL-devel
 
 %package	devel
 Summary:	Library and headers for Generic Applet Interface
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel-devel, libgnomeui-devel
 
 %description
@@ -55,7 +54,7 @@
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING.LIB ChangeLog README* THANKS TODO WINDOWMANAGERS
 %{_libdir}/libgai.so.*
@@ -96,7 +95,7 @@
 
 * Tue Oct 28 2003 Michel Alexandre Salim <salimma[AT]users.sf.net> - 0.5.0-0.fdr.0.1.pre4
 - Fixed broken library naming (thanks Michael Schwendt)
- 
+
 * Mon Oct 27 2003 Michel Alexandre Salim <salimma[AT]users.sourceforge.net> - 0.5.0-0.fdr.0.pre4
 - Update to 0.5.0pre4; API change between 0.4.x and 0.5.0.
 - Most GAI applets now developed for 0.5.0, since 0.4.1 is not in Fedora yet one might as well move to 0.5.0 now.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/galeon/devel galeon.spec,1.3,1.4
Message-ID: <200503032126.j23LQ4pj018528@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/galeon/devel

Modified Files:
	galeon.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- galeon.spec	23 Jan 2005 20:00:53 -0000	1.3
+++ galeon.spec	3 Mar 2005 21:26:02 -0000	1.4
@@ -1,23 +1,21 @@
-Summary:   	GNOME2 Web browser based on Mozilla
-Name:      	galeon
-Version:   	1.3.19
-Release:   	2
-Epoch:		0
-License: 	GPL
-Group:     	Applications/Internet
-URL:       	http://galeon.sourceforge.net/
-Source0:    	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
-BuildRoot:  	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Summary:	GNOME2 Web browser based on Mozilla
+Name:		galeon
+Version:	1.3.19
+Release:	2
+License:	GPL
+Group:		Applications/Internet
+URL:		http://galeon.sourceforge.net/
+Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Requires:	scrollkeeper 
 Requires:	mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null)
 BuildRequires:	gettext mozilla-nspr-devel desktop-file-utils
-BuildRequires:	gtk2-devel >= 0:2.4.0
+BuildRequires:	gtk2-devel >= 2.4.0
 BuildRequires:	mozilla-devel >= 37:1.7.2
-BuildRequires:	libxml2-devel >= 0:2.6.6
-BuildRequires:	libgnomeui-devel >= 0:2.5.2
+BuildRequires:	libxml2-devel >= 2.6.6
+BuildRequires:	libgnomeui-devel >= 2.5.2
 %{!?_without_nautilus:BuildRequires:	eel2-devel nautilus}
 
-# -----------------------------------------------------------------------------
 
 %description
 Galeon is a web browser built around Gecko (Mozilla's rendering
@@ -25,12 +23,10 @@
 browser, designed to take advantage of as many GNOME technologies as
 makes sense. Galeon was written to do just one thing - browse the web.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure \
@@ -39,7 +35,6 @@
 	--disable-schemas-install
 make %{?_smp_mflags}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -58,12 +53,10 @@
 
 find $RPM_BUILD_ROOT%{_libdir} -name \*.la -exec rm {} \;
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %post
 %{_bindir}/galeon-config-tool --fix-gconf-permissions
@@ -71,7 +64,7 @@
 scrollkeeper-update||:
 
 %preun
-if [ "$0" = 1 ] ; then
+if [ "$1" = "1" ] ; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
         %{_sysconfdir}/gconf/schemas/galeon.schemas >/dev/null
@@ -80,6 +73,7 @@
 %postun
 scrollkeeper-update||:
 
+
 %files -f galeon-2.0.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.README ChangeLog NEWS README INSTALL THANKS TODO FAQ FAQ.html README.ExtraPrefs
@@ -99,7 +93,6 @@
 %{_libdir}/bonobo/servers/GNOME_Galeon_NautilusView.server
 %{_datadir}/applications/*galeon.desktop
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Sun Jan 23 2005 Dams <anvil[AT]livna.org> - 0:1.3.19-2



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gai-pal/devel gai-pal.spec,1.6,1.7
Message-ID: <200503032126.j23LQ4Ii018524@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gai-pal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gai-pal/devel

Modified Files:
	gai-pal.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gai-pal.spec
===================================================================
RCS file: /cvs/extras/rpms/gai-pal/devel/gai-pal.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gai-pal.spec	27 Feb 2005 05:29:08 -0000	1.6
+++ gai-pal.spec	3 Mar 2005 21:26:02 -0000	1.7
@@ -1,10 +1,9 @@
-%define gaiver 0:0.5.8
+%define gaiver	0.5.8
 
 Summary:	GAI Pal applet
 Name:		gai-pal
 Version:	0.7
 Release:	4
-Epoch:		0
 Source0:	%{name}-%{version}.tar.bz2
 Patch0:		gai-pal-0.7-xosd-empty-msg.patch
 Patch1:		gai-pal-0.7-typo.patch
@@ -38,7 +37,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/gai-pal



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gc/devel gc.spec,1.6,1.7
Message-ID: <200503032126.j23LQ4Em018532@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gc/devel

Modified Files:
	gc.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gc.spec	29 Jan 2005 16:28:30 -0000	1.6
+++ gc.spec	3 Mar 2005 21:26:02 -0000	1.7
@@ -1,30 +1,29 @@
 # $Id$
 
-Summary: C++ Garbage Collector	
-Name:    gc	
-Epoch:	 0
+Summary: C++ Garbage Collector
+Name:    gc
 Version: 6.4
 # For Extras
-Release: 2 
+Release: 2
 # For kde-redhat
 #Release: 0.2%{?dist_tag}.kde
-Group:	 System Environment/Libraries
+Group:   System Environment/Libraries
 License: BSD
-Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
-Source:	 http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.4.tar.gz
+Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Patch1: gc6.4-opendl.patch
 
 
 %description
-The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage 
+The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage
 collecting replacement for C malloc or C++ new.
 
 %package devel
-Summary: Libraries and header files for gc development 
+Summary: Libraries and header files for gc development
 Group:   Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description devel
 Libraries and header files for gc development.
 
@@ -55,7 +54,7 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -p -D -m644 doc/gc.man	$RPM_BUILD_ROOT%{_mandir}/man3/gc.3
+install -p -D -m644 doc/gc.man $RPM_BUILD_ROOT%{_mandir}/man3/gc.3
 
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gc
@@ -63,14 +62,14 @@
 
 
 %clean
-rm -rf 	"$RPM_BUILD_ROOT"
+rm -rf "$RPM_BUILD_ROOT"
 
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
-%files 
+%files
 %defattr(-,root,root)
 %doc doc/README doc/README.changes doc/README.contributors
 %{_libdir}/lib*.so.*
@@ -114,16 +113,16 @@
 - OK, put manpage in man3.
 
 * Thu Oct 02 2003 Rex Dieter <rexdieter at sf.net> 0:6.2-0.fdr.2
-- drop manpage pending feedback from developer. 
+- drop manpage pending feedback from developer.
 
 * Tue Sep 30 2003 Rex Dieter <rexdieter at sf.net> 0:6.2-0.fdr.1
-- fix manpage location 
+- fix manpage location
 - remove .la file (it appears unnecessary after all, thanks to opendl patch)
 - remove cvs tag from description
 - touchup -devel desc/summary.
 - macro update to support Fedora Core
 
-* Thu Sep 11 2003 Rex Dieter <rexdieter at sf.net> 0:6.2-0.fdr.0 
+* Thu Sep 11 2003 Rex Dieter <rexdieter at sf.net> 0:6.2-0.fdr.0
 - 6.2 release.
 - update license (BSD)
 - Consider building with: --enable-parallel-mark



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gcombust/devel gcombust.spec,1.5,1.6
Message-ID: <200503032126.j23LQ4n1018536@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gcombust/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gcombust/devel

Modified Files:
	gcombust.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gcombust.spec
===================================================================
RCS file: /cvs/extras/rpms/gcombust/devel/gcombust.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gcombust.spec	24 Dec 2004 14:39:13 -0000	1.5
+++ gcombust.spec	3 Mar 2005 21:26:02 -0000	1.6
@@ -1,6 +1,3 @@
-# $Id$
-# Authority: matthias
-
 Summary: Powerful GTK+ front-end for mkisofs and cdrecord
 Name: gcombust
 Version: 0.1.55
@@ -29,7 +26,7 @@
 
 
 %build
-%configure 
+%configure
 %{__make} %{?_smp_mflags}
 
 
@@ -45,17 +42,17 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
-%doc AUTHORS COPYING ChangeLog FAQ.shtml NEWS README THANKS TODO README.ms  
+%doc AUTHORS COPYING ChangeLog FAQ.shtml NEWS README THANKS TODO README.ms
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.xpm
 
 
 %changelog
-* Fri Dec 24 2004 Thomas Vander Stichele <thomas at apestaart dot org> 1:0.1.55-4
-- Scrub release tag for extras
+* Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 1:0.1.55-3
+- Bump release to provide Extras upgrade path.
 
-* Tue May 18 2004 Matthias Saou <http://freshrpms.net/> 1:0.1.55-3
+* Tue May 18 2004 Matthias Saou <http://freshrpms.net/> 1:0.1.55-2
 - Rebuild for Fedora Core 2.
 
 * Fri Nov  7 2003 Matthias Saou <http://freshrpms.net/> 1:0.1.55-2



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gkrellm-volume/devel gkrellm-volume.spec,1.5,1.6
Message-ID: <200503032126.j23LQ4AA018564@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-volume/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gkrellm-volume/devel

Modified Files:
	gkrellm-volume.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gkrellm-volume.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-volume/devel/gkrellm-volume.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gkrellm-volume.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ gkrellm-volume.spec	3 Mar 2005 21:26:02 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           gkrellm-volume
 Version:        2.1.13
 Release:        1
-Epoch:          0
 Summary:        GKrellM volume plugin
 
 Group:          Applications/Multimedia
@@ -14,9 +13,9 @@
 Patch1:         %{name}-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-BuildRequires:  gkrellm-devel >= 0:2.0, gtk2-devel >= 0:2.0.1, gettext
+BuildRequires:  gkrellm-devel >= 2.0, gtk2-devel >= 2.0.1, gettext
 BuildRequires:  alsa-lib-devel
-Requires:       gkrellm >= 0:2.0
+Requires:       gkrellm >= 2.0
 
 %description
 GKrellM plugin for controlling mixer devices.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gtkmm24/devel gtkmm.spec,1.3,1.4
Message-ID: <200503032126.j23LQ50j018663@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gtkmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gtkmm24/devel

Modified Files:
	gtkmm.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkmm.spec	26 Jan 2005 00:10:44 -0000	1.3
+++ gtkmm.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -1,8 +1,7 @@
-Name:           gtkmm24
+Name:
 Version:        2.4.8
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for GTK2 (a GUI library for X).
+Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -12,10 +11,10 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  glibmm24-devel >= 0:2.4.0
-BuildRequires:  atk-devel >= 0:1.6.0
-BuildRequires:  pango-devel >= 0:1.4.0
-BuildRequires:  gtk2-devel >= 0:2.4.0
+BuildRequires:  glibmm24-devel >= 2.4.0
+BuildRequires:  atk-devel >= 1.6.0
+BuildRequires:  pango-devel >= 1.4.0
+BuildRequires:  gtk2-devel >= 2.4.0
 
 %description
 gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2.
@@ -26,7 +25,7 @@
 %package        devel
 Summary:        Headers for developing programs that will use %{name}.
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtk2-devel
 Requires:       glib2-devel
 Requires:       glibmm24-devel
@@ -38,12 +37,12 @@
 developing gtkmm applications.
 
 %package        docs
-Summary:        Documentation for %{name}, includes full API docs.
+Summary:        Documentation for %{name}, includes full API docs
 Group:          Documentation
-Requires:       %{name}-devel = %{epoch}:%{version}-%{release}
+Requires:       %{name}-devel = %{version}-%{release}
 
 %description    docs
-This package contains the full API documentation for %{name}.  
+This package contains the full API documentation for %{name}.
 
 
 %prep



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gtkterm/devel gtkterm.spec,1.4,1.5
Message-ID: <200503032126.j23LQ5Ro018667@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gtkterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gtkterm/devel

Modified Files:
	gtkterm.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gtkterm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkterm/devel/gtkterm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtkterm.spec	10 Dec 2004 22:03:03 -0000	1.4
+++ gtkterm.spec	3 Mar 2005 21:26:03 -0000	1.5
@@ -1,7 +1,6 @@
 Name:           gtkterm
 Version:        0.99.4
 Release:        3
-Epoch:          0
 Summary:        Serial port terminal
 
 Group:          Applications/Communications
@@ -30,7 +29,7 @@
 %makeinstall
 install -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--add-category X-Fedora      \
+        --add-category X-Fedora      \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications  \
 %SOURCE1
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gsview/devel gsview.spec,1.4,1.5
Message-ID: <200503032126.j23LQ507018651@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gsview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gsview/devel

Modified Files:
	gsview.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gsview.spec
===================================================================
RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gsview.spec	18 Feb 2005 18:00:34 -0000	1.4
+++ gsview.spec	3 Mar 2005 21:26:03 -0000	1.5
@@ -1,14 +1,13 @@
 # $Id$
 
 Summary: PostScript and PDF previewer
-Name: 	 gsview
-Epoch:	 0
+Name:    gsview
 Version: 4.6
 Release: 9
 License: Aladdin Free Public License, Ghostgum Software Pty Ltd
-Group: 	 Applications/Publishing
+Group:   Applications/Publishing
 Source:  ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.6.tar.gz
-URL: 	 http://www.cs.wisc.edu/~ghost/gsview/
+URL:     http://www.cs.wisc.edu/~ghost/gsview/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source1: gsview.desktop



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gtkmm20/devel gtkmm.spec,1.2,1.3
Message-ID: <200503032126.j23LQ5RI018659@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gtkmm20/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gtkmm20/devel

Modified Files:
	gtkmm.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm20/devel/gtkmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtkmm.spec	10 Dec 2004 22:03:03 -0000	1.2
+++ gtkmm.spec	3 Mar 2005 21:26:03 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           gtkmm20
 Version:        2.2.12
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for GTK2 (a GUI library for X).
+Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -12,11 +11,11 @@
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  libsigc++-devel >= 0:1.2.0
-BuildRequires:  glib2-devel >= 0:2.2.0
-BuildRequires:  atk-devel >= 0:1.2.0
-BuildRequires:  pango-devel >= 0:1.1.0
-BuildRequires:  gtk2-devel >= 0:2.2.0
+BuildRequires:  libsigc++-devel >= 1.2.0
+BuildRequires:  glib2-devel >= 2.2.0
+BuildRequires:  atk-devel >= 1.2.0
+BuildRequires:  pango-devel >= 1.1.0
+BuildRequires:  gtk2-devel >= 2.2.0
 BuildRequires:  m4
 Obsoletes:      gtkmm2
 
@@ -27,9 +26,9 @@
 quickly create complex user interfaces.
 
 %package        devel
-Summary:        Headers for developing programs that will use %{name}.
+Summary:        Headers for developing programs that will use %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       libsigc++-devel
 Requires:       glib2-devel
 Requires:       atk-devel
@@ -44,12 +43,12 @@
 developing gtkmm applications.
 
 %package        docs
-Summary:        Documentation for %{name}, includes full API docs.
+Summary:        Documentation for %{name}, includes full API docs
 Group:          Documentation
-Requires:       %{name}-devel = %{epoch}:%{version}-%{release}
+Requires:       %{name}-devel = %{version}-%{release}
 
 %description    docs
-This package contains the full API documentation for %{name}.  
+This package contains the full API documentation for %{name}.
 
 
 %prep
@@ -68,7 +67,7 @@
 %{__mkdir} docs-to-include
 %{__mv} ${RPM_BUILD_ROOT}%{_docdir}/gtkmm-2.0/* docs-to-include/
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/gtkmm-2.0/*
- 
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/graphviz/devel graphviz.spec,1.6,1.7
Message-ID: <200503032126.j23LQ5VL018647@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/graphviz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/graphviz/devel

Modified Files:
	graphviz.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: graphviz.spec
===================================================================
RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- graphviz.spec	23 Jan 2005 16:27:43 -0000	1.6
+++ graphviz.spec	3 Mar 2005 21:26:03 -0000	1.7
@@ -1,37 +1,36 @@
 # Note: graphviz requires gd with gif support (and other fixes), hence use
 # internal one for now.
 
-Summary: 	Graph Visualization Tools
-Name: 		graphviz
-Version: 	2.2
-Release: 	3
-Epoch:		0
-Group: 		Applications/Multimedia
-License: 	CPL
-URL:  		http://www.graphviz.org/
-Source: 	http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.2.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-root
+Summary:	Graph Visualization Tools
+Name:		graphviz
+Version:	2.2
+Release:	3
+Group:		Applications/Multimedia
+License:	CPL
+URL:		http://www.graphviz.org/
+Source:		http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.2.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-root
 BuildRequires:	zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel
-BuildRequires:	/bin/ksh bison m4 flex tk tcl >= 0:8.3
+BuildRequires:	/bin/ksh bison m4 flex tk tcl >= 8.3
 BuildRequires:	/usr/include/tcl.h /usr/include/tk.h
 
 %package tcl
-Group:          Applications/Multimedia
-Summary:        Tcl extension tools for %{name}
-Requires:       %{name} = %{epoch}:%{version}-%{release} tcl >= 0:8.3 tk
+Group:		Applications/Multimedia
+Summary:	Tcl extension tools for %{name}
+Requires:	%{name} = %{version}-%{release} tcl >= 8.3 tk
 
 %package devel
-Summary: 	Development package for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release} pkgconfig
+Summary:	Development package for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release} pkgconfig
 
 %package doc
-Group:          Documentation
-Summary:        PDF and HTML documents for %{name}
+Summary:	PDF and HTML documents for %{name}
+Group:		Documentation
 
 %package graphs
-Group:          Applications/Multimedia
-Summary:        Demo graphs for %{name}
+Summary:	Demo graphs for %{name}
+Group:		Applications/Multimedia
 
 
 %description
@@ -82,7 +81,7 @@
     DESTDIR=$RPM_BUILD_ROOT \
     pkgconfigdir=%{_libdir}/pkgconfig \
     transform='s,x,x,' \
-	install
+    install
 chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/lefty/*
 cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/doc __doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
@@ -154,7 +153,7 @@
 - Fix lefty/* permissions.
 
 * Sat Jan 22 2005 John Ellson <ellson at research.att.com> - 0:2.2-1
-- Updated to 2.2 
+- Updated to 2.2
 - split out:
     graphviz-docs    - optional and large
     graphviz-graphs  - optional demo graphs



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/geomview/devel geomview.spec,1.1,1.2
Message-ID: <200503032126.j23LQ48j018548@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/geomview/devel

Modified Files:
	geomview.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview.spec	24 Dec 2004 11:58:48 -0000	1.1
+++ geomview.spec	3 Mar 2005 21:26:02 -0000	1.2
@@ -1,19 +1,18 @@
 # $Id$
 
-%define xforms_ver 0:1.0
+%define xforms_ver 1.0
 %define maniview_ver 2.0.0
 %define orrery_ver 0.9.3
 
-Name:    geomview	
-Summary: An interactive 3D viewing program
-Epoch:	 0
+Name:    geomview
+Summary: Interactive 3D viewing program
 Version: 1.8.1
 Release: 10%{?dist_tag}
 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
+Source:  http://dl.sourceforge.net/sourceforge/geomview/geomview-1.8.1.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source1: geomview.desktop
@@ -43,14 +42,14 @@
 %{!?_without_xforms:%{?!_with_xforms:%define _with_xforms --with-xforms}}
 ## plugins, default to yes, unless rpmbuild --without pluginname
 # default plugins
-#{?_without_xforms:Obsoletes: %{name}-plugins < %{epoch}:%{version}-%{release}}
+#{?_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 < %{epoch}:%{maniview_ver}-%{release}}
+#{?_without_maniview:Obsoletes: %{name}-maniview < %{maniview_ver}-%{release}}
 # orrery
 %{!?_without_orrery:%define _with_orrery --with-orrery}
-#{?_without_orrey:Obsoletes: %{name}-orrery < %{epoch}:%{orrery_ver}-%{release}}
+#{?_without_orrey:Obsoletes: %{name}-orrery < %{orrery_ver}-%{release}}
 
 %description
 Geomview is an interactive 3D viewing program for Unix. It lets you view and 
@@ -65,7 +64,7 @@
 %package plugins
 Group:   Applications/Engineering
 Summary: %{name} plugins
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
 BuildRequires: xforms-devel >= %{xforms_ver}
 %description plugins 
 Geomview default plugins
@@ -73,13 +72,13 @@
 
 %if "%{?_with_orrery:1}" == "1"
 %package orrery
-Group:	 Applications/Engineering
+Group:   Applications/Engineering
 Summary: Solar System Simulator for Geomview
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
 Requires: tk
-Obsoletes: orrery < %{epoch}:%{orrery_ver}-%{release}
-Provides:  orrery = %{epoch}:%{orrery_ver}-%{release}
-%description	orrery
+Obsoletes: orrery < %{orrery_ver}-%{release}
+Provides:  orrery = %{orrery_ver}-%{release}
+%description orrery
 The Orrery is Geomview module which is a digital model of the solar
 system, named for the mechanical models of the same name (often you'll
 see one with just the Sun, Earth and Moon, as little balls supported
@@ -90,12 +89,12 @@
 
 %if "%{?_with_maniview:1}" == "1"
 %package maniview
-Group:	 Applications/Engineering
-Summary: a Geomview module for viewing 3D manifolds	
-Requires: %{name} = %{epoch}:%{version}
+Group:   Applications/Engineering
+Summary: Geomview module for viewing 3D manifolds
+Requires: %{name} = %{version}
 BuildRequires: xforms-devel >= %{xforms_ver}
-Obsoletes: maniview < %{epoch}:%{maniview_ver}-%{release}
-Provides: maniview = %{epoch}:%{maniview_ver}-%{release}
+Obsoletes: maniview < %{maniview_ver}-%{release}
+Provides: maniview = %{maniview_ver}-%{release}
 %description maniview
 a Geomview module for viewing 3D manifolds.
 %endif
@@ -114,8 +113,8 @@
 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*	)}
+%{?_with_orrery:(  mv orrery* src/bin; ln -s src/bin/orrery*     ) }
+%{?_with_maniview:(mv maniview* src/bin; ln -s src/bin/maniview* )}
 
 
 %build



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gconfmm20/devel gconfmm.spec,1.2,1.3
Message-ID: <200503032126.j23LQ4Eq018540@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gconfmm20/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gconfmm20/devel

Modified Files:
	gconfmm.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gconfmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gconfmm20/devel/gconfmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gconfmm.spec	10 Dec 2004 22:03:02 -0000	1.2
+++ gconfmm.spec	3 Mar 2005 21:26:02 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           gconfmm20
 Version:        2.0.2
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for GTK2 (a GUI library for X).
+Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -12,8 +11,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  gtkmm20-devel >= 0:2.0.1
-BuildRequires:  GConf2-devel >= 0:2.0.0
+BuildRequires:  gtkmm20-devel >= 2.0.1
+BuildRequires:  GConf2-devel >= 2.0.0
 BuildRequires:  libtool
 Obsoletes:      gconfmm2
 
@@ -26,7 +25,7 @@
 %package devel
 Summary:        Headers for developing programs that will use gconfmm
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm20-devel
 Requires:       GConf2-devel
 Obsoletes:      gconfmm2-devel
@@ -83,7 +82,7 @@
 
 %changelog
 * Mon Aug 30 2004 Denis Leroy <denis at poolshark.org> - 0:2.0.2-0.fdr.1
-- Fix for x86_64 compile 
+- Fix for x86_64 compile
 - Upgrade to 2.0.2, switched to bz2
 - Changed suffix to 20, added Obsolete tag
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gputils/devel gputils.spec,1.3,1.4
Message-ID: <200503032126.j23LQ5IL018643@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gputils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gputils/devel

Modified Files:
	gputils.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gputils.spec
===================================================================
RCS file: /cvs/extras/rpms/gputils/devel/gputils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gputils.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gputils.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -1,22 +1,21 @@
 Name:		gputils
 Version:	0.12.4
 Release:	2
-Epoch:		0
 Summary:	Development utilities for Microchip (TM) PIC (TM) microcontrollers
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://gputils.sourceforge.net
 Source:		http://prdownloads.sourceforge.net/gputils/gputils-0.12.4.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-This is a collection of development tools for Microchip (TM) PIC (TM) 
+This is a collection of development tools for Microchip (TM) PIC (TM)
 microcontrollers.
 
 This is ALPHA software: there may be serious bugs in it, and it's
 nowhere near complete.  gputils currently only implements a subset of
-the features available with Microchip's tools.  See the documentation for 
+the features available with Microchip's tools.  See the documentation for
 an up-to-date list of what gputils can do.
 
 %prep
@@ -48,5 +47,6 @@
   - Package should own full directory /usr/share/gputils
   - Remove usefulness generic file INSTALL
   - Remove doc source file gputils.lyx
+
 * Wed Oct 6 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:0.12.4-0.fdr.1
   - Initial Fedora RPM



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gtranslator/devel gtranslator.spec,1.3,1.4
Message-ID: <200503032126.j23LQ5n3018671@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gtranslator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gtranslator/devel

Modified Files:
	gtranslator.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gtranslator.spec
===================================================================
RCS file: /cvs/extras/rpms/gtranslator/devel/gtranslator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtranslator.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gtranslator.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -1,8 +1,7 @@
 Name:		gtranslator
 Version:	1.1.5
 Release:	1
-Epoch:		0
-Summary:	A gettext po file editor for GNOME
+Summary:	Gettext po file editor for GNOME
 
 Group:		Development/Tools
 License:	GPL
@@ -11,13 +10,13 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	scrollkeeper
-BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
-BuildRequires:  libgnomeui-devel
-BuildRequires:  perl-XML-Parser
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+BuildRequires:	libgnomeui-devel
+BuildRequires:perl(XML::Parser)
 
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
+Requires(post):		scrollkeeper
+Requires(postun):	scrollkeeper
 
 %description
 gtranslator is an enhanced gettext po file editor for the GNOME
@@ -62,7 +61,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post 
+%post
 scrollkeeper-update -q || :
 
 %postun



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gktools/devel gktools.spec,1.3,1.4
Message-ID: <200503032126.j23LQ4pM018572@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gktools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gktools/devel

Modified Files:
	gktools.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gktools.spec
===================================================================
RCS file: /cvs/extras/rpms/gktools/devel/gktools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gktools.spec	10 Dec 2004 22:03:02 -0000	1.3
+++ gktools.spec	3 Mar 2005 21:26:02 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           gktools
 Version:        0.9.1
 Release:        2
-Epoch:          0
 Summary:        GUI utilities for KerberosV tickets
 
 Group:          User Interface/X
@@ -19,7 +18,7 @@
 gktickets - GUI version of klist for listing and tracking kerberos tickets
 
 %prep
-%setup -q 
+%setup -q
 
 
 %build
@@ -32,17 +31,17 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-krb5.desktop
 desktop-file-install --vendor=fedora \
-		--add-category X-Fedora \
-                --add-category=Application \
-                --add-category=Utility \
-  		--dir $RPM_BUILD_ROOT/%{_datadir}/applications      \
-                krb5.desktop
+    --add-category X-Fedora \
+    --add-category=Application \
+    --add-category=Utility \
+    --dir $RPM_BUILD_ROOT/%{_datadir}/applications      \
+    krb5.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/*
@@ -53,7 +52,9 @@
 %changelog
 * Wed Sep 22 2004 Nils O. Sel??sdal <NOS[AT]Utel.no> - 0:0.9.1-0.fdr.2
 - install .desktop file per fedora guidelines
+
 * Tue Sep 21 2004 Nils O. Sel??sdal <NOS[AT]Utel.no> - 0:0.9.1-0.fdr.1
 - 0.9.1
+
 * Sat Sep 18 2004 Nils O. Sel??sdal <NOS[AT]Utel.no> - 0:0.9.0-0.fdr.1
 - Initial RPM release.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gnotime/devel gnotime.spec,1.2,1.3
Message-ID: <200503032126.j23LQ5nF018616@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnotime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gnotime/devel

Modified Files:
	gnotime.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnotime.spec	16 Dec 2004 18:07:34 -0000	1.2
+++ gnotime.spec	3 Mar 2005 21:26:03 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           gnotime
 Version:        2.2.1
 Release:        5
-Epoch:          0
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
@@ -9,37 +8,37 @@
 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
+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-qof.patch
 # Fixes includes of qof headers in source files.
-Patch2:		http://www.tiki-lounge.com/~toshio/fedora/gnotime-qof-include.patch
+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
+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
+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
+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
+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
+Patch7:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-wordwrap.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml3-devel
-BuildRequires:  guile-devel >= 0:1.6.0
+BuildRequires:  guile-devel >= 1.6.0
 BuildRequires:  scrollkeeper
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-BuildRequires:  qof-devel >= 0:0.5.0
-BuildRequires:  qof-devel < 0:0.6.0
+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:  libtool
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -132,7 +131,7 @@
 * Sat Nov 27 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-5
 - Patch to fix a crash when invoking gnome_help.
 - Patch to wordwrap diary notes.
-  
+
 * Thu Sep 30 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-0.fdr.4
 - New patch to fix the Activity entry in the popup menu.
 
@@ -184,6 +183,6 @@
 
 * Mon Dec 15 2003 Toshio Kuratomi <toshio[AT]tiki-lounge.com> - 0:2.1.7-0.fdr.1
 - Initial Fedora RPM release.
-- Partially adapted from the gnotime.spec.in by Eric Anderson 
+- Partially adapted from the gnotime.spec.in by Eric Anderson
   <eric.anderson[AT]cordata.net> from the Red Hat directory in the gnotime
   distribution.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gnome-vfsmm26/devel gnome-vfsmm.spec,1.3,1.4
Message-ID: <200503032126.j23LQ52k018612@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnome-vfsmm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gnome-vfsmm26/devel

Modified Files:
	gnome-vfsmm.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gnome-vfsmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-vfsmm.spec	28 Jan 2005 00:48:09 -0000	1.3
+++ gnome-vfsmm.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -1,14 +1,13 @@
 Name:           gnome-vfsmm26
 Version:        2.6.1
 Release:        2
-Epoch:          0
 Summary:        C++ wrapper for gnome-vfs
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-vfsmm/2.6/gnome-vfsmm-%{version}.tar.bz2
-Patch0:		gnome-vfsmm-2.6.1-autoreconf.patch.bz2
+Patch0:         gnome-vfsmm-2.6.1-autoreconf.patch.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/ldconfig
@@ -18,12 +17,12 @@
 
 %description
 This package is part of the gnomemm project and provides a C++ interface for
-gnome-vfs.  
+gnome-vfs.
 
 %package devel
-Summary:        Headers for developing programs that will use %{name}.
+Summary:        Headers for developing programs that will use %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       glibmm24-devel
 Requires:       gnome-vfs2-devel
 
@@ -36,7 +35,7 @@
 %setup -q -n gnome-vfsmm-%{version}
 %ifarch x86_64
 # Patch was build after: aclocal -I scripts && automake -c -f && autoconf && libtoolize --copy --force
-%patch0 -p1 
+%patch0 -p1
 %endif
 
 %build
@@ -75,6 +74,7 @@
 %{_libdir}/gnome-vfsmm-2.6
 %{_libdir}/pkgconfig/*.pc
 
+
 %changelog
 * Thu Jan 27 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.6.1-2
 - Add autoreconf patch; fixes build on x86_64
@@ -82,5 +82,5 @@
 * Mon Jun 27 2004 Denis Leroy <denis at poolshark.org> - 0:2.6.1-0.fdr.1
 - Upgrade to 2.6.1
 
-* Wed Jul 22 2003 Gerald Henriksen <ghenriks at rogers.com> 
+* Wed Jul 22 2003 Gerald Henriksen <ghenriks at rogers.com>
 - Initial release



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/glunarclock/devel glunarclock.spec,1.4,1.5
Message-ID: <200503032126.j23LQ5hj018588@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/glunarclock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/glunarclock/devel

Modified Files:
	glunarclock.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: glunarclock.spec
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/devel/glunarclock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glunarclock.spec	13 Feb 2005 16:42:01 -0000	1.4
+++ glunarclock.spec	3 Mar 2005 21:26:03 -0000	1.5
@@ -1,15 +1,14 @@
 Name:           glunarclock
 Version:        0.32.2
 Release:        2
-Epoch:          0
 Summary:        GNOME applet that displays the current lunar phase
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://glunarclock.sourceforge.net/
 Source0:        http://download.sourceforge.net/glunarclock/glunarclock-0.32.2.tar.gz
-Patch0:		glunarclock-configure.in.patch
-Patch1:		glunarclock-0.32.2-autoreconf.patch.bz2
+Patch0:         glunarclock-configure.in.patch
+Patch1:         glunarclock-0.32.2-autoreconf.patch.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel
@@ -81,7 +80,7 @@
 
 %files -f glunarclock-0.32.lang
 %defattr (-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README 
+%doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README
 %{_sysconfdir}/gconf/schemas/*
 %{_libexecdir}/*
 %{_datadir}/glunarclock
@@ -95,7 +94,7 @@
 
 %changelog
 * Sun Feb 13 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 0.32.2-2
-- Add autoreconf and configure.in patch to fix x86_64;  
+- Add autoreconf and configure.in patch to fix x86_64;
 
 * Sun Jan 16 2005 Marius L. J??hndal <mariuslj at ifi.uio.no> - 0:0.32.2-1
 - Updated to 0.32.2.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gmpc/devel gmpc.spec,1.2,1.3
Message-ID: <200503032126.j23LQ5aQ018595@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gmpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gmpc/devel

Modified Files:
	gmpc.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gmpc.spec
===================================================================
RCS file: /cvs/extras/rpms/gmpc/devel/gmpc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gmpc.spec	10 Dec 2004 22:03:03 -0000	1.2
+++ gmpc.spec	3 Mar 2005 21:26:03 -0000	1.3
@@ -2,7 +2,6 @@
 Summary:        GNOME frontend for the MPD
 Version:        0.11.2
 Release:        1
-Epoch:          0
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://musicpd.org/?page=gmpc
@@ -15,13 +14,13 @@
 %description
 Gmpc is a GNOME client for the Music Player Daemon
 Features :
- * Support for loading/saving playlists. 
- * File Browser 
- * Browser based on ID3 information. (on artist and albums) 
- * Search 
- * Current playlist viewer with search. 
- * ID3 information 
- * Lots more 
+ * Support for loading/saving playlists.
+ * File Browser
+ * Browser based on ID3 information. (on artist and albums)
+ * Search
+ * Current playlist viewer with search.
+ * ID3 information
+ * Lots more
 
 %prep
 %setup -q



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gweled/devel gweled.spec,1.4,1.5
Message-ID: <200503032126.j23LQ52O018675@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gweled/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gweled/devel

Modified Files:
	gweled.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gweled.spec
===================================================================
RCS file: /cvs/extras/rpms/gweled/devel/gweled.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gweled.spec	5 Dec 2004 14:44:31 -0000	1.4
+++ gweled.spec	3 Mar 2005 21:26:03 -0000	1.5
@@ -1,19 +1,18 @@
 Name:           gweled
 Version:        0.6
 Release:        1
-Epoch:          0
-Summary:        Swapping gem game.
+Summary:        Swapping gem game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://sebdelestaing.free.fr/gweled/
 Source0:        http://sebdelestaing.free.fr/gweled/Release/gweled-%{version}.tar.gz
-Patch0:		%{name}-Makefile.patch
+Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgnomeui-devel >= 0:2.0.0
-BuildRequires:  librsvg2-devel >= 0:2.0.0
-BuildRequires:  libcroco-devel >= 0:0.3.0
+BuildRequires:  libgnomeui-devel >= 2.0.0
+BuildRequires:  librsvg2-devel >= 2.0.0
+BuildRequires:  libcroco-devel >= 0.3.0
 BuildRequires:  desktop-file-utils 
 
 %description
@@ -39,9 +38,9 @@
 %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			        \
+desktop-file-install --vendor fedora --delete-original \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --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/



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gmime/devel gmime.spec,1.2,1.3
Message-ID: <200503032126.j23LQ5RX018592@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gmime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gmime/devel

Modified Files:
	gmime.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gmime.spec
===================================================================
RCS file: /cvs/extras/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gmime.spec	10 Dec 2004 22:03:03 -0000	1.2
+++ gmime.spec	3 Mar 2005 21:26:03 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           gmime
 Version:        2.1.9
 Release:        3
-Epoch:          0
-Summary:        GMime library -- creation and parsing of MIME-messages   
+Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
 License:        GPL
@@ -10,23 +9,23 @@
 Source0:        http://spruce.sourceforge.net/gmime/sources/v2.1/gmime-2.1.9.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	glib2-devel >= 0:2.0.0
-BuildRequires:	zlib-devel >= 0:1.2.1.1
+BuildRequires:  glib2-devel >= 2.0.0
+BuildRequires:  zlib-devel >= 1.2.1.1
 
 %description
-The GMime suite provides a core library and set of utilities which may be 
-used for the creation and parsing of messages using the Multipurpose 
+The GMime suite provides a core library and set of utilities which may be
+used for the creation and parsing of messages using the Multipurpose
 Internet Mail Extension (MIME).
 
 
 %package        devel
 Summary:        Header files to develop libgmime applications
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
-The GMime suite provides a core library and set of utilities which may be 
-used for the creation and parsing of messages using the Multipurpose 
+The GMime suite provides a core library and set of utilities which may be
+used for the creation and parsing of messages using the Multipurpose
 Internet Mail Extension (MIME). The devel-package contains header files
 to develop applications that use libgmime.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gwenview/devel gwenview.spec,1.4,1.5
Message-ID: <200503032126.j23LQ54A018679@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gwenview/devel

Modified Files:
	gwenview.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gwenview.spec	29 Jan 2005 23:45:57 -0000	1.4
+++ gwenview.spec	3 Mar 2005 21:26:03 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           gwenview
 Version:        1.1.6
 Release:        2
-Epoch:          0
-Summary:        Simple image viewer for KDE.
+Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL
@@ -17,11 +16,11 @@
 #BuildRequires:  fam-devel glib2-devel
 
 %description
-Gwenview is an image viewer for KDE. 
+Gwenview is an image viewer for KDE.
 
-It features a folder tree window and a file list window to provide easy 
-navigation in your file hierarchy.  Image loading is done by the Qt library, 
-so it supports all image formats your Qt installation supports. 
+It features a folder tree window and a file list window to provide easy
+navigation in your file hierarchy.  Image loading is done by the Qt library,
+so it supports all image formats your Qt installation supports.
 
 
 %prep



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gwget/devel gwget.spec,1.3,1.4
Message-ID: <200503032126.j23LQ5oq018683@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gwget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gwget/devel

Modified Files:
	gwget.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gwget.spec	26 Feb 2005 21:36:27 -0000	1.3
+++ gwget.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -1,25 +1,23 @@
 # use "--without epiphanye" as rpmbuildparameter to disable epiphany-extension (requires FC3 Core package)
 
-Summary: 	GUI Download manager using wget
-Name: 		gwget
-Epoch:		0
-Version: 	0.93
-Release: 	1
-License: 	GPL
-Group: 		Applications/Internet
-Source0: 	http://prdownloads.sourceforge.net/gwget/gwget-0.93.tar.gz
-# direct link:	http://mesh.dl.sourceforge.net/sourceforge/gwget/gwget-0.93.tar.gz
+Summary:	Graphical download manager that uses wget
+Name:		gwget
+Version:	0.93
+Release:	1
+License:	GPL
+Group:		Applications/Internet
+Source0:	http://dl.sf.net/gwget/gwget-0.93.tar.gz
 Source1:	gwget.desktop
-URL: 		http://gwget.sourceforge.net/
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Buildrequires:	libgnomeui-devel >= 0:2.0
-Buildrequires:	libglade2-devel >= 0:2.0
+URL:		http://gwget.sourceforge.net/
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildrequires:	libgnomeui-devel >= 2.0
+Buildrequires:	libglade2-devel >= 2.0
 BuildRequires:	perl-XML-Parser
-BuildRequires:	gettext >= 0:0.14.1
-BuildRequires:  desktop-file-utils
-Requires: 	wget >= 0:1.9
-Requires(post):  GConf2
-Requires(preun): GConf2
+BuildRequires:	gettext >= 0.14.1
+BuildRequires:	desktop-file-utils
+Requires:	wget >= 1.9
+Requires(post):		GConf2
+Requires(preun):	GConf2
 
 
 %description
@@ -30,15 +28,15 @@
 %if 0%{!?_without_epiphanye:1}
 
 %package epiphany-extension
-Summary: 	This Package contains extensions gwget2 extensions for epiphany.
-Group: 		Applications/Internet
-Requires:	%{name} = %{epoch}:%{version}
-Requires:	epiphany >= 0:1.4.4
-BuildRequires: 	epiphany-devel >= 0:1.4.4
+Summary:	This Package contains extensions gwget2 extensions for epiphany.
+Group:		Applications/Internet
+Requires:	%{name} = %{version}
+Requires:	epiphany >= 1.4.4
+BuildRequires:	epiphany-devel >= 1.4.4
 
-%description epiphany-extension 
+%description
 This Package contains extensions gwget2 extensions for epiphany.
-%endif 	# _without_epiphanye
+%endif # _without_epiphanye
 
 %prep
 %setup -q
@@ -94,7 +92,7 @@
 %defattr (-,root,root)
 %dir %{_libdir}/epiphany/extensions/
 %{_libdir}/epiphany/extensions/*
-%endif 	# _without_epiphanye
+%endif # _without_epiphanye
 
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gl-117/devel gl-117.spec,1.3,1.4
Message-ID: <200503032126.j23LQ59u018576@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gl-117/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gl-117/devel

Modified Files:
	gl-117.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gl-117.spec
===================================================================
RCS file: /cvs/extras/rpms/gl-117/devel/gl-117.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gl-117.spec	13 Jan 2005 11:14:36 -0000	1.3
+++ gl-117.spec	3 Mar 2005 21:26:02 -0000	1.4
@@ -1,26 +1,25 @@
 Name:           gl-117
 Version:        1.3.1
 Release:        1
-Epoch:          0
-Summary:        An action flight simulator
+Summary:        Action flight simulator
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.heptargon.de/
 Source0:        http://dl.sf.net/sourceforge/gl-117/gl-117-%{version}-src.tar.bz2
-Source1:	gl-117.desktop
-Source2:	gl-117.png
+Source1:        gl-117.desktop
+Source2:        gl-117.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, SDL_mixer-devel
-BuildRequires:	XFree86-devel, freeglut-devel
-BuildRequires:	desktop-file-utils
+BuildRequires:  XFree86-devel, freeglut-devel
+BuildRequires:  desktop-file-utils
 
 %description
-GL-117 is an action flight simulator for Linux/Unix and MSWindows. Enter the 
-Eagle Squadron and succeed in several challanging missions leading though 
-different landscapes. Five predefined levels of video quality and an amount of 
-viewing ranges let you perfectly adjust the game to the performance of your 
+GL-117 is an action flight simulator for Linux/Unix and MSWindows. Enter the
+Eagle Squadron and succeed in several challanging missions leading though
+different landscapes. Five predefined levels of video quality and an amount of
+viewing ranges let you perfectly adjust the game to the performance of your
 system. Joystick, mouse, sound effects, music...
 
 %prep
@@ -39,8 +38,8 @@
 install -m 644 doc/%{name}.6 $RPM_BUILD_ROOT/%{_mandir}/man6/
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-		     --add-category X-Fedora \
-		     --vendor fedora %{SOURCE1} 
+    --add-category X-Fedora \
+    --vendor fedora %{SOURCE1}
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gnome-common/devel gnome-common.spec,1.3,1.4
Message-ID: <200503032126.j23LQ50O018604@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnome-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gnome-common/devel

Modified Files:
	gnome-common.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gnome-common.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-common/devel/gnome-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-common.spec	27 Nov 2004 15:33:14 -0000	1.3
+++ gnome-common.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -1,8 +1,7 @@
 Name:           gnome-common
 Version:        2.8.0
 Release:        1
-Epoch:          0
-Summary:        Useful things common to building gnome packages from scratch.
+Summary:        Useful things common to building gnome packages from scratch
 
 Group:          Development/Tools
 BuildArch:      noarch
@@ -66,7 +65,7 @@
 - Removed Requires.  Although gnome-common still requires autoconf and
   friends, it doesn't require a specific version of them.  There's no virtual
   provides in the automake14,15,16,17 automake packages that could help here.
-  
+
 * Mon Mar 22 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.4.0-0.fdr.3
 - Add COPYING file to the docs
 - Add bin/Changelog to the docs as ChangeLog.bin



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gnome-telnet/devel gnome-telnet.spec,1.4,1.5
Message-ID: <200503032126.j23LQ5Qf018608@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnome-telnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gnome-telnet/devel

Modified Files:
	gnome-telnet.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gnome-telnet.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-telnet/devel/gnome-telnet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-telnet.spec	10 Dec 2004 22:03:03 -0000	1.4
+++ gnome-telnet.spec	3 Mar 2005 21:26:03 -0000	1.5
@@ -1,24 +1,21 @@
-Summary:	A fancy GNOME telnet client.
+Summary:	Fancy GNOME telnet client
 Name: 		gnome-telnet
 Version: 	2.5
 Release: 	4
-Epoch:		0
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.cyest.org/
 Source0: 	http://www.cyest.org/downloads/%{name}-%{version}.tar.bz2
 Patch1:		gnome-telnet-2.5-default-font.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Provides:	GTelnet = %{epoch}:%{version}-%{release}
+Provides:	GTelnet = %{version}-%{release}
 BuildRequires:	gnome-libs-devel gettext automake14 desktop-file-utils
 
-#---------------------------------------------------------------------
 
 %description
 GTelnet (gnome-telnet) is a pretty, powerful, and fancy 3-in-1 GNOME1
 client for telnet, ssh, and rlogin. It supports both SSH2 and OpenSSH.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
@@ -26,28 +23,26 @@
 rm config.{sub,guess,cache}
 automake-1.4 -a -c -i
 
-#---------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT  %{name}.desktop
 %makeinstall
 %find_lang %{name}
 
-grep -v en_US.ISO8859-1 share/GTelnet.desktop |	\
-	sed 's|/usr/bin/||g;s|/usr/share/pixmaps/||g' > %{name}.desktop
+grep -v en_US.ISO8859-1 share/GTelnet.desktop | \
+    sed 's|/usr/bin/||g;s|/usr/share/pixmaps/||g' > %{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications $RPM_BUILD_ROOT%{_datadir}/pixmaps
 desktop-file-install --vendor fedora            \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora                     \
     --add-category Application                  \
-    --add-category Network	                \
+    --add-category Network                      \
     %{name}.desktop
 
 cd share
@@ -56,12 +51,10 @@
   install -m 0644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps
 done
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -70,7 +63,6 @@
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/*
 
-#---------------------------------------------------------------------
 
 %changelog
 * Sun Aug 17 2003 Dams <anvil[AT]livna.org> 0:2.5-0.fdr.4
@@ -86,5 +78,5 @@
 - Added html doc
 - Fixed typo in Provides
 
-* Wed Apr 23 2003 Dams <anvil[AT]livna.org> 
+* Wed Apr 23 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gkrellm-weather/devel gkrellm-weather.spec,1.5,1.6
Message-ID: <200503032126.j23LQ4D2018568@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-weather/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gkrellm-weather/devel

Modified Files:
	gkrellm-weather.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gkrellm-weather.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-weather/devel/gkrellm-weather.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gkrellm-weather.spec	23 Nov 2004 23:16:21 -0000	1.5
+++ gkrellm-weather.spec	3 Mar 2005 21:26:02 -0000	1.6
@@ -1,19 +1,18 @@
 %define plugdir %{_libdir}/gkrellm2/plugins
 %define datadir %{_datadir}/gkrellm2
 
-Summary:        GKrellWeather is a weather plugin for GKrellM
+Summary:        Weather plugin for GKrellM
 Name:           gkrellm-weather
 Version:        2.0.6
 Release:        2
-Epoch:          0
 License:        GPL
 Group:          Applications/System
 URL:            http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
-Source0:  http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/gkrellweather-2.0.6.tgz
+Source:   http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/gkrellweather-2.0.6.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-BuildRequires:  perl, gtk2-devel, gkrellm-devel >= 0:2, gettext
-Requires:       gkrellm >= 0:2
+BuildRequires:  perl, gtk2-devel, gkrellm-devel >= 2, gettext
+Requires:       gkrellm >= 2
 
 %description
 %{summary}.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gpgme03/devel gpgme03.spec,1.7,1.8
Message-ID: <200503032126.j23LQ5s5018633@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gpgme03/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gpgme03/devel

Modified Files:
	gpgme03.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gpgme03.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme03/devel/gpgme03.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gpgme03.spec	17 Jan 2005 11:24:04 -0000	1.7
+++ gpgme03.spec	3 Mar 2005 21:26:03 -0000	1.8
@@ -2,7 +2,6 @@
 Name:           gpgme03
 Version:        0.3.16
 Release:        7
-Epoch:          0
 License:        GPL
 Group:          Applications/System
 Source:         ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-0.3.16.tar.gz
@@ -10,8 +9,8 @@
 Patch1:         gpgme-0.3.16-underquoted.patch
 URL:            http://www.gnupg.org/related_software/gpgme/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gnupg >= 0:1.2.0
-Requires:       gnupg >= 0:1.2.0
+BuildRequires:  gnupg >= 1.2.0
+Requires:       gnupg >= 1.2.0
 
 %description
 GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier
@@ -21,10 +20,10 @@
 %package        devel
 Summary:        Software development files for GnuPG Made Easy
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
-Conflicts:	gpgme-devel
+Conflicts:      gpgme-devel
 
 %description    devel
 Static library, object and header files for GnuPG Made Easy (GPGME).



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gpa/devel gpa.spec,1.3,1.4
Message-ID: <200503032126.j23LQ5Ci018624@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gpa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gpa/devel

Modified Files:
	gpa.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gpa.spec
===================================================================
RCS file: /cvs/extras/rpms/gpa/devel/gpa.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gpa.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gpa.spec	3 Mar 2005 21:26:03 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           gpa
 Version:        0.7.0
 Release:        2
-Epoch:          0
 Summary:        Graphical user interface for GnuPG
 
 Group:          Applications/System
@@ -13,8 +12,8 @@
 Patch1:         %{name}-keytable-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 0:2.0.0, zlib-devel, desktop-file-utils
-BuildRequires:  gnupg >= 0:1.2.1-3, gpgme-devel >= 0:0.4.3, gettext
+BuildRequires:  gtk2-devel >= 2.0.0, zlib-devel, desktop-file-utils
+BuildRequires:  gnupg >= 1.2.1-3, gpgme-devel >= 0.4.3, gettext
 
 %description
 GNU Privacy Assistant (GPA) is a graphical frontend for the GNU



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gpgme/devel gpgme.spec,1.6,1.7
Message-ID: <200503032126.j23LQ5rY018629@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gpgme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gpgme/devel

Modified Files:
	gpgme.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gpgme.spec	1 Feb 2005 19:52:10 -0000	1.6
+++ gpgme.spec	3 Mar 2005 21:26:03 -0000	1.7
@@ -1,6 +1,4 @@
-
-Name:	 gpgme
-Epoch:	 0
+Name:    gpgme
 Version: 1.0.2
 Release: 1%{?dist_tag}
 Summary: GnuPG Made Easy - high level crypto API
@@ -9,17 +7,17 @@
 URL:     http://www.gnupg.org/related_software/gpgme/
 Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2.sig
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gnupg >= 0:1.2.2
-BuildRequires: gnupg2 >= 0:1.9.6
+BuildRequires: gnupg >= 1.2.2
+BuildRequires: gnupg2 >= 1.9.6
 BuildRequires: pth-devel
-BuildRequires: libgpg-error-devel >= 0:0.5
+BuildRequires: libgpg-error-devel >= 0.5
 
-Requires: gnupg >= 0:1.2.2
-Requires: gnupg2 >= 0:1.9.6
+Requires: gnupg >= 1.2.2
+Requires: gnupg2 >= 1.9.6
 
-Obsoletes: cryptplug <= 0:0.3.16-2
+Obsoletes: cryptplug <= 0.3.16-2
 
 %description
 GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
@@ -30,7 +28,7 @@
 %package devel
 Summary:  Static libraries and header files from GPGME, GnuPG Made Easy
 Group:    Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: libgpg-error-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
@@ -58,7 +56,7 @@
 
 
 %check || :
-make check 
+make check
 
 
 %clean



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:05 -0500
Subject: rpms/gnupg2/devel gnupg2.spec,1.2,1.3
Message-ID: <200503032126.j23LQ5dX018620@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gnupg2/devel

Modified Files:
	gnupg2.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnupg2.spec	2 Feb 2005 17:20:20 -0000	1.2
+++ gnupg2.spec	3 Mar 2005 21:26:03 -0000	1.3
@@ -1,18 +1,17 @@
 # $Id$
 
 Summary: GNU utility for secure communication and data storage
-Name:	 gnupg2 
-Epoch:	 0 
+Name:    gnupg2
 Version: 1.9.15
 Release: 1%{?dist_tag}
 License: GPL
-Group: 	 Applications/System
+Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
-URL:	 http://www.gnupg.org/
+URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Obsoletes: newpg < 0:0.9.5
+Obsoletes: newpg < 0.9.5
 
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
@@ -24,11 +23,11 @@
 %define pie 1
 %endif
 
-BuildRequires: libgcrypt-devel => 0:1.2.0
+BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.0
 Requires: libgpg-error >= 1.0
 BuildRequires: libassuan-devel >= 0.6.9
-BuildRequires: libksba-devel >= 0:0.9.7
+BuildRequires: libksba-devel >= 0.9.7
 # to build without opensc support: --without opensc
 %{!?_without_opensc:BuildRequires: opensc-devel >= 0.9}
 %{!?_without_opensc:BuildRequires: pcsc-lite-devel }
@@ -43,11 +42,11 @@
 Buildrequires: libusb-devel
 BuildRequires: docbook-utils
 
-Requires: pinentry >= 0:0.7.1
+Requires: pinentry >= 0.7.1
 
 # Should these be versioned?  -- Rex
-Provides: gpg 
-Provides: openpgp 
+Provides: gpg
+Provides: openpgp
 
 %description
 GnuPG 1.9 is the future version of GnuPG; it is based on the gnupg-1.3
@@ -72,7 +71,7 @@
 
 %configure \
   --program-prefix="%{?_program_prefix}" \
-  --disable-rpath 
+  --disable-rpath
 
 make %{?_smp_mflags}
 
@@ -139,7 +138,7 @@
 - BR: libassuan-devel >= 0.6.9
 
 * Thu Oct 21 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.11-0.fdr.4
-- remove suid. 
+- remove suid.
 
 * Thu Oct 21 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.11-0.fdr.3
 - remove Provides: newpg
@@ -150,6 +149,6 @@
 - update description
 
 * Tue Oct 19 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.11-0.fdr.1
-- first try 
+- first try
 - leave out opensc support (for now), enable --with-opensc
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:26:04 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:26:04 -0500
Subject: rpms/gkrellm-themes/devel gkrellm-themes.spec,1.4,1.5
Message-ID: <200503032126.j23LQ43a018560@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18381/gkrellm-themes/devel

Modified Files:
	gkrellm-themes.spec 
Log Message:
Mass letter "g" update (and some missed before), one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: gkrellm-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-themes/devel/gkrellm-themes.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gkrellm-themes.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ gkrellm-themes.spec	3 Mar 2005 21:26:02 -0000	1.5
@@ -1,14 +1,13 @@
-Summary:        Some themes for the GNU Krell Monitor.
+Summary:        Some themes for the GNU Krell Monitor
 Name:           gkrellm-themes
 Version:        2.1.9
 Release:        1
-Epoch:          0
 License:        GPL
 Group:          Applications/System
 Source:         gkrellm-themes.tar.bz2
 URL:            http://muhri.net/gkrellm/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:       gkrellm >= 0:2.0.0
+Requires:       gkrellm >= 2.0.0
 BuildRequires:  /usr/bin/find
 BuildArch:      noarch
 
@@ -22,15 +21,14 @@
 This package contains various themes to use with GKrellM. You will of
 course have to install the main GKrellM package to use them.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}
 
-#---------------------------------------------------------------------
 
 %build
 
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_datadir}/gkrellm2/themes
@@ -39,18 +37,15 @@
 find . -name ".xvpics" | xargs rm -rf
 find . -type d -name "CVS" | xargs rm -rf
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf %{buildroot}
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(0644,root,root,0755)
 %{_datadir}/gkrellm2/themes/*
 
-#---------------------------------------------------------------------
 
 %changelog
 * Tue Apr  8 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.1.9-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:24 -0500
Subject: rpms/irssi/devel irssi.spec,1.5,1.6
Message-ID: <200503032146.j23LkOxj019540@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/irssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/irssi/devel

Modified Files:
	irssi.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: irssi.spec
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- irssi.spec	29 Jan 2005 16:42:13 -0000	1.5
+++ irssi.spec	3 Mar 2005 21:46:22 -0000	1.6
@@ -1,51 +1,46 @@
 %define		perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
-Summary: 	Modular text mode IRC client with Perl scripting
-Name: 		irssi
-Version: 	0.8.9
-Release: 	5
-Epoch: 		0
-License: 	GPL
-Group: 		Applications/Communications
-URL: 		http://irssi.org/
-Source0: 	http://irssi.org/files/%{name}-%{version}.tar.bz2
+Summary:	Modular text mode IRC client with Perl scripting
+Name:		irssi
+Version:	0.8.9
+Release:	5
+License:	GPL
+Group:		Applications/Communications
+URL:		http://irssi.org/
+Source0:	http://irssi.org/files/%{name}-%{version}.tar.bz2
 Source1:	http://wouter.coekaerts.be/irssi/scripts/replace.pl
 Source2:	http://wouter.coekaerts.be/irssi/scripts/trigger.pl
 Source3:	http://wouter.coekaerts.be/irssi/scripts/convert-replace-trigger.pl
 Patch1:		convert-replace-trigger.pl-fixpath-patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel openssl-devel zlib-devel pkgconfig gc-devel
 %{?_with_glib1:BuildRequires:	glib-devel}
 %{!?_with_glib1:BuildRequires:	glib2-devel}
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# ----------------------------------------------------------------------------
 
 %description
 Irssi is a modular IRC client with Perl scripting. Only text-mode
 frontend is currently supported. The GTK/GNOME frontend is no longer
 being maintained.
 
-# ----------------------------------------------------------------------------
 
 %prep
 %setup -q
 install -m 0644 %{SOURCE3} .
 %patch1 -p0
 
-# ----------------------------------------------------------------------------
 
 %build
 %configure --enable-ipv6 --with-textui	\
-%{?_with_glib1:	 --with-glib1}		\
-	 --with-proxy			\
-	 --with-bot			\
-	 --with-perl=module		\
-	 --with-perl-lib=vendor --with-gc
+%{?_with_glib1:	--with-glib1}		\
+	--with-proxy			\
+	--with-bot			\
+	--with-perl=module		\
+	--with-perl-lib=vendor --with-gc
 make %{?_smp_mflags}
 
-# ----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,7 +51,7 @@
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
 
 # Clean up
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a 
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a
 rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
 find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name '*.bs' -a -empty -exec rm -f {} ';'
 find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name .packlist -exec rm {} ';'
@@ -64,12 +59,10 @@
 # Fix permissions
 chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch}
 
-# ----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# ----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
@@ -83,7 +76,6 @@
 %{perl_vendorarch}/Irssi*
 %{perl_vendorarch}/auto/Irssi
 
-# ----------------------------------------------------------------------------
 
 %changelog
 * Fri Dec 24 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.8.9-5
@@ -135,7 +127,7 @@
 - Added zlib-devel buildrequires
 
 * Sat Jul 12 2003 Dams <anvil[AT]livna.org> 0:0.8.6-0.fdr.6
-- Applied Patches from Ville Skytt?? (bug #277 comment #11 and 
+- Applied Patches from Ville Skytt?? (bug #277 comment #11 and
   comment #12)
 
 * Mon Jun 23 2003 Dams <anvil[AT]livna.org> 0:0.8.6-0.fdr.5
@@ -151,5 +143,5 @@
 - Exclude modules ".a" files
 - Include more files as doc
 
-* Sat May 10 2003 Dams <anvil[AT]livna.org> 
+* Sat May 10 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/http_ping/devel http_ping.spec,1.4,1.5
Message-ID: <200503032146.j23LkNYb019492@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/http_ping/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/http_ping/devel

Modified Files:
	http_ping.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: http_ping.spec
===================================================================
RCS file: /cvs/extras/rpms/http_ping/devel/http_ping.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- http_ping.spec	10 Dec 2004 22:03:03 -0000	1.4
+++ http_ping.spec	3 Mar 2005 21:46:21 -0000	1.5
@@ -1,7 +1,6 @@
 Name:           http_ping
 Version:        0.0
 Release:        2.20020403
-Epoch:          0
 Summary:        HTTP latency measuring utility
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/i810switch/devel i810switch.spec,1.1,1.2
Message-ID: <200503032146.j23LkNjJ019500@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/i810switch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/i810switch/devel

Modified Files:
	i810switch.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/i810switch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- i810switch.spec	25 Jan 2005 16:49:20 -0000	1.1
+++ i810switch.spec	3 Mar 2005 21:46:21 -0000	1.2
@@ -1,8 +1,7 @@
 Name: i810switch
 Version: 0.6.2
 Release: 3
-Epoch: 0
-Summary: A utility for switching the LCD and external VGA displays on and off
+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/
@@ -11,23 +10,20 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pciutils
 
-%description 
+%description
 i810switch is a utility for switching the LCD and external VGA
 displays on and off under Linux. It was originally written by Antonino
 Daplas, and is now maintained by Ken Mano.
 
 %prep
 %setup -q
-%patch -p1 -b .buildroot 
+%patch -p1 -b .buildroot
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%{!?makeinstall: %define makeinstall make install DESTDIR=$RPM_BUILD_ROOT bindir=$RPM_BUILD_ROOT%{_bindir} mandir=$RPM_BUILD_ROOT%{_mandir} }
-
 %makeinstall
 
 %clean



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:24 -0500
Subject: rpms/ip-sentinel/devel ip-sentinel.spec,1.2,1.3
Message-ID: <200503032146.j23LkObC019536@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/ip-sentinel/devel

Modified Files:
	ip-sentinel.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ip-sentinel.spec
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ip-sentinel.spec	8 Feb 2005 23:25:24 -0000	1.2
+++ ip-sentinel.spec	3 Mar 2005 21:46:22 -0000	1.3
@@ -44,18 +44,17 @@
 
 %{!?release_func:%global release_func() %1}
 
-Summary:	A tool to prevent unauthorized usage of IPs
+Summary:	Tool to prevent unauthorized usage of IP addresses
 Name:		ip-sentinel
 Version:	0.11
 Release:	%release_func 1
-Epoch:		0
 License:	GPL
 Group:		System Environment/Daemons
 URL:		http://www.tu-chemnitz.de/~ensc/ip-sentinel
 Source0:	http://www.tu-chemnitz.de/~ensc/ip-sentinel/files/%name-%version.tar.bz2
 Source1:	http://www.tu-chemnitz.de/~ensc/ip-sentinel/files/%name-%version.tar.bz2.asc
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
-Requires:		init(ip-sentinel)
+Requires:	init(ip-sentinel)
 
 %{!?_without_dietlibc:BuildRequires:	dietlibc}
 
@@ -70,8 +69,8 @@
 Summary:		SysV initscripts for ip-sentinel
 Group:			System Environment/Base
 Provides:		init(ip-sentinel)
-Requires(preun):	%name = %epoch:%version-%release
-Requires(postun):	%name = %epoch:%version-%release
+Requires(preun):	%name = %version-%release
+Requires(postun):	%name = %version-%release
 Requires(preun):	initscripts
 Requires(postun):	initscripts
 Requires(post):		/sbin/chkconfig
@@ -112,14 +111,12 @@
 with the minit initconcept.
 
 
-##---------------------------------------------
 
 
 %prep
 %setup -q
 
 
-##---------------------------------------------
 
 
 %build
@@ -129,7 +126,6 @@
 %__make %{?_smp_mflags} all
 
 
-##---------------------------------------------
 
 
 %install
@@ -141,21 +137,18 @@
 %{?_without_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 
 
-##---------------------------------------------
 
 
 %check
 %__make check
 
 
-##---------------------------------------------
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-##---------------------------------------------
 
 
 %pre



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/htmltmpl/devel htmltmpl.spec,1.7,1.8
Message-ID: <200503032146.j23LkNZW019488@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/htmltmpl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/htmltmpl/devel

Modified Files:
	htmltmpl.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: htmltmpl.spec
===================================================================
RCS file: /cvs/extras/rpms/htmltmpl/devel/htmltmpl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- htmltmpl.spec	16 Dec 2004 17:36:24 -0000	1.7
+++ htmltmpl.spec	3 Mar 2005 21:46:21 -0000	1.8
@@ -3,7 +3,6 @@
 Name:           htmltmpl
 Version:        1.22
 Release:        5
-Epoch:          0
 Summary:        Templating engine for separation of code and HTML
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:24 -0500
Subject: rpms/inti/devel inti.spec,1.2,1.3
Message-ID: <200503032146.j23LkOgG019532@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/inti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/inti/devel

Modified Files:
	inti.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: inti.spec
===================================================================
RCS file: /cvs/extras/rpms/inti/devel/inti.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- inti.spec	8 Nov 2004 04:36:47 -0000	1.2
+++ inti.spec	3 Mar 2005 21:46:21 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           inti
 Version:        1.2
-Release:        0.fdr.5.1
-Epoch:          0
+Release:        1
 Summary:        Integrated Foundation Classes for GNOME and GTK+
 
 Group:          System Environment/Libraries
@@ -9,7 +8,7 @@
 URL:            http://inti.sourceforge.net
 Source:         http://download.sourceforge.net/inti/inti-1.2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gtk2-devel >= 0:2.2.1
+BuildRequires:  gtk2-devel >= 2.2.1
 
 %description
 The Integrated Foundation Classes are a set of C++ classes for
@@ -21,27 +20,27 @@
 %package        devel
 Summary:        Development tools for Inti applications
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:	gtk2-devel >= 0:2.2.1, pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       gtk2-devel >= 2.2.1, pkgconfig
 
 %description    devel
 Static libraries and header files needed for developing Inti
 applications.
 
-%package	docs
-Summary:	Documentation for Inti
-Group:		Documentation
-Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+%package        docs
+Summary:        Documentation for Inti
+Group:          Documentation
+Requires:       %{name}-devel = %{version}-%{release}
 
-%description	docs
+%description    docs
 Documentation for the Integrated Foundation Classes.
 
-%package	demo
-Summary:	Inti demo
-Group:		Documentation
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+%package        demo
+Summary:        Inti demo
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
 
-%description	demo
+%description    demo
 Demonstration program for Inti.
 
 %prep



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/id3-py/devel id3-py.spec,1.6,1.7
Message-ID: <200503032146.j23LkNMa019512@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/id3-py/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/id3-py/devel

Modified Files:
	id3-py.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: id3-py.spec
===================================================================
RCS file: /cvs/extras/rpms/id3-py/devel/id3-py.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- id3-py.spec	16 Dec 2004 18:13:17 -0000	1.6
+++ id3-py.spec	3 Mar 2005 21:46:21 -0000	1.7
@@ -3,7 +3,6 @@
 Name:           id3-py
 Version:        1.2
 Release:        6
-Epoch:          0
 Summary:        Python ID3 tag library
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/hunt/devel hunt.spec,1.5,1.6
Message-ID: <200503032146.j23LkN7K019496@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/hunt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/hunt/devel

Modified Files:
	hunt.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: hunt.spec
===================================================================
RCS file: /cvs/extras/rpms/hunt/devel/hunt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hunt.spec	3 Mar 2005 13:44:44 -0000	1.5
+++ hunt.spec	3 Mar 2005 21:46:21 -0000	1.6
@@ -1,12 +1,11 @@
-## $Id$
+# $Id$
 
 %{!?release_func:%define release_func() %1%{?disttag}}
 
-Summary:	A tool for demonstrating well known weaknesses in the TCP/IP protocol suite.
+Summary:	Tool for demonstrating well known weaknesses in the TCP/IP protocol suite
 Name:		hunt
 Version:	1.5
 Release:	%release_func 3
-Epoch:		0
 License:	GPL
 Group:		Applications/Internet
 Source:		http://lin.fsid.cvut.cz/~kra/hunt/%{name}-%{version}.tgz
@@ -44,7 +43,7 @@
 
 
 %build
-%{__make} %{?_smp_mflags} all CFLAGS="$RPM_OPT_FLAGS -D_REENTRANT" 
+%{__make} %{?_smp_mflags} all CFLAGS="$RPM_OPT_FLAGS -D_REENTRANT"
 
 
 %install
@@ -52,7 +51,7 @@
 
 %{__install} -d $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_mandir}/man1 \
                 $RPM_BUILD_ROOT%{_libdir}/%{name}
-		
+
 %{__install} -p hunt          $RPM_BUILD_ROOT%{_sbindir}/
 %{__install} -p tpsetup/*     $RPM_BUILD_ROOT%{_libdir}/%{name}/
 %{__install} -p -m644 man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -93,7 +92,7 @@
 
 * Wed Jun  6 2001 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - added %defattr(-,root,root)
- 
+
 * Fri Jun  1 2001 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - typo
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/id3lib/devel id3lib.spec,1.5,1.6
Message-ID: <200503032146.j23LkNNq019508@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/id3lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/id3lib/devel

Modified Files:
	id3lib.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: id3lib.spec
===================================================================
RCS file: /cvs/extras/rpms/id3lib/devel/id3lib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- id3lib.spec	10 Dec 2004 22:03:03 -0000	1.5
+++ id3lib.spec	3 Mar 2005 21:46:21 -0000	1.6
@@ -1,23 +1,21 @@
-Summary: 	An Open-Source library for manipulating ID3v1 and ID3v2 tags.
-Name: 		id3lib
-Version: 	3.8.3
-Release: 	9
-Epoch:		0
-License: 	LGPL
-Group: 		System Environment/Libraries
-URL: 		http://id3lib.sourceforge.net/
-Source0: 	http://download.sf.net/id3lib/%{name}-%{version}.tar.gz
+Summary:	Library for manipulating ID3v1 and ID3v2 tags
+Name:		id3lib
+Version:	3.8.3
+Release:	9
+License:	LGPL
+Group:		System Environment/Libraries
+URL:		http://id3lib.sourceforge.net/
+Source0:	http://download.sf.net/id3lib/%{name}-%{version}.tar.gz
 Patch0:		id3lib-dox.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	zlib-devel doxygen
 
 %package devel
-Summary:	Development tools for the id3lib.
+Summary:	Development tools for the id3lib library
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	zlib-devel
 
-#---------------------------------------------------------------------
 
 %description
 This package provides a software library for manipulating ID3v1 and
@@ -31,40 +29,35 @@
 %description devel
 This package provides files needed to develop with the id3lib.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
 %patch0 -p0
 
-#---------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 make docs
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
-%exclude %{_libdir}/libid3.la
 %doc AUTHORS COPYING ChangeLog HISTORY NEWS README THANKS TODO
-%doc doc
+%doc doc/
 %{_libdir}/libid3-3.8.so.*
 %{_bindir}/id3convert
 %{_bindir}/id3cp
@@ -76,9 +69,9 @@
 %{_includedir}/id3.h
 %{_includedir}/id3/
 %{_libdir}/libid3.a
+%exclude %{_libdir}/libid3.la
 %{_libdir}/libid3.so
 
-#---------------------------------------------------------------------
 %changelog
 * Wed Oct 29 2003 Ville Skytta <ville.skytta at iki.fi> - 0:3.8.3-0.fdr.9
 - Rebuild.
@@ -105,5 +98,5 @@
 * Thu Apr  3 2003 Dams <anvil[AT]livna.org> 0:3.8.3-0.fdr.2
 - Added missing epoch requirement
 
-* Wed Apr  2 2003 Dams <anvil[AT]livna.org> 
+* Wed Apr  2 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/iftop/devel iftop.spec,1.5,1.6
Message-ID: <200503032146.j23LkNwN019524@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/iftop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/iftop/devel

Modified Files:
	iftop.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: iftop.spec
===================================================================
RCS file: /cvs/extras/rpms/iftop/devel/iftop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iftop.spec	10 Dec 2004 22:03:04 -0000	1.5
+++ iftop.spec	3 Mar 2005 21:46:21 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           iftop
 Version:        0.16
 Release:        3
-Epoch:          0
 Summary:        Command line tool that displays bandwidth usage on an interface
 
 Group:          Applications/Internet
@@ -37,7 +36,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc COPYING README TODO
 %{_sbindir}/*



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/ifplugd/devel ifplugd.spec,1.3,1.4
Message-ID: <200503032146.j23LkN39019520@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ifplugd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/ifplugd/devel

Modified Files:
	ifplugd.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ifplugd.spec
===================================================================
RCS file: /cvs/extras/rpms/ifplugd/devel/ifplugd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ifplugd.spec	10 Dec 2004 22:03:04 -0000	1.3
+++ ifplugd.spec	3 Mar 2005 21:46:21 -0000	1.4
@@ -1,15 +1,14 @@
-Summary:    Detect and take action when an ethernet cable is unplugged
+Summary: Detect and take action when an ethernet cable is unplugged
 Name: ifplugd
 Version: 0.24
 Release: 5
 License: GPL
-Epoch: 0
 Group: System Environment/Daemons
 URL: http://0pointer.de/lennart/projects/ifplugd
 Source0: http://0pointer.de/lennart/projects/ifplugd/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libdaemon >= 0:0.5
-BuildRequires: libdaemon >= 0:0.5, pkgconfig
+Requires: libdaemon >= 0.5
+BuildRequires: libdaemon >= 0.5, pkgconfig
 
 %description
 ifplugd is a Linux daemon which will automatically configure your
@@ -25,6 +24,7 @@
 %build
 %configure --prefix=/ --disable-lynx --disable-xmltoman --disable-subversion
 make %{?_smp_mflags} all
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -p -D -m755 src/ifplugd $RPM_BUILD_ROOT/%{_sbindir}/ifplugd
@@ -35,6 +35,7 @@
 install -p -D man/ifplugd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5/ifplugd.conf.5
 install -p -D man/ifplugd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ifplugd.8
 install -p -D man/ifplugstatus.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ifplugstatus.8
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -49,10 +50,10 @@
 %{_mandir}/man8/ifplugstatus.8*
 %doc README LICENSE
 
-%post 
+%post
 /sbin/chkconfig --add ifplugd
 
-%preun 
+%preun
 /sbin/chkconfig --del ifplugd
 
 %changelog
@@ -62,7 +63,7 @@
 
 * Thu Jun  3 2004  <aaron.bennett at olin.edu> - 0:0.24-0.fdr.4
 - renamed confpatches.patch to ifplugd-0.24-confpatches.patch
-- used %config for /etc/init.d/ifplugd 
+- used %config for /etc/init.d/ifplugd
 - added %config(noreplace) for /etc/ifplugd/*
 - removed patch
 
@@ -78,7 +79,7 @@
 * Mon May 3 2004 <aaron.bennett at olin.edu>
 - Revamped for Fedora.us packaging guidelines
 
-* Wed Mar 31 2004  <abennett at olin.edu> 
+* Wed Mar 31 2004  <abennett at olin.edu>
 - Initial build.
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:24 -0500
Subject: rpms/imlib2/devel imlib2.spec,1.9,1.10
Message-ID: <200503032146.j23LkNVC019529@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/imlib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/imlib2/devel

Modified Files:
	imlib2.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- imlib2.spec	9 Feb 2005 22:06:39 -0000	1.9
+++ imlib2.spec	3 Mar 2005 21:46:21 -0000	1.10
@@ -1,24 +1,22 @@
-Summary: 	A graphic library for file loading, saving, rendering, and manipulation
-Name: 		imlib2
-Version: 	1.2.0
-Release: 	5
-Epoch:		0
-License: 	BSD
-Group: 		System Environment/Libraries
-URL: 		http://www.enlightenment.org/pages/imlib2.html
-Source0: 	http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
-Patch0:         imlib2-1.2.0-configure-xlib64.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Summary:	Graphic library for file loading, saving, rendering, and manipulation
+Name:		imlib2
+Version:	1.2.0
+Release:	5
+License:	BSD
+Group:		System Environment/Libraries
+URL:		http://www.enlightenment.org/pages/imlib2.html
+Source0:	http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
+Patch0:		imlib2-1.2.0-configure-xlib64.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	XFree86-devel libjpeg-devel libpng-devel libtiff-devel
 BuildRequires:	libungif-devel freetype-devel libtool bzip2-devel %{__perl}
 
 %package devel
-Summary: 	Development package for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
+Summary:	Development package for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 Requires:	XFree86-devel freetype-devel pkgconfig
 
-# -----------------------------------------------------------------------------
 
 %description
 Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is
@@ -36,7 +34,6 @@
 which have very similar functionality. Please see the homepage for the
 long description of the differences.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
@@ -48,7 +45,6 @@
   's|^(\w+_la_LDFLAGS .*)|$1 -L\$(top_builddir)/src/lib| ;
    s|^(\w+_la_LIBADD .*)|$1 -lImlib2|' src/modules/loaders/Makefile.*
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure \
@@ -68,7 +64,6 @@
 
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT __doc
@@ -84,16 +79,15 @@
 # ship .la files due to a bug in kdelibs (see changelog):
 #  $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig 
 
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS README ChangeLog TODO __doc/*
@@ -121,7 +115,6 @@
 %{_libdir}/libImlib2.so
 %{_libdir}/pkgconfig/imlib2.pc
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Wed Feb  9 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2.0-5



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/hping2/devel hping2.spec,1.4,1.5
Message-ID: <200503032146.j23LkNEo019480@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/hping2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/hping2/devel

Modified Files:
	hping2.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: hping2.spec
===================================================================
RCS file: /cvs/extras/rpms/hping2/devel/hping2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hping2.spec	13 Feb 2005 11:49:15 -0000	1.4
+++ hping2.spec	3 Mar 2005 21:46:21 -0000	1.5
@@ -1,12 +1,11 @@
 Name:    hping2
 Version: 2.0.0
 Release: 0.3.rc3
-Epoch:   0 
-Summary: A software to do TCP/IP stack auditing and much more
+Summary: TCP/IP stack auditing and much more
 
 Group: Applications/Internet
 License: GPL
-URL: http://www.hping.org/	
+URL: http://www.hping.org/
 Source0: http://www.hping.org/hping2.0.0-rc3.tar.gz
 Patch0: hping2-include.patch
 Patch1: hping2-x86_64.patch
@@ -43,12 +42,11 @@
 
 %files
 %defattr(0644,root,root,0755)
+%doc COPYING *BUGS CHANGES README TODO docs/AS-BACKDOOR docs/HPING2-HOWTO.txt
+%doc docs/HPING2-IS-OPEN docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man8/*
 
-%doc COPYING *BUGS CHANGES README TODO docs/AS-BACKDOOR docs/HPING2-HOWTO.txt 
-%doc docs/HPING2-IS-OPEN docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt
-
 %changelog
 * Sun Feb 13 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 2.0.0-0.3.rc3
 - Add patch to fix build on x86_64



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/id3v2/devel id3v2.spec,1.5,1.6
Message-ID: <200503032146.j23LkNEP019516@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/id3v2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/id3v2/devel

Modified Files:
	id3v2.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: id3v2.spec
===================================================================
RCS file: /cvs/extras/rpms/id3v2/devel/id3v2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- id3v2.spec	10 Dec 2004 22:03:04 -0000	1.5
+++ id3v2.spec	3 Mar 2005 21:46:21 -0000	1.6
@@ -1,8 +1,7 @@
 Name:           id3v2
 Version:        0.1.11
 Release:        1
-Epoch:          0
-Summary:        A command line id3v2 tag editor
+Summary:        Command line id3v2 tag editor
 
 Group:          Applications/Multimedia
 License:        LGPL



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/htb-util/devel htb-util.spec,1.4,1.5
Message-ID: <200503032146.j23LkNI8019484@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/htb-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/htb-util/devel

Modified Files:
	htb-util.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: htb-util.spec
===================================================================
RCS file: /cvs/extras/rpms/htb-util/devel/htb-util.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- htb-util.spec	10 Dec 2004 22:03:03 -0000	1.4
+++ htb-util.spec	3 Mar 2005 21:46:21 -0000	1.5
@@ -1,28 +1,27 @@
-%define         tartopdir      htb_util-0.2.4-pre1
+%define		tartopdir	htb_util-0.2.4-pre1
 
-Name: 		htb-util
-Version: 	0.2.4
-Release: 	0.3.pre1
-Epoch:		0
-Summary: 	Another tool to make your life easier with HTB
-Group: 		Applications/Internet
-License: 	GPL
-URL: 		http://SGI.rdscv.ro/~ionuts/C/htb-tools/
-Source0: 	http://SGI.rdscv.ro/~ionuts/C/htb_util-0.2.4-pre1.tar.gz
-Patch0: 	htb-util-0.2.4pre1-FC2.patch
-Patch1: 	htb-util-0.2.4pre1-init.d.patch
-Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Name:		htb-util
+Version:	0.2.4
+Release:	0.3.pre1
+Summary:	Another tool to make your life easier with HTB
+Group:		Applications/Internet
+License:	GPL
+URL:		http://SGI.rdscv.ro/~ionuts/C/htb-tools/
+Source0:	http://SGI.rdscv.ro/~ionuts/C/htb_util-0.2.4-pre1.tar.gz
+Patch0:		htb-util-0.2.4pre1-FC2.patch
+Patch1:		htb-util-0.2.4pre1-init.d.patch
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
-Requires: 	perl, sed, bash >= 2.00, iproute
+Requires:	perl, sed, bash >= 2.00, iproute
 
 BuildRequires:	flex
 
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
+Requires(post):		/sbin/chkconfig
+Requires(preun):	/sbin/chkconfig
 
 %description
 htb-util is a set of tools that generates scripts for bandwidth management
-using the HTB queueing discipline and lets you see the traffic passing 
+using the HTB queueing discipline and lets you see the traffic passing
 through each queue in real time.
 
 %prep
@@ -77,7 +76,7 @@
 - added iproute requires
 - rm -rf RPM_BUILD_ROOT upon install
 - corrected default file attributes
-- don't enable htb-util automatically for runlevels 3 and 5, just add the 
+- don't enable htb-util automatically for runlevels 3 and 5, just add the
 service and let the sysadmin do the job
 - added postun
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/ibmonitor/devel ibmonitor.spec,1.6,1.7
Message-ID: <200503032146.j23LkN2c019504@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ibmonitor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/ibmonitor/devel

Modified Files:
	ibmonitor.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ibmonitor.spec
===================================================================
RCS file: /cvs/extras/rpms/ibmonitor/devel/ibmonitor.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ibmonitor.spec	12 Feb 2005 12:42:46 -0000	1.6
+++ ibmonitor.spec	3 Mar 2005 21:46:21 -0000	1.7
@@ -1,7 +1,6 @@
 Name:           ibmonitor
 Version:        1.3
 Release:        1
-Epoch:          0
 Summary:        Interactive bandwidth monitor
 
 Group:          Applications/Internet
@@ -17,35 +16,29 @@
 The program ibmonitor is an interactive linux console application which shows
 bandwidth consumed and total data transferred on all interfaces.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n ibmonitor
 
-# -----------------------------------------------------------------------------
 
 %build
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 install -p -m 0755 ibmonitor $RPM_BUILD_ROOT%{_bindir}
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/ibmonitor
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Sat Feb 12 2005 Adrian Reber <adrian at lisas.de> - 0:1.3-1



From fedora-extras-commits at redhat.com  Thu Mar  3 21:46:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:46:23 -0500
Subject: rpms/hddtemp/devel hddtemp.spec,1.7,1.8
Message-ID: <200503032146.j23LkNG5019476@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419/hddtemp/devel

Modified Files:
	hddtemp.spec 
Log Message:
Mass letter "h" and "i" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hddtemp.spec	22 Jan 2005 13:39:06 -0000	1.7
+++ hddtemp.spec	3 Mar 2005 21:46:21 -0000	1.8
@@ -1,7 +1,6 @@
 Name:           hddtemp
 Version:        0.3
 Release:        0.2.beta12
-Epoch:          0
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/kickpim/devel kickpim.spec,1.5,1.6
Message-ID: <200503032156.j23LugEw019957@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kickpim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19897/kickpim/devel

Modified Files:
	kickpim.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: kickpim.spec
===================================================================
RCS file: /cvs/extras/rpms/kickpim/devel/kickpim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kickpim.spec	10 Feb 2005 16:50:58 -0000	1.5
+++ kickpim.spec	3 Mar 2005 21:56:40 -0000	1.6
@@ -1,14 +1,13 @@
 # $Id$
 
-Name:	 kickpim
+Name:    kickpim
 Summary: KDE kicker applet to access addressbook
-Epoch:	 0
 Version: 0.5.3
 Release: 5%{?dist_tag}
 License: GPL
-Group:	 Applications/Productivity
-URL:	 http://kickpim.sourceforge.net/
-Source:	 http://dl.sourceforge.net/sourceforge/kickpim/kickpim-0.5.3.tar.bz2
+Group:   Applications/Productivity
+URL:     http://kickpim.sourceforge.net/
+Source:  http://dl.sourceforge.net/sourceforge/kickpim/kickpim-0.5.3.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 # remove build dep on qt-3.2
@@ -25,7 +24,7 @@
 BuildRequires: kdepim-devel >= 6:3.1
 Requires: kdebase
 
-# Dynamically determine qt,kdelibs dependancies, depending on 
+# Dynamically determine qt,kdelibs dependancies, depending on
 # what we're built against.
 BuildRequires: qt-devel >= 1:3.1
 %define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f-2)
@@ -83,7 +82,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-
 %changelog
 * Mon Feb 07 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.5.3-5
 - fix x86_64 build (#147332)



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/jasper/devel jasper.spec,1.2,1.3
Message-ID: <200503032156.j23Lugso019933@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/jasper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19897/jasper/devel

Modified Files:
	jasper.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jasper.spec	10 Dec 2004 22:03:04 -0000	1.2
+++ jasper.spec	3 Mar 2005 21:56:40 -0000	1.3
@@ -7,13 +7,12 @@
 # netpbm
 
 Summary: Implementation of the JPEG-2000 standard, Part 1
-Name:	 jasper
+Name:    jasper
 License: JasPer License Version 2.0
-Group:	 System Environment/Libraries
-Epoch:	 0
+Group:   System Environment/Libraries
 Version: 1.701.0
 Release: 3%{?dist_tag}
-URL: 	 http://www.ece.uvic.ca/~mdadams/jasper/
+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
 
@@ -28,9 +27,10 @@
 %package devel
 Summary: JPEG-2000 library developer files
 Group:   Development/Libraries
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
 Requires: libjpeg-devel
-%description devel 
+
+%description devel
 JPEG-2000 library developer files.
 
 
@@ -42,14 +42,14 @@
 %configure \
   --program-prefix="%{?_program_prefix}" \
   --disable-dependency-tracking \
-  --enable-shared --disable-static 
+  --enable-shared --disable-static
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT  
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # Unpackaged files
 rm -f doc/README
@@ -64,11 +64,11 @@
 
 %files
 %defattr(-,root,root)
-%doc COPYRIGHT LICENSE NEWS README 
+%doc COPYRIGHT LICENSE NEWS README
 %{_bindir}/*
 %{_libdir}/lib*.so.*
 
-%files devel 
+%files devel
 %defattr(-,root,root)
 %doc doc/*
 %{_includedir}/*
@@ -84,7 +84,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%changelog 
+%changelog
 * Sat Oct 23 2004 Rex Dieter <rexdieter at sf.net> 0:1.701.0-0.fdr.3
 - Capitalize summary
 - remove 0-length ChangeLog



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/kover/devel kover.spec,1.6,1.7
Message-ID: <200503032156.j23LugZv019969@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kover/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19897/kover/devel

Modified Files:
	kover.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: kover.spec
===================================================================
RCS file: /cvs/extras/rpms/kover/devel/kover.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kover.spec	13 Feb 2005 11:39:12 -0000	1.6
+++ kover.spec	3 Mar 2005 21:56:40 -0000	1.7
@@ -2,7 +2,6 @@
 Summary: WYSIWYG CD cover printer with CDDB support
 Version: 2.9.6
 Release: 1
-Epoch: 0
 License: GPL
 Group: Applications/Publishing
 Source0 http://lisas.de/kover/kover-2.9.6.tar.gz
@@ -14,7 +13,7 @@
 BuildRequires: libart_lgpl-devel, libpng-devel
 
 %description
-Kover is an easy to use WYSIWYG CD cover printer with CDDB support. 
+Kover is an easy to use WYSIWYG CD cover printer with CDDB support.
 
 %prep
 %setup -q
@@ -45,7 +44,7 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS README COPYING TODO NEWS THANKS ChangeLog  
+%doc AUTHORS README COPYING TODO NEWS THANKS ChangeLog
 %{_datadir}/apps/kover/koverui.rc
 %{_datadir}/icons/*/*/*/*
 %dir %{_datadir}/apps/kover
@@ -54,7 +53,7 @@
 %{_datadir}/mimelnk/application/x-kover.desktop
 %{_mandir}/man1/*
 %{_datadir}/applications/*
-%attr(755,root,root)%{_bindir}/kover 
+%attr(755,root,root)%{_bindir}/kover
 %attr(755,root,root)%{_bindir}/cddb-id
 %attr(755,root,root)%{_bindir}/cd-text
 
@@ -71,7 +70,7 @@
 - removed the INSTALL file from package and added the NEWS file
 
 * Sat Apr 26 2003 Adrian Reber <adrian at lisas.de> - 0:2.9.3-0.fdr.5
-- added the directories %{_datadir}/apps/kover and 
+- added the directories %{_datadir}/apps/kover and
   %{_datadir}/apps/kover/pics to the file list
 
 * Wed Apr 23 2003 Adrian Reber <adrian at lisas.de> - 0:2.9.3-0.fdr.4



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/kid3/devel kid3.spec,1.4,1.5
Message-ID: <200503032156.j23Lugee019962@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kid3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19897/kid3/devel

Modified Files:
	kid3.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/devel/kid3.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kid3.spec	19 Dec 2004 16:36:05 -0000	1.4
+++ kid3.spec	3 Mar 2005 21:56:40 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           kid3
 Version:        0.5
 Release:        2
-Epoch:          0
-Summary:        Efficient ID3 tagger
+Summary:        Efficient ID3 tag editor for KDE
 
 Group:          Applications/Multimedia
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/kile/devel kile.spec,1.5,1.6
Message-ID: <200503032156.j23LugBi019965@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19897/kile/devel

Modified Files:
	kile.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kile.spec	13 Jan 2005 15:32:49 -0000	1.5
+++ kile.spec	3 Mar 2005 21:56:40 -0000	1.6
@@ -3,14 +3,13 @@
 # for optionally using destkop-file-install (for fc2 mostly)
 %define desktop_file 1
 
-Name:	 kile
+Name:    kile
 Summary: (La)TeX source editor and TeX shell
-Epoch:	 0
 Version: 1.7.1
 Release: 3%{?dist_tag}
-Group: 	 Applications/Publishing
-URL:	 http://kile.sourceforge.net/
-Source:	 http://dl.sourceforge.net/sourceforge/kile/kile-1.7.1.tar.bz2
+Group:   Applications/Publishing
+URL:     http://kile.sourceforge.net/
+Source:  http://dl.sourceforge.net/sourceforge/kile/kile-1.7.1.tar.bz2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -66,7 +65,7 @@
   --program-prefix="%{?_program_prefix}" \
   --disable-rpath \
   %{?debug:  --enable-debug --enable-warnings } \
-  %{!?debug: --disable-debug --disable-warnings --enable-final } 
+  %{!?debug: --disable-debug --disable-warnings --enable-final }
 
 make %{?_smp_mflags}
 
@@ -102,7 +101,7 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/katepart
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README TODO
 %lang(en) %doc %{_datadir}/doc/HTML/en/*
@@ -189,7 +188,7 @@
 - fix missing latexhelp.html
 
 * Thu Sep 11 2003 Rex Dieter <rexdieter at sf.net> 0:1.5.2-0.fdr.3
-- patch1 
+- patch1
 
 * Wed Aug 20 2003 Rex Dieter <rexdieter at sf.net> 0:1.5.2-0.fdr.2
 - 1.5.2
@@ -210,7 +209,7 @@
 * Fri Apr 25 2003 Rex Dieter <rexdieter at sf.net> 1.40-1.3
 - remove %%doc NEWS
 
-* Mon Mar 03 2003 Rex Dieter <rexdieter at sf.net> 1.40-1.2 
+* Mon Mar 03 2003 Rex Dieter <rexdieter at sf.net> 1.40-1.2
 - version: 1.4 -> 1.40 so silly rpm knows that 1.40 is newer than 1.32
 - use epochs in Obsoletes/Provides/Requires.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/john/devel john.spec,1.5,1.6
Message-ID: <200503032156.j23LugwU019945@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/john/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19897/john/devel

Modified Files:
	john.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: john.spec
===================================================================
RCS file: /cvs/extras/rpms/john/devel/john.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- john.spec	10 Dec 2004 22:03:04 -0000	1.5
+++ john.spec	3 Mar 2005 21:56:40 -0000	1.6
@@ -2,10 +2,9 @@
 Name:             john
 Version:          1.6
 Release:          2
-Epoch:            0
 URL:              http://www.openwall.com/john
 License:          GPL
-Group:            Applications/System 
+Group:            Applications/System
 Source0:          http://www.openwall.com/john/dl/john-1.6.tar.gz
 Patch0:           john-1.6-rh.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/jikes/devel jikes.spec,1.7,1.8
Message-ID: <200503032156.j23LugFf019937@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/jikes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19897/jikes/devel

Modified Files:
	jikes.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: jikes.spec
===================================================================
RCS file: /cvs/extras/rpms/jikes/devel/jikes.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jikes.spec	10 Dec 2004 22:03:04 -0000	1.7
+++ jikes.spec	3 Mar 2005 21:56:40 -0000	1.8
@@ -1,8 +1,7 @@
 Name:           jikes
 Version:        1.22
 Release:        1
-Epoch:          0
-Summary:        A Java source file to bytecode compiler
+Summary:        Java source file to bytecode compiler
 
 License:        IBM Public License
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad.spec, 1.4,
	1.5
Message-ID: <200503032156.j23Lug00019953@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kernel-module-thinkpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19897/kernel-module-thinkpad/devel

Modified Files:
	kernel-module-thinkpad.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: kernel-module-thinkpad.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kernel-module-thinkpad.spec	8 Nov 2004 04:39:54 -0000	1.4
+++ kernel-module-thinkpad.spec	3 Mar 2005 21:56:40 -0000	1.5
@@ -13,8 +13,7 @@
 
 Name:           kernel-module-thinkpad
 Version:        5.0
-Release:        0.fdr.4.1
-Epoch:          0
+Release:        1
 Summary:        IBM ThinkPad support kernel modules
 
 License:        GPL
@@ -52,7 +51,7 @@
 Summary:        %{summary}
 Group:          System Environment/Kernel
 Provides:       kernel-module
-Provides:       %{name} = %{epoch}:%{version}-%{release}
+Provides:       %{name} = %{version}-%{release}
 Obsoletes:      kernel-mod-thinkpad
 Requires(pre):  modutils
 %if 0%(%kmh -- rhkernel)



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/jpgraph/devel jpgraph.spec,1.2,1.3
Message-ID: <200503032156.j23LugTR019949@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/jpgraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19897/jpgraph/devel

Modified Files:
	jpgraph.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: jpgraph.spec
===================================================================
RCS file: /cvs/extras/rpms/jpgraph/devel/jpgraph.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jpgraph.spec	10 Dec 2004 22:03:04 -0000	1.2
+++ jpgraph.spec	3 Mar 2005 21:56:40 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           jpgraph
-Summary:        An OO graph drawing class library for PHP
+Summary:        Object oriented graph drawing class library for PHP
 Version:        1.16
 Release:        2
-Epoch:          0
 Source0:        http://members.chello.se/jpgraph/jpgdownloads/jpgraph-1.16.tar.gz
 License:        QPL
 URL:            http://www.aditus.nu/jpgraph/
@@ -24,11 +23,11 @@
 Extensive documentations are availible at:
 http://www.aditus.nu/jpgraph/
 
-%package	doc
-Summary:	Documenation for %{name}
-Group:		Documentation
+%package        doc
+Summary:        Documenation for %{name}
+Group:          Documentation
 
-%description	doc
+%description    doc
 JpGraph is a OO Graph drawing library for PHP 4.0.2 and above.
 Highlights of the available features are: text, linear, and log
 scales for both the X and Y axes, anti-aliasing of lines,
@@ -42,7 +41,7 @@
 
 %prep
 
-%setup -q 
+%setup -q
 
 mv src/Changelog .
 



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:43 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:43 -0500
Subject: rpms/ksensors/devel ksensors.spec,1.6,1.7
Message-ID: <200503032156.j23LuhC7019973@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ksensors/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19897/ksensors/devel

Modified Files:
	ksensors.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ksensors.spec
===================================================================
RCS file: /cvs/extras/rpms/ksensors/devel/ksensors.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ksensors.spec	10 Dec 2004 22:03:04 -0000	1.6
+++ ksensors.spec	3 Mar 2005 21:56:40 -0000	1.7
@@ -1,8 +1,7 @@
 Name:           ksensors
 Version:        0.7.3
 Release:        1
-Epoch:          0
-Summary:        An lm_sensors frontend for KDE
+Summary:        KDE frontend to lm_sensors
 
 Group:          Applications/System
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 21:56:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 16:56:42 -0500
Subject: rpms/jlint/devel jlint.spec,1.4,1.5
Message-ID: <200503032156.j23Lugnk019941@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/jlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19897/jlint/devel

Modified Files:
	jlint.spec 
Log Message:
Mass letter "j" and "k" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: jlint.spec
===================================================================
RCS file: /cvs/extras/rpms/jlint/devel/jlint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jlint.spec	10 Dec 2004 22:03:04 -0000	1.4
+++ jlint.spec	3 Mar 2005 21:56:40 -0000	1.5
@@ -1,7 +1,6 @@
 Name:           jlint
 Version:        1.21
 Release:        1
-Epoch:          0
 Summary:        Java program checker
 
 Group:          Development/Tools



From bugs.michael at gmx.net  Thu Mar  3 21:57:54 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 22:57:54 +0100
Subject: rpms/inti/devel inti.spec,1.2,1.3
In-Reply-To: <200503032146.j23LkOgG019532@cvs-int.fedora.redhat.com>
References: <200503032146.j23LkOgG019532@cvs-int.fedora.redhat.com>
Message-ID: <20050303225754.509a1171.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 16:46:24 -0500, Matthias Saou (thias) wrote:

>  Name:           inti
>  Version:        1.2
> -Release:        0.fdr.5.1
> -Epoch:          0
> +Release:        1

Release change is pointless here. Please don't mix such changes with the
other documented mass-changes. inti package is broken for quite some
time (GTK incompatibility) and has not been updated since then. Release
should stay to reflect that. Also on the other packages with 0.fdr
prefix, please.



From bugs.michael at gmx.net  Thu Mar  3 22:19:10 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 23:19:10 +0100
Subject: Epoch 0 (was: rpms/lft/devel lft.spec,1.6,1.7)
In-Reply-To: <Pine.LNX.4.61.0503031645530.921@horsea.3ti.be>
References: <200503022042.j22KgKCu018484@cvs-int.fedora.redhat.com>
	<1109797044.15077.271.camel@bobcat.mine.nu>
	<20050302235325.2fc6a141@python2>
	<Pine.LNX.4.61.0503021813370.1036@alien.devel.redhat.com>
	<Pine.LNX.4.61.0503030017060.921@horsea.3ti.be>
	<20050303100000.2268863a.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031313080.921@horsea.3ti.be>
	<20050303141532.679168a7.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031424480.921@horsea.3ti.be>
	<20050303161633.2c4603a3.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031623440.921@horsea.3ti.be>
	<20050303164318.6d5e4480.bugs.michael@gmx.net>
	<Pine.LNX.4.61.0503031645530.921@horsea.3ti.be>
Message-ID: <20050303231910.2f2e7526.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 17:01:04 +0100 (CET), Dag Wieers wrote:

> > You asked for my "line of thought", I gave it. No idea why you feel the
> > need to take something personal.
> 
> Michael, a little honesty here. It served [...]

I disagree. I could expand on how I meant it, how I want it to be
understood, whether and why I accepted a given framework at fedora.us and
whether I agreed with every policy or procedure. But I refrain from doing
so, since it serves no purpose if you're not really interested in
believing me. Further, this is thread is getting off-topic anyway.



From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net  Thu Mar  3 22:34:47 2005
From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou)
Date: Thu, 3 Mar 2005 23:34:47 +0100
Subject: rpms/inti/devel inti.spec,1.2,1.3
In-Reply-To: <20050303225754.509a1171.bugs.michael@gmx.net>
References: <200503032146.j23LkOgG019532@cvs-int.fedora.redhat.com>
	<20050303225754.509a1171.bugs.michael@gmx.net>
Message-ID: <20050303233447.14081067@python2>

Michael Schwendt wrote :

> On Thu, 3 Mar 2005 16:46:24 -0500, Matthias Saou (thias) wrote:
> 
> >  Name:           inti
> >  Version:        1.2
> > -Release:        0.fdr.5.1
> > -Epoch:          0
> > +Release:        1
> 
> Release change is pointless here. Please don't mix such changes with the
> other documented mass-changes. inti package is broken for quite some
> time (GTK incompatibility) and has not been updated since then. Release
> should stay to reflect that. Also on the other packages with 0.fdr
> prefix, please.

Second time I make that "mistake" IIRC.
For me, a *.fdr.* release has nothing to do in the devel branch... so
either it should be fixed (what I unconsciously and repeatedly seem to want
to do) with the building disabled, or it shouldn't have a devel branch at
all.

Matthias

-- 
Clean custom Red Hat Linux rpm packages : http://freshrpms.net/
Fedora Core release 3 (Heidelberg) - Linux kernel 2.6.10-1.770_FC3
Load : 0.34 0.38 0.36



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/ladspa/devel ladspa.spec,1.6,1.7
Message-ID: <200503032241.j23MfXnO021150@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ladspa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/ladspa/devel

Modified Files:
	ladspa.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ladspa.spec
===================================================================
RCS file: /cvs/extras/rpms/ladspa/devel/ladspa.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ladspa.spec	28 Feb 2005 21:12:57 -0000	1.6
+++ ladspa.spec	3 Mar 2005 22:41:31 -0000	1.7
@@ -1,8 +1,7 @@
 Name:           ladspa
 Version:        1.12
 Release:        3
-Epoch:		0
-Summary:        LADSPA SDK, example plug-ins and tools.
+Summary:        LADSPA SDK, example plug-ins and tools
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -23,9 +22,9 @@
 This package contains the example plug-ins and tools from the LADSPA SDK.
 
 %package        devel
-Summary:        Linux Audio Developer's Simple Plug-in API 
+Summary:        Linux Audio Developer's Simple Plug-in API
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 ladspa-devel contains the ladspa.h header file.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/libcddb/devel libcddb.spec,1.5,1.6
Message-ID: <200503032241.j23MfXpv021166@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libcddb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libcddb/devel

Modified Files:
	libcddb.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libcddb.spec	10 Dec 2004 22:03:04 -0000	1.5
+++ libcddb.spec	3 Mar 2005 22:41:31 -0000	1.6
@@ -1,13 +1,12 @@
-Summary: 	A library (C API) for accessing a CDDB server
-Name: 		libcddb
-Version: 	0.9.4
-Release: 	2
-Epoch: 		0
-License: 	LGPL
-Group: 		System Environment/Libraries
-URL: 		http://libcddb.sourceforge.net/
-Source0: 	http://download.sf.net/libcddb/%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Summary:	Library (C API) for accessing CDDB servers
+Name:		libcddb
+Version:	0.9.4
+Release:	2
+License:	LGPL
+Group:		System Environment/Libraries
+URL:		http://libcddb.sourceforge.net/
+Source0:	http://download.sf.net/libcddb/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 %description
 Libcddb is a library that implements the different protocols (CDDBP,
@@ -16,7 +15,7 @@
 %package devel
 Summary:	Development files for libcddb
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 Libcddb is a library that implements the different protocols (CDDBP,
@@ -24,18 +23,15 @@
 This package contains development files (static libraries, headers)
 for libcddb.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -43,16 +39,15 @@
 
 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 NEWS README THANKS ChangeLog TODO
@@ -66,7 +61,6 @@
 %{_includedir}/cddb
 %{_libdir}/pkgconfig/libcddb.pc
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Sat Jul  3 2004 Dams <anvil[AT]livna.org> 0:0.9.4-0.fdr.2



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/lft/devel lft.spec,1.12,1.13
Message-ID: <200503032241.j23MfXhl021158@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/lft/devel

Modified Files:
	lft.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lft.spec	2 Mar 2005 21:39:57 -0000	1.12
+++ lft.spec	3 Mar 2005 22:41:31 -0000	1.13
@@ -1,5 +1,4 @@
 Name:           lft
-Epoch:		0
 Version:        2.3
 Release:        1
 Summary:        Alternate traceroute tool
@@ -13,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpcap
-Obsoletes:      fft
+Obsoletes:      fft <= 2.3
 
 %description
 LFT, short for Layer Four Traceroute, is a 'traceroute' utility that



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libtar/devel libtar.spec,1.5,1.6
Message-ID: <200503032241.j23MfYCX021261@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libtar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libtar/devel

Modified Files:
	libtar.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libtar.spec
===================================================================
RCS file: /cvs/extras/rpms/libtar/devel/libtar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libtar.spec	10 Dec 2004 22:03:06 -0000	1.5
+++ libtar.spec	3 Mar 2005 22:41:32 -0000	1.6
@@ -1,14 +1,13 @@
-Summary: 	Tar file manipulation API
-Name: 		libtar
-Version: 	1.2.11
-Release: 	3
-Epoch: 		0
-License: 	BSD
-Group: 		System Environment/Libraries
-URL: 		http://www-dev.cites.uiuc.edu/libtar/
-Source0: 	%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Provides:	libtar-devel = %{epoch}:%{name}-%{version}
+Summary:	Tar file manipulation API
+Name:		libtar
+Version:	1.2.11
+Release:	3
+License:	BSD
+Group:		System Environment/Libraries
+URL:		http://www-dev.cites.uiuc.edu/libtar/
+Source0:	%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Provides:	libtar-devel = %{name}-%{version}
 BuildRequires:	zlib-devel
 
 
@@ -51,5 +50,5 @@
 - Merged devel and main packages
 - Package provide now libtar-devel
 
-* Tue Jul  8 2003 Dams <anvil[AT]livna.org> 
+* Tue Jul  8 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/lablgl/devel lablgl.spec,1.4,1.5
Message-ID: <200503032241.j23MfXZf021142@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lablgl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/lablgl/devel

Modified Files:
	lablgl.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lablgl.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgl/devel/lablgl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lablgl.spec	13 Feb 2005 09:17:45 -0000	1.4
+++ lablgl.spec	3 Mar 2005 22:41:31 -0000	1.5
@@ -1,18 +1,17 @@
 Name:           lablgl
 Version:        1.01
 Release:        2
-Epoch:          0
-Summary:        LablGL is an OpenGL interface for Objective Caml
+Summary:        OpenGL interface for Objective Caml
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-1.01.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  XFree86-devel, freeglut-devel 
-BuildRequires:	ocaml >= 0:3.08, labltk >= 0:3.08, camlp4 >= 0:3.08
-BuildRequires:	tcl-devel, tk-devel
-Requires:       ocaml >= 0:3.08, labltk >= 0:3.08
+BuildRequires:  XFree86-devel, freeglut-devel
+BuildRequires:  ocaml >= 3.08, labltk >= 3.08, camlp4 >= 3.08
+BuildRequires:  tcl-devel, tk-devel
+Requires:       ocaml >= 3.08, labltk >= 3.08
 
 %description
 LablGL is is an Objective Caml interface to OpenGL. Support is



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libgnomemm20/devel libgnomemm.spec,1.2,1.3
Message-ID: <200503032241.j23MfYkc021198@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libgnomemm20/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libgnomemm20/devel

Modified Files:
	libgnomemm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libgnomemm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomemm20/devel/libgnomemm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgnomemm.spec	10 Dec 2004 22:03:05 -0000	1.2
+++ libgnomemm.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           libgnomemm20
 Version:        2.0.1
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for Gnome libs (a GUI library for X).
+Summary:        C++ interface for Gnome libs (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -20,20 +19,20 @@
 %description
 This package provides a C++ interface for GnomeUI.  It is a subpackage
 of the Gtk-- project.  The interface provides a convenient interface for C++
-programmers to create Gnome GUIs with GTK+'s flexible object-oriented 
+programmers to create Gnome GUIs with GTK+'s flexible object-oriented
 framework.
 
 %package devel
-Summary:        Headers for developing programs that will use Gnome--.
+Summary:        Headers for developing programs that will use Gnome--
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm20-devel
 Requires:       libgnome-devel
 Obsoletes:      libgnomemm2-devel
 
 %description devel
 This package contains the headers that programmers will need to develop
-applications which will use Gnome--, part of Gtk-- the C++ interface to 
+applications which will use Gnome--, part of Gtk-- the C++ interface to
 the GTK+ (the Gimp ToolKit) GUI library.
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/lib3ds/devel lib3ds.spec,1.3,1.4
Message-ID: <200503032241.j23MfXOQ021162@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lib3ds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/lib3ds/devel

Modified Files:
	lib3ds.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/devel/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	3 Mar 2005 22:41:31 -0000	1.4
@@ -1,14 +1,13 @@
 Name:           lib3ds
 Version:        1.2.0
 Release:        3
-Epoch:          0
-Summary:        The 3D Studio File Format Library
+Summary:        3D Studio file format library
 
-Group: 		System Environment/Libraries
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -23,14 +22,14 @@
 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



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/libcdio/devel libcdio.spec,1.4,1.5
Message-ID: <200503032241.j23MfXbg021170@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libcdio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libcdio/devel

Modified Files:
	libcdio.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libcdio.spec
===================================================================
RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libcdio.spec	10 Dec 2004 22:03:04 -0000	1.4
+++ libcdio.spec	3 Mar 2005 22:41:31 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           libcdio
 Version:        0.70
 Release:        1
-Epoch:          0
-Summary:        A CD-ROM input and control library
+Summary:        CD-ROM input and control library
 
 Group:          Applications/Multimedia
 License:        GPL
@@ -25,7 +24,7 @@
 %package        devel
 Summary:        Header files and static libraries for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
 %description    devel



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libtasn1/devel libtasn1.spec,1.5,1.6
Message-ID: <200503032241.j23MfY9f021266@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libtasn1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libtasn1/devel

Modified Files:
	libtasn1.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libtasn1.spec	28 Feb 2005 21:12:57 -0000	1.5
+++ libtasn1.spec	3 Mar 2005 22:41:32 -0000	1.6
@@ -2,13 +2,12 @@
 Name:		libtasn1
 Version:	0.2.6
 Release:	1
-Epoch:		0
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://www.gnu.org/software/gnutls/download.html
 Source0:	ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Provides:	%{name}-devel = %{epoch}:%{version}-%{release}
+Provides:	%{name}-devel = %{version}-%{release}
 BuildRequires:	bison
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/liferea/devel liferea.spec,1.7,1.8
Message-ID: <200503032241.j23MfYFO021286@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/liferea/devel

Modified Files:
	liferea.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- liferea.spec	23 Jan 2005 00:58:10 -0000	1.7
+++ liferea.spec	3 Mar 2005 22:41:32 -0000	1.8
@@ -1,8 +1,7 @@
 Name:           liferea
 Version:        0.9.0
 Release:        1.b
-Epoch:          0
-Summary:        An RSS/RDF feed reader.
+Summary:        RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
@@ -22,10 +21,10 @@
 
 
 %description
-Liferea (Linux Feed Reader) is an RSS/RDF feed reader. 
-It's intended to be a clone of the Windows-only FeedReader. 
-It can be used to maintain a list of subscribed feeds, 
-browse through their items, and show their contents 
+Liferea (Linux Feed Reader) is an RSS/RDF feed reader.
+It's intended to be a clone of the Windows-only FeedReader.
+It can be used to maintain a list of subscribed feeds,
+browse through their items, and show their contents
 using GtkHTML.
 
 
@@ -44,9 +43,9 @@
 %find_lang %{name}
 
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-desktop-file-install --vendor fedora                    \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
-  --add-category X-Fedora			        \
+desktop-file-install --vendor fedora              \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+  --add-category X-Fedora                         \
   %{name}.desktop
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libgnomecanvasmm20/devel libgnomecanvasmm.spec,1.2,1.3
Message-ID: <200503032241.j23MfY3v021190@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libgnomecanvasmm20/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libgnomecanvasmm20/devel

Modified Files:
	libgnomecanvasmm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomecanvasmm20/devel/libgnomecanvasmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgnomecanvasmm.spec	10 Dec 2004 22:03:05 -0000	1.2
+++ libgnomecanvasmm.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           libgnomecanvasmm20
 Version:        2.0.1
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for Gnome libs (a GUI library for X).
+Summary:        C++ interface for Gnome libs (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -21,13 +20,13 @@
 %description
 This package provides a C++ interface for GnomeUI.  It is a subpackage
 of the gnomemm project.  The interface provides a convenient interface for C++
-programmers to create Gnome GUIs with GTK+'s flexible object-oriented 
+programmers to create Gnome GUIs with GTK+'s flexible object-oriented
 framework.
 
 %package devel
 Summary:        Headers for developing programs that will use libgnomecanvasmm.
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm20-devel
 Requires:       libgnomecanvas-devel
 Obsoletes:      libgnomecanvasmm2-devel



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/librsync/devel librsync.spec,1.6,1.7
Message-ID: <200503032241.j23MfYkP021238@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/librsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/librsync/devel

Modified Files:
	librsync.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: librsync.spec
===================================================================
RCS file: /cvs/extras/rpms/librsync/devel/librsync.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- librsync.spec	23 Jan 2005 13:59:37 -0000	1.6
+++ librsync.spec	3 Mar 2005 22:41:32 -0000	1.7
@@ -1,13 +1,12 @@
-Summary:  	Rsync libraries
-Name:     	librsync
-Version:  	0.9.7
-Release:  	2
-Epoch: 		0
-License:	LGPL
-Group:    	System Environment/Libraries
-Source:  	http://dl.sf.net/sourceforge/librsync/librsync-0.9.7.tar.gz
-URL:       	http://librsync.sf.net/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:        Rsync libraries
+Name:           librsync
+Version:        0.9.7
+Release:        2
+License:        LGPL
+Group:          System Environment/Libraries
+Source:         http://dl.sf.net/sourceforge/librsync/librsync-0.9.7.tar.gz
+URL:            http://librsync.sf.net/
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  zlib-devel, bzip2-devel, popt
 Buildrequires:  libtool
 
@@ -26,7 +25,7 @@
 %package devel
 Summary: Headers and development libraries for librsync
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 librsync implements the "rsync" algorithm, which allows remote
@@ -43,7 +42,7 @@
 This package contains header files necessary for developing programs
 based on librsync.
 
-%prep 
+%prep
 %setup -q
 
 %build



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:35 -0500
Subject: rpms/lvcool/devel lvcool.spec,1.6,1.7
Message-ID: <200503032241.j23MfZBG021299@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lvcool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/lvcool/devel

Modified Files:
	lvcool.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lvcool.spec
===================================================================
RCS file: /cvs/extras/rpms/lvcool/devel/lvcool.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lvcool.spec	12 Feb 2005 18:44:42 -0000	1.6
+++ lvcool.spec	3 Mar 2005 22:41:32 -0000	1.7
@@ -1,57 +1,50 @@
-Summary:          Utility to cool Athlon processor during idle on Via KT133 or KX133 chipsets 
+Summary:          Utility to cool down Athlon CPUs when idle on Via KT133 or KX133 chipsets
 Name:             lvcool
-Epoch:            0
 # Upstream has no version, tarball repacked
 Version:          1.0.0
 Release:          1
 URL:              http://vcool.occludo.net/VC_Linux.html
 License:          GPL
-Group:            System Environment/Daemons 
+Group:            System Environment/Daemons
 Source0:          lvcool-1.0.0.tar.gz
-Patch0:           lvcool-g++.patch 
+Patch0:           lvcool-g++.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 
-ExclusiveArch:    %ix86
+ExclusiveArch:    %{ix86}
 BuildArch: athlon
 
 %description
 
 LVCool dramatically reduces the processor temperature during idle for
-Athlon processors running on VIA KT133 or similar chipsets. It sets 
-the Northbridge's "enable bus disconnect on STPGNT" bit and enters an 
+Athlon processors running on VIA KT133 or similar chipsets. It sets
+the Northbridge's "enable bus disconnect on STPGNT" bit and enters an
 idle loop that puts the CPU into STPGNT state.  This approach to
 temperature reduction is a hack, it is better to use an ACPI kernel.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup
 %patch0 -p1
 
-#---------------------------------------------------------------------
 
 %build
 make
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_bindir}
 install -m 755 lvcool %{buildroot}%{_bindir}/lvcool
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf %{buildroot}
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 
-#---------------------------------------------------------------------
 
 %changelog
 * Sun Mar 30 2003 Warren Togami <warren at togami.com> - 1.0.0-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libfac/devel libfac.spec,1.4,1.5
Message-ID: <200503032241.j23MfYol021178@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libfac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libfac/devel

Modified Files:
	libfac.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libfac.spec
===================================================================
RCS file: /cvs/extras/rpms/libfac/devel/libfac.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libfac.spec	4 Dec 2004 09:46:44 -0000	1.4
+++ libfac.spec	3 Mar 2005 22:41:31 -0000	1.5
@@ -1,18 +1,17 @@
 # $Id$
 
-Summary: An extension to Singular-factory
-Name:    libfac	
-Epoch:	 0
+Summary: Extension to Singular-factory
+Name:    libfac
 Version: 2.0.5
 Release: 1%{?dist_tag}
 License: GPL
-Url:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/	
+Url:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/
 # http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/libfac-2-0-5.tar,gz
-Source:	 libfac-2-0-5.tar.gz
-Group:   System Environment/Libraries	
+Source:  libfac-2-0-5.tar.gz
+Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: factory-devel >= 0:2.0.5
+BuildRequires: factory-devel >= 2.0.5
 #BuildRequires: autoconf >= 2.53
 
 %description
@@ -28,10 +27,10 @@
 Provides:  %{name} = %{epoch}:%{version}-%{release}
 Group:   Development/Libraries
 %description devel
-Singular-libfac is an extension to Singular-factory which implements 
-factorization of polynomials over finite fields and algorithms for 
+Singular-libfac is an extension to Singular-factory which implements
+factorization of polynomials over finite fields and algorithms for
 manipulation of polynomial ideals via the characteristic set methods
-(e.g., calculating the characteristic set and the irreducible 
+(e.g., calculating the characteristic set and the irreducible
 characteristic series).
 
 
@@ -43,9 +42,9 @@
 
 
 %build
-%configure --with-NOSTREAMIO 
+%configure --with-NOSTREAMIO
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -72,7 +71,7 @@
 
 %changelog
 * Fri Oct 1 2004 Rex Dieter <rexdieter at sf.net> 0:2.0.5-1
-- 2.0.5 
+- 2.0.5
 
 * Mon Nov 17 2003 Rex Dieter <rexdieter at sf.net> 0:2.0.4-0.fdr.3.b
 - update macros



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libgnomeuimm26/devel libgnomeuimm.spec,1.3,1.4
Message-ID: <200503032241.j23MfYJS021210@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libgnomeuimm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libgnomeuimm26/devel

Modified Files:
	libgnomeuimm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgnomeuimm.spec	28 Jan 2005 17:38:28 -0000	1.3
+++ libgnomeuimm.spec	3 Mar 2005 22:41:32 -0000	1.4
@@ -1,14 +1,13 @@
 Name:           libgnomeuimm26
 Version:        2.6.0
 Release:        2
-Epoch:          0
-Summary:        A C++ interface for Gnome libs (a GUI library for X).
+Summary:        C++ interface for Gnome libs (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomeuimm/2.6/libgnomeuimm-%{version}.tar.bz2
-Patch0:		libgnomeuimm-2.6.0-autoreconf.patch.bz2
+Patch0:         libgnomeuimm-2.6.0-autoreconf.patch.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/ldconfig
@@ -27,9 +26,9 @@
 framework.
 
 %package devel
-Summary:        Headers for developing programs that will use Gnome--.
+Summary:        Headers for developing programs that will use Gnome--
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       libgnomeui-devel
 Requires:       libgnomemm26-devel
 Requires:       libgnomecanvasmm26-devel
@@ -46,9 +45,9 @@
 %prep
 %setup -q -n libgnomeuimm-%{version}
 %ifarch x86_64
-# Patch was build after: 
+# Patch was build after:
 #aclocal -I scripts && automake -c -f && autoconf && libtoolize --copy --force
-%patch0 -p1 
+%patch0 -p1
 %endif
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libzvt/devel libzvt.spec,1.4,1.5
Message-ID: <200503032241.j23MfYHE021282@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libzvt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libzvt/devel

Modified Files:
	libzvt.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libzvt.spec
===================================================================
RCS file: /cvs/extras/rpms/libzvt/devel/libzvt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libzvt.spec	10 Dec 2004 22:03:06 -0000	1.4
+++ libzvt.spec	3 Mar 2005 22:41:32 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           libzvt
 Version:        2.0.1
 Release:        5
-Epoch:          0
-Summary:        ZVT - Zed's Virtual Terminal
+Summary:        Zed's Virtual Terminal library
 
 Group:          System Environment/Libraries
 License:        GPL
@@ -11,10 +10,10 @@
 Source0:        http://anjuta.org/libzvt/libzvt-2.0.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pkgconfig >= 0:0.8
-BuildRequires:  glib2-devel >= 0:2.0
-BuildRequires:  gtk2-devel >= 0:2.0
-BuildRequires:  libart_lgpl-devel >= 0:2.0
+BuildRequires:  pkgconfig >= 0.8
+BuildRequires:  glib2-devel >= 2.0
+BuildRequires:  gtk2-devel >= 2.0
+BuildRequires:  libart_lgpl-devel >= 2.0
 
 
 %description
@@ -24,17 +23,17 @@
 %package devel
 Summary:        Development libraries and header files for libzvt.
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       glib2-devel >= 0:2.0
-Requires:       gtk2-devel >= 0:2.0
-Requires:       libart_lgpl-devel > 0:2.0
+Requires:       %{name} = %{version}-%{release}
+Requires:       glib2-devel >= 2.0
+Requires:       gtk2-devel >= 2.0
+Requires:       libart_lgpl-devel > 2.0
 Requires:       pkgconfig
 
 %description devel
 
 Yet another VT emulation library used by some GNOME programs.
 
-This package contains the header files and libraries needed to write 
+This package contains the header files and libraries needed to write
 or compile programs that use libzvt.
 
 
@@ -97,7 +96,7 @@
 * Sat May 17 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:2.0.1-0.fdr.3
 - Fixed file permissions.
 
-* Fri May 16 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:2.0.1-0.fdr.2 
+* Fri May 16 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:2.0.1-0.fdr.2
 - Added URL.
 - Excluded .la files.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:35 -0500
Subject: rpms/logjam/devel logjam.spec,1.8,1.9
Message-ID: <200503032241.j23MfZgN021290@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/logjam/devel

Modified Files:
	logjam.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- logjam.spec	28 Feb 2005 21:12:57 -0000	1.8
+++ logjam.spec	3 Mar 2005 22:41:32 -0000	1.9
@@ -4,7 +4,7 @@
 Version: 4.4.1
 Release: 4
 Epoch: 1
-Summary: The GTK2-client for LiveJournal
+Summary: GTK2 client for LiveJournal
 License: GPL
 Group: User Interface/Desktops
 URL: http://logjam.danga.com/



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libid3tag/devel libid3tag.spec,1.5,1.6
Message-ID: <200503032241.j23MfYCC021214@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libid3tag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libid3tag/devel

Modified Files:
	libid3tag.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libid3tag.spec
===================================================================
RCS file: /cvs/extras/rpms/libid3tag/devel/libid3tag.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libid3tag.spec	10 Dec 2004 22:03:05 -0000	1.5
+++ libid3tag.spec	3 Mar 2005 22:41:32 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           libid3tag
 Version:        0.15.1
 Release:        1.b
-Epoch:          0
 Summary:        ID3 tag manipulation library
 
 Group:          System Environment/Libraries
@@ -21,7 +20,7 @@
 %package        devel
 Summary:        libid3tag development files
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}, pkgconfig, zlib-devel
+Requires:       %{name} = %{version}-%{release}, pkgconfig, zlib-devel
 
 %description    devel
 ID3 tag library development files.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libsamplerate/devel libsamplerate.spec,1.5,1.6
Message-ID: <200503032241.j23MfYLi021242@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libsamplerate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libsamplerate/devel

Modified Files:
	libsamplerate.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libsamplerate.spec
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/devel/libsamplerate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsamplerate.spec	10 Dec 2004 22:03:05 -0000	1.5
+++ libsamplerate.spec	3 Mar 2005 22:41:32 -0000	1.6
@@ -1,22 +1,20 @@
-Summary: 	A library for performing sample rate conversion on audio.
-Name: 		libsamplerate
-Version: 	0.0.15
-Release: 	5
-Epoch: 		0
-License: 	GPL
-Group: 		System Environment/Libraries
-URL: 		http://www.mega-nerd.com/SRC/
-Source0: 	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Summary:	Library for performing sample rate conversion on audio
+Name:		libsamplerate
+Version:	0.0.15
+Release:	5
+License:	GPL
+Group:		System Environment/Libraries
+URL:		http://www.mega-nerd.com/SRC/
+Source0:	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	libsndfile-devel >= 0:1.0.2
 BuildRequires:	pkgconfig fftw-devel
 
 %package devel
-Summary: 	Development package for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
+Summary:	Development package for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
-# -----------------------------------------------------------------------------
 
 %description
 Secret Rabbit Code is a sample rate converter for audio. It is capable
@@ -33,38 +31,32 @@
 also vary with time for speeding up and slowing down effects.
 This package contains development files for %{name}
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT _doc
 %makeinstall
-mkdir _doc 
+mkdir _doc
 cp -a doc _doc
 rm _doc/doc/Makefile* _doc/doc/NEWS _doc/doc/ChangeLog
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog _doc/doc/*
@@ -79,7 +71,6 @@
 %{_libdir}/lib*.a
 %{_libdir}/pkgconfig/samplerate.pc
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Tue Jul 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.0.15-0.fdr.5
@@ -94,5 +85,5 @@
 * Wed Jun 25 2003 Dams <anvil[AT]livna.org> 0:0.0.15-0.fdr.2
 - Added some more doc
 
-* Thu May 22 2003 Dams <anvil[AT]livna.org> 
+* Thu May 22 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/lablgtk/devel lablgtk.spec,1.5,1.6
Message-ID: <200503032241.j23MfX7e021146@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lablgtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/lablgtk/devel

Modified Files:
	lablgtk.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/devel/lablgtk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lablgtk.spec	12 Feb 2005 11:03:42 -0000	1.5
+++ lablgtk.spec	3 Mar 2005 22:41:31 -0000	1.6
@@ -1,20 +1,19 @@
 Name:           lablgtk
 Version:        2.4.0
 Release:        2
-Epoch:          0
-Summary:        An Objective Caml interface to gtk+
+Summary:        Objective Caml interface to gtk+
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ocaml >= 0:3.08
-%{?_with_gl:Requires: lablgl >= 0:1.00}
-BuildRequires:  ocaml >= 0:3.08, camlp4 >= 0:3.08
-%{?_with_gl:BuildRequires: lablgl >= 0:1.00, gtkglarea2-devel}
+Requires:       ocaml >= 3.08
+%{?_with_gl:Requires: lablgl >= 1.00}
+BuildRequires:  ocaml >= 3.08, camlp4 >= 3.08
+%{?_with_gl:BuildRequires: lablgl >= 1.00, gtkglarea2-devel}
 BuildRequires:  gtk2-devel, libglade-devel, gdk-pixbuf-devel
-BuildRequires:	librsvg2-devel, libcroco-devel
+BuildRequires:  librsvg2-devel, libcroco-devel
 BuildRequires:  libbonobo-devel, bonobo-activation-devel, GConf2-devel
 BuildRequires:  libgnomeui-devel, libgnomecanvas-devel, gnome-panel-devel
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libgnomeuimm20/devel libgnomeuimm.spec,1.2,1.3
Message-ID: <200503032241.j23MfYxi021206@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libgnomeuimm20/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libgnomeuimm20/devel

Modified Files:
	libgnomeuimm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeuimm20/devel/libgnomeuimm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgnomeuimm.spec	10 Dec 2004 22:03:05 -0000	1.2
+++ libgnomeuimm.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           libgnomeuimm20
 Version:        2.0.0
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for Gnome libs (a GUI library for X).
+Summary:        C++ interface for Gnome libs (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -12,24 +11,24 @@
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:	libgnomemm20-devel
-BuildRequires:	libgnomecanvasmm20-devel 
-BuildRequires:	gconfmm20-devel 
-BuildRequires:	libglademm20-devel 
-BuildRequires:	libgnomeui-devel
+BuildRequires:  libgnomemm20-devel
+BuildRequires:  libgnomecanvasmm20-devel
+BuildRequires:  gconfmm20-devel
+BuildRequires:  libglademm20-devel
+BuildRequires:  libgnomeui-devel
 BuildRequires:  libtool
 Obsoletes:      libgnomeuimm2
 
 %description
 This package provides a C++ interface for GnomeUI.  It is a subpackage
 of the Gtk-- project.  The interface provides a convenient interface for C++
-programmers to create Gnome GUIs with GTK+'s flexible object-oriented 
+programmers to create Gnome GUIs with GTK+'s flexible object-oriented
 framework.
 
 %package devel
-Summary:        Headers for developing programs that will use Gnome--.
+Summary:        Headers for developing programs that will use Gnome--
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       libgnomeui-devel
 Requires:       libgnomemm20-devel
 Requires:       libgnomecanvasmm20-devel
@@ -39,7 +38,7 @@
 
 %description devel
 This package contains the headers that programmers will need to develop
-applications which will use Gnome--, part of Gtk-- the C++ interface to 
+applications which will use Gnome--, part of Gtk-- the C++ interface to
 the GTK+ (the Gimp ToolKit) GUI library.
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libglademm24/devel libglademm.spec,1.2,1.3
Message-ID: <200503032241.j23MfYhX021186@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libglademm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libglademm24/devel

Modified Files:
	libglademm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/devel/libglademm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libglademm.spec	10 Dec 2004 22:03:05 -0000	1.2
+++ libglademm.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           libglademm24
 Version:        2.4.1
 Release:        1
-Epoch:          0
-Summary:        A C++ wrapper for libglade
+Summary:        C++ wrapper for libglade
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -24,7 +23,7 @@
 %package devel
 Summary:        Headers for developing programs that will use libglademm.
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
 Requires:       libglade2-devel
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/libdaemon/devel libdaemon.spec,1.3,1.4
Message-ID: <200503032241.j23MfXgi021174@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libdaemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libdaemon/devel

Modified Files:
	libdaemon.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libdaemon.spec
===================================================================
RCS file: /cvs/extras/rpms/libdaemon/devel/libdaemon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libdaemon.spec	10 Dec 2004 22:03:04 -0000	1.3
+++ libdaemon.spec	3 Mar 2005 22:41:31 -0000	1.4
@@ -1,27 +1,26 @@
-Summary: libdaemon is a lightweight C library that eases the writing of UNIX daemons
+Summary: Lightweight C library that eases the writing of UNIX daemons
 Name: libdaemon
 Version: 0.6
 Release: 4
-Epoch: 0
 License: GPL
 URL: http://0pointer.de/lennart/projects/libdaemon
 Group: System Environment/Libraries
 Source: http://0pointer.de/lennart/projects/libdaemon/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides: libdaemon-devel = %{epoch}:%{version}-%{release} 
+Provides: libdaemon-devel = %{version}-%{release}
 
 %description
-   libdaemon is a lightweight C library that eases the writing of UNIX
-   daemons. It consists of the following parts:
-     * A wrapper around fork() which does the correct daemonization
-       procedure of a process
-     * A wrapper around syslog() for simpler and compatible log output to
-       Syslog or STDERR
-     * An API for writing PID files
-     * An API for serializing UNIX signals into a pipe for usage with
-       select() or poll()
-     * An API for running subprocesses with STDOUT and STDERR redirected
-       to syslog.
+libdaemon is a lightweight C library that eases the writing of UNIX
+daemons. It consists of the following parts:
+* A wrapper around fork() which does the correct daemonization
+  procedure of a process
+* A wrapper around syslog() for simpler and compatible log output to
+  Syslog or STDERR
+* An API for writing PID files
+* An API for serializing UNIX signals into a pipe for usage with
+  select() or poll()
+* An API for running subprocesses with STDOUT and STDERR redirected
+  to syslog.
 
 %prep
 %setup -q
@@ -39,10 +38,10 @@
 
 %files
 %defattr(-,root,root,-)
+%doc README LICENSE
 %{_libdir}/pkgconfig/libdaemon.pc
 %{_libdir}/libdaemon.*
 %{_includedir}/libdaemon
-%doc README LICENSE
 
 %post -p /sbin/ldconfig
 
@@ -52,7 +51,7 @@
 * Thu May 13 2004 <aaron.bennett at olin.edu> 0:0.6-0.fdr.4
 - Added post and postun scripts to run ldconfig
 - changed group to standard System/Libraries group
-- removed libtool *.la files  
+- removed libtool *.la files
 
 * Tue May 4 2004 <aaron.bennett at olin.edu> 0:0.6.-0.fdr.3
 - Signed packaged with GPG key
@@ -64,7 +63,7 @@
 * Thu Apr 29 2004  <abennett at olin.edu> - 0:0.6-1
 - Changed to version 0.6 of libdaemon
 
-* Wed Mar 31 2004  <abennett at olin.edu> 
+* Wed Mar 31 2004  <abennett at olin.edu>
 - Initial build.
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:35 -0500
Subject: rpms/lrmi/devel lrmi.spec,1.3,1.4
Message-ID: <200503032241.j23MfZ7F021294@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lrmi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/lrmi/devel

Modified Files:
	lrmi.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lrmi.spec
===================================================================
RCS file: /cvs/extras/rpms/lrmi/devel/lrmi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lrmi.spec	10 Dec 2004 22:03:06 -0000	1.3
+++ lrmi.spec	3 Mar 2005 22:41:32 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           lrmi
 Version:        0.8
 Release:        1
-Epoch:          0
 Summary:        Library for calling real mode BIOS routines
 
 Group:          System Environment/Libraries
@@ -15,7 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
-Provides:       lib%{name} = %{epoch}:%{version}-%{release}
+Provides:       lib%{name} = %{version}-%{release}
 
 %description
 LRMI is a library for calling real mode BIOS routines.
@@ -23,8 +22,8 @@
 %package        devel
 Summary:        Development files for LRMI
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Provides:       lib%{name}-devel = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
+Provides:       lib%{name}-devel = %{version}-%{release}
 
 %description    devel
 %{summary}.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:35 -0500
Subject: rpms/lzop/devel lzop.spec,1.4,1.5
Message-ID: <200503032241.j23MfZ0h021318@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lzop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/lzop/devel

Modified Files:
	lzop.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lzop.spec
===================================================================
RCS file: /cvs/extras/rpms/lzop/devel/lzop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lzop.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ lzop.spec	3 Mar 2005 22:41:33 -0000	1.5
@@ -1,8 +1,7 @@
 Name: lzop
 Version: 1.01
 Release: 1
-Epoch: 0
-Summary: A real-time file compressor.
+Summary: Real-time file compressor
 
 Group: Applications/Archiving
 License: GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libglademm20/devel libglademm.spec,1.2,1.3
Message-ID: <200503032241.j23MfYHO021182@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libglademm20/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libglademm20/devel

Modified Files:
	libglademm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm20/devel/libglademm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libglademm.spec	10 Dec 2004 22:03:05 -0000	1.2
+++ libglademm.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           libglademm20
 Version:        2.2.0
 Release:        1
-Epoch:          0
-Summary:        A C++ wrapper for libglade
+Summary:        C++ wrapper for libglade
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -27,7 +26,7 @@
 %package devel
 Summary:        Headers for developing programs that will use libglademm
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm20-devel
 Requires:       libglade2-devel
 Obsoletes:      libglademm2-devel
@@ -98,14 +97,14 @@
 - Leave out the ChangeLog etc.
 
 * Thu Oct 30 2003 Michael Koziarski <michael at koziarski.org> - 2.0.1-0.fdr.4
-- Remove libgnomemm2 from the requirements 
+- Remove libgnomemm2 from the requirements
 
 * Wed Oct 22 2003 Michael Koziarski <michael at koziarski.org> - 2.0.1-0.fdr.3
 - Add Epochs to the requirements
 
 * Wed Oct 22 2003 Michael Koziarski <michael at koziarski.org> - 2.0.1-0.fdr.2
 - Fix -devel Requires
-- Fix -devel Description 
+- Fix -devel Description
 - Remove empty DOC files
 - Fixed package description
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libgnomecanvasmm26/devel libgnomecanvasmm.spec,1.2,1.3
Message-ID: <200503032241.j23MfYm5021194@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libgnomecanvasmm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libgnomecanvasmm26/devel

Modified Files:
	libgnomecanvasmm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgnomecanvasmm.spec	10 Dec 2004 22:03:05 -0000	1.2
+++ libgnomecanvasmm.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           libgnomecanvasmm26
 Version:        2.6.1
 Release:        1
-Epoch:          0
-Summary:        A C++ interface for Gnome libs (a GUI library for X).
+Summary:        C++ interface for Gnome libs (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -24,7 +23,7 @@
 %package devel
 Summary:        Headers for developing programs that will use libgnomecanvasmm.
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
 Requires:       libgnomecanvas-devel
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:35 -0500
Subject: rpms/lzo/devel lzo.spec,1.5,1.6
Message-ID: <200503032241.j23MfZSV021314@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lzo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/lzo/devel

Modified Files:
	lzo.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lzo.spec
===================================================================
RCS file: /cvs/extras/rpms/lzo/devel/lzo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lzo.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ lzo.spec	3 Mar 2005 22:41:33 -0000	1.6
@@ -1,19 +1,18 @@
-Summary: 	A data compression library with very fast (de)compression.
-Name: 		lzo
-Version: 	1.08
-Release: 	2
-Epoch: 		0
-License: 	GPL
-Group: 		System Environment/Libraries
-URL: 		http://www.oberhumer.com/opensource/lzo/
-Source0: 	http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Summary:	Data compression library with very fast (de)compression
+Name:		lzo
+Version:	1.08
+Release:	2
+License:	GPL
+Group:		System Environment/Libraries
+URL:		http://www.oberhumer.com/opensource/lzo/
+Source0:	http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	nasm zlib-devel
 
 %package devel
-Summary:	Development files for the lzo library.
+Summary:	Development files for the lzo library
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	zlib-devel
 
 %description
@@ -64,5 +63,5 @@
 - Added post and postun scriptlets
 - Added URL in Source0
 
-* Fri Apr 25 2003 Dams <anvil[AT]livna.org> 
+* Fri Apr 25 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libkipi/devel libkipi.spec,1.1,1.2
Message-ID: <200503032241.j23MfYIk021222@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libkipi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libkipi/devel

Modified Files:
	libkipi.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libkipi.spec
===================================================================
RCS file: /cvs/extras/rpms/libkipi/devel/libkipi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libkipi.spec	12 Jan 2005 20:09:34 -0000	1.1
+++ libkipi.spec	3 Mar 2005 22:41:32 -0000	1.2
@@ -1,7 +1,6 @@
 Name:           libkipi
 Version:        0.1
 Release:        2
-Epoch:          0
 Summary:        Common plugin infrastructure for KDE image applications
 
 Group:          System Environment/Libraries
@@ -21,7 +20,7 @@
 %package        devel
 Summary:        Common plugin infrastructure for KDE image applications
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       kdelibs-devel
 
 %description    devel



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libgnomemm26/devel libgnomemm.spec,1.3,1.4
Message-ID: <200503032241.j23MfYCR021202@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libgnomemm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libgnomemm26/devel

Modified Files:
	libgnomemm.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libgnomemm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomemm26/devel/libgnomemm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgnomemm.spec	28 Jan 2005 17:21:41 -0000	1.3
+++ libgnomemm.spec	3 Mar 2005 22:41:32 -0000	1.4
@@ -1,14 +1,13 @@
 Name:           libgnomemm26
 Version:        2.6.0
 Release:        2
-Epoch:          0
-Summary:        A C++ interface for Gnome libs (a GUI library for X).
+Summary:        C++ interface for Gnome libs (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.6/libgnomemm-%{version}.tar.bz2
-Patch0:		libgnomemm-2.6.0-autoreconf.patch.bz2
+Patch0:         libgnomemm-2.6.0-autoreconf.patch.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/ldconfig
@@ -25,7 +24,7 @@
 %package devel
 Summary:        Headers for developing programs that will use Gnome--.
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
 Requires:       libgnome-devel
 
@@ -39,7 +38,7 @@
 %setup -q -n libgnomemm-%{version}
 %ifarch x86_64
 # Patch was build after: aclocal -I scripts && automake -c -f && autoconf && libtoolize --copy --force
-%patch0 -p1 
+%patch0 -p1
 %endif
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libsigc++20/devel libsigc++.spec,1.3,1.4
Message-ID: <200503032241.j23MfYUd021254@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libsigc++20/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libsigc++20/devel

Modified Files:
	libsigc++.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libsigc++.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigc++20/devel/libsigc++.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsigc++.spec	26 Jan 2005 00:10:37 -0000	1.3
+++ libsigc++.spec	3 Mar 2005 22:41:32 -0000	1.4
@@ -1,8 +1,7 @@
 Name:           libsigc++20
 Version:        2.0.6
 Release:        1
-Epoch:          0
-Summary:        The Typesafe Signal Framework for C++
+Summary:        Typesafe signal framework for C++
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -27,9 +26,9 @@
 starting with version 1.1.2, uses %name.
 
 %package devel
-Summary:        development tools for the Typesafe Signal Framework for C++ 
+Summary:        Development tools for the typesafe signal framework for C++
 Group:          Development/Libraries
-Requires:       %name = %{epoch}:%version-%{release}
+Requires:       %name = %{version}-%{release}
 Requires:       pkgconfig
 
 %description devel
@@ -68,8 +67,8 @@
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/*.so.*
 %doc AUTHORS README NEWS ChangeLog TODO
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -132,7 +131,7 @@
 - Added autoconf macro for sigc.
 
 * Fri Jun 11 1999 Karl Nelson <kenelson at ece.ucdavis.edu>
-- Made into a .in to keep version field up to date 
+- Made into a .in to keep version field up to date
 - Still need to do release by hand
 
 * Mon Jun  7 1999 Dmitry V. Levin <ldv at fandra.org>



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libkexif/devel libkexif.spec,1.2,1.3
Message-ID: <200503032241.j23MfYB1021218@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libkexif/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libkexif/devel

Modified Files:
	libkexif.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libkexif.spec
===================================================================
RCS file: /cvs/extras/rpms/libkexif/devel/libkexif.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libkexif.spec	29 Jan 2005 23:32:25 -0000	1.2
+++ libkexif.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           libkexif
 Version:        0.2.1
 Release:        1
-Epoch:          0
 Summary:        Allow Kipi plugins to extract EXIF information
 
 Group:          System Environment/Libraries
@@ -20,7 +19,7 @@
 %package        devel
 Summary:        Allow Kipi plugins to extract EXIF information
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       kdelibs-devel
 
 %description    devel



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libsigsegv/devel libsigsegv.spec,1.2,1.3
Message-ID: <200503032241.j23MfYXS021258@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libsigsegv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libsigsegv/devel

Modified Files:
	libsigsegv.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libsigsegv.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/devel/libsigsegv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libsigsegv.spec	10 Dec 2004 22:03:06 -0000	1.2
+++ libsigsegv.spec	3 Mar 2005 22:41:32 -0000	1.3
@@ -1,14 +1,13 @@
 # $Id$
 
-Summary: Handling page faults in user mode 
+Summary: Library for handling page faults in user mode
 Name:    libsigsegv
-Epoch:	 0
 Version: 2.1
 Release: 2%{?dist_tag}
-License: GPL	
-URL:	 http://libsigsegv.sourceforge.net/
+License: GPL
+URL:     http://libsigsegv.sourceforge.net/
 Source:  ftp://ftp.gnu.org/pub/gnu/libsigsegv/libsigsegv-2.1.tar.gz
-Group:   System Environment/Libraries	
+Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -24,22 +23,22 @@
 
 
 %package devel
-Summary: libraries and header files
+Summary: Development libraries and header files for libsigsegv
 Group:   Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description devel
 Libraries and header files for %{name} development.
 
 
 %prep
-%setup -q 
+%setup -q
 
 
 %build
 %configure \
-  --enable-shared 
+  --enable-shared
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -75,7 +74,7 @@
 %changelog
 * Thu Jul 22 2004 Rex Dieter <rexdieter at sf.net> 0:2.1-0.fdr.2
 - add URL: tag
-- make check 
+- make check
 
 * Mon Apr 12 2004 Rex Dieter <rexdieter at sf.net> 0:2.1-0.fdr.1
 - 2.1



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libuninameslist/devel libuninameslist.spec,1.5,1.6
Message-ID: <200503032241.j23MfYp0021270@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libuninameslist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libuninameslist/devel

Modified Files:
	libuninameslist.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libuninameslist.spec
===================================================================
RCS file: /cvs/extras/rpms/libuninameslist/devel/libuninameslist.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libuninameslist.spec	10 Dec 2004 22:03:06 -0000	1.5
+++ libuninameslist.spec	3 Mar 2005 22:41:32 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           libuninameslist
 Version:        0.0
 Release:        2.040707
-Epoch:          0
 Summary:        Library that provides Unicode names and annotations
 
 Group:          System Environment/Libraries
@@ -18,7 +17,7 @@
 %package        devel
 Summary:        Header files and static libraries for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 This package contains header files and static libraries for %{name}.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:35 -0500
Subject: rpms/lyx/devel lyx.spec,1.5,1.6
Message-ID: <200503032241.j23MfZvU021303@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/lyx/devel

Modified Files:
	lyx.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lyx.spec	4 Dec 2004 12:21:23 -0000	1.5
+++ lyx.spec	3 Mar 2005 22:41:33 -0000	1.6
@@ -1,17 +1,16 @@
 # $Id$
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
-Name:	 lyx
-Epoch:	 0
-Version: 1.3.5 
+Name:    lyx
+Version: 1.3.5
 Release: 3%{?dist_tag}
 License: GPL
-Group: 	 Applications/Publishing
-Url: 	 http://www.lyx.org/
-Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.5.tar.bz2
+Group:   Applications/Publishing
+URL:     http://www.lyx.org/
+Source:  ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.5.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Patch1: lyx-1.3.5-helpers.patch
+Patch1:  lyx-1.3.5-helpers.patch
 
 Source1: lyx.desktop
 # "borrow" kde's crystal icon for lyx
@@ -42,8 +41,8 @@
 %define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2)
 Requires: qt >= 1:%{qt_ver}
 
-## gcc version in use? 
-# I *still* build for some rh73 boxes (not sure why (-: ), 
+## gcc version in use?
+# I *still* build for some rh73 boxes (not sure why (-: ),
 # so I need this -- Rex
 BuildRequires: gcc-c++
 %define gcc_ver %(rpm -q --qf '%%{version}' gcc-c++ )
@@ -78,7 +77,7 @@
 
 
 %build
-unset LINGUAS ||: 
+unset LINGUAS ||:
 unset QTDIR ||: ; . /etc/profile.d/qt.sh
 
 export CXXFLAGS="$RPM_OPT_FLAGS %{?cxxflags}"
@@ -145,10 +144,10 @@
 %{_datadir}/texmf/tex/latex/%{name}
 
 
-%changelog 
+%changelog
 * Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-3
 - BR: htmlview
-- Requires: htmlview, gsview (so build-time-detected helper apps are 
+- Requires: htmlview, gsview (so build-time-detected helper apps are
   available at runtime)
 
 * Wed Oct 20 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.2
@@ -190,7 +189,7 @@
 - Categories=Office
 
 * Mon Nov 24 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.3
-- Requires: tetex-latex 
+- Requires: tetex-latex
 - support MimeType(s): application/x-lyx;text/x-lyx
 
 * Sat Nov 22 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.2



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libksba/devel libksba.spec,1.6,1.7
Message-ID: <200503032241.j23MfYXP021226@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libksba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libksba/devel

Modified Files:
	libksba.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libksba.spec
===================================================================
RCS file: /cvs/extras/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libksba.spec	1 Feb 2005 19:32:51 -0000	1.6
+++ libksba.spec	3 Mar 2005 22:41:32 -0000	1.7
@@ -1,7 +1,5 @@
-
 Summary: X.509 library
-Name:  	 libksba 
-Epoch: 	 0
+Name:    libksba
 Version: 0.9.9
 Release: 1%{?dist_tag}
 License: GPL
@@ -22,7 +20,7 @@
 %package devel
 Summary:  Development headers and libraries for %{name}
 Group:    Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 %description devel
@@ -38,7 +36,7 @@
 %configure
 
 # not smp safe
-make 
+make
 
 make check
 
@@ -67,7 +65,7 @@
 fi
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README* THANKS TODO VERSION
 %{_libdir}/*.so.*



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libxml++/devel libxml++.spec,1.4,1.5
Message-ID: <200503032241.j23MfYAk021278@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libxml++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libxml++/devel

Modified Files:
	libxml++.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libxml++.spec	10 Dec 2004 22:03:06 -0000	1.4
+++ libxml++.spec	3 Mar 2005 22:41:32 -0000	1.5
@@ -1,8 +1,7 @@
 Name: libxml++
 Version: 0.26.0
 Release: 3
-Epoch: 0
-Summary: libxml++ is a C++ wrapper for the libxml2 XML parser library.
+Summary: C++ wrapper for the libxml2 XML parser library
 Group: System Environment/Libraries
 License: LGPL
 URL: http://libxmlplusplus.sourceforge.net/
@@ -11,19 +10,19 @@
 BuildRequires: libxml2-devel >= 0:2.5.1, doxygen, graphviz
 
 %description
-libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original 
-author is Ari Johnson and it is currently maintained by Christophe de Vienne 
+libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
+author is Ari Johnson and it is currently maintained by Christophe de Vienne
 and Murray Cumming.
 
 %package devel
 Summary: %{summary}
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
 %description devel
-libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original 
-author is Ari Johnson and it is currently maintained by Christophe de Vienne 
+libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
+author is Ari Johnson and it is currently maintained by Christophe de Vienne
 and Murray Cumming.
 
 This package contains the headers and libraries for libxml++ development.



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:33 -0500
Subject: rpms/leafnode/devel leafnode.spec,1.5,1.6
Message-ID: <200503032241.j23MfXbf021154@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/leafnode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/leafnode/devel

Modified Files:
	leafnode.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: leafnode.spec
===================================================================
RCS file: /cvs/extras/rpms/leafnode/devel/leafnode.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- leafnode.spec	10 Dec 2004 22:03:04 -0000	1.5
+++ leafnode.spec	3 Mar 2005 22:41:31 -0000	1.6
@@ -1,17 +1,15 @@
 Name: leafnode
 Version: 1.9.53
 Release: 1
-Epoch:          0
-Summary:	Leafnode - a leafsite NNTP server (Version %version)
-Summary(de): 	Leafnode - ein offline-Newsserver (Version %version)
-License: 	MIT, GPL, LGPL
-Group: 		Applications/Internet
-Url: 		http://www.leafnode.org
-Source0: 	http://download.sf.net/leafnode/leafnode-%{version}.rel.tar.bz2
-Source1:        leafnode.xinetd
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: 	pcre-devel
-Requires:	xinetd
+Summary: Leaf site offline NNTP server
+License: MIT, GPL, LGPL
+Group: Applications/Internet
+URL: http://www.leafnode.org
+Source0: http://download.sf.net/leafnode/leafnode-%{version}.rel.tar.bz2
+Source1: leafnode.xinetd
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: pcre-devel
+Requires: xinetd
 
 %define confdir  %{_sysconfdir}/leafnode
 %define spooldir %{_localstatedir}/spool/news
@@ -111,7 +109,7 @@
 * Fri Jan 09 2004 Andreas Pfaffeneder <fedora at zuhause-local.de> 0:1.9.49-0.fdr.1
 - Update to 1.9.49.rel
 - bugfix update
-- little more detailed changelog 
+- little more detailed changelog
 
 * Fri Jan 09 2004 Andreas Pfaffeneder <fedora at zuhause-local.de> 0:1.9.48-0.fdr.1
 - Update to 1.9.48.rel



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libnet10/devel libnet10.spec,1.4,1.5
Message-ID: <200503032241.j23MfYgi021230@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libnet10/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libnet10/devel

Modified Files:
	libnet10.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libnet10.spec
===================================================================
RCS file: /cvs/extras/rpms/libnet10/devel/libnet10.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libnet10.spec	10 Dec 2004 22:03:05 -0000	1.4
+++ libnet10.spec	3 Mar 2005 22:41:32 -0000	1.5
@@ -1,8 +1,7 @@
-Summary:        High-level API (toolkit) allowing the application programmer to construct and inject network packets.
+Summary:        High-level API (toolkit) to construct and inject network packets
 Name:           libnet10
 Version:        1.0.2a
 Release:        5
-Epoch:          0
 URL:            http://www.packetfactory.net/libnet/
 License:        BSD
 Group:          System Environment/Libraries
@@ -10,11 +9,11 @@
 Patch0:         gcc33.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      libnet < 1.1.0
-Provides:       libnet = %{epoch}:%{version}-%{release}
+Provides:       libnet = %{version}-%{release}
 
 %description
 Libnet is a high-level API (toolkit) allowing the application programmer to
-construct and inject network packets. It provides a portable and simplified 
+construct and inject network packets. It provides a portable and simplified
 interface for low-level network packet shaping, handling and injection. Libnet
 hides much of the tedium of packet creation from the application programmer
 such as multiplexing, buffer management, arcane packet header information,



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libol/devel libol.spec,1.6,1.7
Message-ID: <200503032241.j23MfYgs021234@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libol/devel

Modified Files:
	libol.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/devel/libol.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libol.spec	1 Mar 2005 21:12:43 -0000	1.6
+++ libol.spec	3 Mar 2005 22:41:32 -0000	1.7
@@ -7,7 +7,6 @@
 Name:           libol
 Version:        0.3.15
 Release:        2
-Epoch:          0
 Summary:        Support library for syslog-ng
 
 Group:          Development/Libraries
@@ -26,7 +25,7 @@
 %package devel
 Summary:        Support library for syslog-ng: headers and libraries
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 Support library for syslog-ng: headers and libraries.
@@ -55,8 +54,7 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING
-%{_libdir}/libol.so.0
-%{_libdir}/libol.so.0.0.0
+%{_libdir}/libol.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -108,9 +106,9 @@
 
 * Tue Apr 15 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
 - included missing file: /usr/bin/make_class (caused problems in RH9)
- 
+
 * Thu Apr 10 2003 Jose Pedro Oliveira <jpo at di.uminho.pt>
-- specfile reformated 
+- specfile reformated
 - replaced hard coded values by RPM macros
 
 * Sun Jul 30 2000 Hollis Blanchard <hollis at penguinppc.org>



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libvisual/devel libvisual.spec,1.4,1.5
Message-ID: <200503032241.j23MfY6Y021274@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libvisual/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libvisual/devel

Modified Files:
	libvisual.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libvisual.spec
===================================================================
RCS file: /cvs/extras/rpms/libvisual/devel/libvisual.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libvisual.spec	14 Feb 2005 00:12:16 -0000	1.4
+++ libvisual.spec	3 Mar 2005 22:41:32 -0000	1.5
@@ -1,14 +1,13 @@
 Name:           libvisual
 Version:        0.2.0
 Release:        2
-Epoch:          0
-Summary:        An abstraction library for audio visualisation plugins
+Summary:        Abstraction library for audio visualisation plugins
 
 Group:          Applications/Multimedia
 License:        LGPL
 URL:            http://libvisual.sf.net
 Source0:        http://dl.sf.net/libvisual/libvisual-0.2.0.tar.gz
-Patch0:		libvisual-0.2.0-ifdef.patch
+Patch0:         libvisual-0.2.0-ifdef.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  xorg-x11-devel
 
@@ -24,12 +23,12 @@
 an interface towards plugins and applications, through this easy to use
 interface applications can easily access plugins and since the drawing is
 done by the application it also enables the developer to draw the visual
-anywhere he wants. 
+anywhere he wants.
 
 %package        devel
 Summary:        Development files for libvisual
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 Libvisual is an abstraction library that comes between applications and
@@ -62,7 +61,7 @@
 %postun -p /sbin/ldconfig
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_libdir}/*.so.*



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libsigc++/devel libsigc++.spec,1.4,1.5
Message-ID: <200503032241.j23MfYmx021250@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libsigc++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libsigc++/devel

Modified Files:
	libsigc++.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libsigc++.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigc++/devel/libsigc++.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsigc++.spec	10 Dec 2004 22:03:05 -0000	1.4
+++ libsigc++.spec	3 Mar 2005 22:41:32 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           libsigc++
 Version:        1.2.5
 Release:        5
-Epoch:          0
-Summary:        Typesafe Signal Framework for C++.
+Summary:        Typesafe signal framework for C++
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -29,9 +28,9 @@
 library, starting with version 1.1.2, uses %name.
 
 %package        devel
-Summary:        development tools for the Typesafe Signal Framework for C++.
+Summary:        Development tools for the typesafe signal framework for C++
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
 %description devel
@@ -173,7 +172,7 @@
 - Added autoconf macro for sigc.
 
 * Fri Jun 11 1999 Karl Nelson <kenelson at ece.ucdavis.edu>
-- Made into a .in to keep version field up to date 
+- Made into a .in to keep version field up to date
 - Still need to do release by hand
 
 * Mon Jun  7 1999 Dmitry V. Levin <ldv at fandra.org>



From fedora-extras-commits at redhat.com  Thu Mar  3 22:41:34 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 17:41:34 -0500
Subject: rpms/libsidplay/devel libsidplay.spec,1.6,1.7
Message-ID: <200503032241.j23MfY09021246@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libsidplay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21010/libsidplay/devel

Modified Files:
	libsidplay.spec 
Log Message:
Mass letter "l" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: libsidplay.spec
===================================================================
RCS file: /cvs/extras/rpms/libsidplay/devel/libsidplay.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsidplay.spec	16 Dec 2004 16:32:46 -0000	1.6
+++ libsidplay.spec	3 Mar 2005 22:41:32 -0000	1.7
@@ -1,8 +1,7 @@
 Name: libsidplay
-Summary: A Commodore 64 music player and SID chip emulator library.
+Summary: Commodore 64 music player and SID chip emulator library
 Version: 1.36.57
 Release: 6
-Epoch: 0
 Source: http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/%{name}-%{version}.tgz
 Patch: libsidplay-post57fixes.patch
 Icon: sidplay.xpm
@@ -18,9 +17,9 @@
 you can play musics from Commodore 64 (or compatible) programs.
 
 %package devel
-Summary: Header files for compiling apps that use libsidplay.
+Summary: Header files for compiling apps that use libsidplay
 Group: System Environment/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 This package contains the header files for compiling applications



From bugs.michael at gmx.net  Thu Mar  3 22:57:40 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 3 Mar 2005 23:57:40 +0100
Subject: rpms/inti/devel inti.spec,1.2,1.3
In-Reply-To: <20050303233447.14081067@python2>
References: <200503032146.j23LkOgG019532@cvs-int.fedora.redhat.com>
	<20050303225754.509a1171.bugs.michael@gmx.net>
	<20050303233447.14081067@python2>
Message-ID: <20050303235740.6ee29f33.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 23:34:47 +0100, Matthias Saou wrote:

> Michael Schwendt wrote :
> 
> > On Thu, 3 Mar 2005 16:46:24 -0500, Matthias Saou (thias) wrote:
> > 
> > >  Name:           inti
> > >  Version:        1.2
> > > -Release:        0.fdr.5.1
> > > -Epoch:          0
> > > +Release:        1
> > 
> > Release change is pointless here. Please don't mix such changes with the
> > other documented mass-changes. inti package is broken for quite some
> > time (GTK incompatibility) and has not been updated since then. Release
> > should stay to reflect that. Also on the other packages with 0.fdr
> > prefix, please.
> 
> Second time I make that "mistake" IIRC.
> For me, a *.fdr.* release has nothing to do in the devel branch... so
> either it should be fixed (what I unconsciously and repeatedly seem to want
> to do) with the building disabled, or it shouldn't have a devel branch at
> all.

+1

And I'd say this time we get rid of these few packages before first FC4
Test rebuild. They could be resurrected anytime.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/monkey-bubble/devel monkey-bubble.spec,1.1,1.2
Message-ID: <200503032301.j23N1QBQ022824@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/monkey-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/monkey-bubble/devel

Modified Files:
	monkey-bubble.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: monkey-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/monkey-bubble.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monkey-bubble.spec	8 Nov 2004 04:52:25 -0000	1.1
+++ monkey-bubble.spec	3 Mar 2005 23:01:24 -0000	1.2
@@ -1,8 +1,7 @@
 Name:           monkey-bubble
 Version:        0.1.6
-Release:        0.fdr.4.1
-Epoch:          0
-Summary:        Game in the spirit of Frozen Bubble.
+Release:        1
+Summary:        Game in the spirit of Frozen Bubble
 
 Group:          Amusements/Games
 License:        GPL
@@ -17,7 +16,7 @@
 BuildRequires:  pkgconfig
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-Requires(post):  GConf2
+Requires(post): GConf2
 
 %description
 Monkey Bubble is a bust'a'move clone built using Gnometechnologies. It



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:25 -0500
Subject: rpms/mail-notification/devel mail-notification.spec,1.3,1.4
Message-ID: <200503032301.j23N1P5Y022785@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/mail-notification/devel

Modified Files:
	mail-notification.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mail-notification.spec	10 Dec 2004 22:03:07 -0000	1.3
+++ mail-notification.spec	3 Mar 2005 23:01:23 -0000	1.4
@@ -1,10 +1,9 @@
-# use "--with gmail" as rpmbuildparameter to add gmail Support (requires FC3 Core package) 
+# use "--with gmail" as rpmbuildparameter to add gmail Support (requires FC3 Core package)
 
 Name:           mail-notification
-Epoch:          0
 Version:        1.0
 Release:        1
-Summary:        Mail Notification is a status icon that informs you if you have new mail.
+Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
 License:        GPL
@@ -13,17 +12,17 @@
 Source1:        mail-notification-README.FEDORA
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gettext >= 0:0.14.1
-BuildRequires:  eel2-devel >= 0:2.0
+BuildRequires:  gettext >= 0.14.1
+BuildRequires:  eel2-devel >= 2.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  scrollkeeper
-BuildRequires:	openssl-devel  >= 0:0.9.5b
-BuildRequires:	cyrus-sasl-devel >= 0:2.0
-BuildRequires:	gmime-devel >= 0:2.1
+BuildRequires:  openssl-devel  >= 0.9.5b
+BuildRequires:  cyrus-sasl-devel >= 2.0
+BuildRequires:  gmime-devel >= 2.1
 %if 0%{?_with_gmail:1}
-BuildRequires:	libsoup-devel >= 0:2.2.1
-BuildRequires:	gnutls-devel >= 0:1.0.20
-BuildRequires:	libgcrypt-devel >= 0:1.2.0
+BuildRequires:  libsoup-devel >= 2.2.1
+BuildRequires:  gnutls-devel >= 1.0.20
+BuildRequires:  libgcrypt-devel >= 1.2.0
 %endif
 
 Requires(post):   GConf2
@@ -32,21 +31,21 @@
 Requires(postun): scrollkeeper
 
 %description
-Mail Notification is a status icon (aka tray icon) that informs you if you 
+Mail Notification is a status icon (aka tray icon) that informs you if you
 have new mail. It works with system trays implementing the freedesktop.org
-System Tray Specification, such as the GNOME Panel Notification Area, the 
+System Tray Specification, such as the GNOME Panel Notification Area, the
 Xfce Notification Area and the KDE System Tray.
 
 
 %prep
 %setup -q
 cp %{SOURCE1} ./README.FEDORA
- 
+
 
 
 %build
-%configure %{?!_with_gmail:--disable-gmail} 
-make %{?_smp_mflags} 
+%configure %{?!_with_gmail:--disable-gmail}
+make %{?_smp_mflags}
 
 
 %install
@@ -115,13 +114,13 @@
 
 * Tue Nov 09 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.8.1-0.fdr.3
 - trim build comment
-- own _datadir/gnome/help/mail-notification/ 
+- own _datadir/gnome/help/mail-notification/
 - rename SOURCE1 from README.FEDORA to mail-notfication-README.FEDORA
 
 
 * Sat Nov 06 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.8.1-0.fdr.2
-- Really remove "killall bonobo-activation-server"; Add a README.FEDORA 
-  which descibes the problem. 
+- Really remove "killall bonobo-activation-server"; Add a README.FEDORA
+  which descibes the problem.
 - Spilt post,preun,postun sections
 - Use --with gmail to build for FC3 with gmail-support
 
@@ -143,7 +142,7 @@
 
 * Tue Sep 14 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.6.2-0.fdr.1
 - Update to 0.6.2
-- After talkback with program author added "killall bonobo-activation-server" 
+- After talkback with program author added "killall bonobo-activation-server"
   to post section
 
 * Sun Aug 29 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.6.1-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/mknbi/devel mknbi.spec,1.4,1.5
Message-ID: <200503032301.j23N1Q2Q022820@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/mknbi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/mknbi/devel

Modified Files:
	mknbi.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: mknbi.spec
===================================================================
RCS file: /cvs/extras/rpms/mknbi/devel/mknbi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mknbi.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ mknbi.spec	3 Mar 2005 23:01:24 -0000	1.5
@@ -2,7 +2,6 @@
 Name: 		mknbi
 Version:	1.4.0
 Release: 	3
-Epoch: 		0
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://etherboot.sourceforge.net/
@@ -61,7 +60,7 @@
 
 * Tue May 20 2003 Dams <anvil[AT]livna.org> 0:1.4.0-0.fdr.1
 - nasm BuildRequires now arch dependent
-- Changed URL in Source0 
+- Changed URL in Source0
 - buildroot -> RPM_BUILD_ROOT
 - Modifed doc files
 
@@ -69,5 +68,5 @@
 - Updated to 1.4.0
 - Replaced /usr with %{_prefix} in sed
 
-* Sat Apr 26 2003 Dams <anvil[AT]livna.org> 
+* Sat Apr 26 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/most/devel most.spec,1.4,1.5
Message-ID: <200503032301.j23N1QqB022834@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/most/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/most/devel

Modified Files:
	most.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: most.spec
===================================================================
RCS file: /cvs/extras/rpms/most/devel/most.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- most.spec	12 Feb 2005 14:00:37 -0000	1.4
+++ most.spec	3 Mar 2005 23:01:24 -0000	1.5
@@ -4,7 +4,6 @@
 Name:		most
 Version:	4.9.5
 Release:	3
-Epoch:          0
 License:	GPL
 URL:		ftp://space.mit.edu/pub/davis/most/
 Group:		Applications/Text
@@ -47,7 +46,7 @@
 
 %changelog
 * Sat Feb 12 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 4.9.5-3
-- sed -i 's|/usr/lib|%%{_libdir}|g' configure fixes x86_64 build; 
+- sed -i 's|/usr/lib|%%{_libdir}|g' configure fixes x86_64 build;
 
 * Mon Jul 19 2004 Adrian Reber <adrian at lisas.de> - 0:4.9.5-0.fdr.2
 - removed chrpath dependency



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/milter-greylist/devel milter-greylist.spec,1.1,1.2
Message-ID: <200503032301.j23N1Q03022816@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/milter-greylist/devel

Modified Files:
	milter-greylist.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- milter-greylist.spec	3 Feb 2005 10:13:34 -0000	1.1
+++ milter-greylist.spec	3 Mar 2005 23:01:24 -0000	1.2
@@ -15,11 +15,10 @@
 %define rundir		%vardir/run
 %define __chkconfig	/sbin/chkconfig
 
-Summary:	A milter for greylisting, the Next Step in the Spam Control War 
+Summary:	Milter for greylisting, the next step in the spam control war 
 Name:		milter-greylist
 Version:	1.6
 Release:	%release_func 1
-Epoch:		0
 License:	BSD w/ advertising
 Group:		System Environment/Daemon
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -35,21 +34,21 @@
 BuildRequires:		sendmail-devel %{?_with_spf:libspf-devel}
 
 %package sysv
-Summary:	The sysv-initscripts for %name
+Summary:	Sysv initscripts for %name
 Group:		System Environment/Daemon
 Provides:	init(%name) = sysv
-Requires(preun):	%name = %epoch:%version-%release
-Requires(postun):	%name = %epoch:%version-%release
+Requires(preun):	%name = %version-%release
+Requires(postun):	%name = %version-%release
 Requires(preun):	initscripts
 Requires(postun):	initscripts
 Requires(post):		%__chkconfig
 Requires(preun):	%__chkconfig
 
 %package minit
-Summary:	The minit-initscripts for %name
+Summary:	Minit initscripts for %name
 Group:		System Environment/Daemon
 Provides:	init(%name) = minit
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires:		%_sbindir/setuidgid
 Requires(pre):		minit-setup
 Requires(postun):	minit-setup
@@ -97,7 +96,7 @@
 for i in `find -type f`; do
     sed -e 's!/var/milter-greylist/milter-greylist.sock!%rundir/milter-greylist.sock!g;
             s!/var/milter-greylist/greylist.db!%dbdir/greylist.db!g;
-	   ' "$i" >"$i.tmp"
+           ' "$i" >"$i.tmp"
     cmp -s "$i" "$i.tmp" || cat "$i.tmp" >"$i"
     rm -f "$i".tmp
 done



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/moodss/devel moodss.spec,1.4,1.5
Message-ID: <200503032301.j23N1QJh022830@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/moodss/devel

Modified Files:
	moodss.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moodss.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ moodss.spec	3 Mar 2005 23:01:24 -0000	1.5
@@ -2,15 +2,14 @@
 Name: moodss
 Version: 17.17
 Release: 1
-Epoch: 0
 Group: Applications/System
 Source: http://jfontain.free.fr/moodss-17.17.tar.bz2
 URL: http://jfontain.free.fr/moodss/
 License: GPL
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 # work around tcl-devel and tk-devel packages non existence in RH 8.0 and 9:
-BuildRequires: tcl >= 0:8.3.1, %{_includedir}/tcl.h
-Requires: tk >= 0:8.3.1, blt >= 0:2.4-0.fdr.0.z, tktable >= 0:2.7
+BuildRequires: tcl >= 8.3.1, %{_includedir}/tcl.h
+Requires: tk >= 8.3.1, blt >= 2.4, tktable >= 2.7
 
 %description
 A multi-purpose monitoring tool with table, graphical, textual data



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/netmask/devel netmask.spec,1.5,1.6
Message-ID: <200503032301.j23N1Q2W022859@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/netmask/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/netmask/devel

Modified Files:
	netmask.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: netmask.spec
===================================================================
RCS file: /cvs/extras/rpms/netmask/devel/netmask.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- netmask.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ netmask.spec	3 Mar 2005 23:01:24 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           netmask
 Version:        2.3.7
 Release:        2
-Epoch:          0
 Summary:        Utility for determining network masks
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/mathml-fonts/devel mathml-fonts.spec,1.2,1.3
Message-ID: <200503032301.j23N1QCT022798@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/mathml-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/mathml-fonts/devel

Modified Files:
	mathml-fonts.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/mathml-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mathml-fonts.spec	10 Dec 2004 22:03:07 -0000	1.2
+++ mathml-fonts.spec	3 Mar 2005 23:01:24 -0000	1.3
@@ -4,11 +4,10 @@
 %define fontdir       %{_datadir}/fonts/mathml
 
 Summary: Mathematical symbol fonts
-Name:	 mathml-fonts 
-Epoch:	 0
+Name:    mathml-fonts
 Version: 1.0
 Release: 14
-URL:	 http://www.mozilla.org/projects/mathml/fonts/
+URL:     http://www.mozilla.org/projects/mathml/fonts/
 License: Distributable
 Group:   User Interface/X
 BuildArch: noarch
@@ -25,7 +24,7 @@
 ## Design Science fonts
 #  License: http://www.dessci.com/en/support/eula/mtextralic.htm
 #  URL: http://www.dessci.com/en/dl/fonts/
-# extracted from MTW_Truetype.exe 
+# extracted from MTW_Truetype.exe
 # (couldn't figure out how extract at build-time -- Rex)
 Source30: mtextra.ttf
 
@@ -38,7 +37,7 @@
 # in scriptlets
 Prereq: fontconfig
 
-# Not *strictly* required, for Adobe (PS)  Symbol font, expects 
+# Not *strictly* required, for Adobe (PS)  Symbol font, expects
 # /usr/lib/acroread/Resource/Fonts
 # Prereq: acroread
 # BuildRequires: acroread
@@ -47,20 +46,20 @@
 
 %description
 This package contains fonts required to display mathematical
-symbols.  Applications supported include: 
+symbols.  Applications supported include:
 * mozilla (and netscape >= 7) to display MathML
 * lyx
 * kformula (koffice)
 
 
 %prep
-%setup -T -c -n %{name} 
+%setup -T -c -n %{name}
 
 ## Math'ca
 unzip %{SOURCE10}
 
 ## TeX fonts
-#setup -T -D -n %{name} -a 20 
+#setup -T -D -n %{name} -a 20
 cp -a %{SOURCE20} .
 %setup -T -D -n %{name} -a 21
 
@@ -84,7 +83,7 @@
   cmbx10.ttf mtextra.ttf \
   $RPM_BUILD_ROOT%{fontdir}/
 
-# Generate fonts.scale, etc... 
+# Generate fonts.scale, etc...
 # don't really *need* this step, as we're Xft only...
 %{x11bindir}/mkfontscale $RPM_BUILD_ROOT%{fontdir}
 %{x11bindir}/mkfontdir   $RPM_BUILD_ROOT%{fontdir}
@@ -100,7 +99,7 @@
   ## Rebuild fontcache for now available Symbol.pfa
   fc-cache -f %{fontdir} ||:
 fi
- 
+
 %triggerun -- acroread
 [ $2 -eq 0 ] && rm -f %{fontdir}/Symbol.pfa
 ## Rebuild fontcache for now missing (or possibly changed) Symbol.pfa
@@ -144,7 +143,7 @@
 - add comment regarding lyx fonts
 - remove use of mkfontdir -e which causes build failure on FC2.
 - remove deprecated Xft1 bits
-- add %%trigger for acroread, to rebuild font.cache-1 when/if 
+- add %%trigger for acroread, to rebuild font.cache-1 when/if
   Symbol.pfa becomes available/unavailable.
 
 * Tue Jan 13 2004 Rex Dieter <rexdieter at sf.net> 0:1.0-0.fdr.10
@@ -187,6 +186,6 @@
 * Mon Nov 11 2002 Rex Dieter <rdieter at unl.edu> 1.0-0
 - include latest Mathematica 4.1 fonts + CMSY10,CMEX10
 - Require type1inst with added/fixed ams/wri font foundries
-- prefer Math*.pfa over Math*.pfb as type1inst seems to 
+- prefer Math*.pfa over Math*.pfb as type1inst seems to
   incorrectly identify some of the pfb versions.
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:12:26 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 18:12:26 -0500
Subject: rpms/gtkglarea2/devel gtkglarea2.spec,1.6,1.7
Message-ID: <200503032312.j23NCQ4Z023222@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gtkglarea2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23216

Modified Files:
	gtkglarea2.spec 
Log Message:
Remove undefined %{epoch} usage in sub-package.


Index: gtkglarea2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglarea2/devel/gtkglarea2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkglarea2.spec	14 Feb 2005 18:06:47 -0000	1.6
+++ gtkglarea2.spec	3 Mar 2005 23:12:24 -0000	1.7
@@ -14,7 +14,7 @@
 %package devel
 Summary:	Development package for gtkglarea2
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	xorg-x11-devel
 Requires:	gtk2-devel
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:14:30 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 18:14:30 -0500
Subject: rpms/gtkglarea2/FC-3 gtkglarea2.spec,1.6,1.7
Message-ID: <200503032314.j23NEU66023267@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gtkglarea2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23258

Modified Files:
	gtkglarea2.spec 
Log Message:
Remove undefined %{epoch} usage in sub-package.


Index: gtkglarea2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglarea2/FC-3/gtkglarea2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkglarea2.spec	14 Feb 2005 18:06:47 -0000	1.6
+++ gtkglarea2.spec	3 Mar 2005 23:13:54 -0000	1.7
@@ -14,7 +14,7 @@
 %package devel
 Summary:	Development package for gtkglarea2
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	xorg-x11-devel
 Requires:	gtk2-devel
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/mpc/devel mpc.spec,1.2,1.3
Message-ID: <200503032301.j23N1Qhv022838@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/mpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/mpc/devel

Modified Files:
	mpc.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: mpc.spec
===================================================================
RCS file: /cvs/extras/rpms/mpc/devel/mpc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mpc.spec	12 Dec 2004 21:23:43 -0000	1.2
+++ mpc.spec	3 Mar 2005 23:01:24 -0000	1.3
@@ -2,7 +2,6 @@
 Summary:          Command-line client for MPD
 Version:          0.11.1
 Release:          2
-Epoch:            0
 License:          GPL
 Group:            Applications/Multimedia
 URL:              http://www.musicpd.org/?page=mpc



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/nget/devel nget.spec,1.4,1.5
Message-ID: <200503032301.j23N1QmO022869@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/nget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/nget/devel

Modified Files:
	nget.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: nget.spec
===================================================================
RCS file: /cvs/extras/rpms/nget/devel/nget.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nget.spec	23 Jan 2005 16:31:56 -0000	1.4
+++ nget.spec	3 Mar 2005 23:01:24 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           nget
 Version:        0.27.1
 Release:        2
-Epoch:          0
-Summary:        A utility for retrieving files using the NNTP protocol
+Summary:        Utility for retrieving files using the NNTP protocol
 
 Group:          Applications/Internet
 License:        GPL
@@ -29,7 +28,7 @@
 %configure --with-pcre --with-popt
 make %{?_smp_mflags}
 cp .ngetrc ngetrc.example
-	        
+
 
 %install
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/ninja/devel ninja.spec,1.5,1.6
Message-ID: <200503032301.j23N1Q6v022873@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ninja/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/ninja/devel

Modified Files:
	ninja.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ninja.spec
===================================================================
RCS file: /cvs/extras/rpms/ninja/devel/ninja.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ninja.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ ninja.spec	3 Mar 2005 23:01:24 -0000	1.6
@@ -1,10 +1,9 @@
 Name: ninja
 Version: 1.5.8.1
 Release: 2
-Epoch: 0
 License: GPL
-Summary: A text based Internet Relay Chat (IRC) client.
-Group: Applications/Internet 
+Summary: Text based Internet Relay Chat (IRC) client
+Group: Applications/Internet
 URL: http://ninja.qoop.org/
 Source0: ftp://ninja.qoop.org/ninja/sources/%{name}-%{version}.tar.gz
 Patch0: %{name}-%{version}-doc.patch
@@ -29,7 +28,7 @@
 
 %build
 %configure
-make 
+make
 
 %install
 rm -rf %{buildroot}
@@ -57,8 +56,6 @@
 %defattr(644,root,root, 755)
 %doc README ChangeLog BUGS+TODO
 
-
-
 %changelog
 * Tue Feb 25 2003 Adrian Reber <adrian at lisas.de> - 1.5.8.1-0.fdr.1
 - applied fedora naming conventions



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/nethack-falconseye/devel nethack-falconseye.spec,1.6,1.7
Message-ID: <200503032301.j23N1QIN022855@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/nethack-falconseye/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/nethack-falconseye/devel

Modified Files:
	nethack-falconseye.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: nethack-falconseye.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-falconseye/devel/nethack-falconseye.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nethack-falconseye.spec	10 Dec 2004 22:03:07 -0000	1.6
+++ nethack-falconseye.spec	3 Mar 2005 23:01:24 -0000	1.7
@@ -5,8 +5,7 @@
 Name:           nethack-falconseye
 Version:        1.9.4
 Release:        4.a
-Epoch:          0
-Summary:        NetHack - Falcon's Eye
+Summary:        NetHack - Falcon's Eye game
 
 Group:          Amusements/Games
 License:        NetHack General Public License
@@ -28,7 +27,7 @@
 BuildRequires:  ncurses-devel
 %endif
 Requires:       /usr/bin/timidity, /usr/bin/bzip2
-Provides:       nethack = %{epoch}:3.4.1
+Provides:       nethack = 3.4.1
 
 %description
 Falcon's Eye is a mouse-driven interface for NetHack that enhances the



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/netdiag/devel netdiag.spec,1.5,1.6
Message-ID: <200503032301.j23N1QxU022851@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/netdiag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/netdiag/devel

Modified Files:
	netdiag.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: netdiag.spec
===================================================================
RCS file: /cvs/extras/rpms/netdiag/devel/netdiag.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- netdiag.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ netdiag.spec	3 Mar 2005 23:01:24 -0000	1.6
@@ -1,8 +1,7 @@
-Summary:	Diagnostic program for Ethernet adapters under Linux.
+Summary:	Diagnostic program for Ethernet adapters under Linux
 Name:		netdiag
 Version:	2.4
 Release:	4
-Epoch:		0
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.scyld.com/diag/index.html
@@ -12,7 +11,7 @@
 Patch1:		netdiag-2.4-weak-declarations.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Obsoletes:	diag-ether < 0:2.4
-Provides:	diag-ether = %{epoch}:%{version}-%{release}
+Provides:	diag-ether = %{version}-%{release}
 
 
 %description
@@ -21,7 +20,7 @@
 
 
 %prep
-%setup -q -c 
+%setup -q -c
 %patch0 -p1 -b .multilined-strings
 %patch1 -p0 -b .weak-decl
 
@@ -76,5 +75,5 @@
 - updated to 2.3
 - modify whole spec file for according to fedora template
 
-* Mon Feb 24 2003 Dams <anvil[AT]livna.org> 
+* Mon Feb 24 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/meld/devel meld.spec,1.6,1.7
Message-ID: <200503032301.j23N1Qh0022802@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/meld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/meld/devel

Modified Files:
	meld.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/devel/meld.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- meld.spec	9 Feb 2005 02:29:21 -0000	1.6
+++ meld.spec	3 Mar 2005 23:01:24 -0000	1.7
@@ -1,9 +1,9 @@
 Name:             meld
 Version:          0.9.5
 Release:          1
-Summary:          Visual diff and merge tool.
+Summary:          Visual diff and merge tool
 
-Group:            Development/Tools  
+Group:            Development/Tools
 License:          GPL
 URL:              http://meld.sourceforge.net/
 Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/0.9/meld-0.9.5.tar.bz2
@@ -12,8 +12,8 @@
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    desktop-file-utils
-BuildRequires:	  gettext
-BuildRequires:	  intltool
+BuildRequires:    gettext
+BuildRequires:    intltool
 Requires:         gnome-python2 >= 1.99.14
 Requires:         gnome-python2-canvas
 Requires:         gnome-python2-gconf
@@ -64,7 +64,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING 
+%doc AUTHORS COPYING
 %{_bindir}/meld
 %{_datadir}/meld
 %{_datadir}/applications/fedora-meld.desktop



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/mhash/devel mhash.spec,1.7,1.8
Message-ID: <200503032301.j23N1Qfa022807@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/mhash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/mhash/devel

Modified Files:
	mhash.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: mhash.spec
===================================================================
RCS file: /cvs/extras/rpms/mhash/devel/mhash.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mhash.spec	9 Feb 2005 03:27:13 -0000	1.7
+++ mhash.spec	3 Mar 2005 23:01:24 -0000	1.8
@@ -2,17 +2,16 @@
 Name: mhash
 Version: 0.9.2
 Release: 1
-Epoch: 0
 URL: http://mhash.sourceforge.net/
 License: LGPL
 Group: System Environment/Libraries
 Source: http://download.sourceforge.net/mhash/mhash-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-Provides: libmhash = %{epoch}:%{version}-%{release}
+Provides: libmhash = %{version}-%{release}
 
 %description
 Mhash is a free library which provides a uniform interface to a
-large number of hash algorithms. 
+large number of hash algorithms.
 
 These algorithms can be used to compute checksums, message digests,
 and other signatures. The HMAC support implements the basics for
@@ -27,8 +26,8 @@
 %package -n %{name}-devel
 Summary: Header files and libraries for developing apps which use mhash
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Provides: libmhash-devel = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Provides: libmhash-devel = %{version}-%{release}
 
 %description -n %{name}-devel
 This package contains the header files and libraries needed to



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/netcdf/devel netcdf.spec,1.3,1.4
Message-ID: <200503032301.j23N1QVU022845@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/netcdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/netcdf/devel

Modified Files:
	netcdf.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- netcdf.spec	14 Jan 2005 10:10:03 -0000	1.3
+++ netcdf.spec	3 Mar 2005 23:01:24 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           netcdf
 Version:        3.6.0
 Release:        0.2.beta6
-Epoch:          0
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
@@ -15,7 +14,7 @@
 %package devel
 Summary:        Development files for netcdf-3
 Group:          Development/Libraries
-#Requires:       %{name} = %{epoch}:%{version}-%{release}
+#Requires:       %{name} = %{version}-%{release}
 
 %description
 NetCDF-3 (network Common Data Form ver3) is an interface for
@@ -27,7 +26,7 @@
 sharing of scientific data. The NetCDF software was developed at the
 Unidata Program Center in Boulder, Colorado.
 
-NetCDF data is: 
+NetCDF data is:
 
    o Self-Describing: A NetCDF file includes information about the
      data it contains.
@@ -109,8 +108,8 @@
 
 * Sat Dec  4 2004 Ed Hill <eh3 at mit.edu> - 0:3.6.0beta6-0.fdr.0
 - upgrade to 3.6.0beta6
-- create separate devel package that does *not* depend upon 
-  the non-devel package and put the headers/libs in "netcdf-3" 
+- create separate devel package that does *not* depend upon
+  the non-devel package and put the headers/libs in "netcdf-3"
   subdirs for easy co-existance with upcoming netcdf-4
 
 * Thu Dec  2 2004 Ed Hill <eh3 at mit.edu> - 0:3.5.1-0.fdr.12
@@ -120,7 +119,7 @@
 - headers in /usr/include/netcdf, libs in /usr/lib/netcdf
 
 * Mon Oct  4 2004 Ed Hill <eh3 at mit.edu> - 0:3.5.1-0.fdr.10
-- Put headers in their own directory but leave the libraries in the 
+- Put headers in their own directory but leave the libraries in the
   %{_libdir} -- there are only two libs and the majority of other
   "*-devel" packages follow this pattern
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/notemeister/devel notemeister.spec,1.2,1.3
Message-ID: <200503032301.j23N1Qjv022881@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/notemeister/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/notemeister/devel

Modified Files:
	notemeister.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: notemeister.spec
===================================================================
RCS file: /cvs/extras/rpms/notemeister/devel/notemeister.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- notemeister.spec	10 Dec 2004 22:03:07 -0000	1.2
+++ notemeister.spec	3 Mar 2005 23:01:24 -0000	1.3
@@ -4,23 +4,22 @@
 Name:           notemeister
 Version:        0.1.7
 Release:        2
-Epoch:          0
-Summary:        Notemeister is a small, simple note organizer made for the GNOME2 desktop.
+Summary:        Small, simple note organizer made for the GNOME2 desktop
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://notemeister.sourceforge.net
-Source0:	http://dl.sf.net/sourceforge/notemeister/notemeister-0.1.7.tar.gz
+Source0:        http://dl.sf.net/sourceforge/notemeister/notemeister-0.1.7.tar.gz
 #wgetable URL:  http://mesh.dl.sourceforge.net/sourceforge/notemeister/notemeister-0.1.7.tar.gz (german sf mirror)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch: 	noarch     
+BuildArch:      noarch
 BuildRequires:  python-devel >= 2.3.3
-BuildRequires:	gnome-python2-gconf >= 2.0
+BuildRequires:  gnome-python2-gconf >= 2.0
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:  	pygtk2 >= 2.4.0
-Requires:  	pyorbit >= 2.0.0
-Requires:  	gnome-python2 >= 2.0.2
+Requires:       pygtk2 >= 2.4.0
+Requires:       pyorbit >= 2.0.0
+Requires:       gnome-python2 >= 2.0.2
 
 
 
@@ -32,7 +31,7 @@
     * Simple text formatting by highlighted bounds
     * Auto-save feature
     * Import/Export to/from text files
-    * Link notes to a file on disk 
+    * Link notes to a file on disk
 
 
 %prep
@@ -55,7 +54,7 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 rm -rf $RPM_BUILD_ROOT/usr/doc/%{name}-%{version}
- 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:25 -0500
Subject: rpms/manedit/devel manedit.spec,1.8,1.9
Message-ID: <200503032301.j23N1PgQ022788@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/manedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/manedit/devel

Modified Files:
	manedit.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: manedit.spec
===================================================================
RCS file: /cvs/extras/rpms/manedit/devel/manedit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- manedit.spec	28 Feb 2005 21:12:57 -0000	1.8
+++ manedit.spec	3 Mar 2005 23:01:23 -0000	1.9
@@ -1,7 +1,6 @@
 Name:           manedit
 Version:        0.5.11
 Release:        3
-Epoch:          0
 Summary:        GUI editor for creating man pages
 
 Group:          Development/Tools
@@ -15,7 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel zlib-devel desktop-file-utils bzip2-devel
-Requires:	groff
+Requires:       groff
 
 %description
 ManEdit is a UNIX Manual Page Integrated Development Environment.
@@ -37,7 +36,7 @@
 # --disable=bzip2 to build without Bzip2 support
 CFLAGS=$RPM_OPT_FLAGS ./configure Linux --prefix=%{_prefix}  --mandir=%{_mandir} \
 --disable=arch-i486 --disable=arch-i586 --disable=arch-i686 --disable=arch-pentiumpro
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -46,25 +45,25 @@
 
 %{__install} -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
 desktop-file-install --vendor fedora                   \
-	--add-category X-Fedora                        \
-	--add-category Application                     \
-	--add-category Development                     \
-	--dir $RPM_BUILD_ROOT/%{_datadir}/applications \
+        --add-category X-Fedora                        \
+        --add-category Application                     \
+        --add-category Development                     \
+        --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
 %SOURCE1
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE  README 
+%doc AUTHORS LICENSE README
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_datadir}/icons/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*
- 
+
 %changelog
 * Wed Feb  9 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.5.11-3
 - Add patch for multilib and substitute hardcoded 'lib' in %%prep.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/neXtaw/devel neXtaw.spec,1.5,1.6
Message-ID: <200503032301.j23N1Qqx022865@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/neXtaw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/neXtaw/devel

Modified Files:
	neXtaw.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: neXtaw.spec
===================================================================
RCS file: /cvs/extras/rpms/neXtaw/devel/neXtaw.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- neXtaw.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ neXtaw.spec	3 Mar 2005 23:01:24 -0000	1.6
@@ -1,21 +1,19 @@
-Summary:	A modified version of the Athena Widgets with a N*XTSTEP appearance. 
+Summary:	Modified version of the Athena Widgets with a N*XTSTEP appearance
 Name:		neXtaw
-Version: 	0.15.1
-Release: 	1
-Epoch:		0
-URL: 		http://siag.nu/neXtaw/
-Source0: 	http://siag.nu/pub/neXtaw/%{name}-%{version}.tar.gz
-License: 	MIT/X Consortium License
-Group: 		System Environment/Libraries
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Version:	0.15.1
+Release:	1
+URL:		http://siag.nu/neXtaw/
+Source0:	http://siag.nu/pub/neXtaw/%{name}-%{version}.tar.gz
+License:	MIT/X Consortium License
+Group:		System Environment/Libraries
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	XFree86-devel
 
 %package devel
 Summary:	Development files for the neXtaw library
-Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
-#---------------------------------------------------------------------
 
 %description
 neXtaw is a replacement library for the Athena (libXaw) widget set. It
@@ -30,29 +28,24 @@
 the N*XTSTEP GUI. This package contains the development files of the
 neXtaw library.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
 
-#---------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall 
+%makeinstall
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -69,7 +62,6 @@
 %{_libdir}/libneXtaw.so
 %{_libdir}/libneXtaw.a
 
-#---------------------------------------------------------------------
 
 %changelog
 * Thu Oct  2 2003 Dams <anvil[AT]livna.org> 0:0.15.1-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/nomarch/devel nomarch.spec,1.4,1.5
Message-ID: <200503032301.j23N1Qwo022877@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/nomarch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/nomarch/devel

Modified Files:
	nomarch.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: nomarch.spec
===================================================================
RCS file: /cvs/extras/rpms/nomarch/devel/nomarch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nomarch.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ nomarch.spec	3 Mar 2005 23:01:24 -0000	1.5
@@ -1,8 +1,7 @@
-Name:    nomarch
-Version: 1.3
-Release: 1
-Epoch:   0
-Summary: GPLed Arc de-archiver 
+Name:      nomarch
+Version:   1.3
+Release:   1
+Summary:   GPLed Arc de-archiver
 
 Group:     Applications/Archiving
 License:   GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/mantis/devel mantis.spec,1.3,1.4
Message-ID: <200503032301.j23N1Q5e022794@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/mantis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/mantis/devel

Modified Files:
	mantis.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mantis.spec	10 Dec 2004 22:03:07 -0000	1.3
+++ mantis.spec	3 Mar 2005 23:01:24 -0000	1.4
@@ -1,14 +1,13 @@
-## $Id$
+# $Id$
 
 %define pkgdir		%{_datadir}/%{name}
 %define cfgdir		%{_sysconfdir}/%{name}
 %define httpconfdir	%{_sysconfdir}/httpd/conf.d
 
-Summary:	A web-based bugtracking system
+Summary:	Web-based bugtracking system
 Name:		mantis
 Version:	0.18.3
 Release:	2
-Epoch:		0
 License:	GPL
 Group:		Applications/Internet
 URL:		http://mantisbt.sourceforge.net/
@@ -27,7 +26,7 @@
 Group:		Applications/Internet
 Source10:	mantis-httpd.conf
 Provides:	mantis-config = httpd
-Requires:	mantis = %{epoch}:%{version}-%{release}
+Requires:	mantis = %{version}-%{release}
 Requires:	%{httpconfdir}
 Requires:	mod_ssl
 Requires(post):		httpd
@@ -50,7 +49,6 @@
 
 This package contains configuration-files for Apache httpd 2.
 
-#-------------------------------------------------
 
 %prep
 %setup -q -n %{name}bt-%{version}%{?alpha}
@@ -62,7 +60,6 @@
 find -name '.cvsignore' -exec rm -f {} \;
 rm -rf packages
 
-#-------------------------------------------------
 
 %install
 rm -rf "$RPM_BUILD_ROOT"
@@ -93,13 +90,10 @@
 %__install -p -m644 %SOURCE10 $RPM_BUILD_ROOT%httpconfdir/mantis.conf
 subst %httpconfdir/mantis.conf
 
-#-------------------------------------------------
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
-#-------------------------------------------------
-
 
 %post config-httpd
 ! /sbin/pidof httpd &>/dev/null || /usr/sbin/apachectl graceful || :



From fedora-extras-commits at redhat.com  Thu Mar  3 23:01:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:01:26 -0500
Subject: rpms/mhonarc/devel mhonarc.spec,1.4,1.5
Message-ID: <200503032301.j23N1QU5022812@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/mhonarc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/mhonarc/devel

Modified Files:
	mhonarc.spec 
Log Message:
Mass letter "m" and "n" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: mhonarc.spec
===================================================================
RCS file: /cvs/extras/rpms/mhonarc/devel/mhonarc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mhonarc.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ mhonarc.spec	3 Mar 2005 23:01:24 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           mhonarc
 Version:        2.6.10
 Release:        1
-Epoch:          0
-Summary:        A Perl mail-to-HTML converter
+Summary:        Perl mail-to-HTML converter
 
 Group:          Applications/Internet
 License:        GPL
@@ -11,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Provides:       MHonArc = %{epoch}:%{version}-%{release}
+Provides:       MHonArc = %{version}-%{release}
 
 %description
 MHonArc is a Perl mail-to-HTML converter. MHonArc provides HTML mail



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-GDGraph/devel perl-GDGraph.spec,1.3,1.4
Message-ID: <200503032346.j23NkSYl023711@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-GDGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-GDGraph/devel

Modified Files:
	perl-GDGraph.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-GDGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph/devel/perl-GDGraph.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-GDGraph.spec	10 Dec 2004 22:03:08 -0000	1.3
+++ perl-GDGraph.spec	3 Mar 2005 23:46:26 -0000	1.4
@@ -3,7 +3,6 @@
 Name:           perl-GDGraph
 Version:        1.43
 Release:        3
-Epoch:          0
 Summary:        Graph generation package for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Image-Xpm/devel perl-Image-Xpm.spec,1.4,1.5
Message-ID: <200503032346.j23NkTpt023755@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Image-Xpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Image-Xpm/devel

Modified Files:
	perl-Image-Xpm.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Image-Xpm.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Xpm/devel/perl-Image-Xpm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Image-Xpm.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-Image-Xpm.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Image-Xpm
 Version:        1.09
 Release:        2
-Epoch:          0
 Summary:        Load, create, manipulate and save xpm image files in Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-ExtUtils-Depends/devel perl-ExtUtils-Depends.spec, 1.5,
	1.6
Message-ID: <200503032346.j23NkS03023677@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-ExtUtils-Depends/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-ExtUtils-Depends/devel

Modified Files:
	perl-ExtUtils-Depends.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-ExtUtils-Depends.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-Depends/devel/perl-ExtUtils-Depends.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-ExtUtils-Depends.spec	15 Feb 2005 02:49:20 -0000	1.5
+++ perl-ExtUtils-Depends.spec	3 Mar 2005 23:46:26 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-ExtUtils-Depends
 Version:        0.205
 Release:        1
-Epoch:          0
 Summary:        Easily build XS extensions that depend on XS extensions
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Jcode/devel perl-Jcode.spec,1.5,1.6
Message-ID: <200503032346.j23NkTIB023791@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Jcode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Jcode/devel

Modified Files:
	perl-Jcode.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Jcode.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Jcode/devel/perl-Jcode.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Jcode.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-Jcode.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Jcode
 Version:        0.88
 Release:        1
-Epoch:          0
 Summary:        Perl extension interface for converting Japanese text
 
 License:        GPL or Artistic



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Image-Size/devel perl-Image-Size.spec,1.4,1.5
Message-ID: <200503032346.j23NkTmi023747@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Image-Size/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Image-Size/devel

Modified Files:
	perl-Image-Size.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Image-Size.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Size/devel/perl-Image-Size.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Image-Size.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-Image-Size.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Image-Size
 Version:        2.992
 Release:        2
-Epoch:          0
 Summary:        Determine the size of images in several common formats in Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Image-Info/devel perl-Image-Info.spec,1.4,1.5
Message-ID: <200503032346.j23NkTte023743@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Image-Info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Image-Info/devel

Modified Files:
	perl-Image-Info.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Image-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Info/devel/perl-Image-Info.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Image-Info.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-Image-Info.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Image-Info
 Version:        1.16
 Release:        3
-Epoch:          0
 Summary:        Image meta information extraction module for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Pod-Simple/devel perl-Pod-Simple.spec,1.4,1.5
Message-ID: <200503032346.j23NkTgf023870@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Pod-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Pod-Simple/devel

Modified Files:
	perl-Pod-Simple.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Pod-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/devel/perl-Pod-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Pod-Simple.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Pod-Simple.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Pod-Simple
 Version:        3.02
 Release:        1
-Epoch:          0
 Summary:        Framework for parsing POD documentation
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Pod-Coverage/devel perl-Pod-Coverage.spec,1.4,1.5
Message-ID: <200503032346.j23NkTaU023862@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Pod-Coverage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Pod-Coverage/devel

Modified Files:
	perl-Pod-Coverage.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Pod-Coverage.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Coverage/devel/perl-Pod-Coverage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Pod-Coverage.spec	2 Dec 2004 20:06:30 -0000	1.4
+++ perl-Pod-Coverage.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Pod-Coverage
 Version:        0.17
 Release:        1
-Epoch:          0
 Summary:        Checks if the documentation of a module is comprehensive
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-HTML-Tree/devel perl-HTML-Tree.spec,1.1,1.2
Message-ID: <200503032346.j23NkS1q023736@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-HTML-Tree/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-HTML-Tree/devel

Modified Files:
	perl-HTML-Tree.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/devel/perl-HTML-Tree.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-Tree.spec	13 Feb 2005 19:36:38 -0000	1.1
+++ perl-HTML-Tree.spec	3 Mar 2005 23:46:26 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-HTML-Tree
 Version:        3.18
 Release:        2
-Epoch:          0
 Summary:        HTML tree handling modules for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-ExtUtils-PkgConfig/devel perl-ExtUtils-PkgConfig.spec, 1.5,
	1.6
Message-ID: <200503032346.j23NkSgT023689@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-ExtUtils-PkgConfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-ExtUtils-PkgConfig/devel

Modified Files:
	perl-ExtUtils-PkgConfig.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-ExtUtils-PkgConfig.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-PkgConfig/devel/perl-ExtUtils-PkgConfig.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-ExtUtils-PkgConfig.spec	15 Feb 2005 02:57:17 -0000	1.5
+++ perl-ExtUtils-PkgConfig.spec	3 Mar 2005 23:46:26 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-ExtUtils-PkgConfig
 Version:        1.07
 Release:        1
-Epoch:          0
 Summary:        Simplistic interface to pkg-config
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IPC-ShareLite/devel perl-IPC-ShareLite.spec,1.4,1.5
Message-ID: <200503032346.j23NkTT0023787@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IPC-ShareLite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IPC-ShareLite/devel

Modified Files:
	perl-IPC-ShareLite.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IPC-ShareLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-ShareLite/devel/perl-IPC-ShareLite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-IPC-ShareLite.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-IPC-ShareLite.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-IPC-ShareLite
 Version:        0.09
 Release:        4
-Epoch:          0
 Summary:        Light-weight Perl interface to shared memory
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-GDGraph3d/devel perl-GDGraph3d.spec,1.4,1.5
Message-ID: <200503032346.j23NkSBo023715@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-GDGraph3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-GDGraph3d/devel

Modified Files:
	perl-GDGraph3d.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-GDGraph3d.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph3d/devel/perl-GDGraph3d.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-GDGraph3d.spec	17 Jan 2005 21:14:52 -0000	1.4
+++ perl-GDGraph3d.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-GDGraph3d
 Version:        0.63
 Release:        2
-Epoch:          0
 Summary:        3D graph generation package for Perl
 
 Group:          Development/Libraries
@@ -16,7 +15,7 @@
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(GD), perl(GD::Text), perl(GD::Graph)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Provides:       perl-GD-Graph3d = %{epoch}:%{version}-%{release}
+Provides:       perl-GD-Graph3d = %{version}-%{release}
 
 %description
 This is the GD::Graph3d extensions module. It provides 3D graphs for



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-ExtUtils-ParseXS/devel perl-ExtUtils-ParseXS.spec, 1.4,
	1.5
Message-ID: <200503032346.j23NkSE1023684@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-ExtUtils-ParseXS/devel

Modified Files:
	perl-ExtUtils-ParseXS.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-ExtUtils-ParseXS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/perl-ExtUtils-ParseXS.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-ExtUtils-ParseXS.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-ExtUtils-ParseXS.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-ExtUtils-ParseXS
 Version:        2.08
 Release:        2
-Epoch:          0
 Summary:        Module and a script for converting Perl XS code into C code
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Razor-Agent/devel perl-Razor-Agent.spec,1.4,1.5
Message-ID: <200503032346.j23NkTwb023874@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Razor-Agent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Razor-Agent/devel

Modified Files:
	perl-Razor-Agent.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Razor-Agent.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Razor-Agent/devel/perl-Razor-Agent.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Razor-Agent.spec	9 Feb 2005 06:49:01 -0000	1.4
+++ perl-Razor-Agent.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,8 +3,7 @@
 
 Name:           perl-Razor-Agent
 Version:        2.67
-Release:        0.FC3
-Epoch:          0
+Release:        1
 Summary:        Use a Razor catalogue server to filter spam messages
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Net-SSLeay/devel perl-Net-SSLeay.spec,1.1,1.2
Message-ID: <200503032346.j23NkTMw023854@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-SSLeay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Net-SSLeay/devel

Modified Files:
	perl-Net-SSLeay.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/devel/perl-Net-SSLeay.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-SSLeay.spec	20 Dec 2004 17:25:07 -0000	1.1
+++ perl-Net-SSLeay.spec	3 Mar 2005 23:46:27 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-Net-SSLeay
 Version:        1.26
 Release:        1
-Epoch:          0
 Summary:        Perl extension for using OpenSSL
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Image-Base/devel perl-Image-Base.spec,1.4,1.5
Message-ID: <200503032346.j23NkSXe023739@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Image-Base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Image-Base/devel

Modified Files:
	perl-Image-Base.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Image-Base.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Base/devel/perl-Image-Base.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Image-Base.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-Image-Base.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Image-Base
 Version:        1.07
 Release:        3
-Epoch:          0
 Summary:        Base class for loading, manipulating and saving images in Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/pgadmin3/devel pgadmin3.spec,1.2,1.3
Message-ID: <200503032353.j23NrFYG024638@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pgadmin3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/pgadmin3/devel

Modified Files:
	pgadmin3.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: pgadmin3.spec
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/pgadmin3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pgadmin3.spec	10 Dec 2004 22:03:09 -0000	1.2
+++ pgadmin3.spec	3 Mar 2005 23:53:13 -0000	1.3
@@ -1,24 +1,23 @@
-Summary: 	Graphical client for PostgreSQL.
-Name: 		pgadmin3
+Summary:	Graphical client for PostgreSQL
+Name:		pgadmin3
 Version:	1.0.2
 Release:	3
 License:	Artistic
-Epoch:		0
 Group:		Applications/Databases
-Source:  	ftp://ftp.postgresql.org/pub/pgadmin3/release/src/pgadmin3-1.0.2.tar.gz
-URL: 	 	http://www.pgadmin.org/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: 	wxGTK2-devel wxGTK2-stc wxGTK2-xrc postgresql-devel desktop-file-utils openssl-devel
+Source: 	ftp://ftp.postgresql.org/pub/pgadmin3/release/src/pgadmin3-1.0.2.tar.gz
+URL:		http://www.pgadmin.org/
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	wxGTK2-devel wxGTK2-stc wxGTK2-xrc postgresql-devel desktop-file-utils openssl-devel
 
 %description
-pgAdmin III is a comprehensive PostgreSQL database design 
+pgAdmin III is a comprehensive PostgreSQL database design
 and management system for *nix and Windows systems.
 
 %prep
 %setup -q
 
 %build
-%configure 
+%configure
 #Somehow doesn't link in these..
 make %{?_smp_mflags} LDFLAGS="-lwx_gtk2-2.4 -lwx_gtk2_stc-2.4 -lwx_gtk2_xrc-2.4" all
 
@@ -33,14 +32,14 @@
 desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
 	--add-category X-Fedora\
 	--add-category Application\
-	 --add-category System\
-	 ./pkg/%{name}.desktop 
+	--add-category System\
+	./pkg/%{name}.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(-, root, root)
 %doc LICENCE.txt BUGS.txt README.txt
 %{_bindir}/*



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/php-adodb/devel php-adodb.spec,1.2,1.3
Message-ID: <200503032353.j23NrFk2024642@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-adodb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/php-adodb/devel

Modified Files:
	php-adodb.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: php-adodb.spec
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/php-adodb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-adodb.spec	10 Dec 2004 22:03:09 -0000	1.2
+++ php-adodb.spec	3 Mar 2005 23:53:13 -0000	1.3
@@ -2,7 +2,6 @@
 Summary:        Active Data Objects Data Base
 Version:        4.52
 Release:        1
-Epoch:          0
 Source0:        http://dl.sf.net/adodb/adodb452.tgz
 License:        BSD
 URL:            http://adodb.sf.net
@@ -17,7 +16,7 @@
 standardised. Every database extension uses a different and
 incompatibile API. This creates a need for a database class
 library to hide the differences between the different databases
-(encapsulate the differences) so we can easily switch databases. 
+(encapsulate the differences) so we can easily switch databases.
 
 %prep
 %setup -q -n adodb



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/python-adns/devel python-adns.spec,1.4,1.5
Message-ID: <200503032353.j23NrF5m024674@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-adns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/python-adns/devel

Modified Files:
	python-adns.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: python-adns.spec
===================================================================
RCS file: /cvs/extras/rpms/python-adns/devel/python-adns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-adns.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ python-adns.spec	3 Mar 2005 23:53:13 -0000	1.5
@@ -5,16 +5,15 @@
 Name:           python-adns
 Version:        1.0.0
 Release:        3
-Epoch:          0
-Summary:	Python interface for the GNU adns library
-Group:		Development/Languages
-License:	GPL
-URL:		http://dustman.net/andy/python/adns-python
-Source0:	http://dustman.net/andy/python/adns-python/1.0.0/adns-python-1.0.0.tar.gz
+Summary:        Python interface for the GNU adns library
+Group:          Development/Languages
+License:        GPL
+URL:            http://dustman.net/andy/python/adns-python
+Source0:        http://dustman.net/andy/python/adns-python/1.0.0/adns-python-1.0.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	python-devel, adns-devel
-Requires:	python >= 0:%{pyver}, python < 0:%{pynext}
+BuildRequires:  python-devel, adns-devel
+Requires:       python >= %{pyver}, python < %{pynext}
 
 %description
 The adns module provides an interface to the GNU ADNS asynchronous DNS



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/openslp/devel openslp.spec,1.4,1.5
Message-ID: <200503032353.j23NrFrg024610@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/openslp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/openslp/devel

Modified Files:
	openslp.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: openslp.spec
===================================================================
RCS file: /cvs/extras/rpms/openslp/devel/openslp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openslp.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ openslp.spec	3 Mar 2005 23:53:13 -0000	1.5
@@ -2,20 +2,19 @@
 
 %define pie 1
 
-Summary: OpenSLP implementation of Service Location Protocol V2
-Name:	 openslp
-Epoch:	 0
+Summary: Open implementation of Service Location Protocol V2
+Name:    openslp
 Version: 1.2.0
 Release: 4%{?dist_tag}
-Group:	 System Environment/Libraries
+Group:   System Environment/Libraries
 License: BSD
-#URL: 	 http://www.openslp.org/
-URL:	 http://sourceforge.net/projects/openslp/
+#URL:     http://www.openslp.org/
+URL:     http://sourceforge.net/projects/openslp/
 Source:  http://dl.sourceforge.net/sourceforge/openslp/openslp-1.2.0.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source1: slpd.init
-Patch1:	 openslp-1.2.0-optflags.patch
+Patch1:  openslp-1.2.0-optflags.patch
 
 BuildRequires: autoconf automake libtool
 BuildRequires: bison flex
@@ -28,20 +27,20 @@
 existence, location, and configuration of networked services in
 enterprise networks.
 
-OpenSLP is an open source implementation of the SLPv2 protocol as defined 
-by RFC 2608 and RFC 2614.   
+OpenSLP is an open source implementation of the SLPv2 protocol as defined
+by RFC 2608 and RFC 2614.
 
 %package devel
 Summary: OpenSLP headers and libraries
-Group:	Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
 %description devel
 OpenSLP header files and libraries.
 
 %package server
 Summary: OpenSLP server daemon
-Group:	 System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Group:   System Environment/Daemons
+Requires: %{name} = %{version}-%{release}
 Requires(preun): chkconfig /sbin/service
 Requires(post): chkconfig
 Requires(postun): /sbin/service
@@ -50,7 +49,7 @@
 
 
 %prep
-%setup -q 
+%setup -q
 
 %patch1 -p1 -b .optflags
 
@@ -87,8 +86,8 @@
 install -p -D -m755  %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/slpd
 
 # nuke unpackaged/unwanted files
-rm -rf	$RPM_BUILD_ROOT/usr/doc
-rm -f 	$RPM_BUILD_ROOT%{_libdir}/*.la	
+rm -rf $RPM_BUILD_ROOT/usr/doc
+rm -f  $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %clean
@@ -113,7 +112,7 @@
 fi
 
 
-%files 
+%files
 %defattr(-,root,root)
 %doc AUTHORS COPYING FAQ NEWS README THANKS
 %doc doc/html/IntroductionToSLP
@@ -132,7 +131,7 @@
 
 %files devel
 %defattr(-,root,root)
-%doc doc/html/ProgrammersGuide 
+%doc doc/html/ProgrammersGuide
 %doc doc/rfc
 %{_includedir}/*
 %{_libdir}/lib*.so
@@ -150,7 +149,7 @@
 
 * Thu Jul 15 2004 Rex Dieter <rexdieter at sf.net> 0:1.2.0-0.fdr.1
 - 1.2.0
-- use -pie 
+- use -pie
 - don't use Requires(post,postun)
 
 * Fri Oct 24 2003 Rex Dieter <rexdieter af sf.net> 0:1.0.11-0.fdr.7
@@ -176,7 +175,7 @@
 * Thu May 1 2003 Rex Dieter <rexdieter at sf.net> 0:1.0.11-0.fdr.2
 - docs: remove CVS files, include rfc, move ProgrammersGuide to -devel.
 - improve sub-pkg descriptions.
-- improve server %%preun,%%postun scripts: condrestart on upgrade, 
+- improve server %%preun,%%postun scripts: condrestart on upgrade,
   suppress output of server shutdown,restarts.
 
 * Thu May 1 2003 Rex Dieter <rexdieter at sf.net> 0:1.0.11-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/perltidy/devel perltidy.spec,1.7,1.8
Message-ID: <200503032353.j23NrFlg024634@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perltidy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/perltidy/devel

Modified Files:
	perltidy.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perltidy.spec
===================================================================
RCS file: /cvs/extras/rpms/perltidy/devel/perltidy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perltidy.spec	16 Dec 2004 19:39:28 -0000	1.7
+++ perltidy.spec	3 Mar 2005 23:53:13 -0000	1.8
@@ -3,7 +3,6 @@
 Name:           perltidy
 Version:        20031021
 Release:        1
-Epoch:          0
 Summary:        Tool for indenting and reformatting Perl scripts
 
 Group:          Development/Tools



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/openbox/devel openbox.spec,1.5,1.6
Message-ID: <200503032353.j23NrFqc024602@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/openbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/openbox/devel

Modified Files:
	openbox.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: openbox.spec
===================================================================
RCS file: /cvs/extras/rpms/openbox/devel/openbox.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openbox.spec	13 Nov 2004 02:04:50 -0000	1.5
+++ openbox.spec	3 Mar 2005 23:53:13 -0000	1.6
@@ -1,8 +1,7 @@
 Summary: Openbox window manager
 Name: openbox
 Version: 2.3.1
-Release: 0.fdr.5.2
-Epoch: 0
+Release: 1
 URL: http://www.icculus.org/openbox/
 Source0: http://www.icculus.org/openbox/releases/%{name}-%{version}.tar.gz
 Source1: openbox-switchdesk.Xclients
@@ -13,7 +12,7 @@
 Group: User Interface/X
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: XFree86-devel, fontconfig-devel, bison
-Conflicts: fluxbox <= 0:0.1.14
+Conflicts: fluxbox <= 0.1.14
 
 %description
 Openbox is a window manager for the X11 windowing system. It currently



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/pdftohtml/devel pdftohtml.spec,1.5,1.6
Message-ID: <200503032353.j23NrFXE024630@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pdftohtml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/pdftohtml/devel

Modified Files:
	pdftohtml.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: pdftohtml.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftohtml/devel/pdftohtml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pdftohtml.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ pdftohtml.spec	3 Mar 2005 23:53:13 -0000	1.6
@@ -1,13 +1,12 @@
 Name:		pdftohtml
 Version:	0.36
 Release:	3
-Epoch:      0
-Summary:	A PDF to HTML converter.
+Summary:	PDF to HTML converter
 Url:		http://pdftohtml.sourceforge.net/
 Source0:	http://dl.sf.net/pdftohtml/pdftohtml-0.36.tar.gz
 License:	GPL
 Group:		Applications/Text
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 PDFTOHTML converts Portable Document Format (PDF) files to HTML



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/python-crypto/devel python-crypto.spec,1.5,1.6
Message-ID: <200503032353.j23NrFiX024682@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-crypto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/python-crypto/devel

Modified Files:
	python-crypto.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: python-crypto.spec
===================================================================
RCS file: /cvs/extras/rpms/python-crypto/devel/python-crypto.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-crypto.spec	18 Dec 2004 14:40:32 -0000	1.5
+++ python-crypto.spec	3 Mar 2005 23:53:13 -0000	1.6
@@ -1,20 +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)")}
 
-Summary: 	A cryptography library for Python.
-Name: 		python-crypto
-Version: 	2.0
-Epoch:		0
-Release: 	2
-License: 	Python License (CNRI Python License)
-Group: 		Development/Libraries
-URL: 		http://www.amk.ca/python/code/crypto.html
+Summary:	Cryptography library for Python
+Name:		python-crypto
+Version:	2.0
+Release:	2
+License:	Python License (CNRI Python License)
+Group:		Development/Libraries
+URL:		http://www.amk.ca/python/code/crypto.html
 Source:		http://www.amk.ca/files/python/crypto/pycrypto-2.0.tar.gz
 Patch0:		%{name}-x86_64-buildfix.patch
-BuildRequires:	python >= 0:2.2
-BuildRequires:	python-devel >= 0:2.2
-BuildRequires:	gmp-devel >= 0:4.1
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n)
+BuildRequires:	python >= 2.2
+BuildRequires:	python-devel >= 2.2
+BuildRequires:	gmp-devel >= 4.1
+BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n)
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
@@ -24,10 +23,10 @@
 
 # The pre section.
 %prep
-%setup -n pycrypto-2.0 -q 
+%setup -n pycrypto-2.0 -q
 %ifarch x86_64
 %patch0 -b .patch0
-%endif 
+%endif
 
 # The build section.
 %build
@@ -45,7 +44,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 # The files section.
-%files 
+%files
 %defattr(-,root,root,-)
 %doc README TODO ACKS ChangeLog LICENSE Doc Demo
 %{python_sitearch}/Crypto/*.py
@@ -79,7 +78,7 @@
 %changelog
 * Sat Dec 18 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:2.0-2
 - Fix build on x86_64: use python_sitearch for files and patch source
-  to find gmp 
+  to find gmp
 
 * Thu Aug 26 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:2.0-0.fdr.1
 - Update to 2.00



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/parchive/devel parchive.spec,1.5,1.6
Message-ID: <200503032353.j23NrFvp024618@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/parchive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/parchive/devel

Modified Files:
	parchive.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: parchive.spec
===================================================================
RCS file: /cvs/extras/rpms/parchive/devel/parchive.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- parchive.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ parchive.spec	3 Mar 2005 23:53:13 -0000	1.6
@@ -1,11 +1,10 @@
 Summary:          Parity archive command line client
 Name:             parchive
-Version:          1.1 
+Version:          1.1
 Release:          2
-Epoch:            0
 URL:              http://parchive.sourceforge.net/
 License:          GPL
-Group:            Applications/Archiving 
+Group:            Applications/Archiving
 Source0:          http://download.sourceforge.net/parchive/par-v1.1.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -14,10 +13,10 @@
 data-recovery capability concepts of RAID-like systems to the posting
 and recovery of multi-part archives on Usenet. Current filespec and
 clients support the 'Reed-Soloman Code' implementation that allows for
-recovery of any 'X' volumes for 'X' parity volumes present. 
-                       
+recovery of any 'X' volumes for 'X' parity volumes present.
+
 %prep
-%setup -q -n par-cmdline 
+%setup -q -n par-cmdline
 
 %build
 make %{?_smp_mflags} "CFLAGS=-Wall %{optflags}"
@@ -28,7 +27,7 @@
 install -m 755 par %{buildroot}%{_bindir}/par
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/psi/devel psi.spec,1.7,1.8
Message-ID: <200503032353.j23NrFoh024658@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/psi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/psi/devel

Modified Files:
	psi.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/psi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- psi.spec	12 Jan 2005 21:11:58 -0000	1.7
+++ psi.spec	3 Mar 2005 23:53:13 -0000	1.8
@@ -5,7 +5,6 @@
 Version:    0.9.3
 Release:    1
 Summary:    Jabber client using QT3
-Epoch:      0
 License:    GPL
 Group:      Applications/Internet
 URL:        http://psi.affinix.com/
@@ -16,7 +15,7 @@
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	qt-devel >= 1:3.1.1
+BuildRequires:  qt-devel >= 1:3.1.1
 BuildRequires:  XFree86-devel
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
@@ -25,31 +24,31 @@
 BuildRequires:  kdelibs-devel
 %endif
 
-Requires:   sox
-Requires:   gnupg
+Requires:    sox
+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
+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
@@ -83,9 +82,9 @@
 provides gateways to other protocols as AIM, ICQ, MSN and Yahoo!.
 
 %package -n %name-i18n
-Summary:	Language packs for Psi
-Group:		Applications/Internet
-Requires:	psi = 0:%version
+Summary:    Language packs for Psi
+Group:      Applications/Internet
+Requires:   psi = %version
 
 %description -n %name-i18n
 This package adds internationalization to Psi.
@@ -96,7 +95,7 @@
 %package -n %name-icons
 Summary:    Additional icons for Psi
 Group:      Applications/Internet
-Requires:   psi >= 0:0.9.1
+Requires:   psi >= 0.9.1
 
 %description -n %name-icons
 This package contains additional icons for Psi
@@ -121,11 +120,11 @@
 export KDEDIR=%(kde-config --prefix)
 %endif
 
-./configure                     \
-	--prefix=%{_prefix}     \
-	--bindir=%{_bindir}     \
-	--libdir=%{_datadir}/%name  \
-	--qtdir=$QTDIR
+./configure                        \
+        --prefix=%{_prefix}        \
+        --bindir=%{_bindir}        \
+        --libdir=%{_datadir}/%name \
+        --qtdir=$QTDIR
 
 # Fix build for FC1
 make qmake
@@ -205,7 +204,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(0644,root,root,0755)
 #%doc README COPYING libpsi/iconset/ICONSET-HOWTO
 %attr(0755,root,root) %{_bindir}/psi
@@ -216,7 +215,7 @@
 %exclude %{_datadir}/%{name}/*.qm
 %exclude %{_datadir}/%{name}/iconsets/*/*.jisp
 
-%files -n %name-i18n 
+%files -n %name-i18n
 %defattr(0644,root,root,0755)
 %{_datadir}/%name/%{name}_*.qm
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/python-imaging/devel python-imaging.spec,1.3,1.4
Message-ID: <200503032353.j23NrFFw024690@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-imaging/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/python-imaging/devel

Modified Files:
	python-imaging.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/devel/python-imaging.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-imaging.spec	11 Feb 2005 13:17:58 -0000	1.3
+++ python-imaging.spec	3 Mar 2005 23:53:13 -0000	1.4
@@ -2,9 +2,8 @@
 %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 %define py_incdir %{_includedir}/python%{pyver}
 
-Summary: Python's own image processing library 
+Summary: Python's own image processing library
 Name: python-imaging
-Epoch: 0
 Version: 1.1.4
 Release: 7
 License: Distributable
@@ -24,9 +23,9 @@
 Requires: python-abi = %{pyver}
 
 %description
-Python Imaging Library 
-   
-The Python Imaging Library (PIL) adds image processing capabilities 
+Python Imaging Library
+
+The Python Imaging Library (PIL) adds image processing capabilities
 to your Python interpreter.
 
 This library provides extensive file format support, an efficient
@@ -37,12 +36,11 @@
 %package devel
 Summary: Development files for python-imaging.
 Group: Development/Languages
-Requires: %{name} = %{epoch}:%{version}-%{release}, python-devel, %{py_incdir}
+Requires: %{name} = %{version}-%{release}, python-devel, %{py_incdir}
 
 %description devel
 Development files for python-imaging.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q -n Imaging-%{version}
@@ -54,7 +52,6 @@
 %patch5 -p1
 %patch6 -p1
 
-#---------------------------------------------------------------------
 
 %build
 cd libImaging
@@ -68,7 +65,6 @@
 cd ..
 %{__python} setup.py build
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -76,17 +72,14 @@
 install -m 644 libImaging/*.h $RPM_BUILD_ROOT/%{py_incdir}/Imaging
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %check || :
 PYTHONPATH=$(ls -1d build/lib.linux*) %{__python} selftest.py
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files
 %defattr (-,root,root)
@@ -103,6 +96,7 @@
 %{py_incdir}/Imaging
 %doc Doc Scripts Images Sane
 
+
 %changelog
 * Mon Feb  7 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.1.4-7
 - Build PIC on x86_64 to fix x86_64 linking.
@@ -115,7 +109,7 @@
 
 * Sun Nov 30 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.4-0.fdr.5
 - added -devel package (thanks to patch from pmatilai at welho.com)
-- FC1 requires dependency to tcl-devel and tk-devel package 
+- FC1 requires dependency to tcl-devel and tk-devel package
 
 * Wed Jul 16 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.4-0.fdr.4
 - bumped release
@@ -126,7 +120,7 @@
 
 * Sat Jul 12 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.4-0.fdr.3
 - fixed source0 to point into effbot.org instead of pythonware.com
-- changed references from python2 to python, since python in RH9 is 
+- changed references from python2 to python, since python in RH9 is
   python 2.2.
 - removed percent signs from changelog.
 
@@ -140,7 +134,7 @@
 
 * Tue May 20 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.3-0.fdr.5
 - added python2-devel into buildrequires.
-- added versionm variable into setup macro instead of hard coded 
+- added versionm variable into setup macro instead of hard coded
   version number.
 
 * Mon May 12 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.3-0.fdr.4
@@ -168,7 +162,7 @@
 - switched from python 1.5.2 to python 2.2
 - other modifications to make it build at minimal effort
 
-* Tue Sep 12 2000 Ray Garcia <rayg at ssec.wisc.edu> 
+* Tue Sep 12 2000 Ray Garcia <rayg at ssec.wisc.edu>
 - update to 1.1
 
 * Thu Mar 30 2000 Frederic Lepied <flepied at mandrakesoft.com> 1.0b1-3mdk
@@ -187,11 +181,11 @@
 
 * Sun Dec 27 1998 Oliver Andrich <oli at andrich.net>
 - changed Setup file so that the tkinter module is compiled with Tix and BLT
-	support
+  support
 
 * Mon Jul 20 1998 Oliver Andrich <oli at andrich.net>
 - had to recompile and update the package to support the uptodate graphics
-	libs
+  libs
 
 * Sat Jun 07 1998 Oliver Andrich <oli at andrich.net>
 - updated package to version 0.3a4



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/p0f/devel p0f.spec,1.3,1.4
Message-ID: <200503032353.j23NrF3S024614@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/p0f/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/p0f/devel

Modified Files:
	p0f.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: p0f.spec
===================================================================
RCS file: /cvs/extras/rpms/p0f/devel/p0f.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- p0f.spec	2 Dec 2004 01:10:15 -0000	1.3
+++ p0f.spec	3 Mar 2005 23:53:13 -0000	1.4
@@ -1,8 +1,7 @@
 Name: p0f
 Version: 2.0.5
 Release: 1
-Epoch:	0
-Summary: A versatile passive OS fingerprinting tool.
+Summary: Versatile passive OS fingerprinting tool
 Group: Applications/Internet
 License: GPL
 URL: http://lcamtuf.coredump.cx/p0f.shtml
@@ -51,6 +50,7 @@
 %config %{_sysconfdir}/p0f/p0fo.fp
 %{_mandir}/man1/p0f.1.gz
 
+
 %changelog
 * Tue Oct 26 2004 Adrian Reber <adrian at lisas.de> - 0:2.0.5-1
 - updated to 2.0.5



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/pcsc-perl/devel pcsc-perl.spec,1.1,1.2
Message-ID: <200503032353.j23NrFDK024626@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pcsc-perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/pcsc-perl/devel

Modified Files:
	pcsc-perl.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: pcsc-perl.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-perl/devel/pcsc-perl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcsc-perl.spec	7 Jan 2005 20:15:46 -0000	1.1
+++ pcsc-perl.spec	3 Mar 2005 23:53:13 -0000	1.2
@@ -1,10 +1,9 @@
-%define pcscver %(rpm -q --qf %%{epoch}:%%{version} pcsc-lite-libs)
+%define pcscver %(rpm -q --qf %%{version} pcsc-lite-libs)
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           pcsc-perl
 Version:        1.3.1
 Release:        4
-Epoch:          0
 Summary:        Perl interface to the PC/SC smart card library
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/pth/devel pth.spec,1.7,1.8
Message-ID: <200503032353.j23NrFXJ024662@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/pth/devel

Modified Files:
	pth.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: pth.spec
===================================================================
RCS file: /cvs/extras/rpms/pth/devel/pth.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pth.spec	27 Feb 2005 20:00:29 -0000	1.7
+++ pth.spec	3 Mar 2005 23:53:13 -0000	1.8
@@ -1,8 +1,7 @@
-Summary:        GNU Pth - The GNU Portable Threads
+Summary:        The GNU Portable Threads
 Name:           pth
 Version:        2.0.4
 Release:        1
-Epoch:          0
 License:        LGPL
 Group:          System Environment/Libraries
 URL:            http://www.gnu.org/software/pth/
@@ -21,7 +20,7 @@
 %package devel
 Summary:        Development headers and libraries for GNU Pth
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 Development headers and libraries for GNU Pth.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/pcsc-lite/devel pcsc-lite.spec,1.1,1.2
Message-ID: <200503032353.j23NrF4G024622@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pcsc-lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/pcsc-lite/devel

Modified Files:
	pcsc-lite.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcsc-lite.spec	7 Jan 2005 19:57:18 -0000	1.1
+++ pcsc-lite.spec	3 Mar 2005 23:53:13 -0000	1.2
@@ -1,7 +1,6 @@
 Name:           pcsc-lite
 Version:        1.2.0
 Release:        10
-Epoch:          0
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
@@ -28,8 +27,8 @@
 %package        libs
 Summary:        PC/SC Lite libraries
 Group:          System Environment/Libraries
-Provides:       libpcsc-lite = %{epoch}:%{version}-%{release}
-Provides:       libmusclecard = %{epoch}:%{version}-%{release}
+Provides:       libpcsc-lite = %{version}-%{release}
+Provides:       libmusclecard = %{version}-%{release}
 
 %description    libs
 PC/SC Lite libraries.
@@ -37,9 +36,9 @@
 %package        devel
 Summary:        PC/SC Lite development files
 Group:          Development/Libraries
-Requires:       %{name}-libs = %{epoch}:%{version}-%{release}, pkgconfig
-Provides:       libpcsc-lite-devel = %{epoch}:%{version}-%{release}
-Provides:       libmusclecard-devel = %{epoch}:%{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}, pkgconfig
+Provides:       libpcsc-lite-devel = %{version}-%{release}
+Provides:       libmusclecard-devel = %{version}-%{release}
 
 %description    devel
 PC/SC Lite development files.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/pinentry/devel pinentry.spec,1.5,1.6
Message-ID: <200503032353.j23NrFxd024646@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pinentry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/pinentry/devel

Modified Files:
	pinentry.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: pinentry.spec
===================================================================
RCS file: /cvs/extras/rpms/pinentry/devel/pinentry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pinentry.spec	10 Dec 2004 22:03:09 -0000	1.5
+++ pinentry.spec	3 Mar 2005 23:53:13 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           pinentry
 Version:        0.7.1
 Release:        3
-Epoch:          0
 Summary:        Collection of simple PIN or passphrase entry dialogs
 
 Group:          Applications/System
@@ -18,7 +17,7 @@
 # texinfo needed because of patch0
 BuildRequires:  texinfo
 Requires:       %{_sbindir}/update-alternatives, /sbin/install-info
-Provides:       %{name}-curses = %{epoch}:%{version}-%{release}
+Provides:       %{name}-curses = %{version}-%{release}
 
 %description
 Pinentry is a collection of simple PIN or passphrase entry dialogs which
@@ -29,9 +28,9 @@
 %package        gtk
 Summary:        Passphrase/PIN entry dialog based on GTK+
 Group:          Applications/System
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       %{_sbindir}/update-alternatives
-Provides:       %{name}-gui = %{epoch}:%{version}-%{release}
+Provides:       %{name}-gui = %{version}-%{release}
 
 %description    gtk
 Pinentry is a collection of simple PIN or passphrase entry dialogs which
@@ -42,9 +41,9 @@
 %package        qt
 Summary:        Passphrase/PIN entry dialog based on Qt
 Group:          Applications/System
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       %{_sbindir}/update-alternatives
-Provides:       %{name}-gui = %{epoch}:%{version}-%{release}
+Provides:       %{name}-gui = %{version}-%{release}
 
 %description    qt
 Pinentry is a collection of simple PIN or passphrase entry dialogs which



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/prozilla/devel prozilla.spec,1.7,1.8
Message-ID: <200503032353.j23NrFxm024654@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/prozilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/prozilla/devel

Modified Files:
	prozilla.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/devel/prozilla.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- prozilla.spec	9 Feb 2005 20:12:15 -0000	1.7
+++ prozilla.spec	3 Mar 2005 23:53:13 -0000	1.8
@@ -1,13 +1,12 @@
-Summary:	An advanced Linux download manager
+Summary:	Advanced Linux download manager
 Name:		prozilla
-Version: 	1.3.7.3
+Version:	1.3.7.3
 Release:	1
-Epoch:		0
 License:	GPL
 Group:		Applications/Internet
-Source0:	http://prozilla.genesys.ro/downloads/prozilla/tarballs/%{name}-%{version}.tar.gz 
+Source0:	http://prozilla.genesys.ro/downloads/prozilla/tarballs/%{name}-%{version}.tar.gz
 URL:		http://prozilla.genesys.ro/
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel
 
 
@@ -15,7 +14,7 @@
 ProZilla is a download accellerator program written for Linux to speed
 up the normal file download process. It often gives speed increases of
 around 200% to 300%. It supports both FTP and HTTP protocols, and the
-theory behind it is very simple. 
+theory behind it is very simple.
 
 The program opens multiple connections to a server, and each of the
 connections downloads a part of the file, thus defeating existing
@@ -42,7 +41,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ANNOUNCE AUTHORS ChangeLog COPYING CREDITS FAQ INSTALL NEWS README TODO 
+%doc ANNOUNCE AUTHORS ChangeLog COPYING CREDITS FAQ INSTALL NEWS README TODO
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf
 %config(noreplace) %verify(not size mtime md5) /etc/prozilla.conf-sample
 %{_prefix}/bin/proz



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/proj/devel proj.spec,1.1,1.2
Message-ID: <200503032353.j23NrF4O024650@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/proj/devel

Modified Files:
	proj.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: proj.spec
===================================================================
RCS file: /cvs/extras/rpms/proj/devel/proj.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proj.spec	14 Jan 2005 09:45:21 -0000	1.1
+++ proj.spec	3 Mar 2005 23:53:13 -0000	1.2
@@ -1,7 +1,6 @@
 Name: proj
 Version: 4.4.8
 Release: 4
-Epoch: 0
 Summary: Cartographic projection software (PROJ.4)
 
 Group: Applications/Engineering
@@ -15,18 +14,18 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %package devel
-Summary:	Development files for PROJ.4
-Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Summary: Development files for PROJ.4
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %package nad
-Summary:	US and Canadian datum shift grids for PROJ.4
-Group:		Applications/Engineering
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Summary: US and Canadian datum shift grids for PROJ.4
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
 
 %description
-Proj and invproj perform respective forward and inverse transformation of 
-cartographic data to or from cartesian data with a wide range of selectable 
+Proj and invproj perform respective forward and inverse transformation of
+cartographic data to or from cartesian data with a wide range of selectable
 projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/
 
 %description devel



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/ocaml/devel ocaml.spec,1.9,1.10
Message-ID: <200503032353.j23NrFYe024598@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/ocaml/devel

Modified Files:
	ocaml.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ocaml.spec	12 Feb 2005 16:39:53 -0000	1.9
+++ ocaml.spec	3 Mar 2005 23:53:13 -0000	1.10
@@ -1,22 +1,22 @@
-Name: 		ocaml
-Version: 	3.08.2
+Name:		ocaml
+Version:	3.08.2
 Release:	2
-Epoch:		0
-Summary: 	The Objective Caml compiler and programming environment
+Summary:	Objective Caml compiler and programming environment
 
-Group: 		Development/Languages
-License: 	QPL/LGPL
+Group:		Development/Languages
+License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0: 	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.2.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
-Patch:	 	ocaml-rpath.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.2.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
+Patch:		ocaml-rpath.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
-Requires(post,preun): /sbin/install-info
+Requires(post):	/sbin/install-info
+Requires(preun):	/sbin/install-info
 
 %description
 Objective Caml is a high-level, strongly-typed, functional and
@@ -30,7 +30,7 @@
 %package -n labltk
 Group:		Development/Languages
 Summary:	Tk bindings for Objective Caml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 
 %description -n labltk
 A library for interfacing Objective Caml with the scripting language
@@ -38,8 +38,8 @@
 
 %package -n camlp4
 Group:		Development/Languages
-Summary:	A Pre-Processor-Pretty-Printer for OCaml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Summary:	Pre-Processor-Pretty-Printer for OCaml
+Requires:	ocaml = %{version}-%{release}
 
 %description -n camlp4
 Camlp4 is a Pre-Processor-Pretty-Printer for OCaml, parsing a source
@@ -48,7 +48,7 @@
 %package ocamldoc
 Group:		Development/Languages
 Summary:	Documentation generator for OCaml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 
 %description ocamldoc
 Documentation generator for Objective Caml.
@@ -56,7 +56,7 @@
 %package emacs
 Group:		Development/Languages
 Summary:	Emacs mode for Objective Caml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 Requires:	emacs
 
 %description emacs
@@ -65,7 +65,7 @@
 %package docs
 Group:		Development/Languages
 Summary:	Documentation for OCaml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 
 %description docs
 Documentation for Objective Caml.
@@ -113,7 +113,7 @@
     %{_infodir}/dir 2>/dev/null || :
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 fi
 
@@ -183,7 +183,7 @@
 - New Version 3.08.2
 
 * Thu Dec 30 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:3.07-6
-- add -x11lib %%{_prefix}/X11R6/%%{_lib} to configure; fixes labltk build 
+- add -x11lib %%{_prefix}/X11R6/%%{_lib} to configure; fixes labltk build
   on x86_64
 
 * Tue Dec  2 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:3.07-0.fdr.5



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/pybliographer/devel pybliographer.spec,1.4,1.5
Message-ID: <200503032353.j23NrFgq024670@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/pybliographer/devel

Modified Files:
	pybliographer.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pybliographer.spec	22 Feb 2005 22:46:02 -0000	1.4
+++ pybliographer.spec	3 Mar 2005 23:53:13 -0000	1.5
@@ -1,8 +1,7 @@
-Summary: A framework for working with bibliographic databases.
+Summary: Framework for working with bibliographic databases
 Name: pybliographer
 Version: 1.2.6.2
 Release: 1
-Epoch: 0
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.6.2.tar.gz
@@ -30,15 +29,15 @@
 
 
 %description
-Pybliographer is a tool for managing bibliographic databases. It can be 
-used for searching, editing, reformatting, etc. In fact, it's a simple 
-framework that provides easy to use python classes and functions, and 
+Pybliographer is a tool for managing bibliographic databases. It can be
+used for searching, editing, reformatting, etc. In fact, it's a simple
+framework that provides easy to use python classes and functions, and
 therefore can be extended to many uses (generating HTML pages according
 to bibliographic searches, etc).
-In addition to the scripting environment, a graphical Gnome interface 
-is available. It provides powerful editing capabilities, a nice 
-hierarchical search mechanism, direct insertion of references into LyX, 
-direct queries on Medline, and more. It currently supports the following 
+In addition to the scripting environment, a graphical Gnome interface
+is available. It provides powerful editing capabilities, a nice
+hierarchical search mechanism, direct insertion of references into LyX,
+direct queries on Medline, and more. It currently supports the following
 file formats: BibTeX, ISI, Medline, Ovid, Refer.
 
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/python-dialog/devel python-dialog.spec,1.3,1.4
Message-ID: <200503032353.j23NrFtt024686@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-dialog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/python-dialog/devel

Modified Files:
	python-dialog.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: python-dialog.spec
===================================================================
RCS file: /cvs/extras/rpms/python-dialog/devel/python-dialog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-dialog.spec	10 Feb 2005 18:25:12 -0000	1.3
+++ python-dialog.spec	3 Mar 2005 23:53:13 -0000	1.4
@@ -5,7 +5,6 @@
 Name:           python-dialog
 Version:        2.7
 Release:        1
-Epoch:          0
 Summary:        Python interface to the Unix dialog utility
 
 Group:          Development/Languages
@@ -36,7 +35,7 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --prefix=%{_prefix}
 
- 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -57,6 +56,6 @@
 * Sat Feb 05 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 0:2.0.6-2
 - Change %%python_sitearch to %%python_sitelib as sitearch references
   /usr/lib64 on x86_64 multilib and the python files install to /usr/lib.
-  
+
 * Sat Jul 24 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.06-0.fdr.1
 - Initial Fedora Package



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/openct/devel openct.spec,1.2,1.3
Message-ID: <200503032353.j23NrFpH024606@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/openct/devel

Modified Files:
	openct.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openct.spec	25 Feb 2005 20:24:55 -0000	1.2
+++ openct.spec	3 Mar 2005 23:53:13 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           openct
 Version:        0.6.2
 Release:        2
-Epoch:          0
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -31,7 +30,7 @@
 %package        devel
 Summary:        OpenCT development files
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}, pkgconfig
+Requires:       %{name} = %{version}-%{release}, pkgconfig
 
 %description    devel
 %{summary}.
@@ -39,9 +38,9 @@
 %package     -n pcsc-lite-%{name}
 Summary:        OpenCT PC/SC Lite driver
 Group:          System Environment/Daemons
-Requires:       pcsc-lite >= 0:1.2.0
+Requires:       pcsc-lite >= 1.2.0
 Provides:       pcsc-ifd-handler
-Provides:       %{name}-pcsc-lite = %{epoch}:%{version}-%{release}
+Provides:       %{name}-pcsc-lite = %{version}-%{release}
 
 %description -n pcsc-lite-%{name}
 The OpenCT PC/SC Lite driver makes smart card readers supported by



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/putty/devel putty.spec,1.7,1.8
Message-ID: <200503032353.j23NrFTl024666@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/putty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/putty/devel

Modified Files:
	putty.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: putty.spec
===================================================================
RCS file: /cvs/extras/rpms/putty/devel/putty.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- putty.spec	21 Feb 2005 13:18:35 -0000	1.7
+++ putty.spec	3 Mar 2005 23:53:13 -0000	1.8
@@ -1,29 +1,24 @@
-Name: 		putty
-Version: 	0.57
-Release: 	1
-Epoch:          0
-Summary:	Putty - a SSH, Telnet & Rlogin client
-License: 	MIT
-Group: 		Applications/Internet
-Url: 		http://www.chiark.greenend.org.uk/~sgtatham/putty/
-Source0: 	http://the.earth.li/~sgtatham/putty/latest/putty-0.57.tar.gz
+Name:		putty
+Version:	0.57
+Release:	1
+Summary:	SSH, Telnet and Rlogin client
+License:	MIT
+Group:		Applications/Internet
+URL:		http://www.chiark.greenend.org.uk/~sgtatham/putty/
+Source0:	http://the.earth.li/~sgtatham/putty/latest/putty-0.57.tar.gz
 Source1:	putty.desktop
-Source2:        putty.png
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: 	gtk+-devel desktop-file-utils
+Source2:	putty.png
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	gtk+-devel desktop-file-utils
 
 
-#---------------------------------------------------------------------
-
 %description
 Putty is a SSH, Telnet & Rlogin client - this time for Linux.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
 
-#---------------------------------------------------------------------
 
 %build
 ./mkfiles.pl
@@ -33,7 +28,6 @@
 make %{?_smp_mflags}
 popd
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,7 +47,6 @@
 
 install -m644 -D -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/putty.png
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root)
@@ -63,9 +56,11 @@
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/putty.png
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %changelog
 * Mon Feb 21 2005 Adrian Reber <adrian at lisas.de> - 0.57-1
 - Updated to 0.57



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/python-bibtex/devel python-bibtex.spec,1.4,1.5
Message-ID: <200503032353.j23NrFW2024678@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-bibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/python-bibtex/devel

Modified Files:
	python-bibtex.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: python-bibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/python-bibtex/devel/python-bibtex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-bibtex.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ python-bibtex.spec	3 Mar 2005 23:53:13 -0000	1.5
@@ -2,31 +2,29 @@
 %{!?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)")}
 
-Summary: Python extension to parse BibTeX files.
+Summary: Python extension to parse BibTeX files
 Name: python-bibtex
 Version: 1.2.1
 Release: 1
-Epoch: 0
 License: GPL
 Group: Development/Libraries
 Source: http://dl.sf.net/pybliographer/python-bibtex-1.2.1.tar.gz
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: python >= 0:2.2
-BuildRequires: python-devel >= 0:2.2
-BuildRequires: glib2-devel >= 0:2.0
-BuildRequires: recode-devel >= 0:3.6-11
+BuildRequires: python >= 2.2
+BuildRequires: python-devel >= 2.2
+BuildRequires: glib2-devel >= 2.0
+BuildRequires: recode-devel >= 3.6-11
 
-Requires: python >= 0:2.2
-Requires: recode >= 0:3.6-11
+Requires: python >= 2.2
+Requires: recode >= 3.6-11
 
 %description
 This module contains two extensions needed for pybliographer:
-         
-	- a bibtex parser
-	- a simple binding to GNU Recode
-         
+- a bibtex parser
+- a simple binding to GNU Recode
+
 %prep
 %setup -q
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/python-reportlab/devel python-reportlab.spec,1.3,1.4
Message-ID: <200503032353.j23NrFXB024698@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-reportlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/python-reportlab/devel

Modified Files:
	python-reportlab.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: python-reportlab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/devel/python-reportlab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-reportlab.spec	10 Dec 2004 22:03:10 -0000	1.3
+++ python-reportlab.spec	3 Mar 2005 23:53:13 -0000	1.4
@@ -4,18 +4,17 @@
 Name:           python-reportlab
 Version:        1.19
 Release:        2
-Epoch:          0
 Summary:        Python PDF generation library
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.reportlab.org/
 Source0:        http://www.reportlab.org/ftp/ReportLab_1_19.tgz
-         
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel >= 0:2.2  
-Requires:       python >= 0:%{pyver}, python < 0:%{pynext}
+BuildRequires:  python-devel >= 2.2
+Requires:       python >= %{pyver}, python < %{pynext}
 
 %description
 Python PDF generation library.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:53:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:53:15 -0500
Subject: rpms/python-numeric/devel python-numeric.spec,1.3,1.4
Message-ID: <200503032353.j23NrFM4024694@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-numeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/python-numeric/devel

Modified Files:
	python-numeric.spec 
Log Message:
Mass letter "o" and "p" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: python-numeric.spec
===================================================================
RCS file: /cvs/extras/rpms/python-numeric/devel/python-numeric.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-numeric.spec	10 Dec 2004 22:03:10 -0000	1.3
+++ python-numeric.spec	3 Mar 2005 23:53:13 -0000	1.4
@@ -3,7 +3,6 @@
 Name:           python-numeric
 Version:        23.3
 Release:        2
-Epoch:          0
 Summary:        Fast multidimensional array functions for Python
 
 Group:          Development/Languages
@@ -16,7 +15,7 @@
 BuildRequires:  python-devel
 BuildRequires:  lapack
 Requires:       python, %{python_sitearch}
-Provides:       python-numeric-devel = %{epoch}:%{version}-%{release}
+Provides:       python-numeric-devel = %{version}-%{release}
 
 
 %description



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/rdiff-backup/devel rdiff-backup.spec,1.5,1.6
Message-ID: <200503040005.j2405iCk025914@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/rdiff-backup/devel

Modified Files:
	rdiff-backup.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rdiff-backup.spec	22 Jan 2005 20:27:02 -0000	1.5
+++ rdiff-backup.spec	4 Mar 2005 00:05:42 -0000	1.6
@@ -4,15 +4,14 @@
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1
-Epoch: 0
 URL: http://www.nongnu.org/rdiff-backup/
 Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/Archiving
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python-devel >= 0:2.2, librsync-devel >= 0:0.9.6
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6
 
-Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
 rdiff-backup is a script, written in Python, that backs up one
@@ -43,6 +42,7 @@
 
 %files
 %defattr(-,root,root)
+%doc CHANGELOG COPYING FAQ.html README
 %{_bindir}/rdiff-backup
 %{_mandir}/man1/rdiff-backup*
 %dir %{python_sitearch}/rdiff_backup
@@ -50,7 +50,6 @@
 %{python_sitearch}/rdiff_backup/*.pyc
 %{python_sitearch}/rdiff_backup/*.so
 %ghost %{python_sitearch}/rdiff_backup/*.pyo
-%doc CHANGELOG COPYING FAQ.html README
 
 %changelog
 * Sat Jan 22 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.12.7-1



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/qof/devel qof.spec,1.3,1.4
Message-ID: <200503040005.j2405ifs025906@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/qof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/qof/devel

Modified Files:
	qof.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qof.spec	10 Dec 2004 22:03:10 -0000	1.3
+++ qof.spec	4 Mar 2005 00:05:42 -0000	1.4
@@ -1,17 +1,16 @@
 Name:           qof
 Version:        0.5.0
 Release:        2
-Epoch:          0
-Summary:        QOF provides a query engine library for C objects.
+Summary:        QOF provides a 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
+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
+Patch1:         http://www.tiki-lounge.com/~toshio/fedora/qof-linker-dependency.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -36,12 +35,12 @@
 of local objects can act as a 'cache' to a much larger SQL database.
 
 %package        devel
-Summary:        Development tools for programs which will use the qof library.
+Summary:        Development tools for programs which will use the qof library
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       libxml2-devel
-Requires:	glib2-devel
-Requires:	pkgconfig
+Requires:       glib2-devel
+Requires:       pkgconfig
 
 %description    devel
 QOF - The Query Object Framework is a C library that provides a query engine



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/qiv/devel qiv.spec,1.5,1.6
Message-ID: <200503040005.j2405i7R025902@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/qiv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/qiv/devel

Modified Files:
	qiv.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: qiv.spec
===================================================================
RCS file: /cvs/extras/rpms/qiv/devel/qiv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qiv.spec	10 Dec 2004 22:03:10 -0000	1.5
+++ qiv.spec	4 Mar 2005 00:05:42 -0000	1.6
@@ -1,10 +1,9 @@
 Name:           qiv
 Version:        2.0
 Release:        1
-Epoch:          0
 Summary:        Quick Image Viewer
 
-Group:          Applications/Multimedia 
+Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.klografx.net/qiv/
 Source0:        http://www.klografx.net/qiv/download/qiv-2.0-src.tgz



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/qca-tls/devel qca-tls.spec,1.4,1.5
Message-ID: <200503040005.j2405ioU025898@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/qca-tls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/qca-tls/devel

Modified Files:
	qca-tls.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: qca-tls.spec
===================================================================
RCS file: /cvs/extras/rpms/qca-tls/devel/qca-tls.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qca-tls.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ qca-tls.spec	4 Mar 2005 00:05:42 -0000	1.5
@@ -2,12 +2,11 @@
 Version:	1.0
 Release:	2
 Summary:	Qt Cryptographic Architecture, TLS plugin
-Epoch:      0
 License:	LGPL
 Group:		Applications/Internet
 URL:		http://delta.affinix.com/qca/
 Source0:	http://delta.affinix.com/qca/qca-tls-1.0.tar.bz2
-Patch0:     qca-tls-1.0-mach.patch
+Patch0:		qca-tls-1.0-mach.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	qt-devel >= 1:3.1.1, XFree86-devel
@@ -18,11 +17,11 @@
 This is a plugin to provide SSL/TLS capability to programs that use
 the Qt Cryptographic Architecture (QCA).
 QCA is a library providing an easy API for several cryptographic
-algorithmns to Qt programs. 
+algorithmns to Qt programs.
 This package only contains the TLS plugin.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p0 -b .mach
 
 
@@ -45,7 +44,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(0644,root,root,0755)
 %doc README COPYING
 %attr(755,root,root) %{_libdir}/qt-*/plugins/crypto



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/qa-assistant/devel qa-assistant.spec,1.2,1.3
Message-ID: <200503040005.j2405iZi025886@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/qa-assistant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/qa-assistant/devel

Modified Files:
	qa-assistant.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: qa-assistant.spec
===================================================================
RCS file: /cvs/extras/rpms/qa-assistant/devel/qa-assistant.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qa-assistant.spec	29 Nov 2004 19:11:46 -0000	1.2
+++ qa-assistant.spec	4 Mar 2005 00:05:42 -0000	1.3
@@ -5,7 +5,6 @@
 Name:           qa-assistant
 Version:        0.4.1
 Release:        1
-Epoch:          0
 Summary:        Graphical quality assurance report generator
 Group:          Development/Tools
 License:        GPL
@@ -13,10 +12,10 @@
 Source0:        http://dl.sourceforge.net/qa-assistant/qa-assistant-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:	noarch
+BuildArch:      noarch
 BuildRequires:  python-devel
-BuildRequires:	sed
-BuildRequires:	desktop-file-utils
+BuildRequires:  sed
+BuildRequires:  desktop-file-utils
 # Needed to get xmlcatalog
 BuildRequires:  libxml2
 BuildRequires:	pygtk2-devel >= 0:2.2.0
@@ -91,7 +90,7 @@
 #
 # On removal, unregister the xmlcatalog from the supercatalog
 #
-if [ "$1" = 0 ]; then
+if [ "$1" = "0" ]; then
     ROOTCATALOG=%{_sysconfdir}/xml/catalog
 
     if [ -w $ROOTCATALOG ]
@@ -126,6 +125,6 @@
 
 * Sun Aug 8 2004 Toshio Kuratomi <toshio{here}tiki-lounge.com> - 0:0.4-0.fdr.3
 - Substitute macros for file paths in the install/uninstall scriptlets
- 
+
 * Tue Apr 20 2004 Toshio Kuratomi <toshio[in]tiki-lounge.com> - 0:0.4-0.fdr.2
 - Initial Fedora Release.



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:45 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:45 -0500
Subject: rpms/rpmDirectoryCheck/devel rpmDirectoryCheck.spec,1.4,1.5
Message-ID: <200503040005.j2405j2M025926@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/rpmDirectoryCheck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/rpmDirectoryCheck/devel

Modified Files:
	rpmDirectoryCheck.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: rpmDirectoryCheck.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmDirectoryCheck/devel/rpmDirectoryCheck.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmDirectoryCheck.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ rpmDirectoryCheck.spec	4 Mar 2005 00:05:42 -0000	1.5
@@ -1,4 +1,4 @@
-### {{{@ad.common@	Common part; some helper macros shared between .spec files 
+### {{{@ad.common@	Common part; some helper macros shared between .spec files
 %define __isDirectoryShared	f() { rpm --eval '%%{_netsharedpath}' | awk -v y="$1" '{ split($1, x, ":"); for (i in x) if (index(y,x[i])==1) exit 0; exit 1; }'; }; f
 %define __install_info		( %{__isDirectoryShared} %{_infodir} ) || /sbin/install-info --info-dir=%{_infodir}
 %define __install_info_post	g() { %{__install_info} "$@" || :; }; g
@@ -9,7 +9,6 @@
 Name:		rpmDirectoryCheck
 Version:	0.8
 Release:	1
-Epoch:		0
 URL:		http://www.tu-chemnitz.de/~ensc/rpmDirectoryCheck
 Source0:	http://www.tu-chemnitz.de/~ensc/rpmDirectoryCheck/%{name}-%{version}.tar.bz2
 License:	GPL



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/rkhunter/devel rkhunter.spec,1.3,1.4
Message-ID: <200503040005.j2405iom025922@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/rkhunter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/rkhunter/devel

Modified Files:
	rkhunter.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/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	4 Mar 2005 00:05:42 -0000	1.4
@@ -6,8 +6,7 @@
 Name:           rkhunter
 Version:        1.1.9
 Release:        1
-Epoch:          0
-Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits.
+Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPL
@@ -50,7 +49,7 @@
 # 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;
+#       s|../SOURCES|%{_sourcedir}|g;
 #     ' %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5
 #md5sum --check %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5 || exit $?
 
@@ -65,7 +64,7 @@
 	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
 	s|\@RKEXE\@|%{_bindir}/%{name}|g;
     ' rkhunter-scan_on_boot \
-        rkhunter-scan_on_boot-rc.local
+      rkhunter-scan_on_boot-rc.local
 
 %{__perl} -pi.orig -e '
 	s|^#$|INSTALLDIR=%{_prefix}|;
@@ -249,7 +248,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



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:45 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:45 -0500
Subject: rpms/rpmproc/devel rpmproc.spec,1.2,1.3
Message-ID: <200503040005.j2405jP7025936@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/rpmproc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/rpmproc/devel

Modified Files:
	rpmproc.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: rpmproc.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmproc/devel/rpmproc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpmproc.spec	10 Dec 2004 22:03:10 -0000	1.2
+++ rpmproc.spec	4 Mar 2005 00:05:43 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           rpmproc
 Version:        2.1.4
 Release:        3
-Epoch:          0
 Summary:        Perl script to help manage and build RPM packages
 
 License:        GPL



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/qascade/devel qascade.spec,1.4,1.5
Message-ID: <200503040005.j2405i6Z025890@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/qascade/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/qascade/devel

Modified Files:
	qascade.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: qascade.spec
===================================================================
RCS file: /cvs/extras/rpms/qascade/devel/qascade.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qascade.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ qascade.spec	4 Mar 2005 00:05:42 -0000	1.5
@@ -1,7 +1,6 @@
 Name:           qascade
 Version:        0.1
 Release:        2
-Epoch:          0
 Summary:        QT port of classic puzzle game
 
 Group:          Amusements/Games



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:45 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:45 -0500
Subject: rpms/rpmlint/devel rpmlint.spec,1.8,1.9
Message-ID: <200503040005.j2405jmM025932@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/rpmlint/devel

Modified Files:
	rpmlint.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpmlint.spec	13 Feb 2005 19:28:58 -0000	1.8
+++ rpmlint.spec	4 Mar 2005 00:05:43 -0000	1.9
@@ -1,7 +1,6 @@
 Name:           rpmlint
 Version:        0.67
 Release:        1
-Epoch:          0
 Summary:        RPM correctness checker
 
 Group:          Development/Tools
@@ -13,8 +12,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python >= 0:1.5.2, rpm-python, make, %{__perl}
-Requires:       rpm-python, python >= 0:1.5.2, cpio
+BuildRequires:  python >= 1.5.2, rpm-python, make, %{__perl}
+Requires:       rpm-python, python >= 1.5.2, cpio
 
 %description
 rpmlint is a tool for checking common errors in RPM packages.  Binary
@@ -213,7 +212,7 @@
 
 * Mon Jun  3 2002 Gwenole Beauchesne <gbeauchesne at mandrakesoft.com> 0.45-1mdk
  o SpecCheck.py: - Add configure-without-libdir-spec check
-	         - Add hardcoded-library-path check
+                 - Add hardcoded-library-path check
 
 * Wed May 29 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.44-1mdk
  o added non-ghost-file check
@@ -273,15 +272,15 @@
                  Added the new check invalid-dependency.
 
  o InitScriptCheck.py: Added incoherent-init-script-name check.
-	               Expand shell variable in incoherent-subsys check.
+                       Expand shell variable in incoherent-subsys check.
 
  o FilesCheck.py: Use list imported from the setup package for users
    and groups (from setuplist.py).
 
  o PostCheck.py: Don't print error about percent if post-script has a
                  %%. (Chmouel)
-	         Check that RPM_BUILD_ROOT or RPM_BUILD_DIR isn't
-	         used.
+                 Check that RPM_BUILD_ROOT or RPM_BUILD_DIR isn't
+                 used.
 
  o SpecCheck.py: Check also %_sourcedir.
                  Check that the BuildRoot tag doesn't contain a
@@ -345,8 +344,8 @@
 - TagsCheck.py: added the bugzilla https address as a valid one.
 
 - PostCheck.py: o ghost-files-without-postun => ghost-files-without-postin
-		o check if /tmp or /var/tmp is used.
-		o check if update-menus is called without a menu file.
+                o check if /tmp or /var/tmp is used.
+                o check if update-menus is called without a menu file.
 
 - FilesCheck.py: added /etc/logrotate.d entry check.
 
@@ -360,7 +359,7 @@
                     o libc doesn't need to be linked against libc,
   and the dynamic linker doesn't need dependeny information. (Bill Nottingham)
 
-	            o Fix some of the library checks to be more correct. (Bill
+                    o Fix some of the library checks to be more correct. (Bill
   Nottingham)
 
 - TagsCheck.py: added a check on obsoleted packages not provided.
@@ -412,20 +411,20 @@
 - MenuCheck.py: added new Office sub menus.
 
 - FilesCheck.py: o added /usr/X11R6/man subdirs to the list of
-	          STANDARD_DIRS.
-	         o warn for .so file only if they are in a lib dir.
+                   STANDARD_DIRS.
+                 o warn for .so file only if they are in a lib dir.
                  o warn for source files in a non devel package only if they are not
                   doc files.
 
 - TagsCheck.py: corrected description-line-too-long check.
 
 - FilesCheck.py: add the rpm user and group per request of Jeff
-	         Johnson for the future version of rpm.
+                 Johnson for the future version of rpm.
 
 * Fri May 18 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.31-1mdk
 - PostCheck.py: check that a script isn't only one command.
                 check postin and prein instead of postun and preun
-	        for ghost files creation.
+                for ghost files creation.
 
 - MenuCheck.py: don't check NO_XALF in menu command.
 
@@ -489,7 +488,7 @@
 
 - Config.py: various exceptions added.
 
-- BinariesCheck.py: o report the file location on objdump errors. 
+- BinariesCheck.py: o report the file location on objdump errors.
                     o new error: executable in library package.
 
 - I18NCheck.py: fuzzy check on packages without dependency on
@@ -549,7 +548,7 @@
 
 * Fri Sep 29 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.23-1mdk
 - MenuCheck.py: added Applications/Accessibility.
-                check that menu	files are readable by everyone.
+                check that menu files are readable by everyone.
 - Config.py: removed exception for /home.
              added exceptions for vixie-cron.
 - FilesCheck.py: check cvs internal files.
@@ -565,7 +564,7 @@
 - TagsCheck.py: check packager field compliance to a regexp.
 - Config.py: imported default exceptions.
 - TagsCheck.py: added Apache License, PHP Licence and BSD-Style.
-- MenuCheck.py: check hardcoded path in icon field and large, mini, 
+- MenuCheck.py: check hardcoded path in icon field and large, mini,
   normal icon files.
 - PostCheck.py: Fix typo in check of /usr/bin/perl.
 - PostCheck.py: Check perl script like we do for bash script.
@@ -664,7 +663,7 @@
        * check release extension.
        * check non executable in bin directories.
        * new options: ValidGroups, ReleaseExtension and
-	UseVersionInChangelog.
+         UseVersionInChangelog.
 
 * Thu Dec 30 1999 Frederic Lepied <flepied at mandrakesoft.com> 0.8-1mdk
 



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/revelation/devel revelation.spec,1.5,1.6
Message-ID: <200503040005.j2405ix6025918@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/revelation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/revelation/devel

Modified Files:
	revelation.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- revelation.spec	2 Mar 2005 19:05:15 -0000	1.5
+++ revelation.spec	4 Mar 2005 00:05:42 -0000	1.6
@@ -2,31 +2,30 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary:	Password manager for GNOME 2
-Name: 		revelation
-Version: 	0.4.0
-Epoch: 		0
-Release: 	1
-License: 	GPL
-Group: 		Applications/Productivity
-Source: 	ftp://oss.codepoet.no/revelation/revelation-0.4.0.tar.bz2
-URL: 		http://oss.codepoet.no/revelation/
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:	python-crypto >= 0:2.0
-Requires:	pygtk2 >= 0:2.4
-Requires:	gnome-python2-gconf >= 0:2.0
-Requires:	gnome-python2-gnomevfs >= 0:2.6
-BuildRequires:  python >= 0:2.2
-BuildRequires:  python-devel >= 0:2.3
-BuildRequires:  pygtk2-devel >= 0:2.4
-BuildRequires:	gnome-python2-gconf >= 0:2.0
-BuildRequires:	libgnomeui-devel >= 0:2.8
-BuildRequires:	gnome-keyring-devel >= 0:0.4.0
-BuildRequires:	desktop-file-utils 
-BuildRequires:	python-crypto >= 0:2.0
+Name:		revelation
+Version:	0.4.0
+Release:	1
+License:	GPL
+Group:		Applications/Productivity
+Source:		ftp://oss.codepoet.no/revelation/revelation-0.4.0.tar.bz2
+URL:		http://oss.codepoet.no/revelation/
+Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:	python-crypto >= 2.0
+Requires:	pygtk2 >= 2.4
+Requires:	gnome-python2-gconf >= 2.0
+Requires:	gnome-python2-gnomevfs >= 2.6
+BuildRequires:	python >= 2.2
+BuildRequires:	python-devel >= 2.3
+BuildRequires:	pygtk2-devel >= 2.4
+BuildRequires:	gnome-python2-gconf >= 2.0
+BuildRequires:	libgnomeui-devel >= 2.8
+BuildRequires:	gnome-keyring-devel >= 0.4.0
+BuildRequires:	desktop-file-utils
+BuildRequires:	python-crypto >= 2.0
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n)
-Requires(post):	 GConf2 shared-mime-info desktop-file-utils
-Requires(preun): GConf2
-Requires(postun):shared-mime-info desktop-file-utils
+Requires(post):		GConf2 shared-mime-info desktop-file-utils
+Requires(preun):	GConf2
+Requires(postun):	shared-mime-info desktop-file-utils
 
 %description
 Revelation is a password manager. It organizes accounts in
@@ -36,7 +35,7 @@
 %setup -q
 
 %build
-%configure --disable-desktop-update --disable-mime-update 
+%configure --disable-desktop-update --disable-mime-update
 make %{?_smp_mflags}
 
 
@@ -59,7 +58,7 @@
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
- 
+
 %preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
@@ -83,7 +82,7 @@
 %{_datadir}/icons/hicolor/??x??/mimetypes/gnome-mime-application-x-revelation.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 #dir %{python_sitearch}/revelation/
-# the next entry should be python_sitearch, but the packages currently does it 
+# the next entry should be python_sitearch, but the packages currently does it
 # wrong on install and during execution. So leave it in {python_sitelib} for now
 %{python_sitelib}/revelation/authmanager.so
 %dir %{python_sitelib}/revelation/
@@ -102,7 +101,7 @@
 - Uses configure now
 - add BR pygtk2-devel gnome-keyring-devel
 - use shared-mime-info and desktop-file-utils
-- Remove unneeded explicit Requires 
+- Remove unneeded explicit Requires
 - not a noarch package anymore
 - on x86_64 it currently installs and needs authmanager.so in %%{python_sitelib}
   will report upstream



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/qtparted/devel qtparted.spec,1.4,1.5
Message-ID: <200503040005.j2405iaF025910@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/qtparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/qtparted/devel

Modified Files:
	qtparted.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qtparted.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ qtparted.spec	4 Mar 2005 00:05:42 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           qtparted
 Version:        0.4.4
 Release:        1
-Epoch:          0
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:45 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:45 -0500
Subject: rpms/rxvt/devel rxvt.spec,1.5,1.6
Message-ID: <200503040005.j2405juL025940@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/rxvt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/rxvt/devel

Modified Files:
	rxvt.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: rxvt.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt/devel/rxvt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rxvt.spec	10 Dec 2004 22:03:10 -0000	1.5
+++ rxvt.spec	4 Mar 2005 00:05:43 -0000	1.6
@@ -1,8 +1,7 @@
 Name:           rxvt
 Version:        2.7.10
 Release:        5
-Epoch:          0
-Summary:        Rxvt (ouR XVT) - a VT102 emulator for the X window system
+Summary:        ouR XVT, a VT102 emulator for the X window system
 Group:          User Interface/X
 License:        GPL
 URL:            http://www.rxvt.org
@@ -22,18 +21,15 @@
 much  less  swap  space  --  a  significant advantage on a
 machine serving many X sessions.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure --enable-everything --enable-xgetdefault --enable-256-color
 make %{?_smp_mflags}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -51,24 +47,20 @@
   --add-category=X-Fedora \
   %{SOURCE2}
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
 %doc doc/BUGS doc/FAQ doc/README.menu doc/README.xvt doc/TODO
 %doc doc/*.html
 %doc doc/menu/*
-
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Thu Dec 18 2003 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
@@ -84,5 +76,5 @@
 - added menu entry
 - removed -n from setup
 
-* Fri Jun 20 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> 
+* Fri Jun 20 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de>
 - Initial RPM release.



From fedora-extras-commits at redhat.com  Fri Mar  4 00:05:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 19:05:44 -0500
Subject: rpms/qca/devel qca.spec,1.1,1.2
Message-ID: <200503040005.j2405igE025894@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/qca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25833/qca/devel

Modified Files:
	qca.spec 
Log Message:
Mass letter "q" and "r" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: qca.spec
===================================================================
RCS file: /cvs/extras/rpms/qca/devel/qca.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qca.spec	13 Jan 2005 18:24:21 -0000	1.1
+++ qca.spec	4 Mar 2005 00:05:42 -0000	1.2
@@ -1,7 +1,6 @@
 Name:           qca
 Version:        1.0
 Release:        3
-Epoch:          0
 Summary:        Qt Cryptographic Architecture
 
 Group:          System Environment/Libraries
@@ -16,7 +15,7 @@
 %description
 Taking a hint from the similarly-named Java Cryptography Architecture,
 QCA aims to provide a straightforward and cross-platform crypto API,
-using Qt datatypes and conventions. QCA separates the API from the 
+using Qt datatypes and conventions. QCA separates the API from the
 implementation, using plugins known as Providers. The advantage of this
 model is to allow applications to avoid linking to or explicitly depending
 on any particular cryptographic library. This allows one to easily change
@@ -24,9 +23,9 @@
 application!
 
 %package        devel
-Summary:        Qt Cryptographic Architecture - development files
+Summary:        Qt Cryptographic Architecture development files
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 This packages contains the development files for QCA



From fedora-extras-commits at redhat.com  Fri Mar  4 00:14:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 19:14:38 -0500
Subject: rpms/cone/FC-3 cone-0.64.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 cone.spec, 1.4,
	1.5 cone-0.63.tar.bz2.sig, 1.1, NONE
Message-ID: <200503040014.j240Ectv026220@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/cone/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26214

Modified Files:
	.cvsignore sources cone.spec 
Added Files:
	cone-0.64.tar.bz2.sig 
Removed Files:
	cone-0.63.tar.bz2.sig 
Log Message:
Update from Steven Pritchard.


--- NEW FILE cone-0.64.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cone/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Feb 2005 01:17:42 -0000	1.3
+++ .cvsignore	4 Mar 2005 00:14:36 -0000	1.4
@@ -1 +1 @@
-cone-0.63.tar.bz2
+cone-0.64.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cone/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Feb 2005 01:17:42 -0000	1.3
+++ sources	4 Mar 2005 00:14:36 -0000	1.4
@@ -1 +1 @@
-d77f9bfe50ae796c70bb18a7ae59e44c  cone-0.63.tar.bz2
+0375a938da6347e42afd76135f334a6d  cone-0.64.tar.bz2


Index: cone.spec
===================================================================
RCS file: /cvs/extras/rpms/cone/FC-3/cone.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cone.spec	25 Feb 2005 01:17:42 -0000	1.4
+++ cone.spec	4 Mar 2005 00:14:36 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: CONE mail reader
 Name: cone
-Version: 0.63
+Version: 0.64
 Release: 1
 URL: http://www.courier-mta.org/cone/
 Source0: http://dl.sf.net/sourceforge/courier/%{name}-%{version}.tar.bz2
@@ -97,6 +97,9 @@
 %doc cone/html
 
 %changelog
+* Wed Mar 02 2005 Steven Pritchard <steve at kspei.com> 0.64-1
+- Update to 0.64
+
 * Wed Feb 23 2005 Steven Pritchard <steve at kspei.com> 0.63-1
 - Update to 0.63
 - Include signature file with the source rpm


--- cone-0.63.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar  4 00:16:00 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 19:16:00 -0500
Subject: rpms/cone/devel cone-0.64.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 cone.spec, 1.4,
	1.5 cone-0.63.tar.bz2.sig, 1.1, NONE
Message-ID: <200503040016.j240G0sF026265@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/cone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26259

Modified Files:
	.cvsignore sources cone.spec 
Added Files:
	cone-0.64.tar.bz2.sig 
Removed Files:
	cone-0.63.tar.bz2.sig 
Log Message:
Update from Steven Pritchard. Copy of FC-3 branch. No release bump yet.


--- NEW FILE cone-0.64.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Feb 2005 01:17:42 -0000	1.3
+++ .cvsignore	4 Mar 2005 00:15:58 -0000	1.4
@@ -1 +1 @@
-cone-0.63.tar.bz2
+cone-0.64.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Feb 2005 01:17:42 -0000	1.3
+++ sources	4 Mar 2005 00:15:58 -0000	1.4
@@ -1 +1 @@
-d77f9bfe50ae796c70bb18a7ae59e44c  cone-0.63.tar.bz2
+0375a938da6347e42afd76135f334a6d  cone-0.64.tar.bz2


Index: cone.spec
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/cone.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cone.spec	25 Feb 2005 01:17:42 -0000	1.4
+++ cone.spec	4 Mar 2005 00:15:58 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: CONE mail reader
 Name: cone
-Version: 0.63
+Version: 0.64
 Release: 1
 URL: http://www.courier-mta.org/cone/
 Source0: http://dl.sf.net/sourceforge/courier/%{name}-%{version}.tar.bz2
@@ -97,6 +97,9 @@
 %doc cone/html
 
 %changelog
+* Wed Mar 02 2005 Steven Pritchard <steve at kspei.com> 0.64-1
+- Update to 0.64
+
 * Wed Feb 23 2005 Steven Pritchard <steve at kspei.com> 0.63-1
 - Update to 0.63
 - Include signature file with the source rpm


--- cone-0.63.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-YAML/devel perl-YAML.spec,1.4,1.5
Message-ID: <200503032346.j23NkUAi023958@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-YAML/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-YAML/devel

Modified Files:
	perl-YAML.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-YAML.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML/devel/perl-YAML.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-YAML.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-YAML.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-YAML
 Version:        0.35
 Release:        5
-Epoch:          0
 Summary:        YAML Ain't Markup Language (tm)
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-MLDBM/devel perl-MLDBM.spec,1.2,1.3
Message-ID: <200503032346.j23NkTKE023815@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-MLDBM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-MLDBM/devel

Modified Files:
	perl-MLDBM.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-MLDBM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/devel/perl-MLDBM.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-MLDBM.spec	28 Jan 2005 17:36:45 -0000	1.2
+++ perl-MLDBM.spec	3 Mar 2005 23:46:27 -0000	1.3
@@ -3,7 +3,6 @@
 Name:           perl-MLDBM
 Version:        2.01
 Release:        1
-Epoch:          0
 Summary:        Store multi-level hash structure in single level tied hash
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-XML-RSS/devel perl-XML-RSS.spec,1.1,1.2
Message-ID: <200503032346.j23NkUUk023946@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-XML-RSS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-XML-RSS/devel

Modified Files:
	perl-XML-RSS.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-XML-RSS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-RSS/devel/perl-XML-RSS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-RSS.spec	1 Jan 2005 11:10:17 -0000	1.1
+++ perl-XML-RSS.spec	3 Mar 2005 23:46:28 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-XML-RSS
 Version:        1.05
 Release:        1
-Epoch:          0
 Summary:        Perl module for managing RDF Site Summary (RSS) files
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-XML-XPath/devel perl-XML-XPath.spec,1.1,1.2
Message-ID: <200503032346.j23NkU3o023954@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-XML-XPath/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-XML-XPath/devel

Modified Files:
	perl-XML-XPath.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-XML-XPath.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPath/devel/perl-XML-XPath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-XPath.spec	10 Feb 2005 20:29:37 -0000	1.1
+++ perl-XML-XPath.spec	3 Mar 2005 23:46:28 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-XML-XPath
 Version:        1.13
 Release:        2
-Epoch:          0
 Summary:        XPath parser and evaluator for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IO-String/devel perl-IO-String.spec,1.4,1.5
Message-ID: <200503032346.j23NkTpA023763@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IO-String/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IO-String/devel

Modified Files:
	perl-IO-String.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IO-String.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-String/devel/perl-IO-String.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-IO-String.spec	2 Dec 2004 20:14:16 -0000	1.4
+++ perl-IO-String.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-IO-String
 Version:        1.06
 Release:        1
-Epoch:          0
 Summary:        Emulate file interface for in-core strings
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-XML-Simple/devel perl-XML-Simple.spec,1.4,1.5
Message-ID: <200503032346.j23NkUPk023950@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-XML-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-XML-Simple/devel

Modified Files:
	perl-XML-Simple.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Simple/devel/perl-XML-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-XML-Simple.spec	4 Dec 2004 13:23:25 -0000	1.4
+++ perl-XML-Simple.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-XML-Simple
 Version:        2.13
 Release:        1
-Epoch:          0
 Summary:        Easy API to maintain XML in Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Text-Reform/devel perl-Text-Reform.spec,1.4,1.5
Message-ID: <200503032346.j23NkU3i023918@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Text-Reform/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Text-Reform/devel

Modified Files:
	perl-Text-Reform.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Text-Reform.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Reform/devel/perl-Text-Reform.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Text-Reform.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Text-Reform.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Text-Reform
 Version:        1.11
 Release:        3
-Epoch:          0
 Summary:        Manual text wrapping and reformatting
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Error/devel perl-Error.spec,1.2,1.3
Message-ID: <200503032346.j23NkSRP023666@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Error/devel

Modified Files:
	perl-Error.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Error.spec	21 Dec 2004 16:33:00 -0000	1.2
+++ perl-Error.spec	3 Mar 2005 23:46:26 -0000	1.3
@@ -3,7 +3,6 @@
 Name:           perl-Error
 Version:        0.15
 Release:        1
-Epoch:          0
 Summary:        Error Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Archive-Zip/devel perl-Archive-Zip.spec,1.5,1.6
Message-ID: <200503032346.j23NkSA4023616@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Archive-Zip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Archive-Zip/devel

Modified Files:
	perl-Archive-Zip.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Archive-Zip.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Archive-Zip/devel/perl-Archive-Zip.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Archive-Zip.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ perl-Archive-Zip.spec	3 Mar 2005 23:46:26 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Archive-Zip
 Version:        1.12
 Release:        1
-Epoch:          0
 Summary:        Perl library for accessing Zip archives
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Text-Iconv/devel perl-Text-Iconv.spec,1.3,1.4
Message-ID: <200503032346.j23NkUM5023914@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Text-Iconv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Text-Iconv/devel

Modified Files:
	perl-Text-Iconv.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Text-Iconv.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Iconv/devel/perl-Text-Iconv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Text-Iconv.spec	10 Dec 2004 22:03:09 -0000	1.3
+++ perl-Text-Iconv.spec	3 Mar 2005 23:46:28 -0000	1.4
@@ -3,7 +3,6 @@
 Name:           perl-Text-Iconv
 Version:        1.4
 Release:        1
-Epoch:          0
 Summary:        Perl interface to iconv() codeset conversion function
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Set-IntSpan/devel perl-Set-IntSpan.spec,1.3,1.4
Message-ID: <200503032346.j23NkUEs023878@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Set-IntSpan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Set-IntSpan/devel

Modified Files:
	perl-Set-IntSpan.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Set-IntSpan.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-IntSpan/devel/perl-Set-IntSpan.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Set-IntSpan.spec	10 Dec 2004 22:03:09 -0000	1.3
+++ perl-Set-IntSpan.spec	3 Mar 2005 23:46:27 -0000	1.4
@@ -3,7 +3,6 @@
 Name:           perl-Set-IntSpan
 Version:        1.07
 Release:        5
-Epoch:          0
 Summary:        Perl module for managing sets of integers
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-MIME-Types/devel perl-MIME-Types.spec,1.5,1.6
Message-ID: <200503032346.j23NkT47023811@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-MIME-Types/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-MIME-Types/devel

Modified Files:
	perl-MIME-Types.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-MIME-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/devel/perl-MIME-Types.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-MIME-Types.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-MIME-Types.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-MIME-Types
 Version:        1.13
 Release:        3
-Epoch:          0
 Summary:        MIME types module for Perl
 
 License:        GPL or Artistic



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IO-Socket-SSL/devel perl-IO-Socket-SSL.spec,1.1,1.2
Message-ID: <200503032346.j23NkTk3023759@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IO-Socket-SSL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IO-Socket-SSL/devel

Modified Files:
	perl-IO-Socket-SSL.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/devel/perl-IO-Socket-SSL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-IO-Socket-SSL.spec	9 Jan 2005 11:59:30 -0000	1.1
+++ perl-IO-Socket-SSL.spec	3 Mar 2005 23:46:27 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-IO-Socket-SSL
 Version:        0.96
 Release:        3
-Epoch:          0
 Summary:        Perl library for transparent SSL
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Test-Pod/devel perl-Test-Pod.spec,1.4,1.5
Message-ID: <200503032346.j23NkUH2023902@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Test-Pod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Test-Pod/devel

Modified Files:
	perl-Test-Pod.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Test-Pod.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod/devel/perl-Test-Pod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-Pod.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Test-Pod.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Test-Pod
 Version:        1.20
 Release:        1
-Epoch:          0
 Summary:        Perl module for checking for POD errors in files
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Unicode-Map/devel perl-Unicode-Map.spec,1.4,1.5
Message-ID: <200503032346.j23NkUbT023926@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Unicode-Map/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Unicode-Map/devel

Modified Files:
	perl-Unicode-Map.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Unicode-Map.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map/devel/perl-Unicode-Map.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Unicode-Map.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Unicode-Map.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Unicode-Map
 Version:        0.112
 Release:        5
-Epoch:          0
 Summary:        Perl module for mapping charsets from and to utf16 unicode
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-AppConfig/devel perl-AppConfig.spec,1.5,1.6
Message-ID: <200503032346.j23NkSLo023608@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-AppConfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-AppConfig/devel

Modified Files:
	perl-AppConfig.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-AppConfig.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AppConfig/devel/perl-AppConfig.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-AppConfig.spec	10 Dec 2004 22:03:07 -0000	1.5
+++ perl-AppConfig.spec	3 Mar 2005 23:46:25 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-AppConfig
 Version:        1.56
 Release:        1
-Epoch:          0
 Summary:        Perl module for reading configuration files
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Config-Tiny/devel perl-Config-Tiny.spec,1.4,1.5
Message-ID: <200503032346.j23NkScr023633@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Config-Tiny/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Config-Tiny/devel

Modified Files:
	perl-Config-Tiny.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Config-Tiny.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ perl-Config-Tiny.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Config-Tiny
 Version:        2.00
 Release:        1
-Epoch:          0
 Summary:        Perl module for reading and writing .ini style configuration files
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Module-Build/devel perl-Module-Build.spec,1.7,1.8
Message-ID: <200503032346.j23NkTXd023820@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Module-Build/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Module-Build/devel

Modified Files:
	perl-Module-Build.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Module-Build.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Module-Build.spec	27 Jan 2005 17:50:59 -0000	1.7
+++ perl-Module-Build.spec	3 Mar 2005 23:46:27 -0000	1.8
@@ -3,7 +3,6 @@
 Name:           perl-Module-Build
 Version:        0.2608
 Release:        1
-Epoch:          0
 Summary:        Perl module for building and installing Perl modules
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Tie-IxHash/devel perl-Tie-IxHash.spec,1.4,1.5
Message-ID: <200503032346.j23NkUDQ023922@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Tie-IxHash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Tie-IxHash/devel

Modified Files:
	perl-Tie-IxHash.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Tie-IxHash.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Tie-IxHash/devel/perl-Tie-IxHash.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Tie-IxHash.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Tie-IxHash.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Tie-IxHash
 Version:        1.21
 Release:        2
-Epoch:          0
 Summary:        Ordered associative arrays for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Unicode-Map8/devel perl-Unicode-Map8.spec,1.4,1.5
Message-ID: <200503032346.j23NkU2T023930@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Unicode-Map8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Unicode-Map8/devel

Modified Files:
	perl-Unicode-Map8.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map8/devel/perl-Unicode-Map8.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Unicode-Map8.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Unicode-Map8.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Unicode-Map8
 Version:        0.12
 Release:        4
-Epoch:          0
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Unix-Syslog/devel perl-Unix-Syslog.spec,1.5,1.6
Message-ID: <200503032346.j23NkUSP023942@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Unix-Syslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Unix-Syslog/devel

Modified Files:
	perl-Unix-Syslog.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Unix-Syslog.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unix-Syslog/devel/perl-Unix-Syslog.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Unix-Syslog.spec	10 Dec 2004 22:03:09 -0000	1.5
+++ perl-Unix-Syslog.spec	3 Mar 2005 23:46:28 -0000	1.6
@@ -4,7 +4,6 @@
 Name:           perl-Unix-Syslog
 Version:        0.100
 Release:        4
-Epoch:          0
 License:        Artistic
 Group:          System Environment/Libraries
 URL:            http://search.cpan.org/dist/Unix-Syslog/



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-MailTools/devel perl-MailTools.spec,1.6,1.7
Message-ID: <200503032346.j23NkTE3023803@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-MailTools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-MailTools/devel

Modified Files:
	perl-MailTools.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-MailTools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MailTools.spec	22 Jan 2005 11:50:32 -0000	1.6
+++ perl-MailTools.spec	3 Mar 2005 23:46:27 -0000	1.7
@@ -4,7 +4,6 @@
 Name:           perl-MailTools
 Version:        1.66
 Release:        1
-Epoch:          0
 License:        Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/MailTools/



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Config-General/devel perl-Config-General.spec,1.4,1.5
Message-ID: <200503032346.j23NkSeS023629@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Config-General/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Config-General/devel

Modified Files:
	perl-Config-General.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Config-General.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/devel/perl-Config-General.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Config-General.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ perl-Config-General.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Config-General
 Version:        2.27
 Release:        1
-Epoch:          0
 Summary:        Generic configuration module for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Unicode-String/devel perl-Unicode-String.spec,1.4,1.5
Message-ID: <200503032346.j23NkUKg023938@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Unicode-String/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Unicode-String/devel

Modified Files:
	perl-Unicode-String.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Unicode-String.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-String/devel/perl-Unicode-String.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Unicode-String.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Unicode-String.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Unicode-String
 Version:        2.07
 Release:        4
-Epoch:          0
 Summary:        Perl modules to handle various Unicode issues
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-MIME-tools/devel perl-MIME-tools.spec,1.6,1.7
Message-ID: <200503032346.j23NkTEs023807@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-MIME-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-MIME-tools/devel

Modified Files:
	perl-MIME-tools.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/perl-MIME-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MIME-tools.spec	22 Jan 2005 11:53:15 -0000	1.6
+++ perl-MIME-tools.spec	3 Mar 2005 23:46:27 -0000	1.7
@@ -3,7 +3,6 @@
 Name:           perl-MIME-tools
 Version:        5.417
 Release:        1
-Epoch:          0
 Summary:        Modules for parsing and creating MIME entities in Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IO-Zlib/devel perl-IO-Zlib.spec,1.5,1.6
Message-ID: <200503032346.j23NkT5m023775@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IO-Zlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IO-Zlib/devel

Modified Files:
	perl-IO-Zlib.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IO-Zlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Zlib/devel/perl-IO-Zlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-IO-Zlib.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-IO-Zlib.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,8 +3,7 @@
 Name:           perl-IO-Zlib
 Version:        1.04
 Release:        1
-Epoch:          0
-Summary:        IO:: style interface to Compress::Zlib
+Summary:        Perl IO:: style interface to Compress::Zlib
 
 Group:          Development/Libraries
 License:        GPL or Artistic



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-ExtUtils-CBuilder/devel perl-ExtUtils-CBuilder.spec, 1.8,
	1.9
Message-ID: <200503032346.j23NkSXh023672@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-ExtUtils-CBuilder/devel

Modified Files:
	perl-ExtUtils-CBuilder.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-ExtUtils-CBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-ExtUtils-CBuilder.spec	15 Feb 2005 02:35:09 -0000	1.8
+++ perl-ExtUtils-CBuilder.spec	3 Mar 2005 23:46:26 -0000	1.9
@@ -3,7 +3,6 @@
 Name:           perl-ExtUtils-CBuilder
 Version:        0.09
 Release:        1
-Epoch:          0
 Summary:        Compile and link C code for Perl modules
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Mail-Sendmail/devel perl-Mail-Sendmail.spec,1.5,1.6
Message-ID: <200503032346.j23NkTQv023799@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Mail-Sendmail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Mail-Sendmail/devel

Modified Files:
	perl-Mail-Sendmail.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Mail-Sendmail.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Sendmail/devel/perl-Mail-Sendmail.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Mail-Sendmail.spec	16 Dec 2004 19:07:05 -0000	1.5
+++ perl-Mail-Sendmail.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Mail-Sendmail
 Version:        0.79
 Release:        6
-Epoch:          0
 Summary:        Simple platform independent mailer for Perl
 
 License:        Distributable



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Test-Builder-Tester/devel perl-Test-Builder-Tester.spec,
	1.5, 1.6
Message-ID: <200503032346.j23NkUAn023890@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Test-Builder-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Test-Builder-Tester/devel

Modified Files:
	perl-Test-Builder-Tester.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Test-Builder-Tester.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Builder-Tester/devel/perl-Test-Builder-Tester.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-Builder-Tester.spec	10 Dec 2004 22:03:09 -0000	1.5
+++ perl-Test-Builder-Tester.spec	3 Mar 2005 23:46:28 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Test-Builder-Tester
 Version:        1.01
 Release:        1
-Epoch:          0
 Summary:        Test runner for Test::Builder testsuites
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Digest-Nilsimsa/devel perl-Digest-Nilsimsa.spec,1.5,1.6
Message-ID: <200503032346.j23NkSAv023660@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Digest-Nilsimsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Digest-Nilsimsa/devel

Modified Files:
	perl-Digest-Nilsimsa.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Digest-Nilsimsa.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-Nilsimsa/devel/perl-Digest-Nilsimsa.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Digest-Nilsimsa.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-Digest-Nilsimsa.spec	3 Mar 2005 23:46:26 -0000	1.6
@@ -1,8 +1,7 @@
 Name:           perl-Digest-Nilsimsa
 Version:        0.06
 Release:        4
-Epoch:          0
-Summary:        Perl interface to the Nilsima Algorithm 
+Summary:        Perl interface to the Nilsima Algorithm
 
 Group:          Development/Libraries
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Chart/devel perl-Chart.spec,1.1,1.2
Message-ID: <200503032346.j23NkSp3023622@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Chart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Chart/devel

Modified Files:
	perl-Chart.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Chart.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/devel/perl-Chart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Chart.spec	17 Jan 2005 21:07:15 -0000	1.1
+++ perl-Chart.spec	3 Mar 2005 23:46:26 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-Chart
 Version:        2.3
 Release:        2
-Epoch:          0
 Summary:        Perl module for producing many types of charts
 
 Group:          Development/Libraries
@@ -13,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(GD) >= 0:1.20
+BuildRequires:  perl >= 1:5.6.1, perl(GD) >= 1.20
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Gtk2/devel perl-Gtk2.spec,1.4,1.5
Message-ID: <200503032346.j23NkSuZ023727@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Gtk2/devel

Modified Files:
	perl-Gtk2.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Gtk2.spec	15 Feb 2005 03:30:46 -0000	1.4
+++ perl-Gtk2.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Gtk2
 Version:        1.062
 Release:        1
-Epoch:          0
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
 Group:          Development/Libraries
@@ -13,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.062
+BuildRequires:  gtk2-devel, perl(Glib) >= 1.062
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IPC-SharedCache/devel perl-IPC-SharedCache.spec,1.4,1.5
Message-ID: <200503032346.j23NkTH7023783@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IPC-SharedCache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IPC-SharedCache/devel

Modified Files:
	perl-IPC-SharedCache.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IPC-SharedCache.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-SharedCache/devel/perl-IPC-SharedCache.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-IPC-SharedCache.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-IPC-SharedCache.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-IPC-SharedCache
 Version:        1.3
 Release:        4
-Epoch:          0
 Summary:        Perl module to manage a cache in SysV IPC shared memory
 
 Group:          Development/Libraries
@@ -13,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(IPC::ShareLite) >= 0:0.06, perl(Storable)
+BuildRequires:  perl >= 1:5.6.1, perl(IPC::ShareLite) >= 0.06, perl(Storable)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Glib/devel perl-Glib.spec,1.5,1.6
Message-ID: <200503032346.j23NkS7t023723@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Glib/devel

Modified Files:
	perl-Glib.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Glib.spec	15 Feb 2005 03:09:08 -0000	1.5
+++ perl-Glib.spec	3 Mar 2005 23:46:26 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Glib
 Version:        1.062
 Release:        1
-Epoch:          0
 Summary:        Perl interface to GLib
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Convert-TNEF/devel perl-Convert-TNEF.spec,1.5,1.6
Message-ID: <200503032346.j23NkSUf023648@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Convert-TNEF/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Convert-TNEF/devel

Modified Files:
	perl-Convert-TNEF.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Convert-TNEF.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-TNEF/devel/perl-Convert-TNEF.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Convert-TNEF.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-Convert-TNEF.spec	3 Mar 2005 23:46:26 -0000	1.6
@@ -1,10 +1,9 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
-Summary:        Perl module to read TNEF files 
+Summary:        Perl module to read TNEF files
 Name:           perl-Convert-TNEF
 Version:        0.17
 Release:        3
-Epoch:          0
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Convert-TNEF/
@@ -66,5 +65,5 @@
 - Added "make test" in build section
 - Added missing directory
 
-* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 
+* Sun Jun 15 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Convert-BinHex/devel perl-Convert-BinHex.spec,1.1,1.2
Message-ID: <200503032346.j23NkSlh023639@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Convert-BinHex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Convert-BinHex/devel

Modified Files:
	perl-Convert-BinHex.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Convert-BinHex.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-BinHex/devel/perl-Convert-BinHex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Convert-BinHex.spec	25 Jan 2005 16:51:47 -0000	1.1
+++ perl-Convert-BinHex.spec	3 Mar 2005 23:46:26 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-Convert-BinHex
 Version:        1.119
 Release:        1
-Epoch:          0
 Summary:        Macintosh BinHex extractor library for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IO-Tty/devel perl-IO-Tty.spec,1.5,1.6
Message-ID: <200503032346.j23NkT8P023771@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IO-Tty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IO-Tty/devel

Modified Files:
	perl-IO-Tty.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IO-Tty.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/perl-IO-Tty.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-IO-Tty.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-IO-Tty.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-IO-Tty
 Version:        1.02
 Release:        2
-Epoch:          0
 Summary:        Perl interface to pseudo tty's
 
 License:        GPL or Artistic



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Net-SSH/devel perl-Net-SSH.spec,1.5,1.6
Message-ID: <200503032346.j23NkTWM023850@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-SSH/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Net-SSH/devel

Modified Files:
	perl-Net-SSH.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Net-SSH.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSH/devel/perl-Net-SSH.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Net-SSH.spec	16 Dec 2004 19:16:32 -0000	1.5
+++ perl-Net-SSH.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Net-SSH
 Version:        0.08
 Release:        1
-Epoch:          0
 Summary:        Perl extension for secure shell
 
 License:        GPL or Artistic



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Unicode-MapUTF8/devel perl-Unicode-MapUTF8.spec,1.4,1.5
Message-ID: <200503032346.j23NkU5A023934@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Unicode-MapUTF8/devel

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/devel/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Unicode-MapUTF8.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Unicode-MapUTF8.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Unicode-MapUTF8
 Version:        1.09
 Release:        4
-Epoch:          0
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Net-SCP/devel perl-Net-SCP.spec,1.4,1.5
Message-ID: <200503032346.j23NkT9K023842@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-SCP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Net-SCP/devel

Modified Files:
	perl-Net-SCP.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Net-SCP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SCP/devel/perl-Net-SCP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Net-SCP.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-Net-SCP.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Net-SCP
 Version:        0.07
 Release:        1
-Epoch:          0
 Summary:        Perl extension for secure copy protocol
 
 License:        GPL or Artistic



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Net-IP/devel perl-Net-IP.spec,1.3,1.4
Message-ID: <200503032346.j23NkTTi023834@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-IP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Net-IP/devel

Modified Files:
	perl-Net-IP.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Net-IP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-IP/devel/perl-Net-IP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Net-IP.spec	6 Dec 2004 08:17:41 -0000	1.3
+++ perl-Net-IP.spec	3 Mar 2005 23:46:27 -0000	1.4
@@ -3,7 +3,6 @@
 Name:           perl-Net-IP
 Version:        1.21
 Release:        1
-Epoch:          0
 Summary:        Perl module for manipulation of IPv4 and IPv6 addresses
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:33 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:33 -0500
Subject: rpms/perl-GDTextUtil/devel perl-GDTextUtil.spec,1.3,1.4
Message-ID: <200503032346.j23NkXZm023719@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-GDTextUtil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-GDTextUtil/devel

Modified Files:
	perl-GDTextUtil.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-GDTextUtil.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GDTextUtil/devel/perl-GDTextUtil.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-GDTextUtil.spec	10 Dec 2004 22:03:08 -0000	1.3
+++ perl-GDTextUtil.spec	3 Mar 2005 23:46:26 -0000	1.4
@@ -5,7 +5,6 @@
 Name:           perl-GDTextUtil
 Version:        0.86
 Release:        4
-Epoch:          0
 Summary:        Text utilities for use with GD
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-PAR-Dist/devel perl-PAR-Dist.spec,1.4,1.5
Message-ID: <200503032346.j23NkTrB023858@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-PAR-Dist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-PAR-Dist/devel

Modified Files:
	perl-PAR-Dist.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/perl-PAR-Dist.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-PAR-Dist.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-PAR-Dist.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-PAR-Dist
 Version:        0.07
 Release:        2
-Epoch:          0
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-FreezeThaw/devel perl-FreezeThaw.spec,1.2,1.3
Message-ID: <200503032346.j23NkSO4023701@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-FreezeThaw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-FreezeThaw/devel

Modified Files:
	perl-FreezeThaw.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-FreezeThaw.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/devel/perl-FreezeThaw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-FreezeThaw.spec	10 Dec 2004 22:03:08 -0000	1.2
+++ perl-FreezeThaw.spec	3 Mar 2005 23:46:26 -0000	1.3
@@ -3,7 +3,6 @@
 Name:           perl-FreezeThaw
 Version:        0.43
 Release:        1
-Epoch:          0
 Summary:        Convert Perl structures to strings and back
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-File-Tail/devel perl-File-Tail.spec,1.4,1.5
Message-ID: <200503032346.j23NkSIV023694@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-File-Tail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-File-Tail/devel

Modified Files:
	perl-File-Tail.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-File-Tail.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/devel/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	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-File-Tail
 Version:        0.98
 Release:        3
-Epoch:          0
 Summary:        Perl extension for reading from continously updated files
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IPC-Run/devel perl-IPC-Run.spec,1.5,1.6
Message-ID: <200503032346.j23NkTpJ023779@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IPC-Run/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IPC-Run/devel

Modified Files:
	perl-IPC-Run.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IPC-Run.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Run/devel/perl-IPC-Run.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-IPC-Run.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-IPC-Run.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-IPC-Run
 Version:        0.78
 Release:        1
-Epoch:          0
 Summary:        Perl module for interacting with child processes
 
 License:        GPL or Artistic
@@ -13,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl-IO-Tty
+BuildRequires:  perl(IO::Tty)
 
 %description
 IPC::Run allows you run and interact with child processes using files,



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Pod-Escapes/devel perl-Pod-Escapes.spec,1.4,1.5
Message-ID: <200503032346.j23NkTFx023866@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Pod-Escapes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Pod-Escapes/devel

Modified Files:
	perl-Pod-Escapes.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Pod-Escapes.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Escapes/devel/perl-Pod-Escapes.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Pod-Escapes.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-Pod-Escapes.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Pod-Escapes
 Version:        1.04
 Release:        1
-Epoch:          0
 Summary:        Perl module for resolving POD escape sequences
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-HTML-Template/devel perl-HTML-Template.spec,1.4,1.5
Message-ID: <200503032346.j23NkSuG023731@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-HTML-Template/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-HTML-Template/devel

Modified Files:
	perl-HTML-Template.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-HTML-Template.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template/devel/perl-HTML-Template.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Template.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-HTML-Template.spec	3 Mar 2005 23:46:26 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-HTML-Template
 Version:        2.7
 Release:        2
-Epoch:          0
 Summary:        Perl module to use HTML Templates
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-Convert-UUlib/devel perl-Convert-UUlib.spec,1.5,1.6
Message-ID: <200503032346.j23NkSYi023655@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Convert-UUlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Convert-UUlib/devel

Modified Files:
	perl-Convert-UUlib.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/perl-Convert-UUlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Convert-UUlib.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-Convert-UUlib.spec	3 Mar 2005 23:46:26 -0000	1.6
@@ -1,11 +1,10 @@
 %define rname Convert-UUlib
 %define perl_vendorarch %(eval "$(perl -V:installvendorarch)"; echo $installvendorarch)
 
-Name:    perl-%{rname}
-Version: 1.03
-Release: 1
-Epoch:   0
-Summary: A perl interface to the uulib library
+Name:      perl-%{rname}
+Version:   1.03
+Release:   1
+Summary:   Perl interface to the uulib library
 
 Group:     Development/Libraries
 License:   GPL
@@ -44,7 +43,7 @@
 %check || :
 make test
 
-%clean 
+%clean
 rm -fr %{buildroot}
 
 %files



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Net-Netmask/devel perl-Net-Netmask.spec,1.5,1.6
Message-ID: <200503032346.j23NkTU2023838@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-Netmask/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Net-Netmask/devel

Modified Files:
	perl-Net-Netmask.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Net-Netmask.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Netmask/devel/perl-Net-Netmask.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Net-Netmask.spec	26 Dec 2004 20:25:06 -0000	1.5
+++ perl-Net-Netmask.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Net-Netmask
 Version:        1.9011
 Release:        1
-Epoch:          0
 Summary:        Perl module for manipulation and lookup of IP network blocks
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Test-MockObject/devel perl-Test-MockObject.spec,1.5,1.6
Message-ID: <200503032346.j23NkU8t023898@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Test-MockObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Test-MockObject/devel

Modified Files:
	perl-Test-MockObject.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Test-MockObject.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-MockObject.spec	1 Jan 2005 13:17:37 -0000	1.5
+++ perl-Test-MockObject.spec	3 Mar 2005 23:46:28 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           perl-Test-MockObject
 Version:        0.15
 Release:        2
-Epoch:          0
 Summary:        Perl extension for emulating troublesome interfaces
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-String-ShellQuote/devel perl-String-ShellQuote.spec, 1.7,
	1.8
Message-ID: <200503032346.j23NkUdu023886@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-String-ShellQuote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-String-ShellQuote/devel

Modified Files:
	perl-String-ShellQuote.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-String-ShellQuote.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-ShellQuote/devel/perl-String-ShellQuote.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-String-ShellQuote.spec	10 Feb 2005 20:52:36 -0000	1.7
+++ perl-String-ShellQuote.spec	3 Mar 2005 23:46:28 -0000	1.8
@@ -3,7 +3,6 @@
 Name:           perl-String-ShellQuote
 Version:        1.02
 Release:        1
-Epoch:          0
 Summary:        Perl module for quoting strings for passing through the shell
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Mail-Alias/devel perl-Mail-Alias.spec,1.5,1.6
Message-ID: <200503032346.j23NkTEE023795@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Mail-Alias/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Mail-Alias/devel

Modified Files:
	perl-Mail-Alias.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Mail-Alias.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Alias/devel/perl-Mail-Alias.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Mail-Alias.spec	10 Dec 2004 22:03:08 -0000	1.5
+++ perl-Mail-Alias.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -2,18 +2,17 @@
 
 %define		tarname	Mail-Alias
 
-Summary: 	Mail::Alias perl module.
-Name: 		perl-%{tarname}
-Version: 	1.12
-Release: 	3
-Epoch: 		0
-License: 	Artistic
-Group: 		Development/Libraries
-URL: 		http://www.cpan.org/
+Summary:	Mail::Alias perl module
+Name:		perl-%{tarname}
+Version:	1.12
+Release:	3
+License:	Artistic
+Group:		Development/Libraries
+URL:		http://www.cpan.org/
 # Tarball grabbed with perl -MCPAN -e shell -> get Mail::Alias.
-Source0: 	%{tarname}-%{version}.tar.gz
+Source0:	%{tarname}-%{version}.tar.gz
 BuildArch:	noarch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 # -----------------------------------------------------------------------------
 
@@ -73,5 +72,5 @@
 - Added make test in build section
 - Added missing directory
 
-* Tue Jun 17 2003 Dams <anvil[AT]livna.org> 
+* Tue Jun 17 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:28 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:28 -0500
Subject: rpms/perl-GD/devel perl-GD.spec,1.3,1.4
Message-ID: <200503032346.j23NkSYZ023708@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-GD/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-GD/devel

Modified Files:
	perl-GD.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-GD.spec	10 Dec 2004 07:44:01 -0000	1.3
+++ perl-GD.spec	3 Mar 2005 23:46:26 -0000	1.4
@@ -3,7 +3,6 @@
 Name:           perl-GD
 Version:        2.19
 Release:        1
-Epoch:          0
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
@@ -13,10 +12,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  gd-devel >= 0:2.0.28
+BuildRequires:  gd-devel >= 2.0.28
 BuildRequires:  %{_bindir}/gdlib-config
 BuildRequires:  libpng-devel, libjpeg-devel, freetype-devel, XFree86-devel
-Requires:       gd >= 0:2.0.28
+Requires:       gd >= 2.0.28
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Net-Server/devel perl-Net-Server.spec,1.5,1.6
Message-ID: <200503032346.j23NkT7L023846@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-Server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Net-Server/devel

Modified Files:
	perl-Net-Server.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/perl-Net-Server.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Net-Server.spec	11 Feb 2005 18:59:31 -0000	1.5
+++ perl-Net-Server.spec	3 Mar 2005 23:46:27 -0000	1.6
@@ -5,7 +5,6 @@
 Name:    perl-%{rname}
 Version: 0.87
 Release: 3
-Epoch:   0
 Summary: Extensible, general Perl server engine
 
 Group:     Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-IO-stringy/devel perl-IO-stringy.spec,1.6,1.7
Message-ID: <200503032346.j23NkT86023767@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IO-stringy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-IO-stringy/devel

Modified Files:
	perl-IO-stringy.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-IO-stringy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-stringy/devel/perl-IO-stringy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-IO-stringy.spec	15 Feb 2005 17:15:52 -0000	1.6
+++ perl-IO-stringy.spec	3 Mar 2005 23:46:27 -0000	1.7
@@ -6,7 +6,6 @@
 Name: 		perl-%{tarname}
 Version: 	2.110
 Release: 	1
-Epoch: 		0
 License: 	Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/IO-stringy/
@@ -14,25 +13,21 @@
 BuildArch:	noarch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-# -----------------------------------------------------------------------------
 
 %description
 This toolkit primarily provides Perl modules for performing both
 traditional and object-oriented i/o) on things *other* than normal
 filehandles; in particular, IO::Scalar, IO::ScalarArray, and IO::Lines.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{tarname}-%{version}
 
-# -----------------------------------------------------------------------------
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -41,17 +36,14 @@
 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,-)
@@ -59,7 +51,6 @@
 %{perl_vendorlib}/IO/
 %{_mandir}/man3/IO::*.3pm*
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Tue Feb 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.110-1



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-TeX-Hyphen/devel perl-TeX-Hyphen.spec,1.4,1.5
Message-ID: <200503032346.j23NkU2J023911@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-TeX-Hyphen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-TeX-Hyphen/devel

Modified Files:
	perl-TeX-Hyphen.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-TeX-Hyphen.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-TeX-Hyphen/devel/perl-TeX-Hyphen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-TeX-Hyphen.spec	10 Dec 2004 22:03:09 -0000	1.4
+++ perl-TeX-Hyphen.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-TeX-Hyphen
 Version:        0.140
 Release:        1
-Epoch:          0
 Summary:        Hyphenate words using TeX's patterns
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Test-Manifest/devel perl-Test-Manifest.spec,1.4,1.5
Message-ID: <200503032346.j23NkUvB023894@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Test-Manifest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Test-Manifest/devel

Modified Files:
	perl-Test-Manifest.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Test-Manifest.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/perl-Test-Manifest.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-Manifest.spec	1 Dec 2004 15:25:16 -0000	1.4
+++ perl-Test-Manifest.spec	3 Mar 2005 23:46:28 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Test-Manifest
 Version:        1.11
 Release:        1
-Epoch:          0
 Summary:        Test case module for Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-String-Ediff/devel perl-String-Ediff.spec,1.6,1.7
Message-ID: <200503032346.j23NkUDo023882@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-String-Ediff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-String-Ediff/devel

Modified Files:
	perl-String-Ediff.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-String-Ediff.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-Ediff/devel/perl-String-Ediff.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-String-Ediff.spec	18 Feb 2005 22:09:00 -0000	1.6
+++ perl-String-Ediff.spec	3 Mar 2005 23:46:28 -0000	1.7
@@ -3,7 +3,6 @@
 Name:           perl-String-Ediff
 Version:        0.04
 Release:        1
-Epoch:          0
 Summary:        Produce common sub-string indices for two strings
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Module-CoreList/devel perl-Module-CoreList.spec,1.1,1.2
Message-ID: <200503032346.j23NkTDE023824@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Module-CoreList/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Module-CoreList/devel

Modified Files:
	perl-Module-CoreList.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Module-CoreList.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/perl-Module-CoreList.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Module-CoreList.spec	5 Jan 2005 19:33:24 -0000	1.1
+++ perl-Module-CoreList.spec	3 Mar 2005 23:46:27 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-Module-CoreList
 Version:        1.98
 Release:        2
-Epoch:          0
 Summary:        Perl core modules indexed by perl versions
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:29 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:29 -0500
Subject: rpms/perl-Image-Xbm/devel perl-Image-Xbm.spec,1.4,1.5
Message-ID: <200503032346.j23NkTKx023751@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Image-Xbm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Image-Xbm/devel

Modified Files:
	perl-Image-Xbm.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: perl-Image-Xbm.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Xbm/devel/perl-Image-Xbm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Image-Xbm.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-Image-Xbm.spec	3 Mar 2005 23:46:27 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           perl-Image-Xbm
 Version:        1.08
 Release:        2
-Epoch:          0
 Summary:        Load, create, manipulate and save xbm image files in Perl
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Thu Mar  3 23:46:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 3 Mar 2005 18:46:30 -0500
Subject: rpms/perl-Test-Pod-Coverage/devel perl-Test-Pod-Coverage.spec, 1.1,
	1.2
Message-ID: <200503032346.j23NkUPT023906@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404/perl-Test-Pod-Coverage/devel

Modified Files:
	perl-Test-Pod-Coverage.spec 
Log Message:
Mass perl module update, one or more apply :
- Drop epoch: 0
- Remove trailing white spaces
- Keep consistent between spaces and tabs



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.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	3 Mar 2005 23:46:28 -0000	1.2
@@ -3,7 +3,6 @@
 Name:           perl-Test-Pod-Coverage
 Version:        1.06
 Release:        1
-Epoch:          0
 Summary:        Check for pod coverage in your distribution
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Fri Mar  4 00:30:03 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 19:30:03 -0500
Subject: rpms/openbox/devel .cvsignore, 1.2, NONE Makefile, 1.2,
	NONE openbox-2.3.1-gcc33.patch, 1.1,
	NONE openbox-2.3.1-nls.patch, 1.1, NONE openbox-dm.sessions,
	1.1, NONE openbox-switchdesk.Xclients, 1.1, NONE openbox.spec,
	1.6, NONE sources, 1.2, NONE
Message-ID: <200503040030.j240U3nT026999@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/openbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26993

Removed Files:
	.cvsignore Makefile openbox-2.3.1-gcc33.patch 
	openbox-2.3.1-nls.patch openbox-dm.sessions 
	openbox-switchdesk.Xclients openbox.spec sources 
Log Message:
REMOVED from devel tree. Broken, out-of-date and build disabled long enough. If ever picked up again, old version could be resurrected or fresh package imported from scratch.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- openbox-2.3.1-gcc33.patch DELETED ---


--- openbox-2.3.1-nls.patch DELETED ---


--- openbox-dm.sessions DELETED ---


--- openbox-switchdesk.Xclients DELETED ---


--- openbox.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar  4 00:32:13 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 19:32:13 -0500
Subject: rpms/wine/devel .cvsignore, 1.2, NONE Makefile, 1.2, NONE sources,
	1.2, NONE 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 wine.init,
	1.1, NONE wine.spec, 1.2, NONE
Message-ID: <200503040032.j240WD2H027050@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27044

Removed Files:
	.cvsignore Makefile sources wine-20030408-defaultcfg.patch 
	wine-20030408-initial.patch wine-20030408-kde2.patch 
	wine-20030408-winelauncher.patch wine.init wine.spec 
Log Message:
REMOVED from devel tree. Broken and out-of-date long enough. If ever picked up again, old version could be resurrected or fresh package imported from scratch.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- wine-20030408-defaultcfg.patch DELETED ---


--- wine-20030408-initial.patch DELETED ---


--- wine-20030408-kde2.patch DELETED ---


--- wine-20030408-winelauncher.patch DELETED ---


--- wine.init DELETED ---


--- wine.spec DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar  4 00:36:28 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 19:36:28 -0500
Subject: rpms/inti/devel .cvsignore, 1.2, NONE Makefile, 1.2, NONE inti.spec,
	1.3, NONE sources, 1.2, NONE
Message-ID: <200503040036.j240aSZ6027134@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/inti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27128

Removed Files:
	.cvsignore Makefile inti.spec sources 
Log Message:
REMOVED from devel tree. Broken long enough. No upstream update available. If ever fixed or picked up again, old version could be resurrected or fresh package imported from scratch.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- inti.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar  4 00:52:01 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 19:52:01 -0500
Subject: rpms/dietlibc - New directory
Message-ID: <200503040052.j240q1qg027225@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27218/dietlibc

Log Message:
Directory /cvs/extras/rpms/dietlibc added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 00:52:01 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 19:52:01 -0500
Subject: rpms/dietlibc/devel - New directory
Message-ID: <200503040052.j240q1CH027228@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27218/dietlibc/devel

Log Message:
Directory /cvs/extras/rpms/dietlibc/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 00:52:24 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 19:52:24 -0500
Subject: rpms/dietlibc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503040052.j240qOBc027293@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27284

Added Files:
	Makefile import.log 
Log Message:
Setup of module dietlibc


--- NEW FILE Makefile ---
# Top level Makefile for module dietlibc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  4 00:52:24 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 19:52:24 -0500
Subject: rpms/dietlibc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503040052.j240qOBi027296@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27284/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dietlibc


--- 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 Mar  4 00:53:19 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 19:53:19 -0500
Subject: rpms/dietlibc import.log,1.1,1.2
Message-ID: <200503040053.j240rJN4027395@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27386

Modified Files:
	import.log 
Log Message:
auto-import dietlibc-0.28-4 on branch devel from dietlibc-0.28-4.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Mar 2005 00:52:22 -0000	1.1
+++ import.log	4 Mar 2005 00:53:17 -0000	1.2
@@ -0,0 +1 @@
+dietlibc-0_28-4:HEAD:dietlibc-0.28-4.src.rpm:1109897587



From fedora-extras-commits at redhat.com  Fri Mar  4 00:53:19 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 3 Mar 2005 19:53:19 -0500
Subject: rpms/dietlibc/devel dietlibc-0.28-gcc4.patch, NONE,
	1.1 dietlibc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503040053.j240rJOO027399@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27386/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dietlibc-0.28-gcc4.patch dietlibc.spec 
Log Message:
auto-import dietlibc-0.28-4 on branch devel from dietlibc-0.28-4.src.rpm


dietlibc-0.28-gcc4.patch:

--- NEW FILE dietlibc-0.28-gcc4.patch ---
--- dietlibc-0.28/libdl/_dl_int.h.gcc4	2005-01-29 03:29:16.000000000 +0100
+++ dietlibc-0.28/libdl/_dl_int.h	2005-03-04 01:39:26.336802965 +0100
@@ -102,7 +102,7 @@ struct r_debug {
   Elf_Addr r_ldbase;
 };
 #ifdef WANT_LD_SO_GDB_SUPPORT
-extern struct r_debug _r_debug;
+  //extern struct r_debug _r_debug;
 #endif
 
 #define HASH_BUCKET_LEN(p)	(*((p)))
@@ -112,9 +112,9 @@ extern struct r_debug _r_debug;
 #define HASH_CHAIN(p)		((p)+2+HASH_BUCKET_LEN(p))
 
 /* _dl_alloc.c */
-extern struct _dl_handle* _dl_root_handle;
-extern struct _dl_handle* _dl_top_handle;
-extern struct _dl_handle* _dl_free_list;
+//extern struct _dl_handle* _dl_root_handle;
+//extern struct _dl_handle* _dl_top_handle;
+//extern struct _dl_handle* _dl_free_list;
 #ifndef __DIET_LD_SO__
 void _dl_free_handle(struct _dl_handle* dh);
 struct _dl_handle* _dl_get_handle();
--- dietlibc-0.28/libdl/_dl_main.c.gcc4	2005-01-29 03:29:16.000000000 +0100
+++ dietlibc-0.28/libdl/_dl_main.c	2005-03-04 01:40:41.886679465 +0100
@@ -168,9 +168,11 @@ static inline unsigned long* get_got(voi
   return got;
 }
 
+/* declare _dl_jump static otherwise we have a GOT access BEFOR we have the resolver */
+static void _dl_jump(void);
+
 static inline int work_on_pltgot(struct _dl_handle*dh) {
-  /* declare _dl_jump static otherwise we have a GOT access BEFOR we have the resolver */
-  static void _dl_jump(void);
+  
   if ((dh->plt_rel)&&(!(dh->flags&RTLD_NOW))) {
     unsigned long*tmp=dh->pltgot;
     /* GOT */
--- dietlibc-0.28/dyn_start.c.gcc4	2004-11-30 23:35:14.000000000 +0100
+++ dietlibc-0.28/dyn_start.c	2005-03-04 01:44:23.346109645 +0100
@@ -29,10 +29,10 @@ int stackgap(int argc,char* argv[],char*
 
 #ifndef __DYN_LIB_SHARED
 /* pre main, post _start */
+static __attribute__((section(".init"))) void _init(void);
 int _dyn_start(int argc, char **argv, char **envp, structor dl_init);
 int _dyn_start(int argc, char **argv, char **envp, structor dl_init)
 {
-  static __attribute__((section(".init"))) void _init(void);
   int main(int argc, char **argv, char **envp);
 
   if (dl_init) atexit(dl_init);


--- NEW FILE dietlibc.spec ---
## $Id: dietlibc.spec,v 1.3 2005/02/01 12:03:17 ensc Exp $

## This package understands the following switches:
## --with cross                 ...  enable crossbuild
## --define crossarch <arch>    ...  set cross-architecture (only valid with
##                                   '--with cross'; defaults to 'arm-linux')

## Fedora Extras specific customization below...
%global	crossarch	%{!?crossarch:arm-linux}%{?crossarch}
##

%global NAME		dietlibc
%global do_crossbuild	%{?_with_cross:1}%{!?_with_cross:0}

%{!?release_func:%define release_func() %1%{?disttag}}

Summary:	A small libc implementation
Name:		%{?_with_cross:cross-%crossarch-}%NAME
Version:	0.28
Release:	%release_func 4
License:	GPL
Group:		Development/Libraries
URL:		http://www.fefe.de/dietlibc/
Source0:	http://www.fefe.de/dietlibc/%NAME-%version.tar.bz2
Patch0:		dietlibc-0.28-gcc4.patch
BuildRoot:	%_tmppath/%name-%version-buildroot
Requires:	dietlibc-lib = %version-%release

%if %do_crossbuild
BuildRequires:  dietlibc
Requires:       dietlibc = %version-%release
%endif


%package lib
Summary:	Dynamic libraries for dietlibc
Group:		System Environment/Libraries

%description
The diet libc is a libc that is optimized for small size. It can be
used to create small statically linked binaries for Linux on alpha,
arm, hppa, ia64, i386, mips, s390, sparc, sparc64, ppc and x86_64.


%description lib
The diet libc is a libc that is optimized for small size. It can be
used to create small statically linked binaries for Linux on alpha,
arm, hppa, ia64, i386, mips, s390, sparc, sparc64, ppc and x86_64.

This package contains the dynamic libraries for dietlibc.


%prep
%setup -q -n %NAME-%version
%patch0 -p1 -b .gcc4

## only for 0.28; remove it in 0.29
sed -i -e 's!LD_RUN_PATH= !env -u LD_RUN_PATH !' Makefile


%define basemakeflags   prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: %{!?_with_cross:CFLAGS="$RPM_OPT_FLAGS"}
%define xtraflags	%(echo CROSS=%{crossarch}- ARCH=$(echo %crossarch | sed -e 's!-.*!!'))
%define makeflags	%basemakeflags %{?_with_cross:%xtraflags}


%build
%if %do_crossbuild
  mkdir bin-%_arch
  diet gcc diet.c -DDIETHOME=\"`pwd`\" -DVERSION=\"X\" -o bin-%_arch/diet
%endif

%__make %makeflags all dyn %_smp_mflags



%install
rm -rf $RPM_BUILD_ROOT
%__install -d -m755 $RPM_BUILD_ROOT/etc
%__make %makeflags DESTDIR=$RPM_BUILD_ROOT install

%if !%do_crossbuild
  ln -s lib-%_arch ${RPM_BUILD_ROOT}%_libdir/dietlibc/lib-%_arch-%_vendor
%endif

%if %do_crossbuild
  rm -rf ${RPM_BUILD_ROOT}%_libdir/dietlibc/include	\
  	 ${RPM_BUILD_ROOT}%_mandir
%endif


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%exclude %_libdir/dietlibc/*/*.so

%if %do_crossbuild
%_libdir/dietlibc/lib-*
%else
%doc AUTHOR BUGS CAVEAT CHANGES COPYING FAQ PORTING README
%doc THANKS TODO
%doc %_mandir/*/*
%_bindir/*
%_libdir/dietlibc
%endif


%files lib
%defattr(-,root,root,-)
%config(noreplace) %_sysconfdir/*
%dir %_libdir/dietlibc
%dir %_libdir/dietlibc/lib-*
%_libdir/dietlibc/lib-%_arch/*.so


%changelog
* Fri Mar  4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-4
- rebuild
- fixed compilation with gcc4

* Tue Feb  1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-1
- updated to 0.28
- unset LD_RUN_PATH which would result in empty rpaths else
- removed the waitpid patch; it is solved upstream

* Tue Aug 17 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.27-1
- updated to 0.27

* Fri Jun 11 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.26-1
- updated to 0.26

* Fri Apr  9 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.25-1
- updated to 0.25

* Sat Jan 17 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:%VERSION.90.%DATE}-5
- renewed -snprintf patch

* Tue Jan  6 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:%VERSION.90.%DATE}-4
- applied -snprintf patch (from fedora dietlibc-0.24-2 package)

* Tue Dec 30 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:%VERSION.90.%DATE}-2
- added C99 patch

* Thu Dec  4 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.24-1
- updated to 0.24

* Tue Sep 16 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.23-1
- updated to 0.23

* Fri Nov  8 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 1:0.21-1
- updated to 0.21
- removed unpackaged files in %%install-stage

* Thu Jul 11 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 1:0.18-1
- updated to 0.18

* Thu Jul  4 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Mar 2005 00:52:22 -0000	1.1
+++ .cvsignore	4 Mar 2005 00:53:17 -0000	1.2
@@ -0,0 +1 @@
+dietlibc-0.28.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Mar 2005 00:52:22 -0000	1.1
+++ sources	4 Mar 2005 00:53:17 -0000	1.2
@@ -0,0 +1 @@
+5be8e221a438817f83f73d09ce655883  dietlibc-0.28.tar.bz2



From fedora-extras-commits at redhat.com  Fri Mar  4 00:55:53 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 3 Mar 2005 19:55:53 -0500
Subject: rpms/qca-tls/devel qca-tls.spec,1.5,1.6
Message-ID: <200503040055.j240trQL027504@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/qca-tls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27498

Modified Files:
	qca-tls.spec 
Log Message:
Fixed spelling mistake spotted in commits-list diff, and took the chance to pseudo-block-test the description. ;)


Index: qca-tls.spec
===================================================================
RCS file: /cvs/extras/rpms/qca-tls/devel/qca-tls.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qca-tls.spec	4 Mar 2005 00:05:42 -0000	1.5
+++ qca-tls.spec	4 Mar 2005 00:55:51 -0000	1.6
@@ -1,7 +1,7 @@
 Name:		qca-tls
 Version:	1.0
 Release:	2
-Summary:	Qt Cryptographic Architecture, TLS plugin
+Summary:	TLS plugin for the Qt Cryptographic Architecture
 License:	LGPL
 Group:		Applications/Internet
 URL:		http://delta.affinix.com/qca/
@@ -14,11 +14,10 @@
 
 
 %description
-This is a plugin to provide SSL/TLS capability to programs that use
-the Qt Cryptographic Architecture (QCA).
-QCA is a library providing an easy API for several cryptographic
-algorithmns to Qt programs.
-This package only contains the TLS plugin.
+This is a plugin to provide SSL/TLS capability to programs that use the Qt
+Cryptographic Architecture (QCA).  QCA is a library providing an easy API
+for several cryptographic algorithms to Qt programs.  This package only
+contains the TLS plugin.
 
 %prep
 %setup -q



From bugs.michael at gmx.net  Fri Mar  4 01:09:20 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 4 Mar 2005 02:09:20 +0100
Subject: rpms/qca-tls/devel qca-tls.spec,1.5,1.6
In-Reply-To: <200503040055.j240trQL027504@cvs-int.fedora.redhat.com>
References: <200503040055.j240trQL027504@cvs-int.fedora.redhat.com>
Message-ID: <20050304020920.0a50b47e.bugs.michael@gmx.net>

On Thu, 3 Mar 2005 19:55:53 -0500, Michael Schwendt (mschwendt) wrote:

> Log Message:
> Fixed spelling mistake spotted in commits-list diff, and took the chance to pseudo-block-test the description. ;)
> 

should have read: ... pseudo-block-text...



From fedora-extras-commits at redhat.com  Fri Mar  4 01:26:55 2005
From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton))
Date: Thu, 3 Mar 2005 20:26:55 -0500
Subject: rpms/sodipodi/devel .cvsignore, 1.3, NONE Makefile, 1.2,
	NONE sodipodi.spec, 1.4, NONE sources, 1.3, NONE
Message-ID: <200503040126.j241Qt5X028351@cvs-int.fedora.redhat.com>

Author: pcompton

Update of /cvs/extras/rpms/sodipodi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28340

Removed Files:
	.cvsignore Makefile sodipodi.spec sources 
Log Message:
Removing sodipodi (was replaced by inkscape)



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sodipodi.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar  4 03:04:34 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:04:34 -0500
Subject: rpms/perl-Sub-Uplevel - New directory
Message-ID: <200503040304.j2434Y2f029964@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29957/perl-Sub-Uplevel

Log Message:
Directory /cvs/extras/rpms/perl-Sub-Uplevel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 03:04:34 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:04:34 -0500
Subject: rpms/perl-Sub-Uplevel/devel - New directory
Message-ID: <200503040304.j2434YZL029967@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29957/perl-Sub-Uplevel/devel

Log Message:
Directory /cvs/extras/rpms/perl-Sub-Uplevel/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 03:04:52 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:04:52 -0500
Subject: rpms/perl-Sub-Uplevel Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503040304.j2434qrS030026@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30017

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Sub-Uplevel


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Sub-Uplevel
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  4 03:04:52 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:04:52 -0500
Subject: rpms/perl-Sub-Uplevel/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503040304.j2434qtS030029@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30017/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Sub-Uplevel


--- 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 Mar  4 03:05:25 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:05:25 -0500
Subject: rpms/perl-Sub-Uplevel import.log,1.1,1.2
Message-ID: <200503040305.j2435P4G030125@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30116

Modified Files:
	import.log 
Log Message:
auto-import perl-Sub-Uplevel-0.09-0.fdr.1 on branch devel from perl-Sub-Uplevel-0.09-0.fdr.1.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Mar 2005 03:04:50 -0000	1.1
+++ import.log	4 Mar 2005 03:05:23 -0000	1.2
@@ -0,0 +1 @@
+perl-Sub-Uplevel-0_09-0_fdr_1:HEAD:perl-Sub-Uplevel-0.09-0.fdr.1.src.rpm:1109905576



From fedora-extras-commits at redhat.com  Fri Mar  4 03:05:25 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:05:25 -0500
Subject: rpms/perl-Sub-Uplevel/devel perl-Sub-Uplevel.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503040305.j2435PVm030131@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30116/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Sub-Uplevel.spec 
Log Message:
auto-import perl-Sub-Uplevel-0.09-0.fdr.1 on branch devel from perl-Sub-Uplevel-0.09-0.fdr.1.src.rpm



--- NEW FILE perl-Sub-Uplevel.spec ---
%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:           perl-Sub-Uplevel
Version:        0.09
Release:        0.fdr.1
Epoch:          0
Summary:        Apparently run a function in a higher stack frame

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Sub-Uplevel/
Source0:   http://www.cpan.org/authors/id/M/MS/MSCHWERN/Sub-Uplevel-0.09.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Like Tcl's uplevel() function, but not quite so dangerous.  The
idea is just to fool caller().  All the really naughty bits of
Tcl's uplevel() are avoided.


%prep
%setup -q -n Sub-Uplevel-%{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+w $RPM_BUILD_ROOT/*


%check || :
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/Sub/
%{_mandir}/man3/*.3*


%changelog
* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.09-0.fdr.1
- Update to 0.09 (with license info).

* Sun Jul  4 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.08-0.fdr.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Mar 2005 03:04:50 -0000	1.1
+++ .cvsignore	4 Mar 2005 03:05:23 -0000	1.2
@@ -0,0 +1 @@
+Sub-Uplevel-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Mar 2005 03:04:50 -0000	1.1
+++ sources	4 Mar 2005 03:05:23 -0000	1.2
@@ -0,0 +1 @@
+eb09cb38cd7a9b7bc9d3e85e61fe09dd  Sub-Uplevel-0.09.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar  4 03:06:42 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:06:42 -0500
Subject: rpms/perl-Test-Exception - New directory
Message-ID: <200503040306.j2436ggV030252@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30245/perl-Test-Exception

Log Message:
Directory /cvs/extras/rpms/perl-Test-Exception added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 03:06:42 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:06:42 -0500
Subject: rpms/perl-Test-Exception/devel - New directory
Message-ID: <200503040306.j2436gM3030255@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30245/perl-Test-Exception/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-Exception/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 03:07:01 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:07:01 -0500
Subject: rpms/perl-Test-Exception Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503040307.j24371en030314@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30305

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Test-Exception


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-Exception
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  4 03:07:01 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:07:01 -0500
Subject: rpms/perl-Test-Exception/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503040307.j24371eD030317@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30305/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-Exception


--- 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 Mar  4 03:07:33 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:07:33 -0500
Subject: rpms/perl-Test-Exception import.log,1.1,1.2
Message-ID: <200503040307.j2437XJw030410@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30401

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-Exception-0.20-0.fdr.1 on branch devel from perl-Test-Exception-0.20-0.fdr.1.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Exception/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Mar 2005 03:06:59 -0000	1.1
+++ import.log	4 Mar 2005 03:07:31 -0000	1.2
@@ -0,0 +1 @@
+perl-Test-Exception-0_20-0_fdr_1:HEAD:perl-Test-Exception-0.20-0.fdr.1.src.rpm:1109905704



From fedora-extras-commits at redhat.com  Fri Mar  4 03:07:33 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:07:33 -0500
Subject: rpms/perl-Test-Exception/devel perl-Test-Exception.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503040307.j2437Xd3030415@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30401/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Exception.spec 
Log Message:
auto-import perl-Test-Exception-0.20-0.fdr.1 on branch devel from perl-Test-Exception-0.20-0.fdr.1.src.rpm



--- NEW FILE perl-Test-Exception.spec ---
%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:           perl-Test-Exception
Version:        0.20
Release:        0.fdr.1
Epoch:          0
Summary:        Test functions for exception based code

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Test-Exception/
Source0:    http://www.cpan.org/authors/id/A/AD/ADIE/Test-Exception-0.20.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
BuildRequires:  perl(Module::Build), perl(Test::More)
BuildRequires:  perl(Test::Builder), perl(Test::Builder::Tester)
BuildRequires:  perl(Sub::Uplevel), perl(Pod::Coverage), perl(Test::Pod)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides a few convenience methods for testing exception
based code. It is built with Test::Builder and plays happily with
Test::More and friends.


%prep
%setup -q -n Test-Exception-%{version}


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
rm -rf $RPM_BUILD_ROOT
./Build install destdir=$RPM_BUILD_ROOT
chmod -R u+w $RPM_BUILD_ROOT/*


%check || :
./Build test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/Test/
%{_mandir}/man3/*.3*


%changelog
* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.20-0.fdr.1
- Update to 0.20.

* Sun Jul 04 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.15-0.fdr.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Exception/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Mar 2005 03:06:59 -0000	1.1
+++ .cvsignore	4 Mar 2005 03:07:31 -0000	1.2
@@ -0,0 +1 @@
+Test-Exception-0.20.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Exception/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Mar 2005 03:06:59 -0000	1.1
+++ sources	4 Mar 2005 03:07:31 -0000	1.2
@@ -0,0 +1 @@
+820941e2373ecc9a17716550357dc6c6  Test-Exception-0.20.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar  4 03:18:49 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:18:49 -0500
Subject: rpms/perl-Sub-Uplevel/devel perl-Sub-Uplevel.spec,1.1,1.2
Message-ID: <200503040318.j243Inkv030498@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30492

Modified Files:
	perl-Sub-Uplevel.spec 
Log Message:
Removing Epoch


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/perl-Sub-Uplevel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Sub-Uplevel.spec	4 Mar 2005 03:05:23 -0000	1.1
+++ perl-Sub-Uplevel.spec	4 Mar 2005 03:18:47 -0000	1.2
@@ -2,8 +2,7 @@
 
 Name:           perl-Sub-Uplevel
 Version:        0.09
-Release:        0.fdr.1
-Epoch:          0
+Release:        1
 Summary:        Apparently run a function in a higher stack frame
 
 Group:          Development/Libraries
@@ -55,7 +54,7 @@
 
 
 %changelog
-* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.09-0.fdr.1
+* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-1
 - Update to 0.09 (with license info).
 
 * Sun Jul  4 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.08-0.fdr.1



From fedora-extras-commits at redhat.com  Fri Mar  4 03:33:59 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:33:59 -0500
Subject: rpms/perl-Sub-Uplevel/devel perl-Sub-Uplevel.spec,1.2,1.3
Message-ID: <200503040333.j243Xx4C030589@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30583

Modified Files:
	perl-Sub-Uplevel.spec 
Log Message:
New Summary text


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/perl-Sub-Uplevel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Sub-Uplevel.spec	4 Mar 2005 03:18:47 -0000	1.2
+++ perl-Sub-Uplevel.spec	4 Mar 2005 03:33:57 -0000	1.3
@@ -3,7 +3,7 @@
 Name:           perl-Sub-Uplevel
 Version:        0.09
 Release:        1
-Summary:        Apparently run a function in a higher stack frame
+Summary:        Run a perl function in an upper stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic



From fedora-extras-commits at redhat.com  Fri Mar  4 03:48:46 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 3 Mar 2005 22:48:46 -0500
Subject: rpms/perl-Test-Exception/devel perl-Test-Exception.spec,1.1,1.2
Message-ID: <200503040348.j243mkDG030696@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30690

Modified Files:
	perl-Test-Exception.spec 
Log Message:
Removed Epoch.
Modified Summary text.



Index: perl-Test-Exception.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Exception/devel/perl-Test-Exception.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Exception.spec	4 Mar 2005 03:07:31 -0000	1.1
+++ perl-Test-Exception.spec	4 Mar 2005 03:48:44 -0000	1.2
@@ -2,9 +2,8 @@
 
 Name:           perl-Test-Exception
 Version:        0.20
-Release:        0.fdr.1
-Epoch:          0
-Summary:        Test functions for exception based code
+Release:        1
+Summary:        Library of test functions for exception based Perl code
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -56,7 +55,7 @@
 
 
 %changelog
-* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.20-0.fdr.1
+* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.20-1
 - Update to 0.20.
 
 * Sun Jul 04 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.15-0.fdr.1



From ville.skytta at iki.fi  Fri Mar  4 07:29:46 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Fri, 04 Mar 2005 09:29:46 +0200
Subject: APPROVED: perl-Sub-Uplevel, perl-Test-Exception
Message-ID: <1109921386.15077.340.camel@bobcat.mine.nu>

New packages approved by yours truly, maintained by Jos? Pedro Oliveira:

perl-Sub-Uplevel - http://bugzilla.fedora.us/show_bug.cgi?id=1826
perl-Test-Exception - http://bugzilla.fedora.us/show_bug.cgi?id=1827
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050304/0681a4ed/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Fri Mar  4 13:20:28 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 08:20:28 -0500
Subject: rpms/bzflag/devel - New directory
Message-ID: <200503041320.j24DKSpp008147@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8138/bzflag/devel

Log Message:
Directory /cvs/extras/rpms/bzflag/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 13:20:28 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 08:20:28 -0500
Subject: rpms/bzflag - New directory
Message-ID: <200503041320.j24DKSal008145@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8138/bzflag

Log Message:
Directory /cvs/extras/rpms/bzflag added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 13:20:48 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 08:20:48 -0500
Subject: rpms/bzflag Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503041320.j24DKmAM008207@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8198

Added Files:
	Makefile import.log 
Log Message:
Setup of module bzflag


--- NEW FILE Makefile ---
# Top level Makefile for module bzflag
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  4 13:20:48 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 08:20:48 -0500
Subject: rpms/bzflag/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503041320.j24DKmdV008210@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8198/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bzflag


--- 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 Mar  4 14:10:28 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 09:10:28 -0500
Subject: rpms/bzflag/devel bzflag.desktop, NONE, 1.1 bzflag.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503041410.j24EASfc009142@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9136

Modified Files:
	.cvsignore sources 
Added Files:
	bzflag.desktop bzflag.spec 
Log Message:
initial import (cvs-import.sh failed to upload source file)



--- NEW FILE bzflag.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;X-Fedora-Extra;
Name=BZFlag
Comment=3D multi-player tank battle game
GenericName=3D multi-player tank battle game
Exec=bzflag
Icon=bzflag.xpm
Terminal=false
Type=Application
Encoding=UTF-8
EOF


--- NEW FILE bzflag.spec ---
%define desktop_vendor redhat
%define date           20050117

Summary: 3D multi-player tank battle game
Name: bzflag
Version: 2.0.0
Release: 4
License: GPL
Group: Amusements/Games
URL: http://bzflag.org
Source: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
Source1: bzflag.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: xorg-x11-devel gcc-c++ desktop-file-utils SDL-devel ncurses-devel

%description
BZFlag is a 3D multi-player tank battle game  that  allows users to play
against each other in a networked environment.  There are five teams: red,
green, blue, purple and rogue (rogue tanks are black).  Destroying a player
on another team  scores a win, while being destroyed or destroying a teammate
scores a loss.  Rogues have no teammates (not even other rogues), so they
cannot shoot teammates and they do not have a team score.
There are two main styles of play: capture-the-flag and free-for-all.

%prep
%setup -q -n %{name}-%{version}%{?date:.%{date}}

%build
# Use PIE because bzflag/bzfs are networked server applications
CFLAGS='-fPIE -pie %optflags'
CXXFLAGS='-fPIE -pie %optflags'
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%makeinstall
install -D -m 644 package/rpm/bzflag-m.xpm \
    %{buildroot}%{_datadir}/pixmaps/bzflag.xpm

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor %{desktop_vendor} --dir %{buildroot}%{_datadir}/applications \
    %{SOURCE1}

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, 0755)
%doc AUTHORS BUGS COPYING ChangeLog NEWS README README.Linux
%{_bindir}/bzadmin
%{_bindir}/bzflag
#%{_bindir}/bzfrelay
%{_bindir}/bzfs
%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
%{_datadir}/bzflag
%{_datadir}/pixmaps/bzflag.xpm
%{_mandir}/man*/*

%changelog
* Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-4
- move package over to Extras
- make desktop file a file, don't generate it in %%install

* Mon Feb 21 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-3
- fix dates in %%changelog

* Fri Feb 18 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-2
- build as PIE

* Fri Feb 18 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-1
- correct source URL
- buildrequire ncurses-devel

* Tue Jan 18 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-0.1
- version 2.0.0.20050117
- buildrequire xorg-x11-devel, not XFree86-devel

* Tue Aug 10 2004 Alan Cox <alan at redhat.com> 1.10.6-2
- Adopted for FC3 core from Matthias Saou's freshrpms package. Thanks
  to Matthias for doing all the work.

* Tue May 18 2004 Matthias Saou <http://freshrpms.net/> 1.10.6-1
- Update to 1.10.6.
- First rebuild for Fedora Core 2.

* Thu Mar 25 2004 Matthias Saou <http://freshrpms.net/> 1.10.4-2
- Removed explicit XFree86 dependency.

* Mon Feb 16 2004 Matthias Saou <http://freshrpms.net/> 1.10.4-1
- Update to 1.10.4.20040125, update the included docs.
- Removed no longer existing bzfls file and added bzadmin.

* Fri Nov  7 2003 Matthias Saou <http://freshrpms.net/> 1.7g2-2
- Rebuild for Fedora Core 1.
- Added missing gcc-c++ build dependency.

* Sun Jun 22 2003 Matthias Saou <http://freshrpms.net/>
- Update to 1.7g2.
- Major spec changes for the new build method.

* Tue Apr  1 2003 Matthias Saou <http://freshrpms.net/>
- Fix the Xfree86 dependency, doh!
- Clean up the confusing build.
- Add a system menu entry.

* Mon Mar 31 2003 Matthias Saou <http://freshrpms.net/>
- Update to 1.7g0.
- Rebuilt for Red Hat Linux 9.

* Mon Nov  4 2002 Matthias Saou <http://freshrpms.net/>
- Rebuilt for Red Hat Linux 8.0.

* Wed Jun 19 2002 Matthias Saou <http://freshrpms.net/>
- Update to 1.7e6.

* Wed Feb 13 2002 Matthias Saou <http://freshrpms.net/>
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Mar 2005 13:20:46 -0000	1.1
+++ .cvsignore	4 Mar 2005 14:10:26 -0000	1.2
@@ -0,0 +1 @@
+bzflag-2.0.0.20050117.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Mar 2005 13:20:46 -0000	1.1
+++ sources	4 Mar 2005 14:10:26 -0000	1.2
@@ -0,0 +1 @@
+16da32cfaac130bf68ca156d0dec2b2e  bzflag-2.0.0.20050117.tar.bz2



From fedora-extras-commits at redhat.com  Fri Mar  4 14:50:03 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 09:50:03 -0500
Subject: rpms/bzflag/devel bzflag.desktop,1.1,1.2
Message-ID: <200503041450.j24Eo3dR009383@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9358

Modified Files:
	bzflag.desktop 
Log Message:
remove EOF from end of file



Index: bzflag.desktop
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzflag.desktop	4 Mar 2005 14:10:26 -0000	1.1
+++ bzflag.desktop	4 Mar 2005 14:50:01 -0000	1.2
@@ -8,4 +8,3 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-EOF



From fedora-extras-commits at redhat.com  Fri Mar  4 15:20:26 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 10:20:26 -0500
Subject: rpms/bzflag/devel bzflag.spec,1.1,1.2
Message-ID: <200503041520.j24FKQ0M010178@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10170

Modified Files:
	bzflag.spec 
Log Message:
change desktop_vendor from "redhat" to "fedora"



Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzflag.spec	4 Mar 2005 14:10:26 -0000	1.1
+++ bzflag.spec	4 Mar 2005 15:20:24 -0000	1.2
@@ -1,4 +1,4 @@
-%define desktop_vendor redhat
+%define desktop_vendor fedora
 %define date           20050117
 
 Summary: 3D multi-player tank battle game



From fedora-extras-commits at redhat.com  Fri Mar  4 16:21:13 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:21:13 -0500
Subject: rpms/ppracer - New directory
Message-ID: <200503041621.j24GLDip011182@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11175/ppracer

Log Message:
Directory /cvs/extras/rpms/ppracer added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 16:21:13 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:21:13 -0500
Subject: rpms/ppracer/devel - New directory
Message-ID: <200503041621.j24GLD0o011185@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11175/ppracer/devel

Log Message:
Directory /cvs/extras/rpms/ppracer/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 16:21:32 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:21:32 -0500
Subject: rpms/ppracer Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503041621.j24GLWUZ011244@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11235

Added Files:
	Makefile import.log 
Log Message:
Setup of module ppracer


--- NEW FILE Makefile ---
# Top level Makefile for module ppracer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  4 16:21:32 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:21:32 -0500
Subject: rpms/ppracer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503041621.j24GLW33011247@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11235/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ppracer


--- 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 Mar  4 16:24:55 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:24:55 -0500
Subject: rpms/ppracer/devel PPRacer-0.1.9-ia64.patch, NONE,
	1.1 ppracer-0.3.1-optflags.patch, NONE, 1.1 ppracer.desktop,
	NONE, 1.1 ppracer.png, NONE, 1.1 ppracer.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503041624.j24GOtLP011391@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11378/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PPRacer-0.1.9-ia64.patch ppracer-0.3.1-optflags.patch 
	ppracer.desktop ppracer.png ppracer.spec 
Log Message:
auto-import ppracer-0.3.1-1 on branch devel from ppracer-0.3.1-1.src.rpm


PPRacer-0.1.9-ia64.patch:

--- NEW FILE PPRacer-0.1.9-ia64.patch ---
--- PPRacer-0.1.9/src/view.cpp.ia64	2004-10-25 17:40:36.000000000 +0200
+++ PPRacer-0.1.9/src/view.cpp	2004-10-31 17:16:23.718797164 +0100
@@ -359,7 +359,7 @@
 		  ( speed - NO_INTERPOLATION_SPEED ) /
 		  ( BASELINE_INTERPOLATION_SPEED - NO_INTERPOLATION_SPEED )));
 
-    up_dir = pp::Vec3d( 0, 1, 0 );
+    up_dir = pp::Vec3d( 0.0, 1.0, 0.0 );
 
     vel_dir = plyr.vel;
     vel_dir.normalize();
@@ -373,7 +373,7 @@
 	/* Camera-on-a-string mode */
 
 	/* Construct vector from player to camera */
-	view_vec = pp::Vec3d( 0, 
+	view_vec = pp::Vec3d( 0.0, 
 				sin( ANGLES_TO_RADIANS( 
 				    course_angle -
 				    CAMERA_ANGLE_ABOVE_SLOPE + 
@@ -408,6 +408,7 @@
         } 
 
 	/* Interpolate view point */
+#if ! defined (__ia64__)
 	if ( plyr.view.initialized ) {
 	    /* Interpolate twice to get a second-order filter */
 	    int i;
@@ -420,6 +421,7 @@
 					  time_constant_mult );
 	    }
 	}
+#endif
 
 	/* Make sure interpolated view point is above terrain */
         ycoord = find_y_coord( view_pt.x, view_pt.z );
@@ -439,6 +441,7 @@
 	view_dir = -1.0*rot_mat.transformVector( view_vec );
 
 	/* Interpolate orientation of camera */
+#if ! defined (__ia64__)
 	if ( plyr.view.initialized ) {
 	    /* Interpolate twice to get a second-order filter */
 	    int i;
@@ -449,6 +452,7 @@
 		up_dir = pp::Vec3d( 0.0, 1.0, 0.0 );
 	    }
 	}
+#endif
 
         break;
     }
@@ -457,10 +461,10 @@
     {
 	/* Camera follows player (above and behind) */
 
-	up_dir = pp::Vec3d( 0, 1, 0 );
+	up_dir = pp::Vec3d( 0.0, 1.0, 0.0 );
 
 	/* Construct vector from player to camera */
-	view_vec = pp::Vec3d( 0, 
+	view_vec = pp::Vec3d( 0.0, 
 				sin( ANGLES_TO_RADIANS( 
 				    course_angle -
 				    CAMERA_ANGLE_ABOVE_SLOPE +
@@ -494,6 +498,7 @@
             view_pt.y = ycoord + MIN_CAMERA_HEIGHT;
 	}
 
+#if ! defined (__ia64__)
 	/* Interpolate view point */
 	if ( plyr.view.initialized ) {
 	    /* Interpolate twice to get a second-order filter */
@@ -507,6 +512,7 @@
 					  time_constant_mult );
 	    }
 	}
+#endif
 
 	/* Make sure interpolate view point is above terrain */
         ycoord = find_y_coord( view_pt.x, view_pt.z );
@@ -525,6 +531,7 @@
 	view_dir = -1.0*rot_mat.transformVector( view_vec );
 
 	/* Interpolate orientation of camera */
+#if ! defined (__ia64__)
 	if ( plyr.view.initialized ) {
 	    /* Interpolate twice to get a second-order filter */
 	    int i;
@@ -535,6 +542,7 @@
 		up_dir = pp::Vec3d( 0.0, 1.0, 0.0 );
 	    }
 	}
+#endif
 
         break;
     }
@@ -543,11 +551,11 @@
     {
 	/* Camera always uphill of player */
 
-	up_dir = pp::Vec3d( 0, 1, 0 );
+	up_dir = pp::Vec3d( 0.0, 1.0, 0.0 );
 
 
 	/* Construct vector from player to camera */
-	view_vec = pp::Vec3d( 0, 
+	view_vec = pp::Vec3d( 0.0, 
 				sin( ANGLES_TO_RADIANS( 
 				    course_angle - 
 				    CAMERA_ANGLE_ABOVE_SLOPE+

ppracer-0.3.1-optflags.patch:

--- NEW FILE ppracer-0.3.1-optflags.patch ---
--- ppracer-0.3.1/configure.in.optflags	2005-02-27 19:43:18.000000000 +0100
+++ ppracer-0.3.1/configure.in	2005-03-04 17:07:37.482468102 +0100
@@ -35,8 +35,8 @@
 dnl General options
 dnl --------------------------------------------------------------------------
 TR_CPPFLAGS=""
-TR_CFLAGS=""
-TR_CXXFLAGS=""
+TR_CFLAGS="$RPM_OPT_FLAGS"
+TR_CXXFLAGS="$RPM_OPT_FLAGS"
 TR_LIBS=""
 
 case "$host" in
@@ -55,8 +55,8 @@
 AC_ARG_ENABLE(debug,     [  --enable-debug          Produce an executable with debugging symbols])
 
 if test "x$enable_debug" = "xyes" ; then
-	TR_CFLAGS="-g -Wall"
-	TR_CXXFLAGS="-g -Wall"
+	TR_CFLAGS="$RPM_OPT_FLAGS -g -Wall"
+	TR_CXXFLAGS="$RPM_OPT_FLAGS -g -Wall"
 else
 	TR_CPPFLAGS="$TR_CPPFLAGS -DTUXRACER_NO_ASSERT=1"
 fi


--- NEW FILE ppracer.desktop ---
[Desktop Entry]
Encoding=UTF-8
Categories=Application;Game;X-Red-Hat-Extra;
X-Desktop-File-Install-Version=0.2
Name=PPRacer
Description=Race your penguin down an alpine slope
Exec=ppracer
Terminal=0
Type=Application
Icon=/usr/share/ppracer/ppracer.png


--- NEW FILE ppracer.spec ---
%define desktop_file_utils_version 0.2.90

#define srcextraversion -2

Summary: A 3D racing game featuring Tux.
Name: ppracer
Version: 0.3.1
Release: 1
License: GPL
Group: Amusements/Games
URL: http://racer.planetpenguin.de
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Source: http://download.berlios.de/ppracer/ppracer-%{version}%{?srcextraversion}.tar.bz2
Source2: ppracer.png
Source3: ppracer.desktop

Patch1: ppracer-0.3.1-optflags.patch
Patch2: PPRacer-0.1.9-ia64.patch

BuildRequires: grep
BuildRequires: xorg-x11-devel
BuildRequires: SDL-devel >= 1.2
BuildRequires: SDL_mixer-devel >= 1.2
BuildRequires: tcl-devel >= 8.0
BuildRequires: autoconf
BuildRequires: freetype-devel

BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}

%description
PPRacer is a simple OpenGL-based racing game featuring Tux. The
objective of the game is to slide down a snow- and ice-covered mountain
as quickly as possible, avoiding the trees and rocks that will slow
you down.

%prep
%setup -q
%patch1 -p1 -b .optflags
%patch2 -p1 -b .ia64

%build
autoconf
%configure --with-data-dir=%{_datadir}/ppracer
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%makeinstall ppdatadir=%{buildroot}%{_datadir}/ppracer

mkdir -p %{buildroot}%{_datadir}/applications/
install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/applications/net-ppracer.desktop

%clean
rm -rf %{buildroot}

%files
%defattr (-, root, root, 755)
%{_bindir}/ppracer
%{_datadir}/ppracer
%{_datadir}/applications/*
%doc AUTHORS COPYING ChangeLog README contrib

%changelog
* Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com>
- version 0.3.1

* Thu Feb 03 2005 Nils Philippsen <nphilipp at redhat.com>
- version 0.3

* Wed Jan 19 2005 Nils Philippsen <nphilipp at redhat.com>
- version 0.2.3

* Thu Dec 30 2004 Nils Philippsen <nphilipp at redhat.com>
- version 0.2.2

* Wed Dec 08 2004 Nils Philippsen <nphilipp at redhat.com>
- version 0.2.1

* Tue Nov 16 2004 Nils Philippsen <nphilipp at redhat.com>
- version 0.2

* Sun Oct 31 2004 Nils Philippsen <nphilipp at redhat.com>
- version 0.1.9
- initial build based on tuxracer spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Mar 2005 16:21:30 -0000	1.1
+++ .cvsignore	4 Mar 2005 16:24:53 -0000	1.2
@@ -0,0 +1 @@
+ppracer-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Mar 2005 16:21:30 -0000	1.1
+++ sources	4 Mar 2005 16:24:53 -0000	1.2
@@ -0,0 +1 @@
+fa80d5dc1e4b63edf05d27b2e86637ec  ppracer-0.3.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Mar  4 16:24:55 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:24:55 -0500
Subject: rpms/ppracer import.log,1.1,1.2
Message-ID: <200503041624.j24GOti7011388@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11378

Modified Files:
	import.log 
Log Message:
auto-import ppracer-0.3.1-1 on branch devel from ppracer-0.3.1-1.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ppracer/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Mar 2005 16:21:30 -0000	1.1
+++ import.log	4 Mar 2005 16:24:53 -0000	1.2
@@ -0,0 +1 @@
+ppracer-0_3_1-1:HEAD:ppracer-0.3.1-1.src.rpm:1109953485



From fedora-extras-commits at redhat.com  Fri Mar  4 16:33:23 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:33:23 -0500
Subject: rpms/ppracer/devel ppracer.desktop,1.1,1.2
Message-ID: <200503041633.j24GXNSD011491@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11484

Modified Files:
	ppracer.desktop 
Log Message:
fix Categories
add GenericName
"Description" -> "Comment"



Index: ppracer.desktop
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppracer.desktop	4 Mar 2005 16:24:53 -0000	1.1
+++ ppracer.desktop	4 Mar 2005 16:33:21 -0000	1.2
@@ -1,9 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Categories=Application;Game;X-Red-Hat-Extra;
+Categories=Game;ArcadeGame;X-Fedora-Extra;
 X-Desktop-File-Install-Version=0.2
 Name=PPRacer
-Description=Race your penguin down an alpine slope
+GenericName=A 3D downhill racing game
+Comment=Race your penguin down an alpine slope
 Exec=ppracer
 Terminal=0
 Type=Application



From fedora-extras-commits at redhat.com  Fri Mar  4 16:34:17 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:34:17 -0500
Subject: rpms/bzflag/devel bzflag.desktop,1.2,1.3
Message-ID: <200503041634.j24GYHx1011519@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11513

Modified Files:
	bzflag.desktop 
Log Message:
make Comment a (non-redundant) comment



Index: bzflag.desktop
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bzflag.desktop	4 Mar 2005 14:50:01 -0000	1.2
+++ bzflag.desktop	4 Mar 2005 16:34:15 -0000	1.3
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Categories=Game;ArcadeGame;X-Fedora-Extra;
 Name=BZFlag
-Comment=3D multi-player tank battle game
 GenericName=3D multi-player tank battle game
+Comment=Drive around in your tank and shoot others
 Exec=bzflag
 Icon=bzflag.xpm
 Terminal=false



From fedora-extras-commits at redhat.com  Fri Mar  4 16:56:39 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 4 Mar 2005 11:56:39 -0500
Subject: rpms/gwget/devel .cvsignore, 1.3, 1.4 gwget.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200503041656.j24Gud6b011651@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/gwget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11638/devel

Modified Files:
	.cvsignore gwget.spec sources 
Log Message:
fix x86_64


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Feb 2005 21:36:27 -0000	1.3
+++ .cvsignore	4 Mar 2005 16:56:22 -0000	1.4
@@ -1 +1,2 @@
 gwget-0.93.tar.gz
+gwget-autoreconf.patch.bz2


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gwget.spec	3 Mar 2005 21:26:03 -0000	1.4
+++ gwget.spec	4 Mar 2005 16:56:37 -0000	1.5
@@ -3,11 +3,12 @@
 Summary:	Graphical download manager that uses wget
 Name:		gwget
 Version:	0.93
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://dl.sf.net/gwget/gwget-0.93.tar.gz
 Source1:	gwget.desktop
+Patch0: 	gwget-autoreconf.patch.bz2
 URL:		http://gwget.sourceforge.net/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:	libgnomeui-devel >= 2.0
@@ -34,12 +35,13 @@
 Requires:	epiphany >= 1.4.4
 BuildRequires:	epiphany-devel >= 1.4.4
 
-%description
+%description epiphany-extension 
 This Package contains extensions gwget2 extensions for epiphany.
 %endif # _without_epiphanye
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure %{?_without_epiphanye:--disable-epiphany-extension}
@@ -97,6 +99,9 @@
 
 
 %changelog
+* Tue Mar 01 2005 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0:0.93-2
+- Add gwget-autoreconf.patch.bz2 ; fixes x86_64
+
 * Tue Jan 25 2005 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0:0.93-1
 - Update to 0.93
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Feb 2005 21:36:27 -0000	1.3
+++ sources	4 Mar 2005 16:56:37 -0000	1.4
@@ -1 +1,2 @@
 79a3625ef99a5a417164e0d97020fcc5  gwget-0.93.tar.gz
+159d5d2c94c0bb88a82cdfdb2ecbe0d2  gwget-autoreconf.patch.bz2



From fedora-extras-commits at redhat.com  Fri Mar  4 16:56:24 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 4 Mar 2005 11:56:24 -0500
Subject: rpms/gwget/FC-3 .cvsignore, 1.3, 1.4 gwget.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200503041656.j24GuOKv011645@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/gwget/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11638/FC-3

Modified Files:
	.cvsignore gwget.spec sources 
Log Message:
fix x86_64


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Feb 2005 21:36:27 -0000	1.3
+++ .cvsignore	4 Mar 2005 16:56:21 -0000	1.4
@@ -1 +1,2 @@
 gwget-0.93.tar.gz
+gwget-autoreconf.patch.bz2


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-3/gwget.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gwget.spec	26 Feb 2005 21:36:27 -0000	1.3
+++ gwget.spec	4 Mar 2005 16:56:21 -0000	1.4
@@ -1,25 +1,24 @@
 # use "--without epiphanye" as rpmbuildparameter to disable epiphany-extension (requires FC3 Core package)
 
-Summary: 	GUI Download manager using wget
-Name: 		gwget
-Epoch:		0
-Version: 	0.93
-Release: 	1
-License: 	GPL
-Group: 		Applications/Internet
-Source0: 	http://prdownloads.sourceforge.net/gwget/gwget-0.93.tar.gz
-# direct link:	http://mesh.dl.sourceforge.net/sourceforge/gwget/gwget-0.93.tar.gz
+Summary:	Graphical download manager that uses wget
+Name:		gwget
+Version:	0.93
+Release:	1
+License:	GPL
+Group:		Applications/Internet
+Source0:	http://dl.sf.net/gwget/gwget-0.93.tar.gz
 Source1:	gwget.desktop
-URL: 		http://gwget.sourceforge.net/
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Buildrequires:	libgnomeui-devel >= 0:2.0
-Buildrequires:	libglade2-devel >= 0:2.0
+Patch0: 	gwget-autoreconf.patch.bz2
+URL:		http://gwget.sourceforge.net/
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildrequires:	libgnomeui-devel >= 2.0
+Buildrequires:	libglade2-devel >= 2.0
 BuildRequires:	perl-XML-Parser
-BuildRequires:	gettext >= 0:0.14.1
-BuildRequires:  desktop-file-utils
-Requires: 	wget >= 0:1.9
-Requires(post):  GConf2
-Requires(preun): GConf2
+BuildRequires:	gettext >= 0.14.1
+BuildRequires:	desktop-file-utils
+Requires:	wget >= 1.9
+Requires(post):		GConf2
+Requires(preun):	GConf2
 
 
 %description
@@ -30,18 +29,19 @@
 %if 0%{!?_without_epiphanye:1}
 
 %package epiphany-extension
-Summary: 	This Package contains extensions gwget2 extensions for epiphany.
-Group: 		Applications/Internet
-Requires:	%{name} = %{epoch}:%{version}
-Requires:	epiphany >= 0:1.4.4
-BuildRequires: 	epiphany-devel >= 0:1.4.4
+Summary:	This Package contains extensions gwget2 extensions for epiphany.
+Group:		Applications/Internet
+Requires:	%{name} = %{version}
+Requires:	epiphany >= 1.4.4
+BuildRequires:	epiphany-devel >= 1.4.4
 
 %description epiphany-extension 
 This Package contains extensions gwget2 extensions for epiphany.
-%endif 	# _without_epiphanye
+%endif # _without_epiphanye
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure %{?_without_epiphanye:--disable-epiphany-extension}
@@ -94,11 +94,14 @@
 %defattr (-,root,root)
 %dir %{_libdir}/epiphany/extensions/
 %{_libdir}/epiphany/extensions/*
-%endif 	# _without_epiphanye
+%endif # _without_epiphanye
 
 
 
 %changelog
+* Tue Mar 01 2005 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0:0.93-2
+- Add gwget-autoreconf.patch.bz2 ; fixes x86_64
+
 * Tue Jan 25 2005 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0:0.93-1
 - Update to 0.93
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Feb 2005 21:36:27 -0000	1.3
+++ sources	4 Mar 2005 16:56:21 -0000	1.4
@@ -1 +1,2 @@
 79a3625ef99a5a417164e0d97020fcc5  gwget-0.93.tar.gz
+159d5d2c94c0bb88a82cdfdb2ecbe0d2  gwget-autoreconf.patch.bz2



From fedora-extras-commits at redhat.com  Fri Mar  4 16:56:59 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 11:56:59 -0500
Subject: rpms/ppracer/devel ppracer.desktop,1.2,1.3
Message-ID: <200503041656.j24GuxGa011700@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11676

Modified Files:
	ppracer.desktop 
Log Message:
add 3DGraphics to Categories



Index: ppracer.desktop
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppracer.desktop	4 Mar 2005 16:33:21 -0000	1.2
+++ ppracer.desktop	4 Mar 2005 16:56:57 -0000	1.3
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Categories=Game;ArcadeGame;X-Fedora-Extra;
+Categories=Game;ArcadeGame;3DGraphics;X-Fedora-Extra;
 X-Desktop-File-Install-Version=0.2
 Name=PPRacer
 GenericName=A 3D downhill racing game



From fedora-extras-commits at redhat.com  Fri Mar  4 18:45:19 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 13:45:19 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.1,1.2
Message-ID: <200503041845.j24IjJKb013554@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13548

Modified Files:
	ppracer.spec 
Log Message:
use desktop_file_install to install desktop file
actually package icon file
clean up summary
don't buildrequire grep
move up %doc files in %files



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppracer.spec	4 Mar 2005 16:24:53 -0000	1.1
+++ ppracer.spec	4 Mar 2005 18:45:17 -0000	1.2
@@ -1,8 +1,9 @@
 %define desktop_file_utils_version 0.2.90
+%define desktop_vendor fedora
 
 #define srcextraversion -2
 
-Summary: A 3D racing game featuring Tux.
+Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
 Release: 1
@@ -17,7 +18,6 @@
 Patch1: ppracer-0.3.1-optflags.patch
 Patch2: PPRacer-0.1.9-ia64.patch
 
-BuildRequires: grep
 BuildRequires: xorg-x11-devel
 BuildRequires: SDL-devel >= 1.2
 BuildRequires: SDL_mixer-devel >= 1.2
@@ -47,22 +47,32 @@
 rm -rf %{buildroot}
 %makeinstall ppdatadir=%{buildroot}%{_datadir}/ppracer
 
+mkdir -p %{buildroot}%{_datadir}/pixmaps/
+install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/
+
 mkdir -p %{buildroot}%{_datadir}/applications/
-install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/applications/net-ppracer.desktop
+desktop-file-install --vendor %{desktop_vendor} --dir %{buildroot}%{_datadir}/applications \
+    %{SOURCE3}
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr (-, root, root, 755)
+%doc AUTHORS COPYING ChangeLog README contrib
 %{_bindir}/ppracer
 %{_datadir}/ppracer
-%{_datadir}/applications/*
-%doc AUTHORS COPYING ChangeLog README contrib
+%{_datadir}/pixmaps/ppracer.png
+%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
 * Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 0.3.1
+- use desktop_file_install to install desktop file
+- actually package icon file
+- clean up summary
+- don't buildrequire grep
+- move up %%doc files in %%files
 
 * Thu Feb 03 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 0.3



From fedora-extras-commits at redhat.com  Fri Mar  4 18:46:03 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 13:46:03 -0500
Subject: rpms/ppracer/devel ppracer.desktop,1.3,1.4
Message-ID: <200503041846.j24Ik3i2013583@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13577

Modified Files:
	ppracer.desktop 
Log Message:
only use basename for icon file



Index: ppracer.desktop
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ppracer.desktop	4 Mar 2005 16:56:57 -0000	1.3
+++ ppracer.desktop	4 Mar 2005 18:46:01 -0000	1.4
@@ -8,4 +8,4 @@
 Exec=ppracer
 Terminal=0
 Type=Application
-Icon=/usr/share/ppracer/ppracer.png
+Icon=ppracer.png



From fedora-extras-commits at redhat.com  Fri Mar  4 19:39:16 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 14:39:16 -0500
Subject: rpms/bzflag/devel bzflag.spec,1.2,1.3
Message-ID: <200503041939.j24JdG81014545@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14539

Modified Files:
	bzflag.spec 
Log Message:
use an a bit more individual build root



Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bzflag.spec	4 Mar 2005 15:20:24 -0000	1.2
+++ bzflag.spec	4 Mar 2005 19:39:14 -0000	1.3
@@ -10,7 +10,7 @@
 URL: http://bzflag.org
 Source: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
 Source1: bzflag.desktop
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: xorg-x11-devel gcc-c++ desktop-file-utils SDL-devel ncurses-devel
 
 %description
@@ -61,6 +61,7 @@
 * Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-4
 - move package over to Extras
 - make desktop file a file, don't generate it in %%install
+- use an a bit more individual build root
 
 * Mon Feb 21 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-3
 - fix dates in %%changelog



From fedora-extras-commits at redhat.com  Fri Mar  4 19:39:19 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 14:39:19 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.2,1.3
Message-ID: <200503041939.j24JdJwR014568@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14527

Modified Files:
	ppracer.spec 
Log Message:
use an a bit more individual build root
obsolete tuxracer
buildrequire libpng-devel



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppracer.spec	4 Mar 2005 18:45:17 -0000	1.2
+++ ppracer.spec	4 Mar 2005 19:39:17 -0000	1.3
@@ -10,7 +10,7 @@
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: http://download.berlios.de/ppracer/ppracer-%{version}%{?srcextraversion}.tar.bz2
 Source2: ppracer.png
 Source3: ppracer.desktop
@@ -24,9 +24,12 @@
 BuildRequires: tcl-devel >= 8.0
 BuildRequires: autoconf
 BuildRequires: freetype-devel
+BuildRequires: libpng-devel
 
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 
+Obsoletes: tuxracer
+
 %description
 PPRacer is a simple OpenGL-based racing game featuring Tux. The
 objective of the game is to slide down a snow- and ice-covered mountain
@@ -73,6 +76,9 @@
 - clean up summary
 - don't buildrequire grep
 - move up %%doc files in %%files
+- use an a bit more individual build root
+- obsolete tuxracer
+- buildrequire libpng-devel
 
 * Thu Feb 03 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 0.3



From fedora-extras-commits at redhat.com  Fri Mar  4 19:44:04 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 4 Mar 2005 14:44:04 -0500
Subject: rpms/bzflag/devel bzflag.spec,1.3,1.4
Message-ID: <200503041944.j24Ji4nV014612@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14606

Modified Files:
	bzflag.spec 
Log Message:
buildrequire curl-devel



Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bzflag.spec	4 Mar 2005 19:39:14 -0000	1.3
+++ bzflag.spec	4 Mar 2005 19:44:02 -0000	1.4
@@ -11,7 +11,12 @@
 Source: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
 Source1: bzflag.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-devel gcc-c++ desktop-file-utils SDL-devel ncurses-devel
+BuildRequires: xorg-x11-devel
+BuildRequires: gcc-c++
+BuildRequires: desktop-file-utils
+BuildRequires: SDL-devel
+BuildRequires: ncurses-devel
+BuildRequires: curl-devel
 
 %description
 BZFlag is a 3D multi-player tank battle game  that  allows users to play
@@ -62,6 +67,7 @@
 - move package over to Extras
 - make desktop file a file, don't generate it in %%install
 - use an a bit more individual build root
+- buildrequire curl-devel
 
 * Mon Feb 21 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-3
 - fix dates in %%changelog



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:25 -0500
Subject: devel/rpmDirectoryCheck rpmDirectoryCheck.spec,1.5,1.6
Message-ID: <200503042100.j24L0PoO015813@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/rpmDirectoryCheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/rpmDirectoryCheck

Modified Files:
	rpmDirectoryCheck.spec 
Log Message:
#118773 avoidance sweep.


Index: rpmDirectoryCheck.spec
===================================================================
RCS file: /cvs/extras/devel/rpmDirectoryCheck/rpmDirectoryCheck.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmDirectoryCheck.spec	4 Mar 2005 00:05:42 -0000	1.5
+++ rpmDirectoryCheck.spec	4 Mar 2005 21:00:23 -0000	1.6
@@ -17,7 +17,8 @@
 BuildArch:	noarch
 Requires:	rpm-python libxslt graphviz
 BuildRequires:	python2 texinfo tetex-dvips libxslt graphviz
-Requires(post,preun):	gawk rpm /sbin/install-info
+Requires(post):	gawk rpm /sbin/install-info
+Requires(preun): gawk rpm /sbin/install-info
 
 %description
 Various RPMS are creating files although the basedir is not owned by
@@ -71,6 +72,9 @@
 
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Tue Jul 29 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:0.8-0.fdr.1
 - updated to 0.8
 - added 'graphviz' to the list of requirements



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:25 -0500
Subject: devel/allegro allegro.spec,1.8,1.9
Message-ID: <200503042100.j24L0PcB015801@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/allegro
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/allegro

Modified Files:
	allegro.spec 
Log Message:
#118773 avoidance sweep.


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/devel/allegro/allegro.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- allegro.spec	3 Mar 2005 19:29:59 -0000	1.8
+++ allegro.spec	4 Mar 2005 21:00:23 -0000	1.9
@@ -40,7 +40,8 @@
 Summary(it):    Una libreria per la programmazione di videogiochi
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}, XFree86-devel
-Requires(post,preun): /sbin/install-info
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description devel
 Allegro is a cross-platform library intended for use in computer games
@@ -182,6 +183,9 @@
 
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.3-9
 - Disable vga and vbeaf on all non-%%{ix86}.
 - Fix lib paths in allegro-config for 64-bit archs.



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:26 -0500
Subject: devel/tetex-lgrind tetex-lgrind.spec,1.5,1.6
Message-ID: <200503042100.j24L0Q9e015835@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/tetex-lgrind
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/tetex-lgrind

Modified Files:
	tetex-lgrind.spec 
Log Message:
#118773 avoidance sweep.


Index: tetex-lgrind.spec
===================================================================
RCS file: /cvs/extras/devel/tetex-lgrind/tetex-lgrind.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tetex-lgrind.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ tetex-lgrind.spec	4 Mar 2005 21:00:24 -0000	1.6
@@ -16,7 +16,8 @@
 # file contained in the tarballs have to be verified one by one.
 Source0:          ftp://ftp.dante.de/tex-archive/support/lgrind.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires(post,postun): tetex
+Requires(post):   tetex
+Requires(postun): tetex
 Requires:         tetex-latex
 BuildRequires:    tetex-latex, perl
 Prefix:           %{_prefix}
@@ -77,6 +78,9 @@
 %{texmf}/tex/latex/%{tdsname}
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Fri May  2 2003 Marius Johndal <mariuslj at ifi.uio.no> 0:3.67-0.fdr.4
 - Invoke make with %{?_smp_mflags} and from top-level directory to get
   defines right.



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:26 -0500
Subject: devel/uim uim.spec,1.4,1.5
Message-ID: <200503042100.j24L0Q5T015839@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/uim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/uim

Modified Files:
	uim.spec 
Log Message:
#118773 avoidance sweep.


Index: uim.spec
===================================================================
RCS file: /cvs/extras/devel/uim/uim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- uim.spec	24 Feb 2005 05:39:46 -0000	1.4
+++ uim.spec	4 Mar 2005 21:00:24 -0000	1.5
@@ -14,7 +14,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	gtk2-devel
 BuildRequires:	gnome-panel-devel
-Requires(post,postun): %{_sbindir}/alternatives
+Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
+Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
 
 %package	devel
 Summary:	Development files for the Uim library
@@ -25,34 +26,39 @@
 Summary:	GTK+2 support for Uim
 Group:		User Interface/Desktops
 Requires:	uim = %{version}-%{release}
-Requires(post,postun): gtk2
+Requires(post):	gtk2
+Requires(postun): gtk2
 
 %package	gnome
 Summary:	GNOME Applet for Uim
 Group:		User Interface/Desktops
 Requires:	uim = %{version}-%{release}
-Requires(post,postun): %{_sbindir}/bonobo-activation-sysconf
+Requires(post):	%{_sbindir}/bonobo-activation-sysconf
+Requires(postun): %{_sbindir}/bonobo-activation-sysconf
 
 %package	anthy
 Summary:	Anthy support for Uim
 Group:		System Environment/Libraries
 Requires:	anthy
 Requires:	uim = %{version}-%{release}
-Requires(post,postun): gtk2
+Requires(post):	gtk2
+Requires(postun): gtk2
 
 %package	canna
 Summary:	Canna support for Uim
 Group:		System Environment/Libraries
 Requires:	Canna Canna-devel
 Requires:	uim = %{version}-%{release}
-Requires(post,postun): gtk2
+Requires(post):	gtk2
+Requires(postun): gtk2
 
 %package	skk
 Summary:	SKK support for Uim
 Group:		System Environment/Libraries
 Requires:	skkdic
 Requires:	uim = %{version}-%{release}
-Requires(post,postun): gtk2
+Requires(post):	gtk2
+Requires(postun): gtk2
 
 %description
 Uim is a multilingual input method library. Uim aims to
@@ -248,12 +254,16 @@
 %{_datadir}/uim/skk*.scm
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+- Add ldconfig scriptlet dependencies.
+
 * Thu Feb 24 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.5.1-1
 - New upstream release.
   - security fix.
 - support xinput script.
 
-* Sun Feb 20 2005 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info 0.4.5-2
+* Sun Feb 20 2005 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info> 0.4.5-2
 - Added autoreconf-patch; fixes build on x86_64
 
 * Wed Jan 12 2005 Akira TAGOH <tagoh at redhat.com> 0.4.5-1



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:25 -0500
Subject: devel/gnome-blog gnome-blog.spec,1.4,1.5
Message-ID: <200503042100.j24L0Pr5015810@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/gnome-blog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/gnome-blog

Modified Files:
	gnome-blog.spec 
Log Message:
#118773 avoidance sweep.


Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/devel/gnome-blog/gnome-blog.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-blog.spec	3 Mar 2005 21:26:03 -0000	1.4
+++ gnome-blog.spec	4 Mar 2005 21:00:23 -0000	1.5
@@ -19,7 +19,8 @@
 Requires:	pygtk2 >= %{gnome_python2_version}
 Requires:	python >= %{pyver}, python <= %{pynext}
 
-Requires(post,preun):	GConf2
+Requires(post):	GConf2
+Requires(preun): GConf2
 
 BuildRequires:	pygtk2-devel >= %{gnome_python2_version}
 BuildRequires:	glib2-devel
@@ -91,6 +92,9 @@
 
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Tue Feb  3 2004 Brian Pepple <bdpepple at ameritech.net> 0:0.7-0.fdr.7
 - Removed Requires: GConf2, and replaced with Requires(post,preun).
 



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:25 -0500
Subject: devel/seahorse seahorse.spec,1.4,1.5
Message-ID: <200503042100.j24L0PqM015817@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/seahorse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/seahorse

Modified Files:
	seahorse.spec 
Log Message:
#118773 avoidance sweep.


Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/devel/seahorse/seahorse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- seahorse.spec	10 Dec 2004 22:03:11 -0000	1.4
+++ seahorse.spec	4 Mar 2005 21:00:23 -0000	1.5
@@ -16,8 +16,8 @@
 BuildRequires:  scrollkeeper
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-Requires(post): GConf2
-Requires(post,postun): scrollkeeper
+Requires(post): GConf2 scrollkeeper
+Requires(postun): scrollkeeper
 
 %description
 Seahorse is a gnome2 interface for gnupg.
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Mon Nov 09 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:0.7.3-0.fdr.5
 - BuildReq scrollkeeper.
 



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:25 -0500
Subject: devel/cfs cfs.spec,1.5,1.6
Message-ID: <200503042100.j24L0PYn015805@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/cfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/cfs

Modified Files:
	cfs.spec 
Log Message:
#118773 avoidance sweep.


Index: cfs.spec
===================================================================
RCS file: /cvs/extras/devel/cfs/cfs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cfs.spec	3 Mar 2005 20:08:36 -0000	1.5
+++ cfs.spec	4 Mar 2005 21:00:23 -0000	1.6
@@ -18,8 +18,8 @@
 Patch4:		cfs-1.4.1-rpm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	nfs-utils
-Requires(post,preun):	/sbin/chkconfig
-Requires(post):		%{__mkdir}
+Requires(post):		%{__mkdir} /sbin/chkconfig
+Requires(preun):	/sbin/chkconfig
 
 %description
 CFS is an encrypting file system for Unix-like OSs. It uses NFS as its
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Tue Jul 15 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:1.4.1-0.fdr.3
 - s!%%optflags!$RPM_OPT_FLAGS!
 - require nfs-utils



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:26 -0500
Subject: devel/tdl tdl.spec,1.5,1.6
Message-ID: <200503042100.j24L0QFk015830@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/tdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/tdl

Modified Files:
	tdl.spec 
Log Message:
#118773 avoidance sweep.


Index: tdl.spec
===================================================================
RCS file: /cvs/extras/devel/tdl/tdl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tdl.spec	10 Dec 2004 22:03:11 -0000	1.5
+++ tdl.spec	4 Mar 2005 21:00:23 -0000	1.6
@@ -11,7 +11,8 @@
 Source0:		http://www.rpcurnow.force9.co.uk/tdl/tdl-1.5.2.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	libtermcap-devel, readline-devel, texinfo
-Requires(post,preun): /sbin/install-info
+Requires(post):		/sbin/install-info
+Requires(preun):	/sbin/install-info
 
 %description
 tdl is a console to-do list manager.  You can run its subcommands direct from
@@ -56,6 +57,9 @@
 %{_infodir}/*
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Sun Feb 29 2004 Laurent Papier <papier[AT]tuxfan.net> - 0:1.5.2-0.fdr.1
 - update to 1.5.2.
 



From fedora-extras-commits at redhat.com  Fri Mar  4 21:00:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 4 Mar 2005 16:00:25 -0500
Subject: devel/synaptic synaptic.spec,1.8,1.9
Message-ID: <200503042100.j24L0Pwc015821@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/synaptic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/synaptic

Modified Files:
	synaptic.spec 
Log Message:
#118773 avoidance sweep.


Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/devel/synaptic/synaptic.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- synaptic.spec	29 Jan 2005 21:20:56 -0000	1.8
+++ synaptic.spec	4 Mar 2005 21:00:23 -0000	1.9
@@ -14,7 +14,8 @@
 # This isn't really a requirement mozilla works as well for a help browser,
 # however konqueror and firefox don't apparently work so...
 Requires: yelp
-Requires(post,postun): scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 BuildRequires: apt-devel >= 0:0.5.4, rpm-devel >= 0:4.0
 BuildRequires: gtk2-devel, libglade2-devel, desktop-file-utils
 BuildRequires: libstdc++-devel, gettext
@@ -103,6 +104,9 @@
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
 * Sat Jan 29 2005 Warren Togami <wtogami at redhat.com> 0.55.3-2
 - ExcludeArch: x86_64 ppc64
 



From fedora-extras-commits at redhat.com  Fri Mar  4 21:43:58 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Fri, 4 Mar 2005 16:43:58 -0500
Subject: rpms/dietlibc/devel .cvsignore,1.2,1.3
Message-ID: <200503042143.j24Lhw7G017630@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17624

Modified Files:
	.cvsignore 
Log Message:
updated



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Mar 2005 00:53:17 -0000	1.2
+++ .cvsignore	4 Mar 2005 21:43:56 -0000	1.3
@@ -1 +1,4 @@
-dietlibc-0.28.tar.bz2
+dietlibc-[0-9].[0-9][0-9]
+dietlibc*.tar.bz2*
+dietlibc*.rpm
+i386



From fedora-extras-commits at redhat.com  Fri Mar  4 21:44:15 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Fri, 4 Mar 2005 16:44:15 -0500
Subject: rpms/dietlibc/devel sources,1.2,1.3
Message-ID: <200503042144.j24LiF74017667@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17659

Modified Files:
	sources 
Log Message:
updated



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 00:53:17 -0000	1.2
+++ sources	4 Mar 2005 21:44:13 -0000	1.3
@@ -1 +1,2 @@
 5be8e221a438817f83f73d09ce655883  dietlibc-0.28.tar.bz2
+7eb62b549930f3a6c5abbbe01c34b787  dietlibc-0.28.tar.bz2.sig



From fedora-extras-commits at redhat.com  Fri Mar  4 21:44:46 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Fri, 4 Mar 2005 16:44:46 -0500
Subject: rpms/dietlibc/devel dietlibc-0.28-setpriority.patch, NONE,
	1.1 dietlibc.spec, 1.1, 1.2
Message-ID: <200503042144.j24LikHW017700@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17694

Modified Files:
	dietlibc.spec 
Added Files:
	dietlibc-0.28-setpriority.patch 
Log Message:
made nice(2) SUSv3 compliantly on x86_64 and other platforms (patch provided by Colin Hill)
added *.sig signature


dietlibc-0.28-setpriority.patch:

--- NEW FILE dietlibc-0.28-setpriority.patch ---
--- dietlibc-0.28-unpatched/lib/__nice.c	2005-02-13 18:01:18.966469056 -0500
+++ dietlibc-0.28/lib/__nice.c	2005-02-13 18:17:04.381744088 -0500
@@ -1,9 +1,13 @@
 #include "syscalls.h"
-#include <sys/time.h>
+#include <errno.h>
 #include <sys/resource.h>
 
 #ifndef __NR_nice
 int nice(int i) {
-  return setpriority(PRIO_PROCESS,0,getpriority(PRIO_PROCESS,0)+i);
+  if (setpriority(PRIO_PROCESS,0,getpriority(PRIO_PROCESS,0)+i) == -1) {
+    errno=EPERM;
+    return -1;
+  }
+  return getpriority(PRIO_PROCESS,0);
 }
 #endif


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dietlibc.spec	4 Mar 2005 00:53:17 -0000	1.1
+++ dietlibc.spec	4 Mar 2005 21:44:44 -0000	1.2
@@ -22,7 +22,9 @@
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
 Source0:	http://www.fefe.de/dietlibc/%NAME-%version.tar.bz2
+Source1:	http://www.fefe.de/dietlibc/%NAME-%version.tar.bz2.sig
 Patch0:		dietlibc-0.28-gcc4.patch
+Patch1:		dietlibc-0.28-setpriority.patch
 BuildRoot:	%_tmppath/%name-%version-buildroot
 Requires:	dietlibc-lib = %version-%release
 
@@ -53,6 +55,7 @@
 %prep
 %setup -q -n %NAME-%version
 %patch0 -p1 -b .gcc4
+%patch1 -p1 -b .nice
 
 ## only for 0.28; remove it in 0.29
 sed -i -e 's!LD_RUN_PATH= !env -u LD_RUN_PATH !' Makefile
@@ -115,9 +118,11 @@
 
 
 %changelog
-* Fri Mar  4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-4
+* Fri Mar  4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.28-4
 - rebuild
 - fixed compilation with gcc4
+- made nice(2) SUSv3 compliantly on x86_64 and other platforms (patch
+  provided by Colin Hill)
 
 * Tue Feb  1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-1
 - updated to 0.28



From fedora-extras-commits at redhat.com  Fri Mar  4 22:37:10 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 4 Mar 2005 17:37:10 -0500
Subject: rpms/jed - New directory
Message-ID: <200503042237.j24MbA3h018818@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18805/jed

Log Message:
Directory /cvs/extras/rpms/jed added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 22:37:10 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 4 Mar 2005 17:37:10 -0500
Subject: rpms/jed/devel - New directory
Message-ID: <200503042237.j24MbACT018821@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18805/jed/devel

Log Message:
Directory /cvs/extras/rpms/jed/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 22:37:22 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 4 Mar 2005 17:37:22 -0500
Subject: rpms/jed Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503042237.j24MbMtc018898@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18883

Added Files:
	Makefile import.log 
Log Message:
Setup of module jed


--- NEW FILE Makefile ---
# Top level Makefile for module jed
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  4 22:37:22 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 4 Mar 2005 17:37:22 -0500
Subject: rpms/jed/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503042237.j24MbMrH018901@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18883/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jed


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jed
# $Id$
NAME := jed
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Mar  4 22:37:57 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 4 Mar 2005 17:37:57 -0500
Subject: rpms/jed import.log,1.1,1.2
Message-ID: <200503042237.j24MbvoH019079@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19063

Modified Files:
	import.log 
Log Message:
auto-import jed-0.99.16-7 on branch devel from jed-0.99.16-7.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/jed/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Mar 2005 22:37:20 -0000	1.1
+++ import.log	4 Mar 2005 22:37:55 -0000	1.2
@@ -0,0 +1 @@
+jed-0_99_16-7:HEAD:jed-0.99.16-7.src.rpm:1109975872



From fedora-extras-commits at redhat.com  Fri Mar  4 22:37:57 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 4 Mar 2005 17:37:57 -0500
Subject: rpms/jed/devel jed-0.99.12-xkeys.patch, NONE, 1.1 jed-info.patch,
	NONE, 1.1 jed-multilib.patch, NONE, 1.1 jed-selinux.patch,
	NONE, 1.1 jed.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503042237.j24Mbvjs019083@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19063/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jed-0.99.12-xkeys.patch jed-info.patch jed-multilib.patch 
	jed-selinux.patch jed.spec 
Log Message:
auto-import jed-0.99.16-7 on branch devel from jed-0.99.16-7.src.rpm


jed-0.99.12-xkeys.patch:

--- NEW FILE jed-0.99.12-xkeys.patch ---
--- jed-B0.99-12/src/xkeys.c.xkeys	Sat Oct 21 23:15:58 2000
+++ jed-B0.99-12/src/xkeys.c	Thu Dec 28 12:24:21 2000
@@ -943,17 +943,17 @@
    "\003\033OQ",	/* 0xFF92 	 XK_KP_F2        PF2 */
    "\003\033OR",	/* 0xFF93 	 XK_KP_F3        PF3 */
    "\003\033OS",	/* 0xFF94 	 XK_KP_F4        PF4 */
-   "",			/* 0xFF95 */
-   "",			/* 0xFF96 */
-   "",			/* 0xFF97 */
-   "",			/* 0xFF98 */
-   "",			/* 0xFF99 */
-   "",			/* 0xFF9A */
-   "",			/* 0xFF9B */
-   "",			/* 0xFF9C */
-   "",			/* 0xFF9D */
-   "",			/* 0xFF9E */
-   "",			/* 0xFF9F */
+   "\003\033Ow",	/* 0xFF95 	 XK_KP_Home */
+   "\003\033Ot",	/* 0xFF96 	 XK_KP_Left */
+   "\003\033Ox",	/* 0xFF97 	 XK_KP_Up */
+   "\003\033Ov",	/* 0xFF98 	 XK_KP_Right */
+   "\003\033Or",	/* 0xFF99 	 XK_KP_Down */
+   "\003\033Oy",	/* 0xFF9A 	 XK_KP_Prior */
+   "\003\033Os",	/* 0xFF9B 	 XK_KP_Next */
+   "\003\033Oq",	/* 0xFF9C 	 XK_KP_End */
+   "\003\033Ou",	/* 0xFF9D 	 XK_KP_Begin */
+   "\003\033Op",	/* 0xFF9E 	 XK_KP_Insert */
+   "\003\033On",	/* 0xFF9F 	 XK_KP_Delete */
    "",			/* 0xFFA0 */
    "",			/* 0xFFA1 */
    "",			/* 0xFFA2 */

jed-info.patch:

--- NEW FILE jed-info.patch ---
--- jed/info/jed.info.entry	Sat Feb  5 11:10:19 2000
+++ jed/info/jed.info	Sat Feb  5 11:11:11 2000
@@ -1,6 +1,10 @@
 This is Info file jed.info, produced by Makeinfo-1.55 from the input
 file jed.ti.
 
+START-INFO-DIR-ENTRY
+* JED: (jed).         The JED editor
+END-INFO-DIR-ENTRY
+
 
 Indirect:
 jed.1in: 83

jed-multilib.patch:

--- NEW FILE jed-multilib.patch ---
--- jed-B0.99-15/autoconf/aclocal.m4.sopwith	2003-01-10 15:20:04.000000000 -0500
+++ jed-B0.99-15/autoconf/aclocal.m4	2003-01-10 15:21:24.000000000 -0500
@@ -158,6 +158,7 @@
                 $JD_Above_Dir/$1/libsrc,$JD_Above_Dir/$1/libsrc/"$ARCH"objs \
 		$JD_Above_Dir2/$1/src,$JD_Above_Dir2/$1/src/"$ARCH"objs \
                 $JD_Above_Dir/$1/src,$JD_Above_Dir/$1/src/"$ARCH"objs \
+		$HOME/include,$HOME/lib64 \
 		$HOME/include,$HOME/lib"
 
 if test -n "$ARCH"
@@ -174,6 +175,7 @@
 test "x$exec_prefix" = "xNONE" && exec_prefix="$prefix"
 JD_Search_Dirs="$JD_Search_Dirs \
                 $includedir,$libdir \
+                $includedir/$1,$libdir \
                 /usr/local/include,/usr/local/lib \
 		/usr/include,/usr/lib \
 		/usr/include/$1,/usr/lib \

jed-selinux.patch:

--- NEW FILE jed-selinux.patch ---
--- jed-0.99-16/autoconf/configure.in.selinux	2004-09-25 01:33:25.000000000 -0400
+++ jed-0.99-16/autoconf/configure.in	2004-09-25 01:40:05.000000000 -0400
@@ -38,6 +38,8 @@
 
 AC_CHECK_LIB(util,openpty)
 
+AC_CHECK_LIB(selinux, is_selinux_enabled)
+
 AC_CHECK_FUNCS(\
 memset \
 memcpy \
--- jed-0.99-16/src/file.c.selinux	2002-10-20 02:55:31.000000000 -0400
+++ jed-0.99-16/src/file.c	2004-09-25 01:40:42.000000000 -0400
@@ -107,6 +107,11 @@
 # define O_BINARY	0
 #endif
 
+#ifdef HAVE_LIBSELINUX
+int copy_security_context(const char *from_file, const char *to_file);
+int set_default_security_context(const char *file);
+#endif
+
 /*}}}*/
 /*{{{ local inclue files */
 
@@ -1047,6 +1052,10 @@
    (void) utime (to, &ut);
 #endif
 
+#ifdef HAVE_LIBSELINUX
+   copy_security_context(from,to);
+#endif
+	
    return ret;
 }
 /*}}}*/
@@ -1192,6 +1201,9 @@
 #endif
 	  }
 	
+#ifdef HAVE_LIBSELINUX
+	set_default_security_context(dirfile);
+#endif
 	/* Since we wrote the buffer to the file, it is not modified. */
 	if (CBuf == find_file_buffer (dirfile))
 	  CBuf->flags &= ~FILE_MODIFIED;
@@ -1250,6 +1262,7 @@
 	     flush_message("autosaving..."); 
 	     (void) sys_delete_file(tmp);
 	     (void) write_file_internal (tmp, _JED_OPEN_CREATE_EXCL);
+	     copy_security_context(b->dirfile,tmp);
 	     message("autosaving...done");
 	  }
       }
--- /dev/null	2004-09-24 19:41:07.393180112 -0400
+++ jed-0.99-16/src/selinux.c	2004-09-25 01:40:32.000000000 -0400
@@ -0,0 +1,208 @@
+/*
+ * Example code to show how to copy the security context from one file to
+ * another.
+ */
+#include "config.h"
+#ifdef HAVE_LIBSELINUX
+#include <selinux/selinux.h>
+static int selinux_enabled = -1;
+#endif
+#include <string.h>
+#include "misc.h"
+#include <errno.h>
+
+int
+copy_security_context(const char *from_file, const char *to_file)
+{
+	int status = 0;
+#ifdef HAVE_LIBSELINUX
+	security_context_t from_context;
+	security_context_t to_context;
+
+	if (selinux_enabled == -1)
+		selinux_enabled = (is_selinux_enabled() > 0);
+
+	if (!selinux_enabled)
+		return 0;
+
+	if (getfilecon(from_file, &from_context) < 0) {
+		/*
+		 * If the filesystem doesn't support extended
+		 * attributes, the original had no special security
+		 * context and the target cannot have one either.
+		 */
+		if (errno == EOPNOTSUPP)
+			return 0;
+
+		jed_verror("Could not get security context for %s",
+		      from_file);
+		return 1;
+	}
+
+	if (getfilecon(to_file, &to_context) < 0) {
+		jed_verror("Could not get security context for %s",
+			   to_file);
+		freecon(from_context);
+		return 1;
+	}
+
+	if (strcmp(from_context, to_context) != 0) {
+		if (setfilecon(to_file, from_context) < 0) {
+			jed_verror("Could not set security context for %s",
+			      to_file);
+			status = 1;
+		}
+	}
+
+	freecon(to_context);
+	freecon(from_context);
+#endif
+	return status;
+}
+
+int
+set_default_security_context(const char *file)
+{
+	int status = 0;
+	
+#ifdef HAVE_LIBSELINUX
+	security_context_t scontext;
+
+	if (selinux_enabled == -1)
+		selinux_enabled = (is_selinux_enabled() > 0);
+
+	if (!selinux_enabled)
+		return 0;
+
+	set_matchpathcon_printf(jed_verror);
+	
+	if (matchpathcon(file,0,&scontext)) {
+		return 1;
+	}
+	
+	if (setfilecon(file, scontext) < 0) {
+		status = match_default_security_context(file);
+	}
+	freecon(scontext);
+#endif
+	return status;
+}
+	
+int
+match_default_security_context(const char *from_file)
+{
+#ifdef HAVE_LIBSELINUX
+	security_context_t scontext;
+
+	if (selinux_enabled == -1)
+		selinux_enabled = (is_selinux_enabled() > 0);
+
+	if (!selinux_enabled)
+		return 0;
+
+	if (getfilecon(from_file, &scontext) < 0) {
+		/*
+		 * If the filesystem doesn't support extended
+		 * attributes, the original had no special security
+		 * context and the target cannot have one either.
+		 */
+		if (errno == EOPNOTSUPP)
+			return 0;
+
+		jed_verror("Could not get security context for %s",
+		      from_file);
+		return 1;
+	}
+
+	if (setfscreatecon(scontext) < 0) {
+		jed_verror("Could not set default security context for %s",
+		      from_file);
+		freecon(scontext);
+		return 1;
+	}
+	freecon(scontext);
+#endif
+	return 0;
+}
+
+
+int
+reset_default_security_context()
+{
+#ifdef HAVE_LIBSELINUX
+	if (selinux_enabled == -1)
+		selinux_enabled = (is_selinux_enabled() > 0);
+
+	if (!selinux_enabled)
+		return 0;
+
+	if (setfscreatecon(0) < 0) {
+	        jed_verror("Could not reset default security context");
+		return 1;
+	}
+#endif
+	return 0;
+}
+
+
+int
+output_security_context(char *from_file)
+{
+#ifdef HAVE_LIBSELINUX
+	security_context_t scontext;
+
+	if (selinux_enabled == -1)
+		selinux_enabled = (is_selinux_enabled() > 0);
+	if (!selinux_enabled)
+		return 0;
+
+	if (getfilecon(from_file, &scontext) < 0) {
+		/*
+		 * If the filesystem doesn't support extended
+		 * attributes, the original had no special security
+		 * context and the target cannot have one either.
+		 */
+		if (errno == EOPNOTSUPP)
+			return 0;
+		
+	        jed_verror("Could not get security context for %s",
+		      from_file);
+		return 1;
+	}
+
+	jed_verror("%s Security Context %s", from_file, scontext);
+	freecon(scontext);
+#endif
+	return 0;
+}
+
+#if 0
+
+/*
+  Test program compile using the following command
+  cc -o t t.c -DHAVE_LIBSELINUX -DTEST -lselinux
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+main(int argc, char **argv)
+{
+
+	printf("%d: %s\n", argc, argv[1]);
+	if (argc == 3) {
+		copy_security_context(argv[1], argv[2]);
+		output_security_context(argv[2]);
+	}
+	if (argc == 2) {
+		FILE *fd;
+		char *temp;
+		match_default_security_context(argv[1]);
+		mkstemp(temp);
+		printf("temp=%s", temp);
+		fd = fopen(temp, "w");
+		fclose(fd);
+		output_security_context(temp);
+		reset_default_security_context();
+	}
+}
+#endif
--- jed-0.99-16/src/config.hin.selinux	2004-09-25 01:42:56.000000000 -0400
+++ jed-0.99-16/src/config.hin	2004-09-25 01:43:21.000000000 -0400
@@ -80,6 +80,8 @@
 /* Undefine this to disable floating point support. */
 #define FLOAT_TYPE
 
+#undef HAVE_LIBSELINUX
+
 #if defined(ultrix) && !defined(__GNUC__)
 # ifndef NO_PROTOTYPES
 #  define NO_PROTOTYPES
--- jed-0.99-16/src/modules.unx.foo	2004-09-25 01:51:55.000000000 -0400
+++ jed-0.99-16/src/modules.unx	2004-09-25 01:52:33.000000000 -0400
@@ -31,3 +31,4 @@
 version		vterm.h      
 hooks		window.h     
 colors
+selinux


--- NEW FILE jed.spec ---
Summary: A fast, compact editor based on the S-Lang screen library.
Name: jed
Version: 0.99.16
Release: 7
License: GPL
Group: Applications/Editors
Source0: ftp://space.mit.edu/pub/davis/jed/jed-0.99-16.tar.bz2
Patch1: jed-0.99.12-xkeys.patch
Patch2: jed-info.patch
Patch3: jed-multilib.patch
Patch4: jed-selinux.patch
Prereq: /sbin/install-info
Obsoletes: jed-common jed-xjed
BuildPrereq: slang-devel /usr/bin/autoconf-2.13
BuildRoot: /var/tmp/jed-root

%description
Jed is a fast, compact editor based on the S-lang screen library.  Jed
features include emulation of the Emacs, EDT, WordStar and Brief
editors; support for extensive customization with slang macros,
colors, keybindings; and a variety of programming modes with syntax
highlighting.

You should install jed if you've used it before and you like it, or if
you haven't used any text editors before and you're still deciding
what you'd like to use.  You'll also need to have jed-common
installed.

%prep
%setup -q -n jed-0.99-16
%patch1 -p1 -b .xkeys
%patch2 -p1
%patch3 -p1
%patch4 -p1 -b .selinux
autoconf-2.13 -l autoconf autoconf/configure.in > configure
chmod +x configure

%build
export JED_ROOT="%{_datadir}/jed" 
%configure
make

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/jed
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1

cp -r lib $RPM_BUILD_ROOT%{_datadir}/jed

cd src/objs
install -m 0755 -s jed $RPM_BUILD_ROOT%{_bindir}
JED_ROOT=$RPM_BUILD_ROOT%{_datadir}/jed $RPM_BUILD_ROOT%{_bindir}/jed -batch -n -l preparse.sl

cd ../../doc
install -m 644 manual/jed.1 $RPM_BUILD_ROOT%{_mandir}/man1

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc COPYING COPYRIGHT doc INSTALL INSTALL.unx README changes.txt
%{_bindir}/jed
%{_mandir}/man1/jed.*
%{_datadir}/jed

%changelog
* Sun Feb 27 2005 Florian La Roche <laroche at redhat.com>
- Copyright: -> License

* Sat Sep 25 2004 Bill Nottingham <notting at redhat.com> 0.99.16-6
- add SELinux support

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue May  4 2004 Bill Nottingham <notting at redhat.com> 0.99.16-4
- remove info page (#115826)

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 22 2003 Bill Nottingham <notting at redhat.com> 0.99.16-1
- update to 0.99.16

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Thu Dec 12 2002 Tim Powers <timp at redhat.com> 0.99.15-4
- rebuild on all arches

* Thu Jul 25 2002 Bill Nottingham <notting at redhat.com> 0.99.15-3
- obsolete xjed subpackage to help upgrades (ick)

* Wed Jul 24 2002 Bill Nottingham <notting at redhat.com> 0.99.15-2
- remove xjed subpackage, collapse -common into main package

* Mon Jun 24 2002 Bill Nottingham <notting at redhat.com> 0.99.15-1
- update to 0.99.15

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Fri Jun 14 2002 Bill Nottingham <notting at redhat.com> 0.99.14-5
- rebuild against new slang

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Fri Jul 20 2001 Bill Nottingham <notting at redhat.com>
- add buildprereq (#49505)

* Thu Jun 21 2001 Bill Nottingham <notting at redhat.com>
- update to 0.99.14

* Mon May 14 2001 Preston Brown <pbrown at redhat.com>
- rgrep is obsolete, package removed.

* Thu Dec 28 2000 Bill Nottingham <notting at redhat.com>
- do the long-needed update to 0.99 series

* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Sat Jun 10 2000 Bill Nottingham <notting at redhat.com>
- rebuild, move the man pages, etc.

* Mon Feb 07 2000 Preston Brown <pbrown at redhat.com>
- wmconfig -> desktop

* Sat Feb 05 2000 Cristian Gafton <gafton at redhat.com>
- add info entry

* Thu Feb  3 2000 Bill Nottingham <notting at redhat.com>
- handle compressed man pages
- add install-info scripts

* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
- auto rebuild in the new build environment (release 2)

* Thu Oct 29 1998 Bill Nottingham <notting at redhat.com>
- update to 0.98.7 for Raw Hide
- split off lib stuff into jed-common

* Mon Oct  5 1998 Jeff Johnson <jbj at redhat.com>
- change rgep group tag, same as grep.

* Sat Aug 15 1998 Jeff Johnson <jbj at redhat.com>
- build root

* Thu May 07 1998 Prospector System <bugs at redhat.com>
- translations modified for de, fr, tr

* Wed Apr 15 1998 Erik Troan <ewt at redhat.com>
- built against new ncurses

* Mon Nov  3 1997 Michael Fulbright <msf at redhat.com>
- added wmconfig entry for xjed

* Tue Oct 21 1997 Michael Fulbright <msf at redhat.com>
- updated to 0.98.4
- included man pages in file lists

* Thu Jul 10 1997 Erik Troan <ewt at redhat.com>
- built against glibc


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Mar 2005 22:37:20 -0000	1.1
+++ .cvsignore	4 Mar 2005 22:37:55 -0000	1.2
@@ -0,0 +1 @@
+jed-0.99-16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Mar 2005 22:37:20 -0000	1.1
+++ sources	4 Mar 2005 22:37:55 -0000	1.2
@@ -0,0 +1 @@
+c2bcd89c92a120559865a539c2705999  jed-0.99-16.tar.bz2



From fedora-extras-commits at redhat.com  Fri Mar  4 22:39:37 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 4 Mar 2005 17:39:37 -0500
Subject: rpms/jed/devel jed.spec,1.1,1.2
Message-ID: <200503042239.j24MdboL019204@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19192

Modified Files:
	jed.spec 
Log Message:
minor cleanups



Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/jed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jed.spec	4 Mar 2005 22:37:55 -0000	1.1
+++ jed.spec	4 Mar 2005 22:39:35 -0000	1.2
@@ -1,7 +1,7 @@
-Summary: A fast, compact editor based on the S-Lang screen library.
+Summary: A fast, compact editor based on the S-Lang screen library
 Name: jed
 Version: 0.99.16
-Release: 7
+Release: 8
 License: GPL
 Group: Applications/Editors
 Source0: ftp://space.mit.edu/pub/davis/jed/jed-0.99-16.tar.bz2
@@ -23,8 +23,7 @@
 
 You should install jed if you've used it before and you like it, or if
 you haven't used any text editors before and you're still deciding
-what you'd like to use.  You'll also need to have jed-common
-installed.
+what you'd like to use.
 
 %prep
 %setup -q -n jed-0.99-16
@@ -66,6 +65,9 @@
 %{_datadir}/jed
 
 %changelog
+* Fri Mar  4 2005 Bill Nottingham <notting at redhat.com> 0.99.16-8
+- bump release
+
 * Sun Feb 27 2005 Florian La Roche <laroche at redhat.com>
 - Copyright: -> License
 



From fedora-extras-commits at redhat.com  Fri Mar  4 23:40:44 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:40:44 -0500
Subject: rpms/sylpheed - New directory
Message-ID: <200503042340.j24NeihF020097@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20090/sylpheed

Log Message:
Directory /cvs/extras/rpms/sylpheed added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 23:40:44 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:40:44 -0500
Subject: rpms/sylpheed/devel - New directory
Message-ID: <200503042340.j24Neix2020100@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20090/sylpheed/devel

Log Message:
Directory /cvs/extras/rpms/sylpheed/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar  4 23:41:07 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:41:07 -0500
Subject: rpms/sylpheed Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503042341.j24Nf7Zt020159@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20150

Added Files:
	Makefile import.log 
Log Message:
Setup of module sylpheed


--- NEW FILE Makefile ---
# Top level Makefile for module sylpheed
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  4 23:41:07 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:41:07 -0500
Subject: rpms/sylpheed/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503042341.j24Nf7hA020162@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20150/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sylpheed


--- 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 Mar  4 23:46:13 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:46:13 -0500
Subject: rpms/sylpheed import.log,1.1,1.2
Message-ID: <200503042346.j24NkDT6020291@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20282

Modified Files:
	import.log 
Log Message:
auto-import sylpheed-1.0.0-1 on branch devel from sylpheed-1.0.0-1.src.rpm
(last version from Fedora Core Development)


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Mar 2005 23:41:05 -0000	1.1
+++ import.log	4 Mar 2005 23:46:11 -0000	1.2
@@ -0,0 +1 @@
+sylpheed-1_0_0-1:HEAD:sylpheed-1.0.0-1.src.rpm:1109979981



From fedora-extras-commits at redhat.com  Fri Mar  4 23:46:13 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:46:13 -0500
Subject: rpms/sylpheed/devel sylpheed-0.8.9-ck.patch, NONE,
	1.1 sylpheed-0.8.9-ssl.patch, NONE,
	1.1 sylpheed-default-browser.patch, NONE, 1.1 sylpheed.1, NONE,
	1.1 sylpheed.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503042346.j24NkDVu020295@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20282/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sylpheed-0.8.9-ck.patch sylpheed-0.8.9-ssl.patch 
	sylpheed-default-browser.patch sylpheed.1 sylpheed.spec 
Log Message:
auto-import sylpheed-1.0.0-1 on branch devel from sylpheed-1.0.0-1.src.rpm
(last version from Fedora Core Development)

sylpheed-0.8.9-ck.patch:

--- NEW FILE sylpheed-0.8.9-ck.patch ---
--- sylpheed-0.8.9/po/zh_CN.po.ck	2002-11-15 16:48:18.000000000 +0900
+++ sylpheed-0.8.9/po/zh_CN.po	2002-12-12 17:03:23.000000000 +0900
@@ -5938,5 +5938,8 @@
 msgid "Open URI command line is invalid: `%s'"
 msgstr "????URL?????????????? `%s'"
 
+msgid "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"
+msgstr "-*-*-medium-r-normal--16-*-*-*-*-*-*-*"
+
 #~ msgid "Done"
 #~ msgstr "????"
--- sylpheed-0.8.9/po/ko.po.ck	2002-12-25 16:32:26.000000000 +0900
+++ sylpheed-0.8.9/po/ko.po	2003-01-07 17:30:57.000000000 +0900
@@ -5881,6 +5881,9 @@
 msgid "Open URI command line is invalid: `%s'"
 msgstr "URI???? ???????? ????????????????: `%s'"
 
+msgid "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"
+msgstr "-*-*-medium-r-normal--16-*-*-*-*-*-*-*"
+
 #~ msgid "\tSearching uncached messages... "
 #~ msgstr "\t???????????? ???????? ????????... "
 
--- sylpheed-0.8.9/src/prefs.c.orig	2003-01-20 18:22:54.000000000 +0900
+++ sylpheed-0.8.9/src/prefs.c	2003-01-20 18:23:46.000000000 +0900
@@ -372,7 +372,7 @@
 							    NULL);
 				else if (param[i].defval[0] != '\0')
 					*((gchar **)param[i].data) =
-						g_strdup(param[i].defval);
+						g_strdup(_(param[i].defval));
 				else
 					*((gchar **)param[i].data) = NULL;
 			} else
--- sylpheed-0.8.9/src/prefs_common.c.orig	2003-01-20 18:27:42.000000000 +0900
+++ sylpheed-0.8.9/src/prefs_common.c	2003-01-20 18:27:51.000000000 +0900
@@ -337,7 +337,7 @@
 	/* Display */
 	{"widget_font", NULL, &prefs_common.widgetfont, P_STRING,
 	 NULL, NULL, NULL},
-	{"message_font", "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*",
+	{"message_font", N_("-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"),
 	 &prefs_common.textfont, P_STRING,
 	 &display.entry_textfont,
 	 prefs_set_data_from_entry, prefs_set_entry},

sylpheed-0.8.9-ssl.patch:

--- NEW FILE sylpheed-0.8.9-ssl.patch ---
diff -ruN sylpheed-0.8.9.orig/aclocal.m4 sylpheed-0.8.9/aclocal.m4
--- sylpheed-0.8.9.orig/aclocal.m4	2003-03-17 22:36:29.000000000 +0900
+++ sylpheed-0.8.9/aclocal.m4	2003-03-17 22:36:39.000000000 +0900
@@ -6825,3 +6825,60 @@
     fi
   ])
 
+
+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+dnl also defines GSTUFF_PKG_ERRORS on error
+AC_DEFUN(PKG_CHECK_MODULES, [
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        AC_MSG_CHECKING(for $2)
+
+        if $PKG_CONFIG --exists "$2" ; then
+            AC_MSG_RESULT(yes)
+            succeeded=yes
+
+            AC_MSG_CHECKING($1_CFLAGS)
+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+            AC_MSG_RESULT($$1_CFLAGS)
+
+            AC_MSG_CHECKING($1_LIBS)
+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
+            AC_MSG_RESULT($$1_LIBS)
+        else
+            $1_CFLAGS=""
+            $1_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
+        fi
+
+        AC_SUBST($1_CFLAGS)
+        AC_SUBST($1_LIBS)
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     ifelse([$3], , :, [$3])
+  else
+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+  fi
+])
+
+
diff -ruN sylpheed-0.8.9.orig/configure.in sylpheed-0.8.9/configure.in
--- sylpheed-0.8.9.orig/configure.in	2003-03-17 22:36:29.000000000 +0900
+++ sylpheed-0.8.9/configure.in	2003-03-17 22:36:58.000000000 +0900
@@ -208,16 +208,15 @@
 AC_MSG_CHECKING([whether to use OpenSSL])
 if test $ac_cv_enable_ssl = yes; then
 	AC_MSG_RESULT(yes)
-	AC_MSG_CHECKING([if openssl is available])
-	LIBS="$LIBS -lssl -lcrypto"
-	AC_TRY_LINK([
-#include <openssl/opensslv.h>
-],	[ return OPENSSL_VERSION_NUMBER; ],
-	[ AC_MSG_RESULT(yes)
-	  AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.) ],
-	[ AC_MSG_RESULT(no)
-	  LIBS="$ac_save_LIBS"
-	  ac_cv_enable_ssl=no ])
+	PKG_CHECK_MODULES(OPENSSL, openssl)
+	if test "x$OPENSSL_LIBS" != "x"; then
+		CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+		LIBS="$LIBS $OPENSSL_LIBS"
+		AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.)
+	else
+		LIBS="$ac_save_LIBS"
+		ac_cv_enable_ssl=no
+	fi
 else
 	AC_MSG_RESULT(no)
 fi

sylpheed-default-browser.patch:

--- NEW FILE sylpheed-default-browser.patch ---
diff -ruN sylpheed-1.0.0beta3.orig/src/defs.h sylpheed-1.0.0beta3/src/defs.h
--- sylpheed-1.0.0beta3.orig/src/defs.h	2004-11-22 19:54:58.940918000 +0900
+++ sylpheed-1.0.0beta3/src/defs.h	2004-11-22 19:55:52.459857552 +0900
@@ -70,7 +70,7 @@
 /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
 /* #define DEFAULT_INC_PROGRAM	"imget" */
 #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t -i"
-#define DEFAULT_BROWSER_CMD	"mozilla-firefox -remote 'openURL(%s,new-window)'"
+#define DEFAULT_BROWSER_CMD	"gnome-open '%s'"
 
 #ifdef _PATH_MAILDIR
 #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR


--- NEW FILE sylpheed.1 ---
.TH SYLPHEED 1 "Nov 22 2004"
.SH NAME
.B sylpheed
\- a GTK+ based, lightweight, and fast email client

.SH SYNOPSIS
.B sylpheed [options]...

.SH DESCRIPTION
\fIsylpheed\fP is an X based fast email client.

.SH OPTIONS
.TP
.B \-\-compose [ADDRESS]
Open the composition window.
.TP
.B \-\-attach [FILE [FILE]...]
Open the composition window with FILE attached.
.TP
.B \-\-receive
Receive the new messages from the server.
.TP
.B \-\-receive-all
Receive the new messages of all accounts from the servers.
.TP
.B \-\-send
Send all queued messages.
.TP
.B \-\-status [FOLDER]
Show the total number of the message.
.TP
.B \-\-status\-full [FOLDER]
Show the status of each folder
.TP
.B \-\-debug
Enter the debug mode.
.TP
.B \-\-help
Show this message.
.TP
.B \-\-version
Show the version.

.SH SEE ALSO
more documentations are available on /usr/share/sylpheed/manual/ and /usr/share/sylpheed/faq/.

.SH AUTHOR
This manual page was written by Akira TAGOH <tagoh at redhat.com>.


--- NEW FILE sylpheed.spec ---
Name: sylpheed
Version: 1.0.0
Release: 1
License: GPL
URL: http://sylpheed.good-day.net/
Group: Applications/Internet
Buildroot: %{_tmppath}/%{name}-root
BuildPreReq: openssl-devel pkgconfig gtk+-devel gdk-pixbuf-devel desktop-file-utils
%{?_with_gpgme:BuildRequires: gpgme-devel}
Source: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2
Source1: sylpheed.1

Patch: %{name}-0.8.9-ck.patch
Patch1: %{name}-0.8.9-ssl.patch
Patch2: sylpheed-default-browser.patch

Summary: A GTK+ based, lightweight, and fast email client.
%description
This program is an X based fast email client which has features
like:
o user-friendly and intuitive interface
o integrated NetNews client (partially implemented)
o ability of keyboard-only operation
o Mew/Wanderlust-like key bind
o multipart MIME
o unlimited multiple account handling
o message queueing
o assortment function
o XML-based address book

See /usr/share/doc/sylpheed*/README for more information.

%prep
%setup -q -n %{name}-%{version}
%patch -p1 -b .ck
%patch1 -p1 -b .ssl
%patch2 -p1 -b .default-browser

%build
autoconf
%configure --enable-ssl %{?_with_gpgme:--enable-gpgme}
make

%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT

%makeinstall
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
install -m 644 sylpheed-64x64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/sylpheed.png
desktop-file-install --vendor redhat --dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--add-category Application \
	--add-category Network \
	--add-category X-Red-Hat-Extra \
	sylpheed.desktop
install -d $RPM_BUILD_ROOT%{_mandir}/man1/
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
gzip -9 $RPM_BUILD_ROOT%{_mandir}/man1/sylpheed.1
%find_lang %{name}

%clean
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,0755)
%doc COPYING ChangeLog ChangeLog.jp README README.jp INSTALL INSTALL.jp TODO.jp
%{_bindir}/sylpheed
%{_datadir}/sylpheed
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_mandir}/man1

%changelog
* Wed Jan  5 2005 Akira TAGOH <tagoh at redhat.com> - 1.0.0-1
- New upstream release.

* Mon Dec 20 2004 Akira TAGOH <tagoh at redhat.com> - 1.0.0-0.1.rc
- New upstream release.

* Mon Nov 22 2004 Akira TAGOH <tagoh at redhat.com> - 1.0.0-0.1.beta3
- New upstream release.
- sylpheed-default-browser.patch: updated to apply cleanly.
- sylpheed.1: added a simple man page. (#129387)

* Wed Jun 23 2004 Akira TAGOH <tagoh at redhat.com> 0.9.12-1
- New upstream release.

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon May 31 2004 Akira TAGOH <tagoh at redhat.com> 0.9.11-1
- New upstream release.

* Wed Mar 24 2004 Akira TAGOH <tagoh at redhat.com> 0.9.10-2
- sylpheed-default-browser.patch: applied to change the default browser to
  gnome-open. (#119007, Michael Schwendt)

* Wed Mar 10 2004 Akira TAGOH <tagoh at redhat.com> 0.9.10-1
- New upstream release.

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Akira TAGOH <tagoh at redhat.com> 0.9.9-1
- New upstream release.

* Fri Jan 30 2004 Akira TAGOH <tagoh at redhat.com> 0.9.8a-3
- don't strip the binary. Thanks to Michael Schwendt
- use upstream's icon for the desktop file.
- install the desktop file using desktop-install-file

* Thu Jan 29 2004 Akira TAGOH <tagoh at redhat.com> 0.9.8a-2
- add _with_gpgme to build enabled gpgme support.
  NOTE: it's disabled as default. just define _with_gpgme to enable it.

* Tue Dec 16 2003 Akira TAGOH <tagoh at redhat.com> 0.9.8a-1
- New upstream release.

* Thu Oct 16 2003 Akira TAGOH <tagoh at redhat.com> 0.9.7-1
- New upstream release.

* Thu Jul 31 2003 Akira TAGOH <tagoh at redhat.com> 0.9.4-1
- New upstream release.

* Tue Jul 22 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.3-2
- rebuild

* Wed Jul 09 2003 Akira TAGOH <tagoh at redhat.com> 0.9.3-1
- New upstream release.

* Mon Jun 09 2003 Akira TAGOH <tagoh at redhat.com> 0.9.2-1
- New upstream release.

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Apr 09 2003 Akira TAGOH <tagoh at redhat.com> 0.8.11-1
- New upstream release.
- use the appropriate macros.

* Mon Mar 17 2003 Akira TAGOH <tagoh at redhat.com> 0.8.9-3
- enabled ssl support.
- sylpheed-0.8.9-ssl.patch: applied to fix the include path and links the correct libraries.

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Mon Jan 20 2003 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.9

* Tue Jan  7 2003 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.8

* Thu Dec 12 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.6

* Wed Nov 20 2002 Tim Powers <timp at redhat.com>
- rebuild in current collinst

* Thu Aug 29 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.2 to fix gpg fatal bug
- Fix desktop file (#72882)

* Sat Aug  3 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.1, a bug fix release

* Mon Jul 15 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.0

* Fri Jul 12 2002 Yukihiro Nakai <ynakai at redhat.com>
- Apply Japanese utf8 mail patch

* Wed Jul 10 2002 Yukihiro Nakai <ynakai at redhat.com>
- strip the binary
- fix .desktop file (#66460)

* Wed Jun 26 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.7.8

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu Feb 28 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.7.2
- Install .desktop

* Thu Jan 31 2002 Yukihiro Nakai <ynakai at redhat.com>
- Rebuild on new environment.

* Sun Dec 16 2001 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.6.6

* Fri Nov 30 2001 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.6.5

* Thu Aug  2 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add Chinese and Korean fix.
- Use %%find_lang

* Wed Jul 11 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add %%lang

* Mon Jul  9 2001 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.5.0

* Tue Feb  6 2001 Tim Powers <timp at redhat.com>
- updated to 0.4.61, bug fixes

* Fri Jan 12 2001 Tim Powers <timp at redhat.com>
- updated to 0.4.52
 
* Thu Nov 16 2000 Tim Powers <timp at redhat.com>
- update to 0.4.4
- built for Powertools 7.1
- quiet setup
- minor specfile cleanup
- snipped some of the really old changelog, was very very long
- include the manual in the file list
- use %%configure and %%makeinstall as well as other predefined RPM
  macros whenever possible

* Wed Aug 30 2000 Yukihiro Nakai <ynakai at redhat.com> 
- Rebuild on Red Hat Linux 7.0 
 
* Tue Aug 29 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.28 
 
* Fri Aug 25 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.27 
 
* Sat Aug 19 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.26, and modified URL 
 
* Thu Aug 10 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.25 
 
* Fri Aug 4 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.24 
 
* Sat Jul 24 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.23 
 
* Sat Jul 20 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.22 
 
* Sun Jul 4 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
- updated to 0.3.21, and modified Summary 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Mar 2005 23:41:05 -0000	1.1
+++ .cvsignore	4 Mar 2005 23:46:11 -0000	1.2
@@ -0,0 +1 @@
+sylpheed-1.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Mar 2005 23:41:05 -0000	1.1
+++ sources	4 Mar 2005 23:46:11 -0000	1.2
@@ -0,0 +1 @@
+864c4fc581a5ab1c7af5e06153c76769  sylpheed-1.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Mar  4 23:51:12 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:51:12 -0500
Subject: rpms/sylpheed import.log,1.2,1.3
Message-ID: <200503042351.j24NpCmE020409@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20400

Modified Files:
	import.log 
Log Message:
auto-import sylpheed-1.0.3-1 on branch devel from sylpheed-1.0.3-1.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	4 Mar 2005 23:46:11 -0000	1.2
+++ import.log	4 Mar 2005 23:51:10 -0000	1.3
@@ -1 +1,2 @@
 sylpheed-1_0_0-1:HEAD:sylpheed-1.0.0-1.src.rpm:1109979981
+sylpheed-1_0_3-1:HEAD:sylpheed-1.0.3-1.src.rpm:1109980279



From fedora-extras-commits at redhat.com  Fri Mar  4 23:51:12 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 18:51:12 -0500
Subject: rpms/sylpheed/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sylpheed.spec, 1.1, 1.2
Message-ID: <200503042351.j24NpC4j020413@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20400/devel

Modified Files:
	.cvsignore sources sylpheed.spec 
Log Message:
auto-import sylpheed-1.0.3-1 on branch devel from sylpheed-1.0.3-1.src.rpm



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Mar 2005 23:46:11 -0000	1.2
+++ .cvsignore	4 Mar 2005 23:51:10 -0000	1.3
@@ -1 +1 @@
-sylpheed-1.0.0.tar.bz2
+sylpheed-1.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 23:46:11 -0000	1.2
+++ sources	4 Mar 2005 23:51:10 -0000	1.3
@@ -1 +1 @@
-864c4fc581a5ab1c7af5e06153c76769  sylpheed-1.0.0.tar.bz2
+9e2733a0ea903c3fb29f537b67a6f15a  sylpheed-1.0.3.tar.bz2


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sylpheed.spec	4 Mar 2005 23:46:11 -0000	1.1
+++ sylpheed.spec	4 Mar 2005 23:51:10 -0000	1.2
@@ -1,20 +1,26 @@
+# should be vendor 'fedora', but that would break upgrades for
+# people who have linked the desktop icon
+%define desktopvendor redhat
+
+Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 1.0.0
+Version: 1.0.3
 Release: 1
 License: GPL
 URL: http://sylpheed.good-day.net/
 Group: Applications/Internet
-Buildroot: %{_tmppath}/%{name}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 BuildPreReq: openssl-devel pkgconfig gtk+-devel gdk-pixbuf-devel desktop-file-utils
-%{?_with_gpgme:BuildRequires: gpgme-devel}
-Source: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2
+%{!?_without_gpgme:BuildRequires: gpgme-devel >= 1.0.0}
+%{!?_without_compface:BuildRequires: compface-devel}
+BuildRequires: autoconf gettext
+Source0: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2
 Source1: sylpheed.1
 
-Patch: %{name}-0.8.9-ck.patch
+Patch0: %{name}-0.8.9-ck.patch
 Patch1: %{name}-0.8.9-ssl.patch
 Patch2: sylpheed-default-browser.patch
 
-Summary: A GTK+ based, lightweight, and fast email client.
 %description
 This program is an X based fast email client which has features
 like:
@@ -32,26 +38,29 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch -p1 -b .ck
+%patch0 -p1 -b .ck
 %patch1 -p1 -b .ssl
 %patch2 -p1 -b .default-browser
 
 %build
 autoconf
-%configure --enable-ssl %{?_with_gpgme:--enable-gpgme}
-make
+%configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \
+	%{?_without_compface:--disable-compface}
+make %{?_smp_mflags}
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 install -m 644 sylpheed-64x64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/sylpheed.png
-desktop-file-install --vendor redhat --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+desktop-file-install --vendor %{desktopvendor} \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category Application \
 	--add-category Network \
 	--add-category X-Red-Hat-Extra \
+	--add-category X-Fedora-Extra \
 	sylpheed.desktop
 install -d $RPM_BUILD_ROOT%{_mandir}/man1/
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -59,7 +68,7 @@
 %find_lang %{name}
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
@@ -71,6 +80,11 @@
 %{_mandir}/man1
 
 %changelog
+* Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-1
+- Update to 1.0.3.
+- Enable support for GPGME 1.0 and compface.
+- Apply common spec cleanup.
+
 * Wed Jan  5 2005 Akira TAGOH <tagoh at redhat.com> - 1.0.0-1
 - New upstream release.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 00:55:18 2005
From: fedora-extras-commits at redhat.com (Cristian Gafton (gafton))
Date: Fri, 4 Mar 2005 19:55:18 -0500
Subject: common cvs-import.sh,1.6,1.7
Message-ID: <200503050055.j250tIEu021278@cvs-int.fedora.redhat.com>

Author: gafton

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21266

Modified Files:
	cvs-import.sh 
Log Message:
pedantery



Index: cvs-import.sh
===================================================================
RCS file: /cvs/extras/common/cvs-import.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cvs-import.sh	3 Mar 2005 20:02:52 -0000	1.6
+++ cvs-import.sh	5 Mar 2005 00:55:16 -0000	1.7
@@ -350,8 +350,11 @@
 echo "$LOG_ENTRY:$(date +%s)" >> ./import.log
 
 # prepare the commit message
-MESSAGE="auto-import $NAME-$VERSION-$RELEASE ${BRANCH:+on branch $BRANCH} from $(basename $PACKAGE)
-$MESSAGE"
+MESSAGE=$(cat <<EOF
+auto-import $NAME-$VERSION-$RELEASE ${BRANCH:+on branch $BRANCH} from $(basename $PACKAGE)
+$MESSAGE
+EOF
+)
 cvs -Q update && \
     echo "cvs commit..." && \
     cvs -Q commit -m "$MESSAGE" >/dev/null && echo "Commit Complete" && \



From fedora-extras-commits at redhat.com  Sat Mar  5 01:13:45 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Fri, 4 Mar 2005 20:13:45 -0500
Subject: rpms/dietlibc/devel dietlibc.spec,1.2,1.3
Message-ID: <200503050113.j251DjDa022015@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22009

Modified Files:
	dietlibc.spec 
Log Message:
conditionalized usage of %_smp_mflags



Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dietlibc.spec	4 Mar 2005 21:44:44 -0000	1.2
+++ dietlibc.spec	5 Mar 2005 01:13:43 -0000	1.3
@@ -72,7 +72,7 @@
   diet gcc diet.c -DDIETHOME=\"`pwd`\" -DVERSION=\"X\" -o bin-%_arch/diet
 %endif
 
-%__make %makeflags all dyn %_smp_mflags
+%__make %makeflags all dyn %{?_smp_mflags}
 
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 01:43:44 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:43:44 -0500
Subject: rpms/libsndfile import.log,1.5,1.6
Message-ID: <200503050143.j251hiYq022137@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsndfile
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22128

Modified Files:
	import.log 
Log Message:
auto-import libsndfile-1.0.11-1 on branch FC-3 from libsndfile-1.0.11-1.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	8 Nov 2004 04:47:58 -0000	1.5
+++ import.log	5 Mar 2005 01:43:42 -0000	1.6
@@ -2,3 +2,4 @@
 libsndfile-1_0_4-0_fdr_1_rh90:HEAD:libsndfile-1.0.4-0.fdr.1.rh90.src.rpm:1099889266
 libsndfile-1_0_4-0_fdr_1_1:HEAD:libsndfile-1.0.4-0.fdr.1.1.src.rpm:1099889272
 libsndfile-1_0_4-0_fdr_1_2:HEAD:libsndfile-1.0.4-0.fdr.1.2.src.rpm:1099889278
+libsndfile-1_0_11-1:FC-3:libsndfile-1.0.11-1.src.rpm:1109987031



From fedora-extras-commits at redhat.com  Sat Mar  5 01:43:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:43:45 -0500
Subject: rpms/libsndfile/FC-3 libsndfile-1.0.11-svx-channels.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 libsndfile.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200503050143.j251hjo4022141@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsndfile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22128/FC-3

Modified Files:
	.cvsignore libsndfile.spec sources 
Added Files:
	libsndfile-1.0.11-svx-channels.patch 
Log Message:
auto-import libsndfile-1.0.11-1 on branch FC-3 from libsndfile-1.0.11-1.src.rpm


libsndfile-1.0.11-svx-channels.patch:

--- NEW FILE libsndfile-1.0.11-svx-channels.patch ---
diff -Nur libsndfile-1.0.11-orig/src/svx.c libsndfile-1.0.11/src/svx.c
--- libsndfile-1.0.11-orig/src/svx.c	2004-10-17 02:46:34.000000000 +0200
+++ libsndfile-1.0.11/src/svx.c	2005-03-05 02:08:14.094919120 +0100
@@ -280,7 +280,7 @@
 
 					bytecount += psf_binheader_readf (psf, "E4", &channels) ;
 
-					psf_log_printf (psf, "  Channels : %d => %d\n", channels) ;
+					psf_log_printf (psf, "  Channels : %d\n", channels) ;
 
 					psf_binheader_readf (psf, "j", dword - bytecount) ;
 					break ;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:47:40 -0000	1.2
+++ .cvsignore	5 Mar 2005 01:43:42 -0000	1.3
@@ -1 +1 @@
-libsndfile-1.0.4.tar.gz
+libsndfile-1.0.11.tar.gz


Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-3/libsndfile.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsndfile.spec	11 Nov 2004 19:21:37 -0000	1.5
+++ libsndfile.spec	5 Mar 2005 01:43:42 -0000	1.6
@@ -1,18 +1,21 @@
-Summary:	A library for reading and writing sound files.
-Name:		libsndfile
-Version:	1.0.4
-Release:	2
-License:	LGPL
-Group:		System Environment/Libraries
-URL:		http://www.zip.com.au/~erikd/libsndfile/
-Source0:	http://www.zip.com.au/~erikd/libsndfile/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	pkgconfig
+Summary: 	Library for reading and writing sound files
+Name: 		libsndfile
+Version: 	1.0.11
+Release: 	1
+License: 	LGPL
+Group: 		System Environment/Libraries
+URL: 		http://www.mega-nerd.com/libsndfile/
+Source0: 	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:		libsndfile-1.0.11-svx-channels.patch
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+
+BuildRequires:  alsa-lib-devel
+Provides:       %{name}-octave = %{version}-%{release}
 
 %package devel
-Summary:	Development files for libsndfile.
+Summary:	Development files for libsndfile
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release} pkgconfig
 
 %description
 libsndfile is a C library for reading and writing sound files such as
@@ -26,19 +29,32 @@
 AIFF, AU, WAV, and others through one standard interface. 
 This package contains files needed to develop with libsndfile.
 
+
 %prep
 %setup -q
+%patch0 -p1 -b .svx-channels
+
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
+
 %install
-rm -rf %{buildroot}
-%makeinstall
+rm -rf $RPM_BUILD_ROOT __docs
+make install DESTDIR=$RPM_BUILD_ROOT
+cp -pR $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev/html __docs
+rm -rf $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -50,23 +66,34 @@
 %{_mandir}/man1/sndfile-play.1*
 %{_mandir}/man1/sndfile-convert.1*
 %{_libdir}/%{name}.so.*
-%{_datadir}/octave/site/m/sndfile_load.m
-%{_datadir}/octave/site/m/sndfile_play.m
-%{_datadir}/octave/site/m/sndfile_save.m
+%{_datadir}/octave
 
 %files devel
 %defattr(-,root,root,-)
+%doc __docs/*
 %exclude %{_libdir}/%{name}.la
 %{_includedir}/sndfile.h
 %{_libdir}/%{name}.so
 %{_libdir}/%{name}.a
 %{_libdir}/pkgconfig/sndfile.pc
 
+
 %changelog
-* Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 1.0.4-2
-- Bump release to provide Extras upgrade path.
-- Fix spaces/tabs uglyness.
+* Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.11-2
+- Fix format string bug (#149863).
+- Drop explicit Epoch 0.
+
+* Sat Dec  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.11-0.fdr.1
+- Update to 1.0.11.
+
+* Wed Oct 13 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.10-0.fdr.1
+- Update to 1.0.10, update URLs, include ALSA support.
+- Disable dependency tracking to speed up the build.
+- Add missing ldconfig invocations.
+- Make -devel require pkgconfig.
+- Include developer docs in -devel.
+- Provide -octave in main package, own more related dirs.
+- Bring specfile up to date with current spec templates.
 
 * Sat Apr 12 2003 Dams <anvil[AT]livna.org> 
 - Initial build.
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:47:40 -0000	1.2
+++ sources	5 Mar 2005 01:43:42 -0000	1.3
@@ -1 +1 @@
-33929011f48fa2a4b72baf54c69196c5  libsndfile-1.0.4.tar.gz
+9ec0b3610041423a57387f284849f2fc  libsndfile-1.0.11.tar.gz



From fedora-extras-commits at redhat.com  Sat Mar  5 01:44:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:44:42 -0500
Subject: rpms/libsndfile import.log,1.6,1.7
Message-ID: <200503050144.j251igDI022257@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsndfile
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22248

Modified Files:
	import.log 
Log Message:
auto-import libsndfile-1.0.11-2 on branch devel from libsndfile-1.0.11-2.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	5 Mar 2005 01:43:42 -0000	1.6
+++ import.log	5 Mar 2005 01:44:40 -0000	1.7
@@ -3,3 +3,4 @@
 libsndfile-1_0_4-0_fdr_1_1:HEAD:libsndfile-1.0.4-0.fdr.1.1.src.rpm:1099889272
 libsndfile-1_0_4-0_fdr_1_2:HEAD:libsndfile-1.0.4-0.fdr.1.2.src.rpm:1099889278
 libsndfile-1_0_11-1:FC-3:libsndfile-1.0.11-1.src.rpm:1109987031
+libsndfile-1_0_11-2:HEAD:libsndfile-1.0.11-2.src.rpm:1109987091



From fedora-extras-commits at redhat.com  Sat Mar  5 01:44:42 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:44:42 -0500
Subject: rpms/libsndfile/devel libsndfile-1.0.11-svx-channels.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 libsndfile.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200503050144.j251igiN022261@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsndfile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22248/devel

Modified Files:
	.cvsignore libsndfile.spec sources 
Added Files:
	libsndfile-1.0.11-svx-channels.patch 
Log Message:
auto-import libsndfile-1.0.11-2 on branch devel from libsndfile-1.0.11-2.src.rpm


libsndfile-1.0.11-svx-channels.patch:

--- NEW FILE libsndfile-1.0.11-svx-channels.patch ---
diff -Nur libsndfile-1.0.11-orig/src/svx.c libsndfile-1.0.11/src/svx.c
--- libsndfile-1.0.11-orig/src/svx.c	2004-10-17 02:46:34.000000000 +0200
+++ libsndfile-1.0.11/src/svx.c	2005-03-05 02:08:14.094919120 +0100
@@ -280,7 +280,7 @@
 
 					bytecount += psf_binheader_readf (psf, "E4", &channels) ;
 
-					psf_log_printf (psf, "  Channels : %d => %d\n", channels) ;
+					psf_log_printf (psf, "  Channels : %d\n", channels) ;
 
 					psf_binheader_readf (psf, "j", dword - bytecount) ;
 					break ;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:47:40 -0000	1.2
+++ .cvsignore	5 Mar 2005 01:44:40 -0000	1.3
@@ -1 +1 @@
-libsndfile-1.0.4.tar.gz
+libsndfile-1.0.11.tar.gz


Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/libsndfile.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsndfile.spec	11 Nov 2004 19:21:37 -0000	1.5
+++ libsndfile.spec	5 Mar 2005 01:44:40 -0000	1.6
@@ -1,18 +1,21 @@
-Summary:	A library for reading and writing sound files.
-Name:		libsndfile
-Version:	1.0.4
-Release:	2
-License:	LGPL
-Group:		System Environment/Libraries
-URL:		http://www.zip.com.au/~erikd/libsndfile/
-Source0:	http://www.zip.com.au/~erikd/libsndfile/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	pkgconfig
+Summary: 	Library for reading and writing sound files
+Name: 		libsndfile
+Version: 	1.0.11
+Release: 	2
+License: 	LGPL
+Group: 		System Environment/Libraries
+URL: 		http://www.mega-nerd.com/libsndfile/
+Source0: 	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:		libsndfile-1.0.11-svx-channels.patch
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+
+BuildRequires:  alsa-lib-devel
+Provides:       %{name}-octave = %{version}-%{release}
 
 %package devel
-Summary:	Development files for libsndfile.
+Summary:	Development files for libsndfile
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release} pkgconfig
 
 %description
 libsndfile is a C library for reading and writing sound files such as
@@ -26,19 +29,32 @@
 AIFF, AU, WAV, and others through one standard interface. 
 This package contains files needed to develop with libsndfile.
 
+
 %prep
 %setup -q
+%patch0 -p1 -b .svx-channels
+
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
+
 %install
-rm -rf %{buildroot}
-%makeinstall
+rm -rf $RPM_BUILD_ROOT __docs
+make install DESTDIR=$RPM_BUILD_ROOT
+cp -pR $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev/html __docs
+rm -rf $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -50,23 +66,34 @@
 %{_mandir}/man1/sndfile-play.1*
 %{_mandir}/man1/sndfile-convert.1*
 %{_libdir}/%{name}.so.*
-%{_datadir}/octave/site/m/sndfile_load.m
-%{_datadir}/octave/site/m/sndfile_play.m
-%{_datadir}/octave/site/m/sndfile_save.m
+%{_datadir}/octave
 
 %files devel
 %defattr(-,root,root,-)
+%doc __docs/*
 %exclude %{_libdir}/%{name}.la
 %{_includedir}/sndfile.h
 %{_libdir}/%{name}.so
 %{_libdir}/%{name}.a
 %{_libdir}/pkgconfig/sndfile.pc
 
+
 %changelog
-* Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 1.0.4-2
-- Bump release to provide Extras upgrade path.
-- Fix spaces/tabs uglyness.
+* Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.11-2
+- Fix format string bug (#149863).
+- Drop explicit Epoch 0.
+
+* Sat Dec  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.11-0.fdr.1
+- Update to 1.0.11.
+
+* Wed Oct 13 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.10-0.fdr.1
+- Update to 1.0.10, update URLs, include ALSA support.
+- Disable dependency tracking to speed up the build.
+- Add missing ldconfig invocations.
+- Make -devel require pkgconfig.
+- Include developer docs in -devel.
+- Provide -octave in main package, own more related dirs.
+- Bring specfile up to date with current spec templates.
 
 * Sat Apr 12 2003 Dams <anvil[AT]livna.org> 
 - Initial build.
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:47:40 -0000	1.2
+++ sources	5 Mar 2005 01:44:40 -0000	1.3
@@ -1 +1 @@
-33929011f48fa2a4b72baf54c69196c5  libsndfile-1.0.4.tar.gz
+9ec0b3610041423a57387f284849f2fc  libsndfile-1.0.11.tar.gz



From fedora-extras-commits at redhat.com  Sat Mar  5 01:47:18 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:47:18 -0500
Subject: rpms/libsamplerate import.log,1.5,1.6
Message-ID: <200503050147.j251lIOI022388@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsamplerate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22377

Modified Files:
	import.log 
Log Message:
auto-import libsamplerate-0.1.2-1 on branch FC-3 from libsamplerate-0.1.2-1.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	8 Nov 2004 04:46:46 -0000	1.5
+++ import.log	5 Mar 2005 01:47:16 -0000	1.6
@@ -2,3 +2,4 @@
 libsamplerate-0_0_15-0_fdr_5_rh90:HEAD:libsamplerate-0.0.15-0.fdr.5.rh90.src.rpm:1099889194
 libsamplerate-0_0_15-0_fdr_5_1:HEAD:libsamplerate-0.0.15-0.fdr.5.1.src.rpm:1099889200
 libsamplerate-0_0_15-0_fdr_5_2:HEAD:libsamplerate-0.0.15-0.fdr.5.2.src.rpm:1099889206
+libsamplerate-0_1_2-1:FC-3:libsamplerate-0.1.2-1.src.rpm:1109987246



From fedora-extras-commits at redhat.com  Sat Mar  5 01:47:18 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:47:18 -0500
Subject: rpms/libsamplerate/FC-3 .cvsignore, 1.2, 1.3 libsamplerate.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200503050147.j251lIsN022392@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsamplerate/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22377/FC-3

Modified Files:
	.cvsignore libsamplerate.spec sources 
Log Message:
auto-import libsamplerate-0.1.2-1 on branch FC-3 from libsamplerate-0.1.2-1.src.rpm



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:28 -0000	1.2
+++ .cvsignore	5 Mar 2005 01:47:16 -0000	1.3
@@ -1 +1 @@
-libsamplerate-0.0.15.tar.gz
+libsamplerate-0.1.2.tar.gz


Index: libsamplerate.spec
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/FC-3/libsamplerate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsamplerate.spec	10 Dec 2004 22:03:05 -0000	1.5
+++ libsamplerate.spec	5 Mar 2005 01:47:16 -0000	1.6
@@ -1,22 +1,19 @@
-Summary: 	A library for performing sample rate conversion on audio.
+Summary: 	Sample rate conversion library for audio data
 Name: 		libsamplerate
-Version: 	0.0.15
-Release: 	5
-Epoch: 		0
+Version: 	0.1.2
+Release: 	1
 License: 	GPL
 Group: 		System Environment/Libraries
 URL: 		http://www.mega-nerd.com/SRC/
 Source0: 	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	libsndfile-devel >= 0:1.0.2
-BuildRequires:	pkgconfig fftw-devel
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+BuildRequires:	libsndfile-devel >= 1.0.6 pkgconfig
 
 %package devel
-Summary: 	Development package for %{name}
+Summary: 	Development related files for %{name}
 Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
+Requires: 	%{name} = %{version}-%{release} pkgconfig
 
-# -----------------------------------------------------------------------------
 
 %description
 Secret Rabbit Code is a sample rate converter for audio. It is capable
@@ -33,41 +30,38 @@
 also vary with time for speeding up and slowing down effects.
 This package contains development files for %{name}
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
-%configure
+%configure --disable-dependency-tracking --disable-fftw
 make %{?_smp_mflags} 
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT _doc
-%makeinstall
-mkdir _doc 
+make install DESTDIR=$RPM_BUILD_ROOT
 cp -a doc _doc
-rm _doc/doc/Makefile* _doc/doc/NEWS _doc/doc/ChangeLog
+rm _doc/Makefile* _doc/NEWS _doc/ChangeLog
+
+
+%check || :
+make check
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
-
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog _doc/doc/*
+%doc AUTHORS COPYING ChangeLog NEWS README _doc/*
 %{_bindir}/sndfile-resample
 %{_libdir}/%{name}.so.*
 
@@ -79,9 +73,14 @@
 %{_libdir}/lib*.a
 %{_libdir}/pkgconfig/samplerate.pc
 
-# -----------------------------------------------------------------------------
 
 %changelog
+* Mon Oct 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.1.2-0.fdr.1
+- Update to 0.1.2.
+- Use "make install DESTDIR=...", disable dependency tracking.
+- Run tests during build.
+- Drop fftw-devel build dep, it's only for an optional part of the test suite.
+
 * Tue Jul 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.0.15-0.fdr.5
 - Fix %%postun (#1665).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:28 -0000	1.2
+++ sources	5 Mar 2005 01:47:16 -0000	1.3
@@ -1 +1 @@
-6b15cc39d1275f1118de4d57f89544eb  libsamplerate-0.0.15.tar.gz
+06861c2c6b8e5273c9b80cf736b9fd0e  libsamplerate-0.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Mar  5 01:48:11 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:48:11 -0500
Subject: rpms/libsamplerate import.log,1.6,1.7
Message-ID: <200503050148.j251mBO6022517@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsamplerate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22508

Modified Files:
	import.log 
Log Message:
auto-import libsamplerate-0.1.2-2 on branch devel from libsamplerate-0.1.2-2.src.rpm



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	5 Mar 2005 01:47:16 -0000	1.6
+++ import.log	5 Mar 2005 01:48:09 -0000	1.7
@@ -3,3 +3,4 @@
 libsamplerate-0_0_15-0_fdr_5_1:HEAD:libsamplerate-0.0.15-0.fdr.5.1.src.rpm:1099889200
 libsamplerate-0_0_15-0_fdr_5_2:HEAD:libsamplerate-0.0.15-0.fdr.5.2.src.rpm:1099889206
 libsamplerate-0_1_2-1:FC-3:libsamplerate-0.1.2-1.src.rpm:1109987246
+libsamplerate-0_1_2-2:HEAD:libsamplerate-0.1.2-2.src.rpm:1109987299



From fedora-extras-commits at redhat.com  Sat Mar  5 01:48:11 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 4 Mar 2005 20:48:11 -0500
Subject: rpms/libsamplerate/devel .cvsignore, 1.2, 1.3 libsamplerate.spec,
	1.6, 1.7 sources, 1.2, 1.3
Message-ID: <200503050148.j251mBMt022521@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsamplerate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22508/devel

Modified Files:
	.cvsignore libsamplerate.spec sources 
Log Message:
auto-import libsamplerate-0.1.2-2 on branch devel from libsamplerate-0.1.2-2.src.rpm



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:28 -0000	1.2
+++ .cvsignore	5 Mar 2005 01:48:09 -0000	1.3
@@ -1 +1 @@
-libsamplerate-0.0.15.tar.gz
+libsamplerate-0.1.2.tar.gz


Index: libsamplerate.spec
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/devel/libsamplerate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsamplerate.spec	3 Mar 2005 22:41:32 -0000	1.6
+++ libsamplerate.spec	5 Mar 2005 01:48:09 -0000	1.7
@@ -1,19 +1,18 @@
-Summary:	Library for performing sample rate conversion on audio
-Name:		libsamplerate
-Version:	0.0.15
-Release:	5
-License:	GPL
-Group:		System Environment/Libraries
-URL:		http://www.mega-nerd.com/SRC/
-Source0:	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	libsndfile-devel >= 0:1.0.2
-BuildRequires:	pkgconfig fftw-devel
+Summary: 	Sample rate conversion library for audio data
+Name: 		libsamplerate
+Version: 	0.1.2
+Release: 	2
+License: 	GPL
+Group: 		System Environment/Libraries
+URL: 		http://www.mega-nerd.com/SRC/
+Source0: 	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+BuildRequires:	libsndfile-devel >= 1.0.6 pkgconfig
 
 %package devel
-Summary:	Development package for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Summary: 	Development related files for %{name}
+Group: 		Development/Libraries
+Requires: 	%{name} = %{version}-%{release} pkgconfig
 
 
 %description
@@ -37,16 +36,19 @@
 
 
 %build
-%configure
-make %{?_smp_mflags}
+%configure --disable-dependency-tracking --disable-fftw
+make %{?_smp_mflags} 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT _doc
-%makeinstall
-mkdir _doc
+make install DESTDIR=$RPM_BUILD_ROOT
 cp -a doc _doc
-rm _doc/doc/Makefile* _doc/doc/NEWS _doc/doc/ChangeLog
+rm _doc/Makefile* _doc/NEWS _doc/ChangeLog
+
+
+%check || :
+make check
 
 
 %clean
@@ -59,7 +61,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog _doc/doc/*
+%doc AUTHORS COPYING ChangeLog NEWS README _doc/*
 %{_bindir}/sndfile-resample
 %{_libdir}/%{name}.so.*
 
@@ -73,6 +75,12 @@
 
 
 %changelog
+* Mon Oct 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.1.2-0.fdr.1
+- Update to 0.1.2.
+- Use "make install DESTDIR=...", disable dependency tracking.
+- Run tests during build.
+- Drop fftw-devel build dep, it's only for an optional part of the test suite.
+
 * Tue Jul 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.0.15-0.fdr.5
 - Fix %%postun (#1665).
 
@@ -85,5 +93,5 @@
 * Wed Jun 25 2003 Dams <anvil[AT]livna.org> 0:0.0.15-0.fdr.2
 - Added some more doc
 
-* Thu May 22 2003 Dams <anvil[AT]livna.org>
+* Thu May 22 2003 Dams <anvil[AT]livna.org> 
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:28 -0000	1.2
+++ sources	5 Mar 2005 01:48:09 -0000	1.3
@@ -1 +1 @@
-6b15cc39d1275f1118de4d57f89544eb  libsamplerate-0.0.15.tar.gz
+06861c2c6b8e5273c9b80cf736b9fd0e  libsamplerate-0.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Mar  5 07:08:23 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 5 Mar 2005 02:08:23 -0500
Subject: devel/sylpheed-claws sylpheed-claws.desktop, NONE,
	1.1 sylpheed-claws.spec, 1.4, 1.5 sylpheed.desktop, 1.1, NONE
Message-ID: <200503050708.j2578NhR027291@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/devel/sylpheed-claws
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27281

Modified Files:
	sylpheed-claws.spec 
Added Files:
	sylpheed-claws.desktop 
Removed Files:
	sylpheed.desktop 
Log Message:
- more s/sylpheed/sylpheed-claws/ so we don't have to conflict with
  sylpheed anymore



--- NEW FILE sylpheed-claws.desktop ---
[Desktop Entry]
Name=Sylpheed Claws
Name[ja]=Sylpheed Claws
Comment=E-Mail client
Comment[ja]=??????????????????????
Exec=sylpheed-claws
Icon=sylpheed-claws.png
Terminal=false
Type=Application
Categories=Application;Network;


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/sylpheed-claws.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sylpheed-claws.spec	13 Feb 2005 12:41:14 -0000	1.4
+++ sylpheed-claws.spec	5 Mar 2005 07:08:21 -0000	1.5
@@ -5,14 +5,14 @@
 
 Name:           sylpheed-claws
 Version:        1.0.1
-Release:        1
+Release:        2
 Epoch:          0
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
 Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.1.tar.bz2
-Source1:        sylpheed.desktop
+Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
 BuildRequires:  glib-devel
@@ -30,8 +30,6 @@
 Requires:  spamassassin
 Requires:  dillo
 
-Conflicts: sylpheed
-
 %description
 The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast 
 e-mail client.
@@ -48,13 +46,9 @@
 The %{name}-devel package contains the header files  and pkgconfig file needed
 for development with %{name}.
 
-# -----------------------------------------------------------------------------
-
 %prep
 %setup
 
-# -----------------------------------------------------------------------------
-
 %build
 %if %openssl_pc
 MY_OPENSSL_CFLAGS=`pkg-config openssl --cflags`
@@ -67,15 +61,14 @@
 %if "%{aspellver}" >= "0.50"
 	   --enable-aspell \
 %endif
-           --disable-dependency-tracking
+           --disable-dependency-tracking \
+	   --program-suffix="-claws"
 
 %{__make} %{?_smp_mflags}
 
 %{__make} check
 
 
-# -----------------------------------------------------------------------------
-
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %makeinstall gnomedatadir=${RPM_BUILD_ROOT}/%{_datadir}
@@ -92,13 +85,11 @@
 %{__rm} -f ${RPM_BUILD_ROOT}%{_libdir}/sylpheed/plugins/*.a
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
-# -----------------------------------------------------------------------------
+%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/sylpheed{,-claws}.png
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-# -----------------------------------------------------------------------------
-
 %files -f sylpheed-claws.lang
 %defattr(-,root,root,-)
 %doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws COPYING
@@ -120,9 +111,12 @@
 %{_includedir}/sylpheed-claws/*
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 
-# -----------------------------------------------------------------------------
-
 %changelog
+* Sat Mar 05 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.0.1-2
+- fixed some sylpheed/sylpheed-claws
+- removed Conflictes sylpheed
+
 * Wed Feb 09 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0:1.0.1-1
 - version upgrade


--- sylpheed.desktop DELETED ---



From fedora-extras-commits at redhat.com  Sat Mar  5 09:05:59 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 04:05:59 -0500
Subject: devel/allegro allegro.spec,1.9,1.10
Message-ID: <200503050905.j2595xTm030242@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/allegro
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30196/allegro

Modified Files:
	allegro.spec 
Log Message:
Fix fallout from "Epoch: 0" removal.


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/devel/allegro/allegro.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- allegro.spec	4 Mar 2005 21:00:23 -0000	1.9
+++ allegro.spec	5 Mar 2005 09:05:52 -0000	1.10
@@ -69,7 +69,7 @@
 Summary(fr):  Outils suppl??mentaires pour la librairie de programmation Allegro
 Summary(it):    Programmi di utilit?? aggiuntivi per la libreria Allegro
 Group:          Development/Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description tools
 Allegro is a cross-platform library intended for use in computer games



From fedora-extras-commits at redhat.com  Sat Mar  5 09:05:59 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 04:05:59 -0500
Subject: devel/perl-Net-SSLeay perl-Net-SSLeay.spec,1.2,1.3
Message-ID: <200503050905.j2595xHV030249@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/perl-Net-SSLeay
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30196/perl-Net-SSLeay

Modified Files:
	perl-Net-SSLeay.spec 
Log Message:
Fix fallout from "Epoch: 0" removal.


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/devel/perl-Net-SSLeay/perl-Net-SSLeay.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Net-SSLeay.spec	3 Mar 2005 23:46:27 -0000	1.2
+++ perl-Net-SSLeay.spec	5 Mar 2005 09:05:52 -0000	1.3
@@ -14,7 +14,7 @@
 
 BuildRequires:  perl >= 1:5.6.1, openssl-devel
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Provides:       perl-Net_SSLeay = %{epoch}:%{version}-%{release}
+Provides:       perl-Net_SSLeay = %{version}-%{release}
 
 %description
 This module offers some high level convinience functions for accessing



From fedora-extras-commits at redhat.com  Sat Mar  5 09:05:59 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 04:05:59 -0500
Subject: devel/libfac libfac.spec,1.5,1.6
Message-ID: <200503050905.j2595xiP030245@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/libfac
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30196/libfac

Modified Files:
	libfac.spec 
Log Message:
Fix fallout from "Epoch: 0" removal.


Index: libfac.spec
===================================================================
RCS file: /cvs/extras/devel/libfac/libfac.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libfac.spec	3 Mar 2005 22:41:31 -0000	1.5
+++ libfac.spec	5 Mar 2005 09:05:52 -0000	1.6
@@ -23,8 +23,8 @@
 
 %package devel
 Summary: An extension to Singular-factory
-Obsoletes: %{name} < %{epoch}:%{version}-%{release}
-Provides:  %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name} < %{version}-%{release}
+Provides:  %{name} = %{version}-%{release}
 Group:   Development/Libraries
 %description devel
 Singular-libfac is an extension to Singular-factory which implements



From adrian at lisas.de  Sat Mar  5 11:13:49 2005
From: adrian at lisas.de (Adrian Reber)
Date: Sat, 5 Mar 2005 12:13:49 +0100
Subject: FC-3 branch for vnstat
Message-ID: <20050305111349.GA29757@lisas.de>


Please create the FC-3 branch of vnstat.

		Adrian



From fedora-extras-commits at redhat.com  Sat Mar  5 11:17:41 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 06:17:41 -0500
Subject: rpms/perl-XML-LibXSLT - New directory
Message-ID: <200503051117.j25BHf2C032260@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-LibXSLT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32253/perl-XML-LibXSLT

Log Message:
Directory /cvs/extras/rpms/perl-XML-LibXSLT added to the repository




From fedora-extras-commits at redhat.com  Sat Mar  5 11:17:41 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 06:17:41 -0500
Subject: rpms/perl-XML-LibXSLT/devel - New directory
Message-ID: <200503051117.j25BHf2s032263@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-LibXSLT/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32253/perl-XML-LibXSLT/devel

Log Message:
Directory /cvs/extras/rpms/perl-XML-LibXSLT/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar  5 11:18:02 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 06:18:02 -0500
Subject: rpms/perl-XML-LibXSLT Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503051118.j25BI2NH032322@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-LibXSLT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32313

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-XML-LibXSLT


--- NEW FILE Makefile ---
# Top level Makefile for module perl-XML-LibXSLT
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  5 11:18:02 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 06:18:02 -0500
Subject: rpms/perl-XML-LibXSLT/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503051118.j25BI28a032325@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-LibXSLT/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32313/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-XML-LibXSLT


--- 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 Mar  5 11:18:49 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 06:18:49 -0500
Subject: rpms/perl-XML-LibXSLT import.log,1.1,1.2
Message-ID: <200503051118.j25BInl6032421@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-LibXSLT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32412

Modified Files:
	import.log 
Log Message:
auto-import perl-XML-LibXSLT-1.57-3 on branch devel from perl-XML-LibXSLT-1.57-3.src.rpm
https://bugzilla.redhat.com/149766


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-LibXSLT/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Mar 2005 11:18:00 -0000	1.1
+++ import.log	5 Mar 2005 11:18:47 -0000	1.2
@@ -0,0 +1 @@
+perl-XML-LibXSLT-1_57-3:HEAD:perl-XML-LibXSLT-1.57-3.src.rpm:1110021516



From fedora-extras-commits at redhat.com  Sat Mar  5 11:18:49 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 5 Mar 2005 06:18:49 -0500
Subject: rpms/perl-XML-LibXSLT/devel perl-XML-LibXSLT.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503051118.j25BInBq032425@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-XML-LibXSLT/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32412/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-XML-LibXSLT.spec 
Log Message:
auto-import perl-XML-LibXSLT-1.57-3 on branch devel from perl-XML-LibXSLT-1.57-3.src.rpm
https://bugzilla.redhat.com/149766


--- NEW FILE perl-XML-LibXSLT.spec ---
%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}

Name:		perl-XML-LibXSLT
Version:	1.57
Release:	3
Summary:        Perl module for interfacing to GNOME's libxslt

Group:		Development/Libraries
License:	GPL or Artistic
URL:		http://search.cpan.org/dist/XML-LibXSLT/
Source0:	http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-LibXSLT-1.57.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl >= 1:5.6.1, perl(XML::LibXML) >= 1.57
BuildRequires:	libxslt-devel >= 1.0.6 
Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module is a fast XSLT library, based on the Gnome libxslt engine
that you can find at http://www.xmlsoft.org/XSLT/

%prep
%setup -q -n XML-LibXSLT-%{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' -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 benchmark.pl example
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/XML
%exclude %{perl_vendorarch}/XML/benchmark.pl
%{_mandir}/man3/*.3*

%changelog
* Sat Mar  5 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.57-3
- Drop pre-FC2 LD_RUN_PATH hack.
- Install benchmark.pl only as %%doc.

* Fri Feb 26 2005 Zing <shishz at hotpop.com> - 1.57-2
- QA from Ville Skytt??
-	BuildRequires XML::LibXML >= 1.57
-	BuildRequires libxslt-devel
-	put benchmark.pl in %%doc

* Fri Feb 25 2005 Zing <shishz at hotpop.com> - 1.57-1
- First build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-LibXSLT/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Mar 2005 11:18:00 -0000	1.1
+++ .cvsignore	5 Mar 2005 11:18:47 -0000	1.2
@@ -0,0 +1 @@
+XML-LibXSLT-1.57.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-LibXSLT/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Mar 2005 11:18:00 -0000	1.1
+++ sources	5 Mar 2005 11:18:47 -0000	1.2
@@ -0,0 +1 @@
+9b831bc5a97444103f345105f0f6fced  XML-LibXSLT-1.57.tar.gz



From ville.skytta at iki.fi  Sat Mar  5 11:20:44 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Sat, 05 Mar 2005 13:20:44 +0200
Subject: APPROVED: perl-XML-LibXSLT
Message-ID: <1110021644.9070.15.camel@bobcat.mine.nu>

perl-XML-LibXSLT is a Perl module for interfacing to GNOME's libxslt.

Approved by: yours truly
Maintainer: Zing <shishz at hotpop.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050305/555ddd4b/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/shapelib/devel shapelib.spec,1.2,1.3
Message-ID: <200503051928.j25JSUd8007032@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/shapelib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/shapelib/devel

Modified Files:
	shapelib.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: shapelib.spec
===================================================================
RCS file: /cvs/extras/rpms/shapelib/devel/shapelib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib.spec	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib.spec	5 Mar 2005 19:28:28 -0000	1.3
@@ -3,7 +3,6 @@
 Name: shapelib
 Version: 1.2.10
 Release: 6
-Epoch: 0
 URL: http://shapelib.maptools.org/
 Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz
 Patch0: shapelib-%{version}.patch
@@ -15,9 +14,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %package devel
-Summary:	Development files for shapelib
-Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Summary: Development files for shapelib
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description
 The Shapefile C Library provides the ability to write
@@ -30,7 +29,7 @@
 
 %prep
 %setup -q -T -b 0
-%patch -p1 -b .buildroot 
+%patch -p1 -b .buildroot
 %patch1 -p1 -b .endian
 
 %build
@@ -60,8 +59,8 @@
 %{_bindir}/*
 %{_libdir}/*.so.*
 
-%doc LICENSE.LGPL README README.tree dbf_api.html shapelib.html shp_api.html 
-%doc contrib/doc/shpproj.txt stream1.sh stream1.out stream2.sh 
+%doc LICENSE.LGPL README README.tree dbf_api.html shapelib.html shp_api.html
+%doc contrib/doc/shpproj.txt stream1.sh stream1.out stream2.sh
 %doc stream2.out makeshape.sh stream3.out ChangeLog
 
 %files devel
@@ -92,7 +91,7 @@
 - Removed proj requirement as it is automatically detected.
 - Added epoch to proj-devel requirement
 - Fixed %post and %postun
-- Changed group to Development/Libraries, although this appears to be only 
+- Changed group to Development/Libraries, although this appears to be only
   somewhat satisfactory.
 - Removed "which make"
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/stow/devel stow.spec,1.2,1.3
Message-ID: <200503051928.j25JSUa8007083@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/stow/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/stow/devel

Modified Files:
	stow.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: stow.spec
===================================================================
RCS file: /cvs/extras/rpms/stow/devel/stow.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stow.spec	10 Dec 2004 22:03:11 -0000	1.2
+++ stow.spec	5 Mar 2005 19:28:28 -0000	1.3
@@ -1,7 +1,6 @@
 Name:         stow
 Version:      1.3.3
 Release:      1
-Epoch:        0   
 License:      GPL
 Group:        Development/Tools
 URL:          http://www.gnu.org/software/stow/stow.html
@@ -34,7 +33,7 @@
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info \
     %{_infodir}/dir 2>/dev/null || :
 fi
@@ -44,11 +43,11 @@
 
 %files
 %defattr(-,root,root)
-%doc COPYING README AUTHORS INSTALL ChangeLog NEWS THANKS TODO 
-%doc %{_mandir}/man8/stow* 
+%doc COPYING README AUTHORS INSTALL ChangeLog NEWS THANKS TODO
+%doc %{_mandir}/man8/stow*
 %doc %{_infodir}/stow*
 %{_bindir}/*
 
-%changelog 
+%changelog
 * Sat May 15 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.3.3-0.fdr.1
 - initial RPM



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/scribus/devel scribus.spec,1.8,1.9
Message-ID: <200503051928.j25JSUHY007024@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/scribus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/scribus/devel

Modified Files:
	scribus.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scribus.spec	9 Feb 2005 01:54:43 -0000	1.8
+++ scribus.spec	5 Mar 2005 19:28:28 -0000	1.9
@@ -88,12 +88,12 @@
 
 
 %post
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : 
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %postun
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : 
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.5,1.6
Message-ID: <200503051928.j25JSUtZ007106@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/sylpheed-claws/devel

Modified Files:
	sylpheed-claws.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sylpheed-claws.spec	5 Mar 2005 07:08:21 -0000	1.5
+++ sylpheed-claws.spec	5 Mar 2005 19:28:28 -0000	1.6
@@ -6,7 +6,6 @@
 Name:           sylpheed-claws
 Version:        1.0.1
 Release:        2
-Epoch:          0
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
@@ -24,14 +23,14 @@
 BuildRequires:  pilot-link-devel
 BuildRequires:  gdk-pixbuf-devel
 BuildRequires:  clamav-devel
-BuildRequires:  gnupg >= 0:1.2.1, gpgme03-devel >= 0:0.3.12
+BuildRequires:  gnupg >= 1.2.1, gpgme03-devel >= 0.3.12
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig
 Requires:  spamassassin
 Requires:  dillo
 
 %description
-The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast 
+The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast
 e-mail client.
 The main reason for this bleeding edge branch is to lift some of the burden
 from the shoulders of Hiroyuki Yamamoto, Sylpheed's creator. The idea is that
@@ -59,10 +58,10 @@
            --enable-spamassassin-plugin \
            --disable-mathml-viewer-plugin \
 %if "%{aspellver}" >= "0.50"
-	   --enable-aspell \
+           --enable-aspell \
 %endif
            --disable-dependency-tracking \
-	   --program-suffix="-claws"
+           --program-suffix="-claws"
 
 %{__make} %{?_smp_mflags}
 
@@ -93,7 +92,7 @@
 %files -f sylpheed-claws.lang
 %defattr(-,root,root,-)
 %doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws COPYING
-%doc NEWS README README.claws RELEASE_NOTES.claws 
+%doc NEWS README README.claws RELEASE_NOTES.claws
 %doc TODO
 %{_bindir}/*
 %dir %{_libdir}/sylpheed-claws/



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/suck/devel suck.spec,1.3,1.4
Message-ID: <200503051928.j25JSUJG007093@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/suck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/suck/devel

Modified Files:
	suck.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: suck.spec
===================================================================
RCS file: /cvs/extras/rpms/suck/devel/suck.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- suck.spec	11 Dec 2004 12:49:45 -0000	1.3
+++ suck.spec	5 Mar 2005 19:28:28 -0000	1.4
@@ -1,13 +1,7 @@
-%define version 4.3.2
-%define name suck
-%define release 9
-%define epoch 0
-
-Name: %{name}
-Summary: Suck - download news from remote NNTP server
-Version: %{version}
-Release: %{release}
-Epoch: %{epoch}
+Name: suck
+Summary: Download news from remote NNTP server
+Version: 4.3.2
+Release: 9
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -19,9 +13,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 License: Public Domain
 Group: System Environment/Daemons
-BuildRequires: inn-devel >= 0:2.3, perl >= 3:5.8
-BuildRequires: openssl-devel, autoconf 
-Requires: inn >= 0:2.3
+BuildRequires: inn-devel >= 2.3, perl >= 3:5.8
+BuildRequires: openssl-devel, autoconf
+Requires: inn >= 2.3
 Conflicts: leafnode
 
 %description
@@ -117,7 +111,7 @@
 - Some changes becouse messages of rpmlint
 
 * Thu Mar 09 2004 Jochen Schmitt <Jochen at herr-schmitt.de>
-- Adapt getnews-script for using with INN 2.4.1 
+- Adapt getnews-script for using with INN 2.4.1
 - Configuration file in /etc/sysconfig/suck
 
 * Thu Mar 08 2004 Jochen Schmitt <Jochen at herr-schmitt.de>



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/soundtracker/devel soundtracker.spec,1.6,1.7
Message-ID: <200503051928.j25JSU5W007066@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/soundtracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/soundtracker/devel

Modified Files:
	soundtracker.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: soundtracker.spec
===================================================================
RCS file: /cvs/extras/rpms/soundtracker/devel/soundtracker.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- soundtracker.spec	28 Feb 2005 21:12:57 -0000	1.6
+++ soundtracker.spec	5 Mar 2005 19:28:28 -0000	1.7
@@ -1,14 +1,13 @@
 Name:           soundtracker
 Version:        0.6.7
 Release:        3
-Epoch:          0
 Summary:        Sound module composer/player
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.soundtracker.org/
 Source0:        http://www.soundtracker.org/dl/v0.6/soundtracker-0.6.7.tar.gz
-Source1:	soundtracker.desktop
+Source1:        soundtracker.desktop
 Patch0:         soundtracker-automake.patch
 Patch1:         soundtracker-mkinstalldirs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +21,7 @@
 format.  The user interface makes use of GTK+.
 
 %prep
-%setup -q 
+%setup -q
 %patch0
 %patch1 -p1
 
@@ -81,6 +80,6 @@
 
 * Wed Aug 27 2003 Nils O. Sel??sdal <NOS at Utel.no> - 0:0.6.7-0.fdr.1.pre6
 - Initial RPM release for Fedora
-- Rework Makefile.am's to work with recent autotools and to not 
+- Rework Makefile.am's to work with recent autotools and to not
   install setuid root
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/shorewall/devel shorewall.spec,1.5,1.6
Message-ID: <200503051928.j25JSUpU007036@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/shorewall/devel

Modified Files:
	shorewall.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- shorewall.spec	10 Dec 2004 22:03:11 -0000	1.5
+++ shorewall.spec	5 Mar 2005 19:28:28 -0000	1.6
@@ -1,8 +1,7 @@
 Name: shorewall
 Version: 1.4.8
 Release: 2
-Epoch: 0
-Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
+Summary: Iptables-based firewall for Linux systems
 
 Group: Applications/System
 License: GPL
@@ -32,7 +31,7 @@
 
 %prep
 
-%setup -q 
+%setup -q
 
 # Clean backup doc files
 rm -rf documentation/*~
@@ -56,7 +55,7 @@
 %post
 
 if [ $1 -eq 1 ]; then
-    	echo \
+	echo \
 "########################################################################
 #      REMOVE THIS FILE AFTER YOU HAVE CONFIGURED SHOREWALL            #
 ########################################################################" \
@@ -66,9 +65,9 @@
 
 %preun
 
-if [ $1 = 0 ]; then
-        /sbin/chkconfig --del shorewall
-        rm -f %{_sysconfdir}/shorewall/startup_disabled
+if [ $1 -eq 0 ]; then
+	/sbin/chkconfig --del shorewall
+	rm -f %{_sysconfdir}/shorewall/startup_disabled
 fi
 
 %files
@@ -94,15 +93,19 @@
 * Tue Nov 11 2003 Miguel Armas <kuko at maarmas.com> - 1.4.8-1.fdr.2
 - Clean backup doc files
 - Fix some entries in files section
+
 * Mon Nov 10 2003 Miguel Armas <kuko at maarmas.com> - 1.4.8-1.fdr.1
 - Upgraded to shorewall 1.4.8
+
 * Fri Oct 31 2003 Miguel Armas <kuko at maarmas.com> - 1.4.7-1.fdr.3.a
 - Start shorewall *before* network for better security.
 - Added clear command to shorewall init script to run "shorewall clear"
 - Changed status command in shorewall init script to run "shorewall status"
+
 * Thu Oct 30 2003 Miguel Armas <kuko at maarmas.com> - 1.4.7-1.fdr.2.a
 - Lots of bugfixes in spec file (Thanks to Michael Schwendt)
+
 * Sat Oct 25 2003 Miguel Armas <kuko at maarmas.com> - 1.4.7-1.fdr.1.a
 - Fedorized package
 - Split documentation in a subpackage (we don't need de docs in a production
-firewall) 
+firewall)



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/sirius/devel sirius.spec,1.6,1.7
Message-ID: <200503051928.j25JSUxo007052@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/sirius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/sirius/devel

Modified Files:
	sirius.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: sirius.spec
===================================================================
RCS file: /cvs/extras/rpms/sirius/devel/sirius.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sirius.spec	11 Feb 2005 19:59:30 -0000	1.6
+++ sirius.spec	5 Mar 2005 19:28:28 -0000	1.7
@@ -1,17 +1,17 @@
-Name: 		sirius
-Version: 	0.8.0
-Release: 	3
-Summary: 	Othello for Gnome.
-
-Group: 		Amusements/Games
-License:        GPL
-URL: 		http://sirius.bitvis.nu/
+Name:		sirius
+Version:	0.8.0
+Release:	3
+Summary:	Othello for Gnome
+
+Group:		Amusements/Games
+License:	GPL
+URL:		http://sirius.bitvis.nu/
 Source0:	http://sirius.bitvis.nu/files/sirius-0.8.0.tar.gz
 Patch0:		sirius-0.8.0-autoreconf.patch.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:	libgnomeui-devel
 
 %description
@@ -33,7 +33,7 @@
 
 %prep
 %setup -q
-%ifarch x86_64 
+%ifarch x86_64
 # patch was created after autoreconf -f -i and after removing autom4te.cache/
 %patch0 -p 1 -b .autoreconf
 %endif



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/snort/devel snort.spec,1.3,1.4
Message-ID: <200503051928.j25JSUbK007056@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/snort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/snort/devel

Modified Files:
	snort.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- snort.spec	2 Dec 2004 01:37:21 -0000	1.3
+++ snort.spec	5 Mar 2005 19:28:28 -0000	1.4
@@ -1,8 +1,7 @@
-Summary:        An intrusion detection system
+Summary:        Intrusion detection system
 Name:           snort
 Version:        2.0.0
-Release:        0.fdr.1.rh90
-Epoch:          0
+Release:        1
 License:        GPL
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/snort-2.0.0.tar.gz
@@ -10,8 +9,8 @@
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Prefix:         /usr
-Requires:       libpcap >= 0:0.4
-BuildRequires:  libpcap >= 0.4 
+Requires:       libpcap >= 0.4
+BuildRequires:  libpcap >= 0.4
 BuildRequires:  perl
 
 %package        plain+flexresp
@@ -25,7 +24,7 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  mysql-devel 
+BuildRequires:  mysql-devel
 
 %package        mysql+flexresp
 Summary:        Snort with Flexible Response
@@ -33,13 +32,13 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       libnet
 BuildRequires:  libnet
-BuildRequires:  mysql-devel 
+BuildRequires:  mysql-devel
 
 %package        postgresql
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  postgresql-devel 
+BuildRequires:  postgresql-devel
 
 %package        postgresql+flexresp
 Summary:        Snort with Flexible Response
@@ -47,14 +46,14 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       libnet
 BuildRequires:  libnet
-BuildRequires:  postgresql-devel 
+BuildRequires:  postgresql-devel
 
 %package        snmp
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  net-snmp-devel 
-BuildRequires:  openssl-devel 
+BuildRequires:  net-snmp-devel
+BuildRequires:  openssl-devel
 
 %package        snmp+flexresp
 Summary:        Snort with Flexible Response
@@ -62,8 +61,8 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       libnet
 BuildRequires:  libnet
-BuildRequires:  net-snmp-devel 
-BuildRequires:  openssl-devel 
+BuildRequires:  net-snmp-devel
+BuildRequires:  openssl-devel
 
 %package        bloat
 Summary:        Snort with Flexible Response
@@ -71,21 +70,20 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       libnet
 BuildRequires:  libnet
-BuildRequires:  net-snmp-devel 
-BuildRequires:  postgresql-devel 
-BuildRequires:  mysql-devel 
-BuildRequires:  openssl-devel 
+BuildRequires:  net-snmp-devel
+BuildRequires:  postgresql-devel
+BuildRequires:  mysql-devel
+BuildRequires:  openssl-devel
 
-#---------------------------------------------------------------------
 
 %description
-Snort is a libpcap-based packet sniffer/logger which 
-can be used as a lightweight network intrusion detection system. 
-It features rules based logging and can perform protocol analysis, 
-content searching/matching and can be used to detect a variety of 
-attacks and probes, such as buffer overflows, stealth port scans, 
-CGI attacks, SMB probes, OS fingerprinting attempts, and much more. 
-Snort has a real-time alerting capabilty, with alerts being sent to syslog, 
+Snort is a libpcap-based packet sniffer/logger which
+can be used as a lightweight network intrusion detection system.
+It features rules based logging and can perform protocol analysis,
+content searching/matching and can be used to detect a variety of
+attacks and probes, such as buffer overflows, stealth port scans,
+CGI attacks, SMB probes, OS fingerprinting attempts, and much more.
+Snort has a real-time alerting capabilty, with alerts being sent to syslog,
 a seperate "alert" file, or as a WinPopup message via Samba's smbclient
 
 This version is compiled without database support. Edit the spec file
@@ -122,7 +120,7 @@
 Snort compiled with mysql+flexresp support.  Requires libnet rpm.
 
 %description    postgresql
-Snort compiled with postgresql support. 
+Snort compiled with postgresql support.
 
 %description    postgresql+flexresp
 Snort compiled with postgresql+flexresp support.  Requires snort rpm.
@@ -143,7 +141,6 @@
 Snort compiled with snmp+flexresp+mysql+postgresql support.
 Requires libnet rpm.
 
-#---------------------------------------------------------------------
 
 %prep
 echo "
@@ -152,9 +149,8 @@
 Has not been rebuilt or updated since rh9.
 --------------------------------------------------------------" > /dev/null
 exit 1
-%setup -q 
+%setup -q
 
-#---------------------------------------------------------------------
 
 %build
 
@@ -166,12 +162,12 @@
 export AM_CFLAGS="-g -O2"
 SNORT_BASE_CONFIG="--prefix=%{_prefix} \
                    --sysconfdir=%{_sysconfdir} \
-		   --with-libpcap-includes=/usr/include/pcap"
+                   --with-libpcap-includes=/usr/include/pcap"
 
 # there are some strange configure errors
 # when not doing a distclean between major builds.
 
-# plain 
+# plain
 {
 mkdir plain
 cd plain
@@ -181,7 +177,7 @@
                                    --with-odbc=no
 make -j3
 mv src/snort ../snort-plain
-# make distclean 
+# make distclean
 cd ..
 }
 
@@ -196,7 +192,7 @@
                                    --enable-flexresp
 make -j3
 mv src/snort ../snort-plain+flexresp
-# make distclean 
+# make distclean
 
 cd ..
 }
@@ -212,7 +208,7 @@
                                    --enable-flexresp
 make -j3
 mv src/snort ../snort-mysql+flexresp
-# make distclean 
+# make distclean
 cd ..
 }
 
@@ -223,10 +219,10 @@
 ../../configure $SNORT_BASE_CONFIG --with-mysql=yes \
                                    --with-postgresql=no \
                                    --with-oracle=no \
-                                   --with-odbc=no 
+                                   --with-odbc=no
 make -j3
 mv src/snort ../snort-mysql
-# make distclean 
+# make distclean
 
 cd ..
 }
@@ -244,7 +240,7 @@
                                    --enable-flexresp
 make -j3
 mv src/snort ../snort-postgresql+flexresp
-# make distclean 
+# make distclean
 cd ..
 }
 
@@ -255,10 +251,10 @@
 ../../configure $SNORT_BASE_CONFIG --with-mysql=no \
                                    --with-postgresql=yes \
                                    --with-oracle=no \
-                                   --with-odbc=no 
+                                   --with-odbc=no
 make -j3
 mv src/snort ../snort-postgresql
-# make distclean 
+# make distclean
 cd ..
 }
 
@@ -275,7 +271,7 @@
 
 make -j3
 mv src/snort ../snort-snmp
-# make distclean 
+# make distclean
 cd ..
 }
 
@@ -293,7 +289,7 @@
                                    --with-openssl
 make -j3
 mv src/snort ../snort-snmp+flexresp
-# make distclean 
+# make distclean
 cd ..
 }
 
@@ -314,7 +310,6 @@
 cd ..
 }
 
-#---------------------------------------------------------------------
 
 %install
 if [ -d %{buildroot} ]; then
@@ -347,21 +342,18 @@
 
 perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!'  %{buildroot}%{_sysconfdir}/snort.conf
 
-#---------------------------------------------------------------------
 
 %clean
 if [ -d %{buildroot} ]; then
 	rm -rf %{buildroot}
 fi
 
-#---------------------------------------------------------------------
-						
+
 %post
 # make a symlink if there is no link
 ln -sf %{_sbindir}/snort-plain %{_sbindir}/snort
 /sbin/chkconfig --add snortd
 
-#---------------------------------------------------------------------
 
 %preun
 /etc/rc.d/init.d/snortd stop
@@ -370,47 +362,38 @@
    if [ -L %{_sbindir}/snort ]; then rm %{_sbindir}/snort; fi
 fi
 
-#---------------------------------------------------------------------
 
 %post plain+flexresp
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-plain+flexresp %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %post mysql
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-mysql %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %post mysql+flexresp
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-mysql+flexresp %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %post postgresql
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-postgresql %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %post postgresql+flexresp
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-postgresql+flexresp %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %post snmp
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-snmp %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %post snmp+flexresp
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-sfnmp+flexresp %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %post bloat
 if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-bloat %{_sbindir}/snort; fi
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root)
@@ -447,7 +430,6 @@
 %files bloat
 %attr(755,root,root) %{_sbindir}/snort-bloat
 
-#---------------------------------------------------------------------
 
 %changelog
 * Tue Apr 01 2003 Phillip Compton <pcompton AT proteinmedia.com> 0:2.0.0-0.fdr.0.1.rc4



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/straw/devel straw.spec,1.5,1.6
Message-ID: <200503051928.j25JSUFU007089@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/straw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/straw/devel

Modified Files:
	straw.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: straw.spec
===================================================================
RCS file: /cvs/extras/rpms/straw/devel/straw.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- straw.spec	28 Feb 2005 21:12:57 -0000	1.5
+++ straw.spec	5 Mar 2005 19:28:28 -0000	1.6
@@ -5,34 +5,33 @@
 Name:           straw
 Version:        0.22.1
 Release:        5
-Epoch:          0
 Summary:        GNOME desktop news aggregator
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.nongnu.org/straw
-Source0:	http://savannah.nongnu.org/download/straw/straw-0.22.1.tar.bz2
+Source0:        http://savannah.nongnu.org/download/straw/straw-0.22.1.tar.bz2
 Patch1:         straw-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+BuildArch:      noarch
 
 BuildRequires:  python-devel, pygtk2-libglade, pyorbit
-BuildRequires:	desktop-file-utils
-BuildRequires:	gnome-python2, gnome-python2-gconf, gnome-python2-gnomevfs, gnome-python2-gtkhtml2
+BuildRequires:  desktop-file-utils
+BuildRequires:  gnome-python2, gnome-python2-gconf, gnome-python2-gnomevfs, gnome-python2-gtkhtml2
 # FC2 does not need python-bsddb as this is part of python >= 2.3
 %if "%{pyver}" < "2.3"
-BuildRequires:	python-bsddb >= 0:4.1
-Requires:	python-bsddb >= 0:4.1
+BuildRequires:  python-bsddb >= 4.1
+Requires:       python-bsddb >= 4.1
 %endif
-Requires:	python-abi = %{pyver}
-Requires:	gnome-python2-gconf, gnome-python2-gnomevfs, gnome-python2-gtkhtml2
+Requires:       python-abi = %{pyver}
+Requires:       gnome-python2-gconf, gnome-python2-gnomevfs, gnome-python2-gtkhtml2
 # Note: python-adns optional but recommended
-Requires:	python-adns
+Requires:       python-adns
 Requires:       pygtk2-libglade, gnome-python2, gnome-python2-gnomevfs, pyorbit
 # Dropped for versions >= 0.22
-# Requires:	mx
-Requires(post):		GConf2
-Requires(preun):	GConf2
+# Requires:     mx
+Requires(post):  GConf2
+Requires(preun): GConf2
 
 %description
 Straw is a desktop news aggregator for the GNOME environment.



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/stellarium/devel stellarium.spec,1.4,1.5
Message-ID: <200503051928.j25JSU05007079@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/stellarium/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/stellarium/devel

Modified Files:
	stellarium.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- stellarium.spec	27 Jan 2005 18:29:15 -0000	1.4
+++ stellarium.spec	5 Mar 2005 19:28:28 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           stellarium
 Version:        0.6.2
 Release:        2
-Epoch:          0
-Summary:        A photo-realistic nightsky renderer
+Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
 License:        GPL
@@ -16,7 +15,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  ImageMagick
 
-%description 
+%description
 Stellarium is a real-time 3D photo-realistic nightsky renderer. It can
 generate images of the sky as seen through the Earth's atmosphere with
 more than one hundred thousand stars from the Hipparcos Catalogue,



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/s3switch/devel s3switch.spec,1.5,1.6
Message-ID: <200503051928.j25JSUmr007016@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/s3switch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/s3switch/devel

Modified Files:
	s3switch.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: s3switch.spec
===================================================================
RCS file: /cvs/extras/rpms/s3switch/devel/s3switch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- s3switch.spec	10 Dec 2004 22:03:11 -0000	1.5
+++ s3switch.spec	5 Mar 2005 19:28:28 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           s3switch
 Version:        0.0
 Release:        5.20020912
-Epoch:          0
 Summary:        Manage the output device on S3 Savage chips
 
 Group:          Applications/System



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/scorched3d/devel scorched3d.spec,1.2,1.3
Message-ID: <200503051928.j25JSU9f007020@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/scorched3d/devel

Modified Files:
	scorched3d.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scorched3d.spec	10 Dec 2004 22:03:11 -0000	1.2
+++ scorched3d.spec	5 Mar 2005 19:28:28 -0000	1.3
@@ -1,8 +1,7 @@
 Name:           scorched3d
 Version:        37.2
 Release:        1
-Epoch:          0
-Summary:        A game based loosely on the classic DOS game Scorched Earth
+Summary:        Game based loosely on the classic DOS game Scorched Earth
 
 Group:          Amusements/Games
 License:        GPL
@@ -18,7 +17,7 @@
 BuildRequires:  ImageMagick, %{_libdir}/libGLU.so.1, desktop-file-utils
 BuildRequires:  expat-devel, autoconf, automake
 # Upstream naming compatibility
-Provides:       Scorched3D = %{epoch}:%{version}-%{release}
+Provides:       Scorched3D = %{version}-%{release}
 
 %description
 Scorched 3D is a game based on the classic DOS game Scorched Earth



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/seahorse/devel seahorse.spec,1.5,1.6
Message-ID: <200503051928.j25JSUIL007028@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/seahorse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/seahorse/devel

Modified Files:
	seahorse.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- seahorse.spec	4 Mar 2005 21:00:23 -0000	1.5
+++ seahorse.spec	5 Mar 2005 19:28:28 -0000	1.6
@@ -1,23 +1,22 @@
-Name: 		seahorse
-Version: 	0.7.3
-Release: 	5
-Epoch:		0
+Name:		seahorse
+Version:	0.7.3
+Release:	5
 Summary:	GNOME2 interface for gnupg
 
-Group: 		User Interface/Desktops
-License: 	GPL
-URL:            http://seahorse.sourceforge.net/
-Source: 	http://download.sourceforge.net/seahorse/seahorse-0.7.3.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  libgnomeui-devel
-BuildRequires:  eel2-devel
-BuildRequires:  gpgme03-devel
-BuildRequires:  scrollkeeper
-BuildRequires:  gettext
-BuildRequires:  desktop-file-utils
-Requires(post): GConf2 scrollkeeper
-Requires(postun): scrollkeeper
+Group:		User Interface/Desktops
+License:	GPL
+URL:		http://seahorse.sourceforge.net/
+Source:		http://download.sourceforge.net/seahorse/seahorse-0.7.3.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	libgnomeui-devel
+BuildRequires:	eel2-devel
+BuildRequires:	gpgme03-devel
+BuildRequires:	scrollkeeper
+BuildRequires:	gettext
+BuildRequires:	desktop-file-utils
+Requires(post):		GConf2 scrollkeeper
+Requires(postun):	scrollkeeper
 
 %description
 Seahorse is a gnome2 interface for gnupg.
@@ -47,7 +46,7 @@
 rm -rf ${RPM_BUILD_ROOT}/var/scrollkeeper
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
 desktop-file-install --vendor fedora --delete-original  \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
   --add-category Application                            \
   --add-category Utility                                \



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/sqlite/devel sqlite.spec,1.8,1.9
Message-ID: <200503051928.j25JSUgv007074@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/sqlite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/sqlite/devel

Modified Files:
	sqlite.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sqlite.spec	16 Feb 2005 20:20:44 -0000	1.8
+++ sqlite.spec	5 Mar 2005 19:28:28 -0000	1.9
@@ -1,17 +1,16 @@
 Name:           sqlite
 Version:        2.8.16
 Release:        1
-Epoch:          0
-Summary:        An embeddable SQL engine in a C library
+Summary:        Embeddable SQL engine in a C library
 Group:          System Environment/Libraries
 License:        Public Domain
 URL:            http://www.sqlite.org/
 Source0:        http://www.sqlite.org/sqlite-%{version}.tar.gz
-Patch1:         sqlite-2.8.15.rpath.patch      
+Patch1:         sqlite-2.8.15.rpath.patch
 Patch2:         sqlite-2.8.15-makefile.patch
 Patch3:         sqlite-2.8.3.test.rh9.patch
-Patch4:		sqlite-64bit-fixes.patch
-Patch5:		sqlite-2.8.15-arch-double-differences.patch
+Patch4:         sqlite-64bit-fixes.patch
+Patch5:         sqlite-2.8.15-arch-double-differences.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel readline-devel %{_includedir}/tcl.h
@@ -27,20 +26,20 @@
 %package        devel
 Summary:        Development files for SQLite
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:	pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 
 %description    devel
 SQLite is a small, fast, embeddable SQL database engine that supports
 most of SQL92, including transactions with atomic commit and rollback,
 subqueries, compound queries, triggers, and views.
-This package contains static library and header files for developing 
+This package contains static library and header files for developing
 applications using sqlite.
 
 %package        tcl
 Summary:        Tcl bindings for sqlite
 Group:          System Environment/Libraries
-Requires:       tcl >= 0:8.3.3, %{name} = %{epoch}:%{version}-%{release}
+Requires:       tcl >= 8.3.3, %{name} = %{version}-%{release}
 
 %description    tcl
 SQLite is a small, fast, embeddable SQL database engine that supports
@@ -85,7 +84,7 @@
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files 
+%files
 %defattr(-,root,root,-)
 %{_bindir}/sql*
 %{_libdir}/libsql*.so.*
@@ -103,7 +102,7 @@
 %defattr(-,root,root,-)
 %doc doc/tclsqlite.html
 %exclude %_bindir/tclsqlite
-%exclude %_libdir/%{name}-%{version}/libtclsqlite.a 
+%exclude %_libdir/%{name}-%{version}/libtclsqlite.a
 %exclude %{_bindir}/tclsqlite
 %_libdir/sqlite-%version
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/sopwith/devel sopwith.spec,1.4,1.5
Message-ID: <200503051928.j25JSUVD007061@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/sopwith/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/sopwith/devel

Modified Files:
	sopwith.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: sopwith.spec
===================================================================
RCS file: /cvs/extras/rpms/sopwith/devel/sopwith.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sopwith.spec	10 Dec 2004 22:03:11 -0000	1.4
+++ sopwith.spec	5 Mar 2005 19:28:28 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           sopwith
 Version:        1.7.1
 Release:        1
-Epoch:          0
-Summary:        SDL port of sopwith
+Summary:        SDL port of the sopwith game
 
 Group:          Amusements/Games
 License:        GPL
@@ -11,26 +10,22 @@
 Source1:        sopwith.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# -----------------------------------------------------------------------------
 
 BuildRequires:  gtk2-devel, SDL-devel, desktop-file-utils
 
 %description
-This is a port of the classic computer game "Sopwith" to run on modern 
-computers and operating systems. 
+This is a port of the classic computer game "Sopwith" to run on modern
+computers and operating systems.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n sdl_sopwith-%{version}
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,14 +52,12 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING FAQ NEWS README TODO doc/keys.txt doc/origdoc.txt doc/readme.txt
 %{_bindir}/sopwith
@@ -73,7 +66,6 @@
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Wed Jun 18 2003 Adrian Reber <adrian at lisas.de> - 0:1.7.1-0.fdr.1



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/source-highlight/devel source-highlight.spec,1.3,1.4
Message-ID: <200503051928.j25JSUjc007070@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/source-highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/source-highlight/devel

Modified Files:
	source-highlight.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: source-highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/source-highlight/devel/source-highlight.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- source-highlight.spec	10 Dec 2004 22:03:11 -0000	1.3
+++ source-highlight.spec	5 Mar 2005 19:28:28 -0000	1.4
@@ -1,17 +1,16 @@
-Summary: 	Produces a document with syntax highlighting
-Name: 		source-highlight
-Version: 	1.9
+Summary:	Produces a document with syntax highlighting
+Name:		source-highlight
+Version:	1.9
 Release:	2
-Epoch:		0
-Group: 		Development/Tools
-License: 	GPL
-Source: 	ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
-URL: 		http://www.gnu.org/software/src-highlite/
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Group:		Development/Tools
+License:	GPL
+Source:		ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
+URL:		http://www.gnu.org/software/src-highlite/
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	bison, flex
 
 %description
-This program, given a source file, produces a document with syntax 
+This program, given a source file, produces a document with syntax
 highlighting. At the moment this package can handle :
 * Java
 * C/C++
@@ -19,10 +18,10 @@
 * Perl
 * Php3 new
 as source languages, and HTML as output format.
-NOTICE: now the name of the program is source-highlight: there are no two 
-separate programs, namely java2html and cpp2html, anymore.  However there 
-are two shell scripts with the same name in order to facilitate the 
-migration (however their use is not advised). 
+NOTICE: now the name of the program is source-highlight: there are no two
+separate programs, namely java2html and cpp2html, anymore.  However there
+are two shell scripts with the same name in order to facilitate the
+migration (however their use is not advised).
 
 %prep
 %setup -q



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/silky/devel silky.spec,1.4,1.5
Message-ID: <200503051928.j25JSUR0007045@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/silky/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/silky/devel

Modified Files:
	silky.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: silky.spec
===================================================================
RCS file: /cvs/extras/rpms/silky/devel/silky.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- silky.spec	10 Dec 2004 22:03:11 -0000	1.4
+++ silky.spec	5 Mar 2005 19:28:28 -0000	1.5
@@ -1,4 +1,4 @@
-Summary: Silky is an easy-to-use graphical SILC client.
+Summary: Easy-to-use graphical SILC client
 Name: silky
 Version: 0.5.2
 Release: 1
@@ -8,15 +8,14 @@
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Patch: silky-0.5.1-desktop.patch
-Epoch: 0
 
 # mailcap is needed for /etc/mime.types
 
 Requires: mailcap
-Requires: libsilc >= 0:0.9.12
+Requires: libsilc >= 0.9.12
 
 BuildRequires: gtk2-devel libxml2-devel libglade2-devel
-BuildRequires: libsilc-devel >= 0:0.9.12
+BuildRequires: libsilc-devel >= 0.9.12
 
 %description
 Silky is a graphical SILC client.
@@ -27,7 +26,8 @@
 
 %build
 %configure --with-silc-libs=%{_libdir}/silc \
- --with-silc-includes=%{_includedir}/silc --with-docdir=%{_docdir}/silky-%{version}
+ --with-silc-includes=%{_includedir}/silc \
+ --with-docdir=%{_docdir}/silky-%{version}
 make %{?_smp_mflags}
 
 %install



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/swatch/devel swatch.spec,1.5,1.6
Message-ID: <200503051928.j25JSUBc007102@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/swatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/swatch/devel

Modified Files:
	swatch.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: swatch.spec
===================================================================
RCS file: /cvs/extras/rpms/swatch/devel/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 Mar 2005 19:28:28 -0000	1.6
@@ -3,8 +3,7 @@
 Name:           swatch
 Version:        3.1.1
 Release:        1
-Epoch:          0
-Summary:        A tool for actively monitoring log files.
+Summary:        Tool for actively monitoring log files
 
 Group:          Applications/File
 License:        GPL
@@ -19,9 +18,9 @@
 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.
 
 
@@ -46,7 +45,7 @@
 make test
 
 
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/supertux/devel supertux.spec,1.4,1.5
Message-ID: <200503051928.j25JSU6n007099@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/supertux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/supertux/devel

Modified Files:
	supertux.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: supertux.spec
===================================================================
RCS file: /cvs/extras/rpms/supertux/devel/supertux.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- supertux.spec	13 Jan 2005 13:30:45 -0000	1.4
+++ supertux.spec	5 Mar 2005 19:28:28 -0000	1.5
@@ -1,23 +1,22 @@
 Name:           supertux
 Version:        0.1.2
 Release:        1
-Epoch:          0
-Summary:        A jump'n run like game similar to Mario Bros
+Summary:        Jump'n run like game similar to Mario Bros
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://super-tux.sourceforge.net/
 Source0:        http://dl.sf.net/super-tux/supertux-0.1.2.tar.bz2
-Source1:	%{name}.desktop
+Source1:        %{name}.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  SDL-devel >= 0:1.2.4, SDL_image-devel, SDL_mixer-devel
-BuildRequires:	zlib-devel, desktop-file-utils
+BuildRequires:  SDL-devel >= 1.2.4, SDL_image-devel, SDL_mixer-devel
+BuildRequires:  zlib-devel, desktop-file-utils
 
 %description
 SuperTux is a jump'n run like game, with strong inspiration from the
 Super Mario Bros games for Nintendo.
-     
+
 Run and jump through multiple worlds, fighting off enemies by jumping
 on them or bumping them from below.  Grabbing power-ups and other stuff
 on the way.
@@ -47,7 +46,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO LEVELDESIGN
 %{_bindir}/*



From fedora-extras-commits at redhat.com  Sat Mar  5 19:28:30 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:28:30 -0500
Subject: rpms/showimg/devel showimg.spec,1.1,1.2
Message-ID: <200503051928.j25JSU0q007041@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/showimg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6950/showimg/devel

Modified Files:
	showimg.spec 
Log Message:
Mass letter "s" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- showimg.spec	29 Jan 2005 23:49:56 -0000	1.1
+++ showimg.spec	5 Mar 2005 19:28:28 -0000	1.2
@@ -1,8 +1,7 @@
 Name:           showimg
 Version:        0.9.4.1
 Release:        2
-Epoch:          0
-Summary:        Feature-rich image viewer for KDE.
+Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tla/devel tla.spec,1.5,1.6
Message-ID: <200503051943.j25JhJhR007608@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tla/devel

Modified Files:
	tla.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tla.spec	9 Feb 2005 22:50:04 -0000	1.5
+++ tla.spec	5 Mar 2005 19:43:17 -0000	1.6
@@ -1,8 +1,7 @@
 Name:           tla
 Version:        1.3
 Release:        1
-Epoch:          0
-Summary:        The Low-Budget arch Revision Control System
+Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
 License:        GPL



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tktable/devel tktable.spec,1.6,1.7
Message-ID: <200503051943.j25JhJ2e007604@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tktable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tktable/devel

Modified Files:
	tktable.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tktable.spec
===================================================================
RCS file: /cvs/extras/rpms/tktable/devel/tktable.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tktable.spec	10 Dec 2004 22:03:12 -0000	1.6
+++ tktable.spec	5 Mar 2005 19:43:17 -0000	1.7
@@ -1,8 +1,7 @@
-Summary: Table/matrix widget extension to Tcl/Tk.
+Summary: Table/matrix widget extension to Tcl/Tk
 Name: tktable
 Version: 2.9
 Release: 1
-Epoch: 0
 License: BSD-like
 Group: Development/Libraries
 Source: http://download.sourceforge.net/tktable/Tktable2.9.tar.gz
@@ -10,7 +9,7 @@
 BuildRequires: XFree86-devel >= 0:4, tk >= 0:8.3.1
 # work around tcl-devel and tk-devel packages non existence in RH 8.0 and 9:
 BuildRequires: %{_includedir}/tk.h, %{_includedir}/tcl.h
-Requires: tk >= 0:8.3.1
+Requires: tk >= 8.3.1
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/taglib/devel taglib.spec,1.6,1.7
Message-ID: <200503051943.j25JhJ3g007540@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/taglib/devel

Modified Files:
	taglib.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: taglib.spec
===================================================================
RCS file: /cvs/extras/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- taglib.spec	18 Jan 2005 19:13:31 -0000	1.6
+++ taglib.spec	5 Mar 2005 19:43:17 -0000	1.7
@@ -1,13 +1,12 @@
 Name:       taglib	
 Version:    1.3.1
 Release:    1
-Epoch:      0 
-Summary:    Audio Meta-Data Library 
+Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
 License:    LGPL
 URL:	    http://ktown.kde.org/~wheeler/taglib/
-Source:	    http://developer.kde.org/~wheeler/files/src/taglib-1.3.1.tar.gz 
+Source:	    http://developer.kde.org/~wheeler/files/src/taglib-1.3.1.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/ldconfig
@@ -16,15 +15,15 @@
 BuildRequires: doxygen, graphviz
 
 %description
-TagLib is a library for reading and editing the meta-data of several 
-popular audio formats. Currently it supports both ID3v1 and ID3v2 for 
-MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in 
+TagLib is a library for reading and editing the meta-data of several
+popular audio formats. Currently it supports both ID3v1 and ID3v2 for
+MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in
 FLAC files.
 
 %package devel
-Summary: Development tools for taglib 
+Summary: Development tools for taglib
 Group:	 Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description devel
 Development tools for taglib
 
@@ -66,7 +65,7 @@
 %doc examples
 
 
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 
@@ -117,4 +116,4 @@
 - fix for rh73
 
 * Fri Feb 06 2004 Rex Dieter <rexdieter at sf.net> 0:1.0-0.fdr.0
-- first try 
+- first try



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-arabtex/devel tetex-arabtex.spec,1.3,1.4
Message-ID: <200503051943.j25JhJff007548@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-arabtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-arabtex/devel

Modified Files:
	tetex-arabtex.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-arabtex.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-arabtex/devel/tetex-arabtex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tetex-arabtex.spec	10 Dec 2004 22:03:11 -0000	1.3
+++ tetex-arabtex.spec	5 Mar 2005 19:43:17 -0000	1.4
@@ -5,8 +5,7 @@
 Name:           tetex-arabtex
 Version:        3.11
 Release:        1.l
-Epoch:          0
-Summary:        The ArabTeX package for TeX/LaTeX
+Summary:        ArabTeX package for TeX/LaTeX
 
 Group:          Applications/Publishing
 License:        LaTeX Project Public License
@@ -23,7 +22,7 @@
 Requires(postun): tetex
 BuildArch:      noarch
 
-%description 
+%description
 ArabTeX is a macro package for typesetting text using the Arabic
 script, including Naskh style fonts, using TeX or LaTeX. It supports a
 range of encodings and an ASCII translitteration.



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tuxtype2/devel tuxtype2.spec,1.4,1.5
Message-ID: <200503051943.j25JhJ0E007640@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tuxtype2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tuxtype2/devel

Modified Files:
	tuxtype2.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tuxtype2.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxtype2/devel/tuxtype2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tuxtype2.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ tuxtype2.spec	5 Mar 2005 19:43:17 -0000	1.5
@@ -1,25 +1,24 @@
 Name:           tuxtype2
 Version:        1.5.2
 Release:        1
-Epoch:          0
-Summary:        Tux Typing is an educational typing tutor for children.
+Summary:        Tux Typing, an educational typing tutor for children
 Group:          Amusements/Games
 License:        GPL
 URL:            http://tuxtype.sourceforge.net/
 Source0:        http://dl.sf.net/tuxtype/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel >= 0:1.2.5, SDL_image-devel, SDL_mixer-devel
+BuildRequires:  SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel
 BuildRequires:  SDL_ttf-devel, ImageMagick, desktop-file-utils
-BuildRequires:	automake, autoconf
+BuildRequires:  automake, autoconf
 
 %description
-Tux Typing is an educational typing tutor for children. It features several 
+Tux Typing is an educational typing tutor for children. It features several
 different types of gameplay, at a variety of difficulty levels.
 
 
 %prep
-%setup -q 
+%setup -q
 
 
 %build



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/ttf2pt1/devel ttf2pt1.spec,1.2,1.3
Message-ID: <200503051943.j25JhJwV007629@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ttf2pt1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/ttf2pt1/devel

Modified Files:
	ttf2pt1.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ttf2pt1.spec
===================================================================
RCS file: /cvs/extras/rpms/ttf2pt1/devel/ttf2pt1.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ttf2pt1.spec	10 Dec 2004 22:03:12 -0000	1.2
+++ ttf2pt1.spec	5 Mar 2005 19:43:17 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           ttf2pt1
 Version:        3.4.4
 Release:        2
-Epoch:          0
 Summary:        TrueType to Adobe Type 1 converter
 
 Group:          Applications/Publishing
@@ -13,7 +12,7 @@
 Patch1:         ttf2pt1-3.4.3-manpages.patch
 Patch2:         ttf2pt1-3.4.4-ft2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  freetype-devel > 0:2
+BuildRequires:  freetype-devel > 2
 BuildRequires:  t1lib-devel
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tkcvs/devel tkcvs.spec,1.7,1.8
Message-ID: <200503051943.j25JhJ45007600@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tkcvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tkcvs/devel

Modified Files:
	tkcvs.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tkcvs.spec	14 Feb 2005 21:33:30 -0000	1.7
+++ tkcvs.spec	5 Mar 2005 19:43:17 -0000	1.8
@@ -1,7 +1,6 @@
 Name:		tkcvs
 Version:	7.2.2
 Release:	2
-Epoch:		0
 Summary:	TkCVS and TkDiff
 
 Group:		Development/Tools
@@ -45,10 +44,10 @@
 
 %files
 %defattr(-,root,root)
+%doc CHANGELOG COPYING FAQ vendor5readme.pdf vendorcode.sh
 %{_datadir}/tkcvs
 %{_bindir}/*
 %{_mandir}/man1/*
-%doc CHANGELOG COPYING FAQ vendor5readme.pdf vendorcode.sh
 
 %changelog
 * Mon Feb 14 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:7.2.2-2



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-armtex/devel tetex-armtex.spec,1.2,1.3
Message-ID: <200503051943.j25JhJkg007552@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-armtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-armtex/devel

Modified Files:
	tetex-armtex.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-armtex.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-armtex/devel/tetex-armtex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tetex-armtex.spec	10 Dec 2004 22:03:11 -0000	1.2
+++ tetex-armtex.spec	5 Mar 2005 19:43:17 -0000	1.3
@@ -5,7 +5,6 @@
 Name:           tetex-armtex
 Version:        2.0
 Release:        1
-Epoch:          0
 Summary:        Support for typesetting Armenian with TeX and LaTeX
 
 Group:          Applications/Publishing
@@ -23,7 +22,7 @@
 Requires(postun): tetex
 BuildArch:      noarch
 
-%description 
+%description
 ArmTeX adds support to TeX and LaTeX for typesetting text using the
 Armenian script. It can be used with both OT6 and ArmSCII8 encodings.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/themes-backgrounds-gnome/devel themes-backgrounds-gnome.spec,
	1.4, 1.5
Message-ID: <200503051943.j25JhJPg007584@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/themes-backgrounds-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/themes-backgrounds-gnome/devel

Modified Files:
	themes-backgrounds-gnome.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: themes-backgrounds-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/devel/themes-backgrounds-gnome.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- themes-backgrounds-gnome.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ themes-backgrounds-gnome.spec	5 Mar 2005 19:43:17 -0000	1.5
@@ -1,8 +1,7 @@
-Summary:        Assorted Backgrounds from art.gnome.org.
+Summary:        Assorted Backgrounds from art.gnome.org
 Name:           themes-backgrounds-gnome
 Version:        0.3
 Release:        2
-Epoch:          0
 License:        GPL
 Group:          User Interface/Desktops
 URL:            http://art.gnome.org
@@ -12,28 +11,24 @@
 
 %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/
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
@@ -41,7 +36,6 @@
 %dir %{_datadir}/backgrounds/images/
 %{_datadir}/backgrounds/images/art.gnome.org/
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Thu Aug 14 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.3-0.fdr.2



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-lgrind/devel tetex-lgrind.spec,1.6,1.7
Message-ID: <200503051943.j25JhJ14007574@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-lgrind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-lgrind/devel

Modified Files:
	tetex-lgrind.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-lgrind.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-lgrind/devel/tetex-lgrind.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tetex-lgrind.spec	4 Mar 2005 21:00:24 -0000	1.6
+++ tetex-lgrind.spec	5 Mar 2005 19:43:17 -0000	1.7
@@ -1,5 +1,5 @@
 %define texmf       %{_datadir}/texmf
-%define tdsname     lgrind 
+%define tdsname     lgrind
 %define itexhash    $RPM_INSTALL_PREFIX/bin/texhash
 %define itexmf      $RPM_INSTALL_PREFIX/share/texmf
 
@@ -7,7 +7,6 @@
 Name:             tetex-lgrind
 Version:          3.67
 Release:          4
-Epoch:            0
 URL:              http://www.ctan.org/tex-archive/support/lgrind
 License:          BSD
 Group:            Applications/Publishing
@@ -45,7 +44,7 @@
 
 %install
 rm -rf %{buildroot}
- 
+
 # Install TeX files.
 mkdir -p %{buildroot}%{texmf}/tex/latex/%{tdsname}/
 install -m 644 lgrind.sty %{buildroot}%{texmf}/tex/latex/%{tdsname}/



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/t1utils/devel t1utils.spec,1.5,1.6
Message-ID: <200503051943.j25JhJQU007536@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/t1utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/t1utils/devel

Modified Files:
	t1utils.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: t1utils.spec
===================================================================
RCS file: /cvs/extras/rpms/t1utils/devel/t1utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- t1utils.spec	10 Dec 2004 22:03:11 -0000	1.5
+++ t1utils.spec	5 Mar 2005 19:43:17 -0000	1.6
@@ -1,20 +1,19 @@
 Name:		t1utils
 Version:	1.32
 Release:	1
-Epoch:          0
 Summary:	Collection of Type 1 and 2 font manipulation utilities
 
 Group:		Applications/Publishing
 License:	Freely modifiable and 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)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 t1utils is a collection of programs for manipulating PostScript type 1
 and type 2 fonts containing programs to convert between PFA (ASCII)
 format, PFB (binary) format, a human-readable and editable ASCII
-format, and Macintosh resource forks. 
+format, and Macintosh resource forks.
 
 
 %prep



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-eurofont/devel tetex-eurofont.spec,1.2,1.3
Message-ID: <200503051943.j25JhJxZ007556@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-eurofont/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-eurofont/devel

Modified Files:
	tetex-eurofont.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-eurofont.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-eurofont/devel/tetex-eurofont.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tetex-eurofont.spec	10 Dec 2004 22:03:12 -0000	1.2
+++ tetex-eurofont.spec	5 Mar 2005 19:43:17 -0000	1.3
@@ -1,14 +1,13 @@
-Name: 		tetex-eurofont
-Version:	1.1.3
-Release: 	2
-Epoch:		0
-Summary: 	Provides a command that prints a euro symbol.
+Name:           tetex-eurofont
+Version:        1.1.3
+Release:        2
+Summary:        Provides a command that prints a euro symbol
 
-Group: 		Applications/Publishing
+Group:          Applications/Publishing
 License:        LaTeX Project Public License
-Url: 		http://tug.ctan.org/tex-archive/macros/latex/contrib/eurofont
-Source:		ftp://ftp.dante.de/tex-archive/macros/latex/contrib/eurofont.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:            http://tug.ctan.org/tex-archive/macros/latex/contrib/eurofont
+Source:         ftp://ftp.dante.de/tex-archive/macros/latex/contrib/eurofont.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 Requires:       tetex-latex
@@ -46,7 +45,7 @@
 latex eurofont.dtx
 
 %install
-rm -rf $RPM_BUILD_ROOT 
+rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{eurofontpath}
 install -m 644 *.fd $RPM_BUILD_ROOT%{eurofontpath}
@@ -77,9 +76,11 @@
 %changelog
 * Tue Sep 14 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:1.1.3-0.fdr.2
 - Use the good source tarball
+
 * Tue Sep 14 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:1.1.3-0.fdr.1
 - Add BuildRequires tetex-latex
 - Remove Provides tetex-eurofont
 - Directory /usr/share/texmf/fonts/tfm/adobe should not be owned by this package
+
 * Thu Jul 22 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:1.1.3-0.fdr.0
 - Initial Fedora RPM



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/t1lib/devel t1lib.spec,1.3,1.4
Message-ID: <200503051943.j25JhJ0e007532@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/t1lib/devel

Modified Files:
	t1lib.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- t1lib.spec	10 Dec 2004 22:03:11 -0000	1.3
+++ t1lib.spec	5 Mar 2005 19:43:17 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           t1lib
 Version:        5.0.2
 Release:        1
-Epoch:          0
 Summary:        PostScript Type 1 font rasterizer
 
 Group:          Applications/Publishing
@@ -26,7 +25,7 @@
 T1lib is a rasterizer library for Adobe Type 1 Fonts. It supports
 rotation and transformation, kerning underlining and antialiasing. It
 does not depend on X11, but does provides some special functions for
-X11. 
+X11.
 
 AFM-files can be generated from Type 1 font files and font subsetting
 is possible.
@@ -34,7 +33,7 @@
 %package        devel
 Summary:        Header files and static libraries for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 This package contains header files and static libraries for %{name}.



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc.spec,1.2,1.3
Message-ID: <200503051943.j25JhJHm007560@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-font-cm-lgc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-font-cm-lgc/devel

Modified Files:
	tetex-font-cm-lgc.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-font-cm-lgc.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-cm-lgc/devel/tetex-font-cm-lgc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tetex-font-cm-lgc.spec	28 Nov 2004 05:20:14 -0000	1.2
+++ tetex-font-cm-lgc.spec	5 Mar 2005 19:43:17 -0000	1.3
@@ -5,8 +5,7 @@
 Name:           tetex-font-cm-lgc
 Version:        0.3.1
 Release:        1
-Epoch:          0
-Summary:        The CM-LGC Type1 fonts for LaTeX
+Summary:        CM-LGC Type1 fonts for LaTeX
 
 Group:          Applications/Publishing
 License:        GPL
@@ -43,7 +42,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
- 
+
 mkdir -p $RPM_BUILD_ROOT%{texmf}/tex/latex/%{tdsname}
 install -p -m 644 tex/latex/cm-lgc/* $RPM_BUILD_ROOT%{texmf}/tex/latex/%{tdsname}/
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tidy/devel tidy.spec,1.6,1.7
Message-ID: <200503051943.j25JhJBW007591@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tidy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tidy/devel

Modified Files:
	tidy.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tidy.spec
===================================================================
RCS file: /cvs/extras/rpms/tidy/devel/tidy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tidy.spec	17 Dec 2004 19:22:39 -0000	1.6
+++ tidy.spec	5 Mar 2005 19:43:17 -0000	1.7
@@ -1,7 +1,6 @@
 Name:           tidy
 Version:        0.99.0
 Release:        2.20041214
-Epoch:          0
 Summary:        Utility to clean up and pretty print HTML/XHTML/XML
 
 Group:          Applications/Text
@@ -33,7 +32,7 @@
 %package     -n lib%{name}-devel
 Summary:        Development files for tidy
 Group:          Development/Libraries
-Requires:       lib%{name} = %{epoch}:%{version}-%{release}
+Requires:       lib%{name} = %{version}-%{release}
 
 %description -n lib%{name}-devel
 %{summary}.



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-font-tipa/devel tetex-font-tipa.spec,1.2,1.3
Message-ID: <200503051943.j25JhJgJ007570@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-font-tipa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-font-tipa/devel

Modified Files:
	tetex-font-tipa.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-font-tipa.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-tipa/devel/tetex-font-tipa.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tetex-font-tipa.spec	10 Dec 2004 22:03:12 -0000	1.2
+++ tetex-font-tipa.spec	5 Mar 2005 19:43:17 -0000	1.3
@@ -5,8 +5,7 @@
 Name:           tetex-font-tipa
 Version:        1.3
 Release:        1
-Epoch:          0
-Summary:        The TIPA fonts for LaTeX
+Summary:        TIPA fonts for LaTeX
 
 Group:          Applications/Publishing
 License:        LaTeX Project Public License
@@ -42,7 +41,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
- 
+
 mkdir -p $RPM_BUILD_ROOT%{texmf}/tex/latex/%{tdsname}
 install -p -m 644 sty/{*.sty,*.fd,*.def} $RPM_BUILD_ROOT%{texmf}/tex/latex/%{tdsname}/
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tpctl/devel tpctl.spec,1.7,1.8
Message-ID: <200503051943.j25JhJdT007617@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tpctl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tpctl/devel

Modified Files:
	tpctl.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tpctl.spec
===================================================================
RCS file: /cvs/extras/rpms/tpctl/devel/tpctl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tpctl.spec	12 Feb 2005 18:47:27 -0000	1.7
+++ tpctl.spec	5 Mar 2005 19:43:17 -0000	1.8
@@ -1,7 +1,6 @@
 Name:           tpctl
 Version:        4.17
 Release:        1
-Epoch:          0
 Summary:        IBM ThinkPad configuration tools
 
 Group:          System Environment/Base
@@ -15,7 +14,7 @@
 
 ExclusiveArch:  %{ix86}
 BuildRequires:  ncurses-devel, libtool
-Requires:       kernel-module-thinkpad >= 0:3.2
+Requires:       kernel-module-thinkpad >= 3.2
 
 %description
 tpctl is a package of IBM ThinkPad configuration tools for Linux.
@@ -23,7 +22,7 @@
 %package     -n apmiser
 Summary:        IBM ThinkPad APM settings daemon
 Group:          System Environment/Daemons
-Requires:       %{name} = %{epoch}:%{version}
+Requires:       %{name} = %{version}
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tpb/devel tpb.spec,1.5,1.6
Message-ID: <200503051943.j25JhJ5b007612@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tpb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tpb/devel

Modified Files:
	tpb.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tpb.spec
===================================================================
RCS file: /cvs/extras/rpms/tpb/devel/tpb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tpb.spec	9 Feb 2005 22:01:51 -0000	1.5
+++ tpb.spec	5 Mar 2005 19:43:17 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           tpb
 Version:        0.6.3
 Release:        2
-Epoch:          0
 Summary:        IBM ThinkPad button support utility
 
 Group:          System Environment/Base
@@ -13,7 +12,7 @@
 Patch0:         %{name}-defaultconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xosd-devel >= 0:2.0.0, XFree86-devel, gettext, /sbin/MAKEDEV
+BuildRequires:  xosd-devel >= 2.0.0, XFree86-devel, gettext, /sbin/MAKEDEV
 Requires:       udev
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/treecc/devel treecc.spec,1.6,1.7
Message-ID: <200503051943.j25JhJ6Y007621@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/treecc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/treecc/devel

Modified Files:
	treecc.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: treecc.spec
===================================================================
RCS file: /cvs/extras/rpms/treecc/devel/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	5 Mar 2005 19:43:17 -0000	1.7
@@ -1,7 +1,7 @@
 Name:           treecc
 Version:        0.3.4
 Release:        2
-Summary:        Tree Compiler Compiler.
+Summary:        Tree Compiler Compiler
 
 Group:          Development/Tools
 License:        GPL
@@ -47,7 +47,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
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tripwire/devel tripwire.spec,1.4,1.5
Message-ID: <200503051943.j25JhJNw007625@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tripwire/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tripwire/devel

Modified Files:
	tripwire.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tripwire.spec
===================================================================
RCS file: /cvs/extras/rpms/tripwire/devel/tripwire.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tripwire.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ tripwire.spec	5 Mar 2005 19:43:17 -0000	1.5
@@ -1,10 +1,9 @@
 %define		path_to_vi /bin/vi
 %define		path_to_sendmail /usr/sbin/sendmail
-Summary:	An IDS (Intrusion Detection System)
+Summary:	IDS (Intrusion Detection System)
 Name:		tripwire
 Version:	2.3.1
 Release:	21
-Epoch:		0
 License:	GPL
 Group:		Applications/System
 Source0:	http://download.sourceforge.net/tripwire/tripwire-2.3.1-2.tar.gz
@@ -207,7 +206,7 @@
 * Fri Nov 28 2003 Keith G. Robertson-Turner <tripwire-devel[AT]genesis-x.nildram.co.uk> 0:2.3.1-18.fdr.3
 - Thanks to Michael Schwendt for really cleaning up the Spec file
 - The remaining parts of the  original  tripwire-2.3.1-gcc3.patch  have
-  now been implemented 
+  now been implemented
 - Debuginfo fully builds now
 
 * Thu Nov 27 2003 Keith G. Robertson-Turner <tripwire-devel[AT]genesis-x.nildram.co.uk> 0:2.3.1-18.fdr.2
@@ -269,7 +268,7 @@
 
 * Tue Jul 10 2001 Mike A. Harris <mharris at redhat.com> 2.3.1-3
 - Made package own dir /var/lib/tripwire
- 
+
 * Mon Jun 25 2001 Nalin Dahyabhai <nalin at redhat.com>
 - update to 2.3.1-2
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tuxpaint/devel tuxpaint.spec,1.4,1.5
Message-ID: <200503051943.j25JhJYg007636@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tuxpaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tuxpaint/devel

Modified Files:
	tuxpaint.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tuxpaint.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/tuxpaint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tuxpaint.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ tuxpaint.spec	5 Mar 2005 19:43:17 -0000	1.5
@@ -2,23 +2,23 @@
 Version:        0.9.13
 Release:        1
 Epoch:          1
-Summary:        Drawing program designed for young children.
+Summary:        Drawing program designed for young children
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.newbreedsoftware.com/tuxpaint/
 Source0:        http://dl.sf.net/tuxpaint/tuxpaint-0.9.13.tar.gz
-Source1:	%{name}.desktop
-Patch0:		%{name}-%{version}-destdir.patch
+Source1:        %{name}.desktop
+Patch0:         %{name}-%{version}-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel >= 0:1.2.4, SDL_image-devel, SDL_ttf-devel
-BuildRequires:	SDL_mixer-devel, libpng-devel, freetype-devel >= 0:2.0, gettext
-BuildRequires:	netpbm-devel, gnome-libs-devel, kdelibs, desktop-file-utils
+BuildRequires:  SDL-devel >= 1.2.4, SDL_image-devel, SDL_ttf-devel
+BuildRequires:  SDL_mixer-devel, libpng-devel, freetype-devel >= 2.0, gettext
+BuildRequires:  netpbm-devel, gnome-libs-devel, kdelibs, desktop-file-utils
 
 %description
-"Tux Paint" is a free drawing program designed for young children 
-(kids ages 3 and up). It has a simple, easy-to-use interface, 
+"Tux Paint" is a free drawing program designed for young children
+(kids ages 3 and up). It has a simple, easy-to-use interface,
 fun sound effects, and a cartoon mascot who helps you along.
 
 %prep
@@ -35,14 +35,14 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applnk/Graphics
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/{16x16,32x32,48x48}/apps/
 make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_usr} \
-			 X11_ICON_PREFIX=%{_datadir}/pixmaps/
+	X11_ICON_PREFIX=%{_datadir}/pixmaps/
 find $RPM_BUILD_ROOT -type d|xargs chmod 0755
 %find_lang %{name}
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-			 --vendor fedora \
-			 --add-category X-Fedora \
-			 %{SOURCE1}
+	--vendor fedora \
+	--add-category X-Fedora \
+	%{SOURCE1}
 
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/gnome/
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/applnk/



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tdl/devel tdl.spec,1.6,1.7
Message-ID: <200503051943.j25JhJFD007544@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tdl/devel

Modified Files:
	tdl.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tdl.spec
===================================================================
RCS file: /cvs/extras/rpms/tdl/devel/tdl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tdl.spec	4 Mar 2005 21:00:23 -0000	1.6
+++ tdl.spec	5 Mar 2005 19:43:17 -0000	1.7
@@ -1,15 +1,14 @@
 # $Id$
 
-Summary:		A to-do list manager
-Name:			tdl
-Version:		1.5.2
-Release:		1
-Epoch:			0
-URL:			http://www.rc0.org.uk/tdl/index.html
-License:		GPL
-Group:			Applications/Productivity
-Source0:		http://www.rpcurnow.force9.co.uk/tdl/tdl-1.5.2.tar.gz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
+Summary:	To-do list manager
+Name:		tdl
+Version:	1.5.2
+Release:	1
+URL:		http://www.rc0.org.uk/tdl/index.html
+License:	GPL
+Group:		Applications/Productivity
+Source0:	http://www.rpcurnow.force9.co.uk/tdl/tdl-1.5.2.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	libtermcap-devel, readline-devel, texinfo
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
@@ -44,7 +43,7 @@
 /sbin/install-info %{_infodir}/tdl.info %{_infodir}/dir 2>/dev/null || :
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
     /sbin/install-info --delete %{_infodir}/tdl.info \
       %{_infodir}/dir 2>/dev/null || :
 fi



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-font-kerkis/devel tetex-font-kerkis.spec,1.2,1.3
Message-ID: <200503051943.j25JhJxG007565@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-font-kerkis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-font-kerkis/devel

Modified Files:
	tetex-font-kerkis.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-font-kerkis.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-kerkis/devel/tetex-font-kerkis.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tetex-font-kerkis.spec	10 Dec 2004 22:03:12 -0000	1.2
+++ tetex-font-kerkis.spec	5 Mar 2005 19:43:17 -0000	1.3
@@ -5,8 +5,7 @@
 Name:           tetex-font-kerkis
 Version:        2.0
 Release:        2
-Epoch:          0
-Summary:        The Kerkis type 1 fonts for LaTeX
+Summary:        Kerkis type 1 fonts for LaTeX
 
 Group:          Applications/Publishing
 License:        Distributable
@@ -21,7 +20,7 @@
 BuildArch:      noarch
 
 %description
-This package contains the Kerkis type 1 fonts for LaTeX. 
+This package contains the Kerkis type 1 fonts for LaTeX.
 
 These fonts are particularly useful for typesetting Greek. The
 Greek repertoire includes full support for polytonic Greek, Greek
@@ -44,7 +43,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
- 
+
 mkdir -p $RPM_BUILD_ROOT%{texmf}/tex/latex/%{tdsname}
 install -p -m 644 tex/{*.sty,*.fd} $RPM_BUILD_ROOT%{texmf}/tex/latex/%{tdsname}/
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tetex-unicode/devel tetex-unicode.spec,1.3,1.4
Message-ID: <200503051943.j25JhJN8007578@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tetex-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tetex-unicode/devel

Modified Files:
	tetex-unicode.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tetex-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-unicode/devel/tetex-unicode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tetex-unicode.spec	10 Dec 2004 22:03:12 -0000	1.3
+++ tetex-unicode.spec	5 Mar 2005 19:43:17 -0000	1.4
@@ -1,7 +1,6 @@
-Name:           tetex-unicode
+Name:
 Version:        0
 Release:        2.20040307
-Epoch:          0
 Summary:        Unicode support for LaTeX
 
 Group:          Applications/Publishing
@@ -15,7 +14,7 @@
 Requires(post): tetex
 Requires(postun):  tetex
 
-Provides:       tetex-ucs = %{epoch}:%{version}-%{release}
+Provides:       tetex-ucs = %{version}-%{release}
 
 %define unicodepath %{_datadir}/texmf/tex/latex/unicode
 
@@ -51,7 +50,7 @@
 texhash %{_datadir}/texmf >/dev/null 2>&1
 
 
-%files 
+%files
 %defattr(644,root,root,755)
 %doc LICENSE VERSION README FAQ ucs.ps.gz languages.ps.gz
 %unicodepath



From fedora-extras-commits at redhat.com  Sat Mar  5 19:43:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:43:19 -0500
Subject: rpms/tin/devel tin.spec,1.7,1.8
Message-ID: <200503051943.j25JhJ5o007595@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7454/tin/devel

Modified Files:
	tin.spec 
Log Message:
Mass letter "t" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: tin.spec
===================================================================
RCS file: /cvs/extras/rpms/tin/devel/tin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tin.spec	10 Dec 2004 22:03:12 -0000	1.7
+++ tin.spec	5 Mar 2005 19:43:17 -0000	1.8
@@ -1,8 +1,7 @@
 Name: tin
 Version: 1.6.2
 Release: 2
-Epoch: 0
-Summary: A basic Internet news reader.
+Summary: Basic Internet news reader
 Group: Applications/Internet
 License: Distributable
 URL: http://www.tin.org/
@@ -10,7 +9,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel, byacc, desktop-file-utils, pcre-devel
 
-#---------------------------------------------------------------------
 
 %description
 Tin is a basic, easy to use Internet news reader.  Tin can read news
@@ -19,12 +17,10 @@
 
 Install tin if you need a basic news reader.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
 
-#---------------------------------------------------------------------
 
 %build
 %configure \
@@ -44,7 +40,6 @@
 %{__make} clean %{?_smp_mflags}
 %{__make} build %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/pcre"
 
-#---------------------------------------------------------------------
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -69,12 +64,10 @@
 # url_handler.sh conflicts with mutt
 %{__rm} -f $RPM_BUILD_ROOT/%{_bindir}/url_handler.sh
 
-#---------------------------------------------------------------------
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root)
@@ -89,7 +82,6 @@
 /usr/share/locale/*/*/*
 %{_datadir}/applications/*%{name}.desktop
 
-#---------------------------------------------------------------------
 
 %changelog
 * Thu Jun 24 2004 Adrian Reber <adrian at lisas.de> - 0:1.6.2-0.fdr.2
@@ -150,7 +142,7 @@
 - fix libdir=/var/lib/news (#7).
 - fix spooldir=/var/spool/news.
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
 - auto rebuild in the new build environment (release 3)
 
 * Tue Mar 09 1999 Preston Brown <pbrown at redhat.com>



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/wxPythonGTK2/devel wxPython.spec,1.5,1.6
Message-ID: <200503051955.j25JtulN008157@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/wxPythonGTK2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/wxPythonGTK2/devel

Modified Files:
	wxPython.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/wxPythonGTK2/devel/wxPython.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wxPython.spec	10 Feb 2005 19:02:14 -0000	1.5
+++ wxPython.spec	5 Mar 2005 19:55:54 -0000	1.6
@@ -5,8 +5,7 @@
 Name:           wxPythonGTK2
 Version:        2.4.2.4
 Release:        4
-Epoch:          0
-Summary:        wxPython is a GUI toolkit for the Python programming language.
+Summary:        GUI toolkit for the Python programming language
 
 Group:          Development/Languages
 License:        LGPL
@@ -14,19 +13,19 @@
 Source0:        http://dl.sf.net/wxpython/wxPythonSrc-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  wxGTK2-devel >= 0:2.4.2, pkgconfig
-BuildRequires:	zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
-BuildRequires:	python-devel, wxGTK2-gl
+BuildRequires:  wxGTK2-devel >= 2.4.2, pkgconfig
+BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
+BuildRequires:  python-devel, wxGTK2-gl
 Requires:       %{_bindir}/python%{pyver}
 
 # This is what other packages should depend on, NOT the package name!
-Provides:	wxPython = %{epoch}:%{version}-%{release}
+Provides:       wxPython = %{version}-%{release}
 
 %description
-wxPython is a GUI toolkit for the Python programming language. It allows 
+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 
+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
@@ -55,7 +54,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples 
+%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples
 %{_bindir}/*
 %{_libdir}/python%{pyver}/site-packages/wxPython
 %{_libdir}/python%{pyver}/site-packages/wx



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/ucl/devel ucl.spec,1.3,1.4
Message-ID: <200503051955.j25Jtuvp008106@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ucl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/ucl/devel

Modified Files:
	ucl.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ucl.spec
===================================================================
RCS file: /cvs/extras/rpms/ucl/devel/ucl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ucl.spec	10 Dec 2004 22:03:12 -0000	1.3
+++ ucl.spec	5 Mar 2005 19:55:54 -0000	1.4
@@ -1,7 +1,6 @@
 Name:           ucl
 Version:        1.03
 Release:        1
-Epoch:          0
 Summary:        Portable lossless data compression library
 
 Group:          System Environment/Libraries
@@ -19,7 +18,7 @@
 %package        devel
 Summary:        UCL development files
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 %{summary}.



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/uqm/devel uqm.spec,1.4,1.5
Message-ID: <200503051955.j25Jtu6X008122@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/uqm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/uqm/devel

Modified Files:
	uqm.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: uqm.spec
===================================================================
RCS file: /cvs/extras/rpms/uqm/devel/uqm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- uqm.spec	11 Dec 2004 15:54:10 -0000	1.4
+++ uqm.spec	5 Mar 2005 19:55:54 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           uqm
 Version:        0.3
 Release:        3
-Epoch:          0
-Summary:        The Ur-Quan Masters
+Summary:        The Ur-Quan Masters, a port of the classic game Star Control II
 
 Group:          Amusements/Games
 License:        GPL
@@ -17,10 +16,10 @@
 Patch3:         %{name}-gcc34MM.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel >= 0:1.2.3, SDL_image-devel, SDL_mixer-devel
+BuildRequires:  SDL-devel >= 1.2.3, SDL_image-devel, SDL_mixer-devel
 BuildRequires:  libvorbis-devel, zlib-devel, perl, desktop-file-utils
 BuildRequires:  ImageMagick
-Requires:       %{name}-content >= 0:0.3
+Requires:       %{name}-content >= 0.3
 
 %description
 The Ur-Quan Masters is a port of the classic game Star Control II to



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/w3c-markup-validator/devel w3c-markup-validator.spec,1.2,1.3
Message-ID: <200503051955.j25Jtu6m008137@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/w3c-markup-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/w3c-markup-validator/devel

Modified Files:
	w3c-markup-validator.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- w3c-markup-validator.spec	10 Dec 2004 22:03:12 -0000	1.2
+++ w3c-markup-validator.spec	5 Mar 2005 19:55:54 -0000	1.3
@@ -1,7 +1,6 @@
 Name:           w3c-markup-validator
 Version:        0.6.7
 Release:        1
-Epoch:          0
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -13,7 +12,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl
-Requires:       httpd, openjade >= 0:1.3.2, %{name}-libs = %{epoch}:%{version}
+Requires:       httpd, openjade >= 1.3.2, %{name}-libs = %{version}
 Obsoletes:      w3c-validator
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/vnc-ltsp-config/devel vnc-ltsp-config.spec,1.2,1.3
Message-ID: <200503051955.j25JtuE3008133@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/vnc-ltsp-config/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/vnc-ltsp-config/devel

Modified Files:
	vnc-ltsp-config.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: vnc-ltsp-config.spec
===================================================================
RCS file: /cvs/extras/rpms/vnc-ltsp-config/devel/vnc-ltsp-config.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vnc-ltsp-config.spec	10 Dec 2004 22:03:12 -0000	1.2
+++ vnc-ltsp-config.spec	5 Mar 2005 19:55:54 -0000	1.3
@@ -1,8 +1,6 @@
-
 Summary: Easy Enabler of VNC remote LTSP desktops
 Name:	 vnc-ltsp-config
-Epoch:	 0
-Version: 4.0 
+Version: 4.0
 Release: 2
 License: GPL
 Group: 	 User Interface/X
@@ -18,16 +16,16 @@
 # Xvnc default options
 Source3: vncts.sysconfig
 
-Requires: vnc-server >= 0:%{version}
+Requires: vnc-server >= %{version}
 Requires: xinetd
 
 Requires(preun): chkconfig
-Requires(post): perl 
-Requires(postun): perl 
+Requires(post): perl
+Requires(postun): perl
 
 %description
-Easy Enabler of VNC remote LTSP desktops.  This package contains xinetd.d 
-configurations that allow incoming VNC clients to open a new desktop session 
+Easy Enabler of VNC remote LTSP desktops.  This package contains xinetd.d
+configurations that allow incoming VNC clients to open a new desktop session
 with each connection.  Xvnc connects to the local server using XDMCP.
 
 
@@ -57,18 +55,18 @@
   cat %{_datadir}/vnc/vncts.services >> %{_sysconfdir}/services ||:
 fi
 
-%preun 
+%preun
 if [ $1 -eq 0 ]; then
   # turn off now, to avoid running in middle of uninstall
   /sbin/chkconfig vncts off ||:
 fi
 
-%postun 
+%postun
 if [ $1 -eq 0 ]; then
   ## cleanup services
   # method1: grep
   # grep -v -e '^vnc-............59../tcp' %{_sysconfdir}/services > %{_sysconfdir}/services.%{name} && \
-  #mv -f %{_sysconfdir}/services.%{name} %{_sysconfdir}/services 
+  #mv -f %{_sysconfdir}/services.%{name} %{_sysconfdir}/services
   # method2: perl
   perl -ni -e 'print if ! /^vnc-............59..\/tcp/' %{_sysconfdir}/services ||:
   # method3: sed ??



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/upx/devel upx.spec,1.4,1.5
Message-ID: <200503051955.j25JtuCe008117@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/upx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/upx/devel

Modified Files:
	upx.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: upx.spec
===================================================================
RCS file: /cvs/extras/rpms/upx/devel/upx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- upx.spec	17 Dec 2004 17:58:40 -0000	1.4
+++ upx.spec	5 Mar 2005 19:55:54 -0000	1.5
@@ -1,8 +1,7 @@
 Name:           upx
 Version:        1.25
 Release:        2
-Epoch:          0
-Summary:        The Ultimate Packer for eXecutables
+Summary:        Ultimate Packer for eXecutables
 
 Group:          Applications/Archiving
 License:        GPL
@@ -12,7 +11,7 @@
 Patch1:         %{name}-nostrip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ucl-devel >= 0:1.01, perl
+BuildRequires:  ucl-devel >= 1.01, perl
 
 %description
 UPX is a free, portable, extendable, high-performance executable



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/util-vserver/devel util-vserver.spec,1.2,1.3
Message-ID: <200503051955.j25JtuDS008126@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/util-vserver/devel

Modified Files:
	util-vserver.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util-vserver.spec	3 Feb 2005 00:53:33 -0000	1.2
+++ util-vserver.spec	5 Mar 2005 19:55:54 -0000	1.3
@@ -21,7 +21,6 @@
 Name:		util-vserver
 Version:	0.30.203
 Release:	%release_func 1
-Epoch:		0
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -29,11 +28,11 @@
 Source1:	http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%name-%version.tar.bz2.asc
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
-Requires:	%name-core = %epoch:%version-%release
-Requires:	%name-lib  = %epoch:%version-%release
+Requires:	%name-core = %version-%release
+Requires:	%name-lib  = %version-%release
 Requires:	diffutils mktemp sed
-Provides:	vserver = %epoch:%version-%release
-Obsoletes:	vserver < %epoch:%version
+Provides:	vserver = %version-%release
+Obsoletes:	vserver < %version
 BuildRequires:	mount vconfig gawk iproute iptables
 BuildRequires:	gcc-c++ wget
 BuildRequires:	e2fsprogs-devel
@@ -57,7 +56,7 @@
 Summary:		Tools which can be used to build vservers
 Group:			Applications/System
 Requires:		rpm apt wget binutils tar e2fsprogs
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(pre):		%confdir
 Requires(postun):	%confdir
 
@@ -67,7 +66,7 @@
 Provides:		init(%name) = sysv
 Requires:		make diffutils
 Requires:		initscripts
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(post):		%chkconfig
 Requires(preun):	%chkconfig
 Requires(pre):		%_initrddir %pkglibdir
@@ -76,14 +75,14 @@
 %package legacy
 Summary:		Legacy utilities for util-vserver
 Group:			Applications/System
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(post):		%chkconfig
 Requires(preun):	%chkconfig
 Requires(pre):		%_initrddir %pkglibdir
 requires(postun):	%_initrddir %pkglibdir
 
 %package devel
-Summary:		Header-files and libraries which are needed to develop vserver based applications
+Summary:		Header-files and libraries needed to develop vserver based applications
 Group:			Development/Libraries
 Requires:		pkgconfig
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/wbxml2/devel wbxml2.spec,1.3,1.4
Message-ID: <200503051955.j25JtujZ008142@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/wbxml2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/wbxml2/devel

Modified Files:
	wbxml2.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/devel/wbxml2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wbxml2.spec	10 Dec 2004 22:03:12 -0000	1.3
+++ wbxml2.spec	5 Mar 2005 19:55:54 -0000	1.4
@@ -1,21 +1,20 @@
 Name:           wbxml2
 Version:        0.9.0
 Release:        2
-Epoch:          0
-Summary:        Library and tools to parse, encode and handle WBXML documents.
+Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://libwbxml.aymerick.com/
 Source0:        http://dl.sf.net/sourceforge/wbxmllib/wbxml2-0.9.0-src.tar.gz
-Patch0:		wbxml2-0.9.0-am_cflags.patch
+Patch0:         wbxml2-0.9.0-am_cflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  popt, expat-devel, zlib-devel
-BuildRequires:	libtool, automake, autoconf
+BuildRequires:  libtool, automake, autoconf
 
 %description
-The WBXML Library (aka libwbxml) contains a library and its associated tools 
+The WBXML Library (aka libwbxml) contains a library and its associated tools
 to Parse, Encode and Handle WBXML documents.
 
 The WBXML format is a binary representation of XML, defined by the Wap Forum,
@@ -26,7 +25,7 @@
 %package        devel
 Summary:        %{summary}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 This package contains the libraries, include files and documentation



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/wv/devel wv.spec,1.5,1.6
Message-ID: <200503051955.j25JtufA008153@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/wv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/wv/devel

Modified Files:
	wv.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/wv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wv.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ wv.spec	5 Mar 2005 19:55:54 -0000	1.6
@@ -2,7 +2,6 @@
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
 Version:    1.0.0
 Release:    3
-Epoch:      0
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
@@ -11,13 +10,13 @@
 Patch1:     wv-wvdvi-copy.patch
 Patch2:     wv-docbook-filename.patch
 # patch3: deal with filenames containing spaces
-Patch3:     wv-wvmime-tmp-filename.patch 
+Patch3:     wv-wvmime-tmp-filename.patch
 Patch4:     wv-field.c.patch
 
 #BuildRequires: XFree86-devel
 BuildRequires: glib2-devel
 BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel 
+BuildRequires: libpng-devel
 BuildRequires: libxml2-devel
 BuildRequires: ImageMagick-devel
 BuildRequires: pkgconfig
@@ -42,7 +41,7 @@
 
 %build
 %configure --with-exporter \
-           --with-libxml2 
+           --with-libxml2
 
 make %{?_smp_mflags}
 
@@ -51,7 +50,7 @@
 %makeinstall
 
 #ln -sf wvConvert $RPM_BUILD_ROOT/%{_bindir}/wvText
-mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_datadir} 
+mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_datadir}
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -exec rm -f {} \;
 
 %clean
@@ -64,7 +63,7 @@
 
 %files
 %defattr(-,root,root)
-%doc COPYING  README 
+%doc COPYING README
 %{_bindir}/wv*
 %{_datadir}/wv
 %{_includedir}/wv



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/ulogd/devel ulogd.spec,1.6,1.7
Message-ID: <200503051955.j25Jtuke008110@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ulogd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/ulogd/devel

Modified Files:
	ulogd.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ulogd.spec	28 Feb 2005 21:12:57 -0000	1.6
+++ ulogd.spec	5 Mar 2005 19:55:54 -0000	1.7
@@ -12,12 +12,12 @@
 Patch2:         ulogd-1.02-init.patch
 Patch3:         ulogd-1.02-pgsql.patch
 Patch4:         ulogd-1.21-x86_64.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(post):	initscripts, chkconfig
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(post): initscripts, chkconfig
 Requires(postun): initscripts, chkconfig
 BuildRequires:  mysql-devel
 BuildRequires:  postgresql-devel
-#BuildRequires:	libpcap-devel
+#BuildRequires:  libpcap-devel
 
 %description
 Ulogd is an universal logging daemon for the ULOG target of netfilter, the
@@ -53,7 +53,7 @@
 %build
 %configure --with-mysql --with-pgsql
 # Does not support parallel builds
-make 
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -78,14 +78,14 @@
 %post
 /sbin/chkconfig --add ulogd
 
-%preun 
-if [ "$1" = 0 ]; then 
+%preun
+if [ $1 -eq 0 ]; then
   /sbin/service ulogd stop > /dev/null 2>&1 ||:
-  /sbin/chkconfig --del ulogd 
+  /sbin/chkconfig --del ulogd
 fi
 
-%postun 
-if [ "$1" -ge "1" ]; then 
+%postun
+if [ $1 -ge 1 ]; then
   /sbin/service ulogd reload > /dev/null 2>&1 ||:
 fi
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/unison/devel unison.spec,1.4,1.5
Message-ID: <200503051955.j25Jtugu008113@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/unison/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/unison/devel

Modified Files:
	unison.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: unison.spec
===================================================================
RCS file: /cvs/extras/rpms/unison/devel/unison.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unison.spec	24 Feb 2005 21:59:42 -0000	1.4
+++ unison.spec	5 Mar 2005 19:55:54 -0000	1.5
@@ -2,18 +2,17 @@
 Name:           unison
 Version:        2.10.2
 Release:        2
-Epoch:          0
 Summary:        Unison is a file-synchronization tool
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.cis.upenn.edu/~bcpierce/unison
 Source:         http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/unison-2.10.2/unison-2.10.2.tar.gz
-Source1:	unison.png
+Source1:        unison.png
 #Patch:          unison-uigtk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ocaml >= 0:3.08, lablgtk >= 0:2.4.0, tetex-latex
-BuildRequires:	desktop-file-utils
+BuildRequires:  ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex
+BuildRequires:  desktop-file-utils
 # for lablgtk
 BuildRequires:  gtk2-devel
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/whowatch/devel whowatch.spec,1.5,1.6
Message-ID: <200503051955.j25JtuJX008149@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/whowatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/whowatch/devel

Modified Files:
	whowatch.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: whowatch.spec
===================================================================
RCS file: /cvs/extras/rpms/whowatch/devel/whowatch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- whowatch.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ whowatch.spec	5 Mar 2005 19:55:54 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           whowatch
 Version:        1.4
 Release:        2
-Epoch:          0
 Summary:        Displays informations about the users currently logged in
 
 Group:          Applications/System
@@ -9,7 +8,7 @@
 URL:            http://wizard.ae.krakow.pl/~mike/
 Source0:        http://wizard.ae.krakow.pl/~mike/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ncurses-devel 
+BuildRequires:  ncurses-devel
 
 %description
 Whowatch is an interactive console utility that displays informations about
@@ -38,7 +37,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO KEYS
 %{_bindir}/*
@@ -47,6 +46,7 @@
 %changelog
 * Mon Aug 25 2003 Nils O. Sel?sdal <NOS at Utel.no> - 0:1.4-0.fdr.1
 - Remove libncurses dependency, and libncurses-devel version dependency
+
 * Wed Aug 20 2003 Nils O. Sel?sdal <NOS at Utel.no> - 0:1.4-0.fdr.1
 - Initial release.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/uudeview/devel uudeview.spec,1.5,1.6
Message-ID: <200503051955.j25JtuEA008129@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/uudeview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/uudeview/devel

Modified Files:
	uudeview.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: uudeview.spec
===================================================================
RCS file: /cvs/extras/rpms/uudeview/devel/uudeview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- uudeview.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ uudeview.spec	5 Mar 2005 19:55:54 -0000	1.6
@@ -1,7 +1,6 @@
 Name:           uudeview
 Version:        0.5.20
 Release:        4
-Epoch:          0
 License:        GPL
 Group:          Applications/File
 Source:         http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
@@ -24,7 +23,7 @@
 %package        -n uulib
 Summary:        Binary news message decoding library
 Group:          Development/Libraries
-Provides:       uulib-devel = %{epoch}:%{version}-%{release}
+Provides:       uulib-devel = %{version}-%{release}
 
 %description    -n uulib
 uulib is a library of functions for decoding uuencoded, xxencoded,
@@ -100,7 +99,7 @@
 
 * Tue May 06 2003 Adrian Reber <adrian at lisas.de> - 0:0.5.18-0.fdr.5
 - extended the patch uudeview-tempname.patch to fix and remove
-  all the remaining security warnings 
+  all the remaining security warnings
 
 * Tue May 06 2003 Adrian Reber <adrian at lisas.de> - 0:0.5.18-0.fdr.4
 - applied tempnam patch from Michael Schwendt to fix security
@@ -119,7 +118,7 @@
   ghostscript, transfig
 - changed Group to an official rpm group
 - added rm -rf RPM_BUILD_ROOT in install section and removed it from
-  prep section 
+  prep section
 - added _smp_mflags to make
 - removed directory doc from package
 - doc/library.tex is transformed to ps and pdf and added to package



From fedora-extras-commits at redhat.com  Sat Mar  5 19:55:56 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 14:55:56 -0500
Subject: rpms/wesnoth/devel wesnoth.spec,1.4,1.5
Message-ID: <200503051955.j25JtuVP008145@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/wesnoth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058/wesnoth/devel

Modified Files:
	wesnoth.spec 
Log Message:
Mass letter "u", "v" and "w" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wesnoth.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ wesnoth.spec	5 Mar 2005 19:55:54 -0000	1.5
@@ -1,25 +1,24 @@
 Name:           wesnoth
 Version:        0.8
 Release:        2
-Epoch:          0
-Summary:        Battle for Wesnoth is a fantasy turn-based strategy game.
+Summary:        Battle for Wesnoth, a fantasy turn-based strategy game
 
-Group:         	Amusements/Games
+Group:          Amusements/Games
 License:        GPL
 URL:            http://www.wesnoth.org
 Source0:        http://www.wesnoth.org/files/wesnoth-0.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, SDL_image-devel, SDL_mixer-devel
-BuildRequires:	SDL_ttf-devel, SDL_net-devel, freetype-devel
-BuildRequires:	desktop-file-utils
+BuildRequires:  SDL_ttf-devel, SDL_net-devel, freetype-devel
+BuildRequires:  desktop-file-utils
 
 %description
-%{summary}
+%{summary}.
 
-Battle for control of villages, using variety of units which have advantages 
-and disadvantages in different types of terrains and against different types 
-of attacks. Units gain experience and advance levels, and are carried over 
+Battle for control of villages, using variety of units which have advantages
+and disadvantages in different types of terrains and against different types
+of attacks. Units gain experience and advance levels, and are carried over
 from one scenario to the next campaign.
 
 %prep
@@ -28,10 +27,10 @@
 
 %build
 %configure --disable-dependency-tracking \
-	   --enable-server \
-	   --enable-editor
+           --enable-server \
+           --enable-editor
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -39,9 +38,9 @@
 %makeinstall
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-		     --mode="0644" --vendor fedora \
-		     --add-category="X-Fedora" icons/%{name}.desktop
-# add icon for menus		     
+                     --mode="0644" --vendor fedora \
+                     --add-category="X-Fedora" icons/%{name}.desktop
+# add icon for menus
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 install -m 644 images/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xmms-modplug/devel xmms-modplug.spec,1.4,1.5
Message-ID: <200503052007.j25K7BuF009214@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-modplug/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/xmms-modplug/devel

Modified Files:
	xmms-modplug.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xmms-modplug.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-modplug/devel/xmms-modplug.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmms-modplug.spec	10 Dec 2004 22:03:13 -0000	1.4
+++ xmms-modplug.spec	5 Mar 2005 20:07:09 -0000	1.5
@@ -3,7 +3,6 @@
 Name:           xmms-modplug
 Version:        2.05
 Release:        1
-Epoch:          0
 Summary:        Modplug Plugin for XMMS
 
 License:        Public Domain
@@ -13,9 +12,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xmms-devel, gtk+-devel, gettext, libmodplug-devel >= 1:0.7
-BuildConflicts: %{name} < 0:2.0
+BuildConflicts: %{name} < 2.0
 Requires:       xmms
-Provides:       modplug-xmms = %{epoch}:%{version}-%{release}
+Provides:       modplug-xmms = %{version}-%{release}
 
 %description
 Modplug-XMMS is a fully featured, complete input plugin for XMMS which



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xca/devel xca.spec,1.4,1.5
Message-ID: <200503052007.j25K7BDc009190@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/xca/devel

Modified Files:
	xca.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xca.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ xca.spec	5 Mar 2005 20:07:09 -0000	1.5
@@ -4,7 +4,6 @@
 Name:		xca
 Version:	0.4.6
 Release:	1
-Epoch:		0
 License:	BSD
 Group:		Applications/Productivity
 URL:		http://www.hohnstaedt.de/xca.html
@@ -28,13 +27,11 @@
 can be imported and exported in several formats like PKCS#7, PKCS#12,
 PEM, DER, PKCS#8.
 
-#-----------------------
 
 %prep
 %setup -q
 %patch0 -p2 -b .gcc3
 
-#-----------------------
 
 %build
 test -n "$QTDIR" || . %{_sysconfdir}/profile.d/qt.sh
@@ -54,7 +51,6 @@
 ./configure
 %__make
 
-#-----------------------
 
 %install
 rm -rf "$RPM_BUILD_ROOT" _doc
@@ -70,12 +66,10 @@
   $RPM_BUILD_ROOT%{_datadir}/applications/xca.desktop
 %endif
 
-#-----------------------
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
-#-----------------------
 
 %files
 %defattr(-,root,root,-)
@@ -92,7 +86,6 @@
 %{_datadir}/applications/*
 %endif
 
-#-----------------------
 
 %changelog
 * Sat Dec 13 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.4.6-0.fdr.1
@@ -104,7 +97,7 @@
 - removed desktop patch which went upstream
 
 * Fri Aug 15 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:0.4.5-0.fdr.2
-- applied Ville Skytt??'s patch to add categories and to fix encoding of desktop-file 
+- applied Ville Skytt??'s patch to add categories and to fix encoding of desktop-file
   (http://sourceforge.net/tracker/index.php?func=detail&aid=789374&group_id=62274&atid=500027)
 - removed '--add-category ...' options which become obsoleted by this
   patch
@@ -150,5 +143,5 @@
 - added dbpriv patch
 - added desktop entry
 
-* Fri Jun  6 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 
+* Fri Jun  6 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xmms-alarm/devel xmms-alarm.spec,1.5,1.6
Message-ID: <200503052007.j25K7BNR009206@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-alarm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/xmms-alarm/devel

Modified Files:
	xmms-alarm.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xmms-alarm.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-alarm/devel/xmms-alarm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmms-alarm.spec	10 Dec 2004 22:03:13 -0000	1.5
+++ xmms-alarm.spec	5 Mar 2005 20:07:09 -0000	1.6
@@ -3,7 +3,6 @@
 Name:           xmms-alarm
 Version:        0.3.6
 Release:        1
-Epoch:          0
 Summary:        xmms General plugin for using xmms as an alarm clock
 
 License:        GPL



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xmms-sid/devel xmms-sid.spec,1.5,1.6
Message-ID: <200503052007.j25K7BWS009218@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-sid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/xmms-sid/devel

Modified Files:
	xmms-sid.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xmms-sid.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-sid/devel/xmms-sid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmms-sid.spec	10 Nov 2004 04:05:42 -0000	1.5
+++ xmms-sid.spec	5 Mar 2005 20:07:09 -0000	1.6
@@ -4,7 +4,6 @@
 Name: xmms-sid
 Version: 0.7.4
 Release: 4
-Epoch: 0
 URL: http://www.tnsp.org/xmms-sid.php
 License: GPL
 Group: Applications/Multimedia
@@ -12,18 +11,18 @@
 Patch0: xmms-sid-0.7.4-cflags.patch
 Patch1: xmms-sid-0.7.4-gcc34.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: xmms >= 0:1.2.7
-BuildRequires: xmms-devel >= 0:1.2, libsidplay-devel >= 0:1.36.57
-BuildRequires: gtk+-devel >= 0:1.2.2, glib-devel >= 0:1.2.2
+Requires: xmms >= 1.2.7
+BuildRequires: xmms-devel >= 1.2, libsidplay-devel >= 1.36.57
+BuildRequires: gtk+-devel >= 1.2.2, glib-devel >= 1.2.2
 
 %description
 XMMS-SID is a plugin for XMMS (X MultiMedia System) which provides
 support for playing the so-called "SID tunes". For the actual playing,
 XMMS-SID uses the excellent libsidplay SID-chip/6502 emulator engine.
- 
+
 If you are not familiar with the term "SID tune" or "SID" concept at
 all, a short (yes it is! ;-) explanation follows:
- 
+
 SID is the sound chip that was used in many of the old 8-bit home
 computers manufactured by Commodore Inc. in 1980's. Best known of
 those was the Commodore 64 home computer (aka C64 or CBM64, also
@@ -35,33 +34,26 @@
 %patch1 -p1 -b .gcc34
 
 
-#---------------------------------------------------------------------
-
 %build
 %configure --libdir=%{xmms_inputdir}
 make %{?_smp_mflags}
-  
-#---------------------------------------------------------------------
+
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 rm -f %{buildroot}/%{xmms_inputdir}/*.la
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf %{buildroot}
 
-#---------------------------------------------------------------------
-
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO README.*
 %{xmms_inputdir}/*.so
 
-#---------------------------------------------------------------------
 
 %changelog
 * Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.7.4-4
@@ -74,5 +66,5 @@
 * Mon Apr 28 2003 Panu Matilainen <pmatilai at welho.com> 0:0.7.4-0.fdr.2
 - add missing Epoch's
 
-* Mon Mar 24 2003 Panu Matilainen <pmatilai at welho.com> 
+* Mon Mar 24 2003 Panu Matilainen <pmatilai at welho.com>
 - Initial Fedora packaging.



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:12 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:12 -0500
Subject: rpms/zoo/devel zoo.spec,1.4,1.5
Message-ID: <200503052007.j25K7CW8009244@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/zoo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/zoo/devel

Modified Files:
	zoo.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: zoo.spec
===================================================================
RCS file: /cvs/extras/rpms/zoo/devel/zoo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zoo.spec	10 Dec 2004 22:03:13 -0000	1.4
+++ zoo.spec	5 Mar 2005 20:07:10 -0000	1.5
@@ -1,8 +1,7 @@
-Name:    zoo
-Version: 2.10
-Release: 2
-Epoch:   0
-Summary: File archiving utility with compression
+Name:      zoo
+Version:   2.10
+Release:   2
+Summary:   File archiving utility with compression
 
 Group:     Applications/Archiving
 License:   Distributable
@@ -12,9 +11,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-zoo is a file archiving utility for maintaining collections of files. 
-It uses Lempel-Ziv compression to provide space savings in the 
-range of 20 to 80 percent depending on the type of data. Written by 
+zoo is a file archiving utility for maintaining collections of files.
+It uses Lempel-Ziv compression to provide space savings in the
+range of 20 to 80 percent depending on the type of data. Written by
 Rahul Dhesi, and posted to the USENET newsgroup comp.sources.misc.
 
 %prep



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xmlindent/devel xmlindent.spec,1.1,1.2
Message-ID: <200503052007.j25K7B5i009202@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmlindent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/xmlindent/devel

Modified Files:
	xmlindent.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xmlindent.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlindent/devel/xmlindent.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmlindent.spec	19 Feb 2005 11:53:53 -0000	1.1
+++ xmlindent.spec	5 Mar 2005 20:07:09 -0000	1.2
@@ -1,9 +1,9 @@
 # $Id$
+
 Name:           xmlindent
 Version:        0.2.17
 Release:        2
-Epoch:          0
-Summary:        A XML stream reformatter
+Summary:        XML stream reformatter
 
 Group:          Applications/Text
 License:        GPL



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xforms/devel xforms.spec,1.5,1.6
Message-ID: <200503052007.j25K7BWH009194@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xforms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/xforms/devel

Modified Files:
	xforms.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xforms.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ xforms.spec	5 Mar 2005 20:07:09 -0000	1.6
@@ -1,19 +1,18 @@
 # $Id$
 
 # Since we're using xmkmf, we must match XFree86's notion of these
-%define _x11dir	/usr/X11R6
+%define _x11dir /usr/X11R6
 %define _prefix %{_x11dir}
 %define _mandir %{_prefix}/man
 
-Name:	 xforms
-Summary: An X11 toolkit library.
-Epoch:	 0
+Name:    xforms
+Summary: X11 toolkit library
 Version: 1.0
 Release: 2%{?dist_tag}
 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 
+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
 
 BuildRequires: XFree86-devel
@@ -31,14 +30,14 @@
 It has now gone Open Source (LGPL).
 
 %package devel
-Summary: Development files for the xforms toolkit.
+Summary: Development files for the xforms toolkit
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 # legacy versions included -designer/-static subpkgs
-Obsoletes: %{name}-designer < %{epoch}:%{version}-%{release}
-Provides:  %{name}-designer = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-static < %{epoch}:%{version}-%{release}
-Provides:  %{name}-static = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-designer < %{version}-%{release}
+Provides:  %{name}-designer = %{version}-%{release}
+Obsoletes: %{name}-static < %{version}-%{release}
+Provides:  %{name}-static = %{version}-%{release}
 %description devel
 This package contains development headers and libraries for %{name}.
 
@@ -47,7 +46,7 @@
 
 %prep
 
-%setup -q 
+%setup -q
 
 
 %build
@@ -55,14 +54,14 @@
 (unset RPM_OPT_FLAGS; xmkmf -a)
 
 make %{?_smp_mflags} \
-	CDEBUGFLAGS="$RPM_OPT_FLAGS" 
+    CDEBUGFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # makeinstall macro doesn't work for this pkg.
-make install install.man DESTDIR="$RPM_BUILD_ROOT" 
+make install install.man DESTDIR="$RPM_BUILD_ROOT"
 
 
 %clean
@@ -73,7 +72,7 @@
 %postun -p /sbin/ldconfig
 
 
-%files 
+%files
 %defattr(-,root,root)
 %doc *README Changes Copyright COPYING
 %{_libdir}/lib*.so.*



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xlhtml/devel xlhtml.spec,1.5,1.6
Message-ID: <200503052007.j25K7BUL009198@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xlhtml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/xlhtml/devel

Modified Files:
	xlhtml.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xlhtml.spec
===================================================================
RCS file: /cvs/extras/rpms/xlhtml/devel/xlhtml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xlhtml.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ xlhtml.spec	5 Mar 2005 20:07:09 -0000	1.6
@@ -2,13 +2,12 @@
 Summary:        Excel 95/97 and PowerPoint to HTML converter
 Version:        0.5
 Release:        2
-Epoch:          0
 License:        GPL
 Group:          Applications/Text
 Source0:        http://dl.sf.net/chicago/xlhtml-%{version}.tgz
-URL:		http://chicago.sourceforge.net/xlhtml/
-BuildRequires:	autoconf
-BuildRequires:	automake
+URL:            http://chicago.sourceforge.net/xlhtml/
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -19,7 +18,7 @@
 
 
 %prep
-%setup -q 
+%setup -q
 
 %build
 aclocal



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xplanet/devel xplanet.spec,1.5,1.6
Message-ID: <200503052007.j25K7BGS009222@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xplanet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/xplanet/devel

Modified Files:
	xplanet.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xplanet.spec
===================================================================
RCS file: /cvs/extras/rpms/xplanet/devel/xplanet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xplanet.spec	11 Dec 2004 12:49:45 -0000	1.5
+++ xplanet.spec	5 Mar 2005 20:07:09 -0000	1.6
@@ -1,8 +1,5 @@
-# %define _unpackaged_files_terminate_build	1
-
 Summary: Render a planetary image into an X window
 Name: xplanet
-Epoch: 0
 Version: 1.0.1
 Release: 5
 License: GPL
@@ -23,30 +20,25 @@
 planets may also be displayed. The Xplanet home page has links to
 locations with map files.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup
 %patch -p0
 
-#---------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install 
+make DESTDIR=%{buildroot} install
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf %{buildroot}
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root)
@@ -55,7 +47,6 @@
 %{_mandir}/man1/*
 %{_datadir}/xplanet
 
-#---------------------------------------------------------------------
 
 %changelog
 * Sun May 11 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.0.1-0.fdr.5



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/yap/devel yap.spec,1.2,1.3
Message-ID: <200503052007.j25K7B3w009231@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/yap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/yap/devel

Modified Files:
	yap.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: yap.spec
===================================================================
RCS file: /cvs/extras/rpms/yap/devel/yap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yap.spec	23 Feb 2005 03:27:57 -0000	1.2
+++ yap.spec	5 Mar 2005 20:07:09 -0000	1.3
@@ -1,18 +1,16 @@
-### Package needs review + approval.
 Name:		yap
 Version:	4.5.5
 Release:	1
-Epoch:		0
 Summary:	High-performance Prolog Compiler
 
 Group:		Development/Languages
 License:	Artistic/LGPL
 Source:		http://download.sourceforge.net/yap/Yap-4.5.5.tar.gz
-URL: 		http://www.ncc.up.pt/~vsc/Yap
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:		http://www.ncc.up.pt/~vsc/Yap
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gmp-devel
-Requires(post):	  /sbin/install-info
-Requires(postun): /sbin/install-info
+Requires(post):		/sbin/install-info
+Requires(postun):	/sbin/install-info
 
 %description
 A high-performance Prolog compiler developed at LIACC, Universidade do
@@ -43,7 +41,7 @@
 /sbin/install-info %{_infodir}/pillow_doc.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || :
 
 %postun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/yap.info %{_infodir}/dir 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/pillow_doc.info %{_infodir}/dir 2>/dev/null || :
 fi



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xmms-cdread/devel xmms-cdread.spec,1.4,1.5
Message-ID: <200503052007.j25K7B9U009210@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-cdread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/xmms-cdread/devel

Modified Files:
	xmms-cdread.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xmms-cdread.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-cdread/devel/xmms-cdread.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmms-cdread.spec	10 Dec 2004 22:03:13 -0000	1.4
+++ xmms-cdread.spec	5 Mar 2005 20:07:09 -0000	1.5
@@ -5,7 +5,6 @@
 Name:		xmms-cdread
 Version:	0.14
 Release: 	4.a
-Epoch:		0
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
@@ -15,44 +14,44 @@
 BuildRequires:	gtk+-devel glib-devel xmms-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
-#---------------------------------------------------------------------
+
 %description
 XMMS is a multimedia (Ogg Vorbis, CDs) player for the X Window System
 with an interface similar to Winamp's. XMMS supports playlists and
-streaming content and has a configurable interface. 
+streaming content and has a configurable interface.
 
 This is the input plugin needed to play audio CDs digitally, i.e. without a
 connecting cable between the CD drive and sound card.
 
-#---------------------------------------------------------------------
+
 %prep
 %setup -q -n %{name}-%{version}a
 %patch1 -p1 -b .shuffle
 
-#---------------------------------------------------------------------
+
 %build
 %configure --libdir=%{xmmsinputdir}
 perl -pi -e 's/^(CFLAGS.*)-O2(.*)/$1\$\(RPM_OPT_FLAGS\)$2/' Makefile
 make %{?_smp_mflags}
 
-#---------------------------------------------------------------------
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
-%files 
+
+%files
 %defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README TODO
 %{xmmsinputdir}/libcdread.so
 %exclude %{xmmsinputdir}/libcdread.la
 
-#---------------------------------------------------------------------
+
 %changelog
 * Mon Nov 24 2003 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.14-0.fdr.4.a
 - Add XMMS 1.2.8 compat.patch from Mandrake Contrib,



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:11 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:11 -0500
Subject: rpms/xtide/devel xtide.spec,1.6,1.7
Message-ID: <200503052007.j25K7BQo009226@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xtide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/xtide/devel

Modified Files:
	xtide.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xtide.spec	8 Jan 2005 23:07:00 -0000	1.6
+++ xtide.spec	5 Mar 2005 20:07:09 -0000	1.7
@@ -1,8 +1,7 @@
-Summary: A program for calculating tide all over the world
+Summary: Calculate tide all over the world
 Name: xtide
 Version: 2.8
 Release: 2
-Epoch: 0
 URL: http://www.flaterco.com/xtide/
 Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz
 Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz
@@ -17,9 +16,9 @@
 Buildrequires: desktop-file-utils
 Buildrequires: flex
 Buildrequires: bison
-Provides: xttpd = %{epoch}:%{version}-%{release}
+Provides: xttpd = %{version}-%{release}
 
-%description 
+%description
 XTide is a package that provides tide and current
 predictions in a wide variety of formats.  Graphs, text listings, and
 calendars can be generated, or a tide clock can be provided on your
@@ -129,7 +128,7 @@
 
 * Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:2.8-1
 - Updated to version 2.8
-- Cleaned up spec file because much of the tricks to get it to work 
+- Cleaned up spec file because much of the tricks to get it to work
   are no longer necessary.
 
 * Mon Dec  8 2003 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:2.6.4-0.fdr.4



From fedora-extras-commits at redhat.com  Sat Mar  5 20:07:12 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 15:07:12 -0500
Subject: rpms/zope/devel zope.spec,1.6,1.7
Message-ID: <200503052007.j25K7C7Q009252@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/zope/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148/zope/devel

Modified Files:
	zope.spec 
Log Message:
Mass letter "x"," y" and "z" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- zope.spec	2 Mar 2005 21:39:57 -0000	1.6
+++ zope.spec	5 Mar 2005 20:07:10 -0000	1.7
@@ -10,15 +10,14 @@
 %define zopectl        %{_bindir}/zopectl
 %define runzope        %{_bindir}/runzope
 
-Name: 	 zope
+Name:    zope
 Summary: Web application server for flexible content management applications
-Epoch:	 0
 Version: 2.7.4
 Release: 1
 License: ZPL
-Group: 	 System Environment/Daemons
-URL:	 http://www.zope.org/
-Source:	 http://zope.org/Products/Zope/2.7.4/Zope-2.7.4-0.tgz
+Group:   System Environment/Daemons
+URL:     http://www.zope.org/
+Source:  http://zope.org/Products/Zope/2.7.4/Zope-2.7.4-0.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -29,8 +28,8 @@
 Source6: zope.logrotate.cron.in
 Patch0:  zope-2.7.3-config.patch
 
-BuildRequires: python-devel >= %{python_minver} 
-BuildRequires: python >= %{python_minver} 
+BuildRequires: python-devel >= %{python_minver}
+BuildRequires: python >= %{python_minver}
 Requires:      python >= %{python_minver}
 
 Requires(pre): /usr/sbin/useradd
@@ -59,7 +58,7 @@
   --with-python=%{__python} \
   --prefix=$RPM_BUILD_ROOT%{zope_home} \
   --optimize
-  
+
 #    --no-compile
 
 make %{?_smp_mflags}
@@ -147,7 +146,7 @@
 
 
 
-%files 
+%files
 %defattr(-, root, root, -)
 %doc %{zope_home}/doc
 %doc docs README.Fedora
@@ -218,7 +217,7 @@
 - drop patch 1, fixed upstream
 
 * Tue Aug 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.3
-- add hotfix from Zope.org: 
+- add hotfix from Zope.org:
   http://zope.org/Products/Zope/Hotfix-200400807/Hotfix-20040807-alert
 
 * Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.2
@@ -234,8 +233,8 @@
 - 2.7.1
 - move files created in %%post back into rpm.  Unowned files are bad.
 - make (theoretically) buildable for all rh73-rh90,fc1/2,el3
-  NOTE: lowerred python_minver to 2.2.2 to test builds, though (most) 
-  docs claim 2.3.3 is required.  (??) 
+  NOTE: lowerred python_minver to 2.2.2 to test builds, though (most)
+  docs claim 2.3.3 is required.  (??)
 - don't use Requires(preun,postun)
 - use %%_smp_mflags
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/plone/devel plone.spec,1.2,1.3
Message-ID: <200503052110.j25LAPbb011321@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/plone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/plone/devel

Modified Files:
	plone.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plone.spec	11 Feb 2005 12:06:21 -0000	1.2
+++ plone.spec	5 Mar 2005 21:10:23 -0000	1.3
@@ -11,7 +11,7 @@
 
 License:        GPL
 Group:          System Environment/Daemons
-URL:		http://www.plone.org/
+URL:            http://www.plone.org/
 Source0:        http://dl.sf.net/plone/Plone-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,7 +51,7 @@
 
 %files
 %defattr(644,root,root,755)
-%{software_home}/Products/* 
+%{software_home}/Products/*
 
 
 %changelog



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/php-mmcache/devel php-mmcache.spec,1.4,1.5
Message-ID: <200503052110.j25LAPHc011304@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-mmcache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/php-mmcache/devel

Modified Files:
	php-mmcache.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: php-mmcache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-mmcache/devel/php-mmcache.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-mmcache.spec	13 Jan 2005 18:19:10 -0000	1.4
+++ php-mmcache.spec	5 Mar 2005 21:10:23 -0000	1.5
@@ -24,10 +24,10 @@
 caching them in compiled state, so that the overhead of compiling is almost
 completely eliminated. Also it uses some optimizations to speed up execution
 of PHP scripts. Turck MMCache typically reduces server load and increases the
-speed of your PHP code by 1-10 times. 
+speed of your PHP code by 1-10 times.
 
 
-%prep 
+%prep
 %setup -n turck-mmcache-%{module_version}
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:26 -0500
Subject: rpms/pyzor/devel pyzor.spec,1.8,1.9
Message-ID: <200503052110.j25LAQvA011339@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pyzor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/pyzor/devel

Modified Files:
	pyzor.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: pyzor.spec
===================================================================
RCS file: /cvs/extras/rpms/pyzor/devel/pyzor.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pyzor.spec	10 Feb 2005 03:09:32 -0000	1.8
+++ pyzor.spec	5 Mar 2005 21:10:24 -0000	1.9
@@ -18,17 +18,17 @@
 Requires:      python-abi = %{pyver}
 
 %description
-Pyzor is a collaborative, networked system to detect 
-and block spam using identifying digests of messages. 
-Pyzor is similar to Vipul's Razor except implemented 
+Pyzor is a collaborative, networked system to detect
+and block spam using identifying digests of messages.
+Pyzor is similar to Vipul's Razor except implemented
 in python, and using fully open source servers.
 
-Pyzor can be used either standalone, or to augment the 
-spam filtering ability of spamassassin.  spamassassin 
+Pyzor can be used either standalone, or to augment the
+spam filtering ability of spamassassin.  spamassassin
 is highly recommended.
 
 %prep
-%setup -q 
+%setup -q
 
 %build
 %__python setup.py build
@@ -41,7 +41,7 @@
 install -p -m755 build/scripts-%{pyver}/* $RPM_BUILD_ROOT%{_bindir}
 %__python -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'/%{python_sitelib}",10,"%{python_sitelib}")'
 %__python -O -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'/%{python_sitelib}",10,"%{python_sitelib}")'
-chmod -R a+rX $RPM_BUILD_ROOT/%{python_sitelib}/pyzor $RPM_BUILD_ROOT%{_bindir}/pyzor* 
+chmod -R a+rX $RPM_BUILD_ROOT/%{python_sitelib}/pyzor $RPM_BUILD_ROOT%{_bindir}/pyzor*
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:26 -0500
Subject: rpms/qcad/devel qcad.spec,1.4,1.5
Message-ID: <200503052110.j25LAQor011347@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/qcad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/qcad/devel

Modified Files:
	qcad.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: qcad.spec
===================================================================
RCS file: /cvs/extras/rpms/qcad/devel/qcad.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qcad.spec	14 Feb 2005 23:16:46 -0000	1.4
+++ qcad.spec	5 Mar 2005 21:10:24 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		qcad
 Version:	2.0.4.0
 Release:	2
-Summary:	A simple 2D CAD program
+Summary:	Simple 2D CAD program
 
 Group:		Applications/Engineering
 License:	GPL
@@ -12,7 +12,7 @@
 Patch2:		qcad-manual-bugs.patch
 URL:		http://www.ribbonsoft.com/qcad.html
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{subversion}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	qt-devel >= 0:3.1.2, python-devel, desktop-file-utils, xorg-x11-devel
+BuildRequires:	qt-devel >= 3.1.2, python-devel, desktop-file-utils, xorg-x11-devel
 # Help viewer is Qt Assistant in qt-devel package.
 #Requires:       /usr/bin/assistant
 Requires(post): desktop-file-utils



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/rrdtool/devel rrdtool.spec,1.6,1.7
Message-ID: <200503052110.j25LAQTD011359@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/rrdtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/rrdtool/devel

Modified Files:
	rrdtool.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rrdtool.spec	31 Jan 2005 17:17:30 -0000	1.6
+++ rrdtool.spec	5 Mar 2005 21:10:24 -0000	1.7
@@ -14,12 +14,12 @@
 BuildRequires: libpng-devel, zlib-devel
 
 %description
-RRD is the Acronym for Round Robin Database. RRD is a system to store and 
-display time-series data (i.e. network bandwidth, machine-room temperature, 
-server load average). It stores the data in a very compact way that will not 
-expand over time, and it presents useful graphs by processing the data to 
-enforce a certain data density. It can be used either via simple wrapper 
-scripts (from shell or Perl) or via frontends that poll network devices and 
+RRD is the Acronym for Round Robin Database. RRD is a system to store and
+display time-series data (i.e. network bandwidth, machine-room temperature,
+server load average). It stores the data in a very compact way that will not
+expand over time, and it presents useful graphs by processing the data to
+enforce a certain data density. It can be used either via simple wrapper
+scripts (from shell or Perl) or via frontends that poll network devices and
 put a friendly user interface on it.
 
 
@@ -67,7 +67,7 @@
 %{__make} install DESTDIR="%{rrdtmpdir}"
 pushd contrib/php4
     ./configure \
-	--with-rrdtool="%{rrdtmpdir}%{_prefix}"
+        --with-rrdtool="%{rrdtmpdir}%{_prefix}"
     %{__make} %{?_smp_mflags}
 popd
 %{__rm} -rf %{rrdtmpdir}
@@ -116,7 +116,7 @@
 %clean
 %{__rm} -rf %{buildroot}
 
- 
+
 %files
 %defattr(-, root, root, 0755)
 %doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO doc2/doc



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:26 -0500
Subject: rpms/pybliographer/devel pybliographer.spec,1.5,1.6
Message-ID: <200503052110.j25LAQC0011331@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/pybliographer/devel

Modified Files:
	pybliographer.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pybliographer.spec	3 Mar 2005 23:53:13 -0000	1.5
+++ pybliographer.spec	5 Mar 2005 21:10:24 -0000	1.6
@@ -9,18 +9,18 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-BuildRequires: pygtk2-libglade >= 0:2.0.0
-BuildRequires: gnome-python2 >= 0:2.0.0
-BuildRequires: gnome-python2-gconf >= 0:2.0.0
-BuildRequires: python-bibtex >= 0:1.1.93.1
+BuildRequires: pygtk2-libglade >= 2.0.0
+BuildRequires: gnome-python2 >= 2.0.0
+BuildRequires: gnome-python2-gconf >= 2.0.0
+BuildRequires: python-bibtex >= 1.1.93.1
 BuildRequires: gettext
 BuildRequires: scrollkeeper
 BuildRequires: desktop-file-utils
 
-Requires: pygtk2-libglade >= 0:2.0.0
-Requires: gnome-python2 >= 0:2.0.0
-Requires: gnome-python2-gconf >= 0:2.0.0
-Requires: python-bibtex >= 0:1.1.93.1
+Requires: pygtk2-libglade >= 2.0.0
+Requires: gnome-python2 >= 2.0.0
+Requires: gnome-python2-gconf >= 2.0.0
+Requires: python-bibtex >= 1.1.93.1
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/xemacs/devel xemacs.spec,1.1,1.2
Message-ID: <200503052110.j25LARmb011423@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/xemacs/devel

Modified Files:
	xemacs.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xemacs.spec	1 Mar 2005 22:11:36 -0000	1.1
+++ xemacs.spec	5 Mar 2005 21:10:25 -0000	1.2
@@ -1,4 +1,4 @@
-Summary: A different version of Emacs.
+Summary: Different version of Emacs
 Name: xemacs
 Version: 21.4.17
 Release: 2
@@ -35,7 +35,7 @@
 Requires: xemacs-sumo >= 20050118-2, xemacs-common = %{version}-%{release}
 Obsoletes: xemacs-extras xemacs-noX xemacs-X11 xemacs-mule xemacs-static
 
-%description 
+%description
 XEmacs is a highly customizable open source text editor and
 application development system. It is protected under the
 GNU General Public License and related to other versions of Emacs,
@@ -113,7 +113,7 @@
 %prep
 %setup -q
 
-## Lisp patches ## 
+## Lisp patches ##
 # make find-paths.el look in datadir
 rm lisp/find-paths.elc
 %patch10 -p1
@@ -312,7 +312,7 @@
 for file in xemacs cl internals lispref new-users-guide; do
   /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir
 done
- 
+
 %preun info
 if [ "$1" = "0" ]; then
   for file in xemacs cl internals lispref new-users-guide; do
@@ -378,7 +378,7 @@
 - Some specfile maintainablity improvements and cleanups.
 
 * Fri Feb 25 2005 Jens Petersen <petersen at redhat.com>
-- use PreReq not Requires(post,preun) for install and uninstall script 
+- use PreReq not Requires(post,preun) for install and uninstall script
   requirements (Axel Thimm, 147791)
 - use sed instead of perl to fixup filelists
 
@@ -607,7 +607,7 @@
 - update to 21.4.12 bugfix release (21.4 series now declared stable branch)
 - renumbered sumo package patches to be greater than 100
 - install sumo packages by copying rather than moving
-- patch sh-script.el to append m?spec entry to auto-mode-alist 
+- patch sh-script.el to append m?spec entry to auto-mode-alist
 - avoid ppc.ldscript and build on ppc
 - remove games that we shouldn't ship
 - update to latest rcs2log
@@ -706,7 +706,7 @@
 - uncomment deactivate-mark in simple.el (#77696)
 
 * Mon Aug 26 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-16
-- some cleanups - and remove the info tarball, it's now part 
+- some cleanups - and remove the info tarball, it's now part
   of the base tarball. Wow, the package gets smaller. (#72480)
 
 * Mon Aug 19 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-15
@@ -717,7 +717,7 @@
 - Make it not segfault when handling utf-8 (#71589)
 
 * Wed Aug  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-13
-- Add openmotif-devel to buildrequires, as it will use it for widgets 
+- Add openmotif-devel to buildrequires, as it will use it for widgets
   if it finds it
 
 * Fri Aug  2 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-12
@@ -758,7 +758,7 @@
 - 21.4.8
 
 * Tue May  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-9
-- Rebuild... chmod -x pstogif to work around an rpm bug until 
+- Rebuild... chmod -x pstogif to work around an rpm bug until
   it's fixed (#64320)
 
 * Tue Apr 23 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-8



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/vpnc/devel vpnc.spec,1.3,1.4
Message-ID: <200503052110.j25LARtp011411@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/vpnc/devel

Modified Files:
	vpnc.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vpnc.spec	6 Jan 2005 09:07:08 -0000	1.3
+++ vpnc.spec	5 Mar 2005 21:10:25 -0000	1.4
@@ -12,8 +12,8 @@
 Patch1:         vpnc-0.3.2-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgcrypt-devel > 0:1.1.90
-Requires:       kernel >= 0:2.4
+BuildRequires:  libgcrypt-devel > 1.1.90
+Requires:       kernel >= 2.4
 
 %description
 A VPN client compatible with Cisco's EasyVPN equipment.
@@ -22,7 +22,7 @@
 shared-secret IPSec authentication, 3DES, MD5, and IP tunneling.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
 %patch1 -p1
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/vnstat/devel vnstat.spec,1.1,1.2
Message-ID: <200503052110.j25LARBs011407@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/vnstat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/vnstat/devel

Modified Files:
	vnstat.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: vnstat.spec
===================================================================
RCS file: /cvs/extras/rpms/vnstat/devel/vnstat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vnstat.spec	1 Mar 2005 18:37:42 -0000	1.1
+++ vnstat.spec	5 Mar 2005 21:10:25 -0000	1.2
@@ -1,13 +1,13 @@
-Summary: 	Console-based network traffic monitor
-Name: 		vnstat
-Version: 	1.4
-Release: 	3
-License: 	GPL
-Group: 		System Environment/Daemons
-URL: 		http://humdi.net/vnstat/
-Source0: 	http://humdi.net/vnstat/vnstat-%{version}.tar.gz
-Source1: 	FAQ.vnstat
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:	Console-based network traffic monitor
+Name:		vnstat
+Version:	1.4
+Release:	3
+License:	GPL
+Group:		System Environment/Daemons
+URL:		http://humdi.net/vnstat/
+Source0:	http://humdi.net/vnstat/vnstat-%{version}.tar.gz
+Source1:	FAQ.vnstat
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 vnStat is a console-based network traffic monitor that uses the



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:26 -0500
Subject: rpms/python-sqlite/devel python-sqlite.spec,1.2,1.3
Message-ID: <200503052110.j25LAQsQ011335@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-sqlite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/python-sqlite/devel

Modified Files:
	python-sqlite.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: python-sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite/devel/python-sqlite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-sqlite.spec	14 Jan 2005 20:15:08 -0000	1.2
+++ python-sqlite.spec	5 Mar 2005 21:10:24 -0000	1.3
@@ -14,7 +14,7 @@
 
 BuildRequires:  python
 BuildRequires:  python-devel
-BuildRequires:  sqlite-devel 
+BuildRequires:  sqlite-devel
 
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/qtparted/devel qtparted.spec,1.5,1.6
Message-ID: <200503052110.j25LAQID011355@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/qtparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/qtparted/devel

Modified Files:
	qtparted.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qtparted.spec	4 Mar 2005 00:05:42 -0000	1.5
+++ qtparted.spec	5 Mar 2005 21:10:24 -0000	1.6
@@ -15,7 +15,7 @@
 Patch0:         %{name}-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel >= 1:3.1.0, parted-devel >= 0:1.6.6, XFree86-devel
+BuildRequires:  qt-devel >= 1:3.1.0, parted-devel >= 1.6.6, XFree86-devel
 BuildRequires:  desktop-file-utils, qt-designer, e2fsprogs-devel, jfsutils
 BuildRequires:  zlib-devel, libjpeg-devel, xfsprogs
 Requires:       usermode-gtk, e2fsprogs, jfsutils, xfsprogs



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/udftools/devel udftools.spec,1.1,1.2
Message-ID: <200503052110.j25LARBE011399@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/udftools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/udftools/devel

Modified Files:
	udftools.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: udftools.spec
===================================================================
RCS file: /cvs/extras/rpms/udftools/devel/udftools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udftools.spec	9 Feb 2005 10:20:01 -0000	1.1
+++ udftools.spec	5 Mar 2005 21:10:25 -0000	1.2
@@ -20,7 +20,7 @@
 
 
 %build
-%configure 
+%configure
 %{__make} %{_smp_mflags}
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/synaptic/devel synaptic.spec,1.9,1.10
Message-ID: <200503052110.j25LAQhs011383@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/synaptic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/synaptic/devel

Modified Files:
	synaptic.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- synaptic.spec	4 Mar 2005 21:00:23 -0000	1.9
+++ synaptic.spec	5 Mar 2005 21:10:24 -0000	1.10
@@ -1,5 +1,4 @@
-
-%define	desktop_vendor	fedora
+%define desktop_vendor fedora
 
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
@@ -16,7 +15,7 @@
 Requires: yelp
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
-BuildRequires: apt-devel >= 0:0.5.4, rpm-devel >= 0:4.0
+BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0
 BuildRequires: gtk2-devel, libglade2-devel, desktop-file-utils
 BuildRequires: libstdc++-devel, gettext
 BuildRequires: xmlto, perl-XML-Parser
@@ -25,14 +24,14 @@
 
 %description
 Synaptic is a graphical package management
-program for apt. It provides the same features as the apt-get command line 
+program for apt. It provides the same features as the apt-get command line
 utility with a GUI front-end based on Gtk+
 
 %prep
 %setup -q
 
 %build
-%configure 
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -176,7 +175,7 @@
 
 * Thu Oct 23 2003 Panu Matilainen <pmatilai at welho.com> 0.45-0.fdr.1
 - update to 0.45
-- support FC release naming 
+- support FC release naming
 
 * Thu Sep 25 2003 Panu Matilainen <pmatilai at welho.com> 0.44-0.fdr.1
 - update to 0.44
@@ -195,7 +194,7 @@
 * Sat Aug 02 2003 Panu Matilainen <pmatilai at welho.com> 0.40-0.fdr.1
 - address issues in #313 / 13
 
-* Wed Jul 30 2003 Panu Matilainen <pmatilai at welho.com> 
+* Wed Jul 30 2003 Panu Matilainen <pmatilai at welho.com>
 - update to 0.40
 - drop gtk requirement from 2.2 to 2.0
 
@@ -207,7 +206,7 @@
 - automatically pick up rh version
 - drop patches (merged upstream)
 
-* Tue May 27 2003 Panu Matilainen <pmatilai at welho.com> 
+* Tue May 27 2003 Panu Matilainen <pmatilai at welho.com>
 - patch to make it build with GTK 2.0
 
 * Sat May 24 2003 Panu Matilainen <pmatilai at welho.com> 0.36.1-0.fdr.3
@@ -216,7 +215,7 @@
 * Fri May 16 2003 Panu Matilainen <pmatilai at welho.com> 0.36.1-0.fdr.2
 - missing buildrequires: gettext
 
-* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com> 
+* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com>
 - add sources.list.d support
 
 * Tue Apr 22 2003 Panu Matilainen <pmatilai at welho.com> 0.36.1-0.fdr.1



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:26 -0500
Subject: rpms/portaudio/devel portaudio.spec,1.2,1.3
Message-ID: <200503052110.j25LAQ52011325@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/portaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/portaudio/devel

Modified Files:
	portaudio.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: portaudio.spec
===================================================================
RCS file: /cvs/extras/rpms/portaudio/devel/portaudio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- portaudio.spec	16 Nov 2004 18:04:28 -0000	1.2
+++ portaudio.spec	5 Mar 2005 21:10:23 -0000	1.3
@@ -1,6 +1,3 @@
-# $Id$
-# Upstream: <portaudio$techweb,rfa,org>
-
 %define real_version v18_1
 
 Summary: Free, cross platform, open-source, audio I/O library
@@ -22,7 +19,7 @@
 
 
 %prep
-%setup -n %{name}_%{real_version} 
+%setup -n %{name}_%{real_version}
 %{__perl} -pi.orig -e 's|^(LIBINST) = /usr/local/lib|$1 = %{_libdir}|' \
     Makefile.linux
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/skencil/devel skencil.spec,1.2,1.3
Message-ID: <200503052110.j25LAQf9011371@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/skencil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/skencil/devel

Modified Files:
	skencil.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: skencil.spec
===================================================================
RCS file: /cvs/extras/rpms/skencil/devel/skencil.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- skencil.spec	22 Feb 2005 22:19:14 -0000	1.2
+++ skencil.spec	5 Mar 2005 21:10:24 -0000	1.3
@@ -1,13 +1,13 @@
 Name:           skencil
 Version:        0.6.16
 Release:        2
-Summary:        A vector drawing program
+Summary:        Vector drawing program
 
 Group:          Applications/Multimedia
 License:        LGPL, GPL, Historical Permission Notice and Disclaimer
 URL:            http://www.skencil.org
 Source0:        http://dl.sf.net/sketch/skencil-0.6.16.tar.gz
-Source1:	skencil-logo.png
+Source1:        skencil-logo.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, python-imaging-devel, PyXML
@@ -118,6 +118,6 @@
 - Add mkfontdb.py.
 - Remove --imaging-include switch, folder is autodetected.
 
-* Sun Feb 29 2004 Axel Thimm <Axel.Thimm at physik.fu-berlin.de> 
+* Sun Feb 29 2004 Axel Thimm <Axel.Thimm at physik.fu-berlin.de>
 - Initial build.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/xemacs-sumo/devel xemacs-sumo.spec,1.1,1.2
Message-ID: <200503052110.j25LASgv011428@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/xemacs-sumo/devel

Modified Files:
	xemacs-sumo.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xemacs-sumo.spec	1 Mar 2005 22:31:04 -0000	1.1
+++ xemacs-sumo.spec	5 Mar 2005 21:10:26 -0000	1.2
@@ -7,7 +7,7 @@
 License: GPL
 Group: Applications/Editors
 Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2
-Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo_ver}.tar.bz2 
+Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo_ver}.tar.bz2
 Source10: Emacs.ad.ja_JP.eucJP
 Source11: Emacs.ad.ko_KR.eucKR
 Source12: Emacs.ad.zh_CN.GB2312
@@ -329,7 +329,7 @@
 - update to 21.4.12 bugfix release (21.4 series now declared stable branch)
 - renumbered sumo package patches to be greater than 100
 - install sumo packages by copying rather than moving
-- patch sh-script.el to append m?spec entry to auto-mode-alist 
+- patch sh-script.el to append m?spec entry to auto-mode-alist
 - avoid ppc.ldscript and build on ppc
 - remove games that we shouldn't ship
 - update to latest rcs2log
@@ -428,7 +428,7 @@
 - uncomment deactivate-mark in simple.el (#77696)
 
 * Mon Aug 26 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-16
-- some cleanups - and remove the info tarball, it's now part 
+- some cleanups - and remove the info tarball, it's now part
   of the base tarball. Wow, the package gets smaller. (#72480)
 
 * Mon Aug 19 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-15
@@ -439,7 +439,7 @@
 - Make it not segfault when handling utf-8 (#71589)
 
 * Wed Aug  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-13
-- Add openmotif-devel to buildrequires, as it will use it for widgets 
+- Add openmotif-devel to buildrequires, as it will use it for widgets
   if it finds it
 
 * Fri Aug  2 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.8-12
@@ -480,7 +480,7 @@
 - 21.4.8
 
 * Tue May  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-9
-- Rebuild... chmod -x pstogif to work around an rpm bug until 
+- Rebuild... chmod -x pstogif to work around an rpm bug until
   it's fixed (#64320)
 
 * Tue Apr 23 2002 Trond Eivind Glomsr??d <teg at redhat.com> 21.4.6-8



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:26 -0500
Subject: rpms/qemu/devel qemu.spec,1.2,1.3
Message-ID: <200503052110.j25LAQVn011351@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/qemu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/qemu/devel

Modified Files:
	qemu.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qemu.spec	13 Feb 2005 16:08:11 -0000	1.2
+++ qemu.spec	5 Mar 2005 21:10:24 -0000	1.3
@@ -26,7 +26,7 @@
    a processor and various peripherials. Currently, it is only used to launch
    an x86 Linux kernel on an x86 Linux system. It enables easier testing and
    debugging of system code. It can also be used to provide virtual hosting
-   of several virtual PC on a single server. 
+   of several virtual PC on a single server.
 
 As QEMU requires no host kernel patches to run, it is very safe and easy to use.
 
@@ -47,8 +47,8 @@
 	mandir="${RPM_BUILD_ROOT}%{_mandir}" \
 	docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \
 	datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install
-	
-install -D $RPM_SOURCE_DIR/qemu.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu 
+
+install -D $RPM_SOURCE_DIR/qemu.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,7 +65,7 @@
 %files
 %defattr(-,root,root)
 %doc Changelog README README.distrib TODO
-%doc qemu-tech.texi qemu-doc.texi 
+%doc qemu-tech.texi qemu-doc.texi
 %doc linux-2.6-qemu-fast.patch *.html
 %{_bindir}/qemu*
 %{_prefix}/share/qemu



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:26 -0500
Subject: rpms/qa-assistant/devel qa-assistant.spec,1.3,1.4
Message-ID: <200503052110.j25LAQnq011343@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/qa-assistant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/qa-assistant/devel

Modified Files:
	qa-assistant.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: qa-assistant.spec
===================================================================
RCS file: /cvs/extras/rpms/qa-assistant/devel/qa-assistant.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qa-assistant.spec	4 Mar 2005 00:05:42 -0000	1.3
+++ qa-assistant.spec	5 Mar 2005 21:10:24 -0000	1.4
@@ -18,7 +18,7 @@
 BuildRequires:  desktop-file-utils
 # Needed to get xmlcatalog
 BuildRequires:  libxml2
-BuildRequires:	pygtk2-devel >= 0:2.2.0
+BuildRequires:	pygtk2-devel >= 2.2.0
 BuildRequires:	pkgconfig
 BuildRequires:	gtk2-devel
 BuildRequires:	gnome-python2
@@ -28,7 +28,7 @@
 Requires:	python-abi = %{pyver}
 Requires:	libxml2-python
 Requires:	gnome-python2
-Requires:	pygtk2 >= 0:2.2.0
+Requires:	pygtk2 >= 2.2.0
 Requires:	rpm-python
 Requires(post): /usr/bin/xmlcatalog
 Requires(postun): /usr/bin/xmlcatalog



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/shapelib/devel shapelib.spec,1.3,1.4
Message-ID: <200503052110.j25LAQts011367@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/shapelib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/shapelib/devel

Modified Files:
	shapelib.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: shapelib.spec
===================================================================
RCS file: /cvs/extras/rpms/shapelib/devel/shapelib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- shapelib.spec	5 Mar 2005 19:28:28 -0000	1.3
+++ shapelib.spec	5 Mar 2005 21:10:24 -0000	1.4
@@ -10,7 +10,7 @@
 License: LGPL/MIT
 Group: Development/Libraries
 Buildrequires: libtool
-BuildRequires: proj-devel >= 0:4.4.1
+BuildRequires: proj-devel >= 4.4.1
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %package devel



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/wv/devel wv.spec,1.6,1.7
Message-ID: <200503052110.j25LARlZ011415@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/wv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/wv/devel

Modified Files:
	wv.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/wv.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wv.spec	5 Mar 2005 19:55:54 -0000	1.6
+++ wv.spec	5 Mar 2005 21:10:25 -0000	1.7
@@ -21,8 +21,8 @@
 BuildRequires: ImageMagick-devel
 BuildRequires: pkgconfig
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:   wvware = %{epoch}:%{version}-%{release}
-Provides:   wv-devel = %{epoch}:%{version}-%{release}
+Provides:   wvware = %{version}-%{release}
+Provides:   wv-devel = %{version}-%{release}
 
 %description
 Wv is a program that understands the Microsoft Word 6/7/8/9



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/php-pecl-sqlite/devel php-pecl-sqlite.spec,1.3,1.4
Message-ID: <200503052110.j25LAPI0011316@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-pecl-sqlite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/php-pecl-sqlite/devel

Modified Files:
	php-pecl-sqlite.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: php-pecl-sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-sqlite/devel/php-pecl-sqlite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pecl-sqlite.spec	16 Feb 2005 12:42:07 -0000	1.3
+++ php-pecl-sqlite.spec	5 Mar 2005 21:10:23 -0000	1.4
@@ -21,7 +21,7 @@
 This extension allows you to access SQLite databases from within PHP.
 
 
-%prep 
+%prep
 %setup -n SQLite-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/php-pecl-mailparse/devel php-pecl-mailparse.spec,1.4,1.5
Message-ID: <200503052110.j25LAPkJ011311@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-pecl-mailparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/php-pecl-mailparse/devel

Modified Files:
	php-pecl-mailparse.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: php-pecl-mailparse.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-mailparse/devel/php-pecl-mailparse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pecl-mailparse.spec	16 Feb 2005 13:49:36 -0000	1.4
+++ php-pecl-mailparse.spec	5 Mar 2005 21:10:23 -0000	1.5
@@ -20,7 +20,7 @@
 It can deal with rfc822 and rfc2045 (MIME) compliant messages.
 
 
-%prep 
+%prep
 %setup -a 1 -n mailparse-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/unrtf/devel unrtf.spec,1.4,1.5
Message-ID: <200503052110.j25LARcO011403@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/unrtf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/unrtf/devel

Modified Files:
	unrtf.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: unrtf.spec
===================================================================
RCS file: /cvs/extras/rpms/unrtf/devel/unrtf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unrtf.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ unrtf.spec	5 Mar 2005 21:10:25 -0000	1.5
@@ -11,7 +11,7 @@
 %description
 UnRTF is a moderately complicated converter from RTF to other
 formats, including HTML, LaTeX, text, and PostScript. Converting
-to HTML, it supports tables, fonts, colors, embedded images, 
+to HTML, it supports tables, fonts, colors, embedded images,
 hyperlinks, paragraph alignment among other things. All other
 conversions are "alpha"--just begun.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/sylpheed/devel sylpheed.spec,1.2,1.3
Message-ID: <200503052110.j25LAQxQ011379@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/sylpheed/devel

Modified Files:
	sylpheed.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sylpheed.spec	4 Mar 2005 23:51:10 -0000	1.2
+++ sylpheed.spec	5 Mar 2005 21:10:24 -0000	1.3
@@ -225,7 +225,7 @@
 
 * Fri Jan 12 2001 Tim Powers <timp at redhat.com>
 - updated to 0.4.52
- 
+
 * Thu Nov 16 2000 Tim Powers <timp at redhat.com>
 - update to 0.4.4
 - built for Powertools 7.1
@@ -236,30 +236,30 @@
 - use %%configure and %%makeinstall as well as other predefined RPM
   macros whenever possible
 
-* Wed Aug 30 2000 Yukihiro Nakai <ynakai at redhat.com> 
-- Rebuild on Red Hat Linux 7.0 
- 
-* Tue Aug 29 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.28 
- 
-* Fri Aug 25 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.27 
- 
-* Sat Aug 19 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.26, and modified URL 
- 
-* Thu Aug 10 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.25 
- 
-* Fri Aug 4 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.24 
- 
-* Sat Jul 24 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.23 
- 
-* Sat Jul 20 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.22 
- 
-* Sun Jul 4 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> 
-- updated to 0.3.21, and modified Summary 
+* Wed Aug 30 2000 Yukihiro Nakai <ynakai at redhat.com>
+- Rebuild on Red Hat Linux 7.0
+
+* Tue Aug 29 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.28
+
+* Fri Aug 25 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.27
+
+* Sat Aug 19 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.26, and modified URL
+
+* Thu Aug 10 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.25
+
+* Fri Aug 4 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.24
+
+* Sat Jul 24 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.23
+
+* Sat Jul 20 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.22
+
+* Sun Jul 4 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
+- updated to 0.3.21, and modified Summary
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/scribus-templates/devel scribus-templates.spec,1.4,1.5
Message-ID: <200503052110.j25LAQcu011363@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/scribus-templates/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/scribus-templates/devel

Modified Files:
	scribus-templates.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: scribus-templates.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus-templates/devel/scribus-templates.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scribus-templates.spec	9 Feb 2005 02:03:15 -0000	1.4
+++ scribus-templates.spec	5 Mar 2005 21:10:24 -0000	1.5
@@ -1,7 +1,7 @@
 Name:           scribus-templates
 Version:        1.2.1
 Release:        1
-Summary:        This package includes additional templates for Scribus.
+Summary:        Additional templates for Scribus
 
 Group:          Applications/Productivity
 License:        GPL
@@ -19,7 +19,7 @@
 
 
 %prep
-%setup -q 
+%setup -q
 
 
 %build



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/synce/devel synce.spec,1.1,1.2
Message-ID: <200503052110.j25LARXa011387@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/synce/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/synce/devel

Modified Files:
	synce.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: synce.spec
===================================================================
RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synce.spec	8 Dec 2004 15:47:19 -0000	1.1
+++ synce.spec	5 Mar 2005 21:10:24 -0000	1.2
@@ -1,4 +1,4 @@
-Summary: SynCE: Serial connection support for Pocket PC devices
+Summary: Serial connection support for Pocket PC devices
 Name: synce
 Version: 0.9.0
 Release: 1
@@ -12,9 +12,8 @@
 Source5: libmimedir-0.3.tar.gz
 Patch0: synce-rra-0.9.0-ambiguous.patch
 URL: http://synce.sourceforge.net/
-Distribution: Fedora Core
 Requires: ppp
-BuildRoot: /var/tmp/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 The purpose of the SynCE project is to provide a means of
@@ -89,7 +88,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for module in libsynce dccm librapi2 rra serial ; do 
+for module in libsynce dccm librapi2 rra serial ; do
     cd synce-${module}-%{version}
     %makeinstall
     cd ..



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/torcs/devel torcs.spec,1.4,1.5
Message-ID: <200503052110.j25LARn2011395@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/torcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/torcs/devel

Modified Files:
	torcs.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- torcs.spec	10 Feb 2005 00:04:29 -0000	1.4
+++ torcs.spec	5 Mar 2005 21:10:25 -0000	1.5
@@ -22,7 +22,7 @@
 %description
 TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
 programmed robots drivers racing against each others.  You can also drive
-yourself with either a wheel, keyboard or mouse. 
+yourself with either a wheel, keyboard or mouse.
 
 
 %package robots



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/wxGTK/devel wxGTK.spec,1.8,1.9
Message-ID: <200503052110.j25LARHY011419@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/wxGTK/devel

Modified Files:
	wxGTK.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wxGTK.spec	23 Jan 2005 19:36:58 -0000	1.8
+++ wxGTK.spec	5 Mar 2005 21:10:25 -0000	1.9
@@ -352,7 +352,7 @@
 - Now build/include both gtk/gtk2 libs
 - buildroot -> RPM_BUILD_ROOT
 
-* Mon Mar  3 2003 Dams <anvil at livna.org> 
+* Mon Mar  3 2003 Dams <anvil at livna.org>
 - Initial build.
 - Disable unicode as it breaks lmule
 - use the %find_lang macro for locale



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/tktable/devel tktable.spec,1.7,1.8
Message-ID: <200503052110.j25LARKe011391@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/tktable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/tktable/devel

Modified Files:
	tktable.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: tktable.spec
===================================================================
RCS file: /cvs/extras/rpms/tktable/devel/tktable.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tktable.spec	5 Mar 2005 19:43:17 -0000	1.7
+++ tktable.spec	5 Mar 2005 21:10:25 -0000	1.8
@@ -6,7 +6,7 @@
 Group: Development/Libraries
 Source: http://download.sourceforge.net/tktable/Tktable2.9.tar.gz
 URL: http://tktable.sourceforge.net/
-BuildRequires: XFree86-devel >= 0:4, tk >= 0:8.3.1
+BuildRequires: XFree86-devel >= 4, tk >= 8.3.1
 # work around tcl-devel and tk-devel packages non existence in RH 8.0 and 9:
 BuildRequires: %{_includedir}/tk.h, %{_includedir}/tcl.h
 Requires: tk >= 8.3.1



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/Hermes/devel Hermes.spec,1.6,1.7
Message-ID: <200503052110.j25LAM1K010699@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/Hermes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/Hermes/devel

Modified Files:
	Hermes.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: Hermes.spec
===================================================================
RCS file: /cvs/extras/rpms/Hermes/devel/Hermes.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Hermes.spec	28 Feb 2005 21:12:57 -0000	1.6
+++ Hermes.spec	5 Mar 2005 21:10:20 -0000	1.7
@@ -1,8 +1,7 @@
 Name:           Hermes
 Version:        1.3.3
 Release:        6
-Epoch:		0
-Summary:        HERMES pixel format conversion library.
+Summary:        Pixel format conversion library
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -12,9 +11,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # we need depcomp, it's symlinked instead of copied
-BuildRequires:	automake
+BuildRequires:  automake
 # sigh, it's in maintainer mode
-BuildRequires:	autoconf
+BuildRequires:  autoconf
 
 %description
 HERMES is a library designed to convert a source buffer with a specified pixel
@@ -33,7 +32,7 @@
 %package        devel
 Summary:        Static libraries and header files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains the static libraries and header files



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/amarok/devel amarok.spec,1.7,1.8
Message-ID: <200503052110.j25LAMYE010766@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/amarok/devel

Modified Files:
	amarok.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- amarok.spec	3 Mar 2005 21:26:02 -0000	1.7
+++ amarok.spec	5 Mar 2005 21:10:20 -0000	1.8
@@ -1,4 +1,4 @@
-# Rebuild switch: 
+# Rebuild switch:
 #  --with xine    Enables xine engine
 #
 
@@ -9,7 +9,7 @@
 Version:    1.2
 Release:    2
 
-Group: 	    Applications/Multimedia
+Group:      Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 Source0:    http://dl.sf.net/amarok/amarok-1.2.tar.bz2
@@ -24,7 +24,7 @@
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 
 %if  0%{?use_xine}
-BuildRequires:  xine-lib-devel >= 0:1.0.0
+BuildRequires:  xine-lib-devel >= 1.0.0
 BuildRequires:  libmad-devel
 %endif
 
@@ -95,7 +95,7 @@
 
 %install
 rm -fr $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT 
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # desktop files
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/SDL_ttf/devel SDL_ttf.spec,1.4,1.5
Message-ID: <200503052110.j25LAMX6010720@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/SDL_ttf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/SDL_ttf/devel

Modified Files:
	SDL_ttf.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: SDL_ttf.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_ttf/devel/SDL_ttf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SDL_ttf.spec	10 Dec 2004 22:03:01 -0000	1.4
+++ SDL_ttf.spec	5 Mar 2005 21:10:20 -0000	1.5
@@ -1,8 +1,7 @@
-Summary: Simple DirectMedia Layer - Sample TrueType Font Library
+Summary: Simple DirectMedia Layer TrueType Font library
 Name: SDL_ttf
 Version: 2.0.6
 Release: 4
-Epoch: 0
 URL: http://www.libsdl.org/projects/SDL_ttf/
 Source0: http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.6.tar.gz
 Patch0: %{name}-%{version}-openstream.patch
@@ -10,8 +9,8 @@
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: SDL-devel >= 0:1.2.4
-BuildRequires: freetype-devel >= 0:2.0
+BuildRequires: SDL-devel >= 1.2.4
+BuildRequires: freetype-devel >= 2.0
 BuildRequires: zlib-devel
 
 %description
@@ -19,9 +18,9 @@
 applications.
 
 %package devel
-Summary: Libraries, includes and more to develop SDL applications.
+Summary: Files to develop SDL applications which use TrueType fonts
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 This library allows you to use TrueType fonts to render text in SDL
@@ -77,7 +76,7 @@
 - Fedoraize
 - patch to compile on RH9
 
-* Wed Jan 19 2000 Sam Lantinga 
+* Wed Jan 19 2000 Sam Lantinga
 - converted to get package information from configure
 * Sun Jan 16 2000 Hakan Tandogan <hakan at iconsult.com>
 - initial spec file



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/easytag/devel easytag.spec,1.6,1.7
Message-ID: <200503052110.j25LANrW010897@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/easytag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/easytag/devel

Modified Files:
	easytag.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/easytag.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- easytag.spec	10 Dec 2004 20:20:47 -0000	1.6
+++ easytag.spec	5 Mar 2005 21:10:21 -0000	1.7
@@ -10,8 +10,8 @@
 Patch0:         easytag-0.30.2-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk+-devel, id3lib-devel >= 0:3.7.12
-BuildRequires:  libvorbis-devel >= 0:1.0, flac-devel, gettext
+BuildRequires:  gtk+-devel, id3lib-devel >= 3.7.12
+BuildRequires:  libvorbis-devel >= 1.0, flac-devel, gettext
 BuildRequires:  desktop-file-utils
 
 %description
@@ -87,7 +87,7 @@
 - Updated to 0.28.
 
 * Sat May 24 2003 Marius J??hndal <mariuslj at ifi.uio.no> 0:0.27-0.fdr.3.a
-- Removed version from BuildRequires: gtk+-devel (RH 7.0 and newer ship with 
+- Removed version from BuildRequires: gtk+-devel (RH 7.0 and newer ship with
   gtk+-devel >= 1.2.8).
 
 * Mon May 19 2003 Marius J??hndal <mariuslj at ifi.uio.no> 0:0.27-0.fdr.2.a



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/apt/devel apt.spec,1.10,1.11
Message-ID: <200503052110.j25LAMKm010794@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/apt/devel

Modified Files:
	apt.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apt.spec	3 Mar 2005 19:29:59 -0000	1.10
+++ apt.spec	5 Mar 2005 21:10:20 -0000	1.11
@@ -14,7 +14,7 @@
 # we need to work around various missing builddeps in rpm :-/
 %{!?rpmver:%define rpmver %(rpm --version | cut -d' ' -f3 | cut -d. -f1-2)}
 
-Summary: Debian's Advanced Packaging Tool with RPM support.
+Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
 Version: 0.5.15cnc6
 Release: 16.%{svnver}
@@ -88,7 +88,7 @@
 BuildRequires: beecrypt-devel
 BuildRequires: elfutils-devel
 # TODO: verify the required minimum version
-BuildRequires: python-devel >= 0:2.2
+BuildRequires: python-devel >= 2.2
 BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext
 BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel
 # for version detection to work



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/Gtk-Perl/devel Gtk-Perl.spec,1.1,1.2
Message-ID: <200503052110.j25LAMlM010688@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/Gtk-Perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/Gtk-Perl/devel

Modified Files:
	Gtk-Perl.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: Gtk-Perl.spec
===================================================================
RCS file: /cvs/extras/rpms/Gtk-Perl/devel/Gtk-Perl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Gtk-Perl.spec	28 Jan 2005 16:40:15 -0000	1.1
+++ Gtk-Perl.spec	5 Mar 2005 21:10:19 -0000	1.2
@@ -78,11 +78,11 @@
     -name .packlist -o -name '*.bs'`
 
 
-%clean 
+%clean
 %{__rm} -rf %{buildroot}
 
 
-%files 
+%files
 %defattr(-, root, root, 0755)
 %doc ChangeLog NOTES README VERSIONS
 %{_libdir}/perl5/vendor_perl/*/*-linux*/Gnome/



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/abe/devel abe.spec,1.5,1.6
Message-ID: <200503052110.j25LAM5P010750@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/abe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/abe/devel

Modified Files:
	abe.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: abe.spec
===================================================================
RCS file: /cvs/extras/rpms/abe/devel/abe.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- abe.spec	3 Mar 2005 19:29:59 -0000	1.5
+++ abe.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           abe
 Version:        1.0
 Release:        3
-Summary:        A scrolling, platform-jumping, ancient pyramid exploring game.
+Summary:        Scrolling, platform-jumping, ancient pyramid exploring game
 Group:          Amusements/Games
 License:        GPL
 URL:            http://abe.sourceforge.net/
@@ -11,7 +11,7 @@
 Patch1:         %{name}-%{version}-tmppath.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  SDL-devel >= 0:1.2.3, SDL_mixer-devel >= 0:1.2.3
+BuildRequires:  SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3
 BuildRequires:  desktop-file-utils
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.2,1.3
Message-ID: <200503052110.j25LAMrn010710@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/Macaulay2/devel

Modified Files:
	Macaulay2.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Macaulay2.spec	10 Dec 2004 22:03:01 -0000	1.2
+++ Macaulay2.spec	5 Mar 2005 21:10:20 -0000	1.3
@@ -1,14 +1,13 @@
 # $Id$
 
-Summary: A system for algebraic geometry and commutative algebra	
-Name:    Macaulay2 
-Epoch:	 0
+Summary: System for algebraic geometry and commutative algebra
+Name:    Macaulay2
 Version: 0.9.2
 Release: 13%{?dist_tag}
-License: GPL 
+License: GPL
 Group:   Applications/Engineering
-URL:	 http://www.math.uiuc.edu/Macaulay2/
-Source:	 http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.2-src.tar.gz
+URL:     http://www.math.uiuc.edu/Macaulay2/
+Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.2-src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source1: Macaulay2.png
@@ -22,31 +21,31 @@
 Patch4: Macaulay2-0.9.2-gcc34.patch
 
 BuildRequires: desktop-file-utils
-BuildRequires: gc-devel >= 0:6.3
-BuildRequires: factory-devel >= 0:2.0.5
-BuildRequires: libfac-devel >= 0:2.0.5
-BuildRequires: gdbm-devel 
+BuildRequires: gc-devel >= 6.3
+BuildRequires: factory-devel >= 2.0.5
+BuildRequires: libfac-devel >= 2.0.5
+BuildRequires: gdbm-devel
 BuildRequires: time
 
 %description
-Macaulay 2 is a new software system devoted to supporting research in 
-algebraic geometry and commutative algebra written by Daniel R. Grayson 
+Macaulay 2 is a new software system devoted to supporting research in
+algebraic geometry and commutative algebra written by Daniel R. Grayson
 and Michael E. Stillman
 
-%package doc 
+%package doc
 Summary: Macaulay2 documentation
-Group: Documentation 
-Requires: %{name} = %{epoch}:%{version}
+Group: Documentation
+Requires: %{name} = %{version}
 Requires: htmlview
-Summary: Macaulay2 documentation 
+Summary: Macaulay2 documentation
 %description doc
-Macaulay2 documentation. 
+Macaulay2 documentation.
 
 %package emacs
 Summary: Macaulay2 emacs mode
 Group: Applications/Editors
 Requires: emacs
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
 %description emacs
 Macaulay2 emacs mode.
 
@@ -73,9 +72,9 @@
   %{?debug_package:--disable-strip}
 
 # not smp-safe
-make 
+make
 
-# Takes a *long* time, default off 
+# Takes a *long* time, default off
 %check || :
 %{?_with_check:make check }
 
@@ -85,7 +84,7 @@
 
 # Fix locations
 perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
-	$RPM_BUILD_ROOT%{_bindir}/M2 
+	$RPM_BUILD_ROOT%{_bindir}/M2
 perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
 	$RPM_BUILD_ROOT%{_bindir}/M2-help
 perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/emacs/*
@@ -171,9 +170,9 @@
 
 * Mon Oct 18 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.12
 - actually *apply* gcc34 patch this time.
- 
+
 * Mon Oct 18 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.11
-- gcc34 patch 
+- gcc34 patch
 
 * Fri Oct 1 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.10
 - explicit BR versions for gc-devel, libfac-devel, factory-devel
@@ -184,7 +183,7 @@
 * Thu Jun 03 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.8
 - .desktop: remove Terminaloptions to be desktop agnostic
 - .desktop: Categories += Education;Math;Development (Devel only
-  added so it shows *somewhere* in gnome menus) 
+  added so it shows *somewhere* in gnome menus)
 
 * Tue Jun 01 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.7
 - disable default 'make check' (util/screen fails on fc2)
@@ -200,7 +199,7 @@
 - fix desktop-file-install --add-cateagories usage
 
 * Tue Dec 23 2003 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.4
-- -emacs: use %%defattr 
+- -emacs: use %%defattr
 - -emacs: fix M2-init.el
 
 * Mon Nov 17 2003 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.3



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:35 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:35 -0500
Subject: rpms/snownews/devel snownews.spec,1.2,1.3
Message-ID: <200503052110.j25LAQdR011375@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/snownews/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/snownews/devel

Modified Files:
	snownews.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: snownews.spec
===================================================================
RCS file: /cvs/extras/rpms/snownews/devel/snownews.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- snownews.spec	10 Dec 2004 22:03:11 -0000	1.2
+++ snownews.spec	5 Mar 2005 21:10:24 -0000	1.3
@@ -1,16 +1,16 @@
-Name: 		snownews
-Version: 	1.5.3
-Release: 	4
-Summary: 	A RSS/RDF news aggregator.
-Group: 		Applications/Internet
-License: 	GPL
-Url:		http://home.kcore.de/~kiza/software/snownews
-Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.3.tar.gz
+Name:		snownews
+Version:	1.5.3
+Release:	4
+Summary:	RSS/RDF news aggregator
+Group:		Applications/Internet
+License:	GPL
+URL:		http://home.kcore.de/~kiza/software/snownews
+Source0:	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.3.tar.gz
 Patch0:		snownews-1.5.3-nocheck.patch
 Patch1:		snownews-1.5.3-manpath.patch
 Patch2:		snownews-1.5.3-nostrip.patch
 Patch3:		snownews-1.5.3-buildroot.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	gettext
@@ -19,7 +19,7 @@
 Snownews  is  a text mode RSS/RDF newsreader. It supports all versions
 of RSS natively and supports other formats via plugins.
 
-The program depends on ncurses for the user interface and uses libxml2 
+The program depends on ncurses for the user interface and uses libxml2
 for XML parsing. ncurses must be at least version 5.0. It should work
 with any version of libxml2.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/brightside/devel brightside.spec,1.3,1.4
Message-ID: <200503052110.j25LAMxA010823@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/brightside/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/brightside/devel

Modified Files:
	brightside.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: brightside.spec
===================================================================
RCS file: /cvs/extras/rpms/brightside/devel/brightside.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- brightside.spec	3 Mar 2005 19:46:39 -0000	1.3
+++ brightside.spec	5 Mar 2005 21:10:20 -0000	1.4
@@ -14,9 +14,9 @@
 Requires(post): GConf2
 BuildRequires:  intltool
 BuildRequires:  gettext
-BuildRequires:  libwnck-devel >= 0:2.6.0
-BuildRequires:  libgnomeui-devel >= 0:2.6.0
-BuildRequires:  libglade2-devel >= 0:2.2.0
+BuildRequires:  libwnck-devel >= 2.6.0
+BuildRequires:  libgnomeui-devel >= 2.6.0
+BuildRequires:  libglade2-devel >= 2.2.0
 
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gconfmm26/devel gconfmm.spec,1.3,1.4
Message-ID: <200503052110.j25LAN0c010947@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gconfmm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gconfmm26/devel

Modified Files:
	gconfmm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gconfmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gconfmm26/devel/gconfmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gconfmm.spec	3 Mar 2005 21:26:02 -0000	1.3
+++ gconfmm.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -11,9 +11,9 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  glibmm24-devel >= 0:2.4.0
-BuildRequires:  gtkmm24-devel >= 0:2.4.0
-BuildRequires:  GConf2-devel >= 0:2.4.0
+BuildRequires:  glibmm24-devel >= 2.4.0
+BuildRequires:  gtkmm24-devel >= 2.4.0
+BuildRequires:  GConf2-devel >= 2.4.0
 
 %description
 This package provides a C++ interface for GConf2. It is a subpackage



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/anthy/devel anthy.spec,1.2,1.3
Message-ID: <200503052110.j25LAMsK010778@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/anthy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/anthy/devel

Modified Files:
	anthy.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- anthy.spec	24 Feb 2005 14:31:31 -0000	1.2
+++ anthy.spec	5 Mar 2005 21:10:20 -0000	1.3
@@ -12,7 +12,7 @@
 Source0:	http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 
-Summary:	A Japanese character set input library
+Summary:	Japanese character set input library
 %description
 Anthy provides the library to input Japanese on the applications, such as
 X applications and emacs. and the user dictionaries and the users information



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libksba/devel libksba.spec,1.7,1.8
Message-ID: <200503052110.j25LAOmb011171@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libksba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libksba/devel

Modified Files:
	libksba.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libksba.spec
===================================================================
RCS file: /cvs/extras/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libksba.spec	3 Mar 2005 22:41:32 -0000	1.7
+++ libksba.spec	5 Mar 2005 21:10:22 -0000	1.8
@@ -10,8 +10,8 @@
 Patch0:  libksba-0.9.9-underquoted.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: libgpg-error >= 0:0.7
-BuildRequires: libgcrypt-devel >= 0:1.2.0
+BuildRequires: libgpg-error >= 0.7
+BuildRequires: libgcrypt-devel >= 1.2.0
 
 %description
 KSBA is a library designed to build software based on the X.509 and



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libgnomeuimm26/devel libgnomeuimm.spec,1.4,1.5
Message-ID: <200503052110.j25LAObL011160@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libgnomeuimm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libgnomeuimm26/devel

Modified Files:
	libgnomeuimm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgnomeuimm.spec	3 Mar 2005 22:41:32 -0000	1.4
+++ libgnomeuimm.spec	5 Mar 2005 21:10:22 -0000	1.5
@@ -12,12 +12,12 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  libgnomeui-devel >= 0:2.0.0
-BuildRequires:  libgnomemm26-devel >= 0:2.6.0
-BuildRequires:  libgnomecanvasmm26-devel >= 0:2.6.0
-BuildRequires:  gconfmm26-devel >= 0:2.6.0
-BuildRequires:  libglademm24-devel >= 0:2.4.0
-BuildRequires:  gnome-vfsmm26-devel >= 0:2.6.0
+BuildRequires:  libgnomeui-devel >= 2.0.0
+BuildRequires:  libgnomemm26-devel >= 2.6.0
+BuildRequires:  libgnomecanvasmm26-devel >= 2.6.0
+BuildRequires:  gconfmm26-devel >= 2.6.0
+BuildRequires:  libglademm24-devel >= 2.4.0
+BuildRequires:  gnome-vfsmm26-devel >= 2.6.0
 
 %description
 This package provides a C++ interface for GnomeUI.  It is a subpackage



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/apmud/devel apmud.spec,1.1,1.2
Message-ID: <200503052110.j25LAMK7010789@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/apmud/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/apmud/devel

Modified Files:
	apmud.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: apmud.spec
===================================================================
RCS file: /cvs/extras/rpms/apmud/devel/apmud.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apmud.spec	15 Feb 2005 17:14:23 -0000	1.1
+++ apmud.spec	5 Mar 2005 21:10:20 -0000	1.2
@@ -1,9 +1,9 @@
 %define _prefix /usr
 
-Name: apmud 
+Name: apmud
 Version: 1.0.0
 Release: 1
-Summary: Power management daemon for Apple laptops.
+Summary: Power management daemon for Apple laptops
 Source0: http://linuxppc.jvc.nl/apmud-%{version}.tgz
 Source1: trackpad.init
 Source2: trackpad.sysconfig
@@ -18,9 +18,9 @@
 Obsoletes: trackpad, pmud
 ExclusiveArch: ppc
 
-%description 
-pmud is a daemon which periodically polls the PMU (power manager) and performs 
-functions such as enabling or disabling devices appropriately when the power 
+%description
+pmud is a daemon which periodically polls the PMU (power manager) and performs
+functions such as enabling or disabling devices appropriately when the power
 source changes. It can also be instructed to signal init(8) that a power-
 failure has occured.  pmud works on Apple PowerBooks and iBooks.
 
@@ -29,7 +29,7 @@
 
 Tools for enabling video mirroring for ATI Rage 128 Mobility (m3mirror)
 and ATI Radeon Mobility (m6mirror) enabled PowerBooks are also included.
- 
+
 %prep
 %setup -q -n apmud
 %patch0 -p1
@@ -55,7 +55,7 @@
 make PREFIX=$RPM_BUILD_ROOT install
 make PREFIX=$RPM_BUILD_ROOT -C contrib/ install
 
-cd $RPM_BUILD_ROOT/usr/bin; ln -s ../../sbin/snooze apm 
+cd $RPM_BUILD_ROOT/usr/bin; ln -s ../../sbin/snooze apm
 
 install -m755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/trackpad
 install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/trackpad
@@ -63,7 +63,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post 
+%post
 /sbin/chkconfig --add pmud
 /sbin/chkconfig --add trackpad
 
@@ -86,7 +86,7 @@
 %{_prefix}/X11R6/bin/xmouse
 %config %attr(0755,root,root) /etc/power/pwrctl
 %config(noreplace) %attr(0755,root,root) /etc/power/pwrctl-local
-/etc/init.d/pmud 
+/etc/init.d/pmud
 /etc/init.d/trackpad
 %config(noreplace) /etc/sysconfig/power
 %config(noreplace) /etc/sysconfig/trackpad



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/ogmtools/devel ogmtools.spec,1.5,1.6
Message-ID: <200503052110.j25LAPfm011223@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ogmtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/ogmtools/devel

Modified Files:
	ogmtools.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: ogmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/ogmtools/devel/ogmtools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ogmtools.spec	16 Nov 2004 18:05:31 -0000	1.5
+++ ogmtools.spec	5 Mar 2005 21:10:23 -0000	1.6
@@ -1,6 +1,3 @@
-# $Id$
-# Upstream: Moritz Bunkus <moritz$bunkus,org>
-
 Summary: Tools for Ogg media streams
 Name: ogmtools
 Version: 1.5
@@ -15,7 +12,7 @@
 %description
 These tools allow information about (ogminfo) or extraction from (ogmdemux) or
 creation of (ogmmerge) OGG media streams. Note that OGM is used for "OGG media
-streams". 
+streams".
 
 
 %prep
@@ -38,7 +35,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc README ChangeLog TODO COPYING 
+%doc README ChangeLog TODO COPYING
 %{_bindir}/*
 %{_mandir}/man1/*
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libassuan/devel libassuan.spec,1.4,1.5
Message-ID: <200503052110.j25LAO76011108@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libassuan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libassuan/devel

Modified Files:
	libassuan.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libassuan.spec	3 Feb 2005 12:34:21 -0000	1.4
+++ libassuan.spec	5 Mar 2005 21:10:22 -0000	1.5
@@ -1,13 +1,12 @@
-
-Summary: GnuPG IPC library 
-Name:	 libassuan
+Summary: GnuPG IPC library
+Name:    libassuan
 Version: 0.6.9
 Release: 2%{?dist_tag}
 Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz
 Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig
-URL:	 http://www.gnupg.org/
+URL:     http://www.gnupg.org/
 License: GPL
-Group: 	 System Environment/Libraries
+Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -15,19 +14,19 @@
 packages.
 
 %package devel
-Summary: Development files for the %{name} package.
+Summary: Development files for the %{name} package
 Group: Development/Libraries
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 %description devel
 This is the IPC library used by GnuPG 1.9, GPGME and a few other
-packages.  
+packages.
 
 This package contains files needed to develop applications using %{name}.
 
 
 %prep
-%setup -q 
+%setup -q
 
 
 %build



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/dietlibc/devel dietlibc.spec,1.3,1.4
Message-ID: <200503052110.j25LANcb010880@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/dietlibc/devel

Modified Files:
	dietlibc.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dietlibc.spec	5 Mar 2005 01:13:43 -0000	1.3
+++ dietlibc.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -14,7 +14,7 @@
 
 %{!?release_func:%define release_func() %1%{?disttag}}
 
-Summary:	A small libc implementation
+Summary:	Small libc implementation
 Name:		%{?_with_cross:cross-%crossarch-}%NAME
 Version:	0.28
 Release:	%release_func 4
@@ -160,5 +160,5 @@
 * Thu Jul 11 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 1:0.18-1
 - updated to 0.18
 
-* Thu Jul  4 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 
+* Thu Jul  4 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gsview/devel gsview.spec,1.5,1.6
Message-ID: <200503052110.j25LANDv011025@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gsview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gsview/devel

Modified Files:
	gsview.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gsview.spec
===================================================================
RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gsview.spec	3 Mar 2005 21:26:03 -0000	1.5
+++ gsview.spec	5 Mar 2005 21:10:21 -0000	1.6
@@ -30,14 +30,14 @@
 
 %description
 GSview is a graphical interface for Ghostscript.
-Ghostscript is an interpreter for the PostScript page 
+Ghostscript is an interpreter for the PostScript page
 description language used by laser printers.
-For documents following the Adobe PostScript Document Structuring 
+For documents following the Adobe PostScript Document Structuring
 Conventions, GSview allows selected pages to be viewed or printed.
 
 
 %prep
-%setup -q 
+%setup -q
 
 %patch1 -p1 -b .htmlview
 %patch2 -p1 -b .libgs7
@@ -70,7 +70,7 @@
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  %{SOURCE1} 
+  %{SOURCE1}
 
 ## Unpackaged files
 # nuke depcrecated epstool
@@ -85,7 +85,7 @@
 %{_mandir}/man*/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
-%doc %{_docdir}/* 
+%doc %{_docdir}/*
 
 
 %clean
@@ -120,8 +120,8 @@
 
 * Sat Apr 24 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.3
 - don't include old epstool (to be packaged separately)
-- gsview.desktop: 
-  MimeType=image/x-eps;application/postscript;application/pdf; 
+- gsview.desktop:
+  MimeType=image/x-eps;application/postscript;application/pdf;
   Categories=Application;GTK;Graphics;Viewer;Publishing;
 
 * Thu Apr 01 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.2



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libgnomecanvasmm20/devel libgnomecanvasmm.spec,1.3,1.4
Message-ID: <200503052110.j25LAOqm011143@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libgnomecanvasmm20/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libgnomecanvasmm20/devel

Modified Files:
	libgnomecanvasmm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomecanvasmm20/devel/libgnomecanvasmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgnomecanvasmm.spec	3 Mar 2005 22:41:32 -0000	1.3
+++ libgnomecanvasmm.spec	5 Mar 2005 21:10:22 -0000	1.4
@@ -11,8 +11,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  gtkmm20-devel >= 0:2.2.5
-BuildRequires:  libgnomecanvas-devel >= 0:1.113.0
+BuildRequires:  gtkmm20-devel >= 2.2.5
+BuildRequires:  libgnomecanvas-devel >= 1.113.0
 Buildrequires:  libtool
 Obsoletes:      libgnomecanvasmm2
 Patch0:         libgnomecanvasmm-2.0.1-gcc34.patch



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/SDL_gfx/devel SDL_gfx.spec,1.1,1.2
Message-ID: <200503052110.j25LAM9m010714@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/SDL_gfx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/SDL_gfx/devel

Modified Files:
	SDL_gfx.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: SDL_gfx.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_gfx/devel/SDL_gfx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SDL_gfx.spec	28 Jan 2005 16:30:08 -0000	1.1
+++ SDL_gfx.spec	5 Mar 2005 21:10:20 -0000	1.2
@@ -77,14 +77,14 @@
 - Initial Extras import, minor spec tweaks.
 
 * Tue Dec 21 2004 Dries Verachtert <dries at ulyssis.org> 2.0.13-1
-- Updated to release 2.0.13 and removed the patch (has been 
+- Updated to release 2.0.13 and removed the patch (has been
   applied upstream)
 
 * Thu Nov 11 2004 Matthias Saou <http://freshrpms.net/> 2.0.12-3
 - Explicitly disable mmx for non-ix86 to fix build on x86_64.
 
 * Fri Oct 22 2004 Dries Verachtert <dries at ulyssis.org> 2.0.12-3
-- fixed some buildrequirements so the correct version of libSDL_gfx.so 
+- fixed some buildrequirements so the correct version of libSDL_gfx.so
   can be found in the list of provides.
 
 * Fri Oct 22 2004 Dries Verachtert <dries at ulyssis.org> 2.0.12-2



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/advancecomp/devel advancecomp.spec,1.4,1.5
Message-ID: <200503052110.j25LAM1B010760@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/advancecomp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/advancecomp/devel

Modified Files:
	advancecomp.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: advancecomp.spec
===================================================================
RCS file: /cvs/extras/rpms/advancecomp/devel/advancecomp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- advancecomp.spec	23 Feb 2005 10:40:08 -0000	1.4
+++ advancecomp.spec	5 Mar 2005 21:10:20 -0000	1.5
@@ -13,7 +13,7 @@
 AdvanceCOMP is a set of recompression utilities for .PNG, .MNG and .ZIP files.
 The main features are :
 * Recompress ZIP, PNG and MNG files using the Deflate 7-Zip implementation.
-* Recompress MNG files using Delta and Move optimization. 
+* Recompress MNG files using Delta and Move optimization.
 
 
 %prep



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/aqhbci-qt-tools/devel aqhbci-qt-tools.spec,1.3,1.4
Message-ID: <200503052110.j25LAMMf010800@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/aqhbci-qt-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/aqhbci-qt-tools/devel

Modified Files:
	aqhbci-qt-tools.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: aqhbci-qt-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/aqhbci-qt-tools/devel/aqhbci-qt-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aqhbci-qt-tools.spec	28 Feb 2005 21:54:32 -0000	1.3
+++ aqhbci-qt-tools.spec	5 Mar 2005 21:10:20 -0000	1.4
@@ -9,9 +9,9 @@
 BuildRequires: gwenhywfar-devel aqbanking-devel aqhbci-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-%description 
+%description
 This package contains the QT setup wizard and a debugger for the HBCI backend
-for the Aqbanking library which implements a client for the German HBCI 
+for the Aqbanking library which implements a client for the German HBCI
 (Home Banking Computer Interface) protocol.
 
 %prep



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-MIME-tools/devel perl-MIME-tools.spec,1.7,1.8
Message-ID: <200503052110.j25LAP9N011252@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-MIME-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-MIME-tools/devel

Modified Files:
	perl-MIME-tools.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/perl-MIME-tools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-MIME-tools.spec	3 Mar 2005 23:46:27 -0000	1.7
+++ perl-MIME-tools.spec	5 Mar 2005 21:10:23 -0000	1.8
@@ -99,5 +99,5 @@
 * Wed Jun 25 2003 Dams <anvil[AT]livna.org> 0:5.411-0.fdr.2.a
 - Now using roaringpenguin tarball
 
-* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 
+* Sun Jun 15 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/openal/devel openal.spec,1.6,1.7
Message-ID: <200503052110.j25LAPmu011227@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/openal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/openal/devel

Modified Files:
	openal.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/devel/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	5 Mar 2005 21:10:23 -0000	1.7
@@ -97,7 +97,7 @@
        ${RPM_BUILD_ROOT}%{_libdir}/openal/Makefile* \
        ${RPM_BUILD_ROOT}%{_libdir}/openal/CVS
 #
-# info 
+# info
 install -m0755 -d ${RPM_BUILD_ROOT}%{_infodir}
 install -m0644 linux/doc/openal.info ${RPM_BUILD_ROOT}%{_infodir}
 #
@@ -118,7 +118,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
 
@@ -128,7 +128,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES COPYING CREDITS README 
+%doc CHANGES COPYING CREDITS README
 %config %{_sysconfdir}/openalrc
 %attr(0644,root,root)%{_libdir}/libopenal.so.*
 %attr(0644,root,root)%{_infodir}/*.info*



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.5,1.6
Message-ID: <200503052110.j25LAMMB010704@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/Inventor/devel

Modified Files:
	Inventor.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Inventor.spec	16 Feb 2005 18:45:21 -0000	1.5
+++ Inventor.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -314,5 +314,5 @@
 
 * Wed Jun 30 2004 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-0.fdr.1
 - Initial Fedora Extras RPM.
-- Adopt Debian/Testing patches (Thanks to Steve M. Robbins for keeping 
+- Adopt Debian/Testing patches (Thanks to Steve M. Robbins for keeping
   Inventor alive).



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/awstats/devel awstats.spec,1.5,1.6
Message-ID: <200503052110.j25LAM49010806@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/awstats/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/awstats/devel

Modified Files:
	awstats.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- awstats.spec	15 Feb 2005 17:35:38 -0000	1.5
+++ awstats.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -11,8 +11,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	httpd
 Requires:	perl
-Requires(post): perl
-Requires(postun): /sbin/service
+Requires(post):		perl
+Requires(postun):	/sbin/service
 
 %description
 Advanced Web Statistics is a powerful and featureful tool that generates
@@ -91,7 +91,7 @@
                 s|^SkipHosts=.*$|SkipHosts="127.0.0.1"|;
                 s|^Expires=.*$|Expires=3600|;
         ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf
-install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf 
+install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf
 
 # Fix scripts
 %{__perl} -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \
@@ -208,7 +208,7 @@
 - only restart apache if we are upgrading
 - install and cp use the "-p" switch
 - use %%_datadir in /etc/httpd/conf.d/awstats.conf
-- improve cron job 
+- improve cron job
 - don't brutally recode HTML pages
 - the scan is now done hourly instead of daily
 - *.pm files are not executable any more



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/neverball/devel neverball.spec,1.6,1.7
Message-ID: <200503052110.j25LAPcD011219@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/neverball/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/neverball/devel

Modified Files:
	neverball.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: neverball.spec
===================================================================
RCS file: /cvs/extras/rpms/neverball/devel/neverball.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- neverball.spec	14 Nov 2004 17:50:10 -0000	1.6
+++ neverball.spec	5 Mar 2005 21:10:23 -0000	1.7
@@ -17,7 +17,7 @@
 %description
 Tilt the  floor to roll a  ball through an obstacle  course within the
 given time.  If the ball falls or time expires, a ball is lost.
- 
+
 Collect 100 coins  to save your progress and earn  an extra ball.  Red
 coins are worth 5.  Blue coins are worth 10.
 
@@ -50,7 +50,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc CHANGES COPYING README
 %{_bindir}/*



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-Net-IP/devel perl-Net-IP.spec,1.4,1.5
Message-ID: <200503052110.j25LAPlj011260@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-IP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-Net-IP/devel

Modified Files:
	perl-Net-IP.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-Net-IP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-IP/devel/perl-Net-IP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Net-IP.spec	3 Mar 2005 23:46:27 -0000	1.4
+++ perl-Net-IP.spec	5 Mar 2005 21:10:23 -0000	1.5
@@ -30,7 +30,7 @@
 # http://rt.cpan.org/NoAuth/Bug.html?id=7528
 %patch0 -p0
 # http://rt.cpan.org/NoAuth/Bug.html?id=3844
-%{__perl} -pi -e 's/^use 5\.008;$//' Makefile.PL # 
+%{__perl} -pi -e 's/^use 5\.008;$//' Makefile.PL
 
 
 %build



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/GtkAda/devel GtkAda.spec,1.6,1.7
Message-ID: <200503052110.j25LAMtT010694@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/GtkAda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/GtkAda/devel

Modified Files:
	GtkAda.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/devel/GtkAda.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GtkAda.spec	13 Feb 2005 13:24:39 -0000	1.6
+++ GtkAda.spec	5 Mar 2005 21:10:20 -0000	1.7
@@ -1,8 +1,7 @@
 Name:		GtkAda
 Version:	2.4.0
 Release:	3
-Epoch:		0
-Summary:	An Ada95 graphical toolkit based on Gtk+
+Summary:	Ada95 graphical toolkit based on Gtk+
 
 Group:		System Environment/Libraries
 License:	GPL
@@ -21,7 +20,7 @@
 %package devel
 Summary:	Development files for GtkAda
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}, perl
+Requires:	%{name} = %{version}-%{release}, perl
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/logjam/devel logjam.spec,1.9,1.10
Message-ID: <200503052110.j25LAP7u011203@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/logjam/devel

Modified Files:
	logjam.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- logjam.spec	3 Mar 2005 22:41:32 -0000	1.9
+++ logjam.spec	5 Mar 2005 21:10:23 -0000	1.10
@@ -65,11 +65,11 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
+%doc doc/README COPYING doc/TODO
 %{_bindir}/logjam
 %{_mandir}/man1/logjam.1.gz
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/logjam*
-%doc doc/README COPYING doc/TODO 
 
 %if %{use_xmms}
 %files xmms
@@ -167,7 +167,7 @@
 * Mon Jan 07 2002 Tom "spot" Callaway <tcallawa at redhat.com>
  - 3.0.2 release, spec cleanups
 * Mon Nov 12 2001 Tom "spot" Callaway <tcallawa at redhat.com>
- - 3.0.1 release, lots of new features/bugfixes. 
+ - 3.0.1 release, lots of new features/bugfixes.
 * Fri Sep 07 2001 Tom "spot" Callaway <tcallawa at redhat.com>
  - Rebuild without ssl for compat. :~(
 * Thu Sep 06 2001 Tom "spot" Callaway <tcallawa at redhat.com>



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/Coin2/devel Coin2.spec,1.3,1.4
Message-ID: <200503052110.j25LAM2j010682@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/Coin2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/Coin2/devel

Modified Files:
	Coin2.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Coin2.spec	10 Dec 2004 22:03:00 -0000	1.3
+++ Coin2.spec	5 Mar 2005 21:10:19 -0000	1.4
@@ -7,10 +7,9 @@
 %define libsimage_SONAME libsimage.so.20
 %define libfreetype_SONAME libfreetype.so.6
 
-Summary: A high-level 3D visualization library.
+Summary: High-level 3D visualization library
 Name: %{name}
 Version: %{srcvers}
-Epoch: 0
 Release: 4
 
 License: GPL
@@ -37,7 +36,7 @@
 
 %package devel
 Summary: Development files for Coin
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: XFree86-devel zlib-devel bzip2-devel
 Group: Development/Libraries
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libglademm20/devel libglademm.spec,1.3,1.4
Message-ID: <200503052110.j25LAOQ8011132@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libglademm20/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libglademm20/devel

Modified Files:
	libglademm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm20/devel/libglademm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libglademm.spec	3 Mar 2005 22:41:32 -0000	1.3
+++ libglademm.spec	5 Mar 2005 21:10:22 -0000	1.4
@@ -11,8 +11,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  gtkmm20-devel >= 0:2.0.2
-BuildRequires:  libglade2-devel >= 0:2.0.0
+BuildRequires:  gtkmm20-devel >= 2.0.2
+BuildRequires:  libglade2-devel >= 2.0.0
 BuildRequires:  libtool
 Obsoletes:      libglademm2
 Patch0:         libglademm-2.2.0-gcc34.patch



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libglademm24/devel libglademm.spec,1.3,1.4
Message-ID: <200503052110.j25LAOiw011138@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libglademm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libglademm24/devel

Modified Files:
	libglademm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/devel/libglademm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libglademm.spec	3 Mar 2005 22:41:32 -0000	1.3
+++ libglademm.spec	5 Mar 2005 21:10:22 -0000	1.4
@@ -11,8 +11,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  gtkmm24-devel >= 0:2.4.0
-BuildRequires:  libglade2-devel >= 0:2.3.6
+BuildRequires:  gtkmm24-devel >= 2.4.0
+BuildRequires:  libglade2-devel >= 2.3.6
 
 %description
 This package provides a C++ interface for libglademm. It is a



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/aalib/devel aalib.spec,1.6,1.7
Message-ID: <200503052110.j25LAM5r010744@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/aalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/aalib/devel

Modified Files:
	aalib.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: aalib.spec
===================================================================
RCS file: /cvs/extras/rpms/aalib/devel/aalib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aalib.spec	16 Dec 2004 20:40:23 -0000	1.6
+++ aalib.spec	5 Mar 2005 21:10:20 -0000	1.7
@@ -132,5 +132,5 @@
 * Wed Apr  2 2003 Dams <anvil[AT]livna.org> 0:1.4.0-0.fdr.0.2.rc5
 - Applied spec modifications from Adrian Reber
 
-* Tue Apr  1 2003 Dams <anvil[AT]livna.org> 
+* Tue Apr  1 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libkexif/devel libkexif.spec,1.3,1.4
Message-ID: <200503052110.j25LAOM6011167@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libkexif/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libkexif/devel

Modified Files:
	libkexif.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libkexif.spec
===================================================================
RCS file: /cvs/extras/rpms/libkexif/devel/libkexif.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libkexif.spec	3 Mar 2005 22:41:32 -0000	1.3
+++ libkexif.spec	5 Mar 2005 21:10:22 -0000	1.4
@@ -9,7 +9,7 @@
 Source0:        http://dl.sf.net/digikam/libkexif-0.2.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libexif-devel >= 0:0.5.7, kdelibs-devel >= 6:3.0
+BuildRequires:  libexif-devel >= 0.5.7, kdelibs-devel >= 6:3.0
 BuildRequires:  gettext
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libsndfile/devel libsndfile.spec,1.6,1.7
Message-ID: <200503052110.j25LAONf011191@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libsndfile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libsndfile/devel

Modified Files:
	libsndfile.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/libsndfile.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsndfile.spec	5 Mar 2005 01:44:40 -0000	1.6
+++ libsndfile.spec	5 Mar 2005 21:10:22 -0000	1.7
@@ -1,16 +1,16 @@
-Summary: 	Library for reading and writing sound files
-Name: 		libsndfile
-Version: 	1.0.11
-Release: 	2
-License: 	LGPL
-Group: 		System Environment/Libraries
-URL: 		http://www.mega-nerd.com/libsndfile/
-Source0: 	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Summary:	Library for reading and writing sound files
+Name:		libsndfile
+Version:	1.0.11
+Release:	2
+License:	LGPL
+Group:		System Environment/Libraries
+URL:		http://www.mega-nerd.com/libsndfile/
+Source0:	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
 Patch0:		libsndfile-1.0.11-svx-channels.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
-BuildRequires:  alsa-lib-devel
-Provides:       %{name}-octave = %{version}-%{release}
+BuildRequires:	alsa-lib-devel
+Provides:	%{name}-octave = %{version}-%{release}
 
 %package devel
 Summary:	Development files for libsndfile
@@ -26,7 +26,7 @@
 
 %description devel
 libsndfile is a C library for reading and writing sound files such as
-AIFF, AU, WAV, and others through one standard interface. 
+AIFF, AU, WAV, and others through one standard interface.
 This package contains files needed to develop with libsndfile.
 
 
@@ -95,5 +95,5 @@
 - Provide -octave in main package, own more related dirs.
 - Bring specfile up to date with current spec templates.
 
-* Sat Apr 12 2003 Dams <anvil[AT]livna.org> 
+* Sat Apr 12 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libmatroska/devel libmatroska.spec,1.7,1.8
Message-ID: <200503052110.j25LAOac011175@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libmatroska/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libmatroska/devel

Modified Files:
	libmatroska.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libmatroska.spec
===================================================================
RCS file: /cvs/extras/rpms/libmatroska/devel/libmatroska.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libmatroska.spec	27 Feb 2005 18:29:38 -0000	1.7
+++ libmatroska.spec	5 Mar 2005 21:10:22 -0000	1.8
@@ -1,4 +1,4 @@
-Summary:	An open Audio/Video container format
+Summary:	Open Audio/Video container format
 Name:		libmatroska
 Version:	0.7.5
 Release:	2
@@ -71,6 +71,6 @@
 - Added license files as doc
 - Requires libebml-devel (headers needed)
 
-* Sat Feb 28 2004 Dams <anvil[AT]livna.org> 
+* Sat Feb 28 2004 Dams <anvil[AT]livna.org>
 - Initial build.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/gwget/devel gwget.spec,1.5,1.6
Message-ID: <200503052110.j25LANbb011052@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gwget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gwget/devel

Modified Files:
	gwget.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gwget.spec	4 Mar 2005 16:56:37 -0000	1.5
+++ gwget.spec	5 Mar 2005 21:10:21 -0000	1.6
@@ -35,7 +35,7 @@
 Requires:	epiphany >= 1.4.4
 BuildRequires:	epiphany-devel >= 1.4.4
 
-%description epiphany-extension 
+%description epiphany-extension
 This Package contains extensions gwget2 extensions for epiphany.
 %endif # _without_epiphanye
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libgnomemm20/devel libgnomemm.spec,1.3,1.4
Message-ID: <200503052110.j25LAOMQ011151@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libgnomemm20/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libgnomemm20/devel

Modified Files:
	libgnomemm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libgnomemm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomemm20/devel/libgnomemm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgnomemm.spec	3 Mar 2005 22:41:32 -0000	1.3
+++ libgnomemm.spec	5 Mar 2005 21:10:22 -0000	1.4
@@ -11,8 +11,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  gtkmm20-devel >= 0:2.0
-BuildRequires:  libgnome-devel >= 0:2.0
+BuildRequires:  gtkmm20-devel >= 2.0
+BuildRequires:  libgnome-devel >= 2.0
 BuildRequires:  libtool
 Obsoletes:      libgnomemm2
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/kile-i18n/devel kile-i18n.spec,1.1,1.2
Message-ID: <200503052110.j25LAOki011096@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kile-i18n/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/kile-i18n/devel

Modified Files:
	kile-i18n.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: kile-i18n.spec
===================================================================
RCS file: /cvs/extras/rpms/kile-i18n/devel/kile-i18n.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kile-i18n.spec	13 Jan 2005 15:39:01 -0000	1.1
+++ kile-i18n.spec	5 Mar 2005 21:10:22 -0000	1.2
@@ -1,11 +1,11 @@
 # $Id$
 
 Summary: i18n support for Kile
-Name: 	 kile-i18n 
-Group:	 Applications/Office
+Name:    kile-i18n
+Group:   Applications/Office
 Version: 1.7
 Release: 3
-Source:  http://dl.sourceforge.net/sourceforge/kile/kile-i18n-1.7.tar.bz2 
+Source:  http://dl.sourceforge.net/sourceforge/kile/kile-i18n-1.7.tar.bz2
 URL:     http://kile.sourceforge.net/
 License: GPL
 # Should be noarch, but doesn't currently work -- Rex
@@ -13,10 +13,10 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libtool
-BuildRequires: kdelibs-devel >= 6:3.2 
+BuildRequires: kdelibs-devel >= 6:3.2
 BuildRequires: gettext
 
-Requires: kile >= 0:1.7 
+Requires: kile >= 1.7
 
 
 %description
@@ -24,21 +24,21 @@
 
 
 %prep
-%setup -q 
+%setup -q
 
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure 
+%configure
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT 
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # Replace absolute symlinks with relative ones
 pushd $RPM_BUILD_ROOT%{_docdir}/HTML
@@ -55,7 +55,7 @@
 
 ## File lists
 # locale's
-%find_lang kile 
+%find_lang kile
 # HTML
 for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
   lang=$(basename $lang_dir)
@@ -79,6 +79,6 @@
 * Tue Nov 20 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.7-0.fdr.2
 - cleanup file lists
 
-* Mon Oct 18 2004 Rex Dieter <rexdieter at sf.net> 1.7-0.fdr.1 
+* Mon Oct 18 2004 Rex Dieter <rexdieter at sf.net> 1.7-0.fdr.1
 - 1.7
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/imlib2/devel imlib2.spec,1.10,1.11
Message-ID: <200503052110.j25LAO7E011058@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/imlib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/imlib2/devel

Modified Files:
	imlib2.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- imlib2.spec	3 Mar 2005 21:46:21 -0000	1.10
+++ imlib2.spec	5 Mar 2005 21:10:21 -0000	1.11
@@ -85,7 +85,7 @@
 
 
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig 
+%postun -p /sbin/ldconfig
 
 
 %files
@@ -111,7 +111,7 @@
 %{_bindir}/imlib2-config
 %{_includedir}/Imlib2.h
 %{_libdir}/libImlib2.a
-%{_libdir}/libImlib2.la 
+%{_libdir}/libImlib2.la
 %{_libdir}/libImlib2.so
 %{_libdir}/pkgconfig/imlib2.pc
 
@@ -124,7 +124,7 @@
 - Really include libtool archives to fix fedora.us bug #2284.
 
 * Fri Jan 14 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.2.0-3
-- Move filters and loaders back into main package where they belong 
+- Move filters and loaders back into main package where they belong
 
 * Mon Jan 10 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.2.0-2
 - Don't ship *.?.a in {_libdir}/imlib/filters/ and loaders/
@@ -134,12 +134,12 @@
   https://bugzilla.fedora.us/show_bug.cgi?id=2284
   http://bugzilla.redhat.com/bugzilla/142244
   http://bugs.kde.org/93359
-- Use make param LIBTOOL=/usr/bin/libtool - fixes hardcoded rpath on x86_64 
+- Use make param LIBTOOL=/usr/bin/libtool - fixes hardcoded rpath on x86_64
 - fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs
   returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz"
-- Update to 1.2.0 -- fixes several security issues 
+- Update to 1.2.0 -- fixes several security issues
 - remove explicit libdir=_libdir - 1.2.9 does not need it anymore
-- removeddemo compile/install; 
+- removeddemo compile/install;
 - use configure param --x-libraries={_prefix}/X11R6/{_lib} and patch to fix
   "cannot find -lX11"
 
@@ -160,5 +160,5 @@
 - Moved some binaries and loaders into main package
 - Added missing Requires and BuildRequires
 
-* Sun Oct 26 2003 Dams <anvil[AT]livna.org> 
+* Sun Oct 26 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libid3tag/devel libid3tag.spec,1.6,1.7
Message-ID: <200503052110.j25LAOu8011163@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libid3tag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libid3tag/devel

Modified Files:
	libid3tag.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libid3tag.spec
===================================================================
RCS file: /cvs/extras/rpms/libid3tag/devel/libid3tag.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libid3tag.spec	3 Mar 2005 22:41:32 -0000	1.6
+++ libid3tag.spec	5 Mar 2005 21:10:22 -0000	1.7
@@ -11,7 +11,7 @@
 Source1:        %{name}.pc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:  zlib-devel >= 0:1.1.4
+BuildRequires:  zlib-devel >= 1.1.4
 
 %description
 libid3tag is a library for reading and (eventually) writing ID3 tags,



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/jed/devel jed.spec,1.2,1.3
Message-ID: <200503052110.j25LAOcp011070@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/jed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/jed/devel

Modified Files:
	jed.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/jed.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jed.spec	4 Mar 2005 22:39:35 -0000	1.2
+++ jed.spec	5 Mar 2005 21:10:22 -0000	1.3
@@ -1,4 +1,4 @@
-Summary: A fast, compact editor based on the S-Lang screen library
+Summary: Fast, compact editor based on the S-Lang screen library
 Name: jed
 Version: 0.99.16
 Release: 8
@@ -35,7 +35,7 @@
 chmod +x configure
 
 %build
-export JED_ROOT="%{_datadir}/jed" 
+export JED_ROOT="%{_datadir}/jed"
 %configure
 make
 
@@ -144,7 +144,7 @@
 - handle compressed man pages
 - add install-info scripts
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
 - auto rebuild in the new build environment (release 2)
 
 * Thu Oct 29 1998 Bill Nottingham <notting at redhat.com>



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libmodplug/devel libmodplug.spec,1.4,1.5
Message-ID: <200503052110.j25LAOix011179@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libmodplug/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libmodplug/devel

Modified Files:
	libmodplug.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libmodplug.spec
===================================================================
RCS file: /cvs/extras/rpms/libmodplug/devel/libmodplug.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libmodplug.spec	10 Dec 2004 22:03:05 -0000	1.4
+++ libmodplug.spec	5 Mar 2005 21:10:22 -0000	1.5
@@ -16,7 +16,7 @@
 %package        devel
 Summary:        Development files for the Modplug mod music file format library
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}, pkgconfig
+Requires:       %{name} = %{version}-%{release}, pkgconfig
 
 %description    devel
 %{summary}.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libsafe/devel libsafe-2.0-16.spec,1.4,1.5
Message-ID: <200503052110.j25LAO8m011183@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libsafe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libsafe/devel

Modified Files:
	libsafe-2.0-16.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libsafe-2.0-16.spec
===================================================================
RCS file: /cvs/extras/rpms/libsafe/devel/libsafe-2.0-16.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsafe-2.0-16.spec	2 Feb 2005 14:02:59 -0000	1.4
+++ libsafe-2.0-16.spec	5 Mar 2005 21:10:22 -0000	1.5
@@ -1,4 +1,4 @@
-Summary: Libsafe: Protecting Critical Elements of Stacks
+Summary: Protect critical elements of stacks
 Name: libsafe
 Version: 2.0
 Release: 16c
@@ -23,8 +23,8 @@
 potentially prevent yet unknown attacks. Experiments indicate that the
 performance overhead of libsafe is negligible.
 
-Be aware that any RPMS built while libsafe is installed will require libsafe 
-in order to install because of RPM's autodeps. You are encouraged to use a 
+Be aware that any RPMS built while libsafe is installed will require libsafe
+in order to install because of RPM's autodeps. You are encouraged to use a
 chroot for RPM builds rather than a libsafe protected system.
 
 This libsafe is modified from upstream's 2002 release by Steve Grubb's
@@ -47,7 +47,7 @@
 %doc README EMAIL_NOTIFICATION LIBPRELUDE COPYING ChangeLog doc tools
 /lib/libsafe.so.2.0.16c
 
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
@@ -87,7 +87,7 @@
 rm -f /etc/ld.so.preload.tmp
 
 %changelog
-* Sat Jan 29 2005 Warren Togami <wtogami at redhat.com> 
+* Sat Jan 29 2005 Warren Togami <wtogami at redhat.com>
 
 * Thu Dec 16 2004 Warren Togami <wtogami at redhat.com> 2.0-16c
 - Patch with Steve Grubb's libsafe-2.0-16c improvements



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-XML-LibXSLT/devel perl-XML-LibXSLT.spec,1.1,1.2
Message-ID: <200503052110.j25LAP1b011286@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-XML-LibXSLT/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-XML-LibXSLT/devel

Modified Files:
	perl-XML-LibXSLT.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-XML-LibXSLT.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-LibXSLT/devel/perl-XML-LibXSLT.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-LibXSLT.spec	5 Mar 2005 11:18:47 -0000	1.1
+++ perl-XML-LibXSLT.spec	5 Mar 2005 21:10:23 -0000	1.2
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1, perl(XML::LibXML) >= 1.57
-BuildRequires:	libxslt-devel >= 1.0.6 
+BuildRequires:	libxslt-devel >= 1.0.6
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/lincvs/devel lincvs.spec,1.4,1.5
Message-ID: <200503052110.j25LAPCd011199@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lincvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/lincvs/devel

Modified Files:
	lincvs.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: lincvs.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/devel/lincvs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lincvs.spec	12 Feb 2005 21:24:23 -0000	1.4
+++ lincvs.spec	5 Mar 2005 21:10:23 -0000	1.5
@@ -1,7 +1,7 @@
 Name:             lincvs
 Version:          1.4.0
 Release:          0.rc2
-Summary:          Graphical CVS Client.
+Summary:          Graphical CVS client
 
 Group:            Development/Tools
 License:          GPL
@@ -11,14 +11,22 @@
 Source2:          lincvs.desktop
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:    cvs >= 0:1.9.0
+BuildRequires:    cvs >= 1.9.0
 BuildRequires:    qt-devel >= 1:3.3
-Requires:         cvs >= 0:1.9.0
+Requires:         cvs >= 1.9.0
 
 %description
-LinCVS is a graphical Interface for the cvs client commandline tool on the Unix and Windows platform. It allows ato load modules from a server (checkout), create modules on the server (import), as well as checking the state of directories and individual files or updating them. Basic operations like add, remove and commit are supported as matter of course, just like showing the actual differences between the server version and the local sandbox, graphical display of the version tree, and manifoldy graphical support of project maintenance. All actions are logged on the cvs server (configurable via history), and are therewith comprehensible.
+LinCVS is a graphical Interface for the cvs client commandline tool. It allows
+ato load modules from a server (checkout), create modules on the server
+(import), as well as checking the state of directories and individual files or
+updating them. Basic operations like add, remove and commit are supported as
+matter of course, just like showing the actual differences between the server
+version and the local sandbox, graphical display of the version tree, and
+manifoldy graphical support of project maintenance. All actions are logged on
+the cvs server (configurable via history), and are therewith comprehensible.
 
-To keep LinCVS independant of the cvs version, LinCVS uses the local but separat installed cvs and therewith always should work with the latest version.
+To keep LinCVS independant of the cvs version, LinCVS uses the local but
+separately installed cvs and should always work with the latest version.
 
 
 %prep
@@ -29,7 +37,7 @@
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 qmake -o Makefile lincvs.pro
 make %{?_smp_mflags}
-  
+
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -45,7 +53,7 @@
 
 desktop-file-install --vendor fedora                \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   \
-  --add-category X-Fedora-Extra	                    \
+  --add-category X-Fedora-Extra                     \
   %{SOURCE2}
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/apachetop/devel apachetop.spec,1.5,1.6
Message-ID: <200503052110.j25LAM8o010784@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/apachetop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/apachetop/devel

Modified Files:
	apachetop.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: apachetop.spec
===================================================================
RCS file: /cvs/extras/rpms/apachetop/devel/apachetop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apachetop.spec	11 Nov 2004 11:14:06 -0000	1.5
+++ apachetop.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           apachetop
 Version:        0.12
 Release:        2
-Summary:        A top-like display of Apache logs
+Summary:        Top-like display of Apache logs
 
 Group:          Applications/Internet
 License:        BSD
@@ -38,7 +38,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE ChangeLog README TODO
 %{_sbindir}/*



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/libxml++/devel libxml++.spec,1.5,1.6
Message-ID: <200503052110.j25LAPgb011195@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libxml++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libxml++/devel

Modified Files:
	libxml++.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libxml++.spec	3 Mar 2005 22:41:32 -0000	1.5
+++ libxml++.spec	5 Mar 2005 21:10:22 -0000	1.6
@@ -7,7 +7,7 @@
 URL: http://libxmlplusplus.sourceforge.net/
 Source: http://dl.sf.net/libxmlplusplus/libxml++-0.26.0.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libxml2-devel >= 0:2.5.1, doxygen, graphviz
+BuildRequires: libxml2-devel >= 2.5.1, doxygen, graphviz
 
 %description
 libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-MailTools/devel perl-MailTools.spec,1.7,1.8
Message-ID: <200503052110.j25LAPFf011256@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-MailTools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-MailTools/devel

Modified Files:
	perl-MailTools.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-MailTools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-MailTools.spec	3 Mar 2005 23:46:27 -0000	1.7
+++ perl-MailTools.spec	5 Mar 2005 21:10:23 -0000	1.8
@@ -86,5 +86,5 @@
 - Modified Summary according to Michael Schwendt suggestion
 - Modified tarball permissions to 0644
 
-* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 
+* Sun Jun 15 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libsamplerate/devel libsamplerate.spec,1.7,1.8
Message-ID: <200503052110.j25LAOLO011187@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libsamplerate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libsamplerate/devel

Modified Files:
	libsamplerate.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libsamplerate.spec
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/devel/libsamplerate.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libsamplerate.spec	5 Mar 2005 01:48:09 -0000	1.7
+++ libsamplerate.spec	5 Mar 2005 21:10:22 -0000	1.8
@@ -1,18 +1,18 @@
-Summary: 	Sample rate conversion library for audio data
-Name: 		libsamplerate
-Version: 	0.1.2
-Release: 	2
-License: 	GPL
-Group: 		System Environment/Libraries
-URL: 		http://www.mega-nerd.com/SRC/
-Source0: 	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Summary:	Sample rate conversion library for audio data
+Name:		libsamplerate
+Version:	0.1.2
+Release:	2
+License:	GPL
+Group:		System Environment/Libraries
+URL:		http://www.mega-nerd.com/SRC/
+Source0:	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 BuildRequires:	libsndfile-devel >= 1.0.6 pkgconfig
 
 %package devel
-Summary: 	Development related files for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{version}-%{release} pkgconfig
+Summary:	Development related files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release} pkgconfig
 
 
 %description
@@ -37,7 +37,7 @@
 
 %build
 %configure --disable-dependency-tracking --disable-fftw
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -93,5 +93,5 @@
 * Wed Jun 25 2003 Dams <anvil[AT]livna.org> 0:0.0.15-0.fdr.2
 - Added some more doc
 
-* Thu May 22 2003 Dams <anvil[AT]livna.org> 
+* Thu May 22 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/bbkeys/devel bbkeys.spec,1.5,1.6
Message-ID: <200503052110.j25LAMD9010812@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/bbkeys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/bbkeys/devel

Modified Files:
	bbkeys.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: bbkeys.spec
===================================================================
RCS file: /cvs/extras/rpms/bbkeys/devel/bbkeys.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bbkeys.spec	16 Nov 2004 17:10:21 -0000	1.5
+++ bbkeys.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -1,6 +1,3 @@
-# $Id$
-# Authority: matthias
-
 Summary: Completely configurable key-combo grabber for blackbox
 Name: bbkeys
 Version: 0.8.6
@@ -40,16 +37,16 @@
 %{__rm} -rf %{buildroot}
 
 
-%files 
-%defattr(-, root, root, 0755) 
+%files
+%defattr(-, root, root, 0755)
 %doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 %{_bindir}/*
 %dir %{_datadir}/bbtools
 %config %{_datadir}/bbtools/*
 %{_mandir}/man?/*
 
- 
-%changelog 
+
+%changelog
 * Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 0.8.6-4
 - Bump release to provide Extras upgrade path.
 
@@ -84,8 +81,8 @@
 - added to file list for newly included files (docs and man pages)
 - install to %{prefix} instead of /usr
 
-* Sun May 6 2001 Hollis Blanchard <hollis at terraplex.com> 
-- removed file list in favor of explicit %files section 
-- install to /usr instead of /usr/local 
+* Sun May 6 2001 Hollis Blanchard <hollis at terraplex.com>
+- removed file list in favor of explicit %files section
+- install to /usr instead of /usr/local
 - buildroot = /var/tmp/bbkeys-buildroot instead of /tmp/buildroot
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/directfb/devel directfb.spec,1.1,1.2
Message-ID: <200503052110.j25LAN0m010886@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/directfb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/directfb/devel

Modified Files:
	directfb.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: directfb.spec
===================================================================
RCS file: /cvs/extras/rpms/directfb/devel/directfb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- directfb.spec	31 Dec 2004 17:36:32 -0000	1.1
+++ directfb.spec	5 Mar 2005 21:10:21 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           directfb
 Version:        0.9.21
-Release:        0.fdr.1.3
-Summary:        Graphics abstraction library for the Linux Framebuffer Device.
+Release:        1
+Summary:        Graphics abstraction library for the Linux Framebuffer Device
 
 Group:          System/Libraries
 License:        GPL
@@ -13,11 +13,11 @@
 BuildRequires:  zlib-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  freetype-devel
-BuildRequires:	SDL-devel
+BuildRequires:  SDL-devel
 # libtool
-BuildRequires:	gcc-c++
+BuildRequires:  gcc-c++
 
-%define oname	DirectFB
+%define oname   DirectFB
 
 %description
 DirectFB is a thin library that provides hardware graphics acceleration,
@@ -25,10 +25,10 @@
 support for translucent windows and multiple display layers on top of the
 Linux Framebuffer Device.
 
-It is a complete hardware abstraction layer with software fallbacks for 
+It is a complete hardware abstraction layer with software fallbacks for
 every graphics operation that is not supported by the underlying hardware.
-DirectFB adds graphical power to embedded systems and sets a new standard 
-for graphics under Linux. 
+DirectFB adds graphical power to embedded systems and sets a new standard
+for graphics under Linux.
 
 %package        devel
 Summary:        Development package for %{name}
@@ -51,12 +51,12 @@
 %else
 	--disable-mmx \
 %endif
-        --disable-maintainer-mode \
-        --enable-shared \
-        --enable-static \
-        --enable-fast-install \
-        --disable-avifile \
-        --disable-debug \
+	--disable-maintainer-mode \
+	--enable-shared \
+	--enable-static \
+	--enable-fast-install \
+	--disable-avifile \
+	--disable-debug \
 	--with-gfxdrivers=\
 ati128,cle266,cyber5k,i810,mach64,matrox,\
 neomagic,nsc,nvidia,radeon,savage,\



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/inkscape/devel inkscape.spec,1.5,1.6
Message-ID: <200503052110.j25LAOof011065@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/inkscape/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/inkscape/devel

Modified Files:
	inkscape.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- inkscape.spec	10 Feb 2005 04:14:11 -0000	1.5
+++ inkscape.spec	5 Mar 2005 21:10:22 -0000	1.6
@@ -43,7 +43,7 @@
 
 It has a relatively modern display engine, giving you finely antialiased
 display, alpha transparencies, vector fonts and so on. Inkscape is written in
-C and C++, using the Gtk+ toolkit and optionally some Gnome libraries. 
+C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
 
 
 %prep
@@ -110,7 +110,7 @@
 
 * Thu Nov 11 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.39-0.fdr.2
 - post/postun for new mime system.
-- Dropped redundant BR XFree86-devel. 
+- Dropped redundant BR XFree86-devel.
 
 * Sun Aug 29 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.39-0.fdr.1
 - 0.39.
@@ -128,9 +128,9 @@
 - version upgrade with many improvements and bug fixes
 
 * Fri Mar 19 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.7
-- repsin - sourceforge does not allow reloading files with same name 
+- repsin - sourceforge does not allow reloading files with same name
 * Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.6
-- fix typo in provides 
+- fix typo in provides
 * Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.5
 - add %{release} to provides perl(SpSVG) = %{epoch}:%{version}:%{release} only
 * Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.4
@@ -146,10 +146,10 @@
 - enable inkjar
 * Tue Feb 10  2004 P Linnell <scribusdocs at atlantictechsolutions.com>   0:0.37.0.fdr.1
 - pgp'd tarball from inkscape.org
-- clean out the cvs tweaks in spec file 
+- clean out the cvs tweaks in spec file
 - enable gnome-print
 - add the new tutorial files
-- make sure .mo file gets packaged 
+- make sure .mo file gets packaged
 - add provides: perlSVG
 - submit to Fedora QA
 * Sat Feb 7  2004 P Linnell <scribusdocs at atlantictechsolutions.com>



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/pcsc-lite/devel pcsc-lite.spec,1.2,1.3
Message-ID: <200503052110.j25LAPBE011240@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pcsc-lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/pcsc-lite/devel

Modified Files:
	pcsc-lite.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcsc-lite.spec	3 Mar 2005 23:53:13 -0000	1.2
+++ pcsc-lite.spec	5 Mar 2005 21:10:23 -0000	1.3
@@ -12,7 +12,7 @@
 Patch0:         %{name}-docinst.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{__perl}, flex, libusb-devel >= 0:0.1.6
+BuildRequires:  %{__perl}, flex, libusb-devel >= 0.1.6
 Requires:       chkconfig, pcsc-ifd-handler
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libfwbuilder/devel libfwbuilder.spec,1.4,1.5
Message-ID: <200503052110.j25LAOuu011126@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libfwbuilder/devel

Modified Files:
	libfwbuilder.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libfwbuilder.spec	3 Mar 2005 18:04:58 -0000	1.4
+++ libfwbuilder.spec	5 Mar 2005 21:10:22 -0000	1.5
@@ -1,21 +1,21 @@
 Name:           libfwbuilder
-Summary: 	Firewall Builder API
+Summary:        Firewall Builder API
 Version:        2.0.6
 Release:        1
-License: 	GPL
-Group:  	System Environment/Libraries
-Url: 		http://www.fwbuilder.org/
-Source: 	%{name}-%{version}.tar.gz
+License:        GPL
+Group:          System Environment/Libraries
+URL:            http://www.fwbuilder.org/
+Source:         %{name}-%{version}.tar.gz
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  qt-devel >= 1:3.0.0
-BuildRequires:	libxslt-devel
+BuildRequires:  libxslt-devel
 BuildRequires:  openssl-devel
 #BuildRequires:  net-snmp-devel
 
-%description 
+%description
 Firewall Builder API library and compiler framework
 
-%files 
+%files
 %defattr(-,root,root)
 %doc doc/AUTHORS doc/COPYING doc/ChangeLog doc/Credits doc/README doc/PatchAcceptancePolicy.txt
 %dir %{_datadir}/libfwbuilder
@@ -26,7 +26,7 @@
 
 %package devel
 Summary:   Firewall Builder API Libraries and Header Files
-Group: 	   Development/Libraries
+Group:     Development/Libraries
 Requires:  %{name} = %{version}-%{release}
 Requires: libxslt-devel
 Requires: openssl-devel
@@ -42,7 +42,7 @@
 %{_includedir}/fwb-2.0/fwcompiler
 
 
-%prep 
+%prep
 %setup -q
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libgnomecanvasmm26/devel libgnomecanvasmm.spec,1.3,1.4
Message-ID: <200503052110.j25LAOic011147@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libgnomecanvasmm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libgnomecanvasmm26/devel

Modified Files:
	libgnomecanvasmm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgnomecanvasmm.spec	3 Mar 2005 22:41:32 -0000	1.3
+++ libgnomecanvasmm.spec	5 Mar 2005 21:10:22 -0000	1.4
@@ -11,8 +11,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  gtkmm24-devel >= 0:2.4.0
-BuildRequires:  libgnomecanvas-devel >= 0:2.6.0
+BuildRequires:  gtkmm24-devel >= 2.4.0
+BuildRequires:  libgnomecanvas-devel >= 2.6.0
 
 %description
 This package provides a C++ interface for GnomeUI.  It is a subpackage



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-Net-Server/devel perl-Net-Server.spec,1.6,1.7
Message-ID: <200503052110.j25LAPip011269@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Net-Server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-Net-Server/devel

Modified Files:
	perl-Net-Server.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/perl-Net-Server.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Net-Server.spec	3 Mar 2005 23:46:27 -0000	1.6
+++ perl-Net-Server.spec	5 Mar 2005 21:10:23 -0000	1.7
@@ -22,7 +22,7 @@
 end layer of internet protocol servers.
 
 %prep
-%setup -n %{rname}-%{version} 
+%setup -n %{rname}-%{version}
 
 %build
 CFLAGS="%{optflags}" %{__perl} Makefile.PL \
@@ -41,7 +41,7 @@
 %check || :
 make test
 
-%clean 
+%clean
 rm -fr %{buildroot}
 
 %files



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/fluxconf/devel fluxconf.spec,1.4,1.5
Message-ID: <200503052110.j25LANaG010926@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fluxconf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/fluxconf/devel

Modified Files:
	fluxconf.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: fluxconf.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/devel/fluxconf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fluxconf.spec	3 Mar 2005 20:33:53 -0000	1.4
+++ fluxconf.spec	5 Mar 2005 21:10:21 -0000	1.5
@@ -3,7 +3,7 @@
 Release:	1
 Summary:	Configuration utility for fluxbox
 
-Group:		User Interface/Desktops 
+Group:		User Interface/Desktops
 License:	GPL
 URL:		http://devaux.fabien.free.fr/flux
 
@@ -20,7 +20,7 @@
 
 Fluxbox graphical configuration utilities:
 fluxconf: a general configuration tool
-fluxkeys: keyboard shortcut configuration tool  
+fluxkeys: keyboard shortcut configuration tool
 fluxmenu: menu configuration tool using drag & drop
 
 %prep
@@ -40,7 +40,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %makeinstall     bindir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/bin \
-                 mandir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/man 
+                 mandir=$RPM_BUILD_ROOT/%{_prefix}/X11R6/man
 
 cd $RPM_BUILD_ROOT/%{_prefix}/X11R6/bin
 rm -f fluxkeys fluxmenu fluxbare
@@ -62,5 +62,5 @@
 %{_prefix}/share/locale/fr/LC_MESSAGES/%{name}.mo
 
 %changelog
-* Tue Jan 13 2004 Arnaud Ab?lard <arny at arny.org> 
+* Tue Jan 13 2004 Arnaud Ab?lard <arny at arny.org>
 - Initial release



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gnofract4d/devel gnofract4d.spec,1.4,1.5
Message-ID: <200503052110.j25LANv4010975@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnofract4d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gnofract4d/devel

Modified Files:
	gnofract4d.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gnofract4d.spec
===================================================================
RCS file: /cvs/extras/rpms/gnofract4d/devel/gnofract4d.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnofract4d.spec	13 Feb 2005 17:33:51 -0000	1.4
+++ gnofract4d.spec	5 Mar 2005 21:10:21 -0000	1.5
@@ -11,16 +11,16 @@
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 # This *really* requires gcc at runtime!
-Requires:	gcc
+Requires:       gcc
 BuildRequires:  desktop-file-utils, python-devel
-BuildRequires:	scrollkeeper, libgnomeui-devel
+BuildRequires:  scrollkeeper, libgnomeui-devel
 
 %description
-Gnofract 4D is a Gnome-based program to draw fractals. What sets it apart from 
-other fractal programs (and makes it "4D") is the way that it treats the 
-Mandelbrot and Julia sets as different views of the same four-dimensional 
-fractal object. This allows you to generate images which are a cross between 
-the two sets and explore their inter-relationships. 
+Gnofract 4D is a Gnome-based program to draw fractals. What sets it apart from
+other fractal programs (and makes it "4D") is the way that it treats the
+Mandelbrot and Julia sets as different views of the same four-dimensional
+fractal object. This allows you to generate images which are a cross between
+the two sets and explore their inter-relationships.
 
 %prep
 %setup -q
@@ -61,7 +61,7 @@
 /usr/bin/scrollkeeper-update 2> /dev/null
 /usr/bin/update-desktop-database %{_datadir}/applications
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/*



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-Convert-UUlib/devel perl-Convert-UUlib.spec,1.6,1.7
Message-ID: <200503052110.j25LAP5L011244@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Convert-UUlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-Convert-UUlib/devel

Modified Files:
	perl-Convert-UUlib.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/perl-Convert-UUlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Convert-UUlib.spec	3 Mar 2005 23:46:26 -0000	1.6
+++ perl-Convert-UUlib.spec	5 Mar 2005 21:10:23 -0000	1.7
@@ -12,8 +12,8 @@
 Source:    http://www.cpan.org/authors/id/M/ML/MLEHMANN/%{rname}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: perl >= 0:5.8.0
-Requires:      perl >= 0:5.8.0
+BuildRequires: perl >= 5.8.0
+Requires:      perl >= 5.8.0
 
 %description
 A perl interface to the uulib library (a.k.a. uudeview/uuenview)



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/convmv/devel convmv.spec,1.2,1.3
Message-ID: <200503052110.j25LAMKi010862@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/convmv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/convmv/devel

Modified Files:
	convmv.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: convmv.spec
===================================================================
RCS file: /cvs/extras/rpms/convmv/devel/convmv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- convmv.spec	15 Jan 2005 09:22:40 -0000	1.2
+++ convmv.spec	5 Mar 2005 21:10:20 -0000	1.3
@@ -1,4 +1,4 @@
-Summary: Convert filename encodings.
+Summary: Convert filename encodings
 Name: convmv
 Version: 1.08
 Release: 2



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/anjuta/devel anjuta.spec,1.7,1.8
Message-ID: <200503052110.j25LAM2O010772@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/anjuta/devel

Modified Files:
	anjuta.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- anjuta.spec	3 Mar 2005 19:29:59 -0000	1.7
+++ anjuta.spec	5 Mar 2005 21:10:20 -0000	1.8
@@ -10,11 +10,11 @@
 Source0:        http://download.sourceforge.net/anjuta/anjuta-1.2.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgnomeui-devel >= 0:2.0.2
-BuildRequires:  libbonoboui-devel >= 0:2.0.1
+BuildRequires:  libgnomeui-devel >= 2.0.2
+BuildRequires:  libbonoboui-devel >= 2.0.1
 BuildRequires:  libgnomeprintui22-devel
-BuildRequires:  ncurses-devel >= 0:5.0
-BuildRequires:  pcre-devel >= 0:3.9
+BuildRequires:  ncurses-devel >= 5.0
+BuildRequires:  pcre-devel >= 3.9
 BuildRequires:  vte-devel
 BuildRequires:  scrollkeeper
 BuildRequires:  libtool
@@ -37,9 +37,9 @@
 
 
 %package        docs
-Summary:        Anjuta documentations package.
+Summary:        Anjuta documentation
 Group:          Development/Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description docs
 Anjuta documentations.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gtkglarea2/devel gtkglarea2.spec,1.7,1.8
Message-ID: <200503052110.j25LANrS011036@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gtkglarea2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gtkglarea2/devel

Modified Files:
	gtkglarea2.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gtkglarea2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglarea2/devel/gtkglarea2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkglarea2.spec	3 Mar 2005 23:12:24 -0000	1.7
+++ gtkglarea2.spec	5 Mar 2005 21:10:21 -0000	1.8
@@ -1,13 +1,13 @@
-Summary:	An OpenGL GTK widget
-Name: 		gtkglarea2
+Summary:	OpenGL GTK widget
+Name:		gtkglarea2
 Version:	1.99.0
-Release: 	1
+Release:	1
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea
 # ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/
-Source0: 	ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/1.99/gtkglarea-1.99.0.tar.bz2
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/1.99/gtkglarea-1.99.0.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	pkgconfig, xorg-x11-devel
 BuildRequires:	gtk2-devel
 
@@ -74,5 +74,5 @@
 * Tue May  6 2003 Dams <anvil[AT]livna.org> 0:1.99.0-0.fdr.2
 - buildroot -> RPM_BUILD_ROOT
 
-* Wed Apr 23 2003 Dams <anvil[AT]livna.org> 
+* Wed Apr 23 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/opensc/devel opensc.spec,1.3,1.4
Message-ID: <200503052110.j25LAPW6011232@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/opensc/devel

Modified Files:
	opensc.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- opensc.spec	9 Feb 2005 02:35:04 -0000	1.3
+++ opensc.spec	5 Mar 2005 21:10:23 -0000	1.4
@@ -69,7 +69,7 @@
   iconv -f iso-8859-1 -t utf-8 $file > $file.utf-8 ; mv $file.utf-8 $file
 done
 sh ./bootstrap # for patch0
-# Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms. 
+# Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms.
 sed -i -e 's!/lib/libcrypto!/%{_lib}/libcrypto!g' configure
 sed -i -e 's!openssldir/lib !openssldir/%{_lib} !g' configure
 
@@ -180,7 +180,7 @@
 
 %changelog
 * Wed Feb  9 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.4-2
-- Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms. 
+- Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms.
 - Use --with-plugin-dir instead of --with-plugin-path (fixes x86_64).
 
 * Thu Feb  3 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.4-1



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/galculator/devel galculator.spec,1.3,1.4
Message-ID: <200503052110.j25LANhF010937@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/galculator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/galculator/devel

Modified Files:
	galculator.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: galculator.spec
===================================================================
RCS file: /cvs/extras/rpms/galculator/devel/galculator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- galculator.spec	29 Nov 2004 00:42:15 -0000	1.3
+++ galculator.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -1,7 +1,7 @@
 Name:           galculator
 Version:        1.2.4
 Release:        2
-Summary:        GTK 2 based scientific calculator.
+Summary:        GTK 2 based scientific calculator
 
 Group:          Applications/Engineering
 License:        GPL
@@ -13,10 +13,10 @@
 BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  libglade2-devel
-BuildRequires:	perl-XML-Parser
+BuildRequires:  perl(XML::Parser)
 
 %description
-galculator is a GTK 2 based scientific calculator with "ordinary" and reverse 
+galculator is a GTK 2 based scientific calculator with "ordinary" and reverse
 polish notation.
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/pam_mount/devel pam_mount.spec,1.2,1.3
Message-ID: <200503052110.j25LAPUm011236@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pam_mount/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/pam_mount/devel

Modified Files:
	pam_mount.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: pam_mount.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam_mount.spec	2 Feb 2005 14:10:19 -0000	1.2
+++ pam_mount.spec	5 Mar 2005 21:10:23 -0000	1.3
@@ -1,4 +1,4 @@
-Summary: A PAM module that can mount volumes for a user session
+Summary: PAM module that can mount volumes for a user session
 Name: pam_mount
 Version: 0.9.16
 Release: 1
@@ -11,12 +11,12 @@
 BuildRequires: glib2-devel pam-devel openssl-devel zlib-devel
 
 %description
-This module is aimed at environments with SMB (Samba or Windows NT) 
-or NCP (Netware or Mars-NWE) servers that Unix users wish to access 
-transparently. It facilitates access to private volumes of these types 
-well. The module also supports mounting home directories using 
-loopback encrypted filesystems. The module was originally written for 
-use on the GNU/Linux operating system but has since been modified to 
+This module is aimed at environments with SMB (Samba or Windows NT)
+or NCP (Netware or Mars-NWE) servers that Unix users wish to access
+transparently. It facilitates access to private volumes of these types
+well. The module also supports mounting home directories using
+loopback encrypted filesystems. The module was originally written for
+use on the GNU/Linux operating system but has since been modified to
 work on several flavors of BSD.
 
  o Every user can access his own volumes
@@ -27,21 +27,21 @@
 
  o There is no need to keep the login passwords in any additional file
 
- o The volumes are unmounted upon logout, so it saves system resources, 
- avoiding the need of listing every every possibly useful remote 
- volume in /etc/fstab or in an automount/supermount config file. This 
+ o The volumes are unmounted upon logout, so it saves system resources,
+ avoiding the need of listing every every possibly useful remote
+ volume in /etc/fstab or in an automount/supermount config file. This
  is also necessary for securing encrypted filesystems.
 
-Pam_mount "understands" SMB, NCP, and any type of filesystem that can 
-be mounted using the standard mount command. If someone has a 
-particular need for a different filesystem, feel free to ask me to 
+Pam_mount "understands" SMB, NCP, and any type of filesystem that can
+be mounted using the standard mount command. If someone has a
+particular need for a different filesystem, feel free to ask me to
 include it and send me patches.
 
-If you intend to use pam_mount to protect volumes on your computer 
-using an encrypted filesystem system, please know that there are many 
-other issues you need to consider in order to protect your data. 
-For example, you probably want to disable or encrypt your swap 
-partition (the cryptoswap can help you do this). Don't assume a 
+If you intend to use pam_mount to protect volumes on your computer
+using an encrypted filesystem system, please know that there are many
+other issues you need to consider in order to protect your data.
+For example, you probably want to disable or encrypt your swap
+partition (the cryptoswap can help you do this). Don't assume a
 system is secure without carefully considering potential threats.
 
 
@@ -70,6 +70,7 @@
 
 %files
 %defattr(-, root, root)
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README FAQ
 /%{_lib}/security/pam_mount.so
 /%{_lib}/security/pam_mount_auth.so
 /%{_lib}/security/pam_mount_session.so
@@ -81,9 +82,6 @@
 %config(noreplace) %{_sysconfdir}/security/pam_mount.conf
 
 
-%doc	AUTHORS COPYING ChangeLog INSTALL NEWS README FAQ
-
-
 %changelog
 * Tue Mar 23 2004 W. Michael Petullo <mike[@]flyn.org> - 0.9.16-0.fdr.1
    - Updated to pam_mount 0.9.16.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-Test-Manifest/devel perl-Test-Manifest.spec,1.5,1.6
Message-ID: <200503052110.j25LAPDP011274@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Test-Manifest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-Test-Manifest/devel

Modified Files:
	perl-Test-Manifest.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-Test-Manifest.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/perl-Test-Manifest.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-Manifest.spec	3 Mar 2005 23:46:28 -0000	1.5
+++ perl-Test-Manifest.spec	5 Mar 2005 21:10:23 -0000	1.6
@@ -55,7 +55,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes 
+%doc Changes
 %{perl_vendorlib}/Test/
 %{_mandir}/man3/*.3*
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/jhead/devel jhead.spec,1.7,1.8
Message-ID: <200503052110.j25LAO73011076@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/jhead/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/jhead/devel

Modified Files:
	jhead.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: jhead.spec
===================================================================
RCS file: /cvs/extras/rpms/jhead/devel/jhead.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jhead.spec	13 Feb 2005 11:16:18 -0000	1.7
+++ jhead.spec	5 Mar 2005 21:10:22 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: Tool for displaying EXIF data embedded in JPEG images
 Group: Applications/Multimedia
 License: Public Domain
-URL: http://www.sentex.net/~mwandel/jhead/           
+URL: http://www.sentex.net/~mwandel/jhead/
 Source0: http://www.sentex.net/~mwandel/jhead/jhead-2.3.tar.gz
 Patch0: jhead-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gweled/devel gweled.spec,1.5,1.6
Message-ID: <200503052110.j25LANlX011046@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gweled/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gweled/devel

Modified Files:
	gweled.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gweled.spec
===================================================================
RCS file: /cvs/extras/rpms/gweled/devel/gweled.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gweled.spec	3 Mar 2005 21:26:03 -0000	1.5
+++ gweled.spec	5 Mar 2005 21:10:21 -0000	1.6
@@ -13,7 +13,7 @@
 BuildRequires:  libgnomeui-devel >= 2.0.0
 BuildRequires:  librsvg2-devel >= 2.0.0
 BuildRequires:  libcroco-devel >= 0.3.0
-BuildRequires:  desktop-file-utils 
+BuildRequires:  desktop-file-utils
 
 %description
 Gweled is a Gnome version of a popular PalmOS/Windows/Java game called
@@ -24,7 +24,7 @@
 
 %prep
 %setup -q
-%patch0  -p0 -b .patch0 
+%patch0  -p0 -b .patch0
 
 %build
 %configure
@@ -73,7 +73,7 @@
 
 * Thu Jan 15 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:0.4-0.fdr.2
 - Own dirs correctly
-- BuildRequires desktop-file-utils 
+- BuildRequires desktop-file-utils
 
 * Fri Jan 09 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:0.4-0.fdr.1
 - Update to 0.4



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/fwbuilder/devel fwbuilder.spec,1.5,1.6
Message-ID: <200503052110.j25LANvH010931@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/fwbuilder/devel

Modified Files:
	fwbuilder.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fwbuilder.spec	3 Mar 2005 18:08:57 -0000	1.5
+++ fwbuilder.spec	5 Mar 2005 21:10:21 -0000	1.6
@@ -21,14 +21,14 @@
 code. Several algorithms are provided for automated network objects
 discovery and bulk import of data. The GUI and policy compilers are
 completely independent, this provides for a consistent abstract model
-and the same GUI for different firewall platforms. 
+and the same GUI for different firewall platforms.
 
 %prep
-%setup -q 
+%setup -q
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-./configure --prefix=%{_prefix}	--with-templatedir=%{_datadir}/fwbuilder 
+./configure --prefix=%{_prefix}	--with-templatedir=%{_datadir}/fwbuilder
 make all
 
 %install
@@ -156,7 +156,7 @@
 - New upstream version
 
 * Sun Jan 23 2005 Warren Togami <wtogami at redhat.com> 2.0.5-3
-- Typo fix (#145887 Stefan Hoelldampf) 
+- Typo fix (#145887 Stefan Hoelldampf)
 
 * Sat Jan 22 2005 Warren Togami <wtogami at redhat.com> 2.0.5-2
 - minor spec cleanup



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/dhcp-forwarder/devel dhcp-forwarder.spec,1.6,1.7
Message-ID: <200503052110.j25LANHY010875@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/dhcp-forwarder/devel

Modified Files:
	dhcp-forwarder.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dhcp-forwarder.spec	3 Mar 2005 20:20:14 -0000	1.6
+++ dhcp-forwarder.spec	5 Mar 2005 21:10:21 -0000	1.7
@@ -243,5 +243,5 @@
 * Thu Jun 13 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0.1-0.3
 - Added --without dietlibc option
 
-* Sat Jun  1 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 
+* Sat Jun  1 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/djvulibre/devel djvulibre.spec,1.6,1.7
Message-ID: <200503052110.j25LANBY010892@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/djvulibre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/djvulibre/devel

Modified Files:
	djvulibre.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: djvulibre.spec
===================================================================
RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- djvulibre.spec	14 Feb 2005 11:31:45 -0000	1.6
+++ djvulibre.spec	5 Mar 2005 21:10:21 -0000	1.7
@@ -1,6 +1,3 @@
-# $Id$
-# Authority: matthias
-
 Summary: DjVu viewers, encoders and utilities
 Name: djvulibre
 Version: 3.5.14
@@ -16,7 +13,7 @@
 Provides: mozilla-djvulibre = %{version}-%{release}
 Provides: djvulibre-devel = %{version}-%{release}
 
-%description 
+%description
 DjVu is a web-centric format and software platform for distributing documents
 and images.  DjVu content downloads faster, displays and renders faster, looks
 nicer on a screen, and consume less client resources than competing formats.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/csmash/devel csmash.spec,1.4,1.5
Message-ID: <200503052110.j25LANC2010869@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/csmash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/csmash/devel

Modified Files:
	csmash.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: csmash.spec
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- csmash.spec	16 Nov 2004 17:29:28 -0000	1.4
+++ csmash.spec	5 Mar 2005 21:10:20 -0000	1.5
@@ -1,6 +1,3 @@
-# $Id$
-# Authority: matthias
-
 Summary: 3D tabletennis game
 Name: csmash
 Version: 0.6.6
@@ -16,8 +13,8 @@
 BuildRequires: gcc-c++, desktop-file-utils
 
 %description
-CannonSmash is a 3D tabletennis game. The goal of this project is to 
-represent various strategy of tabletennis on computer game. 
+CannonSmash is a 3D tabletennis game. The goal of this project is to
+represent various strategy of tabletennis on computer game.
 This program requires OpenGL and SDL. If your machine doesn't have 3D
 accelaration video card, this program runs very slowly.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/celestia/devel celestia.spec,1.5,1.6
Message-ID: <200503052110.j25LAMbW010829@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/celestia/devel

Modified Files:
	celestia.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- celestia.spec	13 Nov 2004 22:10:04 -0000	1.5
+++ celestia.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           celestia
 Version:        1.3.2
 Release:        2
-Summary:        An OpenGL real-time visual space simulation
+Summary:        OpenGL real-time visual space simulation
 
 Group:          Amusements/Graphics
 License:        GPL
@@ -22,11 +22,11 @@
 Requires(preun): GConf2
 
 
-%description 
+%description
 Celestia is a real-time space simulation which lets you experience the
 universe in three dimensions. Celestia does not confine you to the
 surface of the Earth, it allows you to travel throughout the solar
-system, to any of over 100,000 stars, or even beyond the galaxy. 
+system, to any of over 100,000 stars, or even beyond the galaxy.
 
 Travel in Celestia is seamless; the exponential zoom feature lets
 you explore space across a huge range of scales, from galaxy clusters



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/fluxbox/devel fluxbox.spec,1.6,1.7
Message-ID: <200503052110.j25LANS6010920@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fluxbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/fluxbox/devel

Modified Files:
	fluxbox.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fluxbox.spec	13 Nov 2004 00:10:24 -0000	1.6
+++ fluxbox.spec	5 Mar 2005 21:10:21 -0000	1.7
@@ -1,13 +1,13 @@
 Name:		fluxbox
 Version:	0.9.9
 Release:	2
-Summary:	Fluxbox is a windowmanager that is based on Blackbox.
+Summary:	Window Manager based on Blackbox
 
-Group:          User Interface/Desktops 
+Group:		User Interface/Desktops
 License:	MIT
 URL:		http://fluxbox.sourceforge.net
 
-Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.9.tar.bz2 
+Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.9.tar.bz2
 Source1: Xclients.%{name}
 Source2: FluxBox
 Source3: fluxbox.desktop
@@ -18,8 +18,8 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:	XFree86-devel
-Buildrequires: zlib-devel
-Requires(post): chkfontpath
+Buildrequires:	zlib-devel
+Requires(post):   chkfontpath
 Requires(postun): chkfontpath
 
 
@@ -87,7 +87,7 @@
 
 tmp=`fgrep "<dir>%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka</dir>" %{_sysconfdir}/fonts/local.conf`
 if [ -z "$tmp" ];
-	then sed -i "s,</fontconfig>,<dir>%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka</dir>\n</fontconfig>," %{_sysconfdir}/fonts/local.conf 
+	then sed -i "s,</fontconfig>,<dir>%{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka</dir>\n</fontconfig>," %{_sysconfdir}/fonts/local.conf
 fi
 
 %postun



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/galeon/devel galeon.spec,1.4,1.5
Message-ID: <200503052110.j25LANEo010942@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/galeon/devel

Modified Files:
	galeon.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- galeon.spec	3 Mar 2005 21:26:02 -0000	1.4
+++ galeon.spec	5 Mar 2005 21:10:21 -0000	1.5
@@ -7,7 +7,7 @@
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-Requires:	scrollkeeper 
+Requires:	scrollkeeper
 Requires:	mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null)
 BuildRequires:	gettext mozilla-nspr-devel desktop-file-utils
 BuildRequires:	gtk2-devel >= 2.4.0



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/fbida/devel fbida.spec,1.5,1.6
Message-ID: <200503052110.j25LANRh010908@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fbida/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/fbida/devel

Modified Files:
	fbida.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fbida.spec	21 Feb 2005 17:19:10 -0000	1.5
+++ fbida.spec	5 Mar 2005 21:10:21 -0000	1.6
@@ -18,7 +18,7 @@
 %description
 fbi displays the specified file(s) on the linux console using the
 framebuffer device. PhotoCD, jpeg, ppm, gif, tiff, xwd, bmp and png
-are supported directly. For other formats fbi tries to use 
+are supported directly. For other formats fbi tries to use
 ImageMagick's convert.
 
 %package ida
@@ -26,7 +26,7 @@
 Summary: Motif based Imageviewer
 
 %description ida
-This is a X11 application (Motif based) for viewing images. Some basic 
+This is a X11 application (Motif based) for viewing images. Some basic
 editing functions are available too.
 
 %package fbgs
@@ -50,9 +50,9 @@
 iconv -t UTF-8 -f ISO-8859-1 ida.man > ida.man.new
 iconv -t UTF-8 -f ISO-8859-1 fbgs.man > fbgs.man.new
 %{__mv} fbi.man.new fbi.man
-%{__mv} exiftran.man.new exiftran.man 
-%{__mv} ida.man.new ida.man 
-%{__mv} fbgs.man.new fbgs.man 
+%{__mv} exiftran.man.new exiftran.man
+%{__mv} ida.man.new ida.man
+%{__mv} fbgs.man.new fbgs.man
 lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
 
 %clean
@@ -60,7 +60,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc Changes COPYING README TODO 
+%doc Changes COPYING README TODO
 %doc %{_mandir}/man1/fbi*
 %doc %{_mandir}/man1/exiftran*
 %{_bindir}/fbi



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gdeskcal/devel gdeskcal.spec,1.5,1.6
Message-ID: <200503052110.j25LANu6010952@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gdeskcal/devel

Modified Files:
	gdeskcal.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gdeskcal.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ gdeskcal.spec	5 Mar 2005 21:10:21 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           gdeskcal
 Version:        0.57.1
 Release:        3
-Summary:        Eye-candy calendar for your desktop. 
+Summary:        Eye-candy calendar for your desktop
 
 Group:          User Interface/Desktops
 License:        GPL



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gqview/devel gqview.spec,1.4,1.5
Message-ID: <200503052110.j25LANkx011008@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gqview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gqview/devel

Modified Files:
	gqview.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gqview.spec	26 Feb 2005 23:00:44 -0000	1.4
+++ gqview.spec	5 Mar 2005 21:10:21 -0000	1.5
@@ -1,18 +1,18 @@
-Summary: 	Image browser and viewer
-Name: 		gqview
-Version: 	2.0.0
+Summary:	Image browser and viewer
+Name:		gqview
+Version:	2.0.0
 Release:	1
-License: 	GPL
-Group: 		User Interface/X
-Source: 	http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
+License:	GPL
+Group:		User Interface/X
+Source:		http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
 Patch1:		gqview-2.0.0-desktop.patch
 Patch2:		gqview-2.0.0-editors.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-URL: 		http://gqview.sourceforge.net/
-BuildRequires: 	gtk2-devel >= 0:2.4.0
-BuildRequires: 	gettext desktop-file-utils
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+URL:		http://gqview.sourceforge.net/
+BuildRequires:	gtk2-devel >= 2.4.0
+BuildRequires:	gettext desktop-file-utils
+Requires(post):		desktop-file-utils
+Requires(postun):	desktop-file-utils
 
 %description
 GQview is an image viewer for browsing through graphics files. GQview
@@ -149,7 +149,7 @@
 - use makeinstall macro
 
 * Mon Jul 29 2002 Karsten Hopp <karsten at redhat.de> 1.0.2-2
-- remove --add-only-show-in GNOME 
+- remove --add-only-show-in GNOME
 
 * Tue Jul 16 2002 Karsten Hopp <karsten at redhat.de> 1.0.2-1
 - update (#68838)
@@ -190,19 +190,24 @@
 * Wed Jul 7 1999 Michael Fulbright <drmike at redhat.com>
 - version 0.7.0
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
 - auto rebuild in the new build environment (release 3)
 
 * Fri Mar 19 1999 Michael Fulbright <drmike at redhat.com>
 - strip binaries
+
 * Sat Mar 6 1999 Michael Fulbright <drmike at redhat.com>
 - version 0.6.0
+
 * Wed Oct 7 1998 John Ellis <gqview at geocities.com>
 - updated for version 0.4.2
+
 * Fri Sep 11 1998 John Ellis <gqview at geocities.com>
 - updated for version 0.4.1
+
 * Sat Aug 15 1998 John Ellis <gqview at geocities.com>
 - updated for version 0.4.0
+
 * Wed Aug 5 1998 Joel Young <jyoung at erols.com>
 - enhanced rpm .spec file
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gnome-cpufreq-applet/devel gnome-cpufreq-applet.spec,1.1,1.2
Message-ID: <200503052110.j25LANlD010980@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnome-cpufreq-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gnome-cpufreq-applet/devel

Modified Files:
	gnome-cpufreq-applet.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gnome-cpufreq-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-cpufreq-applet/devel/gnome-cpufreq-applet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-cpufreq-applet.spec	15 Feb 2005 13:14:09 -0000	1.1
+++ gnome-cpufreq-applet.spec	5 Mar 2005 21:10:21 -0000	1.2
@@ -38,7 +38,7 @@
 %find_lang %{name}
 
 ### Clean up buildroot
-%{__rm} -rf %{buildroot}%{_localstatedir}/scrollkeeper/ 
+%{__rm} -rf %{buildroot}%{_localstatedir}/scrollkeeper/
 
 %post
 scrollkeeper-update -q || :
@@ -46,7 +46,7 @@
 gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas &>/dev/null
 
-%preun 
+%preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
 	%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas >/dev/null || :



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/cfengine/devel cfengine.spec,1.7,1.8
Message-ID: <200503052110.j25LAM7b010840@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cfengine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/cfengine/devel

Modified Files:
	cfengine.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cfengine.spec	3 Mar 2005 20:08:36 -0000	1.7
+++ cfengine.spec	5 Mar 2005 21:10:20 -0000	1.8
@@ -52,7 +52,7 @@
 
 # It's ugly, but thats the way Mark wants to have it. :(
 # If we don't create this link, cfexecd will not be able to start
-# (hardcoded) /var/sbin/cfagent in scheduled intervals. Other option 
+# (hardcoded) /var/sbin/cfagent in scheduled intervals. Other option
 # would be to patch cfengine to use %{_sbindir}/cfagent
 mkdir -p $RPM_BUILD_ROOT/var/cfengine/bin
 ln -sf %{_sbindir}/cfagent $RPM_BUILD_ROOT/var/cfengine/bin/
@@ -77,7 +77,7 @@
 #
 # All this stuff is pushed into doc directory.
 #
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} 
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 
 %post
@@ -187,7 +187,7 @@
 * Wed Apr 09 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:2.0.6-0.fdr.2
 - fixed URL
 - removed Requires as redundant
-- remove %{_infodir}/dir from package, if it would exist 
+- remove %{_infodir}/dir from package, if it would exist
   (which is not the case in RH8)
 
 * Wed Apr 09 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:2.0.6-0.fdr.1
@@ -207,14 +207,14 @@
 - new upstream version.
 
 * Thu Jun 20 2002 Juha Ylitalo <juha.ylitalo at iki.fi> - 2.0.2-4
-- added check that if we are doing initial install 
+- added check that if we are doing initial install
   (meaning that /mnt/sysimage is mounted), there is no point at
   running cfkey until system boots up with correct root directory
 
 * Thu Jun 13 2002 Juha Ylitalo <juha.ylitalo at iki.fi> - 2.0.2-3
 - fixed revision numberings to go on in sensible way
 - added missing man page
-- changed cfexecd and cfservd to start later 
+- changed cfexecd and cfservd to start later
   (assuming your using chkconfig for setting things)
 - additional check in cfexecd start() for making sure that local cfkeys
   have been created.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/kernel-module-devel-2.6.8-1.521/devel kernel-module-devel.spec,
	1.1, 1.2
Message-ID: <200503052110.j25LAOg2011084@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kernel-module-devel-2.6.8-1.521/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/kernel-module-devel-2.6.8-1.521/devel

Modified Files:
	kernel-module-devel.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: kernel-module-devel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel-module-devel-2.6.8-1.521/devel/kernel-module-devel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kernel-module-devel.spec	8 Nov 2004 04:39:33 -0000	1.1
+++ kernel-module-devel.spec	5 Mar 2005 21:10:22 -0000	1.2
@@ -5,8 +5,8 @@
 
 Name:           kernel-module-devel-%{krel}
 Version:        0.5
-Release:        0.fdr.1
-Summary:        Build files for all kernel arch/types for %{krel} 
+Release:        1
+Summary:        Build files for all kernel arch/types for %{krel}
 
 Group:          System Environment/Kernel
 License:        GPL



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad.spec, 1.5,
	1.6
Message-ID: <200503052110.j25LAO8q011090@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kernel-module-thinkpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/kernel-module-thinkpad/devel

Modified Files:
	kernel-module-thinkpad.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: kernel-module-thinkpad.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kernel-module-thinkpad.spec	3 Mar 2005 21:56:40 -0000	1.5
+++ kernel-module-thinkpad.spec	5 Mar 2005 21:10:22 -0000	1.6
@@ -28,7 +28,7 @@
 ExclusiveArch:  i586 i686
 BuildRequires:  bash, %{__perl}, MAKEDEV
 %if ! %{ksrcprv}
-BuildRequires:  kernel-source = 0:%(%kmh -- verrel)
+BuildRequires:  kernel-source = %(%kmh -- verrel)
 %endif
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/SoQt/devel SoQt.spec,1.3,1.4
Message-ID: <200503052110.j25LAMhn010726@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/SoQt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/SoQt/devel

Modified Files:
	SoQt.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: SoQt.spec
===================================================================
RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SoQt.spec	10 Dec 2004 22:03:01 -0000	1.3
+++ SoQt.spec	5 Mar 2005 21:10:20 -0000	1.4
@@ -1,8 +1,7 @@
-%define _includedir		%{expand:%%(coin-config --includedir)}
+%define _includedir %{expand:%%(coin-config --includedir)}
 
-Summary: A high-level 3D visualization library.
+Summary: High-level 3D visualization library
 Name: SoQt
-Epoch: 0
 Version: 1.2.0
 Release: 1
 
@@ -27,7 +26,7 @@
 
 %package devel
 Summary: Development files for SoQt
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: autoconf
 Requires: Coin2-devel qt-devel
 Group: Development/Libraries



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/lib3ds/devel lib3ds.spec,1.4,1.5
Message-ID: <200503052110.j25LAOsS011102@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lib3ds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/lib3ds/devel

Modified Files:
	lib3ds.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/devel/lib3ds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lib3ds.spec	3 Mar 2005 22:41:31 -0000	1.4
+++ lib3ds.spec	5 Mar 2005 21:10:22 -0000	1.5
@@ -14,13 +14,13 @@
 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
 Summary:        %summary



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gtweakui/devel gtweakui.spec,1.3,1.4
Message-ID: <200503052110.j25LANOh011041@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gtweakui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gtweakui/devel

Modified Files:
	gtweakui.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gtweakui.spec
===================================================================
RCS file: /cvs/extras/rpms/gtweakui/devel/gtweakui.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtweakui.spec	16 Nov 2004 17:44:40 -0000	1.3
+++ gtweakui.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -66,7 +66,7 @@
 %build
 %configure
 %{__make} %{?_smp_mflags}
-  
+
 
 %install
 %{__rm} -rf %{buildroot}



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/grip/devel grip.spec,1.3,1.4
Message-ID: <200503052110.j25LANrf011014@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/grip/devel

Modified Files:
	grip.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grip.spec	2 Mar 2005 18:40:35 -0000	1.3
+++ grip.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -1,4 +1,4 @@
-Summary: A front-end for CD rippers and Ogg Vorbis encoders
+Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
 Release: 4
@@ -92,7 +92,7 @@
 - rebuilt
 - add vte-devel to BuildRequires
 
-* Sun Jun 20 2004 Karsten Hopp <karsten at redhat.de> 3.2.0-1 
+* Sun Jun 20 2004 Karsten Hopp <karsten at redhat.de> 3.2.0-1
 - update to latest stable version
 - remove obsolete locking and cdparanoia patches
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libcddb/devel libcddb.spec,1.6,1.7
Message-ID: <200503052110.j25LAOIK011114@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libcddb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libcddb/devel

Modified Files:
	libcddb.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libcddb.spec	3 Mar 2005 22:41:31 -0000	1.6
+++ libcddb.spec	5 Mar 2005 21:10:22 -0000	1.7
@@ -68,6 +68,6 @@
 - Added URL in Source0
 - Added additionnal files as doc
 
-* Tue Mar  9 2004 Dams <anvil[AT]livna.org> 
+* Tue Mar  9 2004 Dams <anvil[AT]livna.org>
 - Initial build.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/grisbi/devel grisbi.spec,1.4,1.5
Message-ID: <200503052110.j25LANvw011019@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/grisbi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/grisbi/devel

Modified Files:
	grisbi.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: grisbi.spec
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/grisbi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grisbi.spec	26 Feb 2005 16:59:55 -0000	1.4
+++ grisbi.spec	5 Mar 2005 21:10:21 -0000	1.5
@@ -1,16 +1,16 @@
 %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help
-Name: 		grisbi
+Name:		grisbi
 Version:	0.5.5
-Release: 	2
-Summary: 	Personal finances manager
+Release:	2
+Summary:	Personal finances manager
 
-Group: 		Applications/Productivity
-License: 	GPL
-Url: 		http://www.grisbi.org
+Group:		Applications/Productivity
+License:	GPL
+URL:		http://www.grisbi.org
 Source0:	http://dl.sf.net/grisbi/%{name}-%{version}.tar.bz2
 Source1:	%{name}.desktop
 Patch0:		%{name}-%{version}-htmlview.diff
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel, libxml2-devel, glib2-devel, gettext
 BuildRequires:	desktop-file-utils, libofx-devel
@@ -31,7 +31,7 @@
 party, nice and easy user interface, user manual, QIF import/export.
 
 %prep
-%setup -q 
+%setup -q
 %patch0
 
 %build
@@ -39,7 +39,7 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT 
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 for lang in C de fr



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libebml/devel libebml.spec,1.7,1.8
Message-ID: <200503052110.j25LAObG011120@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libebml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libebml/devel

Modified Files:
	libebml.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libebml.spec
===================================================================
RCS file: /cvs/extras/rpms/libebml/devel/libebml.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libebml.spec	27 Feb 2005 18:28:52 -0000	1.7
+++ libebml.spec	5 Mar 2005 21:10:22 -0000	1.8
@@ -65,7 +65,7 @@
 * Sun Feb 29 2004 Dams <anvil[AT]livna.org> 0:0.6.4-0.fdr.2
 - Added licenses file as doc
 
-* Thu Sep  4 2003 Dams <anvil[AT]livna.org> 
+* Thu Sep  4 2003 Dams <anvil[AT]livna.org>
 - Initial build.
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/giblib/devel giblib.spec,1.5,1.6
Message-ID: <200503052110.j25LANYk010970@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/giblib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/giblib/devel

Modified Files:
	giblib.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: giblib.spec
===================================================================
RCS file: /cvs/extras/rpms/giblib/devel/giblib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- giblib.spec	16 Nov 2004 17:11:57 -0000	1.5
+++ giblib.spec	5 Mar 2005 21:10:21 -0000	1.6
@@ -1,6 +1,3 @@
-# $Id$
-# Authority: matthias
-
 Summary: Simple library and a wrapper for imlib2
 Name: giblib
 Version: 1.2.4



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.1,1.2
Message-ID: <200503052110.j25LAP6C011298@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/php-eaccelerator/devel

Modified Files:
	php-eaccelerator.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-eaccelerator.spec	28 Jan 2005 16:22:52 -0000	1.1
+++ php-eaccelerator.spec	5 Mar 2005 21:10:23 -0000	1.2
@@ -25,7 +25,7 @@
 that the overhead of compiling is almost completely eliminated.
 
 
-%prep 
+%prep
 %setup -n eaccelerator
 
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gnugo/devel gnugo.spec,1.7,1.8
Message-ID: <200503052110.j25LANTF010996@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnugo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gnugo/devel

Modified Files:
	gnugo.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gnugo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnugo/devel/gnugo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnugo.spec	14 Feb 2005 10:14:52 -0000	1.7
+++ gnugo.spec	5 Mar 2005 21:10:21 -0000	1.8
@@ -27,13 +27,13 @@
 
 
 %build
-%configure --enable-color 
+%configure --enable-color
 make %{?_smp_mflags}
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make DESTDIR=${RPM_BUILD_ROOT} install 
+make DESTDIR=${RPM_BUILD_ROOT} install
 rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
 
 %clean



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/nethack-falconseye/devel nethack-falconseye.spec,1.7,1.8
Message-ID: <200503052110.j25LAP8N011215@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/nethack-falconseye/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/nethack-falconseye/devel

Modified Files:
	nethack-falconseye.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: nethack-falconseye.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-falconseye/devel/nethack-falconseye.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nethack-falconseye.spec	3 Mar 2005 23:01:24 -0000	1.7
+++ nethack-falconseye.spec	5 Mar 2005 21:10:23 -0000	1.8
@@ -21,7 +21,7 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel >= 0:1.2.2, byacc, flex, desktop-file-utils
+BuildRequires:  SDL-devel >= 1.2.2, byacc, flex, desktop-file-utils
 BuildRequires:  ImageMagick
 %if %{with_tty}
 BuildRequires:  ncurses-devel



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:24 -0500
Subject: rpms/libgnomemm26/devel libgnomemm.spec,1.4,1.5
Message-ID: <200503052110.j25LAOFo011155@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libgnomemm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/libgnomemm26/devel

Modified Files:
	libgnomemm.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: libgnomemm.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomemm26/devel/libgnomemm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgnomemm.spec	3 Mar 2005 22:41:32 -0000	1.4
+++ libgnomemm.spec	5 Mar 2005 21:10:22 -0000	1.5
@@ -12,8 +12,8 @@
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  gtkmm24-devel >= 0:2.4.0
-BuildRequires:  libgnome-devel >= 0:2.6.0
+BuildRequires:  gtkmm24-devel >= 2.4.0
+BuildRequires:  libgnome-devel >= 2.6.0
 
 %description
 This package provides a C++ interface for GnomeUI.  It is a subpackage



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/conglomerate/devel conglomerate.spec,1.4,1.5
Message-ID: <200503052110.j25LAMST010857@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/conglomerate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/conglomerate/devel

Modified Files:
	conglomerate.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: conglomerate.spec
===================================================================
RCS file: /cvs/extras/rpms/conglomerate/devel/conglomerate.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- conglomerate.spec	21 Feb 2005 04:02:18 -0000	1.4
+++ conglomerate.spec	5 Mar 2005 21:10:20 -0000	1.5
@@ -132,7 +132,7 @@
 - Require yelp so help will work (#1203).
 
 * Wed Apr 14 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.7.12-0.fdr.3
-- Using ln -s so conglomerate and yelp can both find help files (#1203). 
+- Using ln -s so conglomerate and yelp can both find help files (#1203).
 
 * Tue Apr 13 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.7.12-0.fdr.2
 - BuildReq perl-XML-Parser.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/blackbox/devel blackbox.spec,1.5,1.6
Message-ID: <200503052110.j25LAM3X010818@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/blackbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/blackbox/devel

Modified Files:
	blackbox.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: blackbox.spec
===================================================================
RCS file: /cvs/extras/rpms/blackbox/devel/blackbox.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blackbox.spec	16 Nov 2004 17:08:40 -0000	1.5
+++ blackbox.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -1,6 +1,3 @@
-# $Id$
-# Authority: matthias
-
 Summary: Very small and fast Window Manager
 Name: blackbox
 Version: 0.65.0
@@ -85,7 +82,7 @@
 
 * 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. :-) 
+- Fixed nls problem, left in --disable just in case. Smile, Matthias. :-)
 
 * Fri Nov 14 2003 Mattthias Saou <http://freshrpms.net/> 0.65.0-5
 - Rebuild for Fedora Core 1.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/milter-greylist/devel milter-greylist.spec,1.2,1.3
Message-ID: <200503052110.j25LAPM2011211@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/milter-greylist/devel

Modified Files:
	milter-greylist.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- milter-greylist.spec	3 Mar 2005 23:01:24 -0000	1.2
+++ milter-greylist.spec	5 Mar 2005 21:10:23 -0000	1.3
@@ -15,7 +15,7 @@
 %define rundir		%vardir/run
 %define __chkconfig	/sbin/chkconfig
 
-Summary:	Milter for greylisting, the next step in the spam control war 
+Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	1.6
 Release:	%release_func 1
@@ -144,7 +144,7 @@
                             -c 'Greylist-milter user' -g %username %username &>/dev/null || :
 
 
-%postun 
+%postun
 test "$1" != 0 || /usr/sbin/fedora-userdel  %username &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %username &>/dev/null || :
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/fltk/devel fltk.spec,1.6,1.7
Message-ID: <200503052110.j25LANmW010914@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/fltk/devel

Modified Files:
	fltk.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: fltk.spec
===================================================================
RCS file: /cvs/extras/rpms/fltk/devel/fltk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fltk.spec	3 Mar 2005 20:33:53 -0000	1.6
+++ fltk.spec	5 Mar 2005 21:10:21 -0000	1.7
@@ -29,7 +29,7 @@
 GUI functionality without the bloat, and supports 3D graphics via
 OpenGL and its built-in GLUT emulation. FLTK is designed to be small
 and modular enough to be statically linked, and also works fine as a
-shared library. 
+shared library.
 
 %description devel
 This package contains development files for %{name}
@@ -40,7 +40,7 @@
 
 %description fluid
 fluid stands for the Fast Light User Interface Designer. It is an
-interactive GUI designer for FLTK. 
+interactive GUI designer for FLTK.
 
 
 %prep
@@ -52,7 +52,7 @@
 export CPPFLAGS="$(pkg-config xft --cflags)"
 export LDFLAGS="$(pkg-config xft --libs)"
 %configure --enable-shared --enable-threads --enable-xdbe --enable-xft
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -158,5 +158,5 @@
 - Moved fluid to its own package
 - Added missing Requires for devel package
 
-* Sat Aug 16 2003 Dams <anvil[AT]livna.org> 
+* Sat Aug 16 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-IO-stringy/devel perl-IO-stringy.spec,1.7,1.8
Message-ID: <200503052110.j25LAP4K011248@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-IO-stringy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-IO-stringy/devel

Modified Files:
	perl-IO-stringy.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-IO-stringy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-stringy/devel/perl-IO-stringy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-IO-stringy.spec	3 Mar 2005 23:46:27 -0000	1.7
+++ perl-IO-stringy.spec	5 Mar 2005 21:10:23 -0000	1.8
@@ -2,16 +2,16 @@
 
 %define		tarname	IO-stringy
 
-Summary: 	I/O on in-core objects like strings and arrays for Perl
-Name: 		perl-%{tarname}
-Version: 	2.110
-Release: 	1
-License: 	Artistic
-Group: 		Development/Libraries
-URL: 		http://search.cpan.org/dist/IO-stringy/
-Source0: 	http://www.cpan.org/authors/id/D/DS/DSKOLL/%{tarname}-%{version}.tar.gz
+Summary:	I/O on in-core objects like strings and arrays for Perl
+Name:		perl-%{tarname}
+Version:	2.110
+Release:	1
+License:	Artistic
+Group:		Development/Libraries
+URL:		http://search.cpan.org/dist/IO-stringy/
+Source0:	http://www.cpan.org/authors/id/D/DS/DSKOLL/%{tarname}-%{version}.tar.gz
 BuildArch:	noarch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 
 %description
@@ -72,5 +72,5 @@
 - "make test" in build section
 - Added missing directory
 
-* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 
+* Sun Jun 15 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/pexpect/devel pexpect.spec,1.5,1.6
Message-ID: <200503052110.j25LAPRJ011293@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/pexpect/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/pexpect/devel

Modified Files:
	pexpect.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: pexpect.spec
===================================================================
RCS file: /cvs/extras/rpms/pexpect/devel/pexpect.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pexpect.spec	10 Feb 2005 20:19:03 -0000	1.5
+++ pexpect.spec	5 Mar 2005 21:10:23 -0000	1.6
@@ -14,14 +14,14 @@
 Source2: http://download.sourceforge.net/pexpect/pexpect-examples.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-abi = %{pyver}
-BuildRequires: python-devel >= 0:2.2
+BuildRequires: python-devel >= 2.2
 
 %description
 Pexpect is a pure Python module for spawning child applications; controlling
 them; and responding to expected patterns in their output. Pexpect works like
 Don Libes' Expect. Pexpect allows your script to spawn a child application and
 control it as if a human were typing commands.
- 
+
 Pexpect can be used for automating interactive applications such as ssh, ftp,
 passwd, telnet, etc. It can be used to a automate setup scripts for
 duplicating software package installations on different servers. It can be
@@ -72,7 +72,7 @@
 * Thu Feb 03 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 0.999-2
 - Use python_sitelib macro to resolve build issues on x86_64.
 - %%ghost *.pyo
-- Install ANSI.py, screen.py, and FSM.py into the examples.  These are intended 
+- Install ANSI.py, screen.py, and FSM.py into the examples.  These are intended
   to suplement pexpect eventually but they are currently much less robust and
   not installed to by default.  But they are needed by some examples.
 - Use __python macro in build/install for consistency.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/enigma/devel enigma.spec,1.3,1.4
Message-ID: <200503052110.j25LANTk010903@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/enigma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/enigma/devel

Modified Files:
	enigma.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: enigma.spec
===================================================================
RCS file: /cvs/extras/rpms/enigma/devel/enigma.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- enigma.spec	10 Nov 2004 23:18:39 -0000	1.3
+++ enigma.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -10,16 +10,16 @@
 Patch:          enigma-0.81-gcc34.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	SDL-devel >= 0:1.2  SDL_image-devel >= 0:1.2 SDL_mixer-devel >= 0:1.2
-BuildRequires:  desktop-file-utils zlib-devel >= 0:1.2.0 tetex >= 0:2.0.2
+BuildRequires:  SDL-devel >= 1.2  SDL_image-devel >= 1.2 SDL_mixer-devel >= 1.2
+BuildRequires:  desktop-file-utils zlib-devel >= 1.2.0 tetex >= 2.0.2
 
 %description
-Enigma is a tribute to and a re-implementation of one of the most               
-original and intriguing computer games of the 1990's: Oxyd.  Your               
-objective is easily explained: find and uncover all pairs of identical          
-Oxyd stones in each landscape.  Sounds simple?  It would be, if it              
-weren't for hidden traps, vast mazes, insurmountable obstacles and              
-innumerable puzzles blocking your direct way to the Oxyd stones...      
+Enigma is a tribute to and a re-implementation of one of the most
+original and intriguing computer games of the 1990's: Oxyd.  Your
+objective is easily explained: find and uncover all pairs of identical
+Oxyd stones in each landscape.  Sounds simple?  It would be, if it
+weren't for hidden traps, vast mazes, insurmountable obstacles and
+innumerable puzzles blocking your direct way to the Oxyd stones...
 
 %prep
 %setup -q



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/abicheck/devel abicheck.spec,1.6,1.7
Message-ID: <200503052110.j25LAMXm010756@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/abicheck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/abicheck/devel

Modified Files:
	abicheck.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: abicheck.spec
===================================================================
RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- abicheck.spec	13 Dec 2004 12:04:36 -0000	1.6
+++ abicheck.spec	5 Mar 2005 21:10:20 -0000	1.7
@@ -11,27 +11,23 @@
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires:	binutils perl
 
-# -----------------------------------------------------------------------------
 
 %description
 abicheck is a tool that checks application binary executables and
 shared libraries for conformance to the (or an) ABI (Application
 Binary Interface).
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q
 %patch -p1 -b .fc3
 %patch1 -p1 -b .test-static
 
-# -----------------------------------------------------------------------------
 
 %build
-make 
+make
 make test
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -39,12 +35,10 @@
 install -m 0755 abicheck $RPM_BUILD_ROOT%{_bindir}
 install -m 0644 abicheck.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
@@ -52,7 +46,6 @@
 %{_bindir}/abicheck
 %{_mandir}/man1/abicheck.1*
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Mon Dec 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2-3
@@ -70,5 +63,5 @@
 * Sat Aug 23 2003 Dams <anvil[AT]livna.org> 0:1.1-0.fdr.2
 - Aplied patch from Michael Schwendt (bug #605 comment #1)
 
-* Sat Aug 16 2003 Dams <anvil[AT]livna.org> 
+* Sat Aug 16 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/geomview/devel geomview.spec,1.2,1.3
Message-ID: <200503052110.j25LANJ6010958@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/geomview/devel

Modified Files:
	geomview.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geomview.spec	3 Mar 2005 21:26:02 -0000	1.2
+++ geomview.spec	5 Mar 2005 21:10:21 -0000	1.3
@@ -21,7 +21,7 @@
 # Other plugins
 Source10: http://dl.sourceforge.net/geomview/orrery-%{orrery_ver}.tar.gz
 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
@@ -52,11 +52,11 @@
 #{?_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, 
-etc. It can be used as a standalone viewer for static objects or as a display 
-engine for other programs which produce dynamically changing geometry. It can 
-display objects described in a variety of file formats. It comes with a wide 
+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,
+etc. It can be used as a standalone viewer for static objects or as a display
+engine for other programs which produce dynamically changing geometry. It can
+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.
 
 
@@ -66,7 +66,7 @@
 Summary: %{name} plugins
 Requires: %{name} = %{version}
 BuildRequires: xforms-devel >= %{xforms_ver}
-%description plugins 
+%description plugins
 Geomview default plugins
 %endif
 
@@ -139,7 +139,7 @@
   --add-category X-Fedora \
   %{SOURCE1}
 
-# app icon 
+# app icon
 install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
 # move the html manual for inclusion later
@@ -186,7 +186,7 @@
 %{_libexecdir}/%{name}/.geomview-drawbdy
 
 %if "%{?_with_xforms:1}" == "1"
-%files plugins 
+%files plugins
 %defattr(-,root,root)
 %{_libexecdir}/%{name}/example
 %{_libexecdir}/%{name}/.geomview-example
@@ -206,9 +206,9 @@
 %endif
 
 %if "%{?_with_orrery:1}" == "1"
-%files orrery 
+%files orrery
 %defattr(-,root,root)
-%doc orrery*/README orrery*/NEWS orrery*/AUTHORS orrery*/ChangeLog 
+%doc orrery*/README orrery*/NEWS orrery*/AUTHORS orrery*/ChangeLog
 %dir %{_datadir}/geomview/modules
 %{_datadir}/geomview/modules/orrery
 %{_libexecdir}/%{name}/.geomview-orrery
@@ -258,7 +258,7 @@
 - .desktop: Categories += Graphics
 
 * Tue Mar 16 2004 Rex Dieter <rexdieter at sf.net> 0:1.8.1-0.fdr.3
-- use patch from geomview sf site to allow gcc3. 
+- use patch from geomview sf site to allow gcc3.
 - use desktop-file-install
 
 * Wed Sep 24 2003 Rex Dieter <rexdieter at sf.net> 0:1.8.1-0.fdr.2
@@ -268,7 +268,7 @@
 - Build against openmotif.
 
 * Mon May 12 2003 Rex Dieter <rexdieter at users.sf.net> 0:1.8.1-0.fdr.0
-- fedora'ize 
+- fedora'ize
 - rh73: link xforms static (for now, so rh80+ users could use if they
   want/need plugins/maniview subpkgs).
 - rh80+: use g++296, no xforms.
@@ -308,6 +308,6 @@
 - include option to link xforms-static (untested)
 
 * Fri Sep 28 2001 Rex Dieter <rexdieter at users.sf.net> 1.8.1-0
-- first try. 
+- first try.
 - TODO: make subpkgs manual(html), modules, modules-xforms
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/cgoban/devel cgoban.spec,1.5,1.6
Message-ID: <200503052110.j25LAMgo010846@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cgoban/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/cgoban/devel

Modified Files:
	cgoban.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: cgoban.spec
===================================================================
RCS file: /cvs/extras/rpms/cgoban/devel/cgoban.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cgoban.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ cgoban.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -33,7 +33,7 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall 
+%makeinstall
 install -p -D -m644 cgoban_icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/cgoban.png
 
 desktop-file-install --vendor fedora               \



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/perl-Unix-Syslog/devel perl-Unix-Syslog.spec,1.6,1.7
Message-ID: <200503052110.j25LAPDW011280@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/perl-Unix-Syslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/perl-Unix-Syslog/devel

Modified Files:
	perl-Unix-Syslog.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: perl-Unix-Syslog.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unix-Syslog/devel/perl-Unix-Syslog.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Unix-Syslog.spec	3 Mar 2005 23:46:28 -0000	1.6
+++ perl-Unix-Syslog.spec	5 Mar 2005 21:10:23 -0000	1.7
@@ -71,5 +71,5 @@
 - Changed Group tag value
 - Added missing unowned directories
 
-* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 
+* Sun Jun 15 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/centericq/devel centericq.spec,1.7,1.8
Message-ID: <200503052110.j25LAMW4010834@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/centericq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/centericq/devel

Modified Files:
	centericq.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- centericq.spec	25 Feb 2005 19:40:27 -0000	1.7
+++ centericq.spec	5 Mar 2005 21:10:20 -0000	1.8
@@ -1,9 +1,9 @@
 Name:           centericq
-Version:        4.20.0 
+Version:        4.20.0
 Release:        1
 Summary:        Text mode menu- and window-driven IM
 
-Group:          Applications/Internet 
+Group:          Applications/Internet
 License:        GPL
 URL:            http://konst.org.ua/centericq/
 Source0:        http://konst.org.ua/download/centericq-4.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gnome-themes-extras/devel gnome-themes-extras.spec,1.6,1.7
Message-ID: <200503052110.j25LAN5O010986@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnome-themes-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gnome-themes-extras/devel

Modified Files:
	gnome-themes-extras.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/gnome-themes-extras.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-themes-extras.spec	28 Feb 2005 19:56:57 -0000	1.6
+++ gnome-themes-extras.spec	5 Mar 2005 21:10:21 -0000	1.7
@@ -63,7 +63,7 @@
 * Fri Nov 26 2004 Adrian Reber <adrian at lisas.de> - 0:0.8.0-0.fdr.1
 - updated to 0.8.0
 - changed gtk-2.0/2.2 to gtk-2.0/2.4
-- libsmooth.so is deleted during installation as it is 
+- libsmooth.so is deleted during installation as it is
   provided by gnome-themes
 - removed empty NEWS file from doc
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/ghex/devel ghex.spec,1.7,1.8
Message-ID: <200503052110.j25LANcQ010964@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ghex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/ghex/devel

Modified Files:
	ghex.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: ghex.spec
===================================================================
RCS file: /cvs/extras/rpms/ghex/devel/ghex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ghex.spec	9 Jan 2005 16:28:55 -0000	1.7
+++ ghex.spec	5 Mar 2005 21:10:21 -0000	1.8
@@ -1,7 +1,7 @@
 Name:           ghex
 Version:        2.8.1
 Release:        2
-Summary:        A binary editor for GNOME
+Summary:        Binary editor for GNOME
 
 Group:          Applications/Editors
 License:        GPL
@@ -16,7 +16,7 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  scrollkeeper
-BuildRequires:  libtool 
+BuildRequires:  libtool
 Requires(post): GConf2
 Requires(post): scrollkeeper
 Requires(post): /sbin/ldconfig
@@ -110,7 +110,7 @@
 
 %changelog
 * Sun Jan 09 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.8.1-2
-- Use make param LIBTOOL=/usr/bin/libtool instead autoreconf -- fixes x86_64 
+- Use make param LIBTOOL=/usr/bin/libtool instead autoreconf -- fixes x86_64
   build
 
 * Mon Dec 27 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.8.1-1



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/TeXmacs/devel TeXmacs.spec,1.6,1.7
Message-ID: <200503052110.j25LAMUF010732@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/TeXmacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/TeXmacs/devel

Modified Files:
	TeXmacs.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TeXmacs.spec	21 Feb 2005 19:27:31 -0000	1.6
+++ TeXmacs.spec	5 Mar 2005 21:10:20 -0000	1.7
@@ -1,18 +1,17 @@
 Name:		TeXmacs
 Version:	1.0.4.6
 Release:	1
-Epoch:		0
-Summary:	A structured wysiwyg scientific text editor
+Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.texmacs.org
 Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.4.6-src.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex, tetex-fonts, ghostscript
 Buildrequires:	guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel
-Requires(post):   shared-mime-info, desktop-file-utils
-Requires(postun): shared-mime-info, desktop-file-utils
+Requires(post):		shared-mime-info, desktop-file-utils
+Requires(postun):	shared-mime-info, desktop-file-utils
 
 %description
 GNU TeXmacs is a free scientific text editor, which was both inspired
@@ -109,6 +108,7 @@
 
 %files
 %defattr(-,root,root,-)
+%doc LICENSE COPYING TeXmacs/README TeXmacs/TEX_FONTS
 %{_bindir}/*
 %{_includedir}/*
 %{_mandir}/man*/*
@@ -120,7 +120,6 @@
 %{_datadir}/mime/packages/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-text-texmacs.xpm
-%doc LICENSE COPYING TeXmacs/README TeXmacs/TEX_FONTS
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.3,1.4
Message-ID: <200503052110.j25LANc3011031@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gtk-qt-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gtk-qt-engine/devel

Modified Files:
	gtk-qt-engine.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk-qt-engine.spec	12 Feb 2005 17:01:20 -0000	1.3
+++ gtk-qt-engine.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -1,14 +1,14 @@
 # $Id$
 
-Summary: a project allowing GTK to use Qt widget styles.
-Name: 	 gtk-qt-engine 
-Group:	 User Interface/Desktops
+Summary: Allow GTK to use Qt widget styles
+Name:    gtk-qt-engine
+Group:   User Interface/Desktops
 Version: 0.41
 Release: 5%{?dist_tag}
 License: GPL
 Source:  http://www.freedesktop.org/Software/gtk-qt/gtk-qt-engine-0.41.tar.bz2
 Patch0:  %{name}-x86_64.patch
-URL:	 http://www.freedesktop.org/Software/gtk-qt
+URL:     http://www.freedesktop.org/Software/gtk-qt
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gtk2-devel >= 2.2
@@ -31,14 +31,14 @@
 %description
 The GTK-Qt Theme Engine is a project allowing GTK to use Qt widget styles.
 
-It behaves like a normal GTK theme engine, but calls functions from Qt 
-instead of doing the drawing itself. 
+It behaves like a normal GTK theme engine, but calls functions from Qt
+instead of doing the drawing itself.
 
 
 %prep
-%setup -q 
+%setup -q
 %ifarch x86_64
-%patch0 
+%patch0
 %endif
 
 %build
@@ -74,7 +74,7 @@
 %{_datadir}/applnk/Settings/LookNFeel/kcmgtk.desktop
 
 
-%changelog 
+%changelog
 * Sat Feb 12 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0.41-5
 - Add patch to fix compile-error on x86_64; Patch was found in a suse srpm
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gonvert/devel gonvert.spec,1.4,1.5
Message-ID: <200503052110.j25LANj1011002@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gonvert/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gonvert/devel

Modified Files:
	gonvert.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gonvert.spec
===================================================================
RCS file: /cvs/extras/rpms/gonvert/devel/gonvert.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gonvert.spec	27 Nov 2004 18:35:05 -0000	1.4
+++ gonvert.spec	5 Mar 2005 21:10:21 -0000	1.5
@@ -1,7 +1,7 @@
 Name:           gonvert
 Version:        0.2.11
 Release:        1
-Summary:        Units conversion utility.
+Summary:        Units conversion utility
 
 Group:          Applications/Engineering
 License:        GPL
@@ -17,21 +17,21 @@
 BuildArch:      noarch
 
 %description
-gonvert is a conversion utility that allows conversion between many units 
-like CGS, Ancient, Imperial with many categories like length, mass, numbers, 
-etc. All units converted values shown at once as you type. Easy to add/change 
-your own units. Written in Python,pygtk,libgade. 
+gonvert is a conversion utility that allows conversion between many units
+like CGS, Ancient, Imperial with many categories like length, mass, numbers,
+etc. All units converted values shown at once as you type. Easy to add/change
+your own units. Written in Python,pygtk,libgade.
 
 
-%prep 
+%prep
 %setup -q
 
 
-%build 
+%build
 make %{?_smp_mflags}
 
 
-%install 
+%install
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall
 
@@ -45,12 +45,12 @@
   gonvert.desktop
 
 
-%clean 
+%clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
-%files 
-%defattr(-,root,root,-) 
+%files
+%defattr(-,root,root,-)
 %doc doc/CHANGELOG doc/COPYING doc/FAQ doc/THANKS doc/TODO
 %{_bindir}/*
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -62,7 +62,7 @@
 %changelog
 * Sat Nov 27 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.2.11-1
 - Bump release/Spec Cleanup.
- 
+
 * Thu Oct 21 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.2.11-0.fdr.1
 - 2.11.
 



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/WindowMaker/devel WindowMaker.spec,1.4,1.5
Message-ID: <200503052110.j25LAMA1010738@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/WindowMaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/WindowMaker/devel

Modified Files:
	WindowMaker.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: WindowMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WindowMaker.spec	10 Dec 2004 22:03:01 -0000	1.4
+++ WindowMaker.spec	5 Mar 2005 21:10:20 -0000	1.5
@@ -1,26 +1,24 @@
-Summary: 	A fast, feature rich Window manager.
-Name: 		WindowMaker
+Summary:	A fast, feature rich Window Manager
+Name:		WindowMaker
 Version:	0.80.2
 Release:	6
-Epoch:		0
 License:	GPL
-Group: 		User Interface/Desktops
-URL: 		http://www.windowmaker.org/
-Source0: 	%{name}-%{version}.tar.bz2
+Group:		User Interface/Desktops
+URL:		http://www.windowmaker.org/
+Source0:	%{name}-%{version}.tar.bz2
 Patch0:		windowmaker-src_actions_c.patch
 Patch1:		windowmaker-src_event_c.patch
 Patch2:		windowmaker-src_workspace_c.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	XFree86-devel libpng-devel libjpeg-devel libungif-devel 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires:	XFree86-devel libpng-devel libjpeg-devel libungif-devel
 BuildRequires:	libtiff-devel zlib-devel gettext
 Obsoletes:	WindowMaker-libs
 
 %package devel
 Summary:	libraries needed for WindowMaker.
 Group:		System Environment/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
-#---------------------------------------------------------------------
 
 %description
 Window Maker is an X11 window manager designed to give additional
@@ -36,7 +34,6 @@
 possible, it reproduces the elegant look and feel of the NeXTSTEP[tm]
 GUI. This package contains development files for WindowMaker libraries
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
@@ -44,7 +41,6 @@
 %patch1 -p0 -b .gtk2
 %patch2 -p0 -b .focus
 
-#---------------------------------------------------------------------
 
 %build
 LINGUAS=`(cd po ; echo *.po|sed 's/zh_TW.Big5.po//g;s/.po//g')`
@@ -55,7 +51,6 @@
 # Dont use _smp_mflags. Race condition.
 make
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -65,12 +60,10 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libwraster.la
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files -f '\(WPrefs\|%{name}\|WINGs\)'.lang
 %defattr(-,root,root,-)
@@ -96,7 +89,6 @@
 %{_libdir}/lib*.a
 %{_libdir}/libwraster.so
 
-#---------------------------------------------------------------------
 
 %changelog
 * Fri Nov 28 2003 Dams <anvil[AT]livna.org> - 0:0.80.2-0.fdr.6
@@ -120,5 +112,5 @@
 * Thu Apr 10 2003 Dams <anvil[AT]livna.org> 0:0.80.2-0.fdr.2
 - Added missing Require: for gettext
 
-* Tue Apr  8 2003 Dams <anvil[AT]livna.org> 
+* Tue Apr  8 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:23 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:23 -0500
Subject: rpms/gnotime/devel gnotime.spec,1.3,1.4
Message-ID: <200503052110.j25LANIU010991@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gnotime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/gnotime/devel

Modified Files:
	gnotime.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnotime.spec	3 Mar 2005 21:26:03 -0000	1.3
+++ gnotime.spec	5 Mar 2005 21:10:21 -0000	1.4
@@ -44,9 +44,6 @@
 Requires(postun): scrollkeeper
 Requires(post): GConf2
 Requires(preun): GConf2
-#Conflicts:      
-#Obsoletes:      
-#BuildConflicts: 
 
 %description
 A combination of stop-watch, diary, consultant billing system, and project



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:22 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:22 -0500
Subject: rpms/cone/devel cone.spec,1.5,1.6
Message-ID: <200503052110.j25LAMXu010851@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/cone/devel

Modified Files:
	cone.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: cone.spec
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/cone.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cone.spec	4 Mar 2005 00:15:58 -0000	1.5
+++ cone.spec	5 Mar 2005 21:10:20 -0000	1.6
@@ -15,7 +15,7 @@
 BuildRequires: zlib-devel openssl-devel fam-devel perl
 BuildRequires: libstdc++-devel gcc-c++
 BuildRequires: openssl-perl
-BuildRequires: ncurses-devel >= 0:5.3
+BuildRequires: ncurses-devel >= 5.3
 
 Requires(post): %{__perl}
 
@@ -25,7 +25,7 @@
 %package devel
 Group: Development/Libraries
 Summary: LibMAIL mail client development library.
-Requires: %{name} = 0:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 The %{name}-devel package the header files and library files for developing



From fedora-extras-commits at redhat.com  Sat Mar  5 21:10:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 16:10:25 -0500
Subject: rpms/mach/devel mach.spec,1.4,1.5
Message-ID: <200503052110.j25LAPhs011207@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/mach/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10397/mach/devel

Modified Files:
	mach.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/devel/mach.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mach.spec	26 Nov 2004 13:22:50 -0000	1.4
+++ mach.spec	5 Mar 2005 21:10:23 -0000	1.5
@@ -1,22 +1,22 @@
 Name:           mach
 Version:        0.4.5
-Release:        0.fdr.1.1
+Release:        1
 Summary:        make a chroot
 
 Group:          Applications/System
-License:	GPL
+License:        GPL
 URL:            http://thomas.apestaart.org/projects/mach/
 Source:         http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Requires:	python
-Requires:	rpm
-Requires:	rpm-python
-Requires:	apt
-Requires:	sed
-Requires:	cpio
+Requires:       python
+Requires:       rpm
+Requires:       rpm-python
+Requires:       apt
+Requires:       sed
+Requires:       cpio
 
-BuildRequires:	python
+BuildRequires:  python
 
 %{!?builduser:  %define builduser  machbuild}
 %{!?buildgroup: %define buildgroup machbuild}
@@ -83,10 +83,10 @@
 fi
 
 %postun
-if [ "$1" == 0 ];
+if [ "$1" = "0" ];
 then
   # last removal
-  userdel mach > /dev/null 2>&1 || : 
+  userdel mach > /dev/null 2>&1 || :
   groupdel mach > /dev/null 2>&1 || :
 fi
 



From fedora-extras-commits at redhat.com  Sat Mar  5 22:25:54 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 5 Mar 2005 17:25:54 -0500
Subject: rpms/pdfjam - New directory
Message-ID: <200503052225.j25MPs60014913@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/pdfjam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14902/pdfjam

Log Message:
Directory /cvs/extras/rpms/pdfjam added to the repository




From fedora-extras-commits at redhat.com  Sat Mar  5 22:25:54 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 5 Mar 2005 17:25:54 -0500
Subject: rpms/pdfjam/devel - New directory
Message-ID: <200503052225.j25MPsZa014916@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/pdfjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14902/pdfjam/devel

Log Message:
Directory /cvs/extras/rpms/pdfjam/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar  5 22:26:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 17:26:24 -0500
Subject: rpms/ncftp - New directory
Message-ID: <200503052226.j25MQOBF015006@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ncftp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14996/ncftp

Log Message:
Directory /cvs/extras/rpms/ncftp added to the repository




From fedora-extras-commits at redhat.com  Sat Mar  5 22:26:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 17:26:24 -0500
Subject: rpms/ncftp/devel - New directory
Message-ID: <200503052226.j25MQOuo015009@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ncftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14996/ncftp/devel

Log Message:
Directory /cvs/extras/rpms/ncftp/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar  5 22:26:39 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 5 Mar 2005 17:26:39 -0500
Subject: rpms/pdfjam Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503052226.j25MQdK3015072@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/pdfjam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15063

Added Files:
	Makefile import.log 
Log Message:
Setup of module pdfjam


--- NEW FILE Makefile ---
# Top level Makefile for module pdfjam
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  5 22:26:50 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 17:26:50 -0500
Subject: rpms/ncftp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503052226.j25MQoOR015111@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ncftp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15085

Added Files:
	Makefile import.log 
Log Message:
Setup of module ncftp


--- NEW FILE Makefile ---
# Top level Makefile for module ncftp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  5 22:26:39 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 5 Mar 2005 17:26:39 -0500
Subject: rpms/pdfjam/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503052226.j25MQdMS015074@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/pdfjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15063/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pdfjam


--- 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 Mar  5 22:26:50 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 17:26:50 -0500
Subject: rpms/ncftp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503052226.j25MQolx015114@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ncftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15085/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ncftp


--- 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 Mar  5 22:28:24 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 5 Mar 2005 17:28:24 -0500
Subject: rpms/pdfjam import.log,1.1,1.2
Message-ID: <200503052228.j25MSO6N015324@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/pdfjam
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15312

Modified Files:
	import.log 
Log Message:
auto-import pdfjam-1.20-1 on branch devel from pdfjam-1.20-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pdfjam/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Mar 2005 22:26:37 -0000	1.1
+++ import.log	5 Mar 2005 22:28:22 -0000	1.2
@@ -0,0 +1 @@
+pdfjam-1_20-1:HEAD:pdfjam-1.20-1.src.rpm:1110061744



From fedora-extras-commits at redhat.com  Sat Mar  5 22:28:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 17:28:26 -0500
Subject: rpms/ncftp import.log,1.1,1.2
Message-ID: <200503052228.j25MSQAW015357@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ncftp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15322

Modified Files:
	import.log 
Log Message:
auto-import ncftp-3.1.8-4 on branch devel from ncftp-3.1.8-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ncftp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Mar 2005 22:26:48 -0000	1.1
+++ import.log	5 Mar 2005 22:28:24 -0000	1.2
@@ -0,0 +1 @@
+ncftp-3_1_8-4:HEAD:ncftp-3.1.8-4.src.rpm:1110061549



From fedora-extras-commits at redhat.com  Sat Mar  5 22:28:24 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 5 Mar 2005 17:28:24 -0500
Subject: rpms/pdfjam/devel pdfjam.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503052228.j25MSO8L015328@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/pdfjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15312/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pdfjam.spec 
Log Message:
auto-import pdfjam-1.20-1 on branch devel from pdfjam-1.20-1.src.rpm


--- NEW FILE pdfjam.spec ---
Name:           pdfjam
Version:        1.20
Release:        1
Summary:        Utilities for join, rotate and align PDFs

Group:          Applications/Publishing
License:        GPL
URL:            http://www.warwick.ac.uk/go/pdfjam
Source0:        http://www.warwick.ac.uk/go/pdfjam/pdfjam_1.20.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       tetex-latex

%description
PDFjam is a small collection of shell scripts which provide a simple
interface to some of the functionality of the excellent pdfpages
package (by Andreas Matthias) for pdfLaTeX.  At present the utilities
available are:

  * pdfnup, which allows PDF files to be "n-upped" in roughly the way
    that psnup does for PostScript files;
  * pdfjoin, which concatenates the pages of multiple PDF files
    together into a single file;
  * pdf90, which rotates the pages of one or more PDF files through 90
    degrees (anti-clockwise).

In every case, source files are left unchanged.

A potential drawback of these utilities is that any hyperlinks in the
source PDF are lost. On the positive side, there is no appreciable
degradation of image quality in processing PDF files with these
programs, unlike some other indirect methods such as "pdf2ps | psnup |
ps2pdf" (in the author's experience).


%prep
%setup -q -n pdfjam

%build

%install
rm -rf $RPM_BUILD_ROOT

install -d -m 755 $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
install -p -m 755 scripts/* $RPM_BUILD_ROOT%{_bindir}/
install -p -m 644 man1/* $RPM_BUILD_ROOT%{_mandir}/man1/

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING PDFjam-README.html pdfdroplets.png
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Thu Feb 24 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.20-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pdfjam/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Mar 2005 22:26:37 -0000	1.1
+++ .cvsignore	5 Mar 2005 22:28:22 -0000	1.2
@@ -0,0 +1 @@
+pdfjam_1.20.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pdfjam/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Mar 2005 22:26:37 -0000	1.1
+++ sources	5 Mar 2005 22:28:22 -0000	1.2
@@ -0,0 +1 @@
+3e443fd2c0063330313c1c079053e622  pdfjam_1.20.tgz



From fedora-extras-commits at redhat.com  Sat Mar  5 22:28:26 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 17:28:26 -0500
Subject: rpms/ncftp/devel ncftp-3.0.1-pref.patch, NONE,
	1.1 ncftp-3.0.3-resume.patch, NONE,
	1.1 ncftp-3.1.5-ncursesw.patch, NONE,
	1.1 ncftp-3.1.5-pmeter.patch, NONE, 1.1 ncftp-3.1.6-rh1.patch,
	NONE, 1.1 ncftp-3.1.7-shell.patch, NONE, 1.1 ncftp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503052228.j25MSQVP015361@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ncftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15322/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ncftp-3.0.1-pref.patch ncftp-3.0.3-resume.patch 
	ncftp-3.1.5-ncursesw.patch ncftp-3.1.5-pmeter.patch 
	ncftp-3.1.6-rh1.patch ncftp-3.1.7-shell.patch ncftp.spec 
Log Message:
auto-import ncftp-3.1.8-4 on branch devel from ncftp-3.1.8-4.src.rpm

ncftp-3.0.1-pref.patch:

--- NEW FILE ncftp-3.0.1-pref.patch ---
--- ncftp/pref.c	2000/07/30 07:01:37	1.1
+++ ncftp/pref.c	2000/07/30 07:01:55
@@ -552,7 +552,7 @@
 	gAutoResume = 0;
 	gSOBufsize = 0;
 	gMaxLogSize = 10240;
-	gConfirmClose = 1;
+	gConfirmClose = 0;
 	gAutoSaveChangesToExistingBookmarks = 0;
 	gRedialDelay = kDefaultRedialDelay;
 

ncftp-3.0.3-resume.patch:

--- NEW FILE ncftp-3.0.3-resume.patch ---
--- ncftp-3.0.3/ncftp/pref.c.resume	Tue May 22 21:56:21 2001
+++ ncftp-3.0.3/ncftp/pref.c	Tue May 22 21:57:07 2001
@@ -625,7 +625,7 @@
 	gCtrlTimeout = 135;
 	gDataPortMode = kFallBackToSendPortMode;
 	gConn.dataPortMode = gDataPortMode;
-	gAutoResume = 0;
+	gAutoResume = 1;
 	gSOBufsize = 0;
 	gMaxLogSize = 10240;
 	gConfirmClose = 0;

ncftp-3.1.5-ncursesw.patch:

--- NEW FILE ncftp-3.1.5-ncursesw.patch ---
--- ncftp-3.1.5/autoconf/aclocal.m4.ncursesw	2003-08-12 12:17:43.000000000 +0200
+++ ncftp-3.1.5/autoconf/aclocal.m4	2003-08-12 12:25:39.000000000 +0200
@@ -3704,7 +3704,7 @@
 wi_cv_lib_curses=no
 wi_cv_lib_curses_result=no
 ac_save_LIBS="$LIBS"
-for LIBCURSES in "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
+for LIBCURSES in "-lncursesw" "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
 do
 	if test "x$LIBCURSES-$wi_cv_ncurses" = "x-lncurses-no" ; then
 		# This should never work
@@ -3752,7 +3752,7 @@
 
 if test "$wi_cv_lib_curses_result" != "no" ; then
 	case "$LIBCURSES" in
-		"-lncurses")
+		"-lncurses*")
 			AC_DEFINE(HAVE_LIBNCURSES)
 			;;
 		"-lcurses")
--- ncftp-3.1.5/configure.ncursesw	2003-08-12 12:28:43.000000000 +0200
+++ ncftp-3.1.5/configure	2003-08-12 12:28:47.000000000 +0200
@@ -3452,7 +3452,7 @@
 wi_cv_lib_curses=no
 wi_cv_lib_curses_result=no
 ac_save_LIBS="$LIBS"
-for LIBCURSES in "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
+for LIBCURSES in "-lncursesw" "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
 do
 	if test "x$LIBCURSES-$wi_cv_ncurses" = "x-lncurses-no" ; then
 		# This should never work

ncftp-3.1.5-pmeter.patch:

--- NEW FILE ncftp-3.1.5-pmeter.patch ---
--- ncftp-3.1.5/sh_util/gpshare.c.pmeter	Thu Dec  5 19:04:42 2002
+++ ncftp-3.1.5/sh_util/gpshare.c	Thu Dec  5 19:06:36 2002
@@ -436,8 +436,8 @@
 #else
 	gIsAtty1 = isatty(1);
 	gIsAtty2 = isatty(2);
-	/* progmeters = ((isatty(2) != 0) && (getppid() > 1)) ? 1 : 0; */
-	progmeters = (getppid() > 1) ? 1 : 0;
+	progmeters = ((gIsAtty2 != 0) && (getppid() > 1)) ? 1 : 0;
+	/* progmeters = (getppid() > 1) ? 1 : 0; */
 #endif
 	return (progmeters);
 }	/* GetDefaultProgressMeterSetting */

ncftp-3.1.6-rh1.patch:

--- NEW FILE ncftp-3.1.6-rh1.patch ---
--- ncftp-3.1.6/ncftp/cmds.c.rh1	2003-10-27 15:10:52.000000000 +0100
+++ ncftp-3.1.6/ncftp/cmds.c	2003-10-27 16:18:48.000000000 +0100
@@ -267,7 +267,7 @@
 	FillBookmarkInfo(&gBm);
 
 	saveBmPassword = gSavePasswords;
-	if ((saveBmPassword < 0) && (gBm.pass[0] != '\0')) {
+	if ((saveBmPassword < 0) && (gBm.pass[0] == '\0') && (gLoadedBm == 0)) {
 		if (gIsTTYr == 0) {
 			saveBmPassword = 0;
 		} else {
@@ -280,7 +280,10 @@
 				(void) printf("\nNot saving the password.\n");
 			}
 		}
+	} else if ((saveBmPassword < 0) && (gBm.pass[0] != '\0')) {
+		saveBmPassword = 1;
 	}
+
 	if (PutBookmark(&gBm, saveBmPassword) < 0) {
 		(void) fprintf(stderr, "Could not save bookmark.\n");
 	} else {

ncftp-3.1.7-shell.patch:

--- NEW FILE ncftp-3.1.7-shell.patch ---
--- ncftp-3.1.7/ncftp/shell.c.shell	2004-01-14 16:17:04.243105318 +0100
+++ ncftp-3.1.7/ncftp/shell.c	2004-01-14 16:17:31.502130388 +0100
@@ -225,7 +225,6 @@
 	char *dcp;
 	char *scp;
 	char *arg;
-	static char xclam[4];
 
 	*cargc = 0;
 	scp = line;
@@ -257,9 +256,7 @@
 			if (scp[1] == '!') {
 				scp[1] = '\0';
 			} else if ((scp[1] != '\0') && (!isspace((int) scp[1]))) {
-				xclam[0] = '!';
-				xclam[1] = '\0';
-				cargv[0] = xclam;
+				cargv[0] = "!";
 				scp++;
 				arg = dcp;
 				cargv[*cargc] = arg;


--- NEW FILE ncftp.spec ---
Summary: An improved FTP client.
Name: ncftp
Version: 3.1.8
Epoch: 2
Release: 4
Prefix: %{_prefix}
License: Distributable
Group: Applications/Internet
Source0: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2
Patch1: ncftp-3.0.1-pref.patch
Patch2: ncftp-3.1.7-shell.patch
Patch3: ftp://ftp.kame.net/pub/kame/misc/ncftp-3181-v6-20040826.diff.gz
Patch4: ncftp-3.0.3-resume.patch
Patch5: ncftp-3.1.5-pmeter.patch
Patch6: ncftp-3.1.5-ncursesw.patch
Patch7: ncftp-3.1.6-rh1.patch
BuildRoot: /var/tmp/%{name}-root
BuildRequires: ncurses-devel glibc-devel gcc
URL: http://www.ncftp.com/ncftp/

%description
Ncftp is an improved FTP client. Ncftp's improvements include support
for command line editing, command histories, recursive gets, automatic
anonymous logins, and more.

%prep
%setup -q
%patch1 -p0 -b .pref
%patch2 -p1
%patch3 -p1 -b .ipv6
%patch4 -p1 -b .res
%patch5 -p1 -b .pmeter
%patch6 -p1 -b .ncursesw
#%patch7 -p1 -b .ask_save

%build
#aclocal -I autoconf
#cp -f autoconf/aclocal.m4 .
%configure --enable-signals --enable-ipv6
make STRIPFLAG=""
rm -f README.v6.ipv6

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{/usr/bin,%{_mandir}/man1}

%makeinstall BINDIR=$RPM_BUILD_ROOT/usr/bin

mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Internet

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README* doc
%{_bindir}/ncftp
%{_bindir}/ncftpget
%{_bindir}/ncftpput
%{_bindir}/ncftpbatch
%{_bindir}/ncftpls
%{_bindir}/ncftpbookmarks
%{_bindir}/ncftpspooler
%{_mandir}/man1/ncftp.1*
%{_mandir}/man1/ncftpget.1*
%{_mandir}/man1/ncftpput.1*
%{_mandir}/man1/ncftpbatch.1*
%{_mandir}/man1/ncftpls.1*
%{_mandir}/man1/ncftpspooler.1*

%changelog
* Wed Mar 02 2005 Karsten Hopp <karsten at redhat.de> 2:3.1.8-4
- build with gcc-4

* Wed Feb 09 2005 Karsten Hopp <karsten at redhat.de> 2:3.1.8-3
- rebuilt

* Thu Aug 26 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-2 
- new upstream ipv6 patch, enable ipv6 again

* Mon Aug 09 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-1 
- update to version 3.1.8
- new ipv6 patch, but currently disabled due to problems with active-ftp
  (#127553)

* Wed Jul 07 2004 Karsten Hopp <karsten at redhat.de> 2:3.1.7-5
- rebuild with new gcc

* Mon Jul 05 2004 Karsten Hopp <karsten at redhat.de> 3.1.7-4 
- add new ipv6 patch (#124232)

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Jan 14 2004 Karsten Hopp <karsten at redhat.de> 3.1.7-1
- update to 3.1.7

* Mon Oct 27 2003 Karsten Hopp <karsten at redhat.de> 2:3.1.6-2
- don't ask again if the password should be saved when it already is in the
  bookmarks file (#62177)

* Fri Oct 03 2003 Florian La Roche <Florian.LaRoche at redhat.de>
- 3.1.6
- disabled patch6, seems not necessary

* Tue Aug 12 2003 Karsten Hopp <karsten at redhat.de> 2:3.1.5-7
- don't terminate when 8bit characters are entered (#83107)
- link ncursesw if available

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Sun Feb 23 2003 Tim Powers <timp at redhat.com>
- rebuild to try and fix a missing dep on libresolv.so.2

* Tue Feb 04 2003 Karsten Hopp <karsten at redhat.de> 3.1.5-4
- updated ipv6 patch (#83186)

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Wed Dec 04 2002 Karsten Hopp <karsten at redhat.de> 3.1.5-2
- don't enable progressbar when called from a script (#78905)

* Mon Nov 18 2002 Karsten Hopp <karsten at redhat.de> 3.1.5-1
- update to 3.1.5
- fix #75253
- disable patch3
- fix filelist

* Mon Jul  1 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.1.3-6
- Bring back IPv6 support (#67322)

* 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 Apr 10 2002 Florian La Roche <Florian.LaRoche at redhat.de>
- add new patch from Jakub as given in #61961
  select his second patch, that seems a very clean solution

* Wed Mar 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.1.3-2
- Add workaround for glibc bug #61961 (should-fix)

* Sat Feb  9 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.1.3-1
- 3.1.3

* Mon Jan 21 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.1.1-1
- Update to 3.1.1
- Temporarily disable the IPv6 patch as it breaks IPv4 connecting
  to machines with both an IPv6 and an IPv4 address

* Tue Nov 20 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.4-2
- Update IPv6 patch

* Wed Oct 31 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.4-1
- 3.0.4
- Add URL tag to spec file (RFE #54622)
- Update and port IPv6 patches
- Fix build with gcc 3.1

* Sat Aug  4 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-6
- Fix suspend (#44101, #50846)

* Sun Jul 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-5
- Add build requirements (#49541)

* Sat Jul 21 2001 Tim Powers <timp at redhat.com>
- no ncftp applnk entry, it's cluttering the menus

* Wed Jul 18 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-3
- Fix ipv6 crash (Patch from Pekka Savola, #47763)

* Tue May 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-2
- Default to auto-resume=yes (REF #28705)

* Tue Apr 24 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-1
- Update to 3.0.3

* Sun Apr 15 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- Add PLD's IPv6 patches (#35645)

* Fri Oct 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 3.0.2

* Thu Aug 24 2000 Philipp Knirsch <pknirsch at redhat.com>
- Fixed bug in ncftp/cmds.c in LocalListCmd where the use of the popen/pclose
  was simply wrong and ocasionally resulted in a SIGSEGV (#16315)

* Fri Aug  4 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Add Swedish and German translations to .desktop file, Bug #15325

* Sun Jul 30 2000 Florian La Roche <Florian.LaRoche at redhat.de>
- small changes to spec file and redo prev patch

* Sun Jul 30 2000 Florian La Roche <Florian.LaRoche at redhat.de>
- set "confirm-close no" per default

* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Mon Jun 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- FHSify

* Sun Apr 02 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 3.0.1

* Fri Mar 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 3.0.0 final

* Mon Mar  6 2000 Jeff Johnson <jbj at redhat.com>
- permit 8-bit input chars to be returned without exiting (#9981),

* Sat Feb  5 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Deal with rpm compressing man pages
- remove wmconfig stuff

* Thu Jan  6 2000 Jeff Johnson <jbj at redhat.com>
- add missing docs.
- y2k wartlet (#8225)

* Tue Nov  9 1999 Bernhard Rosenkraenzer <bero at redhat.com>
- 3.0b21
- enable signal usage

* Sat Jun 12 1999 Jeff Johnson <jbj at redhat.com>
- 3.0b19

* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
- auto rebuild in the new build environment (release 3)

* Wed Feb 24 1999 Bill Nottingham <notting at redhat.com>
- return of wmconfig

* Tue Feb 23 1999 Bill Nottingham <notting at redhat.com>
- 3.0b18

* Fri Feb 12 1999 Bill Nottingham <notting at redhat.com>
- 3.0b17

* Wed Dec  2 1998 Bill Nottingham <notting at redhat.com>
- 3.0b16

* Wed Nov 18 1998 Bill Nottingham <notting at redhat.com>
- add docs

* Thu Nov  5 1998 Bill Nottingham <notting at redhat.com>
- update to 3.0beta15

* Thu Aug 13 1998 Jeff Johnson <jbj at redhat.com>
- build root

* Fri Apr 24 1998 Prospector System <bugs at redhat.com>
- translations modified for de, fr, tr

* Wed Apr 08 1998 Cristian Gafton <gafton at redhat.com>
- compiled for Manhattan

* Fri Mar 20 1998 Cristian Gafton <gafton at redhat.com>
- updated to 2.4.3 for security reasons

* Wed Nov 05 1997 Donnie Barnes <djb at redhat.com>
- added wmconfig entry

* Wed Oct 21 1997 Cristian Gafton <gafton at redhat.com>
- fixed the spec file

* Fri Oct 10 1997 Erik Troan <ewt at redhat.com>
- updated to ncftp 2.4.2

* Thu Jul 10 1997 Erik Troan <ewt at redhat.com>
- built against glibc

* Tue Mar 25 1997 Donnie Barnes <djb at redhat.com>
- Rebuild as Sun version didn't work.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Mar 2005 22:26:48 -0000	1.1
+++ .cvsignore	5 Mar 2005 22:28:24 -0000	1.2
@@ -0,0 +1,2 @@
+ncftp-3.1.8-src.tar.bz2
+ncftp-3181-v6-20040826.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Mar 2005 22:26:48 -0000	1.1
+++ sources	5 Mar 2005 22:28:24 -0000	1.2
@@ -0,0 +1,2 @@
+dd5f47c72b6958fdb652355fb9bdb70c  ncftp-3.1.8-src.tar.bz2
+ade187726693f5c6c6415e41832f514d  ncftp-3181-v6-20040826.diff.gz



From fedora-extras-commits at redhat.com  Sat Mar  5 22:58:37 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sat, 5 Mar 2005 17:58:37 -0500
Subject: rpms/ncftp/devel ncftp.spec,1.1,1.2
Message-ID: <200503052258.j25Mwb3M015641@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ncftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15629

Modified Files:
	ncftp.spec 
Log Message:
Post initial import cleanup and changes.



Index: ncftp.spec
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/ncftp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ncftp.spec	5 Mar 2005 22:28:24 -0000	1.1
+++ ncftp.spec	5 Mar 2005 22:58:35 -0000	1.2
@@ -1,12 +1,12 @@
-Summary: An improved FTP client.
+Summary: Improved console FTP client
 Name: ncftp
 Version: 3.1.8
+Release: 5
 Epoch: 2
-Release: 4
-Prefix: %{_prefix}
 License: Distributable
 Group: Applications/Internet
-Source0: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2
+URL: http://www.ncftp.com/ncftp/
+Source: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2
 Patch1: ncftp-3.0.1-pref.patch
 Patch2: ncftp-3.1.7-shell.patch
 Patch3: ftp://ftp.kame.net/pub/kame/misc/ncftp-3181-v6-20040826.diff.gz
@@ -14,46 +14,45 @@
 Patch5: ncftp-3.1.5-pmeter.patch
 Patch6: ncftp-3.1.5-ncursesw.patch
 Patch7: ncftp-3.1.6-rh1.patch
-BuildRoot: /var/tmp/%{name}-root
-BuildRequires: ncurses-devel glibc-devel gcc
-URL: http://www.ncftp.com/ncftp/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: ncurses-devel
 
 %description
 Ncftp is an improved FTP client. Ncftp's improvements include support
 for command line editing, command histories, recursive gets, automatic
 anonymous logins, and more.
 
+
 %prep
 %setup -q
 %patch1 -p0 -b .pref
-%patch2 -p1
+%patch2 -p1 -b .shell
 %patch3 -p1 -b .ipv6
 %patch4 -p1 -b .res
 %patch5 -p1 -b .pmeter
 %patch6 -p1 -b .ncursesw
 #%patch7 -p1 -b .ask_save
 
+
 %build
-#aclocal -I autoconf
-#cp -f autoconf/aclocal.m4 .
 %configure --enable-signals --enable-ipv6
 make STRIPFLAG=""
 rm -f README.v6.ipv6
 
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{/usr/bin,%{_mandir}/man1}
 
-%makeinstall BINDIR=$RPM_BUILD_ROOT/usr/bin
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}{%{_bindir},%{_mandir}/man1}
+%makeinstall BINDIR=%{buildroot}%{_bindir}
 
-mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Internet
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %files
-%defattr(-,root,root)
-%doc README* doc
+%defattr(-,root,root,0755)
+%doc README* doc/*.txt doc/html/
 %{_bindir}/ncftp
 %{_bindir}/ncftpget
 %{_bindir}/ncftpput
@@ -68,17 +67,23 @@
 %{_mandir}/man1/ncftpls.1*
 %{_mandir}/man1/ncftpspooler.1*
 
+
 %changelog
+* Sat Mar  5 2005 Matthias Saou <http://freshrpms.net/> 2:3.1.8-5
+- Spec file cleanup.
+- Remove man pages from docs.
+- Update summary.
+
 * Wed Mar 02 2005 Karsten Hopp <karsten at redhat.de> 2:3.1.8-4
 - build with gcc-4
 
 * Wed Feb 09 2005 Karsten Hopp <karsten at redhat.de> 2:3.1.8-3
 - rebuilt
 
-* Thu Aug 26 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-2 
+* Thu Aug 26 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-2
 - new upstream ipv6 patch, enable ipv6 again
 
-* Mon Aug 09 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-1 
+* Mon Aug 09 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-1
 - update to version 3.1.8
 - new ipv6 patch, but currently disabled due to problems with active-ftp
   (#127553)
@@ -86,7 +91,7 @@
 * Wed Jul 07 2004 Karsten Hopp <karsten at redhat.de> 2:3.1.7-5
 - rebuild with new gcc
 
-* Mon Jul 05 2004 Karsten Hopp <karsten at redhat.de> 3.1.7-4 
+* Mon Jul 05 2004 Karsten Hopp <karsten at redhat.de> 3.1.7-4
 - add new ipv6 patch (#124232)
 
 * Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
@@ -231,7 +236,7 @@
 * Sat Jun 12 1999 Jeff Johnson <jbj at redhat.com>
 - 3.0b19
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
 - auto rebuild in the new build environment (release 3)
 
 * Wed Feb 24 1999 Bill Nottingham <notting at redhat.com>



From fedora-extras-commits at redhat.com  Sat Mar  5 23:39:56 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 5 Mar 2005 18:39:56 -0500
Subject: rpms/graveman import.log,1.2,1.3
Message-ID: <200503052339.j25Ndusc016537@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/graveman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16531

Modified Files:
	import.log 
Log Message:
auto-import graveman-0.3.8-2 on branch FC-3 from graveman-0.3.8-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/graveman/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	26 Feb 2005 21:39:05 -0000	1.2
+++ import.log	5 Mar 2005 23:39:54 -0000	1.3
@@ -1 +1,2 @@
 graveman-0_3_8-1:HEAD:graveman-0.3.8-1.src.rpm:1109453936
+graveman-0_3_8-2:FC-3:graveman-0.3.8-2.src.rpm:1110065985



From fedora-extras-commits at redhat.com  Sun Mar  6 02:10:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 5 Mar 2005 21:10:45 -0500
Subject: rpms/sqlite import.log,1.5,1.6
Message-ID: <200503060210.j262Ajcc019216@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sqlite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19203

Modified Files:
	import.log 
Log Message:
auto-import sqlite-2.8.16-0.fdr.1.2 on branch FC-2 from sqlite-2.8.16-0.fdr.1.2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sqlite/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	8 Nov 2004 05:23:02 -0000	1.5
+++ import.log	6 Mar 2005 02:10:43 -0000	1.6
@@ -2,3 +2,4 @@
 sqlite-2_8_6-0_fdr_6_rh90:HEAD:sqlite-2.8.6-0.fdr.6.rh90.src.rpm:1099891358
 sqlite-2_8_6-0_fdr_6_1:HEAD:sqlite-2.8.6-0.fdr.6.1.src.rpm:1099891373
 sqlite-2_8_6-0_fdr_6_2:HEAD:sqlite-2.8.6-0.fdr.6.2.src.rpm:1099891382
+sqlite-2_8_16-0_fdr_1_2:FC-2:sqlite-2.8.16-0.fdr.1.2.src.rpm:1110075055



From fedora-extras-commits at redhat.com  Sun Mar  6 02:10:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 5 Mar 2005 21:10:45 -0500
Subject: rpms/sqlite/FC-2 sqlite-2.8.15-arch-double-differences.patch, NONE,
	1.1 sqlite-2.8.15-makefile.patch, NONE,
	1.1 sqlite-2.8.15.rpath.patch, NONE,
	1.1 sqlite-64bit-fixes.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 sqlite.spec, 1.4,
	1.5 sqlite-2.8.3.makefile.tclsqlite.patch, 1.1,
	NONE sqlite-2.8.6.norpath.patch, 1.1, NONE
Message-ID: <200503060210.j262Aj8U019220@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sqlite/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19203/FC-2

Modified Files:
	.cvsignore sources sqlite.spec 
Added Files:
	sqlite-2.8.15-arch-double-differences.patch 
	sqlite-2.8.15-makefile.patch sqlite-2.8.15.rpath.patch 
	sqlite-64bit-fixes.patch 
Removed Files:
	sqlite-2.8.3.makefile.tclsqlite.patch 
	sqlite-2.8.6.norpath.patch 
Log Message:
auto-import sqlite-2.8.16-0.fdr.1.2 on branch FC-2 from sqlite-2.8.16-0.fdr.1.2.src.rpm

sqlite-2.8.15-arch-double-differences.patch:

--- NEW FILE sqlite-2.8.15-arch-double-differences.patch ---
--- sqlite/test/format3.test.bak	2003-12-23 03:17:35.000000000 +0100
+++ sqlite/test/format3.test	2005-01-28 18:06:35.066538463 +0100
@@ -686,7 +686,7 @@
   execsql {SELECT '0'==0.0}
 } {1}
 do_test format3-11.3 {
-  execsql {SELECT '123456789012345678901'=='123456789012345678900'}
+  execsql {SELECT '1234567890123456789012'=='1234567890123456789011'}
 } {1}
 do_test format3-11.4 {
   execsql {
--- sqlite/test/misc1.test.bak	2003-08-05 15:13:39.000000000 +0200
+++ sqlite/test/misc1.test	2005-01-28 18:07:26.976971054 +0100
@@ -335,7 +335,7 @@
   execsql {SELECT '0'==0.0}
 } {1}
 do_test misc1-12.3 {
-  execsql {SELECT '12345678901234567890'=='12345678901234567891'}
+  execsql {SELECT '1234567890123456789012'=='1234567890123456789011'}
 } {0}
 do_test misc1-12.4 {
   execsql {

sqlite-2.8.15-makefile.patch:

--- NEW FILE sqlite-2.8.15-makefile.patch ---
diff -Nur sqlite-2.8.15-orig/Makefile.in sqlite-2.8.15/Makefile.in
--- sqlite-2.8.15-orig/Makefile.in	2004-03-27 00:16:32.000000000 +0100
+++ sqlite-2.8.15/Makefile.in	2005-01-23 18:20:37.034194768 +0100
@@ -465,14 +465,16 @@
 	mv $(DOC) doc
 
 install:	sqlite libsqlite.la sqlite.h
-	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib
-	$(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib
+	$(INSTALL) -d $(DESTDIR)$(libdir)
+	$(LTINSTALL) libsqlite.la $(DESTDIR)$(libdir)
+	$(LTINSTALL) libtclsqlite.la $(DESTDIR)$(libdir)/sqlite-__VERSION__
 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
 	$(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin
+	$(LTINSTALL) tclsqlite $(DESTDIR)$(exec_prefix)/bin
 	$(INSTALL) -d $(DESTDIR)$(prefix)/include
 	$(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
-	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
-	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
+	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig; 
+	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(libdir)/pkgconfig; 
 
 clean:	
 	rm -f *.lo *.la *.o sqlite at TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.*

sqlite-2.8.15.rpath.patch:

--- NEW FILE sqlite-2.8.15.rpath.patch ---
--- sqlite/Makefile.in.nos	2004-06-18 14:13:40.127066236 +0200
+++ sqlite/Makefile.in	2004-06-18 14:13:56.241098295 +0200
@@ -192,7 +192,7 @@
 
 libtclsqlite.la:	tclsqlite.lo libsqlite.la
 	$(LTLINK) -o libtclsqlite.la tclsqlite.lo \
-		libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite \
+		libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite-__VERSION__ \
 		-version-info "8:6:8"
 
 sqlite at TARGET_EXEEXT@:	$(TOP)/src/shell.c libsqlite.la sqlite.h

sqlite-64bit-fixes.patch:

--- NEW FILE sqlite-64bit-fixes.patch ---
--- sqlite/src/test3.c.64bit-fixes	2004-09-29 10:09:56.249551000 -0400
+++ sqlite/src/test3.c	2004-09-29 11:34:51.314336091 -0400
@@ -19,9 +19,11 @@
 #include "pager.h"
 #include "btree.h"
 #include "tcl.h"
+#include "test-util.h"
 #include <stdlib.h>
 #include <string.h>
 
+
 /*
 ** Interpret an SQLite error number
 */
@@ -98,7 +100,7 @@ static int btree_close(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeClose(pBt);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -125,7 +127,7 @@ static int btree_begin_transaction(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeBeginTrans(pBt);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -152,7 +154,7 @@ static int btree_rollback(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeRollback(pBt);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -179,7 +181,7 @@ static int btree_commit(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeCommit(pBt);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -207,7 +209,7 @@ static int btree_create_table(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeCreateTable(pBt, &iTable);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -237,7 +239,7 @@ static int btree_drop_table(
        " ID TABLENUM\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR;
   rc = sqliteBtreeDropTable(pBt, iTable);
   if( rc!=SQLITE_OK ){
@@ -266,7 +268,7 @@ static int btree_clear_table(
        " ID TABLENUM\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR;
   rc = sqliteBtreeClearTable(pBt, iTable);
   if( rc!=SQLITE_OK ){
@@ -296,7 +298,7 @@ static int btree_get_meta(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeGetMeta(pBt, aMeta);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -333,7 +335,7 @@ static int btree_update_meta(
        " ID METADATA...\" (METADATA is ", zBuf, " integers)", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   for(i=0; i<SQLITE_N_BTREE_META; i++){
     if( Tcl_GetInt(interp, argv[i+2], &aMeta[i]) ) return TCL_ERROR;
   }
@@ -365,7 +367,7 @@ static int btree_page_dump(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &iPage) ) return TCL_ERROR;
   rc = sqliteBtreePageDump(pBt, iPage, 0);
   if( rc!=SQLITE_OK ){
@@ -395,7 +397,7 @@ static int btree_tree_dump(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &iPage) ) return TCL_ERROR;
   rc = sqliteBtreePageDump(pBt, iPage, 1);
   if( rc!=SQLITE_OK ){
@@ -425,7 +427,7 @@ static int btree_pager_stats(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   a = sqlitepager_stats(sqliteBtreePager(pBt));
   for(i=0; i<9; i++){
     static char *zName[] = {
@@ -458,7 +460,7 @@ static int btree_pager_ref_dump(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   sqlitepager_refdump(sqliteBtreePager(pBt));
   return TCL_OK;
 }
@@ -487,7 +489,7 @@ static int btree_integrity_check(
        " ID ROOT ...\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   nRoot = argc-2;
   aRoot = malloc( sizeof(int)*(argc-2) );
   for(i=0; i<argc-2; i++){
@@ -524,7 +526,7 @@ static int btree_cursor(
        " ID TABLENUM WRITEABLE\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR;
+  pBt = sqliteTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR;
   if( Tcl_GetBoolean(interp, argv[3], &wrFlag) ) return TCL_ERROR;
   rc = sqliteBtreeCursor(pBt, iTable, wrFlag, &pCur);
@@ -556,7 +558,7 @@ static int btree_close_cursor(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeCloseCursor(pCur);
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -586,7 +588,7 @@ static int btree_move_to(
        " ID KEY\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeMoveto(pCur, argv[2], strlen(argv[2]), &res);  
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -618,7 +620,7 @@ static int btree_delete(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeDelete(pCur);
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -647,7 +649,7 @@ static int btree_insert(
        " ID KEY DATA\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeInsert(pCur, argv[2], strlen(argv[2]),
                          argv[3], strlen(argv[3]));
   if( rc ){
@@ -680,7 +682,7 @@ static int btree_next(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeNext(pCur, &res);
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -714,7 +716,7 @@ static int btree_prev(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreePrevious(pCur, &res);
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -747,7 +749,7 @@ static int btree_first(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeFirst(pCur, &res);
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -780,7 +782,7 @@ static int btree_last(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeLast(pCur, &res);
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -812,7 +814,7 @@ static int btree_key(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   sqliteBtreeKeySize(pCur, &n);
   zBuf = malloc( n+1 );
   rc = sqliteBtreeKey(pCur, 0, n, zBuf);
@@ -850,7 +852,7 @@ static int btree_data(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   sqliteBtreeDataSize(pCur, &n);
   zBuf = malloc( n+1 );
   rc = sqliteBtreeData(pCur, 0, n, zBuf);
@@ -887,7 +889,7 @@ static int btree_payload_size(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   sqliteBtreeKeySize(pCur, &n1);
   sqliteBtreeDataSize(pCur, &n2);
   sprintf(zBuf, "%d", n1+n2);
@@ -927,7 +929,7 @@ static int btree_cursor_dump(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR;
+  pCur = sqliteTextToPtr(argv[1]);
   rc = sqliteBtreeCursorDump(pCur, aResult);
   if( rc ){
     Tcl_AppendResult(interp, errorName(rc), 0);
--- sqlite/src/test2.c.64bit-fixes	2004-02-09 20:54:28.000000000 -0500
+++ sqlite/src/test2.c	2004-09-29 11:35:00.840257674 -0400
@@ -19,6 +19,7 @@
 #include "sqliteInt.h"
 #include "pager.h"
 #include "tcl.h"
+#include "test-util.h"
 #include <stdlib.h>
 #include <string.h>
 
@@ -104,7 +105,7 @@ static int pager_close(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_close(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -131,7 +132,7 @@ static int pager_rollback(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_rollback(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -158,7 +159,7 @@ static int pager_commit(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_commit(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -185,7 +186,7 @@ static int pager_ckpt_begin(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_ckpt_begin(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -212,7 +213,7 @@ static int pager_ckpt_rollback(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_ckpt_rollback(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -239,7 +240,7 @@ static int pager_ckpt_commit(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_ckpt_commit(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -266,7 +267,7 @@ static int pager_stats(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   a = sqlitepager_stats(pPager);
   for(i=0; i<9; i++){
     static char *zName[] = {
@@ -299,7 +300,7 @@ static int pager_pagecount(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   sprintf(zBuf,"%d",sqlitepager_pagecount(pPager));
   Tcl_AppendResult(interp, zBuf, 0);
   return TCL_OK;
@@ -326,7 +327,7 @@ static int page_get(
        " ID PGNO\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &pgno) ) return TCL_ERROR;
   rc = sqlitepager_get(pPager, pgno, &pPage);
   if( rc!=SQLITE_OK ){
@@ -359,7 +360,7 @@ static int page_lookup(
        " ID PGNO\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR;
+  pPager = sqliteTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &pgno) ) return TCL_ERROR;
   pPage = sqlitepager_lookup(pPager, pgno);
   if( pPage ){
@@ -387,7 +388,7 @@ static int page_unref(
        " PAGE\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR;
+  pPage = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_unref(pPage);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -414,7 +415,7 @@ static int page_read(
        " PAGE\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR;
+  pPage = sqliteTextToPtr(argv[1]);
   memcpy(zBuf, pPage, sizeof(zBuf));
   Tcl_AppendResult(interp, zBuf, 0);
   return TCL_OK;
@@ -438,7 +439,7 @@ static int page_number(
        " PAGE\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR;
+  pPage = sqliteTextToPtr(argv[1]);
   sprintf(zBuf, "%d", sqlitepager_pagenumber(pPage));
   Tcl_AppendResult(interp, zBuf, 0);
   return TCL_OK;
@@ -462,7 +463,7 @@ static int page_write(
        " PAGE DATA\"", 0);
     return TCL_ERROR;
   }
-  if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR;
+  pPage = sqliteTextToPtr(argv[1]);
   rc = sqlitepager_write(pPage);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
--- sqlite/src/test-util.c.64bit-fixes	2004-09-29 11:33:18.838681763 -0400
+++ sqlite/src/test-util.c	2004-09-29 11:35:32.332610359 -0400
@@ -0,0 +1,47 @@
+#include <stdint.h>
+#include <assert.h>
+#include "test-util.h"
+
+/*
+** Translate a single byte of Hex into an integer.
+*/
+static int hexToInt(int h){
+  if( h>='0' && h<='9' ){
+    return h - '0';
+  }else if( h>='a' && h<='f' ){
+    return h - 'a' + 10;
+  }else if( h>='A' && h<='F' ){
+    return h - 'A' + 10;
+  }else{
+    return 0;
+  }
+}
+
+#if defined(SQLITE_TEST)
+/*
+** Convert text generated by the "%p" conversion format back into
+** a pointer.
+*/
+void *sqliteTextToPtr(const char *z){
+  void *p;
+  uint64_t v;
+  uint32_t v2;
+  if( z[0]=='0' && z[1]=='x' ){
+    z += 2;
+  }
+  v = 0;
+  while( *z ){
+    v = (v<<4) + hexToInt(*z);
+    z++;
+  }
+  if( sizeof(p)==sizeof(v) ){
+    p = *(void**)&v;
+  }else{
+    assert( sizeof(p)==sizeof(v2) );
+    v2 = (uint32_t)v;
+    p = *(void**)&v2;
+  }
+  return p;
+}
+#endif
+
--- sqlite/src/test-util.h.64bit-fixes	2004-09-29 11:33:23.513624799 -0400
+++ sqlite/src/test-util.h	2004-09-29 11:34:35.012047569 -0400
@@ -0,0 +1,6 @@
+#ifndef TEST_UTIL_H
+#define TEST_UTIL_H
+
+extern void *sqliteTextToPtr(const char *z);
+
+#endif /* TEST_UTIL_H */
--- sqlite/Makefile.in.64bit-fixes	2004-09-29 09:41:08.011929000 -0400
+++ sqlite/Makefile.in	2004-09-29 11:32:59.441768988 -0400
@@ -142,6 +142,7 @@ SRC = \
 # Source code to the test files.
 #
 TESTSRC = \
+  $(TOP)/src/test-util.c \
   $(TOP)/src/btree.c \
   $(TOP)/src/func.c \
   $(TOP)/src/os.c \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sqlite/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:22:32 -0000	1.2
+++ .cvsignore	6 Mar 2005 02:10:43 -0000	1.3
@@ -1 +1 @@
-sqlite-2.8.6.tar.gz
+sqlite-2.8.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sqlite/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:22:32 -0000	1.2
+++ sources	6 Mar 2005 02:10:43 -0000	1.3
@@ -1 +1 @@
-3047e24370d7e49d7bfd9728addf76cf  sqlite-2.8.6.tar.gz
+9c79b461ff30240a6f9d70dd67f8faea  sqlite-2.8.16.tar.gz


Index: sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/sqlite/FC-2/sqlite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sqlite.spec	8 Nov 2004 05:23:02 -0000	1.4
+++ sqlite.spec	6 Mar 2005 02:10:43 -0000	1.5
@@ -1,15 +1,17 @@
 Name:           sqlite
-Version:        2.8.6
-Release:        0.fdr.6.2
+Version:        2.8.16
+Release:        0.fdr.1.2
 Epoch:          0
-Summary:        An embeddable SQL engine in a C library.
+Summary:        An embeddable SQL engine in a C library
 Group:          System Environment/Libraries
 License:        Public Domain
 URL:            http://www.sqlite.org/
-Source0:        http://www.sqlite.org/sqlite-2.8.6.tar.gz
-Patch1:		sqlite-2.8.6.norpath.patch
-Patch2:		sqlite-2.8.3.makefile.tclsqlite.patch
-Patch3:		sqlite-2.8.3.test.rh9.patch
+Source0:        http://www.sqlite.org/sqlite-%{version}.tar.gz
+Patch1:         sqlite-2.8.15.rpath.patch      
+Patch2:         sqlite-2.8.15-makefile.patch
+Patch3:         sqlite-2.8.3.test.rh9.patch
+Patch4:		sqlite-64bit-fixes.patch
+Patch5:		sqlite-2.8.15-arch-double-differences.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel readline-devel %{_includedir}/tcl.h
@@ -47,25 +49,33 @@
 This package contains tcl bindings for sqlite.
 
 %prep
-%setup -q -n %{name}
-%patch1 -p1
-%patch2 -p0
+%setup -q
+%patch1 -p1 -b .rpath
+%patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+sed -i.rpath 's!__VERSION__!%{version}!g' Makefile.in
+# Patch additional /usr/lib locations where we don't have $(libdir)
+# to substitute with.
+sed -i.lib 's!@exec_prefix@/lib!%_libdir!g' Makefile.in
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -DNDEBUG=1"
 %configure --enable-utf8
-make all tclsqlite doc test
+make
+make tclsqlite libtclsqlite.la doc
+#obs. make test doesn't like root
+make test
 
 %install
 rm -rf $RPM_BUILD_ROOT
 DIRECTORY=$RPM_BUILD_ROOT%_libdir/sqlite-%version
 install -d $DIRECTORY
-cp -d -p .libs/libtclsqlite.so* $DIRECTORY
 echo 'package ifneeded sqlite 2 [list load [file join $dir libtclsqlite.so]]' > $DIRECTORY/pkgIndex.tcl
 
 %makeinstall
-install -D -m 0644 sqlite.1 $RPM_BUILD_ROOT/%{_mandir}/man1/sqlite.1
+install -D -m 0644 sqlite.1 $RPM_BUILD_ROOT%{_mandir}/man1/sqlite.1
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
@@ -93,10 +103,35 @@
 %defattr(-,root,root,-)
 %doc doc/tclsqlite.html
 %exclude %_bindir/tclsqlite
-%exclude %_libdir/libtclsqlite.*
+%exclude %_libdir/%{name}-%{version}/libtclsqlite.a 
+%exclude %{_bindir}/tclsqlite
 %_libdir/sqlite-%version
 
 %changelog
+* Wed Feb 16 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:2.8.16-1
+- Update to 2.8.16 bug-fix release + update patches.
+
+* Tue Feb 15 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.8.15-2
+- add sqlite-64bit-fixes.patch and sqlite-2.8.15-arch-double-differences.patch
+  fixes x86_64; Both were found in a mandrake srpm
+- remove exclusive arch ix86; hopefully this fixes ppc also
+
+* Sun Jan 23 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:2.8.15-1
+- Add exclusive arch ix86 for now (make test segfaults on x86_64).
+- Update makefile patch, $(exec_prefix)/lib -> $(libdir), and
+  substitute additional /usr/lib locations in %%prep for multilib
+  people to play with.
+
+* Sun Sep 26 2004 Adrian Reber <adrian at lisas.de> - 0:2.8.15-0.fdr.1
+- Update to 2.8.15
+- Update patches
+
+* Fri Jun 19 2004 Nils O. Sel??sdal <NOS at Utel.no> - 0:2.8.14-0.fdr.1
+- Update to 2.8.14
+- Update patches
+- --enable-releasemode
+- small spec file tweaks
+
 * Sat Dec 27 2003 Jean-Luc Fontaine <jfontain at free.fr> - 0:2.8.6-0.fdr.6
 - in tcl rpm, removed tclsqlite, moved shared library in own sqlite
   sub-directory add added pkgIndex.tcl file to make package dynamically
@@ -105,13 +140,17 @@
   existence in RH 8.0 and 9
 - in tcl rpm, added tcl package requirement
 - in tcl rpm, post ldconfig is not necessary
+
 * Wed Nov 12 2003 Nils O. Sel??sdal <NOS at Utel.no> -  0:2.8.6-0.fdr.5
 - BuildRequires tcl-devel
 - small .spec tweaks
+
 * Tue Oct 28 2003 Nils O. Sel??sdal <NOS at Utel.no> - 0:2.8.6-0.fdr.4
 - exclude libtclsqlite.a
+
 * Mon Oct 27 2003 Nils O. Sel??sdal <NOS at Utel.no> - 0:2.8.6-0.fdr.3
 - Fix readme -> README
+
 * Mon Oct 27 2003 Nils O. Sel??sdal <NOS at Utel.no> - 0:2.8.6-0.fdr.2
 - Better summary/description
 - Add patch for not using rpath


--- sqlite-2.8.3.makefile.tclsqlite.patch DELETED ---


--- sqlite-2.8.6.norpath.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar  6 03:48:17 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sat, 5 Mar 2005 22:48:17 -0500
Subject: rpms/netcdf/FC-3 .cvsignore, 1.3, 1.4 netcdf.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200503060348.j263mHqm020163@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/netcdf/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20157

Modified Files:
	.cvsignore netcdf.spec sources 
Log Message:
update for 3.6.0-p1 large-files-bug fix and remove the Epoch



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Jan 2005 09:52:44 -0000	1.3
+++ .cvsignore	6 Mar 2005 03:48:15 -0000	1.4
@@ -1 +1 @@
-netcdf-3_6_0-beta6.tar.gz
+netcdf-3.6.0-p1.tar.gz


Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-3/netcdf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- netcdf.spec	14 Jan 2005 10:10:03 -0000	1.3
+++ netcdf.spec	6 Mar 2005 03:48:15 -0000	1.4
@@ -1,13 +1,12 @@
 Name:           netcdf
 Version:        3.6.0
-Release:        0.2.beta6
-Epoch:          0
+Release:        1.p1
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
 License:        NetCDF
 URL:            http://my.unidata.ucar.edu/content/software/netcdf/index.html
-Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3_6_0-beta6.tar.gz
+Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.0-p1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-g77
@@ -54,11 +53,11 @@
 
 
 %prep
-%setup -q -n netcdf-3_6_0-beta6
+%setup -q -n netcdf-3.6.0-p1
 
 
 %build
-cd $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src
+cd $RPM_BUILD_DIR/netcdf-3.6.0-p1/src
 export FC="g77"
 export CPPFLAGS="-fPIC"
 %configure
@@ -74,7 +73,7 @@
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/netcdf-3
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}
-cd $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src
+cd $RPM_BUILD_DIR/netcdf-3.6.0-p1/src
 %makeinstall INCDIR=${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 \
   LIBDIR=${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 \
   MANDIR=$RPM_BUILD_ROOT/%{_mandir}
@@ -86,7 +85,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src/COPYRIGHT $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src/README $RPM_BUILD_DIR/netcdf-3_6_0-beta6/src/COMPATIBILITY
+%doc $RPM_BUILD_DIR/netcdf-3.6.0-p1/src/COPYRIGHT $RPM_BUILD_DIR/netcdf-3.6.0-p1/src/README
 %{_bindir}/*
 %{_mandir}/man1/*
 
@@ -98,6 +97,9 @@
 
 
 %changelog
+* Sat Mar  5 2005 Ed Hill <ed at eh3.com> - 0:3.6.0-1.p1
+- update for 3.6.0-p1 large-files-bug fix and remove the Epoch
+
 * Sun Dec 12 2004 Ed Hill <eh3 at mit.edu> - 0:3.6.0-0.2.beta6
 - fix naming scheme for pre-releases (per Michael Schwendt)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Jan 2005 09:52:44 -0000	1.3
+++ sources	6 Mar 2005 03:48:15 -0000	1.4
@@ -1 +1 @@
-6c914f05c3327dd91d05322b143f7e9b  netcdf-3_6_0-beta6.tar.gz
+27c193e0462d9979406d167a01a5ee95  netcdf-3.6.0-p1.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar  6 04:37:03 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sat, 5 Mar 2005 23:37:03 -0500
Subject: rpms/netcdf/FC-3 netcdf.spec,1.4,1.5
Message-ID: <200503060437.j264b3Nr020991@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/netcdf/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20984

Modified Files:
	netcdf.spec 
Log Message:
remove unnecessary $RPM_BUILD_DIR entries (per Michael Schwendt)



Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-3/netcdf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netcdf.spec	6 Mar 2005 03:48:15 -0000	1.4
+++ netcdf.spec	6 Mar 2005 04:37:01 -0000	1.5
@@ -14,7 +14,7 @@
 %package devel
 Summary:        Development files for netcdf-3
 Group:          Development/Libraries
-#Requires:       %{name} = %{epoch}:%{version}-%{release}
+#Requires:       %{name} = %{version}-%{release}
 
 %description
 NetCDF-3 (network Common Data Form ver3) is an interface for
@@ -57,7 +57,7 @@
 
 
 %build
-cd $RPM_BUILD_DIR/netcdf-3.6.0-p1/src
+cd src
 export FC="g77"
 export CPPFLAGS="-fPIC"
 %configure
@@ -73,7 +73,7 @@
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/netcdf-3
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}
-cd $RPM_BUILD_DIR/netcdf-3.6.0-p1/src
+cd src
 %makeinstall INCDIR=${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 \
   LIBDIR=${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 \
   MANDIR=$RPM_BUILD_ROOT/%{_mandir}
@@ -85,7 +85,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc $RPM_BUILD_DIR/netcdf-3.6.0-p1/src/COPYRIGHT $RPM_BUILD_DIR/netcdf-3.6.0-p1/src/README
+%doc src/COPYRIGHT src/README
 %{_bindir}/*
 %{_mandir}/man1/*
 



From adrian at lisas.de  Sun Mar  6 10:31:46 2005
From: adrian at lisas.de (Adrian Reber)
Date: Sun, 6 Mar 2005 11:31:46 +0100
Subject: APPROVED: pdfjam
Message-ID: <20050306103146.GB25771@lisas.de>


pdfjam: Utilities for join, rotate and align PDFs

Approved by: me
Maintainer: Jose Pedro Oliveira <jpo at di.uminho.pt> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050306/dc06efa5/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Sun Mar  6 10:39:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 6 Mar 2005 05:39:50 -0500
Subject: rpms/pth import.log,1.8,1.9
Message-ID: <200503061039.j26AdoTV030740@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30730

Modified Files:
	import.log 
Log Message:
auto-import pth-2.0.4-0.fdr.1.2 on branch FC-2 from pth-2.0.4-0.fdr.1.2.src.rpm
http://bugzilla.fedora.us/show_bug.cgi?id=133


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pth/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	27 Feb 2005 19:58:36 -0000	1.8
+++ import.log	6 Mar 2005 10:39:48 -0000	1.9
@@ -5,3 +5,4 @@
 pth-2_0_3-1:HEAD:pth-2.0.3-1.src.rpm:1108270503
 pth-2_0_4-1:FC-3:pth-2.0.4-1.src.rpm:1109534233
 pth-2_0_4-0_fdr_1:FC-2:pth-2.0.4-0.fdr.1.src.rpm:1109534307
+pth-2_0_4-0_fdr_1_2:FC-2:pth-2.0.4-0.fdr.1.2.src.rpm:1110105580



From fedora-extras-commits at redhat.com  Sun Mar  6 10:39:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 6 Mar 2005 05:39:50 -0500
Subject: rpms/pth/FC-2 pth.spec,1.5,1.6
Message-ID: <200503061039.j26AdoN7030743@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pth/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30730/FC-2

Modified Files:
	pth.spec 
Log Message:
auto-import pth-2.0.4-0.fdr.1.2 on branch FC-2 from pth-2.0.4-0.fdr.1.2.src.rpm
http://bugzilla.fedora.us/show_bug.cgi?id=133


Index: pth.spec
===================================================================
RCS file: /cvs/extras/rpms/pth/FC-2/pth.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pth.spec	27 Feb 2005 19:58:36 -0000	1.5
+++ pth.spec	6 Mar 2005 10:39:48 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:        GNU Pth - The GNU Portable Threads
 Name:           pth
 Version:        2.0.4
-Release:        0.fdr.1
+Release:        0.fdr.1.2
 Epoch:          0
 License:        LGPL
 Group:          System Environment/Libraries



From fedora-extras-commits at redhat.com  Sun Mar  6 16:57:57 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 6 Mar 2005 11:57:57 -0500
Subject: rpms/dietlibc/devel dietlibc.spec,1.4,1.5
Message-ID: <200503061657.j26Gvv82009532@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9526

Modified Files:
	dietlibc.spec 
Log Message:
build the dynamic libs for x86, x86_64 and arm only
tabifyied the file



Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dietlibc.spec	5 Mar 2005 21:10:21 -0000	1.4
+++ dietlibc.spec	6 Mar 2005 16:57:55 -0000	1.5
@@ -1,9 +1,9 @@
 ## $Id$
 
 ## This package understands the following switches:
-## --with cross                 ...  enable crossbuild
-## --define crossarch <arch>    ...  set cross-architecture (only valid with
-##                                   '--with cross'; defaults to 'arm-linux')
+## --with cross			...  enable crossbuild
+## --define crossarch <arch>	...  set cross-architecture (only valid with
+##				     '--with cross'; defaults to 'arm-linux')
 
 ## Fedora Extras specific customization below...
 %global	crossarch	%{!?crossarch:arm-linux}%{?crossarch}
@@ -12,7 +12,26 @@
 %global NAME		dietlibc
 %global do_crossbuild	%{?_with_cross:1}%{!?_with_cross:0}
 
-%{!?release_func:%define release_func() %1%{?disttag}}
+%ifarch %ix86 x86_64 arm
+%global noncross_do_dyn	1
+%else
+%global noncross_do_dyn 0
+%endif
+
+%ifarch %ix86
+%global target_cpu	i386
+%else
+%global target_cpu	%_target_cpu
+%endif
+
+%global target_cpu	%(test "%do_crossbuild" = 1 && echo %crossarch | sed -e 's!-.*!!' || echo %target_cpu)
+%global do_dyn		%(test "%do_crossbuild" = 1 && case "%target_cpu" in (x86_86|arm|i?86) echo 1;; (*) echo 0;; esac || echo %noncross_do_dyn)
+%if %do_dyn
+%global with_dyn	1
+%endif
+
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	Small libc implementation
 Name:		%{?_with_cross:cross-%crossarch-}%NAME
@@ -26,11 +45,11 @@
 Patch0:		dietlibc-0.28-gcc4.patch
 Patch1:		dietlibc-0.28-setpriority.patch
 BuildRoot:	%_tmppath/%name-%version-buildroot
-Requires:	dietlibc-lib = %version-%release
+%{?with_dyn:Requires:	dietlibc-lib = %version-%release}
 
 %if %do_crossbuild
-BuildRequires:  dietlibc
-Requires:       dietlibc = %version-%release
+BuildRequires:	dietlibc
+Requires:	dietlibc = %version-%release
 %endif
 
 
@@ -61,18 +80,17 @@
 sed -i -e 's!LD_RUN_PATH= !env -u LD_RUN_PATH !' Makefile
 
 
-%define basemakeflags   prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: %{!?_with_cross:CFLAGS="$RPM_OPT_FLAGS"}
-%define xtraflags	%(echo CROSS=%{crossarch}- ARCH=$(echo %crossarch | sed -e 's!-.*!!'))
-%define makeflags	%basemakeflags %{?_with_cross:%xtraflags}
+%define basemakeflags	prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: %{!?_with_cross:CFLAGS="$RPM_OPT_FLAGS"}
+%define makeflags	%basemakeflags %{?_with_cross:CROSS=%crossarch- ARCH=%target_cpu}
 
 
 %build
 %if %do_crossbuild
-  mkdir bin-%_arch
+  mkdir -p bin-%_arch
   diet gcc diet.c -DDIETHOME=\"`pwd`\" -DVERSION=\"X\" -o bin-%_arch/diet
 %endif
 
-%__make %makeflags all dyn %{?_smp_mflags}
+%__make %makeflags all %{?with_dyn:dyn} %{?_smp_mflags}
 
 
 
@@ -81,13 +99,14 @@
 %__install -d -m755 $RPM_BUILD_ROOT/etc
 %__make %makeflags DESTDIR=$RPM_BUILD_ROOT install
 
+
 %if !%do_crossbuild
   ln -s lib-%_arch ${RPM_BUILD_ROOT}%_libdir/dietlibc/lib-%_arch-%_vendor
 %endif
 
 %if %do_crossbuild
   rm -rf ${RPM_BUILD_ROOT}%_libdir/dietlibc/include	\
-  	 ${RPM_BUILD_ROOT}%_mandir
+	 ${RPM_BUILD_ROOT}%_mandir
 %endif
 
 
@@ -96,7 +115,7 @@
 
 %files
 %defattr(-,root,root,-)
-%exclude %_libdir/dietlibc/*/*.so
+%{?with_dyn:%exclude %_libdir/dietlibc/*/*.so}
 
 %if %do_crossbuild
 %_libdir/dietlibc/lib-*
@@ -108,14 +127,14 @@
 %_libdir/dietlibc
 %endif
 
-
+%if %do_dyn
 %files lib
 %defattr(-,root,root,-)
 %config(noreplace) %_sysconfdir/*
 %dir %_libdir/dietlibc
 %dir %_libdir/dietlibc/lib-*
-%_libdir/dietlibc/lib-%_arch/*.so
-
+%_libdir/dietlibc/lib-%target_cpu/*.so
+%endif
 
 %changelog
 * Fri Mar  4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.28-4
@@ -123,6 +142,7 @@
 - fixed compilation with gcc4
 - made nice(2) SUSv3 compliantly on x86_64 and other platforms (patch
   provided by Colin Hill)
+- build the dynamic libs for x86, x86_64 and arm only
 
 * Tue Feb  1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-1
 - updated to 0.28



From fedora-extras-commits at redhat.com  Sun Mar  6 17:56:40 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 6 Mar 2005 12:56:40 -0500
Subject: devel/libsidplay libsidplay.spec,1.7,1.8 sidplay.xpm,1.1,NONE
Message-ID: <200503061756.j26HuecB010426@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/libsidplay
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10419

Modified Files:
	libsidplay.spec 
Removed Files:
	sidplay.xpm 
Log Message:
* Sun Mar  6 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.36.57-7
- Remove "Icon:". This was the only package in Fedora Extras, which
  used such an icon, and it breaks --specfile queries.




Index: libsidplay.spec
===================================================================
RCS file: /cvs/extras/devel/libsidplay/libsidplay.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libsidplay.spec	3 Mar 2005 22:41:32 -0000	1.7
+++ libsidplay.spec	6 Mar 2005 17:56:38 -0000	1.8
@@ -1,10 +1,9 @@
 Name: libsidplay
 Summary: Commodore 64 music player and SID chip emulator library
 Version: 1.36.57
-Release: 6
+Release: 7
 Source: http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/%{name}-%{version}.tgz
 Patch: libsidplay-post57fixes.patch
-Icon: sidplay.xpm
 Group: System Environment/Libraries
 URL: http://www.geocities.com/SiliconValley/Lakes/5147/
 License: GPL
@@ -63,6 +62,10 @@
 %{_includedir}/sidplay
 
 %changelog
+* Sun Mar  6 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.36.57-7
+- Remove "Icon:". This was the only package in Fedora Extras, which
+  used such an icon, and it breaks --specfile queries.
+
 * Thu Dec 16 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.36.57-6
 - Use %%configure macro, so %%_libdir and friends get set for x86_64.
 


--- sidplay.xpm DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar  6 18:46:39 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 6 Mar 2005 13:46:39 -0500
Subject: devel/gtkmm24 gtkmm.spec,1.4,1.5
Message-ID: <200503061846.j26IkduR011415@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gtkmm24
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11409

Modified Files:
	gtkmm.spec 
Log Message:
Restore package name, which was deleted during the recent mass-cleanup attempts.


Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/devel/gtkmm24/gtkmm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtkmm.spec	3 Mar 2005 21:26:03 -0000	1.4
+++ gtkmm.spec	6 Mar 2005 18:46:37 -0000	1.5
@@ -1,4 +1,4 @@
-Name:
+Name:           gtkmm24
 Version:        2.4.8
 Release:        1
 Summary:        C++ interface for GTK2 (a GUI library for X)



From fedora-extras-commits at redhat.com  Sun Mar  6 18:48:58 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 6 Mar 2005 13:48:58 -0500
Subject: devel/tetex-unicode tetex-unicode.spec,1.4,1.5
Message-ID: <200503061848.j26ImwtY011444@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/tetex-unicode
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11438

Modified Files:
	tetex-unicode.spec 
Log Message:
Restore package name, which was deleted during the recent mass-cleanup attempts.


Index: tetex-unicode.spec
===================================================================
RCS file: /cvs/extras/devel/tetex-unicode/tetex-unicode.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tetex-unicode.spec	5 Mar 2005 19:43:17 -0000	1.4
+++ tetex-unicode.spec	6 Mar 2005 18:48:56 -0000	1.5
@@ -1,4 +1,4 @@
-Name:
+Name:           tetex-unicode
 Version:        0
 Release:        2.20040307
 Summary:        Unicode support for LaTeX



From jpo at di.uminho.pt  Sun Mar  6 01:07:35 2005
From: jpo at di.uminho.pt (Jose Pedro Oliveira)
Date: Sun, 06 Mar 2005 01:07:35 +0000
Subject: Request: Pre-devel branches creation for pdfjam, perl-Sub-Uplevel, 
 and perl-Test-Exception
Message-ID: <422A57D7.2080804@di.uminho.pt>


I would like to have the following pre-devel branches:

Component             Branches needed
-------------------------------------------------
pdfjam              : FC-3
perl-Sub-Uplevel    : RHL-9, FC-1, FC-2, and FC-3
perl-Test-Exception : RHL-9, FC-1, FC-2, and FC-3
-------------------------------------------------

Thanks,
jpo
-- 
Jos? Pedro Oliveira
* mailto: jpo at di.uminho.pt * http://gsd.di.uminho.pt/~jpo *
* gpg fingerprint = F9B6 8D87 859D 1C94 48F0 84C0 9749 9EB5 91BD 851B *



From fedora-extras-commits at redhat.com  Sun Mar  6 21:39:20 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 6 Mar 2005 16:39:20 -0500
Subject: rpms/dietlibc/devel dietlibc-0.28-ppc.patch, NONE, 1.1 dietlibc.spec,
	1.5, 1.6
Message-ID: <200503062139.j26LdKna014333@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14327

Modified Files:
	dietlibc.spec 
Added Files:
	dietlibc-0.28-ppc.patch 
Log Message:
fixed PPC issues in ISO mode (do not use the 'powerpc' macro but the '__powerpc__' one)


dietlibc-0.28-ppc.patch:

--- NEW FILE dietlibc-0.28-ppc.patch ---
diff -rup dietlibc-0.28.ppc/include/asm/sigcontext.h dietlibc-0.28/include/asm/sigcontext.h
--- dietlibc-0.28.ppc/include/asm/sigcontext.h	2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/asm/sigcontext.h	2005-03-06 22:21:43.000000000 +0100
@@ -21,7 +21,7 @@ __BEGIN_DECLS
 #include <asm/mips-sigcontext.h>
 #endif
 
-#if defined(powerpc) || defined(__powerpc64__)
+#if defined(__powerpc__) || defined(__powerpc64__)
 #include <asm/ppc-sigcontext.h>
 #endif
 
diff -rup dietlibc-0.28.ppc/include/fcntl.h dietlibc-0.28/include/fcntl.h
--- dietlibc-0.28.ppc/include/fcntl.h	2004-01-03 03:10:02.000000000 +0100
+++ dietlibc-0.28/include/fcntl.h	2005-03-06 22:21:43.000000000 +0100
@@ -322,7 +322,7 @@ struct flock64 {
 };
 #endif
 
-#elif defined(powerpc) || defined(__powerpc64__)
+#elif defined(__powerpc__) || defined(__powerpc64__)
 
 /* open/fcntl - O_SYNC is only implemented on blocks devices and on files
    located on an ext2 file system */
diff -rup dietlibc-0.28.ppc/include/setjmp.h dietlibc-0.28/include/setjmp.h
--- dietlibc-0.28.ppc/include/setjmp.h	2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/setjmp.h	2005-03-06 22:21:43.000000000 +0100
@@ -170,7 +170,7 @@ typedef int __jmp_buf[24];
 #endif
 #endif
 
-#if defined(powerpc) || defined(__powerpc64__)
+#if defined(__powerpc__) || defined(__powerpc64__)
 # define JB_GPR1   0  /* Also known as the stack pointer */
 # define JB_GPR2   1
 # define JB_LR     2  /* The address we will return to */
diff -rup dietlibc-0.28.ppc/include/signal.h dietlibc-0.28/include/signal.h
--- dietlibc-0.28.ppc/include/signal.h	2004-12-17 20:14:49.000000000 +0100
+++ dietlibc-0.28/include/signal.h	2005-03-06 22:21:43.000000000 +0100
@@ -31,7 +31,7 @@ __BEGIN_DECLS
 #define SIGALRM		14
 #define SIGTERM		15
 #define SIGUNUSED	31
-#if defined(__i386__) || defined(__x86_64__) || defined(powerpc) || defined(__arm__) \
+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__arm__) \
 	|| defined(__s390__) || defined(__ia64__) || defined(__powerpc64__)
 #define SIGBUS		 7
 #define SIGUSR1		10
diff -rup dietlibc-0.28.ppc/include/stdarg-cruft.h dietlibc-0.28/include/stdarg-cruft.h
--- dietlibc-0.28.ppc/include/stdarg-cruft.h	2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/stdarg-cruft.h	2005-03-06 22:21:43.000000000 +0100
@@ -109,7 +109,7 @@ typedef char * va_list;
 #endif
 #endif
 
-#elif defined(powerpc)
+#elif defined(__powerpc__)
 
 typedef struct __va_list_tag {
   unsigned char gpr;		/* index into the array of 8 GPRs stored in the
diff -rup dietlibc-0.28.ppc/include/sys/ioctl.h dietlibc-0.28/include/sys/ioctl.h
--- dietlibc-0.28.ppc/include/sys/ioctl.h	2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/sys/ioctl.h	2005-03-06 22:21:43.000000000 +0100
@@ -15,7 +15,7 @@ __BEGIN_DECLS
 #include <sys/sparc-ioctl.h>
 #elif defined(__mips__)
 #include <sys/mips-ioctl.h>
-#elif defined(powerpc) || defined(__powerpc64__)
+#elif defined(__powerpc__) || defined(__powerpc64__)
 #include <sys/ppc-ioctl.h>
 #elif defined(__s390__)
 #include <sys/s390-ioctl.h>
diff -rup dietlibc-0.28.ppc/include/sys/mman.h dietlibc-0.28/include/sys/mman.h
--- dietlibc-0.28.ppc/include/sys/mman.h	2004-11-30 16:37:29.000000000 +0100
+++ dietlibc-0.28/include/sys/mman.h	2005-03-06 22:21:43.000000000 +0100
@@ -73,7 +73,7 @@ __BEGIN_DECLS
 #define MADV_SEQUENTIAL	0x2		/* read-ahead aggressively */
 #define MADV_WILLNEED	0x3		/* pre-fault pages */
 #define MADV_DONTNEED	0x4		/* discard these pages */
-#elif defined(__sparc__) || defined (powerpc) || defined (__powerpc64__)
+#elif defined(__sparc__) || defined (__powerpc__) || defined (__powerpc64__)
 #define MAP_FIXED	0x10		/* Interpret addr exactly */
 #define MAP_ANONYMOUS	0x20		/* don't use a file */
 #define MAP_RENAME	MAP_ANONYMOUS	/* In SunOS terminology */
diff -rup dietlibc-0.28.ppc/include/sys/ptrace.h dietlibc-0.28/include/sys/ptrace.h
--- dietlibc-0.28.ppc/include/sys/ptrace.h	2004-11-18 17:44:39.000000000 +0100
+++ dietlibc-0.28/include/sys/ptrace.h	2005-03-06 22:21:43.000000000 +0100
@@ -637,7 +637,7 @@ struct sparc_stackf {
 
 #define PTRACE_GETUCODE           29  /* stupid bsd-ism */
 
-#elif defined(powerpc) || defined (__powerpc64__)
+#elif defined(__powerpc__) || defined (__powerpc64__)
 
 #include <asm/sigcontext.h>
 
diff -rup dietlibc-0.28.ppc/include/sys/shm.h dietlibc-0.28/include/sys/shm.h
--- dietlibc-0.28.ppc/include/sys/shm.h	2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/sys/shm.h	2005-03-06 22:21:43.000000000 +0100
@@ -60,7 +60,7 @@ struct shm_info {
   unsigned long swap_successes;
 };
 
-#if defined(__i386__) || defined(__mips__) || defined(__arm__) || defined(powerpc) || defined (__powerpc64__) || defined(__s390__) || defined(__hppa__) || defined(__x86_64__) || defined(__ia64__)
+#if defined(__i386__) || defined(__mips__) || defined(__arm__) || defined(__powerpc__) || defined (__powerpc64__) || defined(__s390__) || defined(__hppa__) || defined(__x86_64__) || defined(__ia64__)
 #define PAGE_SIZE 4096UL
 #define PAGE_SHIFT 12
 #elif defined(__alpha__) || defined(__sparc__)
diff -rup dietlibc-0.28.ppc/include/sys/stat.h dietlibc-0.28/include/sys/stat.h
--- dietlibc-0.28.ppc/include/sys/stat.h	2004-03-26 16:25:15.000000000 +0100
+++ dietlibc-0.28/include/sys/stat.h	2005-03-06 22:21:43.000000000 +0100
@@ -248,8 +248,8 @@ __extension__ long long	st_size;
 	unsigned long	st_pad2;
 __extension__ long long	st_blocks;
 };
-#elif defined(powerpc) || defined(__powerpc64__)
-#if defined(powerpc)
+#elif defined(__powerpc__) || defined(__powerpc64__)
+#if defined(__powerpc__)
 struct stat {
 	dev_t		st_dev;
 	ino_t		st_ino;
diff -rup dietlibc-0.28.ppc/include/sys/types.h dietlibc-0.28/include/sys/types.h
--- dietlibc-0.28.ppc/include/sys/types.h	2004-04-14 15:33:41.000000000 +0200
+++ dietlibc-0.28/include/sys/types.h	2005-03-06 22:21:43.000000000 +0100
@@ -67,7 +67,7 @@ typedef unsigned long int clock_t;	/* Us
     typedef unsigned int mode_t;
     typedef int nlink_t;
     typedef int uid_t;
-#elif defined(powerpc)
+#elif defined(__powerpc__)
     typedef unsigned int dev_t;
     typedef unsigned int gid_t;
     typedef unsigned int mode_t;
diff -rup dietlibc-0.28.ppc/include/sys/ucontext.h dietlibc-0.28/include/sys/ucontext.h
--- dietlibc-0.28.ppc/include/sys/ucontext.h	2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/sys/ucontext.h	2005-03-06 22:21:43.000000000 +0100
@@ -10,7 +10,7 @@ __BEGIN_DECLS
 typedef struct sigcontext mcontext_t;
 #endif
 
-#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__mips64__) || defined(powerpc) || defined(__powerpc64__) || defined(__hppa__)
+#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__mips64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(__hppa__)
 struct ucontext {
   unsigned long		uc_flags;
   struct ucontext	*uc_link;
diff -rup dietlibc-0.28.ppc/include/termios.h dietlibc-0.28/include/termios.h
--- dietlibc-0.28.ppc/include/termios.h	2004-08-04 00:28:46.000000000 +0200
+++ dietlibc-0.28/include/termios.h	2005-03-06 22:21:43.000000000 +0100
@@ -103,7 +103,7 @@ struct termios {
 	cc_t c_line;			/* line discipline */
 	cc_t c_cc[NCCS];		/* control characters */
 };
-#elif defined(powerpc) || defined(__powerpc64__) || defined(__alpha__)
+#elif defined(__powerpc__) || defined(__powerpc64__) || defined(__alpha__)
 #define NCCS	19
 struct termios {
 	tcflag_t c_iflag;		/* input mode flags */
@@ -167,7 +167,7 @@ struct termios {
 #define VLNEXT	15
 #define VEOF	16
 #define VEOL	17
-#elif defined(powerpc) || defined(__powerpc64__)
+#elif defined(__powerpc__) || defined(__powerpc64__)
 #define VINTR	0
 #define VQUIT	1
 #define VERASE	2
diff -rup dietlibc-0.28.ppc/syscalls.h dietlibc-0.28/syscalls.h
--- dietlibc-0.28.ppc/syscalls.h	2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/syscalls.h	2005-03-06 22:21:43.000000000 +0100
@@ -11,7 +11,7 @@
 #include "sparc/syscalls.h"
 #endif
 
-#elif defined(powerpc)
+#elif defined(__powerpc__)
 #include "ppc/syscalls.h"
 
 #elif defined(__powerpc64__)


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dietlibc.spec	6 Mar 2005 16:57:55 -0000	1.5
+++ dietlibc.spec	6 Mar 2005 21:39:18 -0000	1.6
@@ -2,7 +2,7 @@
 
 ## This package understands the following switches:
 ## --with cross			...  enable crossbuild
-## --define crossarch <arch>	...  set cross-architecture (only valid with
+## --define 'crossarch <arch>'	...  set cross-architecture (only valid with
 ##				     '--with cross'; defaults to 'arm-linux')
 
 ## Fedora Extras specific customization below...
@@ -44,6 +44,7 @@
 Source1:	http://www.fefe.de/dietlibc/%NAME-%version.tar.bz2.sig
 Patch0:		dietlibc-0.28-gcc4.patch
 Patch1:		dietlibc-0.28-setpriority.patch
+Patch2:		dietlibc-0.28-ppc.patch
 BuildRoot:	%_tmppath/%name-%version-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
 
@@ -75,6 +76,7 @@
 %setup -q -n %NAME-%version
 %patch0 -p1 -b .gcc4
 %patch1 -p1 -b .nice
+%patch2 -p1 -b .ppc
 
 ## only for 0.28; remove it in 0.29
 sed -i -e 's!LD_RUN_PATH= !env -u LD_RUN_PATH !' Makefile
@@ -143,6 +145,8 @@
 - made nice(2) SUSv3 compliantly on x86_64 and other platforms (patch
   provided by Colin Hill)
 - build the dynamic libs for x86, x86_64 and arm only
+- fixed PPC issues in ISO mode (do not use the 'powerpc' macro but the
+  '__powerpc__' one)
 
 * Tue Feb  1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-1
 - updated to 0.28



From fedora-extras-commits at redhat.com  Sun Mar  6 21:55:25 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 6 Mar 2005 16:55:25 -0500
Subject: rpms/dhcp-forwarder/devel dhcp-forwarder-0.7-bigend.patch, NONE,
	1.1 dhcp-forwarder.spec, 1.7, 1.8
Message-ID: <200503062155.j26LtP0d014469@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14461

Modified Files:
	dhcp-forwarder.spec 
Added Files:
	dhcp-forwarder-0.7-bigend.patch 
Log Message:
fixed bigendian builds (backported from 0.8)
s!%%define!%%global! to workaround bugs in rpm's macro-engine


dhcp-forwarder-0.7-bigend.patch:

--- NEW FILE dhcp-forwarder-0.7-bigend.patch ---
Index: dhcp.h
===================================================================
RCS file: /home/cvs/dhcpfwd/src/dhcp.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- src/dhcp.h	22 Jun 2004 10:46:56 -0000	1.14
+++ src/dhcp.h	23 Dec 2004 00:49:01 -0000	1.15
@@ -1,4 +1,4 @@
-// $Id: dhcp.h,v 1.14 2004/06/22 10:46:56 ensc Exp $    --*- c++ -*--
+// $Id: dhcp.h,v 1.15 2004/12/23 00:49:01 ensc Exp $    --*- c++ -*--
 
 // Copyright (C) 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 //  
@@ -89,7 +89,7 @@ enum {
   optDHCP_COOKIE = 0x63538263u,
   flgDHCP_BCAST	 = 0x0080u
 #else
-  DHCP_COOKIE  	 = 0x63825363u,
+  optDHCP_COOKIE = 0x63825363u,
   flgDHCP_BCAST	 = 0x8000u
 #endif
 };


Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dhcp-forwarder.spec	5 Mar 2005 21:10:21 -0000	1.7
+++ dhcp-forwarder.spec	6 Mar 2005 21:55:23 -0000	1.8
@@ -5,34 +5,38 @@
 ## --without minit      ...   disable creation of 'minit' subpackage
 ## --with    fedora     ...   enable fedora.us specific parts
 
-%define _with_fedora	1
-%define _without_minit	1
+## Fedora Extras specific customization below...
+%{!?_without_fedora:%global	_with_fedora	--with fedora}
+%{!?_with_minit:%global		_without_minit	--without minit}
+##
 
 
-%define uid		11
-%define useradd		/usr/sbin/%{?_with_fedora:fedora-}useradd  %{?_with_fedora:%uid}
-%define groupadd	/usr/sbin/%{?_with_fedora:fedora-}groupadd %{?_with_fedora:%uid}
-%define userdel		/usr/sbin/%{?_with_fedora:fedora-}userdel
-%define groupdel	/usr/sbin/%{?_with_fedora:fedora-}groupdel
+%global uid		11
+%global useradd		/usr/sbin/%{?_with_fedora:fedora-}useradd  %{?_with_fedora:%uid}
+%global groupadd	/usr/sbin/%{?_with_fedora:fedora-}groupadd %{?_with_fedora:%uid}
+%global userdel		/usr/sbin/%{?_with_fedora:fedora-}userdel
+%global groupdel	/usr/sbin/%{?_with_fedora:fedora-}groupdel
 
 
-%define	username	dhcp-fwd
-%define homedir		%_var/lib/%username
-%define minitdir	%_sysconfdir/minit
-%define minitsvcdir	%minitdir/services/dhcp-fwd
-%define service		dhcp-fwd
+%global	username	dhcp-fwd
+%global homedir		%_var/lib/%username
+%global minitdir	%_sysconfdir/minit
+%global minitsvcdir	%minitdir/services/dhcp-fwd
+%global service		dhcp-fwd
 
-%{!?release_func:%define release_func() %1}
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.7
-Release:	%release_func 1
+Release:	%release_func 2
 License:	GPL
 Group:		System Environment/Daemons
 URL:		http://www.tu-chemnitz.de/~ensc/dhcp-fwd
 Source0:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2
 Source1:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2.asc
+Patch0:		dhcp-forwarder-0.7-bigend.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(dhcp-forwarder)
 
@@ -97,7 +101,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p0
 
 
 %build
@@ -186,6 +190,10 @@
 
 
 %changelog
+* Sun Mar  6 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.7-2
+- fixed bigendian builds (backported from 0.8)
+- s!%%define!%%global! to workaround bugs in rpm's macro-engine
+
 * Thu Nov 11 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.7-0.fdr.1
 - fedora'ized it
 



From fedora-extras-commits at redhat.com  Sun Mar  6 23:28:34 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 6 Mar 2005 18:28:34 -0500
Subject: rpms/dietlibc/devel dietlibc-0.28-ppc.patch,1.1,1.2
Message-ID: <200503062328.j26NSYWj016069@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16063

Modified Files:
	dietlibc-0.28-ppc.patch 
Log Message:
added a 'defined(__powerpc__)' in libdl/_dl_rel.h


dietlibc-0.28-ppc.patch:

Index: dietlibc-0.28-ppc.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.28-ppc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dietlibc-0.28-ppc.patch	6 Mar 2005 21:39:18 -0000	1.1
+++ dietlibc-0.28-ppc.patch	6 Mar 2005 23:28:32 -0000	1.2
@@ -1,6 +1,6 @@
 diff -rup dietlibc-0.28.ppc/include/asm/sigcontext.h dietlibc-0.28/include/asm/sigcontext.h
 --- dietlibc-0.28.ppc/include/asm/sigcontext.h	2003-10-10 15:37:34.000000000 +0200
-+++ dietlibc-0.28/include/asm/sigcontext.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/asm/sigcontext.h	2005-03-06 22:46:45.000000000 +0100
 @@ -21,7 +21,7 @@ __BEGIN_DECLS
  #include <asm/mips-sigcontext.h>
  #endif
@@ -12,7 +12,7 @@
  
 diff -rup dietlibc-0.28.ppc/include/fcntl.h dietlibc-0.28/include/fcntl.h
 --- dietlibc-0.28.ppc/include/fcntl.h	2004-01-03 03:10:02.000000000 +0100
-+++ dietlibc-0.28/include/fcntl.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/fcntl.h	2005-03-06 22:46:45.000000000 +0100
 @@ -322,7 +322,7 @@ struct flock64 {
  };
  #endif
@@ -24,7 +24,7 @@
     located on an ext2 file system */
 diff -rup dietlibc-0.28.ppc/include/setjmp.h dietlibc-0.28/include/setjmp.h
 --- dietlibc-0.28.ppc/include/setjmp.h	2003-10-10 15:37:34.000000000 +0200
-+++ dietlibc-0.28/include/setjmp.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/setjmp.h	2005-03-06 22:46:45.000000000 +0100
 @@ -170,7 +170,7 @@ typedef int __jmp_buf[24];
  #endif
  #endif
@@ -36,7 +36,7 @@
  # define JB_LR     2  /* The address we will return to */
 diff -rup dietlibc-0.28.ppc/include/signal.h dietlibc-0.28/include/signal.h
 --- dietlibc-0.28.ppc/include/signal.h	2004-12-17 20:14:49.000000000 +0100
-+++ dietlibc-0.28/include/signal.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/signal.h	2005-03-06 22:46:45.000000000 +0100
 @@ -31,7 +31,7 @@ __BEGIN_DECLS
  #define SIGALRM		14
  #define SIGTERM		15
@@ -48,7 +48,7 @@
  #define SIGUSR1		10
 diff -rup dietlibc-0.28.ppc/include/stdarg-cruft.h dietlibc-0.28/include/stdarg-cruft.h
 --- dietlibc-0.28.ppc/include/stdarg-cruft.h	2003-10-10 15:37:34.000000000 +0200
-+++ dietlibc-0.28/include/stdarg-cruft.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/stdarg-cruft.h	2005-03-06 22:46:45.000000000 +0100
 @@ -109,7 +109,7 @@ typedef char * va_list;
  #endif
  #endif
@@ -60,7 +60,7 @@
    unsigned char gpr;		/* index into the array of 8 GPRs stored in the
 diff -rup dietlibc-0.28.ppc/include/sys/ioctl.h dietlibc-0.28/include/sys/ioctl.h
 --- dietlibc-0.28.ppc/include/sys/ioctl.h	2003-10-10 15:37:34.000000000 +0200
-+++ dietlibc-0.28/include/sys/ioctl.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/sys/ioctl.h	2005-03-06 22:46:45.000000000 +0100
 @@ -15,7 +15,7 @@ __BEGIN_DECLS
  #include <sys/sparc-ioctl.h>
  #elif defined(__mips__)
@@ -72,7 +72,7 @@
  #include <sys/s390-ioctl.h>
 diff -rup dietlibc-0.28.ppc/include/sys/mman.h dietlibc-0.28/include/sys/mman.h
 --- dietlibc-0.28.ppc/include/sys/mman.h	2004-11-30 16:37:29.000000000 +0100
-+++ dietlibc-0.28/include/sys/mman.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/sys/mman.h	2005-03-06 22:46:45.000000000 +0100
 @@ -73,7 +73,7 @@ __BEGIN_DECLS
  #define MADV_SEQUENTIAL	0x2		/* read-ahead aggressively */
  #define MADV_WILLNEED	0x3		/* pre-fault pages */
@@ -84,7 +84,7 @@
  #define MAP_RENAME	MAP_ANONYMOUS	/* In SunOS terminology */
 diff -rup dietlibc-0.28.ppc/include/sys/ptrace.h dietlibc-0.28/include/sys/ptrace.h
 --- dietlibc-0.28.ppc/include/sys/ptrace.h	2004-11-18 17:44:39.000000000 +0100
-+++ dietlibc-0.28/include/sys/ptrace.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/sys/ptrace.h	2005-03-06 22:46:45.000000000 +0100
 @@ -637,7 +637,7 @@ struct sparc_stackf {
  
  #define PTRACE_GETUCODE           29  /* stupid bsd-ism */
@@ -96,7 +96,7 @@
  
 diff -rup dietlibc-0.28.ppc/include/sys/shm.h dietlibc-0.28/include/sys/shm.h
 --- dietlibc-0.28.ppc/include/sys/shm.h	2003-10-10 15:37:34.000000000 +0200
-+++ dietlibc-0.28/include/sys/shm.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/sys/shm.h	2005-03-06 22:46:45.000000000 +0100
 @@ -60,7 +60,7 @@ struct shm_info {
    unsigned long swap_successes;
  };
@@ -108,7 +108,7 @@
  #elif defined(__alpha__) || defined(__sparc__)
 diff -rup dietlibc-0.28.ppc/include/sys/stat.h dietlibc-0.28/include/sys/stat.h
 --- dietlibc-0.28.ppc/include/sys/stat.h	2004-03-26 16:25:15.000000000 +0100
-+++ dietlibc-0.28/include/sys/stat.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/sys/stat.h	2005-03-06 22:46:45.000000000 +0100
 @@ -248,8 +248,8 @@ __extension__ long long	st_size;
  	unsigned long	st_pad2;
  __extension__ long long	st_blocks;
@@ -122,7 +122,7 @@
  	ino_t		st_ino;
 diff -rup dietlibc-0.28.ppc/include/sys/types.h dietlibc-0.28/include/sys/types.h
 --- dietlibc-0.28.ppc/include/sys/types.h	2004-04-14 15:33:41.000000000 +0200
-+++ dietlibc-0.28/include/sys/types.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/sys/types.h	2005-03-06 22:46:45.000000000 +0100
 @@ -67,7 +67,7 @@ typedef unsigned long int clock_t;	/* Us
      typedef unsigned int mode_t;
      typedef int nlink_t;
@@ -134,7 +134,7 @@
      typedef unsigned int mode_t;
 diff -rup dietlibc-0.28.ppc/include/sys/ucontext.h dietlibc-0.28/include/sys/ucontext.h
 --- dietlibc-0.28.ppc/include/sys/ucontext.h	2003-10-10 15:37:34.000000000 +0200
-+++ dietlibc-0.28/include/sys/ucontext.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/sys/ucontext.h	2005-03-06 22:46:45.000000000 +0100
 @@ -10,7 +10,7 @@ __BEGIN_DECLS
  typedef struct sigcontext mcontext_t;
  #endif
@@ -146,7 +146,7 @@
    struct ucontext	*uc_link;
 diff -rup dietlibc-0.28.ppc/include/termios.h dietlibc-0.28/include/termios.h
 --- dietlibc-0.28.ppc/include/termios.h	2004-08-04 00:28:46.000000000 +0200
-+++ dietlibc-0.28/include/termios.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/include/termios.h	2005-03-06 22:46:45.000000000 +0100
 @@ -103,7 +103,7 @@ struct termios {
  	cc_t c_line;			/* line discipline */
  	cc_t c_cc[NCCS];		/* control characters */
@@ -165,9 +165,21 @@
  #define VINTR	0
  #define VQUIT	1
  #define VERASE	2
+diff -rup dietlibc-0.28.ppc/libdl/_dl_rel.h dietlibc-0.28/libdl/_dl_rel.h
+--- dietlibc-0.28.ppc/libdl/_dl_rel.h	2005-01-29 03:34:22.000000000 +0100
++++ dietlibc-0.28/libdl/_dl_rel.h	2005-03-07 00:25:56.000000000 +0100
+@@ -10,7 +10,7 @@
+ #define _DL_REL_PLT(b,r)	(*(unsigned long*)((b)+(r)->r_offset)+=(unsigned long)(b))
+ 
+ #elif defined(__alpha__) || defined(__hppa__) || defined(__ppc__) || defined(__sparc__) || defined(__s390__) \
+-  || defined(__x86_64__)
++  || defined(__x86_64__) || defined(__powerpc__)
+ /* this are RELA only archs: alpha, chris, hppa, ia64, m68k, ppc, sparc, sparc64, sh, s390, x86_64 */
+ 
+ #define _dl_rel_t	Elf_Rela
 diff -rup dietlibc-0.28.ppc/syscalls.h dietlibc-0.28/syscalls.h
 --- dietlibc-0.28.ppc/syscalls.h	2003-10-10 15:37:34.000000000 +0200
-+++ dietlibc-0.28/syscalls.h	2005-03-06 22:21:43.000000000 +0100
++++ dietlibc-0.28/syscalls.h	2005-03-06 22:46:45.000000000 +0100
 @@ -11,7 +11,7 @@
  #include "sparc/syscalls.h"
  #endif



From fedora-extras-commits at redhat.com  Mon Mar  7 00:26:01 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 6 Mar 2005 19:26:01 -0500
Subject: rpms/dietlibc/devel dietlibc-0.28-hppa.patch, NONE,
	1.1 dietlibc.spec, 1.6, 1.7
Message-ID: <200503070026.j270Q113017008@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17002

Modified Files:
	dietlibc.spec 
Added Files:
	dietlibc-0.28-hppa.patch 
Log Message:
synced hppa's <fcntl.h> with recent kernel


dietlibc-0.28-hppa.patch:

--- NEW FILE dietlibc-0.28-hppa.patch ---
diff -rup dietlibc-0.28.hppa/include/fcntl.h dietlibc-0.28/include/fcntl.h
--- dietlibc-0.28.hppa/include/fcntl.h	2005-03-07 01:11:46.000000000 +0100
+++ dietlibc-0.28/include/fcntl.h	2005-03-07 01:21:07.000000000 +0100
@@ -501,13 +501,21 @@ struct flock64 {
 #define O_CREAT     00000400 /* not fcntl */
 #define O_TRUNC     00001000 /* not fcntl */
 #define O_EXCL      00002000 /* not fcntl */
+#define O_LARGEFILE 00004000
 #define O_ASYNC     00020000
 #define O_SYNC      00100000
 #define O_NONBLOCK  00200004 /* HPUX has separate NDELAY & NONBLOCK */
 #define O_NDELAY    O_NONBLOCK
 #define O_NOCTTY    00400000 /* not fcntl */
+#define O_DSYNC     01000000 /* HPUX only */
+#define O_RSYNC     02000000 /* HPUX only */
+#define O_NOATIME   04000000
 #define O_DIRECTORY  00010000
 
+#define O_DIRECT    00040000 /* direct disk access hint - currently ignored */
+#define O_NOFOLLOW  00000200 /* don't follow links */
+#define O_INVISIBLE 04000000 /* invisible I/O, for DMAPI/XDSM */
+
 #define F_DUPFD     0   /* Duplicate file descriptor.  */
 #define F_GETFD     1   /* Get file descriptor flags.  */
 #define F_SETFD     2   /* Set file descriptor flags.  */
@@ -521,6 +529,11 @@ struct flock64 {
 #define F_SETLK64   9   /* Set record locking info (non-blocking).  */
 #define F_SETLKW64  10  /* Set record locking info (blocking).  */
 
+#define F_GETOWN    11	/*  for sockets. */
+#define F_SETOWN    12	/*  for sockets. */
+#define F_SETSIG    13	/*  for sockets. */
+#define F_GETSIG    14	/*  for sockets. */
+
 #define FD_CLOEXEC  1   /* actually anything with low bit set goes */
 
 #define F_RDLCK     1   /* Read lock.  */
@@ -530,6 +543,21 @@ struct flock64 {
 #define F_EXLCK     4   /* or 3 */
 #define F_SHLCK     8   /* or 4 */
 
+/* for leases */
+#define F_INPROGRESS	16
+
+/* operations for bsd flock(), also used by the kernel implementation */
+#define LOCK_SH		1	/* shared lock */
+#define LOCK_EX		2	/* exclusive lock */
+#define LOCK_NB		4	/* or'd with one of the above to prevent
+				   blocking */
+#define LOCK_UN		8	/* remove lock */
+
+#define LOCK_MAND	32	/* This is a mandatory flock */
+#define LOCK_READ	64	/* ... Which allows concurrent read operations */
+#define LOCK_WRITE	128	/* ... Which allows concurrent write operations */
+#define LOCK_RW		192	/* ... Which allows concurrent read & write ops */
+
 struct flock
 {
     short int l_type;   /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dietlibc.spec	6 Mar 2005 21:39:18 -0000	1.6
+++ dietlibc.spec	7 Mar 2005 00:25:59 -0000	1.7
@@ -45,6 +45,7 @@
 Patch0:		dietlibc-0.28-gcc4.patch
 Patch1:		dietlibc-0.28-setpriority.patch
 Patch2:		dietlibc-0.28-ppc.patch
+Patch3:		dietlibc-0.28-hppa.patch
 BuildRoot:	%_tmppath/%name-%version-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
 
@@ -77,6 +78,7 @@
 %patch0 -p1 -b .gcc4
 %patch1 -p1 -b .nice
 %patch2 -p1 -b .ppc
+%patch3 -p1 -b .hppa
 
 ## only for 0.28; remove it in 0.29
 sed -i -e 's!LD_RUN_PATH= !env -u LD_RUN_PATH !' Makefile



From fedora-extras-commits at redhat.com  Mon Mar  7 07:12:29 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 7 Mar 2005 02:12:29 -0500
Subject: rpms/vnstat import.log,1.2,1.3
Message-ID: <200503070712.j277CTUs023834@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/vnstat
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23828

Modified Files:
	import.log 
Log Message:
auto-import vnstat-1.4-3 on branch FC-3 from vnstat-1.4-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vnstat/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	1 Mar 2005 18:37:42 -0000	1.2
+++ import.log	7 Mar 2005 07:12:27 -0000	1.3
@@ -1 +1,2 @@
 vnstat-1_4-3:HEAD:vnstat-1.4-3.src.rpm:1109702252
+vnstat-1_4-3:FC-3:vnstat-1.4-3.src.rpm:1110179538



From fedora-extras-commits at redhat.com  Mon Mar  7 08:22:33 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 7 Mar 2005 03:22:33 -0500
Subject: rpms/jabberd - New directory
Message-ID: <200503070822.j278MXfk024816@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24809/jabberd

Log Message:
Directory /cvs/extras/rpms/jabberd added to the repository




From fedora-extras-commits at redhat.com  Mon Mar  7 08:22:33 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 7 Mar 2005 03:22:33 -0500
Subject: rpms/jabberd/devel - New directory
Message-ID: <200503070822.j278MXhP024819@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/jabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24809/jabberd/devel

Log Message:
Directory /cvs/extras/rpms/jabberd/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar  7 08:22:54 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 7 Mar 2005 03:22:54 -0500
Subject: rpms/jabberd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503070822.j278MsHw024884@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24875

Added Files:
	Makefile import.log 
Log Message:
Setup of module jabberd


--- NEW FILE Makefile ---
# Top level Makefile for module jabberd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  7 08:22:54 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 7 Mar 2005 03:22:54 -0500
Subject: rpms/jabberd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503070822.j278Msmi024887@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/jabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24875/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jabberd


--- 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 Mar  7 08:23:37 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 7 Mar 2005 03:23:37 -0500
Subject: rpms/jabberd/devel jabberd, NONE, 1.1 jabberd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503070823.j278Nbmn024994@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/jabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24980/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jabberd jabberd.spec 
Log Message:
auto-import jabberd-2.0-0.s6.3 on branch devel from jabberd-2.0-0.s6.3.src.rpm


--- NEW FILE jabberd ---
#!/bin/bash
#
# Based on script from Raymond 25DEC2003 support at bigriverinfotech.com
# Changed by Adrian Reber <adrian at lisas.de>
#
# processname: jabberd2
# description: jabberd2 is the next generation of the jabberd server
# chkconfig: 2345 85 15
#

if [ -f /etc/init.d/functions ]; then
	. /etc/init.d/functions
elif [ -f /etc/rc.d/init.d/functions ]; then
	. /etc/rc.d/init.d/functions
else
	echo "jabberd2: unable to locate functions lib. Cannot continue."
	exit -1
fi
#
progs="router resolver sm c2s s2s"
progsPath="__BINDIR__"
confPath="__ETCDIR__"
pidPath="__PIDDIR__"
retval=0
#
ReqBins ( ) {
	for prog in ${progs}; do
		if [ ! -x ${progsPath}/${prog} ]; then
			echo "jabberd2 binary [${prog}] not found."
			echo "Cannot continue."
			return -1
		fi
	done
	return 0
}
#
ReqConfs ( ) {
	for prog in ${progs}; do
		if [ ! -f ${confPath}/${prog}.xml ]; then
			echo "jabberd2 configuration [${prog}.xml] not found."
			echo "Cannot continue."
			return -1
		fi
	done
	return 0
}
#
ReqDirs ( ) {
	if [ ! -d ${pidPath} ]; then
		echo "jabberd2 PID directory not found. Cannot continue."
		return -1
	fi
	return 0
}
#
Start ( ) {
	for req in ReqBins ReqConfs ReqDirs; do
		${req}
		retval=$?
		[ ${retval} == 0 ] || return ${retval}
	done
	echo "Initializing jabberd2 processes ..."
	for prog in ${progs}; do
		if [ $( pidof -s ${prog} ) ]; then
			echo "process [${prog}] already running"
			continue
		fi
		echo -n "Starting ${prog}: "
		rm -f /var/lock/subsys/${prog}
		rm -f ${pidPath}/${prog}.pid
		args="-c ${confPath}/${prog}.xml"
		daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
		retval=$?
		echo
		if [ ${retval} == 0 ]; then
			touch /var/lock/subsys/${prog}
		else
			let retval=-1
			break
		fi
	done
	return ${retval}
}
#
Stop ( ) {
	echo "Terminating jabberd2 processes ..."
	for prog in ${progs}; do
		echo -n "Stopping ${prog}: "
		killproc ${prog}
		retval=$?
		if [ ${retval} == 0 ]; then
			rm -f /var/lock/subsys/${prog}
			rm -f ${pidPath}/${prog}.pid
		fi
		echo
		sleep 1
	done
	return ${retval}
}
#
reload()
{
	echo "Reloading jabberd2 processes ..."
	for prog in ${progs}; do
		killproc ${prog} -HUP
		retval=$?
	done
	return ${retval}
}

rhstatus()
{
        for prog in ${progs}; do
                status ${prog}
        done
}

case "$1" in
	start)
		Start
		;;
	stop)
		Stop
		;;
	reload)
		reload
		;;
	status)
		rhstatus
		;;
	restart)
		Stop
		Start
		;;
	condrestart)
        	for prog in ${progs}; do
			if [ ! -f /var/lock/subsys/${prog} ]; then
				exit -1
			fi
		done
		Stop
		sleep 3
		Start
		;;
	*)
		echo "Usage: $0 {start|stop|restart|condrestart|reload|status}"
		let retval=-1
esac
exit ${retval}


--- NEW FILE jabberd.spec ---
Summary:        OpenSource server implementation of the Jabber protocols
Name:           jabberd
Version:        2.0
Release:        0.s6.3
Epoch:          0
License:        GPL
Group:          System Environment/Daemons
Source0:        http://files.jabberstudio.org/jabberd2/jabberd-2.0s6.tar.gz
Source1:        jabberd
URL:            http://jabberd.jabberstudio.org/2/
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  openssl-devel, db4-devel, libidn-devel, pam-devel
Requires(post): openssl

%description
The jabberd project aims to provide an open-source server implementation of the
Jabber protocols for instant messaging and XML routing. The goal of this
project is to provide a scalable, reliable, efficient and extensible server
that provides a complete set of features and is up to date with the latest
protocol revisions.
jabberd 2 is the next generation of the jabberd server. It has been rewritten
from the ground up to be scalable, architecturally sound, and to support the
latest protocol extensions coming out of the JSF.

%prep
%setup -q -n %{name}-%{version}s6

%build
%define _sysconfdir /etc/jabberd
%define sysconfdir /etc/jabberd
%{__perl} -pi -e 's,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g' configure
%configure --enable-db --disable-mysql --enable-pam
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
%makeinstall
%define _sysconfdir /etc
%{__mkdir_p} $RPM_BUILD_ROOT/%{_var}/jabberd/{log,pid,db}
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__install} -m 644 tools/db-setup.mysql $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__install} -m 644 tools/db-setup.pgsql $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__install} -m 644 tools/migrate.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__install} -m 644 tools/pipe-auth.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
%{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}

%{__perl} -pi -e 's,__BINDIR__,%{_bindir},g; \
                  s,__ETCDIR__,%{sysconfdir},g; \
                  s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g;' \
          $RPM_BUILD_ROOT%{_initrddir}/%{name}

%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
%{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/jabberd << END
#%PAM-1.0
auth       required     pam_nologin.so
auth       required     pam_stack.so service=system-auth
account    required     pam_stack.so service=system-auth
session    required     pam_stack.so service=system-auth
END

%{__sed} -i -e "s,<driver>mysql</driver>,<driver>db</driver>,g" \
	$RPM_BUILD_ROOT%{sysconfdir}/sm.xml

#ghost file
touch $RPM_BUILD_ROOT%{sysconfdir}/server.pem

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%pre
#creating jabber user
useradd -r -d %{_localstatedir}/%{name} -m -c "Jabber Server" -s /bin/bash jabber >/dev/null 2>&1 ||:


%post
if [ "$1" -eq "1" ]; then
	#register %{name} service
	/sbin/chkconfig --add %{name}
	#replace default passwords, yet another hack 
	export NEWPASS="$RANDOM-newpass-$RANDOM"
	cd %{sysconfdir}
	%{__perl} -pi -e "s,<secret>secret</secret>,<secret>$NEWPASS</secret>,g" router-users.xml
	%{__perl} -pi -e "s,<secret>secret</secret>,<secret>$NEWPASS</secret>,g" router.xml
	%{__perl} -pi -e "s,<pass>secret</pass>,<pass>$NEWPASS</pass>,g" *.xml
fi

#create ssl certificate
cd %{sysconfdir}
if [ ! -e server.pem ]; then
 %{___build_shell} %{_datadir}/ssl/certs/make-dummy-cert server.pem
 %{__chown} root.jabber server.pem
 %{__chmod} 640 server.pem
fi

%preun
if [ "$1" -eq "0" ]; then
	/sbin/service %{name} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{name}
	userdel jabber
	#should %{_localstatedir}/jabberd be deleted???
	#%{__rm} -rf %{_localstatedir}/jabberd
fi

%postun
if [ "$1" -eq "1" ]; then
	/sbin/service %{name} condrestart > /dev/null 2>&1
fi

%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README PROTOCOL TODO
%{_bindir}/*
%config(noreplace) %{sysconfdir}/
%{_datadir}/man/man8/*
%{_datadir}/%{name}/
%config(noreplace) %{_initrddir}/%{name}
%config(noreplace) %{_sysconfdir}/pam.d/jabberd
%attr(-,jabber,jabber) %{_var}/jabberd
%ghost %{_sysconfdir}/jabberd/server.pem

%changelog
* Mon Mar 07 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.3
- changed startscript again

* Mon Mar 07 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.2
- changed startscript to support condrestart

* Mon Mar 07 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.1
- updated to 2.0s6

* Wed Nov 24 2004 Adrian Reber <adrian at lisas.de> - 0:2.0-0.fdr.16.s4
- updated to 2.0s4
- added jabberd-c2s-buffers.patch 
  (http://jabberstudio.org/projects/jabberd2/bugs/view.php?id=4528)
- replace <driver>mysql</driver> with <driver>db</driver> in sm.xml

* Mon Jul 19 2004 Adrian Reber <adrian at lisas.de> - 0:2.0-0.fdr.15.s3
- add ||: at the end of the useradd line

* Mon Jul 19 2004 Adrian Reber <adrian at lisas.de> - 0:2.0-0.fdr.14.s3
- create jabber user in %%pre instead of in %%post
- remove -r from userdel

* Mon Jul 19 2004 Adrian Reber <adrian at lisas.de> - 0:2.0-0.fdr.13.s3
- s/jabberd2/%%{name}/
- replace another default password

* Fri Jul 16 2004 Adrian Reber <adrian at lisas.de> - 0:2.0-0.fdr.12.s3
- %%{_var}/jabberd is now owned be the package
- %%ghost-ing server.pem
- disable rm-ing %%{_var}/jabberd on uninstall

* Fri Jul 16 2004 Adrian Reber <adrian at lisas.de> - 0:2.0-0.fdr.11.s3
- using %%{_datadir}/ssl/certs/make-dummy-cert to
  create the certificate
- added -r to useradd
- added openssl to post-requires
- added libidn-devel and pam-devel as BuildRequires

* Mon Jul 12 2004 Adrian Reber <adrian at lisas.de> - 0:2.0-0.fdr.10.s3
- complete rewrite for fedora (I mean it)

* Tue May 18 2004 Tim Niemueller <tim at niemueller.de>
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Mar 2005 08:22:52 -0000	1.1
+++ .cvsignore	7 Mar 2005 08:23:35 -0000	1.2
@@ -0,0 +1 @@
+jabberd-2.0s6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Mar 2005 08:22:52 -0000	1.1
+++ sources	7 Mar 2005 08:23:35 -0000	1.2
@@ -0,0 +1 @@
+ca2818885e126181e002949c71603df3  jabberd-2.0s6.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar  7 08:23:37 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 7 Mar 2005 03:23:37 -0500
Subject: rpms/jabberd import.log,1.1,1.2
Message-ID: <200503070823.j278Nbeq024990@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24980

Modified Files:
	import.log 
Log Message:
auto-import jabberd-2.0-0.s6.3 on branch devel from jabberd-2.0-0.s6.3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/jabberd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Mar 2005 08:22:52 -0000	1.1
+++ import.log	7 Mar 2005 08:23:35 -0000	1.2
@@ -0,0 +1 @@
+jabberd-2_0-0_s6_3:HEAD:jabberd-2.0-0.s6.3.src.rpm:1110183806



From fedora-extras-commits at redhat.com  Mon Mar  7 09:15:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 7 Mar 2005 04:15:25 -0500
Subject: rpms/lighttpd/FC-3 .cvsignore, 1.2, 1.3 lighttpd.spec, 1.2,
	1.3 sources, 1.2, 1.3 lighttpd-1.3.11-empty_cgi_handler.patch,
	1.1, NONE
Message-ID: <200503070915.j279FPJr026553@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26543/FC-3

Modified Files:
	.cvsignore lighttpd.spec sources 
Removed Files:
	lighttpd-1.3.11-empty_cgi_handler.patch 
Log Message:
Update to 1.3.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Feb 2005 00:12:23 -0000	1.2
+++ .cvsignore	7 Mar 2005 09:15:23 -0000	1.3
@@ -1 +1 @@
-lighttpd-1.3.11.tar.gz
+lighttpd-1.3.13.tar.gz


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-3/lighttpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lighttpd.spec	1 Mar 2005 18:26:10 -0000	1.2
+++ lighttpd.spec	7 Mar 2005 09:15:23 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.3.11
-Release: 2
+Version: 1.3.13
+Release: 1
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -14,7 +14,6 @@
 Source11: lighttpd.png
 Source12: powered_by_fedora.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
-Patch1: lighttpd-1.3.11-empty_cgi_handler.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -62,7 +61,6 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
-%patch1 -p1 -b .empty_cgi_handler
 
 
 %build
@@ -159,9 +157,17 @@
 %{_bindir}/spawn-fcgi
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_fastcgi.so
+%{_mandir}/man1/spawn-fcgi.1*
 
 
 %changelog
+* Sun Mar  6 2005 Matthias Saou <http://freshrpms.net/> 1.3.13-1
+- Update to 1.3.13.
+
+* Wed Mar  2 2005 Matthias Saou <http://freshrpms.net/> 1.3.12-1
+- Update to 1.3.12.
+- Remove obsolete empty_cgi_handler patch.
+
 * Tue Mar  1 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-2
 - Add missing defattr to sub-packages (#150018).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Feb 2005 00:12:23 -0000	1.2
+++ sources	7 Mar 2005 09:15:23 -0000	1.3
@@ -1 +1 @@
-730c9b9d743360d23e523968ab4fe7c5  lighttpd-1.3.11.tar.gz
+2f017b936be376ad6f6c2ee26db93467  lighttpd-1.3.13.tar.gz


--- lighttpd-1.3.11-empty_cgi_handler.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar  7 09:15:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 7 Mar 2005 04:15:25 -0500
Subject: rpms/lighttpd/devel .cvsignore, 1.2, 1.3 lighttpd.spec, 1.2,
	1.3 sources, 1.2, 1.3 lighttpd-1.3.11-empty_cgi_handler.patch,
	1.1, NONE
Message-ID: <200503070915.j279FP0t026559@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26543/devel

Modified Files:
	.cvsignore lighttpd.spec sources 
Removed Files:
	lighttpd-1.3.11-empty_cgi_handler.patch 
Log Message:
Update to 1.3.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Feb 2005 00:12:23 -0000	1.2
+++ .cvsignore	7 Mar 2005 09:15:23 -0000	1.3
@@ -1 +1 @@
-lighttpd-1.3.11.tar.gz
+lighttpd-1.3.13.tar.gz


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lighttpd.spec	1 Mar 2005 18:26:10 -0000	1.2
+++ lighttpd.spec	7 Mar 2005 09:15:23 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.3.11
-Release: 2
+Version: 1.3.13
+Release: 1
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -14,7 +14,6 @@
 Source11: lighttpd.png
 Source12: powered_by_fedora.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
-Patch1: lighttpd-1.3.11-empty_cgi_handler.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -62,7 +61,6 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
-%patch1 -p1 -b .empty_cgi_handler
 
 
 %build
@@ -159,9 +157,17 @@
 %{_bindir}/spawn-fcgi
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_fastcgi.so
+%{_mandir}/man1/spawn-fcgi.1*
 
 
 %changelog
+* Sun Mar  6 2005 Matthias Saou <http://freshrpms.net/> 1.3.13-1
+- Update to 1.3.13.
+
+* Wed Mar  2 2005 Matthias Saou <http://freshrpms.net/> 1.3.12-1
+- Update to 1.3.12.
+- Remove obsolete empty_cgi_handler patch.
+
 * Tue Mar  1 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-2
 - Add missing defattr to sub-packages (#150018).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Feb 2005 00:12:23 -0000	1.2
+++ sources	7 Mar 2005 09:15:23 -0000	1.3
@@ -1 +1 @@
-730c9b9d743360d23e523968ab4fe7c5  lighttpd-1.3.11.tar.gz
+2f017b936be376ad6f6c2ee26db93467  lighttpd-1.3.13.tar.gz


--- lighttpd-1.3.11-empty_cgi_handler.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar  7 11:03:46 2005
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 7 Mar 2005 06:03:46 -0500
Subject: rpms/cdlabelgen - New directory
Message-ID: <200503071103.j27B3kOn029319@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/extras/rpms/cdlabelgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29312/cdlabelgen

Log Message:
Directory /cvs/extras/rpms/cdlabelgen added to the repository




From fedora-extras-commits at redhat.com  Mon Mar  7 11:03:47 2005
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 7 Mar 2005 06:03:47 -0500
Subject: rpms/cdlabelgen/devel - New directory
Message-ID: <200503071103.j27B3lcE029322@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/extras/rpms/cdlabelgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29312/cdlabelgen/devel

Log Message:
Directory /cvs/extras/rpms/cdlabelgen/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar  7 11:04:06 2005
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 7 Mar 2005 06:04:06 -0500
Subject: rpms/cdlabelgen Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503071104.j27B46Rb029381@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/extras/rpms/cdlabelgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29372

Added Files:
	Makefile import.log 
Log Message:
Setup of module cdlabelgen


--- NEW FILE Makefile ---
# Top level Makefile for module cdlabelgen
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  7 11:04:06 2005
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 7 Mar 2005 06:04:06 -0500
Subject: rpms/cdlabelgen/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503071104.j27B46OZ029384@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/extras/rpms/cdlabelgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29372/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cdlabelgen


--- 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 Mar  7 11:04:47 2005
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 7 Mar 2005 06:04:47 -0500
Subject: rpms/cdlabelgen import.log,1.1,1.2
Message-ID: <200503071104.j27B4laG029487@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/extras/rpms/cdlabelgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29477

Modified Files:
	import.log 
Log Message:
auto-import cdlabelgen-3.0.0-1 on branch devel from cdlabelgen-3.0.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Mar 2005 11:04:04 -0000	1.1
+++ import.log	7 Mar 2005 11:04:45 -0000	1.2
@@ -0,0 +1 @@
+cdlabelgen-3_0_0-1:HEAD:cdlabelgen-3.0.0-1.src.rpm:1110193474



From fedora-extras-commits at redhat.com  Mon Mar  7 11:04:47 2005
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 7 Mar 2005 06:04:47 -0500
Subject: rpms/cdlabelgen/devel cdlabelgen.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503071104.j27B4lm5029490@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/extras/rpms/cdlabelgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29477/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cdlabelgen.spec 
Log Message:
auto-import cdlabelgen-3.0.0-1 on branch devel from cdlabelgen-3.0.0-1.src.rpm


--- NEW FILE cdlabelgen.spec ---
Name: cdlabelgen
Summary: Generates frontcards and traycards for inserting in CD jewelcases.
Version: 3.0.0
Release: 1
#Source: http://www.red-bean.com/~bwf/software/cdlabelgen/cdlabelgen-1.5.0.tar.gz
#URL: http://www.red-bean.com/~bwf/software/cdlabelgen
Source: http://www.aczone.com/pub/tools/cdlabelgen-%{version}.tgz
URL: http://www.aczone.com/tools/cdinsert/
BuildRoot: %{_tmppath}/%{name}-root
License: GPL
Group: Applications/Publishing
BuildArch: noarch

%description
Cdlabelgen is a utility which generates frontcards and traycards (in
PostScript(TM) format) for CD jewelcases.

%prep
%setup -q

%build
make
#pod2man cdlabelgen > cdlabelgen.1

%install
mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/cdlabelgen,%{_mandir}/man1}
install -m 755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}
install -m 644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen
install -m 644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog README cdlabelgen.html
%{_bindir}/cdlabelgen
%{_datadir}/cdlabelgen
%{_mandir}/*/*

%changelog
* Tue Sep 21 2004 Harald Hoyer <harald at redhat.com> 3.0.0
- Updated to new version 3.0.0

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Oct 08 2003 Harald Hoyer <harald at redhat.com> 2.6.1-1
- Updated to new version 2.6.1

* Thu May 22 2003 Harald Hoyer <harald at redhat.com> 2.6.0-1
- Updated to new version 2.6.0

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Mon Oct  7 2002 Mike A. Harris <mharris at redhat.com> 2.3.0-4
- All-arch rebuild

* Fri Jun 21 2002 Tim Powers <timp at redhat.com> 2.3.0-3
- automated rebuild

* Sun May 26 2002 Tim Powers <timp at redhat.com> 2.3.0-2
- automated rebuild

* Tue Feb 26 2002 Mike A. Harris <mharris at redhat.com> 2.3.0-1
- Updated to new version 2.3.0 by different author

* Tue Feb 26 2002 Mike A. Harris <mharris at redhat.com> 1.5.0-11
- s/Copyright/License/ tag
- fixed buildroot tag to point to _tmppath
- Rebuilt in new environment

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Mon May 21 2001 Tim Powers <timp at redhat.com>
- built for the distro

* Mon Jul 24 2000 Prospector <prospector at redhat.com>
- rebuilt

* Mon Jul 10 2000 Tim Powers <timp at redhat.com>
- rebuilt

* Mon Jun 5 2000 Tim Powers <timp at redhat.com>
- fix man page location

* Mon May 8 2000 Tim Powers <timp at redhat.com>
- rebuilt for 7.0
* Tue Jan 4 2000 Tim Powers <timp at redhat.com>
- removed unneeded defines
- rebuilt for 6.2
* Mon Aug 23 1999 Preston Brown <pbrown at redhat.com>
- adopted for Powertools 6.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Mar 2005 11:04:04 -0000	1.1
+++ .cvsignore	7 Mar 2005 11:04:45 -0000	1.2
@@ -0,0 +1 @@
+cdlabelgen-3.0.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Mar 2005 11:04:04 -0000	1.1
+++ sources	7 Mar 2005 11:04:45 -0000	1.2
@@ -0,0 +1 @@
+7e5c5464c168dffa2fadfb6d0d36cdb7  cdlabelgen-3.0.0.tgz



From fedora-extras-commits at redhat.com  Mon Mar  7 13:47:21 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 7 Mar 2005 08:47:21 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.3,1.4
Message-ID: <200503071347.j27DlL7M031447@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31441

Modified Files:
	ppracer.spec 
Log Message:
don't package zero size README file



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ppracer.spec	4 Mar 2005 19:39:17 -0000	1.3
+++ ppracer.spec	7 Mar 2005 13:47:19 -0000	1.4
@@ -62,13 +62,16 @@
 
 %files
 %defattr (-, root, root, 755)
-%doc AUTHORS COPYING ChangeLog README contrib
+%doc AUTHORS COPYING ChangeLog contrib
 %{_bindir}/ppracer
 %{_datadir}/ppracer
 %{_datadir}/pixmaps/ppracer.png
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Mon Mar 07 2005 Nils Philippsen <nphilipp at redhat.com>
+- don't package zero size README file
+
 * Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 0.3.1
 - use desktop_file_install to install desktop file



From fedora-extras-commits at redhat.com  Mon Mar  7 13:51:14 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 7 Mar 2005 08:51:14 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.4,1.5
Message-ID: <200503071351.j27DpESA031488@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31482

Modified Files:
	ppracer.spec 
Log Message:
obsolete tuxracer <= 0.61



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ppracer.spec	7 Mar 2005 13:47:19 -0000	1.4
+++ ppracer.spec	7 Mar 2005 13:51:12 -0000	1.5
@@ -28,7 +28,7 @@
 
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 
-Obsoletes: tuxracer
+Obsoletes: tuxracer <= 0.61
 
 %description
 PPRacer is a simple OpenGL-based racing game featuring Tux. The
@@ -71,6 +71,7 @@
 %changelog
 * Mon Mar 07 2005 Nils Philippsen <nphilipp at redhat.com>
 - don't package zero size README file
+- obsolete tuxracer <= 0.61
 
 * Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 0.3.1



From fedora-extras-commits at redhat.com  Mon Mar  7 13:55:11 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 7 Mar 2005 08:55:11 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.5,1.6
Message-ID: <200503071355.j27DtBYm031539@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31533

Modified Files:
	ppracer.spec 
Log Message:
bump release



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ppracer.spec	7 Mar 2005 13:51:12 -0000	1.5
+++ ppracer.spec	7 Mar 2005 13:55:09 -0000	1.6
@@ -6,7 +6,7 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 1
+Release: 2
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de



From fedora-extras-commits at redhat.com  Mon Mar  7 16:47:08 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 7 Mar 2005 11:47:08 -0500
Subject: rpms/ipython - New directory
Message-ID: <200503071647.j27Gl8Bi001857@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1850/ipython

Log Message:
Directory /cvs/extras/rpms/ipython added to the repository




From fedora-extras-commits at redhat.com  Mon Mar  7 16:47:08 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 7 Mar 2005 11:47:08 -0500
Subject: rpms/ipython/devel - New directory
Message-ID: <200503071647.j27Gl8Oa001860@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1850/ipython/devel

Log Message:
Directory /cvs/extras/rpms/ipython/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar  7 16:47:20 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 7 Mar 2005 11:47:20 -0500
Subject: rpms/ipython Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503071647.j27GlKb7001919@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1910

Added Files:
	Makefile import.log 
Log Message:
Setup of module ipython


--- NEW FILE Makefile ---
# Top level Makefile for module ipython
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  7 16:47:20 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 7 Mar 2005 11:47:20 -0500
Subject: rpms/ipython/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503071647.j27GlKJE001922@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1910/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ipython


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From bugs.michael at gmx.net  Mon Mar  7 17:30:54 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Mon, 7 Mar 2005 18:30:54 +0100
Subject: rpms/jabberd/devel jabberd, NONE, 1.1 jabberd.spec, NONE, 1.1
 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503070823.j278Nbmn024994@cvs-int.fedora.redhat.com>
References: <200503070823.j278Nbmn024994@cvs-int.fedora.redhat.com>
Message-ID: <20050307183054.3ce04956.bugs.michael@gmx.net>

On Mon, 7 Mar 2005 03:23:37 -0500, Adrian Reber (adrian) wrote:

> 	condrestart)
>         	for prog in ${progs}; do
> 			if [ ! -f /var/lock/subsys/${prog} ]; then
> 				exit -1
> 			fi
> 		done
> 		Stop
> 		sleep 3
> 		Start
> 		;;
> 	*)
> 		echo "Usage: $0 {start|stop|restart|condrestart|reload|status}"
> 		let retval=-1
> esac
> exit ${retval}

LSB return code for "Usage" is 2.



From fedora at wir-sind-cool.org  Mon Mar  7 17:32:51 2005
From: fedora at wir-sind-cool.org (Michael Schwendt)
Date: Mon, 7 Mar 2005 18:32:51 +0100
Subject: rpms/cdlabelgen/devel cdlabelgen.spec, NONE, 1.1 .cvsignore,
 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503071104.j27B4lm5029490@cvs-int.fedora.redhat.com>
References: <200503071104.j27B4lm5029490@cvs-int.fedora.redhat.com>
Message-ID: <20050307183251.31c31eda.fedora@wir-sind-cool.org>

On Mon, 7 Mar 2005 06:04:47 -0500, Harald Hoyer (harald) wrote:

> %install
> mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/cdlabelgen,%{_mandir}/man1}

"rm -rf $RPM_BUILD_ROOT" directly after %install would be good, in
particular for short-circuit installs.



From fedora-extras-commits at redhat.com  Mon Mar  7 19:54:08 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 7 Mar 2005 14:54:08 -0500
Subject: devel/unison unison.spec,1.5,1.6
Message-ID: <200503071954.j27Js80J005583@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/unison
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5577

Modified Files:
	unison.spec 
Log Message:
Some minor adjustments.


Index: unison.spec
===================================================================
RCS file: /cvs/extras/devel/unison/unison.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- unison.spec	5 Mar 2005 19:55:54 -0000	1.5
+++ unison.spec	7 Mar 2005 19:54:06 -0000	1.6
@@ -1,8 +1,7 @@
-### Package needs review + approval.
 Name:           unison
 Version:        2.10.2
 Release:        2
-Summary:        Unison is a file-synchronization tool
+Summary:        File-synchronization tool
 
 Group:          Applications/File
 License:        GPL
@@ -42,16 +41,17 @@
 [Desktop Entry]
 Type=Application
 Exec=unison
-Name=Unison
+Name=Unison File Synchronizer
+GenericName=File Synchronizer
+Comment=Replicate files over different hosts or disks
 Terminal=false
 Icon=unison.png
-Comment=Unison file synchronizer
 Encoding=UTF-8
 StartupNotify=true
 EOF
 
 desktop-file-install --vendor fedora \
-    --add-category X-Fedora \
+    --add-category X-Fedora-Extra \
     --add-category Application \
     --add-category Accessories \
     --add-category Utility \



From bugs.michael at gmx.net  Mon Mar  7 19:54:12 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Mon, 7 Mar 2005 20:54:12 +0100
Subject: APPROVED: unison
Message-ID: <20050307205412.43de7645.bugs.michael@gmx.net>

Name: unison
Version: 2.10.2-2

Unison is a file-synchronization tool. It allows two replicas of a
collection of files and directories to be stored on different hosts (or
different disks on the same host), modified separately, and then brought
up to date by propagating the changes in each replica to the other.

[...]

Since it is a beta-release (and the last stable release is three years old
and not as feature-rich), I would recommend giving this a "testing"
release first.  One issue with the GUI I ran into is that a bad profile
cannot be deleted/edited within the GUI.

Package approved for adding to Fedora Extras.

G?rard Milmeister <gemi at bluewin.ch> will be responsible for this
package. (mschwendt)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050307/74e6a03f/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Mon Mar  7 21:09:04 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 7 Mar 2005 16:09:04 -0500
Subject: rpms/unison//FC-3 unison.spec,1.4,1.5
Message-ID: <200503072109.j27L94J8007278@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/unison//FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7272

Modified Files:
	unison.spec 
Log Message:
sync with devel



Index: unison.spec
===================================================================
RCS file: /cvs/extras/rpms/unison//FC-3/unison.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unison.spec	24 Feb 2005 21:59:42 -0000	1.4
+++ unison.spec	7 Mar 2005 21:09:02 -0000	1.5
@@ -1,19 +1,17 @@
-### Package needs review + approval.
 Name:           unison
 Version:        2.10.2
 Release:        2
-Epoch:          0
-Summary:        Unison is a file-synchronization tool
+Summary:        File-synchronization tool
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.cis.upenn.edu/~bcpierce/unison
 Source:         http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/unison-2.10.2/unison-2.10.2.tar.gz
-Source1:	unison.png
+Source1:        unison.png
 #Patch:          unison-uigtk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ocaml >= 0:3.08, lablgtk >= 0:2.4.0, tetex-latex
-BuildRequires:	desktop-file-utils
+BuildRequires:  ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex
+BuildRequires:  desktop-file-utils
 # for lablgtk
 BuildRequires:  gtk2-devel
 
@@ -43,16 +41,17 @@
 [Desktop Entry]
 Type=Application
 Exec=unison
-Name=Unison
+Name=Unison File Synchronizer
+GenericName=File Synchronizer
+Comment=Replicate files over different hosts or disks
 Terminal=false
 Icon=unison.png
-Comment=Unison file synchronizer
 Encoding=UTF-8
 StartupNotify=true
 EOF
 
 desktop-file-install --vendor fedora \
-    --add-category X-Fedora \
+    --add-category X-Fedora-Extra \
     --add-category Application \
     --add-category Accessories \
     --add-category Utility \



From fedora-extras-commits at redhat.com  Mon Mar  7 21:36:21 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 7 Mar 2005 16:36:21 -0500
Subject: rpms/global//FC-3 .cvsignore, 1.3, 1.4 global.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200503072136.j27LaLcg007527@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/global//FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7518

Modified Files:
	.cvsignore global.spec sources 
Log Message:
New Version 4.8.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/global//FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:27:42 -0000	1.3
+++ .cvsignore	7 Mar 2005 21:36:19 -0000	1.4
@@ -1 +1 @@
-global-4.8.2.tar.gz
+global-4.8.4.tar.gz


Index: global.spec
===================================================================
RCS file: /cvs/extras/rpms/global//FC-3/global.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- global.spec	11 Feb 2005 23:27:42 -0000	1.4
+++ global.spec	7 Mar 2005 21:36:19 -0000	1.5
@@ -1,13 +1,12 @@
 Name:           global
-Version:        4.8.2
+Version:        4.8.4
 Release:        1
-Epoch:          0
-Summary:        A source code tag system
+Summary:        Source code tag system
 
-Group:		Development/Tools
-License:	GPL/BSD
-URL:		http://www.gnu.org/software/global
-Source:		http://tamacom.com/global/global-4.8.2.tar.gz
+Group:          Development/Tools
+License:        GPL/BSD
+URL:            http://www.gnu.org/software/global
+Source:         http://tamacom.com/global/global-4.8.4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -17,10 +16,6 @@
 
 %prep
 %setup -q
-perl -pi -e 's|gctags|global-gctags|g' gtags/gtags.c
-perl -pi -e 's|gctags|global-gctags|g' libutil/conf.c
-perl -pi -e 's|gctags|global-gctags|g' libutil/gtagsop.c
-perl -pi -e 's|gctags|global-gctags|g' gctags/const.h
 
 %build
 %configure
@@ -29,8 +24,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{_bindir}/gctags $RPM_BUILD_ROOT%{_bindir}/global-gctags
-mv $RPM_BUILD_ROOT%{_mandir}/man1/gctags.1 $RPM_BUILD_ROOT%{_mandir}/man1/global-gctags.1
+rm -fr $RPM_BUILD_ROOT%{_datadir}/emacs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -39,20 +33,23 @@
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info \
     %{_infodir}/dir 2>/dev/null || :
 fi
 
 %files
 %defattr(-,root,root,-)
+%doc README THANKS LICENSE AUTHORS COPYING FAQ globash.rc gtags.el
 %{_bindir}/*
 %{_infodir}/*
 %{_mandir}/man*/*
 %{_datadir}/gtags
-%doc README THANKS LICENSE AUTHORS COPYING FAQ globash.rc gtags.el
 
 %changelog
+* Mon Mar  7 2005 Gerard Milmeister <gemi at bluewin.ch> - 4.8.4-1
+- New Version 4.8.4
+
 * Mon Dec 27 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:4.8.2-0.fdr.1
 - New Version 4.8.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/global//FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:27:42 -0000	1.3
+++ sources	7 Mar 2005 21:36:19 -0000	1.4
@@ -1 +1 @@
-ec0b03ea8042ed84b6d9f607e24f6360  global-4.8.2.tar.gz
+060d43cf74e297c154a5a53ba43c52fb  global-4.8.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar  7 21:36:40 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 7 Mar 2005 16:36:40 -0500
Subject: devel/global .cvsignore, 1.3, 1.4 global.spec, 1.5, 1.6 sources, 1.3,
	1.4
Message-ID: <200503072136.j27LaeJH007558@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/devel/global
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7552

Modified Files:
	.cvsignore global.spec sources 
Log Message:
New Version 4.8.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/global/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:27:42 -0000	1.3
+++ .cvsignore	7 Mar 2005 21:36:38 -0000	1.4
@@ -1 +1 @@
-global-4.8.2.tar.gz
+global-4.8.4.tar.gz


Index: global.spec
===================================================================
RCS file: /cvs/extras/devel/global/global.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- global.spec	3 Mar 2005 21:26:03 -0000	1.5
+++ global.spec	7 Mar 2005 21:36:38 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           global
-Version:        4.8.2
+Version:        4.8.4
 Release:        1
 Summary:        Source code tag system
 
 Group:          Development/Tools
 License:        GPL/BSD
 URL:            http://www.gnu.org/software/global
-Source:         http://tamacom.com/global/global-4.8.2.tar.gz
+Source:         http://tamacom.com/global/global-4.8.4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -16,10 +16,6 @@
 
 %prep
 %setup -q
-perl -pi -e 's|gctags|global-gctags|g' gtags/gtags.c
-perl -pi -e 's|gctags|global-gctags|g' libutil/conf.c
-perl -pi -e 's|gctags|global-gctags|g' libutil/gtagsop.c
-perl -pi -e 's|gctags|global-gctags|g' gctags/const.h
 
 %build
 %configure
@@ -28,8 +24,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{_bindir}/gctags $RPM_BUILD_ROOT%{_bindir}/global-gctags
-mv $RPM_BUILD_ROOT%{_mandir}/man1/gctags.1 $RPM_BUILD_ROOT%{_mandir}/man1/global-gctags.1
+rm -fr $RPM_BUILD_ROOT%{_datadir}/emacs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,6 +47,9 @@
 %{_datadir}/gtags
 
 %changelog
+* Mon Mar  7 2005 Gerard Milmeister <gemi at bluewin.ch> - 4.8.4-1
+- New Version 4.8.4
+
 * Mon Dec 27 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:4.8.2-0.fdr.1
 - New Version 4.8.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/global/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:27:42 -0000	1.3
+++ sources	7 Mar 2005 21:36:38 -0000	1.4
@@ -1 +1 @@
-ec0b03ea8042ed84b6d9f607e24f6360  global-4.8.2.tar.gz
+060d43cf74e297c154a5a53ba43c52fb  global-4.8.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar  7 22:09:30 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 7 Mar 2005 17:09:30 -0500
Subject: rpms/amarok/FC-3 .cvsignore, 1.5, 1.6 amarok.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200503072209.j27M9Usx008703@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8694/FC-3

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- update to version 1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Feb 2005 16:07:32 -0000	1.5
+++ .cvsignore	7 Mar 2005 22:09:28 -0000	1.6
@@ -1 +1 @@
-amarok-1.2.tar.bz2
+amarok-1.2.1.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/amarok.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- amarok.spec	14 Feb 2005 21:57:39 -0000	1.6
+++ amarok.spec	7 Mar 2005 22:09:28 -0000	1.7
@@ -6,20 +6,20 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.2
-Release:    2
+Version:    1.2.1
+Release:    1
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.2.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.2.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
-BuildRequires:  taglib-devel >= 0:1.3, esound-devel
+BuildRequires:  taglib-devel >= 1.3, esound-devel
 BuildRequires:  desktop-file-utils, gettext
 BuildRequires:  xorg-x11-Mesa-libGL
-BuildRequires:  gstreamer-plugins-devel >= 0:0.8.4
+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
 
@@ -145,7 +145,7 @@
 %{_libdir}/kde3/libamarok_gstengine_plugin.*
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
 %{_libdir}/kde3/konqsidebar_universalamarok.*
-%{_datadir}/apps/konqsidebartng/add/amarok.desktop
+%{_datadir}/apps/konqsidebartng/*/amarok.desktop
 %{_datadir}/apps/profiles/amarok.profile.xml
 
 %{_libdir}/mcop/Amarok
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Sat Mar 05 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.1-1
+- version 1.2.1 (bugfixes)
+
 * Mon Feb 14 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2-2
 - show in the GNOME menus too
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Feb 2005 16:07:32 -0000	1.5
+++ sources	7 Mar 2005 22:09:28 -0000	1.6
@@ -1 +1 @@
-8db7d8985152ff29e8fb7377ada74527  amarok-1.2.tar.bz2
+90a8cce693a31e4d6ff552508c31aed3  amarok-1.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar  7 22:09:30 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 7 Mar 2005 17:09:30 -0500
Subject: rpms/amarok/devel .cvsignore, 1.5, 1.6 amarok.spec, 1.8, 1.9 sources,
	1.5, 1.6
Message-ID: <200503072209.j27M9UBU008709@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8694/devel

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- update to version 1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Feb 2005 16:07:32 -0000	1.5
+++ .cvsignore	7 Mar 2005 22:09:28 -0000	1.6
@@ -1 +1 @@
-amarok-1.2.tar.bz2
+amarok-1.2.1.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- amarok.spec	5 Mar 2005 21:10:20 -0000	1.8
+++ amarok.spec	7 Mar 2005 22:09:28 -0000	1.9
@@ -6,13 +6,13 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.2
-Release:    2
+Version:    1.2.1
+Release:    1
 
 Group:      Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.2.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.2.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -145,7 +145,7 @@
 %{_libdir}/kde3/libamarok_gstengine_plugin.*
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
 %{_libdir}/kde3/konqsidebar_universalamarok.*
-%{_datadir}/apps/konqsidebartng/add/amarok.desktop
+%{_datadir}/apps/konqsidebartng/*/amarok.desktop
 %{_datadir}/apps/profiles/amarok.profile.xml
 
 %{_libdir}/mcop/Amarok
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Sat Mar 05 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.1-1
+- version 1.2.1 (bugfixes)
+
 * Mon Feb 14 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2-2
 - show in the GNOME menus too
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Feb 2005 16:07:32 -0000	1.5
+++ sources	7 Mar 2005 22:09:28 -0000	1.6
@@ -1 +1 @@
-8db7d8985152ff29e8fb7377ada74527  amarok-1.2.tar.bz2
+90a8cce693a31e4d6ff552508c31aed3  amarok-1.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar  8 01:51:30 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 20:51:30 -0500
Subject: rpms/perl-Sub-Uplevel/FC-2 perl-Sub-Uplevel.spec,1.3,1.4
Message-ID: <200503080151.j281pUcM011931@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11911/FC-2

Modified Files:
	perl-Sub-Uplevel.spec 
Log Message:
Sync with Fedora.us specfiles


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-2/perl-Sub-Uplevel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Sub-Uplevel.spec	4 Mar 2005 03:33:57 -0000	1.3
+++ perl-Sub-Uplevel.spec	8 Mar 2005 01:51:28 -0000	1.4
@@ -2,8 +2,9 @@
 
 Name:           perl-Sub-Uplevel
 Version:        0.09
-Release:        1
-Summary:        Run a perl function in an upper stack frame
+Release:        0.fdr.1.2
+Epoch:          0
+Summary:        Apparently run a function in a higher stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -54,7 +55,7 @@
 
 
 %changelog
-* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-1
+* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.09-0.fdr.1
 - Update to 0.09 (with license info).
 
 * Sun Jul  4 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.08-0.fdr.1



From fedora-extras-commits at redhat.com  Tue Mar  8 01:51:30 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 20:51:30 -0500
Subject: rpms/perl-Sub-Uplevel/FC-1 perl-Sub-Uplevel.spec,1.3,1.4
Message-ID: <200503080151.j281pUrY011927@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11911/FC-1

Modified Files:
	perl-Sub-Uplevel.spec 
Log Message:
Sync with Fedora.us specfiles


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-1/perl-Sub-Uplevel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Sub-Uplevel.spec	4 Mar 2005 03:33:57 -0000	1.3
+++ perl-Sub-Uplevel.spec	8 Mar 2005 01:51:28 -0000	1.4
@@ -2,8 +2,9 @@
 
 Name:           perl-Sub-Uplevel
 Version:        0.09
-Release:        1
-Summary:        Run a perl function in an upper stack frame
+Release:        0.fdr.1.1
+Epoch:          0
+Summary:        Apparently run a function in a higher stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -54,7 +55,7 @@
 
 
 %changelog
-* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-1
+* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.09-0.fdr.1
 - Update to 0.09 (with license info).
 
 * Sun Jul  4 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.08-0.fdr.1



From fedora-extras-commits at redhat.com  Tue Mar  8 01:51:30 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 20:51:30 -0500
Subject: rpms/perl-Sub-Uplevel/RHL-9 perl-Sub-Uplevel.spec,1.3,1.4
Message-ID: <200503080151.j281pUZ6011924@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11911/RHL-9

Modified Files:
	perl-Sub-Uplevel.spec 
Log Message:
Sync with Fedora.us specfiles


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/RHL-9/perl-Sub-Uplevel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Sub-Uplevel.spec	4 Mar 2005 03:33:57 -0000	1.3
+++ perl-Sub-Uplevel.spec	8 Mar 2005 01:51:28 -0000	1.4
@@ -2,8 +2,9 @@
 
 Name:           perl-Sub-Uplevel
 Version:        0.09
-Release:        1
-Summary:        Run a perl function in an upper stack frame
+Release:        0.fdr.1.rh90
+Epoch:          0
+Summary:        Apparently run a function in a higher stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -54,7 +55,7 @@
 
 
 %changelog
-* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-1
+* Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.09-0.fdr.1
 - Update to 0.09 (with license info).
 
 * Sun Jul  4 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.08-0.fdr.1



From fedora-extras-commits at redhat.com  Tue Mar  8 01:56:58 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 20:56:58 -0500
Subject: rpms/perl-Test-Exception/FC-2 perl-Test-Exception.spec,1.2,1.3
Message-ID: <200503080156.j281uwhx012062@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12040/FC-2

Modified Files:
	perl-Test-Exception.spec 
Log Message:
Sync with Fedora.us specfiles


Index: perl-Test-Exception.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Exception/FC-2/perl-Test-Exception.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Test-Exception.spec	4 Mar 2005 03:48:44 -0000	1.2
+++ perl-Test-Exception.spec	8 Mar 2005 01:56:56 -0000	1.3
@@ -2,8 +2,9 @@
 
 Name:           perl-Test-Exception
 Version:        0.20
-Release:        1
-Summary:        Library of test functions for exception based Perl code
+Release:        0.fdr.1.2
+Epoch:          0
+Summary:        Test functions for exception based code
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -55,7 +56,7 @@
 
 
 %changelog
-* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.20-1
+* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.20-0.fdr.1
 - Update to 0.20.
 
 * Sun Jul 04 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.15-0.fdr.1



From fedora-extras-commits at redhat.com  Tue Mar  8 01:56:58 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 20:56:58 -0500
Subject: rpms/perl-Test-Exception/FC-1 perl-Test-Exception.spec,1.2,1.3
Message-ID: <200503080156.j281uwBM012058@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12040/FC-1

Modified Files:
	perl-Test-Exception.spec 
Log Message:
Sync with Fedora.us specfiles


Index: perl-Test-Exception.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Exception/FC-1/perl-Test-Exception.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Test-Exception.spec	4 Mar 2005 03:48:44 -0000	1.2
+++ perl-Test-Exception.spec	8 Mar 2005 01:56:56 -0000	1.3
@@ -2,8 +2,9 @@
 
 Name:           perl-Test-Exception
 Version:        0.20
-Release:        1
-Summary:        Library of test functions for exception based Perl code
+Release:        0.fdr.1.1
+Epoch:          0
+Summary:        Test functions for exception based code
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -55,7 +56,7 @@
 
 
 %changelog
-* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.20-1
+* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.20-0.fdr.1
 - Update to 0.20.
 
 * Sun Jul 04 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.15-0.fdr.1



From fedora-extras-commits at redhat.com  Tue Mar  8 01:56:58 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 20:56:58 -0500
Subject: rpms/perl-Test-Exception/RHL-9 perl-Test-Exception.spec,1.2,1.3
Message-ID: <200503080156.j281uwJn012054@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Exception/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12040/RHL-9

Modified Files:
	perl-Test-Exception.spec 
Log Message:
Sync with Fedora.us specfiles


Index: perl-Test-Exception.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Exception/RHL-9/perl-Test-Exception.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Test-Exception.spec	4 Mar 2005 03:48:44 -0000	1.2
+++ perl-Test-Exception.spec	8 Mar 2005 01:56:56 -0000	1.3
@@ -2,8 +2,9 @@
 
 Name:           perl-Test-Exception
 Version:        0.20
-Release:        1
-Summary:        Library of test functions for exception based Perl code
+Release:        0.fdr.1.rh90
+Epoch:          0
+Summary:        Test functions for exception based code
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -55,7 +56,7 @@
 
 
 %changelog
-* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.20-1
+* Fri Nov  5 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.20-0.fdr.1
 - Update to 0.20.
 
 * Sun Jul 04 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.15-0.fdr.1



From fedora-extras-commits at redhat.com  Tue Mar  8 02:13:38 2005
From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton))
Date: Mon, 7 Mar 2005 21:13:38 -0500
Subject: devel/lincvs lincvs.spec,1.5,1.6
Message-ID: <200503080213.j282DcnB012889@cvs-int.fedora.redhat.com>

Author: pcompton

Update of /cvs/extras/devel/lincvs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12882

Modified Files:
	lincvs.spec 
Log Message:
sync lincvs dev w/ FC-3



Index: lincvs.spec
===================================================================
RCS file: /cvs/extras/devel/lincvs/lincvs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lincvs.spec	5 Mar 2005 21:10:23 -0000	1.5
+++ lincvs.spec	8 Mar 2005 02:13:36 -0000	1.6
@@ -1,43 +1,38 @@
 Name:             lincvs
 Version:          1.4.0
-Release:          0.rc2
-Summary:          Graphical CVS client
+Release:          0.1.rc2
+Summary:          Graphical CVS Client
 
 Group:            Development/Tools
 License:          GPL
 URL:              http://www.lincvs.org
 Source0:          http://lincvs.com/download/lincvs-1.4.0-rc2-1-generic-src.tgz
-Source1:          lincvs
-Source2:          lincvs.desktop
+Source1:          lincvs.desktop
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:    cvs >= 1.9.0
+BuildRequires:    cvs >= 0:1.9.0
 BuildRequires:    qt-devel >= 1:3.3
-Requires:         cvs >= 1.9.0
+Requires:         cvs >= 0:1.9.0
 
 %description
-LinCVS is a graphical Interface for the cvs client commandline tool. It allows
-ato load modules from a server (checkout), create modules on the server
-(import), as well as checking the state of directories and individual files or
-updating them. Basic operations like add, remove and commit are supported as
-matter of course, just like showing the actual differences between the server
-version and the local sandbox, graphical display of the version tree, and
-manifoldy graphical support of project maintenance. All actions are logged on
-the cvs server (configurable via history), and are therewith comprehensible.
+LinCVS is a graphical Interface for the cvs client commandline tool on the Unix and Windows platform. It allows ato load modules from a server (checkout), create modules on the server (import), as well as checking the state of directories and individual files or updating them. Basic operations like add, remove and commit are supported as matter of course, just like showing the actual differences between the server version and the local sandbox, graphical display of the version tree, and manifoldy graphical support of project maintenance. All actions are logged on the cvs server (configurable via history), and are therewith comprehensible.
 
-To keep LinCVS independant of the cvs version, LinCVS uses the local but
-separately installed cvs and should always work with the latest version.
+To keep LinCVS independant of the cvs version, LinCVS uses the local but separat installed cvs and therewith always should work with the latest version.
 
 
 %prep
 %setup -q -n %{name}-1.4.0-rc2
 
+cat <<'EOF' >lincvs.sh
+#!/bin/sh
+exec %{_libdir}/LinCVS/AppRun $@
+EOF
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 qmake -o Makefile lincvs.pro
 make %{?_smp_mflags}
-
+  
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -49,12 +44,12 @@
 cp -Rpa LinCVS ${RPM_BUILD_ROOT}%{_libdir}
 cp -p LinCVS/AppIcon.xpm ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/lincvs.xpm
 
-install -p -D %{SOURCE1} ${RPM_BUILD_ROOT}%{_bindir}/lincvs
+install -p -D -m0755 lincvs.sh ${RPM_BUILD_ROOT}%{_bindir}/lincvs
 
 desktop-file-install --vendor fedora                \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   \
-  --add-category X-Fedora-Extra                     \
-  %{SOURCE2}
+  --add-category X-Fedora-Extra	                    \
+  %{SOURCE1}
 
 
 %clean
@@ -71,6 +66,9 @@
 
 
 %changelog
+* Fri Feb 25 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.4.0-0.1.rc2
+- Fix for x86_64.
+
 * Sat Feb 12 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.4.0-0.rc2
 - 1.4.0-rc2.
 



From fedora-extras-commits at redhat.com  Tue Mar  8 02:16:05 2005
From: fedora-extras-commits at redhat.com (Phillip Compton (pcompton))
Date: Mon, 7 Mar 2005 21:16:05 -0500
Subject: devel/seahorse .cvsignore, 1.2, 1.3 seahorse.spec, 1.6, 1.7 sources,
	1.2, 1.3
Message-ID: <200503080216.j282G5T1012925@cvs-int.fedora.redhat.com>

Author: pcompton

Update of /cvs/extras/devel/seahorse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12919

Modified Files:
	.cvsignore seahorse.spec sources 
Log Message:
sync dev with FC3 seahorse



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/seahorse/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:20:20 -0000	1.2
+++ .cvsignore	8 Mar 2005 02:16:03 -0000	1.3
@@ -1 +1 @@
-seahorse-0.7.3.tar.gz
+seahorse-0.7.6.tar.bz2


Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/devel/seahorse/seahorse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- seahorse.spec	5 Mar 2005 19:28:28 -0000	1.6
+++ seahorse.spec	8 Mar 2005 02:16:03 -0000	1.7
@@ -1,79 +1,99 @@
-Name:		seahorse
-Version:	0.7.3
-Release:	5
+Name: 		seahorse
+Version: 	0.7.6
+Release: 	2
 Summary:	GNOME2 interface for gnupg
 
-Group:		User Interface/Desktops
-License:	GPL
-URL:		http://seahorse.sourceforge.net/
-Source:		http://download.sourceforge.net/seahorse/seahorse-0.7.3.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	libgnomeui-devel
-BuildRequires:	eel2-devel
-BuildRequires:	gpgme03-devel
-BuildRequires:	scrollkeeper
-BuildRequires:	gettext
-BuildRequires:	desktop-file-utils
-Requires(post):		GConf2 scrollkeeper
-Requires(postun):	scrollkeeper
+Group: 		User Interface/Desktops
+License: 	GPL
+URL:            http://seahorse.sourceforge.net/
+Source: 	http://ftp.gnome.org/pub/GNOME/sources/seahorse/0.7/seahorse-0.7.6.tar.bz2
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  eel2-devel
+BuildRequires:  gedit-devel
+BuildRequires:  gettext
+BuildRequires:  gpgme-devel >= 1.0
+BuildRequires:  libgnomeui-devel
+BuildRequires:  libgnomeprintui22-devel
+BuildRequires:  perl-XML-Parser
+BuildRequires:  scrollkeeper
+Requires(post): desktop-file-utils
+Requires(post): GConf2
+Requires(post): scrollkeeper
+Requires(post): shared-mime-info
+Requires(postun): desktop-file-utils
+Requires(postun): scrollkeeper
+Requires(postun): shared-mime-info
 
 %description
 Seahorse is a gnome2 interface for gnupg.
 It uses gpgme as the backend.
 
 
-
 %prep
 %setup -q
-
+sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.in
+sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.am
 
 
 %build
-%configure
+%configure --disable-schemas-install 
 make %{?_smp_mflags}
 
 
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=${RPM_BUILD_ROOT}
+%makeinstall
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 %find_lang seahorse
 
 rm -rf ${RPM_BUILD_ROOT}/var/scrollkeeper
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
 desktop-file-install --vendor fedora --delete-original  \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
+  --add-category X-Fedora                               \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-encrypted.desktop
+
+desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
-  --add-category Application                            \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-signature.desktop
+
+desktop-file-install --vendor fedora --delete-original  \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
+  --add-category GNOME                                  \
   --add-category Utility                                \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+  --add-category X-Fedora                               \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse.desktop
+
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
 
 
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
-
 %post
+/sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 \
      --makefile-install-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 scrollkeeper-update -q ||:
-
+update-mime-database %{_datadir}/mime/ > /dev/null
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %postun
+/sbin/ldconfig
 scrollkeeper-update -q ||:
-
+update-mime-database %{_datadir}/mime/ > /dev/null
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %files -f %{name}.lang
@@ -81,22 +101,27 @@
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_datadir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/*.desktop
+%{_datadir}/control-center-2.0/capplets/*.desktop
+%{_datadir}/gnome/help/%{name}
+%{_datadir}/mime-info/seahorse.keys
+%{_datadir}/mime-info/seahorse.mime
+%{_datadir}/mime/packages/*
 %{_datadir}/omf/%{name}
 %{_datadir}/pixmaps/*
-%{_datadir}/gnome/help/%{name}
-%{_sysconfdir}/gconf/schemas/*
+%{_libdir}/libseahorse-internal.so.0.0.0
 %{_libdir}/bonobo/*.*
 %{_libdir}/bonobo/servers/Seahorse_PGP_File_Listener.server
-%{_datadir}/control-center-2.0/capplets/*.desktop
-%{_datadir}/mime-info/seahorse.keys
-%{_datadir}/mime-info/seahorse.mime
-
+%{_libdir}/gedit-2/plugins/*
+%{_sysconfdir}/gconf/schemas/*
 
 
 %changelog
-* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
-- Split context marked dependency syntax to work around #118773.
+* Fri Feb 25 2005 Phillip Compton <pcompton[AT]proteinmedia.com> 0.7.6-2
+- desktop entry fixes.
+
+* Fri Feb 25 2005 Phillip Compton <pcompton[AT]proteinmedia.com> 0.7.6-1
+- 0.7.6.
 
 * Mon Nov 09 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:0.7.3-0.fdr.5
 - BuildReq scrollkeeper.


Index: sources
===================================================================
RCS file: /cvs/extras/devel/seahorse/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:20:20 -0000	1.2
+++ sources	8 Mar 2005 02:16:03 -0000	1.3
@@ -1 +1 @@
-8f77822212a8dff24a56f2855913fc29  seahorse-0.7.3.tar.gz
+b0a0942faabc1dd9367b4bea9cdd9c4a  seahorse-0.7.6.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar  8 02:20:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 21:20:35 -0500
Subject: rpms/libol/FC-1 .cvsignore, 1.2, 1.3 libol.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200503080220.j282KZTd013031@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libol/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13019/FC-1

Modified Files:
	.cvsignore libol.spec sources 
Log Message:
Sync with Fedora.us


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-1/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:55 -0000	1.2
+++ .cvsignore	8 Mar 2005 02:20:33 -0000	1.3
@@ -1 +1 @@
-libol-0.3.13.tar.gz
+libol-0.3.15.tar.gz


Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-1/libol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libol.spec	8 Nov 2004 04:47:01 -0000	1.2
+++ libol.spec	8 Mar 2005 02:20:33 -0000	1.3
@@ -1,31 +1,36 @@
-Summary:   Support library for syslog-ng
-Name:      libol
-Version:   0.3.13
-Release:   0.fdr.2.1
-Epoch:     0
-License:   GPL
-Group:     System Environment/Libraries
-Url:       http://www.balabit.hu/products/syslog-ng/
-Source:    http://www.balabit.hu/downloads/syslog-ng/libol/0.3/libol-0.3.13.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
-Requires(post,postun): /sbin/ldconfig
+#
+# Before changing the macro below see the README file included in
+# the syslog-ng package.
+#
+%define with_scheme_preprocessor 0
+
+Summary:          Support library for syslog-ng
+Name:             libol
+Version:          0.3.15
+Release:          0.fdr.1.1
+Epoch:            0
+Group:            System Environment/Libraries
+License:          GPL
+Url:              http://www.balabit.com/products/syslog-ng/
+Source:           http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.15.tar.gz
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{with_scheme_preprocessor}
+BuildRequires:    scsh
+%endif
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 Support library for syslog-ng.
 
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
 
 %package devel
-Summary: Support library libol for syslog-ng headers and libraries
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary:          Support library for syslog-ng: headers and libraries
+Group:            Development/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
-Support library libol for syslog-ng headers and libraries
-
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
+Support library for syslog-ng: headers and libraries.
 
 
 %prep
@@ -33,21 +38,14 @@
 
 %build
 %configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-#
-# make_class
-#   -- this file is installed without an interpreter
-#   -- doesn't appear to be required to build syslog-ng
-#   -> file manually removed
-#
-rm ${RPM_BUILD_ROOT}%{_bindir}/make_class
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -56,13 +54,18 @@
 
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING
 %{_libdir}/libol.so.0
 %{_libdir}/libol.so.0.0.0
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%if %{with_scheme_preprocessor}
+%{_bindir}/make_class
+%else
+%exclude %{_bindir}/make_class
+%endif
 %{_bindir}/libol-config
 %{_libdir}/libol.a
 %{_libdir}/libol.la
@@ -71,6 +74,14 @@
 
 
 %changelog
+* Sat Feb 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.15-0.fdr.1
+- Update to 0.3.15.
+
+* Wed Aug 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.14-0.fdr.1
+- Update to 0.3.14.
+- Merged upstream specfile changes.
+- Upstream configure.in has been patched (make CFLAGS no longer needed).
+
 * Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
 - building with CFLAGS="$RPM_OPT_FLAGS"
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-1/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:55 -0000	1.2
+++ sources	8 Mar 2005 02:20:33 -0000	1.3
@@ -1 +1 @@
-b66e21769e21ac9b953cbafe517630fd  libol-0.3.13.tar.gz
+1c8d6a9c72a9200738a04d68e5a7b439  libol-0.3.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 02:20:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 21:20:35 -0500
Subject: rpms/libol/RHL-9 .cvsignore, 1.2, 1.3 libol.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200503080220.j282KZEP013043@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libol/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13019/RHL-9

Modified Files:
	.cvsignore libol.spec sources 
Log Message:
Sync with Fedora.us


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libol/RHL-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:55 -0000	1.2
+++ .cvsignore	8 Mar 2005 02:20:33 -0000	1.3
@@ -1 +1 @@
-libol-0.3.13.tar.gz
+libol-0.3.15.tar.gz


Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/RHL-9/libol.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libol.spec	8 Nov 2004 04:46:55 -0000	1.1
+++ libol.spec	8 Mar 2005 02:20:33 -0000	1.2
@@ -1,31 +1,36 @@
-Summary:   Support library for syslog-ng
-Name:      libol
-Version:   0.3.13
-Release:   0.fdr.2.rh90
-Epoch:     0
-License:   GPL
-Group:     System Environment/Libraries
-Url:       http://www.balabit.hu/products/syslog-ng/
-Source:    http://www.balabit.hu/downloads/syslog-ng/libol/0.3/libol-0.3.13.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
-Requires(post,postun): /sbin/ldconfig
+#
+# Before changing the macro below see the README file included in
+# the syslog-ng package.
+#
+%define with_scheme_preprocessor 0
+
+Summary:          Support library for syslog-ng
+Name:             libol
+Version:          0.3.15
+Release:          0.fdr.1.rh90
+Epoch:            0
+Group:            System Environment/Libraries
+License:          GPL
+Url:              http://www.balabit.com/products/syslog-ng/
+Source:           http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.15.tar.gz
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{with_scheme_preprocessor}
+BuildRequires:    scsh
+%endif
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 Support library for syslog-ng.
 
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
 
 %package devel
-Summary: Support library libol for syslog-ng headers and libraries
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary:          Support library for syslog-ng: headers and libraries
+Group:            Development/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
-Support library libol for syslog-ng headers and libraries
-
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
+Support library for syslog-ng: headers and libraries.
 
 
 %prep
@@ -33,21 +38,14 @@
 
 %build
 %configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-#
-# make_class
-#   -- this file is installed without an interpreter
-#   -- doesn't appear to be required to build syslog-ng
-#   -> file manually removed
-#
-rm ${RPM_BUILD_ROOT}%{_bindir}/make_class
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -56,13 +54,18 @@
 
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING
 %{_libdir}/libol.so.0
 %{_libdir}/libol.so.0.0.0
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%if %{with_scheme_preprocessor}
+%{_bindir}/make_class
+%else
+%exclude %{_bindir}/make_class
+%endif
 %{_bindir}/libol-config
 %{_libdir}/libol.a
 %{_libdir}/libol.la
@@ -71,6 +74,14 @@
 
 
 %changelog
+* Sat Feb 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.15-0.fdr.1
+- Update to 0.3.15.
+
+* Wed Aug 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.14-0.fdr.1
+- Update to 0.3.14.
+- Merged upstream specfile changes.
+- Upstream configure.in has been patched (make CFLAGS no longer needed).
+
 * Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
 - building with CFLAGS="$RPM_OPT_FLAGS"
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libol/RHL-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:55 -0000	1.2
+++ sources	8 Mar 2005 02:20:33 -0000	1.3
@@ -1 +1 @@
-b66e21769e21ac9b953cbafe517630fd  libol-0.3.13.tar.gz
+1c8d6a9c72a9200738a04d68e5a7b439  libol-0.3.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 02:20:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 7 Mar 2005 21:20:35 -0500
Subject: rpms/libol/FC-2 .cvsignore, 1.2, 1.3 libol.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200503080220.j282KZPw013037@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libol/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13019/FC-2

Modified Files:
	.cvsignore libol.spec sources 
Log Message:
Sync with Fedora.us


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:55 -0000	1.2
+++ .cvsignore	8 Mar 2005 02:20:33 -0000	1.3
@@ -1 +1 @@
-libol-0.3.13.tar.gz
+libol-0.3.15.tar.gz


Index: libol.spec
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-2/libol.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libol.spec	8 Nov 2004 04:47:07 -0000	1.3
+++ libol.spec	8 Mar 2005 02:20:33 -0000	1.4
@@ -1,31 +1,36 @@
-Summary:   Support library for syslog-ng
-Name:      libol
-Version:   0.3.13
-Release:   0.fdr.2.2
-Epoch:     0
-License:   GPL
-Group:     System Environment/Libraries
-Url:       http://www.balabit.hu/products/syslog-ng/
-Source:    http://www.balabit.hu/downloads/syslog-ng/libol/0.3/libol-0.3.13.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
-Requires(post,postun): /sbin/ldconfig
+#
+# Before changing the macro below see the README file included in
+# the syslog-ng package.
+#
+%define with_scheme_preprocessor 0
+
+Summary:          Support library for syslog-ng
+Name:             libol
+Version:          0.3.15
+Release:          0.fdr.1.2
+Epoch:            0
+Group:            System Environment/Libraries
+License:          GPL
+Url:              http://www.balabit.com/products/syslog-ng/
+Source:           http://www.balabit.com/downloads/syslog-ng/libol/0.3/libol-0.3.15.tar.gz
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{with_scheme_preprocessor}
+BuildRequires:    scsh
+%endif
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 Support library for syslog-ng.
 
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
 
 %package devel
-Summary: Support library libol for syslog-ng headers and libraries
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary:          Support library for syslog-ng: headers and libraries
+Group:            Development/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
-Support library libol for syslog-ng headers and libraries
-
-NOTE: This library is only needed to build syslog-ng. It is not required
-to deploy the syslog-ng binary package (libol is statically linked).
+Support library for syslog-ng: headers and libraries.
 
 
 %prep
@@ -33,21 +38,14 @@
 
 %build
 %configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-#
-# make_class
-#   -- this file is installed without an interpreter
-#   -- doesn't appear to be required to build syslog-ng
-#   -> file manually removed
-#
-rm ${RPM_BUILD_ROOT}%{_bindir}/make_class
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -56,13 +54,18 @@
 
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING
 %{_libdir}/libol.so.0
 %{_libdir}/libol.so.0.0.0
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%if %{with_scheme_preprocessor}
+%{_bindir}/make_class
+%else
+%exclude %{_bindir}/make_class
+%endif
 %{_bindir}/libol-config
 %{_libdir}/libol.a
 %{_libdir}/libol.la
@@ -71,6 +74,14 @@
 
 
 %changelog
+* Sat Feb 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.15-0.fdr.1
+- Update to 0.3.15.
+
+* Wed Aug 25 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.3.14-0.fdr.1
+- Update to 0.3.14.
+- Merged upstream specfile changes.
+- Upstream configure.in has been patched (make CFLAGS no longer needed).
+
 * Tue Mar  2 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:0.3.13-0.fdr.2
 - building with CFLAGS="$RPM_OPT_FLAGS"
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libol/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:55 -0000	1.2
+++ sources	8 Mar 2005 02:20:33 -0000	1.3
@@ -1 +1 @@
-b66e21769e21ac9b953cbafe517630fd  libol-0.3.13.tar.gz
+1c8d6a9c72a9200738a04d68e5a7b439  libol-0.3.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 07:44:58 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 8 Mar 2005 02:44:58 -0500
Subject: devel/jabberd jabberd,1.1,1.2
Message-ID: <200503080744.j287iwcs019277@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19268

Modified Files:
	jabberd 
Log Message:
LSB return code for "Usage" is 2



Index: jabberd
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jabberd	7 Mar 2005 08:23:35 -0000	1.1
+++ jabberd	8 Mar 2005 07:44:56 -0000	1.2
@@ -144,6 +144,6 @@
 		;;
 	*)
 		echo "Usage: $0 {start|stop|restart|condrestart|reload|status}"
-		let retval=-1
+		let retval=2
 esac
 exit ${retval}



From fedora-extras-commits at redhat.com  Tue Mar  8 13:45:03 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 8 Mar 2005 08:45:03 -0500
Subject: rpms/ppracer/devel ppracer.desktop,1.4,1.5
Message-ID: <200503081345.j28Dj3kf025295@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25289

Modified Files:
	ppracer.desktop 
Log Message:
use Terminal=false, not Terminal=0



Index: ppracer.desktop
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ppracer.desktop	4 Mar 2005 18:46:01 -0000	1.4
+++ ppracer.desktop	8 Mar 2005 13:45:01 -0000	1.5
@@ -6,6 +6,6 @@
 GenericName=A 3D downhill racing game
 Comment=Race your penguin down an alpine slope
 Exec=ppracer
-Terminal=0
+Terminal=false
 Type=Application
 Icon=ppracer.png



From fedora-extras-commits at redhat.com  Tue Mar  8 13:46:36 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 8 Mar 2005 08:46:36 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.6,1.7
Message-ID: <200503081346.j28DkaLf025373@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25365

Modified Files:
	ppracer.spec 
Log Message:
don't use integer for boolean value in desktop file



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ppracer.spec	7 Mar 2005 13:55:09 -0000	1.6
+++ ppracer.spec	8 Mar 2005 13:46:34 -0000	1.7
@@ -69,6 +69,9 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Tue Mar 08 2005 Nils Philippsen <nphilipp at redhat.com>
+- don't use integer for boolean value in desktop file
+
 * Mon Mar 07 2005 Nils Philippsen <nphilipp at redhat.com>
 - don't package zero size README file
 - obsolete tuxracer <= 0.61



From fedora-extras-commits at redhat.com  Tue Mar  8 13:48:33 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 08:48:33 -0500
Subject: rpms/dietlibc/devel dietlibc-0.28-cflags.patch, NONE,
	1.1 dietlibc.spec, 1.7, 1.8
Message-ID: <200503081348.j28DmX8K025434@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25428

Modified Files:
	dietlibc.spec 
Added Files:
	dietlibc-0.28-cflags.patch 
Log Message:
use more modern flags for '-Os'


dietlibc-0.28-cflags.patch:

--- NEW FILE dietlibc-0.28-cflags.patch ---
2005-03-08 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* diet.c: use more modern compiler-flags with '-Os'; the new
	  ones are having the same effect as the old ones but do not
	  produce warnings

--- dietlibc-0.28/diet.c.cflags	2004-12-17 19:47:58.000000000 +0100
+++ dietlibc-0.28/diet.c	2005-03-08 14:37:03.000000000 +0100
@@ -26,8 +26,8 @@ static void error(const char *message) {
 
 static const char* Os[] = {
   "i386","-Os","-mpreferred-stack-boundary=2",
-	 "-malign-functions=1","-malign-jumps=1",
-	 "-malign-loops=1","-fomit-frame-pointer",0,
+	 "-falign-functions=1","-falign-jumps=1",
+	 "-falign-loops=1","-fomit-frame-pointer",0,
   "x86_64","-Os","-fno-omit-frame-pointer",0,
   "sparc","-Os","-mcpu=supersparc",0,
   "sparc64","-Os","-m64","-mhard-quad-float",0,


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dietlibc.spec	7 Mar 2005 00:25:59 -0000	1.7
+++ dietlibc.spec	8 Mar 2005 13:48:31 -0000	1.8
@@ -36,7 +36,7 @@
 Summary:	Small libc implementation
 Name:		%{?_with_cross:cross-%crossarch-}%NAME
 Version:	0.28
-Release:	%release_func 4
+Release:	%release_func 4.1
 License:	GPL
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
@@ -46,6 +46,7 @@
 Patch1:		dietlibc-0.28-setpriority.patch
 Patch2:		dietlibc-0.28-ppc.patch
 Patch3:		dietlibc-0.28-hppa.patch
+Patch4:		dietlibc-0.28-cflags.patch
 BuildRoot:	%_tmppath/%name-%version-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
 
@@ -79,6 +80,7 @@
 %patch1 -p1 -b .nice
 %patch2 -p1 -b .ppc
 %patch3 -p1 -b .hppa
+%patch4 -p1 -b .cflags
 
 ## only for 0.28; remove it in 0.29
 sed -i -e 's!LD_RUN_PATH= !env -u LD_RUN_PATH !' Makefile
@@ -149,6 +151,7 @@
 - build the dynamic libs for x86, x86_64 and arm only
 - fixed PPC issues in ISO mode (do not use the 'powerpc' macro but the
   '__powerpc__' one)
+- use more modern flags for '-Os'
 
 * Tue Feb  1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-1
 - updated to 0.28



From fedora-extras-commits at redhat.com  Tue Mar  8 16:21:49 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 8 Mar 2005 11:21:49 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.7,1.8
Message-ID: <200503081621.j28GLnbX028071@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28065

Modified Files:
	ppracer.spec 
Log Message:
remove optflags patch as it isn't necessary anymore
reorder sources and patches



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ppracer.spec	8 Mar 2005 13:46:34 -0000	1.7
+++ ppracer.spec	8 Mar 2005 16:21:47 -0000	1.8
@@ -11,12 +11,11 @@
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: http://download.berlios.de/ppracer/ppracer-%{version}%{?srcextraversion}.tar.bz2
-Source2: ppracer.png
-Source3: ppracer.desktop
+Source0: http://download.berlios.de/ppracer/ppracer-%{version}%{?srcextraversion}.tar.bz2
+Source1: ppracer.png
+Source2: ppracer.desktop
 
-Patch1: ppracer-0.3.1-optflags.patch
-Patch2: PPRacer-0.1.9-ia64.patch
+Patch0: PPRacer-0.1.9-ia64.patch
 
 BuildRequires: xorg-x11-devel
 BuildRequires: SDL-devel >= 1.2
@@ -38,8 +37,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .optflags
-%patch2 -p1 -b .ia64
+%patch0 -p1 -b .ia64
 
 %build
 autoconf
@@ -51,11 +49,11 @@
 %makeinstall ppdatadir=%{buildroot}%{_datadir}/ppracer
 
 mkdir -p %{buildroot}%{_datadir}/pixmaps/
-install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/
+install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/
 
 mkdir -p %{buildroot}%{_datadir}/applications/
 desktop-file-install --vendor %{desktop_vendor} --dir %{buildroot}%{_datadir}/applications \
-    %{SOURCE3}
+    %{SOURCE2}
 
 %clean
 rm -rf %{buildroot}
@@ -71,6 +69,8 @@
 %changelog
 * Tue Mar 08 2005 Nils Philippsen <nphilipp at redhat.com>
 - don't use integer for boolean value in desktop file
+- remove optflags patch as it isn't necessary anymore
+- reorder sources and patches
 
 * Mon Mar 07 2005 Nils Philippsen <nphilipp at redhat.com>
 - don't package zero size README file



From fedora-extras-commits at redhat.com  Tue Mar  8 17:17:00 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 12:17:00 -0500
Subject: rpms/xca/devel .cvsignore,1.2,1.3
Message-ID: <200503081717.j28HH0RX029035@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29028

Modified Files:
	.cvsignore 
Log Message:
updated



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:33:36 -0000	1.2
+++ .cvsignore	8 Mar 2005 17:16:58 -0000	1.3
@@ -1 +1,3 @@
-xca-0.4.6.tar.gz
+xca-*.tar.gz
+xca-*.*.rpm
+i386



From fedora-extras-commits at redhat.com  Tue Mar  8 17:17:23 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 12:17:23 -0500
Subject: rpms/xca/devel xca-0.5.1-langinst.patch, NONE,
	1.1 xca-0.5.1-gcc4.patch, NONE, 1.1 xca-0.5.1-db43.patch, NONE,
	1.1 xca.spec, 1.5, 1.6 xca-0.4.6-gcc3.patch, 1.1,
	NONE cxx_except.h, 1.1, NONE cxx_common.h, 1.1, NONE
Message-ID: <200503081717.j28HHNDW029063@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29057

Modified Files:
	xca.spec 
Added Files:
	xca-0.5.1-langinst.patch xca-0.5.1-gcc4.patch 
	xca-0.5.1-db43.patch 
Removed Files:
	xca-0.4.6-gcc3.patch cxx_except.h cxx_common.h 
Log Message:
- updated to 0.5.1
- (re)enabled parallel build
- applied -langinst patch and other ideas from
  https://bugzilla.fedora.us/show_bug.cgi?id=2019 (Ville Skytt?)
- fixed build with gcc4 and db43
- removed old cruft from the specfile


xca-0.5.1-langinst.patch:

--- NEW FILE xca-0.5.1-langinst.patch ---
--- lang/Makefile~	2004-02-18 19:29:50.000000000 +0200
+++ lang/Makefile	2004-08-27 20:09:02.910204474 +0300
@@ -3,7 +3,7 @@
 
 install:
 	install -m 755 -d $(destdir)$(prefix)/share/xca
-	install -m 644 lang/xca_??.qm $(destdir)$(prefix)/share/xca || true
+	install -m 644 xca_??.qm $(destdir)$(prefix)/share/xca || true
 
 include $(TOPDIR)/Local.mak
 

xca-0.5.1-gcc4.patch:

--- NEW FILE xca-0.5.1-gcc4.patch ---
===================================================================
RCS file: /cvsroot/xca/xca/widgets/clicklabel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xca/xca/widgets/clicklabel.cpp	2003/11/26 22:03:18	1.3
+++ xca/xca/widgets/clicklabel.cpp	2005/02/07 21:56:27	1.4
@@ -45,7 +45,7 @@
  * http://www.hohnstaedt.de/xca
  * email: christian at hohnstaedt.de
  *
- * $Id: clicklabel.cpp,v 1.3 2003/11/26 22:03:18 chris2511 Exp $ 
+ * $Id: clicklabel.cpp,v 1.4 2005/02/07 21:56:27 chris2511 Exp $ 
  *
  */                           
 
@@ -58,9 +58,9 @@
 ClickLabel::ClickLabel( QWidget* parent,  const char* name, WFlags f )
 	:QLabel( parent, name, f )
 {
-	QFont font( font() );
-	font.setBold(true);
-	setFont( font );
+	QFont fnt( font() );
+	fnt.setBold(true);
+	setFont( fnt );
 	setFrameShape( QLabel::Panel );
 	setFrameShadow( QLabel::Sunken );
 	setAlignment( int( QLabel::AlignCenter ) );

xca-0.5.1-db43.patch:

--- NEW FILE xca-0.5.1-db43.patch ---
--- xca-0.5.1/widgets/MainWindow.h.db43	2004-04-15 01:36:56.000000000 +0200
+++ xca-0.5.1/widgets/MainWindow.h	2005-03-08 17:36:26.000000000 +0100
@@ -105,6 +105,10 @@ class MainWindow: public MainWindow_UI
 	static int passRead(char *buf, int size, int rwflag, void *userdata);
 	static int passWrite(char *buf, int size, int rwflag, void *userdata);
 	static void dberr(const char *errpfx, char *msg);
+	static void dberr(DbEnv const *, const char *errpfx, char const *msg)
+	{
+	  dberr(errpfx, const_cast<char *>(msg));
+	}
 	static NewX509 *newX509();
 	static QString md5passwd(const char *pass);
 	static void Error(errorEx &err);


Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xca.spec	5 Mar 2005 20:07:09 -0000	1.5
+++ xca.spec	8 Mar 2005 17:17:21 -0000	1.6
@@ -1,23 +1,24 @@
-## For RHL7.3 compile with '--without desktop' flag
+## $Id$
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
-Version:	0.4.6
-Release:	1
+Version:	0.5.1
+Release:	%release_func 0
 License:	BSD
 Group:		Applications/Productivity
 URL:		http://www.hohnstaedt.de/xca.html
-Source0:	http://download.sourceforge.net/sourceforge/xca/%{name}-%{version}.tar.gz
-Source1:	http://www.hohnstaedt.de/xca/cxx_common.h
-Source2:	http://www.hohnstaedt.de/xca/cxx_except.h
-# http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/MainWindow.cpp?r1=1.33&r2=1.34&diff_format=u
-Patch0:		xca-0.4.6-gcc3.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source0:	http://download.sourceforge.net/sourceforge/xca/%name-%version.tar.gz
+Patch0:		%name-0.5.1-langinst.patch
+# http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/clicklabel.cpp?r1=1.3&r2=1.4&diff_format=u
+Patch1:		%name-0.5.1-gcc4.patch
+Patch2:		%name-0.5.1-db43.patch
+BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt-devel openssl-devel
 BuildRequires:	/usr/include/db.h
-%if 0%{!?_without_desktop:1}
 BuildRequires:	desktop-file-utils
-%endif
+
 
 %description
 The Program uses a Berkeley db for storage and supports RSA keys.
@@ -30,41 +31,31 @@
 
 %prep
 %setup -q
-%patch0 -p2 -b .gcc3
+%patch0 -p0 -b .langinst
+%patch1 -p2 -b .gcc4
+%patch2 -p1 -b .db43
 
+sed -i 's! db_cxx-4 ! db_cxx-4 db_cxx-4.3 !g' configure
 
-%build
-test -n "$QTDIR" || . %{_sysconfdir}/profile.d/qt.sh
-
-db_inc=/usr/include/db
-rpm -q db3-devel && db_inc=/usr/include/db3 || :
-rpm -q db4-devel && db_inc=/usr/include/db4 || :
-
-## Hacky workaround for broken db[34]-devel package:
-## https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=59759
-echo '#include "db_cxx.h"' | g++ -x c++ -E -I $db_inc - &>/dev/null || {
-	cp -a %{SOURCE1} %{SOURCE2} .
-	export CPPFLAGS="-I`pwd`"
-}
 
+%build
+test -n "$QTDIR" || . %_sysconfdir/profile.d/qt.sh
 CC='%__cc' LD='%__ld' CFLAGS="$RPM_OPT_FLAGS" STRIP=: prefix=%_prefix \
 ./configure
-%__make
+%__make %{?_smp_mflags}
+lrelease xca.pro
 
 
 %install
 rm -rf "$RPM_BUILD_ROOT" _doc
-%{__make} destdir="$RPM_BUILD_ROOT" install
+%__make destdir="$RPM_BUILD_ROOT" mandir=share/man install
 
-%{__install} -d -m755 _doc/html $RPM_BUILD_ROOT%{_datadir}/applications
-%{__install} -p -m644 doc/*.html _doc/html/
+%__install -d -m755 _doc/html $RPM_BUILD_ROOT%_datadir/applications
 
-%if 0%{!?_without_desktop:1}
 desktop-file-install --vendor fedora -m644 --delete-original	\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
+  --dir $RPM_BUILD_ROOT%_datadir/applications			\
   --add-category X-Fedora					\
-  $RPM_BUILD_ROOT%{_datadir}/applications/xca.desktop
-%endif
+  $RPM_BUILD_ROOT%_datadir/applications/xca.desktop
 
 
 %clean
@@ -73,21 +64,30 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYRIGHT _doc/html
+%doc AUTHORS COPYRIGHT
 %doc debian/changelog
-%{_bindir}/*
+%_bindir/*
+%_mandir/*/*
 %dir %{_datadir}/xca
-%{_datadir}/xca/*.png
-%{_datadir}/pixmaps/*.xpm
-%lang(de) %{_datadir}/xca/xca_de.qm
-%lang(es) %{_datadir}/xca/xca_es.qm
-
-%if 0%{!?_without_desktop:1}
-%{_datadir}/applications/*
-%endif
+%_datadir/xca/*.png
+%_datadir/xca/*.txt
+%_datadir/xca/*.html
+%_datadir/pixmaps/*.xpm
+%lang(de) %_datadir/xca/xca_de.qm
+%lang(es) %_datadir/xca/xca_es.qm
+
+%_datadir/applications/*
 
 
 %changelog
+* Tue Mar  8 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.1
+- updated to 0.5.1
+- (re)enabled parallel build
+- applied -langinst patch and other ideas from
+  https://bugzilla.fedora.us/show_bug.cgi?id=2019 (Ville Skytt??)
+- fixed build with gcc4 and db43
+- removed old cruft from the specfile
+
 * Sat Dec 13 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.4.6-0.fdr.1
 - changed compile/install commands to work with the new, yet-another configure system
 - removed libpthread test since it went upstream


--- xca-0.4.6-gcc3.patch DELETED ---


--- cxx_except.h DELETED ---


--- cxx_common.h DELETED ---



From fedora-extras-commits at redhat.com  Tue Mar  8 17:18:38 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 12:18:38 -0500
Subject: rpms/xca/devel sources,1.2,1.3
Message-ID: <200503081718.j28HIcSk029138@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29129

Modified Files:
	sources 
Log Message:
updated to 0.5.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:33:36 -0000	1.2
+++ sources	8 Mar 2005 17:18:36 -0000	1.3
@@ -1 +1,2 @@
 3defe69788b9e0eb738f374143be6e12  xca-0.4.6.tar.gz
+24e0289c189b8db2f1f15a4ddac1b1c3  xca-0.5.1.tar.gz



From nphilipp at redhat.com  Tue Mar  8 17:47:06 2005
From: nphilipp at redhat.com (Nils Philippsen)
Date: Tue, 08 Mar 2005 18:47:06 +0100
Subject: APPROVED: ppracer
Message-ID: <1110304026.14945.47.camel@wombat.tiptoe.de>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Name: PPRacer
PPRacer is a simple OpenGL-based racing game featuring Tux. The
objective of the game is to slide down a snow- and ice-covered mountain
as quickly as possible, avoiding the trees and rocks that will slow
you down.

Maintainer: Nils Philippsen
Reviewed by: Adrian Reber, Matthias Saou
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)

iD8DBQFCLs8LR9ibZWlRMBERAruPAJ0RHE65bEjQsmoC+VHQQKwT42WCdQCgqIMG
3OfvV6naC3kQz072jFl7Zzo=
=2QWK
-----END PGP SIGNATURE-----


-- 
     Nils Philippsen    /    Red Hat    /    nphilipp at redhat.com
"They that can give up essential liberty to obtain a little temporary
 safety deserve neither liberty nor safety."     -- B. Franklin, 1759
 PGP fingerprint:  C4A8 9474 5C4C ADE3 2B8F  656D 47D8 9B65 6951 3011



From fedora-extras-commits at redhat.com  Tue Mar  8 18:00:47 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 8 Mar 2005 13:00:47 -0500
Subject: rpms/perl-Glib/FC-3 .cvsignore, 1.3, 1.4 perl-Glib.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200503081800.j28I0lDb029439@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-serv29429/FC-3

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
Update to 1.080


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2005 03:09:08 -0000	1.3
+++ .cvsignore	8 Mar 2005 18:00:45 -0000	1.4
@@ -1 +1 @@
-Glib-1.062.tar.gz
+Glib-1.080.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-3/perl-Glib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Glib.spec	15 Feb 2005 03:09:08 -0000	1.5
+++ perl-Glib.spec	8 Mar 2005 18:00:45 -0000	1.6
@@ -1,15 +1,14 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Glib
-Version:        1.062
+Version:        1.080
 Release:        1
-Epoch:          0
 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.062.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-1.080.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
@@ -61,6 +60,9 @@
 
 
 %changelog
+* Tue Mar  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-1
+- Update to 1.080.
+
 * Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.062-1
 - Update to 1.062.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 03:09:08 -0000	1.3
+++ sources	8 Mar 2005 18:00:45 -0000	1.4
@@ -1 +1 @@
-ddbe549636215eaa1710937b2c723622  Glib-1.062.tar.gz
+b6cb2978519fc3ee882c2c4aa27cbdd1  Glib-1.080.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 18:00:47 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 8 Mar 2005 13:00:47 -0500
Subject: rpms/perl-Glib/devel .cvsignore, 1.3, 1.4 perl-Glib.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200503081800.j28I0ldn029444@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29429/devel

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
Update to 1.080


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2005 03:09:08 -0000	1.3
+++ .cvsignore	8 Mar 2005 18:00:45 -0000	1.4
@@ -1 +1 @@
-Glib-1.062.tar.gz
+Glib-1.080.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Glib.spec	3 Mar 2005 23:46:26 -0000	1.6
+++ perl-Glib.spec	8 Mar 2005 18:00:45 -0000	1.7
@@ -1,14 +1,14 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Glib
-Version:        1.062
+Version:        1.080
 Release:        1
 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.062.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-1.080.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Tue Mar  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-1
+- Update to 1.080.
+
 * Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.062-1
 - Update to 1.062.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 03:09:08 -0000	1.3
+++ sources	8 Mar 2005 18:00:45 -0000	1.4
@@ -1 +1 @@
-ddbe549636215eaa1710937b2c723622  Glib-1.062.tar.gz
+b6cb2978519fc3ee882c2c4aa27cbdd1  Glib-1.080.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 18:10:57 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 13:10:57 -0500
Subject: rpms/xca/devel sources,1.3,1.4
Message-ID: <200503081810.j28IAvUV030234@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30227

Modified Files:
	sources 
Log Message:
removed old tarball



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Mar 2005 17:18:36 -0000	1.3
+++ sources	8 Mar 2005 18:10:55 -0000	1.4
@@ -1,2 +1 @@
-3defe69788b9e0eb738f374143be6e12  xca-0.4.6.tar.gz
 24e0289c189b8db2f1f15a4ddac1b1c3  xca-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 18:11:46 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 13:11:46 -0500
Subject: rpms/xca/devel xca.spec,1.6,1.7
Message-ID: <200503081811.j28IBkOk030280@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30270

Modified Files:
	xca.spec 
Log Message:
removed all traces of _doc in %install; it is not used anymore



Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xca.spec	8 Mar 2005 17:17:21 -0000	1.6
+++ xca.spec	8 Mar 2005 18:11:44 -0000	1.7
@@ -47,10 +47,10 @@
 
 
 %install
-rm -rf "$RPM_BUILD_ROOT" _doc
+rm -rf "$RPM_BUILD_ROOT"
 %__make destdir="$RPM_BUILD_ROOT" mandir=share/man install
 
-%__install -d -m755 _doc/html $RPM_BUILD_ROOT%_datadir/applications
+%__install -d -m755 $RPM_BUILD_ROOT%_datadir/applications
 
 desktop-file-install --vendor fedora -m644 --delete-original	\
   --dir $RPM_BUILD_ROOT%_datadir/applications			\



From fedora-extras-commits at redhat.com  Tue Mar  8 18:21:22 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 13:21:22 -0500
Subject: rpms/mantis/devel .cvsignore,1.2,1.3
Message-ID: <200503081821.j28ILMCd030391@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mantis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30385/devel

Modified Files:
	.cvsignore 
Log Message:
updated



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:50:58 -0000	1.2
+++ .cvsignore	8 Mar 2005 18:21:20 -0000	1.3
@@ -1 +1,2 @@
-mantisbt-0.18.3.tar.gz
+mantis-*.tar.gz
+mantis-*.*.rpm



From fedora-extras-commits at redhat.com  Tue Mar  8 18:24:18 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 8 Mar 2005 13:24:18 -0500
Subject: rpms/mantis/devel mantis-0.19.2-noexamplecom.patch, NONE,
	1.1 mantis-0.19.2-noadmin.patch, NONE,
	1.1 mantis-0.19.2-iis.patch, NONE, 1.1 sources, 1.2,
	1.3 mantis.spec, 1.4, 1.5 mantis-0.18.3-noadmin.patch, 1.1,
	NONE mantis-0.18.3-iis.patch, 1.1,
	NONE mantis-0.18.3-email.patch, 1.1, NONE
Message-ID: <200503081824.j28IOIHu030460@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mantis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30454/devel

Modified Files:
	sources mantis.spec 
Added Files:
	mantis-0.19.2-noexamplecom.patch mantis-0.19.2-noadmin.patch 
	mantis-0.19.2-iis.patch 
Removed Files:
	mantis-0.18.3-noadmin.patch mantis-0.18.3-iis.patch 
	mantis-0.18.3-email.patch 
Log Message:
- updated to 0.19.2
- rediffed patches
- removed dependency on php-mysql as it supports PostgreSQL also
- added inline-hack to generate a PostgreSQL database creation script


mantis-0.19.2-noexamplecom.patch:

--- NEW FILE mantis-0.19.2-noexamplecom.patch ---
--- mantis-0.19.2/config_inc.php.sample.email	2004-09-12 14:23:36.000000000 +0200
+++ mantis-0.19.2/config_inc.php.sample	2005-03-07 17:52:02.000000000 +0100
@@ -34,14 +34,14 @@
 	$g_database_name = "bugtracker";
 
 	# --- email variables -------------
-	$g_administrator_email  = 'administrator at example.com';
-	$g_webmaster_email      = 'webmaster at example.com';
+	$g_administrator_email  = 'administrator at localhost';
+	$g_webmaster_email      = 'webmaster at localhost';
 
 	# the "From: " field in emails
-	$g_from_email           = 'noreply at example.com';
+	$g_from_email           = 'noreply at localhost';
 
 	# the return address for bounced mail
-	$g_return_path_email    = 'admin at example.com';
+	$g_return_path_email    = 'admin at localhost';
 
 	# --- file upload settings --------
 	# This is the master setting to disable *all* file uploading functionality
@@ -49,4 +49,4 @@
 	# The default value is ON but you must make sure file uploading is enabled
 	#  in PHP as well.  You may need to add "file_uploads = TRUE" to your php.ini.
 	$g_allow_file_upload	= ON;
-?>
\ No newline at end of file
+?>
--- mantis-0.19.2/config_defaults_inc.php.email	2005-03-07 17:49:31.000000000 +0100
+++ mantis-0.19.2/config_defaults_inc.php	2005-03-07 17:51:24.000000000 +0100
@@ -75,7 +75,7 @@
 		} else if ( isset( $_SERVER['SERVER_ADDR'] ) ) {
 			$t_host = $_SERVER['SERVER_ADDR'] . $t_port;
 		} else {
-			$t_host = 'www.example.com';
+			$t_host = 'localhost';
 		}
 
 		$t_path = dirname( $_SERVER['PHP_SELF'] );
@@ -85,7 +85,7 @@
 
 		$g_path	= $t_protocol . '://' . $t_host . $t_path.'/';
 	} else {
-		$g_path	= 'http://www.example.com/mantis/';
+		$g_path	= 'http://localhost/mantis/';
 	}
 
 	# path to your images directory (for icons)
@@ -170,14 +170,14 @@
 	#############################
 
 	# --- email variables -------------
-	$g_administrator_email	= 'administrator at example.com';
-	$g_webmaster_email		= 'webmaster at example.com';
+	$g_administrator_email	= 'administrator at localhost';
+	$g_webmaster_email		= 'webmaster at localhost';
 
 	# the 'From: ' field in emails
-	$g_from_email			= 'noreply at example.com';
+	$g_from_email			= 'noreply at localhost';
 
 	# the return address for bounced mail
-	$g_return_path_email	= 'admin at example.com';
+	$g_return_path_email	= 'admin at localhost';
 
 	# allow email notification
 	#  note that if this is disabled, sign-up and password reset messages will
@@ -711,7 +711,7 @@
 	# look in README.LDAP for details
 
 	# --- using openldap -------------
-	$g_ldap_server			= 'ldaps://ldap.example.com.au/';
+	$g_ldap_server			= 'ldaps://localhost/';
 	$g_ldap_port			= '636';
 	$g_ldap_root_dn			= 'dc=example,dc=com,dc=au';
 	$g_ldap_organization		= '';    # e.g. '(organizationname=*Traffic)'

mantis-0.19.2-noadmin.patch:

--- NEW FILE mantis-0.19.2-noadmin.patch ---
--- mantis-0.19.2/login_page.php.noadmin	2004-08-14 17:26:20.000000000 +0200
+++ mantis-0.19.2/login_page.php	2005-03-07 17:54:15.000000000 +0100
@@ -141,7 +141,7 @@
 
 	# Check if the admin directory is available and is readable.
 	$t_admin_dir = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR;
-	if ( is_dir( $t_admin_dir ) && is_readable( $t_admin_dir ) ) {
+	if ( 0 && is_dir( $t_admin_dir ) && is_readable( $t_admin_dir ) ) {
 			echo '<div class="warning" align="center">', "\n";
 			echo '<p><font color="red"><strong>WARNING:</strong> Admin directory should be removed.</font></p>', "\n";
 			echo '</div>', "\n";

mantis-0.19.2-iis.patch:

--- NEW FILE mantis-0.19.2-iis.patch ---
--- mantis-0.19.2/config_defaults_inc.php.iss	2004-12-11 08:21:52.000000000 +0100
+++ mantis-0.19.2/config_defaults_inc.php	2005-03-07 17:47:41.000000000 +0100
@@ -245,7 +245,7 @@
 
 	# set to OFF to disable email check
 	$g_validate_email		= ON;
-	$g_check_mx_record		= OFF;	# Not supported under Windows.
+	$g_check_mx_record		= ON;	# Not supported under Windows.
 
 	# if ON, allow the user to omit an email field
 	# note if you allow users to create their own accounts, they
@@ -1474,4 +1474,4 @@
 	# NOTE: These are meaningless under Windows! Just ignore them!
 	$g_dot_tool							= '/usr/bin/dot';
 	$g_neato_tool						= '/usr/bin/neato';
-?>
\ No newline at end of file
+?>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:50:58 -0000	1.2
+++ sources	8 Mar 2005 18:24:16 -0000	1.3
@@ -1 +1 @@
-a0695e6d562778f8728d8f7ac963d8dd  mantisbt-0.18.3.tar.gz
+042c42c6de3bc536181391c1e9b25db3  mantis-0.19.2.tar.gz


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mantis.spec	3 Mar 2005 23:01:24 -0000	1.4
+++ mantis.spec	8 Mar 2005 18:24:16 -0000	1.5
@@ -1,24 +1,26 @@
 # $Id$
 
-%define pkgdir		%{_datadir}/%{name}
-%define cfgdir		%{_sysconfdir}/%{name}
-%define httpconfdir	%{_sysconfdir}/httpd/conf.d
+%global pkgdir		%{_datadir}/%{name}
+%global cfgdir		%{_sysconfdir}/%{name}
+%global httpconfdir	%{_sysconfdir}/httpd/conf.d
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	Web-based bugtracking system
 Name:		mantis
-Version:	0.18.3
-Release:	2
+Version:	0.19.2
+Release:	%release_func 0
 License:	GPL
 Group:		Applications/Internet
 URL:		http://mantisbt.sourceforge.net/
 BuildArch:	noarch
-Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}bt-%{version}%{?alpha}.tar.gz
-Patch0:		mantis-0.18.3-iis.patch
-Patch1:		mantis-0.18.3-email.patch
-Patch2:		mantis-0.18.3-noadmin.patch
+Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}-%{version}%{?alpha}.tar.gz
+Patch0:		mantis-0.19.2-iis.patch
+Patch1:		mantis-0.19.2-noexamplecom.patch
+Patch2:		mantis-0.19.2-noadmin.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	diffutils
-Requires:	php php-mysql
+Requires:	php
 Requires:	mantis-config
 
 %package config-httpd
@@ -51,15 +53,27 @@
 
 
 %prep
-%setup -q -n %{name}bt-%{version}%{?alpha}
+%setup -q
 %patch0 -p1 -b .iis
-%patch1 -p1 -b .email
+%patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
 
 chmod -x *.php
-find -name '.cvsignore' -exec rm -f {} \;
 rm -rf packages
 
+sed -e '$s!CONCAT.*!md5(random()*random())||md5(now()));!;
+	s! COMMENT=.*;!;!;
+	s! UNIQUE KEY [^ ]* ! UNIQUE !g;
+	s!^\( *\)KEY .*[^,]\(,\?\)$!\1CHECK (TRUE)\2!;
+	s! tinyint! int!;
+	s! unsigned ! !g;
+	s! longblob ! text !g;
+	s! datetime ! timestamp with time zone !g;
+	s!TYPE=MyISAM!WITHOUT OIDS!g;
+	s!^#!-- !;
+	s! int.*auto_increment! SERIAL!;
+	s! int([0-9]*) ! int !' sql/db_generate.sql >sql/db_generate-psql.sql
+
 
 %install
 rm -rf "$RPM_BUILD_ROOT"
@@ -69,12 +83,18 @@
 
 tar cf - . | tar xf - -C $RPM_BUILD_ROOT%{pkgdir}
 
+
+find $RPM_BUILD_ROOT \( \
+	-name '*.noexamplecom' -o -name '*.iis' -o -name '*.noadmin' -o -name '*.#.*' -o \
+	-name '.cvsignore' \
+	\) -print0 | xargs -0 rm -f
+
 ## Do not rename; the *existence* of this file will be checked to
 ## determine if mantis is offline
 mv $RPM_BUILD_ROOT%{pkgdir}/mantis_offline.php.sample $RPM_BUILD_ROOT%{cfgdir}/
 mv $RPM_BUILD_ROOT%{pkgdir}/config_inc.php.sample     $RPM_BUILD_ROOT%{cfgdir}/config_inc.php
 
-ln -s %{cfgdir}/config_inc.php     $RPM_BUILD_ROOT%{pkgdir}/config_inc.php
+ln -s %{cfgdir}/config_inc.php	   $RPM_BUILD_ROOT%{pkgdir}/config_inc.php
 ln -s %{cfgdir}/mantis_offline.php $RPM_BUILD_ROOT%{pkgdir}/mantis_offline.php
 
 
@@ -117,6 +137,12 @@
 
 
 %changelog
+* Mon Mar  7 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.19.2-1
+- updated to 0.19.2
+- rediffed patches
+- removed dependency on php-mysql as it supports PostgreSQL also
+- added inline-hack to generate a PostgreSQL database creation script
+
 * Thu May 27 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.18.3-0.fdr.2
 - ship doc/ in the program-directory instead of copying it into %%docdir
 - modified shipped httpd configuration to disable admin/ directory


--- mantis-0.18.3-noadmin.patch DELETED ---


--- mantis-0.18.3-iis.patch DELETED ---


--- mantis-0.18.3-email.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Mar  8 18:28:39 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 8 Mar 2005 13:28:39 -0500
Subject: rpms/perl-Gtk2/devel .cvsignore, 1.3, 1.4 perl-Gtk2.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200503081828.j28ISdsn030587@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30569/devel

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Update to 1.080


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2005 03:21:00 -0000	1.3
+++ .cvsignore	8 Mar 2005 18:28:36 -0000	1.4
@@ -1 +1 @@
-Gtk2-1.062.tar.gz
+Gtk2-1.080.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Gtk2.spec	3 Mar 2005 23:46:26 -0000	1.5
+++ perl-Gtk2.spec	8 Mar 2005 18:28:36 -0000	1.6
@@ -1,18 +1,18 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Gtk2
-Version:        1.062
+Version:        1.080
 Release:        1
 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.062.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.080.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl(Glib) >= 1.062
+BuildRequires:  gtk2-devel, perl(Glib) >= 1.080
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Mar  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-1
+- Update to 1.080.
+
 * Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.062-1
 - Update to 1.062.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 03:21:00 -0000	1.3
+++ sources	8 Mar 2005 18:28:36 -0000	1.4
@@ -1 +1 @@
-cbca72d71fa470157d139c2bf659c040  Gtk2-1.062.tar.gz
+fa9bf175f72291ae7d843912fed4651a  Gtk2-1.080.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 18:28:39 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 8 Mar 2005 13:28:39 -0500
Subject: rpms/perl-Gtk2/FC-3 .cvsignore, 1.3, 1.4 perl-Gtk2.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200503081828.j28ISdZ3030583@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-serv30569/FC-3

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Update to 1.080


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2005 03:21:00 -0000	1.3
+++ .cvsignore	8 Mar 2005 18:28:36 -0000	1.4
@@ -1 +1 @@
-Gtk2-1.062.tar.gz
+Gtk2-1.080.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-3/perl-Gtk2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Gtk2.spec	15 Feb 2005 03:30:46 -0000	1.4
+++ perl-Gtk2.spec	8 Mar 2005 18:28:36 -0000	1.5
@@ -1,19 +1,18 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Gtk2
-Version:        1.062
+Version:        1.080
 Release:        1
-Epoch:          0
 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.062.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.080.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl(Glib) >= 0:1.062
+BuildRequires:  gtk2-devel, perl(Glib) >= 1.080
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -62,6 +61,9 @@
 
 
 %changelog
+* Tue Mar  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-1
+- Update to 1.080.
+
 * Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.062-1
 - Update to 1.062.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 03:21:00 -0000	1.3
+++ sources	8 Mar 2005 18:28:36 -0000	1.4
@@ -1 +1 @@
-cbca72d71fa470157d139c2bf659c040  Gtk2-1.062.tar.gz
+fa9bf175f72291ae7d843912fed4651a  Gtk2-1.080.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 19:18:02 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 8 Mar 2005 14:18:02 -0500
Subject: devel/sylpheed sylpheed.spec,1.3,1.4
Message-ID: <200503081918.j28JI2cQ031531@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/sylpheed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31525

Modified Files:
	sylpheed.spec 
Log Message:
 


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sylpheed.spec	5 Mar 2005 21:10:24 -0000	1.3
+++ sylpheed.spec	8 Mar 2005 19:18:00 -0000	1.4
@@ -59,7 +59,6 @@
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category Application \
 	--add-category Network \
-	--add-category X-Red-Hat-Extra \
 	--add-category X-Fedora-Extra \
 	sylpheed.desktop
 install -d $RPM_BUILD_ROOT%{_mandir}/man1/



From fedora-extras-commits at redhat.com  Tue Mar  8 19:28:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 8 Mar 2005 14:28:50 -0500
Subject: rpms/libsamplerate import.log,1.7,1.8
Message-ID: <200503081928.j28JSoUt031642@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libsamplerate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31633

Modified Files:
	import.log 
Log Message:
auto-import libsamplerate-0.1.2-0.fdr.1.2 on branch FC-2 from libsamplerate-0.1.2-0.fdr.1.2.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=2242


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	5 Mar 2005 01:48:09 -0000	1.7
+++ import.log	8 Mar 2005 19:28:47 -0000	1.8
@@ -4,3 +4,4 @@
 libsamplerate-0_0_15-0_fdr_5_2:HEAD:libsamplerate-0.0.15-0.fdr.5.2.src.rpm:1099889206
 libsamplerate-0_1_2-1:FC-3:libsamplerate-0.1.2-1.src.rpm:1109987246
 libsamplerate-0_1_2-2:HEAD:libsamplerate-0.1.2-2.src.rpm:1109987299
+libsamplerate-0_1_2-0_fdr_1_2:FC-2:libsamplerate-0.1.2-0.fdr.1.2.src.rpm:1110310118



From fedora-extras-commits at redhat.com  Tue Mar  8 19:28:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 8 Mar 2005 14:28:50 -0500
Subject: rpms/libsamplerate/FC-2 .cvsignore, 1.2, 1.3 libsamplerate.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200503081928.j28JSoLs031646@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libsamplerate/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31633/FC-2

Modified Files:
	.cvsignore libsamplerate.spec sources 
Log Message:
auto-import libsamplerate-0.1.2-0.fdr.1.2 on branch FC-2 from libsamplerate-0.1.2-0.fdr.1.2.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=2242


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:46:28 -0000	1.2
+++ .cvsignore	8 Mar 2005 19:28:48 -0000	1.3
@@ -1 +1 @@
-libsamplerate-0.0.15.tar.gz
+libsamplerate-0.1.2.tar.gz


Index: libsamplerate.spec
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/FC-2/libsamplerate.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsamplerate.spec	8 Nov 2004 04:46:46 -0000	1.4
+++ libsamplerate.spec	8 Mar 2005 19:28:48 -0000	1.5
@@ -1,20 +1,19 @@
 Summary: 	A library for performing sample rate conversion on audio.
 Name: 		libsamplerate
-Version: 	0.0.15
-Release: 	0.fdr.5.2
+Version: 	0.1.2
+Release: 	0.fdr.1.2
 Epoch: 		0
 License: 	GPL
 Group: 		System Environment/Libraries
 URL: 		http://www.mega-nerd.com/SRC/
 Source0: 	http://www.mega-nerd.com/SRC/%{name}-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	libsndfile-devel >= 0:1.0.2
-BuildRequires:	pkgconfig fftw-devel
+BuildRequires:	libsndfile-devel >= 0:1.0.6 pkgconfig
 
 %package devel
 Summary: 	Development package for %{name}
 Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
+Requires: 	%{name} = %{epoch}:%{version}-%{release} pkgconfig
 
 # -----------------------------------------------------------------------------
 
@@ -41,17 +40,21 @@
 # -----------------------------------------------------------------------------
 
 %build
-%configure
+%configure --disable-dependency-tracking --disable-fftw
 make %{?_smp_mflags} 
 
 # -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT _doc
-%makeinstall
-mkdir _doc 
+make install DESTDIR=$RPM_BUILD_ROOT
 cp -a doc _doc
-rm _doc/doc/Makefile* _doc/doc/NEWS _doc/doc/ChangeLog
+rm _doc/Makefile* _doc/NEWS _doc/ChangeLog
+
+
+%check || :
+make check
+
 
 # -----------------------------------------------------------------------------
 
@@ -64,10 +67,9 @@
 %postun -p /sbin/ldconfig
 
 
-
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog _doc/doc/*
+%doc AUTHORS COPYING ChangeLog NEWS README _doc/*
 %{_bindir}/sndfile-resample
 %{_libdir}/%{name}.so.*
 
@@ -82,6 +84,12 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Oct 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.1.2-0.fdr.1
+- Update to 0.1.2.
+- Use "make install DESTDIR=...", disable dependency tracking.
+- Run tests during build.
+- Drop fftw-devel build dep, it's only for an optional part of the test suite.
+
 * Tue Jul 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.0.15-0.fdr.5
 - Fix %%postun (#1665).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:46:28 -0000	1.2
+++ sources	8 Mar 2005 19:28:48 -0000	1.3
@@ -1 +1 @@
-6b15cc39d1275f1118de4d57f89544eb  libsamplerate-0.0.15.tar.gz
+06861c2c6b8e5273c9b80cf736b9fd0e  libsamplerate-0.1.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 19:30:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 8 Mar 2005 14:30:11 -0500
Subject: rpms/libsndfile import.log,1.7,1.8
Message-ID: <200503081930.j28JUBp8031771@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libsndfile
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31762

Modified Files:
	import.log 
Log Message:
auto-import libsndfile-1.0.11-0.fdr.2.1 on branch FC-1 from libsndfile-1.0.11-0.fdr.2.1.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=2156


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	5 Mar 2005 01:44:40 -0000	1.7
+++ import.log	8 Mar 2005 19:30:09 -0000	1.8
@@ -4,3 +4,4 @@
 libsndfile-1_0_4-0_fdr_1_2:HEAD:libsndfile-1.0.4-0.fdr.1.2.src.rpm:1099889278
 libsndfile-1_0_11-1:FC-3:libsndfile-1.0.11-1.src.rpm:1109987031
 libsndfile-1_0_11-2:HEAD:libsndfile-1.0.11-2.src.rpm:1109987091
+libsndfile-1_0_11-0_fdr_2_1:FC-1:libsndfile-1.0.11-0.fdr.2.1.src.rpm:1110310200



From fedora-extras-commits at redhat.com  Tue Mar  8 19:30:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 8 Mar 2005 14:30:11 -0500
Subject: rpms/libsndfile/FC-1 libsndfile-1.0.11-svx-channels.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 libsndfile.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200503081930.j28JUBJn031779@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libsndfile/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31762/FC-1

Modified Files:
	.cvsignore libsndfile.spec sources 
Added Files:
	libsndfile-1.0.11-svx-channels.patch 
Log Message:
auto-import libsndfile-1.0.11-0.fdr.2.1 on branch FC-1 from libsndfile-1.0.11-0.fdr.2.1.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=2156

libsndfile-1.0.11-svx-channels.patch:

--- NEW FILE libsndfile-1.0.11-svx-channels.patch ---
diff -Nur libsndfile-1.0.11-orig/src/svx.c libsndfile-1.0.11/src/svx.c
--- libsndfile-1.0.11-orig/src/svx.c	2004-10-17 02:46:34.000000000 +0200
+++ libsndfile-1.0.11/src/svx.c	2005-03-05 02:08:14.094919120 +0100
@@ -280,7 +280,7 @@
 
 					bytecount += psf_binheader_readf (psf, "E4", &channels) ;
 
-					psf_log_printf (psf, "  Channels : %d => %d\n", channels) ;
+					psf_log_printf (psf, "  Channels : %d\n", channels) ;
 
 					psf_binheader_readf (psf, "j", dword - bytecount) ;
 					break ;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-1/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:47:40 -0000	1.2
+++ .cvsignore	8 Mar 2005 19:30:09 -0000	1.3
@@ -1 +1 @@
-libsndfile-1.0.4.tar.gz
+libsndfile-1.0.11.tar.gz


Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-1/libsndfile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsndfile.spec	8 Nov 2004 04:47:52 -0000	1.3
+++ libsndfile.spec	8 Mar 2005 19:30:09 -0000	1.4
@@ -1,19 +1,21 @@
-Summary: 	A library for reading and writing sound files.
+Summary: 	Library for reading and writing sound files
 Name: 		libsndfile
-Version: 	1.0.4
-Release: 	0.fdr.1.1
-Epoch:		0
+Version: 	1.0.11
+Release: 	0.fdr.2.1
 License: 	LGPL
 Group: 		System Environment/Libraries
-URL: 		http://www.zip.com.au/~erikd/libsndfile/
-Source0: 	http://www.zip.com.au/~erikd/libsndfile/%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	pkgconfig
+URL: 		http://www.mega-nerd.com/libsndfile/
+Source0: 	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:		libsndfile-1.0.11-svx-channels.patch
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+
+BuildRequires:  alsa-lib-devel
+Provides:       %{name}-octave = %{version}-%{release}
 
 %package devel
-Summary:	Development files for libsndfile.
+Summary:	Development files for libsndfile
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release} pkgconfig
 
 %description
 libsndfile is a C library for reading and writing sound files such as
@@ -27,19 +29,32 @@
 AIFF, AU, WAV, and others through one standard interface. 
 This package contains files needed to develop with libsndfile.
 
+
 %prep
 %setup -q
+%patch0 -p1 -b .svx-channels
+
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
+
 %install
-rm -rf %{buildroot}
-%makeinstall
+rm -rf $RPM_BUILD_ROOT __docs
+make install DESTDIR=$RPM_BUILD_ROOT
+cp -pR $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev/html __docs
+rm -rf $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -51,18 +66,34 @@
 %{_mandir}/man1/sndfile-play.1*
 %{_mandir}/man1/sndfile-convert.1*
 %{_libdir}/%{name}.so.*
-%{_datadir}/octave/site/m/sndfile_load.m
-%{_datadir}/octave/site/m/sndfile_play.m
-%{_datadir}/octave/site/m/sndfile_save.m
+%{_datadir}/octave
 
 %files devel
 %defattr(-,root,root,-)
+%doc __docs/*
 %exclude %{_libdir}/%{name}.la
 %{_includedir}/sndfile.h
 %{_libdir}/%{name}.so
 %{_libdir}/%{name}.a
 %{_libdir}/pkgconfig/sndfile.pc
 
+
 %changelog
+* Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.11-0.fdr.2
+- Fix format string bug (#149863).
+- Drop explicit Epoch 0.
+
+* Sat Dec  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.11-0.fdr.1
+- Update to 1.0.11.
+
+* Wed Oct 13 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.10-0.fdr.1
+- Update to 1.0.10, update URLs, include ALSA support.
+- Disable dependency tracking to speed up the build.
+- Add missing ldconfig invocations.
+- Make -devel require pkgconfig.
+- Include developer docs in -devel.
+- Provide -octave in main package, own more related dirs.
+- Bring specfile up to date with current spec templates.
+
 * Sat Apr 12 2003 Dams <anvil[AT]livna.org> 
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-1/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:47:40 -0000	1.2
+++ sources	8 Mar 2005 19:30:09 -0000	1.3
@@ -1 +1 @@
-33929011f48fa2a4b72baf54c69196c5  libsndfile-1.0.4.tar.gz
+9ec0b3610041423a57387f284849f2fc  libsndfile-1.0.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 19:31:09 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 8 Mar 2005 14:31:09 -0500
Subject: rpms/libsndfile import.log,1.8,1.9
Message-ID: <200503081931.j28JV9RJ031901@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libsndfile
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31892

Modified Files:
	import.log 
Log Message:
auto-import libsndfile-1.0.11-0.fdr.2.2 on branch FC-2 from libsndfile-1.0.11-0.fdr.2.2.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=2156


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	8 Mar 2005 19:30:09 -0000	1.8
+++ import.log	8 Mar 2005 19:31:07 -0000	1.9
@@ -5,3 +5,4 @@
 libsndfile-1_0_11-1:FC-3:libsndfile-1.0.11-1.src.rpm:1109987031
 libsndfile-1_0_11-2:HEAD:libsndfile-1.0.11-2.src.rpm:1109987091
 libsndfile-1_0_11-0_fdr_2_1:FC-1:libsndfile-1.0.11-0.fdr.2.1.src.rpm:1110310200
+libsndfile-1_0_11-0_fdr_2_2:FC-2:libsndfile-1.0.11-0.fdr.2.2.src.rpm:1110310259



From fedora-extras-commits at redhat.com  Tue Mar  8 19:31:09 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 8 Mar 2005 14:31:09 -0500
Subject: rpms/libsndfile/FC-2 libsndfile-1.0.11-svx-channels.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 libsndfile.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200503081931.j28JV9WY031905@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libsndfile/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31892/FC-2

Modified Files:
	.cvsignore libsndfile.spec sources 
Added Files:
	libsndfile-1.0.11-svx-channels.patch 
Log Message:
auto-import libsndfile-1.0.11-0.fdr.2.2 on branch FC-2 from libsndfile-1.0.11-0.fdr.2.2.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=2156

libsndfile-1.0.11-svx-channels.patch:

--- NEW FILE libsndfile-1.0.11-svx-channels.patch ---
diff -Nur libsndfile-1.0.11-orig/src/svx.c libsndfile-1.0.11/src/svx.c
--- libsndfile-1.0.11-orig/src/svx.c	2004-10-17 02:46:34.000000000 +0200
+++ libsndfile-1.0.11/src/svx.c	2005-03-05 02:08:14.094919120 +0100
@@ -280,7 +280,7 @@
 
 					bytecount += psf_binheader_readf (psf, "E4", &channels) ;
 
-					psf_log_printf (psf, "  Channels : %d => %d\n", channels) ;
+					psf_log_printf (psf, "  Channels : %d\n", channels) ;
 
 					psf_binheader_readf (psf, "j", dword - bytecount) ;
 					break ;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:47:40 -0000	1.2
+++ .cvsignore	8 Mar 2005 19:31:07 -0000	1.3
@@ -1 +1 @@
-libsndfile-1.0.4.tar.gz
+libsndfile-1.0.11.tar.gz


Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-2/libsndfile.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsndfile.spec	8 Nov 2004 04:47:58 -0000	1.4
+++ libsndfile.spec	8 Mar 2005 19:31:07 -0000	1.5
@@ -1,19 +1,21 @@
-Summary: 	A library for reading and writing sound files.
+Summary: 	Library for reading and writing sound files
 Name: 		libsndfile
-Version: 	1.0.4
-Release: 	0.fdr.1.2
-Epoch:		0
+Version: 	1.0.11
+Release: 	0.fdr.2.2
 License: 	LGPL
 Group: 		System Environment/Libraries
-URL: 		http://www.zip.com.au/~erikd/libsndfile/
-Source0: 	http://www.zip.com.au/~erikd/libsndfile/%{name}-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	pkgconfig
+URL: 		http://www.mega-nerd.com/libsndfile/
+Source0: 	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:		libsndfile-1.0.11-svx-channels.patch
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+
+BuildRequires:  alsa-lib-devel
+Provides:       %{name}-octave = %{version}-%{release}
 
 %package devel
-Summary:	Development files for libsndfile.
+Summary:	Development files for libsndfile
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release} pkgconfig
 
 %description
 libsndfile is a C library for reading and writing sound files such as
@@ -27,19 +29,32 @@
 AIFF, AU, WAV, and others through one standard interface. 
 This package contains files needed to develop with libsndfile.
 
+
 %prep
 %setup -q
+%patch0 -p1 -b .svx-channels
+
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
+
 %install
-rm -rf %{buildroot}
-%makeinstall
+rm -rf $RPM_BUILD_ROOT __docs
+make install DESTDIR=$RPM_BUILD_ROOT
+cp -pR $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev/html __docs
+rm -rf $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -51,18 +66,34 @@
 %{_mandir}/man1/sndfile-play.1*
 %{_mandir}/man1/sndfile-convert.1*
 %{_libdir}/%{name}.so.*
-%{_datadir}/octave/site/m/sndfile_load.m
-%{_datadir}/octave/site/m/sndfile_play.m
-%{_datadir}/octave/site/m/sndfile_save.m
+%{_datadir}/octave
 
 %files devel
 %defattr(-,root,root,-)
+%doc __docs/*
 %exclude %{_libdir}/%{name}.la
 %{_includedir}/sndfile.h
 %{_libdir}/%{name}.so
 %{_libdir}/%{name}.a
 %{_libdir}/pkgconfig/sndfile.pc
 
+
 %changelog
+* Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.11-0.fdr.2
+- Fix format string bug (#149863).
+- Drop explicit Epoch 0.
+
+* Sat Dec  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.11-0.fdr.1
+- Update to 1.0.11.
+
+* Wed Oct 13 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.10-0.fdr.1
+- Update to 1.0.10, update URLs, include ALSA support.
+- Disable dependency tracking to speed up the build.
+- Add missing ldconfig invocations.
+- Make -devel require pkgconfig.
+- Include developer docs in -devel.
+- Provide -octave in main package, own more related dirs.
+- Bring specfile up to date with current spec templates.
+
 * Sat Apr 12 2003 Dams <anvil[AT]livna.org> 
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:47:40 -0000	1.2
+++ sources	8 Mar 2005 19:31:07 -0000	1.3
@@ -1 +1 @@
-33929011f48fa2a4b72baf54c69196c5  libsndfile-1.0.4.tar.gz
+9ec0b3610041423a57387f284849f2fc  libsndfile-1.0.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar  8 21:49:52 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 8 Mar 2005 16:49:52 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.8,1.9
Message-ID: <200503082149.j28Lnqhx001657@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1651

Modified Files:
	ppracer.spec 
Log Message:
bump release



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ppracer.spec	8 Mar 2005 16:21:47 -0000	1.8
+++ ppracer.spec	8 Mar 2005 21:49:50 -0000	1.9
@@ -6,7 +6,7 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 2
+Release: 3
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de



From dgregor at redhat.com  Tue Mar  8 19:31:08 2005
From: dgregor at redhat.com (Dennis Gregorovic)
Date: Tue, 08 Mar 2005 14:31:08 -0500
Subject: perl-Class-MethodMaker FC3 branch
Message-ID: <1110310269.7290.0.camel@localhost.localdomain>

Please create the FC-3 branch of perl-Class-MethodMaker.

Thanks
-- Dennis



From fedora-extras-commits at redhat.com  Wed Mar  9 08:00:03 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 9 Mar 2005 03:00:03 -0500
Subject: devel/jabberd jabberd.spec,1.1,1.2
Message-ID: <200503090800.j29803oH010739@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730

Modified Files:
	jabberd.spec 
Log Message:
* made password more random (/dev/random)
* replace password in the config without making it visible in ps
* enable ldap, mysql, postgresql backends
* remove dependency on perl during build
* make pam default authentication backend in c2s.xml
* make files in etc (640, jabber, jabber)
* enabled SSL certificate in c2s.xml
* enabled auto creation of accounts in sm.xml (necessary for usage with PAM)
* enabled require-startls



Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jabberd.spec	7 Mar 2005 08:23:35 -0000	1.1
+++ jabberd.spec	9 Mar 2005 08:00:01 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:        OpenSource server implementation of the Jabber protocols
 Name:           jabberd
 Version:        2.0
-Release:        0.s6.3
+Release:        0.s6.4
 Epoch:          0
 License:        GPL
 Group:          System Environment/Daemons
@@ -9,7 +9,8 @@
 Source1:        jabberd
 URL:            http://jabberd.jabberstudio.org/2/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  openssl-devel, db4-devel, libidn-devel, pam-devel
+BuildRequires:  openssl-devel db4-devel libidn-devel pam-devel
+BuildRequires:  openldap-devel postgresql-devel mysql-devel
 Requires(post): openssl
 
 %description
@@ -22,14 +23,19 @@
 from the ground up to be scalable, architecturally sound, and to support the
 latest protocol extensions coming out of the JSF.
 
+This packages defaults to use pam and the Berkeley DB.
+
 %prep
 %setup -q -n %{name}-%{version}s6
 
 %build
 %define _sysconfdir /etc/jabberd
 %define sysconfdir /etc/jabberd
-%{__perl} -pi -e 's,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g' configure
-%configure --enable-db --disable-mysql --enable-pam
+%{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g" \
+		configure
+%configure --enable-db --enable-mysql --enable-pam --enable-ldap \
+		--enable-pgsql --with-extra-library-path=%{_libdir}/mysql \
+		--enable-debug
 %{__make} %{?_smp_mflags}
 
 %install
@@ -45,9 +51,11 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
 %{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
-%{__perl} -pi -e 's,__BINDIR__,%{_bindir},g; \
-                  s,__ETCDIR__,%{sysconfdir},g; \
-                  s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g;' \
+%{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
+          $RPM_BUILD_ROOT%{_initrddir}/%{name}
+%{__sed} -i -e "s,__ETCDIR__,%{sysconfdir},g" \
+          $RPM_BUILD_ROOT%{_initrddir}/%{name}
+%{__sed} -i -e "s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g" \
           $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
@@ -59,9 +67,25 @@
 session    required     pam_stack.so service=system-auth
 END
 
+#default driver for storage
 %{__sed} -i -e "s,<driver>mysql</driver>,<driver>db</driver>,g" \
 	$RPM_BUILD_ROOT%{sysconfdir}/sm.xml
 
+#default authentication backend
+%{__sed} -i -e "s,<module>mysql</module>,<module>pam</module>,g" \
+	$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
+
+#enable SSL certificate
+%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <pemfile>/etc/jabberd/server.pem</pemfile>\n    -->,<pemfile>/etc/jAbberd/server.pem</pemfile>,g' $RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
+
+#the default pam backend needs auto creation of accounts
+%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <auto-create/>\n    -->,<auto-create/>,g' \
+	$RPM_BUILD_ROOT%{sysconfdir}/sm.xml
+
+#clients must do STARTTLS
+%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <require-startls/>\n    -->,<require-startls/>,g' \
+	$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
+
 #ghost file
 touch $RPM_BUILD_ROOT%{sysconfdir}/server.pem
 
@@ -78,11 +102,16 @@
 	#register %{name} service
 	/sbin/chkconfig --add %{name}
 	#replace default passwords, yet another hack 
-	export NEWPASS="$RANDOM-newpass-$RANDOM"
+	export NEWPASS=$( dd if=/dev/urandom bs=20 count=1 2>/dev/null \
+				| sha1sum | awk '{print $1}' )
 	cd %{sysconfdir}
-	%{__perl} -pi -e "s,<secret>secret</secret>,<secret>$NEWPASS</secret>,g" router-users.xml
-	%{__perl} -pi -e "s,<secret>secret</secret>,<secret>$NEWPASS</secret>,g" router.xml
-	%{__perl} -pi -e "s,<pass>secret</pass>,<pass>$NEWPASS</pass>,g" *.xml
+	%{__sed} -i -f- router-users.xml router.xml <<END
+s,<secret>secret</secret>,<secret>$NEWPASS</secret>,g
+END
+	%{__sed} -i -f- *.xml <<END
+s,<pass>secret</pass>,<pass>$NEWPASS</pass>,g
+END
+
 fi
 
 #create ssl certificate
@@ -111,7 +140,8 @@
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README PROTOCOL TODO
 %{_bindir}/*
-%config(noreplace) %{sysconfdir}/
+%attr(750, jabber, jabber) %dir %{sysconfdir}/
+%attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/*
 %{_datadir}/man/man8/*
 %{_datadir}/%{name}/
 %config(noreplace) %{_initrddir}/%{name}
@@ -120,6 +150,17 @@
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
+- made password more random (/dev/random)
+- replace password in the config without making it visible in ps
+- enable ldap, mysql, postgresql backends
+- remove dependency on perl during build
+- make pam default authentication backend in c2s.xml
+- make files in etc (640, jabber, jabber)
+- enabled SSL certificate in c2s.xml
+- enabled auto creation of accounts in sm.xml (necessary for usage with PAM)
+- enabled require-startls
+
 * Mon Mar 07 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.3
 - changed startscript again
 



From nphilipp at redhat.com  Wed Mar  9 08:15:05 2005
From: nphilipp at redhat.com (Nils Philippsen)
Date: Wed, 09 Mar 2005 09:15:05 +0100
Subject: APPROVED: bzflag
Message-ID: <1110356105.8121.2.camel@gibraltar.stuttgart.redhat.com>

Name: BZFlag
BZFlag is a 3D multi-player tank battle game  that  allows users to play
against each other in a networked environment.  There are five teams: red,
green, blue, purple and rogue (rogue tanks are black).  Destroying a player
on another team  scores a win, while being destroyed or destroying a teammate
scores a loss.  Rogues have no teammates (not even other rogues), so they
cannot shoot teammates and they do not have a team score.
There are two main styles of play: capture-the-flag and free-for-all.

Maintainer: Nils Philippsen
Reviewed by: Adrian Reber
-- 
     Nils Philippsen    /    Red Hat    /    nphilipp at redhat.com
"They that can give up essential liberty to obtain a little temporary
 safety deserve neither liberty nor safety."     -- B. Franklin, 1759
 PGP fingerprint:  C4A8 9474 5C4C ADE3 2B8F  656D 47D8 9B65 6951 3011
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050309/1cec2fbf/attachment-0001.sig>

From wtogami at redhat.com  Wed Mar  9 08:35:22 2005
From: wtogami at redhat.com (Warren Togami)
Date: Tue, 08 Mar 2005 22:35:22 -1000
Subject: devel/jabberd jabberd.spec,1.1,1.2
In-Reply-To: <200503090800.j29803oH010739@cvs-int.fedora.redhat.com>
References: <200503090800.j29803oH010739@cvs-int.fedora.redhat.com>
Message-ID: <422EB54A.3030701@redhat.com>

Adrian Reber (adrian) wrote:
>  
>  %changelog
> +* Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
> +- made password more random (/dev/random)

If /dev/random is used instead of /dev/urandom, is it possible that it 
will totally fail in the (extremely) unlikely case of there being no 
entropy?  Or will it just wait until it has enough entropy before returning?

Warren Togami
wtogami at redhat.com



From rc040203 at freenet.de  Wed Mar  9 10:34:54 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Wed, 09 Mar 2005 11:34:54 +0100
Subject: devel/jabberd jabberd.spec,1.1,1.2
In-Reply-To: <200503090800.j29803oH010739@cvs-int.fedora.redhat.com>
References: <200503090800.j29803oH010739@cvs-int.fedora.redhat.com>
Message-ID: <1110364494.7140.307.camel@mccallum.corsepiu.local>

On Wed, 2005-03-09 at 03:00 -0500, Adrian Reber wrote:
> Author: adrian
> 
> Update of /cvs/extras/devel/jabberd
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730


> @@ -45,9 +51,11 @@
>  %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
>  %{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
>  
> -%{__perl} -pi -e 's,__BINDIR__,%{_bindir},g; \
> -                  s,__ETCDIR__,%{sysconfdir},g; \
> -                  s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g;' \
> +%{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
> +          $RPM_BUILD_ROOT%{_initrddir}/%{name}
> +%{__sed} -i -e "s,__ETCDIR__,%{sysconfdir},g" \
> +          $RPM_BUILD_ROOT%{_initrddir}/%{name}
> +%{__sed} -i -e "s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g" \
>            $RPM_BUILD_ROOT%{_initrddir}/%{name}
>  
>  %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/

Any particular reason to use several sed-calls? 

One sed-call should be sufficient:

%{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
            -e "s,__ETCDIR__,%{sysconfdir},g" \
            -e "s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g" \
             $RPM_BUILD_ROOT%{_initrddir}/%{name}

Ralf




From fedora-extras-commits at redhat.com  Wed Mar  9 12:18:39 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 9 Mar 2005 07:18:39 -0500
Subject: rpms/ulogd/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ulogd.spec,
	1.5, 1.6
Message-ID: <200503091218.j29CIdAm016656@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/ulogd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16650

Modified Files:
	.cvsignore sources ulogd.spec 
Log Message:
- version 1.22



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ulogd/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Feb 2005 15:52:15 -0000	1.3
+++ .cvsignore	9 Mar 2005 12:18:37 -0000	1.4
@@ -1 +1,2 @@
-ulogd-1.21.tar.bz2
+ulogd-1.22.tar.bz2
+ulogd-1.22.tar.bz2.sig


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ulogd/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Feb 2005 15:52:15 -0000	1.3
+++ sources	9 Mar 2005 12:18:37 -0000	1.4
@@ -1 +1,2 @@
-32e94a9336c10a4cb8ab3745bc2abbdb  ulogd-1.21.tar.bz2
+2593dfc51c0bc1d8f86519fb13dd5f34  ulogd-1.22.tar.bz2
+b0efa8912871bff9d88e156e0de7366d  ulogd-1.22.tar.bz2.sig


Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/FC-3/ulogd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ulogd.spec	20 Feb 2005 16:30:17 -0000	1.5
+++ ulogd.spec	9 Mar 2005 12:18:37 -0000	1.6
@@ -1,13 +1,14 @@
 Name:           ulogd
-Version:        1.21
+Version:        1.22
 Release:        1
 Summary:        The userspace logging daemon for netfilter
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://gnumonks.org/projects/ulogd
-Source:         http://ftp.netfilter.org/pub/ulogd/ulogd-%{version}.tar.bz2
+Source0:         http://ftp.netfilter.org/pub/ulogd/ulogd-%{version}.tar.bz2
 Source1:        ulogd.logrotate
 Source2:        ulogd.8
+Source3:         http://ftp.netfilter.org/pub/ulogd/ulogd-%{version}.tar.bz2.sig
 Patch1:         ulogd-1.21-logdir.patch
 Patch2:         ulogd-1.02-init.patch
 Patch3:         ulogd-1.02-pgsql.patch
@@ -117,6 +118,10 @@
 %{_libdir}/ulogd/ulogd_PGSQL.so
 
 %changelog
+* Wed Mar 09 2005 Aurelien Bompard <gauret[AT]free.fr> 1.22-1
+- version 1.22
+- add gpg signature to sources
+
 * Sun Feb 20 2005 Aurelien Bompard <gauret[AT]free.fr> 1.21-1
 - version 1.21
 



From fedora-extras-commits at redhat.com  Wed Mar  9 17:06:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 9 Mar 2005 12:06:27 -0500
Subject: devel/xemacs-sumo .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xemacs-sumo.spec, 1.2, 1.3
Message-ID: <200503091706.j29H6Rd2021511@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/xemacs-sumo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21505

Modified Files:
	.cvsignore sources xemacs-sumo.spec 
Log Message:
Update to 2005-03-07, remove some unneeded executable bits.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/xemacs-sumo/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Mar 2005 22:31:04 -0000	1.2
+++ .cvsignore	9 Mar 2005 17:06:25 -0000	1.3
@@ -1,2 +1,2 @@
-xemacs-mule-sumo-2005-01-18.tar.bz2
-xemacs-sumo-2005-01-18.tar.bz2
+xemacs-mule-sumo-2005-03-07.tar.bz2
+xemacs-sumo-2005-03-07.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/devel/xemacs-sumo/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Mar 2005 22:31:04 -0000	1.2
+++ sources	9 Mar 2005 17:06:25 -0000	1.3
@@ -1,2 +1,2 @@
-8c902131842ecaafeba6682ae956e554  xemacs-mule-sumo-2005-01-18.tar.bz2
-d30cbe9069121e035a42e73e4133ccee  xemacs-sumo-2005-01-18.tar.bz2
+09c6c1b8b39b7460329c522db2a08abf  xemacs-mule-sumo-2005-03-07.tar.bz2
+dd937961bbbb5851be9b4d0ea22e6d8c  xemacs-sumo-2005-03-07.tar.bz2


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/devel/xemacs-sumo/xemacs-sumo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xemacs-sumo.spec	5 Mar 2005 21:10:26 -0000	1.2
+++ xemacs-sumo.spec	9 Mar 2005 17:06:25 -0000	1.3
@@ -1,9 +1,9 @@
-%define sumo_ver 2005-01-18
+%define sumo_ver 2005-03-07
 
 Summary: XEmacs Lisp packages
 Name: xemacs-sumo
 Version: %(echo %{sumo_ver} | tr -d -)
-Release: 2
+Release: 1
 License: GPL
 Group: Applications/Editors
 Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2
@@ -101,18 +101,26 @@
 # fix toolbar specifier error
 %patch16 -p0
 
-# avoid spurious dependencies
-chmod -x xemacs-packages/lisp/erc/*ChangeLog*
+# avoid spurious dependencies and bad file modes
+find . -type f -name "*.el" -perm +111 | xargs chmod 644
+chmod 644 \
+  xemacs-packages/lisp/erc/{*ChangeLog*,HACKING.upstream} \
+  xemacs-packages/etc/xwem/logo.xpm \
+  xemacs-packages/etc/ess/BACKBUGS.BAT
+perl -pi -e "s|/usr/local/bin/perl5?|/usr/bin/perl|g" \
+  xemacs-packages/{lisp/hyperbole/file-newer,etc/bbdb/*.pl}
+
+# remove game we shouldn't ship
+rm xemacs-packages/lisp/games/tetris.el*
 
 
 %build
 %define _xemacs_batch xemacs-nox -batch -vanilla
 
-# remove game we shouldn't ship
-rm xemacs-packages/lisp/games/tetris.el*
-
-%_xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/*
-%_xemacs_batch -f batch-byte-recompile-directory xemacs-packages/lisp mule-packages/lisp
+%_xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \
+  -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/*
+%_xemacs_batch -f batch-byte-recompile-directory \
+  xemacs-packages/lisp mule-packages/lisp
 
 
 %install
@@ -145,13 +153,6 @@
 #  ln -s zh_TW.Big5 zh_TW
 )
 
-# so as not to require /usr/local/bin/perl[5]
-( cd %buildroot%{pkgdir}/xemacs-packages
-  perl -pi -e "s|/usr/local/bin/perl5|/usr/bin/perl|g; s|/usr/local/bin/perl|/usr/bin/perl|g;" \
-	lisp/hyperbole/file-newer \
-	etc/bbdb/*.pl
-)
-
 # the header of this file is weird... and confuses dependency checking
 chmod 0644 %buildroot%{pkgdir}/xemacs-packages/lib-src/pstogif
 
@@ -190,6 +191,10 @@
 
 
 %changelog
+* Tue Mar  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 20050307-1
+- Update to 2005-03-07.
+- Fix up unneeded executable bits on some files.
+
 * Tue Mar  1 2005 Ville Skytt?? <scop at xemacs.org> - 20050118-2
 - Revert back to bundled apel, mew and skk in the sumo.
 - Drop xemacs-packages* Obsoletes.



From fedora-extras-commits at redhat.com  Wed Mar  9 17:33:54 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 12:33:54 -0500
Subject: rpms/ipython import.log,1.1,1.2
Message-ID: <200503091733.j29HXsxe021769@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21760

Modified Files:
	import.log 
Log Message:
auto-import ipython-0.6.11-2 on branch devel from ipython-0.6.11-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ipython/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Mar 2005 16:47:18 -0000	1.1
+++ import.log	9 Mar 2005 17:33:52 -0000	1.2
@@ -0,0 +1 @@
+ipython-0_6_11-2:HEAD:ipython-0.6.11-2.src.rpm:1110389629



From fedora-extras-commits at redhat.com  Wed Mar  9 17:33:54 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 12:33:54 -0500
Subject: rpms/ipython/devel ipython.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503091733.j29HXsih021773@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21760/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ipython.spec 
Log Message:
auto-import ipython-0.6.11-2 on branch devel from ipython-0.6.11-2.src.rpm


--- NEW FILE ipython.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:           ipython
Version:        0.6.11
Release:        2
Summary:        An enhanced interactive Python shell

Group:          Development/Libraries
License:        BSD
URL:            http://ipython.scipy.org/
Source0:        http://ipython.scipy.org/dist/ipython-0.6.11.tar.gz
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

IPython provides a replacement for the interactive Python interpreter with
extra functionality.

Main features:

 * Comprehensive object introspection.

 * Input history, persistent across sessions.

 * Caching of output results during a session with automatically generated
   references.

 * Readline based name completion.

 * Extensible system of 'magic' commands for controlling the environment and
   performing many tasks related either to IPython or the operating system.

 * Configuration system with easy switching between different setups (simpler
   than changing $PYTHONSTARTUP environment variables every time).

 * Session logging and reloading.

 * Extensible syntax processing for special purpose situations.

 * Access to the system shell with user-extensible alias system.

 * Easily embeddable in other Python programs.

 * Integrated access to the pdb debugger and the Python profiler. 

%prep
%setup -q


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# ipython installs its own documentation, but we need to own the directory
%{_datadir}/doc/%{name}-%{version}/
%{_mandir}/man*/*
%{_bindir}/ipython
%{_bindir}/pycolor
%dir %{python_sitelib}/IPython
%{python_sitelib}/IPython/*.py
%{python_sitelib}/IPython/Extensions/*.py
%{python_sitelib}/IPython/*.pyc
%{python_sitelib}/IPython/Extensions/*.pyc
%{python_sitelib}/IPython/UserConfig/*
%ghost %{python_sitelib}/IPython/*.pyo
%ghost %{python_sitelib}/IPython/Extensions/*.pyo

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 0.6.11-2
- Fix up %doc file specifications
- Use offical .tar.gz, not upstream .src.rpm .tar.gz

* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 0.6.11-1
- Initial release to meet Fedora packaging guidelines


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Mar 2005 16:47:18 -0000	1.1
+++ .cvsignore	9 Mar 2005 17:33:52 -0000	1.2
@@ -0,0 +1 @@
+ipython-0.6.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Mar 2005 16:47:18 -0000	1.1
+++ sources	9 Mar 2005 17:33:52 -0000	1.2
@@ -0,0 +1 @@
+cf4bdd4a89d71e497e76f0473cbe02f7  ipython-0.6.11.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar  9 20:16:34 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 9 Mar 2005 15:16:34 -0500
Subject: rpms/mail-notification/FC-3 .cvsignore, 1.3,
	1.4 mail-notification.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200503092016.j29KGX5u024604@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24593/FC-3

Modified Files:
	.cvsignore mail-notification.spec sources 
Log Message:
Update to 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Dec 2004 18:43:31 -0000	1.3
+++ .cvsignore	9 Mar 2005 20:16:31 -0000	1.4
@@ -1 +1 @@
-mail-notification-1.0.tar.gz
+mail-notification-1.1.tar.gz


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/FC-3/mail-notification.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mail-notification.spec	10 Dec 2004 22:03:07 -0000	1.3
+++ mail-notification.spec	9 Mar 2005 20:16:31 -0000	1.4
@@ -1,30 +1,26 @@
-# use "--with gmail" as rpmbuildparameter to add gmail Support (requires FC3 Core package) 
-
 Name:           mail-notification
-Epoch:          0
-Version:        1.0
+Version:        1.1
 Release:        1
-Summary:        Mail Notification is a status icon that informs you if you have new mail.
+Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.nongnu.org/mailnotify/
-Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-1.0.tar.gz
+Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-1.1.tar.gz
 Source1:        mail-notification-README.FEDORA
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gettext >= 0:0.14.1
-BuildRequires:  eel2-devel >= 0:2.0
+BuildRequires:  gettext >= 0.14.1
+BuildRequires:  eel2-devel >= 2.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  scrollkeeper
-BuildRequires:	openssl-devel  >= 0:0.9.5b
-BuildRequires:	cyrus-sasl-devel >= 0:2.0
-BuildRequires:	gmime-devel >= 0:2.1
-%if 0%{?_with_gmail:1}
-BuildRequires:	libsoup-devel >= 0:2.2.1
-BuildRequires:	gnutls-devel >= 0:1.0.20
-BuildRequires:	libgcrypt-devel >= 0:1.2.0
-%endif
+BuildRequires:  openssl-devel  >= 0.9.5b
+BuildRequires:  cyrus-sasl-devel >= 2.0
+BuildRequires:  gmime-devel >= 2.1
+BuildRequires:  libsoup-devel >= 2.2.1
+BuildRequires:  gnutls-devel >= 1.0.20
+BuildRequires:  libgcrypt-devel >= 1.2.0
+BuildRequires:  libicu-devel >= 2.6
 
 Requires(post):   GConf2
 Requires(post):   scrollkeeper
@@ -32,21 +28,21 @@
 Requires(postun): scrollkeeper
 
 %description
-Mail Notification is a status icon (aka tray icon) that informs you if you 
+Mail Notification is a status icon (aka tray icon) that informs you if you
 have new mail. It works with system trays implementing the freedesktop.org
-System Tray Specification, such as the GNOME Panel Notification Area, the 
+System Tray Specification, such as the GNOME Panel Notification Area, the
 Xfce Notification Area and the KDE System Tray.
 
 
 %prep
 %setup -q
 cp %{SOURCE1} ./README.FEDORA
- 
+
 
 
 %build
-%configure %{?!_with_gmail:--disable-gmail} 
-make %{?_smp_mflags} 
+%configure
+make %{?_smp_mflags}
 
 
 %install
@@ -105,6 +101,10 @@
 
 
 %changelog
+* Mon Mar 07 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.1-1
+- update to 1.1
+- remove gmail build option and add new BR libicu-devel
+
 * Tue Nov 25 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.0-0.fdr.1
 - update to 1.0
 
@@ -115,13 +115,13 @@
 
 * Tue Nov 09 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.8.1-0.fdr.3
 - trim build comment
-- own _datadir/gnome/help/mail-notification/ 
+- own _datadir/gnome/help/mail-notification/
 - rename SOURCE1 from README.FEDORA to mail-notfication-README.FEDORA
 
 
 * Sat Nov 06 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.8.1-0.fdr.2
-- Really remove "killall bonobo-activation-server"; Add a README.FEDORA 
-  which descibes the problem. 
+- Really remove "killall bonobo-activation-server"; Add a README.FEDORA
+  which descibes the problem.
 - Spilt post,preun,postun sections
 - Use --with gmail to build for FC3 with gmail-support
 
@@ -143,7 +143,7 @@
 
 * Tue Sep 14 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.6.2-0.fdr.1
 - Update to 0.6.2
-- After talkback with program author added "killall bonobo-activation-server" 
+- After talkback with program author added "killall bonobo-activation-server"
   to post section
 
 * Sun Aug 29 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.6.1-0.fdr.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Dec 2004 18:43:31 -0000	1.3
+++ sources	9 Mar 2005 20:16:31 -0000	1.4
@@ -1 +1 @@
-9f458da2a222490330ed93d3298ced75  mail-notification-1.0.tar.gz
+2359fb53128b12cf295bdf8553e5869b  mail-notification-1.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar  9 20:16:34 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 9 Mar 2005 15:16:34 -0500
Subject: rpms/mail-notification/devel .cvsignore, 1.3,
	1.4 mail-notification.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200503092016.j29KGYe4024610@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24593/devel

Modified Files:
	.cvsignore mail-notification.spec sources 
Log Message:
Update to 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Dec 2004 18:43:31 -0000	1.3
+++ .cvsignore	9 Mar 2005 20:16:31 -0000	1.4
@@ -1 +1 @@
-mail-notification-1.0.tar.gz
+mail-notification-1.1.tar.gz


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mail-notification.spec	3 Mar 2005 23:01:23 -0000	1.4
+++ mail-notification.spec	9 Mar 2005 20:16:31 -0000	1.5
@@ -1,14 +1,12 @@
-# use "--with gmail" as rpmbuildparameter to add gmail Support (requires FC3 Core package)
-
 Name:           mail-notification
-Version:        1.0
+Version:        1.1
 Release:        1
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.nongnu.org/mailnotify/
-Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-1.0.tar.gz
+Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-1.1.tar.gz
 Source1:        mail-notification-README.FEDORA
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -19,11 +17,10 @@
 BuildRequires:  openssl-devel  >= 0.9.5b
 BuildRequires:  cyrus-sasl-devel >= 2.0
 BuildRequires:  gmime-devel >= 2.1
-%if 0%{?_with_gmail:1}
 BuildRequires:  libsoup-devel >= 2.2.1
 BuildRequires:  gnutls-devel >= 1.0.20
 BuildRequires:  libgcrypt-devel >= 1.2.0
-%endif
+BuildRequires:  libicu-devel >= 2.6
 
 Requires(post):   GConf2
 Requires(post):   scrollkeeper
@@ -44,7 +41,7 @@
 
 
 %build
-%configure %{?!_with_gmail:--disable-gmail}
+%configure
 make %{?_smp_mflags}
 
 
@@ -104,6 +101,10 @@
 
 
 %changelog
+* Mon Mar 07 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.1-1
+- update to 1.1
+- remove gmail build option and add new BR libicu-devel
+
 * Tue Nov 25 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.0-0.fdr.1
 - update to 1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Dec 2004 18:43:31 -0000	1.3
+++ sources	9 Mar 2005 20:16:31 -0000	1.4
@@ -1 +1 @@
-9f458da2a222490330ed93d3298ced75  mail-notification-1.0.tar.gz
+2359fb53128b12cf295bdf8553e5869b  mail-notification-1.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar  9 23:02:14 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:02:14 -0500
Subject: rpms/python-quixote - New directory
Message-ID: <200503092302.j29N2E8p027854@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27847/python-quixote

Log Message:
Directory /cvs/extras/rpms/python-quixote added to the repository




From fedora-extras-commits at redhat.com  Wed Mar  9 23:02:14 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:02:14 -0500
Subject: rpms/python-quixote/devel - New directory
Message-ID: <200503092302.j29N2ED8027857@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27847/python-quixote/devel

Log Message:
Directory /cvs/extras/rpms/python-quixote/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar  9 23:02:26 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:02:26 -0500
Subject: rpms/python-quixote Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503092302.j29N2Qb2027926@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27909

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-quixote


--- NEW FILE Makefile ---
# Top level Makefile for module python-quixote
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  9 23:02:26 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:02:26 -0500
Subject: rpms/python-quixote/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503092302.j29N2QqZ027929@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27909/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-quixote


--- 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 Mar  9 23:02:46 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:02:46 -0500
Subject: rpms/python-quixote import.log,1.1,1.2
Message-ID: <200503092302.j29N2kRM028025@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28014

Modified Files:
	import.log 
Log Message:
auto-import python-quixote-1.2-2 on branch devel from python-quixote-1.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Mar 2005 23:02:24 -0000	1.1
+++ import.log	9 Mar 2005 23:02:44 -0000	1.2
@@ -0,0 +1 @@
+python-quixote-1_2-2:HEAD:python-quixote-1.2-2.src.rpm:1110409361



From fedora-extras-commits at redhat.com  Wed Mar  9 23:02:46 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:02:46 -0500
Subject: rpms/python-quixote/devel python-quixote.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503092302.j29N2ksd028028@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28014/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-quixote.spec 
Log Message:
auto-import python-quixote-1.2-2 on branch devel from python-quixote-1.2-2.src.rpm


--- NEW FILE python-quixote.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)")}

%define srcname Quixote
%define srcver  1.2

Name:           python-quixote
Version:        1.2
Release:        2
Summary:        A highly Pythonic Web application framework

Group:          Development/Libraries
License:        CNRI
URL:            http://www.mems-exchange.org/software/quixote/
Source0:        http://www.mems-exchange.org/software/files/quixote/Quixote-1.2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
Quixote is a framework for developing Web applications in Python. Quixote is
based on a simple, flexible design, making it possible to write applications
quickly and to benefit from the wide range of available third-party Python
modules. Deployed appropriately, Quixote has excellent performance that allows
you to put Quixote-based applications into large-scale production use.

%prep
%setup -q -n %{srcname}-%{srcver}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc doc/ CHANGES README TODO LICENSE
%dir %{python_sitearch}/quixote
%{python_sitearch}/quixote/*.py
%{python_sitearch}/quixote/*.pyc
%{python_sitearch}/quixote/*.so
%ghost %{python_sitearch}/quixote/*.pyo
%{python_sitearch}/quixote/demo/*.py
%{python_sitearch}/quixote/demo/*.pyc
%{python_sitearch}/quixote/demo/*.ptl
%ghost %{python_sitearch}/quixote/demo/*.pyo
%{python_sitearch}/quixote/form/*.py
%{python_sitearch}/quixote/form/*.pyc
%ghost %{python_sitearch}/quixote/form/*.pyo
%{python_sitearch}/quixote/server/*.py
%{python_sitearch}/quixote/server/*.pyc
%ghost %{python_sitearch}/quixote/server/*.pyo
# remove the form2 lines for Quixote 2
%{python_sitearch}/quixote/form2/*.py
%{python_sitearch}/quixote/form2/*.pyc
%ghost %{python_sitearch}/quixote/form2/*.pyo

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 1.2-2
- Fix up specfile for FC3
- Change python_sitelib -> python_sitearch for multi-lib builds

* Thu Oct 28 2004 Shahms E. King <shahms at shahms.com> -
- Update to 1.2

* Wed May 26 2004 Shahms King <shahms at shahms.com> -
- Initial Relase


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Mar 2005 23:02:24 -0000	1.1
+++ .cvsignore	9 Mar 2005 23:02:44 -0000	1.2
@@ -0,0 +1 @@
+Quixote-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Mar 2005 23:02:24 -0000	1.1
+++ sources	9 Mar 2005 23:02:44 -0000	1.2
@@ -0,0 +1 @@
+f39e6627fba8266996bff3a494053db7  Quixote-1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar  9 23:04:46 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:04:46 -0500
Subject: rpms/python-durus/devel - New directory
Message-ID: <200503092304.j29N4khx028157@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28145/python-durus/devel

Log Message:
Directory /cvs/extras/rpms/python-durus/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar  9 23:04:46 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:04:46 -0500
Subject: rpms/python-durus - New directory
Message-ID: <200503092304.j29N4k5D028154@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28145/python-durus

Log Message:
Directory /cvs/extras/rpms/python-durus added to the repository




From fedora-extras-commits at redhat.com  Wed Mar  9 23:05:14 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:05:14 -0500
Subject: rpms/python-durus/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503092305.j29N5EpQ028218@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28206/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-durus


--- 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 Mar  9 23:05:25 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:05:25 -0500
Subject: rpms/python-durus Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503092305.j29N5PbJ028220@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28206

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-durus


--- NEW FILE Makefile ---
# Top level Makefile for module python-durus
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar  9 23:05:53 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:05:53 -0500
Subject: rpms/python-durus import.log,1.1,1.2
Message-ID: <200503092305.j29N5rYm028316@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28306

Modified Files:
	import.log 
Log Message:
auto-import python-durus-1.4-1 on branch devel from python-durus-1.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-durus/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Mar 2005 23:05:08 -0000	1.1
+++ import.log	9 Mar 2005 23:05:50 -0000	1.2
@@ -0,0 +1 @@
+python-durus-1_4-1:HEAD:python-durus-1.4-1.src.rpm:1110409538



From fedora-extras-commits at redhat.com  Wed Mar  9 23:05:54 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 9 Mar 2005 18:05:54 -0500
Subject: rpms/python-durus/devel python-durus.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503092305.j29N5rpl028318@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28306/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-durus.spec 
Log Message:
auto-import python-durus-1.4-1 on branch devel from python-durus-1.4-1.src.rpm


--- NEW FILE python-durus.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)")}

%define srcname Durus

Name:           python-durus
Version:        1.4
Release:        1
Summary:        A Python Object Database

Group:          Development/Libraries
License:        CNRI
URL:            http://www.mems-exchange.org/software/durus/
Source0:        http://www.mems-exchange.org/software/files/durus/Durus-1.4.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
Durus is a persistent object system for applications written in the Python
programming language. It offers an easy way to use and maintain a consistent
collection of object instances used by one or more processes. Access and change
of a persistent instances is managed through a cached Connection instance which
includes commit() and abort() methods so that changes are transactional.
Durus is best suited to collections of less than a million instances with
relatively stable state.

%prep
%setup -q -n %{srcname}-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc doc/ *.txt
%dir %{python_sitearch}/durus
%{python_sitearch}/durus/*.so
%{python_sitearch}/durus/*.py
%{python_sitearch}/durus/*.pyc
%ghost %{python_sitearch}/durus/*.pyo
%{_bindir}/durus

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 1.4-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-durus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Mar 2005 23:05:08 -0000	1.1
+++ .cvsignore	9 Mar 2005 23:05:50 -0000	1.2
@@ -0,0 +1 @@
+Durus-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-durus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Mar 2005 23:05:08 -0000	1.1
+++ sources	9 Mar 2005 23:05:50 -0000	1.2
@@ -0,0 +1 @@
+e79aed3bfa1dea3020507082f147600b  Durus-1.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 10 07:03:43 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Thu, 10 Mar 2005 02:03:43 -0500
Subject: devel/jabberd jabberd.spec,1.2,1.3
Message-ID: <200503100703.j2A73hia004755@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4749

Modified Files:
	jabberd.spec 
Log Message:
* removed Epoch: 0
* more Requires(...)
* typo 
* changed db location to %%{_var}/lib/jabberd
* removed noreplace for start script



Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jabberd.spec	9 Mar 2005 08:00:01 -0000	1.2
+++ jabberd.spec	10 Mar 2005 07:03:41 -0000	1.3
@@ -1,17 +1,19 @@
-Summary:        OpenSource server implementation of the Jabber protocols
-Name:           jabberd
-Version:        2.0
-Release:        0.s6.4
-Epoch:          0
-License:        GPL
-Group:          System Environment/Daemons
-Source0:        http://files.jabberstudio.org/jabberd2/jabberd-2.0s6.tar.gz
-Source1:        jabberd
-URL:            http://jabberd.jabberstudio.org/2/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  openssl-devel db4-devel libidn-devel pam-devel
-BuildRequires:  openldap-devel postgresql-devel mysql-devel
-Requires(post): openssl
+Summary: OpenSource server implementation of the Jabber protocols
+Name: jabberd
+Version: 2.0
+Release: 0.s6.5
+License: GPL
+Group: System Environment/Daemons
+Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s6.tar.gz
+Source1: jabberd
+URL: http://jabberd.jabberstudio.org/2/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: openssl-devel db4-devel libidn-devel pam-devel
+BuildRequires: openldap-devel postgresql-devel mysql-devel
+Requires(post): openssl chkconfig
+Requires(pre): shadow-utils
+Requires(preun): chkconfig shadow-utils
+Requires(postun): chkconfig
 
 %description
 The jabberd project aims to provide an open-source server implementation of the
@@ -33,16 +35,21 @@
 %define sysconfdir /etc/jabberd
 %{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g" \
 		configure
-%configure --enable-db --enable-mysql --enable-pam --enable-ldap \
-		--enable-pgsql --with-extra-library-path=%{_libdir}/mysql \
-		--enable-debug
+%configure	--enable-db \
+		--enable-mysql \
+		--enable-pam \
+		--enable-ldap \
+		--enable-pgsql \
+		--with-extra-library-path=%{_libdir}/mysql \
+		--localstatedir=%{_var}/lib
+
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %makeinstall
 %define _sysconfdir /etc
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_var}/jabberd/{log,pid,db}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_var}/lib/jabberd/{log,pid,db}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -m 644 tools/db-setup.mysql $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -m 644 tools/db-setup.pgsql $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -52,11 +59,9 @@
 %{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 %{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
-          $RPM_BUILD_ROOT%{_initrddir}/%{name}
-%{__sed} -i -e "s,__ETCDIR__,%{sysconfdir},g" \
-          $RPM_BUILD_ROOT%{_initrddir}/%{name}
-%{__sed} -i -e "s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g" \
-          $RPM_BUILD_ROOT%{_initrddir}/%{name}
+            -e "s,__ETCDIR__,%{sysconfdir},g" \
+            -e "s,__PIDDIR__,%{_var}/lib/jabberd/pid,g" \
+		$RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
 %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/jabberd << END
@@ -76,7 +81,7 @@
 	$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
 
 #enable SSL certificate
-%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <pemfile>/etc/jabberd/server.pem</pemfile>\n    -->,<pemfile>/etc/jAbberd/server.pem</pemfile>,g' $RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
+%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <pemfile>/etc/jabberd/server.pem</pemfile>\n    -->,<pemfile>/etc/jabberd/server.pem</pemfile>,g' $RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
 
 #the default pam backend needs auto creation of accounts
 %{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <auto-create/>\n    -->,<auto-create/>,g' \
@@ -94,7 +99,7 @@
 
 %pre
 #creating jabber user
-useradd -r -d %{_localstatedir}/%{name} -m -c "Jabber Server" -s /bin/bash jabber >/dev/null 2>&1 ||:
+useradd -r -d %{_var}/lib/%{name} -m -c "Jabber Server" -s /bin/bash jabber >/dev/null 2>&1 ||:
 
 
 %post
@@ -127,8 +132,8 @@
 	/sbin/service %{name} stop > /dev/null 2>&1
 	/sbin/chkconfig --del %{name}
 	userdel jabber
-	#should %{_localstatedir}/jabberd be deleted???
-	#%{__rm} -rf %{_localstatedir}/jabberd
+	#should %{_var}/lib/jabberd be deleted???
+	#%{__rm} -rf %{_var}/lib/jabberd
 fi
 
 %postun
@@ -144,12 +149,19 @@
 %attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/*
 %{_datadir}/man/man8/*
 %{_datadir}/%{name}/
-%config(noreplace) %{_initrddir}/%{name}
+%config %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/pam.d/jabberd
-%attr(-,jabber,jabber) %{_var}/jabberd
+%attr(-,jabber,jabber) %{_var}/lib/jabberd
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Wed Mar 09 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.5
+- removed Epoch: 0
+- more Requires(...)
+- typo 
+- changed db location to %%{_var}/lib/jabberd
+- removed noreplace for start script
+
 * Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
 - made password more random (/dev/random)
 - replace password in the config without making it visible in ps



From adrian at lisas.de  Thu Mar 10 07:17:37 2005
From: adrian at lisas.de (Adrian Reber)
Date: Thu, 10 Mar 2005 08:17:37 +0100
Subject: devel/jabberd jabberd.spec,1.1,1.2
In-Reply-To: <1110364494.7140.307.camel@mccallum.corsepiu.local>
References: <200503090800.j29803oH010739@cvs-int.fedora.redhat.com>
	<1110364494.7140.307.camel@mccallum.corsepiu.local>
Message-ID: <20050310071737.GB30432@lisas.de>

On Wed, Mar 09, 2005 at 11:34:54AM +0100, Ralf Corsepius wrote:
> > +%{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
> > +          $RPM_BUILD_ROOT%{_initrddir}/%{name}
> > +%{__sed} -i -e "s,__ETCDIR__,%{sysconfdir},g" \
> > +          $RPM_BUILD_ROOT%{_initrddir}/%{name}
> > +%{__sed} -i -e "s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g" \
> >            $RPM_BUILD_ROOT%{_initrddir}/%{name}
> 
> Any particular reason to use several sed-calls? 

No.

> One sed-call should be sufficient:
> 
> %{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
>             -e "s,__ETCDIR__,%{sysconfdir},g" \
>             -e "s,__PIDDIR__,%{_localstatedir}/jabberd/pid,g" \
>              $RPM_BUILD_ROOT%{_initrddir}/%{name}

Changed it.

		Adrian



From fedora-extras-commits at redhat.com  Thu Mar 10 15:19:22 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 10 Mar 2005 10:19:22 -0500
Subject: rpms/perl-GD/FC-3 .cvsignore, 1.3, 1.4 perl-GD.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200503101519.j2AFJMbe014744@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GD/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14735/FC-3

Modified Files:
	.cvsignore perl-GD.spec sources 
Log Message:
Update to 2.23


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Dec 2004 07:44:01 -0000	1.3
+++ .cvsignore	10 Mar 2005 15:19:20 -0000	1.4
@@ -1 +1 @@
-GD-2.19.tar.gz
+GD-2.23.tar.gz


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/FC-3/perl-GD.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-GD.spec	10 Dec 2004 07:44:01 -0000	1.3
+++ perl-GD.spec	10 Mar 2005 15:19:20 -0000	1.4
@@ -1,22 +1,21 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-GD
-Version:        2.19
+Version:        2.23
 Release:        1
-Epoch:          0
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
 License:        Artistic
 URL:            http://search.cpan.org/dist/GD/
-Source0:        http://www.cpan.org/authors/id/L/LD/LDS/GD-2.19.tar.gz
+Source0:        http://www.cpan.org/authors/id/L/LD/LDS/GD-2.23.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  gd-devel >= 0:2.0.28
+BuildRequires:  gd-devel >= 2.0.28
 BuildRequires:  %{_bindir}/gdlib-config
 BuildRequires:  libpng-devel, libjpeg-devel, freetype-devel, XFree86-devel
-Requires:       gd >= 0:2.0.28
+Requires:       gd >= 2.0.28
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -56,16 +55,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README README.QUICKDRAW demos/ bdf_scripts/
+%doc ChangeLog README README.QUICKDRAW qd.pl demos/ bdf_scripts/
 %{_bindir}/*
 %{perl_vendorarch}/auto/GD
 %{perl_vendorarch}/GD*
-%{perl_vendorarch}/qd.pl
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Wed Mar  9 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.23-1
+- Update to 2.23.
+
 * Thu Dec 09 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:2.19-1
 - Update to 2.19.
 - GIF support has been restored in gd 2.0.28.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Dec 2004 07:44:01 -0000	1.3
+++ sources	10 Mar 2005 15:19:20 -0000	1.4
@@ -1 +1 @@
-c340ab955aca622df1dcc28f8e5419aa  GD-2.19.tar.gz
+131a84d37921a18c87e7d994d72165b2  GD-2.23.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 10 15:19:22 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 10 Mar 2005 10:19:22 -0500
Subject: rpms/perl-GD/devel .cvsignore, 1.3, 1.4 perl-GD.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200503101519.j2AFJMZE014751@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GD/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14735/devel

Modified Files:
	.cvsignore perl-GD.spec sources 
Log Message:
Update to 2.23


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Dec 2004 07:44:01 -0000	1.3
+++ .cvsignore	10 Mar 2005 15:19:20 -0000	1.4
@@ -1 +1 @@
-GD-2.19.tar.gz
+GD-2.23.tar.gz


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-GD.spec	3 Mar 2005 23:46:26 -0000	1.4
+++ perl-GD.spec	10 Mar 2005 15:19:20 -0000	1.5
@@ -1,14 +1,14 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-GD
-Version:        2.19
+Version:        2.23
 Release:        1
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
 License:        Artistic
 URL:            http://search.cpan.org/dist/GD/
-Source0:        http://www.cpan.org/authors/id/L/LD/LDS/GD-2.19.tar.gz
+Source0:        http://www.cpan.org/authors/id/L/LD/LDS/GD-2.23.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
@@ -55,16 +55,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README README.QUICKDRAW demos/ bdf_scripts/
+%doc ChangeLog README README.QUICKDRAW qd.pl demos/ bdf_scripts/
 %{_bindir}/*
 %{perl_vendorarch}/auto/GD
 %{perl_vendorarch}/GD*
-%{perl_vendorarch}/qd.pl
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Wed Mar  9 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.23-1
+- Update to 2.23.
+
 * Thu Dec 09 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:2.19-1
 - Update to 2.19.
 - GIF support has been restored in gd 2.0.28.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Dec 2004 07:44:01 -0000	1.3
+++ sources	10 Mar 2005 15:19:20 -0000	1.4
@@ -1 +1 @@
-c340ab955aca622df1dcc28f8e5419aa  GD-2.19.tar.gz
+131a84d37921a18c87e7d994d72165b2  GD-2.23.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 10 16:04:55 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 10 Mar 2005 11:04:55 -0500
Subject: devel/perl-String-Ediff .cvsignore, 1.3, 1.4 perl-String-Ediff.spec,
	1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200503101604.j2AG4twu015811@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/perl-String-Ediff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15805

Modified Files:
	.cvsignore perl-String-Ediff.spec sources 
Log Message:
0.05, should fix #150012.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/perl-String-Ediff/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Feb 2005 22:09:00 -0000	1.3
+++ .cvsignore	10 Mar 2005 16:04:53 -0000	1.4
@@ -1 +1 @@
-String-Ediff-0.04.tar.gz
+String-Ediff-0.05.tar.gz


Index: perl-String-Ediff.spec
===================================================================
RCS file: /cvs/extras/devel/perl-String-Ediff/perl-String-Ediff.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-String-Ediff.spec	3 Mar 2005 23:46:28 -0000	1.7
+++ perl-String-Ediff.spec	10 Mar 2005 16:04:53 -0000	1.8
@@ -1,14 +1,14 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-String-Ediff
-Version:        0.04
+Version:        0.05
 Release:        1
 Summary:        Produce common sub-string indices for two strings
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/String-Ediff/
-Source0:    http://www.cpan.org/authors/id/B/BO/BOXZOU/String-Ediff-0.04.tar.gz
+Source0:    http://www.cpan.org/authors/id/B/BO/BOXZOU/String-Ediff-0.05.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Mar 10 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.05-1
+- 0.05, should fix #150012.
+
 * Fri Feb 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.04-1
 - 0.04.
 - Add perl(:MODULE_COMPAT_*) dependency, install with pure_install.


Index: sources
===================================================================
RCS file: /cvs/extras/devel/perl-String-Ediff/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Feb 2005 22:09:00 -0000	1.3
+++ sources	10 Mar 2005 16:04:53 -0000	1.4
@@ -1 +1 @@
-ba79c1986303f7c36929d7478374800b  String-Ediff-0.04.tar.gz
+6415c056b2a9e3380637477b9fadd34e  String-Ediff-0.05.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 10 22:22:33 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 10 Mar 2005 17:22:33 -0500
Subject: rpms/python-quixote/devel python-quixote.spec,1.1,1.2
Message-ID: <200503102222.j2AMMX6E022876@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22867/devel

Modified Files:
	python-quixote.spec 
Log Message:
Remove unnecessary '%define srcver 1.2' from the spec file




Index: python-quixote.spec
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/python-quixote.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-quixote.spec	9 Mar 2005 23:02:44 -0000	1.1
+++ python-quixote.spec	10 Mar 2005 22:22:31 -0000	1.2
@@ -2,11 +2,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define srcname Quixote
-%define srcver  1.2
 
 Name:           python-quixote
 Version:        1.2
-Release:        2
+Release:        3
 Summary:        A highly Pythonic Web application framework
 
 Group:          Development/Libraries
@@ -26,7 +25,7 @@
 you to put Quixote-based applications into large-scale production use.
 
 %prep
-%setup -q -n %{srcname}-%{srcver}
+%setup -q -n %{srcname}-%{version}
 
 
 %build
@@ -66,6 +65,9 @@
 %ghost %{python_sitearch}/quixote/form2/*.pyo
 
 %changelog
+* Thu Mar 10 2005 Shahms E. King <shahms at shahms.com> 1.2-3 -
+- remove 'srcver' from specfile
+
 * Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 1.2-2
 - Fix up specfile for FC3
 - Change python_sitelib -> python_sitearch for multi-lib builds



From fedora-extras-commits at redhat.com  Thu Mar 10 22:51:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 10 Mar 2005 17:51:35 -0500
Subject: rpms/perl-Gtk2/FC-3 perl-Gtk2.spec,1.5,1.6
Message-ID: <200503102251.j2AMpZb1023349@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-serv23340/FC-3

Modified Files:
	perl-Gtk2.spec 
Log Message:
Use perl-Glib for versioning control


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-3/perl-Gtk2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Gtk2.spec	8 Mar 2005 18:28:36 -0000	1.5
+++ perl-Gtk2.spec	10 Mar 2005 22:51:33 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           perl-Gtk2
 Version:        1.080
-Release:        1
+Release:        2
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
 Group:          Development/Libraries
@@ -12,8 +12,9 @@
 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.080
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
+Requires:       perl-Glib >= 1.080
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -44,7 +45,7 @@
 
 %check || :
 # Testing requires X
-#make test
+%{?_with_tests:make test}
 
 
 %clean
@@ -61,6 +62,9 @@
 
 
 %changelog
+* 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??).
+
 * Tue Mar  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-1
 - Update to 1.080.
 



From fedora-extras-commits at redhat.com  Thu Mar 10 22:51:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 10 Mar 2005 17:51:35 -0500
Subject: rpms/perl-Gtk2/devel perl-Gtk2.spec,1.6,1.7
Message-ID: <200503102251.j2AMpZ4X023353@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23340/devel

Modified Files:
	perl-Gtk2.spec 
Log Message:
Use perl-Glib for versioning control


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Gtk2.spec	8 Mar 2005 18:28:36 -0000	1.6
+++ perl-Gtk2.spec	10 Mar 2005 22:51:33 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           perl-Gtk2
 Version:        1.080
-Release:        1
+Release:        2
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
 Group:          Development/Libraries
@@ -12,8 +12,9 @@
 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.080
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
+Requires:       perl-Glib >= 1.080
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -44,7 +45,7 @@
 
 %check || :
 # Testing requires X
-#make test
+%{?_with_tests:make test}
 
 
 %clean
@@ -61,6 +62,9 @@
 
 
 %changelog
+* 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??).
+
 * Tue Mar  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-1
 - Update to 1.080.
 



From shahms at shahms.com  Thu Mar 10 22:30:17 2005
From: shahms at shahms.com (Shahms King)
Date: Thu, 10 Mar 2005 14:30:17 -0800
Subject: APPROVED: ipython, python-durus, python-quixote
Message-ID: <1110493817.4713.51.camel@shahms.mesd.k12.or.us>

Name: ipython
IPython provides a replacement for the interactive Python interpreter
with extra functionality to make experimenting with python code easier
and more pleasant.

Maintainer: Shahms King
Reviewed by: Seth Vidal

------------------
Name: python-durus
python-durus is a persistent object system for applications written in
the Python programming language. It offers an easy way to use and
maintain a consistent collection of object instances used by one or more
processes. Access and change of a persistent instances is managed
through a cached Connection instance which includes commit() and abort()
methods so that changes are transactional. Durus is best suited to
collections of less than a million instances with relatively stable
state.

Maintainer: Shahms King
Reviewed by: Seth Vidal

--------------------
Name: python-quixote
python-quixote is a framework for developing Web applications in Python.
Quixote is based on a simple, flexible design, making it possible to
write applications quickly and to benefit from the wide range of
available third-party Python modules. Deployed appropriately, Quixote
has excellent performance that allows you to put Quixote-based
applications into large-scale production use.

Maintainer: Shahms King
Reviewed by: Seth Vidal


-- 
Shahms E. King <shahms at shahms.com>
Multnomah ESD

Public Key:
http://shahms.mesd.k12.or.us/~sking/shahms.asc
Fingerprint:
1612 054B CE92 8770 F1EA  AB1B FEAB 3636 45B2 D75B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050310/74192ca8/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Sat Mar 12 08:38:57 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 12 Mar 2005 03:38:57 -0500
Subject: rpms/mpc/FC-3 .cvsignore,1.2,1.3 mpc.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200503120838.j2C8cvpR012729@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/mpc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12718/FC-3

Modified Files:
	.cvsignore mpc.spec sources 
Log Message:
- version 0.11.2
- drop Epoch
- update URL




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mpc/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2004 21:12:03 -0000	1.2
+++ .cvsignore	12 Mar 2005 08:38:55 -0000	1.3
@@ -1 +1 @@
-mpc-0.11.1.tar.gz
+mpc-0.11.2.tar.gz


Index: mpc.spec
===================================================================
RCS file: /cvs/extras/rpms/mpc/FC-3/mpc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mpc.spec	12 Dec 2004 21:23:43 -0000	1.2
+++ mpc.spec	12 Mar 2005 08:38:55 -0000	1.3
@@ -1,12 +1,11 @@
 Name:             mpc
 Summary:          Command-line client for MPD
-Version:          0.11.1
-Release:          2
-Epoch:            0
+Version:          0.11.2
+Release:          1
 License:          GPL
 Group:            Applications/Multimedia
-URL:              http://www.musicpd.org/?page=mpc
-Source0:          http://mercury.chem.pitt.edu/~shank/mpc-0.11.1.tar.gz
+URL:              http://www.musicpd.org/mpc.shtml
+Source0:          http://mercury.chem.pitt.edu/~shank/mpc-0.11.2.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -47,6 +46,11 @@
 
 
 %changelog
+* Sat Mar 12 2005 Aurelien Bompard <gauret[AT]free.fr> 0.11.2-1
+- version 0.11.2
+- drop Epoch
+- update URL
+
 * Wed Dec 08 2004 Aurelien Bompard <gauret[AT]free.fr> 0:0.11.1-2
 - put the bash_completion file in %%_datadir instead of %%_docdir
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mpc/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2004 21:12:03 -0000	1.2
+++ sources	12 Mar 2005 08:38:55 -0000	1.3
@@ -1 +1 @@
-5c9887159915164e070cd0230da621fd  mpc-0.11.1.tar.gz
+c8411da7936662312cf9483f3490e285  mpc-0.11.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Mar 12 08:38:57 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 12 Mar 2005 03:38:57 -0500
Subject: rpms/mpc/devel .cvsignore,1.2,1.3 mpc.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <200503120838.j2C8cv68012735@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/mpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12718/devel

Modified Files:
	.cvsignore mpc.spec sources 
Log Message:
- version 0.11.2
- drop Epoch
- update URL




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mpc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2004 21:12:03 -0000	1.2
+++ .cvsignore	12 Mar 2005 08:38:55 -0000	1.3
@@ -1 +1 @@
-mpc-0.11.1.tar.gz
+mpc-0.11.2.tar.gz


Index: mpc.spec
===================================================================
RCS file: /cvs/extras/rpms/mpc/devel/mpc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mpc.spec	3 Mar 2005 23:01:24 -0000	1.3
+++ mpc.spec	12 Mar 2005 08:38:55 -0000	1.4
@@ -1,11 +1,11 @@
 Name:             mpc
 Summary:          Command-line client for MPD
-Version:          0.11.1
-Release:          2
+Version:          0.11.2
+Release:          1
 License:          GPL
 Group:            Applications/Multimedia
-URL:              http://www.musicpd.org/?page=mpc
-Source0:          http://mercury.chem.pitt.edu/~shank/mpc-0.11.1.tar.gz
+URL:              http://www.musicpd.org/mpc.shtml
+Source0:          http://mercury.chem.pitt.edu/~shank/mpc-0.11.2.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -46,6 +46,11 @@
 
 
 %changelog
+* Sat Mar 12 2005 Aurelien Bompard <gauret[AT]free.fr> 0.11.2-1
+- version 0.11.2
+- drop Epoch
+- update URL
+
 * Wed Dec 08 2004 Aurelien Bompard <gauret[AT]free.fr> 0:0.11.1-2
 - put the bash_completion file in %%_datadir instead of %%_docdir
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mpc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2004 21:12:03 -0000	1.2
+++ sources	12 Mar 2005 08:38:55 -0000	1.3
@@ -1 +1 @@
-5c9887159915164e070cd0230da621fd  mpc-0.11.1.tar.gz
+c8411da7936662312cf9483f3490e285  mpc-0.11.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Mar 12 08:43:33 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 12 Mar 2005 03:43:33 -0500
Subject: rpms/ulogd/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ulogd.spec,
	1.7, 1.8
Message-ID: <200503120843.j2C8hXgZ012890@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/ulogd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12882/devel

Modified Files:
	.cvsignore sources ulogd.spec 
Log Message:
- sync FC3 and devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Feb 2005 15:52:15 -0000	1.3
+++ .cvsignore	12 Mar 2005 08:43:31 -0000	1.4
@@ -1 +1,2 @@
-ulogd-1.21.tar.bz2
+ulogd-1.22.tar.bz2
+ulogd-1.22.tar.bz2.sig


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Feb 2005 15:52:15 -0000	1.3
+++ sources	12 Mar 2005 08:43:31 -0000	1.4
@@ -1 +1,2 @@
-32e94a9336c10a4cb8ab3745bc2abbdb  ulogd-1.21.tar.bz2
+2593dfc51c0bc1d8f86519fb13dd5f34  ulogd-1.22.tar.bz2
+b0efa8912871bff9d88e156e0de7366d  ulogd-1.22.tar.bz2.sig


Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ulogd.spec	5 Mar 2005 19:55:54 -0000	1.7
+++ ulogd.spec	12 Mar 2005 08:43:31 -0000	1.8
@@ -1,23 +1,24 @@
 Name:           ulogd
-Version:        1.21
+Version:        1.22
 Release:        1
 Summary:        The userspace logging daemon for netfilter
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://gnumonks.org/projects/ulogd
-Source:         http://ftp.netfilter.org/pub/ulogd/ulogd-%{version}.tar.bz2
+Source0:         http://ftp.netfilter.org/pub/ulogd/ulogd-%{version}.tar.bz2
 Source1:        ulogd.logrotate
 Source2:        ulogd.8
+Source3:         http://ftp.netfilter.org/pub/ulogd/ulogd-%{version}.tar.bz2.sig
 Patch1:         ulogd-1.21-logdir.patch
 Patch2:         ulogd-1.02-init.patch
 Patch3:         ulogd-1.02-pgsql.patch
 Patch4:         ulogd-1.21-x86_64.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(post): initscripts, chkconfig
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(post):	initscripts, chkconfig
 Requires(postun): initscripts, chkconfig
 BuildRequires:  mysql-devel
 BuildRequires:  postgresql-devel
-#BuildRequires:  libpcap-devel
+#BuildRequires:	libpcap-devel
 
 %description
 Ulogd is an universal logging daemon for the ULOG target of netfilter, the
@@ -33,7 +34,7 @@
 %description mysql
 Ulogd-mysql is a MySQL output plugin for ulogd. It enables logging of
 firewall information into a MySQL database.
-
+                                                                                
 %package pgsql
 Summary:        PostgreSQL output plugin for ulogd
 Group:          System Environment/Daemons
@@ -53,7 +54,7 @@
 %build
 %configure --with-mysql --with-pgsql
 # Does not support parallel builds
-make
+make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -78,14 +79,14 @@
 %post
 /sbin/chkconfig --add ulogd
 
-%preun
-if [ $1 -eq 0 ]; then
+%preun 
+if [ "$1" = 0 ]; then 
   /sbin/service ulogd stop > /dev/null 2>&1 ||:
-  /sbin/chkconfig --del ulogd
+  /sbin/chkconfig --del ulogd 
 fi
 
-%postun
-if [ $1 -ge 1 ]; then
+%postun 
+if [ "$1" -ge "1" ]; then 
   /sbin/service ulogd reload > /dev/null 2>&1 ||:
 fi
 
@@ -117,6 +118,10 @@
 %{_libdir}/ulogd/ulogd_PGSQL.so
 
 %changelog
+* Wed Mar 09 2005 Aurelien Bompard <gauret[AT]free.fr> 1.22-1
+- version 1.22
+- add gpg signature to sources
+
 * Sun Feb 20 2005 Aurelien Bompard <gauret[AT]free.fr> 1.21-1
 - version 1.21
 



From fedora-extras-commits at redhat.com  Sat Mar 12 08:44:16 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 12 Mar 2005 03:44:16 -0500
Subject: rpms/amarok/FC-3 amarok.spec,1.7,1.8
Message-ID: <200503120844.j2C8iGMZ012936@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12921/FC-3

Modified Files:
	amarok.spec 
Log Message:
- drop workaround for QT packaging bug. It's fixed.



Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/amarok.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- amarok.spec	7 Mar 2005 22:09:28 -0000	1.7
+++ amarok.spec	12 Mar 2005 08:44:14 -0000	1.8
@@ -29,8 +29,6 @@
 %endif
 
 Requires:   kdemultimedia >= 6:3.2
-# Fix OpenGL analyzers because of a qt packaging bug (#126422)
-Requires:   xorg-x11-devel
 
 %description
 Amarok is a KDE multimedia player with:



From fedora-extras-commits at redhat.com  Sat Mar 12 08:44:16 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 12 Mar 2005 03:44:16 -0500
Subject: rpms/amarok/devel amarok.spec,1.9,1.10
Message-ID: <200503120844.j2C8iGGj012940@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12921/devel

Modified Files:
	amarok.spec 
Log Message:
- drop workaround for QT packaging bug. It's fixed.



Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- amarok.spec	7 Mar 2005 22:09:28 -0000	1.9
+++ amarok.spec	12 Mar 2005 08:44:14 -0000	1.10
@@ -29,8 +29,6 @@
 %endif
 
 Requires:   kdemultimedia >= 6:3.2
-# Fix OpenGL analyzers because of a qt packaging bug (#126422)
-Requires:   xorg-x11-devel
 
 %description
 Amarok is a KDE multimedia player with:



From fedora-extras-commits at redhat.com  Sat Mar 12 08:45:15 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 12 Mar 2005 03:45:15 -0500
Subject: rpms/zope/FC-3 zope.init.in,1.1,1.2
Message-ID: <200503120845.j2C8jFkW013004@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/zope/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12993/FC-3

Modified Files:
	zope.init.in 
Log Message:
- fix return value in initscript



Index: zope.init.in
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/zope.init.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zope.init.in	9 Jan 2005 12:09:24 -0000	1.1
+++ zope.init.in	12 Mar 2005 08:45:13 -0000	1.2
@@ -39,11 +39,11 @@
             # success
             action $"Stopping $prog:  " /bin/true
             rm -f /var/lock/subsys/$prog
-            RETVAL=1
+            RETVAL=0
         else
             # failed
             action $"Stopping $prog:  " /bin/false
-            RETVAL=0
+            RETVAL=1
         fi
         return $RETVAL
 }



From fedora-extras-commits at redhat.com  Sat Mar 12 08:45:15 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 12 Mar 2005 03:45:15 -0500
Subject: rpms/zope/devel zope.init.in,1.1,1.2
Message-ID: <200503120845.j2C8jFqW013008@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/zope/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12993/devel

Modified Files:
	zope.init.in 
Log Message:
- fix return value in initscript



Index: zope.init.in
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.init.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zope.init.in	9 Jan 2005 12:09:24 -0000	1.1
+++ zope.init.in	12 Mar 2005 08:45:13 -0000	1.2
@@ -39,11 +39,11 @@
             # success
             action $"Stopping $prog:  " /bin/true
             rm -f /var/lock/subsys/$prog
-            RETVAL=1
+            RETVAL=0
         else
             # failed
             action $"Stopping $prog:  " /bin/false
-            RETVAL=0
+            RETVAL=1
         fi
         return $RETVAL
 }



From fedora-extras-commits at redhat.com  Sun Mar 13 02:02:35 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 12 Mar 2005 21:02:35 -0500
Subject: rpms/gnome-blog import.log,1.3,1.4
Message-ID: <200503130202.j2D22Z00012106@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12094

Modified Files:
	import.log 
Log Message:
auto-import gnome-blog-0.8-5 on branch devel from gnome-blog-0.8-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 04:27:34 -0000	1.3
+++ import.log	13 Mar 2005 02:02:33 -0000	1.4
@@ -1,2 +1,3 @@
 gnome-blog-0_7-0_fdr_7_1:HEAD:gnome-blog-0.7-0.fdr.7.1.src.rpm:1099888039
 gnome-blog-0_7-0_fdr_7_2:HEAD:gnome-blog-0.7-0.fdr.7.2.src.rpm:1099888054
+gnome-blog-0_8-5:HEAD:gnome-blog-0.8-5.src.rpm:1110679349



From fedora-extras-commits at redhat.com  Sun Mar 13 02:02:35 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 12 Mar 2005 21:02:35 -0500
Subject: rpms/gnome-blog/devel gnome-blog-poster.patch, NONE,
	1.1 gnome-blog_makefile.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 gnome-blog.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200503130202.j2D22Zra012110@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12094/devel

Modified Files:
	.cvsignore gnome-blog.spec sources 
Added Files:
	gnome-blog-poster.patch gnome-blog_makefile.patch 
Log Message:
auto-import gnome-blog-0.8-5 on branch devel from gnome-blog-0.8-5.src.rpm

gnome-blog-poster.patch:

--- NEW FILE gnome-blog-poster.patch ---
--- gnome-blog-0.8/gnome-blog-poster.init	2005-02-06 10:31:26.777409742 -0500
+++ gnome-blog-0.8/gnome-blog-poster	2005-02-06 10:32:16.018009917 -0500
@@ -26,12 +26,6 @@
     def __init__(self):
         self.prefs_key = "/apps/gnome-blog"
 
-        client = gconf.client_get_default()
-        value = client.get_bool(self.prefs_key + "/initialized")
-        if (value == None or value == gtk.FALSE):
-            poster._showPrefDialog()
-            client.set_bool(self.prefs_key + "/initialized", gtk.TRUE)
-        
         poster_window = gtk.Window(gtk.WINDOW_TOPLEVEL)
         poster_window.set_title(_("Post Blog Entry"))
         poster_window.connect('destroy', lambda w: gtk.main_quit())
@@ -42,6 +36,12 @@
                                         accel_group=accel_group,
                                         on_entry_posted=self._onEntryPosted)
         
+        client = gconf.client_get_default()
+        value = client.get_bool(self.prefs_key + "/initialized")
+        if (value == None or value == gtk.FALSE):
+            poster._showPrefDialog()
+            client.set_bool(self.prefs_key + "/initialized", gtk.TRUE)
+        
         poster_window.add(poster)
         poster_window.show_all()
 

gnome-blog_makefile.patch:

--- NEW FILE gnome-blog_makefile.patch ---
--- gnome-blog-0.8/Makefile.in.bytec	2005-01-02 02:29:50.000000000 -0500
+++ gnome-blog-0.8/Makefile.in	2005-01-13 09:18:25.993552717 -0500
@@ -397,7 +397,7 @@
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(gnomeblogdir)" $$dlist
+	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(gnomeblogdir)" $$dlist
 
 uninstall-gnomeblogPYTHON:
 	@$(NORMAL_UNINSTALL)
--- gnome-blog-0.8/py-compile.bytec	2004-11-01 12:26:10.000000000 -0500
+++ gnome-blog-0.8/py-compile	2005-01-13 09:15:53.949455705 -0500
@@ -1,7 +1,7 @@
 #!/bin/sh
 # py-compile - Compile a Python program
 
-scriptversion=2004-01-12.23
+scriptversion=2004-12-05.17
 
 # Copyright (C) 2000, 2001, 2003, 2004  Free Software Foundation, Inc.
 
@@ -34,34 +34,54 @@
 fi
 
 basedir=
+destdir=
+files=
+while test $# -ne 0; do
+  case "$1" in
+    --basedir)
+      basedir=$2
+      if test -z "$basedir"; then
+        echo "$0: Missing argument to --basedir." 1>&2
+        exit 1
+      fi
+      shift
+      ;;
+    --destdir)
+      destdir=$2
+      if test -z "$destdir"; then
+        echo "$0: Missing argument to --destdir." 1>&2
+        exit 1
+      fi
+      shift
+      ;;
+    -h|--h*)
+      cat <<\EOF
+Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..."
+
+Byte compile some python scripts FILES.  Use --destdir to specify any
+leading directory path to the FILES that you don't want to include in the
+byte compiled file.  Specify --basedir for any additional path information you
+do want to be shown in the byte compiled file.
 
-case "$1" in
-  --basedir)
-    basedir=$2
-    if test -z "$basedir"; then
-      echo "$0: Missing argument to --basedir." 1>&2
-      exit 1
-    fi
-    shift 2
-    ;;
-  -h|--h*)
-    cat <<\EOF
-Usage: py-compile [--help] [--version] [--basedir DIR] FILES..."
-
-Byte compile some python scripts FILES.  This should be performed
-after they have been moved to the final installation location
+Example:
+  py-compile --destdir /tmp/pkg-root --basedir /usr/share/test test.py test2.py
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit 0
-    ;;
-  -v|--v*)
-    echo "py-compile $scriptversion"
-    exit 0
-    ;;
-esac
+      exit 0
+      ;;
+    -v|--v*)
+      echo "py-compile $scriptversion"
+      exit 0
+      ;;
+    *)
+      files="$files $1"
+      ;;
+  esac
+  shift
+done
 
-if [ $# = 0 ]; then
+if test -z "$files"; then
     echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
     exit 1
 fi
@@ -69,38 +89,51 @@
 # if basedir was given, then it should be prepended to filenames before
 # byte compilation.
 if [ -z "$basedir" ]; then
-    trans="path = file"
+    pathtrans="path = file"
 else
-    trans="path = os.path.join('$basedir', file)"
+    pathtrans="path = os.path.join('$basedir', file)"
+fi
+
+# if destdir was given, then it needs to be prepended to the filename to
+# byte compile but not go into the compiled file.
+if [ -z "$destdir" ]; then
+    filetrans="filepath = path"
+else
+    filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
 fi
 
 $PYTHON -c "
 import sys, os, string, py_compile
 
-files = '''$*'''
+files = '''$files'''
+
 print 'Byte-compiling python modules...'
 for file in string.split(files):
-    $trans
-    if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+    $pathtrans
+    $filetrans
+    if not os.path.exists(filepath) or not (len(filepath) >= 3
+                                            and filepath[-3:] == '.py'):
 	continue
     print file,
     sys.stdout.flush()
-    py_compile.compile(path)
+    py_compile.compile(filepath, filepath + 'c', path)
 print" || exit $?
 
 # this will fail for python < 1.5, but that doesn't matter ...
 $PYTHON -O -c "
 import sys, os, string, py_compile
 
-files = '''$*'''
+files = '''$files'''
 print 'Byte-compiling python modules (optimized versions) ...'
 for file in string.split(files):
-    $trans
-    if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+    $pathtrans
+    $filetrans
+    if not os.path.exists(filepath) or not (len(filepath) >= 3
+                                            and filepath[-3:] == '.py'):
 	continue
     print file,
     sys.stdout.flush()
-    py_compile.compile(path)
+    py_compile.compile(filepath, filepath + 'o', path)
 print" 2>/dev/null || :
 
 # Local Variables:
--- gnome-blog-0.8/protocols/Makefile.in.bytec	2005-01-13 09:16:10.365997809 -0500
+++ gnome-blog-0.8/protocols/Makefile.in	2005-01-13 09:16:44.221928753 -0500
@@ -237,7 +237,7 @@
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(gnomeblogdir)" $$dlist
+	PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(gnomeblogdir)" $$dlist
 
 uninstall-gnomeblogPYTHON:
 	@$(NORMAL_UNINSTALL)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:27:19 -0000	1.2
+++ .cvsignore	13 Mar 2005 02:02:33 -0000	1.3
@@ -1 +1 @@
-gnome-blog-0.7.tar.gz
+gnome-blog-0.8.tar.gz


Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/gnome-blog.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-blog.spec	4 Mar 2005 21:00:23 -0000	1.5
+++ gnome-blog.spec	13 Mar 2005 02:02:33 -0000	1.6
@@ -1,23 +1,27 @@
 %define gnome_python2_version 1.99.13
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pynext %(python -c 'print %{pyver} + 0.1')
+%{!?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:		gnome-blog
-Version:	0.7
-Release:	7
+Version:	0.8
+Release:	5
 Summary:	GNOME panel object for posting blog entries
 
-Group:		User Interface/Desktops
+Group:		Applications/Internet
 License:	GPL
 URL:		http://www.gnome.org/~seth/gnome-blog/		
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-blog/0.7/gnome-blog-0.7.tar.gz
+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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 Requires:	gnome-python2-applet >= %{gnome_python2_version}
 Requires:	gnome-python2-gconf  >= %{gnome_python2_version}
+Requires:	gnome-python2-gnomevfs >= %{gnome_python2_version}
 Requires:	pygtk2 >= %{gnome_python2_version}
-Requires:	python >= %{pyver}, python <= %{pynext}
+Requires:	python-abi = %{pyver}
 
 Requires(post):	GConf2
 Requires(preun): GConf2
@@ -27,42 +31,42 @@
 BuildRequires:	gettext
 BuildRequires:	GConf2
 BuildRequires:	desktop-file-utils
+BuildRequires:	intltool
 
 %description
 GNOME panel object that allows convenient posting of blog entries to
 any blog that supports the bloggerAPI.
 
-
 %prep
 %setup -q
-%{__sed} -i 's|\(<oaf_server iid="OAFIID:GNOME_BlogApplet_Factory" type="exe" location="\)\(blog_applet.py">\)|\1%{_libexecdir}/\2|' GNOME_BlogApplet.server.in
-
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
 # 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
-desktop-file-install --vendor=fedora --dir=$RPM_BUILD_ROOT%{_datadir}/applications --add-category=X-Fedora --add-category=Network gnome-blog.desktop
-
-# Panel applets belong in /usr/libexec rather than /usr/bin
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/blog_applet.py $RPM_BUILD_ROOT%{_libexecdir}
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
@@ -73,27 +77,44 @@
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
 unset GCONF_CONFIG_SOURCES
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/*
 %{_libexecdir}/*
 %{_sysconfdir}/gconf/schemas/gnomeblog.schemas
-%{_datadir}/pixmaps/gnome-blog.png
+%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/applications/*.desktop
 %{_libdir}/bonobo/servers/*.server
-%dir %{_libdir}/python%{pyver}/site-packages/gnomeblog
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/*.py
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/gnome-blog-poster
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/*.pyc
-%ghost %{_libdir}/python*/site-packages/gnomeblog/*.pyo
-
+%dir %{python_sitelib}/gnomeblog
+%{python_sitelib}/gnomeblog/*.py
+%{python_sitelib}/gnomeblog/*.pyc
+%ghost %{python_sitelib}/gnomeblog/*.pyo
 
 %changelog
-* Fri Mar  4 2005 Ville Skytt?? <ville.skytta at iki.fi>
-- Split context marked dependency syntax to work around #118773.
+* Tue Mar  1 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-5
+- Add build requires: intltool
+- Drop epoch: 0.
+
+* Mon Feb  7 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-4
+- Added patch to correct blog-poster bug.(#2377c5)
+
+* Thu Feb 03 2005 Toshio Kuratomi <toshio at tiki-lounge.com> - 0:0.8-0.fdr.3
+- No longer include gnome-blog-poster in the library path.  It only belongs
+  in the bindir.
+- Switch to the new python macros for python-abi.
+- Switch to python_sitelib in the files section.  Makes gnome-blog build on
+  x86_64.
+- Change group to Applications/Internet.
+
+* Thu Jan 13 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-0.fdr.2
+- Added makefile patch to fix python byte compiling from Toshio Kuratomi (#2377).
+
+* Wed Jan 12 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-0.fdr.1
+- Updated to 0.8.
+- Removed code from spec file that fixed location of blog_applet.py, since this was corrected upstream.
+- Added requires for gnome-python2-gnomevfs.
 
 * Tue Feb  3 2004 Brian Pepple <bdpepple at ameritech.net> 0:0.7-0.fdr.7
 - Removed Requires: GConf2, and replaced with Requires(post,preun).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:27:19 -0000	1.2
+++ sources	13 Mar 2005 02:02:33 -0000	1.3
@@ -1 +1 @@
-0aad0b5b0b3c59bb70ca6f5f9f81c170  gnome-blog-0.7.tar.gz
+d8e8a451f8e7fd4b1af49a6346301e2a  gnome-blog-0.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar 13 02:58:19 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 12 Mar 2005 21:58:19 -0500
Subject: rpms/gnome-blog import.log,1.4,1.5
Message-ID: <200503130258.j2D2wJeA013131@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13116

Modified Files:
	import.log 
Log Message:
auto-import gnome-blog-0.8-5 on branch FC-3 from gnome-blog-0.8-5.src.rpm
Update to 0.8


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	13 Mar 2005 02:02:33 -0000	1.4
+++ import.log	13 Mar 2005 02:58:17 -0000	1.5
@@ -1,3 +1,4 @@
 gnome-blog-0_7-0_fdr_7_1:HEAD:gnome-blog-0.7-0.fdr.7.1.src.rpm:1099888039
 gnome-blog-0_7-0_fdr_7_2:HEAD:gnome-blog-0.7-0.fdr.7.2.src.rpm:1099888054
 gnome-blog-0_8-5:HEAD:gnome-blog-0.8-5.src.rpm:1110679349
+gnome-blog-0_8-5:FC-3:gnome-blog-0.8-5.src.rpm:1110682693



From fedora-extras-commits at redhat.com  Sun Mar 13 02:58:19 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 12 Mar 2005 21:58:19 -0500
Subject: rpms/gnome-blog/FC-3 gnome-blog-poster.patch, NONE,
	1.1 gnome-blog_makefile.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 gnome-blog.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200503130258.j2D2wJjA013135@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13116/FC-3

Modified Files:
	.cvsignore gnome-blog.spec sources 
Added Files:
	gnome-blog-poster.patch gnome-blog_makefile.patch 
Log Message:
auto-import gnome-blog-0.8-5 on branch FC-3 from gnome-blog-0.8-5.src.rpm
Update to 0.8

gnome-blog-poster.patch:

--- NEW FILE gnome-blog-poster.patch ---
--- gnome-blog-0.8/gnome-blog-poster.init	2005-02-06 10:31:26.777409742 -0500
+++ gnome-blog-0.8/gnome-blog-poster	2005-02-06 10:32:16.018009917 -0500
@@ -26,12 +26,6 @@
     def __init__(self):
         self.prefs_key = "/apps/gnome-blog"
 
-        client = gconf.client_get_default()
-        value = client.get_bool(self.prefs_key + "/initialized")
-        if (value == None or value == gtk.FALSE):
-            poster._showPrefDialog()
-            client.set_bool(self.prefs_key + "/initialized", gtk.TRUE)
-        
         poster_window = gtk.Window(gtk.WINDOW_TOPLEVEL)
         poster_window.set_title(_("Post Blog Entry"))
         poster_window.connect('destroy', lambda w: gtk.main_quit())
@@ -42,6 +36,12 @@
                                         accel_group=accel_group,
                                         on_entry_posted=self._onEntryPosted)
         
+        client = gconf.client_get_default()
+        value = client.get_bool(self.prefs_key + "/initialized")
+        if (value == None or value == gtk.FALSE):
+            poster._showPrefDialog()
+            client.set_bool(self.prefs_key + "/initialized", gtk.TRUE)
+        
         poster_window.add(poster)
         poster_window.show_all()
 

gnome-blog_makefile.patch:

--- NEW FILE gnome-blog_makefile.patch ---
--- gnome-blog-0.8/Makefile.in.bytec	2005-01-02 02:29:50.000000000 -0500
+++ gnome-blog-0.8/Makefile.in	2005-01-13 09:18:25.993552717 -0500
@@ -397,7 +397,7 @@
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(gnomeblogdir)" $$dlist
+	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(gnomeblogdir)" $$dlist
 
 uninstall-gnomeblogPYTHON:
 	@$(NORMAL_UNINSTALL)
--- gnome-blog-0.8/py-compile.bytec	2004-11-01 12:26:10.000000000 -0500
+++ gnome-blog-0.8/py-compile	2005-01-13 09:15:53.949455705 -0500
@@ -1,7 +1,7 @@
 #!/bin/sh
 # py-compile - Compile a Python program
 
-scriptversion=2004-01-12.23
+scriptversion=2004-12-05.17
 
 # Copyright (C) 2000, 2001, 2003, 2004  Free Software Foundation, Inc.
 
@@ -34,34 +34,54 @@
 fi
 
 basedir=
+destdir=
+files=
+while test $# -ne 0; do
+  case "$1" in
+    --basedir)
+      basedir=$2
+      if test -z "$basedir"; then
+        echo "$0: Missing argument to --basedir." 1>&2
+        exit 1
+      fi
+      shift
+      ;;
+    --destdir)
+      destdir=$2
+      if test -z "$destdir"; then
+        echo "$0: Missing argument to --destdir." 1>&2
+        exit 1
+      fi
+      shift
+      ;;
+    -h|--h*)
+      cat <<\EOF
+Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..."
+
+Byte compile some python scripts FILES.  Use --destdir to specify any
+leading directory path to the FILES that you don't want to include in the
+byte compiled file.  Specify --basedir for any additional path information you
+do want to be shown in the byte compiled file.
 
-case "$1" in
-  --basedir)
-    basedir=$2
-    if test -z "$basedir"; then
-      echo "$0: Missing argument to --basedir." 1>&2
-      exit 1
-    fi
-    shift 2
-    ;;
-  -h|--h*)
-    cat <<\EOF
-Usage: py-compile [--help] [--version] [--basedir DIR] FILES..."
-
-Byte compile some python scripts FILES.  This should be performed
-after they have been moved to the final installation location
+Example:
+  py-compile --destdir /tmp/pkg-root --basedir /usr/share/test test.py test2.py
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit 0
-    ;;
-  -v|--v*)
-    echo "py-compile $scriptversion"
-    exit 0
-    ;;
-esac
+      exit 0
+      ;;
+    -v|--v*)
+      echo "py-compile $scriptversion"
+      exit 0
+      ;;
+    *)
+      files="$files $1"
+      ;;
+  esac
+  shift
+done
 
-if [ $# = 0 ]; then
+if test -z "$files"; then
     echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
     exit 1
 fi
@@ -69,38 +89,51 @@
 # if basedir was given, then it should be prepended to filenames before
 # byte compilation.
 if [ -z "$basedir" ]; then
-    trans="path = file"
+    pathtrans="path = file"
 else
-    trans="path = os.path.join('$basedir', file)"
+    pathtrans="path = os.path.join('$basedir', file)"
+fi
+
+# if destdir was given, then it needs to be prepended to the filename to
+# byte compile but not go into the compiled file.
+if [ -z "$destdir" ]; then
+    filetrans="filepath = path"
+else
+    filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
 fi
 
 $PYTHON -c "
 import sys, os, string, py_compile
 
-files = '''$*'''
+files = '''$files'''
+
 print 'Byte-compiling python modules...'
 for file in string.split(files):
-    $trans
-    if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+    $pathtrans
+    $filetrans
+    if not os.path.exists(filepath) or not (len(filepath) >= 3
+                                            and filepath[-3:] == '.py'):
 	continue
     print file,
     sys.stdout.flush()
-    py_compile.compile(path)
+    py_compile.compile(filepath, filepath + 'c', path)
 print" || exit $?
 
 # this will fail for python < 1.5, but that doesn't matter ...
 $PYTHON -O -c "
 import sys, os, string, py_compile
 
-files = '''$*'''
+files = '''$files'''
 print 'Byte-compiling python modules (optimized versions) ...'
 for file in string.split(files):
-    $trans
-    if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+    $pathtrans
+    $filetrans
+    if not os.path.exists(filepath) or not (len(filepath) >= 3
+                                            and filepath[-3:] == '.py'):
 	continue
     print file,
     sys.stdout.flush()
-    py_compile.compile(path)
+    py_compile.compile(filepath, filepath + 'o', path)
 print" 2>/dev/null || :
 
 # Local Variables:
--- gnome-blog-0.8/protocols/Makefile.in.bytec	2005-01-13 09:16:10.365997809 -0500
+++ gnome-blog-0.8/protocols/Makefile.in	2005-01-13 09:16:44.221928753 -0500
@@ -237,7 +237,7 @@
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(gnomeblogdir)" $$dlist
+	PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(gnomeblogdir)" $$dlist
 
 uninstall-gnomeblogPYTHON:
 	@$(NORMAL_UNINSTALL)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:27:19 -0000	1.2
+++ .cvsignore	13 Mar 2005 02:58:17 -0000	1.3
@@ -1 +1 @@
-gnome-blog-0.7.tar.gz
+gnome-blog-0.8.tar.gz


Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/FC-3/gnome-blog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-blog.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gnome-blog.spec	13 Mar 2005 02:58:17 -0000	1.4
@@ -1,104 +1,121 @@
 %define gnome_python2_version 1.99.13
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pynext %(python -c 'print %{pyver} + 0.1')
+%{!?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:		gnome-blog
-Version:	0.7
-Release:	7
-Epoch:		0
+Version:	0.8
+Release:	5
 Summary:	GNOME panel object for posting blog entries
 
-Group:		User Interface/Desktops
+Group:		Applications/Internet
 License:	GPL
 URL:		http://www.gnome.org/~seth/gnome-blog/		
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-blog/0.7/gnome-blog-0.7.tar.gz
+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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-Requires:	gnome-python2-applet >= 0:%{gnome_python2_version}
-Requires:	gnome-python2-gconf  >= 0:%{gnome_python2_version}
-Requires:	pygtk2 >= 0:%{gnome_python2_version}
-Requires:	python >= 0:%{pyver}, python <= 0:%{pynext}
+Requires:	gnome-python2-applet >= %{gnome_python2_version}
+Requires:	gnome-python2-gconf  >= %{gnome_python2_version}
+Requires:	gnome-python2-gnomevfs >= %{gnome_python2_version}
+Requires:	pygtk2 >= %{gnome_python2_version}
+Requires:	python-abi = %{pyver}
 
-Requires(post,preun): GConf2
+Requires(post):	GConf2
+Requires(preun): GConf2
 
-BuildRequires:  pygtk2-devel >= 0:%{gnome_python2_version}
+BuildRequires:	pygtk2-devel >= %{gnome_python2_version}
 BuildRequires:	glib2-devel
-BuildRequires: 	gettext
+BuildRequires:	gettext
 BuildRequires:	GConf2
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
+BuildRequires:	intltool
 
 %description
 GNOME panel object that allows convenient posting of blog entries to
 any blog that supports the bloggerAPI.
 
-# ---------------------------------------------------------------------------------------------
-
 %prep
 %setup -q
-%{__sed} -i 's|\(<oaf_server iid="OAFIID:GNOME_BlogApplet_Factory" type="exe" location="\)\(blog_applet.py">\)|\1%{_libexecdir}/\2|' GNOME_BlogApplet.server.in
-
-# ---------------------------------------------------------------------------------------------
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure
 make %{?_smp_mflags}
 
-# ---------------------------------------------------------------------------------------------
-
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
 # 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
-desktop-file-install --vendor=fedora --dir=$RPM_BUILD_ROOT%{_datadir}/applications --add-category=X-Fedora --add-category=Network gnome-blog.desktop
-
-# Panel applets belong in /usr/libexec rather than /usr/bin
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/blog_applet.py $RPM_BUILD_ROOT%{_libexecdir}
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# ---------------------------------------------------------------------------------------------
-
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
 unset GCONF_CONFIG_SOURCES
- 
+
 %preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
 unset GCONF_CONFIG_SOURCES
 
-# ---------------------------------------------------------------------------------------------
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/*
 %{_libexecdir}/*
 %{_sysconfdir}/gconf/schemas/gnomeblog.schemas
-%{_datadir}/pixmaps/gnome-blog.png
+%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/applications/*.desktop
 %{_libdir}/bonobo/servers/*.server
-%dir %{_libdir}/python%{pyver}/site-packages/gnomeblog
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/*.py
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/gnome-blog-poster
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/*.pyc
-%ghost %{_libdir}/python*/site-packages/gnomeblog/*.pyo
-
-# ---------------------------------------------------------------------------------------------
+%dir %{python_sitelib}/gnomeblog
+%{python_sitelib}/gnomeblog/*.py
+%{python_sitelib}/gnomeblog/*.pyc
+%ghost %{python_sitelib}/gnomeblog/*.pyo
 
 %changelog
+* Tue Mar  1 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-5
+- Add build requires: intltool
+- Drop epoch: 0.
+
+* Mon Feb  7 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-4
+- Added patch to correct blog-poster bug.(#2377c5)
+
+* Thu Feb 03 2005 Toshio Kuratomi <toshio at tiki-lounge.com> - 0:0.8-0.fdr.3
+- No longer include gnome-blog-poster in the library path.  It only belongs
+  in the bindir.
+- Switch to the new python macros for python-abi.
+- Switch to python_sitelib in the files section.  Makes gnome-blog build on
+  x86_64.
+- Change group to Applications/Internet.
+
+* Thu Jan 13 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-0.fdr.2
+- Added makefile patch to fix python byte compiling from Toshio Kuratomi (#2377).
+
+* Wed Jan 12 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-0.fdr.1
+- Updated to 0.8.
+- Removed code from spec file that fixed location of blog_applet.py, since this was corrected upstream.
+- Added requires for gnome-python2-gnomevfs.
+
 * Tue Feb  3 2004 Brian Pepple <bdpepple at ameritech.net> 0:0.7-0.fdr.7
 - Removed Requires: GConf2, and replaced with Requires(post,preun).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:27:19 -0000	1.2
+++ sources	13 Mar 2005 02:58:17 -0000	1.3
@@ -1 +1 @@
-0aad0b5b0b3c59bb70ca6f5f9f81c170  gnome-blog-0.7.tar.gz
+d8e8a451f8e7fd4b1af49a6346301e2a  gnome-blog-0.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar 13 05:25:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 13 Mar 2005 00:25:45 -0500
Subject: rpms/gai/FC-3 gai.spec,1.7,1.8
Message-ID: <200503130525.j2D5Pj4B018528@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18503/FC-3/gai

Modified Files:
	gai.spec 
Log Message:
Add missing deps on gtkglext-devel as spotted by Fabrice Colin.
FC3 builds were fine though, because gtkglext-devel was present
in build system.



Index: gai.spec
===================================================================
RCS file: /cvs/extras/rpms/gai/FC-3/gai.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gai.spec	27 Feb 2005 05:31:34 -0000	1.7
+++ gai.spec	13 Mar 2005 05:25:43 -0000	1.8
@@ -1,7 +1,6 @@
 Name:		gai
 Version:	0.5.8
-Release:	4
-Epoch:		0
+Release:	5
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -11,14 +10,15 @@
 Patch0:		gai-0.5.8-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libgnomeui-devel, gtk2-devel >= 0:2.2, gnome-panel-devel
-BuildRequires:	SDL-devel
+BuildRequires:	libgnomeui-devel, gtk2-devel >= 2.2, gnome-panel-devel
+BuildRequires:	SDL-devel gtkglext-devel
 
 %package	devel
 Summary:	Library and headers for Generic Applet Interface
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel-devel, libgnomeui-devel
+Requires:	%{name} = %{version}-%{release}
+Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel-devel
+Requires:	libgnomeui-devel gtkglext-devel
 
 %description
 This library provides a generic interface for developing applets for Gnome 2
@@ -55,7 +55,7 @@
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING.LIB ChangeLog README* THANKS TODO WINDOWMANAGERS
 %{_libdir}/libgai.so.*
@@ -68,6 +68,9 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Sun Mar 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-5
+- Really add gtkglext-devel dependencies (Fabrice Colin).
+
 * Sun Feb 27 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-4
 - licence LGPL
 - BR SDL-devel gtkglext-devel
@@ -96,7 +99,7 @@
 
 * Tue Oct 28 2003 Michel Alexandre Salim <salimma[AT]users.sf.net> - 0.5.0-0.fdr.0.1.pre4
 - Fixed broken library naming (thanks Michael Schwendt)
- 
+
 * Mon Oct 27 2003 Michel Alexandre Salim <salimma[AT]users.sourceforge.net> - 0.5.0-0.fdr.0.pre4
 - Update to 0.5.0pre4; API change between 0.4.x and 0.5.0.
 - Most GAI applets now developed for 0.5.0, since 0.4.1 is not in Fedora yet one might as well move to 0.5.0 now.



From fedora-extras-commits at redhat.com  Sun Mar 13 05:25:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 13 Mar 2005 00:25:45 -0500
Subject: devel/gai gai.spec,1.8,1.9
Message-ID: <200503130525.j2D5Pjtk018525@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gai
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18503/d/d

Modified Files:
	gai.spec 
Log Message:
Add missing deps on gtkglext-devel as spotted by Fabrice Colin.
FC3 builds were fine though, because gtkglext-devel was present
in build system.



Index: gai.spec
===================================================================
RCS file: /cvs/extras/devel/gai/gai.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gai.spec	3 Mar 2005 21:26:02 -0000	1.8
+++ gai.spec	13 Mar 2005 05:25:43 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		gai
 Version:	0.5.8
-Release:	4
+Release:	5
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -11,13 +11,14 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel, gtk2-devel >= 2.2, gnome-panel-devel
-BuildRequires:	SDL-devel
+BuildRequires:	SDL-devel gtkglext-devel
 
 %package	devel
 Summary:	Library and headers for Generic Applet Interface
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel-devel, libgnomeui-devel
+Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel-devel
+Requires:	libgnomeui-devel gtkglext-devel
 
 %description
 This library provides a generic interface for developing applets for Gnome 2
@@ -67,6 +68,9 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Sun Mar 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-5
+- Really add gtkglext-devel dependencies (Fabrice Colin).
+
 * Sun Feb 27 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-4
 - licence LGPL
 - BR SDL-devel gtkglext-devel



From fedora-extras-commits at redhat.com  Sun Mar 13 20:52:22 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 13 Mar 2005 15:52:22 -0500
Subject: rpms/rpmlint/FC-3 .cvsignore, 1.5, 1.6 rpmlint-fedora-config, 1.3,
	1.4 rpmlint.spec, 1.8, 1.9 sources, 1.5,
	1.6 rpmlint-siteperl.patch, 1.1, NONE
Message-ID: <200503132052.j2DKqMqY018645@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmlint/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18635/FC-3

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint.spec sources 
Removed Files:
	rpmlint-siteperl.patch 
Log Message:
0.68, some default config improvements.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Feb 2005 19:28:58 -0000	1.5
+++ .cvsignore	13 Mar 2005 20:52:19 -0000	1.6
@@ -1 +1 @@
-rpmlint-0.67.tar.bz2
+rpmlint-0.68.tar.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-3/rpmlint-fedora-config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmlint-fedora-config	13 Feb 2005 19:28:58 -0000	1.3
+++ rpmlint-fedora-config	13 Mar 2005 20:52:20 -0000	1.4
@@ -55,6 +55,7 @@
     "Freeware",
     "GPL",
     "IBM Public License",
+    "LaTeX Project Public License",
     "LGPL",
     "MIT",
     "MPL",
@@ -78,7 +79,7 @@
 # Output filters
 addFilter("W: .* source-or-patch-not-[bg]zipped .*")
 addFilter("E: .* lib-package-without-%mklibname")
-addFilter("E: .* no-dependency (perl|python)-base.*")
+addFilter("E: .* no-dependency-on (perl|python)-base.*")
 addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
 addFilter("W: .* invalid-distribution .*")
 addFilter("W: .* invalid-vendor .*")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-3/rpmlint.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpmlint.spec	13 Feb 2005 19:28:58 -0000	1.8
+++ rpmlint.spec	13 Mar 2005 20:52:20 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           rpmlint
-Version:        0.67
+Version:        0.68
 Release:        1
 Epoch:          0
 Summary:        RPM correctness checker
@@ -7,9 +7,8 @@
 Group:          Development/Tools
 License:        GPL
 URL:            http://people.mandrakesoft.com/~flepied/projects/rpmlint/
-Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.67.tar.bz2
+Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.68.tar.bz2
 Source1:        %{name}-fedora-config
-Patch0:         %{name}-siteperl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,7 +22,6 @@
 
 %prep
 %setup -q
-%patch0
 %{__perl} -pi -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
 
@@ -77,12 +75,19 @@
 %{_bindir}/rpm*
 %dir %{_datadir}/rpmlint
 %{_datadir}/rpmlint/rpmlint.bash-completion
+%exclude %{_datadir}/rpmlint/compile.pyo
 %dir %{_sysconfdir}/rpmlint
 %config(noreplace) %{_sysconfdir}/rpmlint/config
 %ghost %{_sysconfdir}/bash_completion.d/rpmlint
 
 
 %changelog
+* Sun Mar 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.68-1
+- 0.68, siteperl patch applied upstream.
+- Fix "no-dependency-on" filtering in default config.
+- Add LaTeX Project Public License to default config.
+- Remove upstream-only %%changelog entries.
+
 * Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.67-1
 - 0.67.
 - Patch to catch more site_perl directories.
@@ -173,535 +178,3 @@
 
 * Sun Mar 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030330
 - First Fedora release, based on upstream spec.
-
-* Fri Jan 17 2003 Gwenole Beauchesne <gbeauchesne at mandrakesoft.com> 0.48-2mdk
-- BinariesCheck.py: Add lib64 paths
-- FilesCheck.py: Errour out about outside-libdir-files only if it
-  concerns a library package.  This is heuristically determined on the
-  package name as '^(lib|.+-libs)'.
-
-* Fri Jan 17 2003 Frederic Lepied <flepied at mandrakesoft.com> 0.48-1mdk
- o rpmlint.py: added a way to load an alternative config file (using -f).
- o SpecCheck.py: * added lib-package-without-%%mklibname
-                 * don't parse changelog section to find errors and
-                 correct source_dir_regex.
- o FilesCheck.py: added outside-libdir-files
- o I18NCheck.py: * Added 'en_US' as valid locale name
-                 * Added "lug" (Luganda) language as a valid code for
-                 translations
-                 * Added recognition of some more language codes
-                 (Gnome includes some translations in those languages now)
- o various exceptions
-
-* Thu Aug  8 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.47-1mdk
- o BinariesCheck.py: added /usr/lib/bonobo to no binary in /usr/lib exceptions
-                     corrected wrong loop for /usr/lib check
- o Config.py: added handling of default values.
- o FHSCheck.py: Add lib64 as standard subdir in /usr (that's the /lib<qual> part of FHS)
- o FilesCheck.py: Add lib64 directories
-                  use default values from Config.
- o I18NCheck.py: Added 'zh_HK' recognition
- o InitScriptCheck.py: allow to add/del service with rpm-helper scripts.
- o MenuCheck.py: add default values from Config.
- o PostCheck.py: added perl to dangerous command check trigger scripts too
-                 check rpm-helper prereq.
-                 corrected prereq test
- o SpecCheck.py: Also check for \{?_prefix}?/lib references
-
-* Tue Jun  4 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.46-1mdk
- o BinariesCheck.py: added no-binary and only-non-binary-in-usr-lib
-
-* Mon Jun  3 2002 Gwenole Beauchesne <gbeauchesne at mandrakesoft.com> 0.45-1mdk
- o SpecCheck.py: - Add configure-without-libdir-spec check
-	         - Add hardcoded-library-path check
-
-* Wed May 29 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.44-1mdk
- o added non-ghost-file check
- o added non-root-user-log-file and non-root-group-log-file.
-
-* Wed May  1 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.43-1mdk
- o added no-prereq-on check.
-
- o check that the package tags are coherent with the file name.
-
- o added a --policy option.
-
- o build only one regexp for all exception and correct the broken ones.
-
-* Fri Mar  8 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.42-2mdk
-- corrected rpmdiff location
-
-* Sun Mar  3 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.42-1mdk
- o  FilesCheck.py: allow perl and python dependencies to be on
-perl-base and python-base. Manage Mandrake perl versionning.
-
- o I18NCheck.py: Added 'mt' to recognized locales
-
- o various exceptions.
-
-* Sat Feb  9 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.41-1mdk
- o SpecCheck.py: report missing %clean section.
-
- o FilesCheck.py: check dependency on the right version of the
-interpreter for python and perl modules.
-
- o various exceptions.
-
-* Thu Jan 10 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.40-1mdk
-
- o MenuCheck.py: new check: invalid-menu-icon-type
-
- o TagsCheck.py: added libsafe.so as an invalid Requires.
-
- o sync with setup 2.2.0-18mdk (Chmouel).
-
- o various exceptions.
-
- o build the package in a way that rpm -V doesn't report warnings.
-
-* Fri Nov 30 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.39-2mdk
-
- o BinariesCheck.py: search references to home or tmp in /usr/lib/pkgconfig/ files.
-
- o FilesCheck.py: .nosearch files are allowed to have a zero length.
-
- o Config.py: added some exceptions.
-
-* Sun Nov 25 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.39-1mdk
-
- o TagsCheck.py: Corrected regexp to check devel provides.
-                 Added the new check invalid-dependency.
-
- o InitScriptCheck.py: Added incoherent-init-script-name check.
-	               Expand shell variable in incoherent-subsys check.
-
- o FilesCheck.py: Use list imported from the setup package for users
-   and groups (from setuplist.py).
-
- o PostCheck.py: Don't print error about percent if post-script has a
-                 %%. (Chmouel)
-	         Check that RPM_BUILD_ROOT or RPM_BUILD_DIR isn't
-	         used.
-
- o SpecCheck.py: Check also %_sourcedir.
-                 Check that the BuildRoot tag doesn't contain a
-                 hardcoded path.
-
- o BinariesCheck.py: Check if .la files contain tmp or home
-   references.
-
-* Tue Oct 30 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.38-1mdk
-
- o BinariesCheck.py: check that major version is present in package
-name.
-
- o FilesCheck.py: check that regular files haven't a zero size.
-
- o I18NCheck.py: only check binary packages.
-
- o SpecCheck.py: don't allow space before tag name.
-
- o TagsCheck.py: * allow space after the release in a changelog entry.
-                 * updated list of licenses from opensource.org and added non
-                 opensource ones.
-                * report a warning if no url tag is defined.
-
- o Config.py: various exceptions.
-
- o SourceCheck.py: correct boolean expression for strange-permission
-
-
-* Tue Oct 16 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.37-1mdk
-
- o SourceCheck.py: allow 0755 as a valid mode for source.
-
- o Config.py: various exceptions
-
- o TagsCheck.py: added invalid-word check in description and summary.
-                 added invalid-buildhost check.
-
- o FilesCheck.py: added .cvsignore to the list of cvs-internal-file.
-
- o BinariesCheck.py: check for new style of pic sections.
-
- o FilesCheck.py: Check if kernel modules are in the kernel package. (Chmouel)
-
- o PostCheck.py: track command with full path too.
-
- o FilesCheck.py: added squid group and user.
-
- o BinariesCheck.py: Warn for man pages without version in library packages.
-
- o DistributionCheck.py: More explicit path regexp check for info files. (Chmouel)
-
-
-* Fri Sep 28 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.36-1mdk
-
-- MenuCheck.py: check if a menu file is executable.
-
-- rpmlint.py: added -n/--noexception option to display all the errors/warnings
-without exceptions from Config.
-
-- TagsCheck.py: added the bugzilla https address as a valid one.
-
-- PostCheck.py: o ghost-files-without-postun => ghost-files-without-postin
-		o check if /tmp or /var/tmp is used.
-		o check if update-menus is called without a menu file.
-
-- FilesCheck.py: added /etc/logrotate.d entry check.
-
-- Config.py: various exceptions
-
-* Tue Aug 21 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.35-1mdk
-
-- BinariesCheck.py: o Make libraries not linked against libc errors
-  and not warnings. (Bill Nottingham)
-
-                    o libc doesn't need to be linked against libc,
-  and the dynamic linker doesn't need dependeny information. (Bill Nottingham)
-
-	            o Fix some of the library checks to be more correct. (Bill
-  Nottingham)
-
-- TagsCheck.py: added a check on obsoleted packages not provided.
-
-- FilesCheck.py: check non readable files.
-
-- PostCheck.py: check ~/ instead of ~ to allow awk scripts not to
-  give false reports.
-
-- MenuCheck.py: o added a check for / in menu titles.
-
-                o Add missing menu entries. (FredC)
-
-- I18NCheck.py: Added 'bs' as a valid language code name. (Pablo)
-
-- Config.py: added a few exceptions.
-
-* Sun Jul 15 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.34-1mdk
-- added missing descriptions.
-- added -a option to check all the installed packages.
-- TagsCheck.py: handle the libbzip2_1-devel case.
-
-* Fri Jul  6 2001 Christian Belisle <cbelisle at mandrakesoft.com> 0.33-2mdk
-- Added descriptions for the -i option.
-
-* Mon Jul  2 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.33-1mdk
-- more descriptions from Christian Belisle.
-
-- BinariesCheck.py: new check for files which can cause upgrade
- problems in the library packages.
-
-- TagsCheck.py: try to check alpha/beta/pre version improper use.
-
-- Filter.py: print description only if they aren't empty.
-
-- SpecCheck.py: added a check for obsolete tags.
-
-- FilesCheck.py: added named user and group to the exception list.
-
-* Mon Jun 18 2001 Christian Belisle <cbelisle at mandrakesoft.com> 0.32-2mdk
-- Added descriptions for the -i option.
-
-* Wed Jun 13 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.32-1mdk
-- rpmlint.py: o If the file given on the command line doesn't exist,
-               try to use the name as an installed package to check.
-              o new -i option to give explanation on the errors/warnings (not too much
-               descriptions have been added ;-)
-
-- MenuCheck.py: added new Office sub menus.
-
-- FilesCheck.py: o added /usr/X11R6/man subdirs to the list of
-	          STANDARD_DIRS.
-	         o warn for .so file only if they are in a lib dir.
-                 o warn for source files in a non devel package only if they are not
-                  doc files.
-
-- TagsCheck.py: corrected description-line-too-long check.
-
-- FilesCheck.py: add the rpm user and group per request of Jeff
-	         Johnson for the future version of rpm.
-
-* Fri May 18 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.31-1mdk
-- PostCheck.py: check that a script isn't only one command.
-                check postin and prein instead of postun and preun
-	        for ghost files creation.
-
-- MenuCheck.py: don't check NO_XALF in menu command.
-
-- FilesCheck.py: Add rpcuser.
-
-- Config.py: Expections for ldconfig, initscripts, netkit-base and iputils.
-
-- TagsCheck.py: check length of summary and description lines.
-
-* Fri Feb 16 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.30-1mdk
-
-- InitScriptCheck.py: check if runlevels are set
-
-- MenuCheck.py: added support to check launchers.
-
-- I18NCheck.py: check subdirs of /sur/share/man.
-
-- PostCheck.py: check that the postun creates the ghost files
-                added install to dangerous commands
-
-- LSBCheck.py: first version
-
-- TagsCheck.py: changed Window Maker to WindowMaker
-                Add https as valid url.
-                Used list of licenses from www.opensource.org/licenses
-                Check the full license before splitting in it
-                multiple parts.
-
-
-* Thu Dec  7 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.29-1mdk
-
-- PostCheck.py: Add /sbin/sash as VALID_SHELLS.
-
-- Config.py: added exceptions for dev.
-
-- FilesCheck.py: check dangling-symlink in the file index too to
-avoid missing special files that aren't created when extracted as a
-user.
-
-- FilesCheck.py: added a generic way to avoid dangling-symlink
-warnings.
-
-- TagsCheck.py: for devel packages, check dependency on lib package
-only when a .so file is present.
-
-- Config.py: add some execptions for pam (0750 dir for /etc/default
-is normal as weel to have gpasswd and chage as suid).
-
-- Config.py: Don't check info-file-with-install-info for bash since
-it's by default in the dir file.
-
-* Fri Nov 24 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.28-1mdk
-- TagsCheck.py: o check -devel package naming scheme only on binary
-                packages.
-                o report a warning if a -devel package comes with no
-                major in its name.
-                o added python licence and public domain.
-                o check syntax of url tag.
-
-- SourceCheck.py: only check compression on tar or diff files.
-
-- Config.py: various exceptions added.
-
-- BinariesCheck.py: o report the file location on objdump errors. 
-                    o new error: executable in library package.
-
-- I18NCheck.py: fuzzy check on packages without dependency on
-locales
-
-- FilesCheck.py: check if a package provides sources.
-
-- PostCheck.py: force a separator before dangerous command.
-
-
-* Mon Nov 13 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.27-1mdk
-- FilesCheck.py: don't warn if a games is setgid games.
-- README: RpmGamesGroup added to the list of available options.
-- Config.py: added exception for xman.
-- BinariesCheck.py: check ldconfig symlinks.
-- TagsCheck.py: don't check no-version-in-changelog for source rpm.
-
-* Fri Nov 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.26-1mdk
-
-- Config.py: added various exceptions.
-
-- TagsCheck.py: o allow multiple licenses.
-                o don't report anymore the package-provides-itself warning because
-                it's the default in rpm 4.
-                o try to not report incoherent-version-in-changelog for sub-packages.
-
-- MenuCheck.py: correct the non-transparent-xpm check.
-
-- FilesCheck.py: don't report buggy length-symlink anymore.
-
-* Thu Oct 12 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.25-1mdk
-
-- Config.py: added exception for sympa, rpm and bcast.
-
-- TagsCheck.py: o check that devel package depends on the base
-                  package with the same version.
-                o check that summary begins with a
-
-- PostCheck.py: o check dangerous commands.
-                ocheck reference to ~ or $HOME.
-
-- MenuCheck.py: o check that titles and longtitles begin by a capital
-                  letter.
-                o check that no version is included in title and longtitle.
-                o /lib/cpp errors to /dev/null for new cpp.
-
-- FilesCheck.py: check package owning system dirs.
-
-- SpecCheck.py: o new check.
-                o check name of spec file.
-                o check use of $RPM_SOURCE_DIR.
-                o warn if a patch is not applied.
-
-* Mon Oct  2 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.24-1mdk
-- FilesCheck.py: added apache and postgres to standard groups.
-- TagsCheck.py: spell check a la Debian.
-
-* Fri Sep 29 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.23-1mdk
-- MenuCheck.py: added Applications/Accessibility.
-                check that menu	files are readable by everyone.
-- Config.py: removed exception for /home.
-             added exceptions for vixie-cron.
-- FilesCheck.py: check cvs internal files.
-
-* Tue Sep 12 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.22-1mdk
-- PostCheck.py: print a warning on empty script.
-- FilesCheck.py: added postgres and apache to default users.
-- TagsCheck.py: added bugs at linux-mandrake.com as a valid packager address.
-- I18NCheck.py: check *.mo for file-not-in-%lang, not only in /usr/share/locale
-- TagsCheck.py, MenuCheck.py: replaced Networking/ICQ group with Networking/Instant messaging.
-
-* Thu Aug 31 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.21-1mdk
-- TagsCheck.py: check packager field compliance to a regexp.
-- Config.py: imported default exceptions.
-- TagsCheck.py: added Apache License, PHP Licence and BSD-Style.
-- MenuCheck.py: check hardcoded path in icon field and large, mini, 
-  normal icon files.
-- PostCheck.py: Fix typo in check of /usr/bin/perl.
-- PostCheck.py: Check perl script like we do for bash script.
-- I18NCheck.py: updated locales list
-- FilesCheck.py: Only check perl_temp_file in a /perl/ directory.
-
-* Fri Aug 25 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.20-1mdk
-- InitScriptCheck.py: new check for /etc/rc.d/init.d scripts.
-- PostCheck.py: check when a script is present that the shell is valid.
-- ConfigCheck.py: report warnings for app-defaults only
-in /usr/X11R6/lib/X11/app-defaults.
-- BinariesCheck.py: report the rpath warning if the directory isn't a
-sub-directory of /usr/lib/.
-
-* Fri Aug 18 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.19-1mdk
-- BinariesCheck.py: check rpath only on system lib paths (ie /lib,
-/usr/lib and /usr/X11R6/lib).  This can be configured with the
-SystemLibPaths option.
-- I18NCheck.py: warn if .mo is not registered in %%lang.
-- MenuCheck.py: protected kdesu check.
-- FilesCheck.py: check perl temporary files.
-- rpmlint.py: added ExtractDir option usable in the config
-file.
-- PostCheck.py: check ] in if statement.  report warning for a
-percent.
-
-* Thu Aug 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.18-1mdk
-- TagsCheck: check licence file.
-- ConfigCheck: check files without no-replace flag.
-- MenuCheck: allow depency on kdesu to point directly to /usr/bin/kdesu.
-- FHSCheck: allow ftp and www in var (from upcoming FHS 2.2).
-
-* Tue Aug  8 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.17-1mdk
-- PostCheck: check bourne shell syntax (Chmouel).
-- FileCheck: o check chkconfig calls for packages with a file in
-             /etc/rc.d/init.d.
-             o allow the call to install-info to be in %%preun.
-- MenuCheck: o take care of kdesu (Chmouel).
-- various exceptions added.
-
-* Wed Jul 19 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.16-1mdk
-- FHSCheck activated by default.
-- FileCheck: o check dangling symlinks.
-             o check info/dir.
-
-* Tue Jun 27 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.15-1mdk
-- 0.15:
- o check non transparent pixmaps in icon path
- o added a check for soname
- o added a warning for packages that provide themselves (for Pixel)
- o corrected check for needs in menu files.
- o various exceptions added.
-
-* Mon Apr 17 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.14-1mdk
-- 0.14:
- o MenuCheck: check old entries from KDE and GNOME and allow entries
-for sections.
- o config: exceptions for urpmi, sash, octave, ghc, procmail, rsh.
- o extract temp files in <tmppath>/<pkgname>.<pid>
-
-* Mon Apr 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.13-1mdk
-- 0.13:
- o MenuCheck: issue a warning if no icon specified (Chmouel).
-              corrected list of correct sections (Chmouel).
- o FilesCheck: check ldconfig calls in %%post and %%postun if the package
-provide a library.
- o config: new exceptions added.
- o BinariesCheck: check non sparc32 binaries in sparc packages.
-
-* Fri Mar 31 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.12-1mdk
-- 0.12:
- o MenuCheck: check binaries launched by menus and
-              check update-menus %%post and %%postun.
- o BinariesCheck: check for non sparc32 binaries in sparc rpms.
-
-* Mon Mar 27 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.11-1mdk
-- 0.11:
- o check menu files.
-
-* Tue Mar 14 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.10-1mdk
-- 1.10:
- o check .h, .a and .so in non devel package.
- o check files in /home.
- o corrected lists of groups.
-
-* Mon Feb 28 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.9.2-1mdk
-- added a dependency on rpm-python.
-- corrected rpm 3.0.4 support.
-
-* Wed Feb 23 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.9.1-1mdk
-- updated to support the way rpm 3.0.4 stores file names.
-
-* Thu Feb 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.9-1mdk
-
-- 0.9: * gpg support.
-       * check release extension.
-       * check non executable in bin directories.
-       * new options: ValidGroups, ReleaseExtension and
-	UseVersionInChangelog.
-
-* Thu Dec 30 1999 Frederic Lepied <flepied at mandrakesoft.com> 0.8-1mdk
-
-- 0.8: I18N checks, some exceptions added.
-
-* Mon Nov 15 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.7: more robust cleanup, filters are regexp now and added
-exception for /var/catman subirs beeing setgid.
-
-* Sat Oct 23 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.6.1: corrected compilation step.
-
-* Sat Oct 23 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.6: filter output, documentation checks.
-
-* Fri Oct 15 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.5: FHS check, configuration files.
-
-* Fri Oct  8 1999 Chmouel Boudjnah <chmouel at mandrakesoft.com>
-- Add Doc.
-
-* Thu Oct  7 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- version 0.4: pgp check and group name check.
-
-* Wed Oct  6 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- version 0.3.
-
-* Mon Oct  4 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- version 0.2.
-
-* Fri Oct  1 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- First spec file for Mandrake distribution.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Feb 2005 19:28:58 -0000	1.5
+++ sources	13 Mar 2005 20:52:20 -0000	1.6
@@ -1 +1 @@
-5b3e0d8eb10b6013d8987ce5a180c7ae  rpmlint-0.67.tar.bz2
+e321c9868b403366d314c77e637e09b9  rpmlint-0.68.tar.bz2


--- rpmlint-siteperl.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar 13 20:52:22 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 13 Mar 2005 15:52:22 -0500
Subject: rpms/rpmlint/devel .cvsignore, 1.5, 1.6 rpmlint-fedora-config, 1.3,
	1.4 rpmlint.spec, 1.9, 1.10 sources, 1.5,
	1.6 rpmlint-siteperl.patch, 1.1, NONE
Message-ID: <200503132052.j2DKqMm9018653@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18635/devel

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint.spec sources 
Removed Files:
	rpmlint-siteperl.patch 
Log Message:
0.68, some default config improvements.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Feb 2005 19:28:58 -0000	1.5
+++ .cvsignore	13 Mar 2005 20:52:20 -0000	1.6
@@ -1 +1 @@
-rpmlint-0.67.tar.bz2
+rpmlint-0.68.tar.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint-fedora-config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmlint-fedora-config	13 Feb 2005 19:28:58 -0000	1.3
+++ rpmlint-fedora-config	13 Mar 2005 20:52:20 -0000	1.4
@@ -55,6 +55,7 @@
     "Freeware",
     "GPL",
     "IBM Public License",
+    "LaTeX Project Public License",
     "LGPL",
     "MIT",
     "MPL",
@@ -78,7 +79,7 @@
 # Output filters
 addFilter("W: .* source-or-patch-not-[bg]zipped .*")
 addFilter("E: .* lib-package-without-%mklibname")
-addFilter("E: .* no-dependency (perl|python)-base.*")
+addFilter("E: .* no-dependency-on (perl|python)-base.*")
 addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
 addFilter("W: .* invalid-distribution .*")
 addFilter("W: .* invalid-vendor .*")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmlint.spec	4 Mar 2005 00:05:43 -0000	1.9
+++ rpmlint.spec	13 Mar 2005 20:52:20 -0000	1.10
@@ -1,14 +1,13 @@
 Name:           rpmlint
-Version:        0.67
-Release:        1
+Version:        0.68
+Release:        2
 Summary:        RPM correctness checker
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://people.mandrakesoft.com/~flepied/projects/rpmlint/
-Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.67.tar.bz2
+Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.68.tar.bz2
 Source1:        %{name}-fedora-config
-Patch0:         %{name}-siteperl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0
 %{__perl} -pi -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
 
@@ -76,12 +74,19 @@
 %{_bindir}/rpm*
 %dir %{_datadir}/rpmlint
 %{_datadir}/rpmlint/rpmlint.bash-completion
+%exclude %{_datadir}/rpmlint/compile.pyo
 %dir %{_sysconfdir}/rpmlint
 %config(noreplace) %{_sysconfdir}/rpmlint/config
 %ghost %{_sysconfdir}/bash_completion.d/rpmlint
 
 
 %changelog
+* Sun Mar 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.68-2
+- 0.68, siteperl patch applied upstream.
+- Fix "no-dependency-on" filtering in default config.
+- Add LaTeX Project Public License to default config.
+- Remove upstream-only %%changelog entries.
+
 * Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.67-1
 - 0.67.
 - Patch to catch more site_perl directories.
@@ -172,535 +177,3 @@
 
 * Sun Mar 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030330
 - First Fedora release, based on upstream spec.
-
-* Fri Jan 17 2003 Gwenole Beauchesne <gbeauchesne at mandrakesoft.com> 0.48-2mdk
-- BinariesCheck.py: Add lib64 paths
-- FilesCheck.py: Errour out about outside-libdir-files only if it
-  concerns a library package.  This is heuristically determined on the
-  package name as '^(lib|.+-libs)'.
-
-* Fri Jan 17 2003 Frederic Lepied <flepied at mandrakesoft.com> 0.48-1mdk
- o rpmlint.py: added a way to load an alternative config file (using -f).
- o SpecCheck.py: * added lib-package-without-%%mklibname
-                 * don't parse changelog section to find errors and
-                 correct source_dir_regex.
- o FilesCheck.py: added outside-libdir-files
- o I18NCheck.py: * Added 'en_US' as valid locale name
-                 * Added "lug" (Luganda) language as a valid code for
-                 translations
-                 * Added recognition of some more language codes
-                 (Gnome includes some translations in those languages now)
- o various exceptions
-
-* Thu Aug  8 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.47-1mdk
- o BinariesCheck.py: added /usr/lib/bonobo to no binary in /usr/lib exceptions
-                     corrected wrong loop for /usr/lib check
- o Config.py: added handling of default values.
- o FHSCheck.py: Add lib64 as standard subdir in /usr (that's the /lib<qual> part of FHS)
- o FilesCheck.py: Add lib64 directories
-                  use default values from Config.
- o I18NCheck.py: Added 'zh_HK' recognition
- o InitScriptCheck.py: allow to add/del service with rpm-helper scripts.
- o MenuCheck.py: add default values from Config.
- o PostCheck.py: added perl to dangerous command check trigger scripts too
-                 check rpm-helper prereq.
-                 corrected prereq test
- o SpecCheck.py: Also check for \{?_prefix}?/lib references
-
-* Tue Jun  4 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.46-1mdk
- o BinariesCheck.py: added no-binary and only-non-binary-in-usr-lib
-
-* Mon Jun  3 2002 Gwenole Beauchesne <gbeauchesne at mandrakesoft.com> 0.45-1mdk
- o SpecCheck.py: - Add configure-without-libdir-spec check
-                 - Add hardcoded-library-path check
-
-* Wed May 29 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.44-1mdk
- o added non-ghost-file check
- o added non-root-user-log-file and non-root-group-log-file.
-
-* Wed May  1 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.43-1mdk
- o added no-prereq-on check.
-
- o check that the package tags are coherent with the file name.
-
- o added a --policy option.
-
- o build only one regexp for all exception and correct the broken ones.
-
-* Fri Mar  8 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.42-2mdk
-- corrected rpmdiff location
-
-* Sun Mar  3 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.42-1mdk
- o  FilesCheck.py: allow perl and python dependencies to be on
-perl-base and python-base. Manage Mandrake perl versionning.
-
- o I18NCheck.py: Added 'mt' to recognized locales
-
- o various exceptions.
-
-* Sat Feb  9 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.41-1mdk
- o SpecCheck.py: report missing %clean section.
-
- o FilesCheck.py: check dependency on the right version of the
-interpreter for python and perl modules.
-
- o various exceptions.
-
-* Thu Jan 10 2002 Frederic Lepied <flepied at mandrakesoft.com> 0.40-1mdk
-
- o MenuCheck.py: new check: invalid-menu-icon-type
-
- o TagsCheck.py: added libsafe.so as an invalid Requires.
-
- o sync with setup 2.2.0-18mdk (Chmouel).
-
- o various exceptions.
-
- o build the package in a way that rpm -V doesn't report warnings.
-
-* Fri Nov 30 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.39-2mdk
-
- o BinariesCheck.py: search references to home or tmp in /usr/lib/pkgconfig/ files.
-
- o FilesCheck.py: .nosearch files are allowed to have a zero length.
-
- o Config.py: added some exceptions.
-
-* Sun Nov 25 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.39-1mdk
-
- o TagsCheck.py: Corrected regexp to check devel provides.
-                 Added the new check invalid-dependency.
-
- o InitScriptCheck.py: Added incoherent-init-script-name check.
-                       Expand shell variable in incoherent-subsys check.
-
- o FilesCheck.py: Use list imported from the setup package for users
-   and groups (from setuplist.py).
-
- o PostCheck.py: Don't print error about percent if post-script has a
-                 %%. (Chmouel)
-                 Check that RPM_BUILD_ROOT or RPM_BUILD_DIR isn't
-                 used.
-
- o SpecCheck.py: Check also %_sourcedir.
-                 Check that the BuildRoot tag doesn't contain a
-                 hardcoded path.
-
- o BinariesCheck.py: Check if .la files contain tmp or home
-   references.
-
-* Tue Oct 30 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.38-1mdk
-
- o BinariesCheck.py: check that major version is present in package
-name.
-
- o FilesCheck.py: check that regular files haven't a zero size.
-
- o I18NCheck.py: only check binary packages.
-
- o SpecCheck.py: don't allow space before tag name.
-
- o TagsCheck.py: * allow space after the release in a changelog entry.
-                 * updated list of licenses from opensource.org and added non
-                 opensource ones.
-                * report a warning if no url tag is defined.
-
- o Config.py: various exceptions.
-
- o SourceCheck.py: correct boolean expression for strange-permission
-
-
-* Tue Oct 16 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.37-1mdk
-
- o SourceCheck.py: allow 0755 as a valid mode for source.
-
- o Config.py: various exceptions
-
- o TagsCheck.py: added invalid-word check in description and summary.
-                 added invalid-buildhost check.
-
- o FilesCheck.py: added .cvsignore to the list of cvs-internal-file.
-
- o BinariesCheck.py: check for new style of pic sections.
-
- o FilesCheck.py: Check if kernel modules are in the kernel package. (Chmouel)
-
- o PostCheck.py: track command with full path too.
-
- o FilesCheck.py: added squid group and user.
-
- o BinariesCheck.py: Warn for man pages without version in library packages.
-
- o DistributionCheck.py: More explicit path regexp check for info files. (Chmouel)
-
-
-* Fri Sep 28 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.36-1mdk
-
-- MenuCheck.py: check if a menu file is executable.
-
-- rpmlint.py: added -n/--noexception option to display all the errors/warnings
-without exceptions from Config.
-
-- TagsCheck.py: added the bugzilla https address as a valid one.
-
-- PostCheck.py: o ghost-files-without-postun => ghost-files-without-postin
-                o check if /tmp or /var/tmp is used.
-                o check if update-menus is called without a menu file.
-
-- FilesCheck.py: added /etc/logrotate.d entry check.
-
-- Config.py: various exceptions
-
-* Tue Aug 21 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.35-1mdk
-
-- BinariesCheck.py: o Make libraries not linked against libc errors
-  and not warnings. (Bill Nottingham)
-
-                    o libc doesn't need to be linked against libc,
-  and the dynamic linker doesn't need dependeny information. (Bill Nottingham)
-
-                    o Fix some of the library checks to be more correct. (Bill
-  Nottingham)
-
-- TagsCheck.py: added a check on obsoleted packages not provided.
-
-- FilesCheck.py: check non readable files.
-
-- PostCheck.py: check ~/ instead of ~ to allow awk scripts not to
-  give false reports.
-
-- MenuCheck.py: o added a check for / in menu titles.
-
-                o Add missing menu entries. (FredC)
-
-- I18NCheck.py: Added 'bs' as a valid language code name. (Pablo)
-
-- Config.py: added a few exceptions.
-
-* Sun Jul 15 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.34-1mdk
-- added missing descriptions.
-- added -a option to check all the installed packages.
-- TagsCheck.py: handle the libbzip2_1-devel case.
-
-* Fri Jul  6 2001 Christian Belisle <cbelisle at mandrakesoft.com> 0.33-2mdk
-- Added descriptions for the -i option.
-
-* Mon Jul  2 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.33-1mdk
-- more descriptions from Christian Belisle.
-
-- BinariesCheck.py: new check for files which can cause upgrade
- problems in the library packages.
-
-- TagsCheck.py: try to check alpha/beta/pre version improper use.
-
-- Filter.py: print description only if they aren't empty.
-
-- SpecCheck.py: added a check for obsolete tags.
-
-- FilesCheck.py: added named user and group to the exception list.
-
-* Mon Jun 18 2001 Christian Belisle <cbelisle at mandrakesoft.com> 0.32-2mdk
-- Added descriptions for the -i option.
-
-* Wed Jun 13 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.32-1mdk
-- rpmlint.py: o If the file given on the command line doesn't exist,
-               try to use the name as an installed package to check.
-              o new -i option to give explanation on the errors/warnings (not too much
-               descriptions have been added ;-)
-
-- MenuCheck.py: added new Office sub menus.
-
-- FilesCheck.py: o added /usr/X11R6/man subdirs to the list of
-                   STANDARD_DIRS.
-                 o warn for .so file only if they are in a lib dir.
-                 o warn for source files in a non devel package only if they are not
-                  doc files.
-
-- TagsCheck.py: corrected description-line-too-long check.
-
-- FilesCheck.py: add the rpm user and group per request of Jeff
-                 Johnson for the future version of rpm.
-
-* Fri May 18 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.31-1mdk
-- PostCheck.py: check that a script isn't only one command.
-                check postin and prein instead of postun and preun
-                for ghost files creation.
-
-- MenuCheck.py: don't check NO_XALF in menu command.
-
-- FilesCheck.py: Add rpcuser.
-
-- Config.py: Expections for ldconfig, initscripts, netkit-base and iputils.
-
-- TagsCheck.py: check length of summary and description lines.
-
-* Fri Feb 16 2001 Frederic Lepied <flepied at mandrakesoft.com> 0.30-1mdk
-
-- InitScriptCheck.py: check if runlevels are set
-
-- MenuCheck.py: added support to check launchers.
-
-- I18NCheck.py: check subdirs of /sur/share/man.
-
-- PostCheck.py: check that the postun creates the ghost files
-                added install to dangerous commands
-
-- LSBCheck.py: first version
-
-- TagsCheck.py: changed Window Maker to WindowMaker
-                Add https as valid url.
-                Used list of licenses from www.opensource.org/licenses
-                Check the full license before splitting in it
-                multiple parts.
-
-
-* Thu Dec  7 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.29-1mdk
-
-- PostCheck.py: Add /sbin/sash as VALID_SHELLS.
-
-- Config.py: added exceptions for dev.
-
-- FilesCheck.py: check dangling-symlink in the file index too to
-avoid missing special files that aren't created when extracted as a
-user.
-
-- FilesCheck.py: added a generic way to avoid dangling-symlink
-warnings.
-
-- TagsCheck.py: for devel packages, check dependency on lib package
-only when a .so file is present.
-
-- Config.py: add some execptions for pam (0750 dir for /etc/default
-is normal as weel to have gpasswd and chage as suid).
-
-- Config.py: Don't check info-file-with-install-info for bash since
-it's by default in the dir file.
-
-* Fri Nov 24 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.28-1mdk
-- TagsCheck.py: o check -devel package naming scheme only on binary
-                packages.
-                o report a warning if a -devel package comes with no
-                major in its name.
-                o added python licence and public domain.
-                o check syntax of url tag.
-
-- SourceCheck.py: only check compression on tar or diff files.
-
-- Config.py: various exceptions added.
-
-- BinariesCheck.py: o report the file location on objdump errors.
-                    o new error: executable in library package.
-
-- I18NCheck.py: fuzzy check on packages without dependency on
-locales
-
-- FilesCheck.py: check if a package provides sources.
-
-- PostCheck.py: force a separator before dangerous command.
-
-
-* Mon Nov 13 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.27-1mdk
-- FilesCheck.py: don't warn if a games is setgid games.
-- README: RpmGamesGroup added to the list of available options.
-- Config.py: added exception for xman.
-- BinariesCheck.py: check ldconfig symlinks.
-- TagsCheck.py: don't check no-version-in-changelog for source rpm.
-
-* Fri Nov 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.26-1mdk
-
-- Config.py: added various exceptions.
-
-- TagsCheck.py: o allow multiple licenses.
-                o don't report anymore the package-provides-itself warning because
-                it's the default in rpm 4.
-                o try to not report incoherent-version-in-changelog for sub-packages.
-
-- MenuCheck.py: correct the non-transparent-xpm check.
-
-- FilesCheck.py: don't report buggy length-symlink anymore.
-
-* Thu Oct 12 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.25-1mdk
-
-- Config.py: added exception for sympa, rpm and bcast.
-
-- TagsCheck.py: o check that devel package depends on the base
-                  package with the same version.
-                o check that summary begins with a
-
-- PostCheck.py: o check dangerous commands.
-                ocheck reference to ~ or $HOME.
-
-- MenuCheck.py: o check that titles and longtitles begin by a capital
-                  letter.
-                o check that no version is included in title and longtitle.
-                o /lib/cpp errors to /dev/null for new cpp.
-
-- FilesCheck.py: check package owning system dirs.
-
-- SpecCheck.py: o new check.
-                o check name of spec file.
-                o check use of $RPM_SOURCE_DIR.
-                o warn if a patch is not applied.
-
-* Mon Oct  2 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.24-1mdk
-- FilesCheck.py: added apache and postgres to standard groups.
-- TagsCheck.py: spell check a la Debian.
-
-* Fri Sep 29 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.23-1mdk
-- MenuCheck.py: added Applications/Accessibility.
-                check that menu files are readable by everyone.
-- Config.py: removed exception for /home.
-             added exceptions for vixie-cron.
-- FilesCheck.py: check cvs internal files.
-
-* Tue Sep 12 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.22-1mdk
-- PostCheck.py: print a warning on empty script.
-- FilesCheck.py: added postgres and apache to default users.
-- TagsCheck.py: added bugs at linux-mandrake.com as a valid packager address.
-- I18NCheck.py: check *.mo for file-not-in-%lang, not only in /usr/share/locale
-- TagsCheck.py, MenuCheck.py: replaced Networking/ICQ group with Networking/Instant messaging.
-
-* Thu Aug 31 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.21-1mdk
-- TagsCheck.py: check packager field compliance to a regexp.
-- Config.py: imported default exceptions.
-- TagsCheck.py: added Apache License, PHP Licence and BSD-Style.
-- MenuCheck.py: check hardcoded path in icon field and large, mini,
-  normal icon files.
-- PostCheck.py: Fix typo in check of /usr/bin/perl.
-- PostCheck.py: Check perl script like we do for bash script.
-- I18NCheck.py: updated locales list
-- FilesCheck.py: Only check perl_temp_file in a /perl/ directory.
-
-* Fri Aug 25 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.20-1mdk
-- InitScriptCheck.py: new check for /etc/rc.d/init.d scripts.
-- PostCheck.py: check when a script is present that the shell is valid.
-- ConfigCheck.py: report warnings for app-defaults only
-in /usr/X11R6/lib/X11/app-defaults.
-- BinariesCheck.py: report the rpath warning if the directory isn't a
-sub-directory of /usr/lib/.
-
-* Fri Aug 18 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.19-1mdk
-- BinariesCheck.py: check rpath only on system lib paths (ie /lib,
-/usr/lib and /usr/X11R6/lib).  This can be configured with the
-SystemLibPaths option.
-- I18NCheck.py: warn if .mo is not registered in %%lang.
-- MenuCheck.py: protected kdesu check.
-- FilesCheck.py: check perl temporary files.
-- rpmlint.py: added ExtractDir option usable in the config
-file.
-- PostCheck.py: check ] in if statement.  report warning for a
-percent.
-
-* Thu Aug 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.18-1mdk
-- TagsCheck: check licence file.
-- ConfigCheck: check files without no-replace flag.
-- MenuCheck: allow depency on kdesu to point directly to /usr/bin/kdesu.
-- FHSCheck: allow ftp and www in var (from upcoming FHS 2.2).
-
-* Tue Aug  8 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.17-1mdk
-- PostCheck: check bourne shell syntax (Chmouel).
-- FileCheck: o check chkconfig calls for packages with a file in
-             /etc/rc.d/init.d.
-             o allow the call to install-info to be in %%preun.
-- MenuCheck: o take care of kdesu (Chmouel).
-- various exceptions added.
-
-* Wed Jul 19 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.16-1mdk
-- FHSCheck activated by default.
-- FileCheck: o check dangling symlinks.
-             o check info/dir.
-
-* Tue Jun 27 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.15-1mdk
-- 0.15:
- o check non transparent pixmaps in icon path
- o added a check for soname
- o added a warning for packages that provide themselves (for Pixel)
- o corrected check for needs in menu files.
- o various exceptions added.
-
-* Mon Apr 17 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.14-1mdk
-- 0.14:
- o MenuCheck: check old entries from KDE and GNOME and allow entries
-for sections.
- o config: exceptions for urpmi, sash, octave, ghc, procmail, rsh.
- o extract temp files in <tmppath>/<pkgname>.<pid>
-
-* Mon Apr 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.13-1mdk
-- 0.13:
- o MenuCheck: issue a warning if no icon specified (Chmouel).
-              corrected list of correct sections (Chmouel).
- o FilesCheck: check ldconfig calls in %%post and %%postun if the package
-provide a library.
- o config: new exceptions added.
- o BinariesCheck: check non sparc32 binaries in sparc packages.
-
-* Fri Mar 31 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.12-1mdk
-- 0.12:
- o MenuCheck: check binaries launched by menus and
-              check update-menus %%post and %%postun.
- o BinariesCheck: check for non sparc32 binaries in sparc rpms.
-
-* Mon Mar 27 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.11-1mdk
-- 0.11:
- o check menu files.
-
-* Tue Mar 14 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.10-1mdk
-- 1.10:
- o check .h, .a and .so in non devel package.
- o check files in /home.
- o corrected lists of groups.
-
-* Mon Feb 28 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.9.2-1mdk
-- added a dependency on rpm-python.
-- corrected rpm 3.0.4 support.
-
-* Wed Feb 23 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.9.1-1mdk
-- updated to support the way rpm 3.0.4 stores file names.
-
-* Thu Feb 10 2000 Frederic Lepied <flepied at mandrakesoft.com> 0.9-1mdk
-
-- 0.9: * gpg support.
-       * check release extension.
-       * check non executable in bin directories.
-       * new options: ValidGroups, ReleaseExtension and
-         UseVersionInChangelog.
-
-* Thu Dec 30 1999 Frederic Lepied <flepied at mandrakesoft.com> 0.8-1mdk
-
-- 0.8: I18N checks, some exceptions added.
-
-* Mon Nov 15 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.7: more robust cleanup, filters are regexp now and added
-exception for /var/catman subirs beeing setgid.
-
-* Sat Oct 23 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.6.1: corrected compilation step.
-
-* Sat Oct 23 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.6: filter output, documentation checks.
-
-* Fri Oct 15 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- 0.5: FHS check, configuration files.
-
-* Fri Oct  8 1999 Chmouel Boudjnah <chmouel at mandrakesoft.com>
-- Add Doc.
-
-* Thu Oct  7 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- version 0.4: pgp check and group name check.
-
-* Wed Oct  6 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- version 0.3.
-
-* Mon Oct  4 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- version 0.2.
-
-* Fri Oct  1 1999 Frederic Lepied <flepied at mandrakesoft.com>
-
-- First spec file for Mandrake distribution.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Feb 2005 19:28:58 -0000	1.5
+++ sources	13 Mar 2005 20:52:20 -0000	1.6
@@ -1 +1 @@
-5b3e0d8eb10b6013d8987ce5a180c7ae  rpmlint-0.67.tar.bz2
+e321c9868b403366d314c77e637e09b9  rpmlint-0.68.tar.bz2


--- rpmlint-siteperl.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar 13 21:09:16 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 13 Mar 2005 16:09:16 -0500
Subject: rpms/liferea import.log,1.8,1.9
Message-ID: <200503132109.j2DL9Gn8019729@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19718

Modified Files:
	import.log 
Log Message:
auto-import liferea-0.9.1-1 on branch devel from liferea-0.9.1-1.src.rpm
update to 0.9.1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/liferea/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	13 Jan 2005 19:33:01 -0000	1.8
+++ import.log	13 Mar 2005 21:09:14 -0000	1.9
@@ -5,3 +5,4 @@
 liferea-0_5_3-0_fdr_4_c_2:HEAD:liferea-0.5.3-0.fdr.4.c.2.src.rpm:1099889386
 liferea-0_6_4-1_b:HEAD:liferea-0.6.4-1.b.src.rpm:1105560383
 liferea-0_6_4-0_fdr_1_b_2:FC-2:liferea-0.6.4-0.fdr.1.b.2.src.rpm:1105644774
+liferea-0_9_1-1:HEAD:liferea-0.9.1-1.src.rpm:1110748150



From fedora-extras-commits at redhat.com  Sun Mar 13 21:09:16 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 13 Mar 2005 16:09:16 -0500
Subject: rpms/liferea/devel .cvsignore, 1.4, 1.5 liferea.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200503132109.j2DL9Ghf019733@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19718/devel

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
auto-import liferea-0.9.1-1 on branch devel from liferea-0.9.1-1.src.rpm
update to 0.9.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Jan 2005 20:05:46 -0000	1.4
+++ .cvsignore	13 Mar 2005 21:09:14 -0000	1.5
@@ -1 +1 @@
-liferea-0.6.4b.tar.gz
+liferea-0.9.1.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- liferea.spec	3 Mar 2005 22:41:32 -0000	1.8
+++ liferea.spec	13 Mar 2005 21:09:14 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           liferea
-Version:        0.9.0
-Release:        1.b
-Summary:        RSS/RDF feed reader
+Version:        0.9.1
+Release:        1
+Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
-Source0:        http://download.sourceforge.net/liferea/liferea-0.9.0b.tar.gz
+Source0:        http://download.sourceforge.net/liferea/liferea-0.9.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel
@@ -21,15 +21,15 @@
 
 
 %description
-Liferea (Linux Feed Reader) is an RSS/RDF feed reader.
-It's intended to be a clone of the Windows-only FeedReader.
-It can be used to maintain a list of subscribed feeds,
-browse through their items, and show their contents
+Liferea (Linux Feed Reader) is an RSS/RDF feed reader. 
+It's intended to be a clone of the Windows-only FeedReader. 
+It can be used to maintain a list of subscribed feeds, 
+browse through their items, and show their contents 
 using GtkHTML.
 
 
 %prep
-%setup -q -n %{name}-%{version}b
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -42,10 +42,10 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 %find_lang %{name}
 
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-desktop-file-install --vendor fedora              \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-  --add-category X-Fedora                         \
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-install --vendor fedora			\
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
+  --add-category X-Fedora			        \
   %{name}.desktop
 
 
@@ -81,14 +81,18 @@
 
 
 %changelog
-* Tue Jan 18 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-1.b
+* Sat Mar 12 2005 Brian Pepple <bdpepple at ameritech.net> - 0.9.1-1
+- Updated to 0.9.1.
+- Drop epoch: 0.
+
+* Tue Jan 18 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-0.1.b
 - Updated to 0.9.0b.
 - Remove seperate desktop file.
 
-* Fri Jan 14 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-1
+* Fri Jan 14 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-0.fdr.1
 - Updated to 0.9.0.
 
-* Wed Jan 12 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.6.4-1.b
+* Wed Jan 12 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.6.4-0.fdr.1.b
 - Updated to 0.6.4b.
 
 * Mon Nov  1 2004 Brian Pepple <bdpepple at ameritech.net> - 0:0.6.1-0.fdr.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jan 2005 00:58:10 -0000	1.5
+++ sources	13 Mar 2005 21:09:14 -0000	1.6
@@ -1 +1 @@
-2781b3ae500e089497fcbee97bf73441  liferea-0.9.0b.tar.gz
+f0d5f184034697522e68e92909897043  liferea-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar 13 21:18:17 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 13 Mar 2005 16:18:17 -0500
Subject: rpms/liferea import.log,1.9,1.10
Message-ID: <200503132118.j2DLIHqs020033@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20024

Modified Files:
	import.log 
Log Message:
auto-import liferea-0.9.1-1 on branch FC-3 from liferea-0.9.1-1.src.rpm
update to 0.9.1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/liferea/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	13 Mar 2005 21:09:14 -0000	1.9
+++ import.log	13 Mar 2005 21:18:15 -0000	1.10
@@ -6,3 +6,4 @@
 liferea-0_6_4-1_b:HEAD:liferea-0.6.4-1.b.src.rpm:1105560383
 liferea-0_6_4-0_fdr_1_b_2:FC-2:liferea-0.6.4-0.fdr.1.b.2.src.rpm:1105644774
 liferea-0_9_1-1:HEAD:liferea-0.9.1-1.src.rpm:1110748150
+liferea-0_9_1-1:FC-3:liferea-0.9.1-1.src.rpm:1110748691



From fedora-extras-commits at redhat.com  Sun Mar 13 21:18:17 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 13 Mar 2005 16:18:17 -0500
Subject: rpms/liferea/FC-3 .cvsignore, 1.4, 1.5 liferea.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200503132118.j2DLIHDg020037@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20024/FC-3

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
auto-import liferea-0.9.1-1 on branch FC-3 from liferea-0.9.1-1.src.rpm
update to 0.9.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Jan 2005 20:05:46 -0000	1.4
+++ .cvsignore	13 Mar 2005 21:18:15 -0000	1.5
@@ -1 +1 @@
-liferea-0.6.4b.tar.gz
+liferea-0.9.1.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-3/liferea.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- liferea.spec	23 Jan 2005 00:58:10 -0000	1.7
+++ liferea.spec	13 Mar 2005 21:18:15 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           liferea
-Version:        0.9.0
-Release:        1.b
-Epoch:          0
-Summary:        An RSS/RDF feed reader.
+Version:        0.9.1
+Release:        1
+Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
-Source0:        http://download.sourceforge.net/liferea/liferea-0.9.0b.tar.gz
+Source0:        http://download.sourceforge.net/liferea/liferea-0.9.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel
@@ -30,7 +29,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}b
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -43,8 +42,8 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 %find_lang %{name}
 
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-desktop-file-install --vendor fedora                    \
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-install --vendor fedora			\
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
   --add-category X-Fedora			        \
   %{name}.desktop
@@ -82,14 +81,18 @@
 
 
 %changelog
-* Tue Jan 18 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-1.b
+* Sat Mar 12 2005 Brian Pepple <bdpepple at ameritech.net> - 0.9.1-1
+- Updated to 0.9.1.
+- Drop epoch: 0.
+
+* Tue Jan 18 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-0.1.b
 - Updated to 0.9.0b.
 - Remove seperate desktop file.
 
-* Fri Jan 14 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-1
+* Fri Jan 14 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.9.0-0.fdr.1
 - Updated to 0.9.0.
 
-* Wed Jan 12 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.6.4-1.b
+* Wed Jan 12 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.6.4-0.fdr.1.b
 - Updated to 0.6.4b.
 
 * Mon Nov  1 2004 Brian Pepple <bdpepple at ameritech.net> - 0:0.6.1-0.fdr.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jan 2005 00:58:10 -0000	1.5
+++ sources	13 Mar 2005 21:18:15 -0000	1.6
@@ -1 +1 @@
-2781b3ae500e089497fcbee97bf73441  liferea-0.9.0b.tar.gz
+f0d5f184034697522e68e92909897043  liferea-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar 13 21:43:45 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 13 Mar 2005 16:43:45 -0500
Subject: rpms/pure-ftpd - New directory
Message-ID: <200503132143.j2DLhj4q020650@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20643/pure-ftpd

Log Message:
Directory /cvs/extras/rpms/pure-ftpd added to the repository




From fedora-extras-commits at redhat.com  Sun Mar 13 21:43:45 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 13 Mar 2005 16:43:45 -0500
Subject: rpms/pure-ftpd/devel - New directory
Message-ID: <200503132143.j2DLhj1B020653@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20643/pure-ftpd/devel

Log Message:
Directory /cvs/extras/rpms/pure-ftpd/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Mar 13 21:44:18 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 13 Mar 2005 16:44:18 -0500
Subject: rpms/pure-ftpd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503132144.j2DLiIuF020721@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20712

Added Files:
	Makefile import.log 
Log Message:
Setup of module pure-ftpd


--- NEW FILE Makefile ---
# Top level Makefile for module pure-ftpd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 13 21:44:18 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 13 Mar 2005 16:44:18 -0500
Subject: rpms/pure-ftpd/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503132144.j2DLiI7Z020724@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20712/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pure-ftpd


--- 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 Mar 13 21:45:56 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 13 Mar 2005 16:45:56 -0500
Subject: rpms/pure-ftpd/devel pure-ftpd-1.0.20-config.patch, NONE,
	1.1 pure-ftpd-1.0.20-libdir.patch, NONE, 1.1 pure-ftpd.init,
	NONE, 1.1 pure-ftpd.logrotate, NONE, 1.1 pure-ftpd.spec, NONE,
	1.1 pure-ftpd.xinetd, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200503132145.j2DLjus1020890@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20878/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pure-ftpd-1.0.20-config.patch pure-ftpd-1.0.20-libdir.patch 
	pure-ftpd.init pure-ftpd.logrotate pure-ftpd.spec 
	pure-ftpd.xinetd 
Log Message:
auto-import pure-ftpd-1.0.20-0.fdr.9 on branch devel from pure-ftpd-1.0.20-0.fdr.9.src.rpm

pure-ftpd-1.0.20-config.patch:

--- NEW FILE pure-ftpd-1.0.20-config.patch ---
--- ./configuration-file/pure-ftpd.conf.in.config	2004-05-15 22:34:54.000000000 +0200
+++ ./configuration-file/pure-ftpd.conf.in	2005-02-11 20:26:35.209063248 +0100
@@ -9,7 +9,7 @@
 # instead of command-line options, please run the
 # following command :
 #
-# @prefix@/sbin/pure-config.pl @prefix@/etc/pure-ftpd.conf
+# @sbindir@/pure-config.pl @sysconfdir@/pure-ftpd.conf
 #
 # Please don't forget to have a look at documentation at
 # http://www.pureftpd.org/documentation.shtml for a complete list of
@@ -107,23 +107,23 @@
 
 # LDAP configuration file (see README.LDAP)
 
-# LDAPConfigFile                /etc/pureftpd-ldap.conf
+# LDAPConfigFile                @sysconfdir@/pureftpd-ldap.conf
 
 
 
 # MySQL configuration file (see README.MySQL)
 
-# MySQLConfigFile               /etc/pureftpd-mysql.conf
+# MySQLConfigFile               @sysconfdir@/pureftpd-mysql.conf
 
 
 # Postgres configuration file (see README.PGSQL)
 
-# PGSQLConfigFile               /etc/pureftpd-pgsql.conf
+# PGSQLConfigFile               @sysconfdir@/pureftpd-pgsql.conf
 
 
 # PureDB user database (see README.Virtual-Users)
 
-# PureDB                        /etc/pureftpd.pdb
+# PureDB                        @sysconfdir@/pureftpd.pdb
 
 
 # Path to pure-authd socket (see README.Authentication-Modules)
@@ -134,7 +134,7 @@
 
 # If you want to enable PAM authentication, uncomment the following line
 
-# PAMAuthentication             yes
+PAMAuthentication             yes
 
 
 
@@ -158,7 +158,7 @@
 # 'ls' recursion limits. The first argument is the maximum number of
 # files to be displayed. The second one is the max subdirectories depth
 
-LimitRecursion              2000 8
+LimitRecursion              7500 8
 
 
 
@@ -237,7 +237,7 @@
 
 # Minimum UID for an authenticated user to log in.
 
-MinUID                      100
+MinUID                      500
 
 
 
@@ -276,7 +276,7 @@
 
 # Disallow anonymous users to upload new files (no = upload is allowed)
 
-AnonymousCantUpload         no
+AnonymousCantUpload         yes
 
 
 
@@ -301,7 +301,7 @@
 # fw.c9x.org - jedi [13/Dec/1975:19:36:39] "GET /ftp/linux.tar.bz2" 200 21809338
 # This log file can then be processed by www traffic analyzers.
 
-# AltLog                     clf:/var/log/pureftpd.log
+AltLog                     clf:/var/log/pureftpd.log
 
 
 
@@ -434,3 +434,10 @@
 # By default, both IPv4 and IPv6 are enabled.
 
 # IPV6Only                 yes
+
+
+
+# Do not use the /etc/ftpusers file to disable accounts. We're already
+# using MinUID to block users with uid < 500
+
+UseFtpUsers no

pure-ftpd-1.0.20-libdir.patch:

--- NEW FILE pure-ftpd-1.0.20-libdir.patch ---
--- ./configure.libdir	2004-06-20 19:41:54.000000000 +0200
+++ ./configure	2005-01-31 12:33:03.901660331 +0100
@@ -19781,8 +19781,8 @@
       LDFLAGS="$LDFLAGS -L${withval}/lib -L${withval}/lib/mysql -L${withval}/mysql/lib"
       CPPFLAGS="$CPPFLAGS -I${withval}/include -I${withval}/include/mysql -I${withval}/mysql/include"
     else
-      LD_RUN_PATH="/usr/local/mysql/lib:/usr/local/mysql/lib/mysql:/usr/lib/mysql:/usr/mysql/lib:/usr/mysql/lib/mysql:/usr/local/lib/mysql:${LD_RUN_PATH:+:}${LD_RUN_PATH}"
-      LDFLAGS="$LDFLAGS -L/usr/local/mysql/lib -L/usr/lib/mysql -L/usr/mysql/lib -L/usr/local/lib/mysql -L/usr/local/mysql/lib/mysql -L/usr/mysql/lib/mysql"
+      LD_RUN_PATH="/usr/local/mysql/lib:/usr/local/mysql/lib/mysql:${libdir}/mysql:/usr/mysql/lib:/usr/mysql/lib/mysql:/usr/local/lib/mysql:${LD_RUN_PATH:+:}${LD_RUN_PATH}"
+      LDFLAGS="$LDFLAGS -L/usr/local/mysql/lib -L${libdir}/mysql -L/usr/mysql/lib -L/usr/local/lib/mysql -L/usr/local/mysql/lib/mysql -L/usr/mysql/lib/mysql"
       CPPFLAGS="$CPPFLAGS -I/usr/local/mysql/include -I/usr/include/mysql -I/usr/mysql/include -I/usr/local/include/mysql -I/usr/local/mysql/include/mysql -I/usr/mysql/include/mysql"
     fi
 


--- NEW FILE pure-ftpd.init ---
#!/bin/bash
#
# Startup script for the pure-ftpd FTP Server  $Revision: 1.1 $
#
# chkconfig: - 85 15
# description: Pure-FTPd is an FTP server daemon based upon Troll-FTPd
# processname: pure-ftpd
# pidfile: /var/run/pure-ftpd.pid
# config: /etc/pure-ftpd/pure-ftpd.conf

# Source function library.
. /etc/init.d/functions
. /etc/sysconfig/network

# Check that networking is configured.
[ ${NETWORKING} = "no" ] && exit 0

RETVAL=0

# Path to the pure-ftp binaries.
fullpath=/usr/sbin/pure-ftpd
pureftpwho=/usr/sbin/pure-ftpwho
pure_config=/etc/pure-ftpd/pure-ftpd.conf
pure_launch_script=/usr/sbin/pure-config.pl


start() {
	echo -n $"Starting Pure-ftpd: "
	daemon $pure_launch_script $pure_config  --daemonize
	RETVAL=$?
	[ $RETVAL = 0 ] && touch /var/lock/subsys/pure-ftpd
	echo
}

stop() {
	echo -n $"Stopping Pure-ftpd: "
	killproc pure-ftpd
	RETVAL=$?
	[ $RETVAL = 0 ] && rm -f /var/lock/subsys/pure-ftpd
	echo
}

# See how we were called.
case "$1" in
	start)
		start
		;;
	stop)
		stop
		;;
	restart)
		stop
		start
		;;
	reload)
		echo -n "Re-reading Pure-ftpd config: "
		killproc pure-ftpd -HUP
		RETVAL=$?
		echo
		;;
	condrestart)
		if [ -f /var/lock/subsys/pure-ftpd ] ; then
			stop
			# avoid race
			sleep 3
			start
		fi
		;;
	status)
		status pure-ftpd
		RETVAL=$?
		if [ -f $pureftpwho ] && [ $RETVAL -eq 0 ] ; then
			$pureftpwho
		fi
		;;
	*)
		echo $"Usage: pure-ftpd {start|stop|restart|reload|condrestart|status}"
		RETVAL=1
esac
exit $RETVAL


--- NEW FILE pure-ftpd.logrotate ---
/var/log/pureftpd.log {
    weekly
    notifempty
    missingok
}


--- NEW FILE pure-ftpd.spec ---
Name:       pure-ftpd
Version:    1.0.20
Release:    0.fdr.9
Epoch:      0
Summary:    Lightweight, fast and secure FTP server

Group:      System Environment/Daemons
License:    BSD
URL:        http://www.pureftpd.org
Source0:    ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.20.tar.bz2
Source1:    pure-ftpd.init 
Source2:    pure-ftpd.logrotate
Source3:    pure-ftpd.xinetd
Patch0:     pure-ftpd-1.0.20-config.patch
Patch1:     pure-ftpd-1.0.20-libdir.patch
Provides:   ftpserver
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pam-devel, perl, python, libcap-devel
#BuildRequires: openssl-devel
%{?_with_ldap:BuildRequires:  openldap-devel}
%{?_with_mysql:BuildRequires: mysql-devel}
%{?_with_pgsql:BuildRequires: postgresql-devel}

Requires(post):   chkconfig
Requires(preun):  chkconfig, initscripts
Requires(postun): initscripts
Requires:   logrotate


%description
Pure-FTPd is a fast, production-quality, standard-comformant FTP server,
based upon Troll-FTPd. Unlike other popular FTP servers, it has no known
security flaw, it is really trivial to set up and it is especially designed
for modern Linux and FreeBSD kernels (setfsuid, sendfile, capabilities) .
Features include PAM support, IPv6, chroot()ed home directories, virtual
domains, built-in LS, anti-warez system, bandwidth throttling, FXP, bounded
ports for passive downloads, UL/DL ratios, native LDAP and SQL support,
Apache log files and more.
Rebuild switches:
--with ldap     enable ldap support
--with mysql    enable mysql support
--with pgsql    enable postgresql support
--with extauth  enable external authentication


%prep
%setup -q 
%patch0 -p0 -b .config
%patch1 -p0 -b .libdir


%build
%configure  --with-paranoidmsg \
            --with-capabilities \
            --with-privsep \
            --with-pam \
            --with-puredb \
            --with-sendfile \
            --with-altlog \
            --with-cookie \
            --with-diraliases \
            --with-throttling \
            --with-ratios \
            --with-quotas \
            --with-ftpwho \
            --with-welcomemsg \
            --with-uploadscript \
            --with-peruserlimits \
            --with-virtualhosts \
            --with-virtualchroot \
            --with-largefile \
            --sysconfdir=%{_sysconfdir}/%{name} \
            --without-tls \
            --without-rendezvous \
            %{?_with_ldap} \
            %{?_with_mysql} \
            %{?_with_pgsql} \
            %{?_with_extauth}

make %{?_smp_mflags}

%install 
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8/
install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/ftp

# Conf 
install -p -m 755 configuration-file/pure-config.pl $RPM_BUILD_ROOT%{_sbindir}
install -p -m 644 configuration-file/pure-ftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -p -m 755 configuration-file/pure-config.py $RPM_BUILD_ROOT%{_sbindir}
install -p -m 644 pureftpd-ldap.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -p -m 644 pureftpd-mysql.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -p -m 644 pureftpd-pgsql.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}

# Man
install -p -m 644 man/pure-ftpd.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-ftpwho.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-mrtginfo.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-uploadscript.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-pw.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-pwconvert.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-statsdecode.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-quotacheck.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m 644 man/pure-authd.8 $RPM_BUILD_ROOT%{_mandir}/man8

# Init script
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}

# Pam 
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
install -p -m 644 pam/pure-ftpd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/

# Logrotate
install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}

# xinetd support
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/
install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ "$1" -le "1" ]; then 
    /sbin/chkconfig --add pure-ftpd
fi

%preun
if [ "$1" -lt "1" ]; then
    /sbin/service pure-ftpd stop > /dev/null 2>&1 || :
    /sbin/chkconfig --del pure-ftpd
fi

%postun 
if [ "$1" -ge "1" ]; then 
    /sbin/service pure-ftpd condrestart > /dev/null 2>&1 
fi


%files
%defattr(-, root, root, -)
%doc FAQ THANKS README.Authentication-Modules README.Virtual-Users README
%doc README.Contrib README.Configuration-File AUTHORS CONTACT HISTORY NEWS
%doc README.LDAP README.PGSQL README.MySQL README.Netfilter
%doc contrib/pure-vpopauth.pl pureftpd.schema contrib/pure-stat.pl
%{_bindir}/pure-*
%{_sbindir}/pure-*
%config %{_initrddir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
%{_mandir}/man8/*
%dir /var/ftp/


%changelog
* Wed Feb 16 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.9
- license is BSD, not GPL

* Mon Feb 14 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.8
- various fixes. See bug 1573 (fedora.us) for more info.

* Fri Feb 11 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.7
- fix init script
- require logrotate
- add rebuild switches to lower dependancies
- see bug 1573 (fedora.us) for more info.

* Fri Feb 04 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.6
- Add the "UseFtpUsers no" directive in the config file since we don't
  use it anymore

* Wed Feb 02 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.5
- various spec file improvements

* Mon Jan 31 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.4
- add patch for x86_64 support
- implement wishes in bug 1573 from Jose Pedro Oliveira
- don't use the ftpusers file, and thus remove conflicts with other FTP servers
- rediff config patch

* Tue Nov 02 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.3
- add large file support

* Fri Sep 24 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.2
- redirect %%preun output to /dev/null
- add requirements to chkconfig for the scriptlets

* Sun Aug 01 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.1
- version 1.0.20 (bugfixes)

* Mon Jun 28 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.19-0.fdr.1
- version 1.0.19

* Tue May 04 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.18-0.fdr.1
- version 1.0.18
- spec file cleanups

* Sun Oct 19 2003 Aurelien Bompard <gauret[AT]free.fr> 1.0.16a-1
- Redhatize the Mandrake RPM
- version 1.0.16a
- improve ftpusers creation script



--- NEW FILE pure-ftpd.xinetd ---
# default: off
# description: pure-ftpd server, xinetd version. \
# Don't run the standalone version if you run \
# this and remember do set "Daemonize" to "no" \
# in /etc/pure-ftpd/pure-ftpd.conf
service ftp
{
	disable	= yes
	socket_type		= stream
	wait			= no
	user			= root
	server			= /usr/sbin/pure-config.pl
	server_args		= /etc/pure-ftpd/pure-ftpd.conf
	log_on_success		+= DURATION USERID
	log_on_failure		+= USERID
	nice			= 10
}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Mar 2005 21:44:16 -0000	1.1
+++ .cvsignore	13 Mar 2005 21:45:54 -0000	1.2
@@ -0,0 +1 @@
+pure-ftpd-1.0.20.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Mar 2005 21:44:16 -0000	1.1
+++ sources	13 Mar 2005 21:45:54 -0000	1.2
@@ -0,0 +1 @@
+e928e9e15adf6b52bfe6183fdad20144  pure-ftpd-1.0.20.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar 13 21:45:56 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 13 Mar 2005 16:45:56 -0500
Subject: rpms/pure-ftpd import.log,1.1,1.2
Message-ID: <200503132145.j2DLjuvH020887@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20878

Modified Files:
	import.log 
Log Message:
auto-import pure-ftpd-1.0.20-0.fdr.9 on branch devel from pure-ftpd-1.0.20-0.fdr.9.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Mar 2005 21:44:16 -0000	1.1
+++ import.log	13 Mar 2005 21:45:53 -0000	1.2
@@ -0,0 +1 @@
+pure-ftpd-1_0_20-0_fdr_9:HEAD:pure-ftpd-1.0.20-0.fdr.9.src.rpm:1110750342



From fedora-extras-commits at redhat.com  Sun Mar 13 21:49:31 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 13 Mar 2005 16:49:31 -0500
Subject: rpms/pure-ftpd/devel pure-ftpd.spec,1.1,1.2
Message-ID: <200503132149.j2DLnVGO021084@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21076

Modified Files:
	pure-ftpd.spec 
Log Message:
- adapt to Fedora Extras (drop Epoch, change Release tag)



Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pure-ftpd.spec	13 Mar 2005 21:45:54 -0000	1.1
+++ pure-ftpd.spec	13 Mar 2005 21:49:29 -0000	1.2
@@ -1,7 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.20
-Release:    0.fdr.9
-Epoch:      0
+Release:    1
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -164,6 +163,9 @@
 
 
 %changelog
+* Sun Mar 13 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.20-1
+- adapt to Fedora Extras (drop Epoch, change Release tag)
+
 * Wed Feb 16 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.20-0.fdr.9
 - license is BSD, not GPL
 



From gauret at free.fr  Sun Mar 13 22:35:20 2005
From: gauret at free.fr (Aurelien Bompard)
Date: Sun, 13 Mar 2005 23:35:20 +0100
Subject: APPROVED: pure-ftpd
Message-ID: <200503132335.20873.gauret@free.fr>

Name: pure-ftpd
Pure-FTPd is a fast, production-quality, standard-comformant FTP server,
based upon Troll-FTPd. Unlike other popular FTP servers, it has no known
security flaw, it is really trivial to set up and it is especially designed
for modern Linux and FreeBSD kernels (setfsuid, sendfile, capabilities) .
Features include PAM support, IPv6, chroot()ed home directories, virtual
domains, built-in LS, anti-warez system, bandwidth throttling, FXP, bounded
ports for passive downloads, UL/DL ratios, native LDAP and SQL support,
Apache log files and more.

QA done at fedora.us : https://bugzilla.fedora.us/show_bug.cgi?id=1573

Maintainer: Aurelien Bompard
Reviewer: Jose Pedro Oliveira

-- 
http://gauret.free.fr   ~~~~   Jabber : abompard at jabber.fr
"Programming today is a race between software engineers striving to build
bigger and better idiot-proof programs, and the Universe trying to produce
bigger and better idiots. So far, the Universe is winning." -- Rich Cook
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 220 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050313/1d1b67c9/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Mon Mar 14 00:23:06 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 13 Mar 2005 19:23:06 -0500
Subject: rpms/logjam/devel logjam-4.4.1-gtkhtml3.6.patch,1.1,1.2
Message-ID: <200503140023.j2E0N6JI026292@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26272

Modified Files:
	logjam-4.4.1-gtkhtml3.6.patch 
Log Message:


Add a minor fix for gtkhtml-3.6, from CVS.


logjam-4.4.1-gtkhtml3.6.patch:

Index: logjam-4.4.1-gtkhtml3.6.patch
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam-4.4.1-gtkhtml3.6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logjam-4.4.1-gtkhtml3.6.patch	26 Feb 2005 04:20:03 -0000	1.1
+++ logjam-4.4.1-gtkhtml3.6.patch	14 Mar 2005 00:23:04 -0000	1.2
@@ -31,3 +31,14 @@
  
    LJ_PKG_ARG_WITH(librsvg, LIBRSVG,
      AC_HELP_STRING([--with-librsvg],
+--- logjam-4.4.1/src/preview.c.gtkhtml36	2005-03-13 18:17:06.000000000 -0600
++++ logjam-4.4.1/src/preview.c	2005-03-13 18:11:02.000000000 -0600
+@@ -31,7 +31,7 @@
+ 
+ static void
+ html_preview_init(HTMLPreview *hp) {
+-	gtk_html_construct(GTK_WIDGET(hp));
++	gtk_html_construct((gpointer)(hp));
+ 	g_signal_connect(G_OBJECT(hp), "url_requested",
+ 			G_CALLBACK(url_requested), NULL);
+ 	g_signal_connect(G_OBJECT(hp), "link_clicked",



From fedora-extras-commits at redhat.com  Mon Mar 14 00:24:02 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 13 Mar 2005 19:24:02 -0500
Subject: rpms/logjam/devel logjam-4.4.1-cleanups.patch,NONE,1.1
Message-ID: <200503140024.j2E0O2GJ026350@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26332

Added Files:
	logjam-4.4.1-cleanups.patch 
Log Message:


Cleanups from Bugzilla: 149865


logjam-4.4.1-cleanups.patch:

--- NEW FILE logjam-4.4.1-cleanups.patch ---
--- logjam-4.4.1/src/tools.c.BAD	2005-03-13 17:17:31.000000000 -0600
+++ logjam-4.4.1/src/tools.c	2005-03-13 17:54:53.000000000 -0600
@@ -209,7 +209,7 @@
 
 	while (gtk_dialog_run(GTK_DIALOG(cmd_dlg)) == GTK_RESPONSE_OK) {
 		const gchar *command;
-		const gchar *encoding;
+		const gchar *encoding = 0;
 		GError *err = NULL;
 
 		command = gtk_entry_get_text(GTK_ENTRY(entry));
--- logjam-4.4.1/src/checkfriends-gtk.c.BAD	2005-03-13 17:50:06.000000000 -0600
+++ logjam-4.4.1/src/checkfriends-gtk.c	2005-03-13 17:51:41.000000000 -0600
@@ -255,8 +255,6 @@
 
 static void
 cf_float_destroy(CFFloat *cff) {
-	CFMgr *cfm = cff->cfmgr;
-
 	if (GTK_IS_WIDGET(cff->win))
 		gtk_widget_destroy(cff->win);
 
@@ -277,8 +275,6 @@
 #ifdef USE_DOCK
 static void
 cf_dock_destroy(CFFloat *cff) {
-	CFMgr *cfm = cff->cfmgr;
-
 	g_signal_handlers_disconnect_by_func(G_OBJECT(cff->win),
 			G_CALLBACK(cf_dock_destroyed_cb), NULL);
 	gtk_widget_destroy(GTK_WIDGET(cff->win));
@@ -290,7 +286,11 @@
 cf_dock_destroyed_cb(GtkWidget *widget, CFFloat *cff) {
 	app.docklet = NULL;
 }
-	
+
+/* 
+ * Not currently used.	
+ */
+/*
 static void
 cf_dock_setup(CFFloat *ind) {
 	GtkWidget *docklet = app.docklet;
@@ -303,6 +303,7 @@
 
 	ind->win = docklet;
 }
+*/
 #endif /* USE_DOCK */
 
 void cf_float_decorate_refresh(void) {
--- logjam-4.4.1/src/cmdline.c.BAD	2005-03-13 17:41:34.000000000 -0600
+++ logjam-4.4.1/src/cmdline.c	2005-03-13 17:46:22.000000000 -0600
@@ -664,7 +664,7 @@
 
 static void
 command_dispatch(Cmdline *cmdline, Command *commands, const char *help, int argc, gchar *argv[]) {
-	JamAccount *acc;
+	JamAccount *acc = NULL;
 	Command *command = NULL;
 	char *cmdname;
 	int i;
--- logjam-4.4.1/src/menu.c.BAD	2005-03-13 17:52:10.000000000 -0600
+++ logjam-4.4.1/src/menu.c	2005-03-13 17:52:16.000000000 -0600
@@ -440,7 +440,6 @@
 
 };
 	int itemcount = sizeof(menu_items) / sizeof(menu_items[0]);
-	int i;
 	JamView *view;
 
 	accelgroup = gtk_accel_group_new();



From fedora-extras-commits at redhat.com  Mon Mar 14 00:28:27 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 13 Mar 2005 19:28:27 -0500
Subject: rpms/logjam/devel logjam.desktop,1.2,1.3 logjam.spec,1.10,1.11
Message-ID: <200503140028.j2E0SR0O026501@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26483

Modified Files:
	logjam.desktop logjam.spec 
Log Message:

-5 spec, change X-Fedora-Extras to X-Fedora, include cleanups patch.



Index: logjam.desktop
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logjam.desktop	10 Feb 2005 05:31:38 -0000	1.2
+++ logjam.desktop	14 Mar 2005 00:28:25 -0000	1.3
@@ -4,6 +4,6 @@
 Type=Application
 Exec=/usr/bin/logjam
 Icon=/usr/share/pixmaps/gnome-log.png
-Categories=Application;Network;X-Fedora-Extras;
+Categories=Application;Network;X-Fedora;
 Comment=LiveJournal Client
 GenericName=LiveJournal Client


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- logjam.spec	5 Mar 2005 21:10:23 -0000	1.10
+++ logjam.spec	14 Mar 2005 00:28:25 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name: logjam
 Version: 4.4.1
-Release: 4
+Release: 5
 Epoch: 1
 Summary: GTK2 client for LiveJournal
 License: GPL
@@ -22,6 +22,7 @@
 Patch1: logjam-4.4.1-rupo.patch
 Patch2: logjam-4.4.1-backdated.patch
 Patch3: logjam-4.4.1-gtkhtml3.6.patch
+Patch4: logjam-4.4.1-cleanups.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -44,6 +45,7 @@
 %patch1 -p1 -b .rupo
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .gtkhtml36
+%patch4 -p1 -b .cleanups
 
 %build
 %configure \
@@ -60,7 +62,7 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 desktop-file-install --vendor fedora                    \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
-  --add-category X-Fedora-Extras                        \
+  --add-category X-Fedora                               \
   %{SOURCE1}
 
 %files -f %{name}.lang
@@ -80,6 +82,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Mar 13 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-5
+- Cleanups for compiler errors brought to light in Bugzilla 149865
+- Change X-Fedora-Extras to X-Fedora
+
 * Fri Feb 25 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-4
 - Rebuilt for FC4/devel
 - Replace Gtkhtml 3.1 patch with Gtkhtml 3.6 patch



From fedora-extras-commits at redhat.com  Mon Mar 14 12:15:32 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 14 Mar 2005 07:15:32 -0500
Subject: rpms/gnumeric - New directory
Message-ID: <200503141215.j2ECFWFZ019274@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/gnumeric
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19267/gnumeric

Log Message:
Directory /cvs/extras/rpms/gnumeric added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 12:15:32 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 14 Mar 2005 07:15:32 -0500
Subject: rpms/gnumeric/devel - New directory
Message-ID: <200503141215.j2ECFWdr019277@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/gnumeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19267/gnumeric/devel

Log Message:
Directory /cvs/extras/rpms/gnumeric/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 12:15:57 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 14 Mar 2005 07:15:57 -0500
Subject: rpms/gnumeric Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503141215.j2ECFvG9019342@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/gnumeric
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19333

Added Files:
	Makefile import.log 
Log Message:
Setup of module gnumeric


--- NEW FILE Makefile ---
# Top level Makefile for module gnumeric
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 14 12:15:57 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 14 Mar 2005 07:15:57 -0500
Subject: rpms/gnumeric/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503141215.j2ECFvwG019345@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/gnumeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19333/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnumeric


--- 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 Mar 14 12:17:15 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 14 Mar 2005 07:17:15 -0500
Subject: rpms/gnumeric import.log,1.1,1.2
Message-ID: <200503141217.j2ECHFE7019471@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/gnumeric
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19462

Modified Files:
	import.log 
Log Message:
auto-import gnumeric-1.4.3-1 on branch devel from gnumeric-1.4.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Mar 2005 12:15:55 -0000	1.1
+++ import.log	14 Mar 2005 12:17:13 -0000	1.2
@@ -0,0 +1 @@
+gnumeric-1_4_3-1:HEAD:gnumeric-1.4.3-1.src.rpm:1110802621



From fedora-extras-commits at redhat.com  Mon Mar 14 12:17:15 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 14 Mar 2005 07:17:15 -0500
Subject: rpms/gnumeric/devel gnumeric-1.4.1-configure.patch, NONE,
	1.1 gnumeric-1.4.1-desktop.patch, NONE,
	1.1 gnumeric-1.4.1-excelcrash.patch, NONE, 1.1 gnumeric.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503141217.j2ECHFHs019475@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/gnumeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19462/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnumeric-1.4.1-configure.patch gnumeric-1.4.1-desktop.patch 
	gnumeric-1.4.1-excelcrash.patch gnumeric.spec 
Log Message:
auto-import gnumeric-1.4.3-1 on branch devel from gnumeric-1.4.3-1.src.rpm

gnumeric-1.4.1-configure.patch:

--- NEW FILE gnumeric-1.4.1-configure.patch ---
--- gnumeric-1.4.1.orig/configure.in	2004-12-10 15:06:14.000000000 +0000
+++ gnumeric-1.4.1/configure.in	2004-12-15 13:54:19.899301960 +0000
@@ -708,7 +708,7 @@
 dnl * Check for Perl
 dnl **************************************************
 dnl
-perl_msg=no
+perl_msg="yes"
 AC_ARG_WITH(perl, [--{with,without}-perl   Compile the Perl plugin loader])
 AC_ARG_VAR(PERL, [The Perl executable.])
 if test "x$with_perl" != xno; then

gnumeric-1.4.1-desktop.patch:

--- NEW FILE gnumeric-1.4.1-desktop.patch ---
--- gnumeric-1.4.1.orig/Makefile.in	2004-12-10 15:06:35.000000000 +0000
+++ gnumeric-1.4.1/Makefile.in	2004-12-15 13:05:38.887083537 +0000
@@ -310,20 +310,20 @@
 gnew_DATA = gnumeric.desktop
 
 Mimedir = $(datadir)/mime-info
-Mime_DATA = gnumeric.keys gnumeric.mime
+Mime_DATA = gnumeric.mime
 
 @WITH_GNOME_TRUE at serverdir = $(libdir)/bonobo/servers/
 @WITH_GNOME_TRUE at server_in_files = GNOME_Gnumeric.server.in
 @WITH_GNOME_TRUE at server_DATA = GNOME_Gnumeric.server
 
 CLEANFILES = $(server_DATA) $(server_in_files) \
-	gnumeric.desktop gnumeric.keys
+	gnumeric.desktop
 
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
 EXTRA_DIST = \
 	gnumeric.desktop.in gnumeric.spec.in GNOME_Gnumeric.server.in.in\
-	gnumeric.keys.in gnumeric.mime 					\
+	gnumeric.mime 					\
 	gnumeric.xsd							\
 	README HACKING NEWS BEVERAGES BUGS MAINTAINERS AUTHORS $(change_logs)	\
 	intltool-extract.in	\
@@ -839,10 +839,6 @@
 
 @INTLTOOL_SERVER_RULE@
 
-gnumeric.keys: gnumeric.keys.in Makefile
-	sed -e 's^\@gnumeric_icondir\@^$(gnumeric_icondir)^g' < $(srcdir)/gnumeric.keys.in > gnumeric.keys.tmp \
-	&& mv gnumeric.keys.tmp gnumeric.keys 
-
 gnumeric.desktop: gnumeric.desktop.in Makefile $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
 	 LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@.tmp
 @WITH_GNOME_TRUE@	sed -e 's/F_OR_U/U/' <$@.tmp >$@.tmp2

gnumeric-1.4.1-excelcrash.patch:

--- NEW FILE gnumeric-1.4.1-excelcrash.patch ---
--- gnumeric-1.4.1.orig/plugins/excel/ms-excel-read.c	2004-11-28 05:27:04.000000000 +0000
+++ gnumeric-1.4.1/plugins/excel/ms-excel-read.c	2004-12-17 10:13:32.981467314 +0000
@@ -4119,6 +4119,8 @@
 static void
 excel_read_DIMENSIONS (BiffQuery *q, ExcelWorkbook *ewb)
 {
+	if (!(q->length))
+		return;
 	GnmRange r;
 
 	if (ewb->container.ver >= MS_BIFF_V8) {


--- NEW FILE gnumeric.spec ---
%define gnumeric_version %{version}
%define desktop_file_utils_version 0.9

Summary:        A spreadsheet program for GNOME.
Name:     	gnumeric
Version: 	1.4.3
Release: 	1
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.4.0
Requires:       libgnomeprintui22 >= 2.3.0
Requires:       gtk2 >= 2.2.0
Requires:       libgsf >= 1.10.0
#Requires:  	libgnomedb >= 1.0.4
PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
BuildRequires:  libgnomeui-devel >= 2.4.0
BuildRequires:  libgnomeprintui22-devel >= 0.20
BuildRequires:  libxml2-devel
BuildRequires:  python-devel
BuildRequires:  libgsf-devel >= 1.10.0
BuildRequires:  automake autoconf libtool
BuildRequires:  intltool scrollkeeper gettext desktop-file-utils
#BuildRequires:  libgnomedb-devel >= 1.0.4
BuildRequires:  pango-devel >= 1.4.0
Patch0: gnumeric-1.4.1-desktop.patch
Patch1: gnumeric-1.4.1-excelcrash.patch
Patch2: gnumeric-1.4.1-configure.patch

%description
Gnumeric is a spreadsheet program for the GNOME GUI desktop
environment.

%package devel
Summary: Files necessary to develop gnumeric-based applications.
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}

%description devel
Gnumeric is a spreadsheet program for the GNOME GUI desktop
environment. The gnumeric-devel package includes files necessary to
develop gnumeric-based applications.

%prep
%setup -q
%patch0 -p1 -b .desktop
%patch1 -p1 -b .excelcrash
%patch2 -p1 -b .configure

%build
libtoolize --force --copy && aclocal && autoconf
export mllibname=%{_lib}
%configure --without-gb --without-guile

OLD_PO_FILE_INPUT=yes make

%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT

export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL

if [ -f /usr/lib/rpm/find-lang.sh ] ; then
 /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name
fi

./mkinstalldirs $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor gnome --delete-original                   \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
  --add-category X-Red-Hat-Extra                                        \
  --add-category Office                                                 \
  --add-category Application                                            \
  --add-category Spreadsheet                                            \
  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop

#remove spurious .ico thing
rm -rf $RPM_BUILD_ROOT/usr/share/pixmaps/win32-gnumeric.ico

#remove scrollkeeper stuff
rm -rf $RPM_BUILD_ROOT/var

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/ldconfig
update-desktop-database %{_datadir}/applications

export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnumeric*.schemas > /dev/null

%postun
/sbin/ldconfig
update-desktop-database %{_datadir}/applications

%files -f %{name}.lang

%defattr (0755, root, root)
%{_bindir}/*
%dir %{_libdir}/gnumeric
%dir %{_libdir}/gnumeric/%{gnumeric_version}
%{_libdir}/gnumeric/%{gnumeric_version}/plugins/*
# guile disabled due to 64-bit crash
## %{_datadir}/gnumeric/%{gnumeric_version}/guile
# FIXME - for s390 it builds some more with "--with-pic=-fPIC", but the
# grep for dlname then still fails.

%defattr (0644, root, root, 0755)
%doc HACKING AUTHORS ChangeLog NEWS BUGS README COPYING TODO
%{_datadir}/pixmaps/gnumeric
%{_datadir}/pixmaps/gnome-application-*.png
%{_datadir}/pixmaps/gnome-gnumeric.png
%dir %{_datadir}/gnumeric
%dir %{_datadir}/gnumeric/%{gnumeric_version} 
%dir %{_libdir}/gnumeric/%{gnumeric_version}/plugins
%{_datadir}/gnumeric/%{gnumeric_version}/*
%{_datadir}/mime-info/gnumeric.mime
%{_datadir}/mc/templates/gnumeric.desktop
%{_datadir}/applications/*
%dir %{_datadir}/omf/gnumeric/
%{_datadir}/omf/gnumeric/*
%{_sysconfdir}/gconf/schemas/*.schemas
%{_libdir}/bonobo/servers/GNOME_Gnumeric.server
%{_mandir}/man1/*

%files devel
%defattr (-, root, root)
%dir %{_datadir}/gnumeric
%dir %{_datadir}/gnumeric/%{gnumeric_version} 
%{_datadir}/gnumeric/%{gnumeric_version}/idl/*.idl
%dir %{_libdir}/gnumeric
%dir %{_libdir}/gnumeric/%{gnumeric_version}

%changelog
* Mon Mar 14 2005 Caolan McNamara <caolanm at redhat.com> 1.4.3-1
- bump to latest, first in extras
- drop helppath

* Fri Feb 18 2005 Caolan McNamara <caolanm at redhat.com> 1.4.2-3
- rh#149005#

* Mon Feb  7 2005 Matthias Clasen <mclasen at redhat.com> 1.4.2-2
- rebuild

* Thu Jan 27 2005 Caolan McNamara <caolanm at redhat.com> 1.4.2-1
- bump to next version

* Wed Dec 22 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-5
- RH#143587# pango-devel >= 1.4.0

* Sun Dec 19 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-4
- libgsf must be >= 1.10.0

* Fri Dec 17 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-3
- dubious "lib" usage from 64bit POV

* Thu Dec 17 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-2
- RH#143161# crash on reading corrupt excel file

* Wed Dec 15 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-1
- bump to new version
- drop integrated 64bit patch
- drop integrated desktop.in patch
- drop integrated latex patch
- drop disable bonobo patch
- add enable perl configure patch
- add quickfix for help being searched for in wrong place #gnome161404#

* Tue Nov 02 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-9
- #rh137694# backport latex exporter fix
- #rh137692# backport x64 excel fix

* Sat Oct 30 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-7
- #rh137565# Requires libgnomedb

* Thu Sep 30 2004 Christopher Aillon <caillon at redhat.com> 1.2.13-6
- Change Requires(post) to PreReq

* Thu Sep 30 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-5
- #rh134250# improve Requires: desktop-file-utils

* Thu Sep 30 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-4
- #rh134175# invalid mime type entry

* Mon Sep 27 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-3
- make a wild stab at #rh133662#

* Mon Sep 6 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-2
- update .keys to .desktop

* Tue Jul 27 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13
- update to 1.2.13 
- #107278# --without-bonobo, help is fairly nonfunctional otherwise

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed May 5 2004 Caolan McNamara <caolanm at redhat.com> 1.2.12
- update to 1.2.12 some exported excel workbooks will not work in Excel
with older versions
_ delete unused patches

* Tue Apr 13 2004 Warren Togami <wtogami at redhat.com> 1.2.8-2
- #74034 own plugin dir
- #111112 BR intltool scrollkeeper gettext desktop-file-utils
- some cleanup

* Fri Apr  2 2004 Mark McLoughlin <markmc at redhat.com> 1.2.8-1
- Update to 1.2.8

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 6 2004 Daniel Reed <dreed at redhat.com> 1:1.2.6-1
- Version bump (1.2.6)

* Tue Oct 14 2003 Jonathan Blandford <jrb at redhat.com> 1:1.2.1-2
- add ssconvert

* Tue Oct 14 2003 Havoc Pennington <hp at redhat.com> 1:1.2.1-1
- add %post to install schemas
- 1.2.1

* Fri Sep 19 2003 Havoc Pennington <hp at redhat.com> 1:1.2.0-1
- 1.2.0 final

* Mon Aug 25 2003 Jonathan Blandford <jrb at redhat.com>
- new version for GNOME 2.4

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Apr 29 2003 Tim Powers <timp at redhat.com> 1:1.0.12-5
- rebuild to fix broken libgal dep

* Tue Feb 18 2003 Elliot Lee <sopwith at redhat.com> 1:1.0.12-4
- Put in a fix for the no-python-on-lib64 problem.

* Wed Feb 12 2003 Havoc Pennington <hp at redhat.com> 1:1.0.12-3
- add --without-guile due to crash on 64-bit #82977

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Thu Jan  9 2003 Havoc Pennington <hp at redhat.com>
- 1.0.12
- remove libtoolize/autotools invocations, dunno why they were there

* Mon Dec 16 2002 Elliot Lee <sopwith at redhat.com> 1.0.9-6
- Run libtool/auto*
- Rebuild

* Thu Dec 05 2002 Florian La Roche <Florian.LaRoche at redhat.de>
- also disable python for mainframe, this should be fixed properly
  at some point...
- add guile to filelist

* Wed Nov  6 2002 Bill Nottingham <notting at redhat.com> 1.0.9-4
- rebuild everywhere
- no python on hammer ATM

* Thu Oct 24 2002 Jeremy Katz <katzj at redhat.com>
- rebuild against new gal
- fixup file lists to use correct macros and include all files

* Fri Aug  2 2002 Havoc Pennington <hp at redhat.com>
- desktop file fixage

* Fri Jul 26 2002 Akira TAGOH <tagoh at redhat.com> 1.0.9-1
- update to 1.0.9
- gnumeric-0.67-excel95-ja.patch: we no longer need it. removed. (Bug#62776)

* Fri Jul 12 2002 Havoc Pennington <hp at redhat.com>
- update to 1.0.8
- remove exceljpfonts patch that no longer applies

* 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 Apr 10 2002 Havoc Pennington <hp at redhat.com>
- add jp excel reading patch #62776

* Wed Mar 27 2002 Havoc Pennington <hp at redhat.com>
- add multibyte patch #61624

* Mon Mar 11 2002 Havoc Pennington <hp at redhat.com>
- 1.0.5

* Wed Jan 30 2002 Tim Powers <timp at redhat.com>
- update to 1.0.3

* Tue Nov 20 2001 Jonathan Blandford <jrb at redhat.com>
- Version 0.76

* Mon Oct  8 2001 Matt Wilson <msw at redhat.com>
- removed patch4 (gnumeric-0.67-sheet_corruption.patch), in CVS now.
- removed patch8 (gnumeric-0.67-xlsscale.patch), no longer needed.
- removed patch4 (gnumeric-0.67-s390.patch), no longer needed.
- regenerated patch6 (gnumeric-0.67.lengthen-warning.patch) against 0.71
- removed patch2 (gnumeric-0.67-mb.patch), in CVS now.
- removed patch9 (gnumeric-0.67-backspace.patch), came from CVS.
- removed patch5 (gnumeric-0.67-desktop.patch), ditto
- renamed remaining patches:
    patch3 (gnumeric-0.67-excel95-ja.patch) -> patch2
    patch6 (gnumeric-0.71-lengthen-warning.patch) -> patch3
- removed source10, ja.po from upstream is more up to date.
- added files needed for bonobo gnumeric back into file list

* Wed Sep  5 2001 Owen Taylor <otaylor at redhat.com>
- Add patch from CVS to fix backspace (#53062)

* Tue Aug  7 2001 Owen Taylor <otaylor at redhat.com>
- Fix problem with scaling percentage and XLS files (#51054)
- Fix problem where default font for ja and other locales was backwards

* Mon Aug  6 2001 Owen Taylor <otaylor at redhat.com>
- Install all files from the plugins in the main package. Putting .la
  files in the main package didn't make sense, and we were missing
  some files for the gnome-glossary package.

* Fri Aug  3 2001 Owen Taylor <otaylor at redhat.com>
- Add some missing directories to the main package (#50701)

* Tue Jul 31 2001 Than Ngo <than at redhat.com>
- add patch to build on s390, s390x

* Fri Jul 27 2001 Jonathan Blandford <jrb at redhat.com>
- change 'old copy' dialog to popup after 9 months

* Fri Jul 20 2001 Owen Taylor <otaylor at redhat.com>
- Add missing contents of .desktop file from CVS

* Thu Jul 19 2001 Owen Taylor <otaylor at redhat.com>
- Move desktop file to /etc/X11/applnk (#23488)
- Added BuildPrereq on python-devel (#45029)
- Add BuildPrereq on gal-devel (#45027)
- Add <locale.h> include to .mb patch 
  (don't know why it works for me / in the build system, #32388)

* Mon Jul 16 2001 Jonathan Blandford <jrb at redhat.com>
- backport sheet corruption fix

* Tue Jul 10 2001 Trond Eivind Glomsr?d <teg at redhat.com>
- Make devel subpackage depend on main package

* Sat Jul 07 2001 Owen Taylor <otaylor at redhat.com>
- Version 0.67

* Fri Jun 15 2001 Nalin Dahyabhai <nalin at redhat.com>
- rebuild in new environment

* Thu Jun 07 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- support newer gettext version

* Fri Mar  9 2001 Akira TAGOH <tagoh at redhat.com> 0.61-9
- Fixed read excel95's .xls for Japanese.

* Fri Feb 23 2001 Akira TAGOH <tagoh at rehdat.com> 0.61-8
- Fixed jp patch with gnome-print.

* Mon Feb 19 2001 Akira TAGOH <tagoh at redhat.com>
- Fixed jp patch.

* Thu Feb 08 2001 Yukihiro Nakai <ynakai at redhat.com>
- Fix about Japanese translation (ja.po)

* Wed Feb 07 2001 Yukihiro Nakai <ynakai at redhat.com>
- Update Japanese translation.

* Tue Feb 06 2001 Akira TAGOH <tagoh at redhat.com>
- Added Japanese patch.
- Updated Japanese translation.
  Note: Please remove Source10 when the next upstream release.

* Thu Jan 18 2001 Matt Wilson <msw at redhat.com>
- don't use bin:bin for files in devel.

* Wed Jan 03 2001 Preston Brown <pbrown at redhat.com>
- standard file and directory modes/ownership

* Fri Dec 29 2000 Matt Wilson <msw at redhat.com>
- use rpm > 3.0.5 macros
- 0.61

* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
- Up Epoch and release

* Tue Jul 18 2000 Owen Taylor <otaylor at redhat.com>
- Fix DocDir:

* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Mar 2005 12:15:55 -0000	1.1
+++ .cvsignore	14 Mar 2005 12:17:13 -0000	1.2
@@ -0,0 +1 @@
+gnumeric-1.4.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Mar 2005 12:15:55 -0000	1.1
+++ sources	14 Mar 2005 12:17:13 -0000	1.2
@@ -0,0 +1 @@
+b684eec48b1696d7a8d7152d1e17741c  gnumeric-1.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 14 22:32:51 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:32:51 -0500
Subject: rpms/aiksaurus - New directory
Message-ID: <200503142232.j2EMWpF6007004@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/aiksaurus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6988/aiksaurus

Log Message:
Directory /cvs/extras/rpms/aiksaurus added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:32:51 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:32:51 -0500
Subject: rpms/aiksaurus/devel - New directory
Message-ID: <200503142232.j2EMWpvs007007@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/aiksaurus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6988/aiksaurus/devel

Log Message:
Directory /cvs/extras/rpms/aiksaurus/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:33:04 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:33:04 -0500
Subject: rpms/aiksaurus Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503142233.j2EMX4gf007087@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/aiksaurus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7072

Added Files:
	Makefile import.log 
Log Message:
Setup of module aiksaurus


--- NEW FILE Makefile ---
# Top level Makefile for module aiksaurus
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 14 22:33:04 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:33:04 -0500
Subject: rpms/aiksaurus/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503142233.j2EMX4ol007090@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/aiksaurus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7072/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module aiksaurus


--- 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 Mar 14 22:33:26 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:33:26 -0500
Subject: rpms/aiksaurus import.log,1.1,1.2
Message-ID: <200503142233.j2EMXQTK007237@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/aiksaurus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7222

Modified Files:
	import.log 
Log Message:
auto-import aiksaurus-1.2.1-5 on branch devel from aiksaurus-1.2.1-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/aiksaurus/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Mar 2005 22:33:02 -0000	1.1
+++ import.log	14 Mar 2005 22:33:24 -0000	1.2
@@ -0,0 +1 @@
+aiksaurus-1_2_1-5:HEAD:aiksaurus-1.2.1-5.src.rpm:1110839601



From fedora-extras-commits at redhat.com  Mon Mar 14 22:33:26 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:33:26 -0500
Subject: rpms/aiksaurus/devel aiksaurus-1.2.1-desktop.patch, NONE,
	1.1 aiksaurus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503142233.j2EMXQKQ007241@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/aiksaurus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7222/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aiksaurus-1.2.1-desktop.patch aiksaurus.spec 
Log Message:
auto-import aiksaurus-1.2.1-5 on branch devel from aiksaurus-1.2.1-5.src.rpm

aiksaurus-1.2.1-desktop.patch:

--- NEW FILE aiksaurus-1.2.1-desktop.patch ---
--- /dev/null	2005-01-24 09:03:19.124049840 +0000
+++ aiksaurus-1.2.1/gaiksaurus.desktop	2005-01-24 10:43:05.176025758 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Thesaurus
+Comment=Lookup words in a thesaurus
+Exec=gaiksaurus
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;Application;Utility;


--- NEW FILE aiksaurus.spec ---
Summary: An English-language thesaurus library.
Name: aiksaurus
Version: 1.2.1
Release: 5
Epoch: 1
Group: System Environment/Libraries
License: GPL
Source: http://prdownloads.sourceforge.net/aiksaurus/aiksaurus-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gtk2-devel, desktop-file-utils >= 0.9
PreReq: desktop-file-utils >= 0.9

Patch0: aiksaurus-1.2.1-desktop.patch

%description
Aiksaurus is an English-language thesaurus library that can be 
embedded in word processors, email composers, and other authoring
software to provide thesaurus capabilities.  A basic command line 
thesaurus program is also included.

%package devel
Requires: aiksaurus
Summary: Files for developing with aiksaurus.
Group: Development/Libraries
                                                                                
%description devel
Includes and definitions for developing with aiksaurus.

%package gtk
Requires: aiksaurus >= %{version}
Requires: gtk2
Summary: A GTK+ frontend to aiksaurus.
Group: System Environment/Libraries
Requires: aiksaurus

%description gtk
AiksaurusGTK is a GTK+ interface to the Aiksaurus library.  
It provides an attractive thesaurus interface, and can be embedded
in GTK+ projects, notably AbiWord.  A standalone thesaurus program
is also provided.

%package gtk-devel
Requires: aiksaurus-gtk
Requires: aiksaurus-devel >= %{version}
Summary: Files for developing with aiksaurus-gtk.
Group: Development/Libraries
                                                                                
%description gtk-devel
gtk includes and definitions for developing with aiksaurus.

%prep
%setup -q
%patch0 -p1 -b .desktop.patch

%build
%configure
make

%install
%makeinstall
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
desktop-file-install --vendor gnome --dir $RPM_BUILD_ROOT%{_datadir}/applications ./gaiksaurus.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%doc ChangeLog README COPYING AUTHORS
%{_bindir}/aiksaurus
%{_bindir}/caiksaurus
%{_libdir}/*Aiksaurus-*.so.*
%{_datadir}/aiksaurus

%files devel
%defattr(-, root, root)
%{_includedir}/Aiksaurus/Aiksaurus.h
%{_includedir}/Aiksaurus/AiksaurusC.h
%{_libdir}/*Aiksaurus.so
%{_libdir}/pkgconfig/aiksaurus-1.0.pc

%files gtk
%defattr(-, root, root)
%{_bindir}/gaiksaurus
%{_libdir}/*GTK*.so.*
%{_datadir}/applications/gnome-gaiksaurus.desktop

%post gtk
/sbin/ldconfig
update-desktop-database %{_datadir}/applications

%postun gtk
/sbin/ldconfig
update-desktop-database %{_datadir}/applications

%files gtk-devel
%defattr(-, root, root)
%{_includedir}/Aiksaurus/AiksaurusGTK*.h
%{_libdir}/*GTK*.so
%{_libdir}/pkgconfig/gaiksaurus-1.0.pc

%changelog
* Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1.2.1-5
- rebuild with gcc4

* Mon Jan 24 2005 Caolan McNamara <caolanm at redhat.com> 1.2.1-4
- RH#145922# wrong location

* Mon Jan 24 2005 Caolan McNamara <caolanm at redhat.com> 1.2.1-3
- RH#145922# make a .desktop for gaiksaurus

* Wed Oct 10 2004 Caolan McNamara <caolanm at redhat.com> 1.2.1-2
- #rh134808# BuildRequires gtk2-devel

* Tue Aug 10 2004 Caolan McNamara <caolanm at redhat.com>
- initially import 1.2.1 and tweak .spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aiksaurus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Mar 2005 22:33:02 -0000	1.1
+++ .cvsignore	14 Mar 2005 22:33:24 -0000	1.2
@@ -0,0 +1 @@
+aiksaurus-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aiksaurus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Mar 2005 22:33:02 -0000	1.1
+++ sources	14 Mar 2005 22:33:24 -0000	1.2
@@ -0,0 +1 @@
+3eae03b7c49843ccc9262e52846ea6b4  aiksaurus-1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 14 22:34:34 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:34:34 -0500
Subject: rpms/enchant - New directory
Message-ID: <200503142234.j2EMYYQ4007418@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/enchant
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7402/enchant

Log Message:
Directory /cvs/extras/rpms/enchant added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:34:34 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:34:34 -0500
Subject: rpms/enchant/devel - New directory
Message-ID: <200503142234.j2EMYYPH007421@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7402/enchant/devel

Log Message:
Directory /cvs/extras/rpms/enchant/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:34:46 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:34:46 -0500
Subject: rpms/enchant Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503142234.j2EMYkXL007501@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/enchant
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7486

Added Files:
	Makefile import.log 
Log Message:
Setup of module enchant


--- NEW FILE Makefile ---
# Top level Makefile for module enchant
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 14 22:34:46 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:34:46 -0500
Subject: rpms/enchant/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503142234.j2EMYkil007504@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7486/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module enchant


--- 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 Mar 14 22:35:01 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:35:01 -0500
Subject: rpms/enchant import.log,1.1,1.2
Message-ID: <200503142235.j2EMZ1qZ007648@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/enchant
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7633

Modified Files:
	import.log 
Log Message:
auto-import enchant-1.1.5-3 on branch devel from enchant-1.1.5-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/enchant/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Mar 2005 22:34:44 -0000	1.1
+++ import.log	14 Mar 2005 22:34:59 -0000	1.2
@@ -0,0 +1 @@
+enchant-1_1_5-3:HEAD:enchant-1.1.5-3.src.rpm:1110839696



From fedora-extras-commits at redhat.com  Mon Mar 14 22:35:01 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:35:01 -0500
Subject: rpms/enchant/devel enchant-1.1.5-manpage.patch, NONE,
	1.1 enchant.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503142235.j2EMZ1fR007652@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7633/devel

Modified Files:
	.cvsignore sources 
Added Files:
	enchant-1.1.5-manpage.patch enchant.spec 
Log Message:
auto-import enchant-1.1.5-3 on branch devel from enchant-1.1.5-3.src.rpm

enchant-1.1.5-manpage.patch:

--- NEW FILE enchant-1.1.5-manpage.patch ---
diff -ru enchant-1.1.5.orig/doc/enchant.1 enchant-1.1.5/doc/enchant.1
--- enchant-1.1.5.orig/doc/enchant.1	2005-01-14 08:42:25.000000000 +0000
+++ enchant-1.1.5/doc/enchant.1	2005-01-14 08:51:34.355927565 +0000
@@ -22,13 +22,15 @@
 .TP
 .I "\-v"
 Prints the program's version
-.SH Enchant Ordering File
-.TP
+.SH ENCHANT ORDERING FILE
 Enchant has a global and a local ordering file. It lets the user specify
 which spelling backend to use for individual languages if you really care
 which backend gets used. It takes the form of:
+.PP
 *:aspell,myspell,ispell
+.br
 en:aspell,myspell,ispell
+.br
 fr:myspell,ispell:aspell
 .SH MORE INFORMATION
 http://www.abisource.com/enchant/


--- NEW FILE enchant.spec ---
Summary: An Enchanting Spell Checking Library
Name: enchant
Version: 1.1.5
Release: 3
Epoch: 1
Group: System Environment/Libraries
License: LGPL
Source: http://prdownloads.sourceforge.net/abiword/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

Patch0: enchant-1.1.5-manpage.patch

%description
A library that wraps other spell checking backends.

%package devel
Summary: Support files necessary to compile applications with libenchant.
Group: Development/Libraries
Requires: enchant

%description devel
Libraries, headers, and support files necessary to compile applications using libenchant.

%prep
%setup -q
%patch0 -p1 -b .manpage

%build
%configure --disable-ispell

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant/*.la

%files
%defattr(-,root,root)
%doc AUTHORS COPYING.LIB README
%{_bindir}/*
%{_libdir}/lib*.so.*
%{_libdir}/enchant/lib*.so*
%{_mandir}/man1/enchant.1.gz

%files devel
%defattr(-,root,root)
%{_libdir}/*.a
%{_libdir}/*.so
%{_libdir}/enchant/*.a
%{_libdir}/pkgconfig/enchant.pc
%{_includedir}/enchant

%post
/sbin/ldconfig

%postun
/sbin/ldconfig

%clean
rm -r $RPM_BUILD_ROOT

%changelog
* Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.15-3
- rebuild with gcc4

* Fri Jan 14 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.15-2
- RH#145010# misformatted manpage

* Mon Dec 20 2004 Caolan McNamara <caolanm at redhat.com> 1:1.1.15-1
- initial fedora import

* Sun Aug 24 2003 Rui Miguel Seabra <rms at 1407.org>
- update spec to current stat of affairs
- building from source rpm is now aware of --with and --without flags:
- --without aspell --without ispell --without myspell --with uspell

* Wed Jul 16 2003 Rui Miguel Seabra <rms at 1407.org>
- take advantage of environment rpm macros

* Sun Jul 13 2003 Dom Lachowicz <cinamod at hotmail.com>
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Mar 2005 22:34:44 -0000	1.1
+++ .cvsignore	14 Mar 2005 22:34:59 -0000	1.2
@@ -0,0 +1 @@
+enchant-1.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Mar 2005 22:34:44 -0000	1.1
+++ sources	14 Mar 2005 22:34:59 -0000	1.2
@@ -0,0 +1 @@
+b7f266ca9241797839929972395a76cf  enchant-1.1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 14 22:35:31 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:35:31 -0500
Subject: rpms/ots - New directory
Message-ID: <200503142235.j2EMZVLB007819@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/ots
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7806/ots

Log Message:
Directory /cvs/extras/rpms/ots added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:35:31 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:35:31 -0500
Subject: rpms/ots/devel - New directory
Message-ID: <200503142235.j2EMZVBU007822@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/ots/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7806/ots/devel

Log Message:
Directory /cvs/extras/rpms/ots/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:35:44 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:35:44 -0500
Subject: rpms/ots Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503142235.j2EMZiSs007917@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/ots
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7899

Added Files:
	Makefile import.log 
Log Message:
Setup of module ots


--- NEW FILE Makefile ---
# Top level Makefile for module ots
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 14 22:35:44 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:35:44 -0500
Subject: rpms/ots/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503142235.j2EMZirG007920@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/ots/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7899/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ots


--- 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 Mar 14 22:36:11 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:36:11 -0500
Subject: rpms/ots import.log,1.1,1.2
Message-ID: <200503142236.j2EMaB0V008103@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/ots
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8076

Modified Files:
	import.log 
Log Message:
auto-import ots-0.4.2-4 on branch devel from ots-0.4.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ots/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Mar 2005 22:35:42 -0000	1.1
+++ import.log	14 Mar 2005 22:36:09 -0000	1.2
@@ -0,0 +1 @@
+ots-0_4_2-4:HEAD:ots-0.4.2-4.src.rpm:1110839761



From fedora-extras-commits at redhat.com  Mon Mar 14 22:36:11 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:36:11 -0500
Subject: rpms/ots/devel ots-0.2.0-nodocs.patch, NONE,
	1.1 ots-0.4.2-gcc4.patch, NONE, 1.1 ots.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503142236.j2EMaBlV008106@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/ots/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8076/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ots-0.2.0-nodocs.patch ots-0.4.2-gcc4.patch ots.spec 
Log Message:
auto-import ots-0.4.2-4 on branch devel from ots-0.4.2-4.src.rpm

ots-0.2.0-nodocs.patch:

--- NEW FILE ots-0.2.0-nodocs.patch ---
--- ots-0.2.0/Makefile.in.nodocs	2003-07-12 17:34:47.000000000 -0400
+++ ots-0.2.0/Makefile.in	2003-07-12 17:34:59.000000000 -0400
@@ -106,7 +106,7 @@
 AUTOMAKE_OPTIONS = gnu 1.4
 
 DIST_SUBDIRS = src articles dic doc
-SUBDIRS = src dic doc
+SUBDIRS = src dic
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libots-1.pc
--- ots-0.2.0/Makefile.am.nodocs	2003-07-12 17:35:38.000000000 -0400
+++ ots-0.2.0/Makefile.am	2003-07-12 17:35:47.000000000 -0400
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = gnu 1.4
 
 DIST_SUBDIRS=src articles dic doc
-SUBDIRS=src dic doc
+SUBDIRS=src dic
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libots-1.pc

ots-0.4.2-gcc4.patch:

--- NEW FILE ots-0.4.2-gcc4.patch ---
--- ots-0.4.2/src/article.c.orig	2005-03-02 19:42:19.479330826 +0000
+++ ots-0.4.2/src/article.c	2005-03-02 19:42:43.967625287 +0000
@@ -35,7 +35,7 @@
 ots_new_sentence (void)
 {
   OtsSentence *aLine = g_new0 (OtsSentence, 1);
-  (GList *) aLine->words = NULL;
+  aLine->words = NULL;
   aLine->wc = 0;
   aLine->selected = 0;
   aLine->score = 0;


--- NEW FILE ots.spec ---
Name: ots
Summary: A text summarizer
Version: 0.4.2
Release: 4
License: GPL
Group: System Environment/Libraries
Source: http://prdownloads.sourceforge.net/libots/ots-%{version}.tar.gz
Patch1: ots-0.2.0-nodocs.patch
Patch2: ots-0.4.2-gcc4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: pkgconfig >= 0.8
Requires: glib2 >= 2.0
BuildRequires: glib2-devel >= 2.0
BuildRequires: libxml2-devel >= 2.4.23
BuildRequires: automake16

%description
The open text summarizer is an open source tool for summarizing texts.
The program reads a text and decides which sentences are important and
which are not.
 
%package devel
Summary: Libraries and include files for developing with libots.
Group: Development/Libraries
Requires: %{name} = %{version}
Requires: pkgconfig >= 0.8
Requires: glib2 >= 2.0
Requires: glib2-devel >= 2.0


%description devel
This package provides the necessary development libraries and include
files to allow you to develop with libots.

%prep
%setup -q 
%patch1 -p1 -b .nodocs
%patch2 -p1 -b .gcc4

%build
# until patch1 goes away
automake-1.6
autoconf

%configure
make

%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 ChangeLog NEWS README TODO
%{_bindir}/ots
%{_libdir}/*.so.*
#{_mandir}/*/*
%{_datadir}/ots

%files devel
%defattr(-,root,root)
%{_libdir}/*.a
%{_libdir}/*.so
%{_includedir}/libots-1
%{_libdir}/pkgconfig/*.pc

%changelog
* Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> - 0.4.2-4
- rebuild with gcc4
- small lvalue assign patch

* Wed Feb 09 2005 Caolan McNamara <caolanm at redhat.com> - 0.4.2-3
- rebuilt

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Feb 19 2004 Jeremy Katz <katzj at redhat.com> - 0.4.2-1
- 0.4.2

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Nov 28 2003 Jeremy Katz <katzj at redhat.com> 
- add some buildrequires (#111158)

* Mon Sep 15 2003 Jeremy Katz <katzj at redhat.com> 0.4.1-1
- 0.4.1

* Mon Aug  4 2003 Jeremy Katz <katzj at redhat.com> 0.4.0-1
- 0.4.0

* Tue Jul 22 2003 Jeremy Katz <katzj at redhat.com> 0.3.0-1
- update to 0.3.0

* Sat Jul 12 2003 Jeremy Katz <katzj at redhat.com> 0.2.0-2
- forcibly disable gtk-doc (openjade is busted on s390)

* Mon Jul  7 2003 Jeremy Katz <katzj at redhat.com> 0.2.0-1
- update to 0.2.0
- ldconfig in %%post/%%postun
- libtoolize
- clean up spec file a little, build gtk-doc
- fix libtool versioning 

* Thu Jun 05 2003 Rui Miguel Silva Seabra <rms at 1407.org>
- fix spec
- disable gtk-doc (it's not building in RH 9,
  maybe it's broken for some reason)

* Fri May 02 2003 Rui Miguel Silva Seabra <rms at 1407.org>
- define a longer description from the README file
- explicitly set file permissions

* Wed Apr 30 2003 Dom Lachowicz <cinamod at hotmail.com>
- created this thing


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ots/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Mar 2005 22:35:42 -0000	1.1
+++ .cvsignore	14 Mar 2005 22:36:09 -0000	1.2
@@ -0,0 +1 @@
+ots-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ots/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Mar 2005 22:35:42 -0000	1.1
+++ sources	14 Mar 2005 22:36:09 -0000	1.2
@@ -0,0 +1 @@
+bb02a56a3bf2d5ebf9ffd064992d0ae4  ots-0.4.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 14 22:38:38 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:38:38 -0500
Subject: rpms/abiword - New directory
Message-ID: <200503142238.j2EMccV9008309@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/abiword
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8296/abiword

Log Message:
Directory /cvs/extras/rpms/abiword added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:38:38 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:38:38 -0500
Subject: rpms/abiword/devel - New directory
Message-ID: <200503142238.j2EMccXR008312@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8296/abiword/devel

Log Message:
Directory /cvs/extras/rpms/abiword/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 14 22:38:51 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:38:51 -0500
Subject: rpms/abiword Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503142238.j2EMcpuM008392@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/abiword
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8377

Added Files:
	Makefile import.log 
Log Message:
Setup of module abiword


--- NEW FILE Makefile ---
# Top level Makefile for module abiword
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 14 22:38:51 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:38:51 -0500
Subject: rpms/abiword/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503142238.j2EMcpri008395@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8377/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module abiword


--- 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 Mar 14 22:39:47 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:39:47 -0500
Subject: rpms/abiword import.log,1.1,1.2
Message-ID: <200503142239.j2EMdlqp008601@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/abiword
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8586

Modified Files:
	import.log 
Log Message:
auto-import abiword-2.2.5-2 on branch devel from abiword-2.2.5-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/abiword/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Mar 2005 22:38:49 -0000	1.1
+++ import.log	14 Mar 2005 22:39:45 -0000	1.2
@@ -0,0 +1 @@
+abiword-2_2_5-2:HEAD:abiword-2.2.5-2.src.rpm:1110839981



From fedora-extras-commits at redhat.com  Mon Mar 14 22:39:47 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 17:39:47 -0500
Subject: rpms/abiword/devel abiword-2.0.9-windowshelppaths.patch, NONE,
	1.1 abiword-2.2.1-desktop.patch, NONE,
	1.1 abiword-2.2.5-gcc4.patch, NONE,
	1.1 abiword-2.2.5-wvread.patch, NONE, 1.1 abiword.mime, NONE,
	1.1 abiword.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503142239.j2EMdlH6008605@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8586/devel

Modified Files:
	.cvsignore sources 
Added Files:
	abiword-2.0.9-windowshelppaths.patch 
	abiword-2.2.1-desktop.patch abiword-2.2.5-gcc4.patch 
	abiword-2.2.5-wvread.patch abiword.mime abiword.spec 
Log Message:
auto-import abiword-2.2.5-2 on branch devel from abiword-2.2.5-2.src.rpm

abiword-2.0.9-windowshelppaths.patch:

--- NEW FILE abiword-2.0.9-windowshelppaths.patch ---
diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/howto/howtoword.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/howto/howtoword.abw
--- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/howto/howtoword.abw	2004-07-28 19:00:11.612412860 +0100
+++ abiword-2.0.9/abiword-docs/ABW/fr-FR/howto/howtoword.abw	2004-07-28 19:00:49.785296529 +0100
@@ -23,7 +23,7 @@
 <p style="Normal"><c props="lang:fr-FR">Il est presque in??vitable qu'?? un certain moment, vous aurez le besoin d'exp??dier un document que vous avez cr???? avec AbiWord ?? une personne utilisant Microsoft Word ou ouvrir un document cr???? avec Microsoft Word avec AbiWord. Heureusement, il est facile de r??aliser ces transferts.</c><c props="lang:fr-FR"></c></p>
 <p style="Heading 2"><c style="Heading 2" props="lang:fr-FR">Visualiser un document AbiWord avec Microsoft Word</c><c style="Heading 2" props="lang:fr-FR"></c></p>
 <p style="Normal"><c props="lang:fr-FR">Jusqu'?? ce que Microsoft annonce le support des fichiers d'AbiWord, les documents cr????s avec AbiWord n??cessiteront d'??tre export??s dans un format que Word peut lire. L'enregistrement au format </c><c props="lang:fr-FR"></c><c props="font-family:Times New Roman; text-decoration:none; color:000000; font-size:12pt; text-position:normal; font-weight:normal; font-style:normal; lang:fr-FR">Rich Text Format </c><c props="lang:fr-FR">permet de r??aliser facilement cette exportation.</c></p>
-<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\howto\gettingstarted.abw.png_1" props="height:6.91in; width:5.63in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/gettingstarted.abw.png_1" props="height:6.91in; width:5.63in"/></p>
 <p style="Normal"></p>
 <p style="Normal"><c props="lang:fr-FR">Le format Rich Text est couramment utilis?? par les produits Microsoft Office et ils n'auront aucune difficult?? ?? importer les documents enregistr??s ainsi.</c><c props="lang:fr-FR"></c></p>
 <p style="Heading 2"><c style="Heading 2" props="lang:fr-FR">Visualiser les documents Word avec AbiWord</c><c style="Heading 2" props="lang:fr-FR"></c></p>
@@ -31,7 +31,7 @@
 <p style="Normal"><c props="lang:fr-FR">Si vous rencontrez des probl??mes, demandez ?? l'utilisateur de Word d'enregistrer le document au format </c><c props="lang:fr-FR"></c><c props="font-style:italic; lang:fr-FR">Rich Text Format (.rtf)</c><c props="lang:fr-FR">. Toutes les versions de Microsoft Word peuvent le faire et AbiWord peut ouvrir les fichiers RTF de mani??re fiable.</c></p>
 </section>
 <data>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\howto\gettingstarted.abw.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/gettingstarted.abw.png_1" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAhwAAAKXCAYAAADJiZNnAAAABmJLR0QA/wD/AP+gvaeTAAAA
 CXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH0gUSDDMylHTKNAAAIABJREFUeJzsvV+oJcl5
 4PlVcwzngh6qG2TUxgtbl9lmu+7QuOvONu6usbBKEuw0eGGEdmE07MO4C4tZ2TMsMy9m9bY9
diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw
--- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw	2004-07-28 19:00:11.595415583 +0100
+++ abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw	2004-07-28 19:00:49.786296369 +0100
@@ -16,7 +16,7 @@
 <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
 <section>
 <p style="Heading 1"><c props="lang:fr-CA"></c><c props="lang:fr-FR">Dialogue remplacer</c></p>
-<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\replace.png_0" props="height:1.77in; width:4.93in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/replace.png_0" props="height:1.77in; width:4.93in"/></p>
 <p style="Heading 2"><c props="lang:fr-FR">Rechercher</c><c props="lang:fr-FR"></c></p>
 <p style="Normal"><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt">Entrez le mot que vous d??sirez rechercher dans cette bo??te. Il s'agit de la cha??ne de recherche. Cette commande recherche la cha??ne de caract??res ou de nombres que vous entrez. Ainsi, si vous recherchez </c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt"></c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; font-size:12pt">en</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt">, vous trouverez les deux lettres au milieu du mot </c><c props="font-family:Times New Roman!
; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; font-size:12pt">dent</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt"> tout autant que le mot </c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; font-size:12pt">en</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt">.</c></p>
 <p style="Heading 2"><c props="lang:fr-FR">Respecter la casse</c><c props="lang:fr-FR"></c></p>
@@ -33,7 +33,7 @@
 <p style="Normal"><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none">Ce bouton ferme le dialogue </c><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none"></c><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; text-decoration:none">Remplacer</c><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none">.</c></p>
 </section>
 <data>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\replace.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/replace.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAdkAAACqCAIAAABu5KKOAAAaMElEQVR4nO2dX4gkx33Hfxfa
 UAMXmDEyaPWknYcj2jFHtBMd6BaF6BzlQdgPtslDTn7KiRjspxDpIfjyEklvtgPByoOQYgg+
 P8TS6cGnS/BFa5DZPdAxu7Dy3JhE3CxEeJbo2G7wQf/ABZuHqq6urv4zPT3d23u33w/LUl1d
diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/workspace.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/workspace.abw
--- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/workspace.abw	2004-07-28 19:00:11.604414141 +0100
+++ abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/workspace.abw	2004-07-28 19:00:49.789295889 +0100
@@ -23,24 +23,24 @@
 <section header="26414915">
 <p style="Heading 1"><c props="lang:fr-CA"></c><c props="lang:fr-FR">L'espace de travail d'AbiWord</c></p>
 <p style="Normal"><c props="lang:fr-FR">AbiWord a une apparence tr??s similaire ?? d'autres traitements de texte, ce qui, nous l'esp??rons, met ?? l'aise toute personne qui d??bute avec le logiciel.</c><c props="lang:fr-FR"></c></p>
-<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\full_window.png_1" props="height:4.14in; width:6.75in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/full_window.png_1" props="height:4.14in; width:6.75in"/></p>
 <p style="Normal"><c props="lang:fr-FR">L'interface famili??re devrait permettre ?? la plupart des personnes de d??marrer le travail imm??diatement. Cependant, certaines caract??ristiques sont peut-??tre nouvelles.</c><c props="lang:fr-FR"></c></p>
 <p level="1" listid="0" parentid="0" style="Heading 2"><c props="lang:fr-FR">Titre de fen??tre</c><c props="lang:fr-FR"></c></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\titlebar.png_1" props="height:0.23in; width:6.73in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/titlebar.png_1" props="height:0.23in; width:6.73in"/></p>
 <p level="1" listid="0" parentid="0" style="Normal"><c props="lang:fr-FR">La fen??tre de titre est similaire ?? cette de toute autre application, avec une diff??rence toutefois. Notez le caract??re </c><c props="lang:fr-FR"></c><c props="font-style:italic; lang:fr-FR">*</c><c props="lang:fr-FR"> pr??s de </c><c props="font-style:italic; lang:fr-FR">Document10</c><c props="lang:fr-FR">. L'ast??rique signifie que </c><c props="font-style:italic; lang:fr-FR">Document10</c><c props="lang:fr-FR"> a ??t?? modifi??. Ceci fourni un mani??re simple d'identifier si le document doit ??tre enregistr??.</c></p>
 <p level="1" listid="0" parentid="0" style="Heading 2"><c props="lang:fr-FR">Les barres de fonction</c><c props="lang:fr-FR"></c></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars.png_1" props="height:0.98in; width:6.63in"/><c props="lang:fr-FR">Voici les trois plus importantes barres de fonctions. La premi??re, nomm??e barre de menu, est le meilleur endroit pour se familiariser avec AbiWord. Il est pr??f??rable d'y d??buter l'exploration des menus pour saisir ce que AbiWord peut faire avec les documents.</c><c props="lang:fr-FR"></c></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars.png_1" props="height:0.98in; width:6.63in"/><c props="lang:fr-FR">Voici les trois plus importantes barres de fonctions. La premi??re, nomm??e barre de menu, est le meilleur endroit pour se familiariser avec AbiWord. Il est pr??f??rable d'y d??buter l'exploration des menus pour saisir ce que AbiWord peut faire avec les documents.</c><c props="lang:fr-FR"></c></p>
 <p level="1" listid="0" parentid="0" style="Normal"><c props="lang:fr-FR">La seconde est la barre d'outils standard et la troisi??me (au bas) est la barre d'outils de mise en forme.</c><c props="lang:fr-FR"></c></p>
 <p level="1" listid="0" parentid="0" style="Heading 2"><c props="lang:fr-FR">Manipuler les barres</c><c props="lang:fr-FR"></c></p>
 <p level="1" listid="0" parentid="0" style="Normal"><c props="lang:fr-FR">AbiWord permet de cacher les barres. Si certaines manquent ou ne sont pas requises v??rifiez le menu </c><c props="lang:fr-FR"></c><c props="font-style:italic; lang:fr-FR">Affichage</c><c props="lang:fr-FR"> &gt; </c><c props="font-style:italic; lang:fr-FR">Barres d'outils</c><c props="lang:fr-FR">.</c></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars_hiding.png_1" props="height:3.19in; width:5.76in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars_hiding.png_1" props="height:3.19in; width:5.76in"/></p>
 <p style="Heading 2"><c props="lang:fr-FR">Barre de saisie</c><c props="lang:fr-FR"></c></p>
 <p style="Normal"><image dataid="/usr/src/abiword/commit/images/grabbar_shaded.png_0" props="height:1.08in; width:1.35in"/></p>
 <p style="Normal"><c props="lang:fr-FR">Pour ceux qui ex??cutent AbiWord sous GNOME, La barre de saisie localis??e ?? l'extr??mit?? gauche de chaque barre d'outils repr??sente une mani??res simple offerte ?? chacun de modifier l'interface ?? leur convenance. Cliquez la barre de saisie et d??placez-l??. La barre d'outils suivra la souris, permettant m??me ?? la barre d'outil de survoler une partie quelconque de l'??cran.</c><c props="lang:fr-FR"></c></p>
 <p style="Heading 2"><c props="lang:fr-FR">Barre d'??tat</c><c props="lang:fr-FR"></c></p>
 <p style="Normal"><image dataid="/usr/src/abiword/commit/images/statusbar.png_0" props="height:0.22in; width:5.04in"/></p>
 <p style="Normal"><c props="lang:fr-FR">La barre d'??tat permet une vue rapide de l'??tat du document. A la gauche, AbiWord note la page courante. La bo??te du milieu, qui est habituellement vide, affiche un message d'aide rapide d??crivant l'option de menu courante.</c><c props="lang:fr-FR"></c></p>
-<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\statusbar_quickhelp.png_1" props="height:1.61in; width:6.49in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/statusbar_quickhelp.png_1" props="height:1.61in; width:6.49in"/></p>
 <p style="Heading 2"><c props="lang:fr-FR">Les r??gles</c><c props="lang:fr-FR"></c></p>
 <p style="Normal"><image dataid="/usr/src/abiword/commit/images/ruler.png_0" props="height:0.32in; width:5.55in"/></p>
 <p style="Normal"><c props="lang:fr-FR">En employant les r??gles, il devient facile de fixer les marges de la page et les tabulations.</c><c props="lang:fr-FR"></c></p>
@@ -49,7 +49,7 @@
 <p style="Normal" props="text-align:left"></p>
 </section>
 <data>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\full_window.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/full_window.png_1" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAogAAAGNCAIAAAAdDhfDAAAgAElEQVR4nOy9bWwcx5ku+mjR
 vqgJmMWMoSw4gh1oCFnIkLZhkhtBGkbBmjoOYDpZwKIdwGZ8FgnlBDYdX2Qt70EiO4u7trPY
 WE5wEmuDxKKDbEQZiCXqIpaYQDozOpB2hoKU4QSSyTFsg0NsBDcRE5rGCeEuXDWg+6O6q6ur
@@ -732,7 +732,7 @@
 Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW
 iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg==
 </d>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars_hiding.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/functionbars_hiding.png_1" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAikAAAEyCAIAAACwCNeMAAAACXBIWXMAAABEAAAARACdvuRJ
 AABTv0lEQVR42u29f2wcx5nn/bXQflGzYF4MDSfgGEngIbJGKCbGSrw1LCoJTtRqcWHWC1hO
 Foi8uRf2yA4SOTns2flj3yR3eC82Du+beA/5oQTrFWXsxT+AtS0DF1kXREdqYYekYYecQAo1
@@ -1135,7 +1135,7 @@
 MThhNzQ3OWNiNDVjMWM4ZjU4ODEwMjAxODdiNmZkOGRmYmNlZGIwNjWQ4/dNAAAAAElFTkSu
 QmCC
 </d>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/functionbars.png_1" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAnwAAABeCAIAAAA2dF4VAAAACXBIWXMAAABEAAAARACdvuRJ
 AABD6UlEQVR42u29fYwc1Zkv/HNUXFVHzlWPBdG0BZG7BRY9DVZmOrGYmQVdZjbRzZi9EraJ
 BEPeVRgDAjtIiU1WiSHRrk1WG5tEy8VEITNcZRk7UrDNVRhPInO7/cpst9FAz0SGno4ATVvB
@@ -1496,7 +1496,7 @@
 DARcAEBsLLAFAABFC65ZAT5ljHl7Cpt/HGtWAABrMLOCaDgEBABIgTUriEbi4lkAQPkIK4iC
 QzsAgFT+AnafvftOpg+NAAAAAElFTkSuQmCC
 </d>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\titlebar.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/titlebar.png_1" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAoYAAAAWCAIAAADSEcpEAAAACXBIWXMAAABEAAAARACdvuRJ
 AAAKN0lEQVR42u2dXYjc1hXH/wEFjmACEriwAy10TAlxHEq9bgO2ScBx85AtLsROXtYkD0me
 4rSQ2n0o5CnYD/1wCiHbQogTKN0EanYWmnobanZcajxbutkZ8McqtCYa6IIGvFgXMqADvg99
@@ -1550,7 +1550,7 @@
 N2NlNzE0YWQwMjdlM2M5MWZiMjk0ZTc2ZDNlNDU2ZmQxMjFjZmE4ODZiNWRlMGUzZTNmZjhm
 ZTJhZTY0MmU4HyCiUgAAAABJRU5ErkJggg==
 </d>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\statusbar_quickhelp.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/statusbar_quickhelp.png_1" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAm8AAACbCAIAAAC7yOv5AAAACXBIWXMAAABEAAAARACdvuRJ
 AAAqpUlEQVR42u2df2hlx5XnT4cbqAcaeDJOkGB3icTSxFII69Zug92TMN2eXkgvXoiT/LEd
 ZiBW40DayZCN88eS5J9J+4/9kVmSuGdYY7VhZ+3ABsuwiXuH9LZ6iSMpuEfS0G31M4nRE6yZ
diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/howto/howtoword.abw abiword-2.0.9/abiword-docs/ABW/pl-PL/howto/howtoword.abw
--- abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/howto/howtoword.abw	2004-07-28 19:00:11.584417345 +0100
+++ abiword-2.0.9/abiword-docs/ABW/pl-PL/howto/howtoword.abw	2004-07-28 19:00:49.791295568 +0100
@@ -24,7 +24,7 @@
 <p style="Heading 2"><c style="Heading 2" props="lang:en-US">Podgl??d dokument??w AbiWorda w programie Microsoft Word</c></p>
 <p style="Normal"><c props="lang:en-US">Jakkolwiek Microsoft zapowiada wsparcie dla plik??w AbiWorda, to przede wszystkim dokumenty tworzone w AbiWordzie powinny by?? eksportowane do formatu czytelnego dla programu Microsoft Word. Naj??atwiej to zrobi?? przez zapisanie pliku w postaci Rich Text Format.</c></p>
 <p style="Normal"></p>
-<p style="Normal"><image dataid="E:\nowyAbiWord\abiword-doc\docs 9.1\ok---howto\howtoword.png_0" props="height:3.40in; width:5.04in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/howtoword.png_0" props="height:3.40in; width:5.04in"/></p>
 <p style="Normal"></p>
 <p style="Normal"><c props="lang:en-US">Rich Text Format cz??sto jest u??ywany przez pakiet oprogramowania biurowego firmy Microsoft i nie b??dzie problem??w z importem dokument??w zapisanych w ten spos??b.</c></p>
 <p style="Heading 2"><c style="Heading 2" props="lang:en-US">Podgl??d dokument??w Microsoft Word w AbiWordzie</c></p>
@@ -32,7 +32,7 @@
 <p style="Normal"><c props="lang:en-US">Je??li napotykasz problemy, to popro?? u??ytkownika programu Microsoft Word, aby zapisywa?? dokumenty jako Rich Text Format (.rtf). Wszystkie wersje programu Microsoft Word mog?? zapisywa?? pliki w tym formacie, a AbiWord potrafi wiernie odczytywa?? pliki typu RTF.</c></p>
 </section>
 <data>
-<d name="E:\nowyAbiWord\abiword-doc\docs 9.1\ok---howto\howtoword.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/howtoword.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAl0AAAGYCAIAAAGAKvBwAAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXQUxbru6Z59Jvu+IU9Qr7jh8Yrg
 Coq4IKiIinAFFFxYghCQhASyEQj7GgKB7CsJgYCAEJLM9ARCUNGrjyvi9TxChCBclsBlMWzp
diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/interface/workspace.abw abiword-2.0.9/abiword-docs/ABW/pl-PL/interface/workspace.abw
--- abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/interface/workspace.abw	2004-07-28 19:00:11.576418627 +0100
+++ abiword-2.0.9/abiword-docs/ABW/pl-PL/interface/workspace.abw	2004-07-28 19:00:49.962268173 +0100
@@ -25,24 +25,24 @@
 <p style="Heading 1"><c props="lang:pl-PL">Obszar roboczy </c><c props="lang:pl-PL"></c>AbiWorda</p>
 <p style="Normal">Obszar roboczy jest podobny do tych, jakie znamy z innych edytor??w tekstu. Dlatego ka??dy nowy u??ytkownik <c props="lang:en-US">AbiWorda mo??e si?? czu?? jak u siebie w domu</c><c props="lang:en-US"></c>.</p>
 <p style="doc_normal"></p>
-<p style="doc_normal" props="text-indent:0.0000in; text-align:center"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\full_window.png_0" props="height:3.68in; width:6.96in"/></p>
+<p style="doc_normal" props="text-indent:0.0000in; text-align:center"><image dataid="/usr/src/abiword/commit/full_window.png_0" props="height:3.68in; width:6.96in"/></p>
 <p style="doc_normal"></p>
 <p level="1" listid="0" parentid="0" style="Normal">Znajomy interfejs pozwala wi??kszo??ci u??ytkownikom <c props="lang:en-US">od razu rozpocz???? prac??</c><c props="lang:en-US"></c>. Tym niemniej niekt??re mo??liwo??ci b??d?? nowo??ci??.</p>
 <p level="1" listid="0" parentid="0" style="Normal"></p>
 <p level="1" listid="0" parentid="0" style="Heading 3">Okno tytu??u</p>
 <p level="1" listid="0" parentid="0" style="doc_normal" props="text-indent:-0.5000in"></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\titlebar.png_0" props="height:0.25in; width:6.99in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/titlebar.png_0" props="height:0.25in; width:6.99in"/></p>
 <p level="1" listid="0" parentid="0" style="Normal"></p>
 <p level="1" listid="0" parentid="0" style="Normal">Okno tytu??u jest podobne do okien innych aplikacji, z jedn?? jednak r????nic??. Zw???? uwag?? na gwiazdk?? * obok ???Dokument_10???. Gwiazdka oznacza, ??e ???Dokument_10??? zosta?? zmodyfikowany. W ten prosty spos??b AbiWord podpowiada ci, ??e dokument powinien by?? zapisany.</p>
 <p level="1" listid="0" parentid="0" style="Heading 3">Paski funkcji</p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars.png_0" props="height:0.90in; width:6.99in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars.png_0" props="height:0.90in; width:6.99in"/></p>
 <p level="1" listid="0" parentid="0" style="Normal"></p>
 <p level="1" listid="0" parentid="0" style="Normal">Oto trzy podstawowe paski funkcji. Pierwszy, nazywany Paskiem Menu, to najlepsze miejsce, by zapozna?? si?? z AbiWordem. Najlepiej po prostu przejrzyj ka??de menu, wtedy poznasz wszystkie komendy, jakich AbiWord mo??e u??y?? do dokument??w.</p>
 <p level="1" listid="0" parentid="0" style="Normal">Drugi to pasek ???Standardowy???, trzeci z wy??ej pokazanych (na dole) to pasek "Formatowanie".</p>
 <p level="1" listid="0" parentid="0" style="Heading 3">Paski robocze</p>
 <p level="1" listid="0" parentid="0" style="Normal">AbiWord pozwala na ukrywanie pask??w narz??dzi. Je??li kt??rego?? brakuje albo nie jest potrzebny, sprawd?? w Widok &gt; Paski narz??dzi.</p>
 <p level="1" listid="0" parentid="0" style="Normal"></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars_hiding.png_1" props="height:1.67in; width:3.54in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars_hiding.png_1" props="height:1.67in; width:3.54in"/></p>
 <p style="Heading 3">Pasek uchwytu</p>
 <p style="doc_normal"></p>
 <p style="Normal" props="text-align:left"><image dataid="/usr/src/abiword/commit/images/grabbar_shaded.png_0" props="height:1.08in; width:1.35in"/></p>
@@ -50,14 +50,14 @@
 <p style="Normal" props="lang:en-US">U??ytkownicy, kt??rzy uruchamiaj?? AbiWorda w ??rodowisku GNOME, znajd?? pasek uchwytu umieszczony na skraju lewej cz????ci ka??dego z pask??w narz??dziowych, kt??ry pozwala w prosty spos??b zmodyfikowa?? interfejs wedle ??yczenia. Kliknij na pasek uchwytu i przeci??gnij. Pasek narz??dziowy b??dzie przesuwa?? si?? wzd??u?? toru myszki, mo??e nawet wisie?? nad dowoln?? cz????ci?? ekranu.</p>
 <p style="Heading 3">Pasek statusu</p>
 <p style="doc_normal"></p>
-<p style="Normal" props="text-indent:0.0000in"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar.png_0" props="height:0.24in; width:6.96in"/></p>
+<p style="Normal" props="text-indent:0.0000in"><image dataid="/usr/src/abiword/commit/statusbar.png_0" props="height:0.24in; width:6.96in"/></p>
 <p style="doc_normal" props="text-indent:0.5000in; margin-left:0.0000in"></p>
 <p style="Normal" props="text-indent:0.5000in">W pasku statusu znajdziesz skr??towy opis statusu dokumentu. W lewej cz????ci paska<c props="font-family:Times New Roman; text-decoration:none; color:000000; font-size:12pt; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"> AbiWord</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; font-size:12pt; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c> wy??wietla kolejny numer strony oraz liczb?? wszystkich stron. Nast??pnie w ??rodkowej cz????ci, kt??ra najcz????ciej jest pusta, wy??wietlany jest kr??tki pomocniczy opis bie????cej opcji menu. W prawej cz????ci paska podany jest tryb pracy klawiatury (<c props="font-weight:bold">+INS</c>, czyli tryb wstawiania, albo <c props="font-weight:bold">-ins</c>, czyli tryb zast??powania) oraz nazwa aktualnego szablonu.</p>
 <p style="Normal" props="text-indent:0.5000in"></p>
-<p style="Normal" props="text-indent:0.0000in"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar_quickhelp.png_0" props="height:2.48in; width:6.97in"/></p>
+<p style="Normal" props="text-indent:0.0000in"><image dataid="/usr/src/abiword/commit/statusbar_quickhelp.png_0" props="height:2.48in; width:6.97in"/></p>
 <p style="Heading 3">Linijka</p>
 <p style="doc_normal"></p>
-<p style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\ruler.png_0" props="height:0.34in; width:8.85in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/ruler.png_0" props="height:0.34in; width:8.85in"/></p>
 <p style="Normal"></p>
 <p style="Normal">U??ywaj??c linijki mo??esz w ??atwy spos??b definiowa?? <c props="lang:en-US">na stronie </c><c props="lang:en-US"></c>marginesy oraz tabulatory.</p>
 </section>
@@ -65,7 +65,7 @@
 <p style="Normal" props="text-align:left"></p>
 </section>
 <data>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\full_window.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/full_window.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAApwAAAFhCAIAAAElyt0+AAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXwURdbvLPC54IeIuMoKArKcUQgi
 d2JABIGVKxwGVrmPGMQQzklmJpcCIUBMgpBwJBzBEI4glwR0RTySzISEzAyZJIC6IB6suwLK
@@ -1458,7 +1458,7 @@
 Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW
 iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg==
 </d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\titlebar.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/titlebar.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAp8AAAAYCAIAAAFEpzGAAAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9d1RUWbZ38TqYMAdUkAKabCBoS5As
 qKAiKIIgWck5JwkigkgWEFSiiIqCtpjaHFqSIlSBobvtoHaY6fj19Dezpue9Wa++fc6+99at
@@ -1824,7 +1824,7 @@
 U3NkC/pNXf3TzsJ2jxwsz3aUR7tKcWkNGacs2/619xjliewpfDI4XsC01wCb6ZPN6En3gjNT
 F/m4k8smfLv/D9XFSL9vOncQAAAAAElFTkSuQmCC
 </d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar_quickhelp.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/statusbar_quickhelp.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAp0AAADuCAIAAAGDmRu5AAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCVQUx7oeAi5EcXlZTKKXQUUJmgii
 kVUkUURwQdwAgwiIwKCAKLLIooiiILKIgiKCgrsoKhHUuAvMsM4gi8bk5ZpEk6OJeZrz7kty
@@ -2753,7 +2753,7 @@
 rHHd5lpt9kxeQWueBlaZZ/Fw+ux83+U9jEtmQ0dDO9V/An0RGn6kluj/H0TjWnMwPK11AAAA
 AElFTkSuQmCC
 </d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/statusbar.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAApwAAAAXCAIAAAFexjhWAAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAQ2ElEQVR4nO1dC1fbuBIOr+7v3W0pPUtS2P61S3Cc
 0NiOQ7g/5HZpu6fkzswnjR628yKQkPU5g4+QZVmR5q0ZuTPJhkWRFvmoCXJq0Hz3hSAvgn/L
@@ -2837,7 +2837,7 @@
 pHc9YRw/VddzPPJlb69v8xK8bi3Qo7dknmEXttcXuibeNbhLgrjSHv6qx6vuxdUlifPRnA9/
 vvh8+bGUMol5AkbjCX+D/v/6OPv+i4Ym1QAAAABJRU5ErkJggg==
 </d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/functionbars.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAp8AAABWCAIAAAFx9VqcAAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9CXxU1bn4HRJwa23rv699z7a2tX1t
 ta226nOBWLVqfW3t5trF1rpVpVpbBFlmEpBFUURZFZCloICgoIKAooBCJpN1lsxkwhJIWAOU
@@ -3416,7 +3416,7 @@
 bOnGe+2M3XYot2UDS4L5O8omnlXu+gHXqLwXOB02sXB53k22Z9RfqVlmje7/A8GWRyS/OvHV
 AAAAAElFTkSuQmCC
 </d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\ruler.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/ruler.png_0" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAA1IAAAAhCAIAAAErHT00AAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAN60lEQVR4nO1djXLbOA6WNnmmvb1r76l2u0lrqd2H
 c+OkzkRy7Tj3KJ26tg8kJIrWD0VLlAjZwHyjcWSGhiASBEkADN69/xejD4Jt8jWO7uL4A3xA
@@ -3486,7 +3486,7 @@
 5Nm7YpO32pdkR7qtS7ijYei3Sa21MD/MD/PD/DA/18gPH/dai3qzrxHWK0Y91/kYVcAsR85m
 FvqatoL+5yYxmH0MBoPBYFwa2MizxP8Bf0pzQLOvs0QAAAAASUVORK5CYII=
 </d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars_hiding.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/functionbars_hiding.png_1" mime-type="image/png" base64="yes">
 iVBORw0KGgoAAAANSUhEUgAAAVQAAACgCAIAAAGrgzPPAAAACXBIWXMAAAsSAAALEgHS3X78
 AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nLRcC3CURbb+h8lr8k4IRALOPwmQ18S8
 ABHxcVnBSMTwlofZSEiCGALy2EgkExRlQQQf4FvR0t3VXXdXry513dq61i2rbkIICZkZEhK3

abiword-2.2.1-desktop.patch:

--- NEW FILE abiword-2.2.1-desktop.patch ---
--- abiword-2.2.1/abi/abiword.desktop.desktop	2004-12-06 08:55:02.366730824 +0000
+++ abiword-2.2.1/abi/abiword.desktop	2004-12-06 08:57:31.004206527 +0000
@@ -6,11 +6,17 @@
 Categories=Application;Office;WordProcessor;X-Red-Hat-Base;
 StartupNotify=true
 Encoding=UTF-8
-X-Desktop-File-Install-Version=0.4
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;
-Name=AbiWord Word Processor
-Name[de]=AbiWord Textverarbeitung
-Name[nb]=AbiWord Tekstbehandling
-Name[nn]=AbiWord Tekstbehandling
-Name[no]=AbiWord Tekstbehandler
-Name[pt]=AbiWord Processador de Texto
+X-Desktop-File-Install-Version=0.9
+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;
+Name=Word Processor
+Comment=AbiWord Word Processor
+Name[de]=Textverarbeitung
+Comment[de]=AbiWord Textverarbeitung
+Name[nb]=Tekstbehandling
+Comment[nb]=AbiWord Tekstbehandling
+Name[nn]=Tekstbehandling
+Comment[nn]=AbiWord Tekstbehandling
+Name[no]=Tekstbehandler
+Comment[no]=AbiWord Tekstbehandler
+Name[pt]=Processador de Texto
+Comment[pt]=AbiWord Processador de Texto

abiword-2.2.5-gcc4.patch:

--- NEW FILE abiword-2.2.5-gcc4.patch ---
diff -ru abiword-2.2.5.orig/wv/wvConfig.c abiword-2.2.5/wv/wvConfig.c
--- abiword-2.2.5.orig/wv/wvConfig.c	2005-03-04 08:48:33.804025324 +0000
+++ abiword-2.2.5/wv/wvConfig.c	2005-03-04 08:50:44.807202081 +0000
@@ -2130,7 +2130,7 @@
 }
 
 static void
-startElement (void *userData, const XML_Char *name, const XML_Char **atts)
+wvstartElement (void *userData, const XML_Char *name, const XML_Char **atts)
 {
     unsigned int nAtts = 0;
     const XML_Char **p;
@@ -3094,7 +3094,7 @@
 }
 
 static void
-endElement (void *userData, const XML_Char *name)
+wvendElement (void *userData, const XML_Char *name)
 {
     state_data *mydata = (state_data *) userData;
     unsigned int token_type;
@@ -3470,8 +3470,8 @@
 	memset(&hdl, 0, sizeof(hdl));
 
 	hdl.getEntity = _getEntity;
-	hdl.startElement = startElement;
-	hdl.endElement = endElement;
+	hdl.startElement = wvstartElement;
+	hdl.endElement = wvendElement;
 	hdl.characters = charData;
 
 	if (myhandle->fp)
@@ -3514,7 +3514,7 @@
     size_t len;
 
     XML_SetUserData (parser, myhandle);
-    XML_SetElementHandler (parser, startElement, endElement);
+    XML_SetElementHandler (parser, wvstartElement, wvendElement);
     XML_SetCharacterDataHandler (parser, charData);
 
     if (myhandle->fp == NULL)

abiword-2.2.5-wvread.patch:

--- NEW FILE abiword-2.2.5-wvread.patch ---
diff -u abiword-2.2.5.orig/wv/libole2/ms-ole.c abiword-2.2.5/wv/libole2/ms-ole.c
--- abiword-2.2.5.orig/wv/libole2/ms-ole.c	2004-10-23 02:59:51.000000000 +0200
+++ abiword-2.2.5/wv/libole2/ms-ole.c	2005-03-14 21:50:48.000000000 +0100
@@ -36,6 +36,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <string.h>
+#undef read
 
 #ifdef __MINGW32__ /* incomplete defines on mingw */
 


--- NEW FILE abiword.mime ---
application/x-abiword
	ext: abw



--- NEW FILE abiword.spec ---
%define desktop_file_utils_version 0.9

Summary: The AbiWord word processor
Name: abiword
Version: 2.2.5
Release: 2
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
PreReq: desktop-file-utils >= %{desktop_file_utils_version}

BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: libstdc++, /usr/bin/g++
BuildRequires: gtk2-devel aspell-devel libpng-devel
BuildRequires: libxml2-devel
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
BuildRequires: fribidi-devel, enchant-devel

# some plugin build deps
BuildRequires: ots-devel >= 0.4.2
BuildRequires: libwpd-devel >= 0.8.0
BuildRequires: librsvg2-devel
BuildRequires: libwmf-devel
BuildRequires: aiksaurus-gtk-devel >= 1.2.1

# gnome build deps
BuildRequires: libbonobo-devel
BuildRequires: libbonoboui-devel
BuildRequires: libgnomeprint22-devel
BuildRequires: libgnomeprintui22-devel
BuildRequires: libgnomeui-devel
URL: http://www.abisource.com/

Patch0: abiword-2.0.9-windowshelppaths.patch
Patch1: abiword-2.2.1-desktop.patch
Patch2: abiword-2.2.5-gcc4.patch
Patch3: abiword-2.2.5-wvread.patch

%description
AbiWord is a cross-platform Open Source word processor. The goal is to make
AbiWord full-featured, and remain lean.

%prep
%setup -q 
%patch0 -p1 -b .windowshelppaths
%patch1 -p1 -b .desktop
%patch2 -p1 -b .gcc4
%patch3 -p1 -b .wvread

%build
cd abi
autoconf
%configure --enable-gnome --with-libxml2
cd ../wv
%configure --with-libwmf --with-libxml2
cd ../abi
make
cd ../abiword-plugins
libtoolize --copy --force
./nextgen.sh
%configure --disable-gda --with-abiword=../abi
sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo
sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool
make

# now make the docs
cd ../abiword-docs
ABI_DOC_PROG=$(pwd)/../abi/src/wp/main/unix/AbiWord-2.2 ./make-html.sh

%install
cd abi
%makeinstall
cd ../abiword-plugins
%makeinstall DESTDIR=$RPM_BUILD_ROOT

# install the docs
cd ../abiword-docs
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.2/AbiWord/help
cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.2/AbiWord/help/
# some of the help dirs have bad perms (#109261)
find $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.2/AbiWord/help/ -type d -exec chmod -c o+rx {} \;

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
cp $RPM_BUILD_ROOT%{_datadir}/AbiSuite-2.2/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png

cd ../abi
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor gnome \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Red-Hat-Extra --remove-category X-Red-Hat-Base \
  --add-category Applications --add-category Office \
  ./abiword.desktop
# remove the original one (which has X-Red-Hat-Base)  (#107023)
rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/abiword.desktop

mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info
install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info

rm -f $RPM_BUILD_ROOT%{_bindir}/ttf*
# nuke .la files
rm -f $RPM_BUILD_ROOT/%{_libdir}/AbiWord-2.2/plugins/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/ldconfig
update-desktop-database %{_datadir}/applications

%postun
/sbin/ldconfig
update-desktop-database %{_datadir}/applications

%files
%defattr(-,root,root)
%doc abi/docs 
%{_bindir}/AbiWord-2.2
%{_bindir}/abiword
%{_libdir}/AbiWord-2.2
%{_datadir}/AbiSuite-2.2
%{_datadir}/applications/*
%{_datadir}/mime-info/*
%{_datadir}/pixmaps/*png
%{_datadir}/icons/*png

%changelog
* Fri Mar 14 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.5-2
- Remove the --disable-magick plugin switch
- disable GDA support until the plugin is ported to gnomedb 1.2.x
- Change the download location from SF to http://www.abisource.com/
- patch libole2

* Fri Mar  2 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.5-1
- bump to latest stable
- drop integrated dashboard patch again
- some gcc4 fixes

* Wed Feb 23 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.4-2
- rh#149447# dashboard spam revisited

* Tue Feb 22 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.4-1
- bump to latest stable version
- drop integrated nautilus depend patch
- drop integrated libwpd depend patch

* Fri Feb 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.3-4
- upgrade to libwpd-0.8 and incoroprate necessary changeover patches

* Mon Feb 7 2005 Matthias Clasen <mclasen at redhat.com> - 1:2.2.3-3
- rebuild

* Mon Feb 2 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.3-2
- remove unneccessary nautilus dependency

* Mon Jan 17 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.3-1
- bump to new version
- drop integrated silenceabidash patch

* Fri Jan 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.2-4
- RH#145085# annoying cluepacket message on stdout/stderr

* Wed Jan 12 2005 Tim Waugh <twaugh at redhat.com> - 1:2.2.2-3
- Rebuilt for new readline.

* Tue Jan 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.2-2
- RH#143368# use enchant as spellchecker

* Mon Dec 13 2004 Caolan McNamara <caolanm at redhat.com> - 1:2.2.2-1
- bump to new version

* Mon Dec 6 2004 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-1
- bump to new version
- geometry patch upstreamed
- security patch upstreamed
- removeoledecod patch upstreamed
- regenerate desktop patch

* Mon Nov 22 2004 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-2
- #abi7961# remove tempnam usages

* Mon Nov 22 2004 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-1
- bump to latest major stable version
- #rh140321# sanity check geometry

* Tue Nov  9 2004 Caolan McNamara <caolanm at redhat.com> - 1:2.0.14-1
- bump to latest stable version

* Mon Nov  8 2004 Jeremy Katz <katzj at redhat.com> - 1:2.0.12-4
- rebuild for python 2.4

* Thu Sep 30 2004 Christopher Aillon <caillon at redhat.com> 1:2.0.12-3
- Change to PreReq instead of Requires(post), up to 0.9

* Thu Sep 29 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.12-2
- Better Requires desktop-file-utils

* Wed Sep 29 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.12-1
- update to new abiword, + change norwegian wordprocessor translation

* Tue Sep 14 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.11-3
- #132389# Add more abiword supported mime types to abiword.desktop

* Mon Sep 6 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.11-2
- merge abiword.keys into abiword.desktop

* Fri Aug 27 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.11-1
- 2.0.11

* Tue Aug 10 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.10-2
- use libgnomedb

* Tue Aug 10 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.10-1
- 2.0.10
- use aiksaurus

* Tue Aug 2 2004 Matthias Clasen <mclasen at redhat.com> 1:2.0.9-4
- rebuilt

* Thu Jul 29 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.9-3
- #126012# some desktop translations

* Wed Jul 28 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.9-2
- #128004# fix irritating windows looking filenames for generated pngs

* Fri Jul 16 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.9-1
- 2.0.9, new version with security fix

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 20 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.6-1
- 2.0.7, new version + gcc34 fixes

* Wed Apr 28 2004 Caolan McNamara <caolanm at redhat.com> 1:2.0.6-1
- 2.0.6, 64bit changes made upstream

* Sat Mar 13 2004 Jeremy Katz <> 1:2.0.5-1
- 2.0.5

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Feb 19 2004 Jeremy Katz <katzj at redhat.com> - 1:2.0.3-3
- rebuild for newer libots and libwpd
- fix verify as non-root (#109261)
- add wpd files to abiword.keys (#114907)

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Jan 29 2004 Jeremy Katz <katzj at redhat.com> - 1:2.0.3-1
- 2.0.3 (fixes build against gtk+ 2.3 and lets us rebuild to fix libcroco dep)

* Wed Dec 17 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.2-2
- rebuild for new libwpd

* Sun Nov 30 2003 Jeremy Katz <katzj at redhat.com> 
- and librsvg2-devel (#111222)

* Fri Nov 28 2003 Jeremy Katz <katzj at redhat.com> 
- buildrequire libgnomeui-devel (#111164)

* Tue Oct 28 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.1-1
- 2.0.1
- really remove duplicate desktop file

* Tue Oct 21 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.0-6
- make the docs with the just built abiword so that we don't have to 
  have abiword installed to build the docs (#107279)

* Tue Oct 21 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.0-5
- fix linkage to glib 1.2 in hancom plugin (#106033)

* Sun Oct 19 2003 Florian La Roche <Florian.LaRoche at redhat.de>
- add %%clean specfile target

* Tue Oct 14 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.0-4
- remove duplicate desktop file (#107023)

* Tue Sep 23 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.0-3
- include the help
- show the clipart (#104577)

* Mon Sep 15 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.0-2
- rebuild with newer libwpd and libots to get those plugins

* Sun Sep 14 2003 Jeremy Katz <katzj at redhat.com> 1:2.0.0-1
- 2.0.0

* Thu Sep  4 2003 Jeremy Katz <katzj at redhat.com> 1:1.99.6-1
- 1.99.6

* Mon Aug 25 2003 Jeremy Katz <katzj at redhat.com> 1:1.99.5-1
- 1.99.5

* Tue Aug  5 2003 Jeremy Katz <katzj at redhat.com> 1:1.99.3-1
- 1.99.3
- put icon in the right place (#101646)
- fix some 64bit casting issues
- disable ots plugin for now, doesn't seem to build with ots 0.4.0 :/
- disable -pedantic -ansi so that it will build

* Mon Jul 14 2003 Jeremy Katz <katzj at redhat.com> 1:1.99.2-2
- ugly hack to deal with libtool silliness on x86_64

* Fri Jul 11 2003 Jeremy Katz <katzj at redhat.com> 1:1.99.2-1
- 1.99.2
- add buildrequires to make sure the ots and wp plugins get built
- no longer needs libgal2, remove buildrequires

* Mon Jun 16 2003 Jeremy Katz <katzj at redhat.com> 1:1.99.1-1
- 1.99.1

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon May 26 2003 Jeremy Katz <katzj at redhat.com> 1:1.9.1-3
- rebuild for new libgal2

* Mon May 19 2003 Jeremy Katz <katzj at redhat.com> 1:1.9.1-2
- tweak plugins build

* Mon May 12 2003 Jeremy Katz <katzj at redhat.com> 1:1.9.1-0.2
- 1.9.1
- drop old patches, switch to using autoconf based build system instead 
  of diving makefiles
- build with gnome support
- build with plugins
- add patch to build on AMD64

* Mon Apr 28 2003 Tim Powers <timp at redhat.com> 1:1.0.5-2
- rebuild to fix broken libpspell dep

* Mon Mar 24 2003 Jeremy Katz <katzj at redhat.com> 1:1.0.5-1
- 1.0.5

* Mon Feb 10 2003 Jeremy Katz <katzj at redhat.com> 1:1.0.4-2
- fix for abiword starting off the screen (#82425)

* Thu Jan 23 2003 Jeremy Katz <katzj at redhat.com> 1:1.0.4-1
- 1.0.4

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Sun Dec 29 2002 Jeremy Katz <katzj at redhat.com> 1:1.0.3-2
- make it build on x86_64

* Sun Dec 29 2002 Jeremy Katz <katzj at redhat.com> 1:1.0.3-1
- 1.0.3 (#80560)
- set umask before running mkfontdir in %%post
- patch AbiWord script to convert utf8 locales into non-utf8 variants (#72633)

* Mon Dec 02 2002 Elliot Lee <sopwith at redhat.com> 1.0.2-7
- Fix doc lines
- Fix multilib

* Sat Aug 10 2002 Elliot Lee <sopwith at redhat.com> 1.0.2-6
- rebuilt with gcc-3.2 (we hope)

* Sat Aug 10 2002 Jeremy Katz <katzj at redhat.com> 1.0.2-5
- fix help index symlink (#71219)

* Thu Aug  1 2002 Jeremy Katz <katzj at redhat.com> 1.0.2-4
- add abiword binary symlink for upstream compatibility (#70267)

* Mon Jul 22 2002 Tim Powers <timp at redhat.com> 1.0.2-3
- rebuild using gcc-3.2-0.1

* Thu Jul 18 2002 Jeremy Katz <katzj at redhat.com> 1.0.2-2
- use included desktop file (#64447)
- use desktop-file-install

* Wed Jun 26 2002 Jeremy Katz <katzj at redhat.com> 1.0.2-1
- 1.0.2
- disable perl module build since we weren't including it anyway

* Wed May 29 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.0.1-1
- 1.0.1

* Sun Apr 14 2002 Jeremy Katz <katzj at redhat.com> 0.99.5-1
- zh_CN and zh_TW fonts.dir were flipped
- update to 0.99.5 as it fixes some major bugs
- define ABI_BUILD_VERSION so the about screen gives us a version

* Mon Apr  8 2002 Bennhard Rosenkraenzer <bero at redhat.com> 0.99.4-2
- 1st try at fixing up CJK (#61590)
- #if 0'ify font warning dialog (#62909, #64556)

* Tue Apr  2 2002 Bernhard Rosenkraenzer <bero at redhat.com> 0.99.4-1
- Update to 0.99.4, fixes #61153
- Fix #61344
- Nuke the warning about being unable to add anything to font path,
  that's not how xfs works.

* Thu Feb 28 2002 Bernhard Rosenkraenzer <bero at redhat.com> 0.99.2-1
- 0.99.2
- remove blank lines in fonts.dir

* Thu Jan 31 2002 Bernhard Rosenkraenzer <bero at redhat.com> 0.99.1-1
- 0.99.1

* Wed Jan 30 2002 Alex Larsson <alexl at redhat.com> 0.9.5-3
- Added patch to use libpng10
- Added patch to fix perl build problems.

* Fri Nov 23 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.9.5-1
- 0.9.5

* Tue Oct 23 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.9.4.1-1
- Update to 0.9.4.1 (RFE #54806)
- Add URL (RFE #54590)

* Thu Jul 19 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.7.14-7
- Fix uninstall (#49350)

* Sat Jul  7 2001 Tim Powers <timp at redhat.com>
- rebuilt so that dirs aren't sgid root

* Tue Jun 26 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.7.14-5
- Add build requirements (#45157)

* Tue Jun 26 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.7.14-4
- Remove CVS admin files from documentation (#44916)

* Mon Jun 18 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- add s390x patch from <oliver.paukstadt at millenux.com>

* Sat Jun 09 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- add s390 patch from Helge Deller

* Tue May 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.7.14-1
- Update to 0.7.14

* Tue Feb 27 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- Handle MIME type stuff (Bug #27530)
- Add BuildPrereqs for some of the less common stuff AbiWord uses
  (gal-devel, gnome-print-devel, libunicode-devel)

* Tue Feb 20 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.7.13

* Mon Jan 15 2001 Than Ngo <than at redhat.com>
- fixed broken code for building

* Fri Dec 29 2000 Matt Wilson <msw at redhat.com>
- 0.7.12
- copy fonts.dir to fonts.scale so mkfontdir doesn't blow it away

* Tue Dec 12 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Rebuild to get rid of 0777 dirs

* Fri Nov 17 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.7.11

* Sun Aug 20 2000 Preston Brown <pbrown at redhat.com>
- fix path to chkfontpath, it was wrong.

* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
- Up Epoch and release

* Mon Aug  7 2000 Jakub Jelinek <jakub at redhat.com>
- Don't ship AbiWord_s if we have AbiWord_d
- Register AbiWord's fontpath with xfs

* Wed Aug  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Rebuild with new libpng. This fixes Bug #13707 - gotta love it when they
  change the ABI without increasing the soname!
- fix tooltip (Bug #14711)
- move binaries from /usr/share to /usr/lib

* Wed Jul 12 2000 Jakub Jelinek <jakub at redhat.com>
- Fix build on ia64.

* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Tue Jul  4 2000 Jakub Jelinek <jakub at redhat.com>
- Rebuild with new gcc.

* Sat Jun 18 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Fix build on ia64

* Fri Jun 17 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.7.10
- update download location

* Fri Jun  9 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- initial build for main CD
- clean up specfile
- fix build with gcc 2.96 and glibc 2.2
- exclude ia64 for now

* Wed May  3 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.7.9

* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.7.8
- move the desktop file to /etc/X11/applnk so it can be used in both
  GNOME and KDE
- fix up handling of RPM_OPT_FLAGS

* Thu Jan 20 2000 Tim Powers <timp at redhat.com>
- bzipped source to conserve space.

* Sun Jan  9 2000 Matt Wilson <msw at redhat.com>
- enable GNOME, remove perl hack to do RPM_OPT_FLAGS
- added libpng requirement.  0.7.7 requires 1.0.5 libpng ABI

* Tue Jan  4 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.7.7
- handle RPM_OPT_FLAGS

* Mon Nov 15 1999 Tim Powers <timp at redhat.com>
- first build for inclusion into Powertools.
- some things in this spec file are from the abisuite-0.7.5-1mdk package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Mar 2005 22:38:49 -0000	1.1
+++ .cvsignore	14 Mar 2005 22:39:45 -0000	1.2
@@ -0,0 +1 @@
+abiword-2.2.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Mar 2005 22:38:49 -0000	1.1
+++ sources	14 Mar 2005 22:39:45 -0000	1.2
@@ -0,0 +1 @@
+265a6ece8fcfd37cb7c3fc4d13056ad2  abiword-2.2.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 14 23:02:49 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 14 Mar 2005 18:02:49 -0500
Subject: rpms/abiword/devel abiword-2.2.5-wvread.patch, 1.1, 1.2 abiword.spec,
	1.1, 1.2
Message-ID: <200503142302.j2EN2nKj009844@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9829

Modified Files:
	abiword-2.2.5-wvread.patch abiword.spec 
Log Message:
* Fri Mar 14 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.5-2
- Remove the --disable-magick plugin switch
- disable GDA support until the plugin is ported to gnomedb 1.2.x
- Change the download location from SF to http://www.abisource.com/
- patch libole2
- fix read as a macro in new glibc


abiword-2.2.5-wvread.patch:

Index: abiword-2.2.5-wvread.patch
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword-2.2.5-wvread.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- abiword-2.2.5-wvread.patch	14 Mar 2005 22:39:45 -0000	1.1
+++ abiword-2.2.5-wvread.patch	14 Mar 2005 23:02:47 -0000	1.2
@@ -1,11 +1,21 @@
 diff -u abiword-2.2.5.orig/wv/libole2/ms-ole.c abiword-2.2.5/wv/libole2/ms-ole.c
 --- abiword-2.2.5.orig/wv/libole2/ms-ole.c	2004-10-23 02:59:51.000000000 +0200
-+++ abiword-2.2.5/wv/libole2/ms-ole.c	2005-03-14 21:50:48.000000000 +0100
-@@ -36,6 +36,7 @@
- #include <assert.h>
- #include <ctype.h>
- #include <string.h>
-+#undef read
++++ abiword-2.2.5/wv/libole2/ms-ole.c	2005-03-14 23:36:08.130603903 +0100
+@@ -482,7 +482,7 @@
  
- #ifdef __MINGW32__ /* incomplete defines on mingw */
+ 	offset = (b+1)*BB_BLOCK_SIZE;
+ 	f->syswrap->lseek (f->file_des, offset, SEEK_SET, f->syswrap->closure);
+-	f->syswrap->read (f->file_des, attr->data, BB_BLOCK_SIZE, f->syswrap->closure);
++	(f->syswrap->read) (f->file_des, attr->data, BB_BLOCK_SIZE, f->syswrap->closure);
+ 	attr->usage = 1;
+ 	attr->dirty = forwrite;
  
+@@ -1791,7 +1791,7 @@
+ 		f->mem = g_new (guint8, BB_BLOCK_SIZE);
+ 
+ 		if (!f->mem ||
+-		    f->syswrap->read (file, f->mem, BB_BLOCK_SIZE,
++		    (f->syswrap->read) (file, f->mem, BB_BLOCK_SIZE,
+ 				      f->syswrap->closure) == -1) {
+ 			g_warning ("Error reading header\n");
+ 			f->syswrap->close (file, f->syswrap->closure) ;


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- abiword.spec	14 Mar 2005 22:39:45 -0000	1.1
+++ abiword.spec	14 Mar 2005 23:02:47 -0000	1.2
@@ -136,6 +136,7 @@
 - disable GDA support until the plugin is ported to gnomedb 1.2.x
 - Change the download location from SF to http://www.abisource.com/
 - patch libole2
+- fix read as a macro in new glibc
 
 * Fri Mar  2 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.2.5-1
 - bump to latest stable



From fedora-extras-commits at redhat.com  Tue Mar 15 05:48:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 15 Mar 2005 00:48:57 -0500
Subject: devel/bittorrent sources, 1.3, 1.4 .cvsignore, 1.3,
	1.4 bittorrent.spec, 1.7, 1.8
Message-ID: <200503150548.j2F5mvft022900@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/bittorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22894

Modified Files:
	sources .cvsignore bittorrent.spec 
Log Message:
Update by David Hill.


Index: sources
===================================================================
RCS file: /cvs/extras/devel/bittorrent/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:05:46 -0000	1.3
+++ sources	15 Mar 2005 05:48:55 -0000	1.4
@@ -1 +1 @@
-84d8cfedeba539db8b497d63e6ecceed  BitTorrent-3.4.1a.zip
+67f449df351b66f408b72b6bd196952f  BitTorrent-4.0.0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/bittorrent/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:05:46 -0000	1.3
+++ .cvsignore	15 Mar 2005 05:48:55 -0000	1.4
@@ -1 +1 @@
-BitTorrent-3.4.1a.zip
+BitTorrent-4.0.0.tar.gz


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/devel/bittorrent/bittorrent.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bittorrent.spec	3 Mar 2005 19:46:39 -0000	1.7
+++ bittorrent.spec	15 Mar 2005 05:48:55 -0000	1.8
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        3.4.1
-Release:        3.a
+Version:        4.0.0
+Release:        1
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
-License:        MIT
-URL:            http://bitconjurer.org/BitTorrent/
-Source0:        http://dl.sf.net/bittorrent/BitTorrent-3.4.1a.zip
+License:        BitTorrent Open Source License
+URL:            http://www.bittorrent.com/
+Source0:        http://www.bittorrent.com/dl/BitTorrent-4.0.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -27,7 +27,7 @@
 %package        gui
 Summary:        GUI versions of the BitTorrent file transfer tool
 Group:          Applications/Internet
-Requires:       wxPython
+Requires:       pygtk2
 Requires:       %{name} = %{version}-%{release}
 
 %description    gui
@@ -36,7 +36,8 @@
 
 
 %prep
-%setup -q -n BitTorrent-3.4.1a
+%setup -q -n BitTorrent-4.0.0
+sed -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py
 
 
 %build
@@ -56,13 +57,11 @@
 %files
 %defattr(-,root,root,-)
 %doc README.txt credits.txt LICENSE.txt
-%{_bindir}/btcompletedir.py
 %{_bindir}/btdownloadcurses.py
 %{_bindir}/btdownloadheadless.py
-%{_bindir}/btdownloadlibrary.py
 %{_bindir}/btlaunchmany.py
 %{_bindir}/btlaunchmanycurses.py
-%{_bindir}/btmakemetafile.py
+%{_bindir}/btmaketorrent.py
 %{_bindir}/btreannounce.py
 %{_bindir}/btrename.py
 %{_bindir}/btshowmetainfo.py
@@ -75,11 +74,15 @@
 
 %files gui
 %defattr(-,root,root)
-%{_bindir}/btcompletedirgui.py
 %{_bindir}/btdownloadgui.py
+%{_bindir}/btmaketorrentgui.py
+%{_datadir}/pixmaps/%{name}-%{version}
 
 
 %changelog
+* Mon Mar 14 2005 David Hill <djh[at]ii.net> - 4.0.0-1
+- update to 4.0.0, no longer requires wxPythonGTK
+
 * Wed Dec 22 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:3.4.1-3.a
 - x86_64: Fix python dependency, replace with python-abi dependency.
 



From fedora-extras-commits at redhat.com  Tue Mar 15 05:50:48 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 15 Mar 2005 00:50:48 -0500
Subject: devel/bittorrent bittorrent.desktop, NONE, 1.1 bittorrent.png, NONE,
	1.1 bittorrent.spec, 1.8, 1.9
Message-ID: <200503150550.j2F5om2w022937@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/bittorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22931

Modified Files:
	bittorrent.spec 
Added Files:
	bittorrent.desktop bittorrent.png 
Log Message:
- add desktop file, desktop menu icon, post/postun scriptlets



--- NEW FILE bittorrent.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=BitTorrent File Transfer
Comment=Distributed download of files from the Internet
Exec=btdownloadgui.py
Icon=bittorrent.png
Terminal=false
Type=Application
StartupNotify=false
Categories=Application;Network;
MimeType=application/x-bittorrent;


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/devel/bittorrent/bittorrent.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bittorrent.spec	15 Mar 2005 05:48:55 -0000	1.8
+++ bittorrent.spec	15 Mar 2005 05:50:46 -0000	1.9
@@ -1,17 +1,21 @@
+%define desktopvendor fedora
+
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
 Version:        4.0.0
-Release:        1
+Release:        2
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
 License:        BitTorrent Open Source License
 URL:            http://www.bittorrent.com/
-Source0:        http://www.bittorrent.com/dl/BitTorrent-4.0.0.tar.gz
+Source0:        http://www.bittorrent.com/dl/BitTorrent-%{version}.tar.gz
+Source1:        bittorrent.desktop
+Source2:        bittorrent.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel
+BuildRequires:  python-devel desktop-file-utils
 Requires:       python
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
@@ -36,7 +40,7 @@
 
 
 %prep
-%setup -q -n BitTorrent-4.0.0
+%setup -q -n BitTorrent-%{version}
 sed -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py
 
 
@@ -49,11 +53,25 @@
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 sed -i -e 's/env python2/env python/' $RPM_BUILD_ROOT%{_bindir}/*
 
+desktop-file-install --vendor %{desktopvendor} \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	--add-category X-Fedora \
+	%{SOURCE1}
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bittorrent.png
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post gui
+update-desktop-database %{_datadir}/applications &>/dev/null || :
+
+
+%postun gui
+update-desktop-database %{_datadir}/applications &>/dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc README.txt credits.txt LICENSE.txt
@@ -76,10 +94,15 @@
 %defattr(-,root,root)
 %{_bindir}/btdownloadgui.py
 %{_bindir}/btmaketorrentgui.py
+%{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
 %{_datadir}/pixmaps/%{name}-%{version}
+%{_datadir}/pixmaps/bittorrent.png
 
 
 %changelog
+* Tue Mar 15 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 4.0.0-2
+- add desktop file, desktop menu icon, post/postun scriptlets
+
 * Mon Mar 14 2005 David Hill <djh[at]ii.net> - 4.0.0-1
 - update to 4.0.0, no longer requires wxPythonGTK
 



From fedora-extras-commits at redhat.com  Tue Mar 15 08:12:08 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:12:08 -0500
Subject: rpms/libgda - New directory
Message-ID: <200503150812.j2F8C8uI029184@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/libgda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29177/libgda

Log Message:
Directory /cvs/extras/rpms/libgda added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 08:12:08 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:12:08 -0500
Subject: rpms/libgda/devel - New directory
Message-ID: <200503150812.j2F8C8G5029187@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/libgda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29177/libgda/devel

Log Message:
Directory /cvs/extras/rpms/libgda/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 08:12:25 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:12:25 -0500
Subject: rpms/libgda Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503150812.j2F8CPg0029248@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/libgda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29239

Added Files:
	Makefile import.log 
Log Message:
Setup of module libgda


--- NEW FILE Makefile ---
# Top level Makefile for module libgda
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 15 08:12:25 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:12:25 -0500
Subject: rpms/libgda/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503150812.j2F8CPZS029251@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/libgda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29239/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libgda


--- 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 Mar 15 08:13:06 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:13:06 -0500
Subject: rpms/libgda import.log,1.1,1.2
Message-ID: <200503150813.j2F8D642029378@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/libgda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29369

Modified Files:
	import.log 
Log Message:
auto-import libgda-1.2.0-5 on branch devel from libgda-1.2.0-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libgda/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 08:12:23 -0000	1.1
+++ import.log	15 Mar 2005 08:13:04 -0000	1.2
@@ -0,0 +1 @@
+libgda-1_2_0-5:HEAD:libgda-1.2.0-5.src.rpm:1110874378



From fedora-extras-commits at redhat.com  Tue Mar 15 08:13:06 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:13:06 -0500
Subject: rpms/libgda/devel libgda-1.2.0-64bitgnomeXXXXXX.patch, NONE,
	1.1 libgda-1.2.0-configure.patch, NONE,
	1.1 libgda-1.2.0-gnome162569.patch, NONE,
	1.1 libgda-1.2.0-gnomeXXXXXX.patch, NONE, 1.1 libgda.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503150813.j2F8D6HU029384@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/libgda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29369/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libgda-1.2.0-64bitgnomeXXXXXX.patch 
	libgda-1.2.0-configure.patch libgda-1.2.0-gnome162569.patch 
	libgda-1.2.0-gnomeXXXXXX.patch libgda.spec 
Log Message:
auto-import libgda-1.2.0-5 on branch devel from libgda-1.2.0-5.src.rpm

libgda-1.2.0-64bitgnomeXXXXXX.patch:

--- NEW FILE libgda-1.2.0-64bitgnomeXXXXXX.patch ---
--- libgda-1.2.0/configure.in.orig	2005-02-04 14:55:37.264111391 +0000
+++ libgda-1.2.0/configure.in	2005-02-04 14:57:40.495430489 +0000
@@ -157,25 +157,31 @@
 bdbdir=""
 if test $try_bdb = true
 then
-	AC_MSG_CHECKING(for Berkeley DB files)
-	for d in $dir /usr /usr/local
-	do
-		if test -f $d/$lib/libdb.so -a -f $d/include/db.h
+	AC_CHECK_HEADER(db.h, bdb_ok=yes, bdb_ok=no, [])
+	if test $bdb_ok = yes ; then
+		bdbdir=yes
+		BDB_LIBS="-ldb"
+	else
+		AC_MSG_CHECKING(for Berkeley DB files)
+		for d in $dir /usr /usr/local
+		do
+			if test -f $d/$lib/libdb.so -a -f $d/include/db.h
+			then
+				AC_MSG_RESULT(found Berkeley DB in $d)
+				bdblib="-ldb"
+				bdbdir=$d
+				break
+			fi
+			dnl FIXME: check for db1 (non-sleepycat implementation)
+		done
+		if test x$bdbdir = x
 		then
-			AC_MSG_RESULT(found Berkeley DB in $d)
-			bdblib="-ldb"
-			bdbdir=$d
-			break
+			AC_MSG_WARN(Berkeley DB backend not used)
+		else
+			AC_DEFINE(HAVE_BDB, 1, [Have Berkeley DB])
+			BDB_CFLAGS="-I${bdbdir}/include"
+			BDB_LIBS="-L${bdbdir}/lib ${bdblib}"
 		fi
-		dnl FIXME: check for db1 (non-sleepycat implementation)
-	done
-	if test x$bdbdir = x
-	then
-		AC_MSG_WARN(Berkeley DB backend not used)
-	else
-		AC_DEFINE(HAVE_BDB, 1, [Have Berkeley DB])
-		BDB_CFLAGS="-I${bdbdir}/include"
-		BDB_LIBS="-L${bdbdir}/lib ${bdblib}"
 	fi
 fi
 

libgda-1.2.0-configure.patch:

--- NEW FILE libgda-1.2.0-configure.patch ---
--- libgda-1.2.0/configure.in.orig	2005-02-04 09:54:32.000000000 +0000
+++ libgda-1.2.0/configure.in	2005-02-04 09:59:32.030377459 +0000
@@ -251,7 +251,7 @@
 mysqldir=""
 if test $try_mysql = true
 then
-	AC_PATH_PROG(MYSQL_CONFIG, mysql_config)
+	AC_PATH_PROG(MYSQL_CONFIG, mysql_config, 'no', [${libdir}/mysql3/mysql:$PATH])
 
 	if test x$MYSQL_CONFIG = xno; then
 		AC_MSG_CHECKING(for MySQL files)

libgda-1.2.0-gnome162569.patch:

--- NEW FILE libgda-1.2.0-gnome162569.patch ---
--- libgda-1.2.0/providers/bdb/gda-bdb-recordset.c.orig	2005-02-04 12:38:17.332297982 +0000
+++ libgda-1.2.0/providers/bdb/gda-bdb-recordset.c	2005-02-04 12:39:29.939219610 +0000
@@ -227,6 +227,9 @@
 
 	/* get the number of records in the database */
 	ret = dbp->stat (dbp,
+#if BDB_VERSION > 40300
+			 NULL,
+#endif
 			 &statp,
 #if BDB_VERSION < 40000
 			 NULL,

libgda-1.2.0-gnomeXXXXXX.patch:

--- NEW FILE libgda-1.2.0-gnomeXXXXXX.patch ---
diff -ru libgda-1.2.0.orig/providers/bdb/Makefile.am libgda-1.2.0/providers/bdb/Makefile.am
--- libgda-1.2.0.orig/providers/bdb/Makefile.am	2005-02-04 14:04:28.990148676 +0000
+++ libgda-1.2.0/providers/bdb/Makefile.am	2005-02-04 14:06:25.117365278 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-bdb.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/firebird/Makefile.am libgda-1.2.0/providers/firebird/Makefile.am
--- libgda-1.2.0.orig/providers/firebird/Makefile.am	2005-02-04 14:04:23.061056775 +0000
+++ libgda-1.2.0/providers/firebird/Makefile.am	2005-02-04 14:06:32.416247710 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-firebird.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/freetds/Makefile.am libgda-1.2.0/providers/freetds/Makefile.am
--- libgda-1.2.0.orig/providers/freetds/Makefile.am	2005-02-04 14:04:22.368162899 +0000
+++ libgda-1.2.0/providers/freetds/Makefile.am	2005-02-04 14:06:36.861567075 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-freetds.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/ibmdb2/Makefile.am libgda-1.2.0/providers/ibmdb2/Makefile.am
--- libgda-1.2.0.orig/providers/ibmdb2/Makefile.am	2005-02-04 14:04:30.323944395 +0000
+++ libgda-1.2.0/providers/ibmdb2/Makefile.am	2005-02-04 14:06:42.224745913 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-ibmdb2.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/ldap/Makefile.am libgda-1.2.0/providers/ldap/Makefile.am
--- libgda-1.2.0.orig/providers/ldap/Makefile.am	2005-02-04 14:04:31.462769975 +0000
+++ libgda-1.2.0/providers/ldap/Makefile.am	2005-02-04 14:06:46.713058713 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-ldap.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/mdb/Makefile.am libgda-1.2.0/providers/mdb/Makefile.am
--- libgda-1.2.0.orig/providers/mdb/Makefile.am	2005-02-04 14:04:24.488838095 +0000
+++ libgda-1.2.0/providers/mdb/Makefile.am	2005-02-04 14:06:50.902417292 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-mdb.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/msql/Makefile.am libgda-1.2.0/providers/msql/Makefile.am
--- libgda-1.2.0.orig/providers/msql/Makefile.am	2005-02-04 14:04:31.593749914 +0000
+++ libgda-1.2.0/providers/msql/Makefile.am	2005-02-04 14:06:59.626081654 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-msql.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/mysql/Makefile.am libgda-1.2.0/providers/mysql/Makefile.am
--- libgda-1.2.0.orig/providers/mysql/Makefile.am	2005-02-04 14:04:25.430693840 +0000
+++ libgda-1.2.0/providers/mysql/Makefile.am	2005-02-04 14:07:03.699458009 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-mysql.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/odbc/Makefile.am libgda-1.2.0/providers/odbc/Makefile.am
--- libgda-1.2.0.orig/providers/odbc/Makefile.am	2005-02-04 14:04:30.094979462 +0000
+++ libgda-1.2.0/providers/odbc/Makefile.am	2005-02-04 14:07:07.067942289 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-odbc.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/oracle/Makefile.am libgda-1.2.0/providers/oracle/Makefile.am
--- libgda-1.2.0.orig/providers/oracle/Makefile.am	2005-02-04 14:04:22.745105166 +0000
+++ libgda-1.2.0/providers/oracle/Makefile.am	2005-02-04 14:07:11.378282375 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-oracle.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/postgres/Makefile.am libgda-1.2.0/providers/postgres/Makefile.am
--- libgda-1.2.0.orig/providers/postgres/Makefile.am	2005-02-04 14:04:31.058831841 +0000
+++ libgda-1.2.0/providers/postgres/Makefile.am	2005-02-04 14:07:15.095713241 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-postgres.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/sqlite/Makefile.am libgda-1.2.0/providers/sqlite/Makefile.am
--- libgda-1.2.0.orig/providers/sqlite/Makefile.am	2005-02-04 14:04:29.397086350 +0000
+++ libgda-1.2.0/providers/sqlite/Makefile.am	2005-02-04 14:07:20.493886796 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-sqlite.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/sybase/Makefile.am libgda-1.2.0/providers/sybase/Makefile.am
--- libgda-1.2.0.orig/providers/sybase/Makefile.am	2005-02-04 14:04:29.291102583 +0000
+++ libgda-1.2.0/providers/sybase/Makefile.am	2005-02-04 14:07:24.356295478 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-sybase.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/xbase/Makefile.am libgda-1.2.0/providers/xbase/Makefile.am
--- libgda-1.2.0.orig/providers/xbase/Makefile.am	2005-02-04 14:04:25.803636720 +0000
+++ libgda-1.2.0/providers/xbase/Makefile.am	2005-02-04 14:07:27.598799070 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-xbase.la
 
 AM_CPPFLAGS = \
diff -ru libgda-1.2.0.orig/providers/xml/Makefile.am libgda-1.2.0/providers/xml/Makefile.am
--- libgda-1.2.0.orig/providers/xml/Makefile.am	2005-02-04 14:04:24.039906854 +0000
+++ libgda-1.2.0/providers/xml/Makefile.am	2005-02-04 14:07:35.898528447 +0000
@@ -1,4 +1,4 @@
-providerdir=$(prefix)/lib/libgda/providers
+providerdir=$(libdir)/libgda/providers
 provider_LTLIBRARIES = libgda-xml.la
 
 AM_CPPFLAGS = \


--- NEW FILE libgda.spec ---
# Default provider build options (MySQL, Postgres & unixODBC)
#
# Package build options:
# --with tds
# --with db2
# --with oracle
# --with sqlite
# --with sybase
# --with mdb
# --with ldap
# --without mysql
# --without odbc
# --without postgres
# 

%define           FREETDS  0
%define           IBMDB2   0
%define           MYSQL    1
%define           ODBC     1
%define           ORACLE   0
%define           POSTGRES 1
%define           SQLITE   0
%define           SYBASE   0
%define 	  MDB	   0
%define		  LDAP	   0

%{?_with_tds:%define FREETDS 	1}
%{?_with_db2:%define IBMDB2 	1}
%{?_with_ldap:%define LDAP 	1}
%{?_with_mdb:%define MDB 	1}
%{?_with_oracle:%define ORACLE 	1}
%{?_with_sqlite:%define SQLITE 	1}
%{?_with_sybase:%define SYBASE 	1}
%{?_without_mysql:%define MYSQL 0}
%{?_without_odbc:%define ODBC 	0}
%{?_without_postgres:%define POSTGRES 	0}

Summary:          Library for writing gnome database programs
Name:             libgda
Version:          1.2.0
Release: 	  5
Epoch:		  1
Source:           %{name}-%{version}.tar.bz2
URL:              http://www.gnome-db.org/
Group:            System Environment/Libraries
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

%if %{FREETDS}
BuildRequires:    freetds-devel
%endif

%if %{MYSQL}
BuildRequires:    mysqlclient10-devel
%endif

%if %{POSTGRES}
BuildRequires:    postgresql-devel
%endif

%if %{ODBC}
BuildRequires:    unixODBC-devel
%endif

%if %{SQLITE}
BuildRequires:	  sqlite-devel
%endif

%if %{MDB}
BuildRequires:	  mdbtools-devel
%endif

%if %{LDAP}
BuildRequires:	  openldap-devel
%endif

Patch0: libgda-1.2.0-configure.patch
Patch1: libgda-1.2.0-gnome162569.patch
Patch2: libgda-1.2.0-gnomeXXXXXX.patch
Patch3: libgda-1.2.0-64bitgnomeXXXXXX.patch

%description
libgda is a library that eases the task of writing
gnome database programs.


%package devel
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:	  %{name} = %{epoch}:%{version}-%{release}

%description devel
This package contains the header files and libraries needed to write
or compile programs that use libgda.

%if %{FREETDS}
%package -n gda-freetds
Summary:	GDA FreeTDS Provider
Group:		System Environment/Libraries
%description -n gda-freetds
This package includes the GDA FreeTDS provider.
%endif

%if %{IBMDB2}
%package -n gda-ibmdb2
Summary:	GDA IBM DB2 Provider
Group:		System Environment/Libraries
%description -n gda-ibmdb2
This package includes the GDA IBM DB2 provider.
%endif

%if %{MYSQL}
%package -n gda-mysql
Summary:	GDA MySQL Provider
Group:		System Environment/Libraries
%description -n gda-mysql
This package includes the GDA MySQL provider.
%endif

%if %{ODBC}
%package -n gda-odbc
Summary:	GDA ODBC Provider
Group:		System Environment/Libraries
%description -n gda-odbc
This package includes the GDA ODBC provider.
%endif

%if %{ORACLE}
%package -n gda-oracle
Summary:	GDA Oracle Provider
Group:		System Environment/Libraries
%description -n gda-oracle
This package includes the GDA Oracle provider.
%endif

%if %{POSTGRES}
%package -n gda-postgres
Summary:	GDA PostgreSQL Provider
Group:		System Environment/Libraries
%description -n gda-postgres
This package includes the GDA PostgreSQL provider.
%endif

%if %{SQLITE}
%package -n gda-sqlite
Summary:	GDA SQLite Provider
Group:		System Environment/Libraries
%description -n gda-sqlite
This package includes the GDA SQLite provider.
%endif

%if %{SYBASE}
%package -n gda-sybase
Summary:	GDA Sybase Provider
Group:		System Environment/Libraries
%description -n gda-sybase
This package includes the GDA Sybase provider.
%endif

%if %{MDB}
%package -n gda-mdb
Summary:	GDA MDB Provider
Group:		System Environment/Libraries
%description -n gda-mdb
This package includes the GDA MDB provider.
%endif

%if %{LDAP}
%package -n gda-ldap
Summary:	GDA LDAP Provider
Group:		System Environment/Libraries
%description -n gda-ldap
This package includes the GDA LDAP provider.
%endif

%prep
%setup -q
%patch0 -p1 -b .configure
%patch1 -p1 -b .gnome162569
%patch2 -p1 -b .gnomeXXXXXX
%patch3 -p1 -b .64bitgnomeXXXXXX.patch

%build
aclocal
automake
autoconf
%if %{FREETDS}
CONFIG="$CONFIG --with-tds"
%else
CONFIG="$CONFIG --without-tds"
%endif

%if %{IBMDB2}
CONFIG="$CONFIG --with-ibmdb2"
%else
CONFIG="$CONFIG --without-ibmdb2"
%endif

%if %{MYSQL}
CONFIG="$CONFIG --with-mysql"
%else
CONFIG="$CONFIG --without-mysql"
%endif

%if %{POSTGRES}
CONFIG="$CONFIG --with-postgres"
%else
CONFIG="$CONFIG --without-postgres"
%endif

%if %{ODBC}
CONFIG="$CONFIG --with-odbc"
%else
CONFIG="$CONFIG --without-odbc"
%endif

%if %{ORACLE}
CONFIG="$CONFIG --with-oracle"
%else
CONFIG="$CONFIG --without-oracle"
%endif

%if %{SQLITE}
CONFIG="$CONFIG --with-sqlite"
%else
CONFIG="$CONFIG --without-sqlite"
%endif

%if %{SYBASE}
CONFIG="$CONFIG --with-sybase"
%else
CONFIG="$CONFIG --without-sybase"
%endif

%if %{MDB}
CONFIG="$CONFIG --with-mdb"
%else
CONFIG="$CONFIG --without-mdb"
%endif

%if %{LDAP}
CONFIG="$CONFIG --with-ldap"
%else
CONFIG="$CONFIG --without-ldap"
%endif

%configure $CONFIG --disable-gtk-doc
make

%install
rm -rf %{buildroot}
%makeinstall

# Cleanup unnecessary, unpackaged files
rm -f %{buildroot}/%{_libdir}/libgda/providers/*.{a,la}

%find_lang libgda-2

%post -p /sbin/ldconfig

%post devel
if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi

%postun -p /sbin/ldconfig

%postun devel
if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi

%clean
rm -rf %{buildroot}

%files -f libgda-2.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README NEWS
#%doc %{_datadir}/gnome/help/libgda
%dir %{_sysconfdir}/libgda
%config(noreplace) %{_sysconfdir}/libgda/config
%{_bindir}/*
%{_datadir}/libgda
%{_libdir}/*.so.*
%dir %{_libdir}/libgda
%dir %{_libdir}/libgda/providers
%{_libdir}/libgda/providers/libgda-xml.so
%{_libdir}/libgda/providers/libgda-bdb.so
%{_mandir}/man1/*
%{_mandir}/man5/*

%files devel
%defattr(-,root,root)
%doc %{_datadir}/gtk-doc/html/libgda
%{_datadir}/omf/*
%{_includedir}/*
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%if %{FREETDS}
%files -n gda-freetds
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-freetds.so
%endif

%if %{IBMDB2}
%files -n gda-ibmdb2
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-ibmdb2.so
%endif

%if %{MYSQL}
%files -n gda-mysql
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-mysql.so
%endif

%if %{ODBC}
%files -n gda-odbc
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-odbc.so
%endif

%if %{ORACLE}
%files -n gda-oracle
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-oracle.so
%endif

%if %{POSTGRES}
%files -n gda-postgres
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-postgres.so
%endif

%if %{SQLITE}
%files -n gda-sqlite
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-sqlite.so
%endif

%if %{SYBASE}
%files -n gda-sybase
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-sybase.so
%endif

%if %{MDB}
%files -n gda-mdb
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-mdb.so
%endif

%if %{LDAP}
%files -n gda-ldap
%defattr(-,root,root)
%{_libdir}/libgda/providers/libgda-ldap.so
%endif


%changelog
* Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1:1.2.0-5
- rebuild with gcc4

* Fri Feb 11 2005 Caolan McNamara <caolanm at redhat.com> 1:1.2.0-4
- well, that was moronic

* Wed Feb 10 2005 Caolan McNamara <caolanm at redhat.com> 1:1.2.0-3
- bandaid

* Wed Feb  9 2005 Jeremy Katz <katzj at redhat.com> - 1:1.2.0-2
- rebuild to try to fix broken dep

* Fri Feb 4 2005 Caolan McNamara <caolanm at redhat.com> 1:1.2.0-1
- bump to latest version
- drop integrated break warning patch
- update configure patch

* Wed Jan 12 2005 Tim Waugh <twaugh at redhat.com> 1:1.0.4-5
- Rebuilt for new readline.

* Sat Oct 30 2004 Caolan McNamara <caolanm at redhat.com> 1:1.0.4-4
- Use mysqlclient10

* Fri Oct  8 2004 Caolan McNamara <caolanm at redhat.com> 1:1.0.4-3
- #rh135043# Extra BuildRequires

* Thu Sep  9 2004 Bill Nottingham <notting at redhat.com> 1:1.0.4-2
- %%defattr

* Thu Aug 12 2004 Caolan McNamara <caolanm at redhat.com> 1:1.0.4-1
- Initial Red Hat import
- patch for missing break statement
- fixup devel package requirement pickiness
- autoconf patch to pick up correct mysql path from mysql_config (e.g. x64)
- autoconf patch to just look in the normal place for postgres first

* Tue Mar 11 2003 David Hollis <dhollis at davehollis.com>
- Fix --with-tds & --without-tds to match what configure wants

* Tue Jan 28 2003 Yanko Kaneti <yaneti at declera.com>
- Remove the idl path
- Include gda-config man page
- add --without-* for disabled providers
- package and use the omf/scrollkeeper bits

* Tue Dec 31 2002 David Hollis <dhollis at davehollis.com>
- Added sqlite-devel buildreq
- Include gda-config-tool man page

* Mon Aug 19 2002 Ben Liblit <liblit at acm.org>
- Fixed version number substitutions

- Removed some explicit "Requires:" prerequisites that RPM will figure
  out on its own.  Removed explicit dependency on older MySQL client
  libraries

- Required that the ODBC development package be installed if we are
  building the ODBC provider

- Created distinct subpackages for each provider, conditional on that
  provider actually being enabled; some of these will need to be
  updated as the family of available providers changes

- Updated files list to match what "make install" actually installs

- Added URL tag pointing to GNOME-DB project's web site

* Tue Feb 26 2002 Chris Chabot <chabotc at reviewboard.com>
- Added defines and configure flags for all supported DB types

* Mon Feb 25 2002 Chris Chabot <chabotc at reviewboard.com>
- Cleaned up formatting
- Added Requirements
- Added defines for postgres, mysql, odbc support

* Thu Feb 21 2002 Chris Chabot <chabotc at reviewboard.com>
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 08:12:23 -0000	1.1
+++ .cvsignore	15 Mar 2005 08:13:04 -0000	1.2
@@ -0,0 +1 @@
+libgda-1.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 08:12:23 -0000	1.1
+++ sources	15 Mar 2005 08:13:04 -0000	1.2
@@ -0,0 +1 @@
+c18ac2dc6484c58cc9f72387abb9a10c  libgda-1.2.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar 15 08:13:49 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:13:49 -0500
Subject: rpms/libgnomedb - New directory
Message-ID: <200503150813.j2F8Dn0b029513@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/libgnomedb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29506/libgnomedb

Log Message:
Directory /cvs/extras/rpms/libgnomedb added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 08:13:49 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:13:49 -0500
Subject: rpms/libgnomedb/devel - New directory
Message-ID: <200503150813.j2F8DnXP029516@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/libgnomedb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29506/libgnomedb/devel

Log Message:
Directory /cvs/extras/rpms/libgnomedb/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 08:14:06 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:14:06 -0500
Subject: rpms/libgnomedb Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503150814.j2F8E6D2029577@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/libgnomedb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29568

Added Files:
	Makefile import.log 
Log Message:
Setup of module libgnomedb


--- NEW FILE Makefile ---
# Top level Makefile for module libgnomedb
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 15 08:14:06 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:14:06 -0500
Subject: rpms/libgnomedb/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503150814.j2F8E68C029580@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/libgnomedb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29568/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libgnomedb


--- 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 Mar 15 08:14:37 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:14:37 -0500
Subject: rpms/libgnomedb import.log,1.1,1.2
Message-ID: <200503150814.j2F8Ebe5029689@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/libgnomedb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29680

Modified Files:
	import.log 
Log Message:
auto-import libgnomedb-1.2.0-3 on branch devel from libgnomedb-1.2.0-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 08:14:04 -0000	1.1
+++ import.log	15 Mar 2005 08:14:35 -0000	1.2
@@ -0,0 +1 @@
+libgnomedb-1_2_0-3:HEAD:libgnomedb-1.2.0-3.src.rpm:1110874469



From fedora-extras-commits at redhat.com  Tue Mar 15 08:14:37 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:14:37 -0500
Subject: rpms/libgnomedb/devel libgnomedb-1.2.0-desktop.patch, NONE,
	1.1 libgnomedb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200503150814.j2F8EbFJ029693@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/libgnomedb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29680/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libgnomedb-1.2.0-desktop.patch libgnomedb.spec 
Log Message:
auto-import libgnomedb-1.2.0-3 on branch devel from libgnomedb-1.2.0-3.src.rpm

libgnomedb-1.2.0-desktop.patch:

--- NEW FILE libgnomedb-1.2.0-desktop.patch ---
--- libgnomedb-1.2.0.orig/control-center/database-properties.desktop.in	2005-02-21 17:38:51.000000000 +0000
+++ libgnomedb-1.2.0/control-center/database-properties.desktop.in	2005-02-21 17:39:42.000000000 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Database Access Properties 
 _Comment=Configure your database environment
-Icon=libgnomedb/gnome-db.png
+Icon=/usr/share/pixmaps/libgnomedb/gnome-db.png
 Exec=gnome-database-properties
 Terminal=0
 Type=Application


--- NEW FILE libgnomedb.spec ---
Summary:         Library for writing gnome database programs
Name:            libgnomedb
Version:         1.2.0
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
Requires:	 libgda >= 1.2.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.2.0

Patch0: libgnomedb-1.2.0-desktop.patch

%description
libgnomedb is a library that eases the task of writing
gnome database programs.

%package devel
Summary:         Development libraries and header files for libgnomedb.
Group:           Development/Libraries
Requires:	  %{name} = %{epoch}:%{version}-%{release}
Requires:        pkgconfig >= 0.8
Requires:        libgnomeui >= 1.103.0
Requires:        libgnomeui-devel >= 1.103.0
Requires:        libgda >= 1.2.0
Requires:        libgda-devel >= 1.2.0
Requires:        gtk2 >= 1.3.6
Requires:        gtk2-devel >= 1.3.6
Requires:        libglade2
Requires:        libglade2-devel

%description devel
This package contains the header files and libraries needed to write
or compile programs that use libgda.

%prep
%setup -q
%patch0 -p1 -b .desktop.patch

%build
%configure --disable-gtk-doc
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%makeinstall
%find_lang libgnomedb-2

# rh#14932# install the .desktop into the canonical location
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --vendor=database --delete-original \
  $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/database-properties.desktop

%post
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`

for SCHEMA in %{_sysconfdir}/gconf/schemas/libgnomedb.schemas; do
/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-2.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README NEWS
%{_bindir}/*
%{_datadir}/mime-info/*
%{_datadir}/pixmaps/libgnomedb
%{_datadir}/applications/*.desktop
%{_datadir}/gnome-db
%{_libdir}/*.so.*
%{_libdir}/libglade/2.0/*
%config(noreplace) %{_sysconfdir}/gconf/schemas/*

%files devel
%defattr(-,root,root)
%{_includedir}/libgnomedb-1.2
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/*.so
%{_libdir}/pkgconfig/*


%changelog
* Wed Mar 02 2005 Caolan McNamara <caolanm at redhat.com> 1.2.0-3
- rebuild with gcc4

* Mon Feb 21 2005 Caolan McNamara <caolanm at redhat.com> 1.2.0-2
- rh#149232#/rh#149222# install .desktop to /usr/share/applications

* Fri Feb 04 2005 Caolan McNamara <caolanm at redhat.com> 1.2.0-1
- bump to latest stable version
- drop integrated patchs

* Tue Dec 07 2004 Caolan McNamara <caolanm at redhat.com> 1.0.4-4
- #rh142098# missing return

* Wed Oct 20 2004 Caolan McNamara <caolanm at redhat.com> 1.0.4-3
- #rh136069# Backport crashfix on no tables
- #rh136361# Move icon for gnome properties

* Fri Oct 08 2004 Caolan McNamara <caolanm at redhat.com> 1.0.4-2
- #rh135044# BuildRequires

* Thu Aug 12 2004 Caolan McNamara <caolanm at redhat.com>
- Initial Red Hat import
- patch for missing break statement
- fixup devel package requirement pickiness

* Tue Jan 28 2003 Yanko Kaneti <yaneti at delcera.com>
- Package and add the omf/scrollkeeper bits.
- --disable-gtk-doc to configure because the generated docs are in the tarball

* Mon Aug 19 2002 Ben Liblit <liblit at acm.org>
- Fixed version number substitutions
- Updated files list to match what "make install" actually installs
- Added URL tag pointing to GNOME-DB project's web site

* Mon Feb 25 2002 Chris Chabot <chabotc at reviewboard.com>
- Cleaned up formatting
- Added requirements

* Thu Feb 21 2002 Chris Chabot <chabotc at reviewboard.com>
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 08:14:04 -0000	1.1
+++ .cvsignore	15 Mar 2005 08:14:35 -0000	1.2
@@ -0,0 +1 @@
+libgnomedb-1.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 08:14:04 -0000	1.1
+++ sources	15 Mar 2005 08:14:35 -0000	1.2
@@ -0,0 +1 @@
+d446a3b7b13e0100794feb62fbc296c6  libgnomedb-1.2.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar 15 08:15:59 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 15 Mar 2005 03:15:59 -0500
Subject: rpms/gnumeric/devel gnumeric.spec,1.1,1.2
Message-ID: <200503150815.j2F8Fxt8029814@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/gnumeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29808

Modified Files:
	gnumeric.spec 
Log Message:
add libgnomedb to extras and gnumeric's requires


Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnumeric.spec	14 Mar 2005 12:17:13 -0000	1.1
+++ gnumeric.spec	15 Mar 2005 08:15:57 -0000	1.2
@@ -4,7 +4,7 @@
 Summary:        A spreadsheet program for GNOME.
 Name:     	gnumeric
 Version: 	1.4.3
-Release: 	1
+Release: 	2
 Epoch:		1
 License:	GPL
 Group:		Applications/Productivity
@@ -16,7 +16,7 @@
 Requires:       libgnomeprintui22 >= 2.3.0
 Requires:       gtk2 >= 2.2.0
 Requires:       libgsf >= 1.10.0
-#Requires:  	libgnomedb >= 1.0.4
+Requires:  	libgnomedb >= 1.0.4
 PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:  libgnomeui-devel >= 2.4.0
@@ -26,7 +26,7 @@
 BuildRequires:  libgsf-devel >= 1.10.0
 BuildRequires:  automake autoconf libtool
 BuildRequires:  intltool scrollkeeper gettext desktop-file-utils
-#BuildRequires:  libgnomedb-devel >= 1.0.4
+BuildRequires:  libgnomedb-devel >= 1.0.4
 BuildRequires:  pango-devel >= 1.4.0
 Patch0: gnumeric-1.4.1-desktop.patch
 Patch1: gnumeric-1.4.1-excelcrash.patch
@@ -138,6 +138,9 @@
 %dir %{_libdir}/gnumeric/%{gnumeric_version}
 
 %changelog
+* Tue Mar 15 2005 Caolan McNamara <caolanm at redhat.com> 1.4.3-2
+- add libgnomedb to extras and gnumeric's requires
+
 * Mon Mar 14 2005 Caolan McNamara <caolanm at redhat.com> 1.4.3-1
 - bump to latest, first in extras
 - drop helppath



From fedora-extras-commits at redhat.com  Tue Mar 15 08:29:40 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 03:29:40 -0500
Subject: rpms/rpmlint/FC-3 rpmlint.spec,1.9,1.10
Message-ID: <200503150829.j2F8Tems030214@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmlint/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30205/FC-3

Modified Files:
	rpmlint.spec 
Log Message:
Fix build.


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-3/rpmlint.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmlint.spec	13 Mar 2005 20:52:20 -0000	1.9
+++ rpmlint.spec	15 Mar 2005 08:29:38 -0000	1.10
@@ -33,6 +33,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_datadir}/rpmlint/compile.pyo
 install -pm 644 rpmlint.bash-completion $RPM_BUILD_ROOT%{_datadir}/rpmlint
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 touch $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
@@ -75,7 +76,6 @@
 %{_bindir}/rpm*
 %dir %{_datadir}/rpmlint
 %{_datadir}/rpmlint/rpmlint.bash-completion
-%exclude %{_datadir}/rpmlint/compile.pyo
 %dir %{_sysconfdir}/rpmlint
 %config(noreplace) %{_sysconfdir}/rpmlint/config
 %ghost %{_sysconfdir}/bash_completion.d/rpmlint



From fedora-extras-commits at redhat.com  Tue Mar 15 08:29:40 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 03:29:40 -0500
Subject: rpms/rpmlint/devel rpmlint.spec,1.10,1.11
Message-ID: <200503150829.j2F8TeLa030218@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30205/devel

Modified Files:
	rpmlint.spec 
Log Message:
Fix build.


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rpmlint.spec	13 Mar 2005 20:52:20 -0000	1.10
+++ rpmlint.spec	15 Mar 2005 08:29:38 -0000	1.11
@@ -32,6 +32,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_datadir}/rpmlint/compile.pyo
 install -pm 644 rpmlint.bash-completion $RPM_BUILD_ROOT%{_datadir}/rpmlint
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 touch $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
@@ -74,7 +75,6 @@
 %{_bindir}/rpm*
 %dir %{_datadir}/rpmlint
 %{_datadir}/rpmlint/rpmlint.bash-completion
-%exclude %{_datadir}/rpmlint/compile.pyo
 %dir %{_sysconfdir}/rpmlint
 %config(noreplace) %{_sysconfdir}/rpmlint/config
 %ghost %{_sysconfdir}/bash_completion.d/rpmlint



From fedora-extras-commits at redhat.com  Tue Mar 15 08:45:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 15 Mar 2005 03:45:45 -0500
Subject: devel/bittorrent bittorrent.spec,1.9,1.10
Message-ID: <200503150845.j2F8jj68030579@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/bittorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30569

Modified Files:
	bittorrent.spec 
Log Message:
+ scriptlet deps


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/devel/bittorrent/bittorrent.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bittorrent.spec	15 Mar 2005 05:50:46 -0000	1.9
+++ bittorrent.spec	15 Mar 2005 08:45:43 -0000	1.10
@@ -18,6 +18,8 @@
 BuildRequires:  python-devel desktop-file-utils
 Requires:       python
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 BuildArch:      noarch
 



From fedora-extras-commits at redhat.com  Tue Mar 15 11:59:34 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 06:59:34 -0500
Subject: devel/hddtemp hddtemp.db,1.2,1.3 hddtemp.spec,1.8,1.9
Message-ID: <200503151159.j2FBxY4C005188@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/hddtemp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5180

Modified Files:
	hddtemp.db hddtemp.spec 
Log Message:
hddtemp.db 2005-03-15.


Index: hddtemp.db
===================================================================
RCS file: /cvs/extras/devel/hddtemp/hddtemp.db,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hddtemp.db	22 Jan 2005 13:39:06 -0000	1.2
+++ hddtemp.db	15 Mar 2005 11:59:32 -0000	1.3
@@ -74,6 +74,7 @@
 "FUJITSU MPG3409AH.*"           194  C  "Fujitsu MPG3409AH E"
 "FUJITSU MPG3204AH"		194  C  "Fujitsu MPG3204AH"
 
+
 ########################################
 ############# Hitachi drives
 ########################################
@@ -141,6 +142,7 @@
 #"Maxtor 4D040H2"					9    C	"Maxtor DiamondMax D540X-4D"
 #"Maxtor 4D040H2"                        		0    C  "Maxtor 4D040H2"
 #"Maxtor 4D080H4"					12   C	"Maxtor DiamondMax D540X-4D"
+#"Maxtor 4D060H3"					12   C	"Maxtor DiamondMax D540X-4D"
 #"Maxtor 4D080H4"					9    C	"Maxtor DiamondMax D540X-4D"
 "MAXTOR 4K0[468]0H[234]"				194  C  "Maxtor DiamondMax D540X serie"
 "Maxtor 4[RA](25|16|12|08|06)0[LJ]0"			194  C  "Maxtor DiamondMax 16"
@@ -148,11 +150,13 @@
 "Maxtor 5A250J0"					194  C  "Maxtor MaXline II 250GB 5400RPM"
 "Maxtor 5A300J0"					194  C  "Maxtor 5A300J0"
 "Maxtor 5T0[24]0H[24]"					0    C  "Maxtor DiamondMax Plus 60"
+"Maxtor 6B(08|12|16|20|25|30)0[RSPM]0"			194  C  "Maxtor DiamondMax Plus 10"
 "Maxtor 6E0[234]0L0"					194  C  "Maxtor DiamondMax Plus 8"
 "MAXTOR 6L0[2468]0[LJ][1234]"				194  C  "Maxtor DiamondMax Plus D740X family"
-"Maxtor 6[YB](04|06|08|12|16|20|25)0[LPM]0"		194  C  "Maxtor DiamondMax Plus 9" 
+"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0"			194  C  "Maxtor DiamondMax Plus 9" 
 "Maxtor 7Y250[PM]0"					194  C	"Maxtor MaXLine Plus II 250GB 7200RPM"
 "Maxtor 94098U8"			 		11   C  "Maxtor DiamondMax 40 94098U8"
+"Maxtor 6B200P0" 194 C "Maxtor DiamondMax 10"
 
 ########################################
 ############# Quantum drives
@@ -185,7 +189,6 @@
 "SAMSUNG SV(0401|0802|1203|1604)N"			194  C  "Samsung SpinPoint V80 serie"
 
 
-
 ########################################
 ############# Seagate drives
 ########################################
@@ -234,6 +237,9 @@
 "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"
+"ST3250823A"				194  C  "Seagate Barracuda 7200.8 250GB"
+"ST3400832A"                            194  C  "Seagate Barracuda 7200.8 Plus 400GB"
+"ST9100823A"				194  C	"Seagate Momentus 5400.2 100GB"
 "ST94[08]11A"				194  C  "Seagate ST94011A"
 
 
@@ -247,6 +253,7 @@
 "TOSHIBA MK3017GAP"			0    C  "Toshiba MK3017GAP"
 "TOSHIBA MK3021GAS"			194  C  "Toshiba MK3021GAS"
 #"TOSHIBA MK4019GAX"			222  C  "Toshiba MK4019GAX"
+"TOSHIBA MK4025GAS"			194  C  "Toshiba MK4025GAS 40 Go"
 "TOSHIBA MK6021GAS"			194  C	"Toshiba MK6021GAS"
 "TOSHIBA MK6022GAX"			194  C	"Toshiba MK6022GAX"
 "TOSHIBA MK6025GAS"			194  C  "Toshiba MK6025GAS"
@@ -254,41 +261,47 @@
 "TOSHIBA MK8026GAX"			194  C  "Toshiba MK8026GAX" 
 "MK4025GAS"                             194  C  "Toshiba MK4025GAS"
 
-
-
 ########################################
 ############# Western Digital drives
 ########################################
 # WDC AC310100B and WDC AC2850F are reported not working
 # no more informations were given
-"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 WD360GD-00FNA0"				194 C "Western Digital SATA Raptor 36.7GB"
-"WDC WD400BB-(18CA|00DE)A0"     		  0 C "Western Digital Caviar WD400BB"
-"WDC WD400EB-00CPF0"				  0 C "Western Digital 400EB-00CPF0"
-"WDC WD400JB-00FMA0"				194 C "Western Digital Caviar 40GB Special Edition 8MB"
-"WDC WD600BB-32BSA0"				  0 C "Western Digital 600BB-32BSA0"
-"WDC WD600LB-00DNA0"            		194 C "Western Digital 60GB"
-"WDC WD800BB-00CAA1"				  0 C "Western Digital WD800BB-00CAA1"
-"WDC WD800BB-22DKA0"				194 C "Western Digital 800BB-22DKA0"
-"WDC WD800BB-32CCB0"				194 C "Western Digital 800BB-32CCB0"
-"WDC WD800BB-55JKA0"				194 C "Western Digital 800BB-55JKA0" 
-"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-00JJA0"				194 C "Western Digital WD800JB"
-"WDC WD800JD-00HKA0"				194 C "Western Digital SATA 80GB, 8MB Cache"
-"WDC WD1200JB-00(EV|FU|GV)A0"   		194 C "Western Digital Caviar 120GB Special Edition 8MB" 
-"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-00(EV|FU|GV)A0"   		194 C "Western Digital Caviar 160GB Special Edition 8MB"
-"WDC WD2000JB-(00EV|34EV|00FU|00GV|98GV)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
-"WDC WD2500JB-(00FU|32FU|00GV)A0"		194 C "Western Digital Caviar 250GB Special Edition 8MB"
-"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-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)A0"				194 C "Western Digital Caviar 40GB Special Edition 8MB"
+"WDC WD600BB-32BSA0"					  0 C "Western Digital 600BB-32BSA0"
+"WDC WD600LB-00DNA0"            			194 C "Western Digital 60GB"
+"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-55JKA0"					194 C "Western Digital 800BB-55JKA0" 
+"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-00JJA0"					194 C "Western Digital WD800JB"
+"WDC WD800JD-00HKA0"					194 C "Western Digital SATA 80GB, 8MB Cache"
+"WDC WD1200BB-00FTA0"					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 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-00(EV|FU|GV)A0"   			194 C "Western Digital Caviar 160GB Special Edition 8MB"
+"WDC WD2000JB-(00EV|34EV|00FU|00GV|55GV|98GV)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
+"WDC WD2500JB-(00FU|32FU|00GV)A0"			194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC WD2500PB-98FBA0"					194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC AC420400D"                 			231 C "Western Digital Caviar AC420400D"
+"WDC AC418000D"						231 C "Western Digital AC418000D"
+"WDC WD135BA"						231 C "Western Digital WD135BA"
 
 # not sure for next
 # "WDC WD1200JB-00CRA1"		9   C "Western Digital 1200JB-00CRA1"
 # "WDC WD273BA"			9   C "Western Digital WD273BA"
+
+# SATA drive with libata passthru
+"WDC WD740GD-00FL21.0"				194 C "Western Digital SATA Raptor"


Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/devel/hddtemp/hddtemp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hddtemp.spec	3 Mar 2005 21:46:21 -0000	1.8
+++ hddtemp.spec	15 Mar 2005 11:59:32 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           hddtemp
 Version:        0.3
-Release:        0.2.beta12
+Release:        0.3.beta12
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Tue Mar 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.3.beta12
+- Update hddtemp.db to 2005-03-15.
+
 * Sat Jan 22 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3-0.2.beta12
 - Update hddtemp.db to 2005-01-17.
 



From fedora-extras-commits at redhat.com  Tue Mar 15 13:04:05 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 15 Mar 2005 08:04:05 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.9,1.10
Message-ID: <200503151304.j2FD453j008426@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8417

Modified Files:
	ppracer.spec 
Log Message:
buildrequire correct tcl-devel version that includes tclConfig.sh



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ppracer.spec	8 Mar 2005 21:49:50 -0000	1.9
+++ ppracer.spec	15 Mar 2005 13:04:02 -0000	1.10
@@ -20,7 +20,7 @@
 BuildRequires: xorg-x11-devel
 BuildRequires: SDL-devel >= 1.2
 BuildRequires: SDL_mixer-devel >= 1.2
-BuildRequires: tcl-devel >= 8.0
+BuildRequires: tcl-devel >= 8.4.9
 BuildRequires: autoconf
 BuildRequires: freetype-devel
 BuildRequires: libpng-devel
@@ -67,6 +67,9 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Tue Mar 15 2004 Nils Philippsen <nphilipp at redhat.com>
+- buildrequire correct tcl-devel version that includes tclConfig.sh
+
 * Tue Mar 08 2005 Nils Philippsen <nphilipp at redhat.com>
 - don't use integer for boolean value in desktop file
 - remove optflags patch as it isn't necessary anymore



From fedora-extras-commits at redhat.com  Tue Mar 15 14:15:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 09:15:11 -0500
Subject: rpms/perl-Pod-POM - New directory
Message-ID: <200503151415.j2FEFBnU010505@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10498/perl-Pod-POM

Log Message:
Directory /cvs/extras/rpms/perl-Pod-POM added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 14:15:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 09:15:11 -0500
Subject: rpms/perl-Pod-POM/devel - New directory
Message-ID: <200503151415.j2FEFBTt010508@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10498/perl-Pod-POM/devel

Log Message:
Directory /cvs/extras/rpms/perl-Pod-POM/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 14:15:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 09:15:31 -0500
Subject: rpms/perl-Pod-POM Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503151415.j2FEFVF4010574@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10565

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Pod-POM


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Pod-POM
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 15 14:15:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 09:15:31 -0500
Subject: rpms/perl-Pod-POM/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503151415.j2FEFVZl010577@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10565/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Pod-POM


--- 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 Mar 15 14:16:12 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 09:16:12 -0500
Subject: rpms/perl-Pod-POM import.log,1.1,1.2
Message-ID: <200503151416.j2FEGCw1010680@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10671

Modified Files:
	import.log 
Log Message:
auto-import perl-Pod-POM-0.17-3 on branch devel from perl-Pod-POM-0.17-3.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 14:15:29 -0000	1.1
+++ import.log	15 Mar 2005 14:16:10 -0000	1.2
@@ -0,0 +1 @@
+perl-Pod-POM-0_17-3:HEAD:perl-Pod-POM-0.17-3.src.rpm:1110896069



From fedora-extras-commits at redhat.com  Tue Mar 15 14:16:12 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 15 Mar 2005 09:16:12 -0500
Subject: rpms/perl-Pod-POM/devel perl-Pod-POM.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503151416.j2FEGCWW010684@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10671/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Pod-POM.spec 
Log Message:
auto-import perl-Pod-POM-0.17-3 on branch devel from perl-Pod-POM-0.17-3.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


--- NEW FILE perl-Pod-POM.spec ---
%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:           perl-Pod-POM
Version:        0.17
Release:        3
Summary:        Object-oriented interface to Perl POD documents

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Pod-POM/
Source0:        http://www.cpan.org/authors/id/A/AB/ABW/Pod-POM-0.17.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module implements a parser to convert Pod documents into a simple
object model form known hereafter as the Pod Object Model.  The object
model is generated as a hierarchical tree of nodes, each of which
represents a different element of the original document.  The tree can
be walked manually and the nodes examined, printed or otherwise
manipulated.  In addition, Pod::POM supports and provides view objects
which can automatically traverse the tree, or section thereof, and
generate an output representation in one form or another.


%prep
%setup -q -n Pod-POM-%{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+w $RPM_BUILD_ROOT/*


%check || :
# http://rt.cpan.org/NoAuth/Bug.html?id=3910
PERL_HASH_SEED=0 make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{_bindir}/podlint
%{_bindir}/pom2
%{perl_vendorlib}/Pod
%{_mandir}/man[13]/*.[13]*


%changelog
* Tue Mar 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.17-3
- Remove Epoch: 0.
- Improve summary.

* Sun Jul 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.17-0.fdr.3
- Bring up to date with current fedora.us Perl spec template.

* Fri Nov 21 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.17-0.fdr.2
- Add workaround for http://rt.cpan.org/NoAuth/Bug.html?id=3910.

* Sun Oct 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.17-0.fdr.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 14:15:29 -0000	1.1
+++ .cvsignore	15 Mar 2005 14:16:10 -0000	1.2
@@ -0,0 +1 @@
+Pod-POM-0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 14:15:29 -0000	1.1
+++ sources	15 Mar 2005 14:16:10 -0000	1.2
@@ -0,0 +1 @@
+6ec8b345c9d43d45cc404c9416443d76  Pod-POM-0.17.tar.gz



From ville.skytta at iki.fi  Tue Mar 15 14:16:36 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Tue, 15 Mar 2005 16:16:36 +0200
Subject: APPROVED: perl-Pod-POM
Message-ID: <1110896196.26174.2.camel@bobcat.mine.nu>

perl-Pod-POM provides an OO interface to Perl POD documents.  It is a
dependency of perl-Template-Toolkit (soon to be submitted) which is a
dependency of Bugzilla and others.

https://bugzilla.fedora.us/show_bug.cgi?id=1954
Approved by: Jos? Pedro Oliveira
Maintainer: yours truly

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050315/72e8410b/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Tue Mar 15 15:36:14 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 15 Mar 2005 10:36:14 -0500
Subject: rpms/amarok/FC-3 .cvsignore, 1.6, 1.7 amarok.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <200503151536.j2FFaEjs012941@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12928/FC-3

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Mar 2005 22:09:28 -0000	1.6
+++ .cvsignore	15 Mar 2005 15:36:12 -0000	1.7
@@ -1 +1 @@
-amarok-1.2.1.tar.bz2
+amarok-1.2.2.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/amarok.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- amarok.spec	12 Mar 2005 08:44:14 -0000	1.8
+++ amarok.spec	15 Mar 2005 15:36:12 -0000	1.9
@@ -6,13 +6,13 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.2.1
+Version:    1.2.2
 Release:    1
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.2.1.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.2.2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -132,7 +132,6 @@
 %defattr(-,root,root)
 %{_bindir}/amarok
 %{_bindir}/amarokapp
-%{_bindir}/release_amarok
 %_datadir/apps/%{name}
 %_datadir/icons/*/*/*
 %{_datadir}/applications/kde/*.desktop
@@ -171,11 +170,14 @@
 %defattr(-,root,root)
 %{_libdir}/kde3/libamarok_xine-engine.*
 %{_datadir}/services/amarok_xine-engine.desktop
-%{_datadir}/services/amarok_xineengine_plugin.desktop
+#%{_datadir}/services/amarok_xine-engine_plugin.desktop
 %endif
 
 
 %changelog
+* Mon Mar 14 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.2-1
+- version 1.2.2
+
 * Sat Mar 05 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.1-1
 - version 1.2.1 (bugfixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Mar 2005 22:09:28 -0000	1.6
+++ sources	15 Mar 2005 15:36:12 -0000	1.7
@@ -1 +1 @@
-90a8cce693a31e4d6ff552508c31aed3  amarok-1.2.1.tar.bz2
+af3bd552fbc61168a894a9cd447d2b2e  amarok-1.2.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar 15 15:36:14 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 15 Mar 2005 10:36:14 -0500
Subject: rpms/amarok/devel .cvsignore, 1.6, 1.7 amarok.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200503151536.j2FFaEMf012946@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12928/devel

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Mar 2005 22:09:28 -0000	1.6
+++ .cvsignore	15 Mar 2005 15:36:12 -0000	1.7
@@ -1 +1 @@
-amarok-1.2.1.tar.bz2
+amarok-1.2.2.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- amarok.spec	12 Mar 2005 08:44:14 -0000	1.10
+++ amarok.spec	15 Mar 2005 15:36:12 -0000	1.11
@@ -1,4 +1,4 @@
-# Rebuild switch:
+# Rebuild switch: 
 #  --with xine    Enables xine engine
 #
 
@@ -6,13 +6,13 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.2.1
+Version:    1.2.2
 Release:    1
 
-Group:      Applications/Multimedia
+Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.2.1.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.2.2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -24,7 +24,7 @@
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 
 %if  0%{?use_xine}
-BuildRequires:  xine-lib-devel >= 1.0.0
+BuildRequires:  xine-lib-devel >= 0:1.0.0
 BuildRequires:  libmad-devel
 %endif
 
@@ -93,7 +93,7 @@
 
 %install
 rm -fr $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT 
 
 # desktop files
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -132,7 +132,6 @@
 %defattr(-,root,root)
 %{_bindir}/amarok
 %{_bindir}/amarokapp
-%{_bindir}/release_amarok
 %_datadir/apps/%{name}
 %_datadir/icons/*/*/*
 %{_datadir}/applications/kde/*.desktop
@@ -171,11 +170,14 @@
 %defattr(-,root,root)
 %{_libdir}/kde3/libamarok_xine-engine.*
 %{_datadir}/services/amarok_xine-engine.desktop
-%{_datadir}/services/amarok_xineengine_plugin.desktop
+#%{_datadir}/services/amarok_xine-engine_plugin.desktop
 %endif
 
 
 %changelog
+* Mon Mar 14 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.2-1
+- version 1.2.2
+
 * Sat Mar 05 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.1-1
 - version 1.2.1 (bugfixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Mar 2005 22:09:28 -0000	1.6
+++ sources	15 Mar 2005 15:36:12 -0000	1.7
@@ -1 +1 @@
-90a8cce693a31e4d6ff552508c31aed3  amarok-1.2.1.tar.bz2
+af3bd552fbc61168a894a9cd447d2b2e  amarok-1.2.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar 15 15:47:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 15 Mar 2005 10:47:14 -0500
Subject: rpms/dkms - New directory
Message-ID: <200503151547.j2FFlEkP013225@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/dkms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13218/dkms

Log Message:
Directory /cvs/extras/rpms/dkms added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 15:47:14 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 15 Mar 2005 10:47:14 -0500
Subject: rpms/dkms/devel - New directory
Message-ID: <200503151547.j2FFlEfO013228@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/dkms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13218/dkms/devel

Log Message:
Directory /cvs/extras/rpms/dkms/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 15:47:42 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 15 Mar 2005 10:47:42 -0500
Subject: rpms/dkms Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503151547.j2FFlg7i013305@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/dkms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13296

Added Files:
	Makefile import.log 
Log Message:
Setup of module dkms


--- NEW FILE Makefile ---
# Top level Makefile for module dkms
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 15 15:47:42 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 15 Mar 2005 10:47:42 -0500
Subject: rpms/dkms/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503151547.j2FFlgiO013308@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/dkms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13296/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dkms


--- 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 Mar 15 15:48:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 15 Mar 2005 10:48:36 -0500
Subject: rpms/dkms import.log,1.1,1.2
Message-ID: <200503151548.j2FFmaRe013427@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/dkms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13418

Modified Files:
	import.log 
Log Message:
auto-import dkms-2.0.5.2-2 on branch devel from dkms-2.0.5.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dkms/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 15:47:39 -0000	1.1
+++ import.log	15 Mar 2005 15:48:34 -0000	1.2
@@ -0,0 +1 @@
+dkms-2_0_5_2-2:HEAD:dkms-2.0.5.2-2.src.rpm:1110901444



From fedora-extras-commits at redhat.com  Tue Mar 15 15:48:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 15 Mar 2005 10:48:36 -0500
Subject: rpms/dkms/devel dkms.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200503151548.j2FFmaav013431@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/dkms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13418/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dkms.spec 
Log Message:
auto-import dkms-2.0.5.2-2 on branch devel from dkms-2.0.5.2-2.src.rpm


--- NEW FILE dkms.spec ---
Summary: Dynamic Kernel Module Support Framework
Name: dkms
Version: 2.0.5.2
Release: 2
License: GPL
Group: System Environment/Base
BuildArch: noarch
Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
Requires: bash > 1.99
Provides: dkms-minimal
Source0: dkms-%version.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This package contains the framework for the Dynamic
Kernel Module Support (DKMS) method for installing
module RPMS as originally developed by the Dell
Computer Corporation.

%prep

%setup -q

%triggerpostun -- dkms < 1.90.00-1
for dir in `find /var/dkms -type d -maxdepth 1 -mindepth 1`; do
	mv -f $dir /var/lib/dkms
done
[ -e /etc/dkms_framework.conf ] && ! [ -e /etc/dkms/framework.conf ] && mkdir /etc/dkms && cp /etc/dkms_framework.conf /etc/dkms/framework.conf
arch_used=""
[ `uname -m` == "x86_64" ] && [ `cat /proc/cpuinfo | grep -c "Intel"` -gt 0 ] && arch_used="ia32e" || arch_used=`uname -m`
echo ""
echo "ALERT! ALERT! ALERT!"
echo ""
echo "You are using a version of DKMS which does not support multiple system"
echo "architectures.  Your DKMS tree will now be modified to add this support."
echo ""
echo "The upgrade will assume all built modules are for arch: $arch_used"
current_kernel=`uname -r`
dkms_tree="/var/lib/dkms"
source_tree="/usr/src"
tmp_location="/tmp"
dkms_frameworkconf="/etc/dkms/framework.conf"
. $dkms_frameworkconf 2>/dev/null
echo ""
echo "Fixing directories."
for directory in `find $dkms_tree -type d -name "module" -mindepth 3 -maxdepth 4`; do
	dir_to_fix=`echo $directory | sed 's#/module$##'`
	echo "Creating $dir_to_fix/$arch_used..."
	mkdir $dir_to_fix/$arch_used
	mv -f $dir_to_fix/* $dir_to_fix/$arch_used 2>/dev/null 
done
echo ""
echo "Fixing symlinks."	
for symlink in `find $dkms_tree -type l -name "kernel*" -mindepth 2 -maxdepth 2`; do
	symlink_kernelname=`echo $symlink | sed 's#.*/kernel-##'`
	dir_of_symlink=`echo $symlink | sed 's#/kernel-.*$##'`
	cd $dir_of_symlink
        read_link="$symlink"
        while [ -L "$read_link" ]; do
            read_link=`ls -l $read_link | sed 's/.*-> //'`
        done
	if [ `echo $read_link | sed 's#/# #g' | wc -w | awk {'print $1'}` -lt 3 ]; then
		echo "Updating $symlink..."
		ln -sf $read_link/$arch_used kernel-$symlink_kernelname-$arch_used
		rm -f $symlink
	fi
	cd -
done
echo ""

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/{var/lib/dkms,/usr/sbin,usr/share/man/man8,etc/init.d,etc/dkms}
install -m 755 dkms $RPM_BUILD_ROOT/usr/sbin/dkms
install -m 644 dkms.8.gz $RPM_BUILD_ROOT/usr/share/man/man8
install -m 644 dkms_framework.conf  $RPM_BUILD_ROOT/etc/dkms/framework.conf
install -m 644 template-dkms-mkrpm.spec $RPM_BUILD_ROOT/etc/dkms
install -m 644 dkms_dbversion $RPM_BUILD_ROOT/var/lib/dkms/dkms_dbversion
install -m 755 dkms_autoinstaller $RPM_BUILD_ROOT/etc/init.d/dkms_autoinstaller
install -m 755 dkms_mkkerneldoth $RPM_BUILD_ROOT/usr/sbin/dkms_mkkerneldoth

%clean 
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%attr(0755,root,root) /usr/sbin/dkms
%attr(0755,root,root) /var/lib/dkms
%attr(0755,root,root) /etc/init.d/dkms_autoinstaller
%attr(0755,root,root) /usr/sbin/dkms_mkkerneldoth
%doc %attr(0644,root,root) /usr/share/man/man8/dkms.8.gz
%doc %attr (-,root,root) sample.spec sample.conf AUTHORS COPYING
%config(noreplace) /etc/dkms/framework.conf
%config(noreplace) /etc/dkms/template-dkms-mkrpm.spec

%post
[ -e /sbin/dkms ] && mv -f /sbin/dkms /sbin/dkms.old 2>/dev/null
/sbin/chkconfig dkms_autoinstaller on


%changelog
* Tue Mar 15 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.5.2-2
- Minor spec cleanups:
  Removed check for / before performing clean, unnecessary.
  Removed "Packager" tag.
  Removed "Vendor" tag.
  Replaced "Source" with "Source0".

* Mon Mar 14 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.5.2
- Tweaked spec to follow http://fedoraproject.org/wiki/PackagingGuidelines

* Thu Mar 03 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.5.1
- Added --size for alternate driver disk image sizes

* Tue Jan 25 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.5
- Repackaged as 2.0.5

* Mon Jan 17 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.4.3
- Allow MAKE_MATCH[0] to decide if MAKE[0] will be used
- Add Taroon check in template-dkms-mkrpm.spec for ia32e detection

* Mon Dec 20 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.4.2
- John Hull's patch for no SuSE 2.6 kernel preparation

* Wed Dec 15 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.4.1
- Red Hat driver disks can now have modules.pcimap and pci.ids files

* Mon Dec 13 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.4
- bumped revision

* Fri Dec 10 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.3.3
- Added quotes to $kernel_config when checking variable
- Tweak the multiowned arch detection workaround to deal with no ownership

* Mon Dec 6 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.3.2
- Fix to template-spec so that ia32e check doesn't require kernel sources

* Wed Dec 1 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.3.1
- Jeffrey Kirsher's workaround for arch detection on multiowned /lib/modules

* Mon Nov 22 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.3
- Issues regressed.  Bumped to non-testing version.

* Fri Nov 19 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.2.5
- DKMS ldtarball arch fix for changed Andreas 2.0.2 code
- Workaround for Red Hat's new source symlink in 2.6.9
- All 'cd -' now output to /dev/null

* Sat Oct 2 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.2
- Added --verbose which invoke_command uses
- Fixed it so mrproper doesn't get run > 2.6.6

* Tue Sep 28 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.1.2-1
- Charles Duffy's fix for multiple rpms owning /lib/modules/kernel...
- Andreas Gruenbacher's removal of IFS usage 
- Andreas Gruenbacher's reorganizing prepare check into prepare_kernel
- Andreas Gruenbacher's patch to cut down on line length by using $base_dir
- fixed $base_dir so it gets set after setup_kernels_arches

* Sun Sep 12 2004 Andreas Gruenbacher <agruen at suse.de>
- patch to remove tick usage
- patch to rewrite version comparison code
- patch to switch to usage of case, remove use of grep -c, remove use of IFS 
- patch to change handling of stderr

* Fri Sep 10 2004 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Fixed remove so you can remove modules in added state

* Thu Sep 9 2004 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Removed "module ignored" message from dkms_autoinstaller

* Thu Aug 26 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.0-1
- Output to stderr is now >> and not >
- Added kludge to allow redhat1 driver disks with BOOT kernel modules
- Allow cross arch building on 2.6 if --kernelsourcedir is passed
- Generic make commands now respect --kernelsourcedir
- Bumped dkms_dbversion to 2.0.0

* Thu Aug 19 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.96.02-1
- Fixed suse driver disks for i386

* Thu Aug 12 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.96.01-1
- Look for /etc/SuSEconfig also to know if its a SuSE box
- If no make command, set the clean command

* Wed Aug 11 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.32-1
- Added suse mkdriverdisk support
- Updated man page

* Tue Aug 10 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.25-1
- Added provides: dkms-minimal for Mandrake
- Added -r, --release for use in SuSE driver disks

* Fri Aug 06 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.24-1
- Fixed kernelsourcedir error message.
- dkms_autoinstaller now excepts a kernel parameter

* Tue Jul 27 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.19-1
- Created a set_kernel_source_dir function to remove dup code

* Mon Jul 26 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.18-1
- Added John Hull's SuSE support patches (mkinitrd, config prep)

* Fri Jul 23 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.11-1
- Split modulesconf_modify to separate add and remove functions
- Added support for /etc/modprobe.conf

* Thu Jul 15 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.10-1
- Remove coreutils as a dependency to avoid RH21 error.

* Wed Jul 14 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.09-1
- DKMS ldtarball now check dbversion and wont load future tarballs

* Mon Jul 12 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.95.06-1
- Buchan Milne's Mandrake prep support patch
- Buchan Milne's macro additions to template-dkms-mkrpm.spec
- Buchan Milne's typo corrections in mkrpm
- Buchan Milne's change to how mkrpm works (mktarball happen in rpm prep)

* Tue Jul 06 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.94.16-1
- Added a dependency on modutils for usage of modinfo
- Added version sanity check
- dkms_autoinstaller now check for sanity of version
- Changed conversion algorithm for /var/dkms to /var/lib/dkms
- Changed all warning to get to stderr
- set_module_suffix doesn't use version_checker because its too slow

* Thu Jul 01 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.94.06-1
- Reworked version checking to handle non-digit characters
- Added coreutils as a dependency
- Create a tempdir in mkdriverdisk, whoops (thanks Charles Duffy)

* Wed Jun 30 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.94.03-1
- dkms_dbversion belongs in /var/lib/dkms (thanks Thomas Palmieri)
- Added a version checking subroutine
- Removed gt2dot4 variable in favor of kernel version checking
- MAKE is no longer required.  If none specified, it uses a default.

* Thu Jun 24 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.94.01-1
- Buchan Milne's optimization of the arch detection code

* Wed Jun 23 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.93.14-1
- Fixed bug when find finds more than one thing (thanks Paul Howarth)
- Changed arch detection code to first try RPM which always will get it right (thanks Vladimir Simonov)

* Tue Jun 22 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.93.12-1
- Initial mkrpm is working
- Added --source-only option to mktarball
- mkrpm handles --source-only
- Updated manpage

* Fri Jun 17 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.93.04-1
- Started adding mkrpm

* Wed Jun 16 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.93.01-1
- Fixed dkms_autoinstaller bugs (thanks Vladimir Simonov)
- Fixed paths in the tarball's install.sh

* Tue Jun 15 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.92.33-1
- kernelver/arch handling for mktarball

* Mon Jun 14 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.92.26-1
- Added support for RH v2 driver disks (they support multiple arches)

* Fri Jun 11 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.92.24-1
- Continue rework of kernelver/arch handling
- Added PATH fix (thanks Andrey Ulanov <andrey.ulanov at acronis.com>)
- config_contents should not be local (thanks Andrey Ulanov)
- If no config in /configs, just use .config (thanks Andrey Ulanov)
- match now pays attention to --kernelsourcedir

* Wed Jun 09 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.92.06-1
- Started coding new kernelver arch CLI handling

* Mon Jun 07 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.92.04-1
- Added STRIP[] directive.  By default dkms now runs strip -g on all built modules.
- Fix set_module_suffix in dkms build
- Changed /etc/dkms_framework.conf to /etc/dkms/framework.conf
- Added reload into dkms_autoinstaller to limit Mandrake error messages
- Moved /var/dkms to /var/lib/dkms !!!!!!!!!!!!!!!!

* Fri Jun 04 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.92.01-1
- PRE_BUILD, POST_BUILD, POST_ADD, etc all now allow their scripts to accept parameters

* Thu Jun 03 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.91.18-1
- Added --installtree option to specify different install location besides /lib/modules
- Took Charles Duffy's advice and removed brackets on error messages

* Wed Jun 02 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.91.14-1
- Added set_module_suffix function

* Tue Jun 01 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.91.12-1
- Added a PRE_BUILD dkms.conf directive.

* Thu May 27 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.91.11-1
- Added build time check for gcc and make if there is a build failure
- You can now specify --archive to mktarball to control the naming of the made tarball (thanks Vladimir Simonov)

* Wed May 26 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.91.07-1
- Removed rpm dependency on gcc (thanks Vladimir Simonov)
- Re-implemented dkms status recursively

* Mon May 24 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.91.01-1
- Added local variable declarations to local variables

* Fri May 21 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.90.46-1
- Vladimir Simonov's invoke_command improvements for keeping /tmp clean

* Thu May 20 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.90.45-1
- Pass --targetarch to dkms_mkkerneldoth (thanks to Vladimir Simonov <validimir.simonov at acronis.com>)
- Moved arch detection into a function called detect_arch

* Wed May 19 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.90.44-1
- Bug fixes on arch support
- Updated man page

* Tue May 18 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.90.32-1
- Completing arch awareness and transition scripts
- Created upgrade_dkms_archify.sh to update DKMS trees for arch support

* Mon May 17 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.90.06-1
- Continued adding arch awareness

* Thu May 13 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.90.01-1
- Started adding arch awareness into the DKMS tree

* Fri May 07 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.10-1
- bumped the revision

* Thu May 06 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.09.21-1
- Improved readability of install and uninstall text to the screen
- You can now specify multiple actions in the same command

* Wed May 05 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.09.05-1
- Added arch_used as part of the filename of a tarball created by mktarball
- If multiple original modules exist in a single kernel, the one in /updates is preferred
- Changed multiple original module handling to move out and store all collisions

* Mon May 03 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.09.01-1
- Changed 2.6 prep prepare-all target usage to make modules_prepare
- Changed 2.6 make command to always use M= as this is fixed in 2.6.6-rc3-bk5

* Fri Apr 30 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.09-1
- If module build exit status is bad, die accordingly
- 2.6 kernel prep changes (not quite there yet, still broken)

* Thu Apr 29 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.08.06-1
- Added BUILD_EXCLUSIVE_KERNEL & BUILD_EXCLUSIVE_ARCH directives for dkms.conf
- Tweaked dkms_autoinstaller to more gracefully handle a build failure

* Tue Apr 27 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.08.02-1
- Got rid of make clean warning if not present

* Tue Apr 20 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.08.01-1
- Fixed error message when compiling with --no-prepare-kernel

* Tue Apr 13 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.08-1
- Fixed the format of rhdd-6.1 for Red Hat driver disks
- Update man page with new white paper info

* Thu Apr 1 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.07-1
- Added work-around to recognize ia32e kernel config instead of x86_64
- Got rid of start and stop functions which were no-ops anyway

* Thu Mar 25 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.06-1
- Added a fix to keep the driver disk filename from being so long that it breaks

* Mon Feb 09 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.05-1
- Added a fix to resolve RHEL21 depmod errors when an obsolete reference is found

* Thu Jan 15 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.02-1
- Fixed mkinitrd for ia64

* Tue Dec 09 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.00.01-1
- Fixed /usr/share/doc/dkms-<version> mode to 755

* Mon Dec 01 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 1.00-1
- Bumped version to 1.00

* Mon Nov 24 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.99.02-1
- Add -t vfat to loopback mount during creation of driver disk

* Fri Nov 21 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.99.01-1
- Only edit /etc/modules.conf if remake_initrd is set or if this is the last uninstall and no original module exists
- Added MODULES_CONF_OBSOLETE_ONLY array directive in dkms.conf
- Updated man page

* Wed Nov 19 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.46.05-1
- Fixed a bug in mktarball to limit the tarball name to less than 255 chars

* Tue Nov 18 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.46.04-1
- Binary only tarballs now contain a copy of dkms.conf so that they can be force loaded

* Mon Nov 17 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.45.03-1
- Updated man page, recommended rpm naming: <module>-<version>-<rpmversion>dkms.noarch.rpm

* Thu Nov 13 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.45.02-1
- dkms_autoinstaller is now installed to /etc/init.d for cross-distro happiness

* Fri Nov 07 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.45.01-1
- Added kernel config prepping for hugemem kernel (thanks Amit Bhutani)
- modules.conf only now gets changed during install or uninstall of active module

* Tue Nov 03 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.44.05-1
- Changed MODULES_CONF_ALIAS_TYPE to an array in dkms.conf
- Added MODULES_CONF_OBSOLETES array in dkms.conf
- Reworked modules_conf_modify to make use of OBSOLETES logic
- Updated man page

* Fri Oct 31 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.42.03-1
- Added --binaries-only option to mktarball
- Updated man page

* Thu Oct 30 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.41.15-1
- If depmod or mkinitrd fail during install, automatically go back to built state
- Warn heavily if mkinitrd fails during uninstall

* Wed Oct 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.41.11-1
- Removed paths from dkms calls in sample.spec
- Fixed typo of KERNELRELEASE

* Wed Oct 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.41.10-1
- Added Red Hat specific kernel prep to avoid make dep (Thanks Matt Domsch)
- Added dkms_mkkerneldoth script to support RH kernel prep
- Moved dkms from /sbin/ to /usr/sbin
- Fixed typo which caused original_module not to get replaced on uninstall
- No longer edit Makefiles, just specify KERNELVERSION=$kernel_version on the command line
- Removed unnecessary depmod during uninstall

* Thu Oct 23 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.40.16-1
- Fixed mkdriverdisk to copy rhdd-6.1 file into driver disk image

* Wed Oct 22 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.40.15-1
- Changed expected driver disk filename from module-info to modinfo to work on legacy RH OSs

* Tue Oct 14 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.40.14-1
- Unset all arrays before using them.  duh.

* Tue Oct 07 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.40.12-1
- Fixed bug in autoinstaller where it wasn't looking for dkms.conf through source symlink

* Thu Oct 02 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.40.11-1
- Added --rpm_safe_upgrade flag
- Updated the man page and sample.spec

* Wed Oct 01 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.40.05-1
- No longer copy dkms.conf into /var/dkms tree, just go to the source_tree so as to reduce duplication
- Got rid of --post-add, --post-build, --post-install and --post-remove
- Replaced the above with DKMS directives POST_ADD, POST_BUILD, POST_INSTALL, POST_REMOVE
- Fixed ldtarball and mktarball to no longer look for these duplicate files
- Added a sample.conf for /usr/share/doc
- Updated dkms_dbversion to 1.01 from 1.00 due to these changes
- Update the man page

* Tue Sep 30 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.39.17-1
- Added diff checking in status command in case modules are overwritten by someone else
- Fixed already built error message in build_module
- Changed build-arch to noarch
- Updated sample.spec
- Change dest_module_location to not get prefaced by /lib/modules/$kernel_version
- When saving old initrd, copy it instead of moving it in case new one doesn't build
- Only create source symlink during loadtarball if --force or if it doesn't exist
- Decide to completely remove during remove_module after doing find with maxdepth of 0 not 1

* Mon Sep 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.39.08-1
- Reworked mktarball format to remove dependence on /var/dkms and /usr/src
- Reworked ldtarball to match new tarball format
- Ldtarball now uses --archive=tarball-location flag instead of --config flag
- Ldtarball can now load any old source tarball as long as it contains a good dkms.conf
- Added --kernelsourcedir cli option to provide alternate location for kernel source
- Driver disk files are now looked for in /redhat_driver_disk
- Added $tmp_location specifiable in /etc/dkms_framework.conf to specify your /tmp dir (default /tmp)
- Updated man page

* Thu Sep 25 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.38.03-1
- Fixed tmp_dir_name typo in ldtarball
- Fixed mkdriverdisk to correctly create kernel/module structure
- Don't expect a rhdd-6.1 file for RH driver disk, dkms will create it
- Remove mkdriverdisk warning on non BOOT kernels
- Moved driver_disk directory location to underneath $module_version
- mkdriverdisk can now accept multiple kernel versions
- Updated man page with info about $dkms_tree and $source_tree as dkms.conf variables

* Wed Sep 24 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.37.10-1
- Don't allow installs of modules onto non-existant kernels
- Suppressed stderr on some commands
- Fixed brain-dead bug for REMAKE INITRD
- During uninstall, dont remake initrd if it was not installed
- ldtarball into unique tempdir and delete it when finished

* Tue Sep 23 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.37.04-1
- Changed PATCH to array based system (added PATCH_MATCH array)
- PATCHes can now be matched against regular expressions, not just substrings
- Changed MODULES_CONF to array based system
- CHANGED MAKE to array based system (added MAKE_MATCH array)
- MAKEs can now be matched against regular expressions, not just substrings.
- Updated man page

* Mon Sep 22 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.36.10-1
- Changed autoinstaller bootup priority from 08 to 04
- Changed invoke_command routine to use mktemp for better security
- Changed invoke_command in dkms_autoinstaller too

* Fri Sep 19 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.36.05-1
- Continued bug testing and fixing new features

* Wed Sep 17 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.36.02-1
- Got rid of MODULE_NAME: replaced with BUILT_MODULE_NAME, DEST_MODULE_NAME arrays
- Got rid of LOCATION: replaced with BUILT_MODULE_LOCATION, DEST_MODULE_LOCATION arrays
- Update man page

* Tue Sep 16 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.36.01-1
- Fixed the setting of the gt2dot4 variable

* Wed Sep 10 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.35.02-1
- Added PACKAGE_NAME, PACKAGE_VERSION requirements to dkms.conf for gmodconfig use
- Fixed creation of /var/dkms before cp of dkms_dbversion in install.sh

* Mon Sep 08 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.34.10-1
- Continued adding autoinstall stuff
- Updated man page

* Fri Sep 05 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.34.01-1
- Added dkms_autoinstaller service (builds module on boot if AUTOINSTALL="yes" in dkms.conf)
- DKMS usage no longer sent to std_err
- Added --no-prepare-kernel cli option

* Fri Aug 08 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.33.02-1
- Fixed quote bugs in match (Reported by: John Hull <john_hull at dell.com>) 
- Added Fred Treasure to the AUTHORS list
- Added dkms_dbversion file to DKMS tree to track architecture of dkms db layout

* Thu Jul 03 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.32.04-1
- Added mkinitrd support for SuSE (etc_sysconfig_kernel_modify)
- Added generic make command for kernel >2.4 (make -C <path-to-kernel-source> SUBDIRS=<build dir> modules)
- Fixed kernel prepare to do Red Hat/Generic by default
- Only do make dep if < 2.5

* Tue Jun 03 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.31.04-1
- Modified the Red Hat prep routine to be smaller and more robust (including summit support)
- Added sample.spec to the sources for /usr/share/doc
- If you save a .config before make mrproper, return it right afterwards
- Updated the man page

* Fri May 30 2003 Gary Lerhaupt <gary_lerahupt at dell.com> 0.30.17-1
- Added a remake_initrd function to keep SuSE from doing wrong things
- If you know the correct right steps for rebuilding SuSE initrds, please let me know!
- Updated man page

* Thu May 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.30.15-1
- Added a native readlink function to make sure it exists
- Added a mkdir -p to $location to make sure it exists
- Added --directive

* Wed May 28 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.30.05-1
- Added kernel preparation support for SLES/United Linux (Many thanks to: Fred Treasure <fwtreas at us.ibm.com>)

* Tue May 20 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.29.09-1
- On remove, to remove all kernel versions you must now specify --all
- Added grep, cpio and gzip to the Requires of the RPM
- Added cleaning kernel tree (make mrproper) after last build completes
- Before prepare kernel, the current .config is stored in memory to be restored later
- Added a verbose warning to the status command to remind people it only shows DKMS modules
- Added /etc/dkms_framwork.conf for controlling source_tree and dkms_tree
- Added the undocumented --dkmstree and --sourcetree options for cli control of these vars
- When looking for original modules, dkms now employs the find command to expand search past $location
- Updated man page

* Wed May 14 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.28.05-1
- Fixed a typo in the man page.

* Tue May 05 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.28.04-1
- Fixed ldtarball/mktarball to obey source_tree & dkms_tree (Reported By: Jordan Hargrave <jordan_hargrave at dell.com>)
- Added DKMS mailing list to man page

* Tue Apr 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.27.05-1
- Changed NEEDED_FOR_BOOT to REMAKE_INITRD as this makes more sense
- Redid handling of modifying modules.conf 
- Added MODULE_CONF_ALIAS_TYPE to specs

* Mon Apr 28 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.26.12-1
- Started adding ldtarball support
- added the --force option
- Update man page

* Thu Apr 24 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.26.05-1
- Started adding mktarball support
- Fixed up the spec file to use the tarball

* Tue Mar 25 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.25.14-1
- Continued integrating mkdriverdisk
- Updated man page

* Mon Mar 24 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.25.03-1
- Added renaming ability to modules after builds (MODULE_NAME="beforename.o:aftername.o")
- Started adding mkdriverdisk support
- Added distro parameter for use with mkdriverdisk
- Now using readlink to determine symlink pointing location
- Added redhat BOOT config to default location of config files
- Fixed a bug in read_conf that caused the wrong make subdirective to be used
- Remove root requirement for build action

* Wed Mar 19 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.23.19-1
- Fixed archiving of original modules (Reported by: Kris Jordan <kris at sagebrushnetworks.com>)

* Wed Mar 12 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.23.18-1
- Added kernel specific patching ability

* Mon Mar 10 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.23.16-1
- Removed the sourcing in of /etc/init.d/functions as it was unused anyway
- Implemented generic patching support
- Updated man page
- Fixed timing of the creation of DKMS built infrastructure in case of failure

* Fri Mar 07 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.23.11-1
- Builds now occur in /var/dkms/$module/$module_version/build and not in /usr/src
- Fixed the logging of the kernel_config

* Thu Mar 06 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.23.01-1
- Started adding patch support
- Redid reading implementation of modules_conf entries in dkms.conf (now supports more than 5)
- Updated man page

* Tue Mar 04 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.22.06-1
- Module names are not just assumed to end in .o any longer (you must specify full module name)
- At exit status to invoke_command when bad exit status is returned

* Fri Feb 28 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.22.03-1
- Changed the way variables are handled in dkms.conf, %kernelver to $kernelver

* Mon Feb 24 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.22.02-1
- Fixed a typo in install

* Tue Feb 11 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.22.01-1
- Fixed bug in remove which made it too greedy
- Updated match code

* Mon Feb 10 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.21.16-1
- Added uninstall action
- Updated man page

* Fri Feb 07 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.20.06-1
- Added --config option to specify where alternate .config location exists
- Updated the man page to indicate the new option.
- Updated the spec to allow for software versioning printout
- Added -V which prints out the current dkms version and exits

* Thu Jan 09 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.19.01-1
- Added GPL stuffs

* Mon Dec 09 2002 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.18.04-1
- Added support for multiple modules within the same install
- Added postadd and fixed up the man page

* Fri Dec 06 2002 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.17.01-1
- Cleaned up the spec file.

* Fri Nov 22 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Fixed a bug in finding MAKE subdirectives

* Thu Nov 21 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Fixed make.log path error when module make fails
- Fixed invoke_command to work under RH8.0
- DKMS now edits kernel makefile to get around RH8.0 problems

* Wed Nov 20 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Reworked the implementation of -q, --quiet

* Tue Nov 19 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Version 0.16: added man page

* Mon Nov 18 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Version 0.13: added match option
- Version 0.14: dkms is no longer a SysV service
- Added depmod after install and remove
- Version 0.15: added MODULES_CONF directives in dkms.conf

* Fri Nov 15 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Version 0.12: added the -q (quiet) option

* Thu Nov 14 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Version 0.11: began coding the status function

* Wed Nov 13 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Changed the name to DKMS
- Moved original_module to its own separate directory structure
- Removal now does a complete clean up

* Mon Nov 11 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Split build into build and install
- dkds.conf is now sourced in
- added kernelver variable to dkds.conf

* Fri Nov 8 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Added date to make.log
- Created the prepare_kernel function

* Thu Nov 7 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Barebones implementation complete

* Wed Oct 30 2002 Gary Lerhaupt <gary_lerhaupt at dell.com>
- Initial coding


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 15:47:39 -0000	1.1
+++ .cvsignore	15 Mar 2005 15:48:34 -0000	1.2
@@ -0,0 +1 @@
+dkms-2.0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 15:47:39 -0000	1.1
+++ sources	15 Mar 2005 15:48:34 -0000	1.2
@@ -0,0 +1 @@
+0e3030c92d21613a726563f8b94788d1  dkms-2.0.5.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 15 15:49:31 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 15 Mar 2005 10:49:31 -0500
Subject: rpms/bzflag/devel bzflag.spec,1.4,1.5
Message-ID: <200503151549.j2FFnVOv013530@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13518

Modified Files:
	bzflag.spec 
Log Message:
buildrequire bc for curl version check



Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bzflag.spec	4 Mar 2005 19:44:02 -0000	1.4
+++ bzflag.spec	15 Mar 2005 15:49:29 -0000	1.5
@@ -17,6 +17,8 @@
 BuildRequires: SDL-devel
 BuildRequires: ncurses-devel
 BuildRequires: curl-devel
+# for curl version checking in configure. ugh.
+BuildRequires: bc
 
 %description
 BZFlag is a 3D multi-player tank battle game  that  allows users to play
@@ -63,7 +65,10 @@
 %{_mandir}/man*/*
 
 %changelog
-* Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-4
+* Tue Mar 15 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-4
+- buildrequire bc for curl version check
+
+* Fri Mar 04 2005 Nils Philippsen <nphilipp at redhat.com>
 - move package over to Extras
 - make desktop file a file, don't generate it in %%install
 - use an a bit more individual build root



From fedora-extras-commits at redhat.com  Tue Mar 15 16:41:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 15 Mar 2005 11:41:50 -0500
Subject: rpms/bittorrent import.log,1.5,1.6
Message-ID: <200503151641.j2FGfohI015705@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bittorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15695

Modified Files:
	import.log 
Log Message:
auto-import bittorrent-4.0.0-1.FC3 on branch FC-3 from bittorrent-4.0.0-1.FC3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	8 Nov 2004 04:06:01 -0000	1.5
+++ import.log	15 Mar 2005 16:41:48 -0000	1.6
@@ -2,3 +2,4 @@
 bittorrent-3_4_1-0_fdr_2_a_rh90:HEAD:bittorrent-3.4.1-0.fdr.2.a.rh90.src.rpm:1099886746
 bittorrent-3_4_1-0_fdr_2_a_1:HEAD:bittorrent-3.4.1-0.fdr.2.a.1.src.rpm:1099886755
 bittorrent-3_4_1-0_fdr_2_a_1_91:HEAD:bittorrent-3.4.1-0.fdr.2.a.1.91.src.rpm:1099886761
+bittorrent-4_0_0-1_FC3:FC-3:bittorrent-4.0.0-1.FC3.src.rpm:1110904916



From fedora-extras-commits at redhat.com  Tue Mar 15 16:41:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 15 Mar 2005 11:41:50 -0500
Subject: rpms/bittorrent/FC-3 bittorrent.desktop, NONE, 1.1 bittorrent.png,
	NONE, 1.1 .cvsignore, 1.3, 1.4 bittorrent.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200503151641.j2FGfofx015708@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bittorrent/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15695/FC-3

Modified Files:
	.cvsignore bittorrent.spec sources 
Added Files:
	bittorrent.desktop bittorrent.png 
Log Message:
auto-import bittorrent-4.0.0-1.FC3 on branch FC-3 from bittorrent-4.0.0-1.FC3.src.rpm


--- NEW FILE bittorrent.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=BitTorrent File Transfer
Comment=Distributed download of files from the Internet
Exec=btdownloadgui.py
Icon=bittorrent.png
Terminal=false
Type=Application
StartupNotify=false
Categories=Application;Network;
MimeType=application/x-bittorrent;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:05:46 -0000	1.3
+++ .cvsignore	15 Mar 2005 16:41:48 -0000	1.4
@@ -1 +1 @@
-BitTorrent-3.4.1a.zip
+BitTorrent-4.0.0.tar.gz


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/bittorrent.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bittorrent.spec	14 Jan 2005 20:00:29 -0000	1.6
+++ bittorrent.spec	15 Mar 2005 16:41:48 -0000	1.7
@@ -1,20 +1,25 @@
+%define desktopvendor fedora
+
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        3.4.1
-Release:        3.a
-Epoch:          0
+Version:        4.0.0
+Release:        1.FC3
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
-License:        MIT
-URL:            http://bitconjurer.org/BitTorrent/
-Source0:        http://dl.sf.net/bittorrent/BitTorrent-3.4.1a.zip
+License:        BitTorrent Open Source License
+URL:            http://www.bittorrent.com/
+Source0:        http://www.bittorrent.com/dl/BitTorrent-%{version}.tar.gz
+Source1:        bittorrent.desktop
+Source2:        bittorrent.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel
+BuildRequires:  python-devel desktop-file-utils
 Requires:       python
-Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 BuildArch:      noarch
 
@@ -28,16 +33,17 @@
 %package        gui
 Summary:        GUI versions of the BitTorrent file transfer tool
 Group:          Applications/Internet
-Requires:       wxPython
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       pygtk2
+Requires:       %{name} = %{version}-%{release}
 
-%description    gui 
+%description    gui
 This package contains the GUI versions of the BitTorrent file transfer
 tool.
 
 
 %prep
-%setup -q -n BitTorrent-3.4.1a
+%setup -q -n BitTorrent-%{version}
+sed -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py
 
 
 %build
@@ -49,21 +55,33 @@
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 sed -i -e 's/env python2/env python/' $RPM_BUILD_ROOT%{_bindir}/*
 
+desktop-file-install --vendor %{desktopvendor} \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	--add-category X-Fedora \
+	%{SOURCE1}
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bittorrent.png
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post gui
+update-desktop-database %{_datadir}/applications &>/dev/null || :
+
+
+%postun gui
+update-desktop-database %{_datadir}/applications &>/dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc README.txt credits.txt LICENSE.txt
-%{_bindir}/btcompletedir.py
 %{_bindir}/btdownloadcurses.py
 %{_bindir}/btdownloadheadless.py
-%{_bindir}/btdownloadlibrary.py
 %{_bindir}/btlaunchmany.py
 %{_bindir}/btlaunchmanycurses.py
-%{_bindir}/btmakemetafile.py
+%{_bindir}/btmaketorrent.py
 %{_bindir}/btreannounce.py
 %{_bindir}/btrename.py
 %{_bindir}/btshowmetainfo.py
@@ -76,11 +94,20 @@
 
 %files gui
 %defattr(-,root,root)
-%{_bindir}/btcompletedirgui.py
 %{_bindir}/btdownloadgui.py
+%{_bindir}/btmaketorrentgui.py
+%{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
+%{_datadir}/pixmaps/%{name}-%{version}
+%{_datadir}/pixmaps/bittorrent.png
 
 
 %changelog
+* Tue Mar 15 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 4.0.0-1.FC3
+- add desktop file, desktop menu icon, post/postun scriptlets
+
+* Mon Mar 14 2005 David Hill <djh[at]ii.net> - 4.0.0-1
+- update to 4.0.0, no longer requires wxPythonGTK
+
 * Wed Dec 22 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:3.4.1-3.a
 - x86_64: Fix python dependency, replace with python-abi dependency.
 
@@ -109,7 +136,7 @@
 - adapted to Doors Linux
 
 * Sun Mar 30 2003 G??tz Waschk <waschk at linux-mandrake.com> 3.2.1b-1mdk
-- split out gui tools to remove wxPythonGTK dep from the main package 
+- split out gui tools to remove wxPythonGTK dep from the main package
 - new version
 
 * Fri Mar 28 2003 Frederic Lepied <flepied at mandrakesoft.com> 3.2-1mdk


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:05:46 -0000	1.3
+++ sources	15 Mar 2005 16:41:48 -0000	1.4
@@ -1 +1 @@
-84d8cfedeba539db8b497d63e6ecceed  BitTorrent-3.4.1a.zip
+67f449df351b66f408b72b6bd196952f  BitTorrent-4.0.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 15 17:02:17 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 15 Mar 2005 12:02:17 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.10,1.11
Message-ID: <200503151702.j2FH2Hp5017221@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17208

Modified Files:
	ppracer.spec 
Log Message:
fox year in changelog entry



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ppracer.spec	15 Mar 2005 13:04:02 -0000	1.10
+++ ppracer.spec	15 Mar 2005 17:02:15 -0000	1.11
@@ -67,7 +67,7 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
-* Tue Mar 15 2004 Nils Philippsen <nphilipp at redhat.com>
+* Tue Mar 15 2005 Nils Philippsen <nphilipp at redhat.com>
 - buildrequire correct tcl-devel version that includes tclConfig.sh
 
 * Tue Mar 08 2005 Nils Philippsen <nphilipp at redhat.com>



From fedora-extras-commits at redhat.com  Tue Mar 15 18:58:15 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 15 Mar 2005 13:58:15 -0500
Subject: rpms/aqhbci-qt-tools/devel aqhbci-qt-tools.spec,1.4,1.5
Message-ID: <200503151858.j2FIwFdH019774@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/aqhbci-qt-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19762

Modified Files:
	aqhbci-qt-tools.spec 
Log Message:
buildreq qt-devel



Index: aqhbci-qt-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/aqhbci-qt-tools/devel/aqhbci-qt-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aqhbci-qt-tools.spec	5 Mar 2005 21:10:20 -0000	1.4
+++ aqhbci-qt-tools.spec	15 Mar 2005 18:58:13 -0000	1.5
@@ -1,12 +1,12 @@
 Name: aqhbci-qt-tools
 Summary: Setup wizard and debugger for the HBCI backend for the Aqbanking library
 Version: 1.0.1beta
-Release: 2
+Release: 3
 Source: http://download.sourceforge.net/aqhbci/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 License: GPL
 URL: http://sourceforge.net/projects/aqhbci
-BuildRequires: gwenhywfar-devel aqbanking-devel aqhbci-devel
+BuildRequires: gwenhywfar-devel aqbanking-devel aqhbci-devel qt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -37,5 +37,8 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Tue Mar 15 2005  Bill Nottingham <notting at redhat.com> 1.0.1beta-3
+- buildreq qt-devel
+
 * Mon Feb 28 2005  Bill Nottingham <notting at redhat.com> 1.0.1beta-2
 - initial import



From fedora-extras-commits at redhat.com  Tue Mar 15 20:44:19 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:44:19 -0500
Subject: rpms/python-tpg - New directory
Message-ID: <200503152044.j2FKiJkO022882@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22875/python-tpg

Log Message:
Directory /cvs/extras/rpms/python-tpg added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:44:19 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:44:19 -0500
Subject: rpms/python-tpg/devel - New directory
Message-ID: <200503152044.j2FKiJN6022885@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22875/python-tpg/devel

Log Message:
Directory /cvs/extras/rpms/python-tpg/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:44:31 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:44:31 -0500
Subject: rpms/python-tpg Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503152044.j2FKiVUC022949@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22937

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-tpg


--- NEW FILE Makefile ---
# Top level Makefile for module python-tpg
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 15 20:44:31 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:44:31 -0500
Subject: rpms/python-tpg/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503152044.j2FKiVtt022952@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22937/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-tpg


--- 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 Mar 15 20:44:52 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:44:52 -0500
Subject: rpms/python-tpg import.log,1.1,1.2
Message-ID: <200503152044.j2FKiq9u023048@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23039

Modified Files:
	import.log 
Log Message:
auto-import python-tpg-3.0.5-1 on branch devel from python-tpg-3.0.5-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 20:44:29 -0000	1.1
+++ import.log	15 Mar 2005 20:44:50 -0000	1.2
@@ -0,0 +1 @@
+python-tpg-3_0_5-1:HEAD:python-tpg-3.0.5-1.src.rpm:1110919487



From fedora-extras-commits at redhat.com  Tue Mar 15 20:44:52 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:44:52 -0500
Subject: rpms/python-tpg/devel python-tpg.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503152044.j2FKiqPO023052@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23039/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-tpg.spec 
Log Message:
auto-import python-tpg-3.0.5-1 on branch devel from python-tpg-3.0.5-1.src.rpm


--- NEW FILE python-tpg.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)")}

%define srcname TPG

Name:           python-tpg
Version:        3.0.5
Release:        1
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
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
Toy Parser Generator is a lexical and syntactic parser generator
for Python. This generator was born from a simple statement: YACC
is to complex to use in simple cases (calculators, configuration
files, small programming languages, ...).

TPG can very simply write parsers that are usefull for most every
day needs (even if it can't make your coffee). With a very clear
and simple syntax, you can write an attributed grammar that is
translated into a recursive descendant parser. TPG generated code
is very closed to the original grammar. This means that the parser
works "like" the grammar. A grammar rule can be seen as a method
of the parser class, symbols as method calls, attributes as method
parameters and semantic values as return values. You can also add
Python code directly into grammar rules and build abstract syntax
trees while parsing.


%prep
%setup -q -n %{srcname}-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README doc THANKS ChangeLog License.txt
%{_bindir}/tpg
%{python_sitelib}/tpg.py
%{python_sitelib}/tpg.pyc
%ghost %{python_sitelib}/tpg.pyo

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 3.0.5-1 -
- Update to 3.0.5
- Clean up spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 20:44:29 -0000	1.1
+++ .cvsignore	15 Mar 2005 20:44:50 -0000	1.2
@@ -0,0 +1 @@
+TPG-3.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 20:44:29 -0000	1.1
+++ sources	15 Mar 2005 20:44:50 -0000	1.2
@@ -0,0 +1 @@
+4608d9a4795b02a9df685d1916090432  TPG-3.0.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 15 20:46:23 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:46:23 -0500
Subject: rpms/python-simpletal - New directory
Message-ID: <200503152046.j2FKkN82023195@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23188/python-simpletal

Log Message:
Directory /cvs/extras/rpms/python-simpletal added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:46:23 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:46:23 -0500
Subject: rpms/python-simpletal/devel - New directory
Message-ID: <200503152046.j2FKkNPW023198@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23188/python-simpletal/devel

Log Message:
Directory /cvs/extras/rpms/python-simpletal/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:46:37 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:46:37 -0500
Subject: rpms/python-simpletal Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503152046.j2FKkbQk023260@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23251

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-simpletal


--- NEW FILE Makefile ---
# Top level Makefile for module python-simpletal
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 15 20:46:37 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:46:37 -0500
Subject: rpms/python-simpletal/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503152046.j2FKkbBA023263@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23251/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-simpletal


--- 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 Mar 15 20:46:55 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:46:55 -0500
Subject: rpms/python-simpletal import.log,1.1,1.2
Message-ID: <200503152046.j2FKkt1U023362@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23353

Modified Files:
	import.log 
Log Message:
auto-import python-simpletal-3.12-1 on branch devel from python-simpletal-3.12-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 20:46:35 -0000	1.1
+++ import.log	15 Mar 2005 20:46:53 -0000	1.2
@@ -0,0 +1 @@
+python-simpletal-3_12-1:HEAD:python-simpletal-3.12-1.src.rpm:1110919611



From fedora-extras-commits at redhat.com  Tue Mar 15 20:46:55 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:46:55 -0500
Subject: rpms/python-simpletal/devel python-simpletal.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503152046.j2FKkt7M023366@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23353/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-simpletal.spec 
Log Message:
auto-import python-simpletal-3.12-1 on branch devel from python-simpletal-3.12-1.src.rpm


--- NEW FILE python-simpletal.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define srcname SimpleTAL

Name:           python-simpletal
Version:        3.12
Release:        1
Summary:        An XML based template processor for TAL, TALES and METAL specifications.

Group:          Development/Libraries
License:        Other
URL:            http://www.owlfish.com/software/simpleTAL/index.html
Source0:        http://www.owlfish.com/software/simpleTAL/downloads/SimpleTAL-3.12.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
SimpleTAL is a stand alone Python implementation of the TAL, TALES and METAL  specifications  used in Zope to power HTML and XML templates.


%prep
%setup -q -n %{srcname}-%{version}

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes.txt LICENSE.txt README.txt examples/
%dir %{python_sitelib}/simpletal
%{python_sitelib}/simpletal/*.py
%{python_sitelib}/simpletal/*.pyc
%ghost %{python_sitelib}/simpletal/*.pyo

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 3.12-1 -
- Update to 3.12
- Clean up spec file

* Mon Dec 06 2004 Shahms E. King <shahms at shahms.com> -
- Update to 3.11
* Thu May 27 2004 Shahms King <shahms at shahms.com> -
- Initial Release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 20:46:35 -0000	1.1
+++ .cvsignore	15 Mar 2005 20:46:53 -0000	1.2
@@ -0,0 +1 @@
+SimpleTAL-3.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 20:46:35 -0000	1.1
+++ sources	15 Mar 2005 20:46:53 -0000	1.2
@@ -0,0 +1 @@
+4c34dc80dba22d9f7ea7ff7fd2e2bea1  SimpleTAL-3.12.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 15 20:49:16 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:49:16 -0500
Subject: rpms/python-protocols - New directory
Message-ID: <200503152049.j2FKnGDg023517@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-protocols
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23510/python-protocols

Log Message:
Directory /cvs/extras/rpms/python-protocols added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:49:16 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:49:16 -0500
Subject: rpms/python-protocols/devel - New directory
Message-ID: <200503152049.j2FKnGXF023520@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-protocols/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23510/python-protocols/devel

Log Message:
Directory /cvs/extras/rpms/python-protocols/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:49:29 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:49:29 -0500
Subject: rpms/python-protocols Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503152049.j2FKnTQ4023582@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-protocols
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23573

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-protocols


--- NEW FILE Makefile ---
# Top level Makefile for module python-protocols
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 15 20:49:29 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:49:29 -0500
Subject: rpms/python-protocols/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503152049.j2FKnT3c023585@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-protocols/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23573/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-protocols


--- 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 Mar 15 20:49:51 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:49:51 -0500
Subject: rpms/python-protocols import.log,1.1,1.2
Message-ID: <200503152049.j2FKnpO7023687@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-protocols
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23678

Modified Files:
	import.log 
Log Message:
auto-import python-protocols-0.9.3-2 on branch devel from python-protocols-0.9.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-protocols/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 20:49:27 -0000	1.1
+++ import.log	15 Mar 2005 20:49:49 -0000	1.2
@@ -0,0 +1 @@
+python-protocols-0_9_3-2:HEAD:python-protocols-0.9.3-2.src.rpm:1110919786



From fedora-extras-commits at redhat.com  Tue Mar 15 20:49:51 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:49:51 -0500
Subject: rpms/python-protocols/devel python-protocols.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503152049.j2FKnpL9023691@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-protocols/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23678/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-protocols.spec 
Log Message:
auto-import python-protocols-0.9.3-2 on branch devel from python-protocols-0.9.3-2.src.rpm


--- NEW FILE python-protocols.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)")}

%define srcname PyProtocols

Name:           python-protocols
Version:        0.9.3
Release:        2
Summary:        Open Protocols and Component Adaptation for Python

Group:          Development/Libraries
License:        PSF or ZPL
URL:            http://peak.telecommunity.com/PyProtocols.html
Source0:        http://peak.telecommunity.com/dist/PyProtocols-0.9.3.tar.gz
Source1:        setuptools.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
PyProtocols is an implementation of PEP 246 allowing Python programmers to define
Interfaces and adapters between them, thereby reducing or eliminating fragile 'isinstance'
if type() comparisons.

%prep
%setup -q -n %{srcname}-%{version}
# install setuptools
tar -zxf %{SOURCE1}

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt CHANGES.txt docs/*
%dir %{python_sitelib}/protocols
%{python_sitelib}/protocols/*.so
%{python_sitelib}/protocols/*.py
%{python_sitelib}/protocols/*.pyc
%ghost %{python_sitelib}/protocols/*.pyo
%{python_sitelib}/protocols/*/*.py
%{python_sitelib}/protocols/*/*.pyc
%ghost %{python_sitelib}/protocols/*/*.pyo

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 0.9.3-2
- Clean up spec file
* Tue Aug 31 2004 Shahms E. King <shahms at shahms.com> -
- Update to 0.9.3
* Fri Jul 30 2004 Shahms E. King <shahms at shahms.com> -
- Update to 0.9.3rc2
* Thu May 27 2004 Shahms King <shahms at shahms.com> -
- Initial Release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-protocols/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 20:49:27 -0000	1.1
+++ .cvsignore	15 Mar 2005 20:49:49 -0000	1.2
@@ -0,0 +1,2 @@
+PyProtocols-0.9.3.tar.gz
+setuptools.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-protocols/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 20:49:27 -0000	1.1
+++ sources	15 Mar 2005 20:49:49 -0000	1.2
@@ -0,0 +1,2 @@
+50559c9869389e9d576b98f6382b1324  PyProtocols-0.9.3.tar.gz
+1fe0f57c72b81ab7fc357b972ba80f4b  setuptools.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 15 20:51:36 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:51:36 -0500
Subject: rpms/python-psycopg - New directory
Message-ID: <200503152051.j2FKpaOw023838@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23831/python-psycopg

Log Message:
Directory /cvs/extras/rpms/python-psycopg added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:51:36 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:51:36 -0500
Subject: rpms/python-psycopg/devel - New directory
Message-ID: <200503152051.j2FKpaHv023841@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23831/python-psycopg/devel

Log Message:
Directory /cvs/extras/rpms/python-psycopg/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:51:48 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:51:48 -0500
Subject: rpms/python-psycopg Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503152051.j2FKpmMb023903@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23894

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-psycopg


--- NEW FILE Makefile ---
# Top level Makefile for module python-psycopg
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 15 20:51:48 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:51:48 -0500
Subject: rpms/python-psycopg/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503152051.j2FKpmqi023906@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23894/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-psycopg


--- 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 Mar 15 20:52:08 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:52:08 -0500
Subject: rpms/python-psycopg import.log,1.1,1.2
Message-ID: <200503152052.j2FKq8Up024004@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23995

Modified Files:
	import.log 
Log Message:
auto-import python-psycopg-1.1.18-1 on branch devel from python-psycopg-1.1.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 20:51:46 -0000	1.1
+++ import.log	15 Mar 2005 20:52:06 -0000	1.2
@@ -0,0 +1 @@
+python-psycopg-1_1_18-1:HEAD:python-psycopg-1.1.18-1.src.rpm:1110919922



From fedora-extras-commits at redhat.com  Tue Mar 15 20:52:08 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:52:08 -0500
Subject: rpms/python-psycopg/devel python-psycopg.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503152052.j2FKq8PG024008@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23995/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-psycopg.spec 
Log Message:
auto-import python-psycopg-1.1.18-1 on branch devel from python-psycopg-1.1.18-1.src.rpm


--- NEW FILE python-psycopg.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)")}

%define srcname psycopg

Name:           python-psycopg
Version:        1.1.18
Release:        1
Summary:        PostgreSQL database adapter for Python

Group:          Development/Libraries
License:        GPL
URL:            http://www.initd.org/software/initd/psycopg
Source0:        http://initd.org/pub/software/psycopg/psycopg-1.1.18.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel postgresql-devel mx
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") mx postgresql-libs

%description
psycopg is a PostgreSQL database adapter for the Python programming
language (just like pygresql and popy.) It was written from scratch with
the aim of being very small and fast, and stable as a rock. The main
advantages of psycopg are that it supports the full Python DBAPI-2.0 and
being thread safe at level 2.

%prep
%setup -n %{srcname}-%{version}

%build
if [ -x /usr/bin/pg_config ]; then
	POSTGRESQLINC=$(/usr/bin/pg_config --includedir-server)
	POSTGRESQLLIB=$(/usr/bin/pg_config --libdir)
else
	POSTGRESQLINC=/usr/include/pgsql
	POSTGRESQLLIB=/usr/lib
fi
%configure --with-python=%{__python} \
      --with-mxdatetime-includes=%{_includedir}  \
      --with-postgres-includes=$POSTGRESQLINC \
      --with-postgres-libs=$POSTGRESQLLIB
make

%install
mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
install -m 555 psycopgmodule.so $RPM_BUILD_ROOT%{python_sitelib}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS  COPYING  CREDITS  FAQ  INSTALL  NEWS  README  RELEASE-1.0  SUCCESS  TODO doc
%{python_sitearch}/*.so

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 1.1.18-1
- Repackage for Extras
- Update to 1.1.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 20:51:46 -0000	1.1
+++ .cvsignore	15 Mar 2005 20:52:06 -0000	1.2
@@ -0,0 +1 @@
+psycopg-1.1.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 20:51:46 -0000	1.1
+++ sources	15 Mar 2005 20:52:06 -0000	1.2
@@ -0,0 +1 @@
+8e5cd2925a25a5aa80cd83418d6a5f09  psycopg-1.1.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 15 20:53:36 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:53:36 -0500
Subject: rpms/python-psyco - New directory
Message-ID: <200503152053.j2FKra5B024147@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24140/python-psyco

Log Message:
Directory /cvs/extras/rpms/python-psyco added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:53:36 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:53:36 -0500
Subject: rpms/python-psyco/devel - New directory
Message-ID: <200503152053.j2FKra9T024150@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24140/python-psyco/devel

Log Message:
Directory /cvs/extras/rpms/python-psyco/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Mar 15 20:53:51 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:53:51 -0500
Subject: rpms/python-psyco Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503152053.j2FKrp4q024212@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24203

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-psyco


--- NEW FILE Makefile ---
# Top level Makefile for module python-psyco
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 15 20:53:51 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:53:51 -0500
Subject: rpms/python-psyco/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503152053.j2FKrpwV024215@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24203/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-psyco


--- 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 Mar 15 20:54:12 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:54:12 -0500
Subject: rpms/python-psyco import.log,1.1,1.2
Message-ID: <200503152054.j2FKsC4o024316@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24306

Modified Files:
	import.log 
Log Message:
auto-import python-psyco-1.4-1 on branch devel from python-psyco-1.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Mar 2005 20:53:49 -0000	1.1
+++ import.log	15 Mar 2005 20:54:10 -0000	1.2
@@ -0,0 +1 @@
+python-psyco-1_4-1:HEAD:python-psyco-1.4-1.src.rpm:1110920047



From fedora-extras-commits at redhat.com  Tue Mar 15 20:54:12 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 15 Mar 2005 15:54:12 -0500
Subject: rpms/python-psyco/devel python-psyco.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503152054.j2FKsCuO024320@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24306/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-psyco.spec 
Log Message:
auto-import python-psyco-1.4-1 on branch devel from python-psyco-1.4-1.src.rpm


--- NEW FILE python-psyco.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)")}

%define srcname psyco

Name:           python-%{srcname}
Version:        1.4
Release:        1
Summary:        The Python Specialing Compiler

Group:          Development/Libraries
License:        MIT
URL:            http://psyco.sourceforge.net/
Source0:        http://prdownloads.sourceforge.net/psyco/psyco-1.4-src.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description


%prep
%setup -q -n %{srcname}-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING.txt INSTALL.txt README.txt doc/
%{python_sitearch}/psyco/*.so
%{python_sitearch}/psyco/*.py
%{python_sitearch}/psyco/*.pyc
%dir %{python_sitearch}/psyco
%ghost %{python_sitearch}/psyco/*.pyo

%changelog
* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 1.4-1
- Repackage for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2005 20:53:49 -0000	1.1
+++ .cvsignore	15 Mar 2005 20:54:10 -0000	1.2
@@ -0,0 +1 @@
+psyco-1.4-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2005 20:53:49 -0000	1.1
+++ sources	15 Mar 2005 20:54:10 -0000	1.2
@@ -0,0 +1 @@
+b1365ceaa40a75326d3deb48edf0c8cc  psyco-1.4-src.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 15 21:24:40 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 15 Mar 2005 16:24:40 -0500
Subject: rpms/abiword/devel abiword-2.2.5-pt64.patch, NONE,
	1.1 abiword-2.2.5-virtdestr.patch, NONE, 1.1 abiword.spec, 1.2, 1.3
Message-ID: <200503152124.j2FLOeZ9025741@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25727

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.2.5-pt64.patch abiword-2.2.5-virtdestr.patch 
Log Message:
* Fri Mar 15 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.5-3
- Fix 64bit build
- Add virtual destructors to classes with virtual functions


abiword-2.2.5-pt64.patch:

--- NEW FILE abiword-2.2.5-pt64.patch ---
diff -r -u abiword-2.2.5.orig/abi/src/text/ptbl/xp/pp_TableAttrProp.cpp abiword-2.2.5/abi/src/text/ptbl/xp/pp_TableAttrProp.cpp
--- abiword-2.2.5.orig/abi/src/text/ptbl/xp/pp_TableAttrProp.cpp	2004-04-03 19:48:28.000000000 +0200
+++ abiword-2.2.5/abi/src/text/ptbl/xp/pp_TableAttrProp.cpp	2005-03-15 21:33:41.519703662 +0100
@@ -53,10 +53,9 @@
 static UT_sint32 compareAPBinary(const void * vX1, const void * vX2)
 {
 //
-// vX1 is actually the key value (a UT_uint32 checkSum) cast into a
-// void * pointer so this cast is correct even on a 64 bit machine
+// vX1 is actually a pointer to a UT_uint32 key value (a checkSum)
 //
-	UT_uint32 u1 = ((UT_uint32) (vX1));
+	UT_uint32 u1 = *((UT_uint32*) (vX1));
 	PP_AttrProp *x2 = *(PP_AttrProp **)(vX2);
 	UT_uint32 u2 = x2->getCheckSum();
 
@@ -176,7 +175,8 @@
  	// VC6 complains about not being able to convert from
  	// 'const class UT_Vector *' to 'class UT_Vector &'
  	// so I put in the cast to shut it up
- 	k = ((UT_Vector &)m_vecTableSorted).binarysearch(reinterpret_cast<void *>(pMatch->getCheckSum()), compareAPBinary);
+	UT_uint32 checksum = pMatch->getCheckSum();
+ 	k = ((UT_Vector &)m_vecTableSorted).binarysearch(reinterpret_cast<void *>(&checksum), compareAPBinary);
  	UT_uint32 cksum = pMatch->getCheckSum();
  
  	if (k == -1)

abiword-2.2.5-virtdestr.patch:

--- NEW FILE abiword-2.2.5-virtdestr.patch ---
diff -u -r abiword-2.2.5.orig/abi/src/af/gr/xp/gr_Graphics.h abiword-2.2.5/abi/src/af/gr/xp/gr_Graphics.h
--- abiword-2.2.5.orig/abi/src/af/gr/xp/gr_Graphics.h	2005-01-01 01:16:58.000000000 +0100
+++ abiword-2.2.5/abi/src/af/gr/xp/gr_Graphics.h	2005-03-15 21:05:32.020613488 +0100
@@ -247,6 +247,8 @@
 class GR_AllocInfo
 {
   public:
+	virtual ~GR_AllocInfo() {}
+
 	virtual GR_GraphicsId getType() const {UT_ASSERT_HARMLESS(UT_NOT_IMPLEMENTED); return GRID_UNKNOWN;}
 	virtual bool isPrinterGraphics()const {UT_ASSERT_HARMLESS(UT_NOT_IMPLEMENTED); return false;}
 };
diff -u -r abiword-2.2.5.orig/abi/src/af/gr/xp/gr_Image.h abiword-2.2.5/abi/src/af/gr/xp/gr_Image.h
--- abiword-2.2.5.orig/abi/src/af/gr/xp/gr_Image.h	2004-03-18 17:00:48.000000000 +0100
+++ abiword-2.2.5/abi/src/af/gr/xp/gr_Image.h	2005-03-15 21:05:32.040610718 +0100
@@ -79,6 +79,8 @@
 class ABI_EXPORT GR_ImageFactory
 {
 public:
+	virtual ~GR_ImageFactory() {}
+
    	virtual GR_Image*	createNewImage(const char* pszName, GR_Image::GRType iType = GR_Image::GRT_Raster) = 0;
 };
 
diff -u -r abiword-2.2.5.orig/abi/src/af/util/xp/ut_TextIterator.h abiword-2.2.5/abi/src/af/util/xp/ut_TextIterator.h
--- abiword-2.2.5.orig/abi/src/af/util/xp/ut_TextIterator.h	2004-03-10 23:03:21.000000000 +0100
+++ abiword-2.2.5/abi/src/af/util/xp/ut_TextIterator.h	2005-03-15 21:05:32.063607531 +0100
@@ -104,6 +104,7 @@
 class ABI_EXPORT UT_TextIterator
 {
   public:
+	virtual ~UT_TextIterator() {}
 
 	/////////////////////////////////////////////////////////////////////////
 	// data accessor; retrieves character at present position
diff -u -r abiword-2.2.5.orig/abi/src/af/xap/xp/xap_AppImpl.h abiword-2.2.5/abi/src/af/xap/xp/xap_AppImpl.h
--- abiword-2.2.5.orig/abi/src/af/xap/xp/xap_AppImpl.h	2004-02-06 12:13:47.000000000 +0100
+++ abiword-2.2.5/abi/src/af/xap/xp/xap_AppImpl.h	2005-03-15 21:05:32.084604622 +0100
@@ -27,6 +27,8 @@
 class XAP_AppImpl
 {
 public:
+	virtual ~XAP_AppImpl() {}
+
 	static XAP_AppImpl* static_constructor(void);		/* must be implemented by the ap_<FE>AppImpl */
 
 	/* XAP_App can call impl methods. */
diff -u -r abiword-2.2.5.orig/abi/src/af/xap/xp/xav_Listener.h abiword-2.2.5/abi/src/af/xap/xp/xav_Listener.h
--- abiword-2.2.5.orig/abi/src/af/xap/xp/xav_Listener.h	2004-10-05 12:25:42.000000000 +0200
+++ abiword-2.2.5/abi/src/af/xap/xp/xav_Listener.h	2005-03-15 21:05:32.104601851 +0100
@@ -94,6 +94,8 @@
 class AV_Listener
 {
 public:
+	virtual ~AV_Listener() {}
+
 	virtual bool		notify(AV_View * pView, const AV_ChangeMask mask) = 0;
 	virtual AV_ListenerType    getType(void) = 0;
 };


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- abiword.spec	14 Mar 2005 23:02:47 -0000	1.2
+++ abiword.spec	15 Mar 2005 21:24:38 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.2.5
-Release: 2
+Release: 3
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -42,6 +42,8 @@
 Patch1: abiword-2.2.1-desktop.patch
 Patch2: abiword-2.2.5-gcc4.patch
 Patch3: abiword-2.2.5-wvread.patch
+Patch4: abiword-2.2.5-virtdestr.patch
+Patch5: abiword-2.2.5-pt64.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -53,6 +55,8 @@
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .gcc4
 %patch3 -p1 -b .wvread
+%patch4 -p1 -b .virtdestr
+%patch5 -p1 -b .pt64
 
 %build
 cd abi
@@ -131,6 +135,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Fri Mar 15 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.5-3
+- Fix 64bit build
+- Add virtual destructors to classes with virtual functions
+
 * Fri Mar 14 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.5-2
 - Remove the --disable-magick plugin switch
 - disable GDA support until the plugin is ported to gnomedb 1.2.x



From fedora-extras-commits at redhat.com  Wed Mar 16 12:27:25 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 16 Mar 2005 07:27:25 -0500
Subject: rpms/ppracer/devel ppracer-0.3.1-lib64.patch, NONE, 1.1 ppracer.spec,
	1.11, 1.12 ppracer-0.3.1-optflags.patch, 1.1, NONE
Message-ID: <200503161227.j2GCRP5o025289@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25283

Modified Files:
	ppracer.spec 
Added Files:
	ppracer-0.3.1-lib64.patch 
Removed Files:
	ppracer-0.3.1-optflags.patch 
Log Message:
look in .../lib64 as well for tclConfig.sh
remove obsolete optflags patch


ppracer-0.3.1-lib64.patch:

--- NEW FILE ppracer-0.3.1-lib64.patch ---
--- ppracer-0.3.1/configure.in.lib64	2005-02-27 19:43:18.000000000 +0100
+++ ppracer-0.3.1/configure.in	2005-03-16 13:23:36.600097963 +0100
@@ -127,29 +127,31 @@
     found=0
     if test "$tcl" != "no"; then
     	tcl=no
-    	for try in $dirs; do
-    		if test -f $try/tclConfig.sh; then		
-    			found=1
-    			. $try/tclConfig.sh
-    			tcl=yes
-                customtcl="no"
-                if test "x$with_tcl_lib_name" != "x"; then
-                    TCL_LIBS="-l$with_tcl_lib_name"
-                    AC_MSG_NOTICE(["Using custom TCL Library: $with_tcl_lib_name"])
-                else
-                    TCL_LIBS="$TCL_LIB_SPEC $TCL_LIBS"
-                fi
-
-                if test "x$with_tcl_inc" != "x"; then
-                    TCL_CFLAGS="-I$with_tcl_inc"
-                    AC_MSG_NOTICE(["Using custom TCL headers directory: $with_tcl_inc"])
-                else
-                    TCL_CFLAGS="-I$TCL_INC_DIR $TCL_INCLUDE_SPEC"
-                fi
-
-    			AC_MSG_RESULT($try/tclConfig.sh)
-    			break
-    		fi
+    	for trydir in $dirs; do
+            for try in ${trydir}64 ${trydir}; do
+    		    if test -f $try/tclConfig.sh; then		
+    			    found=1
+    			    . $try/tclConfig.sh
+    			    tcl=yes
+                    customtcl="no"
+                    if test "x$with_tcl_lib_name" != "x"; then
+                        TCL_LIBS="-l$with_tcl_lib_name"
+                        AC_MSG_NOTICE(["Using custom TCL Library: $with_tcl_lib_name"])
+                    else
+                        TCL_LIBS="$TCL_LIB_SPEC $TCL_LIBS"
+                    fi
+
+                    if test "x$with_tcl_inc" != "x"; then
+                        TCL_CFLAGS="-I$with_tcl_inc"
+                        AC_MSG_NOTICE(["Using custom TCL headers directory: $with_tcl_inc"])
+                    else
+                        TCL_CFLAGS="-I$TCL_INC_DIR $TCL_INCLUDE_SPEC"
+                    fi
+
+    			    AC_MSG_RESULT($try/tclConfig.sh)
+    			    break
+    		    fi
+            done
     	done
     	if test "$found" -eq 0 ; then
     		AC_MSG_ERROR([tclConfig.sh not found - use the --with-tcl option])


Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ppracer.spec	15 Mar 2005 17:02:15 -0000	1.11
+++ ppracer.spec	16 Mar 2005 12:27:22 -0000	1.12
@@ -6,7 +6,7 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 3
+Release: 4
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
@@ -16,6 +16,7 @@
 Source2: ppracer.desktop
 
 Patch0: PPRacer-0.1.9-ia64.patch
+Patch1: ppracer-0.3.1-lib64.patch
 
 BuildRequires: xorg-x11-devel
 BuildRequires: SDL-devel >= 1.2
@@ -38,6 +39,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .ia64
+%patch1 -p1 -b .lib64
 
 %build
 autoconf
@@ -67,6 +69,9 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Wed Mar 16 2005 Nils Philippsen <nphilipp at redhat.com>
+- look in .../lib64 as well for tclConfig.sh
+
 * Tue Mar 15 2005 Nils Philippsen <nphilipp at redhat.com>
 - buildrequire correct tcl-devel version that includes tclConfig.sh
 


--- ppracer-0.3.1-optflags.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar 16 16:38:46 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 16 Mar 2005 11:38:46 -0500
Subject: rpms/gazpacho/devel gazpacho.spec,1.4,1.5
Message-ID: <200503161638.j2GGckJr000657@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/gazpacho/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv642

Modified Files:
	gazpacho.spec 
Log Message:
test trying to change something



Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/gazpacho.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gazpacho.spec	22 Feb 2005 02:36:44 -0000	1.4
+++ gazpacho.spec	16 Mar 2005 16:38:44 -0000	1.5
@@ -33,7 +33,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files -f %{name}-%{version}.files
 %defattr(-,root,root,-)
 %doc README COPYING NEWS



From fedora-extras-commits at redhat.com  Wed Mar 16 16:53:23 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:53:23 -0500
Subject: rpms/clearlooks - New directory
Message-ID: <200503161653.j2GGrNHV001150@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1143/clearlooks

Log Message:
Directory /cvs/extras/rpms/clearlooks added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 16:53:23 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:53:23 -0500
Subject: rpms/clearlooks/devel - New directory
Message-ID: <200503161653.j2GGrNfq001153@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/clearlooks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1143/clearlooks/devel

Log Message:
Directory /cvs/extras/rpms/clearlooks/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 16:53:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:53:50 -0500
Subject: rpms/clearlooks Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161653.j2GGroD5001221@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1210

Added Files:
	Makefile import.log 
Log Message:
Setup of module clearlooks


--- NEW FILE Makefile ---
# Top level Makefile for module clearlooks
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 16:53:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:53:50 -0500
Subject: rpms/clearlooks/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161653.j2GGroR4001224@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/clearlooks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1210/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module clearlooks


--- 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 Mar 16 16:55:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:55:03 -0500
Subject: rpms/clearlooks import.log,1.1,1.2
Message-ID: <200503161655.j2GGt30a001347@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1338

Modified Files:
	import.log 
Log Message:
auto-import clearlooks-0.4-1 on branch devel from clearlooks-0.4-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/clearlooks/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 16:53:48 -0000	1.1
+++ import.log	16 Mar 2005 16:55:01 -0000	1.2
@@ -0,0 +1 @@
+clearlooks-0_4-1:HEAD:clearlooks-0.4-1.src.rpm:1110992088



From fedora-extras-commits at redhat.com  Wed Mar 16 16:55:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:55:03 -0500
Subject: rpms/clearlooks/devel clearlooks.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503161655.j2GGt3m4001351@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/clearlooks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1338/devel

Modified Files:
	.cvsignore sources 
Added Files:
	clearlooks.spec 
Log Message:
auto-import clearlooks-0.4-1 on branch devel from clearlooks-0.4-1.src.rpm
Initial import


--- NEW FILE clearlooks.spec ---
Name:           clearlooks
Version:        0.4
Release:        1
Summary:        An attractive GTK+ 2 engine with a focus on usability
Group:          User Interface/Desktops
License:        GPL
URL:            http://clearlooks.sourceforge.net/screenshots/
Source0:        http://prdownloads.sourceforge.net/clearlooks/clearlooks-0.4.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtk2-devel
Requires:       gtk2

%description
Clearlooks will transform your GNOME desktop into an attractive looking and usable environment.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING CREDITS ChangeLog NEWS README TODO
%{_datadir}/themes/*
%{_libdir}/gtk-2.0/2.4.0/engines/*

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-1
- Bump release to 1

* Sat Mar  5 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.4-0.iva.0
- Upstream update

* Sat Feb 26 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.3-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clearlooks/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 16:53:48 -0000	1.1
+++ .cvsignore	16 Mar 2005 16:55:01 -0000	1.2
@@ -0,0 +1 @@
+clearlooks-0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clearlooks/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 16:53:48 -0000	1.1
+++ sources	16 Mar 2005 16:55:01 -0000	1.2
@@ -0,0 +1 @@
+d714197da50c4eb3c2278f3c786fa996  clearlooks-0.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar 16 16:58:17 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:58:17 -0500
Subject: rpms/deskbar-applet - New directory
Message-ID: <200503161658.j2GGwHEc001683@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1676/deskbar-applet

Log Message:
Directory /cvs/extras/rpms/deskbar-applet added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 16:58:17 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:58:17 -0500
Subject: rpms/deskbar-applet/devel - New directory
Message-ID: <200503161658.j2GGwHlA001686@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1676/deskbar-applet/devel

Log Message:
Directory /cvs/extras/rpms/deskbar-applet/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 16:58:35 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:58:35 -0500
Subject: rpms/deskbar-applet Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161658.j2GGwZFs001748@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1739

Added Files:
	Makefile import.log 
Log Message:
Setup of module deskbar-applet


--- NEW FILE Makefile ---
# Top level Makefile for module deskbar-applet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 16:58:35 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:58:35 -0500
Subject: rpms/deskbar-applet/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161658.j2GGwZv6001751@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1739/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module deskbar-applet


--- 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 Mar 16 16:59:06 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:59:06 -0500
Subject: rpms/deskbar-applet/devel deskbar-applet.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161659.j2GGx61P001858@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1841/devel

Modified Files:
	.cvsignore sources 
Added Files:
	deskbar-applet.spec 
Log Message:
auto-import deskbar-applet-0.2-1 on branch devel from deskbar-applet-0.2-1.src.rpm
Initial import


--- NEW FILE deskbar-applet.spec ---
Name:           deskbar-applet
Version:        0.2
Release:        1
Summary:        A Gnome applet to allow easy access to various search engines
Group:          Applications/Internet
License:        GPL
URL:            http://browserbookapp.sourceforge.net/deskbar.html
Source0:        http://prdownloads.sourceforge.net/browserbookapp/deskbar-applet-0.2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf
BuildArch:      noarch

%description
This applet looks like the current Gnome Mini-Commander, but it launches search queries instead of programs.

Example search-engines include
+ Google
+ MSN
+ EBay
+ IMDB
+ Stock Quotes
+ Wikipedia
+ Local File Search (and eventually also Beagle)

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT
install -D -m 0755 deskbar-applet.py $RPM_BUILD_ROOT%{_libexecdir}/deskbar-applet.py
install -D -m 0644 DeskbarApplet.server $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/DeskbarApplet.server

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENCE README
%{_libexecdir}/deskbar-applet.py
%{_libdir}/bonobo/servers/DeskbarApplet.server

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-1
- Bump release to 1

* Thu Feb 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.2-0.iva.0
- Upstream update

* Sun Feb 20 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.1-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 16:58:33 -0000	1.1
+++ .cvsignore	16 Mar 2005 16:59:04 -0000	1.2
@@ -0,0 +1 @@
+deskbar-applet-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 16:58:33 -0000	1.1
+++ sources	16 Mar 2005 16:59:04 -0000	1.2
@@ -0,0 +1 @@
+051558aa867073aa901dc1049ae0ae12  deskbar-applet-0.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 16:59:06 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:59:06 -0500
Subject: rpms/deskbar-applet import.log,1.1,1.2
Message-ID: <200503161659.j2GGx68c001853@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1841

Modified Files:
	import.log 
Log Message:
auto-import deskbar-applet-0.2-1 on branch devel from deskbar-applet-0.2-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 16:58:33 -0000	1.1
+++ import.log	16 Mar 2005 16:59:04 -0000	1.2
@@ -0,0 +1 @@
+deskbar-applet-0_2-1:HEAD:deskbar-applet-0.2-1.src.rpm:1110992338



From fedora-extras-commits at redhat.com  Wed Mar 16 16:59:43 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:59:43 -0500
Subject: rpms/edb - New directory
Message-ID: <200503161659.j2GGxhnB001984@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1977/edb

Log Message:
Directory /cvs/extras/rpms/edb added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 16:59:44 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 11:59:44 -0500
Subject: rpms/edb/devel - New directory
Message-ID: <200503161659.j2GGxiAD001987@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1977/edb/devel

Log Message:
Directory /cvs/extras/rpms/edb/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:00:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:00:01 -0500
Subject: rpms/edb Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161700.j2GH01ah002053@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2044

Added Files:
	Makefile import.log 
Log Message:
Setup of module edb


--- NEW FILE Makefile ---
# Top level Makefile for module edb
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:00:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:00:01 -0500
Subject: rpms/edb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161700.j2GH01X5002056@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2044/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module edb


--- 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 Mar 16 17:01:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:01:02 -0500
Subject: rpms/edb import.log,1.1,1.2
Message-ID: <200503161701.j2GH12Yp002818@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2168

Modified Files:
	import.log 
Log Message:
auto-import edb-1.0.5-1 on branch devel from edb-1.0.5-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/edb/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 16:59:59 -0000	1.1
+++ import.log	16 Mar 2005 17:01:00 -0000	1.2
@@ -0,0 +1 @@
+edb-1_0_5-1:HEAD:edb-1.0.5-1.src.rpm:1110992452



From fedora-extras-commits at redhat.com  Wed Mar 16 17:01:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:01:02 -0500
Subject: rpms/edb/devel edb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200503161701.j2GH129x002822@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2168/devel

Modified Files:
	.cvsignore sources 
Added Files:
	edb.spec 
Log Message:
auto-import edb-1.0.5-1 on branch devel from edb-1.0.5-1.src.rpm
Initial import


--- NEW FILE edb.spec ---
Name:           edb
Version:        1.0.5
Release:        1
Summary:        A database convenience library wrapped around BDB
Group:          System Environment/Libraries
License:        MIT
URL:            http://enlightenment.org/pages/edb.html
Source0:        http://prdownloads.sourceforge.net/enlightenment/edb-1.0.5.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtk+-devel, ncurses-devel zlib-devel 
Requires:       zlib
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
EDB is a database convenience library wrapped around the Berkeley DB 2.7.7 by Sleepycat Software. It is intended to make accessing database information portable, easy, fast and efficient.

%package        devel
Summary:        Development libraries for edb
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The edb-devel package contains static libraries and header files for developing edb applications.

%package        ncurses
Summary:        ncurses frontend for edb
Group:          Applications/Databases
Requires:       %{name} = %{version}-%{release} ncurses

%description    ncurses
edb-ncurses is a frontend for edb that uses ncurses

%package        gtk
Summary:        GTK+ 1.x frontend for edb
Group:          Applications/Databases
Requires:       %{name} = %{version}-%{release} gtk+

%description    gtk
edb-gtk is a frontend for edb that uses GTK+ 1.x

%prep
%setup -q

%build
#./autogen.sh %{_target_platform} --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir} --program-prefix=
%configure
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

%post
/sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/edb_ed
%{_libdir}/libedb.so.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/edb-config
%{_includedir}/Edb.h
%{_libdir}/*.a
%{_libdir}/*.so
%{_libdir}/pkgconfig/edb.pc

%files ncurses
%defattr(-,root,root,-)
%{_bindir}/edb_vt_ed

%files gtk
%defattr(-,root,root,-)
%{_bindir}/edb_gtk_ed

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-1
- Bump release to 1
- Fix %description of -gtk
- Fix Source0

* Wed Mar  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-0.iva.1
- Backleveled to released version

* Sun Feb  6 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-0.iva.0.20050205
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/edb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 16:59:59 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:01:00 -0000	1.2
@@ -0,0 +1 @@
+edb-1.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/edb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 16:59:59 -0000	1.1
+++ sources	16 Mar 2005 17:01:00 -0000	1.2
@@ -0,0 +1 @@
+c8ee165f92dbc6e6fd9c9114e90e338c  edb-1.0.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:01:42 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:01:42 -0500
Subject: rpms/ghasher - New directory
Message-ID: <200503161701.j2GH1g6h003047@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ghasher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3040/ghasher

Log Message:
Directory /cvs/extras/rpms/ghasher added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:01:42 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:01:42 -0500
Subject: rpms/ghasher/devel - New directory
Message-ID: <200503161701.j2GH1gn5003050@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ghasher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3040/ghasher/devel

Log Message:
Directory /cvs/extras/rpms/ghasher/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:02:00 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:02:00 -0500
Subject: rpms/ghasher Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161702.j2GH20g0003115@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ghasher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3104

Added Files:
	Makefile import.log 
Log Message:
Setup of module ghasher


--- NEW FILE Makefile ---
# Top level Makefile for module ghasher
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:02:00 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:02:00 -0500
Subject: rpms/ghasher/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161702.j2GH20nR003118@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ghasher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3104/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ghasher


--- 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 Mar 16 17:02:29 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:02:29 -0500
Subject: rpms/ghasher import.log,1.1,1.2
Message-ID: <200503161702.j2GH2TvE003216@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ghasher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3207

Modified Files:
	import.log 
Log Message:
auto-import ghasher-1.2.0-1 on branch devel from ghasher-1.2.0-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ghasher/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:01:58 -0000	1.1
+++ import.log	16 Mar 2005 17:02:26 -0000	1.2
@@ -0,0 +1 @@
+ghasher-1_2_0-1:HEAD:ghasher-1.2.0-1.src.rpm:1110992542



From fedora-extras-commits at redhat.com  Wed Mar 16 17:02:29 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:02:29 -0500
Subject: rpms/ghasher/devel ghasher.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503161702.j2GH2Tm8003220@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ghasher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3207/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ghasher.spec 
Log Message:
auto-import ghasher-1.2.0-1 on branch devel from ghasher-1.2.0-1.src.rpm
Initial import


--- NEW FILE ghasher.spec ---
Name:           ghasher
Version:        1.2.0
Release:        1
Summary:        GUI hasher for GTK+ 2
Group:          Applications/File
License:        BSD
URL:            http://asgaard.homelinux.org/code/ghasher/
Source0:        http://asgaard.homelinux.org/code/ghasher/ghasher-1.2.0.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtk2-devel >= 2.4 openssl-devel desktop-file-utils libglade2-devel
Requires:       gtk2 >= 2.4 libglade2

%description
ghasher can easily show the MD5 sum (or md2, md4, sha1, sha, ripemd160, dss1) of a file. Motivation for this utility was that users shouldn't need to open a command line for checking the MD5 sum of files they download.

%prep
%setup -q

%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -D -m 0755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
install -D -m 0644 hash.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/hash.xpm
cat > %{name}.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Name=MD5 sum utility
Comment=Calculate the md5 sum of a file
Exec=ghasher %F
Terminal=false
Type=Application
Icon=hash.xpm
Categories=Utility;GTK;X-Fedora;
EOF
desktop-file-install --vendor=fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category Utility \
  --add-category GTK \
  %{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE NEWS README TODO
%{_bindir}/*
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/*

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-1
- Bump release to 1
- Cleaned up %description

* Thu Mar  3 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.0-0.iva.1
- Fixed several packaging errors

* Mon Feb 28 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.0-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghasher/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:01:58 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:02:26 -0000	1.2
@@ -0,0 +1 @@
+ghasher-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghasher/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:01:58 -0000	1.1
+++ sources	16 Mar 2005 17:02:26 -0000	1.2
@@ -0,0 +1 @@
+b0b2dc591e210bca509249c8841a0869  ghasher-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:02:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:02:59 -0500
Subject: rpms/gpredict - New directory
Message-ID: <200503161702.j2GH2x53003343@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gpredict
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3334/gpredict

Log Message:
Directory /cvs/extras/rpms/gpredict added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:03:00 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:03:00 -0500
Subject: rpms/gpredict/devel - New directory
Message-ID: <200503161703.j2GH2xZn003346@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gpredict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3334/gpredict/devel

Log Message:
Directory /cvs/extras/rpms/gpredict/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:03:12 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:03:12 -0500
Subject: rpms/gpredict Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161703.j2GH3CHC003411@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gpredict
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3401

Added Files:
	Makefile import.log 
Log Message:
Setup of module gpredict


--- NEW FILE Makefile ---
# Top level Makefile for module gpredict
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:03:12 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:03:12 -0500
Subject: rpms/gpredict/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161703.j2GH3Cf0003414@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gpredict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3401/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gpredict


--- 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 Mar 16 17:04:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:04:13 -0500
Subject: rpms/gpredict import.log,1.1,1.2
Message-ID: <200503161704.j2GH4Dm6003542@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gpredict
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3532

Modified Files:
	import.log 
Log Message:
auto-import gpredict-0.5.0-0.iva.0 on branch devel from gpredict-0.5.0-0.iva.0.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gpredict/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:03:10 -0000	1.1
+++ import.log	16 Mar 2005 17:04:11 -0000	1.2
@@ -0,0 +1 @@
+gpredict-0_5_0-0_iva_0:HEAD:gpredict-0.5.0-0.iva.0.src.rpm:1110992642



From fedora-extras-commits at redhat.com  Wed Mar 16 17:04:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:04:13 -0500
Subject: rpms/gpredict/devel gpredict-0.5.0-po.patch, NONE, 1.1 gpredict.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161704.j2GH4D5J003546@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gpredict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3532/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gpredict-0.5.0-po.patch gpredict.spec 
Log Message:
auto-import gpredict-0.5.0-0.iva.0 on branch devel from gpredict-0.5.0-0.iva.0.src.rpm
Initial import

gpredict-0.5.0-po.patch:

--- NEW FILE gpredict-0.5.0-po.patch ---
--- gpredict-0.5.0/po/Makefile.in.in.orig	2005-02-13 10:13:36.724457992 -0500
+++ gpredict-0.5.0/po/Makefile.in.in	2005-02-13 10:13:50.365384256 -0500
@@ -29,7 +29,7 @@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(MKINSTALLDIRS)
 
 CC = @CC@
 GMSGFMT = @GMSGFMT@


--- NEW FILE gpredict.spec ---
Name:           gpredict
Version:        0.5.0
Release:        0.iva.0
Summary:        Real-time satellite tracking and orbit prediction program
Group:          Applications/Communications
License:        GPL
URL:            http://sourceforge.net/projects/groundstation/
Source0:        http://prdownloads.sourceforge.net/groundstation/gpredict-0.5.0.tar.gz
Patch0:         gpredict-0.5.0-po.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtk+-devel hamlib-devel gnome-libs-devel gettext GConf-devel gnome-vfs-devel gnome-print-devel gal-devel desktop-file-utils
Requires:       gtk+ hamlib gnome-libs GConf gnome-vfs gnome-print gal

%description
Gpredict calculates and shows the position of satellites in lists and on maps. It can also make detailed predictions of upcoming satellites passes.

%prep
%setup -q
%patch -p 1 -b .po

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

rm -f $RPM_BUILD_ROOT%{_infodir}/dir
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

cat > gpredict.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Type=Application
Exec=gpredict
TryExec=
Icon=gpredict/icons/gpredict-icon.png
Terminal=false
Name=Gpredict
GenericName=Satellite Tracker
Comment=Track satellites in real-time
Startup-Notify=true
EOF
desktop-file-install --vendor=fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category HamRadio \
  --add-category GTK \
  gpredict.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-1
- Bump release to 1
- Added d-f-u to BR

* Sun Feb 13 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.5.0-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpredict/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:03:10 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:04:11 -0000	1.2
@@ -0,0 +1 @@
+gpredict-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpredict/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:03:10 -0000	1.1
+++ sources	16 Mar 2005 17:04:11 -0000	1.2
@@ -0,0 +1 @@
+9aaf9acc813c8a02cb99816fd3979696  gpredict-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:04:36 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:04:36 -0500
Subject: rpms/hamlib - New directory
Message-ID: <200503161704.j2GH4auo003680@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3673/hamlib

Log Message:
Directory /cvs/extras/rpms/hamlib added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:04:36 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:04:36 -0500
Subject: rpms/hamlib/devel - New directory
Message-ID: <200503161704.j2GH4aNT003683@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/hamlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3673/hamlib/devel

Log Message:
Directory /cvs/extras/rpms/hamlib/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:04:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:04:50 -0500
Subject: rpms/hamlib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161704.j2GH4oij003747@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/hamlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3735/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hamlib


--- 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 Mar 16 17:04:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:04:50 -0500
Subject: rpms/hamlib Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161704.j2GH4ovA003744@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3735

Added Files:
	Makefile import.log 
Log Message:
Setup of module hamlib


--- NEW FILE Makefile ---
# Top level Makefile for module hamlib
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:05:34 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:05:34 -0500
Subject: rpms/hamlib import.log,1.1,1.2
Message-ID: <200503161705.j2GH5YQg003866@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3857

Modified Files:
	import.log 
Log Message:
auto-import hamlib-1.2.3-1 on branch devel from hamlib-1.2.3-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/hamlib/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:04:48 -0000	1.1
+++ import.log	16 Mar 2005 17:05:32 -0000	1.2
@@ -0,0 +1 @@
+hamlib-1_2_3-1:HEAD:hamlib-1.2.3-1.src.rpm:1110992729



From fedora-extras-commits at redhat.com  Wed Mar 16 17:05:34 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:05:34 -0500
Subject: rpms/hamlib/devel hamlib-automake.patch, NONE,
	1.1 hamlib-bindings.patch, NONE, 1.1 hamlib.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161705.j2GH5YfH003870@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/hamlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3857/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hamlib-automake.patch hamlib-bindings.patch hamlib.spec 
Log Message:
auto-import hamlib-1.2.3-1 on branch devel from hamlib-1.2.3-1.src.rpm
Initial import

hamlib-automake.patch:

--- NEW FILE hamlib-automake.patch ---
--- hamlib-1.2.3/hamlib.m4.orig	2005-02-09 23:44:25.065619304 -0500
+++ hamlib-1.2.3/hamlib.m4	2005-02-09 23:44:34.349207984 -0500
@@ -10,7 +10,7 @@
 dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified,
 dnl and the hamlib libraries are not found, a fatal AC_MSG_ERROR() will result.
 dnl
-AC_DEFUN(AM_PATH_HAMLIB,
+AC_DEFUN([AM_PATH_HAMLIB],
 [dnl Save the original CFLAGS, LDFLAGS, and LIBS
 hamlib_save_CFLAGS="$CFLAGS"
 hamlib_save_LDFLAGS="$LDFLAGS"

hamlib-bindings.patch:

--- NEW FILE hamlib-bindings.patch ---
--- hamlib-1.2.0/bindings/Makefile.in	2004-02-16 18:04:55.000000000 -0500
+++ hamlib-1.2.0.mod/bindings/Makefile.in	2004-04-19 05:48:59.000000000 -0500
@@ -138,7 +138,7 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SWIG = @SWIG@
+SWIG = /usr/bin/swig
 TCL_BIN_DIR = @TCL_BIN_DIR@
 TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
 TCL_LIB_FILE = @TCL_LIB_FILE@
@@ -195,7 +195,7 @@
 program_transform_name = @program_transform_name@
 pyexecdir = @pyexecdir@
 
-pythondir = $(prefix)/lib/python
+pythondir = $(prefix)/lib/python2.3
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 subdirs = @subdirs@


--- NEW FILE hamlib.spec ---
Name: hamlib
Version: 1.2.3
Release: 1
License: LGPL
Group: System Environment/Libraries
Summary: Run-time library to control radio transcievers and receivers.
Source: ftp://ftp.sourceforge.net/pub/sourceforge/hamlib/hamlib-1.2.3.tar.gz

# For whatever reason @SWIG@ isn't being set by the configure script.
Patch: hamlib-bindings.patch
Patch1: hamlib-automake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://hamlib.sourceforge.net
BuildRequires: /bin/sh, automake >= 1.4, libtool >= 1.4, fileutils, findutils, flex
BuildRequires: binutils >= 2.9.4, gcc >= 2.95, glibc-devel >= 2.1
BuildRequires: gzip, make >= 3.77, patch >= 2.5, rpm >= 3.0, sed
BuildRequires: textutils python-devel swig gd-devel
BuildRequires: doxygen

%description
Hamlib provides a standardised programming interface that applications 
can uso to send the appropriate commands to a radio.
 
Also included in the package is a simple radio control program 'rigctl',
which lets one control a radio transceiver or receiver, either from
command line interface or in a text-oriented interactive interface.

%package devel
Summary: Development library to control radio transcievers and receivers.
Group: Development/Libraries
Requires: hamlib = %{version}

%description devel
Hamlib radio control library C development headers and libraries
for building C applications with Hamlib.

%package c++
Summary: Hamlib radio control library C++ binding
Group: Development/Libraries
Requires: hamlib

%description c++
Hamlib radio control library C++ language binding.

%package c++-devel
Summary: Hamlib radio control library C++ binding development headers and libraries
Group: Development/Libraries
Requires: hamlib, hamlib-devel

%description c++-devel
Hamlib radio control library C++ binding development headers and libraries
for building C++ applications with Hamlib.


#%package perl
#Summary: Hamlib radio control library Perl binding
#Group: Development/Libraries
#Requires: hamlib = %{version}
#
#%description perl
#Hamlib PERL Language bindings to allow radio control from PERL scripts.

%package python
Summary: Hamlib radio control library Python binding
Group: Development/Libraries
Requires: hamlib = %{version}
Requires: python => 2.2.3

%description python
Hamlib Python Language bindings to allow radio control from Python scripts.

%prep
%setup
%patch -p1
%patch1 -p1
%build

%configure \
        --with-rigmatrix \
        --without-tcl-binding \
        --with-python-binding
##        --with-perl-binding

# Build libs, drivers, and programs
make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" all

# Build PERL and Python bindings
pushd bindings
  #  make all-perl
  make all-py
popd
# Build Documentation
pushd doc
  make doc
popd

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
pushd bindings
# Install Python
make prefix=$RPM_BUILD_ROOT%{_prefix} \
        exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
        bindir=$RPM_BUILD_ROOT%{_bindir} \
        sbindir=$RPM_BUILD_ROOT%{_sbindir} \
        sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
        datadir=$RPM_BUILD_ROOT%{_datadir} \
        includedir=$RPM_BUILD_ROOT%{_includedir} \
        libdir=$RPM_BUILD_ROOT%{_libdir} \
        libexecdir=$RPM_BUILD_ROOT%{_libexecdir} \
        localstatedir=$RPM_BUILD_ROOT%{_localstatedir} \
        sharedstatedir=$RPM_BUILD_ROOT%{_sharedstatedir} \
        mandir=$RPM_BUILD_ROOT%{_mandir} \
        infodir=$RPM_BUILD_ROOT%{_infodir} \
   install-pythonPYTHON

# Install PERL 
# make prefix=$RPM_BUILD_ROOT%{_prefix} \
#        exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
#        bindir=$RPM_BUILD_ROOT%{_bindir} \
#        sbindir=$RPM_BUILD_ROOT%{_sbindir} \
#        sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
#        datadir=$RPM_BUILD_ROOT%{_datadir} \
#        includedir=$RPM_BUILD_ROOT%{_includedir} \
#        libdir=$RPM_BUILD_ROOT%{_libdir} \
#        libexecdir=$RPM_BUILD_ROOT%{_libexecdir} \
#        localstatedir=$RPM_BUILD_ROOT%{_localstatedir} \
#        sharedstatedir=$RPM_BUILD_ROOT%{_sharedstatedir} \
#        mandir=$RPM_BUILD_ROOT%{_mandir} \
#        infodir=$RPM_BUILD_ROOT%{_infodir} \
#   install-perl
popd

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%doc COPYING doc/html
%{_bindir}/rigctl
%{_bindir}/rigmem
%{_bindir}/rigswr
%{_bindir}/rotctl
%{_sbindir}/rpc.rigd
%{_sbindir}/rpc.rotd
%{_libdir}/libhamlib-%{version}.so.2.0.2
%{_libdir}/hamlib-*.so
%{_libdir}/libhamlib.la
%{_libdir}/hamlib-*.la
%{_mandir}/man8/rpc.rigd.8.gz
%{_mandir}/man8/rpc.rotd.8.gz
%{_mandir}/man1/rigctl.1.gz
%{_mandir}/man1/rigmem.1.gz
%{_mandir}/man1/rigswr.1.gz
%{_mandir}/man1/rotctl.1.gz

%files c++
%defattr(-, root, root)
%{_libdir}/libhamlib++-%{version}.so.2.0.0
%{_libdir}/libhamlib++.la

%files c++-devel
%defattr(-, root, root)
%{_libdir}/libhamlib++.so
%{_libdir}/libhamlib++.a
%{_includedir}/hamlib/rigclass.h
%{_includedir}/hamlib/rotclass.h

#%files perl
#%defattr(-, root, root)
#%{_libdir}/perl5/site_perl/5.8.3/i386-linux-thread-multi/auto/Hamlib/hamlib.so
#%{_libdir}/perl5/site_perl/5.8.3/i386-linux-thread-multi/auto/Hamlib/hamlib.bs
#%{_libdir}/perl5/site_perl/5.8.3/i386-linux-thread-multi/Hamlib.pm
#%{_libdir}/perl5/5.8.3/i386-linux-thread-multi/perllocal.pod
#%{_libdir}/perl5/site_perl/5.8.3/i386-linux-thread-multi/auto/Hamlib/.packlist
#%{_libdir}/perl5/site_perl/5.8.3/i386-linux-thread-multi/perltest.pl

%files python
%defattr(-, root, root)
%{_libdir}/python2.3/Hamlib.py
%{_libdir}/python2.3/Hamlib.pyc
%{_libdir}/python2.3/Hamlib.pyo

%files devel
%defattr(-, root, root)
%{_libdir}/libhamlib.so
%{_libdir}/libhamlib.a
%{_libdir}/hamlib-*.a
%{_datadir}/aclocal/hamlib.m4
%{_includedir}/hamlib/rig.h
%{_includedir}/hamlib/riglist.h
%{_includedir}/hamlib/rig_dll.h
%{_includedir}/hamlib/rotator.h
%{_includedir}/hamlib/rotlist.h
%{_libdir}/pkgconfig/hamlib.pc


%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-1
- Bump release to 1
- Fixed BuildRoot

* Mon Feb 10 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.3-0.iva.1
- Fixed error with automake in -devel (#26)

* Mon Jan 31 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.3-0.iva.0
- Upstream update

* Sun Jan  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.2-0.iva.1
- Fixed %files %defattr

* Sun Jan  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.2-0.iva.0
- Ported to FC3
- Upgraded to 1.2.2

* Sun Apr 18 2004 David L Norris <dave at webaugur.com>
- Enable disabled script bindings.
- Touch up descriptions.

* Tue Jan 20 2004 Tomi Manninen
- Fix for 1.1.5pre2
- Better use of rpm macros
- Disable all bindings

* Tue Oct 08 2003 Joop Stakenborg
- Fix 'make rpm' again by disabling c++ bindings.
- rotclass.h and rigclass.h go into the devel package for now (FIXME)

* Wed Jan 15 2003 Joop Stakenborg
- Fix the spec file for 1.1.4CVS
- 'make rpm' should work now

* Thu Jun 17 2002 Stephane Fillod
- Added rotator support
- Added RPC daemon, hamlib.m4
- Upstream version 1.1.3

* Mon Jul 18 2001 Stephane Fillod
- Made initial "working" SPEC file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hamlib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:04:48 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:05:32 -0000	1.2
@@ -0,0 +1 @@
+hamlib-1.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hamlib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:04:48 -0000	1.1
+++ sources	16 Mar 2005 17:05:32 -0000	1.2
@@ -0,0 +1 @@
+f049d6d126d5391adde5cc7838483564  hamlib-1.2.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:06:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:06:01 -0500
Subject: rpms/kphone - New directory
Message-ID: <200503161706.j2GH61uU003996@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3989/kphone

Log Message:
Directory /cvs/extras/rpms/kphone added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:06:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:06:01 -0500
Subject: rpms/kphone/devel - New directory
Message-ID: <200503161706.j2GH61xt003999@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3989/kphone/devel

Log Message:
Directory /cvs/extras/rpms/kphone/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:06:16 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:06:16 -0500
Subject: rpms/kphone Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161706.j2GH6Ghj004060@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4049

Added Files:
	Makefile import.log 
Log Message:
Setup of module kphone


--- NEW FILE Makefile ---
# Top level Makefile for module kphone
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:06:16 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:06:16 -0500
Subject: rpms/kphone/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161706.j2GH6Gr8004063@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4049/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kphone


--- 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 Mar 16 17:06:46 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:06:46 -0500
Subject: rpms/kphone import.log,1.1,1.2
Message-ID: <200503161706.j2GH6kpE004170@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4161

Modified Files:
	import.log 
Log Message:
auto-import kphone-4.1.0-0.iva.0 on branch devel from kphone-4.1.0-0.iva.0.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kphone/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:06:14 -0000	1.1
+++ import.log	16 Mar 2005 17:06:44 -0000	1.2
@@ -0,0 +1 @@
+kphone-4_1_0-0_iva_0:HEAD:kphone-4.1.0-0.iva.0.src.rpm:1110992800



From fedora-extras-commits at redhat.com  Wed Mar 16 17:06:46 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:06:46 -0500
Subject: rpms/kphone/devel kphone.desktop, NONE, 1.1 kphone.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161706.j2GH6kGa004174@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4161/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kphone.desktop kphone.spec 
Log Message:
auto-import kphone-4.1.0-0.iva.0 on branch devel from kphone-4.1.0-0.iva.0.src.rpm
Initial import


--- NEW FILE kphone.desktop ---
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Type=Application
Exec=kphone
Icon=kphone.png
Terminal=false
Name=kphone
GenericName=SIP VoIP Application
X-KDE-StartupNotify=true


--- NEW FILE kphone.spec ---
Name:           kphone
Version:        4.1.0
Release:        0.iva.0
Summary:        A SIP (Session Initiation Protocol) user agent for Linux

Group:          Applications/Communications
License:        GPL
URL:            http://www.wirlab.net/kphone/
Source0:        http://www.wirlab.net/kphone/kphone-4.1.0.tar.gz
Source1:        kphone.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils
Requires:       qt alsa-lib

%description
KPhone is a SIP (Session Initiation Protocol) user agent for Linux, with which you can initiate VoIP (Voice over IP) connections over the Internet.  It supports Presence and Instant Messaging, and to some extent also video calls between two hosts.

%prep
%setup -q -c kphone

%build
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
cd kphone
./configure --prefix=$RPM_BUILD_ROOT%{_prefix}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
cd kphone
%makeinstall
install -D -m 0644 icons/large-kphone.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kphone.png
desktop-file-install --vendor=Fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category Internet \
  --add-category Telephony \
  --add-category Qt \
  %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_bindir}/kphone
%{_datadir}/applications/*.desktop
%{_datadir}/apps/kphone
%{_datadir}/kphone
%{_datadir}/pixmaps/*.png

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-1
- Bump release to 1
- Added d-f-u to BR

* Sat Jan 22 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:4.1.0-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:06:14 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:06:44 -0000	1.2
@@ -0,0 +1 @@
+kphone-4.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:06:14 -0000	1.1
+++ sources	16 Mar 2005 17:06:44 -0000	1.2
@@ -0,0 +1 @@
+d226b44d34e99887e3169ddd52a4684d  kphone-4.1.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:07:15 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:07:15 -0500
Subject: rpms/ktrack - New directory
Message-ID: <200503161707.j2GH7F0b004297@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4290/ktrack

Log Message:
Directory /cvs/extras/rpms/ktrack added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:07:15 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:07:15 -0500
Subject: rpms/ktrack/devel - New directory
Message-ID: <200503161707.j2GH7FCB004300@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ktrack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4290/ktrack/devel

Log Message:
Directory /cvs/extras/rpms/ktrack/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:07:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:07:30 -0500
Subject: rpms/ktrack Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161707.j2GH7UuT004365@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4353

Added Files:
	Makefile import.log 
Log Message:
Setup of module ktrack


--- NEW FILE Makefile ---
# Top level Makefile for module ktrack
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:07:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:07:30 -0500
Subject: rpms/ktrack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161707.j2GH7U7I004368@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ktrack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4353/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ktrack


--- 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 Mar 16 17:08:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:08:09 -0500
Subject: rpms/ktrack import.log,1.1,1.2
Message-ID: <200503161708.j2GH89uC004481@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4472

Modified Files:
	import.log 
Log Message:
auto-import ktrack-0.3.0-1.rc1 on branch devel from ktrack-0.3.0-1.rc1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ktrack/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:07:28 -0000	1.1
+++ import.log	16 Mar 2005 17:08:07 -0000	1.2
@@ -0,0 +1 @@
+ktrack-0_3_0-1_rc1:HEAD:ktrack-0.3.0-1.rc1.src.rpm:1110992883



From fedora-extras-commits at redhat.com  Wed Mar 16 17:08:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:08:09 -0500
Subject: rpms/ktrack/devel ktrack-headers.patch, NONE, 1.1 ktrack.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161708.j2GH8910004485@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ktrack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4472/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ktrack-headers.patch ktrack.spec 
Log Message:
auto-import ktrack-0.3.0-1.rc1 on branch devel from ktrack-0.3.0-1.rc1.src.rpm
Initial import

ktrack-headers.patch:

--- NEW FILE ktrack-headers.patch ---
diff -ur ktrack-0.3.0-rc1.orig/ktrack/calculator.cpp ktrack-0.3.0-rc1/ktrack/calculator.cpp
--- ktrack-0.3.0-rc1.orig/ktrack/calculator.cpp	2005-01-09 04:51:43.793099259 -0500
+++ ktrack-0.3.0-rc1/ktrack/calculator.cpp	2004-01-09 07:49:39.000000000 -0500
@@ -17,6 +17,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <sys/time.h>
 #include <kstandarddirs.h>
 #include <qfile.h>
 #include <qtimer.h>
diff -ur ktrack-0.3.0-rc1.orig/ktrack/hamlibwrapper.cpp ktrack-0.3.0-rc1/ktrack/hamlibwrapper.cpp
--- ktrack-0.3.0-rc1.orig/ktrack/hamlibwrapper.cpp	2005-01-09 04:50:52.321676590 -0500
+++ ktrack-0.3.0-rc1/ktrack/hamlibwrapper.cpp	2004-01-18 03:25:00.000000000 -0500
@@ -17,6 +17,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <math.h>
 #include <kapplication.h>
 
 #include "hamlibwrapper.h"


--- NEW FILE ktrack.spec ---
Summary: Satellite prediction software for KDE
Name: ktrack
Version: 0.3.0
Release: 1.rc1
License: GPL
Group: Applications/Communications
Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
Patch: ktrack-headers.patch
Requires: kdelibs >= 3.3 hamlib = 1.2.3
BuildRequires: desktop-file-utils kdelibs-devel >= 3.3 hamlib-devel = 1.2.3
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
K-Track is an KDE3 satellite prediction software, especially suited for radio amateurs operating through the satellites that are providing linear transponders.

%prep
rm -rf $RPM_BUILD_ROOT
%setup -q -c %{name}-%{version}-rc1
pushd %{name}-%{version}-rc1
%patch -p 1 -b .headers
popd

%build
pushd %{name}-%{version}-rc1
%configure --with-qt-includes=/usr/lib/qt-3.3/include --with-qt-libraries=/usr/lib/qt-3.3/lib
make
popd

%install
rm -rf $RPM_BUILD_ROOT
pushd %{name}-%{version}-rc1
%makeinstall
desktop-file-install --vendor=Fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category HamRadio \
  --add-category KDE \
  ktrack/ktrack.desktop
install -D -m 0644 ktrack/hi32-app-ktrack.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ktrack.png
popd
rm -r $RPM_BUILD_ROOT%{_datadir}/doc

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_bindir}/ktrack
%{_datadir}/applnk/Applications/HamRadio/ktrack.desktop
%{_datadir}/apps/ktrack/earth.jpg
%{_datadir}/apps/ktrack/nasa.tle
%{_datadir}/apps/ktrack/night.jpg
%{_datadir}/icons/hicolor/16x16/apps/ktrack.png
%{_datadir}/icons/hicolor/32x32/apps/ktrack.png
%{_datadir}/icons/locolor/16x16/apps/ktrack.png
%{_datadir}/icons/locolor/32x32/apps/ktrack.png
%{_datadir}/locale/de/LC_MESSAGES/ktrack.mo
%{_datadir}/locale/fr/LC_MESSAGES/ktrack.mo
%{_datadir}/applications/Fedora-ktrack.desktop
%{_datadir}/pixmaps/ktrack.png
%doc %{name}-%{version}-rc1/AUTHORS %{name}-%{version}-rc1/ChangeLog %{name}-%{version}-rc1/COPYING %{name}-%{version}-rc1/README %{name}-%{version}-rc1/TODO %{name}-%{version}-rc1/doc/en/index.docbook %{name}-%{version}-rc1/doc/en/index.cache.bz2

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-1.rc1
- Bump release to 1
- Fixed BuildRoot
- Added -with-qt-* options to %configure

* Mon Jan 31 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.3.0-0.iva.1.rc1
- Rebuild against hamlib 1.2.3

* Sun Jan  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.3.0-0.iva.0.rc1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ktrack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:07:28 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:08:07 -0000	1.2
@@ -0,0 +1 @@
+ktrack-0.3.0-rc1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ktrack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:07:28 -0000	1.1
+++ sources	16 Mar 2005 17:08:07 -0000	1.2
@@ -0,0 +1 @@
+032c914ab7316471505265e6a68d9da3  ktrack-0.3.0-rc1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar 16 17:08:36 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:08:36 -0500
Subject: rpms/leafpad - New directory
Message-ID: <200503161708.j2GH8abT004615@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4603/leafpad

Log Message:
Directory /cvs/extras/rpms/leafpad added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:08:36 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:08:36 -0500
Subject: rpms/leafpad/devel - New directory
Message-ID: <200503161708.j2GH8a47004618@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/leafpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4603/leafpad/devel

Log Message:
Directory /cvs/extras/rpms/leafpad/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:08:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:08:50 -0500
Subject: rpms/leafpad Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161708.j2GH8os4004680@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4671

Added Files:
	Makefile import.log 
Log Message:
Setup of module leafpad


--- NEW FILE Makefile ---
# Top level Makefile for module leafpad
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:08:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:08:50 -0500
Subject: rpms/leafpad/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161708.j2GH8oEr004683@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/leafpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4671/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module leafpad


--- 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 Mar 16 17:09:18 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:09:18 -0500
Subject: rpms/leafpad import.log,1.1,1.2
Message-ID: <200503161709.j2GH9Is6004788@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4779

Modified Files:
	import.log 
Log Message:
auto-import leafpad-0.7.9-1 on branch devel from leafpad-0.7.9-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/leafpad/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:08:48 -0000	1.1
+++ import.log	16 Mar 2005 17:09:16 -0000	1.2
@@ -0,0 +1 @@
+leafpad-0_7_9-1:HEAD:leafpad-0.7.9-1.src.rpm:1110992952



From fedora-extras-commits at redhat.com  Wed Mar 16 17:09:18 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:09:18 -0500
Subject: rpms/leafpad/devel leafpad-0.7.9-file_chooser.patch, NONE,
	1.1 leafpad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161709.j2GH9Ivl004792@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/leafpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4779/devel

Modified Files:
	.cvsignore sources 
Added Files:
	leafpad-0.7.9-file_chooser.patch leafpad.spec 
Log Message:
auto-import leafpad-0.7.9-1 on branch devel from leafpad-0.7.9-1.src.rpm
Initial import

leafpad-0.7.9-file_chooser.patch:

--- NEW FILE leafpad-0.7.9-file_chooser.patch ---
diff -uNr leafpad-0.7.9.orig/src/callback.c leafpad-0.7.9/src/callback.c
--- leafpad-0.7.9.orig/src/callback.c	2004-12-20 03:58:26.000000000 -0800
+++ leafpad-0.7.9/src/callback.c	2004-12-28 18:43:09.000000000 -0800
@@ -93,7 +93,7 @@
 	
 	if (!check_text_modification(sd)) {
 //		fi = get_file_info_by_selector(OPEN, sd->fi);
-		fi = get_fileinfo_from_selector(sd->mainwin->window, sd->fi, OPEN);
+		fi = get_fileinfo_from_chooser(sd->mainwin->window, sd->fi, OPEN);
 		if (fi) {
 			if (file_open_real(sd->mainwin->textview, fi)) {
 				g_free(fi);
@@ -123,7 +123,7 @@
 {
 	FileInfo *fi;
 	
-	fi = get_fileinfo_from_selector(sd->mainwin->window, sd->fi, SAVE);
+	fi = get_fileinfo_from_chooser(sd->mainwin->window, sd->fi, SAVE);
 	if (fi) {
 		if (file_save_real(sd->mainwin->textview, fi))
 			g_free(fi);
diff -uNr leafpad-0.7.9.orig/src/selector.c leafpad-0.7.9/src/selector.c
--- leafpad-0.7.9.orig/src/selector.c	2004-12-24 01:35:12.000000000 -0800
+++ leafpad-0.7.9/src/selector.c	2004-12-28 19:00:29.000000000 -0800
@@ -310,7 +310,7 @@
 	return option_menu;
 }
 
-static GtkWidget *create_file_selector(FileInfo *selected_fi)
+static GtkWidget *create_file_chooser(FileInfo *selected_fi, GtkWidget *window)
 {
 	GtkWidget *filesel;
 	GtkWidget *align;
@@ -322,12 +322,19 @@
 	
 	title = mode ? _("Open") : _("Save As");
 	
-	filesel = gtk_file_selection_new(title);
-//	gtk_window_set_transient_for(GTK_WINDOW(filesel), GTK_WINDOW(window));
+	if(mode == OPEN)
+		filesel = gtk_file_chooser_dialog_new(title, GTK_WINDOW(window),
+				GTK_FILE_CHOOSER_ACTION_OPEN,
+				GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,
+				GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,NULL);
+	else
+		filesel = gtk_file_chooser_dialog_new(title, GTK_WINDOW(window),
+				GTK_FILE_CHOOSER_ACTION_SAVE,
+				GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,
+				GTK_STOCK_SAVE,GTK_RESPONSE_ACCEPT,NULL);
 	
 	align = gtk_alignment_new(1, 0, 0, 0);
-	gtk_box_pack_end(GTK_BOX(GTK_FILE_SELECTION(filesel)->main_vbox),
-		align, FALSE, FALSE, 0);
+	gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(filesel),align);
 	table = gtk_table_new(2, 2, FALSE);
 	gtk_table_set_row_spacings(GTK_TABLE(table), 5);
 	gtk_container_add(GTK_CONTAINER(align), table);
@@ -340,15 +347,15 @@
 		option_menu_lineend = create_lineend_menu(selected_fi);
 		gtk_table_attach_defaults(GTK_TABLE(table), option_menu_lineend, 1, 2, 0, 1);
 	}
-	gtk_widget_show_all(GTK_FILE_SELECTION(filesel)->main_vbox);
+	gtk_widget_show_all(GTK_FILE_CHOOSER(filesel));
 	
 	if (selected_fi->filename)
-		gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), selected_fi->filename);
+		gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(filesel), selected_fi->filename);
 	
 	return filesel;
 }
 
-FileInfo *get_fileinfo_from_selector(GtkWidget *window, FileInfo *fi, gint requested_mode)
+FileInfo *get_fileinfo_from_chooser(GtkWidget *window, FileInfo *fi, gint requested_mode)
 {
 	FileInfo *selected_fi;
 	GtkWidget *filesel;
@@ -366,24 +373,24 @@
 	selected_fi->manual_charset =
 		fi->manual_charset ? g_strdup(fi->manual_charset) : NULL;
 	
-	filesel = create_file_selector(selected_fi);
+	filesel = create_file_chooser(selected_fi,window);
 	
 	gtk_window_set_transient_for(GTK_WINDOW(filesel), GTK_WINDOW(window));
 	
 	do {
 		res = gtk_dialog_run(GTK_DIALOG(filesel));
-		if (res == GTK_RESPONSE_OK) {
+		if (res == GTK_RESPONSE_ACCEPT) {
 			if (selected_fi->filename)
 				g_free(selected_fi->filename);
 			selected_fi->filename = g_strdup(
-				gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel)));
+				gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filesel)));
 			if (g_file_test(selected_fi->filename, G_FILE_TEST_IS_DIR)) {
 				len = strlen(selected_fi->filename);
 				if (len < 1 || selected_fi->filename[len - 1] != G_DIR_SEPARATOR)
 					str = g_strconcat(selected_fi->filename, G_DIR_SEPARATOR_S, NULL);
 				else
 					str = g_strdup(selected_fi->filename);
-				gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), str);
+				gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), str);
 				g_free(str);
 				continue;
 			}
@@ -397,14 +404,14 @@
 				case GTK_RESPONSE_NO:
 					continue;
 				case GTK_RESPONSE_YES:
-					res = GTK_RESPONSE_OK;
+					res = GTK_RESPONSE_ACCEPT;
 				}
 			}
 		}
 		gtk_widget_hide(filesel);
 	} while (GTK_WIDGET_VISIBLE(filesel));
 	
-	if (res != GTK_RESPONSE_OK) {
+	if (res != GTK_RESPONSE_ACCEPT) {
 		if (selected_fi->charset)
 			g_free(selected_fi->charset);
 		if (selected_fi->manual_charset)
diff -uNr leafpad-0.7.9.orig/src/selector.h leafpad-0.7.9/src/selector.h
--- leafpad-0.7.9.orig/src/selector.h	2004-12-20 16:51:06.000000000 -0800
+++ leafpad-0.7.9/src/selector.h	2004-12-28 18:43:09.000000000 -0800
@@ -30,6 +30,6 @@
 	OPEN
 };
 
-FileInfo *get_fileinfo_from_selector(GtkWidget *window, FileInfo *fi, gint requested_mode);
+FileInfo *get_fileinfo_from_chooser(GtkWidget *window, FileInfo *fi, gint requested_mode);
 
 #endif  /* _SELECTOR_H */


--- NEW FILE leafpad.spec ---
Name:           leafpad
Version:        0.7.9
Release:        1
Summary:        GTK+ based simple text editor

Group:          Applications/Editors
License:        GPL
URL:            http://tarot.freeshell.org/leafpad/
Source0:        http://savannah.nongnu.org/download/leafpad/leafpad-0.7.9.tar.gz
Patch0:         leafpad-0.7.9-file_chooser.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.4
Requires:       gtk2 >= 2.4
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils

%description
Leafpad is a GTK+ based simple text editor. The user interface is similar to Notepad. It aims to be lighter than GEdit and KWrite, and to be as useful as them.

%prep
%setup -q
%patch -p 1 -b .filechooser

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_datadir}/applications/leafpad.desktop
cat >> leafpad.desktop << EOF
StartupNotify=true
EOF
desktop-file-install --vendor=Fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category Utility \
  --add-category TextEditor \
  --add-category GTK \
  leafpad.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post
update-desktop-database

%postun
update-desktop-database

%files
%defattr(-,root,root,-)
%{_bindir}/leafpad
%{_datadir}/applications/Fedora-leafpad.desktop
%{_datadir}/locale/*/LC_MESSAGES/leafpad.mo
%{_datadir}/pixmaps/leafpad.png

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-1
- Bump release to 1

* Thu Feb  3 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.7.9-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:08:48 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:09:16 -0000	1.2
@@ -0,0 +1 @@
+leafpad-0.7.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:08:48 -0000	1.1
+++ sources	16 Mar 2005 17:09:16 -0000	1.2
@@ -0,0 +1 @@
+01d851421f554cce3867e39bb258c414  leafpad-0.7.9.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:09:46 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:09:46 -0500
Subject: rpms/libosip - New directory
Message-ID: <200503161709.j2GH9k5m004915@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4908/libosip

Log Message:
Directory /cvs/extras/rpms/libosip added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:09:46 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:09:46 -0500
Subject: rpms/libosip/devel - New directory
Message-ID: <200503161709.j2GH9kTo004918@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libosip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4908/libosip/devel

Log Message:
Directory /cvs/extras/rpms/libosip/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:10:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:10:02 -0500
Subject: rpms/libosip Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161710.j2GHA2H0004980@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4971

Added Files:
	Makefile import.log 
Log Message:
Setup of module libosip


--- NEW FILE Makefile ---
# Top level Makefile for module libosip
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:10:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:10:02 -0500
Subject: rpms/libosip/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161710.j2GHA2Rp004983@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libosip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4971/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libosip


--- 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 Mar 16 17:10:32 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:10:32 -0500
Subject: rpms/libosip import.log,1.1,1.2
Message-ID: <200503161710.j2GHAWd9005087@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5078

Modified Files:
	import.log 
Log Message:
auto-import libosip-0.9.7-1 on branch devel from libosip-0.9.7-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libosip/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:10:00 -0000	1.1
+++ import.log	16 Mar 2005 17:10:30 -0000	1.2
@@ -0,0 +1 @@
+libosip-0_9_7-1:HEAD:libosip-0.9.7-1.src.rpm:1110993026



From fedora-extras-commits at redhat.com  Wed Mar 16 17:10:32 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:10:32 -0500
Subject: rpms/libosip/devel libosip.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503161710.j2GHAWlM005091@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libosip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5078/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libosip.spec 
Log Message:
auto-import libosip-0.9.7-1 on branch devel from libosip-0.9.7-1.src.rpm
Initial import


--- NEW FILE libosip.spec ---
Name:           libosip
Version:        0.9.7
Release:        1
Summary:        oSIP is an implementation of SIP

Group:          System Environment/Libraries
License:        LGPL
URL:            http://www.fsf.org/software/osip/osip.html
Source0:        http://ftp.gnu.org/gnu/osip/libosip-0.9.7.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
oSIP is an implementation of SIP.

SIP stands for the Session Initiation Protocol and is described by the rfc3261 (wich deprecates rfc2543). This library aims to provide multimedia and telecom software developers an easy and powerful interface to initiate and control SIP based sessions in their applications. SIP is a open standard replacement from IETF for H323.

%package        devel
Summary:        Development libraries for oSIP
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The GNU oSIP library is written in C and get no dependencies except the standard C library. oSIP is thread safe and will generally be used in a multi-threaded application. Nevertheless, this is optional.

oSIP is little in size and code and thus could be use to implement IP soft-phone as well as embedded SIP software. oSIP is not limited to endpoint agents, and can also be used to implement "SIP proxy".

oSIP does not intend to provide a high layer API for controlling "SIP Session" at this step. Instead, it currently provides an API for the SIP message parser, SDP message parser, and library to handle "SIP transactions" as defined by the SIP document.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/ldconfig

%preun

%postun
/sbin/ldconfig

%files
%defattr(-,root,root)
%{_libdir}/*.so.*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root)
%{_includedir}/osip/*.h
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/*.so

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-1
- Bump release to 1

* Fri Jan 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.9.7-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libosip/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:10:00 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:10:30 -0000	1.2
@@ -0,0 +1 @@
+libosip-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libosip/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:10:00 -0000	1.1
+++ sources	16 Mar 2005 17:10:30 -0000	1.2
@@ -0,0 +1 @@
+1c97d2bbc042ba318b1ad422b6109537  libosip-0.9.7.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:10:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:10:59 -0500
Subject: rpms/linphone - New directory
Message-ID: <200503161710.j2GHAxki005214@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5207/linphone

Log Message:
Directory /cvs/extras/rpms/linphone added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:10:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:10:59 -0500
Subject: rpms/linphone/devel - New directory
Message-ID: <200503161710.j2GHAxn9005217@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5207/linphone/devel

Log Message:
Directory /cvs/extras/rpms/linphone/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:11:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:11:13 -0500
Subject: rpms/linphone Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161711.j2GHBDAx005279@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5270

Added Files:
	Makefile import.log 
Log Message:
Setup of module linphone


--- NEW FILE Makefile ---
# Top level Makefile for module linphone
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:11:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:11:13 -0500
Subject: rpms/linphone/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161711.j2GHBDg0005282@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5270/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module linphone


--- 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 Mar 16 17:12:27 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:12:27 -0500
Subject: rpms/linphone import.log,1.1,1.2
Message-ID: <200503161712.j2GHCRYH005415@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5406

Modified Files:
	import.log 
Log Message:
auto-import linphone-0.12.2-1 on branch devel from linphone-0.12.2-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/linphone/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:11:11 -0000	1.1
+++ import.log	16 Mar 2005 17:12:25 -0000	1.2
@@ -0,0 +1 @@
+linphone-0_12_2-1:HEAD:linphone-0.12.2-1.src.rpm:1110993141



From fedora-extras-commits at redhat.com  Wed Mar 16 17:12:27 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:12:27 -0500
Subject: rpms/linphone/devel linphone-0.12.2-docs.patch, NONE,
	1.1 linphone-0.12.2-speex.patch, NONE, 1.1 linphone.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161712.j2GHCRRV005419@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5406/devel

Modified Files:
	.cvsignore sources 
Added Files:
	linphone-0.12.2-docs.patch linphone-0.12.2-speex.patch 
	linphone.spec 
Log Message:
auto-import linphone-0.12.2-1 on branch devel from linphone-0.12.2-1.src.rpm
Initial import

linphone-0.12.2-docs.patch:

--- NEW FILE linphone-0.12.2-docs.patch ---
--- linphone-0.12.2/oRTP/configure.orig	2005-01-21 11:24:48.993986731 -0500
+++ linphone-0.12.2/oRTP/configure	2005-01-21 11:25:08.144473681 -0500
@@ -20640,7 +20640,7 @@
 
 
 
-                                                  ac_config_files="$ac_config_files Makefile src/Makefile docs/Makefile build/Makefile build/win32/Makefile"
+                                                  ac_config_files="$ac_config_files Makefile src/Makefile build/Makefile build/win32/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -21206,7 +21206,6 @@
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
   "build/Makefile" ) CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
   "build/win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES build/win32/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
--- linphone-0.12.2/oRTP/Makefile.am.orig	2005-01-21 11:28:40.834457361 -0500
+++ linphone-0.12.2/oRTP/Makefile.am	2005-01-21 11:28:46.102490995 -0500
@@ -6,7 +6,7 @@
 EXTRA_DIST=oRTP.prj   ortp-config.h.in	TODO
 
 
-SUBDIRS=src docs build
+SUBDIRS=src build
 
 mod-dist:
 	mkdir oRTP-bin
--- linphone-0.12.2/osipua/configure.orig	2005-01-21 11:33:56.904478419 -0500
+++ linphone-0.12.2/osipua/configure	2005-01-21 11:34:22.628759708 -0500
@@ -22300,7 +22300,7 @@
 
 
 
-                              ac_config_files="$ac_config_files Makefile src/Makefile docs/Makefile"
+                              ac_config_files="$ac_config_files Makefile src/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -22852,7 +22852,6 @@
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "osipua-config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS osipua-config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--- linphone-0.12.2/osipua/Makefile.am.orig	2005-01-21 11:34:02.887380950 -0500
+++ linphone-0.12.2/osipua/Makefile.am	2005-01-21 11:34:29.713460135 -0500
@@ -1,3 +1,3 @@
 EXTRA_DIST=	osipua-config.h.in
 
-SUBDIRS=src docs
+SUBDIRS=src
--- linphone-0.12.2/oRTP/Makefile.in.orig	2005-03-15 21:27:48.740665660 -0500
+++ linphone-0.12.2/oRTP/Makefile.in	2005-03-15 21:27:55.102342712 -0500
@@ -110,7 +110,7 @@
 #dist...
 EXTRA_DIST = oRTP.prj   ortp-config.h.in	TODO
 
-SUBDIRS = src docs build
+SUBDIRS = src build
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
--- linphone-0.12.2/osipua/Makefile.in.orig	2005-03-15 21:43:26.476524155 -0500
+++ linphone-0.12.2/osipua/Makefile.in	2005-03-15 21:43:31.467515812 -0500
@@ -102,7 +102,7 @@
 osip_prefix = @osip_prefix@
 EXTRA_DIST = osipua-config.h.in
 
-SUBDIRS = src docs
+SUBDIRS = src
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs

linphone-0.12.2-speex.patch:

--- NEW FILE linphone-0.12.2-speex.patch ---
--- linphone-0.12.2/Makefile.am.speex	2004-03-31 15:40:14.000000000 -0500
+++ linphone-0.12.2/Makefile.am	2005-01-21 11:46:24.109386492 -0500
@@ -6,11 +6,11 @@
 
 if BUILD_SPEEX
 SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \
-                $(WIN32ACM_DIR) speex mediastreamer \
+                $(WIN32ACM_DIR) mediastreamer \
 		media_api osipua coreapi console gnome share developer-docs
 else
 SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \
-                $(WIN32ACM_DIR) speex mediastreamer \
+                $(WIN32ACM_DIR) mediastreamer \
 		media_api osipua coreapi console gnome share developer-docs
 endif
 
--- linphone-0.12.2/Makefile.in.orig	2005-03-15 21:37:06.508714564 -0500
+++ linphone-0.12.2/Makefile.in	2005-03-15 21:37:41.282614403 -0500
@@ -157,11 +157,11 @@
 @BUILD_TRUESPEECH_TRUE at WIN32ACM_DIR = win32acm
 
 @BUILD_SPEEX_TRUE at SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \
- at BUILD_SPEEX_TRUE@                $(WIN32ACM_DIR) speex mediastreamer \
+ at BUILD_SPEEX_TRUE@                $(WIN32ACM_DIR) mediastreamer \
 @BUILD_SPEEX_TRUE@		media_api osipua coreapi console gnome share developer-docs
 
 @BUILD_SPEEX_FALSE at SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \
- at BUILD_SPEEX_FALSE@                $(WIN32ACM_DIR) speex mediastreamer \
+ at BUILD_SPEEX_FALSE@                $(WIN32ACM_DIR) mediastreamer \
 @BUILD_SPEEX_FALSE@		media_api osipua coreapi console gnome share developer-docs
 
 


--- NEW FILE linphone.spec ---
Name:           linphone
Version:        0.12.2
Release:        1
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/0.12.2/source/linphone-0.12.2.tar.gz
Patch:          linphone-0.12.2-docs.patch
Patch1:         linphone-0.12.2-speex.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
BuildRequires:  libosip-devel speex-devel gettext
Requires:       gnome-panel libgnomeui glib2 alsa-lib libosip speex
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Linphone is mostly sip compliant. It works successfully with these implementations:
    * eStara softphone (commercial software for windows)
    * Pingtel phones (with DNS enabled and VLAN QOS support disabled).
    * Hotsip, a free of charge phone for Windows.
    * Vocal, an open source SIP stack from Vovida that includes a SIP proxy that works with linphone since version 0.7.1.
    * Siproxd is a free sip proxy being developped by Thomas Ries because he would like to have linphone working behind his firewall. Siproxd is simple to setup and works perfectly with linphone.
    * Partysip aims at being a generic and fully functionnal SIP proxy. Visit the web page for more details on its functionalities.

Linphone may work also with other sip phones, but this has not been tested yet.

%package devel
Summary:        Development libraries for linphone
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
Libraries required to develop software with linphone

%prep
%setup -q
%patch -p 1 -b .docs
%patch1 -p 1 -b .speex
rm -r $RPM_BUILD_DIR/linphone-0.12.2/oRTP/docs
rm -r $RPM_BUILD_DIR/linphone-0.12.2/speex

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/ldconfig

%postun
/sbin/ldconfig

%files
%defattr(-,root,root)
%{_bindir}/*
%{_libdir}/bonobo
%{_libdir}/*.so.*
%{_libexecdir}/*
%{_mandir}/man1/*
%{_datadir}/gnome
%{_datadir}/gnome-2.0
%{_datadir}/gtk-doc
%{_datadir}/linphonec/linphonec
%{_datadir}/locale/*/*
%{_datadir}/pixmaps
%{_datadir}/sounds

%files devel
%defattr(-,root,root)
%{_includedir}/*/*.h
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-1
- Bump release to 1
- Cleaned up the -docs and -speex patches

* Fri Jan 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.12.2-0.iva.1
- Fixed a silly spec error

* Fri Jan 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.12.2-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:11:11 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:12:25 -0000	1.2
@@ -0,0 +1 @@
+linphone-0.12.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:11:11 -0000	1.1
+++ sources	16 Mar 2005 17:12:25 -0000	1.2
@@ -0,0 +1 @@
+86c01dbbcdb41786229f51ec0994ff67  linphone-0.12.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:12:55 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:12:55 -0500
Subject: rpms/lock-keys-applet - New directory
Message-ID: <200503161712.j2GHCtqj005543@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5536/lock-keys-applet

Log Message:
Directory /cvs/extras/rpms/lock-keys-applet added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:12:55 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:12:55 -0500
Subject: rpms/lock-keys-applet/devel - New directory
Message-ID: <200503161712.j2GHCtaw005546@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5536/lock-keys-applet/devel

Log Message:
Directory /cvs/extras/rpms/lock-keys-applet/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:13:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:13:09 -0500
Subject: rpms/lock-keys-applet Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161713.j2GHD99f005611@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5599

Added Files:
	Makefile import.log 
Log Message:
Setup of module lock-keys-applet


--- NEW FILE Makefile ---
# Top level Makefile for module lock-keys-applet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:13:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:13:09 -0500
Subject: rpms/lock-keys-applet/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161713.j2GHD99a005614@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5599/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lock-keys-applet


--- 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 Mar 16 17:13:35 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:13:35 -0500
Subject: rpms/lock-keys-applet/devel lock-keys-applet.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161713.j2GHDZwX005717@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5704/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lock-keys-applet.spec 
Log Message:
auto-import lock-keys-applet-1.0-1 on branch devel from lock-keys-applet-1.0-1.src.rpm
Initial import


--- NEW FILE lock-keys-applet.spec ---
Name:           lock-keys-applet
Version:        1.0
Release:        1
Summary:        A GNOME panel applet that shows the status of the lock keys
Group:          Applications/System
License:        GPL
URL:            http://mfcn.ilo.de/led_applet/
Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libgnomeui-devel gnome-panel-devel
Requires:       libgnomeui gnome-panel
Requires(post): scrollkeeper
Requires(postun): scrollkeeper

%description
lock-keys-applet is a GNOME applet that shows the status of the Caps, Num and Scroll Lock keys of your keyboard. This isn't especially usefull for normal keyboards as they have LEDs for that. But some keyboards (especially wireless keyboards) don't. One more feature of the applet is that it saves the status of the lock keys and restores them when starting GNOME.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%post
scrollkeeper-update

%postun
scrollkeeper-update

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_datadir}/gnome/help/%{name}
%{_datadir}/locale/*/*/%{name}.mo
%{_datadir}/omf/%{name}
%{_datadir}/pixmaps/%{name}.png
%{_libdir}/bonobo/servers/*.server
%{_libexecdir}/%{name}

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-1
- Bump release to 1
- Added Requires(post) and Requires(postun)

* Mon Feb  7 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.0-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lock-keys-applet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:13:07 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:13:33 -0000	1.2
@@ -0,0 +1 @@
+lock-keys-applet-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lock-keys-applet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:13:07 -0000	1.1
+++ sources	16 Mar 2005 17:13:33 -0000	1.2
@@ -0,0 +1 @@
+8dc772d62f0881c8978513d7e69de3db  lock-keys-applet-1.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:13:35 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:13:35 -0500
Subject: rpms/lock-keys-applet import.log,1.1,1.2
Message-ID: <200503161713.j2GHDZE4005714@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5704

Modified Files:
	import.log 
Log Message:
auto-import lock-keys-applet-1.0-1 on branch devel from lock-keys-applet-1.0-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lock-keys-applet/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:13:07 -0000	1.1
+++ import.log	16 Mar 2005 17:13:33 -0000	1.2
@@ -0,0 +1 @@
+lock-keys-applet-1_0-1:HEAD:lock-keys-applet-1.0-1.src.rpm:1110993210



From fedora-extras-commits at redhat.com  Wed Mar 16 17:13:57 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:13:57 -0500
Subject: rpms/pam_mysql - New directory
Message-ID: <200503161713.j2GHDvHB005840@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5833/pam_mysql

Log Message:
Directory /cvs/extras/rpms/pam_mysql added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:13:57 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:13:57 -0500
Subject: rpms/pam_mysql/devel - New directory
Message-ID: <200503161713.j2GHDvUP005843@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5833/pam_mysql/devel

Log Message:
Directory /cvs/extras/rpms/pam_mysql/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:14:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:14:13 -0500
Subject: rpms/pam_mysql Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161714.j2GHEDSg005905@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5896

Added Files:
	Makefile import.log 
Log Message:
Setup of module pam_mysql


--- NEW FILE Makefile ---
# Top level Makefile for module pam_mysql
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:14:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:14:13 -0500
Subject: rpms/pam_mysql/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161714.j2GHEDma005908@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5896/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pam_mysql


--- 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 Mar 16 17:14:36 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:14:36 -0500
Subject: rpms/pam_mysql import.log,1.1,1.2
Message-ID: <200503161714.j2GHEaTD006009@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5999

Modified Files:
	import.log 
Log Message:
auto-import pam_mysql-0.50-2 on branch devel from pam_mysql-0.50-2.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:14:10 -0000	1.1
+++ import.log	16 Mar 2005 17:14:34 -0000	1.2
@@ -0,0 +1 @@
+pam_mysql-0_50-2:HEAD:pam_mysql-0.50-2.src.rpm:1110993270



From fedora-extras-commits at redhat.com  Wed Mar 16 17:14:36 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:14:36 -0500
Subject: rpms/pam_mysql/devel pam_mysql.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503161714.j2GHEaea006012@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5999/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pam_mysql.spec 
Log Message:
auto-import pam_mysql-0.50-2 on branch devel from pam_mysql-0.50-2.src.rpm
Initial import


--- NEW FILE pam_mysql.spec ---
Summary:	PAM module for auth UNIX users using MySQL data base
Summary(pl):	modu? PAM uwierzytelniaj?cy u?ytkownik?w Linuksa poprzez baz? danych MySQL
Name:		pam_mysql
Version:	0.50
Release:	2
License:	GPL
Group:		Base
Source0:	http://dl.sf.net/pam-mysql/pam_mysql-0.5.tar.gz
URL:		http://sf.net/projects/pam-mysql/
BuildRequires:	pam-devel mysql-devel
Requires:       pam mysql
BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)

%description
Pam_mysql aims to provide a backend neutral means of authenticating
users against an MySQL database.

%description -l pl
Modu? PAM pozwalaj?cy na uwierzytelnianie u?ytkownik?w Linuksa poprzez
baz? danych MySQL.

%prep
%setup -q -n %{name}

%build
make

%install
rm -rf $RPM_BUILD_ROOT
install -D -m 755 pam_mysql.so $RPM_BUILD_ROOT/%{_lib}/security/pam_mysql.so

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc Readme Changelog
/%{_lib}/security/pam_mysql.so

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-2
- Bump release to 2
- Added Requires

* Fri Jan  7 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.50-1.iva.0
- Retooled spec file for FC3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:14:11 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:14:34 -0000	1.2
@@ -0,0 +1 @@
+pam_mysql-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:14:11 -0000	1.1
+++ sources	16 Mar 2005 17:14:34 -0000	1.2
@@ -0,0 +1 @@
+8cf002392292ae2a5774545324739a94  pam_mysql-0.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:15:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:15:03 -0500
Subject: rpms/python-amara - New directory
Message-ID: <200503161715.j2GHF3JH006136@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6129/python-amara

Log Message:
Directory /cvs/extras/rpms/python-amara added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:15:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:15:03 -0500
Subject: rpms/python-amara/devel - New directory
Message-ID: <200503161715.j2GHF3cD006139@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6129/python-amara/devel

Log Message:
Directory /cvs/extras/rpms/python-amara/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:15:19 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:15:19 -0500
Subject: rpms/python-amara Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161715.j2GHFJ00006208@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6199

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-amara


--- NEW FILE Makefile ---
# Top level Makefile for module python-amara
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:15:19 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:15:19 -0500
Subject: rpms/python-amara/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161715.j2GHFJUT006211@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6199/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-amara


--- 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 Mar 16 17:15:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:15:50 -0500
Subject: rpms/python-amara import.log,1.1,1.2
Message-ID: <200503161715.j2GHFoQ4006318@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6309

Modified Files:
	import.log 
Log Message:
auto-import python-amara-0.9.4-1 on branch devel from python-amara-0.9.4-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-amara/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:15:17 -0000	1.1
+++ import.log	16 Mar 2005 17:15:48 -0000	1.2
@@ -0,0 +1 @@
+python-amara-0_9_4-1:HEAD:python-amara-0.9.4-1.src.rpm:1110993344



From fedora-extras-commits at redhat.com  Wed Mar 16 17:15:50 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:15:50 -0500
Subject: rpms/python-amara/devel python-amara.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503161715.j2GHFoel006322@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6309/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-amara.spec 
Log Message:
auto-import python-amara-0.9.4-1 on branch devel from python-amara-0.9.4-1.src.rpm
Initial import


--- NEW FILE python-amara.spec ---
%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}

Name:           python-amara
Version:        0.9.4
Release:        1
Summary:        A collection of Pythonic tools for XML data binding

Group:          Development/Libraries
License:        ASL-derived
URL:            http://uche.ogbuji.net/uche.ogbuji.net/tech/4Suite/amara/
Source0:        http://uche.ogbuji.net/uche.ogbuji.net/tech/4Suite/amara/Amara-0.9.4.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python
Requires:       python >= 2.3 4Suite >= 1.0
Provides:       python-Amara = %{version} Amara = %{version}
BuildArch:      noarch

%description
Amara is a collection of Pythonic tools for XML data binding. Not just tools that happen to be written in Python, but tools built from the ground up to use Python idioms and take advantage of the many advantages of Python over other programming languages.

Amara builds on 4Suite, but whereas 4Suite focuses more on literal implementation of XML standards in Python, Amara adds a much more Pythonic face to these capabilities.

Amara provides tools you can trust to conform with XML standards without losing the familiar Python feel.

%prep
%setup -q -c Amara-0.9.4

%build
cd Amara-0.9.4
python setup.py build

%install
rm -rf $RPM_BUILD_ROOT
cd Amara-0.9.4
python setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/flextyper.py
%{_bindir}/scimitar.py
%{_libdir}/python%{pyver}/site-packages/amara/*
%doc Amara-0.9.4/CHANGES Amara-0.9.4/COPYING Amara-0.9.4/demo Amara-0.9.4/manual.html Amara-0.9.4/README Amara-0.9.4/TODO

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-1
- Bump release to 1

* Fri Feb  4 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.9.4-0.iva.0
- Upstream update

* Mon Jan 31 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.9.3-0.iva.0
- Upstream update

* Thu Jan 20 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.9.2-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-amara/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:15:17 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:15:48 -0000	1.2
@@ -0,0 +1 @@
+Amara-0.9.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-amara/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:15:17 -0000	1.1
+++ sources	16 Mar 2005 17:15:48 -0000	1.2
@@ -0,0 +1 @@
+916d2b60e59e10b6a7780d3bc7522046  Amara-0.9.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar 16 17:16:18 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:16:18 -0500
Subject: rpms/python-HTMLgen - New directory
Message-ID: <200503161716.j2GHGIJu006443@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6436/python-HTMLgen

Log Message:
Directory /cvs/extras/rpms/python-HTMLgen added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:16:18 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:16:18 -0500
Subject: rpms/python-HTMLgen/devel - New directory
Message-ID: <200503161716.j2GHGI2L006446@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6436/python-HTMLgen/devel

Log Message:
Directory /cvs/extras/rpms/python-HTMLgen/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:16:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:16:33 -0500
Subject: rpms/python-HTMLgen Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161716.j2GHGXOT006513@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6504

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-HTMLgen


--- NEW FILE Makefile ---
# Top level Makefile for module python-HTMLgen
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:16:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:16:33 -0500
Subject: rpms/python-HTMLgen/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161716.j2GHGXtx006516@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6504/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-HTMLgen


--- 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 Mar 16 17:17:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:17:01 -0500
Subject: rpms/python-HTMLgen import.log,1.1,1.2
Message-ID: <200503161717.j2GHH14f006621@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6610

Modified Files:
	import.log 
Log Message:
auto-import python-HTMLgen-2.2.2-0.iva.1 on branch devel from python-HTMLgen-2.2.2-0.iva.1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-HTMLgen/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:16:31 -0000	1.1
+++ import.log	16 Mar 2005 17:16:59 -0000	1.2
@@ -0,0 +1 @@
+python-HTMLgen-2_2_2-0_iva_1:HEAD:python-HTMLgen-2.2.2-0.iva.1.src.rpm:1110993415



From fedora-extras-commits at redhat.com  Wed Mar 16 17:17:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:17:01 -0500
Subject: rpms/python-HTMLgen/devel python-HTMLgen.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161717.j2GHH1Wn006627@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6610/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-HTMLgen.spec 
Log Message:
auto-import python-HTMLgen-2.2.2-0.iva.1 on branch devel from python-HTMLgen-2.2.2-0.iva.1.src.rpm
Initial import


--- NEW FILE python-HTMLgen.spec ---
%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')

%define version 2.2.2

%if "%{pyver}" == "%{mainpyver}"
%define name python-HTMLgen
%define prov python%{pyver}-htmlgen = %{version} python-htmlgen = %{version}
%else
%define name python%{pyver}-HTMLgen
%define prov python%{pyver}-htmlgen = %{version}
%endif

Name:           %name
Version:        %version
Release:        0.iva.1
Summary:        A class library for the generation of HTML documents

Group:          Development/Libraries
License:        See Source
URL:            http://starship.python.net/lib.html
Source0:        http://starship.python.net/crew/friedrich/HTMLgen.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Provides:       %{prov}
BuildRequires:  python-abi = %{pyver}
Requires:       python-abi = %{pyver}
Provides:       HTMLgen = %{version}
BuildArch:      noarch

%description
HTMLgen is a class library for the generation of HTML documents with Python scripts. It's used when you want to create HTML pages containing information which changes from time to time.

%prep
%setup -q -c htmlgen

%build

%install
rm -rf $RPM_BUILD_ROOT
install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
for file in HTMLgen.py HTMLcolors.py HTMLutil.py HTMLcalendar.py barchart.py colorcube.py imgsize.py NavLinks.py Formtools.py ImageH.py ImageFileH.py ImagePaletteH.py GifImagePluginH.py JpegImagePluginH.py PngImagePluginH.py; do
  install -m 0644 HTMLgen/$file $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
done
python%{pyver} %{_libdir}/python%{pyver}/compileall.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
python%{pyver} -O %{_libdir}/python%{pyver}/compileall.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_libdir}/python%pyver/site-packages/*.py
%{_libdir}/python%pyver/site-packages/*.py[co]

%changelog
* Thu Mar 10 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-0.iva.1
- Name changed to python-HTMLgen to match module import
- %pyver cleanups

* Thu Jan 20 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-0.iva.0
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-HTMLgen/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:16:31 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:16:59 -0000	1.2
@@ -0,0 +1 @@
+HTMLgen.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-HTMLgen/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:16:31 -0000	1.1
+++ sources	16 Mar 2005 17:16:59 -0000	1.2
@@ -0,0 +1 @@
+cd20f8b63d3215e57289ddbf56c97f48  HTMLgen.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:17:28 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:17:28 -0500
Subject: rpms/repoml - New directory
Message-ID: <200503161717.j2GHHSR5006747@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/repoml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6740/repoml

Log Message:
Directory /cvs/extras/rpms/repoml added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:17:28 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:17:28 -0500
Subject: rpms/repoml/devel - New directory
Message-ID: <200503161717.j2GHHSPh006750@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/repoml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6740/repoml/devel

Log Message:
Directory /cvs/extras/rpms/repoml/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:17:42 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:17:42 -0500
Subject: rpms/repoml Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161717.j2GHHgaC006814@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/repoml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6802

Added Files:
	Makefile import.log 
Log Message:
Setup of module repoml


--- NEW FILE Makefile ---
# Top level Makefile for module repoml
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:17:42 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:17:42 -0500
Subject: rpms/repoml/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161717.j2GHHg1t006817@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/repoml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6802/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module repoml


--- 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 Mar 16 17:18:05 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:18:05 -0500
Subject: rpms/repoml import.log,1.1,1.2
Message-ID: <200503161718.j2GHI5UY006914@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/repoml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6904

Modified Files:
	import.log 
Log Message:
auto-import repoml-0.1-1 on branch devel from repoml-0.1-1.src.rpm
Initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/repoml/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:17:40 -0000	1.1
+++ import.log	16 Mar 2005 17:18:03 -0000	1.2
@@ -0,0 +1 @@
+repoml-0_1-1:HEAD:repoml-0.1-1.src.rpm:1110993479



From fedora-extras-commits at redhat.com  Wed Mar 16 17:18:05 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 12:18:05 -0500
Subject: rpms/repoml/devel repoml.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503161718.j2GHI5eT006917@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/repoml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6904/devel

Modified Files:
	.cvsignore sources 
Added Files:
	repoml.spec 
Log Message:
auto-import repoml-0.1-1 on branch devel from repoml-0.1-1.src.rpm
Initial import


--- NEW FILE repoml.spec ---
Name:           repoml
Version:        0.1
Release:        1
Summary:        Tools and data for working with RepoML files
Group:          Applications/System
License:        GPL
URL:            http://fedora.ivazquez.net/
Source0:        http://fedora.ivazquez.net/files/repoml-0.1.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       libxslt
BuildArch:      noarch

%description
Contains:
  - repoml.xsd, an XML Schema for RepoML files
  - repoml.xsl, a stylesheet for converting RepoML files into .repo files
  - repoml2repo, a script that invokes repoml.xsl

%prep
%setup -q

%build
sed -ipath -e s!@@DATADIR@@!%{_datadir}!g repoml2repo

%install
rm -rf $RPM_BUILD_ROOT
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}
install -m 0644 repoml.xs? $RPM_BUILD_ROOT%{_datadir}/%{name}
install -D -m 0755 repoml2repo $RPM_BUILD_ROOT%{_bindir}/repoml2repo

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog CREDITS NEWS README TODO
%{_bindir}/*
%{_datadir}/%{name}

%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
- Bump to release 1

* Fri Feb 25 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/repoml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:17:40 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:18:03 -0000	1.2
@@ -0,0 +1 @@
+repoml-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/repoml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:17:40 -0000	1.1
+++ sources	16 Mar 2005 17:18:03 -0000	1.2
@@ -0,0 +1 @@
+609eef9fb8e3fed976c32336a19b3021  repoml-0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 17:21:00 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 16 Mar 2005 12:21:00 -0500
Subject: rpms/bmp - New directory
Message-ID: <200503161721.j2GHL08j007077@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7070/bmp

Log Message:
Directory /cvs/extras/rpms/bmp added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:21:00 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 16 Mar 2005 12:21:00 -0500
Subject: rpms/bmp/devel - New directory
Message-ID: <200503161721.j2GHL0U3007080@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7070/bmp/devel

Log Message:
Directory /cvs/extras/rpms/bmp/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 17:21:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 16 Mar 2005 12:21:21 -0500
Subject: rpms/bmp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161721.j2GHLLSK007149@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7140

Added Files:
	Makefile import.log 
Log Message:
Setup of module bmp


--- NEW FILE Makefile ---
# Top level Makefile for module bmp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 17:21:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 16 Mar 2005 12:21:21 -0500
Subject: rpms/bmp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503161721.j2GHLLQ4007152@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7140/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bmp


--- 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 Mar 16 17:24:51 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 16 Mar 2005 12:24:51 -0500
Subject: rpms/bmp import.log,1.1,1.2
Message-ID: <200503161724.j2GHOpv6007336@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7326

Modified Files:
	import.log 
Log Message:
auto-import bmp-0.9.7-4 on branch devel from bmp-0.9.7-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bmp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 17:21:19 -0000	1.1
+++ import.log	16 Mar 2005 17:24:48 -0000	1.2
@@ -0,0 +1 @@
+bmp-0_9_7-4:HEAD:bmp-0.9.7-4.src.rpm:1110993900



From fedora-extras-commits at redhat.com  Wed Mar 16 17:24:51 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 16 Mar 2005 12:24:51 -0500
Subject: rpms/bmp/devel beep.png, NONE, 1.1 bmp-0.9.7-default-alsa.patch,
	NONE, 1.1 bmp-0.9.7-default-skin.patch, NONE,
	1.1 bmp-0.9.7-readmacro.patch, NONE, 1.1 bmp.sh, NONE,
	1.1 bmp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161724.j2GHOpAU007342@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7326/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beep.png bmp-0.9.7-default-alsa.patch 
	bmp-0.9.7-default-skin.patch bmp-0.9.7-readmacro.patch bmp.sh 
	bmp.spec 
Log Message:
auto-import bmp-0.9.7-4 on branch devel from bmp-0.9.7-4.src.rpm

bmp-0.9.7-default-alsa.patch:

--- NEW FILE bmp-0.9.7-default-alsa.patch ---
diff -Nur bmp-0.9.7-orig/beep/main.c bmp-0.9.7/beep/main.c
--- bmp-0.9.7-orig/beep/main.c	2004-12-04 10:04:24.000000000 +0100
+++ bmp-0.9.7/beep/main.c	2005-03-16 18:03:12.000000000 +0100
@@ -504,9 +504,9 @@
         cfg.gentitle_format = g_strdup("%p - %t");
 
     if (!cfg.outputplugin) {
-#ifdef HAVE_OSS
+#ifdef HAVE_ALSA
         cfg.outputplugin = g_build_filename(PLUGIN_DIR, plugin_dir_list[0],
-                                            PLUGIN_FILENAME("OSS"), NULL);
+                                            PLUGIN_FILENAME("ALSA"), NULL);
 #else
         /* FIXME: This implicitly means the output plugin that is
          * first in the alphabet will be used (usually the disk writer

bmp-0.9.7-default-skin.patch:

--- NEW FILE bmp-0.9.7-default-skin.patch ---
diff -Nur bmp-0.9.7/beep/main.c bmp-0.9.7-modified/beep/main.c
--- bmp-0.9.7/beep/main.c	2004-12-04 10:04:24.000000000 +0100
+++ bmp-0.9.7-modified/beep/main.c	2005-01-28 23:54:17.938968912 +0100
@@ -144,7 +144,7 @@
     0.0,                        /* equalizer preamp */
     {0, 0, 0, 0, 0,             /* equalizer bands */
      0, 0, 0, 0, 0},
-    NULL,                       /* skin */
+    "/usr/share/xmms/Skins/Bluecurve-xmms.zip",  /* skin */
     NULL,                       /* output plugin */
     NULL,                       /* file selector path */
     NULL,                       /* playlist path */

bmp-0.9.7-readmacro.patch:

--- NEW FILE bmp-0.9.7-readmacro.patch ---
--- bmp-0.9.7-orig/libbeep/configfile.c	2004-06-23 01:50:53.000000000 +0200
+++ bmp-0.9.7/libbeep/configfile.c	2005-03-11 13:53:06.000000000 +0100
@@ -83,7 +83,7 @@
                              const gchar * section, const gchar * key,
                              XmmsCfgValueType value_type, gpointer * value)
 {
-    return xmms_cfg_value_type_func[value_type].read(config_file,
+    return (xmms_cfg_value_type_func[value_type].read)(config_file,
                                                      section, key, value);
 }
 
@@ -91,7 +91,7 @@
                           const gchar * section, const gchar * key,
                           XmmsCfgValueType value_type, gpointer * value)
 {
-    xmms_cfg_value_type_func[value_type].read(config_file,
+    (xmms_cfg_value_type_func[value_type].read)(config_file,
                                               section, key, value);
 }
 


--- NEW FILE bmp.sh ---
#!/bin/sh

# Colon-separated directory path to look for
# additional skins. See man beep-media-player.
export SKINSDIR=/usr/share/xmms/Skins


--- NEW FILE bmp.spec ---
Name:           bmp
Version:        0.9.7
Release:        4
Summary:        GTK2 based port of the XMMS media player

Group:          Applications/Multimedia
License:        GPL
URL:            http://beepmp.sourceforge.net/
# The original source files contain an mp3 decoder. It is removed in the
# -patched- file
# Source0:        http://dl.sf.net/beepmp/bmp-%{version}.tar.gz
Source0:        bmp-patched-%{version}.tar.gz
Source1:        bmp.sh
Source2:        beep.png
Patch0:         bmp-0.9.7-readmacro.patch
Patch1:         bmp-0.9.7-default-skin.patch
Patch2:         bmp-0.9.7-default-alsa.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pkgconfig gtk2-devel esound-devel libvorbis-devel
BuildRequires:  zlib-devel desktop-file-utils alsa-lib-devel
BuildRequires:  gnome-vfs2-devel libglade2-devel
#BuildRequires:  id3lib-devel

# Package seems to miscompile on PPC, possibly a endianess issue
ExcludeArch: ppc

%description
BMP (Beep Media Player) is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
XMMS.

%package        devel
Summary:        Development files for the Beep Media Player
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
Development files for the Beep Media Player

%prep
%setup -q

# Fix the improper use of read as a function name
%patch0 -p1 -b .readmacro

# Use the XMMS Bluecurve skin by default
%patch1 -p1 -b .default-skin

%patch2 -p1 -b .default-alsa


%build
%configure \
%ifarch %{ix86}
	--enable-simd \
%endif
	--disable-mp3 \
	--enable-gconf \
	--enable-gnome-vfs
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

perl -pi -e 's/svg/png/ ; s/^(Categories=.+[^;\n])$/\1;/' beep/bmp.desktop
desktop-file-install --vendor fedora \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
    --add-category X-Fedora  \
    --add-category Application  \
    beep/bmp.desktop
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/bmp.desktop

rm -f $RPM_BUILD_ROOT%{_infodir}/dir
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

# Shell variables
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d

# Replace icon
rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/bmp.svg
install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bmp.png


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog FAQ NEWS README TODO
%{_bindir}/*
%{_libdir}/*.so.*
%{_libdir}/bmp
%{_datadir}/bmp
%{_mandir}/man[^3]/*
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%config(noreplace) %{_sysconfdir}/profile.d/bmp.sh

%files devel
%defattr(-,root,root,-)
%{_includedir}/bmp
%{_libdir}/*.so
%{_libdir}/pkgconfig/*


%changelog
* Wed Mar 16 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-4
- Apply common spec cleanup and corrections.
- Add patch to make ALSA output driver the default.

* Sun Mar 13 2005 Ralf Ertzinger <ralf at skytale.net> 0.9.7-3 
- More changes from livna

* Fri Mar 11 2005 Ralf Ertzinger <ralf at skytale.net> 0.9.7-2 
- Added bmp.sh, default-skin patch from livna package
- Removed mp3 plugin code

* Fri Mar 11 2005 Ralf Ertzinger <ralf at skytale.net> 0.9.7-1 
- Initial build for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bmp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 17:21:19 -0000	1.1
+++ .cvsignore	16 Mar 2005 17:24:48 -0000	1.2
@@ -0,0 +1 @@
+bmp-patched-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bmp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 17:21:19 -0000	1.1
+++ sources	16 Mar 2005 17:24:48 -0000	1.2
@@ -0,0 +1 @@
+bcfd525c376ff9ece8f935d34bdcb56e  bmp-patched-0.9.7.tar.gz



From katzj at redhat.com  Wed Mar 16 18:01:17 2005
From: katzj at redhat.com (Jeremy Katz)
Date: Wed, 16 Mar 2005 13:01:17 -0500
Subject: rpms/pam_mysql/devel pam_mysql.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503161714.j2GHEaea006012@cvs-int.fedora.redhat.com>
References: <200503161714.j2GHEaea006012@cvs-int.fedora.redhat.com>
Message-ID: <1110996078.7095.36.camel@bree.local.net>

On Wed, 2005-03-16 at 12:14 -0500, Ignacio Vazquez-Abrams wrote:
> Summary(pl):	modu PAM uwierzytelniajcy uytkownikw Linuksa poprzez baz danych MySQL

Doing the localized summary and description in the spec file is less
useful because it makes it harder to make small tweaks to them.
Eventually we're going to end up needing specspo-like for extras, but
right now, English is really the only way :/

Jeremy



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/hamlib hamlib.spec,1.1,1.2
Message-ID: <200503161854.j2GIslG8010860@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/hamlib

Modified Files:
	hamlib.spec 
Log Message:
Initial review fixes


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hamlib.spec	16 Mar 2005 17:05:32 -0000	1.1
+++ hamlib.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name: hamlib
 Version: 1.2.3
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transcievers and receivers.
@@ -37,7 +37,6 @@
 %package c++
 Summary: Hamlib radio control library C++ binding
 Group: Development/Libraries
-Requires: hamlib
 
 %description c++
 Hamlib radio control library C++ language binding.
@@ -45,7 +44,7 @@
 %package c++-devel
 Summary: Hamlib radio control library C++ binding development headers and libraries
 Group: Development/Libraries
-Requires: hamlib, hamlib-devel
+Requires: hamlib-devel = %{version}
 
 %description c++-devel
 Hamlib radio control library C++ binding development headers and libraries
@@ -63,8 +62,6 @@
 %package python
 Summary: Hamlib radio control library Python binding
 Group: Development/Libraries
-Requires: hamlib = %{version}
-Requires: python => 2.2.3
 
 %description python
 Hamlib Python Language bindings to allow radio control from Python scripts.
@@ -200,6 +197,9 @@
 
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-2
+- Removed/fixed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-1
 - Bump release to 1
 - Fixed BuildRoot



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/lock-keys-applet lock-keys-applet.spec,1.1,1.2
Message-ID: <200503161854.j2GIslEO010880@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/lock-keys-applet

Modified Files:
	lock-keys-applet.spec 
Log Message:
Initial review fixes


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/extras/devel/lock-keys-applet/lock-keys-applet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lock-keys-applet.spec	16 Mar 2005 17:13:33 -0000	1.1
+++ lock-keys-applet.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        1
+Release:        2
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
 License:        GPL
@@ -8,7 +8,6 @@
 Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel gnome-panel-devel
-Requires:       libgnomeui gnome-panel
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -46,6 +45,9 @@
 %{_libexecdir}/%{name}
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-1
 - Bump release to 1
 - Added Requires(post) and Requires(postun)



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/clearlooks clearlooks.spec,1.1,1.2
Message-ID: <200503161854.j2GIslDY010844@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/clearlooks

Modified Files:
	clearlooks.spec 
Log Message:
Initial review fixes


Index: clearlooks.spec
===================================================================
RCS file: /cvs/extras/devel/clearlooks/clearlooks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clearlooks.spec	16 Mar 2005 16:55:01 -0000	1.1
+++ clearlooks.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           clearlooks
 Version:        0.4
-Release:        1
+Release:        2
 Summary:        An attractive GTK+ 2 engine with a focus on usability
 Group:          User Interface/Desktops
 License:        GPL
@@ -8,7 +8,6 @@
 Source0:        http://prdownloads.sourceforge.net/clearlooks/clearlooks-0.4.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel
-Requires:       gtk2
 
 %description
 Clearlooks will transform your GNOME desktop into an attractive looking and usable environment.
@@ -34,6 +33,9 @@
 %{_libdir}/gtk-2.0/2.4.0/engines/*
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-1
 - Bump release to 1
 



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/pam_mysql pam_mysql.spec,1.1,1.2
Message-ID: <200503161854.j2GIslig010884@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/pam_mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/pam_mysql

Modified Files:
	pam_mysql.spec 
Log Message:
Initial review fixes


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/devel/pam_mysql/pam_mysql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam_mysql.spec	16 Mar 2005 17:14:34 -0000	1.1
+++ pam_mysql.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,24 +1,18 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
-Summary(pl):	modu? PAM uwierzytelniaj?cy u?ytkownik?w Linuksa poprzez baz? danych MySQL
 Name:		pam_mysql
 Version:	0.50
-Release:	2
+Release:	3
 License:	GPL
 Group:		Base
 Source0:	http://dl.sf.net/pam-mysql/pam_mysql-0.5.tar.gz
 URL:		http://sf.net/projects/pam-mysql/
 BuildRequires:	pam-devel mysql-devel
-Requires:       pam mysql
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Pam_mysql aims to provide a backend neutral means of authenticating
 users against an MySQL database.
 
-%description -l pl
-Modu? PAM pozwalaj?cy na uwierzytelnianie u?ytkownik?w Linuksa poprzez
-baz? danych MySQL.
-
 %prep
 %setup -q -n %{name}
 
@@ -38,6 +32,10 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Wed Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-3
+- Removed explicit Requires
+- Removed Polish Summary and Description
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-2
 - Bump release to 2
 - Added Requires



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/kphone kphone.spec,1.1,1.2
Message-ID: <200503161854.j2GIsl0v010864@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/kphone

Modified Files:
	kphone.spec 
Log Message:
Initial review fixes


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kphone.spec	16 Mar 2005 17:06:44 -0000	1.1
+++ kphone.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        0.iva.0
+Release:        2
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -11,7 +11,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils
-Requires:       qt alsa-lib
 
 %description
 KPhone is a SIP (Session Initiation Protocol) user agent for Linux, with which you can initiate VoIP (Voice over IP) connections over the Internet.  It supports Presence and Instant Messaging, and to some extent also video calls between two hosts.
@@ -51,6 +50,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-1
 - Bump release to 1
 - Added d-f-u to BR



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/gpredict gpredict.spec,1.1,1.2
Message-ID: <200503161854.j2GIslRU010856@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/gpredict
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/gpredict

Modified Files:
	gpredict.spec 
Log Message:
Initial review fixes


Index: gpredict.spec
===================================================================
RCS file: /cvs/extras/devel/gpredict/gpredict.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpredict.spec	16 Mar 2005 17:04:11 -0000	1.1
+++ gpredict.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gpredict
 Version:        0.5.0
-Release:        0.iva.0
+Release:        2
 Summary:        Real-time satellite tracking and orbit prediction program
 Group:          Applications/Communications
 License:        GPL
@@ -9,7 +9,6 @@
 Patch0:         gpredict-0.5.0-po.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk+-devel hamlib-devel gnome-libs-devel gettext GConf-devel gnome-vfs-devel gnome-print-devel gal-devel desktop-file-utils
-Requires:       gtk+ hamlib gnome-libs GConf gnome-vfs gnome-print gal
 
 %description
 Gpredict calculates and shows the position of satellites in lists and on maps. It can also make detailed predictions of upcoming satellites passes.
@@ -64,6 +63,9 @@
 %{_datadir}/pixmaps/%{name}
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-1
 - Bump release to 1
 - Added d-f-u to BR



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/ktrack ktrack.spec,1.1,1.2
Message-ID: <200503161854.j2GIslI3010868@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/ktrack

Modified Files:
	ktrack.spec 
Log Message:
Initial review fixes


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ktrack.spec	16 Mar 2005 17:08:07 -0000	1.1
+++ ktrack.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,12 +1,11 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 1.rc1
+Release: 2.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
 Patch: ktrack-headers.patch
-Requires: kdelibs >= 3.3 hamlib = 1.2.3
 BuildRequires: desktop-file-utils kdelibs-devel >= 3.3 hamlib-devel = 1.2.3
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,6 +61,9 @@
 %doc %{name}-%{version}-rc1/AUTHORS %{name}-%{version}-rc1/ChangeLog %{name}-%{version}-rc1/COPYING %{name}-%{version}-rc1/README %{name}-%{version}-rc1/TODO %{name}-%{version}-rc1/doc/en/index.docbook %{name}-%{version}-rc1/doc/en/index.cache.bz2
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-2.rc1
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-1.rc1
 - Bump release to 1
 - Fixed BuildRoot



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/python-amara python-amara.spec,1.1,1.2
Message-ID: <200503161854.j2GIslAB010892@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/python-amara

Modified Files:
	python-amara.spec 
Log Message:
Initial review fixes


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/devel/python-amara/python-amara.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-amara.spec	16 Mar 2005 17:15:48 -0000	1.1
+++ python-amara.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-amara
 Version:        0.9.4
-Release:        1
+Release:        2
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python
-Requires:       python >= 2.3 4Suite >= 1.0
+Requires:       4Suite >= 1.0
 Provides:       python-Amara = %{version} Amara = %{version}
 BuildArch:      noarch
 
@@ -46,6 +46,9 @@
 %doc Amara-0.9.4/CHANGES Amara-0.9.4/COPYING Amara-0.9.4/demo Amara-0.9.4/manual.html Amara-0.9.4/README Amara-0.9.4/TODO
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-1
 - Bump release to 1
 



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/linphone linphone.spec,1.1,1.2
Message-ID: <200503161854.j2GIsl5C010876@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/linphone

Modified Files:
	linphone.spec 
Log Message:
Initial review fixes


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linphone.spec	16 Mar 2005 17:12:25 -0000	1.1
+++ linphone.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        1
+Release:        2
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -13,7 +13,6 @@
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
 BuildRequires:  libosip-devel speex-devel gettext
-Requires:       gnome-panel libgnomeui glib2 alsa-lib libosip speex
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -84,6 +83,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-1
 - Bump release to 1
 - Cleaned up the -docs and -speex patches



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/edb edb.spec,1.1,1.2
Message-ID: <200503161854.j2GIslp1010848@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/edb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/edb

Modified Files:
	edb.spec 
Log Message:
Initial review fixes


Index: edb.spec
===================================================================
RCS file: /cvs/extras/devel/edb/edb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edb.spec	16 Mar 2005 17:01:00 -0000	1.1
+++ edb.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           edb
 Version:        1.0.5
-Release:        1
+Release:        2
 Summary:        A database convenience library wrapped around BDB
 Group:          System Environment/Libraries
 License:        MIT
@@ -8,7 +8,6 @@
 Source0:        http://prdownloads.sourceforge.net/enlightenment/edb-1.0.5.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk+-devel, ncurses-devel zlib-devel 
-Requires:       zlib
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -26,7 +25,7 @@
 %package        ncurses
 Summary:        ncurses frontend for edb
 Group:          Applications/Databases
-Requires:       %{name} = %{version}-%{release} ncurses
+Requires:       %{name} = %{version}-%{release}
 
 %description    ncurses
 edb-ncurses is a frontend for edb that uses ncurses
@@ -34,7 +33,7 @@
 %package        gtk
 Summary:        GTK+ 1.x frontend for edb
 Group:          Applications/Databases
-Requires:       %{name} = %{version}-%{release} gtk+
+Requires:       %{name} = %{version}-%{release}
 
 %description    gtk
 edb-gtk is a frontend for edb that uses GTK+ 1.x
@@ -83,6 +82,9 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-1
 - Bump release to 1
 - Fix %description of -gtk



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/leafpad leafpad.spec,1.1,1.2
Message-ID: <200503161854.j2GIslXo010872@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/leafpad

Modified Files:
	leafpad.spec 
Log Message:
Initial review fixes


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/devel/leafpad/leafpad.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- leafpad.spec	16 Mar 2005 17:09:16 -0000	1.1
+++ leafpad.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           leafpad
 Version:        0.7.9
-Release:        1
+Release:        2
 Summary:        GTK+ based simple text editor
 
 Group:          Applications/Editors
@@ -11,7 +11,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.4
-Requires:       gtk2 >= 2.4
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -60,6 +59,9 @@
 %{_datadir}/pixmaps/leafpad.png
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-1
 - Bump release to 1
 



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/ghasher ghasher.spec,1.1,1.2
Message-ID: <200503161854.j2GIslAl010853@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ghasher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/ghasher

Modified Files:
	ghasher.spec 
Log Message:
Initial review fixes


Index: ghasher.spec
===================================================================
RCS file: /cvs/extras/devel/ghasher/ghasher.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghasher.spec	16 Mar 2005 17:02:26 -0000	1.1
+++ ghasher.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ghasher
 Version:        1.2.0
-Release:        1
+Release:        2
 Summary:        GUI hasher for GTK+ 2
 Group:          Applications/File
 License:        BSD
@@ -8,7 +8,6 @@
 Source0:        http://asgaard.homelinux.org/code/ghasher/ghasher-1.2.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel >= 2.4 openssl-devel desktop-file-utils libglade2-devel
-Requires:       gtk2 >= 2.4 libglade2
 
 %description
 ghasher can easily show the MD5 sum (or md2, md4, sha1, sha, ripemd160, dss1) of a file. Motivation for this utility was that users shouldn't need to open a command line for checking the MD5 sum of files they download.
@@ -54,6 +53,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-2
+- Removed explicit Requires
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-1
 - Bump release to 1
 - Cleaned up %description



From fedora-extras-commits at redhat.com  Wed Mar 16 18:54:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 13:54:47 -0500
Subject: devel/python-HTMLgen python-HTMLgen.spec,1.1,1.2
Message-ID: <200503161854.j2GIsl3O010888@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10800/python-HTMLgen

Modified Files:
	python-HTMLgen.spec 
Log Message:
Initial review fixes


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/devel/python-HTMLgen/python-HTMLgen.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-HTMLgen.spec	16 Mar 2005 17:16:59 -0000	1.1
+++ python-HTMLgen.spec	16 Mar 2005 18:54:45 -0000	1.2
@@ -13,11 +13,11 @@
 
 Name:           %name
 Version:        %version
-Release:        0.iva.1
+Release:        1
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
-License:        See Source
+License:        MIT
 URL:            http://starship.python.net/lib.html
 Source0:        http://starship.python.net/crew/friedrich/HTMLgen.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +54,10 @@
 %{_libdir}/python%pyver/site-packages/*.py[co]
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-1
+- Bump release to 1
+- Fixed License tag
+
 * Thu Mar 10 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-0.iva.1
 - Name changed to python-HTMLgen to match module import
 - %pyver cleanups



From bugs.michael at gmx.net  Wed Mar 16 19:43:20 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Wed, 16 Mar 2005 20:43:20 +0100
Subject: rpms/clearlooks/devel clearlooks.spec, NONE, 1.1 .cvsignore,
 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503161655.j2GGt3m4001351@cvs-int.fedora.redhat.com>
References: <200503161655.j2GGt3m4001351@cvs-int.fedora.redhat.com>
Message-ID: <20050316204320.7b3b4dc2.bugs.michael@gmx.net>

On Wed, 16 Mar 2005 11:55:03 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/rpms/clearlooks/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1338/devel

Build fails on FC3. Does it work on FC4T1 (can't test right now):

error: Installed (but unpackaged) file(s) found:
   /share/themes/Clearlooks/metacity-1/metacity-theme-1.xml



From fedora-extras-commits at redhat.com  Wed Mar 16 19:45:13 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 14:45:13 -0500
Subject: rpms/perl-ExtUtils-CBuilder/FC-3 .cvsignore, 1.6,
	1.7 perl-ExtUtils-CBuilder.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200503161945.j2GJjDl2012611@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12602/FC-3

Modified Files:
	.cvsignore perl-ExtUtils-CBuilder.spec sources 
Log Message:
Update to 0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Feb 2005 02:35:09 -0000	1.6
+++ .cvsignore	16 Mar 2005 19:45:11 -0000	1.7
@@ -1 +1 @@
-ExtUtils-CBuilder-0.09.tar.gz
+ExtUtils-CBuilder-0.10.tar.gz


Index: perl-ExtUtils-CBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3/perl-ExtUtils-CBuilder.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-ExtUtils-CBuilder.spec	15 Feb 2005 02:35:09 -0000	1.8
+++ perl-ExtUtils-CBuilder.spec	16 Mar 2005 19:45:11 -0000	1.9
@@ -1,15 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-ExtUtils-CBuilder
-Version:        0.09
+Version:        0.10
 Release:        1
-Epoch:          0
 Summary:        Compile and link C code for Perl modules
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-CBuilder/
-Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.09.tar.gz
+Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.10.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -56,6 +55,9 @@
 
 
 %changelog
+* Wed Mar 16 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.10-1
+- Update to 0.10.
+
 * Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.09-1
 - Update to 0.09.
 - Patch no longer needed.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Feb 2005 02:35:09 -0000	1.6
+++ sources	16 Mar 2005 19:45:11 -0000	1.7
@@ -1 +1 @@
-c0e6e997525e41cb9ac96ca981903336  ExtUtils-CBuilder-0.09.tar.gz
+e20aae61839fd7df8c719e2c97a3aac5  ExtUtils-CBuilder-0.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 19:45:13 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 14:45:13 -0500
Subject: rpms/perl-ExtUtils-CBuilder/devel .cvsignore, 1.6,
	1.7 perl-ExtUtils-CBuilder.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200503161945.j2GJjD17012617@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12602/devel

Modified Files:
	.cvsignore perl-ExtUtils-CBuilder.spec sources 
Log Message:
Update to 0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Feb 2005 02:35:09 -0000	1.6
+++ .cvsignore	16 Mar 2005 19:45:11 -0000	1.7
@@ -1 +1 @@
-ExtUtils-CBuilder-0.09.tar.gz
+ExtUtils-CBuilder-0.10.tar.gz


Index: perl-ExtUtils-CBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-ExtUtils-CBuilder.spec	3 Mar 2005 23:46:26 -0000	1.9
+++ perl-ExtUtils-CBuilder.spec	16 Mar 2005 19:45:11 -0000	1.10
@@ -1,14 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-ExtUtils-CBuilder
-Version:        0.09
+Version:        0.10
 Release:        1
 Summary:        Compile and link C code for Perl modules
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-CBuilder/
-Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.09.tar.gz
+Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.10.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Mar 16 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.10-1
+- Update to 0.10.
+
 * Tue Feb 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:0.09-1
 - Update to 0.09.
 - Patch no longer needed.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Feb 2005 02:35:09 -0000	1.6
+++ sources	16 Mar 2005 19:45:11 -0000	1.7
@@ -1 +1 @@
-c0e6e997525e41cb9ac96ca981903336  ExtUtils-CBuilder-0.09.tar.gz
+e20aae61839fd7df8c719e2c97a3aac5  ExtUtils-CBuilder-0.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 16 19:49:45 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 16 Mar 2005 14:49:45 -0500
Subject: rpms/python-docutils/devel - New directory
Message-ID: <200503161949.j2GJnj4Z012720@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12711/python-docutils/devel

Log Message:
Directory /cvs/extras/rpms/python-docutils/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 19:49:45 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 16 Mar 2005 14:49:45 -0500
Subject: rpms/python-docutils - New directory
Message-ID: <200503161949.j2GJnj4p012718@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12711/python-docutils

Log Message:
Directory /cvs/extras/rpms/python-docutils added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 16 19:50:03 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 16 Mar 2005 14:50:03 -0500
Subject: rpms/python-docutils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503161950.j2GJo3du012781@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12772

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-docutils


--- NEW FILE Makefile ---
# Top level Makefile for module python-docutils
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 16 19:50:03 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 16 Mar 2005 14:50:03 -0500
Subject: rpms/python-docutils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503161950.j2GJo3Ql012784@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12772/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-docutils


--- 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 Mar 16 19:51:21 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 16 Mar 2005 14:51:21 -0500
Subject: rpms/python-docutils import.log,1.1,1.2
Message-ID: <200503161951.j2GJpLRn012878@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12869

Modified Files:
	import.log 
Log Message:
auto-import python-docutils-0.3.7-5 on branch devel from python-docutils-0.3.7-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Mar 2005 19:50:01 -0000	1.1
+++ import.log	16 Mar 2005 19:51:19 -0000	1.2
@@ -0,0 +1 @@
+python-docutils-0_3_7-5:HEAD:python-docutils-0.3.7-5.src.rpm:1111002672



From fedora-extras-commits at redhat.com  Wed Mar 16 19:51:21 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 16 Mar 2005 14:51:21 -0500
Subject: rpms/python-docutils/devel python-docutils.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503161951.j2GJpLHE012882@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12869/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-docutils.spec 
Log Message:
auto-import python-docutils-0.3.7-5 on branch devel from python-docutils-0.3.7-5.src.rpm


--- NEW FILE python-docutils.spec ---
%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.7
Release:        5
Summary:        A system for processing plaintext documentation

Group:          Development/Languages
License:        Public domain, BSD, PSF, 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
Provides: docutils = %{version}-%{release}
Obsoletes: docutils < %{version}-%{release}
Requires:	python-abi = %{pyver}

%description
The Docutils project specifies a plaintext markup language, reStructuredText,
which is easy to read and quick to write.  The project includes a python
library to parse rST files and transform them into other useful formats such
as HTML, XML, and TeX as well as commandline tools that give the enduser
access to this functionality.

Currently, the library supports parsing rST that is in standalone files and
PEPs (Python Enhancement Proposals).  Work is underway to parse rST from
Python inline documentation modules and packages.

%prep
%setup -q -n %{srcname}-%{version}

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
	
for file in $RPM_BUILD_ROOT/%{_bindir}/*.py; do
	mv $file `dirname $file`/`basename $file .py`
done

# We want the licenses but don't need this build file
rm -f licenses/docutils.conf

# docutils only installs this if its not already on the system.  Due to the
# possibility that a previous version of docutils may be installed, we install
# it manually here.
file=roman.py
extradest=%{python_sitelib}
fullextradest=$RPM_BUILD_ROOT/$extradest
install -m 0644 extras/$file $fullextradest
%{__python} -c "import py_compile; py_compile.compile(\
    '$fullextradest/$file', \
    '$fullextradest/$file' + 'c', \
    '$extradest/$file')"
%{__python} -O -c "import py_compile; py_compile.compile(\
    '$fullextradest/$file', \
    '$fullextradest/$file' + 'o', \
    '$extradest/$file')"

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt licenses docs tools
%{_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
* Sat Mar 12 2005 Toshio Kuratomi <toshio.tiki-lounge.com> 0.3.7-5
- Add GPL as a license (mschwendt)
- Use versioned Obsoletes and Provides (mschwendt)

* Fri Mar 04 2005 Toshio Kuratomi <toshio.tiki-lounge.com> 0:0.3.7-4
- Rename to python-docutils per the new packaging guidelines.

* Wed Jan 12 2005 Toshio Kuratomi <toshio.tiki-lounge.com> 0:0.3.7-0.fdr.3
- Really install roman.py and build roman.py[co].  Needed to make sure I have
  docutils installed to test that it builds roman.py fine in that case.

* Tue Jan 11 2005 Toshio Kuratomi <toshio.tiki-lounge.com> 0:0.3.7-0.fdr.2
- Special case roman.py to always install.  This is the behaviour we want
  unless something else provides it.  Will need to watch out for this in
  future Core and Extras packages, but the auto detection code makes it
  possible that builds will not be reproducible if roman.py were installed
  from another package.... Lesser of two evils here.
- Provide python-docutils in case that package were preinstalled from
  another repository.
  
* Fri Dec 31 2004 Toshio Kuratomi <toshio.tiki-lounge.com> 0:0.3.7-0.fdr.1
- Update to 0.3.7
- Rename from python-docutils to docutils.
- Make roman.py optionally a part of the files list.  In FC2, this will be
  included.  In FC3, this won't.
- BuildConflict with self since the docutils build detects the presence
  of roman.py and doesn't reinstall itself.
  
* Mon Aug 9 2004 Toshio Kuratomi <toshio.tiki-lounge.com> 0:0.3.5-0.fdr.1
- Update to 0.3.5.
- Update spec style to latest fedora-rpmdevtools.
- Merge everything into a single package.  There isn't very much space
  advantage to having separate packages in a package this small and in
  this case, the documentation on using docutils as a library is also a
  good example of how to write in ReSructuredText.

* Sat Jan 10 2004 Michel Alexandre Salim <salimma[AT]users.sf.net> 0:0.3-0.fdr.1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2005 19:50:01 -0000	1.1
+++ .cvsignore	16 Mar 2005 19:51:19 -0000	1.2
@@ -0,0 +1 @@
+docutils-0.3.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2005 19:50:01 -0000	1.1
+++ sources	16 Mar 2005 19:51:19 -0000	1.2
@@ -0,0 +1 @@
+fdd192d62bf5aebac6258a7ae8af5123  docutils-0.3.7.tar.gz



From bugs.michael at gmx.net  Wed Mar 16 19:51:59 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Wed, 16 Mar 2005 20:51:59 +0100
Subject: rpms/ktrack/devel ktrack-headers.patch, NONE, 1.1 ktrack.spec, 
 NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503161708.j2GH8910004485@cvs-int.fedora.redhat.com>
References: <200503161708.j2GH8910004485@cvs-int.fedora.redhat.com>
Message-ID: <20050316205159.4487bc37.bugs.michael@gmx.net>

On Wed, 16 Mar 2005 12:08:09 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/rpms/ktrack/devel


> %setup -q -c %{name}-%{version}-rc1
> pushd %{name}-%{version}-rc1

Option -c is a systematical mistake in several of your packages. You
want -n ... 



From bugs.michael at gmx.net  Wed Mar 16 19:54:18 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Wed, 16 Mar 2005 20:54:18 +0100
Subject: rpms/libosip/devel libosip.spec, NONE, 1.1 .cvsignore, 1.1, 1.2
 sources, 1.1, 1.2
In-Reply-To: <200503161710.j2GHAWlM005091@cvs-int.fedora.redhat.com>
References: <200503161710.j2GHAWlM005091@cvs-int.fedora.redhat.com>
Message-ID: <20050316205418.24aa2144.bugs.michael@gmx.net>

On Wed, 16 Mar 2005 12:10:32 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/rpms/libosip/devel

> %files devel
> %defattr(-,root,root)
> %{_includedir}/osip/*.h

Directory %_includedir/osip  is not included in the package!



From bugs.michael at gmx.net  Wed Mar 16 20:01:54 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Wed, 16 Mar 2005 21:01:54 +0100
Subject: rpms/lock-keys-applet/devel lock-keys-applet.spec, NONE, 1.1
 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503161713.j2GHDZwX005717@cvs-int.fedora.redhat.com>
References: <200503161713.j2GHDZwX005717@cvs-int.fedora.redhat.com>
Message-ID: <20050316210154.2f884bbf.bugs.michael@gmx.net>

On Wed, 16 Mar 2005 12:13:35 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/rpms/lock-keys-applet/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5704/devel

Fails to build. At least Buildrequires gettext is missing.

make[3]: Leaving directory `/home/qa/tmp/rpm/tmp/lock-keys-applet-1.0/docs'
Making all in po
make[3]: Entering directory `/home/qa/tmp/rpm/tmp/lock-keys-applet-1.0/po'
make[3]: *** No rule to make target `deNONE', needed by `all-yes'.  Stop.
make[3]: Leaving directory `/home/qa/tmp/rpm/tmp/lock-keys-applet-1.0/po'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/qa/tmp/rpm/tmp/lock-keys-applet-1.0'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/qa/tmp/rpm/tmp/lock-keys-applet-1.0'
error: Bad exit status from /home/qa/tmp/rpm/tmp/rpm-tmp.2051 (%build)

> %files
> %defattr(-,root,root,-)
> %doc AUTHORS COPYING ChangeLog NEWS README TODO
> %{_datadir}/gnome/help/%{name}
> %{_datadir}/locale/*/*/%{name}.mo

%find_lang is for language files.



From fedora-extras-commits at redhat.com  Wed Mar 16 21:00:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 16:00:39 -0500
Subject: devel/clearlooks clearlooks-0.4-dirs.patch, NONE,
	1.1 clearlooks.spec, 1.2, 1.3
Message-ID: <200503162100.j2GL0dQt013993@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13986

Modified Files:
	clearlooks.spec 
Added Files:
	clearlooks-0.4-dirs.patch 
Log Message:
Fix install issues

clearlooks-0.4-dirs.patch:

--- NEW FILE clearlooks-0.4-dirs.patch ---
--- clearlooks-0.4/themes/Clearlooks-Olive/gtk-2.0/Makefile.in.orig	2005-03-16 15:05:43.149930536 -0500
+++ clearlooks-0.4/themes/Clearlooks-Olive/gtk-2.0/Makefile.in	2005-03-16 15:05:58.706150174 -0500
@@ -217,7 +217,7 @@
 uninstall-info-am:
 install-themeDATA: $(theme_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
+	test -z "$(DESTDIR)$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
 	@list='$(theme_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
--- clearlooks-0.4/themes/Clearlooks-DeepSky/gtk-2.0/Makefile.in.orig	2005-03-16 15:01:35.995104503 -0500
+++ clearlooks-0.4/themes/Clearlooks-DeepSky/gtk-2.0/Makefile.in	2005-03-16 15:01:54.102868103 -0500
@@ -245,7 +245,7 @@
 uninstall-info-am:
 install-themeDATA: $(theme_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
+	test -z "$(DESTDIR)$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
 	@list='$(theme_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
--- clearlooks-0.4/themes/Clearlooks/gtk-2.0/Makefile.in.orig	2005-03-16 15:00:08.175800441 -0500
+++ clearlooks-0.4/themes/Clearlooks/gtk-2.0/Makefile.in	2005-03-16 15:00:16.964229686 -0500
@@ -245,7 +245,7 @@
 uninstall-info-am:
 install-themeDATA: $(theme_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
+	test -z "$(DESTDIR)$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
 	@list='$(theme_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
--- clearlooks-0.4/themes/Clearlooks/metacity-1/Makefile.in.orig	2005-03-16 15:00:33.588258474 -0500
+++ clearlooks-0.4/themes/Clearlooks/metacity-1/Makefile.in	2005-03-16 15:36:58.038831762 -0500
@@ -171,7 +171,7 @@
 target_alias = @target_alias@
 gnome_data = @gnome_prefix@/share
 dummy = 
-themedir = $(gnome_data)/themes/Clearlooks/metacity-1
+themedir = $(datadir)/themes/Clearlooks/metacity-1
 theme_DATA = metacity-theme-1.xml
 EXTRA_DIST = metacity-theme-1.xml
 all: all-am
@@ -218,7 +218,7 @@
 uninstall-info-am:
 install-themeDATA: $(theme_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
+	test -z "$(DESTDIR)$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
 	@list='$(theme_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
--- clearlooks-0.4/themes/Clearlooks/Makefile.in.orig	2005-03-16 14:59:21.839082200 -0500
+++ clearlooks-0.4/themes/Clearlooks/Makefile.in	2005-03-16 14:59:47.009583478 -0500
@@ -230,7 +230,7 @@
 uninstall-info-am:
 install-themeDATA: $(theme_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
+	test -z "$(DESTDIR)$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
 	@list='$(theme_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
--- clearlooks-0.4/src/Makefile.in.orig	2005-03-16 14:56:17.892958879 -0500
+++ clearlooks-0.4/src/Makefile.in	2005-03-16 14:56:56.330089013 -0500
@@ -241,7 +241,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-engineLTLIBRARIES: $(engine_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(enginedir)" || $(mkdir_p) "$(DESTDIR)$(enginedir)"
+	test -z "$(DESTDIR)$(enginedir)" || $(mkdir_p) "$(DESTDIR)$(enginedir)"
 	@list='$(engine_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \


Index: clearlooks.spec
===================================================================
RCS file: /cvs/extras/devel/clearlooks/clearlooks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clearlooks.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ clearlooks.spec	16 Mar 2005 21:00:37 -0000	1.3
@@ -1,11 +1,12 @@
 Name:           clearlooks
 Version:        0.4
-Release:        2
+Release:        3
 Summary:        An attractive GTK+ 2 engine with a focus on usability
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://clearlooks.sourceforge.net/screenshots/
 Source0:        http://prdownloads.sourceforge.net/clearlooks/clearlooks-0.4.tar.bz2
+Patch0:         clearlooks-0.4-dirs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel
 
@@ -14,14 +15,16 @@
 
 %prep
 %setup -q
+%patch -p 1 -b dirs
 
 %build
-%configure
+%configure --enable-animation
 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
@@ -33,6 +36,11 @@
 %{_libdir}/gtk-2.0/2.4.0/engines/*
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-3
+- Fixed build problem with metacity-theme-1.xml
+- Added option for animated progress bars
+- Removed .la files
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 21:15:09 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed, 16 Mar 2005 16:15:09 -0500
Subject: devel/galeon .cvsignore, 1.2, 1.3 galeon.spec, 1.5, 1.6 sources, 1.3,
	1.4
Message-ID: <200503162115.j2GLF9G5015073@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/devel/galeon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15065

Modified Files:
	.cvsignore galeon.spec sources 
Log Message:
galeon: updated to 1.3.20


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/galeon/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:21:30 -0000	1.2
+++ .cvsignore	16 Mar 2005 21:15:07 -0000	1.3
@@ -1 +1 @@
-galeon-1.3.11a-fixed.tar.bz2
+galeon-1.3.20.tar.bz2


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/devel/galeon/galeon.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- galeon.spec	5 Mar 2005 21:10:21 -0000	1.5
+++ galeon.spec	16 Mar 2005 21:15:07 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
-Version:	1.3.19
-Release:	2
+Version:	1.3.20
+Release:	1
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -16,7 +16,6 @@
 BuildRequires:	libgnomeui-devel >= 2.5.2
 %{!?_without_nautilus:BuildRequires:	eel2-devel nautilus}
 
-
 %description
 Galeon is a web browser built around Gecko (Mozilla's rendering
 engine) and Necko (Mozilla's networking engine). It's a GNOME web
@@ -95,6 +94,9 @@
 
 
 %changelog
+* Wed Mar 16 2005 Dams <anvil[AT]livna.org> - 1.3.20-1
+- Updated to 1.3.20
+
 * Sun Jan 23 2005 Dams <anvil[AT]livna.org> - 0:1.3.19-2
 - Urlized Source0
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/galeon/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jan 2005 19:40:22 -0000	1.3
+++ sources	16 Mar 2005 21:15:07 -0000	1.4
@@ -1 +1 @@
-7d272c6b1863252026386fd299122841  galeon-1.3.19.tar.bz2
+13954dd2f11748c02f3071ac9987d7d3  galeon-1.3.20.tar.bz2



From toshio at tiki-lounge.com  Wed Mar 16 20:19:35 2005
From: toshio at tiki-lounge.com (Toshio)
Date: Wed, 16 Mar 2005 15:19:35 -0500
Subject: APPROVED: python-docutils
Message-ID: <1111004376.4342.12.camel@Madison.badger.com>

Name: python-docutils
The Docutils project specifies a plaintext markup language,
reStructuredText,
which is easy to read and quick to write.  The project includes a python
library to parse rST files and transform them into other useful formats
such
as HTML, XML, and TeX as well as commandline tools that give the enduser
access to this functionality.

Currently, the library supports parsing rST that is in standalone files
and
PEPs (Python Enhancement Proposals).  Work is underway to parse rST from
Python inline documentation modules and packages.

QA done at fedora.us : https://bugzilla.fedora.us/show_bug.cgi?id=2081

Maintainer: Toshio Kuratomi
Reviewer: Michael Schwendt

-- 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/hamlib hamlib.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1dc019223@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/hamlib

Modified Files:
	hamlib.spec 
Log Message:
More review fixes


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hamlib.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ hamlib.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -19,7 +19,7 @@
 
 %description
 Hamlib provides a standardised programming interface that applications 
-can uso to send the appropriate commands to a radio.
+can use to send the appropriate commands to a radio.
  
 Also included in the package is a simple radio control program 'rigctl',
 which lets one control a radio transceiver or receiver, either from
@@ -197,6 +197,9 @@
 
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-3
+- Spell-corrected %description
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-2
 - Removed/fixed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/ktrack ktrack.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1q2019231@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/ktrack

Modified Files:
	ktrack.spec 
Log Message:
More review fixes


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ktrack.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ ktrack.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 2.rc1
+Release: 3.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -10,24 +10,21 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-K-Track is an KDE3 satellite prediction software, especially suited for radio amateurs operating through the satellites that are providing linear transponders.
+K-Track is an KDE3 satellite prediction software, especially suited for radio
+amateurs operating through the satellites that are providing linear
+transponders.
 
 %prep
 rm -rf $RPM_BUILD_ROOT
-%setup -q -c %{name}-%{version}-rc1
-pushd %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc1
 %patch -p 1 -b .headers
-popd
 
 %build
-pushd %{name}-%{version}-rc1
 %configure --with-qt-includes=/usr/lib/qt-3.3/include --with-qt-libraries=/usr/lib/qt-3.3/lib
 make
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-pushd %{name}-%{version}-rc1
 %makeinstall
 desktop-file-install --vendor=Fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -37,7 +34,6 @@
   --add-category KDE \
   ktrack/ktrack.desktop
 install -D -m 0644 ktrack/hi32-app-ktrack.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ktrack.png
-popd
 rm -r $RPM_BUILD_ROOT%{_datadir}/doc
 
 %clean
@@ -58,9 +54,13 @@
 %{_datadir}/locale/fr/LC_MESSAGES/ktrack.mo
 %{_datadir}/applications/Fedora-ktrack.desktop
 %{_datadir}/pixmaps/ktrack.png
-%doc %{name}-%{version}-rc1/AUTHORS %{name}-%{version}-rc1/ChangeLog %{name}-%{version}-rc1/COPYING %{name}-%{version}-rc1/README %{name}-%{version}-rc1/TODO %{name}-%{version}-rc1/doc/en/index.docbook %{name}-%{version}-rc1/doc/en/index.cache.bz2
+%doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-3.rc1
+- Modified %setup to use -n
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-2.rc1
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/gpredict gpredict.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1cL019219@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/gpredict
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/gpredict

Modified Files:
	gpredict.spec 
Log Message:
More review fixes


Index: gpredict.spec
===================================================================
RCS file: /cvs/extras/devel/gpredict/gpredict.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gpredict.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ gpredict.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -11,7 +11,8 @@
 BuildRequires:  gtk+-devel hamlib-devel gnome-libs-devel gettext GConf-devel gnome-vfs-devel gnome-print-devel gal-devel desktop-file-utils
 
 %description
-Gpredict calculates and shows the position of satellites in lists and on maps. It can also make detailed predictions of upcoming satellites passes.
+Gpredict calculates and shows the position of satellites in lists and on maps.
+It can also make detailed predictions of upcoming satellites passes.
 
 %prep
 %setup -q
@@ -63,6 +64,9 @@
 %{_datadir}/pixmaps/%{name}
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-3
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/edb edb.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1Fv019211@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/edb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/edb

Modified Files:
	edb.spec 
Log Message:
More review fixes


Index: edb.spec
===================================================================
RCS file: /cvs/extras/devel/edb/edb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- edb.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ edb.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           edb
 Version:        1.0.5
-Release:        2
+Release:        3
 Summary:        A database convenience library wrapped around BDB
 Group:          System Environment/Libraries
 License:        MIT
@@ -12,7 +12,9 @@
 Requires(postun): /sbin/ldconfig
 
 %description
-EDB is a database convenience library wrapped around the Berkeley DB 2.7.7 by Sleepycat Software. It is intended to make accessing database information portable, easy, fast and efficient.
+EDB is a database convenience library wrapped around the Berkeley DB 2.7.7 by
+Sleepycat Software. It is intended to make accessing database information
+portable, easy, fast and efficient.
 
 %package        devel
 Summary:        Development libraries for edb
@@ -20,7 +22,8 @@
 Requires:       %{name} = %{version}-%{release}
 
 %description    devel
-The edb-devel package contains static libraries and header files for developing edb applications.
+The edb-devel package contains static libraries and header files for developing
+edb applications.
 
 %package        ncurses
 Summary:        ncurses frontend for edb
@@ -82,6 +85,9 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-3
+- Broke %descriptions at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/python-amara python-amara.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1fk019251@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/python-amara

Modified Files:
	python-amara.spec 
Log Message:
More review fixes


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/devel/python-amara/python-amara.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-amara.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ python-amara.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -1,8 +1,19 @@
-%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')
 
-Name:           python-amara
-Version:        0.9.4
-Release:        2
+%define version 0.9.4
+
+%if "%{pyver}" == "%{mainpyver}"
+%define name python-amara
+%define prov python%{pyver}-amara = %{version} python-amara = %{version}
+%else
+%define name python%{pyver}-amara
+%define prov python%{pyver}-Amara = %{version}
+%endif
+
+Name:           %name
+Version:        %version
+Release:        3
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -11,29 +22,33 @@
 Source0:        http://uche.ogbuji.net/uche.ogbuji.net/tech/4Suite/amara/Amara-0.9.4.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python
-Requires:       4Suite >= 1.0
-Provides:       python-Amara = %{version} Amara = %{version}
+BuildRequires:  python-abi = %{pyver}
+Requires:       python-abi = %{pyver} 4Suite >= 1.0
+Provides:       %{prov}
 BuildArch:      noarch
 
 %description
-Amara is a collection of Pythonic tools for XML data binding. Not just tools that happen to be written in Python, but tools built from the ground up to use Python idioms and take advantage of the many advantages of Python over other programming languages.
-
-Amara builds on 4Suite, but whereas 4Suite focuses more on literal implementation of XML standards in Python, Amara adds a much more Pythonic face to these capabilities.
+Amara is a collection of Pythonic tools for XML data binding. Not just tools
+that happen to be written in Python, but tools built from the ground up to use
+Python idioms and take advantage of the many advantages of Python over other
+programming languages.
+
+Amara builds on 4Suite, but whereas 4Suite focuses more on literal
+implementation of XML standards in Python, Amara adds a much more Pythonic face
+to these capabilities.
 
-Amara provides tools you can trust to conform with XML standards without losing the familiar Python feel.
+Amara provides tools you can trust to conform with XML standards without losing
+the familiar Python feel.
 
 %prep
-%setup -q -c Amara-0.9.4
+%setup -q -n Amara-0.9.4
 
 %build
-cd Amara-0.9.4
 python setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd Amara-0.9.4
-python setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}
+python%{pyver} setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,10 +57,15 @@
 %defattr(-,root,root,-)
 %{_bindir}/flextyper.py
 %{_bindir}/scimitar.py
-%{_libdir}/python%{pyver}/site-packages/amara/*
-%doc Amara-0.9.4/CHANGES Amara-0.9.4/COPYING Amara-0.9.4/demo Amara-0.9.4/manual.html Amara-0.9.4/README Amara-0.9.4/TODO
+%{_libdir}/python%{pyver}/site-packages/amara
+%doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-3
+- Better %pyver and BR/Requires handling
+- Broke %description at 80 columns
+- Fixed file ownership
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/ghasher ghasher.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1NF019215@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ghasher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/ghasher

Modified Files:
	ghasher.spec 
Log Message:
More review fixes


Index: ghasher.spec
===================================================================
RCS file: /cvs/extras/devel/ghasher/ghasher.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ghasher.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ ghasher.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ghasher
 Version:        1.2.0
-Release:        2
+Release:        3
 Summary:        GUI hasher for GTK+ 2
 Group:          Applications/File
 License:        BSD
@@ -10,7 +10,9 @@
 BuildRequires:  gtk2-devel >= 2.4 openssl-devel desktop-file-utils libglade2-devel
 
 %description
-ghasher can easily show the MD5 sum (or md2, md4, sha1, sha, ripemd160, dss1) of a file. Motivation for this utility was that users shouldn't need to open a command line for checking the MD5 sum of files they download.
+ghasher can easily show the MD5 sum (or md2, md4, sha1, sha, ripemd160, dss1)
+of a file. Motivation for this utility was that users shouldn't need to open a
+command line for checking the MD5 sum of files they download.
 
 %prep
 %setup -q
@@ -53,6 +55,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-3
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/lock-keys-applet lock-keys-applet.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1Lo019243@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/lock-keys-applet

Modified Files:
	lock-keys-applet.spec 
Log Message:
More review fixes


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/extras/devel/lock-keys-applet/lock-keys-applet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lock-keys-applet.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ lock-keys-applet.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        2
+Release:        3
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
 License:        GPL
@@ -12,7 +12,11 @@
 Requires(postun): scrollkeeper
 
 %description
-lock-keys-applet is a GNOME applet that shows the status of the Caps, Num and Scroll Lock keys of your keyboard. This isn't especially usefull for normal keyboards as they have LEDs for that. But some keyboards (especially wireless keyboards) don't. One more feature of the applet is that it saves the status of the lock keys and restores them when starting GNOME.
+lock-keys-applet is a GNOME applet that shows the status of the Caps, Num and
+Scroll Lock keys of your keyboard. This isn't especially usefull for normal
+keyboards as they have LEDs for that. But some keyboards (especially wireless
+keyboards) don't. One more feature of the applet is that it saves the status of
+the lock keys and restores them when starting GNOME.
 
 %prep
 %setup -q
@@ -24,6 +28,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -34,17 +39,20 @@
 %postun
 scrollkeeper-update
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_datadir}/gnome/help/%{name}
-%{_datadir}/locale/*/*/%{name}.mo
 %{_datadir}/omf/%{name}
 %{_datadir}/pixmaps/%{name}.png
 %{_libdir}/bonobo/servers/*.server
 %{_libexecdir}/%{name}
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-3
+- Used %find_lang instead of putting the .mo files in %files.
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/deskbar-applet deskbar-applet.spec,1.1,1.2
Message-ID: <200503162342.j2GNg1Q5019207@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/deskbar-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/deskbar-applet

Modified Files:
	deskbar-applet.spec 
Log Message:
More review fixes


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/devel/deskbar-applet/deskbar-applet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deskbar-applet.spec	16 Mar 2005 16:59:04 -0000	1.1
+++ deskbar-applet.spec	16 Mar 2005 23:41:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           deskbar-applet
 Version:        0.2
-Release:        1
+Release:        2
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
 License:        GPL
@@ -11,7 +11,8 @@
 BuildArch:      noarch
 
 %description
-This applet looks like the current Gnome Mini-Commander, but it launches search queries instead of programs.
+This applet looks like the current Gnome Mini-Commander, but it launches search
+queries instead of programs.
 
 Example search-engines include
 + Google
@@ -42,6 +43,9 @@
 %{_libdir}/bonobo/servers/DeskbarApplet.server
 
 %changelog
+* Wed Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-2
+- Broke %description at 80 columns
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-1
 - Bump release to 1
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/python-HTMLgen python-HTMLgen.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1Nq019247@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/python-HTMLgen

Modified Files:
	python-HTMLgen.spec 
Log Message:
More review fixes


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/devel/python-HTMLgen/python-HTMLgen.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-HTMLgen.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ python-HTMLgen.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -13,7 +13,7 @@
 
 Name:           %name
 Version:        %version
-Release:        1
+Release:        2
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -29,10 +29,12 @@
 BuildArch:      noarch
 
 %description
-HTMLgen is a class library for the generation of HTML documents with Python scripts. It's used when you want to create HTML pages containing information which changes from time to time.
+HTMLgen is a class library for the generation of HTML documents with Python
+scripts. It's used when you want to create HTML pages containing information
+which changes from time to time.
 
 %prep
-%setup -q -c htmlgen
+%setup -q -n HTMLgen
 
 %build
 
@@ -40,7 +42,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
 for file in HTMLgen.py HTMLcolors.py HTMLutil.py HTMLcalendar.py barchart.py colorcube.py imgsize.py NavLinks.py Formtools.py ImageH.py ImageFileH.py ImagePaletteH.py GifImagePluginH.py JpegImagePluginH.py PngImagePluginH.py; do
-  install -m 0644 HTMLgen/$file $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+  install -m 0644 $file $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
 done
 python%{pyver} %{_libdir}/python%{pyver}/compileall.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
 python%{pyver} -O %{_libdir}/python%{pyver}/compileall.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
@@ -54,6 +56,10 @@
 %{_libdir}/python%pyver/site-packages/*.py[co]
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-2
+- Modified %setup to use -n
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-1
 - Bump release to 1
 - Fixed License tag



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/leafpad leafpad.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1Bk019235@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/leafpad

Modified Files:
	leafpad.spec 
Log Message:
More review fixes


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/devel/leafpad/leafpad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- leafpad.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ leafpad.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           leafpad
 Version:        0.7.9
-Release:        2
+Release:        3
 Summary:        GTK+ based simple text editor
 
 Group:          Applications/Editors
@@ -15,7 +15,9 @@
 Requires(postun): desktop-file-utils
 
 %description
-Leafpad is a GTK+ based simple text editor. The user interface is similar to Notepad. It aims to be lighter than GEdit and KWrite, and to be as useful as them.
+Leafpad is a GTK+ based simple text editor. The user interface is similar to
+Notepad. It aims to be lighter than GEdit and KWrite, and to be as useful as
+them.
 
 %prep
 %setup -q
@@ -59,6 +61,9 @@
 %{_datadir}/pixmaps/leafpad.png
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-3
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/libosip libosip.spec,1.1,1.2
Message-ID: <200503162342.j2GNg1IX019239@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/libosip

Modified Files:
	libosip.spec 
Log Message:
More review fixes


Index: libosip.spec
===================================================================
RCS file: /cvs/extras/devel/libosip/libosip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libosip.spec	16 Mar 2005 17:10:30 -0000	1.1
+++ libosip.spec	16 Mar 2005 23:41:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libosip
 Version:        0.9.7
-Release:        1
+Release:        2
 Summary:        oSIP is an implementation of SIP
 
 Group:          System Environment/Libraries
@@ -15,7 +15,11 @@
 %description
 oSIP is an implementation of SIP.
 
-SIP stands for the Session Initiation Protocol and is described by the rfc3261 (wich deprecates rfc2543). This library aims to provide multimedia and telecom software developers an easy and powerful interface to initiate and control SIP based sessions in their applications. SIP is a open standard replacement from IETF for H323.
+SIP stands for the Session Initiation Protocol and is described by the rfc3261
+(wich deprecates rfc2543). This library aims to provide multimedia and telecom
+software developers an easy and powerful interface to initiate and control SIP
+based sessions in their applications. SIP is a open standard replacement from
+IETF for H.323.
 
 %package        devel
 Summary:        Development libraries for oSIP
@@ -58,12 +62,16 @@
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/osip/*.h
+%{_includedir}/osip
 %{_libdir}/*.a
 %{_libdir}/*.la
 %{_libdir}/*.so
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-2
+- Fix %files devel to include %{_includedir}/osip
+- Broke %description at 80 columns
+
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-1
 - Bump release to 1
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/kphone kphone.spec,1.2,1.3
Message-ID: <200503162342.j2GNg1uh019227@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/kphone

Modified Files:
	kphone.spec 
Log Message:
More review fixes


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kphone.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ kphone.spec	16 Mar 2005 23:41:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        2
+Release:        3
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -13,20 +13,21 @@
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils
 
 %description
-KPhone is a SIP (Session Initiation Protocol) user agent for Linux, with which you can initiate VoIP (Voice over IP) connections over the Internet.  It supports Presence and Instant Messaging, and to some extent also video calls between two hosts.
+KPhone is a SIP (Session Initiation Protocol) user agent for Linux, with which
+you can initiate VoIP (Voice over IP) connections over the Internet.  It
+supports Presence and Instant Messaging, and to some extent also video calls
+between two hosts.
 
 %prep
-%setup -q -c kphone
+%setup -q -n kphone
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-cd kphone
 ./configure --prefix=$RPM_BUILD_ROOT%{_prefix}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd kphone
 %makeinstall
 install -D -m 0644 icons/large-kphone.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kphone.png
 desktop-file-install --vendor=Fedora \
@@ -50,6 +51,10 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-3
+- Modified %setup to use -n
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-2
 - Removed explicit Requires
 



From fedora-extras-commits at redhat.com  Wed Mar 16 23:42:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 16 Mar 2005 18:42:01 -0500
Subject: devel/clearlooks clearlooks.spec,1.3,1.4
Message-ID: <200503162342.j2GNg1J9019203@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/clearlooks

Modified Files:
	clearlooks.spec 
Log Message:
More review fixes


Index: clearlooks.spec
===================================================================
RCS file: /cvs/extras/devel/clearlooks/clearlooks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- clearlooks.spec	16 Mar 2005 21:00:37 -0000	1.3
+++ clearlooks.spec	16 Mar 2005 23:41:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           clearlooks
 Version:        0.4
-Release:        3
+Release:        4
 Summary:        An attractive GTK+ 2 engine with a focus on usability
 Group:          User Interface/Desktops
 License:        GPL
@@ -11,7 +11,8 @@
 BuildRequires:  gtk2-devel
 
 %description
-Clearlooks will transform your GNOME desktop into an attractive looking and usable environment.
+Clearlooks will transform your GNOME desktop into an attractive looking and
+usable environment.
 
 %prep
 %setup -q
@@ -36,6 +37,9 @@
 %{_libdir}/gtk-2.0/2.4.0/engines/*
 
 %changelog
+* Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-4
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-3
 - Fixed build problem with metacity-theme-1.xml
 - Added option for animated progress bars



From fedora-extras-commits at redhat.com  Thu Mar 17 02:05:20 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 21:05:20 -0500
Subject: rpms/perl-pmtools - New directory
Message-ID: <200503170205.j2H25KEw024311@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24304/perl-pmtools

Log Message:
Directory /cvs/extras/rpms/perl-pmtools added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 02:05:20 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 21:05:20 -0500
Subject: rpms/perl-pmtools/devel - New directory
Message-ID: <200503170205.j2H25KNT024314@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24304/perl-pmtools/devel

Log Message:
Directory /cvs/extras/rpms/perl-pmtools/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 02:05:39 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 21:05:39 -0500
Subject: rpms/perl-pmtools Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503170205.j2H25dV0024375@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24366

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-pmtools


--- NEW FILE Makefile ---
# Top level Makefile for module perl-pmtools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 17 02:05:39 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 21:05:39 -0500
Subject: rpms/perl-pmtools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503170205.j2H25d7n024378@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24366/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-pmtools


--- 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 Mar 17 02:06:22 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 21:06:22 -0500
Subject: rpms/perl-pmtools import.log,1.1,1.2
Message-ID: <200503170206.j2H26MSf024493@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24484

Modified Files:
	import.log 
Log Message:
auto-import perl-pmtools-1.00-0.fdr.1 on branch devel from perl-pmtools-1.00-0.fdr.1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Mar 2005 02:05:37 -0000	1.1
+++ import.log	17 Mar 2005 02:06:20 -0000	1.2
@@ -0,0 +1 @@
+perl-pmtools-1_00-0_fdr_1:HEAD:perl-pmtools-1.00-0.fdr.1.src.rpm:1111025239



From fedora-extras-commits at redhat.com  Thu Mar 17 02:06:22 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 21:06:22 -0500
Subject: rpms/perl-pmtools/devel perl-pmtools.spec, NONE,
	1.1 pmtools-1.00-different-tarball.patch, NONE,
	1.1 pmtools-1.00-pmall.patch, NONE,
	1.1 pmtools-1.00-pmeth-pman2pmman.patch, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503170206.j2H26Mql024497@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24484/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-pmtools.spec pmtools-1.00-different-tarball.patch 
	pmtools-1.00-pmall.patch pmtools-1.00-pmeth-pman2pmman.patch 
Log Message:
auto-import perl-pmtools-1.00-0.fdr.1 on branch devel from perl-pmtools-1.00-0.fdr.1.src.rpm


--- NEW FILE perl-pmtools.spec ---
%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:           perl-pmtools
Version:        1.00
Release:        0.fdr.1
Epoch:          0
Summary:        A suite of small programs to help manage Perl modules

Group:          Development/Libraries
License:        Artistic
Url:            http://language.perl.com/
Source:         http://history.perl.org/src/pmtools-1.00.tar.gz
Patch1:         pmtools-1.00-different-tarball.patch
Patch2:         pmtools-1.00-pmall.patch
Patch3:         pmtools-1.00-pmeth-pman2pmman.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is pmtools -- a suite of small programs to help manage modules.
The names are totally preliminary, and in fact, so is the code.  We follow
the "keep it small" notion of many tiny tools each doing one thing well,
eschewing giant megatools with millions of options.

Tom Christiansen


%prep
%setup -q -n pmtools-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
chmod 755 pmman
find . -type f -perm 755 | xargs %{__perl} -pi -e 's{^#!/usr/bin/env perl}{#!%{__perl}}'


%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 README
%{_bindir}/*
%{perl_vendorlib}/Devel/
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3*


%changelog
* Sun Feb 06 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.00-0.fdr.1
- Valid source file link found.
- Package renamed to 'perl-pmtools' in order to avoid name clash with
  the ACPI debugging tools (pmtools).

* Tue Dec 28 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.00-0.fdr.1
- The patch adds a missing target in Makefile.PL (pmeth) and renames the
  script 'pman' into 'pmman' in order to avoid a filename clash with
  the pinfo package.

* Sat Feb 28 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> 0:1.00-0.fdr.0
- Initial build for fedora.us

pmtools-1.00-different-tarball.patch:

--- NEW FILE pmtools-1.00-different-tarball.patch ---
diff -ruN pmtools-1.00-history/pmall pmtools-1.00/pmall
--- pmtools-1.00-history/pmall	1999-02-16 01:18:36.000000000 +0000
+++ pmtools-1.00/pmall	1999-02-22 17:56:21.000000000 +0000
@@ -132,7 +132,7 @@
     # This should really use system(), because otherwise we bloat.
     my $mod = shift;
     local $SIG{__WARN__} = sub {};
-    eval "require $mod";
+    eval "local \$^W = 0; require $module";
     if ($@) {
 	warn "Cannot require $mod -- $@\n"
 	    if $opt_v;
diff -ruN pmtools-1.00-history/pmeth pmtools-1.00/pmeth
--- pmtools-1.00-history/pmeth	1999-02-16 01:18:48.000000000 +0000
+++ pmtools-1.00/pmeth	1999-02-22 17:56:25.000000000 +0000
@@ -16,7 +16,7 @@
     my $module = shift;
     my @indirect = @_;
     my @baseclasses = @indirect[ 0 .. ($#indirect-1) ];
-    eval "require $module";
+    eval "local \$^W = 0; require $module";
     if ($@) {
 	$@ =~ s/at \(eval.*$//;
 	warn "$0: $@";
diff -ruN pmtools-1.00-history/pmexp pmtools-1.00/pmexp
--- pmtools-1.00-history/pmexp	1999-02-16 01:18:50.000000000 +0000
+++ pmtools-1.00/pmexp	1999-02-22 17:56:28.000000000 +0000
@@ -8,7 +8,7 @@
 $errors = 0;
 
 for $module (@ARGV) { 
-    eval "require $module";
+    eval "local \$^W = 0; require $module";
     if ($@) {
         $@ =~ s/at \(eval.*$//;
         warn "$0: $@";
diff -ruN pmtools-1.00-history/pmload pmtools-1.00/pmload
--- pmtools-1.00-history/pmload	1999-02-16 01:18:57.000000000 +0000
+++ pmtools-1.00/pmload	1999-02-22 17:56:33.000000000 +0000
@@ -8,7 +8,7 @@
 %seen = %INC;
 
 $module = shift;
-eval "require $module";
+eval "local \$^W = 0; require $module";
 
 if ($@) {
     $@ =~ s/at \(eval.*$//;
diff -ruN pmtools-1.00-history/pmpath pmtools-1.00/pmpath
--- pmtools-1.00-history/pmpath	1999-02-16 01:19:01.000000000 +0000
+++ pmtools-1.00/pmpath	1999-02-22 17:55:54.000000000 +0000
@@ -7,7 +7,7 @@
 $errors = 0;
 
 for $module (@ARGV) {
-    eval "require $module";
+    eval "local \$^W = 0; require $module";
     if ($@) {
 	$@ =~ s/at \(eval.*$//;
 	warn "$0: $@";
diff -ruN pmtools-1.00-history/pmvers pmtools-1.00/pmvers
--- pmtools-1.00-history/pmvers	1999-02-16 01:19:05.000000000 +0000
+++ pmtools-1.00/pmvers	1999-02-22 17:56:41.000000000 +0000
@@ -7,7 +7,7 @@
 $errors = 0;
 
 for $module (@ARGV) {
-    eval "require $module";
+    eval "local \$^W = 0; require $module";
     if ($@) {
 	$@ =~ s/at \(eval.*$//;
 	warn "$0: $@";

pmtools-1.00-pmall.patch:

--- NEW FILE pmtools-1.00-pmall.patch ---
diff -ruN pmtools-1.00/pmall pmtools-1.00-modified/pmall
--- pmtools-1.00/pmall	2005-02-07 01:20:07.045247168 +0000
+++ pmtools-1.00-modified/pmall	2005-02-07 01:21:50.649496928 +0000
@@ -132,7 +132,7 @@
     # This should really use system(), because otherwise we bloat.
     my $mod = shift;
     local $SIG{__WARN__} = sub {};
-    eval "local \$^W = 0; require $module";
+    eval "local \$^W = 0; require $mod";
     if ($@) {
 	warn "Cannot require $mod -- $@\n"
 	    if $opt_v;

pmtools-1.00-pmeth-pman2pmman.patch:

--- NEW FILE pmtools-1.00-pmeth-pman2pmman.patch ---
diff -ruN pmtools-1.00/Makefile.lame pmtools-1.00-modified/Makefile.lame
--- pmtools-1.00/Makefile.lame	1999-02-15 21:40:31.000000000 +0000
+++ pmtools-1.00-modified/Makefile.lame	2004-12-28 20:06:11.745150464 +0000
@@ -1,5 +1,5 @@
 
-PROGRAMS=basepods faqpods modpods pfcat plxload pmall pman pmcat \
+PROGRAMS=basepods faqpods modpods pfcat plxload pmall pmman pmcat \
 	pmdesc pmdirs pmeth pmexp pmfunc pminst pmload pmls pmpath pmvers podgrep \
 	podpath pods podtoc sitepods stdpods
 
diff -ruN pmtools-1.00/Makefile.PL pmtools-1.00-modified/Makefile.PL
--- pmtools-1.00/Makefile.PL	1999-02-16 01:13:35.000000000 +0000
+++ pmtools-1.00-modified/Makefile.PL	2004-12-28 20:00:27.997408064 +0000
@@ -4,8 +4,8 @@
 	NAME => "pmtools",
         DISTNAME => "pmtools",
 	EXE_FILES => [  basepods, faqpods, modpods, pfcat, plxload,
-			pmall, pman, pmcat, pmdesc, pmdirs, pmexp,
-			pmfunc, pminst, pmload, pmls, pmpath, pmvers,
+			pmall, pmcat, pmdesc, pmdirs, pmeth, pmexp,
+			pmfunc, pminst, pmload, pmman, pmls, pmpath, pmvers,
 			podgrep, podpath, pods, podtoc, sitepods,
 			stdpods ],
 	PM => { 'Devel/Loaded.pm' => '$(INST_LIBDIR)/Devel/Loaded.pm' }
diff -ruN pmtools-1.00/MANIFEST pmtools-1.00-modified/MANIFEST
--- pmtools-1.00/MANIFEST	1999-02-16 01:17:15.000000000 +0000
+++ pmtools-1.00-modified/MANIFEST	2004-12-28 20:06:29.068516912 +0000
@@ -10,7 +10,7 @@
 pfcat
 plxload
 pmall
-pman
+pmman
 pmcat
 pmdesc
 pmdirs
diff -ruN pmtools-1.00/pman pmtools-1.00-modified/pman
--- pmtools-1.00/pman	1999-02-16 01:18:39.000000000 +0000
+++ pmtools-1.00-modified/pman	1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-#!/usr/bin/env perl
-# pman -- show a module's man page
-# tchrist at perl.com
-
-BEGIN { $^W = 1 }
-BEGIN { die "usage: $0 module ...\n" unless @ARGV }
-
-use FindBin qw($Bin);
-
-$errors = 0;
-
-unless ($pager = $ENV{PAGER}) {
-    require Config;
-    $pager = $Config::Config{"pager"} || "more";
-} 
-
-for $module (@ARGV) { 
-    my $path =  `$Bin/pmpath $module`;
-    if ($?) {
-	$errors++;
-	next;
-    } 
-    chomp $path;
-    system "pod2text $path | $pager";
-    $errors += ($? != 1);
-}
-
-exit($errors != 0);
-
-__END__
-
-=head1 NAME
-
-pman - show a module's man page
-
-=head1 DESCRIPTION
-
-Send a module's pod through pod2text and your pager.
-
-This is mostly here for people too lazy to type
-
-    $ pod2text `pmpath CGI` | $PAGER
-
-=head1 EXAMPLES
-
-    $ pman CGI
-    $ pman Curses
-
-Or running under different versions of Perl: 
-
-    $ oldperl -S pman CGI
-    $ filsperl -S pman Threads
-
-=head1 SEE ALSO
-
-pod2text(1), perlpod(1), pod2man(1), pod2html(1).
-
-=head1 AUTHOR and COPYRIGHT
-
-Copyright (c) 1999 Tom Christiansen
-
-This is free software.  You may modify it and distribute it 
-under Perl's Artistic Licence.  Modified versions must be
-clearly indicated.
diff -ruN pmtools-1.00/pmman pmtools-1.00-modified/pmman
--- pmtools-1.00/pmman	1970-01-01 01:00:00.000000000 +0100
+++ pmtools-1.00-modified/pmman	2004-12-28 20:03:48.054994688 +0000
@@ -0,0 +1,64 @@
+#!/usr/bin/env perl
+# pmman -- show a module's man page
+# tchrist at perl.com
+
+BEGIN { $^W = 1 }
+BEGIN { die "usage: $0 module ...\n" unless @ARGV }
+
+use FindBin qw($Bin);
+
+$errors = 0;
+
+unless ($pager = $ENV{PAGER}) {
+    require Config;
+    $pager = $Config::Config{"pager"} || "more";
+} 
+
+for $module (@ARGV) { 
+    my $path =  `$Bin/pmpath $module`;
+    if ($?) {
+	$errors++;
+	next;
+    } 
+    chomp $path;
+    system "pod2text $path | $pager";
+    $errors += ($? != 1);
+}
+
+exit($errors != 0);
+
+__END__
+
+=head1 NAME
+
+pmman - show a module's man page
+
+=head1 DESCRIPTION
+
+Send a module's pod through pod2text and your pager.
+
+This is mostly here for people too lazy to type
+
+    $ pod2text `pmpath CGI` | $PAGER
+
+=head1 EXAMPLES
+
+    $ pmman CGI
+    $ pmman Curses
+
+Or running under different versions of Perl: 
+
+    $ oldperl -S pmman CGI
+    $ filsperl -S pmman Threads
+
+=head1 SEE ALSO
+
+pod2text(1), perlpod(1), pod2man(1), pod2html(1).
+
+=head1 AUTHOR and COPYRIGHT
+
+Copyright (c) 1999 Tom Christiansen
+
+This is free software.  You may modify it and distribute it 
+under Perl's Artistic Licence.  Modified versions must be
+clearly indicated.
diff -ruN pmtools-1.00/README pmtools-1.00-modified/README
--- pmtools-1.00/README	1999-02-16 01:18:08.000000000 +0000
+++ pmtools-1.00-modified/README	2004-12-28 20:01:27.751324088 +0000
@@ -383,10 +383,10 @@
 
 =========================================================
 
-pman - show the module's pod docs
+pmman - show the module's pod docs
 
-    $ pman CGI
-    $ pman Curses
+    $ pmman CGI
+    $ pmman Curses
 
 This is mostly here for people too lazy to type
     $ pod2text `pmpath CGI` | more


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Mar 2005 02:05:37 -0000	1.1
+++ .cvsignore	17 Mar 2005 02:06:20 -0000	1.2
@@ -0,0 +1 @@
+pmtools-1.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Mar 2005 02:05:37 -0000	1.1
+++ sources	17 Mar 2005 02:06:20 -0000	1.2
@@ -0,0 +1 @@
+88ee58113ac3d513d94f81f9fdfaeb00  pmtools-1.00.tar.gz



From jpo at di.uminho.pt  Thu Mar 17 02:13:41 2005
From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=)
Date: Thu, 17 Mar 2005 02:13:41 +0000
Subject: APPROVED: perl-pmtools
Message-ID: <4238E7D5.9020009@di.uminho.pt>

Description:
This is pmtools -- a suite of small programs to help manage modules.
The names are totally preliminary, and in fact, so is the code.  We
follow the "keep it small" notion of many tiny tools each doing one
thing well, eschewing giant megatools with millions of options.

Author:
Tom Christiansen

QA:
https://bugzilla.fedora.us/show_bug.cgi?id=2415

Reviewer:
Ville Skytt?

Maintainer:
Jos? Pedro Oliveira
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/128c848e/attachment-0001.sig>

From rc040203 at freenet.de  Thu Mar 17 03:21:33 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Thu, 17 Mar 2005 04:21:33 +0100
Subject: devel/clearlooks clearlooks-0.4-dirs.patch, NONE, 1.1
	clearlooks.spec, 1.2, 1.3
In-Reply-To: <200503162100.j2GL0dQt013993@cvs-int.fedora.redhat.com>
References: <200503162100.j2GL0dQt013993@cvs-int.fedora.redhat.com>
Message-ID: <1111029694.17514.144.camel@mccallum.corsepiu.local>

On Wed, 2005-03-16 at 16:00 -0500, Ignacio Vazquez-Abrams wrote:
> Author: ivazquez
> 
> Update of /cvs/extras/devel/clearlooks
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13986
> 
> Modified Files:
> 	clearlooks.spec 
> Added Files:
> 	clearlooks-0.4-dirs.patch 
> Log Message:
> Fix install issues
> 
> clearlooks-0.4-dirs.patch:
> 
> --- NEW FILE clearlooks-0.4-dirs.patch ---
> --- clearlooks-0.4/themes/Clearlooks-Olive/gtk-2.0/Makefile.in.orig	2005-03-16 15:05:43.149930536 -0500
> +++ clearlooks-0.4/themes/Clearlooks-Olive/gtk-2.0/Makefile.in	2005-03-16 15:05:58.706150174 -0500
> @@ -217,7 +217,7 @@
>  uninstall-info-am:
>  install-themeDATA: $(theme_DATA)
>  	@$(NORMAL_INSTALL)
> -	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
> +	test -z "$(DESTDIR)$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"

This patch doesn't seem correct to me for 2 reasons:

1. This patch hacks an automake-generated Makefile.in.
If something is broken in a configuration, you should edit the
Makefile.am and regenerate the Makefile.in, but you must not manually
edit Makefile.ins.

2. The patch doesn't make sense.
test -z "$(themedir)" and test -z "$(DESTDIR)$(themedir)"
are equivalent.

Ralf





From fedora-extras-commits at redhat.com  Thu Mar 17 03:40:09 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 22:40:09 -0500
Subject: rpms/perl-pmtools/FC-3 perl-pmtools.spec,1.1,1.2
Message-ID: <200503170340.j2H3e9AJ026681@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26670/FC-3

Modified Files:
	perl-pmtools.spec 
Log Message:
Adapting to Fedora.Extras


Index: perl-pmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/FC-3/perl-pmtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-pmtools.spec	17 Mar 2005 02:06:20 -0000	1.1
+++ perl-pmtools.spec	17 Mar 2005 03:40:07 -0000	1.2
@@ -2,8 +2,7 @@
 
 Name:           perl-pmtools
 Version:        1.00
-Release:        0.fdr.1
-Epoch:          0
+Release:        1
 Summary:        A suite of small programs to help manage Perl modules
 
 Group:          Development/Libraries
@@ -68,7 +67,7 @@
 
 
 %changelog
-* Sun Feb 06 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.00-0.fdr.1
+* Sun Feb 06 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.00-1
 - Valid source file link found.
 - Package renamed to 'perl-pmtools' in order to avoid name clash with
   the ACPI debugging tools (pmtools).



From fedora-extras-commits at redhat.com  Thu Mar 17 03:40:09 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 16 Mar 2005 22:40:09 -0500
Subject: rpms/perl-pmtools/devel perl-pmtools.spec,1.1,1.2
Message-ID: <200503170340.j2H3e9qD026685@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26670/devel

Modified Files:
	perl-pmtools.spec 
Log Message:
Adapting to Fedora.Extras


Index: perl-pmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/devel/perl-pmtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-pmtools.spec	17 Mar 2005 02:06:20 -0000	1.1
+++ perl-pmtools.spec	17 Mar 2005 03:40:07 -0000	1.2
@@ -2,8 +2,7 @@
 
 Name:           perl-pmtools
 Version:        1.00
-Release:        0.fdr.1
-Epoch:          0
+Release:        1
 Summary:        A suite of small programs to help manage Perl modules
 
 Group:          Development/Libraries
@@ -68,7 +67,7 @@
 
 
 %changelog
-* Sun Feb 06 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.00-0.fdr.1
+* Sun Feb 06 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.00-1
 - Valid source file link found.
 - Package renamed to 'perl-pmtools' in order to avoid name clash with
   the ACPI debugging tools (pmtools).



From rc040203 at freenet.de  Thu Mar 17 03:57:06 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Thu, 17 Mar 2005 04:57:06 +0100
Subject: rpms/clearlooks/devel clearlooks.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <20050316204320.7b3b4dc2.bugs.michael@gmx.net>
References: <200503161655.j2GGt3m4001351@cvs-int.fedora.redhat.com>
	<20050316204320.7b3b4dc2.bugs.michael@gmx.net>
Message-ID: <1111031826.17514.154.camel@mccallum.corsepiu.local>

On Wed, 2005-03-16 at 20:43 +0100, Michael Schwendt wrote:
> On Wed, 16 Mar 2005 11:55:03 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> 
> > Author: ivazquez
> > 
> > Update of /cvs/extras/rpms/clearlooks/devel
> > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1338/devel
> 
> Build fails on FC3.

Try adding
BuildRequires: libgnome-devel

>  Does it work on FC4T1 (can't test right now):
> 
> error: Installed (but unpackaged) file(s) found:
>    /share/themes/Clearlooks/metacity-1/metacity-theme-1.xml
This is a side effect of the missing "BR: libgnome-devel"


Further (minor) bug:

checking for ANSI C header files... (cached) yes
./configure: line 21956: --variable=gtk_binary_version: command not
found
checking for pkg-config... /usr/bin/pkg-config

The cause is the configure script invoking $PKG_CONFIG before setting
PKG_CONFIG.

It doesn't have any effect on the rpm, so letting upstream fix this
probably would be appropriate.

Below is what works for me on FC3.

Ralf

-------------- next part --------------
A non-text attachment was scrubbed...
Name: clearlooks.diff
Type: text/x-patch
Size: 867 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/63534428/attachment-0001.bin>

From ivazquez at ivazquez.net  Thu Mar 17 05:21:24 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 00:21:24 -0500
Subject: rpms/clearlooks/devel clearlooks.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <1111031826.17514.154.camel@mccallum.corsepiu.local>
References: <200503161655.j2GGt3m4001351@cvs-int.fedora.redhat.com>
	<20050316204320.7b3b4dc2.bugs.michael@gmx.net>
	<1111031826.17514.154.camel@mccallum.corsepiu.local>
Message-ID: <1111036884.18744.8.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 04:57 +0100, Ralf Corsepius wrote:
> On Wed, 2005-03-16 at 20:43 +0100, Michael Schwendt wrote:
> > error: Installed (but unpackaged) file(s) found:
> >    /share/themes/Clearlooks/metacity-1/metacity-theme-1.xml
> This is a side effect of the missing "BR: libgnome-devel"

Aha! This is a much better solution than futzing with patches and
makefiles.

> The cause is the configure script invoking $PKG_CONFIG before setting
> PKG_CONFIG.
> 
> It doesn't have any effect on the rpm, so letting upstream fix this
> probably would be appropriate.

Agreed. I'll kick this one upstream.

Thanks for looking at this closer.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/17446f2c/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Thu Mar 17 05:36:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 00:36:03 -0500
Subject: devel/clearlooks clearlooks.spec, 1.4, 1.5 clearlooks-0.4-dirs.patch,
	1.1, NONE
Message-ID: <200503170536.j2H5a34M029857@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29851

Modified Files:
	clearlooks.spec 
Removed Files:
	clearlooks-0.4-dirs.patch 
Log Message:
BuildRequires: libgnome-devel fix


Index: clearlooks.spec
===================================================================
RCS file: /cvs/extras/devel/clearlooks/clearlooks.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- clearlooks.spec	16 Mar 2005 23:41:59 -0000	1.4
+++ clearlooks.spec	17 Mar 2005 05:36:01 -0000	1.5
@@ -1,14 +1,13 @@
 Name:           clearlooks
 Version:        0.4
-Release:        4
+Release:        5
 Summary:        An attractive GTK+ 2 engine with a focus on usability
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://clearlooks.sourceforge.net/screenshots/
 Source0:        http://prdownloads.sourceforge.net/clearlooks/clearlooks-0.4.tar.bz2
-Patch0:         clearlooks-0.4-dirs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gtk2-devel
+BuildRequires:  gtk2-devel libgnome-devel
 
 %description
 Clearlooks will transform your GNOME desktop into an attractive looking and
@@ -16,7 +15,6 @@
 
 %prep
 %setup -q
-%patch -p 1 -b dirs
 
 %build
 %configure --enable-animation
@@ -37,6 +35,10 @@
 %{_libdir}/gtk-2.0/2.4.0/engines/*
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-5
+- Added libgnome-devel to BR
+- Removed iffy dir patch
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-4
 - Broke %description at 80 columns
 


--- clearlooks-0.4-dirs.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar 17 07:19:47 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 02:19:47 -0500
Subject: rpms/nabi - New directory
Message-ID: <200503170719.j2H7Jlw8000721@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv708/nabi

Log Message:
Directory /cvs/extras/rpms/nabi added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 07:19:47 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 02:19:47 -0500
Subject: rpms/nabi/devel - New directory
Message-ID: <200503170719.j2H7JlWj000724@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv708/nabi/devel

Log Message:
Directory /cvs/extras/rpms/nabi/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 07:20:06 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 02:20:06 -0500
Subject: rpms/nabi Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503170720.j2H7K6p1000803@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv788

Added Files:
	Makefile import.log 
Log Message:
Setup of module nabi


--- NEW FILE Makefile ---
# Top level Makefile for module nabi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 17 07:20:06 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 02:20:06 -0500
Subject: rpms/nabi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503170720.j2H7K6oU000806@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv788/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nabi


--- 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 Mar 17 07:21:04 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 02:21:04 -0500
Subject: rpms/nabi import.log,1.1,1.2
Message-ID: <200503170721.j2H7L4VA000962@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv947

Modified Files:
	import.log 
Log Message:
auto-import nabi-0.14-3 on branch devel from nabi-0.14-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nabi/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Mar 2005 07:20:04 -0000	1.1
+++ import.log	17 Mar 2005 07:21:02 -0000	1.2
@@ -0,0 +1 @@
+nabi-0_14-3:HEAD:nabi-0.14-3.src.rpm:1111044052



From fedora-extras-commits at redhat.com  Thu Mar 17 07:21:04 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 02:21:04 -0500
Subject: rpms/nabi/devel nabi.spec, NONE, 1.1 themeRemoval.sh, NONE,
	1.1 xinput.d-nabi, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503170721.j2H7L4HD000966@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv947/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nabi.spec themeRemoval.sh xinput.d-nabi 
Log Message:
auto-import nabi-0.14-3 on branch devel from nabi-0.14-3.src.rpm


--- NEW FILE nabi.spec ---
%define name nabi
%define version 0.14
%define release 3
%define prefix /usr

Summary: Simple Hangul X Input Method
Name: %{name}
Version: %{version}
Release: %{release}

Group: User Interface/X

Copyright: GPL
URL: http://nabi.kldp.net
Source: http://download.kldp.net/%{name}/%{name}-%{version}.tar.gz
Source2: xinput.d-%{name}
Source3: themeRemoval.sh

BuildRequires: gtk2-devel >= 2.2.0

BuildRoot:  /var/tmp/%{name}-root

%description
Nabi is a simple XIM for Korean, implemented with GTK+2.
It can dock in the notification area, and also show the
status of imhangul(See also http://imhangul.kldp.net).

%prep
rm -rf $RPM_BUILD_ROOT
%setup -q -n %{name}-%{version}

%build
./configure --prefix=%{prefix}
make

%install
make DESTDIR=$RPM_BUILD_ROOT install-strip

install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}

# Nabi shortcut menu

mkdir -p $RPM_BUILD_ROOT/usr/share/applications
cat >$RPM_BUILD_ROOT/usr/share/applications/nabi.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=Nabi
Comment=Simple Hangul XIM
Exec=nabi
Icon=/usr/share/nabi/nabi.png
Terminal=false
NoDisplay=true
Type=Application
Categories=Application;System;X-Red-Hat-Base;
EOF
# End of nabi.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post
alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/ko_KR xinput-ko_KR %{_sysconfdir}/X11/xinit/xinput.d/%{name} 30

%preun
if [ "$1" = 0 ]; then
   alternatives --remove xinput-ko_KR %{_sysconfdir}/X11/xinit/xinput.d/%{name}
fi

%postun

%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README
%attr(755,root,root) %{prefix}/bin/nabi
%{prefix}/share/nabi
%{prefix}/share/locale/*/LC_MESSAGES/nabi.mo
/usr/share/applications/nabi.desktop
%{_sysconfdir}/X11/xinit/xinput.d


%changelog
* Tue Oct 12 2004 Leon Ho <llch at redhat.com>
- add NoDisplay=true to .desktop to hide desktop entry

* Wed Sep 29 2004 Lawrence Lim <llim at redhat.com>
- upgraded to 0.14
- fix bug 131586
  - Trademaked icons in nabi themes
- fix bug 131866
  - Upgrade nabi to 0.14

* Tue Jul 06 2004 Leon Ho <llch at redhat.com>
- upgraded to 0.13
- added support to xinitrc-4.0.1
  - added xinput-nabi
  - added alternativies on post and preun

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Dec 02 2003 David Joo <djoo at redhat.com> 0.11-3
- Packaged against Fedora Core2

* Sat Nov 29 2003 DongCheon Park <pdc at kaist.ac.kr> 0.11-1pdc
- updated to 0.11 release

* Sat Nov 29 2003 DongCheon Park <pdc at kaist.ac.kr> 0.10-2pdc
- fixed BuildRequires

* Sun Nov 09 2003 DongCheon Park <pdc at kaist.ac.kr> 0.10-1pdc
- updated to 0.10 release

* Mon Oct 20 2003 DongCheon Park <pdc at kaist.ac.kr> 0.9-2pdc
- added RedHat/Mandrake specific entries

* Wed Oct 15 2003 DongCheon Park <pdc at kaist.ac.kr> 0.9-1pdc
- updated to 0.9 release

* Thu Oct 09 2003 DongCheon Park <pdc at kaist.ac.kr> 0.8-1pdc
- updated to 0.8 release

* Fri Sep 26 2003 DongCheon Park <pdc at kaist.ac.kr> 0.7-1pdc
- updated to 0.7 release

* Tue Sep 16 2003 DongCheon Park <pdc at kaist.ac.kr> 0.6-1pdc
- updated to 0.6 release

* Mon Sep 08 2003 DongCheon Park <pdc at kaist.ac.kr> 0.5-1pdc
- updated to 0.5 release

* Wed Sep 03 2003 DongCheon Park <pdc at kaist.ac.kr> 0.4-2pdc
- cleaned up nabi.spec

* Wed Aug 27 2003 DongCheon Park <pdc at kaist.ac.kr> 0.4-1pdc
- updated to 0.4 release

* Mon Aug 11 2003 DongCheon Park <pdc at kaist.ac.kr> 0.3-1pdc
- updated to 0.3 release

* Sat Aug 09 2003 DongCheon Park <pdc at kaist.ac.kr> 0.2-1pdc
- updated to 0.2 release

* Thu Aug 07 2003 DongCheon Park <pdc at kaist.ac.kr> 0.1-1pdc
- initial build



--- NEW FILE themeRemoval.sh ---
#!/bin/bash

NAME=nabi-0.14
FILENAME=$NAME.orig.tar.gz
MODIFICATION=$NAME/themes/Makefile.am
CONFIGURE=$NAME/configure.in                         
                                                                                                    
tar xfz $FILENAME
   
for i in Mac MS
do
   sed -e 's/^.*MS.*$//' $CONFIGURE > $CONFIGURE.changed
   cp $CONFIGURE.changed $CONFIGURE
   sed -e 's/^.*Mac.*$//' $CONFIGURE > $CONFIGURE.changed
   cp $CONFIGURE.changed $CONFIGURE
done

mv -f $CONFIGURE.changed $CONFIGURE

echo "configure.in file updated"                                   
                                                                                       
for i in Mac MS
do
   rm -Rf $NAME/themes/$i*
   sed -e 's/^.*MS.*$//' $MODIFICATION > $MODIFICATION.changed
   cp $MODIFICATION.changed $MODIFICATION
   sed -e 's/^.*Mac.*$//' $MODIFICATION > $MODIFICATION.changed
   cp $MODIFICATION.changed $MODIFICATION
done
                                                                                                                             
sed -e '/^$/d' $MODIFICATION > $MODIFICATION.changed
mv -f $MODIFICATION.changed $MODIFICATION
                                                                                                                             
echo "themes removed"


--- NEW FILE xinput.d-nabi ---
XIM=nabi
XIM_PROGRAM=nabi
GTK_IM_MODULE=xim


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Mar 2005 07:20:04 -0000	1.1
+++ .cvsignore	17 Mar 2005 07:21:02 -0000	1.2
@@ -0,0 +1 @@
+nabi-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Mar 2005 07:20:04 -0000	1.1
+++ sources	17 Mar 2005 07:21:02 -0000	1.2
@@ -0,0 +1 @@
+fd17d4baedf374d3f0930ce61f4497c3  nabi-0.14.tar.gz



From wtogami at redhat.com  Thu Mar 17 07:23:46 2005
From: wtogami at redhat.com (Warren Togami)
Date: Wed, 16 Mar 2005 21:23:46 -1000
Subject: APPROVED: nabi
Message-ID: <42393082.7000207@redhat.com>

Nabi is a simple XIM for Korean, implemented with GTK+2.
It can dock in the notification area, and also show the
status of imhangul(See also http://imhangul.kldp.net

This was previously shipped in FC3 so requires no review, however I am 
fixing it up...

Warren Togami
wtogami at redhat.com



From fedora-extras-commits at redhat.com  Thu Mar 17 07:54:09 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 02:54:09 -0500
Subject: rpms/nabi/devel nabi.spec,1.1,1.2
Message-ID: <200503170754.j2H7s9Rb001666@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1654

Modified Files:
	nabi.spec 
Log Message:
many spec fixes



Index: nabi.spec
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/nabi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nabi.spec	17 Mar 2005 07:21:02 -0000	1.1
+++ nabi.spec	17 Mar 2005 07:54:07 -0000	1.2
@@ -1,24 +1,17 @@
-%define name nabi
-%define version 0.14
-%define release 3
-%define prefix /usr
-
 Summary: Simple Hangul X Input Method
-Name: %{name}
-Version: %{version}
-Release: %{release}
-
+Name: nabi
+Version: 0.14
+Release: 4
 Group: User Interface/X
-
-Copyright: GPL
+License: GPL
 URL: http://nabi.kldp.net
 Source: http://download.kldp.net/%{name}/%{name}-%{version}.tar.gz
 Source2: xinput.d-%{name}
 Source3: themeRemoval.sh
-
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel >= 2.2.0
+BuildRequires: gettext
 
-BuildRoot:  /var/tmp/%{name}-root
 
 %description
 Nabi is a simple XIM for Korean, implemented with GTK+2.
@@ -30,10 +23,11 @@
 %setup -q -n %{name}-%{version}
 
 %build
-./configure --prefix=%{prefix}
+./configure --prefix=/usr
 make
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install-strip
 
 install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}
@@ -71,14 +65,18 @@
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog README
-%attr(755,root,root) %{prefix}/bin/nabi
-%{prefix}/share/nabi
-%{prefix}/share/locale/*/LC_MESSAGES/nabi.mo
-/usr/share/applications/nabi.desktop
+%attr(755,root,root)
+%{_bindir}/nabi
+%{_datadir}/nabi
+%{_datadir}/locale/*/LC_MESSAGES/nabi.mo
+%{_datadir}/applications/nabi.desktop
 %{_sysconfdir}/X11/xinit/xinput.d
 
 
 %changelog
+* Wed Mar 16 2005 Warren Togami <wtogami at redhat.com> -  0.14-4
+- many spec fixes
+
 * Tue Oct 12 2004 Leon Ho <llch at redhat.com>
 - add NoDisplay=true to .desktop to hide desktop entry
 



From rc040203 at freenet.de  Thu Mar 17 08:24:43 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Thu, 17 Mar 2005 09:24:43 +0100
Subject: rpms/nabi/devel nabi.spec,1.1,1.2
In-Reply-To: <200503170754.j2H7s9Rb001666@cvs-int.fedora.redhat.com>
References: <200503170754.j2H7s9Rb001666@cvs-int.fedora.redhat.com>
Message-ID: <1111047883.17514.179.camel@mccallum.corsepiu.local>

On Thu, 2005-03-17 at 02:54 -0500, Warren Togami wrote:
> Author: wtogami

>  
>  %build
> -./configure --prefix=%{prefix}
> +./configure --prefix=/usr

> +%attr(755,root,root)
> +%{_bindir}/nabi
> +%{_datadir}/nabi
> +%{_datadir}/locale/*/LC_MESSAGES/nabi.mo
> +%{_datadir}/applications/nabi.desktop
>  %{_sysconfdir}/X11/xinit/xinput.d

?? This is inconsistent:

* If you need "configure --prefix=/usr" you should hard code 
/usr in %files, too.

* If you're using %{_XXX} in %files, you should pass each of the %{_XXX}
vars to configure, too.

Try 
rpmbuild --define '_prefix /usr/local' ...
to see the effect of this inconsistency.

Ralf




From rc040203 at freenet.de  Thu Mar 17 08:29:36 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Thu, 17 Mar 2005 09:29:36 +0100
Subject: devel/kphone kphone.spec,1.2,1.3
In-Reply-To: <200503162342.j2GNg1uh019227@cvs-int.fedora.redhat.com>
References: <200503162342.j2GNg1uh019227@cvs-int.fedora.redhat.com>
Message-ID: <1111048177.17514.182.camel@mccallum.corsepiu.local>

On Wed, 2005-03-16 at 18:42 -0500, Ignacio Vazquez-Abrams wrote:
> Author: ivazquez
> 
> Update of /cvs/extras/devel/kphone
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161/kphone
> 
> Modified Files:
> 	kphone.spec 
> Log Message:
> More review fixes

>  ./configure --prefix=$RPM_BUILD_ROOT%{_prefix}

A prefix containing $RPM_BUILD_ROOT hardly can be correct.
You probably want %configure


Furthermore, I am not convinced about this package's sources quality:

- The tarballs is badly packaged:
+ tar -xf -
tar: kphone/dissipate2: implausibly old time stamp 1970-01-01 01:00:00
tar: kphone/gsm: implausibly old time stamp 1970-01-01 01:00:00
tar: kphone/icons: implausibly old time stamp 1970-01-01 01:00:00
tar: kphone/ilbc: implausibly old time stamp 1970-01-01 01:00:00
tar: kphone/kphone: implausibly old time stamp 1970-01-01 01:00:00
tar: Read 7168 bytes from -
tar: kphone/po: implausibly old time stamp 1970-01-01 01:00:00
tar: kphone: implausibly old time stamp 1970-01-01 01:00:00
+ STATUS=0

- Serious compiler warnings:
In file included from dspoutrtp.cpp:16:
rtpdataheader.h:35: warning: `__packed__' attribute ignored
(I didn't investigate potential issues being caused by this warning.)

- This package does not acknowledge RPM_OPT_FLAGS
(This package's configuration is ..., to say the least ...)


Below is a patch to workaround the prefix issue.

Ralf

-------------- next part --------------
A non-text attachment was scrubbed...
Name: kphone-4.1.0-po-hacks.diff
Type: text/x-patch
Size: 478 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/8f7cde0a/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: kphone.spec.diff
Type: text/x-patch
Size: 1101 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/8f7cde0a/attachment-0003.bin>

From ivazquez at ivazquez.net  Thu Mar 17 08:31:31 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 03:31:31 -0500
Subject: rpms/nabi/devel nabi.spec,1.1,1.2
In-Reply-To: <1111047883.17514.179.camel@mccallum.corsepiu.local>
References: <200503170754.j2H7s9Rb001666@cvs-int.fedora.redhat.com>
	<1111047883.17514.179.camel@mccallum.corsepiu.local>
Message-ID: <1111048291.30220.0.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 09:24 +0100, Ralf Corsepius wrote:
> On Thu, 2005-03-17 at 02:54 -0500, Warren Togami wrote:
> >  %build
> > -./configure --prefix=%{prefix}
> > +./configure --prefix=/usr
> 
> * If you're using %{_XXX} in %files, you should pass each of the %{_XXX}
> vars to configure, too.

Or just use %configure.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/5f97ec3f/attachment-0001.sig>

From wtogami at redhat.com  Thu Mar 17 08:31:54 2005
From: wtogami at redhat.com (Warren Togami)
Date: Wed, 16 Mar 2005 22:31:54 -1000
Subject: rpms/nabi/devel nabi.spec,1.1,1.2
In-Reply-To: <1111047883.17514.179.camel@mccallum.corsepiu.local>
References: <200503170754.j2H7s9Rb001666@cvs-int.fedora.redhat.com>
	<1111047883.17514.179.camel@mccallum.corsepiu.local>
Message-ID: <4239407A.1060904@redhat.com>

Ralf Corsepius wrote:
> On Thu, 2005-03-17 at 02:54 -0500, Warren Togami wrote:
> 
>>Author: wtogami
> 
> 
>> 
>> %build
>>-./configure --prefix=%{prefix}
>>+./configure --prefix=/usr
> 
> 
>>+%attr(755,root,root)
>>+%{_bindir}/nabi
>>+%{_datadir}/nabi
>>+%{_datadir}/locale/*/LC_MESSAGES/nabi.mo
>>+%{_datadir}/applications/nabi.desktop
>> %{_sysconfdir}/X11/xinit/xinput.d
> 
> 
> ?? This is inconsistent:
> 
> * If you need "configure --prefix=/usr" you should hard code 
> /usr in %files, too.
> 
> * If you're using %{_XXX} in %files, you should pass each of the %{_XXX}
> vars to configure, too.
> 
> Try 
> rpmbuild --define '_prefix /usr/local' ...
> to see the effect of this inconsistency.
> 
> Ralf

Good catch.  Glad to see folks reviewing checkins.

Eternal vigilance.

Warren



From fedora-extras-commits at redhat.com  Thu Mar 17 08:50:11 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 17 Mar 2005 03:50:11 -0500
Subject: rpms/nabi/devel nabi.spec,1.2,1.3
Message-ID: <200503170850.j2H8oBQx003373@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3351

Modified Files:
	nabi.spec 
Log Message:
uh... I think this fixes it.  I didn't test it.
djoo at redhat.com will be taking over this package tomorrow so it is his problem.
He needs to learn this stuff anyway.



Index: nabi.spec
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/nabi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nabi.spec	17 Mar 2005 07:54:07 -0000	1.2
+++ nabi.spec	17 Mar 2005 08:50:09 -0000	1.3
@@ -23,7 +23,7 @@
 %setup -q -n %{name}-%{version}
 
 %build
-./configure --prefix=/usr
+./configure --prefix={%_prefix}
 make
 
 %install



From fedora-extras-commits at redhat.com  Thu Mar 17 10:53:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 05:53:32 -0500
Subject: devel/gkrellm-weather .cvsignore, 1.2, 1.3 gkrellm-weather.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200503171053.j2HArWEZ007431@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/gkrellm-weather
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7425

Modified Files:
	.cvsignore gkrellm-weather.spec sources 
Log Message:
2.0.7, provide upstream name.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/gkrellm-weather/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:24:18 -0000	1.2
+++ .cvsignore	17 Mar 2005 10:53:30 -0000	1.3
@@ -1 +1 @@
-gkrellweather-2.0.6.tgz
+gkrellweather-2.0.7.tgz


Index: gkrellm-weather.spec
===================================================================
RCS file: /cvs/extras/devel/gkrellm-weather/gkrellm-weather.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gkrellm-weather.spec	3 Mar 2005 21:26:02 -0000	1.6
+++ gkrellm-weather.spec	17 Mar 2005 10:53:30 -0000	1.7
@@ -3,14 +3,15 @@
 
 Summary:        Weather plugin for GKrellM
 Name:           gkrellm-weather
-Version:        2.0.6
-Release:        2
+Version:        2.0.7
+Release:        1
 License:        GPL
 Group:          Applications/System
 URL:            http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
-Source:   http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/gkrellweather-2.0.6.tgz
+Source:         http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/gkrellweather-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+Provides:       gkrellweather = %{version}-%{release}
 BuildRequires:  perl, gtk2-devel, gkrellm-devel >= 2, gettext
 Requires:       gkrellm >= 2
 
@@ -57,6 +58,10 @@
 
 
 %changelog
+* Thu Mar 17 2005 Ville Skytt?? <ville.skytta at iki.fi> - 2.0.7-1
+- 2.0.7.
+- Provide upstream name.
+
 * Fri Nov 19 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.0.6-2
 - Clean up specfile and convert to UTF-8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/gkrellm-weather/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:24:18 -0000	1.2
+++ sources	17 Mar 2005 10:53:30 -0000	1.3
@@ -1 +1 @@
-458125fe9276db3733a6c4b0e27eca86  gkrellweather-2.0.6.tgz
+73f5ec4e950f933a5904317037d6add2  gkrellweather-2.0.7.tgz



From ville.skytta at iki.fi  Thu Mar 17 10:57:07 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Thu, 17 Mar 2005 12:57:07 +0200
Subject: rpms/nabi/devel nabi.spec,1.2,1.3
In-Reply-To: <200503170850.j2H8oBQx003373@cvs-int.fedora.redhat.com>
References: <200503170850.j2H8oBQx003373@cvs-int.fedora.redhat.com>
Message-ID: <1111057027.20672.4.camel@bobcat.mine.nu>

On Thu, 2005-03-17 at 03:50 -0500, Warren Togami wrote:
> Author: wtogami
> 
> Update of /cvs/extras/rpms/nabi/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3351
> 
> Modified Files:
> 	nabi.spec 
> Log Message:
> uh... I think this fixes it.  I didn't test it.

And it shows ;)

> +./configure --prefix={%_prefix}

Oops.




From fedora-extras-commits at redhat.com  Thu Mar 17 11:08:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 06:08:03 -0500
Subject: rpms/perl-Pod-POM import.log,1.2,1.3
Message-ID: <200503171108.j2HB83BH008483@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8471

Modified Files:
	import.log 
Log Message:
auto-import perl-Pod-POM-0.17-0.fdr.3.rh90 on branch RHL-9 from perl-Pod-POM-0.17-0.fdr.3.rh90.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	15 Mar 2005 14:16:10 -0000	1.2
+++ import.log	17 Mar 2005 11:08:01 -0000	1.3
@@ -1 +1,2 @@
 perl-Pod-POM-0_17-3:HEAD:perl-Pod-POM-0.17-3.src.rpm:1110896069
+perl-Pod-POM-0_17-0_fdr_3_rh90:RHL-9:perl-Pod-POM-0.17-0.fdr.3.rh90.src.rpm:1111057554



From fedora-extras-commits at redhat.com  Thu Mar 17 11:08:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 06:08:03 -0500
Subject: rpms/perl-Pod-POM/RHL-9 perl-Pod-POM.spec,1.1,1.2
Message-ID: <200503171108.j2HB83Ra008487@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8471/RHL-9

Modified Files:
	perl-Pod-POM.spec 
Log Message:
auto-import perl-Pod-POM-0.17-0.fdr.3.rh90 on branch RHL-9 from perl-Pod-POM-0.17-0.fdr.3.rh90.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


Index: perl-Pod-POM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/RHL-9/perl-Pod-POM.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Pod-POM.spec	15 Mar 2005 14:16:10 -0000	1.1
+++ perl-Pod-POM.spec	17 Mar 2005 11:08:01 -0000	1.2
@@ -2,8 +2,9 @@
 
 Name:           perl-Pod-POM
 Version:        0.17
-Release:        3
-Summary:        Object-oriented interface to Perl POD documents
+Release:        0.fdr.3.rh90
+Epoch:          0
+Summary:        OO interface to Perl POD documents
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -62,10 +63,6 @@
 
 
 %changelog
-* Tue Mar 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.17-3
-- Remove Epoch: 0.
-- Improve summary.
-
 * Sun Jul 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.17-0.fdr.3
 - Bring up to date with current fedora.us Perl spec template.
 



From fedora-extras-commits at redhat.com  Thu Mar 17 11:08:49 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 06:08:49 -0500
Subject: rpms/perl-Pod-POM import.log,1.3,1.4
Message-ID: <200503171108.j2HB8nPH008599@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8590

Modified Files:
	import.log 
Log Message:
auto-import perl-Pod-POM-0.17-0.fdr.3.1 on branch FC-1 from perl-Pod-POM-0.17-0.fdr.3.1.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	17 Mar 2005 11:08:01 -0000	1.3
+++ import.log	17 Mar 2005 11:08:47 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Pod-POM-0_17-3:HEAD:perl-Pod-POM-0.17-3.src.rpm:1110896069
 perl-Pod-POM-0_17-0_fdr_3_rh90:RHL-9:perl-Pod-POM-0.17-0.fdr.3.rh90.src.rpm:1111057554
+perl-Pod-POM-0_17-0_fdr_3_1:FC-1:perl-Pod-POM-0.17-0.fdr.3.1.src.rpm:1111057600



From fedora-extras-commits at redhat.com  Thu Mar 17 11:08:49 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 06:08:49 -0500
Subject: rpms/perl-Pod-POM/FC-1 perl-Pod-POM.spec,1.1,1.2
Message-ID: <200503171108.j2HB8ngO008603@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8590/FC-1

Modified Files:
	perl-Pod-POM.spec 
Log Message:
auto-import perl-Pod-POM-0.17-0.fdr.3.1 on branch FC-1 from perl-Pod-POM-0.17-0.fdr.3.1.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


Index: perl-Pod-POM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/FC-1/perl-Pod-POM.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Pod-POM.spec	15 Mar 2005 14:16:10 -0000	1.1
+++ perl-Pod-POM.spec	17 Mar 2005 11:08:47 -0000	1.2
@@ -2,8 +2,9 @@
 
 Name:           perl-Pod-POM
 Version:        0.17
-Release:        3
-Summary:        Object-oriented interface to Perl POD documents
+Release:        0.fdr.3.1
+Epoch:          0
+Summary:        OO interface to Perl POD documents
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -62,10 +63,6 @@
 
 
 %changelog
-* Tue Mar 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.17-3
-- Remove Epoch: 0.
-- Improve summary.
-
 * Sun Jul 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.17-0.fdr.3
 - Bring up to date with current fedora.us Perl spec template.
 



From fedora-extras-commits at redhat.com  Thu Mar 17 11:09:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 06:09:32 -0500
Subject: rpms/perl-Pod-POM import.log,1.4,1.5
Message-ID: <200503171109.j2HB9Wvg008715@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8706

Modified Files:
	import.log 
Log Message:
auto-import perl-Pod-POM-0.17-0.fdr.3.2 on branch FC-2 from perl-Pod-POM-0.17-0.fdr.3.2.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	17 Mar 2005 11:08:47 -0000	1.4
+++ import.log	17 Mar 2005 11:09:30 -0000	1.5
@@ -1,3 +1,4 @@
 perl-Pod-POM-0_17-3:HEAD:perl-Pod-POM-0.17-3.src.rpm:1110896069
 perl-Pod-POM-0_17-0_fdr_3_rh90:RHL-9:perl-Pod-POM-0.17-0.fdr.3.rh90.src.rpm:1111057554
 perl-Pod-POM-0_17-0_fdr_3_1:FC-1:perl-Pod-POM-0.17-0.fdr.3.1.src.rpm:1111057600
+perl-Pod-POM-0_17-0_fdr_3_2:FC-2:perl-Pod-POM-0.17-0.fdr.3.2.src.rpm:1111057643



From fedora-extras-commits at redhat.com  Thu Mar 17 11:09:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 06:09:32 -0500
Subject: rpms/perl-Pod-POM/FC-2 perl-Pod-POM.spec,1.1,1.2
Message-ID: <200503171109.j2HB9Wqm008719@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Pod-POM/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8706/FC-2

Modified Files:
	perl-Pod-POM.spec 
Log Message:
auto-import perl-Pod-POM-0.17-0.fdr.3.2 on branch FC-2 from perl-Pod-POM-0.17-0.fdr.3.2.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=1954


Index: perl-Pod-POM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-POM/FC-2/perl-Pod-POM.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Pod-POM.spec	15 Mar 2005 14:16:10 -0000	1.1
+++ perl-Pod-POM.spec	17 Mar 2005 11:09:30 -0000	1.2
@@ -2,8 +2,9 @@
 
 Name:           perl-Pod-POM
 Version:        0.17
-Release:        3
-Summary:        Object-oriented interface to Perl POD documents
+Release:        0.fdr.3.2
+Epoch:          0
+Summary:        OO interface to Perl POD documents
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -62,10 +63,6 @@
 
 
 %changelog
-* Tue Mar 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.17-3
-- Remove Epoch: 0.
-- Improve summary.
-
 * Sun Jul 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.17-0.fdr.3
 - Bring up to date with current fedora.us Perl spec template.
 



From fedora-extras-commits at redhat.com  Thu Mar 17 11:20:38 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 06:20:38 -0500
Subject: devel/gkrellm-hddtemp gkrellm-hddtemp.spec,1.5,1.6
Message-ID: <200503171120.j2HBKccj008985@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/gkrellm-hddtemp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8978

Modified Files:
	gkrellm-hddtemp.spec 
Log Message:
Fix URLs.


Index: gkrellm-hddtemp.spec
===================================================================
RCS file: /cvs/extras/devel/gkrellm-hddtemp/gkrellm-hddtemp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gkrellm-hddtemp.spec	3 Mar 2005 21:26:02 -0000	1.5
+++ gkrellm-hddtemp.spec	17 Mar 2005 11:20:36 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           gkrellm-hddtemp
 Version:        0.2
-Release:        0.2.beta
+Release:        0.3.beta
 Summary:        Hard disk temperature plugin for GKrellM
 
 Group:          Applications/System
 License:        GPL
-URL:            http://coredump.free.fr/linux/hddtemp.php
-Source:         http://coredump.free.fr/linux/gkrellm-hddtemp-0.2-beta.tar.gz
+URL:            http://www.guzu.net/linux/hddtemp.php
+Source:         http://www.guzu.net/linux/gkrellm-hddtemp-0.2-beta.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, gkrellm-devel >= 2
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Thu Mar 17 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.2-0.3.beta
+- Fix URLs.
+
 * Fri May 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.2-0.fdr.0.2.beta
 - Spec file cleanups.
 



From bugs.michael at gmx.net  Thu Mar 17 13:03:12 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 17 Mar 2005 14:03:12 +0100
Subject: devel/python-amara python-amara.spec,1.2,1.3
In-Reply-To: <200503162342.j2GNg1fk019251@cvs-int.fedora.redhat.com>
References: <200503162342.j2GNg1fk019251@cvs-int.fedora.redhat.com>
Message-ID: <20050317140312.282928f7.bugs.michael@gmx.net>

On Wed, 16 Mar 2005 18:42:01 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/devel/python-amara

> -%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
> +%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
> +%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')

> +BuildRequires:  python-abi = %{pyver}
> +Requires:       python-abi = %{pyver} 4Suite >= 1.0

> +%{_libdir}/python%{pyver}/site-packages/amara

Please take a look at e.g. the "bittorrent" package in devel tree on
how to use %python_sitelib.

> +%if "%{pyver}" == "%{mainpyver}"
> +%define name python-amara
> +%define prov python%{pyver}-amara = %{version} python-amara = %{version}
> +%else
> +%define name python%{pyver}-amara
> +%define prov python%{pyver}-Amara = %{version}
> +%endif
> +Provides:       %{prov}

I consider this unnecessary and ugly bloat, also considering that we have
specific Python module naming guidelines. You're over-complicating the
packaging.



From bugs.michael at gmx.net  Thu Mar 17 13:13:28 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 17 Mar 2005 14:13:28 +0100
Subject: APPROVED: bmp
Message-ID: <20050317141328.2be51de0.bugs.michael@gmx.net>

Name: bmp
Version: 0.9.7-4

BMP (Beep Media Player) is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
XMMS.

[...]

Imported package approved by mschwendt for adding to Fedora Extras.
Ralf Ertzinger will be responsible for this package.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/f778d2ee/attachment-0001.sig>

From ivazquez at ivazquez.net  Thu Mar 17 17:13:33 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 12:13:33 -0500
Subject: devel/python-amara python-amara.spec,1.2,1.3
In-Reply-To: <20050317140312.282928f7.bugs.michael@gmx.net>
References: <200503162342.j2GNg1fk019251@cvs-int.fedora.redhat.com>
	<20050317140312.282928f7.bugs.michael@gmx.net>
Message-ID: <1111079613.30220.16.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 14:03 +0100, Michael Schwendt wrote:
> On Wed, 16 Mar 2005 18:42:01 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> > +%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
> > +%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')
> 
> > +%{_libdir}/python%{pyver}/site-packages/amara
> 
> Please take a look at e.g. the "bittorrent" package in devel tree on
> how to use %python_sitelib.
> 
> > +%if "%{pyver}" == "%{mainpyver}"
> 
> I consider this unnecessary and ugly bloat, also considering that we have
> specific Python module naming guidelines. You're over-complicating the
> packaging.

BitTorrent is an app, Amara is a library. For the most part that "bloat"
serves to allow Amara to be built for multiple versions of Python on the
same platform.

However, if you would like me to remove it regardless then I will do so.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/dd2a0602/attachment-0001.sig>

From ivazquez at ivazquez.net  Thu Mar 17 17:15:13 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 12:15:13 -0500
Subject: devel/kphone kphone.spec,1.2,1.3
In-Reply-To: <1111048177.17514.182.camel@mccallum.corsepiu.local>
References: <200503162342.j2GNg1uh019227@cvs-int.fedora.redhat.com>
	<1111048177.17514.182.camel@mccallum.corsepiu.local>
Message-ID: <1111079713.30220.17.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 09:29 +0100, Ralf Corsepius wrote:
> On Wed, 2005-03-16 at 18:42 -0500, Ignacio Vazquez-Abrams wrote:
> >  ./configure --prefix=$RPM_BUILD_ROOT%{_prefix}
> 
> A prefix containing $RPM_BUILD_ROOT hardly can be correct.
> You probably want %configure

Yes. I'll fix it.

> Furthermore, I am not convinced about this package's sources quality:

> tar: kphone/dissipate2: implausibly old time stamp 1970-01-01 01:00:00

I agree that it looks flaky, but that's exactly how it's found on the
site.

> - Serious compiler warnings:
> In file included from dspoutrtp.cpp:16:
> rtpdataheader.h:35: warning: `__packed__' attribute ignored
> (I didn't investigate potential issues being caused by this warning.)

Well, the attribute is on a bitfield dword-aligned struct so it should
be fine on 32-bit archs. On 64-bit archs it may have runtime failures
unless alignment is dword-forced.

Also, looking into it reveals that the package probably won't run
properly on big-endian archs. Unfortunately I don't have enough endian
experience to construct a universal patch.

> - This package does not acknowledge RPM_OPT_FLAGS
> (This package's configuration is ..., to say the least ...)

It was one of my first with FC3, so I'm not surprised that it's a piece
of ....

> Below is a patch to workaround the prefix issue.

I'll apply it, thanks.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/c3ba87c2/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Thu Mar 17 17:37:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 12:37:49 -0500
Subject: devel/chkrootkit chkrootkit-0.45-includes.patch, NONE,
	1.1 chkrootkit.spec, 1.8, 1.9
Message-ID: <200503171737.j2HHbnrI020256@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/chkrootkit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20246

Modified Files:
	chkrootkit.spec 
Added Files:
	chkrootkit-0.45-includes.patch 
Log Message:
- Make GCC4 shut up by including more C headers in chkproc.c/chkwtmp.c



chkrootkit-0.45-includes.patch:

--- NEW FILE chkrootkit-0.45-includes.patch ---
diff -Nur chkrootkit-0.45-orig/chkproc.c chkrootkit-0.45/chkproc.c
--- chkrootkit-0.45-orig/chkproc.c	2004-09-13 20:39:29.000000000 +0200
+++ chkrootkit-0.45/chkproc.c	2005-03-17 16:48:48.000000000 +0100
@@ -48,6 +48,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
+#include <string.h>
 #if defined(__sun)
 #include <procfs.h>
 #include <fcntl.h>
diff -Nur chkrootkit-0.45-orig/chkwtmp.c chkrootkit-0.45/chkwtmp.c
--- chkrootkit-0.45-orig/chkwtmp.c	2004-09-06 21:24:56.000000000 +0200
+++ chkrootkit-0.45/chkwtmp.c	2005-03-17 16:49:01.000000000 +0100
@@ -17,7 +17,7 @@
    Nelson Murilo, nelson at pangeia.com.br
 */
 
-
+#include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>


Index: chkrootkit.spec
===================================================================
RCS file: /cvs/extras/devel/chkrootkit/chkrootkit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- chkrootkit.spec	3 Mar 2005 20:08:36 -0000	1.8
+++ chkrootkit.spec	17 Mar 2005 17:37:47 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           chkrootkit
 Version:        0.45
-Release:        1
+Release:        2
 Summary:        Tool to locally check for signs of a rootkit
 
 Group:          Applications/System
@@ -14,6 +14,7 @@
 Source5:        chkrootkit.pam
 Patch1:         chkrootkit-0.44-getCMD.patch
 Patch2:         chkrootkit-0.44-inetd.patch
+Patch3:         chkrootkit-0.45-includes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -39,6 +40,7 @@
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .getCMD
 %patch2 -p1 -b .inetd
+%patch3 -p1 -b .includes
 
 
 %build
@@ -104,6 +106,9 @@
 
 
 %changelog
+* Thu Mar 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.45-2
+- Make GCC4 shut up by including more C headers in chkproc.c/chkwtmp.c
+
 * Thu Feb 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.45-1
 - Update to 0.45, trim description.
 



From fedora-extras-commits at redhat.com  Thu Mar 17 17:40:19 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 12:40:19 -0500
Subject: devel/sylpheed sylpheed-1.0.3-desktop.patch, NONE, 1.1 sylpheed.spec,
	1.4, 1.5
Message-ID: <200503171740.j2HHeJ7F020343@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/sylpheed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20331

Modified Files:
	sylpheed.spec 
Added Files:
	sylpheed-1.0.3-desktop.patch 
Log Message:
Desktop file fixes.



sylpheed-1.0.3-desktop.patch:

--- NEW FILE sylpheed-1.0.3-desktop.patch ---
diff -Naur sylpheed-1.0.3-orig/sylpheed.desktop sylpheed-1.0.3/sylpheed.desktop
--- sylpheed-1.0.3-orig/sylpheed.desktop	2002-08-30 10:53:18.000000000 +0200
+++ sylpheed-1.0.3/sylpheed.desktop	2005-03-17 18:18:12.000000000 +0100
@@ -1,10 +1,11 @@
 [Desktop Entry]
-Name=Sylpheed
+Encoding=UTF-8
+Name=Sylpheed E-Mail
 Name[ja]=Sylpheed
 Comment=E-Mail client
-Comment[ja]=??????????????????????
+Comment[ja]=?????????????????????????????????
 Exec=sylpheed
 Icon=sylpheed.png
-Terminal=0
+Terminal=false
 Type=Application
 Categories=Application;Network;


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sylpheed.spec	8 Mar 2005 19:18:00 -0000	1.4
+++ sylpheed.spec	17 Mar 2005 17:40:17 -0000	1.5
@@ -20,6 +20,7 @@
 Patch0: %{name}-0.8.9-ck.patch
 Patch1: %{name}-0.8.9-ssl.patch
 Patch2: sylpheed-default-browser.patch
+Patch3: sylpheed-1.0.3-desktop.patch
 
 %description
 This program is an X based fast email client which has features
@@ -41,6 +42,7 @@
 %patch0 -p1 -b .ck
 %patch1 -p1 -b .ssl
 %patch2 -p1 -b .default-browser
+%patch3 -p1 -b .desktop
 
 %build
 autoconf
@@ -59,7 +61,7 @@
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category Application \
 	--add-category Network \
-	--add-category X-Fedora-Extra \
+	--add-category X-Fedora \
 	sylpheed.desktop
 install -d $RPM_BUILD_ROOT%{_mandir}/man1/
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -82,7 +84,7 @@
 * Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-1
 - Update to 1.0.3.
 - Enable support for GPGME 1.0 and compface.
-- Apply common spec cleanup.
+- Apply common spec cleanup. Make desktop file UTF-8.
 
 * Wed Jan  5 2005 Akira TAGOH <tagoh at redhat.com> - 1.0.0-1
 - New upstream release.



From fedora-extras-commits at redhat.com  Thu Mar 17 17:40:29 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 12:40:29 -0500
Subject: devel/kphone kphone.spec,1.3,1.4
Message-ID: <200503171740.j2HHeTRu020376@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20368

Modified Files:
	kphone.spec 
Log Message:
Fix %configure and po patch


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kphone.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ kphone.spec	17 Mar 2005 17:40:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        3
+Release:        4
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -8,6 +8,7 @@
 URL:            http://www.wirlab.net/kphone/
 Source0:        http://www.wirlab.net/kphone/kphone-4.1.0.tar.gz
 Source1:        kphone.desktop
+Patch0:         kphone-4.1.0-po-hacks.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils
@@ -20,10 +21,11 @@
 
 %prep
 %setup -q -n kphone
+%patch -p1 -b .po-hacks
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-./configure --prefix=$RPM_BUILD_ROOT%{_prefix}
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -51,6 +53,10 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-4
+- Fixed %configure
+- Added po-hacks patch
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-3
 - Modified %setup to use -n
 - Broke %description at 80 columns



From fedora-extras-commits at redhat.com  Thu Mar 17 17:40:53 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 12:40:53 -0500
Subject: devel/kphone kphone-4.1.0-po-hacks.diff,NONE,1.1
Message-ID: <200503171740.j2HHerAA020415@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20409

Added Files:
	kphone-4.1.0-po-hacks.diff 
Log Message:
Fix %configure and po patch

kphone-4.1.0-po-hacks.diff:

--- NEW FILE kphone-4.1.0-po-hacks.diff ---
--- kphone-4.1.0.orig/po/Makefile.in	2004-10-19 10:24:16.000000000 +0200
+++ kphone/po/Makefile.in	2005-03-17 08:56:38.165328978 +0100
@@ -4,11 +4,11 @@
 PO_DIR=$(SHAREDIR)/translations/
 
 install:
-	install --mode=0755 --directory $(PO_DIR)
+	install --mode=0755 --directory $(DESTDIR)$(PO_DIR)
 	for T in *.qm; do \
-		install --mode=0644 $$T $(PO_DIR); \
+		install --mode=0644 $$T $(DESTDIR)$(PO_DIR); \
 	done
 
 uninstall:
-	rm -r $(PO_DIR)
+	rm -r $(DESTDIR)$(PO_DIR)
 



From bugs.michael at gmx.net  Thu Mar 17 17:48:55 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 17 Mar 2005 18:48:55 +0100
Subject: devel/python-amara python-amara.spec,1.2,1.3
In-Reply-To: <1111079613.30220.16.camel@ignacio.ignacio.lan>
References: <200503162342.j2GNg1fk019251@cvs-int.fedora.redhat.com>
	<20050317140312.282928f7.bugs.michael@gmx.net>
	<1111079613.30220.16.camel@ignacio.ignacio.lan>
Message-ID: <20050317184855.374d9293.bugs.michael@gmx.net>

On Thu, 17 Mar 2005 12:13:33 -0500, Ignacio Vazquez-Abrams wrote:

> On Thu, 2005-03-17 at 14:03 +0100, Michael Schwendt wrote:
> > On Wed, 16 Mar 2005 18:42:01 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> > > +%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
> > > +%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')
> > 
> > > +%{_libdir}/python%{pyver}/site-packages/amara
> > 
> > Please take a look at e.g. the "bittorrent" package in devel tree on
> > how to use %python_sitelib.
> > 
> > > +%if "%{pyver}" == "%{mainpyver}"
> > 
> > I consider this unnecessary and ugly bloat, also considering that we have
> > specific Python module naming guidelines. You're over-complicating the
> > packaging.
> 
> BitTorrent is an app, Amara is a library. For the most part that "bloat"
> serves to allow Amara to be built for multiple versions of Python on the
> same platform.

Two different comments in one mail. The bottom comment did not refer
to bittorrent. Using %python_sitelib instead of "path hacks" would still
be an improvement.



From ville.skytta at iki.fi  Thu Mar 17 18:33:05 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Thu, 17 Mar 2005 20:33:05 +0200
Subject: APPROVED: bmp
In-Reply-To: <20050317141328.2be51de0.bugs.michael@gmx.net>
References: <20050317141328.2be51de0.bugs.michael@gmx.net>
Message-ID: <1111084385.4784.2.camel@bobcat.mine.nu>

On Thu, 2005-03-17 at 14:13 +0100, Michael Schwendt wrote:
> Name: bmp
> Version: 0.9.7-4
> 
> BMP (Beep Media Player) is a media player that currently uses a skinned
> user interface based on Winamp 2.x skins. It is based on ("forked off")
> XMMS.
> 
> [...]
> 
> Imported package approved by mschwendt for adding to Fedora Extras.
> Ralf Ertzinger will be responsible for this package.

bmp-devel is missing lots of dependencies.  Start with pkgconfig, then
proceed to stuff listed in /usr/lib/pkg-config/bmp.pc (Requires:)...



From fedora-extras-commits at redhat.com  Thu Mar 17 18:55:42 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 13:55:42 -0500
Subject: devel/python-amara python-amara.spec,1.3,1.4
Message-ID: <200503171855.j2HItg9q022302@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22294

Modified Files:
	python-amara.spec 
Log Message:
Path and version fixes


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/devel/python-amara/python-amara.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-amara.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ python-amara.spec	17 Mar 2005 18:55:40 -0000	1.4
@@ -1,19 +1,16 @@
-%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
-%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')
-
-%define version 0.9.4
+%{!?pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
+%define mainpyver %(%{__python} -c 'import sys;print(sys.version[0:3])')
+%{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %if "%{pyver}" == "%{mainpyver}"
 %define name python-amara
-%define prov python%{pyver}-amara = %{version} python-amara = %{version}
 %else
 %define name python%{pyver}-amara
-%define prov python%{pyver}-Amara = %{version}
 %endif
 
 Name:           %name
-Version:        %version
-Release:        3
+Version:        0.9.4
+Release:        4
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -24,7 +21,7 @@
 
 BuildRequires:  python-abi = %{pyver}
 Requires:       python-abi = %{pyver} 4Suite >= 1.0
-Provides:       %{prov}
+Provides:       python%{pyver}-amara = %{version}
 BuildArch:      noarch
 
 %description
@@ -37,30 +34,32 @@
 implementation of XML standards in Python, Amara adds a much more Pythonic face
 to these capabilities.
 
-Amara provides tools you can trust to conform with XML standards without losing
-the familiar Python feel.
-
 %prep
 %setup -q -n Amara-0.9.4
 
 %build
-python setup.py build
+%{__python}%{pyver} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python%{pyver} setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}
+%{__python}%{pyver} setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}
+[ "%{pyver}" == "%{mainpyver}" ] || rename .py %{pyver}.py $RPM_BUILD_ROOT%{_bindir}/*.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/flextyper.py
-%{_bindir}/scimitar.py
-%{_libdir}/python%{pyver}/site-packages/amara
+%{_bindir}/*.py
+%{python_sitelib}/amara
 %doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-4
+- Streamlined/fixed Python version handling
+- Implemented %python_sitelib
+- Decreased verbosity in %description
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-3
 - Better %pyver and BR/Requires handling
 - Broke %description at 80 columns



From ivazquez at ivazquez.net  Thu Mar 17 18:55:46 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 13:55:46 -0500
Subject: devel/python-amara python-amara.spec,1.2,1.3
In-Reply-To: <20050317184855.374d9293.bugs.michael@gmx.net>
References: <200503162342.j2GNg1fk019251@cvs-int.fedora.redhat.com>
	<20050317140312.282928f7.bugs.michael@gmx.net>
	<1111079613.30220.16.camel@ignacio.ignacio.lan>
	<20050317184855.374d9293.bugs.michael@gmx.net>
Message-ID: <1111085746.30220.21.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 18:48 +0100, Michael Schwendt wrote:
> On Thu, 17 Mar 2005 12:13:33 -0500, Ignacio Vazquez-Abrams wrote:
> > BitTorrent is an app, Amara is a library. For the most part that "bloat"
> > serves to allow Amara to be built for multiple versions of Python on the
> > same platform.
> 
> Two different comments in one mail. The bottom comment did not refer
> to bittorrent. Using %python_sitelib instead of "path hacks" would still
> be an improvement.

My bad. That's what happens when I read things when I'm not awake :/

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/09a3869c/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Thu Mar 17 19:03:41 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 14:03:41 -0500
Subject: devel/perl-PAR-Dist perl-PAR-Dist.spec,1.5,1.6
Message-ID: <200503171903.j2HJ3fao023170@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/perl-PAR-Dist
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22389

Modified Files:
	perl-PAR-Dist.spec 
Log Message:
Don't run signature test during build, sync with Perl spec template.

If Module::Signature is installed, running the signature test would
import stuff from pgp.mit.edu to the build user's GPG keyring.



Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/extras/devel/perl-PAR-Dist/perl-PAR-Dist.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-PAR-Dist.spec	3 Mar 2005 23:46:27 -0000	1.5
+++ perl-PAR-Dist.spec	17 Mar 2005 19:03:39 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           perl-PAR-Dist
 Version:        0.07
-Release:        2
+Release:        3
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 
 Group:          Development/Libraries
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl
+BuildRequires:  perl >= 1:5.6.1
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -24,24 +24,21 @@
 
 
 %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 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 || :
-rm -f debugfiles.list debugsources.list
-make test
+make test TEST_FILES=t/1*.t # avoid signature check
 
 
 %clean
@@ -56,6 +53,10 @@
 
 
 %changelog
+* Thu Mar 17 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-3
+- Avoid running signature test during build.
+- Sync with fedora-rpmdevtools' Perl spec template.
+
 * Sun Apr 25 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.07-0.fdr.2
 - Require perl(:MODULE_COMPAT_*).
 



From fedora-extras-commits at redhat.com  Thu Mar 17 19:12:34 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 14:12:34 -0500
Subject: devel/libmodplug libmodplug.spec,1.5,1.6
Message-ID: <200503171912.j2HJCYpi023303@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/libmodplug
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23297

Modified Files:
	libmodplug.spec 
Log Message:
Restore incorrectly removed Epoch from -devel dependency, other minor tweaks.


Index: libmodplug.spec
===================================================================
RCS file: /cvs/extras/devel/libmodplug/libmodplug.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmodplug.spec	5 Mar 2005 21:10:22 -0000	1.5
+++ libmodplug.spec	17 Mar 2005 19:12:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libmodplug
 Version:        0.7
-Release:        1
+Release:        2
 Epoch:          1
 Summary:        Modplug mod music file format library
 
@@ -16,7 +16,7 @@
 %package        devel
 Summary:        Development files for the Modplug mod music file format library
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, pkgconfig
+Requires:       %{name} = %{epoch}:%{version}-%{release}, pkgconfig
 
 %description    devel
 %{summary}.
@@ -27,9 +27,8 @@
 
 
 %build
-%configure --enable-static
+%configure --enable-static --disable-dependency-tracking
 make %{?_smp_mflags}
-make check
 
 
 %install
@@ -38,6 +37,10 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
+%check || :
+make check
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -60,6 +63,10 @@
 
 
 %changelog
+* Thu Mar 17 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.7-2
+- Build with dependency tracking disabled.
+- Run tests in the %%check section.
+
 * Fri Oct 17 2003 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.7-0.fdr.1
 - First build, separated from xmms-modplug.
 - Bump Epoch.



From fedora-extras-commits at redhat.com  Thu Mar 17 19:46:55 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 14:46:55 -0500
Subject: devel/goopy - New directory
Message-ID: <200503171946.j2HJkt4g023620@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/devel/goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23615/goopy

Log Message:
Directory /cvs/extras/devel/goopy added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 19:54:10 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 14:54:10 -0500
Subject: rpms/goopy - New directory
Message-ID: <200503171954.j2HJsAVV023703@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23696/goopy

Log Message:
Directory /cvs/extras/rpms/goopy added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 19:54:10 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 14:54:10 -0500
Subject: rpms/goopy/devel - New directory
Message-ID: <200503171954.j2HJsA66023706@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23696/goopy/devel

Log Message:
Directory /cvs/extras/rpms/goopy/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 19:54:23 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 14:54:23 -0500
Subject: rpms/goopy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503171954.j2HJsNUe023768@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23756/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module goopy


--- 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 Mar 17 19:54:23 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 14:54:23 -0500
Subject: rpms/goopy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503171954.j2HJsNSe023765@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23756

Added Files:
	Makefile import.log 
Log Message:
Setup of module goopy


--- NEW FILE Makefile ---
# Top level Makefile for module goopy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 17 19:54:39 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 14:54:39 -0500
Subject: rpms/goopy import.log,1.1,1.2
Message-ID: <200503171954.j2HJsdl5023864@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23853

Modified Files:
	import.log 
Log Message:
auto-import goopy-0.1-1 on branch devel from goopy-0.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/goopy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Mar 2005 19:54:21 -0000	1.1
+++ import.log	17 Mar 2005 19:54:37 -0000	1.2
@@ -0,0 +1 @@
+goopy-0_1-1:HEAD:goopy-0.1-1.src.rpm:1111089273



From fedora-extras-commits at redhat.com  Thu Mar 17 19:54:39 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 14:54:39 -0500
Subject: rpms/goopy/devel goopy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200503171954.j2HJsdFi023868@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23853/devel

Modified Files:
	.cvsignore sources 
Added Files:
	goopy.spec 
Log Message:
auto-import goopy-0.1-1 on branch devel from goopy-0.1-1.src.rpm


--- NEW FILE goopy.spec ---
%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
%undefine _enable_debug_packages

Summary: Google Python Utilities
Name: goopy
Version: 0.1
Release: 1
Source0: %{name}-%{version}.tar.gz
License: BSD
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python >= %{pyver}
Requires: python >= %{pyver}
BuildArch: noarch

%description
The goopy package contains python utilities from Google.

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --root "${RPM_BUILD_ROOT}"

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README PKG-INFO
%{_libdir}/python?.?/site-packages/goopy

%changelog
* Thu Mar 17 2005 Peter Jones <pjones at redhat.com> - 0.1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/goopy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Mar 2005 19:54:21 -0000	1.1
+++ .cvsignore	17 Mar 2005 19:54:37 -0000	1.2
@@ -0,0 +1 @@
+goopy-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/goopy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Mar 2005 19:54:21 -0000	1.1
+++ sources	17 Mar 2005 19:54:37 -0000	1.2
@@ -0,0 +1 @@
+e6f6782c01af621dfaf7f4a272838a70  goopy-0.1.tar.gz



From bugs.michael at gmx.net  Thu Mar 17 20:04:54 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 17 Mar 2005 21:04:54 +0100
Subject: devel/python-amara python-amara.spec,1.2,1.3
In-Reply-To: <1111079613.30220.16.camel@ignacio.ignacio.lan>
References: <200503162342.j2GNg1fk019251@cvs-int.fedora.redhat.com>
	<20050317140312.282928f7.bugs.michael@gmx.net>
	<1111079613.30220.16.camel@ignacio.ignacio.lan>
Message-ID: <20050317210454.030b7bb1.bugs.michael@gmx.net>

On Thu, 17 Mar 2005 12:13:33 -0500, Ignacio Vazquez-Abrams wrote:

> On Thu, 2005-03-17 at 14:03 +0100, Michael Schwendt wrote:
> > On Wed, 16 Mar 2005 18:42:01 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> > > +%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
> > > +%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')
> > 
> > > +%{_libdir}/python%{pyver}/site-packages/amara
> > 
> > Please take a look at e.g. the "bittorrent" package in devel tree on
> > how to use %python_sitelib.
> > 
> > > +%if "%{pyver}" == "%{mainpyver}"
> > 
> > I consider this unnecessary and ugly bloat, also considering that we have
> > specific Python module naming guidelines. You're over-complicating the
> > packaging.
> 
> BitTorrent is an app, Amara is a library. For the most part that "bloat"
> serves to allow Amara to be built for multiple versions of Python on the
> same platform.

Two different comments in one mail. The bottom comment did not refer
to bittorrent. Using %python_sitelib instead of "path hacks" would still
be an improvement.

-- 
Fedora Core release Rawhide (Rawhide) - Linux 2.6.11-1.1177_FC4
loadavg: 2.92 2.96 2.49



From fedora-extras-commits at redhat.com  Thu Mar 17 20:05:48 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 15:05:48 -0500
Subject: devel/sylpheed sylpheed-1.0.3-draftsegf.patch, NONE,
	1.1 sylpheed.spec, 1.5, 1.6
Message-ID: <200503172005.j2HK5mRN024924@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/sylpheed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24916

Modified Files:
	sylpheed.spec 
Added Files:
	sylpheed-1.0.3-draftsegf.patch 
Log Message:
- Fix segfault when reopening drafts.



sylpheed-1.0.3-draftsegf.patch:

--- NEW FILE sylpheed-1.0.3-draftsegf.patch ---
diff -Naur sylpheed-1.0.3-orig/src/account.c sylpheed-1.0.3/src/account.c
--- sylpheed-1.0.3-orig/src/account.c	2004-12-22 08:19:09.000000000 +0100
+++ sylpheed-1.0.3/src/account.c	2005-03-17 20:56:24.000000000 +0100
@@ -256,7 +256,9 @@
 {
 	static HeaderEntry hentry[] = {{"From:",		  NULL, FALSE},
 				       {"X-Sylpheed-Account-Id:", NULL, FALSE},
-				       {"AID:",			  NULL, FALSE}};
+				       {"AID:",			  NULL, FALSE},
+				       {NULL, NULL, FALSE}
+	};
 
 	enum
 	{



Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sylpheed.spec	17 Mar 2005 17:40:17 -0000	1.5
+++ sylpheed.spec	17 Mar 2005 20:05:46 -0000	1.6
@@ -5,7 +5,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 1.0.3
-Release: 1
+Release: 2
 License: GPL
 URL: http://sylpheed.good-day.net/
 Group: Applications/Internet
@@ -21,6 +21,7 @@
 Patch1: %{name}-0.8.9-ssl.patch
 Patch2: sylpheed-default-browser.patch
 Patch3: sylpheed-1.0.3-desktop.patch
+Patch4: sylpheed-1.0.3-draftsegf.patch
 
 %description
 This program is an X based fast email client which has features
@@ -43,6 +44,7 @@
 %patch1 -p1 -b .ssl
 %patch2 -p1 -b .default-browser
 %patch3 -p1 -b .desktop
+%patch4 -p1 -b .draftsegf
 
 %build
 autoconf
@@ -81,6 +83,9 @@
 %{_mandir}/man1
 
 %changelog
+* Thu Mar 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-2
+- Fix segfault when reopening drafts.
+
 * Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-1
 - Update to 1.0.3.
 - Enable support for GPGME 1.0 and compface.



From ivazquez at ivazquez.net  Thu Mar 17 20:06:09 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 15:06:09 -0500
Subject: rpms/goopy/devel goopy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2
	sources, 1.1, 1.2
In-Reply-To: <200503171954.j2HJsdFi023868@cvs-int.fedora.redhat.com>
References: <200503171954.j2HJsdFi023868@cvs-int.fedora.redhat.com>
Message-ID: <1111089969.30220.24.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 14:54 -0500, Peter Jones wrote:
> Author: pjones
> 
> BuildRequires: python >= %{pyver}
> Requires: python >= %{pyver}

Should this use python-abi instead?

> %{_libdir}/python?.?/site-packages/goopy

Might want to consider using %python_sitelib as bittorrent does.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/9cc53472/attachment-0001.sig>

From notting at redhat.com  Thu Mar 17 20:12:41 2005
From: notting at redhat.com (Bill Nottingham)
Date: Thu, 17 Mar 2005 15:12:41 -0500
Subject: rpms/goopy/devel goopy.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
In-Reply-To: <1111089969.30220.24.camel@ignacio.ignacio.lan>
References: <200503171954.j2HJsdFi023868@cvs-int.fedora.redhat.com>
	<1111089969.30220.24.camel@ignacio.ignacio.lan>
Message-ID: <20050317201241.GG30312@nostromo.devel.redhat.com>

Ignacio Vazquez-Abrams (ivazquez at ivazquez.net) said: 
> > BuildRequires: python >= %{pyver}
> > Requires: python >= %{pyver}
> 
> Should this use python-abi instead?

Actually, why does the *source* package buildreq the version
of python the source package was built with? It really shouldn't
care.

Bill



From fedora-extras-commits at redhat.com  Thu Mar 17 20:14:13 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 15:14:13 -0500
Subject: rpms/goopy/devel goopy.spec,1.1,1.2
Message-ID: <200503172014.j2HKEDAX025137@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25129

Modified Files:
	goopy.spec 
Log Message:
update per warren's review


Index: goopy.spec
===================================================================
RCS file: /cvs/extras/rpms/goopy/devel/goopy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- goopy.spec	17 Mar 2005 19:54:37 -0000	1.1
+++ goopy.spec	17 Mar 2005 20:14:11 -0000	1.2
@@ -1,16 +1,17 @@
 %define pyver %(%{__python} -c "import sys; print sys.version[:3]")
 %undefine _enable_debug_packages
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 
 Summary: Google Python Utilities
 Name: goopy
 Version: 0.1
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.gz
 License: BSD
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python >= %{pyver}
-Requires: python >= %{pyver}
 BuildArch: noarch
 
 %description
@@ -31,8 +32,12 @@
 %files
 %defattr(-,root,root)
 %doc README PKG-INFO
-%{_libdir}/python?.?/site-packages/goopy
+%{python_sitelib}/goopy
 
 %changelog
-* Thu Mar 17 2005 Peter Jones <pjones at redhat.com> - 0.1
+* Thu Mar 17 2005 Peter Jones <pjones at redhat.com> - 0.1-2
+- remove dep on python; rpm auto-requires python(abi) = %%{pyver}
+- ask python where the site-packages dir is for %%files
+
+* Thu Mar 17 2005 Peter Jones <pjones at redhat.com> - 0.1-1
 - initial packaging



From ivazquez at ivazquez.net  Thu Mar 17 20:18:06 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 15:18:06 -0500
Subject: rpms/clearlooks/devel clearlooks.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <1111036884.18744.8.camel@ignacio.ignacio.lan>
References: <200503161655.j2GGt3m4001351@cvs-int.fedora.redhat.com>
	<20050316204320.7b3b4dc2.bugs.michael@gmx.net>
	<1111031826.17514.154.camel@mccallum.corsepiu.local>
	<1111036884.18744.8.camel@ignacio.ignacio.lan>
Message-ID: <1111090687.30220.25.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 00:21 -0500, Ignacio Vazquez-Abrams wrote:
> On Thu, 2005-03-17 at 04:57 +0100, Ralf Corsepius wrote:
> > On Wed, 2005-03-16 at 20:43 +0100, Michael Schwendt wrote:
> > > error: Installed (but unpackaged) file(s) found:
> > >    /share/themes/Clearlooks/metacity-1/metacity-theme-1.xml
> > This is a side effect of the missing "BR: libgnome-devel"
> 
> Aha! This is a much better solution than futzing with patches and
> makefiles.

Turns out that this is an upstream error in configure.in. I submitted it
as well.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/be063103/attachment-0001.sig>

From wtogami at redhat.com  Thu Mar 17 20:33:38 2005
From: wtogami at redhat.com (Warren Togami)
Date: Thu, 17 Mar 2005 10:33:38 -1000
Subject: APPROVED: goopy
Message-ID: <4239E9A2.6020005@redhat.com>

The goopy package contains python utilities from Google.

Reviewed by wtogami at redhat.com, pjones at redhat.com will be the maintainer.



From fedora-extras-commits at redhat.com  Thu Mar 17 20:35:32 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 15:35:32 -0500
Subject: rpms/bmp/devel bmp.spec,1.1,1.2
Message-ID: <200503172035.j2HKZWMa025528@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25512

Modified Files:
	bmp.spec 
Log Message:
- Add -devel dependencies needed for headers and pkgconfig template.




Index: bmp.spec
===================================================================
RCS file: /cvs/extras/rpms/bmp/devel/bmp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bmp.spec	16 Mar 2005 17:24:48 -0000	1.1
+++ bmp.spec	17 Mar 2005 20:35:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           bmp
 Version:        0.9.7
-Release:        4
+Release:        5
 Summary:        GTK2 based port of the XMMS media player
 
 Group:          Applications/Multimedia
@@ -34,6 +34,7 @@
 Summary:        Development files for the Beep Media Player
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       glib2-devel gtk2-devel gnome-vfs2-devel GConf2-devel
 
 %description    devel
 Development files for the Beep Media Player
@@ -116,6 +117,9 @@
 
 
 %changelog
+* Thu Mar 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-5
+- Add -devel dependencies needed for headers and pkgconfig template.
+
 * Wed Mar 16 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-4
 - Apply common spec cleanup and corrections.
 - Add patch to make ALSA output driver the default.



From fedora-extras-commits at redhat.com  Thu Mar 17 20:58:44 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 15:58:44 -0500
Subject: rpms/goopy/devel goopy.spec,1.2,1.3
Message-ID: <200503172058.j2HKwiDf025740@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25732

Modified Files:
	goopy.spec 
Log Message:
remove version on buildreq



Index: goopy.spec
===================================================================
RCS file: /cvs/extras/rpms/goopy/devel/goopy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- goopy.spec	17 Mar 2005 20:14:11 -0000	1.2
+++ goopy.spec	17 Mar 2005 20:58:42 -0000	1.3
@@ -6,12 +6,12 @@
 Summary: Google Python Utilities
 Name: goopy
 Version: 0.1
-Release: 2
+Release: 3
 Source0: %{name}-%{version}.tar.gz
 License: BSD
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python >= %{pyver}
+BuildRequires: python
 BuildArch: noarch
 
 %description
@@ -35,6 +35,9 @@
 %{python_sitelib}/goopy
 
 %changelog
+* Thu Mar 17 2005 Peter Jones <pjones at redhat.com> - 0.1-3
+- version on python buildreq is dumb
+
 * Thu Mar 17 2005 Peter Jones <pjones at redhat.com> - 0.1-2
 - remove dep on python; rpm auto-requires python(abi) = %%{pyver}
 - ask python where the site-packages dir is for %%files



From fedora-extras-commits at redhat.com  Thu Mar 17 21:14:58 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:14:58 -0500
Subject: rpms/python-goopy - New directory
Message-ID: <200503172114.j2HLEw0l026657@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26648/python-goopy

Log Message:
Directory /cvs/extras/rpms/python-goopy added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 21:14:58 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:14:58 -0500
Subject: rpms/python-goopy/devel - New directory
Message-ID: <200503172114.j2HLEw3P026660@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26648/python-goopy/devel

Log Message:
Directory /cvs/extras/rpms/python-goopy/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 21:17:29 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:17:29 -0500
Subject: rpms/python-goopy Makefile,NONE,1.1
Message-ID: <200503172117.j2HLHTsi026818@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26809

Added Files:
	Makefile 
Log Message:
wtf didn't these get created right?



--- NEW FILE Makefile ---
# Top level Makefile for module python-goopy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From fedora-extras-commits at redhat.com  Thu Mar 17 21:17:29 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:17:29 -0500
Subject: rpms/python-goopy/devel Makefile,NONE,1.1
Message-ID: <200503172117.j2HLHT5C026821@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26809/devel

Added Files:
	Makefile 
Log Message:
wtf didn't these get created right?



***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'



From fedora-extras-commits at redhat.com  Thu Mar 17 21:21:39 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:21:39 -0500
Subject: rpms/python-goopy - New directory
Message-ID: <200503172121.j2HLLd1d027067@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27060/python-goopy

Log Message:
Directory /cvs/extras/rpms/python-goopy added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 21:21:39 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:21:39 -0500
Subject: rpms/python-goopy/devel - New directory
Message-ID: <200503172121.j2HLLdwn027070@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27060/python-goopy/devel

Log Message:
Directory /cvs/extras/rpms/python-goopy/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 17 21:21:52 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:21:52 -0500
Subject: rpms/python-goopy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503172121.j2HLLqSE027129@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27120

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-goopy


--- NEW FILE Makefile ---
# Top level Makefile for module python-goopy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 17 21:21:52 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:21:52 -0500
Subject: rpms/python-goopy/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503172121.j2HLLq28027132@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27120/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-goopy


--- 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 Mar 17 21:22:11 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:22:11 -0500
Subject: rpms/python-goopy import.log,1.1,1.2
Message-ID: <200503172122.j2HLMBVl027231@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27222

Modified Files:
	import.log 
Log Message:
auto-import python-goopy-0.1-1 on branch devel from python-goopy-0.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-goopy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Mar 2005 21:21:50 -0000	1.1
+++ import.log	17 Mar 2005 21:22:09 -0000	1.2
@@ -0,0 +1 @@
+python-goopy-0_1-1:HEAD:python-goopy-0.1-1.src.rpm:1111094526



From fedora-extras-commits at redhat.com  Thu Mar 17 21:22:11 2005
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 17 Mar 2005 16:22:11 -0500
Subject: rpms/python-goopy/devel python-goopy.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503172122.j2HLMBaY027235@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/python-goopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27222/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-goopy.spec 
Log Message:
auto-import python-goopy-0.1-1 on branch devel from python-goopy-0.1-1.src.rpm


--- NEW FILE python-goopy.spec ---
%define realname goopy
%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
%undefine _enable_debug_packages
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Google Python Utilities
Name: python-goopy
Version: 0.1
Release: 1
Source0: %{realname}-%{version}.tar.gz
License: BSD
Group: Development/Libraries
Url: https://sourceforge.net/projects/goog-goopy/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
BuildArch: noarch

%description
The python-goopy package contains python utilities from Google.

%prep
%setup -q -n %{realname}-%{version}

%build

%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --root "${RPM_BUILD_ROOT}" --record=INSTALLED_FILES

%clean
rm -rf $RPM_BUILD_ROOT

%files -f INSTALLED_FILES
%defattr(-,root,root)
%doc README PKG-INFO

%changelog
* Thu Mar 17 2005 Peter Jones <pjones at redhat.com> - 0.1-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-goopy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Mar 2005 21:21:50 -0000	1.1
+++ .cvsignore	17 Mar 2005 21:22:09 -0000	1.2
@@ -0,0 +1 @@
+goopy-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-goopy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Mar 2005 21:21:50 -0000	1.1
+++ sources	17 Mar 2005 21:22:09 -0000	1.2
@@ -0,0 +1 @@
+e6f6782c01af621dfaf7f4a272838a70  goopy-0.1.tar.gz



From sopwith at redhat.com  Thu Mar 17 21:37:50 2005
From: sopwith at redhat.com (Elliot Lee)
Date: Thu, 17 Mar 2005 16:37:50 -0500 (EST)
Subject: Fedora Core CVS commit notifications
Message-ID: <Pine.LNX.4.58.0503171614400.18630@devserv.devel.redhat.com>

Hey hackers!

If you would like to get details of the commits to Fedora Core packages,
you can now receive them by subscribing to the fedora-cvs-commits mailing
list (https://www.redhat.com/mailman/listinfo/fedora-cvs-commits).

This list is the Fedora Core equivalent of the fedora-extras-commits list.

Best,
-- Elliot



From fedora-extras-commits at redhat.com  Thu Mar 17 21:57:11 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 17 Mar 2005 16:57:11 -0500
Subject: devel/xosd xosd-defaults.patch,NONE,1.1 xosd.spec,1.7,1.8
Message-ID: <200503172157.j2HLvBje027921@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/xosd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27914

Modified Files:
	xosd.spec 
Added Files:
	xosd-defaults.patch 
Log Message:
Add BMP plugin subpackage, improve default config.

xosd-defaults.patch:

--- NEW FILE xosd-defaults.patch ---
diff -Naru xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c xosd-2.2.14/src/bmp_plugin/bmp_osd.c
--- xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c	2004-11-17 21:26:56.000000000 +0200
+++ xosd-2.2.14/src/bmp_plugin/bmp_osd.c	2005-03-17 23:42:25.000000000 +0200
@@ -177,8 +177,8 @@
   colour = NULL;
   font = NULL;
   timeout = 3;
-  offset = 50;
-  h_offset = 0;
+  offset = 60;
+  h_offset = 60;
   shadow_offset = 1;
   outline_offset = 0;
   pos = XOSD_bottom;
diff -Naru xosd-2.2.14.orig/src/libxosd/xosd.c xosd-2.2.14/src/libxosd/xosd.c
--- xosd-2.2.14.orig/src/libxosd/xosd.c	2004-11-17 21:27:11.000000000 +0200
+++ xosd-2.2.14/src/libxosd/xosd.c	2005-03-17 23:43:48.000000000 +0200
@@ -24,7 +24,7 @@
 #define XOFFSET 10
 
 const char *osd_default_font =
-  "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*";
+  "-*-luxi sans-*-r-*-*-17-*-*-*-*-*-*-*";
 #if 0
 "-adobe-helvetica-bold-r-*-*-10-*";
 #endif
diff -Naru xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c xosd-2.2.14/src/xmms_plugin/xmms_osd.c
--- xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c	2004-11-04 21:47:50.000000000 +0200
+++ xosd-2.2.14/src/xmms_plugin/xmms_osd.c	2005-03-17 23:42:11.000000000 +0200
@@ -177,8 +177,8 @@
   colour = NULL;
   font = NULL;
   timeout = 3;
-  offset = 50;
-  h_offset = 0;
+  offset = 60;
+  h_offset = 60;
   shadow_offset = 1;
   outline_offset = 0;
   pos = XOSD_bottom;


Index: xosd.spec
===================================================================
RCS file: /cvs/extras/devel/xosd/xosd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xosd.spec	29 Nov 2004 18:40:26 -0000	1.7
+++ xosd.spec	17 Mar 2005 21:57:09 -0000	1.8
@@ -1,8 +1,9 @@
-%define	plugdir	%(xmms-config --general-plugin-dir 2>/dev/null)
+%define	xmms_plugdir %(xmms-config --general-plugin-dir 2>/dev/null)
+%define bmp_plugdir %(pkg-config bmp --variable=general_plugin_dir 2>/dev/null)
 
 Name:           xosd
 Version:        2.2.14
-Release:        1
+Release:        2
 Summary:        On-screen display library for X
 
 Group:          System Environment/Libraries
@@ -10,9 +11,11 @@
 URL:            http://www.ignavus.net/software.html
 Source:         http://ftp.debian.org/debian/pool/main/x/xosd/xosd_2.2.14.orig.tar.gz
 Patch0:         %{name}-aclocal18.patch
+Patch1:         %{name}-defaults.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel >= 1:0.22.0, xmms-devel
+BuildRequires:  bmp-devel
 
 %description
 XOSD displays text on your screen, sounds simple right? The difference
@@ -32,19 +35,29 @@
 display.
 
 %package     -n xmms-%{name}
-Summary:        An XMMS plugin for on-screen display using the XOSD library
+Summary:        XMMS plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
 Requires:       %{name} = %{version}-%{release}, xmms
 Obsoletes:      %{name}-xmms <= 2.2.12
 
 %description -n xmms-%{name}
-An X MultiMedia System plugin to display information on-screen through
+X MultiMedia System plugin to display information on-screen through
+the XOSD library, similarly to TV OSD.
+
+%package     -n bmp-%{name}
+Summary:        BMP plugin for on-screen display using the XOSD library
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}-%{release}, bmp
+
+%description -n bmp-%{name}
+Beep Media Player plugin to display information on-screen through
 the XOSD library, similarly to TV OSD.
 
 
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 
 %build
@@ -56,7 +69,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT{%{_libdir},%{plugdir}}/*.la
+rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir},%{bmp_plugdir}}/*.la
 
 
 %clean
@@ -87,10 +100,18 @@
 
 %files -n xmms-%{name}
 %defattr(-,root,root,-)
-%{plugdir}/*.so
+%{xmms_plugdir}/*.so
+
+%files -n bmp-%{name}
+%defattr(-,root,root,-)
+%{bmp_plugdir}/*.so
 
 
 %changelog
+* Thu Mar 17 2005 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-2
+- Add Beep Media Player plugin subpackage.
+- Improve default font and plugin OSD placement.
+
 * Mon Nov 29 2004 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-1
 - Update to 2.2.14 (from Debian).
 - Drop pre-FC1 gdk-pixbuf compatibility kludges.



From fedora-extras-commits at redhat.com  Thu Mar 17 22:09:27 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 17:09:27 -0500
Subject: devel/python-HTMLgen python-HTMLgen.spec,1.3,1.4
Message-ID: <200503172209.j2HM9R04029175@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29167

Modified Files:
	python-HTMLgen.spec 
Log Message:
Version and %python_sitelib cleanup


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/devel/python-HTMLgen/python-HTMLgen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-HTMLgen.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ python-HTMLgen.spec	17 Mar 2005 22:09:25 -0000	1.4
@@ -1,19 +1,16 @@
-%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
-%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')
-
-%define version 2.2.2
+%{!?pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}%define mainpyver %(%{__python} -c 'import sys;print(sys.version[0:3])')
+%{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?pydir: %define pydir %(%{__python}%{pyver} -c "from distutils.sysconfig import get_config_vars; print get_config_vars()['LIBDEST']")}
 
 %if "%{pyver}" == "%{mainpyver}"
 %define name python-HTMLgen
-%define prov python%{pyver}-htmlgen = %{version} python-htmlgen = %{version}
 %else
 %define name python%{pyver}-HTMLgen
-%define prov python%{pyver}-htmlgen = %{version}
 %endif
 
 Name:           %name
-Version:        %version
-Release:        2
+Version:        2.2.2
+Release:        3
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -22,10 +19,9 @@
 Source0:        http://starship.python.net/crew/friedrich/HTMLgen.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Provides:       %{prov}
 BuildRequires:  python-abi = %{pyver}
 Requires:       python-abi = %{pyver}
-Provides:       HTMLgen = %{version}
+Provides:       python%{pyver}HTMLgen = %{version}
 BuildArch:      noarch
 
 %description
@@ -40,22 +36,26 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+install -d -m 0755 $RPM_BUILD_ROOT%{python_sitelib}
 for file in HTMLgen.py HTMLcolors.py HTMLutil.py HTMLcalendar.py barchart.py colorcube.py imgsize.py NavLinks.py Formtools.py ImageH.py ImageFileH.py ImagePaletteH.py GifImagePluginH.py JpegImagePluginH.py PngImagePluginH.py; do
-  install -m 0644 $file $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+  install -m 0644 $file $RPM_BUILD_ROOT%{python_sitelib}
 done
-python%{pyver} %{_libdir}/python%{pyver}/compileall.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
-python%{pyver} -O %{_libdir}/python%{pyver}/compileall.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+%{__python}%{pyver} %{pydir}/compileall.py $RPM_BUILD_ROOT%{python_sitelib}
+%{__python}%{pyver} -O %{pydir}/compileall.py $RPM_BUILD_ROOT%{python_sitelib}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/python%pyver/site-packages/*.py
-%{_libdir}/python%pyver/site-packages/*.py[co]
+%{python_sitelib}/*.py
+%{python_sitelib}/*.py[co]
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-3
+- Streamlined version handling
+- Implemented %python_sitelib
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-2
 - Modified %setup to use -n
 - Broke %description at 80 columns



From fedora-extras-commits at redhat.com  Thu Mar 17 22:12:34 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 17:12:34 -0500
Subject: devel/python-HTMLgen python-HTMLgen.spec,1.4,1.5
Message-ID: <200503172212.j2HMCYn6029369@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29360

Modified Files:
	python-HTMLgen.spec 
Log Message:
Fixed small Provides bug


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/devel/python-HTMLgen/python-HTMLgen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-HTMLgen.spec	17 Mar 2005 22:09:25 -0000	1.4
+++ python-HTMLgen.spec	17 Mar 2005 22:12:32 -0000	1.5
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        2.2.2
-Release:        3
+Release:        4
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -21,7 +21,7 @@
 
 BuildRequires:  python-abi = %{pyver}
 Requires:       python-abi = %{pyver}
-Provides:       python%{pyver}HTMLgen = %{version}
+Provides:       python%{pyver}-HTMLgen = %{version}
 BuildArch:      noarch
 
 %description
@@ -52,6 +52,9 @@
 %{python_sitelib}/*.py[co]
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-4
+- Fixed small Provides bug
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-3
 - Streamlined version handling
 - Implemented %python_sitelib



From fedora-extras-commits at redhat.com  Thu Mar 17 22:35:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 17:35:39 -0500
Subject: devel/hamlib hamlib.spec,1.3,1.4
Message-ID: <200503172235.j2HMZdND030501@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30495

Modified Files:
	hamlib.spec 
Log Message:
Fixed %post and %postun along with Requires(...)


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hamlib.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ hamlib.spec	17 Mar 2005 22:35:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name: hamlib
 Version: 1.2.3
-Release: 2
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transcievers and receivers.
@@ -16,6 +16,8 @@
 BuildRequires: gzip, make >= 3.77, patch >= 2.5, rpm >= 3.0, sed
 BuildRequires: textutils python-devel swig gd-devel
 BuildRequires: doxygen
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 Hamlib provides a standardised programming interface that applications 
@@ -37,6 +39,8 @@
 %package c++
 Summary: Hamlib radio control library C++ binding
 Group: Development/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description c++
 Hamlib radio control library C++ language binding.
@@ -135,6 +139,10 @@
 
 %postun -p /sbin/ldconfig
 
+%post c++ -p /sbin/ldconfig
+
+%postun c++ -p /sbin/ldconfig
+
 %files
 %defattr(-, root, root)
 %doc COPYING doc/html
@@ -197,6 +205,9 @@
 
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-4
+- Fixed %post and %postun along with Requires(...)
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-3
 - Spell-corrected %description
 



From fedora-extras-commits at redhat.com  Thu Mar 17 22:39:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 17:39:02 -0500
Subject: devel/libosip libosip.spec,1.2,1.3
Message-ID: <200503172239.j2HMd2IC030707@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30699

Modified Files:
	libosip.spec 
Log Message:
Spec file cleanup


Index: libosip.spec
===================================================================
RCS file: /cvs/extras/devel/libosip/libosip.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libosip.spec	16 Mar 2005 23:41:59 -0000	1.2
+++ libosip.spec	17 Mar 2005 22:39:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libosip
 Version:        0.9.7
-Release:        2
+Release:        3
 Summary:        oSIP is an implementation of SIP
 
 Group:          System Environment/Libraries
@@ -27,11 +27,18 @@
 Requires:       %{name} = %{version}-%{release}
 
 %description    devel
-The GNU oSIP library is written in C and get no dependencies except the standard C library. oSIP is thread safe and will generally be used in a multi-threaded application. Nevertheless, this is optional.
-
-oSIP is little in size and code and thus could be use to implement IP soft-phone as well as embedded SIP software. oSIP is not limited to endpoint agents, and can also be used to implement "SIP proxy".
-
-oSIP does not intend to provide a high layer API for controlling "SIP Session" at this step. Instead, it currently provides an API for the SIP message parser, SDP message parser, and library to handle "SIP transactions" as defined by the SIP document.
+The GNU oSIP library is written in C and get no dependencies except the
+standard C library. oSIP is thread safe and will generally be used in a
+multi-threaded application. Nevertheless, this is optional.
+
+oSIP is little in size and code and thus could be use to implement IP
+soft-phone as well as embedded SIP software. oSIP is not limited to endpoint
+agents, and can also be used to implement "SIP proxy".
+
+oSIP does not intend to provide a high layer API for controlling "SIP Session"
+at this step. Instead, it currently provides an API for the SIP message parser,
+SDP message parser, and library to handle "SIP transactions" as defined by the
+SIP document.
 
 %prep
 %setup -q
@@ -50,8 +57,6 @@
 %post
 /sbin/ldconfig
 
-%preun
-
 %postun
 /sbin/ldconfig
 
@@ -68,6 +73,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-3
+- Spec file cleanup
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-2
 - Fix %files devel to include %{_includedir}/osip
 - Broke %description at 80 columns



From bugs.michael at gmx.net  Thu Mar 17 22:45:48 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 17 Mar 2005 23:45:48 +0100
Subject: devel/hamlib hamlib.spec,1.3,1.4
In-Reply-To: <200503172235.j2HMZdND030501@cvs-int.fedora.redhat.com>
References: <200503172235.j2HMZdND030501@cvs-int.fedora.redhat.com>
Message-ID: <20050317234548.2dc77869.bugs.michael@gmx.net>

On Thu, 17 Mar 2005 17:35:39 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/devel/hamlib
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30495
> 
> Modified Files:
> 	hamlib.spec 
> Log Message:
> Fixed %post and %postun along with Requires(...)

> +Requires(post): /sbin/ldconfig
> +Requires(postun): /sbin/ldconfig

Not needed. These are automatically set because you change the
scriplet interpreter with -p:

> +%post c++ -p /sbin/ldconfig
> +
> +%postun c++ -p /sbin/ldconfig
> +



From fedora-extras-commits at redhat.com  Thu Mar 17 22:53:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 17:53:03 -0500
Subject: devel/linphone linphone.spec,1.2,1.3
Message-ID: <200503172253.j2HMr3Sl031351@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31345

Modified Files:
	linphone.spec 
Log Message:
Broke %description at 80 columns


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linphone.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ linphone.spec	17 Mar 2005 22:53:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        2
+Release:        3
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -17,13 +17,18 @@
 Requires(postun): /sbin/ldconfig
 
 %description
-Linphone is mostly sip compliant. It works successfully with these implementations:
+Linphone is mostly sip compliant. It works successfully with these
+implementations:
     * eStara softphone (commercial software for windows)
     * Pingtel phones (with DNS enabled and VLAN QOS support disabled).
     * Hotsip, a free of charge phone for Windows.
-    * Vocal, an open source SIP stack from Vovida that includes a SIP proxy that works with linphone since version 0.7.1.
-    * Siproxd is a free sip proxy being developped by Thomas Ries because he would like to have linphone working behind his firewall. Siproxd is simple to setup and works perfectly with linphone.
-    * Partysip aims at being a generic and fully functionnal SIP proxy. Visit the web page for more details on its functionalities.
+    * Vocal, an open source SIP stack from Vovida that includes a SIP proxy
+        that works with linphone since version 0.7.1.
+    * Siproxd is a free sip proxy being developped by Thomas Ries because he
+        would like to have linphone working behind his firewall. Siproxd is
+        simple to setup and works perfectly with linphone.
+    * Partysip aims at being a generic and fully functionnal SIP proxy. Visit
+        the web page for more details on its functionalities.
 
 Linphone may work also with other sip phones, but this has not been tested yet.
 
@@ -83,6 +88,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-3
+- Broke %description at 80 columns
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-2
 - Removed explicit Requires
 



From ivazquez at ivazquez.net  Thu Mar 17 22:59:10 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 17 Mar 2005 17:59:10 -0500
Subject: devel/hamlib hamlib.spec,1.3,1.4
In-Reply-To: <20050317234548.2dc77869.bugs.michael@gmx.net>
References: <200503172235.j2HMZdND030501@cvs-int.fedora.redhat.com>
	<20050317234548.2dc77869.bugs.michael@gmx.net>
Message-ID: <1111100350.30220.27.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 23:45 +0100, Michael Schwendt wrote:
> On Thu, 17 Mar 2005 17:35:39 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> > +Requires(post): /sbin/ldconfig
> > +Requires(postun): /sbin/ldconfig
> 
> Not needed. These are automatically set because you change the
> scriplet interpreter with -p:

Aha. Thanks.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050317/ebab248f/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Thu Mar 17 22:59:26 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 17 Mar 2005 17:59:26 -0500
Subject: devel/hamlib hamlib.spec,1.4,1.5
Message-ID: <200503172259.j2HMxQps031405@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31399

Modified Files:
	hamlib.spec 
Log Message:
Removed spurious Requires(...)


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hamlib.spec	17 Mar 2005 22:35:37 -0000	1.4
+++ hamlib.spec	17 Mar 2005 22:59:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name: hamlib
 Version: 1.2.3
-Release: 4
+Release: 5
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transcievers and receivers.
@@ -16,8 +16,6 @@
 BuildRequires: gzip, make >= 3.77, patch >= 2.5, rpm >= 3.0, sed
 BuildRequires: textutils python-devel swig gd-devel
 BuildRequires: doxygen
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 
 %description
 Hamlib provides a standardised programming interface that applications 
@@ -39,8 +37,6 @@
 %package c++
 Summary: Hamlib radio control library C++ binding
 Group: Development/Libraries
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 
 %description c++
 Hamlib radio control library C++ language binding.
@@ -205,6 +201,9 @@
 
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-5
+- Removed spurious Requires(...)
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-4
 - Fixed %post and %postun along with Requires(...)
 



From fedora-extras-commits at redhat.com  Thu Mar 17 23:13:55 2005
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Thu, 17 Mar 2005 18:13:55 -0500
Subject: rpms/cfengine/FC-3 cfengine.spec, 1.6, 1.7 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200503172313.j2HNDtfB032301@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32295

Modified Files:
	cfengine.spec sources .cvsignore 
Log Message:
update to upstream 2.1.13, multiple spec file changes


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/cfengine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cfengine.spec	15 Dec 2004 19:33:17 -0000	1.6
+++ cfengine.spec	17 Mar 2005 23:13:53 -0000	1.7
@@ -1,16 +1,17 @@
-Summary: GNU cfengine - a systems administration tool for networks
+Summary: A systems administration tool for networks
 Name: cfengine
-Epoch: 0
-Version: 2.1.9
-Release: 2
+Version: 2.1.13
+Release: 4
 License: GPL
-Group: System Environment/Daemons
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.9.tar.gz
+Group: Applications/System
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.13.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
 URL: http://www.cfengine.org/
-BuildRequires: db4-devel,openssl-devel,texinfo,tetex-dvips,bison,flex,m4
+BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel
+Requires(post): /sbin/chkconfig, /sbin/install-info
+Requires(preun): /sbin/chkconfig, /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -22,12 +23,10 @@
 configurations. Cfengine is designed to be a part of a computer immune
 system.
 
-#---------------------------------------------------------------------
 
 %prep
-%setup -n %{name}-%{version}
+%setup -q
 
-#---------------------------------------------------------------------
 
 %build
 # Since /usr is managed by rpmdb, we can build stuff in there
@@ -35,10 +34,9 @@
 # ./configure BERKELEY_DB_LIB=-ldb --prefix=/usr --infodir=/usr/share/info
 %configure BERKELEY_DB_LIB=-ldb --with-docs
 make
-
 # Some of the example files have execute bit for some reason.
 chmod 644 inputs/*example
-#---------------------------------------------------------------------
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,56 +45,46 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 make DESTDIR=$RPM_BUILD_ROOT install
 # make directory tree for cfengine configs
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_var}/%{name}
 for i in ppkeys inputs outputs
 do
- 	mkdir -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/%{name}/$i
+ 	mkdir -m 0700 $RPM_BUILD_ROOT%{_var}/%{name}/$i
 done
 
 # It's ugly, but thats the way Mark wants to have it. :(
 # If we don't create this link, cfexecd will not be able to start
 # (hardcoded) /var/sbin/cfagent in scheduled intervals. Other option 
 # would be to patch cfengine to use %{_sbindir}/cfagent
-mkdir -p $RPM_BUILD_ROOT/var/cfengine/bin
-ln -sf %{_sbindir}/cfagent $RPM_BUILD_ROOT/var/cfengine/bin/
+mkdir -p $RPM_BUILD_ROOT/%{_var}/%{name}/bin
+ln -sf %{_sbindir}/cfagent $RPM_BUILD_ROOT/%{_var}/%{name}/bin/
 
 # Startup file for cfexecd and cfservd
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 for i in %{SOURCE1} %{SOURCE2} %{SOURCE3}
 do
-	install -m 0755 $i $RPM_BUILD_ROOT%{_initrddir}/
+	install -p -m 0755 $i $RPM_BUILD_ROOT%{_initrddir}/
 done
 
-#
-# Appearantly this %{_infodir}/dir gets build on RH9, but it doesn't
-# appear in my RH8 box. Confusing situation...
-#
-if [ -f $RPM_BUILD_ROOT%{_infodir}/dir ]; then
-	rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-fi
-if [ -f NEWS -a -z "`cat NEWS`" ]; then
-	rm -f NEWS
-fi
-#
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
 # All this stuff is pushed into doc directory.
-#
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} 
-#---------------------------------------------------------------------
+
 
 %post
 # cfagent won't run nicely, unless your host has keys.
-if [ ! -d /mnt/sysimage -a ! -f %{_localstatedir}/%{name}/ppkeys/localhost.priv ]; then
+if [ ! -d /mnt/sysimage -a ! -f %{_var}/%{name}/ppkeys/localhost.priv ]; then
 	%{_sbindir}/cfkey
-	/sbin/install-info --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
 fi
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
+# add init files to chkconfig
 if [ "$1" = "1" ]; then
 	chkconfig --add cfenvd
 	chkconfig --add cfexecd
 	chkconfig --add cfservd
-	chkconfig cfenvd off
-	chkconfig cfexecd off
-	chkconfig cfservd off
 fi
+
+
 %preun
 if [ "$1" = "0" ]; then
         /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
@@ -105,15 +93,13 @@
 	chkconfig --del cfservd
 fi
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %doc contrib
 %doc inputs
@@ -123,18 +109,36 @@
 %{_sbindir}/*
 %{_mandir}/man8/*
 %{_infodir}/cfengine*
-%config(noreplace) %{_initrddir}/cfenvd
-%config(noreplace) %{_initrddir}/cfexecd
-%config(noreplace) %{_initrddir}/cfservd
-/var/cfengine/bin
-%dir %{_localstatedir}/%{name}
-%dir %{_localstatedir}/%{name}/inputs
-%dir %{_localstatedir}/%{name}/outputs
-%dir %{_localstatedir}/%{name}/ppkeys
+%config %{_initrddir}/cfenvd
+%config %{_initrddir}/cfexecd
+%config %{_initrddir}/cfservd
+%dir %{_var}/%{name}
+%dir %{_var}/%{name}/bin
+%dir %{_var}/%{name}/inputs
+%dir %{_var}/%{name}/outputs
+%dir %{_var}/%{name}/ppkeys
 
-#---------------------------------------------------------------------
 
 %changelog
+* Mon Mar 14 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.13-4
+- add buildrequires: tetex
+
+* Wed Mar  9 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.13-3
+- change _localstatdir macros to _var
+- change group to Applications/System
+- add buildrequires: libacl-devel
+- add requires(post,preun) for chkconfig and install-info
+
+* Wed Mar  9 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.13-2
+- Remove unnecessary 'chkconfig <init_script> off' from post section
+
+* Mon Mar  7 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.13-1
+- Various spec file changes: change summary, line separators, defattr
+- Remove epoch 0
+
+* Mon Feb 27 2005 David Dorgan <davidd at micro-gravity.com> - 0:2.1.13-0
+- Updated to version 2.1.13
+
 * Sun Aug 15 2004 Juha Ylitalo <jylitalo at iki.fi> - 0:2.1.9-2
 - nowdays we need --with-docs to get man pages included
 - texinfo added into buildrequires list


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Dec 2004 19:33:17 -0000	1.4
+++ sources	17 Mar 2005 23:13:53 -0000	1.5
@@ -1 +1 @@
-421ac1ba0fd9cbe0384f1b0eded1afd8  cfengine-2.1.9.tar.gz
+2c002fc37f2fc9f87248ad8b9e899091  cfengine-2.1.13.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Dec 2004 19:33:17 -0000	1.4
+++ .cvsignore	17 Mar 2005 23:13:53 -0000	1.5
@@ -1 +1 @@
-cfengine-2.1.9.tar.gz
+cfengine-2.1.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 17 23:31:38 2005
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Thu, 17 Mar 2005 18:31:38 -0500
Subject: rpms/fortune-mod/FC-3 fortune-mod-1.99-move-offensive.patch, NONE,
	1.1 fortune-mod-1.99-remove-offensive-option.patch, NONE,
	1.1 fortune-mod-cflags.patch, NONE,
	1.1 fortune-mod-offense.patch, 1.1, 1.2 fortune-mod.spec, 1.5,
	1.6 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4
Message-ID: <200503172331.j2HNVcdM032446@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/fortune-mod/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32440

Modified Files:
	fortune-mod-offense.patch fortune-mod.spec sources .cvsignore 
Added Files:
	fortune-mod-1.99-move-offensive.patch 
	fortune-mod-1.99-remove-offensive-option.patch 
	fortune-mod-cflags.patch 
Log Message:
update to version 1.99.1 - and a few spec file changes

fortune-mod-1.99-move-offensive.patch:

--- NEW FILE fortune-mod-1.99-move-offensive.patch ---
--- datfiles/riddles	2004-03-05 05:29:56.000000000 -0800
+++ datfiles/riddles.pc	2005-03-14 06:09:08.290062640 -0800
@@ -419,9 +419,6 @@
 Q:	What's a light-year?
 A:	One-third less calories than a regular year.
 %
-Q:	What's a WASP's idea of open-mindedness?
-A:	Dating a Canadian.
-%
 Q:	What's buried in Grant's tomb?
 A:	A corpse.
 %
--- datfiles/off/unrotated/riddles	2004-03-05 05:29:56.000000000 -0800
+++ datfiles/off/unrotated/riddles.new	2005-03-14 06:11:01.351874632 -0800
@@ -1098,3 +1098,6 @@
 Why is it that there are so many more horses' asses than there are horses?
 		-- G. Gordon Liddy
 %
+Q:     What's a WASP's idea of open-mindedness?
+A:     Dating a Canadian.
+%

fortune-mod-1.99-remove-offensive-option.patch:

--- NEW FILE fortune-mod-1.99-remove-offensive-option.patch ---
--- fortune/fortune.c	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune.c.nooff	2005-03-13 08:47:12.815509344 -0800
@@ -275,7 +275,7 @@
 #ifndef	NO_REGEX
     (void) fprintf(stderr, "i");
 #endif /* NO_REGEX */
-    (void) fprintf(stderr, "losw]");
+    (void) fprintf(stderr, "lsw]");
 #ifndef	NO_REGEX
     (void) fprintf(stderr, " [-m pattern]");
 #endif /* NO_REGEX */
@@ -1013,9 +1013,9 @@
     ignore_case = FALSE;
 
 #ifdef DEBUG
-    while ((ch = getopt(argc, argv, "acDefilm:n:osvw")) != EOF)
+    while ((ch = getopt(argc, argv, "acDefilm:n:svw")) != EOF)
 #else
-    while ((ch = getopt(argc, argv, "acefilm:n:osvw")) != EOF)
+    while ((ch = getopt(argc, argv, "acefilm:n:svw")) != EOF)
 #endif /* DEBUG */
 	switch (ch)
 	  {
@@ -1040,9 +1040,6 @@
 	  case 'n':
 	      SLEN = atoi(optarg);
 	      break;
-	  case 'o':		/* offensive ones only */
-	      Offend++;
-	      break;
 	  case 's':		/* short ones only */
 	      Short_only++;
 	      Long_only = FALSE;
--- fortune/fortune-man.part1	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune-man.part1.nooff	2005-03-13 09:00:47.344682088 -0800
@@ -50,7 +50,7 @@
 .SH NAME
 fortune \- print a random, hopefully interesting, adage
 .SH SYNOPSIS
-.BR fortune " [" -acefilosw "] [" -n 
+.BR fortune " [" -acefilsw "] [" -n 
 .IR length "] ["
 .B -m 
 .IR pattern "] [[" n% "] " file/dir/all ]
@@ -58,15 +58,12 @@
 When
 .B fortune
 is run with no arguments it prints out a random epigram. Epigrams are
-divided into several categories, where each category is sub-divided
-into those which are potentially offensive and those which are not.
+divided into several categories.
 .SS Options
 The options are as follows:
 .TP
 .B -a
-Choose from all lists of maxims, both offensive and not.  (See the
-.B -o 
-option for more information on offensive fortunes.)
+Choose from all lists of maxims.
 .TP
 .B -c
 Show the cookie file from which the fortune came.
@@ -114,29 +111,6 @@
 ask for short fortunes, or too long and ask for long ones, fortune goes
 into a never-ending thrash loop.
 .TP
-.B -o
-Choose only from potentially offensive aphorisms.  The -o option is
-ignored if a fortune directory is specified.
-.sp
-.B Please, please, please request a potentially
-.B offensive fortune if and only if
-.B you believe, deep in your heart,
-.B that you are willing to be
-.B offended. (And that you'll just quit
-.BR using " -o " rather
-.B than give us grief about it,
-.B okay?)
-.sp
-.RS
-\&... let us keep in mind the basic governing philosophy of The
-Brotherhood, as handsomely summarized in these words: we believe in
-healthy, hearty laughter -- at the expense of the whole human race, if
-needs be.  Needs be.
-.RS
---H. Allen Smith, "Rude Jokes"
-.RE
-.RE
-.TP
 .B -s
 Short apothegms only.  See
 .B -n
@@ -207,30 +181,6 @@
 .RI "50% " funny " 50% " not-funny
 .sp
 .RE
-This fortune also supports the BSD method of appending ``-o'' to
-database names to specify offensive fortunes.  However this is
-.B not
-how fortune stores them: offensive fortunes are stored in a seperate
-directory without the ``-o'' infix.  A plain name (i.e., not a path to a
-file or directory) that ends in ``-o'' will be assumed to be an
-offensive database, and will have its suffix stripped off and be
-searched in the offensive directory (even if the neither of the
-.IR -a " or " -o
-options were specified).  This feature is not only for
-backwards-compatibility, but also to allow users to distinguish between
-inoffensive and offensive databases of the same name.
-.PP
-For example, assuming there is a database named
-.I definitions
-in both the inoffensive and potentially offensive collections, then the
-following command will select an inoffensive definition 90% of the time,
-and a potentially offensive definition for the remaining 10%:
-.RS
-.sp
-.B fortune
-90%
-.I definitions definitions-o
-.RE
 .SH FILES
 Note: these are the defaults as defined at compile time.
 .PP
--- fortune/fortune-man.part2	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune-man.part2.nooff	2005-03-13 09:13:40.985070872 -0800
@@ -8,16 +8,6 @@
 .B fortune
 no longer finds the pointers file, it ignores the text file.
 .SH BUGS
-The division of fortunes into offensive and non-offensive by directory,
-rather than via the `-o' file infix, is not 100% compatible with
-original BSD fortune. Although the `-o' infix is recognised as referring
-to an offensive database, the offensive database files still need to be
-in a separate directory.  The workaround, of course, is to move the `-o'
-files into the offensive directory (with or without renaming), and to
-use the
-.B -a
-option.
-.PP
 The supplied fortune databases have been attacked, in order to correct
 orthographical and grammatical errors, and particularly to reduce
 redundancy and repetition and redundancy.  But especially to avoid
@@ -26,13 +16,7 @@
 .PP
 The fortune databases are now divided into a larger number of smaller
 files, some organized by format (poetry, definitions), and some by
-content (religion, politics).  There are parallel files in the main
-directory and in the offensive files directory (e.g., fortunes/definitions and
-fortunes/off/definitions).  Not all the potentially offensive fortunes are in
-the offensive fortunes files, nor are all the fortunes in the offensive
-files potentially offensive, probably, though a strong attempt has been
-made to achieve greater consistency.  Also, a better division might be
-made.
+content (religion, politics).
 .SH HISTORY
 This version of fortune is based on the NetBSD fortune 1.4, but with a
 number of bug fixes and enhancements.

fortune-mod-cflags.patch:

--- NEW FILE fortune-mod-cflags.patch ---
--- fortune-mod-1.99.1/Makefile	2004-03-05 05:29:56.000000000 -0800
+++ fortune-mod-1.99.1/Makefile.cflags	2005-03-13 08:34:26.910944536 -0800
@@ -65,8 +65,8 @@
 RECODELIBS=-lrecode
 
 DEFINES=-DFORTDIR="\"$(COOKIEDIR)\"" -DOFFDIR="\"$(OCOOKIEDIR)\"" -DLOCFORTDIR="\"$(LOCALDIR)\"" -DLOCOFFDIR="\"$(LOCALODIR)\""
-CFLAGS=-O2 $(DEFINES) -Wall -fomit-frame-pointer -pipe -fsigned-char
-LDFLAGS=-s
+CFLAGS=$(RPM_OPT_FLAGS) $(DEFINES)
+LDFLAGS=
 
 # The above flags are used by default; the debug flags are used when make
 # is called with a debug target, such as 'make debug'

fortune-mod-offense.patch:

Index: fortune-mod-offense.patch
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/FC-3/fortune-mod-offense.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fortune-mod-offense.patch	8 Nov 2004 04:20:02 -0000	1.1
+++ fortune-mod-offense.patch	17 Mar 2005 23:31:36 -0000	1.2
@@ -1,32 +1,7 @@
---- fortune-mod-9708/Makefile.mike	Thu Aug 28 15:36:15 1997
-+++ fortune-mod-9708/Makefile	Tue Jun  6 17:57:18 2000
-@@ -3,27 +3,27 @@
- #
- 
- # Where does the fortune program go?
--FORTDIR=/usr/local/games
-+FORTDIR=/usr/games
- # Where do the data files (fortunes, or cookies) go?
--COOKIEDIR=/usr/local/share/games/fortunes
-+COOKIEDIR=/usr/share/games/fortunes
- # Offensive ones?
- OCOOKIEDIR=$(COOKIEDIR)/off
- # The ones with html tags?
- WCOOKIEDIR=$(COOKIEDIR)/html
- # Where do strfile and unstr go?
--BINDIR=/usr/local/bin
-+BINDIR=/usr/sbin
- # What is the proper mode for strfile and unstr? 755= everyone, 700= root only
- BINMODE=0755
- #BINMODE=0700
- # Where do the man pages for strfile and unstr go?
--BINMANDIR=/usr/local/man/man1
-+BINMANDIR=/usr/man/man1
- # What is their proper extension?
- BINMANEXT=1
- # And the same for the fortune man page
--FORTMANDIR=/usr/local/man/man6
-+FORTMANDIR=/usr/man/man6
+--- fortune-mod-1.99.1/Makefile	2004-03-05 05:29:56.000000000 -0800
++++ fortune-mod-1.99.1/Makefile.nooff	2005-03-13 09:08:19.087006816 -0800
+@@ -29,7 +29,7 @@
+ FORTMANDIR=$(prefix)/usr/share/man/man6
  FORTMANEXT=6
  # Do we want to install the offensive files? (0 no, 1 yes)
 -OFFENSIVE=1
@@ -34,14 +9,15 @@
  # Do we want to install files with html tags? (0 no, 1 yes)
  # (Note: These files are not yet available)
  WEB=0
-@@ -55,8 +55,8 @@
- REGEXLIBS=
- 
- DEFINES=-DFORTDIR="\"$(COOKIEDIR)\"" -DOFFDIR="\"$(OCOOKIEDIR)\""
--CFLAGS=-O2 $(DEFINES) -Wall -fomit-frame-pointer -pipe
--LDFLAGS=-s
-+CFLAGS=$(RPM_OPT_FLAGS) $(DEFINES)
-+LDFLAGS=
+@@ -156,10 +156,7 @@
+ 	@echo -n "Building fortune/fortune.man ... "
+ 	@cat fortune/fortune-man.part1 >fortune/fortune.man
+ 	@echo ".I $(COOKIEDIR)" >>fortune/fortune.man
+-	@echo "Directory for innoffensive fortunes." >>fortune/fortune.man
+-	@echo ".TP" >>fortune/fortune.man
+-	@echo ".I $(OCOOKIEDIR)" >>fortune/fortune.man
+-	@echo "Directory for offensive fortunes." >>fortune/fortune.man
++	@echo "Directory for fortunes." >>fortune/fortune.man
+ 	@cat fortune/fortune-man.part2 >>fortune/fortune.man
+ 	@echo done.
  
- # The above flags are used by default; the debug flags are used when make
- # is called with a debug target, such as 'make debug'


Index: fortune-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/FC-3/fortune-mod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fortune-mod.spec	14 Nov 2004 16:23:47 -0000	1.5
+++ fortune-mod.spec	17 Mar 2005 23:31:36 -0000	1.6
@@ -1,14 +1,14 @@
 %define DisableOffensiveFortunes 1
 %define CookieDir %{_prefix}/games/fortune
 
-Summary: A program which will display a fortune.
-Name:		fortune-mod
-Version:	1.0
-Release:	25
-URL:		http://www.ibiblio.org/pub/Linux/games/amusements/fortune/fortune-mod-9708.README
+Summary: A program which will display a fortune
+Name: fortune-mod
+Version: 1.99.1
+Release: 2
+URL: http://www.redellipse.net/code/fortune
 License: BSD
 Group: Amusements/Games
-Source: http://www.ibiblio.org/pub/Linux/games/amusements/fortune/fortune-mod-9708.tar.gz
+Source: http://www.redellipse.net/code/downloads/fortune-mod-1.99.1.tar.gz
 Source1: kernelnewbies-fortunes.tar.gz
 Source2: bofh-excuses.tar.bz2
 Source3: http://www.aboleo.net/software/misc/fortune-tao.tar.gz
@@ -16,9 +16,11 @@
 Source5: http://www.dibona.com/opensources/osfortune.tar.gz
 Source6: http://humorix.org/downloads/humorixfortunes-1.4.tar.gz
 Patch0: fortune-mod-offense.patch
-Patch1: fortune-mod-1.0-remove-offensive.patch
-Patch2: fortune-mod-1.0-remove-offensive-option.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Patch1: fortune-mod-1.99-remove-offensive-option.patch
+Patch2: fortune-mod-cflags.patch
+Patch3: fortune-mod-1.99-move-offensive.patch
+BuildRequires: recode-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 Fortune-mod contains the ever-popular fortune program, which will
@@ -27,14 +29,19 @@
 wisdom each time they log in.
 
 %prep
-%setup -q -n fortune-mod-9708
+%setup -q
 
+# disable offensive fortunes completely
 %if %{DisableOffensiveFortunes}
 %patch0 -p1 -b .disable-offensive1
-%patch1 -p0 -b .disable-offensive2
-%patch2 -p0 -b .remove-offensive-option
+%patch1 -p0 -b .remove-offensive-option
 %endif
 
+# use CFLAGS from rpmbuld
+%patch2 -p1 -b .cflags
+# move possibly offensive fortunes into the offensive directory
+%patch3 -p0 -b .move-offensive
+
 %build
 make COOKIEDIR=%{CookieDir} \
 	FORTDIR=%{_bindir} BINDIR=%{_sbindir}
@@ -45,6 +52,7 @@
 make    COOKIEDIR=%{CookieDir} fortune/fortune.man
 make	FORTDIR=$RPM_BUILD_ROOT/%{_bindir} \
 	COOKIEDIR=$RPM_BUILD_ROOT%{CookieDir} \
+	LOCALDIR=$RPM_BUILD_ROOT%{CookieDir} \
 	BINDIR=$RPM_BUILD_ROOT/%{_sbindir} \
 	BINMANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 \
 	FORTMANDIR=$RPM_BUILD_ROOT/%{_mandir}/man6 \
@@ -52,13 +60,14 @@
 
 tar zxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{CookieDir}
 %if %{DisableOffensiveFortunes}
-rm $RPM_BUILD_ROOT%{CookieDir}/men-women*
+rm -f $RPM_BUILD_ROOT%{CookieDir}/men-women*
 %endif
 
-# Using bzcat for portability because tar keeps randomly changing the switch
-# for bzip.  It was "y" at one point, then "I", and now it is "j".  God knows
-# WTF they'll change it too next.
+# this isn't debian
+rm -f $RPM_BUILD_ROOT%{CookieDir}/debian*
+rm -f $RPM_BUILD_ROOT%{CookieDir}/off/debian*
 
+# Using bzcat for portability because tar keeps changing the switch
 bzcat %{SOURCE2} | tar xvf - -C $RPM_BUILD_ROOT%{CookieDir}
 
 # Non-standard source files, need to move things around
@@ -88,7 +97,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README ChangeLog TODO
 %{_bindir}/fortune
 %{_sbindir}/strfile
@@ -97,6 +106,15 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Mar 14 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> 1.99.1-2
+- Add patch for moving fortunes into offensive directory
+
+* Sun Mar 13 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> 1.99.1-1
+- Update to newer source (see URL)
+- Update patches as necessary, separate cflags patch as it was only applied if applying offensive patches
+- New source has recode-devel buildreq
+- Remove debian fortunes which are included in new source
+
 * Sat Nov 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.0-25
 - Recreate .dat files at build-time to fix x86_64 fedora.us bug #2279.
 - Use %%CookieDir everywhere.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:20:06 -0000	1.3
+++ sources	17 Mar 2005 23:31:36 -0000	1.4
@@ -1,6 +1,6 @@
+f208805b3b712e32997d7667e0ec52d8  fortune-mod-1.99.1.tar.gz
 50ea110b4a9dd719a410045700760401  bofh-excuses.tar.bz2
 dc2860793725fce93445035b4aa8c812  fortune-hitchhiker.tgz
-81a87a44f9d94b0809dfc2b7b140a379  fortune-mod-9708.tar.gz
 9dd679fee3a8fff17daaf6563fd2cd8f  fortune-tao.tar.gz
 a0f5eb298aa5982aa54571f6e46aa58b  humorixfortunes-1.4.tar.gz
 73d25d1b7cfb9f82376e61fa3d8e58f2  kernelnewbies-fortunes.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:20:06 -0000	1.3
+++ .cvsignore	17 Mar 2005 23:31:36 -0000	1.4
@@ -1,6 +1,6 @@
+fortune-mod-1.99.1.tar.gz
 bofh-excuses.tar.bz2
 fortune-hitchhiker.tgz
-fortune-mod-9708.tar.gz
 fortune-tao.tar.gz
 humorixfortunes-1.4.tar.gz
 kernelnewbies-fortunes.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 17 23:40:57 2005
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Thu, 17 Mar 2005 18:40:57 -0500
Subject: rpms/fortune-mod/devel fortune-mod-1.99-move-offensive.patch, NONE,
	1.1 fortune-mod-1.99-remove-offensive-option.patch, NONE,
	1.1 fortune-mod-cflags.patch, NONE,
	1.1 fortune-mod-offense.patch, 1.1, 1.2 fortune-mod.spec, 1.5,
	1.6 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4
Message-ID: <200503172340.j2HNev6q000344@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/fortune-mod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv336

Modified Files:
	fortune-mod-offense.patch fortune-mod.spec sources .cvsignore 
Added Files:
	fortune-mod-1.99-move-offensive.patch 
	fortune-mod-1.99-remove-offensive-option.patch 
	fortune-mod-cflags.patch 
Log Message:
update to version 1.99.1 - and a few spec file changes

fortune-mod-1.99-move-offensive.patch:

--- NEW FILE fortune-mod-1.99-move-offensive.patch ---
--- datfiles/riddles	2004-03-05 05:29:56.000000000 -0800
+++ datfiles/riddles.pc	2005-03-14 06:09:08.290062640 -0800
@@ -419,9 +419,6 @@
 Q:	What's a light-year?
 A:	One-third less calories than a regular year.
 %
-Q:	What's a WASP's idea of open-mindedness?
-A:	Dating a Canadian.
-%
 Q:	What's buried in Grant's tomb?
 A:	A corpse.
 %
--- datfiles/off/unrotated/riddles	2004-03-05 05:29:56.000000000 -0800
+++ datfiles/off/unrotated/riddles.new	2005-03-14 06:11:01.351874632 -0800
@@ -1098,3 +1098,6 @@
 Why is it that there are so many more horses' asses than there are horses?
 		-- G. Gordon Liddy
 %
+Q:     What's a WASP's idea of open-mindedness?
+A:     Dating a Canadian.
+%

fortune-mod-1.99-remove-offensive-option.patch:

--- NEW FILE fortune-mod-1.99-remove-offensive-option.patch ---
--- fortune/fortune.c	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune.c.nooff	2005-03-13 08:47:12.815509344 -0800
@@ -275,7 +275,7 @@
 #ifndef	NO_REGEX
     (void) fprintf(stderr, "i");
 #endif /* NO_REGEX */
-    (void) fprintf(stderr, "losw]");
+    (void) fprintf(stderr, "lsw]");
 #ifndef	NO_REGEX
     (void) fprintf(stderr, " [-m pattern]");
 #endif /* NO_REGEX */
@@ -1013,9 +1013,9 @@
     ignore_case = FALSE;
 
 #ifdef DEBUG
-    while ((ch = getopt(argc, argv, "acDefilm:n:osvw")) != EOF)
+    while ((ch = getopt(argc, argv, "acDefilm:n:svw")) != EOF)
 #else
-    while ((ch = getopt(argc, argv, "acefilm:n:osvw")) != EOF)
+    while ((ch = getopt(argc, argv, "acefilm:n:svw")) != EOF)
 #endif /* DEBUG */
 	switch (ch)
 	  {
@@ -1040,9 +1040,6 @@
 	  case 'n':
 	      SLEN = atoi(optarg);
 	      break;
-	  case 'o':		/* offensive ones only */
-	      Offend++;
-	      break;
 	  case 's':		/* short ones only */
 	      Short_only++;
 	      Long_only = FALSE;
--- fortune/fortune-man.part1	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune-man.part1.nooff	2005-03-13 09:00:47.344682088 -0800
@@ -50,7 +50,7 @@
 .SH NAME
 fortune \- print a random, hopefully interesting, adage
 .SH SYNOPSIS
-.BR fortune " [" -acefilosw "] [" -n 
+.BR fortune " [" -acefilsw "] [" -n 
 .IR length "] ["
 .B -m 
 .IR pattern "] [[" n% "] " file/dir/all ]
@@ -58,15 +58,12 @@
 When
 .B fortune
 is run with no arguments it prints out a random epigram. Epigrams are
-divided into several categories, where each category is sub-divided
-into those which are potentially offensive and those which are not.
+divided into several categories.
 .SS Options
 The options are as follows:
 .TP
 .B -a
-Choose from all lists of maxims, both offensive and not.  (See the
-.B -o 
-option for more information on offensive fortunes.)
+Choose from all lists of maxims.
 .TP
 .B -c
 Show the cookie file from which the fortune came.
@@ -114,29 +111,6 @@
 ask for short fortunes, or too long and ask for long ones, fortune goes
 into a never-ending thrash loop.
 .TP
-.B -o
-Choose only from potentially offensive aphorisms.  The -o option is
-ignored if a fortune directory is specified.
-.sp
-.B Please, please, please request a potentially
-.B offensive fortune if and only if
-.B you believe, deep in your heart,
-.B that you are willing to be
-.B offended. (And that you'll just quit
-.BR using " -o " rather
-.B than give us grief about it,
-.B okay?)
-.sp
-.RS
-\&... let us keep in mind the basic governing philosophy of The
-Brotherhood, as handsomely summarized in these words: we believe in
-healthy, hearty laughter -- at the expense of the whole human race, if
-needs be.  Needs be.
-.RS
---H. Allen Smith, "Rude Jokes"
-.RE
-.RE
-.TP
 .B -s
 Short apothegms only.  See
 .B -n
@@ -207,30 +181,6 @@
 .RI "50% " funny " 50% " not-funny
 .sp
 .RE
-This fortune also supports the BSD method of appending ``-o'' to
-database names to specify offensive fortunes.  However this is
-.B not
-how fortune stores them: offensive fortunes are stored in a seperate
-directory without the ``-o'' infix.  A plain name (i.e., not a path to a
-file or directory) that ends in ``-o'' will be assumed to be an
-offensive database, and will have its suffix stripped off and be
-searched in the offensive directory (even if the neither of the
-.IR -a " or " -o
-options were specified).  This feature is not only for
-backwards-compatibility, but also to allow users to distinguish between
-inoffensive and offensive databases of the same name.
-.PP
-For example, assuming there is a database named
-.I definitions
-in both the inoffensive and potentially offensive collections, then the
-following command will select an inoffensive definition 90% of the time,
-and a potentially offensive definition for the remaining 10%:
-.RS
-.sp
-.B fortune
-90%
-.I definitions definitions-o
-.RE
 .SH FILES
 Note: these are the defaults as defined at compile time.
 .PP
--- fortune/fortune-man.part2	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune-man.part2.nooff	2005-03-13 09:13:40.985070872 -0800
@@ -8,16 +8,6 @@
 .B fortune
 no longer finds the pointers file, it ignores the text file.
 .SH BUGS
-The division of fortunes into offensive and non-offensive by directory,
-rather than via the `-o' file infix, is not 100% compatible with
-original BSD fortune. Although the `-o' infix is recognised as referring
-to an offensive database, the offensive database files still need to be
-in a separate directory.  The workaround, of course, is to move the `-o'
-files into the offensive directory (with or without renaming), and to
-use the
-.B -a
-option.
-.PP
 The supplied fortune databases have been attacked, in order to correct
 orthographical and grammatical errors, and particularly to reduce
 redundancy and repetition and redundancy.  But especially to avoid
@@ -26,13 +16,7 @@
 .PP
 The fortune databases are now divided into a larger number of smaller
 files, some organized by format (poetry, definitions), and some by
-content (religion, politics).  There are parallel files in the main
-directory and in the offensive files directory (e.g., fortunes/definitions and
-fortunes/off/definitions).  Not all the potentially offensive fortunes are in
-the offensive fortunes files, nor are all the fortunes in the offensive
-files potentially offensive, probably, though a strong attempt has been
-made to achieve greater consistency.  Also, a better division might be
-made.
+content (religion, politics).
 .SH HISTORY
 This version of fortune is based on the NetBSD fortune 1.4, but with a
 number of bug fixes and enhancements.

fortune-mod-cflags.patch:

--- NEW FILE fortune-mod-cflags.patch ---
--- fortune-mod-1.99.1/Makefile	2004-03-05 05:29:56.000000000 -0800
+++ fortune-mod-1.99.1/Makefile.cflags	2005-03-13 08:34:26.910944536 -0800
@@ -65,8 +65,8 @@
 RECODELIBS=-lrecode
 
 DEFINES=-DFORTDIR="\"$(COOKIEDIR)\"" -DOFFDIR="\"$(OCOOKIEDIR)\"" -DLOCFORTDIR="\"$(LOCALDIR)\"" -DLOCOFFDIR="\"$(LOCALODIR)\""
-CFLAGS=-O2 $(DEFINES) -Wall -fomit-frame-pointer -pipe -fsigned-char
-LDFLAGS=-s
+CFLAGS=$(RPM_OPT_FLAGS) $(DEFINES)
+LDFLAGS=
 
 # The above flags are used by default; the debug flags are used when make
 # is called with a debug target, such as 'make debug'

fortune-mod-offense.patch:

Index: fortune-mod-offense.patch
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/devel/fortune-mod-offense.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fortune-mod-offense.patch	8 Nov 2004 04:20:02 -0000	1.1
+++ fortune-mod-offense.patch	17 Mar 2005 23:40:55 -0000	1.2
@@ -1,32 +1,7 @@
---- fortune-mod-9708/Makefile.mike	Thu Aug 28 15:36:15 1997
-+++ fortune-mod-9708/Makefile	Tue Jun  6 17:57:18 2000
-@@ -3,27 +3,27 @@
- #
- 
- # Where does the fortune program go?
--FORTDIR=/usr/local/games
-+FORTDIR=/usr/games
- # Where do the data files (fortunes, or cookies) go?
--COOKIEDIR=/usr/local/share/games/fortunes
-+COOKIEDIR=/usr/share/games/fortunes
- # Offensive ones?
- OCOOKIEDIR=$(COOKIEDIR)/off
- # The ones with html tags?
- WCOOKIEDIR=$(COOKIEDIR)/html
- # Where do strfile and unstr go?
--BINDIR=/usr/local/bin
-+BINDIR=/usr/sbin
- # What is the proper mode for strfile and unstr? 755= everyone, 700= root only
- BINMODE=0755
- #BINMODE=0700
- # Where do the man pages for strfile and unstr go?
--BINMANDIR=/usr/local/man/man1
-+BINMANDIR=/usr/man/man1
- # What is their proper extension?
- BINMANEXT=1
- # And the same for the fortune man page
--FORTMANDIR=/usr/local/man/man6
-+FORTMANDIR=/usr/man/man6
+--- fortune-mod-1.99.1/Makefile	2004-03-05 05:29:56.000000000 -0800
++++ fortune-mod-1.99.1/Makefile.nooff	2005-03-13 09:08:19.087006816 -0800
+@@ -29,7 +29,7 @@
+ FORTMANDIR=$(prefix)/usr/share/man/man6
  FORTMANEXT=6
  # Do we want to install the offensive files? (0 no, 1 yes)
 -OFFENSIVE=1
@@ -34,14 +9,15 @@
  # Do we want to install files with html tags? (0 no, 1 yes)
  # (Note: These files are not yet available)
  WEB=0
-@@ -55,8 +55,8 @@
- REGEXLIBS=
- 
- DEFINES=-DFORTDIR="\"$(COOKIEDIR)\"" -DOFFDIR="\"$(OCOOKIEDIR)\""
--CFLAGS=-O2 $(DEFINES) -Wall -fomit-frame-pointer -pipe
--LDFLAGS=-s
-+CFLAGS=$(RPM_OPT_FLAGS) $(DEFINES)
-+LDFLAGS=
+@@ -156,10 +156,7 @@
+ 	@echo -n "Building fortune/fortune.man ... "
+ 	@cat fortune/fortune-man.part1 >fortune/fortune.man
+ 	@echo ".I $(COOKIEDIR)" >>fortune/fortune.man
+-	@echo "Directory for innoffensive fortunes." >>fortune/fortune.man
+-	@echo ".TP" >>fortune/fortune.man
+-	@echo ".I $(OCOOKIEDIR)" >>fortune/fortune.man
+-	@echo "Directory for offensive fortunes." >>fortune/fortune.man
++	@echo "Directory for fortunes." >>fortune/fortune.man
+ 	@cat fortune/fortune-man.part2 >>fortune/fortune.man
+ 	@echo done.
  
- # The above flags are used by default; the debug flags are used when make
- # is called with a debug target, such as 'make debug'


Index: fortune-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/devel/fortune-mod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fortune-mod.spec	14 Nov 2004 16:23:47 -0000	1.5
+++ fortune-mod.spec	17 Mar 2005 23:40:55 -0000	1.6
@@ -1,14 +1,14 @@
 %define DisableOffensiveFortunes 1
 %define CookieDir %{_prefix}/games/fortune
 
-Summary: A program which will display a fortune.
-Name:		fortune-mod
-Version:	1.0
-Release:	25
-URL:		http://www.ibiblio.org/pub/Linux/games/amusements/fortune/fortune-mod-9708.README
+Summary: A program which will display a fortune
+Name: fortune-mod
+Version: 1.99.1
+Release: 2
+URL: http://www.redellipse.net/code/fortune
 License: BSD
 Group: Amusements/Games
-Source: http://www.ibiblio.org/pub/Linux/games/amusements/fortune/fortune-mod-9708.tar.gz
+Source: http://www.redellipse.net/code/downloads/fortune-mod-1.99.1.tar.gz
 Source1: kernelnewbies-fortunes.tar.gz
 Source2: bofh-excuses.tar.bz2
 Source3: http://www.aboleo.net/software/misc/fortune-tao.tar.gz
@@ -16,9 +16,11 @@
 Source5: http://www.dibona.com/opensources/osfortune.tar.gz
 Source6: http://humorix.org/downloads/humorixfortunes-1.4.tar.gz
 Patch0: fortune-mod-offense.patch
-Patch1: fortune-mod-1.0-remove-offensive.patch
-Patch2: fortune-mod-1.0-remove-offensive-option.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Patch1: fortune-mod-1.99-remove-offensive-option.patch
+Patch2: fortune-mod-cflags.patch
+Patch3: fortune-mod-1.99-move-offensive.patch
+BuildRequires: recode-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 Fortune-mod contains the ever-popular fortune program, which will
@@ -27,14 +29,19 @@
 wisdom each time they log in.
 
 %prep
-%setup -q -n fortune-mod-9708
+%setup -q
 
+# disable offensive fortunes completely
 %if %{DisableOffensiveFortunes}
 %patch0 -p1 -b .disable-offensive1
-%patch1 -p0 -b .disable-offensive2
-%patch2 -p0 -b .remove-offensive-option
+%patch1 -p0 -b .remove-offensive-option
 %endif
 
+# use CFLAGS from rpmbuld
+%patch2 -p1 -b .cflags
+# move possibly offensive fortunes into the offensive directory
+%patch3 -p0 -b .move-offensive
+
 %build
 make COOKIEDIR=%{CookieDir} \
 	FORTDIR=%{_bindir} BINDIR=%{_sbindir}
@@ -45,6 +52,7 @@
 make    COOKIEDIR=%{CookieDir} fortune/fortune.man
 make	FORTDIR=$RPM_BUILD_ROOT/%{_bindir} \
 	COOKIEDIR=$RPM_BUILD_ROOT%{CookieDir} \
+	LOCALDIR=$RPM_BUILD_ROOT%{CookieDir} \
 	BINDIR=$RPM_BUILD_ROOT/%{_sbindir} \
 	BINMANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 \
 	FORTMANDIR=$RPM_BUILD_ROOT/%{_mandir}/man6 \
@@ -52,13 +60,14 @@
 
 tar zxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{CookieDir}
 %if %{DisableOffensiveFortunes}
-rm $RPM_BUILD_ROOT%{CookieDir}/men-women*
+rm -f $RPM_BUILD_ROOT%{CookieDir}/men-women*
 %endif
 
-# Using bzcat for portability because tar keeps randomly changing the switch
-# for bzip.  It was "y" at one point, then "I", and now it is "j".  God knows
-# WTF they'll change it too next.
+# this isn't debian
+rm -f $RPM_BUILD_ROOT%{CookieDir}/debian*
+rm -f $RPM_BUILD_ROOT%{CookieDir}/off/debian*
 
+# Using bzcat for portability because tar keeps changing the switch
 bzcat %{SOURCE2} | tar xvf - -C $RPM_BUILD_ROOT%{CookieDir}
 
 # Non-standard source files, need to move things around
@@ -88,7 +97,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README ChangeLog TODO
 %{_bindir}/fortune
 %{_sbindir}/strfile
@@ -97,6 +106,15 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Mar 14 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> 1.99.1-2
+- Add patch for moving fortunes into offensive directory
+
+* Sun Mar 13 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> 1.99.1-1
+- Update to newer source (see URL)
+- Update patches as necessary, separate cflags patch as it was only applied if applying offensive patches
+- New source has recode-devel buildreq
+- Remove debian fortunes which are included in new source
+
 * Sat Nov 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.0-25
 - Recreate .dat files at build-time to fix x86_64 fedora.us bug #2279.
 - Use %%CookieDir everywhere.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:20:06 -0000	1.3
+++ sources	17 Mar 2005 23:40:55 -0000	1.4
@@ -1,6 +1,6 @@
+f208805b3b712e32997d7667e0ec52d8  fortune-mod-1.99.1.tar.gz
 50ea110b4a9dd719a410045700760401  bofh-excuses.tar.bz2
 dc2860793725fce93445035b4aa8c812  fortune-hitchhiker.tgz
-81a87a44f9d94b0809dfc2b7b140a379  fortune-mod-9708.tar.gz
 9dd679fee3a8fff17daaf6563fd2cd8f  fortune-tao.tar.gz
 a0f5eb298aa5982aa54571f6e46aa58b  humorixfortunes-1.4.tar.gz
 73d25d1b7cfb9f82376e61fa3d8e58f2  kernelnewbies-fortunes.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:20:06 -0000	1.3
+++ .cvsignore	17 Mar 2005 23:40:55 -0000	1.4
@@ -1,6 +1,6 @@
+fortune-mod-1.99.1.tar.gz
 bofh-excuses.tar.bz2
 fortune-hitchhiker.tgz
-fortune-mod-9708.tar.gz
 fortune-tao.tar.gz
 humorixfortunes-1.4.tar.gz
 kernelnewbies-fortunes.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 18 03:02:18 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 22:02:18 -0500
Subject: devel/gpgme03 gpgme-0.3.16-macro.patch, NONE,
	1.1 gpgme-0.3.16-relocate.patch, NONE, 1.1 gpgme03.spec, 1.8, 1.9
Message-ID: <200503180302.j2I32ItV009138@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gpgme03
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9120

Modified Files:
	gpgme03.spec 
Added Files:
	gpgme-0.3.16-macro.patch gpgme-0.3.16-relocate.patch 
Log Message:
* Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.3.16-8
- Fix build for FC4.
- Remove conflict with gpgme packages (relocate files in -devel
  package, rename .info file and rename macro in .m4 file).
  This is not as clean as I wanted it to be. But other -devel
  packages in FC pollute the linker's search path with leading
  -L%_libdir options, which makes parallel installation of multiple
  library versions unnecessarily complicated.



gpgme-0.3.16-macro.patch:

--- NEW FILE gpgme-0.3.16-macro.patch ---
diff -Nur gpgme-0.3.16-orig/gpgme/ath.c gpgme-0.3.16/gpgme/ath.c
--- gpgme-0.3.16-orig/gpgme/ath.c	2002-09-20 12:44:22.000000000 +0200
+++ gpgme-0.3.16/gpgme/ath.c	2005-03-18 03:29:24.000000000 +0100
@@ -108,7 +108,7 @@
 ath_read (int fd, void *buf, size_t nbytes)
 {
   if (ath_ops && ath_ops->read)
-    return ath_ops->read (fd, buf, nbytes);
+    return (ath_ops->read) (fd, buf, nbytes);
   else
     return read (fd, buf, nbytes);
 }

gpgme-0.3.16-relocate.patch:

--- NEW FILE gpgme-0.3.16-relocate.patch ---
diff -Nur gpgme-0.3.16-orig/gpgme/gpgme.m4 gpgme-0.3.16/gpgme/gpgme.m4
--- gpgme-0.3.16-orig/gpgme/gpgme.m4	2002-08-23 21:48:30.000000000 +0200
+++ gpgme-0.3.16/gpgme/gpgme.m4	2005-03-18 03:42:55.000000000 +0100
@@ -6,7 +6,7 @@
 dnl               [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS
 dnl
-AC_DEFUN([AM_PATH_GPGME],
+AC_DEFUN([AM_PATH_GPGME03],
 [ AC_ARG_WITH(gpgme-prefix,
             AC_HELP_STRING([--with-gpgme-prefix=PFX],
                            [prefix where GPGME is installed (optional)]),


Index: gpgme03.spec
===================================================================
RCS file: /cvs/extras/devel/gpgme03/gpgme03.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gpgme03.spec	3 Mar 2005 21:26:03 -0000	1.8
+++ gpgme03.spec	18 Mar 2005 03:02:16 -0000	1.9
@@ -1,12 +1,17 @@
+# For partial relocation of files to avoid conflict with gpgme package.
+%define rootprefix	%{_libdir}/gpgme03
+
 Summary:        GnuPG Made Easy interface library
 Name:           gpgme03
 Version:        0.3.16
-Release:        7
+Release:        8
 License:        GPL
 Group:          Applications/System
 Source:         ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-0.3.16.tar.gz
 Patch:          gpgme-0.3.16-select.patch
 Patch1:         gpgme-0.3.16-underquoted.patch
+Patch2:         gpgme-0.3.16-macro.patch
+Patch3:         gpgme-0.3.16-relocate.patch
 URL:            http://www.gnupg.org/related_software/gpgme/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gnupg >= 1.2.0
@@ -23,7 +28,6 @@
 Requires:       %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
-Conflicts:      gpgme-devel
 
 %description    devel
 Static library, object and header files for GnuPG Made Easy (GPGME).
@@ -33,10 +37,15 @@
 %setup -q -n gpgme-%{version}
 %patch -p1 -b .select
 %patch1 -p1 -b .underquoted
+%patch2 -p1 -b .macro
+%patch3 -p1 -b .relocate
 
 
 %build
-%configure --with-pth=no --without-gpgsm
+%configure --with-pth=no --without-gpgsm \
+    --bindir=%{rootprefix}/bin \
+    --includedir=%{rootprefix}/include \
+    --libdir=%{rootprefix}/lib
 make %{?_smp_mflags}
 
 
@@ -45,6 +54,16 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/*.la}
 
+# Relocation and renaming:
+mv $RPM_BUILD_ROOT%{_datadir}/info/gpgme{.info,03.info}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme.so.* $RPM_BUILD_ROOT%{_libdir}
+# Keep run-time libs in original libdir and link build-time lib to there.
+rm -f  $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme{.so,.la}
+ln -s %{_libdir}/libgpgme.so.6 $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme.so
+ln -s %{_libdir}/libgpgme.so.6 $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme03.so
+sed -i 's!lgpgme!lgpgme03!' $RPM_BUILD_ROOT%{rootprefix}/bin/gpgme-config
+
 
 %check || :
 make check
@@ -74,15 +93,24 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/gpgme-config
-%{_includedir}/gpgme.h
-%{_libdir}/libgpgme.a
-%{_libdir}/libgpgme.so
+%{rootprefix}/bin/gpgme-config
+%{rootprefix}/include/gpgme.h
+%{rootprefix}/lib/libgpgme.a
+%{rootprefix}/lib/libgpgme.so
 %{_datadir}/aclocal/gpgme.m4
-%{_infodir}/gpgme.info*
+%{_infodir}/gpgme03.info*
 
 
 %changelog
+* Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.3.16-8
+- Fix build for FC4.
+- Remove conflict with gpgme packages (relocate files in -devel
+  package, rename .info file and rename macro in .m4 file).
+  This is not as clean as I wanted it to be. But other -devel
+  packages in FC pollute the linker's search path with leading
+  -L%_libdir options, which makes parallel installation of multiple
+  library versions unnecessarily complicated.
+
 * Sun Jan 16 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.3.16-7
 - Disable GPGSM, remove /usr/bin/gpgsm dependency.
   None of our GPGME 0.3.x API users need this.



From fedora-extras-commits at redhat.com  Fri Mar 18 03:03:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 22:03:38 -0500
Subject: devel/sylpheed-claws sylpheed-claws.spec,1.6,1.7
Message-ID: <200503180303.j2I33ciB009194@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/sylpheed-claws
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9180

Modified Files:
	sylpheed-claws.spec 
Log Message:
* Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.1-3
- Set --with-gpgme-prefix to use relocated gpgme03 package contents.
- BR startup-notification-devel




Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/sylpheed-claws.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sylpheed-claws.spec	5 Mar 2005 19:28:28 -0000	1.6
+++ sylpheed-claws.spec	18 Mar 2005 03:03:36 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name:           sylpheed-claws
 Version:        1.0.1
-Release:        2
+Release:        3
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
@@ -23,8 +23,8 @@
 BuildRequires:  pilot-link-devel
 BuildRequires:  gdk-pixbuf-devel
 BuildRequires:  clamav-devel
-BuildRequires:  gnupg >= 1.2.1, gpgme03-devel >= 0.3.12
-BuildRequires:  desktop-file-utils
+BuildRequires:  gnupg >= 1.2.1, gpgme03-devel >= 0.3.16-8
+BuildRequires:  desktop-file-utils startup-notification-devel
 BuildRequires:  pkgconfig
 Requires:  spamassassin
 Requires:  dillo
@@ -46,7 +46,7 @@
 for development with %{name}.
 
 %prep
-%setup
+%setup -q
 
 %build
 %if %openssl_pc
@@ -61,6 +61,7 @@
            --enable-aspell \
 %endif
            --disable-dependency-tracking \
+           --with-gpgme-prefix=%{_libdir}/gpgme03 \
            --program-suffix="-claws"
 
 %{__make} %{?_smp_mflags}
@@ -111,6 +112,10 @@
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 
 %changelog
+* Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.1-3
+- Set --with-gpgme-prefix to use relocated gpgme03 package contents.
+- BR startup-notification-devel
+
 * Sat Mar 05 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.0.1-2
 - fixed some sylpheed/sylpheed-claws



From fedora-extras-commits at redhat.com  Fri Mar 18 03:08:17 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 22:08:17 -0500
Subject: devel/gpgme03 gpgme03.spec,1.9,1.10
Message-ID: <200503180308.j2I38H7V009294@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gpgme03
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9287

Modified Files:
	gpgme03.spec 
Log Message:
Add newly created unowned directories to files section.


Index: gpgme03.spec
===================================================================
RCS file: /cvs/extras/devel/gpgme03/gpgme03.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gpgme03.spec	18 Mar 2005 03:02:16 -0000	1.9
+++ gpgme03.spec	18 Mar 2005 03:08:15 -0000	1.10
@@ -93,8 +93,12 @@
 
 %files devel
 %defattr(-,root,root,-)
+%dir %{rootprefix}
+%dir %{rootprefix}/bin
 %{rootprefix}/bin/gpgme-config
+%dir %{rootprefix}/include
 %{rootprefix}/include/gpgme.h
+%dir %{rootprefix}/lib
 %{rootprefix}/lib/libgpgme.a
 %{rootprefix}/lib/libgpgme.so
 %{_datadir}/aclocal/gpgme.m4



From fedora-extras-commits at redhat.com  Fri Mar 18 03:11:33 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 22:11:33 -0500
Subject: devel/gpgme03 gpgme03.spec,1.10,1.11
Message-ID: <200503180311.j2I3BXr3009385@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gpgme03
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9375

Modified Files:
	gpgme03.spec 
Log Message:
Add missing library link to files section.


Index: gpgme03.spec
===================================================================
RCS file: /cvs/extras/devel/gpgme03/gpgme03.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gpgme03.spec	18 Mar 2005 03:08:15 -0000	1.10
+++ gpgme03.spec	18 Mar 2005 03:11:31 -0000	1.11
@@ -100,7 +100,7 @@
 %{rootprefix}/include/gpgme.h
 %dir %{rootprefix}/lib
 %{rootprefix}/lib/libgpgme.a
-%{rootprefix}/lib/libgpgme.so
+%{rootprefix}/lib/libgpgme*.so
 %{_datadir}/aclocal/gpgme.m4
 %{_infodir}/gpgme03.info*
 



From fedora-extras-commits at redhat.com  Fri Mar 18 03:16:49 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 22:16:49 -0500
Subject: devel/gpgme03 gpgme03.spec,1.11,1.12
Message-ID: <200503180316.j2I3GnhU009504@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gpgme03
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9495

Modified Files:
	gpgme03.spec 
Log Message:
Also add a link for the static library just to be complete.


Index: gpgme03.spec
===================================================================
RCS file: /cvs/extras/devel/gpgme03/gpgme03.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gpgme03.spec	18 Mar 2005 03:11:31 -0000	1.11
+++ gpgme03.spec	18 Mar 2005 03:16:47 -0000	1.12
@@ -60,6 +60,7 @@
 mv $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme.so.* $RPM_BUILD_ROOT%{_libdir}
 # Keep run-time libs in original libdir and link build-time lib to there.
 rm -f  $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme{.so,.la}
+ln -s libgpgme.a $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme03.a
 ln -s %{_libdir}/libgpgme.so.6 $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme.so
 ln -s %{_libdir}/libgpgme.so.6 $RPM_BUILD_ROOT%{rootprefix}/lib/libgpgme03.so
 sed -i 's!lgpgme!lgpgme03!' $RPM_BUILD_ROOT%{rootprefix}/bin/gpgme-config
@@ -99,7 +100,7 @@
 %dir %{rootprefix}/include
 %{rootprefix}/include/gpgme.h
 %dir %{rootprefix}/lib
-%{rootprefix}/lib/libgpgme.a
+%{rootprefix}/lib/libgpgme*.a
 %{rootprefix}/lib/libgpgme*.so
 %{_datadir}/aclocal/gpgme.m4
 %{_infodir}/gpgme03.info*



From bugs.michael at gmx.net  Fri Mar 18 03:53:51 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 18 Mar 2005 04:53:51 +0100
Subject: rpms/python-protocols/devel python-protocols.spec, NONE, 1.1
 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503152049.j2FKnpL9023691@cvs-int.fedora.redhat.com>
References: <200503152049.j2FKnpL9023691@cvs-int.fedora.redhat.com>
Message-ID: <20050318045351.5c5cf82d.bugs.michael@gmx.net>

On Tue, 15 Mar 2005 15:49:51 -0500, Shahms King (shahms) wrote:

> Author: shahms
> 
> Update of /cvs/extras/rpms/python-protocols/devel

> --- NEW FILE python-protocols.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)")}
>
> %{python_sitelib}/protocols/*.so

At least this package and python-simpletal will not build on multilib
platforms, such as x86_64, since they don't install into python_sitearch.


-- 
Fedora Core release Rawhide (Rawhide) - Linux 2.6.11-1.1177_FC4
loadavg: 2.58 3.95 3.75



From fedora-extras-commits at redhat.com  Fri Mar 18 04:18:43 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 17 Mar 2005 23:18:43 -0500
Subject: devel/sylpheed-claws sylpheed-claws.spec,1.7,1.8
Message-ID: <200503180418.j2I4IhPW011394@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/sylpheed-claws
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11386

Modified Files:
	sylpheed-claws.spec 
Log Message:
sylpheed-claws.spec


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/sylpheed-claws.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sylpheed-claws.spec	18 Mar 2005 03:03:36 -0000	1.7
+++ sylpheed-claws.spec	18 Mar 2005 04:18:41 -0000	1.8
@@ -98,7 +98,8 @@
 %{_bindir}/*
 %dir %{_libdir}/sylpheed-claws/
 %dir %{_libdir}/sylpheed-claws/plugins/
-%{_libdir}/sylpheed-claws/plugins/*
+%{_libdir}/sylpheed-claws/plugins/*.so
+%exclude %{_libdir}/sylpheed-claws/plugins/*.a
 %{_datadir}/pixmaps/*
 %dir %{_datadir}/sylpheed-claws/
 %{_datadir}/sylpheed-claws/*
@@ -113,6 +114,7 @@
 
 %changelog
 * Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.1-3
+- Don't include static libs in plugin directory.
 - Set --with-gpgme-prefix to use relocated gpgme03 package contents.
 - BR startup-notification-devel
 



From fedora-extras-commits at redhat.com  Fri Mar 18 07:52:52 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 18 Mar 2005 02:52:52 -0500
Subject: rpms/iiimf-le-simplehangul - New directory
Message-ID: <200503180752.j2I7qqJk017529@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17516/iiimf-le-simplehangul

Log Message:
Directory /cvs/extras/rpms/iiimf-le-simplehangul added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 07:52:52 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 18 Mar 2005 02:52:52 -0500
Subject: rpms/iiimf-le-simplehangul/devel - New directory
Message-ID: <200503180752.j2I7qqMp017532@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17516/iiimf-le-simplehangul/devel

Log Message:
Directory /cvs/extras/rpms/iiimf-le-simplehangul/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 07:53:12 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 18 Mar 2005 02:53:12 -0500
Subject: rpms/iiimf-le-simplehangul Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503180753.j2I7rCsp017613@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17598

Added Files:
	Makefile import.log 
Log Message:
Setup of module iiimf-le-simplehangul


--- NEW FILE Makefile ---
# Top level Makefile for module iiimf-le-simplehangul
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 18 07:53:12 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 18 Mar 2005 02:53:12 -0500
Subject: rpms/iiimf-le-simplehangul/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200503180753.j2I7rCEg017616@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17598/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module iiimf-le-simplehangul


--- 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 Mar 18 07:53:51 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 18 Mar 2005 02:53:51 -0500
Subject: rpms/iiimf-le-simplehangul import.log,1.1,1.2
Message-ID: <200503180753.j2I7rp4S017759@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17744

Modified Files:
	import.log 
Log Message:
auto-import iiimf-le-simplehangul-0.1.1-2 on branch devel from iiimf-le-simplehangul-0.1.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/iiimf-le-simplehangul/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Mar 2005 07:53:10 -0000	1.1
+++ import.log	18 Mar 2005 07:53:49 -0000	1.2
@@ -0,0 +1 @@
+iiimf-le-simplehangul-0_1_1-2:HEAD:iiimf-le-simplehangul-0.1.1-2.src.rpm:1111132414



From fedora-extras-commits at redhat.com  Fri Mar 18 07:53:51 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 18 Mar 2005 02:53:51 -0500
Subject: rpms/iiimf-le-simplehangul/devel iiimf-le-simplehangul.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503180753.j2I7rpbW017763@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17744/devel

Modified Files:
	.cvsignore sources 
Added Files:
	iiimf-le-simplehangul.spec 
Log Message:
auto-import iiimf-le-simplehangul-0.1.1-2 on branch devel from iiimf-le-simplehangul-0.1.1-2.src.rpm


--- NEW FILE iiimf-le-simplehangul.spec ---
%define im_dir %{_libdir}/im

Summary: Romanized Korean Hangul language engine for IIIMF
Name: iiimf-le-simplehangul
Version: 0.1.1
Release: 2
License: GPL
Source: %{name}-%{version}.tar.bz2
URL: http://www3.sympatico.ca/d.moser/hangul.html
Group: User Interface/X
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: iiimf-libs-devel

%description
Romanised Korean Hangul language engine for IIIMF
Simple Hangul input with any Western keyboard

%define sendhup %{_bindir}/killall -HUP htt_server >& /dev/null || :
%define instle %{_bindir}/iiimf-le-tools --install %{im_dir}/leif/
%define uninstle %{_bindir}/iiimf-le-tools --remove %{im_dir}/leif/

%prep
rm -rf $RPM_BUILD_ROOT

%setup -q -n %{name}-%{version}

%build
./configure --prefix=%{im_dir}
make  

%install
rm -rf $RPM_BUILD_ROOT
make prefix=$RPM_BUILD_ROOT%{im_dir}
# FIXME: make install should honor $DESTDIR
# so we don't need to install it manually
mkdir -p $RPM_BUILD_ROOT%{im_dir}/leif
install -m 755 src/.libs/simplehangul.so $RPM_BUILD_ROOT%{im_dir}/leif

%clean
rm -rf $RPM_BUILD_ROOT

%preun
if [ "$1" = 0 ]; then
  %{uninstle}chinput.so >& /dev/null || :
fi

%postun
if [ "$1" = 0 ]; then
  %{sendhup}
fi

%files
%defattr(-,root,root)
%{im_dir}/*

%changelog
* Thu Mar 17 2005 Warren Togami <wtogami at redhat.com> 0.1.1-2
- minor spec changes
- copy preun and postun scripts from iiimf-le-chinput

* Mon Jan 10 2005 Derrick Moser <derrick_moser at yahoo.com> 0.1.1-1
- clean-ups

* Wed Sep 08 2004 Warren Togami <wtogami at redhat.com> 0.0-1
- ugly hacked up package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/iiimf-le-simplehangul/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Mar 2005 07:53:10 -0000	1.1
+++ .cvsignore	18 Mar 2005 07:53:49 -0000	1.2
@@ -0,0 +1 @@
+iiimf-le-simplehangul-0.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/iiimf-le-simplehangul/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Mar 2005 07:53:10 -0000	1.1
+++ sources	18 Mar 2005 07:53:49 -0000	1.2
@@ -0,0 +1 @@
+7410d1f14e19f58493a51bdb648996b8  iiimf-le-simplehangul-0.1.1.tar.bz2



From wtogami at redhat.com  Fri Mar 18 08:11:49 2005
From: wtogami at redhat.com (Warren Togami)
Date: Thu, 17 Mar 2005 22:11:49 -1000
Subject: APPROVED: iiimf-le-simplehangul
Message-ID: <423A8D45.5040607@redhat.com>

Romanised Korean Hangul language engine for IIIMF
Simple Hangul input with any Western keyboard

Reviewed by: petersen at redhat.com
Maintained by: wtogami at redhat.com



From fedora-extras-commits at redhat.com  Fri Mar 18 08:12:44 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 18 Mar 2005 03:12:44 -0500
Subject: rpms/iiimf-le-simplehangul/FC-3 iiimf-le-simplehangul.spec,1.1,1.2
Message-ID: <200503180812.j2I8Ci8o019081@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19069

Modified Files:
	iiimf-le-simplehangul.spec 
Log Message:
prep FC3 build



Index: iiimf-le-simplehangul.spec
===================================================================
RCS file: /cvs/extras/rpms/iiimf-le-simplehangul/FC-3/iiimf-le-simplehangul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iiimf-le-simplehangul.spec	18 Mar 2005 07:53:49 -0000	1.1
+++ iiimf-le-simplehangul.spec	18 Mar 2005 08:12:42 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Romanized Korean Hangul language engine for IIIMF
 Name: iiimf-le-simplehangul
 Version: 0.1.1
-Release: 2
+Release: 1.FC3
 License: GPL
 Source: %{name}-%{version}.tar.bz2
 URL: http://www3.sympatico.ca/d.moser/hangul.html
@@ -54,7 +54,7 @@
 %{im_dir}/*
 
 %changelog
-* Thu Mar 17 2005 Warren Togami <wtogami at redhat.com> 0.1.1-2
+* Thu Mar 17 2005 Warren Togami <wtogami at redhat.com> 0.1.1-1.FC3
 - minor spec changes
 - copy preun and postun scripts from iiimf-le-chinput
 



From fedora-extras-commits at redhat.com  Fri Mar 18 09:13:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 04:13:50 -0500
Subject: devel/libassuan libassuan-macro.patch, NONE, 1.1 libassuan.spec, 1.5,
	1.6
Message-ID: <200503180913.j2I9Do3L021515@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/libassuan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21505

Modified Files:
	libassuan.spec 
Added Files:
	libassuan-macro.patch 
Log Message:
Fix FC4 build and source URLs.

libassuan-macro.patch:

--- NEW FILE libassuan-macro.patch ---
--- src/assuan-buffer.c~	2004-12-07 11:29:58.000000000 +0200
+++ src/assuan-buffer.c	2005-03-18 01:07:54.000000000 +0200
@@ -61,7 +61,7 @@
   *r_nread = 0;
   while (nleft > 0)
     {
-      ssize_t n = ctx->io->read (ctx, buf, nleft);
+      ssize_t n = (ctx->io->read) (ctx, buf, nleft);
 
       if (n < 0)
         {


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/devel/libassuan/libassuan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libassuan.spec	5 Mar 2005 21:10:22 -0000	1.5
+++ libassuan.spec	18 Mar 2005 09:13:48 -0000	1.6
@@ -1,9 +1,10 @@
 Summary: GnuPG IPC library
 Name:    libassuan
 Version: 0.6.9
-Release: 2%{?dist_tag}
-Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz
-Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig
+Release: 3%{?dist_tag}
+Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz
+Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig
+Patch0:  %{name}-macro.patch
 URL:     http://www.gnupg.org/
 License: GPL
 Group:   System Environment/Libraries
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -78,6 +80,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-3
+- Fix FC4 build and source URLs.
+
 * Thu Feb  3 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.6.9-2
 - Build PIC to fix x86_64 linking.
 



From fedora-extras-commits at redhat.com  Fri Mar 18 09:23:20 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 04:23:20 -0500
Subject: devel/opensc opensc-lvalue.patch,NONE,1.1 opensc.spec,1.4,1.5
Message-ID: <200503180923.j2I9NKLN021699@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/opensc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21693

Modified Files:
	opensc.spec 
Added Files:
	opensc-lvalue.patch 
Log Message:
Fix FC4 build, opensc-pam -> pam_opensc.

opensc-lvalue.patch:

--- NEW FILE opensc-lvalue.patch ---
Index: src/pam/pam_support.c
===================================================================
--- src/pam/pam_support.c	(revision 2139)
+++ src/pam/pam_support.c	(revision 2140)
@@ -205,7 +205,8 @@
 
 static void _cleanup(pam_handle_t * pamh, void *x, int error_status)
 {
-	_pam_delete((char *) x);
+	char *y = (char *) x;
+	_pam_delete(y);
 }
 
 /* ************************************************************** *


Index: opensc.spec
===================================================================
RCS file: /cvs/extras/devel/opensc/opensc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- opensc.spec	5 Mar 2005 21:10:23 -0000	1.4
+++ opensc.spec	18 Mar 2005 09:23:18 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name:           opensc
 Version:        0.9.4
-Release:        2
+Release:        3
 Summary:        OpenSC SmartCard library and applications
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@
 URL:            http://www.opensc.org/
 Source0:        http://www.opensc.org/files/opensc-0.9.4.tar.gz
 Patch0:         %{name}-build.patch
+Patch1:         %{name}-lvalue.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.1.1 flex pam-devel openldap-devel
@@ -41,20 +42,21 @@
 plugins that will generate digital signatures using facilities on
 PKI-capable smartcards.
 
-%package        pam
+%package     -n pam_%{name}
 Summary:        OpenSC pluggable authentication module
 Group:          System Environment/Base
-Provides:       pam_opensc = %{version}-%{release}
+Provides:       %{name}-pam = %{version}-%{release}
+Obsoletes:      %{name}-pam < 0.9.4-3
 Requires:       %{name} = %{version}-%{release}
 
-%description    pam
+%description -n pam_%{name}
 OpenSC pluggable authentication module implementing smart card support.
 
 %package        devel
 Summary:        OpenSC development files
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release} pkgconfig
-Requires:       %{name}-pam = %{version}-%{release}
+Requires:       pam_%{name} = %{version}-%{release}
 
 %description    devel
 OpenSC development files.
@@ -63,6 +65,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 cp -p src/pkcs15init/README ./README.pkcs15init
 cp -p src/scconf/README.scconf .
 for file in docs/*.1 ; do
@@ -105,9 +108,9 @@
 
 
 %post -p /sbin/ldconfig
-%post pam -p /sbin/ldconfig
+%post -n pam_%{name} -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
-%postun pam -p /sbin/ldconfig
+%postun -n pam_%{name} -p /sbin/ldconfig
 
 
 %files
@@ -147,7 +150,7 @@
 %{plugindir}/opensc-signer.so
 %{_libdir}/opensc/opensc-signer.so
 
-%files pam
+%files -n pam_%{name}
 %defattr(-,root,root,-)
 %doc PAM_README
 /%{_lib}/security/pam_opensc.so
@@ -179,6 +182,10 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.4-3
+- Fix FC4 build.
+- Rename opensc-pam to pam_opensc per package naming guidelines.
+
 * Wed Feb  9 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.4-2
 - Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms.
 - Use --with-plugin-dir instead of --with-plugin-path (fixes x86_64).



From fedora-extras-commits at redhat.com  Fri Mar 18 09:27:56 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 04:27:56 -0500
Subject: devel/cabextract cabextract-macro.patch, NONE, 1.1 cabextract.spec,
	1.6, 1.7
Message-ID: <200503180927.j2I9RumE021818@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/cabextract
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21812

Modified Files:
	cabextract.spec 
Added Files:
	cabextract-macro.patch 
Log Message:
Fix FC4 build.

cabextract-macro.patch:

--- NEW FILE cabextract-macro.patch ---
diff -NarU1 cabextract-1.1.orig/mspack/cabd.c cabextract-1.1/mspack/cabd.c
--- cabextract-1.1.orig/mspack/cabd.c	2004-10-18 11:10:15.000000000 +0300
+++ cabextract-1.1/mspack/cabd.c	2005-03-18 01:24:26.000000000 +0200
@@ -331,3 +331,3 @@
   /* read in the CFHEADER */
-  if (sys->read(fh, &buf[0], cfhead_SIZEOF) != cfhead_SIZEOF) {
+  if ((sys->read)(fh, &buf[0], cfhead_SIZEOF) != cfhead_SIZEOF) {
     return MSPACK_ERR_READ;
@@ -367,3 +367,3 @@
   if (cab->base.flags & cfheadRESERVE_PRESENT) {
-    if (sys->read(fh, &buf[0], cfheadext_SIZEOF) != cfheadext_SIZEOF) {
+    if ((sys->read)(fh, &buf[0], cfheadext_SIZEOF) != cfheadext_SIZEOF) {
       return MSPACK_ERR_READ;
@@ -405,3 +405,3 @@
   for (i = 0; i < num_folders; i++) {
-    if (sys->read(fh, &buf[0], cffold_SIZEOF) != cffold_SIZEOF) {
+    if ((sys->read)(fh, &buf[0], cffold_SIZEOF) != cffold_SIZEOF) {
       return MSPACK_ERR_READ;
@@ -435,3 +435,3 @@
   for (i = 0; i < num_files; i++) {
-    if (sys->read(fh, &buf[0], cffile_SIZEOF) != cffile_SIZEOF) {
+    if ((sys->read)(fh, &buf[0], cffile_SIZEOF) != cffile_SIZEOF) {
       return MSPACK_ERR_READ;
@@ -528,3 +528,3 @@
   /* read up to 256 bytes */
-  len = sys->read(fh, &buf[0], 256);
+  len = (sys->read)(fh, &buf[0], 256);
 
@@ -641,3 +641,3 @@
     /* fill the search buffer with data from disk */
-    if (sys->read(fh, &buf[0], length) != length) {
+    if ((sys->read)(fh, &buf[0], length) != length) {
       return MSPACK_ERR_READ;
@@ -1213,3 +1213,3 @@
     /* read the block header */
-    if (sys->read(d->infh, &hdr[0], cfdata_SIZEOF) != cfdata_SIZEOF) {
+    if ((sys->read)(d->infh, &hdr[0], cfdata_SIZEOF) != cfdata_SIZEOF) {
       return MSPACK_ERR_READ;
@@ -1239,3 +1239,3 @@
     /* read the block data */
-    if (sys->read(d->infh, d->i_end, len) != len) {
+    if ((sys->read)(d->infh, d->i_end, len) != len) {
       return MSPACK_ERR_READ;
@@ -1353,3 +1353,3 @@
     run = (bytes > s->bufsize) ? s->bufsize : (int) bytes;
-    if (s->sys->read(s->i, &s->buf[0], run) != run) return MSPACK_ERR_READ;
+    if ((s->sys->read)(s->i, &s->buf[0], run) != run) return MSPACK_ERR_READ;
     if (s->sys->write(s->o, &s->buf[0], run) != run) return MSPACK_ERR_WRITE;
diff -NarU1 cabextract-1.1.orig/mspack/lzxd.c cabextract-1.1/mspack/lzxd.c
--- cabextract-1.1.orig/mspack/lzxd.c	2004-10-18 11:10:15.000000000 +0300
+++ cabextract-1.1/mspack/lzxd.c	2005-03-18 01:23:01.000000000 +0200
@@ -128,3 +128,3 @@
 static int lzxd_read_input(struct lzxd_stream *lzx) {
-  int read = lzx->sys->read(lzx->input, &lzx->inbuf[0], (int)lzx->inbuf_size);
+  int read = (lzx->sys->read)(lzx->input, &lzx->inbuf[0], (int)lzx->inbuf_size);
   if (read < 0) return lzx->error = MSPACK_ERR_READ;
diff -NarU1 cabextract-1.1.orig/mspack/mszipd.c cabextract-1.1/mspack/mszipd.c
--- cabextract-1.1.orig/mspack/mszipd.c	2004-10-18 11:10:15.000000000 +0300
+++ cabextract-1.1/mspack/mszipd.c	2005-03-18 01:23:59.000000000 +0200
@@ -91,3 +91,3 @@
 static int zipd_read_input(struct mszipd_stream *zip) {
-  int read = zip->sys->read(zip->input, &zip->inbuf[0], (int)zip->inbuf_size);
+  int read = (zip->sys->read)(zip->input, &zip->inbuf[0], (int)zip->inbuf_size);
   if (read < 0) return zip->error = MSPACK_ERR_READ;
diff -NarU1 cabextract-1.1.orig/mspack/qtmd.c cabextract-1.1/mspack/qtmd.c
--- cabextract-1.1.orig/mspack/qtmd.c	2004-10-18 11:10:15.000000000 +0300
+++ cabextract-1.1/mspack/qtmd.c	2005-03-18 01:25:06.000000000 +0200
@@ -91,3 +91,3 @@
 static int qtmd_read_input(struct qtmd_stream *qtm) {
-  int read = qtm->sys->read(qtm->input, &qtm->inbuf[0], (int)qtm->inbuf_size);
+  int read = (qtm->sys->read)(qtm->input, &qtm->inbuf[0], (int)qtm->inbuf_size);
   if (read < 0) return qtm->error = MSPACK_ERR_READ;


Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/devel/cabextract/cabextract.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cabextract.spec	25 Nov 2004 21:16:20 -0000	1.6
+++ cabextract.spec	18 Mar 2005 09:27:54 -0000	1.7
@@ -1,12 +1,13 @@
 Name:           cabextract
 Version:        1.1
-Release:        2
-Summary:        A Microsoft Cabinet file extractor
+Release:        3
+Summary:        Microsoft Cabinet file extractor
 
 Group:          Applications/Archiving
 License:        GPL
-URL:            http://www.kyz.uklinux.net/cabextract.php3
+URL:            http://www.kyz.uklinux.net/cabextract.php
 Source:         http://www.kyz.uklinux.net/downloads/cabextract-%{version}.tar.gz
+Patch0:         %{name}-macro.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -41,6 +43,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.1-3
+- Fix FC4 build.
+
 * Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 1.1-2
 - Update to 1.1.
 - Bump release to provide Extras upgrade path.



From fedora-extras-commits at redhat.com  Fri Mar 18 10:25:22 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 18 Mar 2005 05:25:22 -0500
Subject: devel/kphone kphone-4.1.0-po-hacks.patch, NONE,
	1.1 kphone-4.1.0-po-hacks.diff, 1.1, NONE
Message-ID: <200503181025.j2IAPM5x023788@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23782

Added Files:
	kphone-4.1.0-po-hacks.patch 
Removed Files:
	kphone-4.1.0-po-hacks.diff 
Log Message:
Filename fix

kphone-4.1.0-po-hacks.patch:

--- NEW FILE kphone-4.1.0-po-hacks.patch ---
--- kphone-4.1.0.orig/po/Makefile.in	2004-10-19 10:24:16.000000000 +0200
+++ kphone/po/Makefile.in	2005-03-17 08:56:38.165328978 +0100
@@ -4,11 +4,11 @@
 PO_DIR=$(SHAREDIR)/translations/
 
 install:
-	install --mode=0755 --directory $(PO_DIR)
+	install --mode=0755 --directory $(DESTDIR)$(PO_DIR)
 	for T in *.qm; do \
-		install --mode=0644 $$T $(PO_DIR); \
+		install --mode=0644 $$T $(DESTDIR)$(PO_DIR); \
 	done
 
 uninstall:
-	rm -r $(PO_DIR)
+	rm -r $(DESTDIR)$(PO_DIR)
 


--- kphone-4.1.0-po-hacks.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar 18 10:46:23 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 05:46:23 -0500
Subject: devel/gnome-applet-netmon - New directory
Message-ID: <200503181046.j2IAkNvr024515@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gnome-applet-netmon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24507/gnome-applet-netmon

Log Message:
Directory /cvs/extras/devel/gnome-applet-netmon added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 10:48:32 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 05:48:32 -0500
Subject: devel/gnome-applet-netmon Makefile,NONE,1.1
Message-ID: <200503181048.j2IAmWju024573@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gnome-applet-netmon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24567

Added Files:
	Makefile 
Log Message:
 


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'



From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net  Fri Mar 18 10:51:46 2005
From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou)
Date: Fri, 18 Mar 2005 11:51:46 +0100
Subject: APPROVED: bmp
In-Reply-To: <20050317141328.2be51de0.bugs.michael@gmx.net>
References: <20050317141328.2be51de0.bugs.michael@gmx.net>
Message-ID: <20050318115146.2dbeffa8@python2>

Michael Schwendt wrote :

> Name: bmp
> Version: 0.9.7-4
> 
> BMP (Beep Media Player) is a media player that currently uses a skinned
> user interface based on Winamp 2.x skins. It is based on ("forked off")
> XMMS.
> 
> [...]
> 
> Imported package approved by mschwendt for adding to Fedora Extras.
> Ralf Ertzinger will be responsible for this package.

After launching it for the first time, I saw it appear with a Bluecurve
look, but I then went into "Preferences", where in "Appearance" I only see
one skin called "Default" which is not the Bluecurve one, and when I went
out of the prefs, the appearance changed to that one. I can't find any way
to switch back to the Bluecurve look, so it seems like something in the
way the new default is set needs fixing.

Matthias

-- 
Clean custom Red Hat Linux rpm packages : http://freshrpms.net/
Fedora Core release 3 (Heidelberg) - Linux kernel 2.6.10-1.766_FC3.radeon
Load : 0.82 0.85 0.71



From fedora-extras-commits at redhat.com  Fri Mar 18 10:53:06 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 05:53:06 -0500
Subject: rpms/gnome-applet-netmon - New directory
Message-ID: <200503181053.j2IAr6BS024719@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24711/gnome-applet-netmon

Log Message:
Directory /cvs/extras/rpms/gnome-applet-netmon added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 10:53:19 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 05:53:19 -0500
Subject: rpms/gnome-applet-netmon/devel - New directory
Message-ID: <200503181053.j2IArJF5024749@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24741/gnome-applet-netmon/devel

Log Message:
Directory /cvs/extras/rpms/gnome-applet-netmon/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 10:53:52 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 05:53:52 -0500
Subject: rpms/gnome-applet-netmon Makefile,NONE,1.1
Message-ID: <200503181053.j2IArqUV024795@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24786/gnome-applet-netmon

Added Files:
	Makefile 
Log Message:
 


--- NEW FILE Makefile ---
# Top level Makefile for module gqview
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From fedora-extras-commits at redhat.com  Fri Mar 18 10:58:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 05:58:55 -0500
Subject: rpms/gnome-applet-netmon/devel Makefile,NONE,1.1
Message-ID: <200503181058.j2IAwtWX024988@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24979/devel

Added Files:
	Makefile 
Log Message:
 


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'



From fedora-extras-commits at redhat.com  Fri Mar 18 11:05:28 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 06:05:28 -0500
Subject: rpms/gnome-applet-netmon Makefile,1.1,1.2
Message-ID: <200503181105.j2IB5SfH026006@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26000

Modified Files:
	Makefile 
Log Message:
fixed broken/partial automated import


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-netmon/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	18 Mar 2005 10:53:50 -0000	1.1
+++ Makefile	18 Mar 2005 11:05:26 -0000	1.2
@@ -1,4 +1,4 @@
-# Top level Makefile for module gqview
+# Top level Makefile for module gnome-applet-netmon
 all : CVS/Root common-update
 	@cvs update
 



From fedora-extras-commits at redhat.com  Fri Mar 18 11:15:57 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 06:15:57 -0500
Subject: devel/gpgme gpgme-1.0.2-macro.patch,NONE,1.1 gpgme.spec,1.7,1.8
Message-ID: <200503181115.j2IBFvsw026280@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/gpgme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26273

Modified Files:
	gpgme.spec 
Added Files:
	gpgme-1.0.2-macro.patch 
Log Message:
Fix FC4 build.

gpgme-1.0.2-macro.patch:

--- NEW FILE gpgme-1.0.2-macro.patch ---
--- gpgme/ath-compat.c~	2004-12-07 23:11:52.000000000 +0200
+++ gpgme/ath-compat.c	2005-03-18 12:54:44.000000000 +0200
@@ -108,7 +108,7 @@
 ath_read (int fd, void *buf, size_t nbytes)
 {
   if (ath_ops && ath_ops->read)
-    return ath_ops->read (fd, buf, nbytes);
+    return (ath_ops->read) (fd, buf, nbytes);
   else
     return read (fd, buf, nbytes);
 }


Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/devel/gpgme/gpgme.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gpgme.spec	3 Mar 2005 21:26:03 -0000	1.7
+++ gpgme.spec	18 Mar 2005 11:15:55 -0000	1.8
@@ -1,12 +1,13 @@
 Name:    gpgme
 Version: 1.0.2
-Release: 1%{?dist_tag}
+Release: 2%{?dist_tag}
 Summary: GnuPG Made Easy - high level crypto API
 License: LGPL
 Group:   Applications/System
 URL:     http://www.gnupg.org/related_software/gpgme/
 Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2.sig
+Patch0:  %{name}-1.0.2-macro.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gnupg >= 1.2.2
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -92,6 +94,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.2-2
+- Fix FC4 build.
+
 * Tue Feb  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.0.2-1
 - LGPL used here, and made summary more explicit.
 - Remove dirmngr dependency (gpgsm interfaces with it).



From bugs.michael at gmx.net  Fri Mar 18 11:16:30 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 18 Mar 2005 12:16:30 +0100
Subject: APPROVED: bmp
In-Reply-To: <20050318115146.2dbeffa8@python2>
References: <20050317141328.2be51de0.bugs.michael@gmx.net>
	<20050318115146.2dbeffa8@python2>
Message-ID: <20050318121630.361716a6.bugs.michael@gmx.net>

On Fri, 18 Mar 2005 11:51:46 +0100, Matthias Saou wrote:

> Michael Schwendt wrote :
> 
> > Name: bmp
> > Version: 0.9.7-4
> > 
> > BMP (Beep Media Player) is a media player that currently uses a skinned
> > user interface based on Winamp 2.x skins. It is based on ("forked off")
> > XMMS.
> > 
> > [...]
> > 
> > Imported package approved by mschwendt for adding to Fedora Extras.
> > Ralf Ertzinger will be responsible for this package.
> 
> After launching it for the first time, I saw it appear with a Bluecurve
> look, but I then went into "Preferences", where in "Appearance" I only see
> one skin called "Default" which is not the Bluecurve one, and when I went
> out of the prefs, the appearance changed to that one. I can't find any way
> to switch back to the Bluecurve look, so it seems like something in the
> way the new default is set needs fixing.

You need to source /etc/profile.d/bmp.sh before trying to access the skins.

Might be better to make that bullet-proof with a patch directly in the
program, though.



From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net  Fri Mar 18 11:25:17 2005
From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou)
Date: Fri, 18 Mar 2005 12:25:17 +0100
Subject: APPROVED: bmp
In-Reply-To: <20050318121630.361716a6.bugs.michael@gmx.net>
References: <20050317141328.2be51de0.bugs.michael@gmx.net>
	<20050318115146.2dbeffa8@python2>
	<20050318121630.361716a6.bugs.michael@gmx.net>
Message-ID: <20050318122517.7f20282d@python2>

Michael Schwendt wrote :

> > After launching it for the first time, I saw it appear with a Bluecurve
> > look, but I then went into "Preferences", where in "Appearance" I only see
> > one skin called "Default" which is not the Bluecurve one, and when I went
> > out of the prefs, the appearance changed to that one. I can't find any way
> > to switch back to the Bluecurve look, so it seems like something in the
> > way the new default is set needs fixing.
> 
> You need to source /etc/profile.d/bmp.sh before trying to access the skins.
> 
> Might be better to make that bullet-proof with a patch directly in the
> program, though.

Ah, indeed. I had just looked quickly at the patch that hardcodes the
default skin in. Well... this is a non-obvious side effect that people who
install then toy with bmp in the same session will see, but it's
definitely not a major issue.

Matthias

-- 
Clean custom Red Hat Linux rpm packages : http://freshrpms.net/
Fedora Core release 3 (Heidelberg) - Linux kernel 2.6.10-1.766_FC3.radeon
Load : 0.26 0.80 0.93



From fedora-extras-commits at redhat.com  Fri Mar 18 12:31:56 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 07:31:56 -0500
Subject: rpms/gnome-applet-netmon/devel gnome-applet-netmon.spec,NONE,1.1
Message-ID: <200503181231.j2ICVu6P028282@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28274

Added Files:
	gnome-applet-netmon.spec 
Log Message:
 



--- NEW FILE gnome-applet-netmon.spec ---
Name: 		gnome-applet-netmon
Version: 	0.4
Release: 	2
Epoch: 		0
Summary: 	GNOME Network Load Applet

Group: 		Applications/Internet
License: 	GPL
URL: 		http://www.demonseed.net/~jp/code/netmon_applet/
Source0: 	http://www.demonseed.net/~jp/code/netmon_applet/netmon_applet-0.4.tar.gz
BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot

Provides: 	netmon_applet
Obsoletes:	netmon_applet

BuildRequires  : GConf2
BuildRequires  : gnome-panel >= 0:2.0.0
BuildRequires  : pkgconfig
BuildRequires  : gtk2-devel >= 0:2.0.0
BuildRequires  : libgnomeui-devel >= 0:2.0.0


%description
This is a simple textual network load monitor for the GNOME panel.
Much of the code comes straight from the excellent program xnetload, by Roland
Smith.  (http://www.xs4all.nl/~rsmith/software/). This version is for Gnome 2.X

%prep
%setup -q -n netmon_applet-%{version}

%build
%configure 				
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install  DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
	%{_sysconfdir}/gconf/schemas/netmon.schemas > /dev/null

%preun
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
        %{_sysconfdir}/gconf/schemas/netmon.schemas >/dev/null

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README TODO
%{_libdir}/bonobo/servers/GNOME_NetmonApplet_Factory.server
%{_bindir}/netmon_applet
%{_sysconfdir}/gconf/schemas/netmon.schemas
%{_datadir}/pixmaps/netmon_applet.png

%changelog
* Wed Feb 23 2005 Gavin Henry <ghenry[AT]suretecsystems.com> - 0:0.4-2
- Changed name to gnome-applet-netmon and rebuilt for
  Fedora Core 3 Extras, plus some specfile maintance.
* Sun Feb 08 2004 Gavin Henry <ghenry[AT]suretecsystems.com> - 0:0.4-0.fdr.1
- Initial build.



From fedora-extras-commits at redhat.com  Fri Mar 18 12:42:28 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 07:42:28 -0500
Subject: rpms/gnome-applet-netmon/devel sources, NONE, 1.1 .cvsignore, NONE,
	1.1
Message-ID: <200503181242.j2ICgS3Q028545@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28539

Added Files:
	sources .cvsignore 
Log Message:
 


--- NEW FILE sources ---
6cdb16b2242b70aeabd9fb804b5477e2  gnome-applet-netmon.spec


--- NEW FILE .cvsignore ---
netmon_applet-0.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 18 12:45:10 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 07:45:10 -0500
Subject: rpms/gnome-applet-netmon/devel sources,1.1,1.2
Message-ID: <200503181245.j2ICjA4w028612@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28605

Modified Files:
	sources 
Log Message:
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-netmon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Mar 2005 12:42:26 -0000	1.1
+++ sources	18 Mar 2005 12:45:08 -0000	1.2
@@ -1 +1 @@
-6cdb16b2242b70aeabd9fb804b5477e2  gnome-applet-netmon.spec
+2681886857dbd9c2e80e10da45464861  netmon_applet-0.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 18 12:50:11 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri, 18 Mar 2005 07:50:11 -0500
Subject: rpms/gnome-applet-netmon/devel
	netmon.schemas.in.vertical_layout.to.false.patch, NONE,
	1.1 gnome-applet-netmon.spec, 1.1, 1.2
Message-ID: <200503181250.j2ICoBhL028768@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/gnome-applet-netmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28756/devel

Modified Files:
	gnome-applet-netmon.spec 
Added Files:
	netmon.schemas.in.vertical_layout.to.false.patch 
Log Message:
auto-import gnome-applet-netmon-0.4-3 on branch devel from gnome-applet-netmon-0.4-3.src.rpm
Initial update

netmon.schemas.in.vertical_layout.to.false.patch:

--- NEW FILE netmon.schemas.in.vertical_layout.to.false.patch ---
--- netmon_applet-0.4/netmon.schemas.in.vertical_layout.to.false	2005-03-18 09:56:55.318006288 +0000
+++ netmon_applet-0.4/netmon.schemas.in	2005-03-18 09:57:06.921242328 +0000
@@ -24,7 +24,7 @@
             <key>/schemas/apps/netmon_applet/prefs/vertical_layout</key>
             <owner>netmon_applet</owner>
             <type>bool</type>
-            <default>true</default>
+            <default>false</default>
             <locale name="C">
                 <short>orientation</short>
                 <long>orientation</long>


Index: gnome-applet-netmon.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-netmon/devel/gnome-applet-netmon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-applet-netmon.spec	18 Mar 2005 12:31:53 -0000	1.1
+++ gnome-applet-netmon.spec	18 Mar 2005 12:50:09 -0000	1.2
@@ -1,20 +1,20 @@
 Name: 		gnome-applet-netmon
 Version: 	0.4
-Release: 	2
-Epoch: 		0
+Release: 	3
 Summary: 	GNOME Network Load Applet
 
 Group: 		Applications/Internet
 License: 	GPL
 URL: 		http://www.demonseed.net/~jp/code/netmon_applet/
 Source0: 	http://www.demonseed.net/~jp/code/netmon_applet/netmon_applet-0.4.tar.gz
+Patch0:     netmon.schemas.in.vertical_layout.to.false.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot
 
-Provides: 	netmon_applet
-Obsoletes:	netmon_applet
+Provides: 	netmon_applet = %{version}-%{release}
+Obsoletes:	netmon_applet < %{version}-%{release}
 
 BuildRequires  : GConf2
-BuildRequires  : gnome-panel >= 0:2.0.0
+BuildRequires  : gnome-panel-devel >= 0:2.0.0
 BuildRequires  : pkgconfig
 BuildRequires  : gtk2-devel >= 0:2.0.0
 BuildRequires  : libgnomeui-devel >= 0:2.0.0
@@ -27,6 +27,7 @@
 
 %prep
 %setup -q -n netmon_applet-%{version}
+%patch0 -p1 -b .vertical_layout.to.false
 
 %build
 %configure 				
@@ -60,8 +61,11 @@
 %{_datadir}/pixmaps/netmon_applet.png
 
 %changelog
-* Wed Feb 23 2005 Gavin Henry <ghenry[AT]suretecsystems.com> - 0:0.4-2
+* Fri Mar 18 2005 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.4-3
+- Updated specfile in accordance to bugzilla bug 2439 and created
+  a patch..
+* Wed Feb 23 2005 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.4-2
 - Changed name to gnome-applet-netmon and rebuilt for
   Fedora Core 3 Extras, plus some specfile maintance.
-* Sun Feb 08 2004 Gavin Henry <ghenry[AT]suretecsystems.com> - 0:0.4-0.fdr.1
+* Sun Feb 08 2004 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.4-0.fdr.1
 - Initial build.



From fedora-extras-commits at redhat.com  Fri Mar 18 13:01:32 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri, 18 Mar 2005 08:01:32 -0500
Subject: rpms/rsnapshot - New directory
Message-ID: <200503181301.j2ID1WAE029837@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rsnapshot
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29830/rsnapshot

Log Message:
Directory /cvs/extras/rpms/rsnapshot added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 13:01:32 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri, 18 Mar 2005 08:01:32 -0500
Subject: rpms/rsnapshot/devel - New directory
Message-ID: <200503181301.j2ID1W8x029840@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rsnapshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29830/rsnapshot/devel

Log Message:
Directory /cvs/extras/rpms/rsnapshot/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 13:02:05 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri, 18 Mar 2005 08:02:05 -0500
Subject: rpms/rsnapshot Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503181302.j2ID25MP029912@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rsnapshot
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29903

Added Files:
	Makefile import.log 
Log Message:
Setup of module rsnapshot


--- NEW FILE Makefile ---
# Top level Makefile for module rsnapshot
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 18 13:02:05 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri, 18 Mar 2005 08:02:05 -0500
Subject: rpms/rsnapshot/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503181302.j2ID25Mi029915@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rsnapshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29903/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rsnapshot


--- 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 Mar 18 13:03:21 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri, 18 Mar 2005 08:03:21 -0500
Subject: rpms/rsnapshot import.log,1.1,1.2
Message-ID: <200503181303.j2ID3LEr030025@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rsnapshot
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30015

Modified Files:
	import.log 
Log Message:
auto-import rsnapshot-1.1.4-0.fdr.2 on branch devel from rsnapshot-1.1.4-0.fdr.2.src.rpm
Initial Import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rsnapshot/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Mar 2005 13:02:02 -0000	1.1
+++ import.log	18 Mar 2005 13:03:18 -0000	1.2
@@ -0,0 +1 @@
+rsnapshot-1_1_4-0_fdr_2:HEAD:rsnapshot-1.1.4-0.fdr.2.src.rpm:1111150918



From fedora-extras-commits at redhat.com  Fri Mar 18 13:03:21 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri, 18 Mar 2005 08:03:21 -0500
Subject: rpms/rsnapshot/devel rsnapshot.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503181303.j2ID3LKg030028@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rsnapshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30015/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rsnapshot.spec 
Log Message:
auto-import rsnapshot-1.1.4-0.fdr.2 on branch devel from rsnapshot-1.1.4-0.fdr.2.src.rpm
Initial Import


--- NEW FILE rsnapshot.spec ---
Name: rsnapshot
Summary: Local and remote filesystem snapshot utility
Version: 1.1.4
Release: 0.fdr.2
BuildArch: noarch
License: GPL
Group: Applications/System
URL: http://www.rsnapshot.org
Source: http://www.rsnapshot.org/downloads/rsnapshot-1.1.4.tar.gz
# Configure script checks for rsync, so we need it in order to build
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl, rsync
Requires: perl, openssh-clients, rsync, /usr/bin/logger, /bin/cp, /bin/rm

%description
This is a remote backup program that uses rsync to take backup snapshots 
of filesystems.  It uses hard links to save space on disk.

%prep
%setup -q
perl -p -i -e "s#/usr/local/bin/rsnapshot#%{_bindir}/rsnapshot#" rsnapshot.1

%build
%configure --with-rsync=%{_bindir}/rsync --with-ssh=%{_bindir}/ssh \
	--with-logger=%{_bindir}/logger --with-cp=/bin/cp \
	--with-rm=/bin/rm --with-perl=%{_bindir}/perl

%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_bindir}
install -m 755 rsnapshot $RPM_BUILD_ROOT%{_bindir}/rsnapshot

install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -m 644 rsnapshot.1 $RPM_BUILD_ROOT%{_mandir}/man1

install -d $RPM_BUILD_ROOT%{_sysconfdir}
install -m 644 rsnapshot.conf.default $RPM_BUILD_ROOT%{_sysconfdir}/rsnapshot.conf.default

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README TODO
%config %{_sysconfdir}/rsnapshot.conf.default
%{_bindir}/rsnapshot
%{_mandir}/man1/rsnapshot.1*

%changelog
* Mon Jun 15 2004 Erik S. LaBianca <erik at ilsw.com>  1.1.4-0.fdr.2
- added rsync to buildrequires

* Mon Jun 7 2004 Erik S. LaBianca <erik at ilsw.com>  1.1.4-0.fdr.1
- updated to latest upstream release

* Fri Jun 4 2004 Erik S. LaBianca <erik at ilsw.com>  1.1.1-0.fdr.3
- changed buildroot to fedora spec
- removed /etc/rsnapshot.conf

* Thu Jun 3 2004 Erik S. LaBianca <erik at ilsw.com>  1.1.1-0.fdr.2
- changed buildroot 
- removed explicit perl dep, added /usr/bin/logger
- changed %configure arguments to macros
- fixed rm -rf locations, removed %verify verbosity, empty %post
- replaced rsnapshot references in man page with correct location
- removed INSTALL from %doc

* Mon Feb 16 2004 Erik S. LaBianca <erik at totalcirculation.com>
- Converted to Fedora packaging guidelines for fedora.us submission
- changed release to 0.fdr.1
- removed AutoReqProv: no
- replaced hardcoded paths with macros

* Thu Jan 15 2004 Nathan Rosenquist <nathan at rsnapshot.org>
- Added "AutoReqProv: no" for SuSE compatibility

* Fri Dec 26 2003 Nathan Rosenquist <nathan at rsnapshot.org>
- Added util-linux dependency, and --with-logger= option

* Fri Dec 19 2003 Nathan Rosenquist <nathan at rsnapshot.org>
- now fully support autoconf

* Tue Dec 16 2003 Nathan Rosenquist <nathan at rsnapshot.org>
- changed rsnapshot.conf to rsnapshot.conf.default from the source tree

* Wed Nov 05 2003 Nathan Rosenquist <nathan at rsnapshot.org>
- Removed fileutils dependency, added verification info

* Tue Nov 04 2003 Nathan Rosenquist <nathan at rsnapshot.org>
- fixed anonymous rsync error

* Thu Oct 30 2003 Nathan Rosenquist <nathan at rsnapshot.org>
- update to 1.0.3

* Tue Oct 28 2003 Carl Wilhelm Soderstrom <chrome at real-time.com>
- created spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsnapshot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Mar 2005 13:02:02 -0000	1.1
+++ .cvsignore	18 Mar 2005 13:03:19 -0000	1.2
@@ -0,0 +1 @@
+rsnapshot-1.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsnapshot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Mar 2005 13:02:02 -0000	1.1
+++ sources	18 Mar 2005 13:03:19 -0000	1.2
@@ -0,0 +1 @@
+938a065a0da619d7d94908dc9374b63c  rsnapshot-1.1.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 18 13:07:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 08:07:38 -0500
Subject: rpms/gnome-applet-netmon import.log,NONE,1.1
Message-ID: <200503181307.j2ID7ceA030176@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gnome-applet-netmon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30170

Added Files:
	import.log 
Log Message:
 


--- NEW FILE import.log ---
gnome-applet-netmon-0_4-3:HEAD:gnome-applet-netmon-0.4-3.src.rpm:1111151241



From fedora-extras-commits at redhat.com  Fri Mar 18 13:20:42 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 08:20:42 -0500
Subject: devel/uqm uqm-decls.patch, NONE, 1.1 uqm-lvalues.patch, NONE,
	1.1 uqm-macros.patch, NONE, 1.1 uqm.spec, 1.5, 1.6
Message-ID: <200503181320.j2IDKg6v030443@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/uqm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30436

Modified Files:
	uqm.spec 
Added Files:
	uqm-decls.patch uqm-lvalues.patch uqm-macros.patch 
Log Message:
Fix FC4 build.

uqm-decls.patch:

--- NEW FILE uqm-decls.patch ---
diff -Naru uqm-0.3.orig/src/sc2code/comm/starbas/starbas.c uqm-0.3/src/sc2code/comm/starbas/starbas.c
--- uqm-0.3.orig/src/sc2code/comm/starbas/starbas.c	2003-06-22 03:55:59.000000000 +0300
+++ uqm-0.3/src/sc2code/comm/starbas/starbas.c	2005-03-18 14:40:50.000000000 +0200
@@ -552,6 +552,8 @@
 	Response (enough_history, NeedInfo);
 }
 
+static void TellMission (RESPONSE_REF R);
+
 static void
 DefeatUrquan (RESPONSE_REF R)
 {
@@ -560,7 +562,6 @@
 #define HOW_ALLY_AGAINST_URQUAN (1 << 2)
 #define HOW_STRONG_AGAINST_URQUAN (1 << 3)
 	static BYTE DefeatMask = 0;
-	static void TellMission (RESPONSE_REF R);
 
 	if (PLAYER_SAID (R, how_defeat))
 	{
@@ -1635,6 +1636,8 @@
 	}
 }
 
+static void SellMinerals (RESPONSE_REF R);
+
 static void
 NormalStarbase (RESPONSE_REF R)
 {
@@ -1716,8 +1719,6 @@
 
 	if (GLOBAL_SIS (TotalElementMass))
 	{
-		static void SellMinerals (RESPONSE_REF R);
-
 		Response (have_minerals, SellMinerals);
 	}
 	if (DiscussDevices (FALSE))
diff -Naru uqm-0.3.orig/src/sc2code/gameopt.c uqm-0.3/src/sc2code/gameopt.c
--- uqm-0.3.orig/src/sc2code/gameopt.c	2003-09-05 00:32:06.000000000 +0300
+++ uqm-0.3/src/sc2code/gameopt.c	2005-03-18 14:39:21.000000000 +0200
@@ -188,6 +188,8 @@
 
 static BOOLEAN DoSettings (PMENU_STATE pMS);
 
+static BOOLEAN DoNaming (PMENU_STATE pMS);
+
 static BOOLEAN
 DrawDescriptionString (PMENU_STATE pMS, COUNT which_string, SIZE state)
 {
@@ -196,7 +198,6 @@
 	TEXT lf;
 	COLOR BackGround, ForeGround;
 	FONT Font;
-	static BOOLEAN DoNaming (PMENU_STATE pMS);
 
 	SetSemaphore (GraphicsSem);
 
diff -Naru uqm-0.3.orig/src/sc2code/melee.c uqm-0.3/src/sc2code/melee.c
--- uqm-0.3.orig/src/sc2code/melee.c	2003-08-26 06:22:58.000000000 +0300
+++ uqm-0.3/src/sc2code/melee.c	2005-03-18 14:40:53.000000000 +0200
@@ -201,13 +201,13 @@
 	DrawMeleeIcon (1 + (8 * (1 - which_side)) + (HiLite ? 4 : 0) + which_icon);
 }
 
+static void DrawMeleeShipStrings (PMELEE_STATE pMS, BYTE NewStarShip);
+
 static void
 DrawPickFrame (PMELEE_STATE pMS)
 {
 	FRAME F;
 	RECT r, r0, r1, ship_r;
-	static void DrawMeleeShipStrings (PMELEE_STATE pMS, BYTE
-			NewStarShip);
 				
 	GetShipBox (&r0, 0, 0, 0),
 	GetShipBox (&r1, 1, NUM_MELEE_ROWS - 1, NUM_MELEE_COLUMNS - 1),

uqm-lvalues.patch:

--- NEW FILE uqm-lvalues.patch ---
diff -Naru uqm-0.3.orig/src/sc2code/libs/decomp/lzencode.c uqm-0.3/src/sc2code/libs/decomp/lzencode.c
--- uqm-0.3.orig/src/sc2code/libs/decomp/lzencode.c	2003-07-08 21:17:39.000000000 +0300
+++ uqm-0.3/src/sc2code/libs/decomp/lzencode.c	2005-03-18 14:43:35.000000000 +0200
@@ -60,9 +60,9 @@
 		*(MEM_HANDLE *)lson = h;
 		lson = (PSWORD)((PBYTE)lson + sizeof (h));
 		rson = lson;
-		((BYTE *) rson) += (N + 1) * sizeof (lson[0]);
+		rson = ((BYTE *) rson) + (N + 1) * sizeof (lson[0]);
 		dad = rson;
-		((BYTE *) dad) += (N + 257) * sizeof (rson[0]);
+		dad = ((BYTE *) dad) + (N + 257) * sizeof (rson[0]);
 
 		for (i = N + 1; i <= N + 256; i++)
 			rson[i] = NIL; /* root */
diff -Naru uqm-0.3.orig/src/sc2code/libs/resource/loadres.c uqm-0.3/src/sc2code/libs/resource/loadres.c
--- uqm-0.3.orig/src/sc2code/libs/resource/loadres.c	2003-07-08 21:17:39.000000000 +0300
+++ uqm-0.3/src/sc2code/libs/resource/loadres.c	2005-03-18 14:43:13.000000000 +0200
@@ -62,7 +62,7 @@
 					if ((int)(ReadResFile (RDPtr, 1, num_read, fp)) != (int)num_read)
 						break;
 				}
-				((BYTE *) RDPtr) += num_read;
+				RDPtr = ((BYTE *) RDPtr) + num_read;
 			} while (length -= num_read);
 
 			UnlockResourceData (RData);
diff -Naru uqm-0.3.orig/src/sc2code/libs/strings/strings.c uqm-0.3/src/sc2code/libs/strings/strings.c
--- uqm-0.3.orig/src/sc2code/libs/strings/strings.c	2003-01-19 01:08:39.000000000 +0200
+++ uqm-0.3/src/sc2code/libs/strings/strings.c	2005-03-18 14:45:07.000000000 +0200
@@ -176,8 +176,7 @@
 			StringAddr = 0;
 		else
 		{
-			StringAddr = (STRINGPTR)StringTablePtr;
-			((BYTE *) StringAddr) += StringTablePtr->StringOffsets[StringIndex];
+			StringAddr = (STRINGPTR)StringTablePtr + StringTablePtr->StringOffsets[StringIndex];
 		}
 		UnlockStringTable (StringTable);
 	}
@@ -209,8 +208,7 @@
 			StringAddr = 0;
 		else
 		{
-			StringAddr = (STRINGPTR)StringTablePtr;
-			((BYTE *) StringAddr) += StringTablePtr->StringOffsets[StringIndex];
+			StringAddr = (STRINGPTR)StringTablePtr + StringTablePtr->StringOffsets[StringIndex];
 		}
 		UnlockStringTable (StringTable);
 	}
@@ -233,8 +231,7 @@
 
 		StringIndex = STRING_INDEX (String);
 		LockStringTable (StringTable, &StringTablePtr);
-		StringAddr = (STRINGPTR)StringTablePtr;
-		((BYTE *) StringAddr) += StringTablePtr->StringOffsets[StringIndex];
+		StringAddr = (STRINGPTR)StringTablePtr + StringTablePtr->StringOffsets[StringIndex];
 		UnlockStringTable (StringTable);
 	}
 
diff -Naru uqm-0.3.orig/src/sc2code/libs/uio/uiostream.c uqm-0.3/src/sc2code/libs/uio/uiostream.c
--- uqm-0.3.orig/src/sc2code/libs/uio/uiostream.c	2003-07-13 02:02:55.000000000 +0300
+++ uqm-0.3/src/sc2code/libs/uio/uiostream.c	2005-03-18 14:45:05.000000000 +0200
@@ -141,7 +141,7 @@
 
 		numRead = minu(stream->readEnd - stream->bufPtr, bytesToRead);
 		memcpy(buf, stream->bufPtr, numRead);
-		(char *) buf += numRead;
+		buf = (char *) buf + numRead;
 		stream->bufPtr += numRead;
 		bytesToRead -= numRead;
 		bytesRead += numRead;

uqm-macros.patch:

--- NEW FILE uqm-macros.patch ---
diff -Naru uqm-0.3.orig/src/sc2code/libs/uio/ioaux.c uqm-0.3/src/sc2code/libs/uio/ioaux.c
--- uqm-0.3.orig/src/sc2code/libs/uio/ioaux.c	2003-08-31 21:40:01.000000000 +0300
+++ uqm-0.3/src/sc2code/libs/uio/ioaux.c	2005-03-18 14:46:39.000000000 +0200
@@ -182,7 +182,7 @@
 			// not allocated on the stack, as this function may be called
 			// from a thread with little stack space.
 	while (1) {
-		numInBuf = fromHandler->read(fromHandle, buf, BUFSIZE);
+		numInBuf = (fromHandler->read)(fromHandle, buf, BUFSIZE);
 		if (numInBuf == -1)
 		{
 			if (errno == EINTR)
diff -Naru uqm-0.3.orig/src/sc2code/libs/uio/io.c uqm-0.3/src/sc2code/libs/uio/io.c
--- uqm-0.3.orig/src/sc2code/libs/uio/io.c	2003-09-05 06:12:18.000000000 +0300
+++ uqm-0.3/src/sc2code/libs/uio/io.c	2005-03-18 14:46:39.000000000 +0200
@@ -680,7 +680,7 @@
 
 ssize_t
 uio_read(uio_Handle *handle, void *buf, size_t count) {
-	return handle->root->handler->read(handle, buf, count);
+	return (handle->root->handler->read)(handle, buf, count);
 }
 
 int


Index: uqm.spec
===================================================================
RCS file: /cvs/extras/devel/uqm/uqm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- uqm.spec	5 Mar 2005 19:55:54 -0000	1.5
+++ uqm.spec	18 Mar 2005 13:20:40 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           uqm
 Version:        0.3
-Release:        3
+Release:        4
 Summary:        The Ur-Quan Masters, a port of the classic game Star Control II
 
 Group:          Amusements/Games
@@ -14,6 +14,9 @@
 # Patch2: http://uqm.stack.nl/cgi-bin/bugs/show_bug.cgi?id=363#c20
 Patch2:         %{name}-comms-bluescreen.patch
 Patch3:         %{name}-gcc34MM.patch
+Patch4:         %{name}-decls.patch
+Patch5:         %{name}-lvalues.patch
+Patch6:         %{name}-macros.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2.3, SDL_image-devel, SDL_mixer-devel
@@ -34,6 +37,9 @@
 %patch1 -p0
 %patch2 -p0
 %patch3
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 
 %build
@@ -87,6 +93,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-4
+- Fix FC4 build.
+
 * Sat Dec 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3-3
 - Fix build on FC3.
 - Improve comment in desktop entry file, add Finnish translation.



From fedora-extras-commits at redhat.com  Fri Mar 18 14:02:23 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 09:02:23 -0500
Subject: devel/libcdio libcdio-gcc4.patch,NONE,1.1 libcdio.spec,1.5,1.6
Message-ID: <200503181402.j2IE2N5f031873@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/libcdio
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31867

Modified Files:
	libcdio.spec 
Added Files:
	libcdio-gcc4.patch 
Log Message:
Fix FC4 build, build with dep tracking disabled.

libcdio-gcc4.patch:

--- NEW FILE libcdio-gcc4.patch ---
diff -Naru libcdio-0.70.orig/lib/cdio.c libcdio-0.70.new/lib/cdio.c
--- libcdio-0.70.orig/lib/cdio.c	2004-08-29 06:55:24.000000000 +0300
+++ libcdio-0.70.new/lib/cdio.c	2005-03-18 15:48:40.000000000 +0200
@@ -848,7 +848,7 @@
   if (cdio == NULL) return -1;
   
   if (cdio->op.read)
-    return cdio->op.read (cdio->env, buf, size);
+    return (cdio->op.read) (cdio->env, buf, size);
   return -1;
 }
 
diff -Naru libcdio-0.70.orig/lib/_cdio_stream.c libcdio-0.70.new/lib/_cdio_stream.c
--- libcdio-0.70.orig/lib/_cdio_stream.c	2004-02-07 20:53:02.000000000 +0200
+++ libcdio-0.70.new/lib/_cdio_stream.c	2005-03-18 15:46:44.000000000 +0200
@@ -145,7 +145,7 @@
 
   if (!_cdio_stream_open_if_necessary(obj)) return 0;
 
-  read_bytes = obj->op.read(obj->user_data, ptr, size*nmemb);
+  read_bytes = (obj->op.read)(obj->user_data, ptr, size*nmemb);
   obj->position += read_bytes;
 
   return read_bytes;
diff -Naru libcdio-0.70.orig/src/cd-drive.c libcdio-0.70.new/src/cd-drive.c
--- libcdio-0.70.orig/src/cd-drive.c	2004-08-27 14:53:38.000000000 +0300
+++ libcdio-0.70.new/src/cd-drive.c	2005-03-18 15:51:43.000000000 +0200
@@ -140,7 +140,6 @@
 
 /* CDIO logging routines */
 
-static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
 
 static void 
 _log_handler (cdio_log_level_t level, const char message[])
diff -Naru libcdio-0.70.orig/src/cd-info.c libcdio-0.70.new/src/cd-info.c
--- libcdio-0.70.orig/src/cd-info.c	2004-09-02 04:33:57.000000000 +0300
+++ libcdio-0.70.new/src/cd-info.c	2005-03-18 15:53:49.000000000 +0200
@@ -371,7 +371,6 @@
 
 /* CDIO logging routines */
 
-static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
 #ifdef HAVE_CDDB
 static cddb_log_handler_t gl_default_cddb_log_handler = NULL;
 #endif
diff -Naru libcdio-0.70.orig/src/iso-info.c libcdio-0.70.new/src/iso-info.c
--- libcdio-0.70.orig/src/iso-info.c	2004-06-19 22:15:15.000000000 +0300
+++ libcdio-0.70.new/src/iso-info.c	2005-03-18 15:55:57.000000000 +0200
@@ -133,7 +133,6 @@
 
 /* CDIO logging routines */
 
-static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
 
 static void 
 _log_handler (cdio_log_level_t level, const char message[])


Index: libcdio.spec
===================================================================
RCS file: /cvs/extras/devel/libcdio/libcdio.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libcdio.spec	3 Mar 2005 22:41:31 -0000	1.5
+++ libcdio.spec	18 Mar 2005 14:02:21 -0000	1.6
@@ -1,15 +1,16 @@
 Name:           libcdio
 Version:        0.70
-Release:        1
+Release:        2
 Summary:        CD-ROM input and control library
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.gnu.org/software/libcdio/
 Source0:        http://ftp.gnu.org/gnu/libcdio/libcdio-0.70.tar.gz
+Patch0:         %{name}-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libcddb-devel
+BuildRequires:  libcddb-devel >= 0.9.4
 BuildRequires:  pkgconfig
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -33,10 +34,11 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
-%configure --disable-vcd-info
+%configure --disable-vcd-info --disable-dependency-tracking
 # Parallel build fails
 make
 
@@ -84,6 +86,10 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.70-2
+- Fix FC4 build (#151468).
+- Build with dependency tracking disabled.
+
 * Sun Sep  5 2004 Marius L. J??hndal <mariuslj at ifi.uio.no> - 0:0.70-0.fdr.1
 - Updated to 0.70.
 



From fedora-extras-commits at redhat.com  Fri Mar 18 14:17:24 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 09:17:24 -0500
Subject: devel/bmp bmp-0.9.7-xmms-skins.patch, NONE, 1.1 bmp.sh, 1.1,
	1.2 bmp.spec, 1.2, 1.3
Message-ID: <200503181417.j2IEHOEH032184@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/bmp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32174

Modified Files:
	bmp.sh bmp.spec 
Added Files:
	bmp-0.9.7-xmms-skins.patch 
Log Message:
* Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-6
- Enable XMMS skins directory inside binary, not via profile.d/bmp.sh



bmp-0.9.7-xmms-skins.patch:

--- NEW FILE bmp-0.9.7-xmms-skins.patch ---
diff -Nur bmp-0.9.7-orig/beep/skinwin.c bmp-0.9.7/beep/skinwin.c
--- bmp-0.9.7-orig/beep/skinwin.c	2004-12-04 10:04:29.000000000 +0100
+++ bmp-0.9.7/beep/skinwin.c	2005-03-18 14:40:23.000000000 +0100
@@ -230,11 +230,15 @@
 skinlist_update(void)
 {
     gchar *skinsdir;
+    gchar xmmsskinsdir = "/usr/share/xmms/Skins";
 
     skinlist_clear();
 
     scan_skindir(bmp_user_skin_dir);
     scan_skindir(DATA_DIR G_DIR_SEPARATOR_S BMP_SKIN_DIR_BASENAME);
+    if (g_file_test(xmmsskinsdir, G_FILE_TEST_IS_DIR)) {
+        scan_skindir( xmmsskinsdir);
+    }
 
     skinsdir = getenv("SKINSDIR");
     if (skinsdir) {


Index: bmp.sh
===================================================================
RCS file: /cvs/extras/devel/bmp/bmp.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bmp.sh	16 Mar 2005 17:24:48 -0000	1.1
+++ bmp.sh	18 Mar 2005 14:17:22 -0000	1.2
@@ -2,4 +2,4 @@
 
 # Colon-separated directory path to look for
 # additional skins. See man beep-media-player.
-export SKINSDIR=/usr/share/xmms/Skins
+#export SKINSDIR=


Index: bmp.spec
===================================================================
RCS file: /cvs/extras/devel/bmp/bmp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bmp.spec	17 Mar 2005 20:35:30 -0000	1.2
+++ bmp.spec	18 Mar 2005 14:17:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           bmp
 Version:        0.9.7
-Release:        5
+Release:        6
 Summary:        GTK2 based port of the XMMS media player
 
 Group:          Applications/Multimedia
@@ -15,6 +15,7 @@
 Patch0:         bmp-0.9.7-readmacro.patch
 Patch1:         bmp-0.9.7-default-skin.patch
 Patch2:         bmp-0.9.7-default-alsa.patch
+Patch3:         bmp-0.9.7-xmms-skins.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig gtk2-devel esound-devel libvorbis-devel
@@ -49,6 +50,7 @@
 %patch1 -p1 -b .default-skin
 
 %patch2 -p1 -b .default-alsa
+%patch3 -p1 -b .xmms-skins
 
 
 %build
@@ -117,6 +119,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-6
+- Enable XMMS skins directory inside binary, not via profile.d/bmp.sh
+
 * Thu Mar 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-5
 - Add -devel dependencies needed for headers and pkgconfig template.
 



From fedora-extras-commits at redhat.com  Fri Mar 18 16:04:12 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 18 Mar 2005 11:04:12 -0500
Subject: rpms/perl-Cache-Cache/FC-3 .cvsignore, 1.3,
	1.4 perl-Cache-Cache.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200503181604.j2IG4CkY003527@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cache-Cache/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3517/FC-3

Modified Files:
	.cvsignore perl-Cache-Cache.spec sources 
Log Message:
Update to 1.04.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2005 09:43:31 -0000	1.3
+++ .cvsignore	18 Mar 2005 16:04:09 -0000	1.4
@@ -1 +1 @@
-Cache-Cache-1.03.tar.gz
+Cache-Cache-1.04.tar.gz


Index: perl-Cache-Cache.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-3/perl-Cache-Cache.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Cache-Cache.spec	28 Feb 2005 21:10:11 -0000	1.5
+++ perl-Cache-Cache.spec	18 Mar 2005 16:04:09 -0000	1.6
@@ -1,14 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Cache-Cache
-Version:        1.03
-Release:        2
+Version:        1.04
+Release:        1
 Summary:        Generic cache interface and implementations
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Cache-Cache/
-Source0:   http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-1.03.tar.gz
+Source0:   http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-1.04.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
+- Update to 1.04.
+
 * Mon Feb 28 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.03-2
 - Bring up to date with current fedora.extras perl spec template.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2005 09:43:31 -0000	1.3
+++ sources	18 Mar 2005 16:04:09 -0000	1.4
@@ -1 +1 @@
-5482dea509c2133d1ffbfbd031d2f1c9  Cache-Cache-1.03.tar.gz
+60f79f31e74830dba1e0acda4d232d31  Cache-Cache-1.04.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 18 16:04:12 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 18 Mar 2005 11:04:12 -0500
Subject: rpms/perl-Cache-Cache/devel .cvsignore, 1.3,
	1.4 perl-Cache-Cache.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200503181604.j2IG4Cka003533@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cache-Cache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3517/devel

Modified Files:
	.cvsignore perl-Cache-Cache.spec sources 
Log Message:
Update to 1.04.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2005 09:43:31 -0000	1.3
+++ .cvsignore	18 Mar 2005 16:04:09 -0000	1.4
@@ -1 +1 @@
-Cache-Cache-1.03.tar.gz
+Cache-Cache-1.04.tar.gz


Index: perl-Cache-Cache.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/perl-Cache-Cache.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Cache-Cache.spec	28 Feb 2005 21:08:22 -0000	1.5
+++ perl-Cache-Cache.spec	18 Mar 2005 16:04:10 -0000	1.6
@@ -1,14 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Cache-Cache
-Version:        1.03
-Release:        2
+Version:        1.04
+Release:        1
 Summary:        Generic cache interface and implementations
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Cache-Cache/
-Source0:   http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-1.03.tar.gz
+Source0:   http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-1.04.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
+- Update to 1.04.
+
 * Mon Feb 28 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.03-2
 - Bring up to date with current fedora.extras perl spec template.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2005 09:43:31 -0000	1.3
+++ sources	18 Mar 2005 16:04:10 -0000	1.4
@@ -1 +1 @@
-5482dea509c2133d1ffbfbd031d2f1c9  Cache-Cache-1.03.tar.gz
+60f79f31e74830dba1e0acda4d232d31  Cache-Cache-1.04.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 18 16:36:16 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 11:36:16 -0500
Subject: devel/qascade qascade-dblsep.patch, NONE, 1.1 qascade.desktop, 1.1,
	1.2 qascade.spec, 1.5, 1.6
Message-ID: <200503181636.j2IGaGmL004223@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/qascade
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4216

Modified Files:
	qascade.desktop qascade.spec 
Added Files:
	qascade-dblsep.patch 
Log Message:
Work around #150528, other cosmetic tweaks.

qascade-dblsep.patch:

--- NEW FILE qascade-dblsep.patch ---
--- qascade_main.ui~	2003-05-03 02:04:13.000000000 +0300
+++ qascade_main.ui	2005-03-18 18:18:28.000000000 +0200
@@ -11149,7 +11149,6 @@
     <item text="&amp;File" name="fileMenu">
         <action name="fileNewAction"/>
         <separator/>
-        <separator/>
         <action name="fileExitAction"/>
     </item>
     <item text="View" name="PopupMenu">


Index: qascade.desktop
===================================================================
RCS file: /cvs/extras/devel/qascade/qascade.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qascade.desktop	8 Nov 2004 05:17:16 -0000	1.1
+++ qascade.desktop	18 Mar 2005 16:36:14 -0000	1.2
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=Qascade
-Comment=QT port of classic puzzle game
+Comment=Classic puzzle game
 Exec=qascade
-Icon=qascade.png
+Icon=qascade
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;Game;PuzzleGame;QT;
+Categories=Application;Game;PuzzleGame;Qt;


Index: qascade.spec
===================================================================
RCS file: /cvs/extras/devel/qascade/qascade.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qascade.spec	4 Mar 2005 00:05:42 -0000	1.5
+++ qascade.spec	18 Mar 2005 16:36:14 -0000	1.6
@@ -1,13 +1,14 @@
 Name:           qascade
 Version:        0.1
-Release:        2
-Summary:        QT port of classic puzzle game
+Release:        3
+Summary:        Classic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.bitsnpieces.org.uk/qascade/
 Source0:        http://www.bitsnpieces.org.uk/qascade/qascade-0.1.tar.bz2
 Source1:        %{name}.desktop
+Patch0:         %{name}-dblsep.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, XFree86-devel, desktop-file-utils
@@ -19,12 +20,14 @@
 
 %prep
 %setup -q
+%patch0
 
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 qmake INSTALL_ROOT=$RPM_BUILD_ROOT qascade.pro
 perl -pi -e 's|^(C(XX)?FLAGS\s*=.*)$|$1 \$(RPM_OPT_FLAGS)|g' Makefile
+perl -pi -e 's|^(UIC\s*=.*)|$1 -nounload|' Makefile # work around #150528
 make %{?_smp_mflags}
 
 
@@ -57,6 +60,10 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.1-3
+- Add workaround for UIC segfault (#150528).
+- Various cosmetic desktop entry and UI tweaks.
+
 * Sun Aug 24 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.1-0.fdr.2
 - Fix URL.
 - Ensure that QTDIR is also defined in %%install.



From fedora-extras-commits at redhat.com  Fri Mar 18 17:22:21 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 18 Mar 2005 12:22:21 -0500
Subject: rpms/sabayon - New directory
Message-ID: <200503181722.j2IHML5A005867@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5860/sabayon

Log Message:
Directory /cvs/extras/rpms/sabayon added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 17:22:21 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 18 Mar 2005 12:22:21 -0500
Subject: rpms/sabayon/devel - New directory
Message-ID: <200503181722.j2IHMLDG005870@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5860/sabayon/devel

Log Message:
Directory /cvs/extras/rpms/sabayon/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 18 17:22:41 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 18 Mar 2005 12:22:41 -0500
Subject: rpms/sabayon Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503181722.j2IHMfnP005935@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5926

Added Files:
	Makefile import.log 
Log Message:
Setup of module sabayon


--- NEW FILE Makefile ---
# Top level Makefile for module sabayon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 18 17:22:41 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 18 Mar 2005 12:22:41 -0500
Subject: rpms/sabayon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503181722.j2IHMf4D005938@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5926/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sabayon


--- 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 Mar 18 17:25:15 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 18 Mar 2005 12:25:15 -0500
Subject: rpms/sabayon import.log,1.1,1.2
Message-ID: <200503181725.j2IHPFZG006105@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6095

Modified Files:
	import.log 
Log Message:
auto-import sabayon-0.16-1 on branch devel from sabayon-0.16-1.src.rpm
Initial import of Sabayon (http://www.gnome.org/projects/sabayon)


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sabayon/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Mar 2005 17:22:39 -0000	1.1
+++ import.log	18 Mar 2005 17:25:13 -0000	1.2
@@ -0,0 +1 @@
+sabayon-0_16-1:HEAD:sabayon-0.16-1.src.rpm:1111166704



From fedora-extras-commits at redhat.com  Fri Mar 18 17:25:15 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 18 Mar 2005 12:25:15 -0500
Subject: rpms/sabayon/devel sabayon.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503181725.j2IHPFpc006108@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6095/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sabayon.spec 
Log Message:
auto-import sabayon-0.16-1 on branch devel from sabayon-0.16-1.src.rpm
Initial import of Sabayon (http://www.gnome.org/projects/sabayon)


--- NEW FILE sabayon.spec ---
%define pygtk2_version 2.5.3-2
%define gnome_python2_version 2.6.0-5

%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_pytho\n_lib()")}

Name:    sabayon
Version: 0.16
Release: 1
Summary: Tool to maintain user profiles in a GNOME desktop.

Group:   Applications/System
License: GPL
URL:     http://www.gnome.org/projects/sabayon
Source:  sabayon-%{version}.tar.gz

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires: python-abi = %{pyver}
Requires: gamin-python
Requires: pygtk2 >= %{pygtk2_version}
Requires: gnome-python2-gconf >= %{gnome_python2_version}
Requires: xorg-x11-Xnest
Requires: shadow-utils

BuildRequires: desktop-file-utils

Requires(post):  shadow-utils
Requires(preun): shadow-utils

%description
Sabayon is a tool to help sysadmins and user change and maintain the
default behaviour of the GNOME desktop.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}
gzip -9 ChangeLog

%install
rm -rf $RPM_BUILD_ROOT

%makeinstall PAM_PREFIX=$RPM_BUILD_ROOT%{_sysconfdir}

mkdir -p $RPM_BUILD_ROOT/etc/gconf/2
echo 'include "$(HOME)/.gconf.path.defaults"'  > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2/local-defaults.path
echo 'include "$(HOME)/.gconf.path.mandatory"' > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2/local-mandatory.path

desktop-file-install --vendor gnome --delete-original		\
  --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%find_lang sabayon

%clean
rm -rf $RPM_BUILD_ROOT

%pre
/usr/sbin/groupadd -r %{name} &>/dev/null || :
/usr/sbin/useradd  -r -s /sbin/nologin -c "Sabayon user" -g %{name} %{name} &>/dev/null || :
/usr/sbin/usermod -d "" %{name} &>/dev/null || :

%postun
if [ $1 -eq 0 ]; then
  /usr/sbin/userdel  %{name} &>/dev/null || :
  /usr/sbin/groupdel %{name} &>/dev/null || :
fi

%files -f sabayon.lang
%defattr(-, root, root)

%doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES
%doc doc/index.html doc/testing.html doc/helping.html doc/developing.html
%doc doc/sabayon.css doc/*.jpg doc/*.gif

%config(noreplace) /etc/gconf/2/local-defaults.path
%config(noreplace) /etc/gconf/2/local-mandatory.path
%config(noreplace) /etc/pam.d/%{name}
%config(noreplace) /etc/security/console.apps/%{name}
%config(noreplace) /etc/X11/xinit/xinitrc.d/%{name}*

%{_sysconfdir}/desktop-profiles

%{_bindir}/%{name}*
%{_sbindir}/%{name}*
%{_libexecdir}/%{name}*

%{_datadir}/%{name}/glade/%{name}.glade
%{_datadir}/applications/gnome-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png

%{python_sitelib}/%{name}/*.py
%{python_sitelib}/%{name}/*.pyc
%ghost %{python_sitelib}/%{name}/*.pyo
%{python_sitelib}/%{name}/sources/*.py
%{python_sitelib}/%{name}/sources/*.pyc
%ghost %{python_sitelib}/%{name}/sources/*.pyo

%changelog
* Wed Mar 16 2005 Mark McLoughlin <markmc at redhat.com>
- Various changes to bring in line with Fedora package guidelines

* Wed Feb  9 2005 Daniel Veillard <veillard at redhat.com>
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Mar 2005 17:22:39 -0000	1.1
+++ .cvsignore	18 Mar 2005 17:25:13 -0000	1.2
@@ -0,0 +1 @@
+sabayon-0.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Mar 2005 17:22:39 -0000	1.1
+++ sources	18 Mar 2005 17:25:13 -0000	1.2
@@ -0,0 +1 @@
+e7798dacf96d8b6db2f8b94f5ccd5032  sabayon-0.16.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 18 17:31:36 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 18 Mar 2005 12:31:36 -0500
Subject: rpms/sabayon/devel sabayon.spec,1.1,1.2
Message-ID: <200503181731.j2IHVaB9006277@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6270

Modified Files:
	sabayon.spec 
Log Message:
* Fri Mar 18 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-2
- BuildRequires: gettext-devel
- Add X-Fedora-Extra to .desktop file



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sabayon.spec	18 Mar 2005 17:25:13 -0000	1.1
+++ sabayon.spec	18 Mar 2005 17:31:34 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:    sabayon
 Version: 0.16
-Release: 1
+Release: 2
 Summary: Tool to maintain user profiles in a GNOME desktop.
 
 Group:   Applications/System
@@ -23,6 +23,7 @@
 Requires: xorg-x11-Xnest
 Requires: shadow-utils
 
+BuildRequires: gettext-devel
 BuildRequires: desktop-file-utils
 
 Requires(post):  shadow-utils
@@ -51,6 +52,7 @@
 
 desktop-file-install --vendor gnome --delete-original		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
+  --add-category X-Fedora-Extra					\
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang sabayon
@@ -100,6 +102,10 @@
 %ghost %{python_sitelib}/%{name}/sources/*.pyo
 
 %changelog
+* Fri Mar 18 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-2
+- BuildRequires: gettext-devel
+- Add X-Fedora-Extra to .desktop file
+
 * Wed Mar 16 2005 Mark McLoughlin <markmc at redhat.com>
 - Various changes to bring in line with Fedora package guidelines
 



From fedora-extras-commits at redhat.com  Fri Mar 18 18:03:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 18 Mar 2005 13:03:05 -0500
Subject: rpms/bmp/devel bmp-0.9.7-xmms-skins.patch,1.1,1.2
Message-ID: <200503181803.j2II350J007556@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7547

Modified Files:
	bmp-0.9.7-xmms-skins.patch 
Log Message:
note to self: always commit the tested patch, not introduce cut'n'paste errors'

bmp-0.9.7-xmms-skins.patch:

Index: bmp-0.9.7-xmms-skins.patch
===================================================================
RCS file: /cvs/extras/rpms/bmp/devel/bmp-0.9.7-xmms-skins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bmp-0.9.7-xmms-skins.patch	18 Mar 2005 14:17:22 -0000	1.1
+++ bmp-0.9.7-xmms-skins.patch	18 Mar 2005 18:03:03 -0000	1.2
@@ -5,14 +5,14 @@
  skinlist_update(void)
  {
      gchar *skinsdir;
-+    gchar xmmsskinsdir = "/usr/share/xmms/Skins";
++    gchar xmmsskinsdir[] = "/usr/share/xmms/Skins";
  
      skinlist_clear();
  
      scan_skindir(bmp_user_skin_dir);
      scan_skindir(DATA_DIR G_DIR_SEPARATOR_S BMP_SKIN_DIR_BASENAME);
 +    if (g_file_test(xmmsskinsdir, G_FILE_TEST_IS_DIR)) {
-+        scan_skindir( xmmsskinsdir);
++        scan_skindir( xmmsskinsdir );
 +    }
  
      skinsdir = getenv("SKINSDIR");



From bugs.michael at gmx.net  Fri Mar 18 18:26:05 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 18 Mar 2005 19:26:05 +0100
Subject: devel/cabextract cabextract-macro.patch, NONE, 1.1
 cabextract.spec, 1.6, 1.7
In-Reply-To: <200503180927.j2I9RumE021818@cvs-int.fedora.redhat.com>
References: <200503180927.j2I9RumE021818@cvs-int.fedora.redhat.com>
Message-ID: <20050318192605.32e17b4a.bugs.michael@gmx.net>

On Fri, 18 Mar 2005 04:27:56 -0500, Ville Skytta (scop) wrote:

> Author: scop
> 
> Update of /cvs/extras/devel/cabextract

> -Summary:        A Microsoft Cabinet file extractor
> +Release:        3
> +Summary:        Microsoft Cabinet file extractor

Potential problem, as Microsoft is a registered trademark.
My proposal:  File extractor for cabinet (.cab) files



From fedora-extras-commits at redhat.com  Fri Mar 18 18:45:28 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 18 Mar 2005 13:45:28 -0500
Subject: devel/edb edb.spec,1.3,1.4
Message-ID: <200503181845.j2IIjSnJ008228@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/edb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8219

Modified Files:
	edb.spec 
Log Message:
Fixed URL


Index: edb.spec
===================================================================
RCS file: /cvs/extras/devel/edb/edb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- edb.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ edb.spec	18 Mar 2005 18:45:26 -0000	1.4
@@ -1,10 +1,10 @@
 Name:           edb
 Version:        1.0.5
-Release:        3
+Release:        4
 Summary:        A database convenience library wrapped around BDB
 Group:          System Environment/Libraries
 License:        MIT
-URL:            http://enlightenment.org/pages/edb.html
+URL:            http://enlightenment.org/index.php?id=23
 Source0:        http://prdownloads.sourceforge.net/enlightenment/edb-1.0.5.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk+-devel, ncurses-devel zlib-devel 
@@ -85,6 +85,9 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-4
+- Fixed URL
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-3
 - Broke %descriptions at 80 columns
 



From fedora-extras-commits at redhat.com  Fri Mar 18 19:17:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 14:17:03 -0500
Subject: rpms/cabextract/devel cabextract.spec,1.7,1.8
Message-ID: <200503181917.j2IJH3k6009606@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cabextract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/devel

Modified Files:
	cabextract.spec 
Log Message:
Improve summary and description.


Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/rpms/cabextract/devel/cabextract.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cabextract.spec	18 Mar 2005 09:27:54 -0000	1.7
+++ cabextract.spec	18 Mar 2005 19:17:01 -0000	1.8
@@ -1,7 +1,7 @@
 Name:           cabextract
 Version:        1.1
 Release:        3
-Summary:        Microsoft Cabinet file extractor
+Summary:        Utility for extracting cabinet (.cab) archives
 
 Group:          Applications/Archiving
 License:        GPL
@@ -11,9 +11,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-cabextract is a program which can extract Microsoft Cabinet
-files. Cabinet files are archive files, usually with the extension
-.cab, used by Microsoft and others to distribute software.
+cabextract is a program which can extract files from cabinet (.cab)
+archives.
 
 
 %prep



From fedora-extras-commits at redhat.com  Fri Mar 18 19:17:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 14:17:03 -0500
Subject: rpms/cabextract/FC-1 cabextract.spec,1.3,1.4
Message-ID: <200503181917.j2IJH3nI009586@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cabextract/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/FC-1

Modified Files:
	cabextract.spec 
Log Message:
Improve summary and description.


Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/rpms/cabextract/FC-1/cabextract.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cabextract.spec	8 Nov 2004 04:07:25 -0000	1.3
+++ cabextract.spec	18 Mar 2005 19:17:01 -0000	1.4
@@ -2,7 +2,7 @@
 Version:        1.0
 Release:        0.fdr.1.1
 Epoch:          0
-Summary:        A program to extract Microsoft Cabinet files.
+Summary:        Utility for extracting cabinet (.cab) archives
 
 Group:          Applications/Archiving
 License:        GPL
@@ -11,9 +11,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Cabinet files (with the suffix .cab) are a form of archive files used
-by Microsoft to distribute their software. The cabextract program
-unpacks such files. 
+cabextract is a program which can extract files from cabinet (.cab)
+archives.
 
 
 %prep



From fedora-extras-commits at redhat.com  Fri Mar 18 19:17:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 14:17:03 -0500
Subject: rpms/cabextract/FC-3 cabextract.spec,1.6,1.7
Message-ID: <200503181917.j2IJH3MS009594@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cabextract/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/FC-3

Modified Files:
	cabextract.spec 
Log Message:
Improve summary and description.


Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/rpms/cabextract/FC-3/cabextract.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cabextract.spec	25 Nov 2004 21:16:20 -0000	1.6
+++ cabextract.spec	18 Mar 2005 19:17:01 -0000	1.7
@@ -1,7 +1,7 @@
 Name:           cabextract
 Version:        1.1
 Release:        2
-Summary:        A Microsoft Cabinet file extractor
+Summary:        Utility for extracting cabinet (.cab) archives
 
 Group:          Applications/Archiving
 License:        GPL
@@ -10,9 +10,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-cabextract is a program which can extract Microsoft Cabinet
-files. Cabinet files are archive files, usually with the extension
-.cab, used by Microsoft and others to distribute software.
+cabextract is a program which can extract files from cabinet (.cab)
+archives.
 
 
 %prep



From fedora-extras-commits at redhat.com  Fri Mar 18 19:17:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 14:17:03 -0500
Subject: rpms/cabextract/FC-2 cabextract.spec,1.4,1.5
Message-ID: <200503181917.j2IJH3WW009590@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cabextract/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/FC-2

Modified Files:
	cabextract.spec 
Log Message:
Improve summary and description.


Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/rpms/cabextract/FC-2/cabextract.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cabextract.spec	8 Nov 2004 04:07:31 -0000	1.4
+++ cabextract.spec	18 Mar 2005 19:17:01 -0000	1.5
@@ -2,7 +2,7 @@
 Version:        1.0
 Release:        0.fdr.1.2
 Epoch:          0
-Summary:        A program to extract Microsoft Cabinet files.
+Summary:        Utility for extracting cabinet (.cab) archives
 
 Group:          Applications/Archiving
 License:        GPL
@@ -11,9 +11,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Cabinet files (with the suffix .cab) are a form of archive files used
-by Microsoft to distribute their software. The cabextract program
-unpacks such files. 
+cabextract is a program which can extract files from cabinet (.cab)
+archives.
 
 
 %prep



From fedora-extras-commits at redhat.com  Fri Mar 18 19:17:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 14:17:03 -0500
Subject: rpms/cabextract/RHL-9 cabextract.spec,1.2,1.3
Message-ID: <200503181917.j2IJH35M009603@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cabextract/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/RHL-9

Modified Files:
	cabextract.spec 
Log Message:
Improve summary and description.


Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/rpms/cabextract/RHL-9/cabextract.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cabextract.spec	8 Nov 2004 04:07:19 -0000	1.2
+++ cabextract.spec	18 Mar 2005 19:17:01 -0000	1.3
@@ -2,7 +2,7 @@
 Version:        1.0
 Release:        0.fdr.1.rh90
 Epoch:          0
-Summary:        A program to extract Microsoft Cabinet files.
+Summary:        Utility for extracting cabinet (.cab) archives
 
 Group:          Applications/Archiving
 License:        GPL
@@ -11,9 +11,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Cabinet files (with the suffix .cab) are a form of archive files used
-by Microsoft to distribute their software. The cabextract program
-unpacks such files. 
+cabextract is a program which can extract files from cabinet (.cab)
+archives.
 
 
 %prep



From fedora-extras-commits at redhat.com  Fri Mar 18 19:17:03 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 18 Mar 2005 14:17:03 -0500
Subject: rpms/cabextract/RHL-8 cabextract.spec,1.1,1.2
Message-ID: <200503181917.j2IJH3Rk009598@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cabextract/RHL-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/RHL-8

Modified Files:
	cabextract.spec 
Log Message:
Improve summary and description.


Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/rpms/cabextract/RHL-8/cabextract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cabextract.spec	8 Nov 2004 04:07:13 -0000	1.1
+++ cabextract.spec	18 Mar 2005 19:17:01 -0000	1.2
@@ -2,7 +2,7 @@
 Version:        1.0
 Release:        0.fdr.1.rh80
 Epoch:          0
-Summary:        A program to extract Microsoft Cabinet files.
+Summary:        Utility for extracting cabinet (.cab) archives
 
 Group:          Applications/Archiving
 License:        GPL
@@ -11,9 +11,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Cabinet files (with the suffix .cab) are a form of archive files used
-by Microsoft to distribute their software. The cabextract program
-unpacks such files. 
+cabextract is a program which can extract files from cabinet (.cab)
+archives.
 
 
 %prep



From fedora-extras-commits at redhat.com  Fri Mar 18 19:56:11 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 18 Mar 2005 14:56:11 -0500
Subject: rpms/perl-pmtools/FC-1 perl-pmtools.spec,1.1,1.2
Message-ID: <200503181956.j2IJuBQi010342@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10330/FC-1

Modified Files:
	perl-pmtools.spec 
Log Message:
Fedora.us sync


Index: perl-pmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/FC-1/perl-pmtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-pmtools.spec	17 Mar 2005 02:06:20 -0000	1.1
+++ perl-pmtools.spec	18 Mar 2005 19:56:09 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-pmtools
 Version:        1.00
-Release:        0.fdr.1
+Release:        0.fdr.1.1
 Epoch:          0
 Summary:        A suite of small programs to help manage Perl modules
 



From fedora-extras-commits at redhat.com  Fri Mar 18 19:56:11 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 18 Mar 2005 14:56:11 -0500
Subject: rpms/perl-pmtools/RHL-9 perl-pmtools.spec,1.1,1.2
Message-ID: <200503181956.j2IJuBJD010350@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/RHL-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10330/RHL-9

Modified Files:
	perl-pmtools.spec 
Log Message:
Fedora.us sync


Index: perl-pmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/RHL-9/perl-pmtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-pmtools.spec	17 Mar 2005 02:06:20 -0000	1.1
+++ perl-pmtools.spec	18 Mar 2005 19:56:09 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-pmtools
 Version:        1.00
-Release:        0.fdr.1
+Release:        0.fdr.1.rh90
 Epoch:          0
 Summary:        A suite of small programs to help manage Perl modules
 



From fedora-extras-commits at redhat.com  Fri Mar 18 19:56:11 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 18 Mar 2005 14:56:11 -0500
Subject: rpms/perl-pmtools/FC-2 perl-pmtools.spec,1.1,1.2
Message-ID: <200503181956.j2IJuBsK010346@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10330/FC-2

Modified Files:
	perl-pmtools.spec 
Log Message:
Fedora.us sync


Index: perl-pmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/FC-2/perl-pmtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-pmtools.spec	17 Mar 2005 02:06:20 -0000	1.1
+++ perl-pmtools.spec	18 Mar 2005 19:56:09 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-pmtools
 Version:        1.00
-Release:        0.fdr.1
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        A suite of small programs to help manage Perl modules
 



From fedora-extras-commits at redhat.com  Fri Mar 18 21:05:32 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 18 Mar 2005 16:05:32 -0500
Subject: devel/ktrack ktrack.spec,1.3,1.4
Message-ID: <200503182105.j2IL5WHm012880@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12874

Modified Files:
	ktrack.spec 
Log Message:
Added --disable-rpath to %configure


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ktrack.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ ktrack.spec	18 Mar 2005 21:05:30 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 3.rc1
+Release: 4.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -20,7 +20,7 @@
 %patch -p 1 -b .headers
 
 %build
-%configure --with-qt-includes=/usr/lib/qt-3.3/include --with-qt-libraries=/usr/lib/qt-3.3/lib
+%configure --with-qt-includes=/usr/lib/qt-3.3/include --with-qt-libraries=/usr/lib/qt-3.3/lib --disable-rpath
 make
 
 %install
@@ -57,6 +57,9 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-4.rc1
+* Added --disable-rpath to %configure
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-3.rc1
 - Modified %setup to use -n
 - Broke %description at 80 columns



From fedora-extras-commits at redhat.com  Fri Mar 18 21:19:44 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 18 Mar 2005 16:19:44 -0500
Subject: devel/kphone kphone.spec,1.4,1.5
Message-ID: <200503182119.j2ILJibk013188@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13182

Modified Files:
	kphone.spec 
Log Message:
Added DESTDIR to %makeinstall


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kphone.spec	17 Mar 2005 17:40:27 -0000	1.4
+++ kphone.spec	18 Mar 2005 21:19:42 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        4
+Release:        5
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -30,7 +30,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%makeinstall DESTDIR=$RPM_BUILD_ROOT
 install -D -m 0644 icons/large-kphone.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kphone.png
 desktop-file-install --vendor=Fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -53,6 +53,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-5
+- Added DESTDIR to %makeinstall
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-4
 - Fixed %configure
 - Added po-hacks patch



From bugs.michael at gmx.net  Fri Mar 18 21:32:02 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 18 Mar 2005 22:32:02 +0100
Subject: devel/kphone kphone.spec,1.4,1.5
In-Reply-To: <200503182119.j2ILJibk013188@cvs-int.fedora.redhat.com>
References: <200503182119.j2ILJibk013188@cvs-int.fedora.redhat.com>
Message-ID: <20050318223202.24febdc0.bugs.michael@gmx.net>

On Fri, 18 Mar 2005 16:19:44 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Update of /cvs/extras/devel/kphone

> -%makeinstall
> +%makeinstall DESTDIR=$RPM_BUILD_ROOT

Sure about that?  The %makeinstall macro already prepends the buildroot
to all install locations like bindir, libdir, datadir and so on.


-- 
Fedora Core release Rawhide (Rawhide) - Linux 2.6.11-1.1185_FC4
loadavg: 0.26 0.31 0.33



From ivazquez at ivazquez.net  Fri Mar 18 21:41:40 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Fri, 18 Mar 2005 16:41:40 -0500
Subject: devel/kphone kphone.spec,1.4,1.5
In-Reply-To: <20050318223202.24febdc0.bugs.michael@gmx.net>
References: <200503182119.j2ILJibk013188@cvs-int.fedora.redhat.com>
	<20050318223202.24febdc0.bugs.michael@gmx.net>
Message-ID: <1111182100.14232.18.camel@ignacio.ignacio.lan>

On Fri, 2005-03-18 at 22:32 +0100, Michael Schwendt wrote:
> On Fri, 18 Mar 2005 16:19:44 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> > Update of /cvs/extras/devel/kphone
> 
> > -%makeinstall
> > +%makeinstall DESTDIR=$RPM_BUILD_ROOT
> 
> Sure about that?  The %makeinstall macro already prepends the buildroot
> to all install locations like bindir, libdir, datadir and so on.

Unfortunately po/Makefile.in eschews mechanisms that allow that method
to work. If anyone can come up with a patch then I'll be glad to
incorporate it. I'm still too new to autotools to handle it myself.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050318/0613e3bd/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Fri Mar 18 21:54:00 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Fri, 18 Mar 2005 16:54:00 -0500
Subject: rpms/gnome-common/devel gnome-common.spec,1.4,1.5
Message-ID: <200503182154.j2ILs0h3013673@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/gnome-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13665

Modified Files:
	gnome-common.spec 
Log Message:
Bump release and rebuild for FC4t1.



Index: gnome-common.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-common/devel/gnome-common.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-common.spec	3 Mar 2005 21:26:03 -0000	1.4
+++ gnome-common.spec	18 Mar 2005 21:53:58 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gnome-common
 Version:        2.8.0
-Release:        1
+Release:        2
 Summary:        Useful things common to building gnome packages from scratch
 
 Group:          Development/Tools
@@ -57,6 +57,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Fri Mar 18 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.8.0-2
+- Rebuild for FC4t1
+
 * Tue Sep 14 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.8.0-1
 - Update to 2.8.0
   + This release supports automake thru version 1.9 and has had a lot of



From rc040203 at freenet.de  Sat Mar 19 03:50:05 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Sat, 19 Mar 2005 04:50:05 +0100
Subject: devel/kphone kphone.spec,1.4,1.5
In-Reply-To: <1111182100.14232.18.camel@ignacio.ignacio.lan>
References: <200503182119.j2ILJibk013188@cvs-int.fedora.redhat.com>
	<20050318223202.24febdc0.bugs.michael@gmx.net>
	<1111182100.14232.18.camel@ignacio.ignacio.lan>
Message-ID: <1111204206.2475.148.camel@mccallum.corsepiu.local>

On Fri, 2005-03-18 at 16:41 -0500, Ignacio Vazquez-Abrams wrote:
> On Fri, 2005-03-18 at 22:32 +0100, Michael Schwendt wrote:
> > On Fri, 18 Mar 2005 16:19:44 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> > > Update of /cvs/extras/devel/kphone
> > 
> > > -%makeinstall
> > > +%makeinstall DESTDIR=$RPM_BUILD_ROOT
> > 
> > Sure about that?
Without any doubt this is wrong.

Either 
%makeinstall
or 
make DESTDIR=$RPM_BUILD_ROOT install
but not both.

In most cases you will want
make DESTDIR=$RPM_BUILD_ROOT install

>   The %makeinstall macro already prepends the buildroot
> > to all install locations like bindir, libdir, datadir and so on.
> 
> Unfortunately po/Makefile.in eschews mechanisms that allow that method
> to work. If anyone can come up with a patch then I'll be glad to
> incorporate it.

The kphone-4.1.0-po-hacks.diff I sent a couple of days ago, implements
this.

>  I'm still too new to autotools to handle it myself.
This package uses manually written Makefile.ins. The "make install"
related probs this package suffers from are Makefile bugs the authors of
this package are to blame for.


Try this patch:
--- kphone.spec 18 Mar 2005 21:19:42 -0000      1.5
+++ kphone.spec 19 Mar 2005 03:42:22 -0000
@@ -30,7 +30,8 @@

 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
+
 install -D -m 0644 icons/large-kphone.png $RPM_BUILD_ROOT%
{_datadir}/pixmaps/kphone.png
 desktop-file-install --vendor=Fedora \

Ralf




From fedora-extras-commits at redhat.com  Sat Mar 19 06:44:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 01:44:05 -0500
Subject: rpms/dbh - New directory
Message-ID: <200503190644.j2J6i5to001541@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1532/dbh

Log Message:
Directory /cvs/extras/rpms/dbh added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 06:44:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 01:44:05 -0500
Subject: rpms/dbh/devel - New directory
Message-ID: <200503190644.j2J6i5xT001544@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1532/dbh/devel

Log Message:
Directory /cvs/extras/rpms/dbh/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 06:44:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 01:44:18 -0500
Subject: rpms/dbh Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503190644.j2J6iIBI001605@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1596

Added Files:
	Makefile import.log 
Log Message:
Setup of module dbh


--- NEW FILE Makefile ---
# Top level Makefile for module dbh
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 06:44:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 01:44:18 -0500
Subject: rpms/dbh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503190644.j2J6iIFM001608@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1596/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dbh


--- 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 Mar 19 07:05:37 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sat, 19 Mar 2005 02:05:37 -0500
Subject: rpms/iiimf-le-simplehangul/devel iiimf-le-simplehangul.spec, 1.1,
	1.2
Message-ID: <200503190705.j2J75b8d002812@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2797

Modified Files:
	iiimf-le-simplehangul.spec 
Log Message:
Ugly lib64 hack from FC im-sdk



Index: iiimf-le-simplehangul.spec
===================================================================
RCS file: /cvs/extras/rpms/iiimf-le-simplehangul/devel/iiimf-le-simplehangul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iiimf-le-simplehangul.spec	18 Mar 2005 07:53:49 -0000	1.1
+++ iiimf-le-simplehangul.spec	19 Mar 2005 07:05:35 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Romanized Korean Hangul language engine for IIIMF
 Name: iiimf-le-simplehangul
 Version: 0.1.1
-Release: 2
+Release: 3.FC4
 License: GPL
 Source: %{name}-%{version}.tar.bz2
 URL: http://www3.sympatico.ca/d.moser/hangul.html
@@ -25,6 +25,12 @@
 %setup -q -n %{name}-%{version}
 
 %build
+# /usr/lib or /usr/lib64 substitution
+# TODO: This could be done in a cleaner way...
+if [ %{im_dir} != "/usr/lib/im" ]; then
+  find . -type f | xargs grep -l "/usr/lib/im" | \
+        xargs perl -pi -e "s|/usr/lib/im|%{im_dir}|g;"
+fi
 ./configure --prefix=%{im_dir}
 make  
 
@@ -54,6 +60,9 @@
 %{im_dir}/*
 
 %changelog
+* Fri Mar 18 2005 Warren Togami <wtogami at redhat.com> 0.1.1-3
+- Ugly lib64 hack from FC im-sdk
+
 * Thu Mar 17 2005 Warren Togami <wtogami at redhat.com> 0.1.1-2
 - minor spec changes
 - copy preun and postun scripts from iiimf-le-chinput



From fedora-extras-commits at redhat.com  Sat Mar 19 07:06:34 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sat, 19 Mar 2005 02:06:34 -0500
Subject: rpms/iiimf-le-simplehangul/FC-3 iiimf-le-simplehangul.spec,1.2,1.3
Message-ID: <200503190706.j2J76Ymp002883@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/iiimf-le-simplehangul/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2868

Modified Files:
	iiimf-le-simplehangul.spec 
Log Message:
Ugly lib64 hack from FC im-sdk



Index: iiimf-le-simplehangul.spec
===================================================================
RCS file: /cvs/extras/rpms/iiimf-le-simplehangul/FC-3/iiimf-le-simplehangul.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iiimf-le-simplehangul.spec	18 Mar 2005 08:12:42 -0000	1.2
+++ iiimf-le-simplehangul.spec	19 Mar 2005 07:06:32 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Romanized Korean Hangul language engine for IIIMF
 Name: iiimf-le-simplehangul
 Version: 0.1.1
-Release: 1.FC3
+Release: 3.FC3
 License: GPL
 Source: %{name}-%{version}.tar.bz2
 URL: http://www3.sympatico.ca/d.moser/hangul.html
@@ -25,6 +25,12 @@
 %setup -q -n %{name}-%{version}
 
 %build
+# /usr/lib or /usr/lib64 substitution
+# TODO: This could be done in a cleaner way...
+if [ %{im_dir} != "/usr/lib/im" ]; then
+  find . -type f | xargs grep -l "/usr/lib/im" | \
+        xargs perl -pi -e "s|/usr/lib/im|%{im_dir}|g;"
+fi
 ./configure --prefix=%{im_dir}
 make  
 
@@ -54,7 +60,10 @@
 %{im_dir}/*
 
 %changelog
-* Thu Mar 17 2005 Warren Togami <wtogami at redhat.com> 0.1.1-1.FC3
+* Fri Mar 18 2005 Warren Togami <wtogami at redhat.com> 0.1.1-3
+- Ugly lib64 hack from FC im-sdk
+
+* Thu Mar 17 2005 Warren Togami <wtogami at redhat.com> 0.1.1-2
 - minor spec changes
 - copy preun and postun scripts from iiimf-le-chinput
 



From fedora-extras-commits at redhat.com  Sat Mar 19 07:13:49 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sat, 19 Mar 2005 02:13:49 -0500
Subject: rpms/nabi/devel nabi.spec,1.3,1.4
Message-ID: <200503190713.j2J7Dn8j003042@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nabi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3024

Modified Files:
	nabi.spec 
Log Message:
oops



Index: nabi.spec
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/nabi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nabi.spec	17 Mar 2005 08:50:09 -0000	1.3
+++ nabi.spec	19 Mar 2005 07:13:47 -0000	1.4
@@ -23,7 +23,7 @@
 %setup -q -n %{name}-%{version}
 
 %build
-./configure --prefix={%_prefix}
+./configure --prefix=%{_prefix}
 make
 
 %install



From fedora-extras-commits at redhat.com  Sat Mar 19 08:05:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 03:05:30 -0500
Subject: devel/kphone kphone.spec,1.5,1.6
Message-ID: <200503190805.j2J85U0E004596@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4590

Modified Files:
	kphone.spec 
Log Message:
Split %makeinstall ... to make ... install


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kphone.spec	18 Mar 2005 21:19:42 -0000	1.5
+++ kphone.spec	19 Mar 2005 08:05:28 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        5
+Release:        6
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -30,7 +30,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
 install -D -m 0644 icons/large-kphone.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kphone.png
 desktop-file-install --vendor=Fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -53,6 +53,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-6
+- Split %makeinstall ... to make ... install
+
 * Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-5
 - Added DESTDIR to %makeinstall
 



From ivazquez at ivazquez.net  Sat Mar 19 08:10:08 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Sat, 19 Mar 2005 03:10:08 -0500
Subject: devel/kphone kphone.spec,1.4,1.5
In-Reply-To: <1111204206.2475.148.camel@mccallum.corsepiu.local>
References: <200503182119.j2ILJibk013188@cvs-int.fedora.redhat.com>
	<20050318223202.24febdc0.bugs.michael@gmx.net>
	<1111182100.14232.18.camel@ignacio.ignacio.lan>
	<1111204206.2475.148.camel@mccallum.corsepiu.local>
Message-ID: <1111219808.26827.4.camel@ignacio.ignacio.lan>

On Sat, 2005-03-19 at 04:50 +0100, Ralf Corsepius wrote:
> many very correct things

*sigh*
I'm tired of fighting with this one. It builds when changed as you
recommended, so right now that's good enough for me.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050319/a973541c/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Sat Mar 19 09:23:47 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Sat, 19 Mar 2005 04:23:47 -0500
Subject: rpms/sabayon/devel sabayon.spec,1.2,1.3
Message-ID: <200503190923.j2J9Nlnd007203@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7195

Modified Files:
	sabayon.spec 
Log Message:
* Sat Mar 19 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-3
- Remove period at the end of the summary
- Specify full URL for source
- BuildRequires: python
- Use %{_sysconfdir} everywhere
- Set the directory mode



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sabayon.spec	18 Mar 2005 17:31:34 -0000	1.2
+++ sabayon.spec	19 Mar 2005 09:23:45 -0000	1.3
@@ -6,13 +6,13 @@
 
 Name:    sabayon
 Version: 0.16
-Release: 2
-Summary: Tool to maintain user profiles in a GNOME desktop.
+Release: 3
+Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
 License: GPL
 URL:     http://www.gnome.org/projects/sabayon
-Source:  sabayon-%{version}.tar.gz
+Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/%{version}/sabayon-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,6 +23,7 @@
 Requires: xorg-x11-Xnest
 Requires: shadow-utils
 
+BuildRequires: python
 BuildRequires: gettext-devel
 BuildRequires: desktop-file-utils
 
@@ -46,7 +47,7 @@
 
 %makeinstall PAM_PREFIX=$RPM_BUILD_ROOT%{_sysconfdir}
 
-mkdir -p $RPM_BUILD_ROOT/etc/gconf/2
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2
 echo 'include "$(HOME)/.gconf.path.defaults"'  > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2/local-defaults.path
 echo 'include "$(HOME)/.gconf.path.mandatory"' > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2/local-mandatory.path
 
@@ -72,17 +73,17 @@
 fi
 
 %files -f sabayon.lang
-%defattr(-, root, root)
+%defattr(-, root, root, 755)
 
 %doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES
 %doc doc/index.html doc/testing.html doc/helping.html doc/developing.html
 %doc doc/sabayon.css doc/*.jpg doc/*.gif
 
-%config(noreplace) /etc/gconf/2/local-defaults.path
-%config(noreplace) /etc/gconf/2/local-mandatory.path
-%config(noreplace) /etc/pam.d/%{name}
-%config(noreplace) /etc/security/console.apps/%{name}
-%config(noreplace) /etc/X11/xinit/xinitrc.d/%{name}*
+%config(noreplace) %{_sysconfdir}/gconf/2/local-defaults.path
+%config(noreplace) %{_sysconfdir}/gconf/2/local-mandatory.path
+%config(noreplace) %{_sysconfdir}/pam.d/%{name}
+%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
+%config(noreplace) %{_sysconfdir}/X11/xinit/xinitrc.d/%{name}*
 
 %{_sysconfdir}/desktop-profiles
 
@@ -102,6 +103,13 @@
 %ghost %{python_sitelib}/%{name}/sources/*.pyo
 
 %changelog
+* Sat Mar 19 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-3
+- Remove period at the end of the summary
+- Specify full URL for source
+- BuildRequires: python 
+- Use %{_sysconfdir} everywhere
+- Set the directory mode
+
 * Fri Mar 18 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-2
 - BuildRequires: gettext-devel
 - Add X-Fedora-Extra to .desktop file



From fedora-extras-commits at redhat.com  Sat Mar 19 09:29:07 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Sat, 19 Mar 2005 04:29:07 -0500
Subject: rpms/sabayon/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200503190929.j2J9T7dc007359@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7349

Modified Files:
	.cvsignore sources 
Log Message:
upload .tar.bz2 instead of .tar.gz



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Mar 2005 17:25:13 -0000	1.2
+++ .cvsignore	19 Mar 2005 09:29:05 -0000	1.3
@@ -1 +1 @@
-sabayon-0.16.tar.gz
+sabayon-0.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Mar 2005 17:25:13 -0000	1.2
+++ sources	19 Mar 2005 09:29:05 -0000	1.3
@@ -1 +1 @@
-e7798dacf96d8b6db2f8b94f5ccd5032  sabayon-0.16.tar.gz
+3a2a9a18f44fa5e32dded73a4e111746  sabayon-0.16.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 10:24:09 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 19 Mar 2005 05:24:09 -0500
Subject: devel/uqm uqm-lvalues.patch,1.1,1.2
Message-ID: <200503191024.j2JAO9Kv009007@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/uqm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9001

Modified Files:
	uqm-lvalues.patch 
Log Message:
Adjust according to upstream comments.

uqm-lvalues.patch:

Index: uqm-lvalues.patch
===================================================================
RCS file: /cvs/extras/devel/uqm/uqm-lvalues.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uqm-lvalues.patch	18 Mar 2005 13:20:40 -0000	1.1
+++ uqm-lvalues.patch	19 Mar 2005 10:24:07 -0000	1.2
@@ -21,7 +21,7 @@
  						break;
  				}
 -				((BYTE *) RDPtr) += num_read;
-+				RDPtr = ((BYTE *) RDPtr) + num_read;
++				RDPtr = (RESOURCE_DATAPTR) ((BYTE *) RDPtr + num_read);
  			} while (length -= num_read);
  
  			UnlockResourceData (RData);
@@ -34,7 +34,7 @@
  		{
 -			StringAddr = (STRINGPTR)StringTablePtr;
 -			((BYTE *) StringAddr) += StringTablePtr->StringOffsets[StringIndex];
-+			StringAddr = (STRINGPTR)StringTablePtr + StringTablePtr->StringOffsets[StringIndex];
++			StringAddr = (STRINGPTR) ((BYTE *) StringTablePtr + StringTablePtr->StringOffsets[StringIndex]);
  		}
  		UnlockStringTable (StringTable);
  	}
@@ -44,7 +44,7 @@
  		{
 -			StringAddr = (STRINGPTR)StringTablePtr;
 -			((BYTE *) StringAddr) += StringTablePtr->StringOffsets[StringIndex];
-+			StringAddr = (STRINGPTR)StringTablePtr + StringTablePtr->StringOffsets[StringIndex];
++			StringAddr = (STRINGPTR) ((BYTE *) StringTablePtr + StringTablePtr->StringOffsets[StringIndex]);
  		}
  		UnlockStringTable (StringTable);
  	}
@@ -54,7 +54,7 @@
  		LockStringTable (StringTable, &StringTablePtr);
 -		StringAddr = (STRINGPTR)StringTablePtr;
 -		((BYTE *) StringAddr) += StringTablePtr->StringOffsets[StringIndex];
-+		StringAddr = (STRINGPTR)StringTablePtr + StringTablePtr->StringOffsets[StringIndex];
++		StringAddr = (STRINGPTR) ((BYTE *) StringTablePtr + StringTablePtr->StringOffsets[StringIndex]);
  		UnlockStringTable (StringTable);
  	}
  



From fedora-extras-commits at redhat.com  Sat Mar 19 11:18:28 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 19 Mar 2005 06:18:28 -0500
Subject: devel/apt apt.spec,1.11,1.12
Message-ID: <200503191118.j2JBIShn010694@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/devel/apt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10688

Modified Files:
	apt.spec 
Log Message:
Apply hack against missing libselinux-devel dep in rpm-devel for rpm 4.4 too.


Index: apt.spec
===================================================================
RCS file: /cvs/extras/devel/apt/apt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- apt.spec	5 Mar 2005 21:10:20 -0000	1.11
+++ apt.spec	19 Mar 2005 11:18:26 -0000	1.12
@@ -97,7 +97,7 @@
 BuildRequires: %{_bindir}/xsltproc, %{comps}
 %endif
 
-%if "%{rpmver}" == "4.3"
+%if "%{rpmver}" >= "4.3"
 BuildRequires: libselinux-devel
 %endif
 
@@ -359,6 +359,9 @@
 
 
 %changelog
+* Sat Mar 19 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- Apply hack against missing libselinux-devel dep in rpm-devel for rpm 4.4 too.
+
 * Wed Feb 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.15cnc6-16.r362
 - Make mirror-select.lua write commented out rpm-src entries for Extras (Panu).
 - Add Extras GPG key (Panu), and add it to fedora-vendors.list.



From bugs.michael at gmx.net  Sat Mar 19 11:27:56 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Sat, 19 Mar 2005 12:27:56 +0100
Subject: devel/apt apt.spec,1.11,1.12
In-Reply-To: <200503191118.j2JBIShn010694@cvs-int.fedora.redhat.com>
References: <200503191118.j2JBIShn010694@cvs-int.fedora.redhat.com>
Message-ID: <20050319122756.174d27a6.bugs.michael@gmx.net>

On Sat, 19 Mar 2005 06:18:28 -0500, Ville Skytta (scop) wrote:

> Author: scop
> 
> Update of /cvs/extras/devel/apt
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10688
> 
> Modified Files:
> 	apt.spec 
> Log Message:
> Apply hack against missing libselinux-devel dep in rpm-devel for rpm 4.4 too.
> 
> 
> Index: apt.spec
> ===================================================================
> RCS file: /cvs/extras/devel/apt/apt.spec,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -u -r1.11 -r1.12
> --- apt.spec	5 Mar 2005 21:10:20 -0000	1.11
> +++ apt.spec	19 Mar 2005 11:18:26 -0000	1.12
> @@ -97,7 +97,7 @@
>  BuildRequires: %{_bindir}/xsltproc, %{comps}
>  %endif
>  
> -%if "%{rpmver}" == "4.3"
> +%if "%{rpmver}" >= "4.3"

Interesting, since this was fixed in 0.5.15cnc6-11 already.



From ville.skytta at iki.fi  Sat Mar 19 11:39:31 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Sat, 19 Mar 2005 13:39:31 +0200
Subject: devel/apt apt.spec,1.11,1.12
In-Reply-To: <20050319122756.174d27a6.bugs.michael@gmx.net>
References: <200503191118.j2JBIShn010694@cvs-int.fedora.redhat.com>
	<20050319122756.174d27a6.bugs.michael@gmx.net>
Message-ID: <1111232371.8997.14.camel@bobcat.mine.nu>

On Sat, 2005-03-19 at 12:27 +0100, Michael Schwendt wrote:
> On Sat, 19 Mar 2005 06:18:28 -0500, Ville Skytta (scop) wrote:
>
> > -%if "%{rpmver}" == "4.3"
> > +%if "%{rpmver}" >= "4.3"
> 
> Interesting, since this was fixed in 0.5.15cnc6-11 already.

Well, in any case, it needed treatment again.  According to the
changelog, the original -11 fix had been reverted in -12.r362.  Possibly
an oversight, or hoping that at rpm 4.4 time, the missing deps in rpm-
devel would already be fixed... :I



From fedora-extras-commits at redhat.com  Sat Mar 19 15:33:15 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 10:33:15 -0500
Subject: devel/leafpad leafpad.spec,1.3,1.4
Message-ID: <200503191533.j2JFXF0d016818@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16810

Modified Files:
	leafpad.spec 
Log Message:
Added desktop-file-utils to BuildRequires


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/devel/leafpad/leafpad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- leafpad.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ leafpad.spec	19 Mar 2005 15:33:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           leafpad
 Version:        0.7.9
-Release:        3
+Release:        4
 Summary:        GTK+ based simple text editor
 
 Group:          Applications/Editors
@@ -10,7 +10,7 @@
 Patch0:         leafpad-0.7.9-file_chooser.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 2.4
+BuildRequires:  gtk2-devel >= 2.4 desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -61,6 +61,9 @@
 %{_datadir}/pixmaps/leafpad.png
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-4
+- Added desktop-file-utils to BuildRequires
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-3
 - Broke %description at 80 columns
 



From fedora-extras-commits at redhat.com  Sat Mar 19 15:37:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 10:37:47 -0500
Subject: devel/ktrack ktrack.spec,1.4,1.5
Message-ID: <200503191537.j2JFblFN016949@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16940

Modified Files:
	ktrack.spec 
Log Message:
Removed explicit hamlib-devel version


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ktrack.spec	18 Mar 2005 21:05:30 -0000	1.4
+++ ktrack.spec	19 Mar 2005 15:37:45 -0000	1.5
@@ -1,12 +1,12 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 4.rc1
+Release: 5.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
 Patch: ktrack-headers.patch
-BuildRequires: desktop-file-utils kdelibs-devel >= 3.3 hamlib-devel = 1.2.3
+BuildRequires: desktop-file-utils kdelibs-devel >= 3.3 hamlib-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -57,8 +57,11 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-5.rc1
+- Removed explicit hamlib-devel version
+ 
 * Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-4.rc1
-* Added --disable-rpath to %configure
+- Added --disable-rpath to %configure
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-3.rc1
 - Modified %setup to use -n



From fedora-extras-commits at redhat.com  Sat Mar 19 15:57:43 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 10:57:43 -0500
Subject: devel/linphone linphone.spec,1.3,1.4
Message-ID: <200503191557.j2JFvhUq017256@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17248

Modified Files:
	linphone.spec 
Log Message:
Various .spec cleanups


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linphone.spec	17 Mar 2005 22:53:01 -0000	1.3
+++ linphone.spec	19 Mar 2005 15:57:41 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        3
+Release:        4
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -13,8 +13,6 @@
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
 BuildRequires:  libosip-devel speex-devel gettext
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 
 %description
 Linphone is mostly sip compliant. It works successfully with these
@@ -54,40 +52,44 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %{_bindir}/*
-%{_libdir}/bonobo
+%{_libdir}/bonobo/servers/*.server
 %{_libdir}/*.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
-%{_datadir}/gnome
-%{_datadir}/gnome-2.0
-%{_datadir}/gtk-doc
-%{_datadir}/linphonec/linphonec
-%{_datadir}/locale/*/*
-%{_datadir}/pixmaps
-%{_datadir}/sounds
+%{_datadir}/gnome/apps/Internet/*.desktop
+%{_datadir}/gnome/help/linphone
+%{_datadir}/gnome-2.0/ui/*.xml
+%{_datadir}/gtk-doc/html/mediastreamer
+%{_datadir}/linphonec
+%{_datadir}/pixmaps/linphone
+%{_datadir}/sounds/linphone
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/*/*.h
+%{_includedir}/*
 %{_libdir}/*.a
 %{_libdir}/*.la
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-4
+- Used %find_lang
+- Tightened up %files
+- Streamlined spec file
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-3
 - Broke %description at 80 columns
 



From bugs.michael at gmx.net  Sat Mar 19 16:02:32 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Sat, 19 Mar 2005 17:02:32 +0100
Subject: devel/ktrack ktrack.spec,1.4,1.5
In-Reply-To: <200503191537.j2JFblFN016949@cvs-int.fedora.redhat.com>
References: <200503191537.j2JFblFN016949@cvs-int.fedora.redhat.com>
Message-ID: <20050319170232.4e47380e.bugs.michael@gmx.net>

On Sat, 19 Mar 2005 10:37:47 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/devel/ktrack

>  * Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-4.rc1
> -* Added --disable-rpath to %configure
> +- Added --disable-rpath to %configure

Danger! Avoid mentioning macros in spec changelog. Escape them with a
double % like %%configure, %%install, %%_libdir, and so on, so they
are not expanded.



From ivazquez at ivazquez.net  Sat Mar 19 16:14:08 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Sat, 19 Mar 2005 11:14:08 -0500
Subject: devel/ktrack ktrack.spec,1.4,1.5
In-Reply-To: <20050319170232.4e47380e.bugs.michael@gmx.net>
References: <200503191537.j2JFblFN016949@cvs-int.fedora.redhat.com>
	<20050319170232.4e47380e.bugs.michael@gmx.net>
Message-ID: <1111248848.26827.10.camel@ignacio.ignacio.lan>

On Sat, 2005-03-19 at 17:02 +0100, Michael Schwendt wrote:
> On Sat, 19 Mar 2005 10:37:47 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:
> 
> > Author: ivazquez
> > 
> > Update of /cvs/extras/devel/ktrack
> 
> >  * Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-4.rc1
> > -* Added --disable-rpath to %configure
> > +- Added --disable-rpath to %configure
> 
> Danger! Avoid mentioning macros in spec changelog. Escape them with a
> double % like %%configure, %%install, %%_libdir, and so on, so they
> are not expanded.

Whoops. I'll go fix.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050319/8c363f45/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Sat Mar 19 16:27:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 11:27:33 -0500
Subject: devel/libosip libosip.spec,1.3,1.4
Message-ID: <200503191627.j2JGRXVJ018581@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/libosip

Modified Files:
	libosip.spec 
Log Message:
Macros in %changelog are dangerous


Index: libosip.spec
===================================================================
RCS file: /cvs/extras/devel/libosip/libosip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libosip.spec	17 Mar 2005 22:39:00 -0000	1.3
+++ libosip.spec	19 Mar 2005 16:27:31 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libosip
 Version:        0.9.7
-Release:        3
+Release:        4
 Summary:        oSIP is an implementation of SIP
 
 Group:          System Environment/Libraries
@@ -73,11 +73,14 @@
 %{_libdir}/*.so
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-4
+- Macros in %changelog are dangerous
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-3
 - Spec file cleanup
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-2
-- Fix %files devel to include %{_includedir}/osip
+- Fix %files devel to include %%{_includedir}/osip
 - Broke %description at 80 columns
 
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-1



From fedora-extras-commits at redhat.com  Sat Mar 19 16:27:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 11:27:33 -0500
Subject: devel/python-amara python-amara.spec,1.4,1.5
Message-ID: <200503191627.j2JGRXat018593@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/python-amara

Modified Files:
	python-amara.spec 
Log Message:
Macros in %changelog are dangerous


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/devel/python-amara/python-amara.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-amara.spec	17 Mar 2005 18:55:40 -0000	1.4
+++ python-amara.spec	19 Mar 2005 16:27:31 -0000	1.5
@@ -55,13 +55,16 @@
 %doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-5
+- Macros in %changelog are dangerous
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-4
 - Streamlined/fixed Python version handling
-- Implemented %python_sitelib
+- Implemented %%python_sitelib
 - Decreased verbosity in %description
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-3
-- Better %pyver and BR/Requires handling
+- Better %%pyver and BR/Requires handling
 - Broke %description at 80 columns
 - Fixed file ownership
 



From fedora-extras-commits at redhat.com  Sat Mar 19 16:27:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 11:27:33 -0500
Subject: devel/ktrack ktrack.spec,1.5,1.6
Message-ID: <200503191627.j2JGRXiA018577@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/ktrack

Modified Files:
	ktrack.spec 
Log Message:
Macros in %changelog are dangerous


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ktrack.spec	19 Mar 2005 15:37:45 -0000	1.5
+++ ktrack.spec	19 Mar 2005 16:27:31 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 5.rc1
+Release: 6.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -57,6 +57,9 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-6.rc1
+- Macros in %changelog are dangerous
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-5.rc1
 - Removed explicit hamlib-devel version
  
@@ -64,7 +67,7 @@
 - Added --disable-rpath to %configure
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-3.rc1
-- Modified %setup to use -n
+- Modified %%setup to use -n
 - Broke %description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-2.rc1



From fedora-extras-commits at redhat.com  Sat Mar 19 16:27:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 11:27:33 -0500
Subject: devel/lock-keys-applet lock-keys-applet.spec,1.3,1.4
Message-ID: <200503191627.j2JGRXOD018585@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/lock-keys-applet

Modified Files:
	lock-keys-applet.spec 
Log Message:
Macros in %changelog are dangerous


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/extras/devel/lock-keys-applet/lock-keys-applet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lock-keys-applet.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ lock-keys-applet.spec	19 Mar 2005 16:27:31 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        3
+Release:        4
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
 License:        GPL
@@ -49,8 +49,11 @@
 %{_libexecdir}/%{name}
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-4
+- Macros in %changelog are dangerous
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-3
-- Used %find_lang instead of putting the .mo files in %files.
+- Used %%find_lang instead of putting the .mo files in %files.
 - Broke %description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-2



From fedora-extras-commits at redhat.com  Sat Mar 19 16:27:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 11:27:33 -0500
Subject: devel/python-HTMLgen python-HTMLgen.spec,1.5,1.6
Message-ID: <200503191627.j2JGRXWd018590@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/python-HTMLgen

Modified Files:
	python-HTMLgen.spec 
Log Message:
Macros in %changelog are dangerous


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/devel/python-HTMLgen/python-HTMLgen.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-HTMLgen.spec	17 Mar 2005 22:12:32 -0000	1.5
+++ python-HTMLgen.spec	19 Mar 2005 16:27:31 -0000	1.6
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        2.2.2
-Release:        4
+Release:        5
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -52,15 +52,18 @@
 %{python_sitelib}/*.py[co]
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-5
+- Macros in %changelog are dangerous
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-4
 - Fixed small Provides bug
 
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-3
 - Streamlined version handling
-- Implemented %python_sitelib
+- Implemented %%python_sitelib
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-2
-- Modified %setup to use -n
+- Modified %%setup to use -n
 - Broke %description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-1



From fedora-extras-commits at redhat.com  Sat Mar 19 16:27:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 11:27:33 -0500
Subject: devel/kphone kphone.spec,1.6,1.7
Message-ID: <200503191627.j2JGRXIk018573@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/kphone

Modified Files:
	kphone.spec 
Log Message:
Macros in %changelog are dangerous


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kphone.spec	19 Mar 2005 08:05:28 -0000	1.6
+++ kphone.spec	19 Mar 2005 16:27:31 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        6
+Release:        7
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -53,18 +53,21 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-7
+- Macros in %changelog are dangerous
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-6
-- Split %makeinstall ... to make ... install
+- Split %%makeinstall ... to make ... install
 
 * Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-5
-- Added DESTDIR to %makeinstall
+- Added DESTDIR to %%makeinstall
 
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-4
-- Fixed %configure
+- Fixed %%configure
 - Added po-hacks patch
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-3
-- Modified %setup to use -n
+- Modified %%setup to use -n
 - Broke %description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-2



From fedora-extras-commits at redhat.com  Sat Mar 19 17:31:40 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:31:40 -0500
Subject: rpms/libxfce4mcs - New directory
Message-ID: <200503191731.j2JHVexR020617@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20610/libxfce4mcs

Log Message:
Directory /cvs/extras/rpms/libxfce4mcs added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:31:40 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:31:40 -0500
Subject: rpms/libxfce4mcs/devel - New directory
Message-ID: <200503191731.j2JHVeG7020620@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20610/libxfce4mcs/devel

Log Message:
Directory /cvs/extras/rpms/libxfce4mcs/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:31:55 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:31:55 -0500
Subject: rpms/libxfce4mcs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191731.j2JHVt8i020681@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20672

Added Files:
	Makefile import.log 
Log Message:
Setup of module libxfce4mcs


--- NEW FILE Makefile ---
# Top level Makefile for module libxfce4mcs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 17:31:55 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:31:55 -0500
Subject: rpms/libxfce4mcs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191731.j2JHVtfw020684@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20672/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libxfce4mcs


--- 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 Mar 19 17:32:26 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:32:26 -0500
Subject: rpms/libxfce4mcs import.log,1.1,1.2
Message-ID: <200503191732.j2JHWQIv020783@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20774

Modified Files:
	import.log 
Log Message:
auto-import libxfce4mcs-4.2.1-1 on branch devel from libxfce4mcs-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 17:31:53 -0000	1.1
+++ import.log	19 Mar 2005 17:32:24 -0000	1.2
@@ -0,0 +1 @@
+libxfce4mcs-4_2_1-1:HEAD:libxfce4mcs-4.2.1-1.src.rpm:1111253532



From fedora-extras-commits at redhat.com  Sat Mar 19 17:32:26 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:32:26 -0500
Subject: rpms/libxfce4mcs/devel libxfce4mcs.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191732.j2JHWQIA020787@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20774/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libxfce4mcs.spec 
Log Message:
auto-import libxfce4mcs-4.2.1-1 on branch devel from libxfce4mcs-4.2.1-1.src.rpm


--- NEW FILE libxfce4mcs.spec ---
Summary: Multi-channel settings management support for Xfce
Name: libxfce4mcs
Version: 4.2.1
Release: 1
License: LGPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4mcs-4.2.1.tar.bz2
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Prereq: /sbin/ldconfig

Requires: libxfce4util >= %{version}
Requires: libxfcegui4 >= %{version}

BuildRequires: libxfce4util-devel >= %{version}
BuildRequires: libxfcegui4-devel >= %{version}

%description
This package includes multi-channel settings management support for Xfce.

%package devel
Summary: Developpment tools for libxfce4mcs library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: xorg-x11-devel
Requires: glib2-devel

%description devel
This package includes the static libraries and header files you will need
to compile applications for Xfce.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%{_libdir}/lib*.so.*

%files devel
%defattr(-, root, root)
%{_libdir}/lib*.so
%{_libdir}/*a
%{_libdir}/pkgconfig/*.pc
%{_includedir}/xfce4/libxfce4mcs
%{_datadir}/gtk-doc/html/libxfce4mcs

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Fixed Xfce case

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Inital Fedora Extras version
- Updated the Source line
- Capitalized first letter of Summary in devel section to quiet rpmlint
- Increased the Relase version by one

* Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
- update to 4.2.0

* Wed Dec 08 2004 Than Ngo <than at redhat.com> 4.1.99.1-1
- update to 4.2 rc1

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6
- add requires on xorg-x11-devel, glib2-devel, bug #124199

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Apr 20 2004 Than Ngo <than at redhat.com> 4.0.5-2
- Remove spurious warning at startup, thanks to Olivier Fourdan <fourdan at xfce.org>

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Fri Jan 09 2004 Than Ngo <than at redhat.com> 4.0.3-1
- 4.0.3 release

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 17:31:53 -0000	1.1
+++ .cvsignore	19 Mar 2005 17:32:24 -0000	1.2
@@ -0,0 +1 @@
+libxfce4mcs-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 17:31:53 -0000	1.1
+++ sources	19 Mar 2005 17:32:24 -0000	1.2
@@ -0,0 +1 @@
+2e29527dcabfb0a2f398d253465c0a12  libxfce4mcs-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 17:36:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:36:05 -0500
Subject: rpms/dbh import.log,1.1,1.2
Message-ID: <200503191736.j2JHa5kc020969@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20957

Modified Files:
	import.log 
Log Message:
auto-import dbh-1.0.22-1 on branch devel from dbh-1.0.22-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dbh/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 06:44:16 -0000	1.1
+++ import.log	19 Mar 2005 17:36:03 -0000	1.2
@@ -0,0 +1 @@
+dbh-1_0_22-1:HEAD:dbh-1.0.22-1.src.rpm:1111253751



From fedora-extras-commits at redhat.com  Sat Mar 19 17:36:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:36:05 -0500
Subject: rpms/dbh/devel dbh-1.0.22-rpath.patch, NONE, 1.1 dbh.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191736.j2JHa5og020973@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20957/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dbh-1.0.22-rpath.patch dbh.spec 
Log Message:
auto-import dbh-1.0.22-1 on branch devel from dbh-1.0.22-1.src.rpm

dbh-1.0.22-rpath.patch:

--- NEW FILE dbh-1.0.22-rpath.patch ---
diff -Nur dbh-1.0.22.orig/src/dbh-1.0.pc.in dbh-1.0.22/src/dbh-1.0.pc.in
--- dbh-1.0.22.orig/src/dbh-1.0.pc.in	2005-01-28 13:26:35.000000000 -0700
+++ dbh-1.0.22/src/dbh-1.0.pc.in	2005-03-15 19:10:10.705246122 -0700
@@ -7,5 +7,5 @@
 Description: Diskbased Hashtables
 Requires:
 Version: @DBH_VERSION@
-Libs: -Wl,-R${libdir} -L${libdir} -ldbh -lm
+Libs: -L${libdir} -ldbh -lm
 Cflags: -I${includedir}


--- NEW FILE dbh.spec ---
Summary: Disk based hash library
Name: dbh
Version: 1.0.22
Release: 1
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src/dbh-1.0.22.tar.gz
Patch: dbh-1.0.22-rpath.patch
Epoch: 1
License: LGPL
Group: System Environment/Libraries
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root

%description 
Disk based hashes is a method to create multidimensional binary trees on disk.
This library permits the extension of database concept to a plethora of 
electronic data, such as graphic information. With the multidimensional binary 
tree it is possible to mathematically prove that access time to any 
particular record is minimized (using the concept of critical points from 
calculus), which provides the means to construct optimized databases for 
particular applications.

%package devel
Summary: Header files for disk based hash library
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}

%description devel
This package includes the static libraries and header files you will need
to compile applications for dbh.

%prep
%setup -q

%patch -p1 -b .rpath

%build
%configure --disable-rpath

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT 

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-, root, root)
%doc examples/*.c examples/Makefile* doc/*.html
%{_libdir}/lib*.so
%{_libdir}/*a
%{_libdir}/pkgconfig/*
%{_includedir}/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 1:1.0.22-1
- Updated to 4.2.1 version
- Rediffed rpath patch for new version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 1:1.0.20-3
- Removed generic INSTALL doc from doc

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 1:1.0.20-2
- Inital fedora extras version
- Updated Source line
- Changed license to LGPL
- Increased the Release version by one

* Wed Dec 08 2004 Than Ngo <than at redhat.com> 1:1.0.20-1
- update to 1.0.20

* Tue Sep 28 2004 Than Ngo <than at redhat.com> 1:1.0.18-5
- fix file conflicts

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 13 2004 Than Ngo <than at redhat.com> 1:1.0.18-3
- get rid of rpath

* Sun Apr 18 2004 Warren Togami <wtogami at redhat.com> 1:1.0.18-2
- #121140 explicit epoch in -devel dep

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 1:1.0.18-1
- update to 1.0.18

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 1.0.15-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dbh/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 06:44:16 -0000	1.1
+++ .cvsignore	19 Mar 2005 17:36:03 -0000	1.2
@@ -0,0 +1 @@
+dbh-1.0.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dbh/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 06:44:16 -0000	1.1
+++ sources	19 Mar 2005 17:36:03 -0000	1.2
@@ -0,0 +1 @@
+2dfd35a284068ed0e5a545d18f9bf0f2  dbh-1.0.22.tar.gz



From fedora-extras-commits at redhat.com  Sat Mar 19 17:44:28 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:44:28 -0500
Subject: rpms/gtk-xfce-engine - New directory
Message-ID: <200503191744.j2JHiSW5021234@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21227/gtk-xfce-engine

Log Message:
Directory /cvs/extras/rpms/gtk-xfce-engine added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:44:28 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:44:28 -0500
Subject: rpms/gtk-xfce-engine/devel - New directory
Message-ID: <200503191744.j2JHiSto021237@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21227/gtk-xfce-engine/devel

Log Message:
Directory /cvs/extras/rpms/gtk-xfce-engine/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:44:43 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:44:43 -0500
Subject: rpms/gtk-xfce-engine Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191744.j2JHihnd021301@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21292

Added Files:
	Makefile import.log 
Log Message:
Setup of module gtk-xfce-engine


--- NEW FILE Makefile ---
# Top level Makefile for module gtk-xfce-engine
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 17:44:43 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:44:43 -0500
Subject: rpms/gtk-xfce-engine/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191744.j2JHih3c021304@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21292/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gtk-xfce-engine


--- 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 Mar 19 17:45:13 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:45:13 -0500
Subject: rpms/gtk-xfce-engine import.log,1.1,1.2
Message-ID: <200503191745.j2JHjD8T021405@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21396

Modified Files:
	import.log 
Log Message:
auto-import gtk-xfce-engine-2.2.6-1 on branch devel from gtk-xfce-engine-2.2.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 17:44:41 -0000	1.1
+++ import.log	19 Mar 2005 17:45:11 -0000	1.2
@@ -0,0 +1 @@
+gtk-xfce-engine-2_2_6-1:HEAD:gtk-xfce-engine-2.2.6-1.src.rpm:1111254299



From fedora-extras-commits at redhat.com  Sat Mar 19 17:45:13 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:45:13 -0500
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191745.j2JHjD28021409@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21396/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gtk-xfce-engine.spec 
Log Message:
auto-import gtk-xfce-engine-2.2.6-1 on branch devel from gtk-xfce-engine-2.2.6-1.src.rpm


--- NEW FILE gtk-xfce-engine.spec ---
Summary: Port of Xfce engine to GTK+-2.0
Name: gtk-xfce-engine
Version: 2.2.6
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/gtk-xfce-engine-2.2.6.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: gtk2 >= 2.0.0
Requires: glib2 >= 2.0.0
BuildRequires: gtk2-devel >= 2.0.0
BuildRequires: glib2-devel >= 2.0.0

%description
Port of Xfce engine to GTK+-2.0.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README COPYING AUTHORS
%{_libdir}/gtk-2.0/2.4.0/engines
%{_datadir}/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 2.2.6-1
- Updated to 2.2.6 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 2.2.5-2
- Fixed Xfce case

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 2.2.5-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 17:44:41 -0000	1.1
+++ .cvsignore	19 Mar 2005 17:45:11 -0000	1.2
@@ -0,0 +1 @@
+gtk-xfce-engine-2.2.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 17:44:41 -0000	1.1
+++ sources	19 Mar 2005 17:45:11 -0000	1.2
@@ -0,0 +1 @@
+abb3f1e554d637e01a686360cc120644  gtk-xfce-engine-2.2.6.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 17:46:38 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:46:38 -0500
Subject: rpms/libxfce4util - New directory
Message-ID: <200503191746.j2JHkcAo021558@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21549/libxfce4util

Log Message:
Directory /cvs/extras/rpms/libxfce4util added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:46:38 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:46:38 -0500
Subject: rpms/libxfce4util/devel - New directory
Message-ID: <200503191746.j2JHkcB2021561@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21549/libxfce4util/devel

Log Message:
Directory /cvs/extras/rpms/libxfce4util/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:46:51 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:46:51 -0500
Subject: rpms/libxfce4util Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191746.j2JHkp5R021626@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21617

Added Files:
	Makefile import.log 
Log Message:
Setup of module libxfce4util


--- NEW FILE Makefile ---
# Top level Makefile for module libxfce4util
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 17:46:51 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:46:51 -0500
Subject: rpms/libxfce4util/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191746.j2JHkpXT021629@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21617/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libxfce4util


--- 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 Mar 19 17:47:53 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:47:53 -0500
Subject: rpms/libxfce4util import.log,1.1,1.2
Message-ID: <200503191747.j2JHlrDr021745@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21736

Modified Files:
	import.log 
Log Message:
auto-import libxfce4util-4.2.1-1 on branch devel from libxfce4util-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 17:46:49 -0000	1.1
+++ import.log	19 Mar 2005 17:47:51 -0000	1.2
@@ -0,0 +1 @@
+libxfce4util-4_2_1-1:HEAD:libxfce4util-4.2.1-1.src.rpm:1111254456



From fedora-extras-commits at redhat.com  Sat Mar 19 17:47:53 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:47:53 -0500
Subject: rpms/libxfce4util/devel libxfce4util.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191747.j2JHlrql021749@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21736/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libxfce4util.spec 
Log Message:
auto-import libxfce4util-4.2.1-1 on branch devel from libxfce4util-4.2.1-1.src.rpm


--- NEW FILE libxfce4util.spec ---
Summary: Utility library for the Xfce4 desktop environment
Name: libxfce4util
Version: 4.2.1
Release: 1
License: BSD and LGPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4util-4.2.1.tar.bz2
Group: Development/Libraries
Requires: glib2 >= 2.0.0
Prereq: /sbin/ldconfig
BuildRequires: glib2-devel >= 2.0.0
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

%description
This package includes basic utility non-GUI functions for Xfce4.

%package devel
Summary: Developpment tools for libxfce4util library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: glib2-devel
Requires: gtk2-devel

%description devel
This package includes static libraries and header files for the
libxfce4util library.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%{_libdir}/lib*.so.*
%{_sbindir}/xfce4-kiosk-query

%files devel
%defattr(-, root, root)
%{_libdir}/lib*.so
%{_libdir}/*a
%{_libdir}/pkgconfig/*.pc
%{_includedir}/xfce4/libxfce4util
%{_datadir}/xfce4/m4/
%doc %{_datadir}/gtk-doc/html/libxfce4util

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Fixed License to be BSD and LGPL
- Fixed case on Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Inital Fedora Extras version
- Updated Source line
- Capitalized first letter of Summary in devel section to quiet rpmlint
- Added LGPL to License as 2 files are under LGPL, the rest BSD
- Increased the Release version by one

* Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
- update to 4.2.0 release

* Wed Dec 08 2004 Than Ngo <than at redhat.com> 4.1.99.1-1
- update to 4.2 rc1

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6
- add requires on glib2-devel, bug #124200
- remove unneeded patch file, which is included in new upstream

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Jan 26 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Fri Jan 09 2004 Than Ngo <than at redhat.com> 4.0.3-1
- 4.0.3

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 17:46:49 -0000	1.1
+++ .cvsignore	19 Mar 2005 17:47:51 -0000	1.2
@@ -0,0 +1 @@
+libxfce4util-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 17:46:49 -0000	1.1
+++ sources	19 Mar 2005 17:47:51 -0000	1.2
@@ -0,0 +1 @@
+7fac21585a72c3f4fadf3b0d9807875f  libxfce4util-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 17:51:13 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:51:13 -0500
Subject: rpms/libxfcegui4 - New directory
Message-ID: <200503191751.j2JHpD5B021925@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21916/libxfcegui4

Log Message:
Directory /cvs/extras/rpms/libxfcegui4 added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:51:13 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:51:13 -0500
Subject: rpms/libxfcegui4/devel - New directory
Message-ID: <200503191751.j2JHpDcG021928@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21916/libxfcegui4/devel

Log Message:
Directory /cvs/extras/rpms/libxfcegui4/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:51:28 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:51:28 -0500
Subject: rpms/libxfcegui4 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191751.j2JHpS1M021989@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21980

Added Files:
	Makefile import.log 
Log Message:
Setup of module libxfcegui4


--- NEW FILE Makefile ---
# Top level Makefile for module libxfcegui4
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 17:51:28 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:51:28 -0500
Subject: rpms/libxfcegui4/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191751.j2JHpSHp021992@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21980/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libxfcegui4


--- 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 Mar 19 17:52:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:52:18 -0500
Subject: rpms/libxfcegui4 import.log,1.1,1.2
Message-ID: <200503191752.j2JHqI1K022100@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22091

Modified Files:
	import.log 
Log Message:
auto-import libxfcegui4-4.2.1-2 on branch devel from libxfcegui4-4.2.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 17:51:26 -0000	1.1
+++ import.log	19 Mar 2005 17:52:16 -0000	1.2
@@ -0,0 +1 @@
+libxfcegui4-4_2_1-2:HEAD:libxfcegui4-4.2.1-2.src.rpm:1111254723



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:52:18 -0500
Subject: rpms/libxfcegui4/devel libxfcegui4.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191752.j2JHqIlb022104@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22091/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libxfcegui4.spec 
Log Message:
auto-import libxfcegui4-4.2.1-2 on branch devel from libxfcegui4-4.2.1-2.src.rpm


--- NEW FILE libxfcegui4.spec ---
Summary: GTK widgets for Xfce
Name: libxfcegui4
Version: 4.2.1
Release: 2
License: LGPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfcegui4-4.2.1.tar.bz2
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Prereq: /sbin/ldconfig
Requires: gtk2 >= 2.0.6
Requires: libxfce4util >= %{version}
BuildRequires: gtk2-devel >= 2.0.6
BuildRequires: libxfce4util-devel >= %{version}
BuildRequires: dbh-devel >= 1.0

%description
The package includes various gtk widgets for Xfce.

%package devel
Summary: Developpment tools for libxfcegui4 library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gtk2-devel
Requires: libxfce4util-devel
Provides: libxfcegui4-devel

%description devel
This package includes the static libraries and header files you will need
to compile applications for Xfce.

%prep
%setup -q

%build
%configure --enable-xinerama

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root)
%{_libdir}/lib*.so*
%{_libdir}/xfce4/modules/*.so*
%{_datadir}/xfce4/*

%files devel
%defattr(-, root, root)
%{_libdir}/lib*.so
%{_libdir}/*a
%{_libdir}/xfce4/modules/*.a
%{_libdir}/xfce4/modules/*.la
%{_libdir}/pkgconfig/*.pc
%{_includedir}/xfce4/*
%{_datadir}/gtk-doc/html/libxfcegui4

%changelog
* Wed Mar 16 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
- Fixed %files bug that wasn't packaging .so files

* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Fixed Xfce case

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Inital Fedora Extras version
- Updated the Source line
- Capitalized first letter of Summary in devel section to quiet rpmlint
- Added dbh-devel to BuildRequires
- Capitalized the GTK in the Summary to queit rpmlint
- Moved all the module *.a and *.la libraries to the devel package
- Added Provides: libxfcegui4-devel to devel package
- Increased the Relase version by one

* Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
- update to 4.2.0

* Wed Dec 08 2004 Than Ngo <than at redhat.com> 4.1.99.1-1
- update to 4.2 rc1

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Thu Mar 11 2004 Than Ngo <than at redhat.com> 4.0.3-4
- rebuilt

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Fri Jan 09 2004 Than Ngo <than at redhat.com> 4.0.3-1
- 4.0.3 release

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2 release

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 17:51:26 -0000	1.1
+++ .cvsignore	19 Mar 2005 17:52:16 -0000	1.2
@@ -0,0 +1 @@
+libxfcegui4-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 17:51:26 -0000	1.1
+++ sources	19 Mar 2005 17:52:16 -0000	1.2
@@ -0,0 +1 @@
+020c057cfe25a8aca99af9f39fe2015a  libxfcegui4-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/clearlooks clearlooks.spec,1.5,1.6
Message-ID: <200503191752.j2JHqlpL022228@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/clearlooks

Modified Files:
	clearlooks.spec 
Log Message:
%%


Index: clearlooks.spec
===================================================================
RCS file: /cvs/extras/devel/clearlooks/clearlooks.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- clearlooks.spec	17 Mar 2005 05:36:01 -0000	1.5
+++ clearlooks.spec	19 Mar 2005 17:52:45 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           clearlooks
 Version:        0.4
-Release:        5
+Release:        6
 Summary:        An attractive GTK+ 2 engine with a focus on usability
 Group:          User Interface/Desktops
 License:        GPL
@@ -35,12 +35,15 @@
 %{_libdir}/gtk-2.0/2.4.0/engines/*
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-6
+- %%
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-5
 - Added libgnome-devel to BR
 - Removed iffy dir patch
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-4
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-3
 - Fixed build problem with metacity-theme-1.xml



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/python-HTMLgen python-HTMLgen.spec,1.6,1.7
Message-ID: <200503191752.j2JHqljv022276@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-HTMLgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/python-HTMLgen

Modified Files:
	python-HTMLgen.spec 
Log Message:
%%


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/devel/python-HTMLgen/python-HTMLgen.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-HTMLgen.spec	19 Mar 2005 16:27:31 -0000	1.6
+++ python-HTMLgen.spec	19 Mar 2005 17:52:45 -0000	1.7
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        2.2.2
-Release:        5
+Release:        6
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -52,8 +52,11 @@
 %{python_sitelib}/*.py[co]
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-6
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-5
-- Macros in %changelog are dangerous
+- Macros in %%changelog are dangerous
 
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-4
 - Fixed small Provides bug
@@ -64,7 +67,7 @@
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-2
 - Modified %%setup to use -n
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-1
 - Bump release to 1



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/leafpad leafpad.spec,1.4,1.5
Message-ID: <200503191752.j2JHqldf022260@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/leafpad

Modified Files:
	leafpad.spec 
Log Message:
%%


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/devel/leafpad/leafpad.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- leafpad.spec	19 Mar 2005 15:33:13 -0000	1.4
+++ leafpad.spec	19 Mar 2005 17:52:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           leafpad
 Version:        0.7.9
-Release:        4
+Release:        5
 Summary:        GTK+ based simple text editor
 
 Group:          Applications/Editors
@@ -61,11 +61,14 @@
 %{_datadir}/pixmaps/leafpad.png
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-5
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-4
 - Added desktop-file-utils to BuildRequires
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-3
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-2
 - Removed explicit Requires



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/libosip libosip.spec,1.4,1.5
Message-ID: <200503191752.j2JHqlvK022264@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/libosip

Modified Files:
	libosip.spec 
Log Message:
%%


Index: libosip.spec
===================================================================
RCS file: /cvs/extras/devel/libosip/libosip.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libosip.spec	19 Mar 2005 16:27:31 -0000	1.4
+++ libosip.spec	19 Mar 2005 17:52:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libosip
 Version:        0.9.7
-Release:        4
+Release:        5
 Summary:        oSIP is an implementation of SIP
 
 Group:          System Environment/Libraries
@@ -73,15 +73,18 @@
 %{_libdir}/*.so
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-5
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-4
-- Macros in %changelog are dangerous
+- Macros in %%changelog are dangerous
 
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-3
 - Spec file cleanup
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-2
-- Fix %files devel to include %%{_includedir}/osip
-- Broke %description at 80 columns
+- Fix %%files devel to include %%{_includedir}/osip
+- Broke %%description at 80 columns
 
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-1
 - Bump release to 1



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/python-amara python-amara.spec,1.5,1.6
Message-ID: <200503191752.j2JHqlGK022280@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/python-amara

Modified Files:
	python-amara.spec 
Log Message:
%%


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/devel/python-amara/python-amara.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-amara.spec	19 Mar 2005 16:27:31 -0000	1.5
+++ python-amara.spec	19 Mar 2005 17:52:45 -0000	1.6
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        0.9.4
-Release:        4
+Release:        6
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -55,17 +55,20 @@
 %doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-6
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-5
-- Macros in %changelog are dangerous
+- Macros in %%changelog are dangerous
 
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-4
 - Streamlined/fixed Python version handling
 - Implemented %%python_sitelib
-- Decreased verbosity in %description
+- Decreased verbosity in %%description
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-3
 - Better %%pyver and BR/Requires handling
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 - Fixed file ownership
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-2



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/edb edb.spec,1.4,1.5
Message-ID: <200503191752.j2JHqlh9022236@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/edb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/edb

Modified Files:
	edb.spec 
Log Message:
%%


Index: edb.spec
===================================================================
RCS file: /cvs/extras/devel/edb/edb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- edb.spec	18 Mar 2005 18:45:26 -0000	1.4
+++ edb.spec	19 Mar 2005 17:52:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           edb
 Version:        1.0.5
-Release:        4
+Release:        5
 Summary:        A database convenience library wrapped around BDB
 Group:          System Environment/Libraries
 License:        MIT
@@ -85,18 +85,21 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-5
+- %%
+
 * Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-4
 - Fixed URL
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-3
-- Broke %descriptions at 80 columns
+- Broke %%descriptions at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-2
 - Removed explicit Requires
 
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-1
 - Bump release to 1
-- Fix %description of -gtk
+- Fix %%description of -gtk
 - Fix Source0
 
 * Wed Mar  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-0.iva.1



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/ktrack ktrack.spec,1.6,1.7
Message-ID: <200503191752.j2JHqllZ022256@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/ktrack

Modified Files:
	ktrack.spec 
Log Message:
%%


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ktrack.spec	19 Mar 2005 16:27:31 -0000	1.6
+++ ktrack.spec	19 Mar 2005 17:52:45 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 6.rc1
+Release: 7.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -57,18 +57,21 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-7.rc1
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-6.rc1
-- Macros in %changelog are dangerous
+- Macros in %%changelog are dangerous
 
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-5.rc1
 - Removed explicit hamlib-devel version
  
 * Fri Mar 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-4.rc1
-- Added --disable-rpath to %configure
+- Added --disable-rpath to %%configure
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-3.rc1
 - Modified %%setup to use -n
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-2.rc1
 - Removed explicit Requires
@@ -76,7 +79,7 @@
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-1.rc1
 - Bump release to 1
 - Fixed BuildRoot
-- Added -with-qt-* options to %configure
+- Added -with-qt-* options to %%configure
 
 * Mon Jan 31 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.3.0-0.iva.1.rc1
 - Rebuild against hamlib 1.2.3



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/hamlib hamlib.spec,1.5,1.6
Message-ID: <200503191752.j2JHqlkb022248@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/hamlib

Modified Files:
	hamlib.spec 
Log Message:
%%


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hamlib.spec	17 Mar 2005 22:59:24 -0000	1.5
+++ hamlib.spec	19 Mar 2005 17:52:45 -0000	1.6
@@ -1,6 +1,6 @@
 Name: hamlib
 Version: 1.2.3
-Release: 5
+Release: 6
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transcievers and receivers.
@@ -201,14 +201,17 @@
 
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-6
+- %%
+
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-5
 - Removed spurious Requires(...)
 
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-4
-- Fixed %post and %postun along with Requires(...)
+- Fixed %%post and %%postun along with Requires(...)
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-3
-- Spell-corrected %description
+- Spell-corrected %%description
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-2
 - Removed/fixed explicit Requires
@@ -224,7 +227,7 @@
 - Upstream update
 
 * Sun Jan  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.2-0.iva.1
-- Fixed %files %defattr
+- Fixed %%files %%defattr
 
 * Sun Jan  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.2-0.iva.0
 - Ported to FC3



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/lock-keys-applet lock-keys-applet.spec,1.4,1.5
Message-ID: <200503191752.j2JHql91022272@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/lock-keys-applet

Modified Files:
	lock-keys-applet.spec 
Log Message:
%%


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/extras/devel/lock-keys-applet/lock-keys-applet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lock-keys-applet.spec	19 Mar 2005 16:27:31 -0000	1.4
+++ lock-keys-applet.spec	19 Mar 2005 17:52:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        4
+Release:        5
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
 License:        GPL
@@ -49,12 +49,15 @@
 %{_libexecdir}/%{name}
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-5
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-4
-- Macros in %changelog are dangerous
+- Macros in %%changelog are dangerous
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-3
-- Used %%find_lang instead of putting the .mo files in %files.
-- Broke %description at 80 columns
+- Used %%find_lang instead of putting the .mo files in %%files.
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-2
 - Removed explicit Requires



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/gpredict gpredict.spec,1.3,1.4
Message-ID: <200503191752.j2JHqlwd022244@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/gpredict
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/gpredict

Modified Files:
	gpredict.spec 
Log Message:
%%


Index: gpredict.spec
===================================================================
RCS file: /cvs/extras/devel/gpredict/gpredict.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gpredict.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ gpredict.spec	19 Mar 2005 17:52:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gpredict
 Version:        0.5.0
-Release:        2
+Release:        3
 Summary:        Real-time satellite tracking and orbit prediction program
 Group:          Applications/Communications
 License:        GPL
@@ -64,8 +64,11 @@
 %{_datadir}/pixmaps/%{name}
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-4
+- %%
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-3
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0-2
 - Removed explicit Requires



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/deskbar-applet deskbar-applet.spec,1.2,1.3
Message-ID: <200503191752.j2JHqleq022232@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/deskbar-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/deskbar-applet

Modified Files:
	deskbar-applet.spec 
Log Message:
%%


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/devel/deskbar-applet/deskbar-applet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- deskbar-applet.spec	16 Mar 2005 23:41:59 -0000	1.2
+++ deskbar-applet.spec	19 Mar 2005 17:52:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           deskbar-applet
 Version:        0.2
-Release:        2
+Release:        3
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
 License:        GPL
@@ -43,8 +43,11 @@
 %{_libdir}/bonobo/servers/DeskbarApplet.server
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-3
+- %%
+
 * Wed Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-2
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-1
 - Bump release to 1



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/linphone linphone.spec,1.4,1.5
Message-ID: <200503191752.j2JHqlA6022268@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/linphone

Modified Files:
	linphone.spec 
Log Message:
%%


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linphone.spec	19 Mar 2005 15:57:41 -0000	1.4
+++ linphone.spec	19 Mar 2005 17:52:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        4
+Release:        5
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -85,13 +85,16 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-5
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-4
-- Used %find_lang
-- Tightened up %files
+- Used %%find_lang
+- Tightened up %%files
 - Streamlined spec file
 
 * Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-3
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-2
 - Removed explicit Requires



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/kphone kphone.spec,1.7,1.8
Message-ID: <200503191752.j2JHql3m022252@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/kphone

Modified Files:
	kphone.spec 
Log Message:
%%


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kphone.spec	19 Mar 2005 16:27:31 -0000	1.7
+++ kphone.spec	19 Mar 2005 17:52:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        7
+Release:        8
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -53,8 +53,11 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-8
+- %%
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-7
-- Macros in %changelog are dangerous
+- Macros in %%changelog are dangerous
 
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-6
 - Split %%makeinstall ... to make ... install
@@ -68,7 +71,7 @@
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-3
 - Modified %%setup to use -n
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-2
 - Removed explicit Requires



From fedora-extras-commits at redhat.com  Sat Mar 19 17:52:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 19 Mar 2005 12:52:47 -0500
Subject: devel/ghasher ghasher.spec,1.3,1.4
Message-ID: <200503191752.j2JHqlOg022240@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ghasher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183/ghasher

Modified Files:
	ghasher.spec 
Log Message:
%%


Index: ghasher.spec
===================================================================
RCS file: /cvs/extras/devel/ghasher/ghasher.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghasher.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ ghasher.spec	19 Mar 2005 17:52:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ghasher
 Version:        1.2.0
-Release:        3
+Release:        4
 Summary:        GUI hasher for GTK+ 2
 Group:          Applications/File
 License:        BSD
@@ -55,15 +55,18 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-4
+- %%
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-3
-- Broke %description at 80 columns
+- Broke %%description at 80 columns
 
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-2
 - Removed explicit Requires
 
 * Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-1
 - Bump release to 1
-- Cleaned up %description
+- Cleaned up %%description
 
 * Thu Mar  3 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:1.2.0-0.iva.1
 - Fixed several packaging errors



From fedora-extras-commits at redhat.com  Sat Mar 19 17:53:26 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:53:26 -0500
Subject: rpms/xfcalendar - New directory
Message-ID: <200503191753.j2JHrQWN022574@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22562/xfcalendar

Log Message:
Directory /cvs/extras/rpms/xfcalendar added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:53:26 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:53:26 -0500
Subject: rpms/xfcalendar/devel - New directory
Message-ID: <200503191753.j2JHrQFM022577@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22562/xfcalendar/devel

Log Message:
Directory /cvs/extras/rpms/xfcalendar/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:53:54 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:53:54 -0500
Subject: rpms/xfcalendar Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191753.j2JHrsh4022639@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22630

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfcalendar


--- NEW FILE Makefile ---
# Top level Makefile for module xfcalendar
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 17:53:54 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:53:54 -0500
Subject: rpms/xfcalendar/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191753.j2JHrswa022642@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22630/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfcalendar


--- 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 Mar 19 17:54:26 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:54:26 -0500
Subject: rpms/xfcalendar import.log,1.1,1.2
Message-ID: <200503191754.j2JHsQ3G022749@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22737

Modified Files:
	import.log 
Log Message:
auto-import xfcalendar-4.2.1-1 on branch devel from xfcalendar-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 17:53:52 -0000	1.1
+++ import.log	19 Mar 2005 17:54:24 -0000	1.2
@@ -0,0 +1 @@
+xfcalendar-4_2_1-1:HEAD:xfcalendar-4.2.1-1.src.rpm:1111254851



From fedora-extras-commits at redhat.com  Sat Mar 19 17:54:26 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:54:26 -0500
Subject: rpms/xfcalendar/devel xfcalendar.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191754.j2JHsQ69022752@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22737/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfcalendar.spec 
Log Message:
auto-import xfcalendar-4.2.1-1 on branch devel from xfcalendar-4.2.1-1.src.rpm


--- NEW FILE xfcalendar.spec ---
Summary: Time-managing application for Xfce4
Name: xfcalendar
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfcalendar-4.2.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xfce-mcs-manager-devel

%description
Time-managing application for Xfce4

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README ChangeLog COPYING AUTHORS
%{_bindir}/xfcalendar
%{_libdir}/xfce4/mcs-plugins/xfcalendar_plugin.a
%{_libdir}/xfce4/mcs-plugins/xfcalendar_plugin.la
%{_libdir}/xfce4/mcs-plugins/xfcalendar_plugin.so
%{_datadir}/applications/xfcalendar.desktop
%{_datadir}/applications/xfce-xfcalendar-settings.desktop
%{_datadir}/icons/hicolor/48x48/apps/xfcalendar.png
%{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc
- Added BuildRequires for xfce-mcs-manager-devel

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 17:53:52 -0000	1.1
+++ .cvsignore	19 Mar 2005 17:54:24 -0000	1.2
@@ -0,0 +1 @@
+xfcalendar-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 17:53:52 -0000	1.1
+++ sources	19 Mar 2005 17:54:24 -0000	1.2
@@ -0,0 +1 @@
+b64bf1b492660c25fa12f838e470b777  xfcalendar-4.2.1.tar.bz2



From ivazquez at ivazquez.net  Sat Mar 19 17:57:19 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Sat, 19 Mar 2005 12:57:19 -0500
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec, NONE, 1.1
	.cvsignore, 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503191745.j2JHjD28021409@cvs-int.fedora.redhat.com>
References: <200503191745.j2JHjD28021409@cvs-int.fedora.redhat.com>
Message-ID: <1111255039.26827.20.camel@ignacio.ignacio.lan>

On Sat, 2005-03-19 at 12:45 -0500, Kevin Fenzi wrote:
> Author: kevin
> 
> Requires: gtk2 >= 2.0.0
> Requires: glib2 >= 2.0.0

Lots and lots of explicit Requires to clean up.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050319/354e3a24/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Sat Mar 19 17:58:11 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:58:11 -0500
Subject: rpms/xfce4-appfinder - New directory
Message-ID: <200503191758.j2JHwBXn022928@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22921/xfce4-appfinder

Log Message:
Directory /cvs/extras/rpms/xfce4-appfinder added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:58:11 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:58:11 -0500
Subject: rpms/xfce4-appfinder/devel - New directory
Message-ID: <200503191758.j2JHwBXG022931@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22921/xfce4-appfinder/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-appfinder/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:58:24 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:58:24 -0500
Subject: rpms/xfce4-appfinder Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191758.j2JHwOEp022992@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22983

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-appfinder


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-appfinder
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 17:58:24 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:58:24 -0500
Subject: rpms/xfce4-appfinder/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191758.j2JHwOGe022995@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22983/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-appfinder


--- 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 Mar 19 17:58:47 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:58:47 -0500
Subject: rpms/xfce4-appfinder import.log,1.1,1.2
Message-ID: <200503191758.j2JHwlMJ023096@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23085

Modified Files:
	import.log 
Log Message:
auto-import xfce4-appfinder-4.2.1-1 on branch devel from xfce4-appfinder-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 17:58:22 -0000	1.1
+++ import.log	19 Mar 2005 17:58:45 -0000	1.2
@@ -0,0 +1 @@
+xfce4-appfinder-4_2_1-1:HEAD:xfce4-appfinder-4.2.1-1.src.rpm:1111255113



From fedora-extras-commits at redhat.com  Sat Mar 19 17:58:47 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:58:47 -0500
Subject: rpms/xfce4-appfinder/devel xfce4-appfinder.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191758.j2JHwlSA023100@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23085/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-appfinder.spec 
Log Message:
auto-import xfce4-appfinder-4.2.1-1 on branch devel from xfce4-appfinder-4.2.1-1.src.rpm


--- NEW FILE xfce4-appfinder.spec ---
Summary: Appfinder for the Xfce4 Desktop Environment
Name: xfce4-appfinder
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-appfinder-4.2.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: libxfcegui4 >= 4.2.0
BuildRequires: libxfcegui4-devel >= 4.2.0

%description
xfce-appfinder shows system wide installed applications

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README TODO ChangeLog NEWS COPYING AUTHORS
%{_bindir}/xfce4-appfinder
%{_datadir}/applications/xfce4-appfinder.desktop
%{_datadir}/pixmaps/xfce4-appfinder.png
%{_datadir}/xfce4/doc/C/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version
- Fixed %files section to not list lang files twice

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc
- Fixed case on Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 17:58:22 -0000	1.1
+++ .cvsignore	19 Mar 2005 17:58:45 -0000	1.2
@@ -0,0 +1 @@
+xfce4-appfinder-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 17:58:22 -0000	1.1
+++ sources	19 Mar 2005 17:58:45 -0000	1.2
@@ -0,0 +1 @@
+6bf74961b2aa65c2fae98f9c3d6aabce  xfce4-appfinder-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 17:59:55 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:59:55 -0500
Subject: rpms/xfce4-iconbox - New directory
Message-ID: <200503191759.j2JHxtw9023234@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23227/xfce4-iconbox

Log Message:
Directory /cvs/extras/rpms/xfce4-iconbox added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 17:59:55 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 12:59:55 -0500
Subject: rpms/xfce4-iconbox/devel - New directory
Message-ID: <200503191759.j2JHxtFo023237@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23227/xfce4-iconbox/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-iconbox/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:00:08 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:00:08 -0500
Subject: rpms/xfce4-iconbox Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191800.j2JI08Tg023298@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23289

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-iconbox


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-iconbox
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:00:08 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:00:08 -0500
Subject: rpms/xfce4-iconbox/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191800.j2JI085F023301@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23289/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-iconbox


--- 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 Mar 19 18:00:36 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:00:36 -0500
Subject: rpms/xfce4-iconbox import.log,1.1,1.2
Message-ID: <200503191800.j2JI0auh023402@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23393

Modified Files:
	import.log 
Log Message:
auto-import xfce4-iconbox-4.2.1-1 on branch devel from xfce4-iconbox-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-iconbox/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:00:06 -0000	1.1
+++ import.log	19 Mar 2005 18:00:34 -0000	1.2
@@ -0,0 +1 @@
+xfce4-iconbox-4_2_1-1:HEAD:xfce4-iconbox-4.2.1-1.src.rpm:1111255221



From fedora-extras-commits at redhat.com  Sat Mar 19 18:00:36 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:00:36 -0500
Subject: rpms/xfce4-iconbox/devel xfce4-iconbox.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191800.j2JI0aL5023406@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23393/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-iconbox.spec 
Log Message:
auto-import xfce4-iconbox-4.2.1-1 on branch devel from xfce4-iconbox-4.2.1-1.src.rpm


--- NEW FILE xfce4-iconbox.spec ---
Summary: Icon box for the Xfce4 Desktop Environment
Name: xfce4-iconbox
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-iconbox-4.2.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: libxfcegui4 >= %{version}
Requires: libxfce4mcs >= %{version}
BuildRequires: pkgconfig
BuildRequires: gettext
BuildRequires: libxfcegui4-devel >= %{version}
BuildRequires: libxfce4mcs-devel >= %{version}
BuildRequires: xfce-mcs-manager-devel >= %{version}

%description
xfce-iconbox shows icons for running programs.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root, 0755)
%doc README TODO ChangeLog NEWS COPYING AUTHORS
%{_bindir}/*
%{_libdir}/xfce4/mcs-plugins
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/*/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to version 4.2.1

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Fixed case on Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Inital Fedora Extras version
- Updated the Source line
- Increased the Release by one

* Fri Jan 28 2005 Than Ngo <than at redhat.com> 4.2.0-1
- 4.2.0

* Wed Sep 01 2004 Than Ngo <than at redhat.com> 4.0.6-2
- use find_lang macro
- get rid of useless static library

* Tue Aug 17 2004 Than Ngo <than at redhat.com> 4.0.6-1 
- Initial packaging for Fedora Core 3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-iconbox/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:00:06 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:00:34 -0000	1.2
@@ -0,0 +1 @@
+xfce4-iconbox-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-iconbox/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:00:06 -0000	1.1
+++ sources	19 Mar 2005 18:00:34 -0000	1.2
@@ -0,0 +1 @@
+81919388d17e2d1395bea8d92d99c6f8  xfce4-iconbox-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:02:47 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:02:47 -0500
Subject: rpms/xfce4-icon-theme - New directory
Message-ID: <200503191802.j2JI2lvJ024326@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24317/xfce4-icon-theme

Log Message:
Directory /cvs/extras/rpms/xfce4-icon-theme added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:02:48 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:02:48 -0500
Subject: rpms/xfce4-icon-theme/devel - New directory
Message-ID: <200503191802.j2JI2m5h024329@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24317/xfce4-icon-theme/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-icon-theme/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:03:03 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:03:03 -0500
Subject: rpms/xfce4-icon-theme Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191803.j2JI338S024390@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24381

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-icon-theme


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-icon-theme
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Mar 19 18:03:03 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:03:03 -0500
Subject: rpms/xfce4-icon-theme/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191803.j2JI33KK024393@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24381/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-icon-theme


--- 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 Mar 19 18:03:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:03:42 -0500
Subject: rpms/xfce4-icon-theme import.log,1.1,1.2
Message-ID: <200503191803.j2JI3gG5024494@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24485

Modified Files:
	import.log 
Log Message:
auto-import xfce4-icon-theme-4.2.1-1 on branch devel from xfce4-icon-theme-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:03:00 -0000	1.1
+++ import.log	19 Mar 2005 18:03:40 -0000	1.2
@@ -0,0 +1 @@
+xfce4-icon-theme-4_2_1-1:HEAD:xfce4-icon-theme-4.2.1-1.src.rpm:1111255409



From fedora-extras-commits at redhat.com  Sat Mar 19 18:03:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:03:42 -0500
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191803.j2JI3g4b024498@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24485/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-icon-theme.spec 
Log Message:
auto-import xfce4-icon-theme-4.2.1-1 on branch devel from xfce4-icon-theme-4.2.1-1.src.rpm


--- NEW FILE xfce4-icon-theme.spec ---
Summary: Icons for Xfce
Name: xfce4-icon-theme
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-icon-theme-4.2.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Icon theme for Xfce 4 Desktop Environment.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README ChangeLog NEWS COPYING AUTHORS
%{_datadir}/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:03:00 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:03:40 -0000	1.2
@@ -0,0 +1 @@
+xfce4-icon-theme-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:03:01 -0000	1.1
+++ sources	19 Mar 2005 18:03:40 -0000	1.2
@@ -0,0 +1 @@
+d0471ff2772a55664cc3081db8c2b973  xfce4-icon-theme-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:05:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:05:20 -0500
Subject: rpms/xfce4-mixer - New directory
Message-ID: <200503191805.j2JI5KQc024648@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24639/xfce4-mixer

Log Message:
Directory /cvs/extras/rpms/xfce4-mixer added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:05:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:05:20 -0500
Subject: rpms/xfce4-mixer/devel - New directory
Message-ID: <200503191805.j2JI5K1X024651@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24639/xfce4-mixer/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-mixer/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:05:38 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:05:38 -0500
Subject: rpms/xfce4-mixer Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191805.j2JI5cOA024712@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24703

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-mixer


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-mixer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Mar 19 18:05:38 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:05:38 -0500
Subject: rpms/xfce4-mixer/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191805.j2JI5cl0024715@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24703/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-mixer


--- 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 Mar 19 18:06:07 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:06:07 -0500
Subject: rpms/xfce4-mixer import.log,1.1,1.2
Message-ID: <200503191806.j2JI67FD024814@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24805

Modified Files:
	import.log 
Log Message:
auto-import xfce4-mixer-4.2.1-1 on branch devel from xfce4-mixer-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:05:36 -0000	1.1
+++ import.log	19 Mar 2005 18:06:05 -0000	1.2
@@ -0,0 +1 @@
+xfce4-mixer-4_2_1-1:HEAD:xfce4-mixer-4.2.1-1.src.rpm:1111255551



From fedora-extras-commits at redhat.com  Sat Mar 19 18:06:07 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:06:07 -0500
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191806.j2JI67OD024820@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24805/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-mixer.spec 
Log Message:
auto-import xfce4-mixer-4.2.1-1 on branch devel from xfce4-mixer-4.2.1-1.src.rpm


--- NEW FILE xfce4-mixer.spec ---
Summary: Volume control plugin for the Xfce 4 panel
Name: xfce4-mixer
Version: 4.2.1
Release: 1
License: BSD
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-mixer-4.2.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xfce4-panel >= 4.2.1
BuildRequires: xfce4-panel >= 4.2.1

%description
Volume control plugin for the Xfce 4 panel

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README TODO ChangeLog NOTES COPYING AUTHORS NEWS
%{_bindir}/xfce4-mixer
%{_libdir}/xfce4/*
%{_datadir}/applications/xfce-mixer-settings.desktop
%{_datadir}/icons/hicolor/48x48/apps/xfce4-mixer.png

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:05:36 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:06:05 -0000	1.2
@@ -0,0 +1 @@
+xfce4-mixer-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:05:36 -0000	1.1
+++ sources	19 Mar 2005 18:06:05 -0000	1.2
@@ -0,0 +1 @@
+8f4288708d6365178fec89053742fa01  xfce4-mixer-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:07:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:07:05 -0500
Subject: rpms/xfce4-panel - New directory
Message-ID: <200503191807.j2JI750L024948@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24941/xfce4-panel

Log Message:
Directory /cvs/extras/rpms/xfce4-panel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:07:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:07:05 -0500
Subject: rpms/xfce4-panel/devel - New directory
Message-ID: <200503191807.j2JI75k3024951@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24941/xfce4-panel/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-panel/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:07:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:07:18 -0500
Subject: rpms/xfce4-panel Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191807.j2JI7IZv025013@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25003

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-panel


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-panel
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:07:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:07:18 -0500
Subject: rpms/xfce4-panel/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191807.j2JI7Ile025014@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25003/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-panel


--- 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 Mar 19 18:07:53 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:07:53 -0500
Subject: rpms/xfce4-panel import.log,1.1,1.2
Message-ID: <200503191807.j2JI7rGk025125@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25116

Modified Files:
	import.log 
Log Message:
auto-import xfce4-panel-4.2.1.1-1 on branch devel from xfce4-panel-4.2.1.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:07:15 -0000	1.1
+++ import.log	19 Mar 2005 18:07:51 -0000	1.2
@@ -0,0 +1 @@
+xfce4-panel-4_2_1_1-1:HEAD:xfce4-panel-4.2.1.1-1.src.rpm:1111255659



From fedora-extras-commits at redhat.com  Sat Mar 19 18:07:53 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:07:53 -0500
Subject: rpms/xfce4-panel/devel panel-launchmail.patch, NONE,
	1.1 xfce4-panel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200503191807.j2JI7rZK025132@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25116/devel

Modified Files:
	.cvsignore sources 
Added Files:
	panel-launchmail.patch xfce4-panel.spec 
Log Message:
auto-import xfce4-panel-4.2.1.1-1 on branch devel from xfce4-panel-4.2.1.1-1.src.rpm

panel-launchmail.patch:

--- NEW FILE panel-launchmail.patch ---
diff -Naur xfce4-panel-4.2.0.orig/contents.xml xfce4-panel-4.2.0/contents.xml
--- xfce4-panel-4.2.0.orig/contents.xml	2004-11-11 13:21:40.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml	2005-03-06 12:30:36.094410428 -0700
@@ -50,7 +50,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ar xfce4-panel-4.2.0/contents.xml.ar
--- xfce4-panel-4.2.0.orig/contents.xml.ar	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.ar	2005-03-06 12:32:03.001970353 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.az xfce4-panel-4.2.0/contents.xml.az
--- xfce4-panel-4.2.0.orig/contents.xml.az	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.az	2005-03-06 12:32:10.393827217 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ca xfce4-panel-4.2.0/contents.xml.ca
--- xfce4-panel-4.2.0.orig/contents.xml.ca	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.ca	2005-03-06 12:32:15.329063993 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.eu xfce4-panel-4.2.0/contents.xml.eu
--- xfce4-panel-4.2.0.orig/contents.xml.eu	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.eu	2005-03-06 12:32:21.150163772 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.fr xfce4-panel-4.2.0/contents.xml.fr
--- xfce4-panel-4.2.0.orig/contents.xml.fr	2004-11-26 10:53:59.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.fr	2005-03-06 12:32:26.080401321 -0700
@@ -50,7 +50,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.he xfce4-panel-4.2.0/contents.xml.he
--- xfce4-panel-4.2.0.orig/contents.xml.he	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.he	2005-03-06 12:32:32.065475742 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.hu xfce4-panel-4.2.0/contents.xml.hu
--- xfce4-panel-4.2.0.orig/contents.xml.hu	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.hu	2005-03-06 12:32:37.809587427 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.it xfce4-panel-4.2.0/contents.xml.it
--- xfce4-panel-4.2.0.orig/contents.xml.it	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.it	2005-03-06 12:32:43.531702513 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ko xfce4-panel-4.2.0/contents.xml.ko
--- xfce4-panel-4.2.0.orig/contents.xml.ko	2004-12-05 16:43:32.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.ko	2005-03-06 12:32:49.445787912 -0700
@@ -50,7 +50,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.lt xfce4-panel-4.2.0/contents.xml.lt
--- xfce4-panel-4.2.0.orig/contents.xml.lt	2005-01-10 05:23:37.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.lt	2005-03-06 12:32:57.514540097 -0700
@@ -50,7 +50,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ms xfce4-panel-4.2.0/contents.xml.ms
--- xfce4-panel-4.2.0.orig/contents.xml.ms	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.ms	2005-03-06 12:33:02.966696932 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.nl xfce4-panel-4.2.0/contents.xml.nl
--- xfce4-panel-4.2.0.orig/contents.xml.nl	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.nl	2005-03-06 12:33:07.448003907 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ro xfce4-panel-4.2.0/contents.xml.ro
--- xfce4-panel-4.2.0.orig/contents.xml.ro	2005-01-09 05:03:42.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.ro	2005-03-06 12:33:11.880318459 -0700
@@ -50,7 +50,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail -splash</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ru xfce4-panel-4.2.0/contents.xml.ru
--- xfce4-panel-4.2.0.orig/contents.xml.ru	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.ru	2005-03-06 12:33:22.203721965 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.sk xfce4-panel-4.2.0/contents.xml.sk
--- xfce4-panel-4.2.0.orig/contents.xml.sk	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.sk	2005-03-06 12:33:27.477906324 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.tr xfce4-panel-4.2.0/contents.xml.tr
--- xfce4-panel-4.2.0.orig/contents.xml.tr	2004-11-29 02:47:38.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.tr	2005-03-06 12:33:33.747936677 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.vi xfce4-panel-4.2.0/contents.xml.vi
--- xfce4-panel-4.2.0.orig/contents.xml.vi	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.vi	2005-03-06 12:33:38.300232673 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>
diff -Naur xfce4-panel-4.2.0.orig/contents.xml.zh_TW xfce4-panel-4.2.0/contents.xml.zh_TW
--- xfce4-panel-4.2.0.orig/contents.xml.zh_TW	2004-11-09 13:44:44.000000000 -0700
+++ xfce4-panel-4.2.0/contents.xml.zh_TW	2005-03-06 12:33:43.195475634 -0700
@@ -44,7 +44,7 @@
       <Popup/>
       <Control id="-1" filename="libmailcheck.so">
         <Mailcheck interval="30">
-          <Command term="0" sn="0">mozilla -mail</Command>
+          <Command term="0" sn="0">launchmail</Command>
         </Mailcheck>
       </Control>
     </Group>


--- NEW FILE xfce4-panel.spec ---
Summary: Next generation panel for Xfce
Name: xfce4-panel
Version: 4.2.1.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-panel-4.2.1.1.tar.bz2
# Change default for Fedora
Patch0: panel-launchmail.patch
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-root
Requires: libxfcegui4 >= 4.2.1
Requires: libxfce4mcs >= 4.2.1
Requires: xfce-mcs-manager >= 4.2.1
Requires: libxml2 >= 2.4.0
BuildRequires: libxfcegui4-devel >= 4.2.1
BuildRequires: libxfce4mcs-devel >= 4.2.1
BuildRequires: xfce-mcs-manager-devel >= 4.2.1
BuildRequires: libxml2-devel >= 2.4.0
BuildRequires: startup-notification-devel

%description
This package includes the panel for the Xfce desktop environment

%package devel
Summary: developpment headers for xfce4-panel
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig

%description devel
This package includes the header files you will need to build
plugins for xfce4-panel.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README TODO ChangeLog NEWS NOTES COPYING AUTHORS
/etc/xdg/xfce4
%{_datadir}/xfce4/doc
%{_libdir}/xfce4
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/*/*.png

%files devel
%defattr(-, root, root)
%{_libdir}/pkgconfig/*
%{_includedir}/xfce4

%changelog
* Thu Mar 17 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1.1-1
- Updated to 4.2.1.1 version
- Changed Requires/Buildrequires to 4.2.1, as xfce4-panel was the only package updated to 4.2.1.1

* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-4
- Fixed case of Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Inital Fedora Extras version
- Updated the Source line
- Created a new patch to change mozilla -mail to launchmail
- Moved the includes to the devel subpackage
- Increased the Release by one

* Thu Feb 03 2005 Than Ngo <than at redhat.com> 4.2.0-2
- new sub package xfce4-panel-devel

* Tue Jan 25 2005 Than Ngo <than at redhat.com> 4.2.0-1
- 4.2.0

* Wed Dec 08 2004 Than Ngo <than at redhat.com> 4.0.6-2 
- add patch to use lauchmail/htmlview #142160

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6
- remove some unneeded patch files

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jun 01 2004 Than Ngo <than at redhat.com> 4.0.5-4
- add buildrequires on startup-notification-devel, bug #124948
- use %%find_lang macros, bug #124948

* Mon May 31 2004 Than Ngo <than at redhat.com> 4.0.5-3
- own %%{_libdir}i/xfce4, bug #124826

* Mon Apr 26 2004 Than Ngo <than at redhat.com> 4.0.5-2
- Change more defaults for fedora, use startup notification
  by default, remove "-splash" option from mozilla launcher. Thanks to Olivier Fourdan
- Patch to avoid crash at startup under some rare circumstances
- Change defaults for fedora

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Fri Jan 09 2004 Than Ngo <than at redhat.com> 4.0.3-1
- 4.0.3 release

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2 release

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:07:16 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:07:51 -0000	1.2
@@ -0,0 +1 @@
+xfce4-panel-4.2.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:07:16 -0000	1.1
+++ sources	19 Mar 2005 18:07:51 -0000	1.2
@@ -0,0 +1 @@
+51f77bcd31daf8a62c53a93be263c06a  xfce4-panel-4.2.1.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:08:52 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:08:52 -0500
Subject: rpms/xfce4-session - New directory
Message-ID: <200503191808.j2JI8qxe025262@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25255/xfce4-session

Log Message:
Directory /cvs/extras/rpms/xfce4-session added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:08:52 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:08:52 -0500
Subject: rpms/xfce4-session/devel - New directory
Message-ID: <200503191808.j2JI8qNI025265@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25255/xfce4-session/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-session/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:09:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:09:05 -0500
Subject: rpms/xfce4-session Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191809.j2JI95Pm025329@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25317

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-session


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-session
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:09:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:09:05 -0500
Subject: rpms/xfce4-session/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191809.j2JI95xr025332@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25317/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-session


--- 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 Mar 19 18:09:43 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:09:43 -0500
Subject: rpms/xfce4-session import.log,1.1,1.2
Message-ID: <200503191809.j2JI9hLv025433@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25423

Modified Files:
	import.log 
Log Message:
auto-import xfce4-session-4.2.1-1 on branch devel from xfce4-session-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:09:03 -0000	1.1
+++ import.log	19 Mar 2005 18:09:41 -0000	1.2
@@ -0,0 +1 @@
+xfce4-session-4_2_1-1:HEAD:xfce4-session-4.2.1-1.src.rpm:1111255769



From fedora-extras-commits at redhat.com  Sat Mar 19 18:09:43 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:09:43 -0500
Subject: rpms/xfce4-session/devel xfce4-session.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191809.j2JI9hd4025436@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25423/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-session.spec 
Log Message:
auto-import xfce4-session-4.2.1-1 on branch devel from xfce4-session-4.2.1-1.src.rpm


--- NEW FILE xfce4-session.spec ---
Summary: Xfce session manager
Name: xfce4-session
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-session-4.2.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: libxfcegui4 >= 4.2.1
Requires: libxfce4mcs >= 4.2.1
Requires: xfce-mcs-manager >= 4.2.1
BuildRequires: libxfcegui4-devel >= 4.2.1
BuildRequires: libxfce4mcs-devel >= 4.2.1
BuildRequires: xfce-mcs-manager-devel >= 4.2.1

%description
xfce4-session is the session manager for the Xfce desktop environment.

%package devel
Summary: Development files for xfce4-session
Group: Development/Libraries
Requires: xfce4-session

%description devel
Header files for the Xfce Session Manager.

%package engines
Summary: Additional engines for xfce4-session
Group: User Interface/Desktops
Requires: xfce4-session

%description engines
Additional splash screen engines for the Xfce Session Manager.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/icons/*
%{_datadir}/xfce4/*
%{_libdir}/lib*.so.*
%{_libdir}/xfce4/mcs-plugins/*
%{_libdir}/xfce4/splash/engines/libmice.*
%{_libexecdir}/xfsm-shutdown-helper
%{_mandir}/man1/*
%{_sysconfdir}/xdg/xfce4-session/*

%files devel
%defattr(-,root,root)
%{_includedir}/xfce4/xfce4-session-4.2/libxfsm/*.h
%{_libdir}/lib*.so
%{_libdir}/*a
%{_libdir}/pkgconfig/*.pc

%files engines
%defattr(-,root,root)
%{_datadir}/themes/Default/balou/*
%{_libdir}/xfce4/splash/engines/libbalou.*
%{_libdir}/xfce4/splash/engines/libsimple.*
%{_libexecdir}/balou-*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:09:03 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:09:41 -0000	1.2
@@ -0,0 +1 @@
+xfce4-session-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:09:03 -0000	1.1
+++ sources	19 Mar 2005 18:09:41 -0000	1.2
@@ -0,0 +1 @@
+6487d53d0aff82697217d8462766c31f  xfce4-session-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:11:47 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:11:47 -0500
Subject: rpms/xfce4-systray - New directory
Message-ID: <200503191811.j2JIBll0025591@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25584/xfce4-systray

Log Message:
Directory /cvs/extras/rpms/xfce4-systray added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:11:47 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:11:47 -0500
Subject: rpms/xfce4-systray/devel - New directory
Message-ID: <200503191811.j2JIBl3B025594@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25584/xfce4-systray/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-systray/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:12:00 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:12:00 -0500
Subject: rpms/xfce4-systray Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191812.j2JIC0WF025658@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25646

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-systray


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-systray
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:12:00 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:12:00 -0500
Subject: rpms/xfce4-systray/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191812.j2JIC06h025661@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25646/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-systray


--- 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 Mar 19 18:12:27 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:12:27 -0500
Subject: rpms/xfce4-systray import.log,1.1,1.2
Message-ID: <200503191812.j2JICRl7025759@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25749

Modified Files:
	import.log 
Log Message:
auto-import xfce4-systray-4.2.1-1 on branch devel from xfce4-systray-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systray/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:11:58 -0000	1.1
+++ import.log	19 Mar 2005 18:12:25 -0000	1.2
@@ -0,0 +1 @@
+xfce4-systray-4_2_1-1:HEAD:xfce4-systray-4.2.1-1.src.rpm:1111255933



From fedora-extras-commits at redhat.com  Sat Mar 19 18:12:27 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:12:27 -0500
Subject: rpms/xfce4-systray/devel xfce4-systray.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191812.j2JICRZ9025762@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25749/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-systray.spec 
Log Message:
auto-import xfce4-systray-4.2.1-1 on branch devel from xfce4-systray-4.2.1-1.src.rpm


--- NEW FILE xfce4-systray.spec ---
Summary: Systray for the Xfce4 Desktop Environment
Name: xfce4-systray
Version: 4.2.1
Release: 1
License: BSD
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-systray-4.2.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-root
Requires: xfce4-panel >= %{version}
BuildRequires: xfce4-panel >= %{version}
BuildRequires: libxml2-devel
BuildRequires: libxfcegui4-devel
BuildRequires: startup-notification-devel
BuildRequires: xfce-mcs-manager-devel

%description
This is a systemtray plugin for Xfce4.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root)
%doc README COPYING AUTHORS
%{_libdir}/xfce4

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-4
- Removed generic INSTALL from %doc
- Fixed case of Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Inital Fedora Extras version
- Updated the Source line
- Increased the Release by one

* Wed Jan 26 2005 Than Ngo <than at redhat.com> 4.2.0-1
- 4.2.0

* Wed Oct 06 2004 Than Ngo <than at redhat.com> 4.0.6-2
- more Buildrequires

* Tue Aug 17 2004 Than Ngo <than at redhat.com> 4.0.6-1 
- Initial packaging for Fedora Core 3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systray/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:11:58 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:12:25 -0000	1.2
@@ -0,0 +1 @@
+xfce4-systray-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systray/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:11:58 -0000	1.1
+++ sources	19 Mar 2005 18:12:25 -0000	1.2
@@ -0,0 +1 @@
+d85ec276685040a857e64aa74cdc4c7f  xfce4-systray-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:14:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:14:05 -0500
Subject: rpms/xfce4-toys - New directory
Message-ID: <200503191814.j2JIE5Cp025909@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25902/xfce4-toys

Log Message:
Directory /cvs/extras/rpms/xfce4-toys added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:14:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:14:05 -0500
Subject: rpms/xfce4-toys/devel - New directory
Message-ID: <200503191814.j2JIE5g2025912@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25902/xfce4-toys/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-toys/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:14:19 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:14:19 -0500
Subject: rpms/xfce4-toys Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191814.j2JIEJo4025973@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25964

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-toys


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-toys
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:14:19 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:14:19 -0500
Subject: rpms/xfce4-toys/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191814.j2JIEJMY025976@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25964/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-toys


--- 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 Mar 19 18:14:48 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:14:48 -0500
Subject: rpms/xfce4-toys import.log,1.1,1.2
Message-ID: <200503191814.j2JIEm30026077@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26067

Modified Files:
	import.log 
Log Message:
auto-import xfce4-toys-4.2.1-1 on branch devel from xfce4-toys-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-toys/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:14:17 -0000	1.1
+++ import.log	19 Mar 2005 18:14:46 -0000	1.2
@@ -0,0 +1 @@
+xfce4-toys-4_2_1-1:HEAD:xfce4-toys-4.2.1-1.src.rpm:1111256071



From fedora-extras-commits at redhat.com  Sat Mar 19 18:14:48 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:14:48 -0500
Subject: rpms/xfce4-toys/devel xfce4-toys.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191814.j2JIEmDM026080@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26067/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-toys.spec 
Log Message:
auto-import xfce4-toys-4.2.1-1 on branch devel from xfce4-toys-4.2.1-1.src.rpm


--- NEW FILE xfce4-toys.spec ---
Summary: Various tools for Xfce4
Name: xfce4-toys
Version: 4.2.1
Release: 1
License: BSD
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-toys-4.2.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xfce4-panel >= 4.2.1
BuildRequires: xfce4-panel >= 4.2.1

%description
xfce4-toys includes an "xeyes" type plugin for the Xfce4 panel
and an small application to display tips at startup.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README ChangeLog NOTES COPYING AUTHORS
%{_bindir}/*
%{_libdir}/xfce4/*
%{_datadir}/locale/*/*/xfce4-toys.mo
%{_datadir}/xfce4/eyes/*
%{_datadir}/xfce4/tips/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Upgraded to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc
- Fixed case of Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-toys/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:14:17 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:14:46 -0000	1.2
@@ -0,0 +1 @@
+xfce4-toys-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-toys/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:14:17 -0000	1.1
+++ sources	19 Mar 2005 18:14:46 -0000	1.2
@@ -0,0 +1 @@
+92cfc3d1eba5096900761706f108b59d  xfce4-toys-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:17:01 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:17:01 -0500
Subject: rpms/xfce4-trigger-launcher - New directory
Message-ID: <200503191817.j2JIH1Ia026226@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26219/xfce4-trigger-launcher

Log Message:
Directory /cvs/extras/rpms/xfce4-trigger-launcher added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:17:01 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:17:01 -0500
Subject: rpms/xfce4-trigger-launcher/devel - New directory
Message-ID: <200503191817.j2JIH14V026229@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26219/xfce4-trigger-launcher/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-trigger-launcher/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:17:14 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:17:14 -0500
Subject: rpms/xfce4-trigger-launcher Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191817.j2JIHEtr026291@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26280

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-trigger-launcher


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-trigger-launcher
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:17:14 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:17:14 -0500
Subject: rpms/xfce4-trigger-launcher/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200503191817.j2JIHE02026294@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26280/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-trigger-launcher


--- 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 Mar 19 18:17:43 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:17:43 -0500
Subject: rpms/xfce4-trigger-launcher import.log,1.1,1.2
Message-ID: <200503191817.j2JIHhpi026392@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26383

Modified Files:
	import.log 
Log Message:
auto-import xfce4-trigger-launcher-4.2.1-1 on branch devel from xfce4-trigger-launcher-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-trigger-launcher/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:17:12 -0000	1.1
+++ import.log	19 Mar 2005 18:17:41 -0000	1.2
@@ -0,0 +1 @@
+xfce4-trigger-launcher-4_2_1-1:HEAD:xfce4-trigger-launcher-4.2.1-1.src.rpm:1111256249



From fedora-extras-commits at redhat.com  Sat Mar 19 18:17:43 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:17:43 -0500
Subject: rpms/xfce4-trigger-launcher/devel xfce4-trigger-launcher.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191817.j2JIHhOZ026396@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26383/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-trigger-launcher.spec 
Log Message:
auto-import xfce4-trigger-launcher-4.2.1-1 on branch devel from xfce4-trigger-launcher-4.2.1-1.src.rpm


--- NEW FILE xfce4-trigger-launcher.spec ---
Summary: A panel plugin acting as a launcher with two states
Name: xfce4-trigger-launcher
Version: 4.2.1
Release: 1
License: BSD
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-trigger-launcher-4.2.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xfce4-panel >= 4.2.0
BuildRequires: xfce4-panel >= 4.2.0

%description
xfce4-trigger-launcher is a launcher with two states, like a trigger.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README ChangeLog COPYING AUTHORS
%{_libdir}/xfce4/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version
- Removed unneeded glob in files for lang files

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-trigger-launcher/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:17:12 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:17:41 -0000	1.2
@@ -0,0 +1 @@
+xfce4-trigger-launcher-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-trigger-launcher/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:17:12 -0000	1.1
+++ sources	19 Mar 2005 18:17:41 -0000	1.2
@@ -0,0 +1 @@
+82ac900e930782be035f2689a57425e2  xfce4-trigger-launcher-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:18:46 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:18:46 -0500
Subject: rpms/xfce-mcs-manager - New directory
Message-ID: <200503191818.j2JIIksY026530@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26523/xfce-mcs-manager

Log Message:
Directory /cvs/extras/rpms/xfce-mcs-manager added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:18:46 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:18:46 -0500
Subject: rpms/xfce-mcs-manager/devel - New directory
Message-ID: <200503191818.j2JIIkX4026533@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26523/xfce-mcs-manager/devel

Log Message:
Directory /cvs/extras/rpms/xfce-mcs-manager/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:18:59 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:18:59 -0500
Subject: rpms/xfce-mcs-manager Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191818.j2JIIxSa026594@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26585

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce-mcs-manager


--- NEW FILE Makefile ---
# Top level Makefile for module xfce-mcs-manager
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:18:59 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:18:59 -0500
Subject: rpms/xfce-mcs-manager/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191818.j2JIIxeR026597@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26585/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce-mcs-manager


--- 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 Mar 19 18:19:29 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:19:29 -0500
Subject: rpms/xfce-mcs-manager import.log,1.1,1.2
Message-ID: <200503191819.j2JIJT92026696@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26687

Modified Files:
	import.log 
Log Message:
auto-import xfce-mcs-manager-4.2.1-1 on branch devel from xfce-mcs-manager-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:18:57 -0000	1.1
+++ import.log	19 Mar 2005 18:19:26 -0000	1.2
@@ -0,0 +1 @@
+xfce-mcs-manager-4_2_1-1:HEAD:xfce-mcs-manager-4.2.1-1.src.rpm:1111256354



From fedora-extras-commits at redhat.com  Sat Mar 19 18:19:29 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:19:29 -0500
Subject: rpms/xfce-mcs-manager/devel xfce-mcs-manager.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191819.j2JIJTxc026700@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26687/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce-mcs-manager.spec 
Log Message:
auto-import xfce-mcs-manager-4.2.1-1 on branch devel from xfce-mcs-manager-4.2.1-1.src.rpm


--- NEW FILE xfce-mcs-manager.spec ---
Summary: Multi channel settings manager
Name: xfce-mcs-manager
Version: 4.2.1
Release: 1
License: LGPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-manager-4.2.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: libxfce4mcs >= %{version}
Requires: libxfcegui4 >= %{version}
BuildRequires: pkgconfig
BuildRequires: gettext
BuildRequires: libxfce4mcs-devel >= %{version}
BuildRequires: libxfcegui4-devel >= %{version}

%description
This package includes a multi channel settings manager for Xfce4

%package devel
Summary: Header file to build xfce-mcs-manager plugins
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: libxfce4mcs-devel
Requires: gtk2-devel

%description devel
This package includes the header files you will need to build
mcs plugins.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,0755)
%doc README TODO COPYING AUTHORS
%docdir %{_datadir}/xfce4/doc
%{_datadir}/xfce4/doc/C
%{_datadir}/icons/*/*/apps/*.png
%{_bindir}/*
%{_datadir}/applications/*

%files devel
%defattr(-, root, root,0755)
%{_libdir}/pkgconfig/*.pc
%{_includedir}/xfce4/xfce-mcs-manager

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Fixed case of Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Inital Fedora Extras version
- Updated the Source line
- Capitalized first letter of Summary in devel section to quiet rpmlint
- Increased the Release by one

* Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
- update to 4.2.0

* Wed Dec 08 2004 Than Ngo <than at redhat.com> 4.1.99.1-1
- update to 4.2 rc1

* Wed Sep 01 2004 Than Ngo <than at redhat.com> 4.0.6-2
- use find_lang macro

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Fri Jan 09 2004 Than Ngo <than at redhat.com> 4.0.3-1
- 4.0.3 release

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2 release

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:18:57 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:19:27 -0000	1.2
@@ -0,0 +1 @@
+xfce-mcs-manager-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:18:57 -0000	1.1
+++ sources	19 Mar 2005 18:19:27 -0000	1.2
@@ -0,0 +1 @@
+d2c8a58115ad60c49760c2079d408c51  xfce-mcs-manager-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:21:44 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:21:44 -0500
Subject: rpms/xfce-mcs-plugins - New directory
Message-ID: <200503191821.j2JILijc026856@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26849/xfce-mcs-plugins

Log Message:
Directory /cvs/extras/rpms/xfce-mcs-plugins added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:21:44 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:21:44 -0500
Subject: rpms/xfce-mcs-plugins/devel - New directory
Message-ID: <200503191821.j2JILiCG026859@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26849/xfce-mcs-plugins/devel

Log Message:
Directory /cvs/extras/rpms/xfce-mcs-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:21:58 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:21:58 -0500
Subject: rpms/xfce-mcs-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191821.j2JILwVI026920@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26911

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce-mcs-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module xfce-mcs-plugins
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:21:58 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:21:58 -0500
Subject: rpms/xfce-mcs-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191821.j2JILwEZ026923@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26911/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce-mcs-plugins


--- 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 Mar 19 18:22:33 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:22:33 -0500
Subject: rpms/xfce-mcs-plugins import.log,1.1,1.2
Message-ID: <200503191822.j2JIMXFs027046@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27035

Modified Files:
	import.log 
Log Message:
auto-import xfce-mcs-plugins-4.2.1-1 on branch devel from xfce-mcs-plugins-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:21:56 -0000	1.1
+++ import.log	19 Mar 2005 18:22:31 -0000	1.2
@@ -0,0 +1 @@
+xfce-mcs-plugins-4_2_1-1:HEAD:xfce-mcs-plugins-4.2.1-1.src.rpm:1111256539



From fedora-extras-commits at redhat.com  Sat Mar 19 18:22:33 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:22:33 -0500
Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins-4.2.0-rh.patch, NONE,
	1.1 xfce-mcs-plugins.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191822.j2JIMXRU027050@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27035/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce-mcs-plugins-4.2.0-rh.patch xfce-mcs-plugins.spec 
Log Message:
auto-import xfce-mcs-plugins-4.2.1-1 on branch devel from xfce-mcs-plugins-4.2.1-1.src.rpm

xfce-mcs-plugins-4.2.0-rh.patch:

--- NEW FILE xfce-mcs-plugins-4.2.0-rh.patch ---
--- xfce-mcs-plugins-4.2.0/plugins/ui_plugin/ui_plugin.c.orig	2004-12-27 20:05:36.000000000 +0100
+++ xfce-mcs-plugins-4.2.0/plugins/ui_plugin/ui_plugin.c	2005-01-24 11:01:02.291654459 +0100
@@ -118,8 +118,8 @@
 #define CHANNEL "settings"
 #define PLUGIN_NAME "ui"
 #define DEFAULT_THEME "Default"
-#define INITIAL_THEME "Xfce"
-#define DEFAULT_ICON_THEME "hicolor"
+#define INITIAL_THEME "Bluecurve"
+#define DEFAULT_ICON_THEME "Bluecurve"
 #define INITIAL_ICON_THEME "Rodent"
 #define DEFAULT_TOOLBAR_STYLE "icons"
 #define DEFAULT_FONT "Sans 9"


--- NEW FILE xfce-mcs-plugins.spec ---
Summary: Plugins for multi channel settings manager
Name: xfce-mcs-plugins
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-plugins-4.2.1.tar.bz2
Patch: xfce-mcs-plugins-4.2.0-rh.patch
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: gtk2 >= 2.0.6
Requires: xfce-mcs-manager >= %{version}
BuildRequires: gettext
BuildRequires: gtk2-devel >= 2.0.6
BuildRequires: xfce-mcs-manager-devel >= %{version}
BuildRequires: libxfcegui4-devel >= %{version}
BuildRequires: libxfce4util-devel >= %{version}
BuildRequires: libxfce4mcs-devel >= %{version}

%description
This package inlcudes a set of plugins for the multi channel
settings manager.

%prep
%setup -q
%patch -p1 -b .fedora

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,0755)
%doc README TODO COPYING AUTHORS
%docdir %{_datadir}/xfce4/doc
%{_datadir}/xfce4/doc/C
%{_libdir}/xfce4/mcs-plugins/*
%{_datadir}/applications/*
%{_datadir}/icons/*/*/apps/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Inital Fedora Extras version
- Updated the Source line
- Capitalized first letter of Summary in devel section to quiet rpmlint
- Increased the Release by one

* Mon Jan 24 2005 Than Ngo <than at redhat.com> 4.2.0-1
- 4.2.0

* Wed Dec 08 2004 Than Ngo <than at redhat.com> 4.1.99.1-1
- update to 4.2 rc1

* Thu Sep 02 2004 Than Ngo <than at redhat.com> 4.0.6-2
- use find_lang macro
- cleanup specfile

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6
- remove some unneeded patch files, which are included in new upstream

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Apr 20 2004 Than Ngo <than at redhat.com> 4.0.5-2
- Fix bug in default icon theme selection, thanks to Olivier Fourdan <fourdan at xfce.org>
- Add support for icon theme, Change defaults for fedora, #119647, thanks to Olivier Fourdan <fourdan at xfce.org>

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Fri Jan 09 2004 Than Ngo <than at redhat.com> 4.0.3-1
- add libxfce4util-devel, libxfcegui4-devel in BuildRequires
- 4.0.3 release

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2 release

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:21:56 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:22:31 -0000	1.2
@@ -0,0 +1 @@
+xfce-mcs-plugins-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:21:56 -0000	1.1
+++ sources	19 Mar 2005 18:22:31 -0000	1.2
@@ -0,0 +1 @@
+f53711b93e28b6751f18f6346d4194e2  xfce-mcs-plugins-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:24:30 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:24:30 -0500
Subject: rpms/xfce-utils - New directory
Message-ID: <200503191824.j2JIOUp2027205@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27198/xfce-utils

Log Message:
Directory /cvs/extras/rpms/xfce-utils added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:24:30 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:24:30 -0500
Subject: rpms/xfce-utils/devel - New directory
Message-ID: <200503191824.j2JIOU2m027208@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27198/xfce-utils/devel

Log Message:
Directory /cvs/extras/rpms/xfce-utils/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:24:44 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:24:44 -0500
Subject: rpms/xfce-utils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191824.j2JIOiUx027272@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27263

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce-utils


--- NEW FILE Makefile ---
# Top level Makefile for module xfce-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  Sat Mar 19 18:24:44 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:24:44 -0500
Subject: rpms/xfce-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191824.j2JIOiJW027275@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27263/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce-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  Sat Mar 19 18:25:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:25:20 -0500
Subject: rpms/xfce-utils import.log,1.1,1.2
Message-ID: <200503191825.j2JIPKNN027384@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27374

Modified Files:
	import.log 
Log Message:
auto-import xfce-utils-4.2.1-1 on branch devel from xfce-utils-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:24:42 -0000	1.1
+++ import.log	19 Mar 2005 18:25:18 -0000	1.2
@@ -0,0 +1 @@
+xfce-utils-4_2_1-1:HEAD:xfce-utils-4.2.1-1.src.rpm:1111256706



From fedora-extras-commits at redhat.com  Sat Mar 19 18:25:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:25:20 -0500
Subject: rpms/xfce-utils/devel xfce-utils.spec, NONE, 1.1 xfce4.desktop, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191825.j2JIPKTq027387@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27374/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce-utils.spec xfce4.desktop 
Log Message:
auto-import xfce-utils-4.2.1-1 on branch devel from xfce-utils-4.2.1-1.src.rpm


--- NEW FILE xfce-utils.spec ---
%define xsessiondir %{_datadir}/xsessions

Summary: Utilities for the Xfce Desktop Environment
Name: xfce-utils
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-utils-4.2.1.tar.bz2
Source1: xfce4.desktop
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: xfce-mcs-manager
Requires: xfwm4
Requires: xfdesktop
Requires: /usr/bin/id
BuildRequires: libxfcegui4-devel >= %{version}
BuildRequires: libxfce4mcs-devel >= %{version}
BuildRequires: xfce-mcs-manager-devel

%description
This package includes utilities for the Xfce Desktop Environment

%prep
%setup -q

%build
%configure --enable-gdm

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{xsessiondir}

make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{xsessiondir}/xfce.desktop

install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/

%find_lang %{name}

rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README TODO ChangeLog NEWS COPYING AUTHORS
%attr(0755,root,root) %{_sysconfdir}/xdg/xfce4
%{_bindir}/*
%{_libdir}/xfce4/mcs-plugins/*
%{_datadir}/apps/switchdesk/*
%{_datadir}/xfce4
%{_datadir}/icons/*/*/*
%{_datadir}/applications/*
%{xsessiondir}/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
- Fixed case on Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Inital Fedora Extras version
- Updated the Source line
- Removed old misc patch 
- Increased the Release by one

* Thu Jan 27 2005 Than Ngo <than at redhat.com> 4.2.0-1
- 4.2.0

* Thu Dec 02 2004 Than Ngo <than at redhat.com> 4.0.6-3
- permission fix #141597

* Mon Nov 22 2004 Than Ngo <than at redhat.com> 4.0.6-2
- add session desktop file from KDE, better translations
- improve xfterm4 #139183

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6
- use %%find_lang macros, bug #124950
- fix component deps, bug #125744
- don't run xmodmap twice, bug #115500

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Tue Jan 13 2004 Than Ngo <than at redhat.com> 4.0.3-1
- 4.0.3 release

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2 release

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build



--- NEW FILE xfce4.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=XSession
Exec=startxfce4
TryExec=startxfce4
Name=XFce 4
Name[eo]=Facoj 4
Name[pa]=XFce ???
Name[sv]=Xfce 4
Comment=The Cholesterol Free Desktop Environment, version 4. A desktop environment reminiscent of CDE
Comment[bn]=?????? ???????????????????????? ???????????? ????????????????????? ????????????????????????????????????, ???????????? ???????????????????????? CDE-??? ????????? ????????? ??????????????? ????????? ????????? ???????????? ????????????????????? ????????????????????????????????????
Comment[bs]=Cholesterol Free Desktop Environment. Desktop okolina nalik na CDE
Comment[ca]=L'entorn d'escriptori sense colesterol, versi?? 4. Un entorn d'escriptori que recorda a CDE
Comment[cy]=Yr Amgylchedd Penbwrdd Di-Golesterol, fersiwn 4.  Amgylchedd penbwrdd sy'n atgoffaol o CDE
Comment[da]=Det kolesterolfrie desktopmilj??, version 4. Et desktopmilj?? der minder om CDE
Comment[de]=Cholesterol Free Desktop Environment, Version 4. Benutzerumgebung in der Art von CDE
Comment[el]=???? Cholesterol Free Desktop Environment, ???????????? 4. ?????? ???????????????????? ???????????????????? ???????????????? ?????????????????? ?????? CDE
Comment[eo]=La libera labortablo ??irka??ajo 4
Comment[es]=El Cholesterol Free Desktop Environment, versi??n 4. Un entorno de escritorio que recuerda a CDE
Comment[et]=Kolesteroolivaba t????laua keskkond (versioon 4), mis meenutab mitmeti CDE-d
Comment[eu]=Kolesterolik gabeko idazmahai ingurunea, 4 bertsioa. CDE gogorarazten duen mahaigaina
Comment[fi]=Cholesterol Free -ty??p??yt??ymp??rist??. CDE:t?? muisteleva ty??p??yt??ymp??rist??.
Comment[fr]=The Cholesterol Free Desktop Environment, version 4. Un environnement de bureau rappelant CDE
Comment[gl]=O Cholesterol Free Desktop Environment, versi??n 4. Un entorno de escritorio reminiscencia de CDE
Comment[he]=The Cholesterol Free Desktop Environment. ???????? 4, ?????????? ?????????? ?????????????? ???? CDE
Comment[hu]=The Cholesterol Free Desktop Environment, 4-es verzi??. Egy CDE-szer?? ablakkezel??
Comment[is]=K??lesterol-lausa skj??bor??sumhverfi??, ??tg??fa 4. Skj??bor?? sem l??kist CDE
Comment[it]=Il Cholesterol Free Desktop Environment, versione 4. Un desktop environment che ricorda CDE
Comment[ja]=Cholesterol Free Desktop Environment version 4 CDE?????????????????????????????????????????????????????????
Comment[mt]=Cholesterol Free Desktop Environment (v4). Ambjent grafiku li jixba?? lis-CDE
Comment[nb]=Den Kolesterolfrie Brukerflate, versjon 4. Et skrivebordsmilj?? som minner om CDE
Comment[nds]=De Cholesterol Free Desktop Environment, Verschoon 4. En Schriefdisch-??mgeven, de wat liek is to CDE
Comment[nl]=De Cholesterol Free Desktop Environment, versie 4. Een desktop environment die herinnert aan  CDE
Comment[nn]=Cholesterol Free Desktop Environment. Eit skrivebordsmilj?? som minner om CDE
Comment[pa]=?????????????????????????????? ???????????? ?????????????????????, ???????????? ??? ????????? CDE ???????????? ?????????????????????
Comment[pl]=Cholesterol Free Desktop Environment, wersja 4 - ??rodowisko graficzne podobne do CDE.
Comment[pt]=O Cholesterol Free Desktop Environment, vers??o 4. Um ambiente de trabalho com vest??gios do CDE
Comment[pt_BR]=Acr??nimo para Cholesterol Free Desktop Environment (ou ambiente livre de colesterol), vers??o 4; um ambiente de trabalho remanescente do CDE 
Comment[ro]=Cholesterol Free Desktop Environment, versiunea 4. Un mediu grafic cu reminescente din CDE
Comment[ru]="???? ???????????????????? ??????????????????????" ?????????????? ?????????? xfce ???????????? 4, ???????????????????????? CDE
Comment[sk]=The Cholesterol Free Desktop Environment verzia 4. Pracovn?? prostredie pripom??naj??ce CDE
Comment[sl]=Cholesterol Free Desktop Environment, razli??ica 4. Namizno okolje, podobno okolju CDE
Comment[sr]=???The Cholesterol Free Desktop Environment??? 4. ????????????. ?????????? ???????????????? ???????? ?????????????? ???? CDE
Comment[sr at Latn]=???The Cholesterol Free Desktop Environment??? 4. ????????????. ?????????? ???????????????? ???????? ?????????????? ???? CDE
Comment[sv]=Den kolesterolfria skrivbordsmilj??n, version 4. En skrivbordsmilj?? som p??minner om CDE
Comment[ta]=????????????????????????????????? ?????????????????? ???????????????????????? ???????????????. ????????????????????? 4. CDE ??????????????????????????????????????? ???????????????????????? ???????????????
Comment[tr]=Cholesterol ??cretsiz Masa??st?? Ortam??, s??r??m 4. CDE'nin benzeri olan masa??st?? ortam??
Comment[uk]=The Cholesterol Free Desktop Environment, ???????????? 4. ???????????????? ????????????????????, ???? ?????????????? CDE
Comment[zh_CN]=???????????????????????????????????? 4???CDE ????????????????????????


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:24:42 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:25:18 -0000	1.2
@@ -0,0 +1 @@
+xfce-utils-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:24:42 -0000	1.1
+++ sources	19 Mar 2005 18:25:18 -0000	1.2
@@ -0,0 +1 @@
+b765cc3144731c2fc1e39a0ed70fc25b  xfce-utils-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:26:16 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:26:16 -0500
Subject: rpms/xfdesktop - New directory
Message-ID: <200503191826.j2JIQGbt027520@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27513/xfdesktop

Log Message:
Directory /cvs/extras/rpms/xfdesktop added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:26:16 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:26:16 -0500
Subject: rpms/xfdesktop/devel - New directory
Message-ID: <200503191826.j2JIQGcQ027523@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27513/xfdesktop/devel

Log Message:
Directory /cvs/extras/rpms/xfdesktop/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:26:29 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:26:29 -0500
Subject: rpms/xfdesktop Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191826.j2JIQTGF027588@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27579

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfdesktop


--- NEW FILE Makefile ---
# Top level Makefile for module xfdesktop
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:26:29 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:26:29 -0500
Subject: rpms/xfdesktop/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191826.j2JIQT07027591@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27579/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfdesktop


--- 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 Mar 19 18:27:40 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:27:40 -0500
Subject: rpms/xfdesktop import.log,1.1,1.2
Message-ID: <200503191827.j2JIReM0027700@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27691

Modified Files:
	import.log 
Log Message:
auto-import xfdesktop-4.2.1-1 on branch devel from xfdesktop-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:26:27 -0000	1.1
+++ import.log	19 Mar 2005 18:27:38 -0000	1.2
@@ -0,0 +1 @@
+xfdesktop-4_2_1-1:HEAD:xfdesktop-4.2.1-1.src.rpm:1111256845



From fedora-extras-commits at redhat.com  Sat Mar 19 18:27:40 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:27:40 -0500
Subject: rpms/xfdesktop/devel xfdesktop.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191827.j2JIReHb027704@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27691/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfdesktop.spec 
Log Message:
auto-import xfdesktop-4.2.1-1 on branch devel from xfdesktop-4.2.1-1.src.rpm


--- NEW FILE xfdesktop.spec ---
Summary: Desktop manager for the Xfce Desktop Environment
Name: xfdesktop
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfdesktop-4.2.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: gtk2 >= 2.2.0
Requires: libxfce4mcs >= 4.2.1
Requires: libxfcegui4 >= 4.2.1
BuildRequires: gtk2 >= 2.2.0
BuildRequires: libxfce4mcs-devel >= 4.2.1
BuildRequires: libxfcegui4-devel >= 4.2.1

%description
xfdesktop is a desktop manager for the Xfce Desktop Environment

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README TODO ChangeLog NEWS COPYING AUTHORS
%{_sysconfdir}
%{_bindir}/xfce4-menueditor
%{_bindir}/xfdesktop
%{_mandir}/man1/xfdesktop.1.gz
%{_libdir}/xfce4/*
%{_datadir}/applications/xfce-backdrop-settings.desktop
%{_datadir}/applications/xfce-menueditor.desktop
%{_datadir}/icons/hicolor/32x32/apps/xfce4-backdrop.png
%{_datadir}/icons/hicolor/32x32/apps/xfce4-menueditor.png
%{_datadir}/icons/hicolor/48x48/apps/xfce4-backdrop.png
%{_datadir}/icons/hicolor/48x48/apps/xfce4-menueditor.png
%{_datadir}/icons/hicolor/scalable/apps/xfce4-backdrop.svg
%{_datadir}/icons/hicolor/scalable/apps/xfce4-menueditor.svg
%{_datadir}/pixmaps/*
%{_datadir}/xfce4/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:26:27 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:27:38 -0000	1.2
@@ -0,0 +1 @@
+xfdesktop-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:26:27 -0000	1.1
+++ sources	19 Mar 2005 18:27:38 -0000	1.2
@@ -0,0 +1 @@
+91f02bb04a14f773f4877f4aa534ce0b  xfdesktop-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:31:07 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:31:07 -0500
Subject: rpms/xffm - New directory
Message-ID: <200503191831.j2JIV7tE027874@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27867/xffm

Log Message:
Directory /cvs/extras/rpms/xffm added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:31:07 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:31:07 -0500
Subject: rpms/xffm/devel - New directory
Message-ID: <200503191831.j2JIV7bx027877@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27867/xffm/devel

Log Message:
Directory /cvs/extras/rpms/xffm/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:31:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:31:20 -0500
Subject: rpms/xffm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191831.j2JIVKnr027939@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27930

Added Files:
	Makefile import.log 
Log Message:
Setup of module xffm


--- NEW FILE Makefile ---
# Top level Makefile for module xffm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:31:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:31:20 -0500
Subject: rpms/xffm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503191831.j2JIVKGb027942@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27930/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xffm


--- 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 Mar 19 18:32:14 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:32:14 -0500
Subject: rpms/xffm import.log,1.1,1.2
Message-ID: <200503191832.j2JIWE0u028052@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28043

Modified Files:
	import.log 
Log Message:
auto-import xffm-4.2.1-1 on branch devel from xffm-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xffm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:31:18 -0000	1.1
+++ import.log	19 Mar 2005 18:32:11 -0000	1.2
@@ -0,0 +1 @@
+xffm-4_2_1-1:HEAD:xffm-4.2.1-1.src.rpm:1111257119



From fedora-extras-commits at redhat.com  Sat Mar 19 18:32:14 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:32:14 -0500
Subject: rpms/xffm/devel xffm-4.0.5-rpath.patch, NONE, 1.1 xffm.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503191832.j2JIWEJY028056@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28043/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xffm-4.0.5-rpath.patch xffm.spec 
Log Message:
auto-import xffm-4.2.1-1 on branch devel from xffm-4.2.1-1.src.rpm

xffm-4.0.5-rpath.patch:

--- NEW FILE xffm-4.0.5-rpath.patch ---
--- xffm-4.0.5/configure.orig	2004-05-13 14:42:21.764371688 +0200
+++ xffm-4.0.5/configure	2004-05-13 14:44:42.109609434 +0200
@@ -35263,7 +35263,7 @@
 
             echo "$as_me:$LINENO: checking DBH_LIBS" >&5
 echo $ECHO_N "checking DBH_LIBS... $ECHO_C" >&6
-            DBH_LIBS=`$PKG_CONFIG --libs "dbh-1.0 >= 1.0"`
+            DBH_LIBS=`$PKG_CONFIG --libs-only-l "dbh-1.0 >= 1.0"`
             echo "$as_me:$LINENO: result: $DBH_LIBS" >&5
 echo "${ECHO_T}$DBH_LIBS" >&6
         else


--- NEW FILE xffm.spec ---
Summary: Next generation filemanager and SMB network navigator for Xfce4
Name: xffm
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
Patch1: xffm-4.0.5-rpath.patch
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Prereq: /sbin/ldconfig
Requires: dbh >= 1.0
Requires: glib2 >= 2.0.0
Requires: gtk2 >= 2.0.0
Requires: libxfce4mcs >= 4.0.5
Requires: libxfce4util >= 4.0.5
Requires: libxfcegui4 >= 4.0.5
Requires: libxml2 >= 2.4.0
BuildRequires: dbh-devel >= 1.0
BuildRequires: glib2-devel >= 2.0.0
BuildRequires: gtk2-devel >= 2.0.0
BuildRequires: libxfce4mcs-devel >= 4.0.5
BuildRequires: libxfce4util-devel >= 4.0.5
BuildRequires: libxfcegui4-devel >= 4.0.5
BuildRequires: libxml2-devel >= 2.4.0
BuildRequires: xfce-mcs-manager-devel >= 4.0.5

%description
This package includes a filemanager and SMB network navigator for Xfce4.

%prep
%setup -q

%patch1 -p1 -b .rpath

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root)
%doc README TODO ChangeLog NEWS COPYING AUTHORS
%{_bindir}/*
%{_libdir}/lib*
%{_libdir}/xfce4/xffm/*
%{_libdir}/pkgconfig/*
%{_libdir}/xfce4/mcs-plugins/*
%{_datadir}/xffm
%{_datadir}/xfce4/*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/*
%{_mandir}/man?/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed case of Xfce
- Fixed Source0 line. 
- Removed generic INSTALL from %doc
- Inital Fedora Extras version

* Tue Jul 20 2004 Than Ngo <than at redhat.com> 4.0.6-1
- update to 4.0.6

* Thu Jun 17 2004 Than Ngo <than at redhat.com> 4.0.5-4
- own %{_datadir}/xffm, bug #124825
- use %%find_lang macros, bug #124954
- add buildrequires on xfce-mcs-manager-devel, bug #125061

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 13 2004 Than Ngo <than at redhat.com> 4.0.5-2
- get rid of rpath
- fix gcc34 build problem

* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
- update to 4.0.5

* Thu Mar 11 2004 Than Ngo <than at redhat.com> 4.0.3-4
- fixed gcc-3.4 build problem

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64

* Wed Jan 14 2004 Than Ngo <than at redhat.com> 4.0.3-1
- update 4.0.3

* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2 release

* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:31:18 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:32:11 -0000	1.2
@@ -0,0 +1 @@
+xffm-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:31:18 -0000	1.1
+++ sources	19 Mar 2005 18:32:11 -0000	1.2
@@ -0,0 +1 @@
+543aba5286949b660bd0b9eaa0e0a515  xffm-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:33:32 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:33:32 -0500
Subject: rpms/xfwm4 - New directory
Message-ID: <200503191833.j2JIXWws028196@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28187/xfwm4

Log Message:
Directory /cvs/extras/rpms/xfwm4 added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:33:32 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:33:32 -0500
Subject: rpms/xfwm4/devel - New directory
Message-ID: <200503191833.j2JIXWvo028199@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28187/xfwm4/devel

Log Message:
Directory /cvs/extras/rpms/xfwm4/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:33:45 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:33:45 -0500
Subject: rpms/xfwm4 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191833.j2JIXjDD028264@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28254

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfwm4


--- NEW FILE Makefile ---
# Top level Makefile for module xfwm4
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:33:45 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:33:45 -0500
Subject: rpms/xfwm4/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503191833.j2JIXjRw028267@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28254/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfwm4


--- 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 Mar 19 18:34:21 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:34:21 -0500
Subject: rpms/xfwm4 import.log,1.1,1.2
Message-ID: <200503191834.j2JIYLOO028377@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28365

Modified Files:
	import.log 
Log Message:
auto-import xfwm4-4.2.1-1 on branch devel from xfwm4-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:33:43 -0000	1.1
+++ import.log	19 Mar 2005 18:34:19 -0000	1.2
@@ -0,0 +1 @@
+xfwm4-4_2_1-1:HEAD:xfwm4-4.2.1-1.src.rpm:1111257247



From fedora-extras-commits at redhat.com  Sat Mar 19 18:34:21 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:34:21 -0500
Subject: rpms/xfwm4/devel xfwm4.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200503191834.j2JIYLG6028381@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28365/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfwm4.spec 
Log Message:
auto-import xfwm4-4.2.1-1 on branch devel from xfwm4-4.2.1-1.src.rpm


--- NEW FILE xfwm4.spec ---
Summary: Next generation window manager for Xfce
Name: xfwm4
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: libxfce4mcs >= 4.2.1
Requires: libxfcegui4 >= 4.2.1
Requires: xfce-mcs-manager >= 4.2.1
BuildRequires: libxfce4mcs-devel >= 4.2.1
BuildRequires: libxfcegui4-devel >= 4.2.1
BuildRequires: xfce-mcs-manager-devel >= 4.2.1

%description
xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc example.gtkrc-2.0 README TODO COPYING AUTHORS COMPOSITOR
%{_bindir}/xfwm4
%{_libdir}/xfce4
%{_datadir}/applications
%{_datadir}/icons
%{_datadir}/xfce4
%{_datadir}/xfwm4
%{_datadir}/themes

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to version 4.2.1

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc
- Fixed case of Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:33:43 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:34:19 -0000	1.2
@@ -0,0 +1 @@
+xfwm4-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:33:43 -0000	1.1
+++ sources	19 Mar 2005 18:34:19 -0000	1.2
@@ -0,0 +1 @@
+da3e434bff601fa567710fa288979e2d  xfwm4-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:35:58 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:35:58 -0500
Subject: rpms/xfprint - New directory
Message-ID: <200503191835.j2JIZw0V028528@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28521/xfprint

Log Message:
Directory /cvs/extras/rpms/xfprint added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:35:58 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:35:58 -0500
Subject: rpms/xfprint/devel - New directory
Message-ID: <200503191835.j2JIZwU5028531@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28521/xfprint/devel

Log Message:
Directory /cvs/extras/rpms/xfprint/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:36:11 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:36:11 -0500
Subject: rpms/xfprint Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191836.j2JIaBxp028595@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28586

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfprint


--- NEW FILE Makefile ---
# Top level Makefile for module xfprint
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:36:11 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:36:11 -0500
Subject: rpms/xfprint/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503191836.j2JIaBgN028598@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28586/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfprint


--- 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 Mar 19 18:36:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:36:42 -0500
Subject: rpms/xfprint import.log,1.1,1.2
Message-ID: <200503191836.j2JIagGL028704@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28690

Modified Files:
	import.log 
Log Message:
auto-import xfprint-4.2.1-1 on branch devel from xfprint-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfprint/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:36:09 -0000	1.1
+++ import.log	19 Mar 2005 18:36:39 -0000	1.2
@@ -0,0 +1 @@
+xfprint-4_2_1-1:HEAD:xfprint-4.2.1-1.src.rpm:1111257387



From fedora-extras-commits at redhat.com  Sat Mar 19 18:36:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:36:42 -0500
Subject: rpms/xfprint/devel xfprint.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191836.j2JIagYZ028703@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28690/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfprint.spec 
Log Message:
auto-import xfprint-4.2.1-1 on branch devel from xfprint-4.2.1-1.src.rpm


--- NEW FILE xfprint.spec ---
Summary: Print dialog and printer manager for Xfce 4
Name: xfprint
Version: 4.2.1
Release: 1
License: BSD
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfprint-4.2.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: glib2 >= 2.2.0
Requires: libxfcegui4 >= 4.2.1
Requires: a2ps
BuildRequires: glib2-devel >= 2.2.0
BuildRequires: libxfcegui4-devel >= 4.2.1
BuildRequires: a2ps

%description
xfprint contains a print dialog and a printer manager for the Xfce 4
Desktop Environment, it supports CUPS, BSD-LPR and file as printing
destinations.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc README ChangeLog NEWS COPYING AUTHORS NOTES
%{_bindir}/*
%{_libdir}/xfce4/*
%{_datadir}/applications/*
%{_datadir}/xfce4/*
%{_datadir}/icons/*

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc
- Fixed case of Xfce

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:36:09 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:36:39 -0000	1.2
@@ -0,0 +1 @@
+xfprint-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:36:09 -0000	1.1
+++ sources	19 Mar 2005 18:36:39 -0000	1.2
@@ -0,0 +1 @@
+15922d7e3840ad06144d7e210621ffee  xfprint-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar 19 18:39:08 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:39:08 -0500
Subject: rpms/xfwm4-themes - New directory
Message-ID: <200503191839.j2JId8FR028854@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847/xfwm4-themes

Log Message:
Directory /cvs/extras/rpms/xfwm4-themes added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:39:08 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:39:08 -0500
Subject: rpms/xfwm4-themes/devel - New directory
Message-ID: <200503191839.j2JId8Rk028857@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847/xfwm4-themes/devel

Log Message:
Directory /cvs/extras/rpms/xfwm4-themes/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Mar 19 18:39:21 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:39:21 -0500
Subject: rpms/xfwm4-themes/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503191839.j2JIdLGa028923@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28909/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfwm4-themes


--- 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 Mar 19 18:39:21 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:39:21 -0500
Subject: rpms/xfwm4-themes Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503191839.j2JIdLpT028920@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28909

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfwm4-themes


--- NEW FILE Makefile ---
# Top level Makefile for module xfwm4-themes
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 19 18:39:48 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:39:48 -0500
Subject: rpms/xfwm4-themes import.log,1.1,1.2
Message-ID: <200503191839.j2JIdmDO029021@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29012

Modified Files:
	import.log 
Log Message:
auto-import xfwm4-themes-4.2.1-1 on branch devel from xfwm4-themes-4.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Mar 2005 18:39:19 -0000	1.1
+++ import.log	19 Mar 2005 18:39:46 -0000	1.2
@@ -0,0 +1 @@
+xfwm4-themes-4_2_1-1:HEAD:xfwm4-themes-4.2.1-1.src.rpm:1111257574



From fedora-extras-commits at redhat.com  Sat Mar 19 18:39:48 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 19 Mar 2005 13:39:48 -0500
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503191839.j2JIdm7X029026@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29012/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfwm4-themes.spec 
Log Message:
auto-import xfwm4-themes-4.2.1-1 on branch devel from xfwm4-themes-4.2.1-1.src.rpm


--- NEW FILE xfwm4-themes.spec ---
Summary: Additional themes for xfwm4
Name: xfwm4-themes
Version: 4.2.1
Release: 1
License: GPL
URL: http://www.xfce.org/
Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-themes-4.2.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xfwm4
BuildArch: noarch

%description
A set of additional themes for the xfwm4 window manager.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README TODO COPYING AUTHORS
%{_datadir}/themes

%changelog
* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed spelling: Additionnal to Additional

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2005 18:39:19 -0000	1.1
+++ .cvsignore	19 Mar 2005 18:39:46 -0000	1.2
@@ -0,0 +1 @@
+xfwm4-themes-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2005 18:39:19 -0000	1.1
+++ sources	19 Mar 2005 18:39:46 -0000	1.2
@@ -0,0 +1 @@
+f3c3110d1c5a7a49b53ced19512ab66a  xfwm4-themes-4.2.1.tar.bz2



From riel at redhat.com  Fri Mar 18 12:31:36 2005
From: riel at redhat.com (Rik van Riel)
Date: Fri, 18 Mar 2005 07:31:36 -0500 (EST)
Subject: devel/hamlib hamlib.spec,1.4,1.5
In-Reply-To: <200503172259.j2HMxQps031405@cvs-int.fedora.redhat.com>
References: <200503172259.j2HMxQps031405@cvs-int.fedora.redhat.com>
Message-ID: <Pine.LNX.4.61.0503180730580.26156@chimarrao.boston.redhat.com>

On Thu, 17 Mar 2005, Ignacio Vazquez-Abrams wrote:

> Update of /cvs/extras/devel/hamlib
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31399

Awesome.  I've always wanted to try out hamlib and rigcontrol,
but so far have been too lazy to compile them ;)

Thank you for this RPM.

-- 
"Debugging is twice as hard as writing the code in the first place.
Therefore, if you write the code as cleverly as possible, you are,
by definition, not smart enough to debug it." - Brian W. Kernighan



From fedora-extras-commits at redhat.com  Sun Mar 20 00:08:01 2005
From: fedora-extras-commits at redhat.com (Toni Willberg (twillber))
Date: Sat, 19 Mar 2005 19:08:01 -0500
Subject: rpms/silky/devel silky-0.5.4-desktop.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 silky.spec, 1.5, 1.6 sources, 1.3,
	1.4 silky-0.5.1-desktop.patch, 1.1, NONE
Message-ID: <200503200008.j2K081Xb006702@cvs-int.fedora.redhat.com>

Author: twillber

Update of /cvs/extras/rpms/silky/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6691

Modified Files:
	.cvsignore silky.spec sources 
Added Files:
	silky-0.5.4-desktop.patch 
Removed Files:
	silky-0.5.1-desktop.patch 
Log Message:
 - New upstream release, Silky 0.5.4
 - removed silc flags from configure, now using pkg-config


silky-0.5.4-desktop.patch:

--- NEW FILE silky-0.5.4-desktop.patch ---
--- silky-0.5.4/Makefile.in.orig	2005-03-20 01:45:10.022296880 +0200
+++ silky-0.5.4/Makefile.in	2005-03-20 01:45:45.019976424 +0200
@@ -142,7 +142,7 @@
 
 EXTRA_DIST = $(silkydoc_DATA) $(glade_DATA)
 
-gnomemenudir = $(prefix)/@NO_PREFIX_PACKAGE_MENU_DIR@/Applications
+gnomemenudir = $(prefix)/share/applications
 gnomemenu_DATA = silky.desktop
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/silky/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:20:41 -0000	1.3
+++ .cvsignore	20 Mar 2005 00:07:59 -0000	1.4
@@ -1 +1 @@
-silky-0.5.2.tar.gz
+silky-0.5.4.tar.gz


Index: silky.spec
===================================================================
RCS file: /cvs/extras/rpms/silky/devel/silky.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- silky.spec	5 Mar 2005 19:28:28 -0000	1.5
+++ silky.spec	20 Mar 2005 00:07:59 -0000	1.6
@@ -1,16 +1,15 @@
 Summary: Easy-to-use graphical SILC client
 Name: silky
-Version: 0.5.2
+Version: 0.5.4
 Release: 1
 License: GPL
 Group: Applications/Communications
 URL: http://silky.sourceforge.net/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Patch: silky-0.5.1-desktop.patch
+Patch0: silky-0.5.4-desktop.patch
 
 # mailcap is needed for /etc/mime.types
-
 Requires: mailcap
 Requires: libsilc >= 0.9.12
 
@@ -25,9 +24,8 @@
 %patch -p1
 
 %build
-%configure --with-silc-libs=%{_libdir}/silc \
- --with-silc-includes=%{_includedir}/silc \
- --with-docdir=%{_docdir}/silky-%{version}
+%configure --with-docdir=%{_docdir}/silky-%{version}
+
 make %{?_smp_mflags}
 
 %install
@@ -47,10 +45,14 @@
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Fri Oct 10 2004 Toni Willberg <toniw2iki.fi> - 0.5.2-0.fdr.1
+* Sun Mar 20 2005 Toni Willberg <toniw at iki.fi> - 0.5.4-1
+- New upstream release, Silky 0.5.4
+- removed silc flags from configure, now using pkg-config
+
+* Fri Oct 10 2004 Toni Willberg <toniw at iki.fi> - 0.5.2-0.fdr.1
 - corrected buildrequires and version number
 
-* Fri Oct 08 2004 Toni Willberg <toniw2iki.fi> - 0.5.2-0.fdr.0
+* Fri Oct 08 2004 Toni Willberg <toniw at iki.fi> - 0.5.2-0.fdr.0
 - Release 0.5.2
 
 * Sat Sep 11 2004 Toni Willberg <toniw at iki.fi> - 0.5.1-0.fdr.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/silky/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:20:41 -0000	1.3
+++ sources	20 Mar 2005 00:07:59 -0000	1.4
@@ -1 +1 @@
-6e73ec6cb441bb4ed25ca78636c8c0de  silky-0.5.2.tar.gz
+ef7a583bfb612ec16b3437f56e5c72a3  silky-0.5.4.tar.gz


--- silky-0.5.1-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar 20 01:34:47 2005
From: fedora-extras-commits at redhat.com (Toni Willberg (twillber))
Date: Sat, 19 Mar 2005 20:34:47 -0500
Subject: rpms/silky/FC-3 silky-0.5.4-desktop.patch, NONE, 1.1 silky.spec, 1.4,
	1.5 sources, 1.3, 1.4 silky-0.5.1-desktop.patch, 1.1, NONE
Message-ID: <200503200134.j2K1Yl7R008794@cvs-int.fedora.redhat.com>

Author: twillber

Update of /cvs/extras/rpms/silky/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8782/FC-3

Modified Files:
	silky.spec sources 
Added Files:
	silky-0.5.4-desktop.patch 
Removed Files:
	silky-0.5.1-desktop.patch 
Log Message:
 - release 0.5.4


silky-0.5.4-desktop.patch:

--- NEW FILE silky-0.5.4-desktop.patch ---
--- silky-0.5.4/Makefile.in.orig	2005-03-20 01:45:10.022296880 +0200
+++ silky-0.5.4/Makefile.in	2005-03-20 01:45:45.019976424 +0200
@@ -142,7 +142,7 @@
 
 EXTRA_DIST = $(silkydoc_DATA) $(glade_DATA)
 
-gnomemenudir = $(prefix)/@NO_PREFIX_PACKAGE_MENU_DIR@/Applications
+gnomemenudir = $(prefix)/share/applications
 gnomemenu_DATA = silky.desktop
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs


Index: silky.spec
===================================================================
RCS file: /cvs/extras/rpms/silky/FC-3/silky.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- silky.spec	10 Dec 2004 22:03:11 -0000	1.4
+++ silky.spec	20 Mar 2005 01:34:45 -0000	1.5
@@ -1,22 +1,20 @@
-Summary: Silky is an easy-to-use graphical SILC client.
+Summary: Easy-to-use graphical SILC client
 Name: silky
-Version: 0.5.2
+Version: 0.5.4
 Release: 1
 License: GPL
 Group: Applications/Communications
 URL: http://silky.sourceforge.net/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Patch: silky-0.5.1-desktop.patch
-Epoch: 0
+Patch0: silky-0.5.4-desktop.patch
 
 # mailcap is needed for /etc/mime.types
-
 Requires: mailcap
-Requires: libsilc >= 0:0.9.12
+Requires: libsilc >= 0.9.12
 
 BuildRequires: gtk2-devel libxml2-devel libglade2-devel
-BuildRequires: libsilc-devel >= 0:0.9.12
+BuildRequires: libsilc-devel >= 0.9.12
 
 %description
 Silky is a graphical SILC client.
@@ -26,8 +24,8 @@
 %patch -p1
 
 %build
-%configure --with-silc-libs=%{_libdir}/silc \
- --with-silc-includes=%{_includedir}/silc --with-docdir=%{_docdir}/silky-%{version}
+%configure --with-docdir=%{_docdir}/silky-%{version}
+
 make %{?_smp_mflags}
 
 %install
@@ -47,10 +45,14 @@
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Fri Oct 10 2004 Toni Willberg <toniw2iki.fi> - 0.5.2-0.fdr.1
+* Sun Mar 20 2005 Toni Willberg <toniw at iki.fi> - 0.5.4-1
+- New upstream release, Silky 0.5.4
+- removed silc flags from configure, now using pkg-config
+
+* Fri Oct 10 2004 Toni Willberg <toniw at iki.fi> - 0.5.2-0.fdr.1
 - corrected buildrequires and version number
 
-* Fri Oct 08 2004 Toni Willberg <toniw2iki.fi> - 0.5.2-0.fdr.0
+* Fri Oct 08 2004 Toni Willberg <toniw at iki.fi> - 0.5.2-0.fdr.0
 - Release 0.5.2
 
 * Sat Sep 11 2004 Toni Willberg <toniw at iki.fi> - 0.5.1-0.fdr.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/silky/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:20:41 -0000	1.3
+++ sources	20 Mar 2005 01:34:45 -0000	1.4
@@ -1 +1 @@
-6e73ec6cb441bb4ed25ca78636c8c0de  silky-0.5.2.tar.gz
+ef7a583bfb612ec16b3437f56e5c72a3  silky-0.5.4.tar.gz


--- silky-0.5.1-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar 20 01:38:27 2005
From: fedora-extras-commits at redhat.com (Toni Willberg (twillber))
Date: Sat, 19 Mar 2005 20:38:27 -0500
Subject: rpms/silky/FC-3 .cvsignore,1.3,1.4
Message-ID: <200503200138.j2K1cRgR008886@cvs-int.fedora.redhat.com>

Author: twillber

Update of /cvs/extras/rpms/silky/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8876

Modified Files:
	.cvsignore 
Log Message:
 - release 0.5.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/silky/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:20:41 -0000	1.3
+++ .cvsignore	20 Mar 2005 01:38:25 -0000	1.4
@@ -1 +1 @@
-silky-0.5.2.tar.gz
+silky-0.5.4.tar.gz



From rc040203 at freenet.de  Sun Mar 20 06:57:48 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Sun, 20 Mar 2005 07:57:48 +0100
Subject: rpms/libxfce4mcs/devel libxfce4mcs.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503191732.j2JHWQIA020787@cvs-int.fedora.redhat.com>
References: <200503191732.j2JHWQIA020787@cvs-int.fedora.redhat.com>
Message-ID: <1111301868.2475.195.camel@mccallum.corsepiu.local>

On Sat, 2005-03-19 at 12:32 -0500, Kevin Fenzi wrote:
> Author: kevin
> 
> Update of /cvs/extras/rpms/libxfce4mcs/devel

> Added Files:
> 	libxfce4mcs.spec 
> Log Message:
> auto-import libxfce4mcs-4.2.1-1 on branch devel from libxfce4mcs-4.2.1-1.src.rpm

> %install
> rm -rf $RPM_BUILD_ROOT
> make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

The "mandir=%{_mandir}" is redundant/superfluous, and probably also in
most (all?) of your xfce*.specs.

Ralf



From fedora-extras-commits at redhat.com  Sun Mar 20 07:28:04 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:28:04 -0500
Subject: rpms/dbh/devel dbh.spec,1.1,1.2
Message-ID: <200503200728.j2K7S4Ks022311@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/dbh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22290

Modified Files:
	dbh.spec 
Log Message:
remove moronic changelog lines and prep for FC4 build



Index: dbh.spec
===================================================================
RCS file: /cvs/extras/rpms/dbh/devel/dbh.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbh.spec	19 Mar 2005 17:36:03 -0000	1.1
+++ dbh.spec	20 Mar 2005 07:28:02 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Disk based hash library
 Name: dbh
 Version: 1.0.22
-Release: 1
+Release: 2.FC4
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src/dbh-1.0.22.tar.gz
 Patch: dbh-1.0.22-rpath.patch
@@ -63,18 +63,18 @@
 %{_includedir}/*
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 1:1.0.22-2
+- remove stuff
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 1:1.0.22-1
 - Updated to 4.2.1 version
 - Rediffed rpath patch for new version
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 1:1.0.20-3
-- Removed generic INSTALL doc from doc
+- Removed generic INSTALL doc
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 1:1.0.20-2
-- Inital fedora extras version
-- Updated Source line
 - Changed license to LGPL
-- Increased the Release version by one
 
 * Wed Dec 08 2004 Than Ngo <than at redhat.com> 1:1.0.20-1
 - update to 1.0.20



From fedora-extras-commits at redhat.com  Sun Mar 20 07:34:01 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:34:01 -0500
Subject: rpms/libxfce4util/devel libxfce4util.spec,1.1,1.2
Message-ID: <200503200734.j2K7Y18F022451@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22435

Modified Files:
	libxfce4util.spec 
Log Message:
remove moronic lines and prep for FC4 build



Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libxfce4util.spec	19 Mar 2005 17:47:51 -0000	1.1
+++ libxfce4util.spec	20 Mar 2005 07:33:59 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
 Version: 4.2.1
-Release: 1
+Release: 1.FC4
 License: BSD and LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4util-4.2.1.tar.bz2
@@ -58,6 +58,9 @@
 %doc %{_datadir}/gtk-doc/html/libxfce4util
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- remove stuff 
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
@@ -67,10 +70,8 @@
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
 - Inital Fedora Extras version
-- Updated Source line
 - Capitalized first letter of Summary in devel section to quiet rpmlint
 - Added LGPL to License as 2 files are under LGPL, the rest BSD
-- Increased the Release version by one
 
 * Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - update to 4.2.0 release



From fedora-extras-commits at redhat.com  Sun Mar 20 07:41:26 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:41:26 -0500
Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.1,1.2
Message-ID: <200503200741.j2K7fQWs022599@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22585

Modified Files:
	libxfcegui4.spec 
Log Message:
remove moronic lines and prep for FC4 build



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libxfcegui4.spec	19 Mar 2005 17:52:16 -0000	1.1
+++ libxfcegui4.spec	20 Mar 2005 07:41:24 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
 Version: 4.2.1
-Release: 2
+Release: 3.FC4
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfcegui4-4.2.1.tar.bz2
@@ -67,6 +67,9 @@
 %{_datadir}/gtk-doc/html/libxfcegui4
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-3
+- remove stuff
+
 * Wed Mar 16 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
 - Fixed %files bug that wasn't packaging .so files
 
@@ -77,14 +80,11 @@
 - Fixed Xfce case
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Inital Fedora Extras version
-- Updated the Source line
 - Capitalized first letter of Summary in devel section to quiet rpmlint
 - Added dbh-devel to BuildRequires
 - Capitalized the GTK in the Summary to queit rpmlint
 - Moved all the module *.a and *.la libraries to the devel package
 - Added Provides: libxfcegui4-devel to devel package
-- Increased the Relase version by one
 
 * Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - update to 4.2.0



From fedora-extras-commits at redhat.com  Sun Mar 20 07:42:17 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:42:17 -0500
Subject: rpms/libxfce4util/devel libxfce4util.spec,1.2,1.3
Message-ID: <200503200742.j2K7gHtR022655@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22640

Modified Files:
	libxfce4util.spec 
Log Message:
bump



Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libxfce4util.spec	20 Mar 2005 07:33:59 -0000	1.2
+++ libxfce4util.spec	20 Mar 2005 07:42:15 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
 Version: 4.2.1
-Release: 1.FC4
+Release: 2.FC4
 License: BSD and LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4util-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar 20 07:45:09 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:45:09 -0500
Subject: rpms/libxfce4mcs/devel libxfce4mcs.spec,1.1,1.2
Message-ID: <200503200745.j2K7j9XA022750@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22736

Modified Files:
	libxfce4mcs.spec 
Log Message:
remove and prep for FC4 build



Index: libxfce4mcs.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/libxfce4mcs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libxfce4mcs.spec	19 Mar 2005 17:32:24 -0000	1.1
+++ libxfce4mcs.spec	20 Mar 2005 07:45:07 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Multi-channel settings management support for Xfce
 Name: libxfce4mcs
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4mcs-4.2.1.tar.bz2
@@ -61,6 +61,9 @@
 %{_datadir}/gtk-doc/html/libxfce4mcs
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- remove stuff
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
@@ -68,10 +71,7 @@
 - Fixed Xfce case
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Inital Fedora Extras version
-- Updated the Source line
 - Capitalized first letter of Summary in devel section to quiet rpmlint
-- Increased the Relase version by one
 
 * Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - update to 4.2.0



From fedora-extras-commits at redhat.com  Sun Mar 20 07:47:28 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:47:28 -0500
Subject: rpms/xfce-mcs-manager/devel xfce-mcs-manager.spec,1.1,1.2
Message-ID: <200503200747.j2K7lSEb022852@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22840

Modified Files:
	xfce-mcs-manager.spec 
Log Message:
remove and prep for FC4 build



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/xfce-mcs-manager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce-mcs-manager.spec	19 Mar 2005 18:19:27 -0000	1.1
+++ xfce-mcs-manager.spec	20 Mar 2005 07:47:26 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-manager-4.2.1.tar.bz2
@@ -59,6 +59,9 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- remove stuff
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
@@ -66,10 +69,7 @@
 - Fixed case of Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Inital Fedora Extras version
-- Updated the Source line
 - Capitalized first letter of Summary in devel section to quiet rpmlint
-- Increased the Release by one
 
 * Sun Jan 23 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - update to 4.2.0



From fedora-extras-commits at redhat.com  Sun Mar 20 07:50:48 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:50:48 -0500
Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.1,1.2
Message-ID: <200503200750.j2K7om5w022959@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22945

Modified Files:
	xfce4-panel.spec 
Log Message:
remove stuff and prep for FC4 build



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-panel.spec	19 Mar 2005 18:07:51 -0000	1.1
+++ xfce4-panel.spec	20 Mar 2005 07:50:46 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.2.1.1
-Release: 1
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-panel-4.2.1.1.tar.bz2
@@ -65,6 +65,9 @@
 %{_includedir}/xfce4
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1.1-2
+- remove stuff
+
 * Thu Mar 17 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1.1-1
 - Updated to 4.2.1.1 version
 - Changed Requires/Buildrequires to 4.2.1, as xfce4-panel was the only package updated to 4.2.1.1
@@ -76,11 +79,8 @@
 - Fixed case of Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
-- Inital Fedora Extras version
-- Updated the Source line
 - Created a new patch to change mozilla -mail to launchmail
 - Moved the includes to the devel subpackage
-- Increased the Release by one
 
 * Thu Feb 03 2005 Than Ngo <than at redhat.com> 4.2.0-2
 - new sub package xfce4-panel-devel



From fedora-extras-commits at redhat.com  Sun Mar 20 07:53:33 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:53:33 -0500
Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.2,1.3
Message-ID: <200503200753.j2K7rXqS023040@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23020

Modified Files:
	libxfcegui4.spec 
Log Message:
dbh has an epoch of 1
I could have added the epoch to the versioned requires
but this really doesn't need a version, so removed instead



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libxfcegui4.spec	20 Mar 2005 07:41:24 -0000	1.2
+++ libxfcegui4.spec	20 Mar 2005 07:53:31 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
 Version: 4.2.1
-Release: 3.FC4
+Release: 3.FC3
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfcegui4-4.2.1.tar.bz2
@@ -12,7 +12,7 @@
 Requires: libxfce4util >= %{version}
 BuildRequires: gtk2-devel >= 2.0.6
 BuildRequires: libxfce4util-devel >= %{version}
-BuildRequires: dbh-devel >= 1.0
+BuildRequires: dbh-devel
 
 %description
 The package includes various gtk widgets for Xfce.
@@ -68,7 +68,7 @@
 
 %changelog
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-3
-- remove stuff
+- remove stuff, remove version from dbh-devel buildreq
 
 * Wed Mar 16 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
 - Fixed %files bug that wasn't packaging .so files



From fedora-extras-commits at redhat.com  Sun Mar 20 07:54:00 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 02:54:00 -0500
Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.3,1.4
Message-ID: <200503200754.j2K7s0q3023104@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23091

Modified Files:
	libxfcegui4.spec 
Log Message:
oops



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libxfcegui4.spec	20 Mar 2005 07:53:31 -0000	1.3
+++ libxfcegui4.spec	20 Mar 2005 07:53:58 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
 Version: 4.2.1
-Release: 3.FC3
+Release: 3.FC4
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfcegui4-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar 20 08:40:44 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 03:40:44 -0500
Subject: rpms/xfce4-iconbox/devel xfce4-iconbox.spec,1.1,1.2
Message-ID: <200503200840.j2K8eiEv025275@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-iconbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25257

Modified Files:
	xfce4-iconbox.spec 
Log Message:
prep for FC4 build



Index: xfce4-iconbox.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-iconbox/devel/xfce4-iconbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-iconbox.spec	19 Mar 2005 18:00:34 -0000	1.1
+++ xfce4-iconbox.spec	20 Mar 2005 08:40:42 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Icon box for the Xfce4 Desktop Environment
 Name: xfce4-iconbox
 Version: 4.2.1
-Release: 1
+Release: 1.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-iconbox-4.2.1.tar.bz2
@@ -53,8 +53,6 @@
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
 - Inital Fedora Extras version
-- Updated the Source line
-- Increased the Release by one
 
 * Fri Jan 28 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - 4.2.0



From fedora-extras-commits at redhat.com  Sun Mar 20 08:43:41 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 03:43:41 -0500
Subject: rpms/xfce4-systray/devel xfce4-systray.spec,1.1,1.2
Message-ID: <200503200843.j2K8hfdT025401@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25386/xfce4-systray/devel

Modified Files:
	xfce4-systray.spec 
Log Message:
remove macro from changelog and prep for FC4 build



Index: xfce4-systray.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systray/devel/xfce4-systray.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-systray.spec	19 Mar 2005 18:12:25 -0000	1.1
+++ xfce4-systray.spec	20 Mar 2005 08:43:39 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Systray for the Xfce4 Desktop Environment
 Name: xfce4-systray
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-systray-4.2.1.tar.bz2
@@ -39,17 +39,18 @@
 %{_libdir}/xfce4
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- remove macro from changelog
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-4
-- Removed generic INSTALL from %doc
+- Removed generic INSTALL from doc
 - Fixed case of Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-3
 - Inital Fedora Extras version
-- Updated the Source line
-- Increased the Release by one
 
 * Wed Jan 26 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - 4.2.0



From fedora-extras-commits at redhat.com  Sun Mar 20 08:47:59 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 03:47:59 -0500
Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins.spec,1.1,1.2
Message-ID: <200503200847.j2K8lxMU025606@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25592

Modified Files:
	xfce-mcs-plugins.spec 
Log Message:
remove explicit gtk2 req and prep for FC4 build



Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce-mcs-plugins.spec	19 Mar 2005 18:22:31 -0000	1.1
+++ xfce-mcs-plugins.spec	20 Mar 2005 08:47:57 -0000	1.2
@@ -1,14 +1,13 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-plugins-4.2.1.tar.bz2
 Patch: xfce-mcs-plugins-4.2.0-rh.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: gtk2 >= 2.0.6
 Requires: xfce-mcs-manager >= %{version}
 BuildRequires: gettext
 BuildRequires: gtk2-devel >= 2.0.6
@@ -48,14 +47,14 @@
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- remove explicit gtk2 req
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Inital Fedora Extras version
-- Updated the Source line
 - Capitalized first letter of Summary in devel section to quiet rpmlint
-- Increased the Release by one
 
 * Mon Jan 24 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - 4.2.0



From fedora-extras-commits at redhat.com  Sun Mar 20 08:49:50 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 03:49:50 -0500
Subject: rpms/xfce-utils/devel xfce-utils.spec,1.1,1.2
Message-ID: <200503200849.j2K8noBR025696@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25682

Modified Files:
	xfce-utils.spec 
Log Message:
prep for FC4 build



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce-utils.spec	19 Mar 2005 18:25:18 -0000	1.1
+++ xfce-utils.spec	20 Mar 2005 08:49:48 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
 Version: 4.2.1
-Release: 1
+Release: 1.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-utils-4.2.1.tar.bz2
@@ -66,10 +66,7 @@
 - Fixed case on Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Inital Fedora Extras version
-- Updated the Source line
 - Removed old misc patch 
-- Increased the Release by one
 
 * Thu Jan 27 2005 Than Ngo <than at redhat.com> 4.2.0-1
 - 4.2.0



From fedora-extras-commits at redhat.com  Sun Mar 20 09:57:51 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Sun, 20 Mar 2005 04:57:51 -0500
Subject: rpms/sabayon/devel sabayon.spec,1.3,1.4
Message-ID: <200503200957.j2K9vphu031385@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31375

Modified Files:
	sabayon.spec 
Log Message:
* Sun Mar 20 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-4
- Split the package into sabayon and sabayon-admin
- BuildRequires: gettext instead of gettext-devel



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sabayon.spec	19 Mar 2005 09:23:45 -0000	1.3
+++ sabayon.spec	20 Mar 2005 09:57:49 -0000	1.4
@@ -6,7 +6,7 @@
 
 Name:    sabayon
 Version: 0.16
-Release: 3
+Release: 4
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -24,7 +24,7 @@
 Requires: shadow-utils
 
 BuildRequires: python
-BuildRequires: gettext-devel
+BuildRequires: gettext
 BuildRequires: desktop-file-utils
 
 Requires(post):  shadow-utils
@@ -34,6 +34,15 @@
 Sabayon is a tool to help sysadmins and user change and maintain the
 default behaviour of the GNOME desktop.
 
+%package  admin
+Summary:  Graphical tools for Sabayon profile management
+Group:    Applications/System
+Requires: %{name} = %{version}-%{release}
+
+%description admin
+The sabayon-admin package contains the graphical tools which a
+sysadmin should use to manage Sabayon profiles.
+
 %prep
 %setup -q
 
@@ -61,48 +70,107 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-/usr/sbin/groupadd -r %{name} &>/dev/null || :
-/usr/sbin/useradd  -r -s /sbin/nologin -c "Sabayon user" -g %{name} %{name} &>/dev/null || :
-/usr/sbin/usermod -d "" %{name} &>/dev/null || :
+%pre admin
+/usr/sbin/groupadd -r %{name}-admin &>/dev/null || :
+/usr/sbin/useradd  -r -s /sbin/nologin -c "Sabayon user" -g %{name}-admin %{name}-admin &>/dev/null || :
+/usr/sbin/usermod -d "" %{name}-admin &>/dev/null || :
 
-%postun
+%postun admin
 if [ $1 -eq 0 ]; then
-  /usr/sbin/userdel  %{name} &>/dev/null || :
-  /usr/sbin/groupdel %{name} &>/dev/null || :
+  /usr/sbin/userdel  %{name}-admin &>/dev/null || :
+  /usr/sbin/groupdel %{name}-admin &>/dev/null || :
 fi
 
 %files -f sabayon.lang
 %defattr(-, root, root, 755)
 
 %doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES
-%doc doc/index.html doc/testing.html doc/helping.html doc/developing.html
-%doc doc/sabayon.css doc/*.jpg doc/*.gif
 
 %config(noreplace) %{_sysconfdir}/gconf/2/local-defaults.path
 %config(noreplace) %{_sysconfdir}/gconf/2/local-mandatory.path
-%config(noreplace) %{_sysconfdir}/pam.d/%{name}
-%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 %config(noreplace) %{_sysconfdir}/X11/xinit/xinitrc.d/%{name}*
 
 %{_sysconfdir}/desktop-profiles
 
-%{_bindir}/%{name}*
-%{_sbindir}/%{name}*
+%{_sbindir}/%{name}-apply
+
+%{python_sitelib}/%{name}/__init__.py
+%{python_sitelib}/%{name}/__init__.pyc
+%ghost %{python_sitelib}/%{name}/__init__.pyo
+%{python_sitelib}/%{name}/config.py
+%{python_sitelib}/%{name}/config.pyc
+%ghost %{python_sitelib}/%{name}/config.pyo
+%{python_sitelib}/%{name}/storage.py
+%{python_sitelib}/%{name}/storage.pyc
+%ghost %{python_sitelib}/%{name}/storage.pyo
+%{python_sitelib}/%{name}/userdb.py
+%{python_sitelib}/%{name}/userdb.pyc
+%ghost %{python_sitelib}/%{name}/userdb.pyo
+%{python_sitelib}/%{name}/userprofile.py
+%{python_sitelib}/%{name}/userprofile.pyc
+%ghost %{python_sitelib}/%{name}/userprofile.pyo
+%{python_sitelib}/%{name}/util.py
+%{python_sitelib}/%{name}/util.pyc
+%ghost %{python_sitelib}/%{name}/util.pyo
+
+%{python_sitelib}/%{name}/sources/*.py
+%{python_sitelib}/%{name}/sources/*.pyc
+%ghost %{python_sitelib}/%{name}/sources/*.pyo
+
+%files admin
+%doc doc/index.html doc/testing.html doc/helping.html doc/developing.html
+%doc doc/sabayon.css doc/*.jpg doc/*.gif
+
+%config(noreplace) %{_sysconfdir}/pam.d/%{name}
+%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
+
+%{_bindir}/%{name}
+%{_sbindir}/%{name}
 %{_libexecdir}/%{name}*
 
 %{_datadir}/%{name}/glade/%{name}.glade
 %{_datadir}/applications/gnome-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
-%{python_sitelib}/%{name}/*.py
-%{python_sitelib}/%{name}/*.pyc
-%ghost %{python_sitelib}/%{name}/*.pyo
-%{python_sitelib}/%{name}/sources/*.py
-%{python_sitelib}/%{name}/sources/*.pyc
-%ghost %{python_sitelib}/%{name}/sources/*.pyo
+%{python_sitelib}/%{name}/aboutdialog.py
+%{python_sitelib}/%{name}/aboutdialog.pyc
+%ghost %{python_sitelib}/%{name}/aboutdialog.pyo
+%{python_sitelib}/%{name}/dirmonitor.py
+%{python_sitelib}/%{name}/dirmonitor.pyc
+%ghost %{python_sitelib}/%{name}/dirmonitor.pyo
+%{python_sitelib}/%{name}/editorwindow.py
+%{python_sitelib}/%{name}/editorwindow.pyc
+%ghost %{python_sitelib}/%{name}/editorwindow.pyo
+%{python_sitelib}/%{name}/fileviewer.py
+%{python_sitelib}/%{name}/fileviewer.pyc
+%ghost %{python_sitelib}/%{name}/fileviewer.pyo
+%{python_sitelib}/%{name}/gconfviewer.py
+%{python_sitelib}/%{name}/gconfviewer.pyc
+%ghost %{python_sitelib}/%{name}/gconfviewer.pyo
+%{python_sitelib}/%{name}/monitorwindow.py
+%{python_sitelib}/%{name}/monitorwindow.pyc
+%ghost %{python_sitelib}/%{name}/monitorwindow.pyo
+%{python_sitelib}/%{name}/profilesdialog.py
+%{python_sitelib}/%{name}/profilesdialog.pyc
+%ghost %{python_sitelib}/%{name}/profilesdialog.pyo
+%{python_sitelib}/%{name}/protosession.py
+%{python_sitelib}/%{name}/protosession.pyc
+%ghost %{python_sitelib}/%{name}/protosession.pyo
+%{python_sitelib}/%{name}/saveconfirm.py
+%{python_sitelib}/%{name}/saveconfirm.pyc
+%ghost %{python_sitelib}/%{name}/saveconfirm.pyo
+%{python_sitelib}/%{name}/usermod.py
+%{python_sitelib}/%{name}/usermod.pyc
+%ghost %{python_sitelib}/%{name}/usermod.pyo
+%{python_sitelib}/%{name}/userswindow.py
+%{python_sitelib}/%{name}/userswindow.pyc
+%ghost %{python_sitelib}/%{name}/userswindow.pyo
 
 %changelog
+* Sun Mar 20 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-4
+- Split the package into sabayon and sabayon-admin
+- BuildRequires: gettext instead of gettext-devel
+
 * Sat Mar 19 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-3
 - Remove period at the end of the summary
 - Specify full URL for source



From fedora-extras-commits at redhat.com  Sun Mar 20 13:08:45 2005
From: fedora-extras-commits at redhat.com (Toni Willberg (twillber))
Date: Sun, 20 Mar 2005 08:08:45 -0500
Subject: rpms/silky/FC-3 silky.spec,1.5,1.6
Message-ID: <200503201308.j2KD8jqW004857@cvs-int.fedora.redhat.com>

Author: twillber

Update of /cvs/extras/rpms/silky/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4849

Modified Files:
	silky.spec 
Log Message:
 - corrected release tag for FC3



Index: silky.spec
===================================================================
RCS file: /cvs/extras/rpms/silky/FC-3/silky.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- silky.spec	20 Mar 2005 01:34:45 -0000	1.5
+++ silky.spec	20 Mar 2005 13:08:43 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Easy-to-use graphical SILC client
 Name: silky
 Version: 0.5.4
-Release: 1
+Release: 0.FC3
 License: GPL
 Group: Applications/Communications
 URL: http://silky.sourceforge.net/
@@ -48,6 +48,7 @@
 * Sun Mar 20 2005 Toni Willberg <toniw at iki.fi> - 0.5.4-1
 - New upstream release, Silky 0.5.4
 - removed silc flags from configure, now using pkg-config
+- corrected release tag to 0.FC3, to distinguish from devel
 
 * Fri Oct 10 2004 Toni Willberg <toniw at iki.fi> - 0.5.2-0.fdr.1
 - corrected buildrequires and version number



From fedora-extras-commits at redhat.com  Sun Mar 20 19:16:52 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 20 Mar 2005 14:16:52 -0500
Subject: rpms/gai/FC-3 gai-0.5.8-multilib.patch,1.1,1.2 gai.spec,1.8,1.9
Message-ID: <200503201916.j2KJGqXd014186@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14175

Modified Files:
	gai-0.5.8-multilib.patch gai.spec 
Log Message:
* Sun Mar 20 2005 Fabrice Colin <fabrice.colin[AT]gmail.com> - 0.5.8-6
- Make gai.pc multilib friendly so that 'pkg-config --exists gai' 
  doesn't fail on x86_64.



gai-0.5.8-multilib.patch:

Index: gai-0.5.8-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/gai/FC-3/gai-0.5.8-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gai-0.5.8-multilib.patch	25 Feb 2005 18:06:58 -0000	1.1
+++ gai-0.5.8-multilib.patch	20 Mar 2005 19:16:50 -0000	1.2
@@ -39,3 +39,13 @@
  clean:
  	rm -f *.o *~ *@LIB_END@
  
+--- gai-0.5.8.old/gai.pc.in     2005-03-20 11:18:30.593311880 +0000
++++ gai-0.5.8/gai.pc.in 2005-03-20 11:18:49.061504288 +0000
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib/gai
++libdir=@libdir@/gai
+ includedir=${prefix}/include
+ gnome=@gnome_installed@
+ gl=@gl_installed@


Index: gai.spec
===================================================================
RCS file: /cvs/extras/rpms/gai/FC-3/gai.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gai.spec	13 Mar 2005 05:25:43 -0000	1.8
+++ gai.spec	20 Mar 2005 19:16:50 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		gai
 Version:	0.5.8
-Release:	5
+Release:	6
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -68,6 +68,10 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Sun Mar 20 2005 Fabrice Colin <fabrice.colin[AT]gmail.com> - 0.5.8-6
+- Make gai.pc multilib friendly so that 'pkg-config --exists gai' 
+  doesn't fail on x86_64.
+
 * Sun Mar 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-5
 - Really add gtkglext-devel dependencies (Fabrice Colin).
 



From fedora-extras-commits at redhat.com  Sun Mar 20 19:18:43 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 20 Mar 2005 14:18:43 -0500
Subject: devel/gai gai-0.5.8-gcc4.patch, NONE, 1.1 gai-0.5.8-multilib.patch,
	1.1, 1.2 gai.spec, 1.9, 1.10
Message-ID: <200503201918.j2KJIhOr014251@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/gai
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14241

Modified Files:
	gai-0.5.8-multilib.patch gai.spec 
Added Files:
	gai-0.5.8-gcc4.patch 
Log Message:
* Sun Mar 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-7
- Fix lvalue assignment errors for GCC4.

* Sun Mar 20 2005 Fabrice Colin <fabrice.colin[AT]gmail.com> - 0.5.8-6
- Make gai.pc multilib friendly so that 'pkg-config --exists gai' 
  doesn't fail on x86_64.



gai-0.5.8-gcc4.patch:

--- NEW FILE gai-0.5.8-gcc4.patch ---
diff -Nur gai-0.5.8-orig/gai/gai-pref2.c gai-0.5.8/gai/gai-pref2.c
--- gai-0.5.8-orig/gai/gai-pref2.c	2004-09-12 10:17:58.000000000 +0200
+++ gai-0.5.8/gai/gai-pref2.c	2005-03-20 20:09:30.000000000 +0100
@@ -870,7 +870,7 @@
 
 	    
 	    if(j == g_list_length((GList *)((int *)iw[i].result)[0])){
-		(GList *)((int *)iw[i].result)[0] = g_list_append((GList *)((int *)iw[i].result)[0], 
+		((int *)iw[i].result)[0] = (GList *)g_list_append((GList *)((int *)iw[i].result)[0], 
 								  g_strdup(buff));
 	    } 
 	    ((int *)iw[i].result2)[0] = j;
diff -Nur gai-0.5.8-orig/gai/gai-pref.c gai-0.5.8/gai/gai-pref.c
--- gai-0.5.8-orig/gai/gai-pref.c	2004-03-18 08:56:35.000000000 +0100
+++ gai-0.5.8/gai/gai-pref.c	2005-03-20 20:08:27.000000000 +0100
@@ -967,8 +967,8 @@
 
 	    if((unsigned char*)(((int *)iw[i].result)[0]) != NULL &&
 	       (unsigned char*)(((int *)iw[i].default_val)[0]) != NULL)
-		(unsigned char*)(((int *)iw[i].result)[0]) = 
-		    (unsigned char*)(((int *)iw[i].default_val)[0]) = g_strdup(buff);
+		(((int *)iw[i].result)[0]) = 
+		    (((int *)iw[i].default_val)[0]) = (unsigned char*)g_strdup(buff);
 
 
 	    //printf("%s\n",buff);
@@ -988,7 +988,7 @@
 
 	    
 	    if(j == g_list_length((GList *)((int *)iw[i].result)[0])){
-		(GList *)((int *)iw[i].result)[0] = g_list_append((GList *)((int *)iw[i].result)[0], 
+		((int *)iw[i].result)[0] = (GList *)g_list_append((GList *)((int *)iw[i].result)[0], 
 								  g_strdup(buff));
 		//		printf("%s is a new entry\n",buff);
 	    } 

gai-0.5.8-multilib.patch:

Index: gai-0.5.8-multilib.patch
===================================================================
RCS file: /cvs/extras/devel/gai/gai-0.5.8-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gai-0.5.8-multilib.patch	25 Feb 2005 18:06:58 -0000	1.1
+++ gai-0.5.8-multilib.patch	20 Mar 2005 19:18:40 -0000	1.2
@@ -39,3 +39,13 @@
  clean:
  	rm -f *.o *~ *@LIB_END@
  
+--- gai-0.5.8.old/gai.pc.in     2005-03-20 11:18:30.593311880 +0000
++++ gai-0.5.8/gai.pc.in 2005-03-20 11:18:49.061504288 +0000
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib/gai
++libdir=@libdir@/gai
+ includedir=${prefix}/include
+ gnome=@gnome_installed@
+ gl=@gl_installed@


Index: gai.spec
===================================================================
RCS file: /cvs/extras/devel/gai/gai.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gai.spec	13 Mar 2005 05:25:43 -0000	1.9
+++ gai.spec	20 Mar 2005 19:18:41 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		gai
 Version:	0.5.8
-Release:	5
+Release:	7
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -8,6 +8,7 @@
 URL:		http://gai.sourceforge.net
 Source0:	http://download.sf.net/gai/gai-0.5.8.tar.bz2
 Patch0:		gai-0.5.8-multilib.patch
+Patch1:		gai-0.5.8-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel, gtk2-devel >= 2.2, gnome-panel-devel
@@ -36,6 +37,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
+%patch1 -p1 -b .gcc4
 
 %build
 %ifarch x86_64
@@ -68,6 +70,13 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Sun Mar 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-7
+- Fix lvalue assignment errors for GCC4.
+
+* Sun Mar 20 2005 Fabrice Colin <fabrice.colin[AT]gmail.com> - 0.5.8-6
+- Make gai.pc multilib friendly so that 'pkg-config --exists gai' 
+  doesn't fail on x86_64.
+
 * Sun Mar 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-5
 - Really add gtkglext-devel dependencies (Fabrice Colin).
 



From fedora-extras-commits at redhat.com  Sun Mar 20 20:17:13 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 20 Mar 2005 15:17:13 -0500
Subject: rpms/xfdesktop/devel xfdesktop-image.patch, NONE, 1.1 xfdesktop.spec,
	1.1, 1.2
Message-ID: <200503202017.j2KKHD1h016114@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16087

Modified Files:
	xfdesktop.spec 
Added Files:
	xfdesktop-image.patch 
Log Message:
readded xfdesktop-image.patch
reset spec back to the core/devel version


xfdesktop-image.patch:

--- NEW FILE xfdesktop-image.patch ---
diff -Naur xfdesktop-4.0.5.orig/settings/backdrop_settings.c xfdesktop-4.0.5/settings/backdrop_settings.c
--- xfdesktop-4.0.5.orig/settings/backdrop_settings.c	2003-09-19 23:10:59.000000000 +0200
+++ xfdesktop-4.0.5/settings/backdrop_settings.c	2004-04-20 21:00:10.000000000 +0200
@@ -72,7 +72,8 @@
 #define gdk_pixbuf_new_from_inline gdk_pixbuf_new_from_stream
 #endif
 
-#define DEFAULT_BACKDROP (DATADIR "/xfce4/backdrops/xfce-stripes.png")
+/* Use Fedora (tm) default background image */
+#define DEFAULT_BACKDROP (DATADIR "/backgrounds/images/default.png")
 
 /*
  * XXX - No help button for now. Wait for the others to ACK on this.
@@ -216,12 +217,10 @@
     }
     else
     {
-        /* 
-           Just a color by default #336699 - That number looks cool :)
-         */
-        backdrop_color.red   = (guint16) 0x3300;
-        backdrop_color.green = (guint16) 0x6600;
-        backdrop_color.blue  = (guint16) 0x9900;
+        /* Use Fedora (tm) default background color */
+        backdrop_color.red   = (guint16) 0x2600;
+        backdrop_color.green = (guint16) 0x3200;
+        backdrop_color.blue  = (guint16) 0x4c00;
         backdrop_color.alpha = (guint16) 0;
         mcs_manager_set_color(mcs_plugin->manager, "color", BACKDROP_CHANNEL, 
                               &backdrop_color);


Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfdesktop.spec	19 Mar 2005 18:27:38 -0000	1.1
+++ xfdesktop.spec	20 Mar 2005 20:17:11 -0000	1.2
@@ -1,25 +1,34 @@
-Summary: Desktop manager for the Xfce Desktop Environment
+Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.2.1
 Release: 1
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfdesktop-4.2.1.tar.bz2
+Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz/xfdesktop-4.2.1.tar.bz2
+
+# Change default for Fedora
+Patch1: xfdesktop-image.patch
+
 Group: User Interface/Desktops
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: gtk2 >= 2.2.0
-Requires: libxfce4mcs >= 4.2.1
-Requires: libxfcegui4 >= 4.2.1
-BuildRequires: gtk2 >= 2.2.0
-BuildRequires: libxfce4mcs-devel >= 4.2.1
-BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires: xfce-mcs-manager
+Requires: xfwm4
+Requires: xfce4-panel
+Requires: desktop-backgrounds-basic
+BuildRequires: libxfce4mcs-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: libxml2-devel
+BuildRequires: xfce-mcs-manager-devel
 
 %description
-xfdesktop is a desktop manager for the Xfce Desktop Environment
+This package includes a desktop manager for the XFce Desktop Environment
 
 %prep
 %setup -q
 
+#%patch1 -p1 -b .fedora
+
 %build
 %configure
 
@@ -27,7 +36,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.a
+
 %find_lang %{name}
 
 %clean
@@ -36,29 +49,54 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
-%{_sysconfdir}
-%{_bindir}/xfce4-menueditor
-%{_bindir}/xfdesktop
-%{_mandir}/man1/xfdesktop.1.gz
-%{_libdir}/xfce4/*
-%{_datadir}/applications/xfce-backdrop-settings.desktop
-%{_datadir}/applications/xfce-menueditor.desktop
-%{_datadir}/icons/hicolor/32x32/apps/xfce4-backdrop.png
-%{_datadir}/icons/hicolor/32x32/apps/xfce4-menueditor.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-backdrop.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-menueditor.png
-%{_datadir}/icons/hicolor/scalable/apps/xfce4-backdrop.svg
-%{_datadir}/icons/hicolor/scalable/apps/xfce4-menueditor.svg
-%{_datadir}/pixmaps/*
+%{_sysconfdir}/xdg/xfce4/*
+%{_bindir}/*
 %{_datadir}/xfce4/*
+%{_libdir}/xfce4/mcs-plugins/*
+%{_libdir}/xfce4/modules/*
+%{_libdir}/xfce4/panel-plugins/*
+%{_datadir}/applications/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/pixmaps/*
+%{_mandir}/man1/*
 
 %changelog
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
-* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
-- Removed generic INSTALL from %doc
+* Thu Jan 27 2005 Than Ngo <than at redhat.com> 4.2.0-1
+- 4.2.0
+
+* Wed Sep 01 2004 Than Ngo <than at redhat.com> 4.0.6-2
+- get rid useless static library #131485
+
+* Tue Jul 20 2004 Than Ngo <than at redhat.com> 4.0.6-1
+- update to 4.0.6
+- fix bug #122743, #124951, #125058
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Apr 20 2004 Than Ngo <than at redhat.com> 4.0.5-2
+- Change defaults for fedora, thanks to Olivier Fourdan <fourdan at xfce.org>
+
+* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
+- update to 4.0.5
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
+- fixed dependant libraries check on x86_64
+
+* Wed Jan 14 2004 Than Ngo <than at redhat.com> 4.0.3-1
+- 4.0.3 release
+
+* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
+- 4.0.2 release
 
-* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
-- Inital Fedora Extras version
+* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
+- initial build



From fedora-extras-commits at redhat.com  Sun Mar 20 20:45:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 20 Mar 2005 15:45:42 -0500
Subject: rpms/xffm/devel xffm-4.2.0-menu.patch,NONE,1.1 xffm.spec,1.1,1.2
Message-ID: <200503202045.j2KKjgRA016539@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16527

Modified Files:
	xffm.spec 
Added Files:
	xffm-4.2.0-menu.patch 
Log Message:
Resynced with 4.2.0 spec file from core cvs. 
Readded patches. 


xffm-4.2.0-menu.patch:

--- NEW FILE xffm-4.2.0-menu.patch ---
--- xffm-4.2.0/src/Xffstab.desktop.orig	2005-02-21 12:09:22.065891551 +0100
+++ xffm-4.2.0/src/Xffstab.desktop	2005-02-21 12:09:37.992253979 +0100
@@ -15,3 +15,4 @@
 Categories=X-XFCE;Core;Filemanager;Utility;System
 GenericName=Fstab mount manager
 GenericName[ko]=Fstab ????????? ?????????
+OnlyShowIn=XFCE;
--- xffm-4.2.0/src/Xftree.desktop.orig	2005-02-21 12:08:46.142840482 +0100
+++ xffm-4.2.0/src/Xftree.desktop	2005-02-21 12:09:04.912732203 +0100
@@ -117,3 +117,4 @@
 Terminal=false
 Type=Application
 Categories=Applications;X-XFCE;Core
+OnlyShowIn=XFCE;
--- xffm-4.2.0/src/Xfdiff.desktop.orig	2005-02-21 12:10:00.011607212 +0100
+++ xffm-4.2.0/src/Xfdiff.desktop	2005-02-21 12:10:17.853652159 +0100
@@ -11,3 +11,4 @@
 Terminal=false
 Type=Application
 Categories=X-XFCE;Core;Utility
+OnlyShowIn=XFCE;


Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xffm.spec	19 Mar 2005 18:32:11 -0000	1.1
+++ xffm.spec	20 Mar 2005 20:45:39 -0000	1.2
@@ -5,33 +5,38 @@
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
-Patch1: xffm-4.0.5-rpath.patch
+
+Patch: xffm-4.2.0-rpath.patch
+Patch1: xffm-4.2.0-menu.patch
+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Prereq: /sbin/ldconfig
+
 Requires: dbh >= 1.0
 Requires: glib2 >= 2.0.0
 Requires: gtk2 >= 2.0.0
-Requires: libxfce4mcs >= 4.0.5
-Requires: libxfce4util >= 4.0.5
-Requires: libxfcegui4 >= 4.0.5
+Requires: libxfce4mcs >= %{version}
+Requires: libxfce4util >= %{version}
+Requires: libxfcegui4 >= %{version}
 Requires: libxml2 >= 2.4.0
+
 BuildRequires: dbh-devel >= 1.0
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: gtk2-devel >= 2.0.0
-BuildRequires: libxfce4mcs-devel >= 4.0.5
-BuildRequires: libxfce4util-devel >= 4.0.5
-BuildRequires: libxfcegui4-devel >= 4.0.5
+BuildRequires: libxfce4mcs-devel >= %{version}
+BuildRequires: libxfce4util-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: libxml2-devel >= 2.4.0
-BuildRequires: xfce-mcs-manager-devel >= 4.0.5
+BuildRequires: xfce-mcs-manager-devel >= %{version}
 
 %description
 This package includes a filemanager and SMB network navigator for Xfce4.
 
 %prep
 %setup -q
-
-%patch1 -p1 -b .rpath
+%patch -p1 -b .rpath
+%patch1 -p1 -b .menu
 
 %build
 %configure
@@ -56,26 +61,25 @@
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
 %{_bindir}/*
 %{_libdir}/lib*
-%{_libdir}/xfce4/xffm/*
 %{_libdir}/pkgconfig/*
 %{_libdir}/xfce4/mcs-plugins/*
+%{_libdir}/xfce4/xffm/*
 %{_datadir}/xffm
 %{_datadir}/xfce4/*
-%{_datadir}/applications/*.desktop
-%{_datadir}/icons/*
+%{_datadir}/applications/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man?/*
 
 %changelog
-* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
-- Updated to 4.2.1 version
-
-* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
+* Sun Mar 20 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Fixed case of Xfce
-- Fixed Source0 line. 
-- Removed generic INSTALL from %doc
-- Inital Fedora Extras version
+- Fixed Source0 line
+- Reimported 4.2.0 spec from core cvs
+
+* Mon Feb 21 2005 Than Ngo <than at redhat.com> 4.2.0-2
+- cleanup menu
 
-* Tue Jul 20 2004 Than Ngo <than at redhat.com> 4.0.6-1
+* Fri Jan 28 2005 Than Ngo <than at redhat.com> 4.2.0-1 
 - update to 4.0.6
 
 * Thu Jun 17 2004 Than Ngo <than at redhat.com> 4.0.5-4



From fedora-extras-commits at redhat.com  Sun Mar 20 20:59:26 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 15:59:26 -0500
Subject: rpms/xfdesktop/devel xfdesktop.spec,1.2,1.3
Message-ID: <200503202059.j2KKxQGX016790@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16770

Modified Files:
	xfdesktop.spec 
Log Message:
prep for FC4 build



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfdesktop.spec	20 Mar 2005 20:17:11 -0000	1.2
+++ xfdesktop.spec	20 Mar 2005 20:59:24 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.2.1
-Release: 1
+Release: 1.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz/xfdesktop-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar 20 21:03:14 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 16:03:14 -0500
Subject: rpms/xffm/devel xffm.spec,1.2,1.3
Message-ID: <200503202103.j2KL3ESS017701@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17685

Modified Files:
	xffm.spec 
Log Message:
remove unnecessary deps and versions, prep for FC4 build



Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xffm.spec	20 Mar 2005 20:45:39 -0000	1.2
+++ xffm.spec	20 Mar 2005 21:03:12 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Next generation filemanager and SMB network navigator for Xfce4
 Name: xffm
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
@@ -13,17 +13,14 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Prereq: /sbin/ldconfig
 
-Requires: dbh >= 1.0
-Requires: glib2 >= 2.0.0
-Requires: gtk2 >= 2.0.0
 Requires: libxfce4mcs >= %{version}
 Requires: libxfce4util >= %{version}
 Requires: libxfcegui4 >= %{version}
 Requires: libxml2 >= 2.4.0
 
-BuildRequires: dbh-devel >= 1.0
-BuildRequires: glib2-devel >= 2.0.0
-BuildRequires: gtk2-devel >= 2.0.0
+BuildRequires: dbh-devel
+BuildRequires: glib2-devel 
+BuildRequires: gtk2-devel
 BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: libxfce4util-devel >= %{version}
 BuildRequires: libxfcegui4-devel >= %{version}
@@ -71,6 +68,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- remove stuff
+
 * Sun Mar 20 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Fixed case of Xfce
 - Fixed Source0 line



From fedora-extras-commits at redhat.com  Sun Mar 20 21:13:53 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 20 Mar 2005 16:13:53 -0500
Subject: rpms/xffm/devel xffm-4.2.0-rpath.patch, NONE,
	1.1 xffm-4.2.1-static.patch, NONE, 1.1 xffm.spec, 1.3, 1.4
Message-ID: <200503202113.j2KLDrvZ017926@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17914

Modified Files:
	xffm.spec 
Added Files:
	xffm-4.2.0-rpath.patch xffm-4.2.1-static.patch 
Log Message:
Synced with spec in core devel
Added patch to fix compile on devel
Readded rpath patch


xffm-4.2.0-rpath.patch:

--- NEW FILE xffm-4.2.0-rpath.patch ---
--- xffm-4.2.0/configure.orig	2005-01-09 13:54:20.000000000 +0100
+++ xffm-4.2.0/configure	2005-01-28 14:12:56.000000000 +0100
@@ -38678,7 +38678,7 @@
 
             echo "$as_me:$LINENO: checking DBH_LIBS" >&5
 echo $ECHO_N "checking DBH_LIBS... $ECHO_C" >&6
-            DBH_LIBS=`$PKG_CONFIG --libs "dbh-1.0 >= 1.0"`
+            DBH_LIBS=`$PKG_CONFIG --libs-only-l "dbh-1.0 >= 1.0"`
             echo "$as_me:$LINENO: result: $DBH_LIBS" >&5
 echo "${ECHO_T}$DBH_LIBS" >&6
         else

xffm-4.2.1-static.patch:

--- NEW FILE xffm-4.2.1-static.patch ---
diff -Nur xffm-4.2.1.orig/libs/callbacks.c xffm-4.2.1/libs/callbacks.c
--- xffm-4.2.1.orig/libs/callbacks.c	2004-12-29 14:51:17.000000000 -0700
+++ xffm-4.2.1/libs/callbacks.c	2005-03-20 13:52:51.937643998 -0700
@@ -665,7 +665,7 @@
     skip_second_release = FALSE;
 
     for (tree_id=0; tree_id<TREECOUNT; tree_id++) {      
-      static gboolean unsel(GtkTreeModel *,GtkTreePath *, GtkTreeIter *, gpointer);
+      gboolean unsel(GtkTreeModel *,GtkTreePath *, GtkTreeIter *, gpointer);
       /*printf("DBG: treeview is  0x%x==0x%x\n",tree_details->treestuff[tree_id].treeview,treeview);*/
       if (treeview != tree_details->treestuff[tree_id].treeview){
         /* unselect all in auxiliary treeview */


Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xffm.spec	20 Mar 2005 21:03:12 -0000	1.3
+++ xffm.spec	20 Mar 2005 21:13:51 -0000	1.4
@@ -6,8 +6,9 @@
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
 
-Patch: xffm-4.2.0-rpath.patch
+Patch0: xffm-4.2.0-rpath.patch
 Patch1: xffm-4.2.0-menu.patch
+Patch2: xffm-4.2.1-static.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,7 +20,7 @@
 Requires: libxml2 >= 2.4.0
 
 BuildRequires: dbh-devel
-BuildRequires: glib2-devel 
+BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: libxfce4util-devel >= %{version}
@@ -32,8 +33,9 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rpath
+%patch0 -p1 -b .rpath
 %patch1 -p1 -b .menu
+%patch2 -p1 -b .static
 
 %build
 %configure
@@ -75,6 +77,7 @@
 - Fixed case of Xfce
 - Fixed Source0 line
 - Reimported 4.2.0 spec from core cvs
+- Added patch to remove static call that was breaking compile on devel. 
 
 * Mon Feb 21 2005 Than Ngo <than at redhat.com> 4.2.0-2
 - cleanup menu



From fedora-extras-commits at redhat.com  Sun Mar 20 21:29:03 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 16:29:03 -0500
Subject: rpms/xffm/devel xffm.spec,1.4,1.5
Message-ID: <200503202129.j2KLT3a6018209@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18193

Modified Files:
	xffm.spec 
Log Message:
gtk2-devel pulls in glib2-devel



Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xffm.spec	20 Mar 2005 21:13:51 -0000	1.4
+++ xffm.spec	20 Mar 2005 21:29:01 -0000	1.5
@@ -20,7 +20,6 @@
 Requires: libxml2 >= 2.4.0
 
 BuildRequires: dbh-devel
-BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: libxfce4util-devel >= %{version}



From fedora-extras-commits at redhat.com  Sun Mar 20 21:39:37 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 20 Mar 2005 16:39:37 -0500
Subject: rpms/xfprint/devel xfprint.spec,1.1,1.2
Message-ID: <200503202139.j2KLdbAE018445@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18425

Modified Files:
	xfprint.spec 
Log Message:
readded changelog from core cvs spec
readded ldconfig and get rid of useless library
added Buildrequires for cups-devel



Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfprint.spec	19 Mar 2005 18:36:39 -0000	1.1
+++ xfprint.spec	20 Mar 2005 21:39:35 -0000	1.2
@@ -3,21 +3,21 @@
 Version: 4.2.1
 Release: 1
 License: BSD
-URL: http://www.xfce.org/
+URL: http://www.xfce.org
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfprint-4.2.1.tar.bz2
 Group: User Interface/Desktops
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: glib2 >= 2.2.0
-Requires: libxfcegui4 >= 4.2.1
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prereq: /sbin/ldconfig
+Requires: libxfcegui4 >= %{version}
 Requires: a2ps
-BuildRequires: glib2-devel >= 2.2.0
-BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: glib2-devel
+BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: a2ps
+BuildRequires: cups-devel
 
 %description
-xfprint contains a print dialog and a printer manager for the Xfce 4
-Desktop Environment, it supports CUPS, BSD-LPR and file as printing
-destinations.
+xfprint contains a print dialog and a printer manager for the
+Xfce 4 Desktop Environment
 
 %prep
 %setup -q
@@ -29,29 +29,42 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
+
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README ChangeLog NEWS COPYING AUTHORS NOTES
 %{_bindir}/*
-%{_libdir}/xfce4/*
+%{_libdir}/xfce4/mcs-plugins
+%{_libdir}/xfce4/xfprint-plugins
 %{_datadir}/applications/*
-%{_datadir}/xfce4/*
-%{_datadir}/icons/*
+%{_datadir}/xfce4/doc/C
+%{_datadir}/icons/hicolor/*/*/*
 
 %changelog
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
-
-* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
-- Removed generic INSTALL from %doc
 - Fixed case of Xfce
 
-* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
-- Inital Fedora Extras version
+* Fri Jan 28 2005 Than Ngo <than at redhat.com> 4.2.0-1
+- 4.2.0
+
+* Wed Sep 01 2004 Than Ngo <than at redhat.com> 4.0.6-2
+- get rid of useless static library
+- add missing ldconfig
+- use find_lang
+
+* Tue Aug 17 2004 Than Ngo <than at redhat.com> 4.0.6-1 
+- Initial packaging for Fedora Core 3 



From fedora-extras-commits at redhat.com  Sun Mar 20 21:44:38 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 16:44:38 -0500
Subject: rpms/xfprint/devel xfprint.spec,1.2,1.3
Message-ID: <200503202144.j2KLicnO018592@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18580

Modified Files:
	xfprint.spec 
Log Message:
prep for FC4 build



Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfprint.spec	20 Mar 2005 21:39:35 -0000	1.2
+++ xfprint.spec	20 Mar 2005 21:44:36 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
 Version: 4.2.1
-Release: 1
+Release: 1.FC4
 License: BSD
 URL: http://www.xfce.org
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfprint-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar 20 22:19:28 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 20 Mar 2005 17:19:28 -0500
Subject: rpms/xfwm4/devel xfwm4-bluecurve.patch, NONE,
	1.1 xfwm4-bluecurve-prep.patch, NONE, 1.1 xfwm4.spec, 1.1, 1.2
Message-ID: <200503202219.j2KMJSLB019896@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19862

Modified Files:
	xfwm4.spec 
Added Files:
	xfwm4-bluecurve.patch xfwm4-bluecurve-prep.patch 
Log Message:
Readded changelog entries. 
Fixed bluecurve patch, split into prep and main themes and got to apply. 


xfwm4-bluecurve.patch:

--- NEW FILE xfwm4-bluecurve.patch ---
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/Makefile.am xfwm4-4.0.5/themes/bluecurve/Makefile.am
--- xfwm4-4.0.5.orig2/themes/bluecurve/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/Makefile.am	2004-04-19 23:25:30.000000000 +0200
@@ -0,0 +1,43 @@
+themedir = $(pkgdatadir)/themes/Bluecurve
+theme_DATA = README \
+	bottom-active.xpm \
+	bottom-inactive.xpm \
+	bottom-left-active.xpm \
+	bottom-left-inactive.xpm \
+	bottom-right-active.xpm \
+	bottom-right-inactive.xpm \
+	close-active.xpm \
+	close-inactive.xpm \
+	close-pressed.xpm \
+	hide-active.xpm \
+	hide-inactive.xpm \
+	hide-pressed.xpm \
+	left-active.xpm \
+	left-inactive.xpm \
+	maximize-active.xpm \
+	maximize-inactive.xpm \
+	maximize-pressed.xpm \
+        maximize-toggled-active.xpm \
+        maximize-toggled-inactive.xpm \
+        maximize-toggled-pressed.xpm \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
+EXTRA_DIST = $(theme_DATA)
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/Makefile.in xfwm4-4.0.5/themes/bluecurve/Makefile.in
--- xfwm4-4.0.5.orig2/themes/bluecurve/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/Makefile.in	2004-04-19 23:30:58.000000000 +0200
@@ -0,0 +1,424 @@
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = themes/bluecurve
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \
+	$(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \
+	$(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__installdirs = $(DESTDIR)$(themedir)
+themeDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(theme_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
+LIBSTARTUP_NOTIFICATION_LIBS = @LIBSTARTUP_NOTIFICATION_LIBS@
+LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
+LIBTOOL = @LIBTOOL@
+LIBX11_CFLAGS = @LIBX11_CFLAGS@
+LIBX11_LDFLAGS = @LIBX11_LDFLAGS@
+LIBX11_LIBS = @LIBX11_LIBS@
+LIBXFCE4MCS_CLIENT_CFLAGS = @LIBXFCE4MCS_CLIENT_CFLAGS@
+LIBXFCE4MCS_CLIENT_LIBS = @LIBXFCE4MCS_CLIENT_LIBS@
+LIBXFCE4MCS_CLIENT_REQUIRED_VERSION = @LIBXFCE4MCS_CLIENT_REQUIRED_VERSION@
+LIBXFCE4MCS_MANAGER_CFLAGS = @LIBXFCE4MCS_MANAGER_CFLAGS@
+LIBXFCE4MCS_MANAGER_LIBS = @LIBXFCE4MCS_MANAGER_LIBS@
+LIBXFCE4MCS_MANAGER_REQUIRED_VERSION = @LIBXFCE4MCS_MANAGER_REQUIRED_VERSION@
+LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@
+LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@
+LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@
+LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@
+LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@
+LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@
+LIBXPM_CFLAGS = @LIBXPM_CFLAGS@
+LIBXPM_LDFLAGS = @LIBXPM_LDFLAGS@
+LIBXPM_LIBS = @LIBXPM_LIBS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANDR_LIBS = @RANDR_LIBS@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XFCE_MCS_MANAGER_CFLAGS = @XFCE_MCS_MANAGER_CFLAGS@
+XFCE_MCS_MANAGER_LIBS = @XFCE_MCS_MANAGER_LIBS@
+XFCE_MCS_MANAGER_PLUGINSDIR = @XFCE_MCS_MANAGER_PLUGINSDIR@
+XFCE_MCS_MANAGER_REQUIRED_VERSION = @XFCE_MCS_MANAGER_REQUIRED_VERSION@
+XGETTEXT = @XGETTEXT@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+themedir = $(pkgdatadir)/themes/Bluecurve
+theme_DATA = README \
+	bottom-active.xpm \
+	bottom-inactive.xpm \
+	bottom-left-active.xpm \
+	bottom-left-inactive.xpm \
+	bottom-right-active.xpm \
+	bottom-right-inactive.xpm \
+	close-active.xpm \
+	close-inactive.xpm \
+	close-pressed.xpm \
+	hide-active.xpm \
+	hide-inactive.xpm \
+	hide-pressed.xpm \
+	left-active.xpm \
+	left-inactive.xpm \
+	maximize-active.xpm \
+	maximize-inactive.xpm \
+	maximize-pressed.xpm \
+        maximize-toggled-active.xpm \
+        maximize-toggled-inactive.xpm \
+        maximize-toggled-pressed.xpm \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
+
+EXTRA_DIST = $(theme_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  themes/bluecurve/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  themes/bluecurve/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-themeDATA: $(theme_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkdir_p) $(DESTDIR)$(themedir)
+	@list='$(theme_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \
+	  $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \
+	done
+
+uninstall-themeDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(theme_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(themedir)/$$f"; \
+	  rm -f $(DESTDIR)$(themedir)/$$f; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+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
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	$(mkdir_p) $(DESTDIR)$(themedir)
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+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:
+	-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-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-themeDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-themeDATA
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	install-themeDATA installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-info-am uninstall-themeDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/README xfwm4-4.0.5/themes/bluecurve/README
--- xfwm4-4.0.5.orig2/themes/bluecurve/README	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/README	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,7 @@
+Bluecurve
+---------
+
+Garrett LeSage <garrett at redhat.com> Havoc Pennington <hp at redhat.com>
+(c) 2002 Red Hat Inc.
+May 29, 2002
+Red Hat Linux default theme
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-active.xpm xfwm4-4.0.5/themes/bluecurve/bottom-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/bottom-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,11 @@
+/* XPM */
+static char * bottom_active_xpm[] = {
+"4 5 3 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s active_color_2",
+"....",
+"....",
+"....",
+"....",
+"++++"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-inactive.xpm xfwm4-4.0.5/themes/bluecurve/bottom-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/bottom-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,11 @@
+/* XPM */
+static char * bottom_inactive_xpm[] = {
+"4 5 3 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s inactive_color_2",
+"....",
+"....",
+"....",
+"....",
+"++++"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-left-active.xpm xfwm4-4.0.5/themes/bluecurve/bottom-left-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-left-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/bottom-left-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,24 @@
+/* XPM */
+static char * bottom_left_active_xpm[] = {
+"16 16 5 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s active_color_2",
+"@	c #c1c1c1 s active_mid_2",
+"#	c #a7a7a7 s active_shadow_2",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+ at ...           ",
+"+#...           ",
+" +..............",
+" + at .............",
+"  + at ............",
+"   ++#@.........",
+"     +++++++++++"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-left-inactive.xpm xfwm4-4.0.5/themes/bluecurve/bottom-left-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-left-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/bottom-left-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,24 @@
+/* XPM */
+static char * bottom_left_inactive_xpm[] = {
+"16 16 5 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s inactive_color_2",
+"@	c #c1c1c1 s inactive_mid_2",
+"#	c #a7a7a7 s inactive_shadow_2",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+....           ",
+"+ at ...           ",
+"+#...           ",
+" +..............",
+" + at .............",
+"  + at ............",
+"   ++#@.........",
+"     +++++++++++"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-right-active.xpm xfwm4-4.0.5/themes/bluecurve/bottom-right-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-right-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/bottom-right-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,24 @@
+/* XPM */
+static char * bottom_right_active_xpm[] = {
+"16 16 5 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s active_color_2",
+"@	c #c1c1c1 s active_mid_2",
+"#	c #a7a7a7 s active_shadow_2",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ... at +",
+"           ...#+",
+"..............+ ",
+"............. at + ",
+"............ at +  ",
+".........@#++   ",
+"+++++++++++     "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-right-inactive.xpm xfwm4-4.0.5/themes/bluecurve/bottom-right-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-right-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/bottom-right-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,24 @@
+/* XPM */
+static char * bottom_right_inactive_xpm[] = {
+"16 16 5 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s inactive_color_2",
+"@	c #c1c1c1 s inactive_mid_2",
+"#	c #a7a7a7 s inactive_shadow_2",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ....+",
+"           ... at +",
+"           ...#+",
+"..............+ ",
+"............. at + ",
+"............ at +  ",
+".........@#++   ",
+"+++++++++++     "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/close-active.xpm xfwm4-4.0.5/themes/bluecurve/close-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/close-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/close-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,48 @@
+/* XPM */
+static char * close_active_xpm[] = {
+"18 16 29 1",
+" 	c None",
+".	c #858FA4",
+"+	c #F8F9FD",
+"@	c #E0E7F7",
+"#	c #E1E7F7",
+"$	c #E1E8F7",
+"%	c #E2E8F7",
+"&	c #E2E9F7",
+"*	c #E3E9F7",
+"=	c #E4EAF8",
+"-	c #E5EAF8",
+";	c #E5EBF8",
+">	c #E6EBF8",
+",	c #E7ECF8",
+"'	c #CED3DE",
+")	c #E8EDF9",
+"!	c #647190",
+"~	c #647290",
+"{	c #657290",
+"]	c #E9EEF9",
+"^	c #EAEEF9",
+"/	c #EBEFF9",
+"(	c #657390",
+"_	c #667390",
+":	c #ECF0FA",
+"<	c #EDF0FA",
+"[	c #EDF1FA",
+"}	c #EEF1FA",
+"|	c #EEF2FA",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@#$%&*==-;>,,'.",
+".+@#$%&*==-;>,,)'.",
+".+#$%&!==-~>,,))'.",
+".+$%&!~~-~{{,))]'.",
+".+%&*=~~~{{,))]^'.",
+".+&*==-~{{,))]^^'.",
+".+==-;{{{{{]^^//'.",
+".+=-;{{{){(_^//:'.",
+".+-;>,{))]_^//:<'.",
+".+;>,,))]^^//:<['.",
+".+>,,))]^^//:<[}'.",
+".+,,))]^^//:<[}|'.",
+" .''''''''''''''. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/close-inactive.xpm xfwm4-4.0.5/themes/bluecurve/close-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/close-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/close-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,28 @@
+/* XPM */
+static char * close_inactive_xpm[] = {
+"18 16 9 1",
+" 	c None",
+".	c #BDBDBD",
+"+	c #EEEEEE",
+"@	c #EDEDED",
+"#	c #ECECEC",
+"$	c #939393",
+"%	c #EBEBEB",
+"&	c #EAEAEA",
+"*	c #E9E9E9",
+"  ..............  ",
+" .++++++++++++++. ",
+".@@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@@.",
+".#####$###$######.",
+".####$$$#$$$#####.",
+".#####$$$$$######.",
+".%%%%%%$$$%%%%%%%.",
+".%%%%%$$$$$%%%%%%.",
+".%%%%$$$%$$$%%%%%.",
+".&&&&&$&&&$&&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".****************.",
+" .**************. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/close-pressed.xpm xfwm4-4.0.5/themes/bluecurve/close-pressed.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/close-pressed.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/close-pressed.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,27 @@
+/* XPM */
+static char * close_pressed_xpm[] = {
+"18 16 8 1",
+" 	c None",
+".	c #858FA4",
+"+	c #B0B7C8",
+"@	c #647190",
+"#	c #647290",
+"$	c #657290",
+"%	c #657390",
+"&	c #667390",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".+++++ at +++#++++++.",
+".++++@##+#$$+++++.",
+".+++++###$$++++++.",
+".++++++#$$+++++++.",
+".+++++$$$$$++++++.",
+".++++$$$+$%&+++++.",
+".+++++$+++&++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/hide-active.xpm xfwm4-4.0.5/themes/bluecurve/hide-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/hide-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/hide-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,47 @@
+/* XPM */
+static char * hide_active_xpm[] = {
+"18 16 28 1",
+" 	c None",
+".	c #858FA4",
+"+	c #F8F9FD",
+"@	c #E0E7F7",
+"#	c #E1E7F7",
+"$	c #E1E8F7",
+"%	c #E2E8F7",
+"&	c #E2E9F7",
+"*	c #E3E9F7",
+"=	c #E4EAF8",
+"-	c #E5EAF8",
+";	c #E5EBF8",
+">	c #E6EBF8",
+",	c #E7ECF8",
+"'	c #CED3DE",
+")	c #E8EDF9",
+"!	c #E9EEF9",
+"~	c #EAEEF9",
+"{	c #647290",
+"]	c #657290",
+"^	c #657390",
+"/	c #EBEFF9",
+"(	c #667390",
+"_	c #ECF0FA",
+":	c #EDF0FA",
+"<	c #EDF1FA",
+"[	c #EEF1FA",
+"}	c #EEF2FA",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@#$%&*==-;>,,'.",
+".+@#$%&*==-;>,,)'.",
+".+#$%&*==-;>,,))'.",
+".+$%&*==-;>,,))!'.",
+".+%&*==-;>,,))!~'.",
+".+&*==-;>,,))!~~'.",
+".+==-{]]]]]^~~//'.",
+".+=-;]]]]]^(~//_'.",
+".+-;>]]]]^((//_:'.",
+".+;>,,))!~~//_:<'.",
+".+>,,))!~~//_:<['.",
+".+,,))!~~//_:<[}'.",
+" .''''''''''''''. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/hide-inactive.xpm xfwm4-4.0.5/themes/bluecurve/hide-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/hide-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/hide-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,28 @@
+/* XPM */
+static char * hide_inactive_xpm[] = {
+"18 16 9 1",
+" 	c None",
+".	c #BDBDBD",
+"+	c #EEEEEE",
+"@	c #EDEDED",
+"#	c #ECECEC",
+"$	c #EBEBEB",
+"%	c #939393",
+"&	c #EAEAEA",
+"*	c #E9E9E9",
+"  ..............  ",
+" .++++++++++++++. ",
+".@@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@@.",
+".################.",
+".################.",
+".################.",
+".$$$$$$$$$$$$$$$$.",
+".$$$$%%%%%%%$$$$$.",
+".$$$$%%%%%%%$$$$$.",
+".&&&&%%%%%%%&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".****************.",
+" .**************. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/hide-pressed.xpm xfwm4-4.0.5/themes/bluecurve/hide-pressed.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/hide-pressed.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/hide-pressed.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,26 @@
+/* XPM */
+static char * hide_pressed_xpm[] = {
+"18 16 7 1",
+" 	c None",
+".	c #858FA4",
+"+	c #B0B7C8",
+"@	c #647290",
+"#	c #657290",
+"$	c #657390",
+"%	c #667390",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++@#####$+++++.",
+".++++#####$%+++++.",
+".++++####$%%+++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/left-active.xpm xfwm4-4.0.5/themes/bluecurve/left-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/left-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/left-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,10 @@
+/* XPM */
+static char * left_active_xpm[] = {
+"5 4 3 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s active_color_2",
+"+....",
+"+....",
+"+....",
+"+...."};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/left-inactive.xpm xfwm4-4.0.5/themes/bluecurve/left-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/left-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/left-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,10 @@
+/* XPM */
+static char * left_inactive_xpm[] = {
+"5 4 3 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s inactive_color_2",
+"+....",
+"+....",
+"+....",
+"+...."};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-active.xpm xfwm4-4.0.5/themes/bluecurve/maximize-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/maximize-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,48 @@
+/* XPM */
+static char * maximize_active_xpm[] = {
+"18 16 29 1",
+" 	c None",
+".	c #858FA4",
+"+	c #F8F9FD",
+"@	c #E0E7F7",
+"#	c #E1E7F7",
+"$	c #E1E8F7",
+"%	c #E2E8F7",
+"&	c #E2E9F7",
+"*	c #E3E9F7",
+"=	c #E4EAF8",
+"-	c #E5EAF8",
+";	c #E5EBF8",
+">	c #E6EBF8",
+",	c #E7ECF8",
+"'	c #CED3DE",
+")	c #E8EDF9",
+"!	c #647190",
+"~	c #647290",
+"{	c #657290",
+"]	c #E9EEF9",
+"^	c #EAEEF9",
+"/	c #657390",
+"(	c #EBEFF9",
+"_	c #667390",
+":	c #ECF0FA",
+"<	c #EDF0FA",
+"[	c #EDF1FA",
+"}	c #EEF1FA",
+"|	c #EEF2FA",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@#$%&*==-;>,,'.",
+".+@#$%&*==-;>,,)'.",
+".+#$%!!~~~~{,,))'.",
+".+$%&!~~~~{{,))]'.",
+".+%&*~~~~{{{))]^'.",
+".+&*=~-;>,,{)]^^'.",
+".+==-~>,,))/^^(('.",
+".+=-;{,,))]_^((:'.",
+".+-;>{{{{/__((:<'.",
+".+;>,,))]^^((:<['.",
+".+>,,))]^^((:<[}'.",
+".+,,))]^^((:<[}|'.",
+" .''''''''''''''. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-inactive.xpm xfwm4-4.0.5/themes/bluecurve/maximize-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/maximize-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,28 @@
+/* XPM */
+static char * maximize_inactive_xpm[] = {
+"18 16 9 1",
+" 	c None",
+".	c #BDBDBD",
+"+	c #EEEEEE",
+"@	c #EDEDED",
+"#	c #ECECEC",
+"$	c #939393",
+"%	c #EBEBEB",
+"&	c #EAEAEA",
+"*	c #E9E9E9",
+"  ..............  ",
+" .++++++++++++++. ",
+".@@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@@.",
+".####$$$$$$$#####.",
+".####$$$$$$$#####.",
+".####$$$$$$$#####.",
+".%%%%$%%%%%$%%%%%.",
+".%%%%$%%%%%$%%%%%.",
+".%%%%$%%%%%$%%%%%.",
+".&&&&$$$$$$$&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".****************.",
+" .**************. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-pressed.xpm xfwm4-4.0.5/themes/bluecurve/maximize-pressed.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-pressed.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/maximize-pressed.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,27 @@
+/* XPM */
+static char * maximize_pressed_xpm[] = {
+"18 16 8 1",
+" 	c None",
+".	c #858FA4",
+"+	c #B0B7C8",
+"@	c #647190",
+"#	c #647290",
+"$	c #657290",
+"%	c #657390",
+"&	c #667390",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++@@####$+++++.",
+".++++@####$$+++++.",
+".++++####$$$+++++.",
+".++++#+++++$+++++.",
+".++++#+++++%+++++.",
+".++++$+++++&+++++.",
+".++++$$$$%&&+++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-active.xpm xfwm4-4.0.5/themes/bluecurve/maximize-toggled-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/maximize-toggled-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,54 @@
+/* XPM */
+static char * maximize_toggled_active_xpm[] = {
+"18 16 35 1",
+" 	c None",
+".	c #858FA4",
+"+	c #F8F9FD",
+"@	c #E0E7F7",
+"#	c #E1E7F7",
+"$	c #E1E8F7",
+"%	c #E2E8F7",
+"&	c #E2E9F7",
+"*	c #E3E9F7",
+"=	c #E4EAF8",
+"-	c #E5EAF8",
+";	c #E5EBF8",
+">	c #E6EBF8",
+",	c #E7ECF8",
+"'	c #CED3DE",
+")	c #8A95AE",
+"!	c #8A95AF",
+"~	c #8B95AF",
+"{	c #8B96AF",
+"]	c #E8EDF9",
+"^	c #8C96AF",
+"/	c #647190",
+"(	c #647290",
+"_	c #657290",
+":	c #E9EEF9",
+"<	c #EAEEF9",
+"[	c #8D97AF",
+"}	c #EBEFF9",
+"|	c #657390",
+"1	c #ECF0FA",
+"2	c #667390",
+"3	c #EDF0FA",
+"4	c #EDF1FA",
+"5	c #EEF1FA",
+"6	c #EEF2FA",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@#$%&*==-;>,,'.",
+".+@#$%&)!!~{{,,]'.",
+".+#$%&*==-;>^,]]'.",
+".+$%&/((((_,^]]:'.",
+".+%&*((((__,^]:<'.",
+".+&*=(((___]^:<<'.",
+".+==-(>,,]_:[<}}'.",
+".+=-;_,,]]|<<}}1'.",
+".+-;>____|2<}}13'.",
+".+;>,,]]:<<}}134'.",
+".+>,,]]:<<}}1345'.",
+".+,,]]:<<}}13456'.",
+" .''''''''''''''. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-inactive.xpm xfwm4-4.0.5/themes/bluecurve/maximize-toggled-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/maximize-toggled-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,29 @@
+/* XPM */
+static char * maximize_toggled_inactive_xpm[] = {
+"18 16 10 1",
+" 	c None",
+".	c #BDBDBD",
+"+	c #EEEEEE",
+"@	c #EDEDED",
+"#	c #AEAEAE",
+"$	c #ECECEC",
+"%	c #939393",
+"&	c #EBEBEB",
+"*	c #EAEAEA",
+"=	c #E9E9E9",
+"  ..............  ",
+" .++++++++++++++. ",
+".@@@@@@@@@@@@@@@@.",
+".@@@@@@######@@@@.",
+".$$$$$$$$$$$#$$$$.",
+".$$$$%%%%%%$#$$$$.",
+".$$$$%%%%%%$#$$$$.",
+".&&&&%%%%%%&#&&&&.",
+".&&&&%&&&&%&#&&&&.",
+".&&&&%&&&&%&&&&&&.",
+".****%%%%%%******.",
+".****************.",
+".****************.",
+".================.",
+" .==============. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-pressed.xpm xfwm4-4.0.5/themes/bluecurve/maximize-toggled-pressed.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-pressed.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/maximize-toggled-pressed.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,33 @@
+/* XPM */
+static char * maximize_toggled_pressed_xpm[] = {
+"18 16 14 1",
+" 	c None",
+".	c #858FA4",
+"+	c #B0B7C8",
+"@	c #8A95AE",
+"#	c #8A95AF",
+"$	c #8B95AF",
+"%	c #8B96AF",
+"&	c #8C96AF",
+"*	c #647190",
+"=	c #647290",
+"-	c #657290",
+";	c #8D97AF",
+">	c #657390",
+",	c #667390",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++@##$%%++++.",
+".+++++++++++&++++.",
+".++++*====-+&++++.",
+".++++====--+&++++.",
+".++++===---+&++++.",
+".++++=++++-+;++++.",
+".++++-++++>++++++.",
+".++++---->,++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/menu-active.xpm xfwm4-4.0.5/themes/bluecurve/menu-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/menu-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/menu-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,46 @@
+/* XPM */
+static char * menu_active_xpm[] = {
+"18 16 27 1",
+" 	c None",
+".	c #858FA4",
+"+	c #F8F9FD",
+"@	c #E0E7F7",
+"#	c #E1E7F7",
+"$	c #E1E8F7",
+"%	c #E2E8F7",
+"&	c #E2E9F7",
+"*	c #E3E9F7",
+"=	c #E4EAF8",
+"-	c #E5EAF8",
+";	c #E5EBF8",
+">	c #E6EBF8",
+",	c #E7ECF8",
+"'	c #CED3DE",
+")	c #E8EDF9",
+"!	c #647190",
+"~	c #657290",
+"{	c #E9EEF9",
+"]	c #647290",
+"^	c #EAEEF9",
+"/	c #EBEFF9",
+"(	c #ECF0FA",
+"_	c #EDF0FA",
+":	c #EDF1FA",
+"<	c #EEF1FA",
+"[	c #EEF2FA",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@#$%&*==-;>,,'.",
+".+@#$%&*==-;>,,)'.",
+".+#$%&*==-;>,,))'.",
+".+$%&!==-;>~,)){'.",
+".+%&!]]-;>~~~){^'.",
+".+&*=]]]>~~~){^^'.",
+".+==-;~~~~~{^^//'.",
+".+=-;>,~~~{^^//('.",
+".+-;>,,)~{^^//(_'.",
+".+;>,,)){^^//(_:'.",
+".+>,,)){^^//(_:<'.",
+".+,,)){^^//(_:<['.",
+" .''''''''''''''. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/menu-inactive.xpm xfwm4-4.0.5/themes/bluecurve/menu-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/menu-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/menu-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,28 @@
+/* XPM */
+static char * menu_inactive_xpm[] = {
+"18 16 9 1",
+" 	c None",
+".	c #BDBDBD",
+"+	c #EEEEEE",
+"@	c #EDEDED",
+"#	c #ECECEC",
+"$	c #939393",
+"%	c #EBEBEB",
+"&	c #EAEAEA",
+"*	c #E9E9E9",
+"  ..............  ",
+" .++++++++++++++. ",
+".@@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@@.",
+".################.",
+".####$#####$#####.",
+".###$$$###$$$####.",
+".%%%%$$$%$$$%%%%%.",
+".%%%%%$$$$$%%%%%%.",
+".%%%%%%$$$%%%%%%%.",
+".&&&&&&&$&&&&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".&&&&&&&&&&&&&&&&.",
+".****************.",
+" .**************. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/menu-pressed.xpm xfwm4-4.0.5/themes/bluecurve/menu-pressed.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/menu-pressed.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/menu-pressed.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,25 @@
+/* XPM */
+static char * menu_pressed_xpm[] = {
+"18 16 6 1",
+" 	c None",
+".	c #858FA4",
+"+	c #B0B7C8",
+"@	c #647190",
+"#	c #657290",
+"$	c #647290",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++ at +++++#+++++.",
+".+++@$$+++###++++.",
+".++++$$$+###+++++.",
+".+++++#####++++++.",
+".++++++###+++++++.",
+".+++++++#++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  "};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/right-active.xpm xfwm4-4.0.5/themes/bluecurve/right-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/right-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/right-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,10 @@
+/* XPM */
+static char * right_active_xpm[] = {
+"5 4 3 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s active_color_2",
+"....+",
+"....+",
+"....+",
+"....+"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/right-inactive.xpm xfwm4-4.0.5/themes/bluecurve/right-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/right-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/right-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,10 @@
+/* XPM */
+static char * right_inactive_xpm[] = {
+"5 4 3 1",
+" 	c None",
+"+	c #000000",
+".	c #e6e6e6 s inactive_color_2",
+"....+",
+"....+",
+"....+",
+"....+"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/themerc xfwm4-4.0.5/themes/bluecurve/themerc
--- xfwm4-4.0.5.orig2/themes/bluecurve/themerc	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/themerc	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,11 @@
+active_text_color=#ffffff
+inactive_text_color=#777777
+button_layout=O|HMC
+button_offset=-1
+button_spacing=2
+full_width_title=true
+title_horizontal_offset=4
+title_shadow_active=true
+title_shadow_inactive=false
+title_vertical_offset_active=2
+title_vertical_offset_inactive=2
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-1-active.xpm xfwm4-4.0.5/themes/bluecurve/title-1-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-1-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-1-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,33 @@
+/* XPM */
+static char * title_1_active_xpm[] = {
+"2 22 8 1",
+" 	c None",
+".	c #000000",
+"+	c #BEC6D8",
+"@	c #C3CBDE",
+"#	c #C9D1E3",
+"$	c #CED6E9",
+"%	c #D3DCEF",
+"&	c #7283A7",
+"..",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"@@",
+"##",
+"$$",
+"%%",
+"&&"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-1-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-1-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-1-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-1-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,35 @@
+/* XPM */
+static char * title_1_inactive_xpm[] = {
+"2 22 10 1",
+" 	c None",
+".	c #000000",
+"+	c #E8E8E8",
+"@	c #E3E3E3",
+"#	c #DEDEDE",
+"$	c #D9D9D9",
+"%	c #D6D6D6",
+"&	c #D4D4D4",
+"*	c #D2D2D2",
+"=	c #C4C4C4",
+"..",
+"++",
+"@@",
+"##",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"%%",
+"&&",
+"**",
+"**",
+"=="};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-2-active.xpm xfwm4-4.0.5/themes/bluecurve/title-2-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-2-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-2-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,34 @@
+/* XPM */
+static char * title_2_active_xpm[] = {
+"4 22 9 1",
+" 	c None",
+".	c #000000",
+"+	c #BEC6D8",
+"@	c #283C67",
+"#	c #C3CBDE",
+"$	c #C9D1E3",
+"%	c #CED6E9",
+"&	c #D3DCEF",
+"*	c #7283A7",
+"....",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"+++@",
+"###@",
+"$$$@",
+"%%%@",
+"&&&@",
+"***@"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-2-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-2-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-2-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-2-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,35 @@
+/* XPM */
+static char * title_2_inactive_xpm[] = {
+"4 22 10 1",
+" 	c None",
+".	c #000000",
+"+	c #E8E8E8",
+"@	c #E3E3E3",
+"#	c #DEDEDE",
+"$	c #D9D9D9",
+"%	c #D6D6D6",
+"&	c #D4D4D4",
+"*	c #D2D2D2",
+"=	c #C4C4C4",
+"....",
+"++++",
+"@@@@",
+"####",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"%%%%",
+"&&&&",
+"****",
+"****",
+"===="};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-3-active.xpm xfwm4-4.0.5/themes/bluecurve/title-3-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-3-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-3-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,81 @@
+/* XPM */
+static char * title_3_active_xpm[] = {
+"5 22 56 1",
+" 	c None",
+".	c #000000",
+"+	c #A8B9DE",
+"@	c #647EBA",
+"#	c #3D4F77",
+"$	c #899DC9",
+"%	c #5E7AB8",
+"&	c #859AC7",
+"*	c #5875B5",
+"=	c #3A4D76",
+"-	c #5370B3",
+";	c #374975",
+">	c #8095C5",
+",	c #4D6CB0",
+"'	c #334672",
+")	c #7C92C3",
+"!	c #4B6AB0",
+"~	c #314572",
+"{	c #7B91C3",
+"]	c #304471",
+"^	c #7A91C2",
+"/	c #4969AF",
+"(	c #7A90C2",
+"_	c #4867AE",
+":	c #304472",
+"<	c #4665AD",
+"[	c #2E4271",
+"}	c #778DC0",
+"|	c #4464AC",
+"1	c #2D4171",
+"2	c #768BC0",
+"3	c #2F4270",
+"4	c #788EC0",
+"5	c #314573",
+"6	c #7A8EC2",
+"7	c #4A68AF",
+"8	c #7D92C4",
+"9	c #4E6CB1",
+"0	c #364B78",
+"a	c #5270B4",
+"b	c #3B4F7D",
+"c	c #7D93C4",
+"d	c #5774B5",
+"e	c #405480",
+"f	c #7E95C5",
+"g	c #5F7AB8",
+"h	c #485B86",
+"i	c #8497C7",
+"j	c #4F618B",
+"k	c #879BC7",
+"l	c #6680BA",
+"m	c #8B9ECA",
+"n	c #6D85BE",
+"o	c #566892",
+"p	c #7289C0",
+"q	c #0B0B0C",
+".....",
+"+++++",
+"@@@@@",
+"#$%%%",
+"&***=",
+"---;>",
+",,'),",
+"!~{!!",
+"]^///",
+"(___:",
+"<<<[}",
+"||12|",
+"<34<<",
+"56777",
+"89990",
+"aaabc",
+"ddefd",
+"ghigg",
+"jklll",
+"mnnno",
+"ppppp",
+"qqqqq"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-3-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-3-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-3-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-3-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,35 @@
+/* XPM */
+static char * title_3_inactive_xpm[] = {
+"5 22 10 1",
+" 	c None",
+".	c #000000",
+"+	c #E8E8E8",
+"@	c #E3E3E3",
+"#	c #DEDEDE",
+"$	c #D9D9D9",
+"%	c #D6D6D6",
+"&	c #D4D4D4",
+"*	c #D2D2D2",
+"=	c #C4C4C4",
+".....",
+"+++++",
+"@@@@@",
+"#####",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"$$$$$",
+"%%%%%",
+"&&&&&",
+"*****",
+"*****",
+"====="};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-4-active.xpm xfwm4-4.0.5/themes/bluecurve/title-4-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-4-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-4-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,34 @@
+/* XPM */
+static char * title_4_active_xpm[] = {
+"4 22 9 1",
+" 	c None",
+".	c #000000",
+"+	c #283C67",
+"@	c #BEC6D8",
+"#	c #C3CBDE",
+"$	c #C9D1E3",
+"%	c #CED6E9",
+"&	c #D3DCEF",
+"*	c #7283A7",
+"....",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+@@@",
+"+###",
+"+$$$",
+"+%%%",
+"+&&&",
+"+***"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-4-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-4-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-4-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-4-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,35 @@
+/* XPM */
+static char * title_4_inactive_xpm[] = {
+"4 22 10 1",
+" 	c None",
+".	c #000000",
+"+	c #E8E8E8",
+"@	c #E3E3E3",
+"#	c #DEDEDE",
+"$	c #D9D9D9",
+"%	c #D6D6D6",
+"&	c #D4D4D4",
+"*	c #D2D2D2",
+"=	c #C4C4C4",
+"....",
+"++++",
+"@@@@",
+"####",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"$$$$",
+"%%%%",
+"&&&&",
+"****",
+"****",
+"===="};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-5-active.xpm xfwm4-4.0.5/themes/bluecurve/title-5-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-5-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-5-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,33 @@
+/* XPM */
+static char * title_5_active_xpm[] = {
+"2 22 8 1",
+" 	c None",
+".	c #000000",
+"+	c #BEC6D8",
+"@	c #C3CBDE",
+"#	c #C9D1E3",
+"$	c #CED6E9",
+"%	c #D3DCEF",
+"&	c #7283A7",
+"..",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"@@",
+"##",
+"$$",
+"%%",
+"&&"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-5-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-5-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/title-5-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/title-5-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,35 @@
+/* XPM */
+static char * title_5_inactive_xpm[] = {
+"2 22 10 1",
+" 	c None",
+".	c #000000",
+"+	c #E8E8E8",
+"@	c #E3E3E3",
+"#	c #DEDEDE",
+"$	c #D9D9D9",
+"%	c #D6D6D6",
+"&	c #D4D4D4",
+"*	c #D2D2D2",
+"=	c #C4C4C4",
+"..",
+"++",
+"@@",
+"##",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"$$",
+"%%",
+"&&",
+"**",
+"**",
+"=="};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/top-left-active.xpm xfwm4-4.0.5/themes/bluecurve/top-left-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/top-left-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/top-left-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,38 @@
+/* XPM */
+static char * top_left_active_xpm[] = {
+"10 22 13 1",
+" 	c None",
+".	c #000000",
+"+	c #36383D",
+"@	c #A7AEBE",
+"#	c #BEC6D8",
+"$	c #979EAC",
+"%	c #393B40",
+"&	c #A5ACBB",
+"*	c #C3CBDE",
+"=	c #C9D1E3",
+"-	c #CED6E9",
+";	c #D3DCEF",
+">	c #7283A7",
+"     .....",
+"   .+@####",
+"  .$######",
+" .$#######",
+" %########",
+".&########",
+".#########",
+".#########",
+".#########",
+".#########",
+".#########",
+".#########",
+".#########",
+".#########",
+".#########",
+".#########",
+".#########",
+".*********",
+".=========",
+".---------",
+".;;;;;;;;;",
+".>>>>>>>>>"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/top-left-inactive.xpm xfwm4-4.0.5/themes/bluecurve/top-left-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/top-left-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/top-left-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,41 @@
+/* XPM */
+static char * top_left_inactive_xpm[] = {
+"10 22 16 1",
+" 	c None",
+".	c #000000",
+"+	c #424242",
+"@	c #CCCCCC",
+"#	c #E8E8E8",
+"$	c #B5B5B5",
+"%	c #E3E3E3",
+"&	c #B1B1B1",
+"*	c #DEDEDE",
+"=	c #414141",
+"-	c #D9D9D9",
+";	c #BCBCBC",
+">	c #D6D6D6",
+",	c #D4D4D4",
+"'	c #D2D2D2",
+")	c #C4C4C4",
+"     .....",
+"   .+@####",
+"  .$%%%%%%",
+" .&*******",
+" =--------",
+".;--------",
+".---------",
+".---------",
+".---------",
+".---------",
+".---------",
+".---------",
+".---------",
+".---------",
+".---------",
+".---------",
+".---------",
+".>>>>>>>>>",
+".,,,,,,,,,",
+".'''''''''",
+".'''''''''",
+".)))))))))"};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/top-right-active.xpm xfwm4-4.0.5/themes/bluecurve/top-right-active.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/top-right-active.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/top-right-active.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,38 @@
+/* XPM */
+static char * top_right_active_xpm[] = {
+"10 22 13 1",
+" 	c None",
+".	c #000000",
+"+	c #BEC6D8",
+"@	c #A7AEBE",
+"#	c #36383D",
+"$	c #979EAC",
+"%	c #393B40",
+"&	c #A5ACBB",
+"*	c #C3CBDE",
+"=	c #C9D1E3",
+"-	c #CED6E9",
+";	c #D3DCEF",
+">	c #7283A7",
+".....     ",
+"++++@#.   ",
+"++++++$.  ",
+"+++++++$. ",
+"++++++++% ",
+"++++++++&.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"+++++++++.",
+"*********.",
+"=========.",
+"---------.",
+";;;;;;;;;.",
+">>>>>>>>>."};
diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/top-right-inactive.xpm xfwm4-4.0.5/themes/bluecurve/top-right-inactive.xpm
--- xfwm4-4.0.5.orig2/themes/bluecurve/top-right-inactive.xpm	1970-01-01 01:00:00.000000000 +0100
+++ xfwm4-4.0.5/themes/bluecurve/top-right-inactive.xpm	2004-04-19 23:24:24.000000000 +0200
@@ -0,0 +1,41 @@
+/* XPM */
+static char * top_right_inactive_xpm[] = {
+"10 22 16 1",
+" 	c None",
+".	c #000000",
+"+	c #E8E8E8",
+"@	c #CCCCCC",
+"#	c #424242",
+"$	c #E3E3E3",
+"%	c #B5B5B5",
+"&	c #DEDEDE",
+"*	c #B1B1B1",
+"=	c #D9D9D9",
+"-	c #414141",
+";	c #BCBCBC",
+">	c #D6D6D6",
+",	c #D4D4D4",
+"'	c #D2D2D2",
+")	c #C4C4C4",
+".....     ",
+"++++@#.   ",
+"$$$$$$%.  ",
+"&&&&&&&*. ",
+"========- ",
+"========;.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+"=========.",
+">>>>>>>>>.",
+",,,,,,,,,.",
+"'''''''''.",
+"'''''''''.",
+")))))))))."};

xfwm4-bluecurve-prep.patch:

--- NEW FILE xfwm4-bluecurve-prep.patch ---
diff -Nur xfwm4-4.2.1.orig/configure xfwm4-4.2.1/configure
--- xfwm4-4.2.1.orig/configure	2005-03-12 07:19:39.000000000 -0700
+++ xfwm4-4.2.1/configure	2005-03-20 15:00:33.492532918 -0700
@@ -25253,7 +25253,7 @@
   fi
 
 
-                                                                                                                                                                                                                            ac_config_files="$ac_config_files xfwm4.spec Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile defaults/Makefile icons/Makefile icons/48x48/Makefile icons/scalable/Makefile mcs-plugin/Makefile po/Makefile.in src/Makefile themes/Makefile themes/default/Makefile themes/default.keys/Makefile themes/default-4.0/Makefile themes/opta/Makefile themes/symphony/Makefile themes/tyrex/Makefile themes/therapy/Makefile themes/waza/Makefile themes/wildbush/Makefile"
+                                                                                                                                                                                                                            ac_config_files="$ac_config_files xfwm4.spec Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile defaults/Makefile icons/Makefile icons/48x48/Makefile icons/scalable/Makefile mcs-plugin/Makefile po/Makefile.in src/Makefile themes/Makefile themes/bluecurve/Makefile themes/default/Makefile themes/default.keys/Makefile themes/default-4.0/Makefile themes/opta/Makefile themes/symphony/Makefile themes/tyrex/Makefile themes/therapy/Makefile themes/waza/Makefile themes/wildbush/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -25854,6 +25854,7 @@
   "themes/therapy/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/therapy/Makefile" ;;
   "themes/waza/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/waza/Makefile" ;;
   "themes/wildbush/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/wildbush/Makefile" ;;
+  "themes/bluecurve/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/bluecurve/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
diff -Nur xfwm4-4.2.1.orig/configure.ac xfwm4-4.2.1/configure.ac
--- xfwm4-4.2.1.orig/configure.ac	2005-03-12 07:19:39.000000000 -0700
+++ xfwm4-4.2.1/configure.ac	2005-03-20 15:00:45.731640166 -0700
@@ -125,4 +125,5 @@
 themes/therapy/Makefile
 themes/waza/Makefile
 themes/wildbush/Makefile
+themes/bluecurve/Makefile
 ])
diff -Nur xfwm4-4.2.1.orig/mcs-plugin/xfwm4_plugin.h xfwm4-4.2.1/mcs-plugin/xfwm4_plugin.h
--- xfwm4-4.2.1.orig/mcs-plugin/xfwm4_plugin.h	2004-12-18 16:32:07.000000000 -0700
+++ xfwm4-4.2.1/mcs-plugin/xfwm4_plugin.h	2005-03-20 15:02:32.162180902 -0700
@@ -29,7 +29,7 @@
 #define CHANNEL2  "xfwm4_keys"
 #define PLUGIN_NAME "xfwm4"
 
-#define DEFAULT_THEME "Default"
+#define DEFAULT_THEME "Bluecurve"
 #define DEFAULT_KEY_THEME "Default"
 #define DEFAULT_LAYOUT "OTS|HMC"
 #define DEFAULT_ACTION "maximize"
diff -Nur xfwm4-4.2.1.orig/themes/Makefile.am xfwm4-4.2.1/themes/Makefile.am
--- xfwm4-4.2.1.orig/themes/Makefile.am	2005-01-13 12:56:07.000000000 -0700
+++ xfwm4-4.2.1/themes/Makefile.am	2005-03-20 15:03:03.076400082 -0700
@@ -10,4 +10,5 @@
 	therapy								\
 	tyrex								\
 	waza								\
-	wildbush
+	wildbush                                                        \
+        bluecurve
diff -Nur xfwm4-4.2.1.orig/themes/Makefile.in xfwm4-4.2.1/themes/Makefile.in
--- xfwm4-4.2.1.orig/themes/Makefile.in	2005-01-13 12:56:07.000000000 -0700
+++ xfwm4-4.2.1/themes/Makefile.in	2005-03-20 15:04:02.131267369 -0700
@@ -226,7 +226,8 @@
 	therapy								\
 	tyrex								\
 	waza								\
-	wildbush
+	wildbush                                                        \
+        bluecurve
 
 all: all-recursive
 


Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfwm4.spec	19 Mar 2005 18:34:19 -0000	1.1
+++ xfwm4.spec	20 Mar 2005 22:19:26 -0000	1.2
@@ -1,18 +1,24 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.2.1
-Release: 1
+Release: 2
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2
+
+# Change default for Fedora
+Patch0: xfwm4-bluecurve-prep.patch
+Patch1: xfwm4-bluecurve.patch
+
 Group: User Interface/Desktops
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libxfce4mcs >= 4.2.1
-Requires: libxfcegui4 >= 4.2.1
-Requires: xfce-mcs-manager >= 4.2.1
-BuildRequires: libxfce4mcs-devel >= 4.2.1
-BuildRequires: libxfcegui4-devel >= 4.2.1
-BuildRequires: xfce-mcs-manager-devel >= 4.2.1
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires: libxfce4mcs >= %{version}
+Requires: libxfcegui4 >= %{version}
+Requires: xfce-mcs-manager >= %{version}
+BuildRequires: libxfce4mcs-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: xfce-mcs-manager-devel >= %{version}
 
 %description
 xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.
@@ -20,6 +26,9 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .bluecurve-prep
+%patch1 -p1 -b .bluecurve
+
 %build
 %configure
 
@@ -28,6 +37,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+
 %find_lang %{name}
 
 %clean
@@ -37,21 +47,62 @@
 %defattr(-,root,root)
 %doc example.gtkrc-2.0 README TODO COPYING AUTHORS COMPOSITOR
 %{_bindir}/xfwm4
-%{_libdir}/xfce4
-%{_datadir}/applications
-%{_datadir}/icons
+%{_libdir}/xfce4/mcs-plugins/*
+%{_datadir}/applications/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/xfce4
 %{_datadir}/xfwm4
 %{_datadir}/themes
 
 %changelog
+* Sun Mar 20 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
+- Readded changelogs
+- Split old fedora patch into a bluecurve-prep and bluecurve patch and applied
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to version 4.2.1
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
 - Removed generic INSTALL from %doc
 - Fixed case of Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
 - Inital Fedora Extras version
+
+* Thu Jan 27 2005 Than Ngo <than at redhat.com> 4.2.0-1
+- 4.2.0
+
+* Mon Jul 19 2004 Than Ngo <than at redhat.com> 4.0.6-1
+- update to 4.0.6
+- use %%find_lang macros
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Apr 20 2004 Than Ngo <than at redhat.com> 4.0.5-2
+- Add a patch for stacking request with sibling, thanks to Olivier Fourdan <fourdan at xfce.org>
+- Change defaults for fedora, thanks to Olivier Fourdan <fourdan at xfce.org>
+
+* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
+- update to 4.0.5
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3.1-2
+- fixed dependant libraries check on x86_64
+
+* Tue Jan 13 2004 Than Ngo <than at redhat.com> 4.0.3.1-1
+- 4.0.3.1 release
+
+* Mon Jan 12 2004 Than Ngo <than at redhat.com> 4.0.3-1
+- 4.0.3 release
+
+* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
+- 4.0.2 release
+
+* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
+- initial build



From fedora-extras-commits at redhat.com  Sun Mar 20 22:31:19 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 17:31:19 -0500
Subject: rpms/xfce4-systray/devel xfce4-systray.spec,1.2,1.3
Message-ID: <200503202231.j2KMVJc4020117@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20104

Modified Files:
	xfce4-systray.spec 
Log Message:
needs xfce4-panel-devel



Index: xfce4-systray.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systray/devel/xfce4-systray.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-systray.spec	20 Mar 2005 08:43:39 -0000	1.2
+++ xfce4-systray.spec	20 Mar 2005 22:31:17 -0000	1.3
@@ -8,7 +8,7 @@
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: xfce4-panel >= %{version}
-BuildRequires: xfce4-panel >= %{version}
+BuildRequires: xfce4-panel-devel >= %{version}
 BuildRequires: libxml2-devel
 BuildRequires: libxfcegui4-devel
 BuildRequires: startup-notification-devel



From fedora-extras-commits at redhat.com  Sun Mar 20 22:38:52 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 20 Mar 2005 17:38:52 -0500
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec,1.1,1.2
Message-ID: <200503202238.j2KMcqD7020263@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20251

Modified Files:
	xfwm4-themes.spec 
Log Message:
Readded changelog entries from core cvs spec. 
Removed mandir on install



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/xfwm4-themes.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfwm4-themes.spec	19 Mar 2005 18:39:46 -0000	1.1
+++ xfwm4-themes.spec	20 Mar 2005 22:38:50 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
 Version: 4.2.1
-Release: 1
+Release: 2
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-themes-4.2.1.tar.bz2
@@ -24,7 +24,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -35,6 +35,9 @@
 %{_datadir}/themes
 
 %changelog
+* Sun Mar 20 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
+- Readded changelogs back in from core cvs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
@@ -43,3 +46,27 @@
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
 - Inital Fedora Extras version
+
+* Thu Feb 03 2005 Than Ngo <than at redhat.com> 4.2.0-1
+- 4.2.0
+
+* Fri Sep 24 2004 Than Ngo <than at redhat.com> 4.0.6-2
+- fix package description
+
+* Tue Jul 20 2004 Than Ngo <than at redhat.com> 4.0.6-1
+- update to 4.0.6
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
+- update to 4.0.5
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed Jan 14 2004 Than Ngo <than at redhat.com> 4.0.3-1
+- 4.0.3 release
+
+* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
+- initial build



From fedora-extras-commits at redhat.com  Sun Mar 20 22:41:22 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 17:41:22 -0500
Subject: rpms/xfdesktop/devel xfdesktop.spec,1.3,1.4
Message-ID: <200503202241.j2KMfMEp020516@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20504

Modified Files:
	xfdesktop.spec 
Log Message:
BuildRequires: xfce4-panel-devel >= %{version}



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfdesktop.spec	20 Mar 2005 20:59:24 -0000	1.3
+++ xfdesktop.spec	20 Mar 2005 22:41:19 -0000	1.4
@@ -18,6 +18,7 @@
 Requires: desktop-backgrounds-basic
 BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: xfce4-panel-devel >= %{version}
 BuildRequires: libxml2-devel
 BuildRequires: xfce-mcs-manager-devel
 



From fedora-extras-commits at redhat.com  Sun Mar 20 22:50:52 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 17:50:52 -0500
Subject: rpms/xfwm4/devel xfwm4.spec,1.2,1.3
Message-ID: <200503202250.j2KMoqRa020845@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20831

Modified Files:
	xfwm4.spec 
Log Message:
prep for FC4 build



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfwm4.spec	20 Mar 2005 22:19:26 -0000	1.2
+++ xfwm4.spec	20 Mar 2005 22:50:50 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.2.1
-Release: 2
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar 20 22:52:06 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 17:52:06 -0500
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec,1.2,1.3
Message-ID: <200503202252.j2KMq6TO020918@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20904

Modified Files:
	xfwm4-themes.spec 
Log Message:
prep for FC4 build



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/xfwm4-themes.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfwm4-themes.spec	20 Mar 2005 22:38:50 -0000	1.2
+++ xfwm4-themes.spec	20 Mar 2005 22:52:04 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
 Version: 4.2.1
-Release: 2
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-themes-4.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar 20 23:33:54 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Sun, 20 Mar 2005 18:33:54 -0500
Subject: rpms/pybliographer import.log,1.3,1.4
Message-ID: <200503202333.j2KNXs4b022304@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22293

Modified Files:
	import.log 
Log Message:
auto-import pybliographer-1.2.4-0.fdr.4.1 on branch FC-1 from pybliographer-1.2.4-0.fdr.4.1.src.rpm
Update from fedora.us


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 05:14:20 -0000	1.3
+++ import.log	20 Mar 2005 23:33:52 -0000	1.4
@@ -1,2 +1,3 @@
 pybliographer-1_2_4-0_fdr_1_1:HEAD:pybliographer-1.2.4-0.fdr.1.1.src.rpm:1099890854
 pybliographer-1_2_4-0_fdr_1_2:HEAD:pybliographer-1.2.4-0.fdr.1.2.src.rpm:1099890860
+pybliographer-1_2_4-0_fdr_4_1:FC-1:pybliographer-1.2.4-0.fdr.4.1.src.rpm:1111361718



From fedora-extras-commits at redhat.com  Sun Mar 20 23:33:54 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Sun, 20 Mar 2005 18:33:54 -0500
Subject: rpms/pybliographer/FC-1 pyblio.patch, NONE, 1.1 pybliographer.spec,
	1.1, 1.2
Message-ID: <200503202333.j2KNXsI4022308@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22293/FC-1

Modified Files:
	pybliographer.spec 
Added Files:
	pyblio.patch 
Log Message:
auto-import pybliographer-1.2.4-0.fdr.4.1 on branch FC-1 from pybliographer-1.2.4-0.fdr.4.1.src.rpm
Update from fedora.us

pyblio.patch:

--- NEW FILE pyblio.patch ---
--- pybliographer-1.2.4/Pyblio/Base.py	2004-07-17 21:52:43.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Base.py	2004-11-26 08:09:55.000000000 +0100
@@ -76,6 +76,12 @@
 
 	return self.field_and_loss (key) [0]
 
+    def get (self, key, default=None):
+        if self.has_key (key):
+            return self [key]
+        else :
+            return default
+
 
     def __setitem__ (self, name, value):
 	self.dict [name] = value
@@ -116,7 +122,11 @@
 	tp = self.type.name
 	fields = self.type.fields
 
-	text = '%s [%s]\n' % (tp, self.key.key)
+        try:
+            text = '%s [%s]\n' % (tp, self.key.key)
+        except AttributeError:
+            text  = '%s [no key]\n' %(tp)
+            
 	text = text + ('-' * 70) + '\n'
 
 	dico = self.keys ()
--- pybliographer-1.2.4/Pyblio/ConfDir/Base.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/ConfDir/Base.py	2004-11-26 08:09:55.000000000 +0100
@@ -60,7 +60,7 @@
            'Date', 'NoSeries', 'ConfPlace', 'Cote', 'IEEECN', 'Annotate',
            'Quote', 'LoCN', 'ISBN', 'ISSN', 'Note', 'Language', 'HowPublished',
            'To_Appear', 'From', 'Received', 'Owner', 'Keywords', 'Abstract',
-           'Remarks', 'URL' ]
+           'Remarks', 'URL', 'Beigabevermerk' ]
 
 entries = {
     'Article' : (('author', 'title', 'journal', 'date'),
@@ -81,7 +81,7 @@
     
     'InCollection' : (('author', 'title', 'booktitle', 'publisher', 'date', ),
                       ('editor', 'volume', 'number', 'series', 'type',
-                      'chapter', 'pages', 'address', 'edition',)),
+                      'chapter', 'pages', 'address', 'edition', 'note',)),
     
     'InProceedings' : (('author', 'title', 'booktitle', 'date',),
                        ('editor', 'volume', 'number', 'series',
@@ -136,6 +136,7 @@
 desc ['note'].type         = Fields.LongText
 desc ['quote'].type        = Fields.LongText
 desc ['remarks'].type      = Fields.LongText
+#desc ['beigabevermerk'].type      = Fields.LongText
 
 
 Config.set ('base/fields', desc)
--- pybliographer-1.2.4/Pyblio/ConfDir/GnomeUI.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/ConfDir/GnomeUI.py	2004-11-26 08:09:56.000000000 +0100
@@ -64,7 +64,9 @@
              ('editor', 150),
              ('title',  200),
              ('booktitle', 200),
-             ('date', 50)):
+             ('date', 50),
+             ('-author/editor-', 150),
+             ('-author/title-', 250)):
     
     if not h.has_key (f): continue
 
--- pybliographer-1.2.4/Pyblio/ConfDir/Ovid.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/ConfDir/Ovid.py	2004-11-26 08:09:56.000000000 +0100
@@ -11,23 +11,23 @@
 Config.set ('ovid/deftype',
             Config.get ('base/entries').data ['article'])
 
-Config.define ('ovid/sourceregexp',
-               """A regexp used to parse the source and abbreviated
-               source input fields. This is a raw and verbose Python
-               regular expression""",
-               Config.String())
-
-Config.set ('ovid/sourceregexp',
-    r"""
-    (?P<journal>.*)\.\ +
-    (?P<volume>\d+)
-    (?:\((?P<number>.*)\))?
-    (?::(?P<pages>.*?(?:-+.*?)?)
-    (?:;\ *(?P<other>.*))?)
-    (?:,\ *(?P<year>\d\d\d\d))\ *
-    (?P<month>.*)
-    \.\Z
-    """)
+## Config.define ('ovid/sourceregexp',
+##                """A regexp used to parse the source and abbreviated
+##                source input fields. This is a raw and verbose Python
+##                regular expression""",
+##                Config.String())
+
+## Config.set ('ovid/sourceregexp',
+##     r"""
+##     (?P<journal>.*)\.\ +
+##     (?P<volume>\d+)
+##     (?:\((?P<number>.*)\))?
+##     (?::(?P<pages>.*?(?:-+.*?)?)
+##     (?:;\ *(?P<other>.*))?)
+##     (?:,\ *(?P<year>\d\d\d\d))\ *
+##     (?P<month>.*)
+##     \.\Z
+##     """)
 
 Config.define ('ovid/mapping', 
                """ A mapping between the Ovid field name and
@@ -40,52 +40,53 @@
 
 
 Config.set ('ovid/mapping', {
-    'abbreviated source'
+    'Abbreviated Source'
                     : ('abbrevsrc',   SimpleField),
-    'abstract'      : ('abstract',    SimpleField),
-    'accession number'
+    'Abstract'      : ('abstract',    SimpleField),
+    'Accession Number'
                     : ('accession',   SimpleField),
-    'author'        : ('author',      AuthorField),
-    'author keywords'
-                    : ('keywords',    KeywordField),
-    'authors'       : ('author',      AuthorField),
-    'cas registry/ec number' 
+    'Author'        : ('author',      AuthorField),
+    'Author Keywords'
+                    : ('author-keywords',
+                       KeywordField),
+    'Authors'       : ('author',      AuthorField),
+    'CAS Registry/EC Number' 
                     : ('casec',       SimpleField),
-    'cc categories' : ('cccat',       SimpleField),
-    'classification codes'
+    'CC Categories' : ('cccat',       SimpleField),
+    'Classification Codes'
                     : ('classificationCodes',
                                       SimpleField),
-    'country of publication'
+    'Country of Publication'
                     : ('country',     SimpleField),
-    'document delivery'
+    'Document Delivery'
                     : ('docdeliv',    SimpleField),
-    'entry date'    : ('sourceid4',   SimpleField),
-    'institution'   : ('institution', SimpleField),
-    'issn'          : ('issn',        SimpleField),
-    'journal subset': ('nlmsubset',   SimpleField),
-    'key phrase identifiers'
-                    : ('keywords',    SimpleField),
-    'keywords+'     : ('keywords',    KeywordField),
-    'keywords plus' : ('keywords',    KeywordField),
-    'language'      : ('language',    SimpleField),
-    'mesh subject headings'
-                    : ('mesh',        SimpleField),
-    'nlm journal code'
+    'Entry Date'    : ('sourceid4',   SimpleField),
+    'Institution'   : ('institution', SimpleField),
+    'ISSN'          : ('issn',        SimpleField),
+    'Journal Subset': ('nlmsubset',   SimpleField),
+    'Key Phrase Identifiers'
+                    : ('keyphrase',   SimpleField),
+    'Keywords+'     : ('keywords',    KeywordField),
+    'KeyWords Plus' : ('keywordsplus',    KeywordField),
+    'Language'      : ('language',    SimpleField),
+    'Mesh Subject Headings'
+                    : ('mesh',        KeywordField),
+    'NLM Journal Code'
                     : ('nlmjournal',  SimpleField),
-    'publication notes'
+    'Publication Notes'
                     : ('note',        SimpleField),
-    'publication type'
-                    : ('type',        SimpleField),
-    'record owner'  : ('sourceid1',   SimpleField),
-    'revision date' : ('sourceid3',   SimpleField),
-    'source'        : ('journal',     SourceField),
-    'subject headings'
+    'Publication Type'
+                    : ('profile',     SimpleField),
+    'Record Owner'  : ('sourceid1',   SimpleField),
+    'Revision Date' : ('sourceid3',   SimpleField),
+    'Source'        : ('journal',     SourceField),
+    'Subject Headings'
                     : ('subjectHdgs', SimpleField),
-    'subset'        : ('subset',      SimpleField), 
-    'title'         : ('title',       SimpleField),
-    'treatment'     : ('treatment',   SimpleField),
-    'unique identifier'
+    'Subset'        : ('subset',      SimpleField), 
+    'Title'         : ('title',       SimpleField),
+    'Treatment'     : ('treatment',   SimpleField),
+    'Unique Identifier'
                     : ('sourceid0',   SimpleField),
-    'update date'   : ('sourceid2',   SimpleField), 
+    'Update Date'   : ('sourceid2',   SimpleField), 
     })
 
--- pybliographer-1.2.4/Pyblio/Config.py	2004-07-17 21:54:36.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Config.py	2004-11-26 08:09:56.000000000 +0100
@@ -71,14 +71,16 @@
 
 
     def eventually_resolve (self, key):
+
         if self.items.has_key (key): return
         domain = string.split (key, '/') [0]
-        
+
         if self.sources.has_key (domain):
             file = self.sources [domain]
             del self.sources [domain]
 
             execfile (file, globals (), globals ())
+
         return
 
 
@@ -115,6 +117,7 @@
 
 
     def __getitem__ (self, key):
+
         self.eventually_resolve (key)
         return self.items [key]
         
@@ -148,7 +151,9 @@
     try:
         ConfigItems [key].set (value)
     except KeyError:
-        sys.stderr.write ("pybliographer: warning: configuration key `%s' is undefined\n" % key)
+        sys.stderr.write (
+            "pybliographer: warning: configuration key `%s' is undefined\n"
+            % key)
     return
 
 _changes = {}
--- pybliographer-1.2.4/Pyblio/Fields.py	2004-07-17 21:54:49.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Fields.py	2004-11-26 08:09:56.000000000 +0100
@@ -154,7 +154,7 @@
 
         total = []
 
-        if self.first is None: return None
+        if self.first is None: return ''
         
         for atom in string.split (self.first, ' '):
             list = []
--- pybliographer-1.2.4/Pyblio/Format/isifile.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Format/isifile.py	2004-11-26 08:09:56.000000000 +0100
@@ -293,7 +293,7 @@
             authors = []
             for author in entry['author']:
                 initials = author.initials()
-                initials = re.sub('\. *','',initials)
+                initials = re.sub('\. *','', initials)
                 authors.append( '%s, %s' % (author.last, initials))
             del remaining ['author']    
             output_write('AU', authors)    
--- pybliographer-1.2.4/Pyblio/Format/OvidLike.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Format/OvidLike.py	2004-11-26 08:09:56.000000000 +0100
@@ -33,7 +33,6 @@
 KeywordField = 3
 
 separator_re = re.compile (r'<\d+>$')
-#source_re    = re.compile (r'(\w+)?\(([^\)]+)\):(\d+-\d+)')
 
 compact_dot  = re.compile (r'\.(\s*\.)+')
 
@@ -51,13 +50,32 @@
     month_name [long_month [key] - 1] = key
 
 
+
+def make_anti_mapping (mapping):
+    m = {}
+    for i, j in mapping.items():
+        m[j[0]] = (i, j[1])
+    return m
+
 class OvidLike (Iterator.Iterator):
+    source_rx  = r"""(?P<journal>.*?)\.\ +
+        (?P<volume>\w+)?
+        (?P<inseries>(\ PG\.\ +))?
+        (?:\((?P<number>.*)\))?
+        (?::?(?P<pages>.*?(?:-+.*?)?)
+        (?:;\ *(?P<other>.*))?)
+        (?:[,\.]\ *(?P<year>\d\d\d\d))\ *
+        (?P<month>.*)
+        \.\s*\Z"""
+
+    source_re = re.compile  (source_rx, flags=re.VERBOSE)
 
-    def __init__ (self, file, mapping, deftype, sourceregexp):
+    def __init__ (self, file, mapping, deftype):
         self.file    = file
         self.deftype = deftype
-        self.mapping = mapping
-        self.source_re = re.compile(sourceregexp, flags= re.VERBOSE)
+        self.mapping = {}
+        for i, j in mapping.iteritems():
+            self.mapping[i.lower()] = j
         return
 
     def first (self):
@@ -82,20 +100,17 @@
         dict = {}
         
         # read entry till next blank line
-        text  = ''
+        text  = []
         field = ''
         while 1:
             line = self.file.readline ()
             if line == '': break
-
             line = string.rstrip (line)
 
-            if line == '': continue
-            
             # starting with a blank ?
-            if line [0] == ' ':
+            if line == '' or   line [0] == ' ':
                 # ...then we continue the current text
-                text = text + ' ' + string.lstrip (line)
+                text.append (string.lstrip (line))
                 continue
 
             # new entry ?
@@ -104,25 +119,25 @@
             # else, this is a new field
             if field:
                 # save the previous one if needed
-                dict [field] = text
-                text = ''
+                dict [field] = '\n'.join(text)
+                text = []
 
             # store the name of this new field
             field = string.lower (line)
 
         # don't waste the last field content
         if field:
-            dict [field] = text
+            dict [field] = '\n'.join(text)
 
         # did we parse a field ?
         if len (dict) == 0: return None
-        
+
         # create the entry content
         entry = Base.Entry (type = self.deftype)
 
         for key in dict.keys ():
             if not self.mapping.has_key (key):
-                print "warning: unused key `%s'" % key
+                #print "warning: unused key `%s'" % key
                 continue
 
             (name, type) = self.mapping [key]
@@ -131,18 +146,16 @@
             # parse a simple text field
             if type == SimpleField:
                 entry [name] = text_type (string.strip (dict [key]))
-                continue
 
-            if type == KeywordField:
+            elif type == KeywordField:
                 text = string.strip (dict [key])
                 if entry.has_key (name):
-                    text = str (entry [name]) + '  ' + text
+                    text = str (entry [name]) + '\n  ' + text
                     
                 entry [name] = text_type (text)
-                continue
 
             # parse an author field
-            if type == AuthorField:
+            elif type == AuthorField:
                 ag = Fields.AuthorGroup ()
 
                 for names in string.split (dict [key], '  '):
@@ -169,19 +182,32 @@
                 continue
 
             # parse a source field
-            if type == SourceField:
-
-                m = self.source_re.match (dict[key])
-
+            elif type == SourceField:
+                m = self.source_re.match (dict[key].strip())
                 if m:
                     year, month, day = None, None, None
-
-                    j, v, n, p, o, y, m = m.group(
-                        'journal', 'volume', 'number', 'pages',
-                        'other', 'year', 'month')
-
-                    if j:
-                        entry [name] = Fields.Text (j)
+                    j, v, s, n, p, o, y, d = m.group(
+                        'journal', 'volume', 'inseries', 'number',
+                        'pages', 'other', 'year', 'month')
+
+                    if s:                ### article in a monograph series
+                        entry['booktitle'] = Fields.Text (j)
+                        if d:
+                            entry['beigabevermerk'] = Fields.LongText (d)
+                        entry.type = Types.get_entry('incollection')
+
+                    elif j:
+                        entry ['journal'] = Fields.Text (j)
+                        if d and not d.isspace():
+                            dates = d.split ()                    
+                            try:
+                                month = long_month [dates[0]]
+                            except KeyError:
+                                print 'OVID Warning:',
+                                print '%s is not representable in %s' %(
+                                dates[0], m)
+                            if len(dates) > 1:
+                                day = int (dates[1])
 
                     if v:
                         entry ['volume'] = Fields.Text (v)
@@ -198,21 +224,12 @@
                     if y:
                         year = int(y)
 
-                    if m and not m.isspace():
-                        dates = m.split ()                    
-                        try:
-                            month = long_month [dates[0]]
-                        except KeyError:
-                            print 'OVID Warning: %s is not representable in %s' %(
-                                dates[0], m)
-                        if len(dates) > 1:
-                            day = int (dates[1])
-                            
                     entry ['date'] = Fields.Date((year, month, day))
-                
+                else:
+                    print '>>> Error: Source field  does not parse correctly:'
+                    print dict[key]
+                    print entry
                 continue
-
-            raise TypeError, "unknown field type `%d'" % type
         
         return entry
 
@@ -221,78 +238,139 @@
 
     counter = 1
     entry   = iter.first ()
-
+    m = make_anti_mapping (mapping)
     while entry:
-        output.write ('<%d>\n' % counter)
+        write_entry (output, entry, counter, m)
         counter = counter + 1
+        entry = iter.next ()
+        if entry: output.write ('\n')
 
-        for key in mapping.keys ():
-            (name, type) = mapping [key]
-            key = string.capwords (key)
+def write_entry (output, entry, counter, mapping):
+    output.write ('<%d>\n' % counter)
 
-            if type == SimpleField:
-                if not entry.has_key (name): continue
-                output.write (key + '\n')
+    keys = entry.keys()
 
-                output.write (Utils.format (str (entry [name]),
-                                            75, 2, 2) + '\n')
-                continue
+    write_source_field (output, entry, keys)
+     
+    for key in keys:
+        (name, typ) = mapping.get(key, (None, None))
+        if name == None or typ == SourceField: continue
 
-            if type == AuthorField:
-                if not entry.has_key (name): continue
-                output.write (key + '\n')
+        output.write (name)
+        output.write('\n')
+        
+        if typ == SimpleField:
+            write_simple_field (output, entry[key])
 
-                auths = map (lambda auth: '%s %s' % (auth.last or '', auth.first or ''),
-                             entry [name])
+        elif typ == AuthorField:
+            write_author_field (output, entry[key])
 
-                output.write ('  ' + string.join (auths, '  ') + '\n')
-                continue
+        elif typ == SourceField: print 'sourcefield: %s' %(entry[key])
+#             write_source_field (output, entry, keys)
 
-            if type == SourceField:
-                # do we have one of those fields ?
-                if not (entry.has_key (name [0]) or
-                        entry.has_key (name [1]) or
-                        entry.has_key (name [2]) or
-                        entry.has_key (name [3]) or
-                        entry.has_key (name [4])): continue
-                output.write (key + '\n')
-
-                text = ''
-                if entry.has_key (name [0]):
-                    # put the title
-                    text = text + str (entry [name [0]]) + '. '
-
-                has_source = 0
-                vals = ['', '', '']
-                for i in range (0, 3):
-                    if entry.has_key (name [i + 1]):
-                        has_source = 1
-                        vals [i] = str (entry [name [i + 1]])
-
-                if has_source:
-                    text = text + '%s(%s):%s' % tuple (vals)
-
-                if entry.has_key (name [4]):
-                    if has_source:
-                        text = text + ', '
-
-                    date = entry [name [4]]
-                    text = text + str (date.year)
-                    if date.month:
-                        text = text + ' ' + month_name [date.month - 1]
-                    if date.day:
-                        text = text + ' ' + str (date.day)
-
-                # final dot.
-                if text: text = text + '.'
-
-                # correct the number of dots...
-                text = compact_dot.sub ('.', text)
-                
-                output.write (Utils.format (text,
-                                            75, 2, 2) + '\n')
-                
-        entry = iter.next ()
-        if entry: output.write ('\n')
+        elif typ == KeywordField:
+            if key == 'mesh':
+                offset = 4
+            else:
+                offset = 2
+            write_simple_field (output, entry[key], offset)
+
+    
+def write_simple_field (output, value, offset=2):
+    off = offset * ' '
+    lines = str(value).split('\n')
+    for l in lines:
+        output.write(off)
+        output.write (l)
+        output.write ('\n')
+
+
+def write_keyword_field (output, value):
+    lines = str(value).split('\n')
+    for line in lines:
+        output.write('    ')
+        output.write(line)
+        output.write('\n')
+
+
+def write_author_field (output, value):
+    auths = [ '%s %s' % (auth.last or '', auth.first or '')
+              for auth in value]
+    output.write ('  ')
+    output.write ('  '.join (auths))
+    output.write ('\n')
+
+
+def write_source_field (output, entry, keys):
+    t = []
+
+    output.write('Source\n')
+    
+    if entry.type == Types.get_entry(
+        'incollection') or entry.has_key ('booktitle'):
+        t = [str(entry.get ('booktitle')).strip()]
+        
+        if entry.has_key ('volume'):
+            t.append (".  %s " % (entry ['volume']))
+        if entry.has_key ('number'):
+            t.append ("(%s)" %  (entry ['number']))
+
+        if entry.has_key ('pages'):
+            p = str (entry ['pages'])
+            #p = Utils.compress_page_range (p)
+            t.append ("PG. %s." %(p))
+
+        if entry.has_key('date'):
+            date  = entry['date']
+            t.append (" %s" % (date.year))
+        if entry.has_key ('beigabeevermerk'):
+            t.append (str(entry.get('beigabevermerk')))
+    else: 
+
+        t.append ("%s. " %(entry ['journal']))
+
+        if entry.has_key ('volume'):
+            t.append ("%s" % (entry ['volume']))
+
+        if entry.has_key ('number'):
+            t.append ("(%s)" %  (entry ['number']))
+
+        if entry.has_key ('pages'):
+            p = str (entry ['pages'])
+            #p = Utils.compress_page_range (p)
+            t.append (":%s" %(p))
+
+        if entry.has_key ('other-note'):
+            t.append ("; %s" %(entry ['other-note']))
+
+        if entry.has_key('date'):
+            date  = entry['date']
+
+            t.append (", %s" % (date.year))
+
+            if date.month:
+                t.append (" %s" % (month_name [date.month - 1]))
+            if date.day:
+                t.append (" %s" %(date.day))
+        
+
+    # final dot.
+    t.append (".")
+    text = ''.join (t)
+
+    # correct the number of dots...
+    #text = compact_dot.sub ('.', text)
+    output.write('  ')
+    output.write (text)
+    output.write ('\n')
+
+
+
+
+
+
+### Local Variables:
+### Mode: python
+### py-master-file : "ut_Ovidlike.py"
+### End:
 
-    return
--- pybliographer-1.2.4/Pyblio/Format/Ovid.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Format/Ovid.py	2004-11-26 08:09:56.000000000 +0100
@@ -73,8 +73,8 @@
     return  OvidLike.OvidLike (
         file,
         Config.get ('ovid/mapping').data,
-        Config.get ('ovid/deftype').data,
-        Config.get ('ovid/sourceregexp').data)
+        Config.get ('ovid/deftype').data
+        )
 
 
 def writer (iter, output):
--- pybliographer-1.2.4/Pyblio/GnomeUI/Document.py	2004-07-17 21:51:48.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/GnomeUI/Document.py	2004-11-26 08:09:58.000000000 +0100
@@ -779,7 +779,7 @@
         Utils.config.set_int ('/apps/pybliographic/ui/width',  alloc [2])
         Utils.config.set_int ('/apps/pybliographic/ui/height', alloc [3])
 
-        # 2.- Proportion betzeen list and text
+        # 2.- Proportion between list and text
         height = self.paned.get_position ()
         Utils.config.set_int ('/apps/pybliographic/ui/paned', height)
 
--- pybliographer-1.2.4/Pyblio/GnomeUI/Editor.py	2004-07-17 21:55:14.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/GnomeUI/Editor.py	2004-11-26 08:09:58.000000000 +0100
@@ -640,6 +640,7 @@
                     self.w.get_toplevel(), gtk.DIALOG_DESTROY_WITH_PARENT,
                     gtk.MESSAGE_WARNING, gtk.BUTTONS_OK_CANCEL,
                     "Text will be lost if you click OK.")
+                dialog.set_transient_for (self.dialogue.w)
                 rc = dialog.run()
                 dialog.destroy()
                 
@@ -1225,7 +1226,7 @@
             anno_label.set_markup(l)
             vbox.pack_start (anno_label)
             
-            if entry.has_key(key): t = str (entry[key])
+            if entry.has_key(key): t = str (entry[key]).decode ('latin-1')
             else:                  t = ''
 
             l = min (len(t), 150)
@@ -1286,7 +1287,7 @@
         key = node['key']
         if not item.has_key(key):
             item[key] = Fields.LongText(_('Enter text here'))
-        self.buff.set_text (str(item[key]), -1)
+        self.buff.set_text (str (item[key]).decode ('latin-1'), -1)
         self.buff.set_modified (False)
         self.page.show_all ()
         if self.hidden:
@@ -1301,7 +1302,7 @@
             start, end = self.buff.get_bounds()
             
             key = self.node['key']
-            text = self.buff.get_text (start, end)
+            text = self.buff.get_text (start, end).encode ('latin-1')
             if text.strip():
                 self.entry[key] = Fields.LongText(text)
             else:
@@ -1325,7 +1326,7 @@
 
         start, end = self.buff.get_bounds()
         key = self.node['key']
-        self.entry[key].text = self.buff.get_text (start, end)
+        self.entry[key].text = self.buff.get_text (start, end).encode ('latin-1')
         
 
     def enable_buttons (self):
--- pybliographer-1.2.4/Pyblio/GnomeUI/Fields.py	2004-07-17 21:55:41.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/GnomeUI/Fields.py	2004-11-26 08:09:48.000000000 +0100
@@ -43,22 +43,26 @@
     Fields.Date        : _('Date')
     }
 
-class FieldsDialog:
+class FieldsDialog (Utils.GladeWindow):
 
-    def __init__ (self, parent = None):
+    gladeinfo = {
 
-        gp = os.path.join (version.pybdir, 'glade', 'fields1.glade')
+        'file': 'fields1.glade',
+        'name': 'fields',
+        'root': 'fields1'
         
-        self.xml = gtk.glade.XML (gp, 'fields1')
-        self.xml.signal_autoconnect (self)
+        }
+
+    def __init__ (self, parent = None):
 
+        Utils.GladeWindow.__init__ (self, parent)
+        
         self.dialog = self.xml.get_widget ('fields1')
         self.w = self.xml.get_widget ('notebook')
 
         tooltips = gtk.Tooltips ()
         tooltips.enable ()
         
-        if parent: self.dialog.set_transient_for (parent)
         self.warning = 0
         self.parent = parent
         self.init_page_1()
@@ -74,7 +78,9 @@
 
     def on_close (self, w):
         self.dialog.hide_all()
-
+        self.size_save ()
+        return
+    
     def on_add(self, *args):
         page = self.w.get_current_page ()
         if page == 0: self.page1_add (*args)
@@ -323,8 +329,8 @@
         for i in item.optional:
              self.sm.append((i.name, False, i.name, i))
         self.label3.set_markup (
-            _('Fields associated with <b>%s</b> entry type' %(
-            item.name)))
+            _('Fields associated with <b>%s</b> entry type') %
+            item.name)
         self.check()
 
     def page3_add (self, *args):
--- pybliographer-1.2.4/Pyblio/GnomeUI/Index.py	2004-07-17 21:55:56.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/GnomeUI/Index.py	2004-11-26 08:09:56.000000000 +0100
@@ -30,7 +30,7 @@
 
 ''' Main index containing the columned view of the entries '''
 
-from Pyblio import Fields, Config, Connector, Types, Sort
+from Pyblio import Fields, Config, Connector, Types, Sort, userformat
 
 from gnome import ui
 import gtk, gobject
@@ -335,6 +335,12 @@
                 elif f == '-type-':
                     row.append (str (entry.type.name))
                     
+                elif f == '-author/editor-':
+                    row.append (userformat.author_editor_format (entry))
+
+                elif f == '-author/title-':
+                    row.append (userformat.author_title_format (entry))
+                    
                 elif entry.has_key (f):
                     
                     if Types.get_field (f).type == Fields.AuthorGroup:
--- pybliographer-1.2.4/Pyblio/GnomeUI/__init__.py	2004-07-17 21:56:41.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/GnomeUI/__init__.py	2004-11-26 08:09:58.000000000 +0100
@@ -24,7 +24,8 @@
 
 import sys, string
 
-sys.argv = sys.argv [:2] + ['--'] + sys.argv [2:]
+files    = sys.argv [2:]
+sys.argv = sys.argv [:2] + ['--'] + files
 
 # correctly identify the program
 import pygtk
@@ -46,9 +47,9 @@
     _vnum (gtk.gtk_version), _vnum (gtk.pygtk_version))
     
 # clean up our garbage
-sys.argv = sys.argv [:2] + sys.argv [3:]
+sys.argv = sys.argv [:2] + files
 
-del sys
+del sys, files
 
 import gtk.glade
 
--- pybliographer-1.2.4/Pyblio/GnomeUI/Pybliographic.py	2004-07-17 21:56:09.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/GnomeUI/Pybliographic.py	2004-11-26 08:09:56.000000000 +0100
@@ -106,13 +106,15 @@
         
         if not document.close_document_request ():
             return
+
+        if len (self.documents) == 1 and maybe_exit:
+            self.exit_application (self.documents [0])
+            return
         
         document.w.destroy ()
         self.documents.remove (document)
         
-        if not self.documents:
-            if maybe_exit: mainquit ()
-            else:          self.new_document ()
+        if not self.documents: self.new_document ()
         return
 
 
@@ -137,6 +139,6 @@
             doc.w.destroy ()
             self.documents.remove (doc)
 
-        mainquit ()
+        main_quit ()
         return
     
--- pybliographer-1.2.4/Pyblio/GnomeUI/Search.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/GnomeUI/Search.py	2004-11-26 08:09:51.000000000 +0100
@@ -128,7 +128,8 @@
                 'after' :    TextUI.after,
                 }
             
-            search = self._w_expert_text.get_text ()
+            search = self._w_expert_text.get_text ().encode ('latin-1')
+            
             try:
                 exec ('tester = ' + search, user_global)
             except:
@@ -157,7 +158,7 @@
 
             if field == ' - any field - ' or field == '':
                 try:
-                    test = Search.AnyTester (match)
+                    test = Search.AnyTester (match.encode ('latin-1'))
                 except re.error, err:
                     error = 1
                     
--- pybliographer-1.2.4/Pyblio/Makefile.am	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Makefile.am	2004-11-26 08:09:56.000000000 +0100
@@ -47,7 +47,8 @@
 	__init__.py 	\
 	Query.py	\
 	pybtextvar.py	\
-	recode.py
+	recode.py       \
+	userformat.py
 
 SUBDIRS = GnomeUI Output Format ConfDir Style
 
--- pybliographer-1.2.4/Pyblio/Makefile.in	2004-07-07 22:12:29.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Makefile.in	2004-11-26 08:12:07.000000000 +0100
@@ -139,7 +139,8 @@
 	__init__.py 	\
 	Query.py	\
 	pybtextvar.py	\
-	recode.py
+	recode.py       \
+	userformat.py

 
 SUBDIRS = GnomeUI Output Format ConfDir Style 
--- pybliographer-1.2.4/Pyblio/Open.py	2004-07-17 21:57:10.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Open.py	2004-11-26 08:09:57.000000000 +0100
@@ -21,6 +21,7 @@
 
 
 from types import *
+
 from Pyblio import Autoload, Fields, Help, Exceptions
 
 import urlparse, urllib, traceback, os, sys, tempfile, string
--- pybliographer-1.2.4/Pyblio/userformat.py	1970-01-01 01:00:00.000000000 +0100
+++ pybliographer-1.2.4-patch/Pyblio/userformat.py	2004-11-26 08:09:55.000000000 +0100
@@ -0,0 +1,71 @@
+# This file is part of Pybliographer
+# 
+# Copyright (C) 2004 Peter Schulte-Stracke
+# Email : mail at schulte-stracke.de
+#          
+# 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.
+# 
+# 
+
+
+
+def author_editor_format (item):
+    """Return the author or editor of an item, for use
+    in list displays."""
+    s = []
+    r = item.get ('author') or  item.get ('editor', [])
+
+
+    try:  len(r)
+    except TypeError:
+        print 'USERFORMAT INPUT:', `r`, str(r) 
+        return str(r)
+    
+    if len (r) == 1:
+        a = r[0]
+        s.append ("%s, %s" %(
+            a.last, a.initials()))
+    
+    elif len (r) > 3:       
+        a = r[0]
+        s.append ("%s, %s et al." %(
+            a.last, a.initials()))
+    
+    elif len (r) > 1:
+        for a in r:
+            s.append (a.last)
+        return '/'.join (s)
+
+    return "".join (s)
+
+
+def author_title_format (item):
+    """Return author/title string for use in list displays."""
+
+    r = author_editor_format (item)
+    if r:
+        s = [r, ': ']
+    else:
+        s = []
+        
+    r = item.get ('title') or item.get ('booktitle', '[no title]')
+    s.append (str(r))
+
+    return ''.join (s)
+
+
+
+            
+        
--- pybliographer-1.2.4/Pyblio/Utils.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/Pyblio/Utils.py	2004-11-26 08:09:57.000000000 +0100
@@ -18,13 +18,36 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 # 
 # 
-
+import re
 from string import *
 
 from Pyblio import Key, Autoload, recode
 
 _flat = recode.recode ('latin1..flat')
 
+def compress_page_range (pages, separator='-'):
+    """Returns a page range with common prefix
+    elided from the second number. Resulte is string
+    firstpage(separator)(lastpage), except if separator
+    is None, then a sequence is returned."""
+
+    p = re.sub (' *--? *', '-', pages)
+    s = p.split('-')
+    if len(s) > 1:
+        l, r = s
+        if len(l) == len(r):
+            i = 0
+            while r [i] == l[i]:
+                i += 1
+            r = r[i:]
+    else:
+        l, r = s[0], ''
+    if separator:
+        return "%s%s%s" %(l, separator, r)
+    else:
+        return l, r
+
+
 def format (string, width, first, next):
     ''' Format a string on a given width '''
 
--- pybliographer-1.2.4/pybliographer.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/pybliographer.py	2004-11-26 08:09:50.000000000 +0100
@@ -23,14 +23,12 @@
 version  = "@version@"
 progname = "@package@"
 
-lib_pybdir  = "@libpyb@"
 data_pybdir = "@datapyb@"
 localedir   = "@localedir@"
 
 import sys
 
 sys.path.insert (0, data_pybdir)
-sys.path.insert (0, lib_pybdir)
 sys.path.insert (0, '.')
 
 import locale
--- pybliographer-1.2.4/scripts/pybcheck.py	2004-07-07 21:56:42.000000000 +0200
+++ pybliographer-1.2.4-patch/scripts/pybcheck.py	2004-11-26 08:09:45.000000000 +0100
@@ -23,9 +23,12 @@
 import os, sys, string
 from Pyblio import Config, Exceptions
 
+import locale
+charset = locale.getlocale () [1] or 'ascii'
+
 # check the arguments
 if len (sys.argv) < 3:
-    print "usage: pybcheck <file | directory>..."
+    print _("usage: pybcheck <file | directory>...").encode (charset)
     sys.exit (1)
 
 # list containing the broken entries
@@ -54,7 +57,7 @@
         # try to open the database
         try:
             b = bibopen (f)
-            print "file `%s' is ok [%d entries]" % (f, len (b))
+            print (_("file `%s' is ok [%d entries]") % (f, len (b))).encode (charset)
         except (Exceptions.ParserError, KeyError), err:
             broken.append (str (err))
 
--- pybliographer-1.2.4/scripts/pybcompact.py	2004-07-17 22:03:56.000000000 +0200
+++ pybliographer-1.2.4-patch/scripts/pybcompact.py	2004-11-26 08:09:46.000000000 +0100
@@ -23,12 +23,15 @@
 import string, os, re, copy, sys
 from Pyblio import Base, Key
 
+import locale
+charset = locale.getlocale () [1] or 'ascii'
+
 def usage ():
-    print _("usage: pybcompact <latexfile> <bibtexfiles...>")
+    print _("usage: pybcompact <latexfile> <bibtexfiles...>").encode (charset)
     return
 
 def error (msg):
-    sys.stderr.write (_("pybcompact: error: %s\n") % msg)
+    sys.stderr.write ((_("pybcompact: error: %s\n") % msg).encode (charset))
     sys.exit (1)
     return
 
@@ -54,8 +57,8 @@
     try:
         aux = open (auxfile, 'r')
     except IOError, err:
-        error ('%s: %s' % (auxfile, err))
-    
+        error ("`%s': %s" % (auxfile, str (err).decode (charset)))
+
     citations = []
 
     # parse the whole file
--- pybliographer-1.2.4/scripts/pybconvert.py	2004-07-17 22:04:03.000000000 +0200
+++ pybliographer-1.2.4-patch/scripts/pybconvert.py	2004-11-26 08:09:45.000000000 +0100
@@ -22,8 +22,11 @@
 
 import os, sys, string
 
+import locale
+charset = locale.getlocale () [1] or 'ascii'
+
 if len (sys.argv) < 4 or len (sys.argv) > 5:
-    print _("usage: pybconvert <source>..<target> <input> [output]")
+    print _("usage: pybconvert <source>..<target> <input> [output]").encode (charset)
     sys.exit (1)
 
 
@@ -32,7 +35,7 @@
 try:
     source, target = string.split (format, '..')
 except:
-    print _("pybconvert: bad conversion format")
+    print _("pybconvert: error: bad conversion format").encode (charset)
     sys.exit (1)
 
 
--- pybliographer-1.2.4/scripts/pybformat.py	2004-07-17 22:04:11.000000000 +0200
+++ pybliographer-1.2.4-patch/scripts/pybformat.py	2004-11-26 08:09:49.000000000 +0100
@@ -27,18 +27,32 @@
 from Pyblio import Base, Autoload
 from Pyblio.Style import Utils
 
+import locale
+charset = locale.getlocale () [1] or 'ascii'
+
 def usage ():
-    sys.stderr.write (_("usage: pybformat [bibtexfiles...]\n"))
+    print _("""usage: pybformat [options] <database...>
+
+    options:
+      -o file, --output=file		specify an output filename
+      -s style, --style=style		specify a bibliography style
+      -f format, --format=format	specify an output format
+      -H header, --header=header	defines a header file
+      -F footer, --footer=footer	defines a footer file
+      -l 'output', --list='output'	lists the available output formats
+      -h, --help			show this help message
+      -v, --version			show this help message
+    """).encode (charset)
     return
 
 def error (text, exit = 1):
-    sys.stderr.write (_("pybformat: error: %s\n") % text)
+    sys.stderr.write ((_("pybformat: error: %s\n") % text).encode (charset))
     if exit:
         sys.exit (1)
     return
 
 def warning (text, exit = 0):
-    sys.stderr.write (_("pybformat: warning: %s\n") % text)
+    sys.stderr.write ((_("pybformat: warning: %s\n") % text).encode (charset))
     if exit:
         sys.exit (1)
     return
@@ -73,21 +87,21 @@
         try:
             outfile = open (value, 'w')
         except IOError, err:
-            error ("can't open `%s': %s" % (value, err))
+            error (_("can't open `%s': %s") % (value, str (err).decode (charset)))
         continue
 
     if opt == '-l' or opt == '--list':
         try:
             list = Autoload.available (value)
         except KeyError:
-            error ("unknown list `%s'" % value)
+            error (_("unknown list `%s'") % value)
             
         if list:
-            print "pybformat: available values for `%s':" % value
+            print (_("pybformat: available values for `%s':") % value).encode (charset)
             print "  " + string.join (list, ", ")
             sys.exit (0)
         else:
-            warning ("empty value list `%s'" % value)
+            warning (_("empty value list `%s'") % value)
             sys.exit (0)
             
     if opt == '-h' or opt == '--help':
@@ -115,14 +129,14 @@
 if len (args) < 1:
     # user gave wrong arguments...
     usage ()
-    error ("too few arguments")
+    error (_("too few arguments"))
 
 files  = args
 
 # get the specified style and the output
 output = Autoload.get_by_name ('output', format)
 if output is None:
-    error ("unknown output format `%s'" % format)
+    error (_("unknown output format `%s'") % format)
 
 url = None
 style = os.path.splitext (style) [0]
@@ -138,8 +152,7 @@
     error (_("can't find style `%s'") % style)
 
 
-sys.stderr.write ("pybformat: using style `%s', format `%s'\n" \
-                  % (style, output.name))
+sys.stderr.write ((_("pybformat: using style `%s', format `%s'\n") % (style, output.name)).encode (charset))
 
 formatter = output.data
 
@@ -154,7 +167,7 @@
                 outfile.write (line)
         h.close ()
     except IOError, err:
-        error ("can't open header `%s': %s" % (header, err))
+        error (_("can't open header `%s': %s") % (header, str (err).decode (charset)))
 
 # write the data
 for file in files:
@@ -162,7 +175,7 @@
     try:
         db = bibopen (file)
     except IOError, err:
-        error ("can't open database: %s" % file)
+        error (_("can't open database: %s") % file)
 
     Utils.generate (url, formatter, db, db.keys (), outfile)
     
@@ -177,7 +190,7 @@
                 outfile.write (line)
         h.close ()
     except IOError, err:
-        error ("can't open footer `%s': %s" % (header, err))
+        error (_("can't open footer `%s': %s") % (footer, str (err).decode (charset)))
 
         
 outfile.close ()
--- pybliographer-1.2.4/scripts/pybtex.py	2004-07-17 22:04:28.000000000 +0200
+++ pybliographer-1.2.4-patch/scripts/pybtex.py	2004-11-26 08:09:45.000000000 +0100
@@ -27,12 +27,15 @@
 from Pyblio import Base, Autoload, Fields
 from Pyblio.Style import Utils
 
+import locale
+charset = locale.getlocale () [1] or 'ascii'
+
 def usage ():
-    print _("usage: pybtex <latexfile> [bibtexfiles...]")
+    print _("usage: pybtex <latexfile> [bibtexfiles...]").encode (charset)
     return
 
 def error (message):
-    sys.stderr.write (_("pybtex: error: %s\n") % message)
+    sys.stderr.write ((_("pybtex: error: %s\n") % message).encode (charset))
     sys.exit (1)
     return
 
@@ -53,7 +56,7 @@
 
 if missing:
     # warn the user that some entries were not found
-    print _("pybtex: warning: the following keys were not resolved")
+    print _("pybtex: warning: the following keys were not resolved").encode (charset)
     print '	' + string.join (missing, '\n	') + '\n'
 
 if style is None:
--- pybliographer-1.2.4/scripts/pybtext.py	2004-07-17 22:04:41.000000000 +0200
+++ pybliographer-1.2.4-patch/scripts/pybtext.py	2004-11-26 08:09:45.000000000 +0100
@@ -34,17 +34,20 @@
 
 from Pyblio import pybtextvar
 
+import locale
+charset = locale.getlocale () [1] or 'ascii'
+
 def usage ():
-    print _("usage: pybtext [-o outputfile] [-s style] <textfile> <bibfiles...>")
+    print _("usage: pybtext [-o outputfile] [-s style] <textfile> <bibfiles...>").encode (charset)
     return
 
 def error (msg):
-    sys.stderr.write (_("pybtext: error: %s\n") % msg)
+    sys.stderr.write ((_("pybtext: error: %s\n") % msg).encode (charset))
     sys.exit (1)
     return
 
 def warning (msg, exit = 0):
-    sys.stderr.write (_("pybtext: warning: %s\n") % msg)
+    sys.stderr.write ((_("pybtext: warning: %s\n") % msg).encode (charset))
     if exit:
         sys.exit (1)
     return
@@ -111,17 +114,17 @@
 output = Autoload.get_by_name ('output', format)
 
 if output is None:
-    error ("unknown output format `%s'" % format)
+    error (_("unknown output format `%s'") % format)
 
 
 
 reffile = outfile + '.ref'
 
 if os.path.exists(outfile):
-    error ("File already exists: `%s'" % outfile)
+    error (_("File already exists: `%s'") % outfile)
 
 if os.path.exists(reffile):
-    error ("The file `%s' to be used for creating the reference list already exists." % reffile)
+    error (_("A file with the same name already exists: `%s'") % reffile)
 
 textfile = args [0]
 bibfile = args [1:]
@@ -137,7 +140,7 @@
     try:
         txt = open (textfile, 'r')
     except IOError, err:
-        error ('%s: %s' % (textfile, err))
+        error ("`%s': %s" % (textfile, str (err).decode (charset)))
     
     citations = []
 
@@ -187,8 +190,7 @@
 order = copy.copy (entries)
 
 
-sys.stderr.write ("pybtext: using style `%s', format `%s'\n" \
-                  % (style, output.name))
+sys.stderr.write ((_("pybtext: using style `%s', format `%s'\n") % (style, output.name)).encode (charset))
 
 formatter = output.data
 
@@ -247,7 +249,7 @@
 try:
     refs = open (reffile, 'w')
 except IOError, err:
-    error ("can't open `%s': %s" % (reffile, err))
+    error (_("can't open `%s': %s") % (reffile, str (err).decode (charset)))
 
 refs.write ("\n\nReferences:\n")
 
@@ -268,12 +270,12 @@
     try:
         txt = open (textfile, 'r')
     except IOError, err:
-        error ('%s: %s' % (textfile, err))
+        error ("`%s': %s" % (textfile, str (err).decode (charset)))
 
     try:
         dest = open (outfile, 'a')
     except IOError, err:
-        error ("can't open `%s': %s" % (outfile, err))
+        error (_("can't open `%s': %s") % (outfile, str (err).decode (charset)))
 
     citations = []
     
@@ -311,19 +313,19 @@
     try:
         copyfile (textfile, outfile)
     except:
-        error ("can't create `%s'" % outfile)
+        error (_("can't create `%s'") % outfile)
 
     try:
         dest = open (outfile, 'a')
     except IOError, err:
-        error ("can't open `%s': %s" % (outfile, err))
+        error (_("can't open `%s': %s") % (outfile, str (err).decode (charset)))
 
 
 # appending the reference list
 try:
     refs = open (reffile, 'r')
 except IOError, err:
-    error ('%s: %s' % (reffile, err))
+    error ("`%s': %s" % (reffile, str (err).decode (charset)))
 
 while 1:
     line = refs.readline ()
@@ -337,6 +339,6 @@
 try:
     os.remove (reffile)
 except:
-    warning ("can't remove `%s'" % reffile)
+    warning (_("can't remove `%s'") % reffile)
 
-print "Done"
+print _("Done").encode (charset)


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-1/pybliographer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pybliographer.spec	8 Nov 2004 05:14:14 -0000	1.1
+++ pybliographer.spec	20 Mar 2005 23:33:52 -0000	1.2
@@ -1,19 +1,17 @@
 Summary: A framework for working with bibliographic databases.
 Name: pybliographer
 Version: 1.2.4
-Release: 0.fdr.1.1
+Release: 0.fdr.4.1
 Epoch: 0
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.4.tar.gz
+Patch: pyblio.patch
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-PreReq: scrollkeeper >= 0:0.1.4
 
-BuildRequires: python >= 0:2.2
-BuildRequires: pygtk2 >= 0:2.0.0
 BuildRequires: pygtk2-libglade >= 0:2.0.0
 BuildRequires: gnome-python2 >= 0:2.0.0
 BuildRequires: gnome-python2-gconf >= 0:2.0.0
@@ -23,14 +21,12 @@
 BuildRequires: desktop-file-utils
 BuildRequires: intltool
 
-Requires: python >= 0:2.2
-Requires: pygtk2 >= 0:2.0.0
 Requires: pygtk2-libglade >= 0:2.0.0
 Requires: gnome-python2 >= 0:2.0.0
 Requires: gnome-python2-gconf >= 0:2.0.0
 Requires: python-bibtex >= 0:1.1.93.1
-Requires: recode >= 0:3.6-11
-
+Requires(post): scrollkeeper >= 0:0.1.4
+Requires(postun): scrollkeeper >= 0:0.1.4
 
 %description
 Pybliographer is a tool for managing bibliographic databases. It can be 
@@ -47,10 +43,11 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -63,6 +60,10 @@
 
 %__rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 
+# Compile .pyc and .pyo
+%{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT%{_datadir}/pybliographer', ddir='%{_datadir}/pybliographer', force=1)"
+%{__python} -O -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT%{_datadir}/pybliographer', ddir='%{_datadir}/pybliographer', force=1)"
+
 
 %{find_lang} %{name}
 
@@ -78,7 +79,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING* ChangeLog* INSTALL NEWS README TODO
+%doc AUTHORS COPYING* ChangeLog* NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/fedora-pybliographic.desktop
 %{_datadir}/gnome/help/pybliographer
@@ -86,20 +87,74 @@
 %{_datadir}/omf/pybliographer
 %{_datadir}/pixmaps/*
 %dir %{_datadir}/pybliographer
-%{_datadir}/pybliographer/Pyblio
+%dir %{_datadir}/pybliographer/Pyblio
+%dir %{_datadir}/pybliographer/Pyblio/ConfDir
+%{_datadir}/pybliographer/Pyblio/ConfDir/*.py
+%{_datadir}/pybliographer/Pyblio/ConfDir/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/ConfDir/*.pyo
+%dir %{_datadir}/pybliographer/Pyblio/Format
+%{_datadir}/pybliographer/Pyblio/Format/*.py
+%{_datadir}/pybliographer/Pyblio/Format/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/Format/*.pyo
+%dir %{_datadir}/pybliographer/Pyblio/GnomeUI
+%{_datadir}/pybliographer/Pyblio/GnomeUI/*.py
+%{_datadir}/pybliographer/Pyblio/GnomeUI/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/GnomeUI/*.pyo
+%dir %{_datadir}/pybliographer/Pyblio/Output
+%{_datadir}/pybliographer/Pyblio/Output/*.py
+%{_datadir}/pybliographer/Pyblio/Output/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/Output/*.pyo
+%dir %{_datadir}/pybliographer/Pyblio/Style
+%{_datadir}/pybliographer/Pyblio/Style/*.py
+%{_datadir}/pybliographer/Pyblio/Style/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/Style/*.pyo
+%{_datadir}/pybliographer/Pyblio/*.py
+%{_datadir}/pybliographer/Pyblio/*.pyc
+%ghost %{_datadir}/pybliographer/Pyblio/*.pyo
 %{_datadir}/pybliographer/Styles
 %{_datadir}/pybliographer/glade
-%{_datadir}/pybliographer/pybcheck.py
-%{_datadir}/pybliographer/pybcompact.py
-%{_datadir}/pybliographer/pybconvert.py
-%{_datadir}/pybliographer/pybformat.py
-%{_datadir}/pybliographer/pybliographic.py
-%{_datadir}/pybliographer/pybtex.py
-%{_datadir}/pybliographer/pybtext.py
+%attr(644,root,root) %{_datadir}/pybliographer/pybcheck.py
+%attr(644,root,root) %{_datadir}/pybliographer/pybcompact.py
+%attr(644,root,root) %{_datadir}/pybliographer/pybconvert.py
+%attr(644,root,root) %{_datadir}/pybliographer/pybformat.py
+%attr(644,root,root) %{_datadir}/pybliographer/pybliographic.py
+%attr(644,root,root) %{_datadir}/pybliographer/pybtex.py
+%attr(644,root,root) %{_datadir}/pybliographer/pybtext.py
+%ghost %{_datadir}/pybliographer/pybcheck.pyc
+%ghost %{_datadir}/pybliographer/pybcompact.pyc
+%ghost %{_datadir}/pybliographer/pybconvert.pyc
+%ghost %{_datadir}/pybliographer/pybformat.pyc
+%ghost %{_datadir}/pybliographer/pybliographic.pyc
+%ghost %{_datadir}/pybliographer/pybtex.pyc
+%ghost %{_datadir}/pybliographer/pybtext.pyc
+%ghost %{_datadir}/pybliographer/pybcheck.pyo
+%ghost %{_datadir}/pybliographer/pybcompact.pyo
+%ghost %{_datadir}/pybliographer/pybconvert.pyo
+%ghost %{_datadir}/pybliographer/pybformat.pyo
+%ghost %{_datadir}/pybliographer/pybliographic.pyo
+%ghost %{_datadir}/pybliographer/pybtex.pyo
+%ghost %{_datadir}/pybliographer/pybtext.pyo
 %config %{_datadir}/pybliographer/pybrc.py
 %ghost %{_datadir}/pybliographer/pybrc.pyc
+%ghost %{_datadir}/pybliographer/pybrc.pyo
+
 
 %changelog
+* Fri Mar 11 2005 Zoltan Kota <z.kota at gmx.net> - 0:1.2.4-0.fdr.4
+- fixed file ownerships
+
+* Mon Nov 29 2004 Zoltan Kota <z.kota at gmx.net> - 0:1.2.4-0.fdr.3
+- removed redundant dependencies
+- fixed directories in file list
+
+* Fri Nov 26 2004 Zoltan Kota <z.kota at gmx.net> - 0:1.2.4-0.fdr.2
+- added a patch to fix bugs and add some new features
+  (generated from pyblio arch: 
+  patch-139,141-143,150,154,155,161,163,164,167)
+- (re)compile pyc and pyo files. pyo and redundant pyc
+  files are ghosted
+- fix permission of scripts
+
 * Mon Jul 19 2004 Zoltan Kota <z.kota at gmx.net> - 0:1.2.4-0.fdr.1
 - update to 1.2.4
 - using macros for rm and localstatedir



From fedora-extras-commits at redhat.com  Sun Mar 20 23:37:29 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Sun, 20 Mar 2005 18:37:29 -0500
Subject: rpms/pybliographer import.log,1.4,1.5
Message-ID: <200503202337.j2KNbTOo022465@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22455

Modified Files:
	import.log 
Log Message:
auto-import pybliographer-1.2.6.2-0.fdr.1.2 on branch FC-2 from pybliographer-1.2.6.2-0.fdr.1.2.src.rpm
Update from fedora.us


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	20 Mar 2005 23:33:52 -0000	1.4
+++ import.log	20 Mar 2005 23:37:27 -0000	1.5
@@ -1,3 +1,4 @@
 pybliographer-1_2_4-0_fdr_1_1:HEAD:pybliographer-1.2.4-0.fdr.1.1.src.rpm:1099890854
 pybliographer-1_2_4-0_fdr_1_2:HEAD:pybliographer-1.2.4-0.fdr.1.2.src.rpm:1099890860
 pybliographer-1_2_4-0_fdr_4_1:FC-1:pybliographer-1.2.4-0.fdr.4.1.src.rpm:1111361718
+pybliographer-1_2_6_2-0_fdr_1_2:FC-2:pybliographer-1.2.6.2-0.fdr.1.2.src.rpm:1111361934



From fedora-extras-commits at redhat.com  Sun Mar 20 23:37:29 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Sun, 20 Mar 2005 18:37:29 -0500
Subject: rpms/pybliographer/FC-2 .cvsignore, 1.3, 1.4 pybliographer.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200503202337.j2KNbTbj022470@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22455/FC-2

Modified Files:
	.cvsignore pybliographer.spec sources 
Log Message:
auto-import pybliographer-1.2.6.2-0.fdr.1.2 on branch FC-2 from pybliographer-1.2.6.2-0.fdr.1.2.src.rpm
Update from fedora.us


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-2/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2004 16:13:25 -0000	1.3
+++ .cvsignore	20 Mar 2005 23:37:27 -0000	1.4
@@ -1,2 +1 @@
-pybliographer-1.2.4.tar.gz
-pybliographer-1.2.5.tar.gz
+pybliographer-1.2.6.2.tar.gz


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-2/pybliographer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pybliographer.spec	1 Dec 2004 16:13:25 -0000	1.3
+++ pybliographer.spec	20 Mar 2005 23:37:27 -0000	1.4
@@ -1,11 +1,11 @@
 Summary: A framework for working with bibliographic databases.
 Name: pybliographer
-Version: 1.2.5
-Release: 0.fdr.2.2
+Version: 1.2.6.2
+Release: 0.fdr.1.2
 Epoch: 0
 License: GPL
 Group: Applications/Publishing
-Source: http://dl.sf.net/pybliographer/pybliographer-1.2.5.tar.gz
+Source: http://dl.sf.net/pybliographer/pybliographer-1.2.6.2.tar.gz
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Tue Feb 22 2005 Zoltan Kota <z.kota at gmx.net> - 0:1.2.6.2-0.fdr.1
+- update to 1.2.6.2
+
 * Mon Nov 29 2004 Zoltan Kota <z.kota at gmx.net> - 0:1.2.5-0.fdr.2
 - removed redundant dependencies
 - fixed directories in file list


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-2/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2004 16:13:25 -0000	1.3
+++ sources	20 Mar 2005 23:37:27 -0000	1.4
@@ -1 +1 @@
-b909a988a5e25f23669b7f03a8ea739f  pybliographer-1.2.5.tar.gz
+4404f82be39f5db82da6fe26e3a8f1e5  pybliographer-1.2.6.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 21 00:04:46 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:04:46 -0500
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec,1.1,1.2
Message-ID: <200503210004.j2L04k18024275@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24263

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
remove stuff



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk-xfce-engine.spec	19 Mar 2005 17:45:11 -0000	1.1
+++ gtk-xfce-engine.spec	21 Mar 2005 00:04:44 -0000	1.2
@@ -7,10 +7,7 @@
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/gtk-xfce-engine-2.2.6.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: gtk2 >= 2.0.0
-Requires: glib2 >= 2.0.0
 BuildRequires: gtk2-devel >= 2.0.0
-BuildRequires: glib2-devel >= 2.0.0
 
 %description
 Port of Xfce engine to GTK+-2.0.



From fedora-extras-commits at redhat.com  Mon Mar 21 00:05:05 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:05:05 -0500
Subject: rpms/gtk-xfce-engine/FC-3 gtk-xfce-engine.spec,1.1,1.2
Message-ID: <200503210005.j2L055Sq024326@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/gtk-xfce-engine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24312

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
remove stuff



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/FC-3/gtk-xfce-engine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk-xfce-engine.spec	19 Mar 2005 17:45:11 -0000	1.1
+++ gtk-xfce-engine.spec	21 Mar 2005 00:05:03 -0000	1.2
@@ -7,10 +7,7 @@
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/gtk-xfce-engine-2.2.6.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: gtk2 >= 2.0.0
-Requires: glib2 >= 2.0.0
 BuildRequires: gtk2-devel >= 2.0.0
-BuildRequires: glib2-devel >= 2.0.0
 
 %description
 Port of Xfce engine to GTK+-2.0.



From fedora-extras-commits at redhat.com  Mon Mar 21 00:26:19 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:26:19 -0500
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec,1.2,1.3
Message-ID: <200503210026.j2L0QJFI024659@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24646

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
more stuff



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-xfce-engine.spec	21 Mar 2005 00:04:44 -0000	1.2
+++ gtk-xfce-engine.spec	21 Mar 2005 00:26:17 -0000	1.3
@@ -23,7 +23,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Mon Mar 21 00:27:03 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:27:03 -0500
Subject: rpms/gtk-xfce-engine/FC-3 gtk-xfce-engine.spec,1.2,1.3
Message-ID: <200503210027.j2L0R3ZS024703@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/gtk-xfce-engine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24683

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
prep for FC3 build



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/FC-3/gtk-xfce-engine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-xfce-engine.spec	21 Mar 2005 00:05:03 -0000	1.2
+++ gtk-xfce-engine.spec	21 Mar 2005 00:27:00 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
 Version: 2.2.6
-Release: 1
+Release: 1.FC3
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/gtk-xfce-engine-2.2.6.tar.bz2
@@ -23,7 +23,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Mon Mar 21 00:27:37 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:27:37 -0500
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec,1.3,1.4
Message-ID: <200503210027.j2L0RbMX024759@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24743

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
prep for FC4 build



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk-xfce-engine.spec	21 Mar 2005 00:26:17 -0000	1.3
+++ gtk-xfce-engine.spec	21 Mar 2005 00:27:35 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
 Version: 2.2.6
-Release: 1
+Release: 1.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/gtk-xfce-engine-2.2.6.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 21 00:46:03 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:46:03 -0500
Subject: rpms/xfcalendar/devel xfcalendar.spec,1.1,1.2
Message-ID: <200503210046.j2L0k3cV025066@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfcalendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25051

Modified Files:
	xfcalendar.spec 
Log Message:
fix BuildRequires and prep for FC4 build



Index: xfcalendar.spec
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/devel/xfcalendar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfcalendar.spec	19 Mar 2005 17:54:24 -0000	1.1
+++ xfcalendar.spec	21 Mar 2005 00:46:01 -0000	1.2
@@ -1,13 +1,17 @@
 Summary: Time-managing application for Xfce4
 Name: xfcalendar
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfcalendar-4.2.1.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xfce-mcs-manager-devel
+BuildRequires: libxfce4util-devel
+BuildRequires: libxfcegui4-devel
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 Time-managing application for Xfce4
@@ -22,7 +26,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -41,6 +45,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildRequires
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 00:46:43 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:46:43 -0500
Subject: rpms/xfcalendar/FC-3 xfcalendar.spec,1.1,1.2
Message-ID: <200503210046.j2L0khfc025109@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfcalendar/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25095

Modified Files:
	xfcalendar.spec 
Log Message:
fix BuildRequires and prep for FC4 build



Index: xfcalendar.spec
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/FC-3/xfcalendar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfcalendar.spec	19 Mar 2005 17:54:24 -0000	1.1
+++ xfcalendar.spec	21 Mar 2005 00:46:41 -0000	1.2
@@ -1,13 +1,17 @@
 Summary: Time-managing application for Xfce4
 Name: xfcalendar
 Version: 4.2.1
-Release: 1
+Release: 2.FC3
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfcalendar-4.2.1.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xfce-mcs-manager-devel
+BuildRequires: libxfce4util-devel
+BuildRequires: libxfcegui4-devel
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 Time-managing application for Xfce4
@@ -22,7 +26,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -41,6 +45,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildRequires
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 00:54:11 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:54:11 -0500
Subject: rpms/xfce4-appfinder/devel xfce4-appfinder.spec,1.1,1.2
Message-ID: <200503210054.j2L0sBGw025287@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25266

Modified Files:
	xfce4-appfinder.spec 
Log Message:
fix BuildReqs and prep for FC4 build



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-appfinder.spec	19 Mar 2005 17:58:45 -0000	1.1
+++ xfce4-appfinder.spec	21 Mar 2005 00:54:09 -0000	1.2
@@ -1,14 +1,16 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-appfinder-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libxfcegui4 >= 4.2.0
-BuildRequires: libxfcegui4-devel >= 4.2.0
+Requires: libxfcegui4 >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 xfce-appfinder shows system wide installed applications
@@ -23,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -38,6 +40,9 @@
 %{_datadir}/xfce4/doc/C/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 - Fixed %files section to not list lang files twice



From fedora-extras-commits at redhat.com  Mon Mar 21 00:54:41 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 19:54:41 -0500
Subject: rpms/xfce4-appfinder/FC-3 xfce4-appfinder.spec,1.1,1.2
Message-ID: <200503210054.j2L0sfJl025328@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-appfinder/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25315

Modified Files:
	xfce4-appfinder.spec 
Log Message:
fix buildreqs and prep for FC3 build



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/FC-3/xfce4-appfinder.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-appfinder.spec	19 Mar 2005 17:58:45 -0000	1.1
+++ xfce4-appfinder.spec	21 Mar 2005 00:54:39 -0000	1.2
@@ -1,14 +1,16 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
 Version: 4.2.1
-Release: 1
+Release: 2.FC3
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-appfinder-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libxfcegui4 >= 4.2.0
-BuildRequires: libxfcegui4-devel >= 4.2.0
+Requires: libxfcegui4 >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 xfce-appfinder shows system wide installed applications
@@ -23,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -38,6 +40,9 @@
 %{_datadir}/xfce4/doc/C/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 - Fixed %files section to not list lang files twice



From fedora-extras-commits at redhat.com  Mon Mar 21 01:00:27 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:00:27 -0500
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.1,1.2
Message-ID: <200503210100.j2L10RKF025476@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25462

Modified Files:
	xfce4-icon-theme.spec 
Log Message:
noarch and prep for FC4 build



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-icon-theme.spec	19 Mar 2005 18:03:40 -0000	1.1
+++ xfce4-icon-theme.spec	21 Mar 2005 01:00:25 -0000	1.2
@@ -1,12 +1,13 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-icon-theme-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 %description
 Icon theme for Xfce 4 Desktop Environment.
@@ -22,7 +23,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -33,6 +34,9 @@
 %{_datadir}/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- noarch
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:00:55 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:00:55 -0500
Subject: rpms/xfce4-icon-theme/FC-3 xfce4-icon-theme.spec,1.1,1.2
Message-ID: <200503210100.j2L10tAk025517@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-icon-theme/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25503

Modified Files:
	xfce4-icon-theme.spec 
Log Message:
noarch and prep for FC3 build



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/FC-3/xfce4-icon-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-icon-theme.spec	19 Mar 2005 18:03:40 -0000	1.1
+++ xfce4-icon-theme.spec	21 Mar 2005 01:00:53 -0000	1.2
@@ -1,12 +1,13 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.2.1
-Release: 1
+Release: 2.FC3
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-icon-theme-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 %description
 Icon theme for Xfce 4 Desktop Environment.
@@ -22,7 +23,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -33,6 +34,9 @@
 %{_datadir}/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- noarch
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:12:42 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:12:42 -0500
Subject: rpms/xcin/devel - New directory
Message-ID: <200503210112.j2L1Cgpb026581@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26562/xcin/devel

Log Message:
Directory /cvs/extras/rpms/xcin/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 21 01:12:42 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:12:42 -0500
Subject: rpms/xcin - New directory
Message-ID: <200503210112.j2L1CgON026578@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26562/xcin

Log Message:
Directory /cvs/extras/rpms/xcin added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 21 01:12:51 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:12:51 -0500
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec,1.1,1.2
Message-ID: <200503210112.j2L1Cp2P026629@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26570

Modified Files:
	xfce4-mixer.spec 
Log Message:
fix BuildReqs and prep for FC4 build



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-mixer.spec	19 Mar 2005 18:06:05 -0000	1.1
+++ xfce4-mixer.spec	21 Mar 2005 01:12:49 -0000	1.2
@@ -1,14 +1,21 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-mixer-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfce4-panel >= 4.2.1
-BuildRequires: xfce4-panel >= 4.2.1
+BuildRequires: xfce4-panel-devel >= 4.2.1
+BuildRequires: libxfce4util-devel >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: libxfce4mcs-devel >= 4.2.1
+BuildRequires: xfce-mcs-manager-devel >= 4.2.1
+BuildRequires: libxml2 >= 2.4.0
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 Volume control plugin for the Xfce 4 panel
@@ -23,7 +30,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -38,6 +45,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-mixer.png
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:13:06 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:13:06 -0500
Subject: rpms/xcin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503210113.j2L1D66h026668@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26659

Added Files:
	Makefile import.log 
Log Message:
Setup of module xcin


--- NEW FILE Makefile ---
# Top level Makefile for module xcin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 21 01:13:06 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:13:06 -0500
Subject: rpms/xcin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503210113.j2L1D6JJ026671@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26659/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xcin


--- 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 Mar 21 01:14:30 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:14:30 -0500
Subject: rpms/xfce4-mixer/FC-3 xfce4-mixer.spec,1.1,1.2
Message-ID: <200503210114.j2L1EUd5026821@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-mixer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26807

Modified Files:
	xfce4-mixer.spec 
Log Message:
fix BuildReqs and prep for FC3 build



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/FC-3/xfce4-mixer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-mixer.spec	19 Mar 2005 18:06:05 -0000	1.1
+++ xfce4-mixer.spec	21 Mar 2005 01:14:28 -0000	1.2
@@ -1,14 +1,21 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
 Version: 4.2.1
-Release: 1
+Release: 2.FC3
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-mixer-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfce4-panel >= 4.2.1
-BuildRequires: xfce4-panel >= 4.2.1
+BuildRequires: xfce4-panel-devel >= 4.2.1
+BuildRequires: libxfce4util-devel >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: libxfce4mcs-devel >= 4.2.1
+BuildRequires: xfce-mcs-manager-devel >= 4.2.1
+BuildRequires: libxml2 >= 2.4.0
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 Volume control plugin for the Xfce 4 panel
@@ -23,7 +30,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -38,6 +45,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-mixer.png
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:15:09 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:15:09 -0500
Subject: rpms/xcin import.log,1.1,1.2
Message-ID: <200503210115.j2L1F969026887@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26876

Modified Files:
	import.log 
Log Message:
auto-import xcin-2.5.3.pre3-24 on branch devel from xcin-2.5.3.pre3-24.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xcin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Mar 2005 01:13:04 -0000	1.1
+++ import.log	21 Mar 2005 01:15:07 -0000	1.2
@@ -0,0 +1 @@
+xcin-2_5_3_pre3-24:HEAD:xcin-2.5.3.pre3-24.src.rpm:1111367680



From fedora-extras-commits at redhat.com  Mon Mar 21 01:15:09 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:15:09 -0500
Subject: rpms/xcin/devel xcin-2.5.3-mkuserdir.patch, NONE,
	1.1 xcin-2.5.3-no_rpath.patch, NONE, 1.1 xcin.spec, NONE,
	1.1 xcin.wrap, NONE, 1.1 xcin.xpm, NONE, 1.1 xcinrc.UTF-8,
	NONE, 1.1 xinput.d-xcin, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503210115.j2L1F9au026891@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26876/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xcin-2.5.3-mkuserdir.patch xcin-2.5.3-no_rpath.patch xcin.spec 
	xcin.wrap xcin.xpm xcinrc.UTF-8 xinput.d-xcin 
Log Message:
auto-import xcin-2.5.3.pre3-24 on branch devel from xcin-2.5.3.pre3-24.src.rpm

xcin-2.5.3-mkuserdir.patch:

--- NEW FILE xcin-2.5.3-mkuserdir.patch ---
--- xcin.orig/src/lib/xcintool/check_file.c	2001-09-21 03:00:57.000000000 +1000
+++ xcin/src/lib/xcintool/check_file.c	2004-01-28 16:21:56.000000000 +1000
@@ -155,8 +155,10 @@
 	snprintf(path, 1024, "%s/%s", xrc->usrhome, xrc->user_dir);
     else
 	strncpy(path, xrc->user_dir, 1024);
-    if (check_file_exist(path, FTYPE_DIR) == False)
-	xrc->user_dir = NULL;
-    else
-	xrc->user_dir = (char *)strdup(path);
+    if (check_file_exist(xrc->usrhome, FTYPE_DIR) == True)
+        if (check_file_exist(path, FTYPE_DIR) == False){
+	    mkdir(path, 0700);
+	    xrc->user_dir = (char *)strdup(path);
+        } else
+	    xrc->user_dir = (char *)strdup(path);
 }

xcin-2.5.3-no_rpath.patch:

--- NEW FILE xcin-2.5.3-no_rpath.patch ---
--- xcin/cin/big5/Makefile.in.no_rpath	2003-12-02 16:15:54.000000000 +0100
+++ xcin/cin/big5/Makefile.in	2003-12-02 16:18:08.000000000 +0100
@@ -2,8 +2,7 @@
 top_srcdir  = @top_srcdir@
 include $(top_srcdir)/Rules
 
-build = $(top_srcdir)/libtool --mode=execute $(cin2tab)
-
+build = $(top_srcdir)/libtool --mode=execute -dlopen $(top_srcdir)/src/lib/libxcin.la $(cin2tab) 
 .PHONY: install clean distclean
 
 all: all-$(OS_TYPE)
--- xcin/cin/gb/Makefile.in.no_rpath	2003-12-02 16:19:00.000000000 +0100
+++ xcin/cin/gb/Makefile.in	2003-12-02 16:19:01.000000000 +0100
@@ -2,7 +2,7 @@
 top_srcdir  = @top_srcdir@
 include $(top_srcdir)/Rules
 
-build = $(top_srcdir)/libtool --mode=execute $(cin2tab)
+build = $(top_srcdir)/libtool --mode=execute -dlopen $(top_srcdir)/src/lib/libxcin.la $(cin2tab)
 
 .PHONY: install clean distclean
 


--- NEW FILE xcin.spec ---
Summary: An X Input Method Server for Chinese.
Name: xcin
Version: 2.5.3.pre3
Release: 24
License: GPL
Group: User Interface/X
Source0: ftp://xcin.linux.org.tw/pub/xcin/xcin/%{name}-%{version}.tar.gz
Source2: xcin.xpm
Source3: xcin.wrap
Source4: xcinrc.UTF-8
Source5: xinput.d-%{name}
Patch0: xcin-2.5.3-mkuserdir.patch
Patch1:  xcin-2.5.3-no_rpath.patch
BuildRequires: libtabe >= 0.2.4a
Requires: libtabe >= 0.2.4a
Requires(post,preun): /usr/sbin/alternatives
BuildPrereq: db4-devel,libtabe-devel
Buildroot: %{_tmppath}/%{name}-buildroot

%description
An X Input Method Server for Chinese.

%prep

rm -rf $RPM_BUILD_ROOT

%setup -q -n %{name}
%patch0 -p1 -b .mkuserdir
%patch1 -p1 -b .no_rpath

find . -name CVS | xargs rm -rf

(cd po; \
OLD_PO_FILE_INPUT=yes msgmerge xcin-zh_TW.po xcin.pot > new.po; \
mv new.po xcin-zh_TW.po; \
)


%build
cp /usr/share/libtool/config.sub $RPM_BUILD_DIR/%{name}/script/
cp /usr/share/libtool/config.guess $RPM_BUILD_DIR/%{name}/script/
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \
	--prefix=/usr/X11R6 --libdir=/usr/X11R6/%{_lib} \
        --with-xcin-dir=/usr/X11R6/%{_lib}/X11/xcin \
	--with-xcin-rcdir=/etc/chinese/xcin \
	--with-localedir=/usr/share/locale \
	--with-extra-lib=/usr/%{_lib}

perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool

make
( cd po; msgfmt -o xcin.mo xcin-zh_TW.po )

%install

mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin
mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
mkdir -p $RPM_BUILD_ROOT/etc/chinese/xcin
mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin/tab
mkdir -p $RPM_BUILD_ROOT/usr/X11R6/man

export program_prefix=$RPM_BUILD_ROOT
export xcin_rcp=$RPM_BUILD_ROOT/etc/chinese/xcin
make -e install

mkdir -p $RPM_BUILD_ROOT/usr/share/icons/
mkdir -p $RPM_BUILD_ROOT/usr/share/gnome/apps/Utilities/
mkdir -p $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/

install -m 644 $RPM_SOURCE_DIR/xcin.xpm \
		$RPM_BUILD_ROOT/usr/share/icons/xcin.xpm
install -m 644 po/xcin.mo $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/xcin.mo
install -m 644 src/lib/.libs/libxcin.so.0.0.0 $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/
install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/chinese/xcin/xcinrc
install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}

# remove unpackaged files from the buildroot
rm -rf $RPM_BUILD_ROOT/usr/X11R6/man
rm -f $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/{libxcin.a,libxcin.la}
rm -rf $RPM_BUILD_ROOT/usr/X11R6/share

%post
/sbin/ldconfig
alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/zh_TW xinput-zh_TW %{_sysconfdir}/X11/xinit/xinput.d/%{name} 30

%preun
if [ "$1" = 0 ]; then
   alternatives --remove xinput-zh_TW %{_sysconfdir}/X11/xinit/xinput.d/%{name}
fi


%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc doc/* 
%dir %{_sysconfdir}/chinese
%dir %{_sysconfdir}/chinese/xcin
%config %{_sysconfdir}/chinese/xcin/xcinrc
/usr/X11R6/bin/*
/usr/X11R6/%{_lib}/X11/xcin/
/usr/X11R6/%{_lib}/*
/usr/share/icons/xcin.xpm
%lang(zh_TW) /usr/share/locale/zh_TW/LC_MESSAGES/xcin.mo
%{_sysconfdir}/X11/xinit/xinput.d

%clean 
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT

%changelog
* Thu Jul 01 2004 Leon Ho <llch at redhat.com>
- modify post script

* Wed Jun 30 2004 Leon Ho <llch at redhat.com>
- add xinput.d script
- require alternatives for %%post and %%preun
- install/uninstall xinput.d script as xinput-ja_JP alternative

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Mar 08 2004 Leon Ho <llch at redhat.com>
- update for fc1

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Jan 28 2004 Leon Ho <llch at redhat.com> 2.5.3.pre3-20
- fixed the libraries linking
- fixed the user defined database saved in the current directory

* Thu Jan 22 2004 Leon Ho <llch at redhat.com> 2.5.3.pre3-19
- uses the merged utf-8 patches
- overthespot patches from cvs

* Tue Dec  2 2003 Thomas Woerner <twoerner at redhat.com> 2.5.3.pre3-18
- removed rpath
- fixed libdir problem on 64 bit architectures

* Thu Oct 23 2003 Leon Ho <llch at redhat.com> 2.5.3.pre3-17
- fixes for utf-8

* Wed Sep 24 2003 Leon Ho <llch at redhat.com>
- rebuilt

* Fri Aug  8 2003 Elliot Lee <sopwith at redhat.com>
- Fix libtool

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Apr 30 2003 Elliot Lee <sopwith at redhat.com> 2.5.3.pre3-12
- Always cp config.guess/config.sub

* Tue Feb 04 2003 Florian La Roche <Florian.LaRoche at redhat.de>
- add symlink to shared lib

* Fri Jan 31 2003 Leon Ho <llch at redhat.com> 2.5.3.pre3-11
- rebuild

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Tue Dec 09 2002 Leon Ho <llch at redhat.com> 2.5.3.pre3-10
- fix for the cantonese input setting in config

* Thu Dec 05 2002 Leon Ho <llch at redhat.com> 2.5.3.pre3-9
- check pointers to prevent xcin crash when xcin terminate
- add memory leak patch from James Su
- add ez input method table
- toggle off BEEP_DUPCHAR for some modules.

* Wed Nov 27 2002 Tim Powers <timp at redhat.com> 2.5.3.pre3-8
- rebuild on all arches
- remove unpackaged files from the buildroot
- truly lib64'ize it

* Tue Sep 24 2002 Leon Ho <llch at redhat.com>
- use latest libtool's config.{sub,guess} if x86_64

* Mon Sep 02 2002 Leon Ho <llch at redhat.com>
- some interfaces fix for new desktops

* Tue Aug 06 2002 Leon Ho <llch at redhat.com>
- rebuild with various changes

* Thu Jul 25 2002 Tim Powers <timp at redhat.com>
- rebuild against new libtabe

* Mon Jul 22 2002 Leon Ho <llch at redhat.com>
- own /etc/chinese

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu Jun 13 2002 Leon Ho <llch at redhat.com>
- 2.5.3-pre3

* Mon May 28 2002 Leon Ho <llch at redhat.com>
- rebuild for new toolchains

* Tue Mar 26 2002 Nalin Dahyabhai <nalin at redhat.com>
- rebuild

* Mon Mar 25 2002 Leon Ho <llch at redhat.com>
- take out CVS internal files from doc dir

* Wed Feb 27 2002 Leon Ho <llch at redhat.com>
- rebuild with new tree

* Thu Jan 30 2002 Leon Ho <llch at redhat.com>
- db4
- rebuild with new tools

* Fri Dec 07 2001 Leon Ho <llch at redhat.com>
- update to 2.5.3.pre2 latest from cvs
- update xinitrc.LINUX

* Tue Nov 27 2001 Leon Ho <llch at redhat.com>
- build against 7.2-tcsc
- update to 2.5.3.pre2 

* Tue Oct 29 2001 Chung-Yen Chang <candyz at linux.org.tw>
- update to 2.5.3.pre1

* Thu Aug  2 2001 Yukihiro Nakai <ynakai at redhat.com>
- Remove wmconfig file. (#50110)

* Mon Jul 30 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add (noreplace) to %%config (#50110)

* Fri Jul 27 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add %%lang (#50110)
- Add %%config for xcin.wm (#50110)

* Tue Jul 17 2001 Yukihiro Nakai <ynakai at redhat.com>
- Delete .desktop (#48780)
- Add db2-devel to BuildPrereq. (#48918)

* Wed Jul 11 2001 Jonathan Blandford <jrb at redhat.com>
- moved .desktop file from 'Chinese' to 'Utilities'

* Sun Jul  8 2001 Tim Powers <timp at redhat.com>
- don't have sgid root dirs

* Mon Jun 18 2001 Yukihiro Nakai <ynakai at redhat.com>
- Rebuild against Red Hat 7.2
- Add ia64 support.

* Tue Dec 05 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- Rebuild for Red Hat 7.0
- Add BuildRequires Requires

* Mon Oct 30 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 2.5.2.1

* Mon Oct 16 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 2.5.2

* Tue Oct 10 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 2.5.2-pre6.diff1

* Sun Oct 08 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 2.5.2-pre6

* Mon Sep 04 2000 Chih-Wei Huang <cwhuang at linux.org.tw>
- fix missing icon in xcin.desktop and xcin.wm
- apply xcin-2.5.2.pre5.diff3

* Fri Aug 25 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 2.5.2-pre5

* Sun Apr 23 2000 Andrew Lee <andrew at cle.linux.org.tw>
- change xcin directory to /usr/X11R6/lib/X11/xcin/
- path fix

* Fri Apr 21 2000 Andrew Lee <andrew at cle.linux.org.tw>
- update 2.5.2-pre3
- set OverTheSpot enable default

* Tue Feb 29 2000 Chih-Wei Huang <cwhuang at linux.org.tw>
- update 2.5.2-pre2

* Fri Feb 18 2000 Andrew Lee <andrew at cle.linux.org.tw>
- update 2.5.2-pre1

* Thu Feb 10 2000 Chih-Wei Huang <cwhuang at linux.org.tw>
- remove kdelnk, modify xcin.desktop

* Tue Jan 25 2000 Andrew Lee <andrew at cle.linux.org.tw>
- add bimsphone module patch

* Mon Jan 24 2000 Andrew Lee <andrew at cle.linux.org.tw>
- update xcin-2.5-20000124
- add non-autoselect bimsphone 
- add phonegb2

* Thu Jan 6 2000 Andrew Lee <andrew at cle.linux.org.tw>
- rebuild for yami

* Mon Jan  3 2000 Andrew Lee <andrew at cle.linux.org.tw>
- update xcin-2.5-20000103

* Mon Dec 13 1999 Andrew Lee <andrew at cle.linux.org.tw>
- Patch a bug (gui.c)

* Mon Nov 29 1999 Andrew Lee <Andrew at nssh.tpc.edu.tw>
- update xcin-2.5-19991128

* Thu Nov 25 1999 Andrew Lee <Andrew at nssh.tpc.edu.tw>
- update xcin-2.5-19991109
- fix cin2tab rcfile bug

* Mon Nov 22 1999 Andrew Lee <Andrew at nssh.tpc.edu.tw>
- rebuild for mandrake
- patch cin/Makefile path

* Thu Aug 26 1999 Cheng Yuan-Cheng <platin at linux.org.tw>
- for xcin-2.5.1
- menu entry for GNOME and KDE were added...

* Sat Jun 19 1999 Cheng Yuan-Cheng <platin at cle.linux.org.tw>
- for xcin-2.5.0-pre3

* Sun May  2 1999 Cheng Yuan-Cheng <platin at cle.linux.org.tw>
- frist build xcin-2.5



--- NEW FILE xcin.wrap ---
#!/bin/sh

TESTPRELOAD=`echo $LD_PRELOAD | grep "xa+cv"`
[ -n "$TESTPRELOAD" ] && unset LD_PRELOAD

exec /usr/X11R6/lib/X11/xcin2.5/xcin $@


--- NEW FILE xcin.xpm ---
/* XPM */
static char* xcin = {
"59 29 3 2",
"__ c #ffffff",
"_` c #ff8aa6",
"_a c #4582b6",
"_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a", 
"_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a", 
"_a_______a_a_a_a_a_a_a___a_a_a_a_____a_a___a_a_a_______a_a_a_a_a_a_a_____a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_______a", 
"_a_______a_a_a___a_a_a_____a_a_a___a___a___a_a_a_______a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a_a_a_a_a_a_a___a_a_a___a", 
"_a_______a_a_a_____a_a___a___a_________a___a_a_a_a_____a_a_a_a_a_a_a___a_a_a_a_a_a___a_a___a___________a_a_____a_a___a", 
"_a_____a_a_________a_________a_____a___a___a_a_a_a_____a_a_a_a_a_a_a___a_a_a___a_a___a_a___a_a___a___a_a_a___a_a_a___a", 
"_a_____a_a_a_a___a___a___a_a_a_____a___a___a_a_a_a_____a_a_a_a_a_a_a___a_a_a___a_a___a_a_a_a_a___a___a_a___a_a_a_a___a", 
"_a_____a_a_a_a_a_a___a___a_a___________a___a___a_a_____a_a_a_a_a_a_a___a_a_a_a_a_a___a___a_a_a___a___a_a___a_a_a_a___a", 
"_a_____a_a_a_a_a_a___a___a_a___________a___a___a_a_____a_a_a_a_a_a_a___a_a_a_a_a_a___a___a_a_a___a___a_a___a_a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a_a_a_a_____a___a_______a_a_a___a_a_a_a_a_a_a___a_a_a_a___a___a___a_a_a___a___a___a_a_a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a___a_a_____a___a_a_a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a___a_____a_a_a_a_a_a___a", 
"_a___a_a_a_a_a_____________a_a___________a_a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a_____a___a_a___a___a_a_a_a___a_a___a", 
"_a___a_a_a_a_a_a_a___a_a___a___a___a_a_____a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_______________a_a___a_____a_a_____a_a___a", 
"_a___a_a_a_a_a_a_a___a_a___a___________a___a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a___________a_a___a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a___a___a___a___a___a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a___a___a_a_a_a_a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a___a___a___a___a___a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a___a___a_a_a_a_a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a___a___a___a___a___a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a___a___a_a___a_a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a___a___________a___a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a___a___a_a_a_a_a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a_______a___a___a_____a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a___a___a___a___a_a_a_a_a___a", 
"_a___a_a_a___________________a_a_a_a_a_a_____a_a_a_a___a_a_a_a_a_a_a___a_a___________________a___a_____a_a_a_a_a_a___a", 
"_a___a_a_a_a_a_a_a___a_a_a_a___________a_a___a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a___a_a___a", 
"_a___a_a_a_a_a_a_______a_a_a_a___a_a_a_a_a___a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_____a_a___a", 
"_a___a_a_a_a_a_a_______a_a_a_a___a_a_a_a_a___a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_____a_a___a", 
"_a_____a_a_a_a_a___a_a___a_a_a___a_a_a_a_a_a_a_a_a_____a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a_a_a___a_a_a___a_a_a___a", 
"_a_____a_a_a_a_a___a_a___a_a_________a_a_a___a_a_a_____a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a_a_a_a___a_a_a_a_a_a_a___a", 
"_a_____a_a_a_a_a_a_a_a_a___a_a_a_a___a_a_____a_a_a_____a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a___a_a___a_a___a_a_a_a___a", 
"_a_______a_a_a___a_a_a_a___a_a_a___a___a___a___a_a_____a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a___a_a___a___a_a_a_a_a___a", 
"_a_______a_a_a_a_a_a_a_a_a___a___a_a_____a_a___a_______a_a_a_a_a_a_a___a_a_a_a_a_a___a_a_a_a___a_a_a_____a_a_a_a_a___a", 
"_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`_`", 
} ;


--- NEW FILE xcinrc.UTF-8 ---
;
;  Xcin resource file for GNU/Linux
;
;  By T.H.Hsieh.
;

;
;  Directories.
;
(define XCIN_DEFAULT_DIR      "/usr/X11R6/lib/X11/xcin")
(define XCIN_USER_DIR         ".xcin")

;
;  This defines GUI attribute.
;
(define INDEX_FONT  		"-sony-*-16-*-iso8859-1")
(define FG_COLOR    		"white")
(define BG_COLOR    		"blue")
(define M_FG_COLOR  		"yellow")
(define M_BG_COLOR  		"darkred")
(define ULINE_COLOR		"cyan")
(define GRID_COLOR		"white")
(define X_GEOMETRY  		"45x2+200-1")
(define START_MAINWIN2		"YES")
(define MAINWIN2_GEOMETRY	"27x1+200-1")
(define XCIN_HIDE   		"NO")
(define XKILL_DISABLE		"NO")
(define ICCHECK_DISABLE		"NO")
(define SINGLE_IM_CONTEXT	"NO")
(define IM_FOCUS_ON		"NO")
(define KEEP_POSITION_ON	"NO")
(define DIFF_BEEP		"YES")
(define KEYBOARD_TRANSLATE	"NO")

(define LOCALE	'(zh_TW.Big5 zh_HK.Big5HKSCS zh_CN.GB2312 zh_CN.GBK zh_TW.UTF-8))

;
;  XIM Input Style Adjustments.
;
(define INPUT_STYLE		'(Root OverTheSpot OnTheSpot))
(define OVERSPOT_USE_USRCOLOR	"YES")
(define OVERSPOT_USE_USRFONTSET "YES")
(define OVERSPOT_WINDOW_ONLY	"YES")
(define ONSPOT_PREEDIT_MODE     "REVERSE")

;
;  Special Trigger Keys.
;
;(define FKEY_ZHEN		"ctrl space")
;(define FKEY_2BSB		"shift space")
;(define FKEY_CIRIM		"ctrl shift")
;(define FKEY_CIRRIM		"shift ctrl")
;(define FKEY_CHREP		"ctrl alt r")
;(define FKEY_SIMD		"ctrl alt i")
;(define FKEY_IMFOCUS		"ctrl alt f")
;(define FKEY_IMN		"ctrl alt")
;(define FKEY_QPHRASE		"shift alt")

;
;  IM module default resources.
;
(define gen_inp_default
        '((AUTO_COMPOSE         YES)
          (AUTO_UPCHAR          YES)
          (AUTO_FULLUP          NO)
          (SPACE_AUTOUP         NO)
          (SELKEY_SHIFT         NO)
          (SPACE_IGNORE         NO)
          (SPACE_RESET          YES)
          (AUTO_RESET           NO)
          (WILD_ENABLE          YES)
          (SINMD_IN_LINE1       NO)
          (END_KEY              NO)
          (QPHRASE_MODE         0)      ; 1:shift, 2:ctrl, 4:alt, 8:fallback
          (DISABLE_SEL_LIST     "NONE")
	  (KEYSTROKE_REMAP	"NONE")
          (BEEP_WRONG           YES)
          (BEEP_DUPCHAR         NO)
          (TSI_FNAME            "tsi.db")
	  (HINT_SELECT		NO)
	  (HINT_TSI		NO)))

(define bimsphone_default
        '((N_SELECTION_KEY      9)
          (SELECTION_KEYS       0)      ; 0: "1234567890", 1: "asdfgjkl;"
          (PAGE_KEYS            5)      ; 1:<> 2:,. 4:(Rt)(Lt)
          (QPHRASE_MODE         1)      ; 1:shift, 2:ctrl, 4:alt, 8:fallback
        ;
        ; This is only valid for "bimsphone*" IM name.
          (AUTO_SELECTION       YES)
          (KEYMAP               0)      ; 0:zozy, 1:et, 2:et26, 3:hsu
        ;
        ; This is only valid for "bimspinyin*" IM name.
          (PINPHO_MAP           "bims_pinyin")
        ;
        ; The following has effect only when AUTO_SELECTION is YES
          (TSI_FNAME            "tsi.db")
          (YIN_FNAME            "yin.db")
	  (TSI_USERDEF_FNAME	"utsi.db")
	  (YIN_USERDEF_FNAME	"uyin.db")
          (SPACE_SELECTION      NO)
          (PHRASE_SELECTION     YES)
          (N_SELECTION_PHR      4)
        ;
        ; The following has effect only when AUTO_SELECTION is NO
          (AUTO_UPCHAR          YES)))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;
;  This is the global configuration of the zh_TW.UTF-8 locale
;
(define zh_TW.UTF-8
  '((DEFAULT_IM         "cj5")
    (DEFAULT_IM_MODULE  "gen_inp")
    (DEFAULT_IM_SINMD   "DEFAULT")
    (PHRASE             "default.phr")
    (CINPUT             (cj5 simplex5 phone jyutping bimspinyin bimsphone
                         array30 jyutping0 zh_hex))
    (FONTSET            "-*-medium-*-24-*,*")
    (OVERSPOT_FONTSET   "-*-medium-*-16-*,*")))

(define cj5 at utf-8
        '((SETKEY               1)))

(define simplex5 at utf-8
        '((SETKEY               2)))

(define phone at utf-8
        '((SETKEY               3)
          (END_KEY              YES)
          (BEEP_DUPCHAR         YES)))

(define jyutping at utf-8
        '((SETKEY               4)
          (END_KEY              YES)
          (BEEP_DUPCHAR         YES)))

(define bimsphone at utf-8
        '((SETKEY               6)
          (MODULE               "bimsphone")))

(define bimspinyin at utf-8
        '((SETKEY               7)
          (MODULE               "bimsphone")))

(define array30 at utf-8
        '((SETKEY               8)
          (BEEP_DUPCHAR         YES)
          (DISABLE_SEL_LIST     "w")
          (KEYSTROKE_REMAP      "t:0xaaba;T:0xaaba;")))

(define jyutping0 at utf-8
        '((SETKEY               9)
          (BEEP_DUPCHAR         YES)))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;
;  This is the global configuration of the zh_TW.Big5 locale 
;
(define zh_TW.Big5 
  '((DEFAULT_IM		"cj")
    (DEFAULT_IM_MODULE	"gen_inp")
    (DEFAULT_IM_SINMD	"DEFAULT")
    (PHRASE		"default.phr")
    (CINPUT		(cj simplex phone bimspinyin bimsphone jyutping
			 array30 jyutping0 zh_hex))
    (FONTSET		"-sony-*-24-*-iso8859-1,-*-medium-r-*-24-*-big5-0")
    (OVERSPOT_FONTSET	"-sony-*-16-*-iso8859-1,-*-medium-r-*-16-*-big5-0")))
;
;  Here are detailed configuration of each IM (for zh_TW.Big5 locale).
;
(define cj at big5
	'((SETKEY		1)))

(define simplex at big5
	'((SETKEY		2)))

(define phone at big5
	'((SETKEY		3)
	  (END_KEY		YES)))

(define jyutping at big5
	'((SETKEY		4)
	  (END_KEY		YES)))

(define bimsphone at big5
	'((SETKEY		6)
	  (MODULE		"bimsphone")))

(define bimspinyin at big5
	'((SETKEY		7)
	  (MODULE		"bimsphone")))

(define array30 at big5
	'((SETKEY		8)
	  (DISABLE_SEL_LIST	"w")
	  (KEYSTROKE_REMAP	"t:0xaaba;T:0xaaba;")))

(define jyutping0 at big5
	'((SETKEY		9)))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;
;  This is the global configuration of the zh_CN.GB2312 locale 
;
(define zh_CN.GB2312
  '((DEFAULT_IM		"pinyin")
    (DEFAULT_IM_MODULE	"gen_inp")
    (DEFAULT_IM_SINMD	"DEFAULT")
    (PHRASE		"default.phr")
    (CINPUT		(pinyin shuangpin jtcj_gb wubizixing phonegb2
			 zh_hex))
    (FONTSET		"-sony-*-24-*-iso8859-1,-*-medium-r-*-24-*-gb2312.1980-0")
    (OVERSPOT_FONTSET	"-sony-*-16-*-iso8859-1,-*-medium-r-*-16-*-gb2312.1980-0")))
;
;  Here are detailed configuration of each IM (for zh_CN.GB2312 locale).
;
(define pinyin at gb2312
	'((SETKEY		1)))

(define shuangpin at gb2312
	'((SETKEY		2)))

(define jtcj_gb at gb2312
	'((SETKEY		3)))

(define phonegb2 at gb2312
	'((SETKEY		4)
	  (END_KEY		YES)))

(define wubizixing at gb2312
	'((SETKEY		5)))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;
;  This is the global configuration of the zh_HK.Big5HKSCS locale 
;
(define zh_HK.Big5HKSCS
  '((DEFAULT_IM		"cj")
    (DEFAULT_IM_MODULE	"gen_inp")
    (DEFAULT_IM_SINMD	"DEFAULT")
    (PHRASE		"default.phr")
    (CINPUT             (cj simplex phone bimspinyin bimsphone jyutping
			 array30 jyutping0 zh_hex))
    (FONTSET		"-sony-*-24-*-iso8859-1,-*-medium-r-*-24-*-big5-0,-*-24-*-c-*-big5hkscs-0")
    (OVERSPOT_FONTSET	"-sony-*-16-*-iso8859-1,-*-medium-r-*-16-*-big5-0,-*-16-*-c-*-big5hkscs-0")))
;
;  Here are detailed configuration of each IM (for zh_HK.Big5HKSCS locale).
;
(define cj at big5hkscs
	'((SETKEY		1)))

(define simplex at big5hkscs
	'((SETKEY		2)))

(define phone at big5hkscs
	'((SETKEY		3)
	  (END_KEY		YES)))

(define jyutping at big5hkscs
	'((SETKEY		4)
	  (END_KEY		YES)))

(define bimsphone at big5hkscs
	'((SETKEY		6)
	  (MODULE		"bimsphone")))

(define bimspinyin at big5hkscs
	'((SETKEY		7)
	  (MODULE		"bimsphone")))

(define array30 at big5hkscs
	'((SETKEY		8)
	  (DISABLE_SEL_LIST	"w")
	  (KEYSTROKE_REMAP	"t:0xaaba;T:0xaaba;")))

(define jyutping0 at big5hkscs
	'((SETKEY		9)
	  (END_KEY		YES)))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;
;  This is the global configuration of the zh_CN.GBK locale 
;
(define zh_CN.GBK
  '((DEFAULT_IM		"zh_hex")
    (DEFAULT_IM_MODULE	"gen_inp")
    (DEFAULT_IM_SINMD	"DEFAULT")
    (PHRASE		"default.phr")
    (CINPUT		(zh_hex))
    (FONTSET		"-sony-*-24-*-iso8859-1,-*-medium-r-*-24-*-gbk-0")
    (OVERSPOT_FONTSET	"NONE")))

;
;  The zh_hex module (zh_hex input method) is a special IM, which can be
;  used in many different encodings.
;
(define zh_hex 
	'((SETKEY		0)
	  (MODULE		zh_hex)
	  (INP_CNAME_big5	"0xa4ba+0xbd58")
	  (INP_CNAME_big5hkscs	"0xa4ba+0xbd58")
	  (INP_CNAME_gb2312	"0xc4da+0xc2eb")
	  (INP_CNAME_gbk	"0xc4da+0xc2eb")
	  (INP_CNAME_utf-8	"0xe585a7+0xe7a2bc")
	  (BEEP_WRONG		YES)))



--- NEW FILE xinput.d-xcin ---
XIM=xcin
XIM_PROGRAM=xcin
XIM_ARGS="-x xcin"
GTK_IM_MODULE=xim


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xcin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Mar 2005 01:13:04 -0000	1.1
+++ .cvsignore	21 Mar 2005 01:15:07 -0000	1.2
@@ -0,0 +1 @@
+xcin-2.5.3.pre3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xcin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Mar 2005 01:13:04 -0000	1.1
+++ sources	21 Mar 2005 01:15:07 -0000	1.2
@@ -0,0 +1 @@
+354f46d3f22cab2d8fb57b7649cdc37a  xcin-2.5.3.pre3.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 21 01:22:02 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:22:02 -0500
Subject: rpms/xcin/devel xcin.spec,1.1,1.2
Message-ID: <200503210122.j2L1M2gO027056@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27042

Modified Files:
	xcin.spec 
Log Message:
bump for build



Index: xcin.spec
===================================================================
RCS file: /cvs/extras/rpms/xcin/devel/xcin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xcin.spec	21 Mar 2005 01:15:07 -0000	1.1
+++ xcin.spec	21 Mar 2005 01:22:00 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: An X Input Method Server for Chinese.
 Name: xcin
 Version: 2.5.3.pre3
-Release: 24
+Release: 25
 License: GPL
 Group: User Interface/X
 Source0: ftp://xcin.linux.org.tw/pub/xcin/xcin/%{name}-%{version}.tar.gz
@@ -108,6 +108,9 @@
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Mar 21 2005 Leon Ho <llch at redhat.com>
+- rebuilt for Fedora Extras
+
 * Thu Jul 01 2004 Leon Ho <llch at redhat.com>
 - modify post script
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:22:28 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:22:28 -0500
Subject: rpms/xfce4-session/devel xfce4-session.spec,1.1,1.2
Message-ID: <200503210122.j2L1MSZI027108@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27093

Modified Files:
	xfce4-session.spec 
Log Message:
fix BuildReqs and prep for FC4 build



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-session.spec	19 Mar 2005 18:09:41 -0000	1.1
+++ xfce4-session.spec	21 Mar 2005 01:22:26 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-session-4.2.1.tar.bz2
@@ -13,6 +13,8 @@
 BuildRequires: libxfcegui4-devel >= 4.2.1
 BuildRequires: libxfce4mcs-devel >= 4.2.1
 BuildRequires: xfce-mcs-manager-devel >= 4.2.1
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 xfce4-session is the session manager for the Xfce desktop environment.
@@ -43,7 +45,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -78,6 +80,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:23:34 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:23:34 -0500
Subject: rpms/xfce4-session/FC-3 xfce4-session.spec,1.1,1.2
Message-ID: <200503210123.j2L1NYRI027160@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-session/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27145

Modified Files:
	xfce4-session.spec 
Log Message:
fix BuildReqs and prep for FC3 build



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/FC-3/xfce4-session.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-session.spec	19 Mar 2005 18:09:41 -0000	1.1
+++ xfce4-session.spec	21 Mar 2005 01:23:32 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.2.1
-Release: 1
+Release: 2.FC3
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-session-4.2.1.tar.bz2
@@ -13,6 +13,8 @@
 BuildRequires: libxfcegui4-devel >= 4.2.1
 BuildRequires: libxfce4mcs-devel >= 4.2.1
 BuildRequires: xfce-mcs-manager-devel >= 4.2.1
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 xfce4-session is the session manager for the Xfce desktop environment.
@@ -43,7 +45,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -78,6 +80,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:28:41 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:28:41 -0500
Subject: rpms/system-switch-im - New directory
Message-ID: <200503210128.j2L1SfqF027305@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/system-switch-im
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27298/system-switch-im

Log Message:
Directory /cvs/extras/rpms/system-switch-im added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 21 01:28:41 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:28:41 -0500
Subject: rpms/system-switch-im/devel - New directory
Message-ID: <200503210128.j2L1SfFr027308@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/system-switch-im/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27298/system-switch-im/devel

Log Message:
Directory /cvs/extras/rpms/system-switch-im/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 21 01:29:17 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:29:17 -0500
Subject: rpms/system-switch-im Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503210129.j2L1THea027370@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/system-switch-im
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27361

Added Files:
	Makefile import.log 
Log Message:
Setup of module system-switch-im


--- NEW FILE Makefile ---
# Top level Makefile for module system-switch-im
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 21 01:29:17 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:29:17 -0500
Subject: rpms/system-switch-im/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503210129.j2L1THl2027373@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/system-switch-im/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27361/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module system-switch-im


--- 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 Mar 21 01:30:25 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:30:25 -0500
Subject: rpms/system-switch-im import.log,1.1,1.2
Message-ID: <200503210130.j2L1UPXi027479@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/system-switch-im
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27470

Modified Files:
	import.log 
Log Message:
auto-import system-switch-im-0.1.2-3 on branch devel from system-switch-im-0.1.2-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/system-switch-im/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Mar 2005 01:29:15 -0000	1.1
+++ import.log	21 Mar 2005 01:30:23 -0000	1.2
@@ -0,0 +1 @@
+system-switch-im-0_1_2-3:HEAD:system-switch-im-0.1.2-3.src.rpm:1111368597



From fedora-extras-commits at redhat.com  Mon Mar 21 01:30:25 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:30:25 -0500
Subject: rpms/system-switch-im/devel im-switch, NONE,
	1.1 system-switch-im.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503210130.j2L1UPOp027483@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/system-switch-im/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27470/devel

Modified Files:
	.cvsignore sources 
Added Files:
	im-switch system-switch-im.spec 
Log Message:
auto-import system-switch-im-0.1.2-3 on branch devel from system-switch-im-0.1.2-3.src.rpm


--- NEW FILE im-switch ---
#!/bin/sh

XINPUT_PATH=/etc/X11/xinit/xinput.d
DOTXINPUT_PATH=${HOME}/.xinput.d
ALTER_XINPUT=/etc/alternatives/xinput-
LNG=`echo ${LC_CTYPE:-$LANG} | awk -F. '{ print $1 }'`
DEFAULT=`/usr/sbin/alternatives --display xinput-$LNG | awk '{ if ($0 ~/link/) print $5 }'`

auto() {
    if [ ! -r "${ALTER_XINPUT}${LNG}" ]; then
	echo "No alternatives defined for language $LNG"
	exit 1
    else
	if [ "$UID" -eq 0 ]; then
	    /usr/sbin/alternatives --auto xinput-$LNG
	else
	   [ -r "${XINPUT_PATH}/${LNG}" -a -r "${DOTXINPUT_PATH}/${LNG}" ] && mv ${DOTXINPUT_PATH}/${LNG} ${DOTXINPUT_PATH}/${LNG}.backup
	fi
    fi
}

list() {
    if [ -r "${DOTXINPUT_PATH}/${LNG}" ]; then
	echo "You have ${LNG} setup in \"${DOTXINPUT_PATH}\"."
	echo "======================================================="
    fi
    if [ ! -r "${ALTER_XINPUT}${LNG}" ]; then
	echo "No alternatives defined for language $LNG"
    else
	/usr/sbin/alternatives --display xinput-$LNG | sed -e "s%$XINPUT_PATH/%%"
    fi
    echo "======================================================="
    echo "The following languages currently have input methods configured:"
    for i in `ls $ALTER_XINPUT* | sed -e "s%$ALTER_XINPUT%%"`; do
        echo -n "$i "
    done
    echo
}

setalt() {
    if [ "$UID" -eq 0 ]; then
	if [ ! -r "${ALTER_XINPUT}${LNG}" ]; then
	    echo "No alternatives defined for language $LNG"
	else
	    /usr/sbin/alternatives --set xinput-$LNG $XINPUT_PATH/$1
	fi
    else
	[ -r "$XINPUT_PATH/$1" ] || { echo "No xinput.d config for $1 available." ; exit 1 ; }
	if [ -d ${DOTXINPUT_PATH} ]; then
	    [ -r "${DOTXINPUT_PATH}/${LNG}" ] && mv ${DOTXINPUT_PATH}/${LNG} ${DOTXINPUT_PATH}/${LNG}.backup
	else
	    mkdir -p ${DOTXINPUT_PATH}
	fi
	ln -s $XINPUT_PATH/$1 ${DOTXINPUT_PATH}/$LNG
    fi
}

help() {
echo "Input Method Switcher 0.3"
echo ""
echo "Usage: $0 [-z lang] -s inputmethodname"
echo "           to set a specific input method for the language"
echo "       $0 [-z lang] -a"
echo "           to revent to the default input method for the language"
echo "       $0 [-z lang] -l"
echo "           to list current settings and available input methods for"
echo "           the language, and also all the available languages"
echo "       $0 -h"
echo "           to show this help"
echo
echo "The \"LANG\" argument of -z takes the form \"ll_CC\" and is used to override"
echo "the current language with ll_CC instead: eg \"-z ja_JP\""
    exit 65
}

setcommand() {
if [ -z "$COMMAND" ]; then
    COMMAND=$1
else
    echo "Use only of -s, -a or -l."
    echo "Try \"$0 -h\" for usage."
    exit 1
fi
}

if [ $# -eq 0 ]; then
    help
    exit 1
fi

bad_option=0

while getopts "hz:als:" OPTION; do
    case $OPTION in
        z) LNG=$OPTARG;;
        a) setcommand auto;;
        l) setcommand list;;
        s) setcommand "setalt $OPTARG";;
        h) setcommand "help $0";;
	?) bad_option=1
    esac
done

if [ "$bad_option" -eq 1 ]; then
    echo "Try \"$0 -h\" for usage."
    exit 1
else
    $COMMAND
fi


--- NEW FILE system-switch-im.spec ---
Summary: The Input Method System Switcher
Name: system-switch-im
Version: 0.1.2
Release: 3
Source0: %{name}-%{version}.tar.bz2
Source1: im-switch
License: GPL
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-root

BuildArch: noarch

#Requires: newt
Requires: /usr/sbin/alternatives
Requires: python >= 2.3

# GUI
Requires: libglade2
Requires: pygtk2-libglade
Requires: pygtk2

Conflicts: xinitrc < 4.0.1-1

BuildPreReq: python >= 2.3
BuildPreReq: gettext
BuildPreReq: automake
BuildPreReq: intltool

%description
The system-switch-im is the Input Method Switcher.
It enables users to easily switch between various input methods that they have installed.

#%package gnome
#Summary: A GUI interface for Input Method System Switcher.
#Group: Applications/System
#Requires: %{name} = %{version}-%{release}
#Requires: python >= 2.3
#Requires: /usr/sbin/alternatives

#%description gnome
#The system-switch-im-gnome package contains a GNOME interface for the
#Input Method Switcher.

%prep
%setup -q 

%build
make

%install
rm -rf %{buildroot}

%makeinstall
install %SOURCE1 $RPM_BUILD_ROOT%{_bindir}/

rm -rf $RPM_BUILD_ROOT/usr/bin/system-switch-im-nox
rm -rf $RPM_BUILD_ROOT/usr/sbin/system-switch-im-nox
rm -rf $RPM_BUILD_ROOT/etc/pam.d/system-switch-im-nox
rm -rf $RPM_BUILD_ROOT/etc/security/console.apps/system-switch-im-nox
rm -rf $RPM_BUILD_ROOT/usr/share/system-switch-im/imswitch_tui.py
rm -rf $RPM_BUILD_ROOT/usr/share/system-switch-im/imswitch_tui.pyc
               

%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root)
%{_bindir}/*
%{_sbindir}/*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/functions.py*
%{_datadir}/%{name}/locale-list
%config(noreplace) /etc/pam.d/*
#%{_datadir}/%{name}/imswitch_tui.py*
#%config(noreplace) /etc/security/console.apps/%{name}-nox

#%files gnome
#%defattr(-,root,root)
%config(noreplace) /etc/security/console.apps/%{name}
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_datadir}/%{name}/imswitch_gui.py*
%{_datadir}/%{name}/pixmaps
%{_datadir}/%{name}/imswitch.glade

%changelog
* Mon Oct 11 2004 Leon Ho <llch at redhat.com> 0.1.2-3
- rebuilt for translation

* Thu Sep 16 2004 Leon Ho <llch at redhat.com> 0.1.2-2
- fixed Makefile for locale-list

* Thu Sep 9 2004 Leon Ho <llch at redhat.com> 0.1.2-1
- used locale-list to display more user friendly language names
- fixed on the category for .desktop
- only display languages who has more than one IM

* Mon Aug 24 2004 Leon Ho <llch at redhat.com> 0.1.1-3
- added "Languages" into translatable string

* Mon Aug 23 2004 Leon Ho <llch at redhat.com> 0.1.1-2
- included im-switch cli tool
- fixed on unable to get kinput2 alternatives files bug
- added notification for restarting X
- dropped XIM ratio and retrim UI
- redid po files for translators and built existing translation
- checked if able to avoid confirm dialog if no change


* Wed Jul 21 2004 Leon Ho <llch at redhat.com> 0.1.1-1
- 0.1.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-switch-im/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Mar 2005 01:29:15 -0000	1.1
+++ .cvsignore	21 Mar 2005 01:30:23 -0000	1.2
@@ -0,0 +1 @@
+system-switch-im-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-switch-im/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Mar 2005 01:29:15 -0000	1.1
+++ sources	21 Mar 2005 01:30:23 -0000	1.2
@@ -0,0 +1 @@
+d6702deff3ec8f4fbc61d8c219df94b0  system-switch-im-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 21 01:32:16 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:32:16 -0500
Subject: rpms/xfce4-toys/devel xfce4-toys.spec,1.1,1.2
Message-ID: <200503210132.j2L1WGXL027595@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-toys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27580

Modified Files:
	xfce4-toys.spec 
Log Message:
fix BuildReqs and prep for FC4 build



Index: xfce4-toys.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-toys/devel/xfce4-toys.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-toys.spec	19 Mar 2005 18:14:46 -0000	1.1
+++ xfce4-toys.spec	21 Mar 2005 01:32:14 -0000	1.2
@@ -1,14 +1,18 @@
 Summary: Various tools for Xfce4
 Name: xfce4-toys
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-toys-4.2.1.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfce4-panel >= 4.2.1
-BuildRequires: xfce4-panel >= 4.2.1
+BuildRequires: xfce4-panel-devel >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: libxml2-devel
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 xfce4-toys includes an "xeyes" type plugin for the Xfce4 panel
@@ -24,7 +28,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -40,6 +44,9 @@
 %{_datadir}/xfce4/tips/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Upgraded to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:33:31 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:33:31 -0500
Subject: rpms/xfce4-toys/FC-3 xfce4-toys.spec,1.1,1.2
Message-ID: <200503210133.j2L1XVqc027655@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-toys/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27641

Modified Files:
	xfce4-toys.spec 
Log Message:
fix BuildReqs and prep for FC3 build



Index: xfce4-toys.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-toys/FC-3/xfce4-toys.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-toys.spec	19 Mar 2005 18:14:46 -0000	1.1
+++ xfce4-toys.spec	21 Mar 2005 01:33:29 -0000	1.2
@@ -1,14 +1,18 @@
 Summary: Various tools for Xfce4
 Name: xfce4-toys
 Version: 4.2.1
-Release: 1
+Release: 2.FC3
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-toys-4.2.1.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfce4-panel >= 4.2.1
-BuildRequires: xfce4-panel >= 4.2.1
+BuildRequires: xfce4-panel-devel >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: libxml2-devel
+BuildRequires: startup-notification-devel
+BuildRequires: gettext
 
 %description
 xfce4-toys includes an "xeyes" type plugin for the Xfce4 panel
@@ -24,7 +28,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -40,6 +44,9 @@
 %{_datadir}/xfce4/tips/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Upgraded to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Mon Mar 21 01:42:28 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:42:28 -0500
Subject: rpms/xfce4-trigger-launcher/devel xfce4-trigger-launcher.spec, 1.1,
	1.2
Message-ID: <200503210142.j2L1gSaK027844@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-trigger-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27829

Modified Files:
	xfce4-trigger-launcher.spec 
Log Message:
fix BuildReqs and prep for FC4 build



Index: xfce4-trigger-launcher.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-trigger-launcher/devel/xfce4-trigger-launcher.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-trigger-launcher.spec	19 Mar 2005 18:17:41 -0000	1.1
+++ xfce4-trigger-launcher.spec	21 Mar 2005 01:42:26 -0000	1.2
@@ -1,14 +1,18 @@
 Summary: A panel plugin acting as a launcher with two states
 Name: xfce4-trigger-launcher
 Version: 4.2.1
-Release: 1
+Release: 2.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-trigger-launcher-4.2.1.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: xfce4-panel >= 4.2.0
-BuildRequires: xfce4-panel >= 4.2.0
+Requires: xfce4-panel >= 4.2.1
+BuildRequires: xfce4-panel-devel >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: libxfce4util-devel >= 4.2.1
+BuildRequires: libxml2-devel
+BuildRequires: gettext
 
 %description
 xfce4-trigger-launcher is a launcher with two states, like a trigger.
@@ -23,7 +27,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -35,6 +39,9 @@
 %{_libdir}/xfce4/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 - Removed unneeded glob in files for lang files



From fedora-extras-commits at redhat.com  Mon Mar 21 01:43:07 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 20:43:07 -0500
Subject: rpms/xfce4-trigger-launcher/FC-3 xfce4-trigger-launcher.spec, 1.1,
	1.2
Message-ID: <200503210143.j2L1h7rs027902@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xfce4-trigger-launcher/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27887

Modified Files:
	xfce4-trigger-launcher.spec 
Log Message:
fix BuildReqs and prep for FC4 build



Index: xfce4-trigger-launcher.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-trigger-launcher/FC-3/xfce4-trigger-launcher.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-trigger-launcher.spec	19 Mar 2005 18:17:41 -0000	1.1
+++ xfce4-trigger-launcher.spec	21 Mar 2005 01:43:05 -0000	1.2
@@ -1,14 +1,18 @@
 Summary: A panel plugin acting as a launcher with two states
 Name: xfce4-trigger-launcher
 Version: 4.2.1
-Release: 1
+Release: 2.FC3
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-trigger-launcher-4.2.1.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: xfce4-panel >= 4.2.0
-BuildRequires: xfce4-panel >= 4.2.0
+Requires: xfce4-panel >= 4.2.1
+BuildRequires: xfce4-panel-devel >= 4.2.1
+BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRequires: libxfce4util-devel >= 4.2.1
+BuildRequires: libxml2-devel
+BuildRequires: gettext
 
 %description
 xfce4-trigger-launcher is a launcher with two states, like a trigger.
@@ -23,7 +27,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
 %clean
@@ -35,6 +39,9 @@
 %{_libdir}/xfce4/*
 
 %changelog
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- fix BuildReqs
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 - Removed unneeded glob in files for lang files



From fedora-extras-commits at redhat.com  Mon Mar 21 01:47:28 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 20:47:28 -0500
Subject: rpms/system-switch-im/devel system-switch-im.spec,1.1,1.2
Message-ID: <200503210147.j2L1lSak028009@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/system-switch-im/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28001

Modified Files:
	system-switch-im.spec 
Log Message:
rebuilt for extras



Index: system-switch-im.spec
===================================================================
RCS file: /cvs/extras/rpms/system-switch-im/devel/system-switch-im.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-switch-im.spec	21 Mar 2005 01:30:23 -0000	1.1
+++ system-switch-im.spec	21 Mar 2005 01:47:26 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: The Input Method System Switcher
 Name: system-switch-im
 Version: 0.1.2
-Release: 3
+Release: 4
 Source0: %{name}-%{version}.tar.bz2
 Source1: im-switch
 License: GPL
@@ -87,6 +87,9 @@
 %{_datadir}/%{name}/imswitch.glade
 
 %changelog
+* Mon Mar 21 2005 Leon Ho <llch at redhat.com> 0.1.2-4
+- rebuilt for Extras
+
 * Mon Oct 11 2004 Leon Ho <llch at redhat.com> 0.1.2-3
 - rebuilt for translation
 



From bugs.michael at gmx.net  Mon Mar 21 02:21:11 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Mon, 21 Mar 2005 03:21:11 +0100
Subject: rpms/xfprint/devel xfprint.spec,1.1,1.2
In-Reply-To: <200503202139.j2KLdbAE018445@cvs-int.fedora.redhat.com>
References: <200503202139.j2KLdbAE018445@cvs-int.fedora.redhat.com>
Message-ID: <20050321032111.442dc0c6.bugs.michael@gmx.net>

On Sun, 20 Mar 2005 16:39:37 -0500, Kevin Fenzi (kevin) wrote:

> Author: kevin
> 
> Update of /cvs/extras/rpms/xfprint/devel

> +%post -p /sbin/ldconfig
> +
> +%postun -p /sbin/ldconfig
> +
>  %files -f %{name}.lang
>  %defattr(-,root,root)
>  %doc README ChangeLog NEWS COPYING AUTHORS NOTES
>  %{_bindir}/*
> -%{_libdir}/xfce4/*
> +%{_libdir}/xfce4/mcs-plugins
> +%{_libdir}/xfce4/xfprint-plugins
>  %{_datadir}/applications/*
> -%{_datadir}/xfce4/*
> -%{_datadir}/icons/*
> +%{_datadir}/xfce4/doc/C
> +%{_datadir}/icons/hicolor/*/*/*

Does any of the xfce packages add to /etc/ld.so.conf or /etc/ld.so.conf.d/?
(I assume "no", because the directory names look like plugin directories)

If no package does that, the added ldconfig calls are not needed, because
no library is installed into run-time linker's default search path.



From bugs.michael at gmx.net  Mon Mar 21 02:31:30 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Mon, 21 Mar 2005 03:31:30 +0100
Subject: rpms/xcin/devel xcin-2.5.3-mkuserdir.patch, NONE, 1.1
 xcin-2.5.3-no_rpath.patch, NONE, 1.1 xcin.spec, NONE, 1.1 xcin.wrap, NONE,
 1.1 xcin.xpm, NONE, 1.1 xcinrc.UTF-8, NONE, 1.1 xinput.d-xcin, NONE, 1.1
 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
In-Reply-To: <200503210115.j2L1F9au026891@cvs-int.fedora.redhat.com>
References: <200503210115.j2L1F9au026891@cvs-int.fedora.redhat.com>
Message-ID: <20050321033130.04e4eb64.bugs.michael@gmx.net>

On Sun, 20 Mar 2005 20:15:09 -0500, Leon Ho (llch) wrote:

> Author: llch
> 
> Update of /cvs/extras/rpms/xcin/devel

> %install
> 
> mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin
> mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
> mkdir -p $RPM_BUILD_ROOT/etc/chinese/xcin
> mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin/tab
> mkdir -p $RPM_BUILD_ROOT/usr/X11R6/man

Every package should

  rm -rf $RPM_BUILD_ROOT

at the beginning of the %install section. That is not just to make sure
the build root is emptied. It also makes short-circuit installs necessary
(man rpmbuild). Very handy if these work.



From fedora-extras-commits at redhat.com  Mon Mar 21 03:05:22 2005
From: fedora-extras-commits at redhat.com (Leon Ho (llch))
Date: Sun, 20 Mar 2005 22:05:22 -0500
Subject: rpms/xcin/devel xcin.spec,1.2,1.3
Message-ID: <200503210305.j2L35MWx030666@cvs-int.fedora.redhat.com>

Author: llch

Update of /cvs/extras/rpms/xcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30657

Modified Files:
	xcin.spec 
Log Message:
-rebuilt



Index: xcin.spec
===================================================================
RCS file: /cvs/extras/rpms/xcin/devel/xcin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xcin.spec	21 Mar 2005 01:22:00 -0000	1.2
+++ xcin.spec	21 Mar 2005 03:05:20 -0000	1.3
@@ -52,7 +52,7 @@
 ( cd po; msgfmt -o xcin.mo xcin-zh_TW.po )
 
 %install
-
+rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin
 mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
 mkdir -p $RPM_BUILD_ROOT/etc/chinese/xcin
@@ -110,6 +110,7 @@
 %changelog
 * Mon Mar 21 2005 Leon Ho <llch at redhat.com>
 - rebuilt for Fedora Extras
+- add rm -rf $RPM_BUILD_ROOT
 
 * Thu Jul 01 2004 Leon Ho <llch at redhat.com>
 - modify post script



From fedora-extras-commits at redhat.com  Mon Mar 21 04:23:54 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 20 Mar 2005 23:23:54 -0500
Subject: rpms/xcin/devel xcin.spec,1.3,1.4
Message-ID: <200503210423.j2L4NsBo032697@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32685

Modified Files:
	xcin.spec 
Log Message:
- fix BuildReqs
- macroize stuff and other fixes



Index: xcin.spec
===================================================================
RCS file: /cvs/extras/rpms/xcin/devel/xcin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xcin.spec	21 Mar 2005 03:05:20 -0000	1.3
+++ xcin.spec	21 Mar 2005 04:23:52 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: An X Input Method Server for Chinese.
 Name: xcin
 Version: 2.5.3.pre3
-Release: 25
+Release: 26
 License: GPL
 Group: User Interface/X
 Source0: ftp://xcin.linux.org.tw/pub/xcin/xcin/%{name}-%{version}.tar.gz
@@ -11,11 +11,14 @@
 Source5: xinput.d-%{name}
 Patch0: xcin-2.5.3-mkuserdir.patch
 Patch1:  xcin-2.5.3-no_rpath.patch
-BuildRequires: libtabe >= 0.2.4a
-Requires: libtabe >= 0.2.4a
-Requires(post,preun): /usr/sbin/alternatives
-BuildPrereq: db4-devel,libtabe-devel
 Buildroot: %{_tmppath}/%{name}-buildroot
+Requires(post): /usr/sbin/alternatives
+Requires(preun): /usr/sbin/alternatives
+BuildRequires: db4-devel
+BuildRequires: libtabe-devel >= 0.2.4a
+BuildRequires: libtool
+BuildRequires: xorg-x11-devel
+BuildRequires: gettext
 
 %description
 An X Input Method Server for Chinese.
@@ -37,14 +40,14 @@
 
 
 %build
-cp /usr/share/libtool/config.sub $RPM_BUILD_DIR/%{name}/script/
-cp /usr/share/libtool/config.guess $RPM_BUILD_DIR/%{name}/script/
+cp %{_datadir}/libtool/config.sub $RPM_BUILD_DIR/%{name}/script/
+cp %{_datadir}/libtool/config.guess $RPM_BUILD_DIR/%{name}/script/
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \
-	--prefix=/usr/X11R6 --libdir=/usr/X11R6/%{_lib} \
-        --with-xcin-dir=/usr/X11R6/%{_lib}/X11/xcin \
-	--with-xcin-rcdir=/etc/chinese/xcin \
-	--with-localedir=/usr/share/locale \
-	--with-extra-lib=/usr/%{_lib}
+	--prefix=%{_prefix}/X11R6 --libdir=%{_prefix}/X11R6/%{_lib} \
+        --with-xcin-dir=%{_prefix}/X11R6/%{_lib}/X11/xcin \
+	--with-xcin-rcdir=%{_sysconfdir}/chinese/xcin \
+	--with-localedir=%{_datadir}/locale \
+	--with-extra-lib=%{_libdir}
 
 perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
 
@@ -53,31 +56,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
-mkdir -p $RPM_BUILD_ROOT/etc/chinese/xcin
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin/tab
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/man
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/%{_lib}/X11/xcin
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/chinese/xcin
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/%{_lib}/X11/xcin/tab
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/man
 
 export program_prefix=$RPM_BUILD_ROOT
-export xcin_rcp=$RPM_BUILD_ROOT/etc/chinese/xcin
+export xcin_rcp=$RPM_BUILD_ROOT%{_sysconfdir}/chinese/xcin
 make -e install
 
-mkdir -p $RPM_BUILD_ROOT/usr/share/icons/
-mkdir -p $RPM_BUILD_ROOT/usr/share/gnome/apps/Utilities/
-mkdir -p $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Utilities/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/
 
 install -m 644 $RPM_SOURCE_DIR/xcin.xpm \
-		$RPM_BUILD_ROOT/usr/share/icons/xcin.xpm
-install -m 644 po/xcin.mo $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/xcin.mo
-install -m 644 src/lib/.libs/libxcin.so.0.0.0 $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/
+		$RPM_BUILD_ROOT%{_datadir}/icons/xcin.xpm
+install -m 644 po/xcin.mo $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/xcin.mo
+install -m 644 src/lib/.libs/libxcin.so.0.0.0 $RPM_BUILD_ROOT%{_prefix}/X11R6/%{_lib}/
 install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/chinese/xcin/xcinrc
 install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}
 
 # remove unpackaged files from the buildroot
-rm -rf $RPM_BUILD_ROOT/usr/X11R6/man
-rm -f $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/{libxcin.a,libxcin.la}
-rm -rf $RPM_BUILD_ROOT/usr/X11R6/share
+rm -rf $RPM_BUILD_ROOT%{_prefix}/X11R6/man
+rm -f $RPM_BUILD_ROOT%{_prefix}/X11R6/%{_lib}/{libxcin.a,libxcin.la}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/X11R6/share
 
 %post
 /sbin/ldconfig
@@ -97,21 +100,24 @@
 %dir %{_sysconfdir}/chinese
 %dir %{_sysconfdir}/chinese/xcin
 %config %{_sysconfdir}/chinese/xcin/xcinrc
-/usr/X11R6/bin/*
-/usr/X11R6/%{_lib}/X11/xcin/
-/usr/X11R6/%{_lib}/*
-/usr/share/icons/xcin.xpm
+%{_prefix}/X11R6/bin/*
+%{_prefix}/X11R6/%{_lib}/*
+%{_datadir}/icons/xcin.xpm
 %lang(zh_TW) /usr/share/locale/zh_TW/LC_MESSAGES/xcin.mo
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %clean 
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Mar 21 2005 Leon Ho <llch at redhat.com>
 - rebuilt for Fedora Extras
 - add rm -rf $RPM_BUILD_ROOT
 
+* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com>
+- fix BuildReqs
+- macroize stuff and other fixes
+
 * Thu Jul 01 2004 Leon Ho <llch at redhat.com>
 - modify post script
 



From rc040203 at freenet.de  Mon Mar 21 06:44:01 2005
From: rc040203 at freenet.de (Ralf Corsepius)
Date: Mon, 21 Mar 2005 07:44:01 +0100
Subject: rpms/nabi/devel nabi.spec,1.3,1.4
In-Reply-To: <200503190713.j2J7Dn8j003042@cvs-int.fedora.redhat.com>
References: <200503190713.j2J7Dn8j003042@cvs-int.fedora.redhat.com>
Message-ID: <1111387441.2475.243.camel@mccallum.corsepiu.local>

On Sat, 2005-03-19 at 02:13 -0500, Warren Togami wrote:
> Author: wtogami

> Index: nabi.spec
> ===================================================================
> RCS file: /cvs/extras/rpms/nabi/devel/nabi.spec,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- nabi.spec	17 Mar 2005 08:50:09 -0000	1.3
> +++ nabi.spec	19 Mar 2005 07:13:47 -0000	1.4
> @@ -23,7 +23,7 @@
>  %setup -q -n %{name}-%{version}
>  
>  %build
> -./configure --prefix={%_prefix}
> +./configure --prefix=%{_prefix}
>  make

This is still broken.

Your spec also is using %{_bindir}, %{_datadir},
%_sysconfdir}, but you miss to propagate them to the package's
configuration.

Try this and you'll see the bug:
# rpmbuild --rebuild nabi-0.14-4.src.rpm --define "_datadir /foo/bar"

Further bugs:
* RPM_OPT_FLAGS is being not honoured.
* Using install-strip void *debug.rpms

My advice: use %configure and remove install-strip

Another issue:
* When building the rpm, the autotools are being run.
I haven't investigated, but this could indicate the timestamps inside of
the original tarball to be broken.

Ralf





From wtogami at redhat.com  Mon Mar 21 07:23:17 2005
From: wtogami at redhat.com (Warren Togami)
Date: Sun, 20 Mar 2005 21:23:17 -1000
Subject: rpms/nabi/devel nabi.spec,1.3,1.4
In-Reply-To: <1111387441.2475.243.camel@mccallum.corsepiu.local>
References: <200503190713.j2J7Dn8j003042@cvs-int.fedora.redhat.com>
	<1111387441.2475.243.camel@mccallum.corsepiu.local>
Message-ID: <423E7665.90400@redhat.com>

Ralf Corsepius wrote:
> On Sat, 2005-03-19 at 02:13 -0500, Warren Togami wrote:
> 
>>Author: wtogami
> 
> 
>>Index: nabi.spec
>>===================================================================
>>RCS file: /cvs/extras/rpms/nabi/devel/nabi.spec,v
>>retrieving revision 1.3
>>retrieving revision 1.4
>>diff -u -r1.3 -r1.4
>>--- nabi.spec	17 Mar 2005 08:50:09 -0000	1.3
>>+++ nabi.spec	19 Mar 2005 07:13:47 -0000	1.4
>>@@ -23,7 +23,7 @@
>> %setup -q -n %{name}-%{version}
>> 
>> %build
>>-./configure --prefix={%_prefix}
>>+./configure --prefix=%{_prefix}
>> make
> 
> 
> This is still broken.
> 
> Your spec also is using %{_bindir}, %{_datadir},
> %_sysconfdir}, but you miss to propagate them to the package's
> configuration.
> 
> Try this and you'll see the bug:
> # rpmbuild --rebuild nabi-0.14-4.src.rpm --define "_datadir /foo/bar"
> 
> Further bugs:
> * RPM_OPT_FLAGS is being not honoured.
> * Using install-strip void *debug.rpms
> 
> My advice: use %configure and remove install-strip
> 
> Another issue:
> * When building the rpm, the autotools are being run.
> I haven't investigated, but this could indicate the timestamps inside of
> the original tarball to be broken.

This is an upstream issue.  There is a newer version, but I'm letting 
the new maintainer of nabi take care of these fixes and the version 
upgrade because he needs the practice.  Thanks for the analysis.

Warren Togami
wtogami at redhat.com



From fedora-extras-commits at redhat.com  Mon Mar 21 08:16:02 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Mon, 21 Mar 2005 03:16:02 -0500
Subject: rpms/sabayon/devel sabayon.spec,1.4,1.5
Message-ID: <200503210816.j2L8G2VH010376@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10367

Modified Files:
	sabayon.spec 
Log Message:
* Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-5
- Add dirmonitor.py to base package



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sabayon.spec	20 Mar 2005 09:57:49 -0000	1.4
+++ sabayon.spec	21 Mar 2005 08:16:00 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name:    sabayon
 Version: 0.16
-Release: 4
+Release: 5
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -100,6 +100,9 @@
 %{python_sitelib}/%{name}/config.py
 %{python_sitelib}/%{name}/config.pyc
 %ghost %{python_sitelib}/%{name}/config.pyo
+%{python_sitelib}/%{name}/dirmonitor.py
+%{python_sitelib}/%{name}/dirmonitor.pyc
+%ghost %{python_sitelib}/%{name}/dirmonitor.pyo
 %{python_sitelib}/%{name}/storage.py
 %{python_sitelib}/%{name}/storage.pyc
 %ghost %{python_sitelib}/%{name}/storage.pyo
@@ -135,9 +138,6 @@
 %{python_sitelib}/%{name}/aboutdialog.py
 %{python_sitelib}/%{name}/aboutdialog.pyc
 %ghost %{python_sitelib}/%{name}/aboutdialog.pyo
-%{python_sitelib}/%{name}/dirmonitor.py
-%{python_sitelib}/%{name}/dirmonitor.pyc
-%ghost %{python_sitelib}/%{name}/dirmonitor.pyo
 %{python_sitelib}/%{name}/editorwindow.py
 %{python_sitelib}/%{name}/editorwindow.pyc
 %ghost %{python_sitelib}/%{name}/editorwindow.pyo
@@ -167,6 +167,9 @@
 %ghost %{python_sitelib}/%{name}/userswindow.pyo
 
 %changelog
+* Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-5
+- Add dirmonitor.py to base package
+
 * Sun Mar 20 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-4
 - Split the package into sabayon and sabayon-admin
 - BuildRequires: gettext instead of gettext-devel



From fedora-extras-commits at redhat.com  Mon Mar 21 08:28:24 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Mon, 21 Mar 2005 03:28:24 -0500
Subject: rpms/sabayon/devel sabayon.spec,1.5,1.6
Message-ID: <200503210828.j2L8SOhC010571@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10562

Modified Files:
	sabayon.spec 
Log Message:
* Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-6
- Make noarch



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sabayon.spec	21 Mar 2005 08:16:00 -0000	1.5
+++ sabayon.spec	21 Mar 2005 08:28:21 -0000	1.6
@@ -6,7 +6,7 @@
 
 Name:    sabayon
 Version: 0.16
-Release: 5
+Release: 6
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -15,6 +15,7 @@
 Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/%{version}/sabayon-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 Requires: python-abi = %{pyver}
 Requires: gamin-python
@@ -167,6 +168,9 @@
 %ghost %{python_sitelib}/%{name}/userswindow.pyo
 
 %changelog
+* Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-6
+- Make noarch
+
 * Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-5
 - Add dirmonitor.py to base package
 



From fedora-extras-commits at redhat.com  Mon Mar 21 09:28:59 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Mon, 21 Mar 2005 04:28:59 -0500
Subject: rpms/sabayon/devel sabayon.spec,1.6,1.7
Message-ID: <200503210928.j2L9Sx4H013024@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13016

Modified Files:
	sabayon.spec 
Log Message:
* Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-7
- Move Xnest and shadow-utils requires to sabayon-admin
- Require libxml2-python



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sabayon.spec	21 Mar 2005 08:28:21 -0000	1.6
+++ sabayon.spec	21 Mar 2005 09:28:57 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:    sabayon
 Version: 0.16
-Release: 6
+Release: 7
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -19,10 +19,9 @@
 
 Requires: python-abi = %{pyver}
 Requires: gamin-python
+Requires: libxml2-python
 Requires: pygtk2 >= %{pygtk2_version}
 Requires: gnome-python2-gconf >= %{gnome_python2_version}
-Requires: xorg-x11-Xnest
-Requires: shadow-utils
 
 BuildRequires: python
 BuildRequires: gettext
@@ -40,6 +39,9 @@
 Group:    Applications/System
 Requires: %{name} = %{version}-%{release}
 
+Requires: xorg-x11-Xnest
+Requires: shadow-utils
+
 %description admin
 The sabayon-admin package contains the graphical tools which a
 sysadmin should use to manage Sabayon profiles.
@@ -168,6 +170,10 @@
 %ghost %{python_sitelib}/%{name}/userswindow.pyo
 
 %changelog
+* Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-7
+- Move Xnest and shadow-utils requires to sabayon-admin
+- Require libxml2-python
+
 * Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-6
 - Make noarch
 



From markmc at redhat.com  Mon Mar 21 09:36:18 2005
From: markmc at redhat.com (Mark McLoughlin)
Date: Mon, 21 Mar 2005 09:36:18 +0000
Subject: APPROVED: sabayon
Message-ID: <1111397778.3644.72.camel@blaa>

Sabayon is a tool to help sysadmins and user change and maintain the
default behaviour of the GNOME desktop.

Project website: http://www.gnome.org/projects/sabayon

Reviewed by Nils Philippsen, Warren Togami and Ralf Corsepius:

https://www.redhat.com/archives/fedora-extras-list/2005-March/thread.html#00565

Mark McLoughlin, Daniel Veillard and John Dennis will maintain the
package.



From fedora-extras-commits at redhat.com  Mon Mar 21 11:58:57 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 21 Mar 2005 06:58:57 -0500
Subject: rpms/awstats/FC-3 awstats.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <200503211158.j2LBwvVH018265@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18214/FC-3

Modified Files:
	awstats.spec sources 
Log Message:
- version 6.4 final
- change release tag for FC3/FC4 (following Owen's scheme: 
  https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00633.html)
- convert tabs into spaces



Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-3/awstats.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- awstats.spec	15 Feb 2005 17:35:38 -0000	1.5
+++ awstats.spec	21 Mar 2005 11:58:55 -0000	1.6
@@ -1,16 +1,16 @@
-Name:		awstats
-Version:	6.4
-Release:	0.1.pre
-Summary:	Advanced Web Statistics
-License:	GPL
-Group:		Applications/Internet
-URL:		http://awstats.sourceforge.net
-#Source0:	http://dl.sf.net/awstats/awstats-6.3.tgz
-Source0:	http://awstats.sourceforge.net/files/awstats-6.4.tgz
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	httpd
-Requires:	perl
+Name:       awstats
+Version:    6.4
+Release:    1.fc3
+Summary:    Advanced Web Statistics
+License:    GPL
+Group:      Applications/Internet
+URL:        http://awstats.sourceforge.net
+Source0:    http://dl.sf.net/awstats/awstats-6.4.tgz
+#Source0:   http://awstats.sourceforge.net/files/awstats-6.4.tgz
+BuildArch:  noarch
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:   httpd
+Requires:   perl
 Requires(post): perl
 Requires(postun): /sbin/service
 
@@ -151,6 +151,11 @@
 %{_datadir}/%{name}/wwwroot/js
 
 %changelog
+* Mon Mar 21 2005 Aurelien Bompard <gauret[AT]free.fr> 6.4-1.fc3
+- version 6.4 final
+- change release tag for FC3 (following Owen's scheme)
+- convert tabs into spaces
+
 * Tue Feb 15 2005 Aurelien Bompard <gauret[AT]free.fr> 6.4-0.1.pre
 - update to 6.4pre to fix a vulnerability
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Feb 2005 17:35:38 -0000	1.5
+++ sources	21 Mar 2005 11:58:55 -0000	1.6
@@ -1 +1 @@
-f4e236d2ab4c71933cb476b20172a68e  awstats-6.4.tgz
+056e6fb0c7351b17fe5bbbe0aa1297b1  awstats-6.4.tgz



From fedora-extras-commits at redhat.com  Mon Mar 21 11:58:57 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 21 Mar 2005 06:58:57 -0500
Subject: rpms/awstats/devel awstats.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200503211158.j2LBwvo8018269@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18214/devel

Modified Files:
	awstats.spec sources 
Log Message:
- version 6.4 final
- change release tag for FC3/FC4 (following Owen's scheme: 
  https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00633.html)
- convert tabs into spaces



Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- awstats.spec	5 Mar 2005 21:10:20 -0000	1.6
+++ awstats.spec	21 Mar 2005 11:58:55 -0000	1.7
@@ -1,18 +1,18 @@
-Name:		awstats
-Version:	6.4
-Release:	0.1.pre
-Summary:	Advanced Web Statistics
-License:	GPL
-Group:		Applications/Internet
-URL:		http://awstats.sourceforge.net
-#Source0:	http://dl.sf.net/awstats/awstats-6.3.tgz
-Source0:	http://awstats.sourceforge.net/files/awstats-6.4.tgz
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	httpd
-Requires:	perl
-Requires(post):		perl
-Requires(postun):	/sbin/service
+Name:       awstats
+Version:    6.4
+Release:    1.fc4
+Summary:    Advanced Web Statistics
+License:    GPL
+Group:      Applications/Internet
+URL:        http://awstats.sourceforge.net
+Source0:    http://dl.sf.net/awstats/awstats-6.4.tgz
+#Source0:   http://awstats.sourceforge.net/files/awstats-6.4.tgz
+BuildArch:  noarch
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:   httpd
+Requires:   perl
+Requires(post): perl
+Requires(postun): /sbin/service
 
 %description
 Advanced Web Statistics is a powerful and featureful tool that generates
@@ -91,7 +91,7 @@
                 s|^SkipHosts=.*$|SkipHosts="127.0.0.1"|;
                 s|^Expires=.*$|Expires=3600|;
         ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf
-install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf
+install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf 
 
 # Fix scripts
 %{__perl} -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \
@@ -151,6 +151,11 @@
 %{_datadir}/%{name}/wwwroot/js
 
 %changelog
+* Mon Mar 21 2005 Aurelien Bompard <gauret[AT]free.fr> 6.4-1.fc4
+- version 6.4 final
+- change release tag for FC4 (following Owen's scheme)
+- convert tabs into spaces
+
 * Tue Feb 15 2005 Aurelien Bompard <gauret[AT]free.fr> 6.4-0.1.pre
 - update to 6.4pre to fix a vulnerability
 
@@ -208,7 +213,7 @@
 - only restart apache if we are upgrading
 - install and cp use the "-p" switch
 - use %%_datadir in /etc/httpd/conf.d/awstats.conf
-- improve cron job
+- improve cron job 
 - don't brutally recode HTML pages
 - the scan is now done hourly instead of daily
 - *.pm files are not executable any more


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Feb 2005 17:35:38 -0000	1.5
+++ sources	21 Mar 2005 11:58:55 -0000	1.6
@@ -1 +1 @@
-f4e236d2ab4c71933cb476b20172a68e  awstats-6.4.tgz
+056e6fb0c7351b17fe5bbbe0aa1297b1  awstats-6.4.tgz



From fedora-extras-commits at redhat.com  Mon Mar 21 14:41:06 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 21 Mar 2005 09:41:06 -0500
Subject: rpms/qof/devel qof.spec,1.4,1.5
Message-ID: <200503211441.j2LEf6vi027373@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27364

Modified Files:
	qof.spec 
Log Message:
Bump release for FC4 rebuild


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qof.spec	4 Mar 2005 00:05:42 -0000	1.4
+++ qof.spec	21 Mar 2005 14:41:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           qof
 Version:        0.5.0
-Release:        2
+Release:        3
 Summary:        QOF provides a query engine library for C objects
 
 Group:          System Environment/Libraries
@@ -99,7 +99,7 @@
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
+%defattr(-,root,root,0755)
 %doc html examples
 %{_includedir}/qof
 %{_libdir}/*.a
@@ -107,7 +107,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Tue Sep 28 2004 Toshio Kuuratomi <toshio-tiki-lounge.com> - 0:0.5.0-0.fdr.2
+* Sun Mar 20 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.5.0-3
+- Rebuild for FC4t1.
+
+* Tue Sep 28 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:0.5.0-0.fdr.2
 - Added pkgconfig and glib2-devel to the -devel package's requirements.
   (suggestion from Michael Schwendt)
 



From fedora-extras-commits at redhat.com  Mon Mar 21 14:49:46 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 21 Mar 2005 09:49:46 -0500
Subject: rpms/python-docutils/devel python-docutils.spec,1.1,1.2
Message-ID: <200503211449.j2LEnkdp028033@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28023

Modified Files:
	python-docutils.spec 
Log Message:
Bump release for FC4


Index: python-docutils.spec
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/devel/python-docutils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-docutils.spec	16 Mar 2005 19:51:19 -0000	1.1
+++ python-docutils.spec	21 Mar 2005 14:49:44 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           python-%{srcname}
 Version:        0.3.7
-Release:        5
+Release:        6
 Summary:        A system for processing plaintext documentation
 
 Group:          Development/Languages
@@ -101,6 +101,9 @@
 %ghost %{python_sitelib}/docutils/*/*/*/*.pyo
 
 %changelog
+* Sun Mar 20 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 0.3.7-6
+- Rebuild for FC4t1
+
 * Sat Mar 12 2005 Toshio Kuratomi <toshio.tiki-lounge.com> 0.3.7-5
 - Add GPL as a license (mschwendt)
 - Use versioned Obsoletes and Provides (mschwendt)



From fedora-extras-commits at redhat.com  Mon Mar 21 15:11:16 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 21 Mar 2005 10:11:16 -0500
Subject: devel/clearlooks clearlooks.spec,1.6,1.7
Message-ID: <200503211511.j2LFBGq0029657@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29650

Modified Files:
	clearlooks.spec 
Log Message:
Upstream update


Index: clearlooks.spec
===================================================================
RCS file: /cvs/extras/devel/clearlooks/clearlooks.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- clearlooks.spec	19 Mar 2005 17:52:45 -0000	1.6
+++ clearlooks.spec	21 Mar 2005 15:11:13 -0000	1.7
@@ -1,11 +1,12 @@
 Name:           clearlooks
-Version:        0.4
-Release:        6
+Version:        0.5
+Release:        1
 Summary:        An attractive GTK+ 2 engine with a focus on usability
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://clearlooks.sourceforge.net/screenshots/
-Source0:        http://prdownloads.sourceforge.net/clearlooks/clearlooks-0.4.tar.bz2
+Source0:        http://prdownloads.sourceforge.net/clearlooks/clearlooks-0.5.tar.bz2
+Source1:        http://www.gnome-look.org/content/files/21237-clearlooks-metacity-0.5.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel libgnome-devel
 
@@ -14,7 +15,7 @@
 usable environment.
 
 %prep
-%setup -q
+%setup -q -a 1
 
 %build
 %configure --enable-animation
@@ -24,6 +25,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+install -D -m 0644 Clearlooks/metacity-1/metacity-theme-1.xml $RPM_BUILD_ROOT%{_datadir}/themes/Clearlooks/metacity-1/metacity-theme-1.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -31,10 +33,15 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING CREDITS ChangeLog NEWS README TODO
+%{_datadir}/icons/*
 %{_datadir}/themes/*
 %{_libdir}/gtk-2.0/2.4.0/engines/*
 
 %changelog
+* Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5-1
+- Upstream update
+- Reintegrated Metacity theme
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4-6
 - %%
 



From fedora-extras-commits at redhat.com  Mon Mar 21 15:15:49 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 21 Mar 2005 10:15:49 -0500
Subject: devel/clearlooks .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200503211515.j2LFFnVM030020@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30012

Modified Files:
	.cvsignore sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/clearlooks/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Mar 2005 16:55:01 -0000	1.2
+++ .cvsignore	21 Mar 2005 15:15:47 -0000	1.3
@@ -1 +1,2 @@
-clearlooks-0.4.tar.bz2
+clearlooks-0.5.tar.bz2
+21237-clearlooks-metacity-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/devel/clearlooks/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Mar 2005 16:55:01 -0000	1.2
+++ sources	21 Mar 2005 15:15:47 -0000	1.3
@@ -1 +1,2 @@
-d714197da50c4eb3c2278f3c786fa996  clearlooks-0.4.tar.bz2
+16ad9981ebbd816d7adfe05aadb0503b  clearlooks-0.5.tar.bz2
+7cad4d05b820260b61d63d3cb361877b  21237-clearlooks-metacity-0.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 21 15:36:07 2005
From: fedora-extras-commits at redhat.com (Dennis Gregorovic (dgregor))
Date: Mon, 21 Mar 2005 10:36:07 -0500
Subject: rpms/perl-Class-MethodMaker/FC-3 .cvsignore, 1.2,
	1.3 perl-Class-MethodMaker.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200503211536.j2LFa7qa030727@cvs-int.fedora.redhat.com>

Author: dgregor

Update of /cvs/extras/rpms/perl-Class-MethodMaker/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30718

Modified Files:
	.cvsignore perl-Class-MethodMaker.spec sources 
Log Message:
upgrade to version 2.06


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Feb 2005 01:23:43 -0000	1.2
+++ .cvsignore	21 Mar 2005 15:36:05 -0000	1.3
@@ -1 +1,2 @@
 Class-MethodMaker-2.05.tar.gz
+Class-MethodMaker-2.06.tar.gz


Index: perl-Class-MethodMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/FC-3/perl-Class-MethodMaker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-MethodMaker.spec	28 Feb 2005 01:23:43 -0000	1.1
+++ perl-Class-MethodMaker.spec	21 Mar 2005 15:36:05 -0000	1.2
@@ -1,14 +1,14 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Class-MethodMaker
-Version:        2.05
-Release:        2
+Version:        2.06
+Release:        1
 Summary:        Perl module for creating generic object-oriented methods
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-MethodMaker/
-Source:         http://www.cpan.org/authors/id/F/FL/FLUFFY/Class-MethodMaker-2.05.tar.gz
+Source:         http://www.cpan.org/authors/id/F/FL/FLUFFY/Class-MethodMaker-2.06.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Feb 2005 01:23:43 -0000	1.2
+++ sources	21 Mar 2005 15:36:05 -0000	1.3
@@ -1 +1,2 @@
 a4092146c05bac58b3f99b3f5d2a9a75  Class-MethodMaker-2.05.tar.gz
+21291a8033091c1f77ecdc339e167802  Class-MethodMaker-2.06.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 21 15:37:59 2005
From: fedora-extras-commits at redhat.com (Dennis Gregorovic (dgregor))
Date: Mon, 21 Mar 2005 10:37:59 -0500
Subject: rpms/perl-Class-MethodMaker/FC-3 perl-Class-MethodMaker.spec, 1.2,
	1.3
Message-ID: <200503211537.j2LFbxMc030810@cvs-int.fedora.redhat.com>

Author: dgregor

Update of /cvs/extras/rpms/perl-Class-MethodMaker/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30802

Modified Files:
	perl-Class-MethodMaker.spec 
Log Message:
added changelog entry


Index: perl-Class-MethodMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/FC-3/perl-Class-MethodMaker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-MethodMaker.spec	21 Mar 2005 15:36:05 -0000	1.2
+++ perl-Class-MethodMaker.spec	21 Mar 2005 15:37:57 -0000	1.3
@@ -52,6 +52,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Mar 21 2005 Dennis Gregorovic <dgregor at redhat.com> - 2.06-1
+- Rebuilt for version 2.06 of source
+
 * Thu Feb 24 2005 Dennis Gregorovic <dgregor at redhat.com> - 2.05-2
 - Incorporated feedback from Jose Pedro Oliveira. (#149637)
 



From fedora-extras-commits at redhat.com  Mon Mar 21 15:41:46 2005
From: fedora-extras-commits at redhat.com (Dennis Gregorovic (dgregor))
Date: Mon, 21 Mar 2005 10:41:46 -0500
Subject: rpms/perl-Class-MethodMaker/devel .cvsignore, 1.2,
	1.3 perl-Class-MethodMaker.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200503211541.j2LFfkHI030913@cvs-int.fedora.redhat.com>

Author: dgregor

Update of /cvs/extras/rpms/perl-Class-MethodMaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30907

Modified Files:
	.cvsignore perl-Class-MethodMaker.spec sources 
Log Message:
upgrade to version 2.06


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Feb 2005 01:23:43 -0000	1.2
+++ .cvsignore	21 Mar 2005 15:41:44 -0000	1.3
@@ -1 +1,2 @@
 Class-MethodMaker-2.05.tar.gz
+Class-MethodMaker-2.06.tar.gz


Index: perl-Class-MethodMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/perl-Class-MethodMaker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-MethodMaker.spec	28 Feb 2005 01:23:43 -0000	1.1
+++ perl-Class-MethodMaker.spec	21 Mar 2005 15:41:44 -0000	1.2
@@ -1,14 +1,14 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Class-MethodMaker
-Version:        2.05
+Version:        2.06
 Release:        2
 Summary:        Perl module for creating generic object-oriented methods
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-MethodMaker/
-Source:         http://www.cpan.org/authors/id/F/FL/FLUFFY/Class-MethodMaker-2.05.tar.gz
+Source:         http://www.cpan.org/authors/id/F/FL/FLUFFY/Class-MethodMaker-2.06.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
@@ -52,6 +52,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Mar 21 2005 Dennis Gregorovic <dgregor at redhat.com> - 2.06-2
+- Rebuilt for version 2.06 of source
+
 * Thu Feb 24 2005 Dennis Gregorovic <dgregor at redhat.com> - 2.05-2
 - Incorporated feedback from Jose Pedro Oliveira. (#149637)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Feb 2005 01:23:43 -0000	1.2
+++ sources	21 Mar 2005 15:41:44 -0000	1.3
@@ -1 +1,2 @@
 a4092146c05bac58b3f99b3f5d2a9a75  Class-MethodMaker-2.05.tar.gz
+21291a8033091c1f77ecdc339e167802  Class-MethodMaker-2.06.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 21 16:03:08 2005
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Mon, 21 Mar 2005 11:03:08 -0500
Subject: rpms/fortune-mod/devel fortune-mod.spec,1.6,1.7
Message-ID: <200503211603.j2LG38Fn032410@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/fortune-mod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32404

Modified Files:
	fortune-mod.spec 
Log Message:
bump version for fc4


Index: fortune-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/devel/fortune-mod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fortune-mod.spec	17 Mar 2005 23:40:55 -0000	1.6
+++ fortune-mod.spec	21 Mar 2005 16:03:06 -0000	1.7
@@ -4,7 +4,7 @@
 Summary: A program which will display a fortune
 Name: fortune-mod
 Version: 1.99.1
-Release: 2
+Release: 3
 URL: http://www.redellipse.net/code/fortune
 License: BSD
 Group: Amusements/Games
@@ -106,6 +106,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Mar 21 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> 1.99.1-3
+- Bump version to 3 for fc4 package
+
 * Mon Mar 14 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> 1.99.1-2
 - Add patch for moving fortunes into offensive directory
 



From fedora-extras-commits at redhat.com  Mon Mar 21 16:18:20 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 21 Mar 2005 11:18:20 -0500
Subject: devel/ktrack ktrack.spec,1.7,1.8
Message-ID: <200503211618.j2LGIKTM000429@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv421

Modified Files:
	ktrack.spec 
Log Message:
Use $QTDIR instead of hard-coding paths


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ktrack.spec	19 Mar 2005 17:52:45 -0000	1.7
+++ ktrack.spec	21 Mar 2005 16:18:18 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 7.rc1
+Release: 8.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -20,7 +20,8 @@
 %patch -p 1 -b .headers
 
 %build
-%configure --with-qt-includes=/usr/lib/qt-3.3/include --with-qt-libraries=/usr/lib/qt-3.3/lib --disable-rpath
+[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+%configure --disable-rpath
 make
 
 %install
@@ -57,6 +58,9 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-8.rc1
+- Use $QTDIR instead of hard-coding paths
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-7.rc1
 - %%
 



From ivazquez at ivazquez.net  Mon Mar 21 19:22:55 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:22:55 -0500
Subject: APPROVED: clearlooks
Message-ID: <1111432975.4045.75.camel@ignacio.ignacio.lan>

clearlooks: An attractive GTK+ 2 engine with a focus on usability

Clearlooks will transform your GNOME desktop into an attractive looking
and usable environment.

Reviewers: Jeremy Katz, Michael Schwendt, Ralf Corsepius, Adrian Reber
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/58331211/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:22:56 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:22:56 -0500
Subject: APPROVED: hamlib
Message-ID: <1111432976.4045.76.camel@ignacio.ignacio.lan>

hamlib: Run-time library to control radio transceivers and receivers

Hamlib provides a standardised programming interface that applications
can use to send the appropriate commands to a radio.

Also included in the package is a simple radio control program 'rigctl',
which lets one control a radio transceiver or receiver, either from
command line interface or in a text-oriented interactive interface.

Reviewers: Jeremy Katz, Michael Schwendt
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/1481b8f9/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:22:57 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:22:57 -0500
Subject: APPROVED: ktrack
Message-ID: <1111432977.4045.77.camel@ignacio.ignacio.lan>

ktrack: Satellite prediction software for KDE

K-Track is an KDE3 satellite prediction software, especially suited for
radio amateurs operating through the satellites that are providing
linear transponders.

Reviewers: Jeremy Katz, Michael Schwendt

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/99ed438c/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:22:57 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:22:57 -0500
Subject: APPROVED: lock-keys-applet
Message-ID: <1111432977.4045.78.camel@ignacio.ignacio.lan>

lock-keys-applet: A GNOME panel applet that shows the status of the lock
keys

lock-keys-applet is a GNOME applet that shows the status of the Caps,
Num and Scroll Lock keys of your keyboard. This isn't especially usefull
for normal keyboards as they have LEDs for that. But some keyboards
(especially wireless keyboards) don't. One more feature of the applet is
that it saves the status of the lock keys and restores them when
starting GNOME.

Reviewers: Jeremy Katz, Michael Schwendt
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/ca599f4c/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:22:58 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:22:58 -0500
Subject: APPROVED: linphone
Message-ID: <1111432979.4045.79.camel@ignacio.ignacio.lan>

linphone: Phone anywhere in the whole world by using the Internet

Linphone is mostly sip compliant. It works successfully with these
implementations:
    * eStara softphone (commercial software for windows)
    * Pingtel phones (with DNS enabled and VLAN QOS support disabled).
    * Hotsip, a free of charge phone for Windows.
    * Vocal, an open source SIP stack from Vovida that includes a SIP
        proxy that works with linphone since version 0.7.1.
    * Siproxd is a free sip proxy being developped by Thomas Ries
        because he would like to have linphone working behind his
        firewall. Siproxd is simple to setup and works perfectly with
        linphone.
    * Partysip aims at being a generic and fully functionnal SIP proxy.
        Visit the web page for more details on its functionalities.

Linphone may work also with other sip phones, but this has not been
tested yet.

Reviewer: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/4a783898/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:00 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:00 -0500
Subject: APPROVED: leafpad
Message-ID: <1111432980.4045.80.camel@ignacio.ignacio.lan>

leafpad: GTK+ based simple text editor

Leafpad is a GTK+ based simple text editor. The user interface is
similar to Notepad. It aims to be lighter than GEdit and KWrite, and to
be as useful as them.

Reviewer: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/e17d46ad/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:01 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:01 -0500
Subject: APPROVED: gpredict
Message-ID: <1111432981.4045.81.camel@ignacio.ignacio.lan>

gpredict: Real-time satellite tracking and orbit prediction program

Gpredict calculates and shows the position of satellites in lists and on
maps. It can also make detailed predictions of upcoming satellites
passes.

Reviewer: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/9c033b45/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:02 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:02 -0500
Subject: APPROVED: ghasher
Message-ID: <1111432982.4045.82.camel@ignacio.ignacio.lan>

ghasher: GUI hasher for GTK+ 2

ghasher can easily show the MD5 sum (or md2, md4, sha1, sha, ripemd160,
dss1) of a file. Motivation for this utility was that users shouldn't
need to open a command line for checking the MD5 sum of files they
download.

Reviewers: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/de7b36ab/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:03 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:03 -0500
Subject: APPROVED: deskbar-applet
Message-ID: <1111432983.4045.83.camel@ignacio.ignacio.lan>

deskbar-applet: A Gnome applet to allow easy access to various search
engines

This applet looks like the current Gnome Mini-Commander, but it launches
search queries instead of programs.

Example search-engines include
+ Google
+ MSN
+ EBay
+ IMDB
+ Stock Quotes
+ Wikipedia
+ Local File Search (and eventually also Beagle)

Reviewer: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/3318d413/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:05 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:05 -0500
Subject: APPROVED: repoml
Message-ID: <1111432985.4045.84.camel@ignacio.ignacio.lan>

repoml: Tools and data for working with RepoML files

Contains:
  - repoml.xsd, an XML Schema for RepoML files
  - repoml.xsl, a stylesheet for converting RepoML files into .repo
      files
  - repoml2repo, a script that invokes repoml.xsl

Reviewer: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/9cc6f3af/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:06 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:06 -0500
Subject: APPROVED: pam_mysql
Message-ID: <1111432986.4045.85.camel@ignacio.ignacio.lan>

pam_mysql: PAM module for auth UNIX users using MySQL data base

Pam_mysql aims to provide a backend neutral means of authenticating
users against an MySQL database.

Reviewers: Jeremy Katz, Brian Pepple
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/4d543c86/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:07 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:07 -0500
Subject: APPROVED: libosip
Message-ID: <1111432987.4045.86.camel@ignacio.ignacio.lan>

libosip: oSIP is an implementation of SIP

SIP stands for the Session Initiation Protocol and is described by the
rfc3261 (wich deprecates rfc2543). This library aims to provide
multimedia and telecom software developers an easy and powerful
interface to initiate and control SIP based sessions in their
applications. SIP is a open standard replacement from IETF for H.323.

Reviewers: Jeremy Katz, Michael Schwendt

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/9d797fd6/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:08 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:08 -0500
Subject: APPROVED: edb
Message-ID: <1111432988.4045.87.camel@ignacio.ignacio.lan>

edb: A database convenience library wrapped around BDB

EDB is a database convenience library wrapped around the Berkeley DB
2.7.7 by Sleepycat Software. It is intended to make accessing database
information portable, easy, fast and efficient.

Reviewer: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/fff60555/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:10 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:10 -0500
Subject: APPROVED: python-HTMLgen
Message-ID: <1111432990.4045.88.camel@ignacio.ignacio.lan>

python-HTMLgen: A class library for the generation of HTML documents

HTMLgen is a class library for the generation of HTML documents with
Python scripts. It's used when you want to create HTML pages containing
information which changes from time to time.

Reviewer: Jeremy Katz
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/65fd0c74/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:11 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:11 -0500
Subject: APPROVED: python-amara
Message-ID: <1111432991.4045.89.camel@ignacio.ignacio.lan>

python-amara: A collection of Pythonic tools for XML data binding

Amara is a collection of Pythonic tools for XML data binding. Not just
tools that happen to be written in Python, but tools built from the
ground up to use Python idioms and take advantage of the many advantages
of Python over other programming languages.

Amara builds on 4Suite, but whereas 4Suite focuses more on literal
implementation of XML standards in Python, Amara adds a much more
Pythonic face to these capabilities.

Reviewers: Jeremy Katz, Michael Schwendt, Ville Skytt?
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/dd22410e/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 19:23:11 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 14:23:11 -0500
Subject: APPROVED: kphone
Message-ID: <1111432991.4045.90.camel@ignacio.ignacio.lan>

kphone: A SIP (Session Initiation Protocol) user agent for Linux

KPhone is a SIP (Session Initiation Protocol) user agent for Linux, with
which you can initiate VoIP (Voice over IP) connections over the
Internet.  It supports Presence and Instant Messaging, and to some
extent also video calls between two hosts.

Reviewers: Jeremy Katz, Michael Schwendt, Ralf Corsepius
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/73dce18b/attachment-0001.sig>

From dag at wieers.com  Mon Mar 21 20:24:42 2005
From: dag at wieers.com (Dag Wieers)
Date: Mon, 21 Mar 2005 21:24:42 +0100 (CET)
Subject: APPROVED: clearlooks
In-Reply-To: <1111432975.4045.75.camel@ignacio.ignacio.lan>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
Message-ID: <Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>

On Mon, 21 Mar 2005, Ignacio Vazquez-Abrams wrote:

> clearlooks: An attractive GTK+ 2 engine with a focus on usability
> 
> Clearlooks will transform your GNOME desktop into an attractive looking
> and usable environment.
> 
> Reviewers: Jeremy Katz, Michael Schwendt, Ralf Corsepius, Adrian Reber
> Maintainer: Ignacio Vazquez-Abrams

Is it ok to package a Gnome theme as 'clearlooks' when it 
will become the default theme in Gnome ? If so, wouldn't 
gnome-themes-clearlooks not be a better name ? Like gnome-themes and 
gnome-themes-extras already set a precedent.

--   dag wieers,  dag at wieers.com,  http://dag.wieers.com/   --
[all I want is a warm bed and a kind word and unlimited power]



From ivazquez at ivazquez.net  Mon Mar 21 20:30:35 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 15:30:35 -0500
Subject: APPROVED: clearlooks
In-Reply-To: <Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
Message-ID: <1111437035.1810.3.camel@ignacio.ignacio.lan>

On Mon, 2005-03-21 at 21:24 +0100, Dag Wieers wrote:
> On Mon, 21 Mar 2005, Ignacio Vazquez-Abrams wrote:
> 
> > clearlooks: An attractive GTK+ 2 engine with a focus on usability
> > 
> > Clearlooks will transform your GNOME desktop into an attractive looking
> > and usable environment.
> > 
> > Reviewers: Jeremy Katz, Michael Schwendt, Ralf Corsepius, Adrian Reber
> > Maintainer: Ignacio Vazquez-Abrams
> 
> Is it ok to package a Gnome theme as 'clearlooks' when it 
> will become the default theme in Gnome ? If so, wouldn't 
> gnome-themes-clearlooks not be a better name ? Like gnome-themes and 
> gnome-themes-extras already set a precedent.

https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00317.html
https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00453.html
https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00569.html

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/c34d4572/attachment-0001.sig>

From bdpepple at ameritech.net  Mon Mar 21 20:46:55 2005
From: bdpepple at ameritech.net (Brian Pepple)
Date: Mon, 21 Mar 2005 15:46:55 -0500
Subject: APPROVED: clearlooks
In-Reply-To: <Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
Message-ID: <1111438015.7533.5.camel@localhost.localdomain>

On Mon, 2005-03-21 at 21:24 +0100, Dag Wieers wrote:
> Is it ok to package a Gnome theme as 'clearlooks' when it 
> will become the default theme in Gnome ? If so, wouldn't 
> gnome-themes-clearlooks not be a better name ? Like gnome-themes and 
> gnome-themes-extras already set a precedent.

Glad to see I'm not the only one bothered by this.

/B
-- 
Brian Pepple <bdpepple at ameritech.net>

gpg --keyserver pgp.mit.edu --recv-keys 810CC15E
BD5E 6F9E 8688 E668 8F5B  CBDE 326A E936 810C C15E
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/5acee4a7/attachment-0001.sig>

From dag at wieers.com  Mon Mar 21 21:21:37 2005
From: dag at wieers.com (Dag Wieers)
Date: Mon, 21 Mar 2005 22:21:37 +0100 (CET)
Subject: APPROVED: clearlooks
In-Reply-To: <1111437035.1810.3.camel@ignacio.ignacio.lan>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
	<1111437035.1810.3.camel@ignacio.ignacio.lan>
Message-ID: <Pine.LNX.4.62.0503212211500.8489@horsea.3ti.be>

On Mon, 21 Mar 2005, Ignacio Vazquez-Abrams wrote:

> On Mon, 2005-03-21 at 21:24 +0100, Dag Wieers wrote:
> > On Mon, 21 Mar 2005, Ignacio Vazquez-Abrams wrote:
> > 
> > > clearlooks: An attractive GTK+ 2 engine with a focus on usability
> > > 
> > > Clearlooks will transform your GNOME desktop into an attractive looking
> > > and usable environment.
> > > 
> > > Reviewers: Jeremy Katz, Michael Schwendt, Ralf Corsepius, Adrian Reber
> > > Maintainer: Ignacio Vazquez-Abrams
> > 
> > Is it ok to package a Gnome theme as 'clearlooks' when it 
> > will become the default theme in Gnome ? If so, wouldn't 
> > gnome-themes-clearlooks not be a better name ? Like gnome-themes and 
> > gnome-themes-extras already set a precedent.
> 
> https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00317.html
> https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00453.html
> https://www.redhat.com/archives/fedora-extras-list/2005-March/msg00569.html

Ok, I've only subscribed this weekend to fedora-extras. (For some 
reason I thought I was already subscribed to every fedora mailinglist, 
but I noticed today I'm still missing the buildsystem mailinglist, 
sigh) None of these mails seem conclusive on the subject and since I was 
subscribed to fedora-packaging I would have expected such a 
discussion/decision there probably.

I think package naming is an important (and the first) part of good 
packaging and I would hate to see a Gnome theme be packaged like an 
application or library. The current guidelines already have some policy 
for plugins and extras, so I think this is an obvious extension to that.

The same is true for Gnome (or other) applets. foo-applet could be an 
applet for a lot of things, so gnome-applet-foo seems a much better 
scheme.

--   dag wieers,  dag at wieers.com,  http://dag.wieers.com/   --
[all I want is a warm bed and a kind word and unlimited power]



From wtogami at redhat.com  Mon Mar 21 21:29:55 2005
From: wtogami at redhat.com (Warren Togami)
Date: Mon, 21 Mar 2005 11:29:55 -1000
Subject: gnome-theme-clearlooks please Re: APPROVED: clearlooks
In-Reply-To: <Pine.LNX.4.62.0503212211500.8489@horsea.3ti.be>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>	<1111437035.1810.3.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212211500.8489@horsea.3ti.be>
Message-ID: <423F3CD3.7050100@redhat.com>

I'm totally OK with this package contents, but can I also add my request 
to rename this package to gnome-theme-clearlooks?

I am working now to add an Obsoletes: (whatever-clearlooks-is-called) to 
gtk2-engines of FC4, but we really should avoid polluting the namespace 
forever with a short package name that existed for only one 
distribution.  "gnome-theme-clearlooks" describes exactly what it is, 
and we should really use it for FC3.

Thoughts?

Warren Togami
wtogami at redhat.com



From ville.skytta at iki.fi  Mon Mar 21 21:31:04 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Mon, 21 Mar 2005 23:31:04 +0200
Subject: gnome-theme-clearlooks please Re: APPROVED: clearlooks
In-Reply-To: <423F3CD3.7050100@redhat.com>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
	<1111437035.1810.3.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212211500.8489@horsea.3ti.be>
	<423F3CD3.7050100@redhat.com>
Message-ID: <1111440664.9841.48.camel@bobcat.mine.nu>

On Mon, 2005-03-21 at 11:29 -1000, Warren Togami wrote:
> I'm totally OK with this package contents, but can I also add my request 
> to rename this package to gnome-theme-clearlooks?

+1, FWIW.



From bdpepple at ameritech.net  Mon Mar 21 21:37:48 2005
From: bdpepple at ameritech.net (Brian Pepple)
Date: Mon, 21 Mar 2005 16:37:48 -0500
Subject: gnome-theme-clearlooks please
In-Reply-To: <423F3CD3.7050100@redhat.com>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
	<1111437035.1810.3.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212211500.8489@horsea.3ti.be>
	<423F3CD3.7050100@redhat.com>
Message-ID: <1111441069.8011.1.camel@localhost.localdomain>

On Mon, 2005-03-21 at 11:29 -1000, Warren Togami wrote:
> I am working now to add an Obsoletes: (whatever-clearlooks-is-called) to 
> gtk2-engines of FC4, but we really should avoid polluting the namespace 
> forever with a short package name that existed for only one 
> distribution.  "gnome-theme-clearlooks" describes exactly what it is, 
> and we should really use it for FC3.

+1 Sounds good.

/B
-- 
Brian Pepple <bdpepple at ameritech.net>

gpg --keyserver pgp.mit.edu --recv-keys 810CC15E
BD5E 6F9E 8688 E668 8F5B  CBDE 326A E936 810C C15E
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/e971c1ab/attachment-0001.sig>

From bugs.michael at gmx.net  Mon Mar 21 21:49:54 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Mon, 21 Mar 2005 22:49:54 +0100
Subject: APPROVED: clearlooks
In-Reply-To: <Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
Message-ID: <20050321224954.75965904.bugs.michael@gmx.net>

On Mon, 21 Mar 2005 21:24:42 +0100 (CET), Dag Wieers wrote:

> On Mon, 21 Mar 2005, Ignacio Vazquez-Abrams wrote:
> 
> > clearlooks: An attractive GTK+ 2 engine with a focus on usability
> > 
> > Clearlooks will transform your GNOME desktop into an attractive looking
> > and usable environment.
> > 
> > Reviewers: Jeremy Katz, Michael Schwendt, Ralf Corsepius, Adrian Reber
> > Maintainer: Ignacio Vazquez-Abrams
> 
> Is it ok to package a Gnome theme as 'clearlooks' when it 
> will become the default theme in Gnome ? If so, wouldn't 
> gnome-themes-clearlooks not be a better name ? Like gnome-themes and 
> gnome-themes-extras already set a precedent.

I'd also like to point out that there is still a difference between
commenting on cvs commits and full reviewing and approving.



From wtogami at redhat.com  Mon Mar 21 21:53:21 2005
From: wtogami at redhat.com (Warren Togami)
Date: Mon, 21 Mar 2005 11:53:21 -1000
Subject: APPROVED: clearlooks
In-Reply-To: <20050321224954.75965904.bugs.michael@gmx.net>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
	<20050321224954.75965904.bugs.michael@gmx.net>
Message-ID: <423F4251.3020809@redhat.com>

Michael Schwendt wrote:
> 
> I'd also like to point out that there is still a difference between
> commenting on cvs commits and full reviewing and approving.
> 

In this case Jeremy seems to give all these packages his approval, but I 
would agree and warn against naming people who do not give an explicit 
"I approve this."

Warren Togami
wtogami at redhat.com



From ville.skytta at iki.fi  Mon Mar 21 21:58:20 2005
From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=)
Date: Mon, 21 Mar 2005 23:58:20 +0200
Subject: APPROVED: cvsps
Message-ID: <1111442300.9841.115.camel@bobcat.mine.nu>

CVSps is a program for generating 'patchset' information from a CVS
repository.  A patchset in this case is defined as a set of changes
made to a collection of files, and all committed at the same time
(using a single 'cvs commit' command).  This information is valuable
to seeing the big picture of the evolution of a cvs project.  While
cvs tracks revision information, it is often difficult to see what
changes were committed 'atomically' to the repository.

Reviewed by: Brian Pepple, Panu Matilainen
Maintainer: Ville Skytt?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/bf9a934e/attachment-0001.sig>

From ivazquez at ivazquez.net  Mon Mar 21 22:03:31 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Mon, 21 Mar 2005 17:03:31 -0500
Subject: APPROVED: clearlooks
In-Reply-To: <423F4251.3020809@redhat.com>
References: <1111432975.4045.75.camel@ignacio.ignacio.lan>
	<Pine.LNX.4.62.0503212121340.8489@horsea.3ti.be>
	<20050321224954.75965904.bugs.michael@gmx.net>
	<423F4251.3020809@redhat.com>
Message-ID: <1111442611.1810.15.camel@ignacio.ignacio.lan>

On Mon, 2005-03-21 at 11:53 -1000, Warren Togami wrote:
> Michael Schwendt wrote:
> > 
> > I'd also like to point out that there is still a difference between
> > commenting on cvs commits and full reviewing and approving.
> > 
> 
> In this case Jeremy seems to give all these packages his approval, but I 
> would agree and warn against naming people who do not give an explicit 
> "I approve this."

My apologies. I guess the distinction between "reviewing" and
"examining" is a bit too fuzzy still, and I misinterpreted what caused
one to be a reviewer.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050321/7d68644c/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Tue Mar 22 20:48:37 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 22 Mar 2005 15:48:37 -0500
Subject: rpms/kphone/FC-3 kphone.spec,1.8,1.9
Message-ID: <200503222048.j2MKmbvn022463@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/kphone/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22455

Modified Files:
	kphone.spec 
Log Message:

add in buildreq for openssl-devel on kphone



Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-3/kphone.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kphone.spec	19 Mar 2005 17:52:45 -0000	1.8
+++ kphone.spec	22 Mar 2005 20:48:34 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        8
+Release:        9
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -11,7 +11,7 @@
 Patch0:         kphone-4.1.0-po-hacks.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils
+BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
 
 %description
 KPhone is a SIP (Session Initiation Protocol) user agent for Linux, with which
@@ -53,6 +53,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Tue Mar 22 2005 Seth Vidal <skvidal at phy.duke.edu> 4.1.0-9
+- add required openssl-devel to buildreqs
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-8
 - %%
 



From fedora-extras-commits at redhat.com  Tue Mar 22 20:52:02 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 22 Mar 2005 15:52:02 -0500
Subject: devel/kphone kphone.spec,1.8,1.9
Message-ID: <200503222052.j2MKq2ko022539@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22533

Modified Files:
	kphone.spec 
Log Message:

openssl-devel to buildreqs in devel branch



Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kphone.spec	19 Mar 2005 17:52:45 -0000	1.8
+++ kphone.spec	22 Mar 2005 20:51:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        8
+Release:        9
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -11,7 +11,7 @@
 Patch0:         kphone-4.1.0-po-hacks.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils
+BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
 
 %description
 KPhone is a SIP (Session Initiation Protocol) user agent for Linux, with which
@@ -53,6 +53,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Tue Mar 22 2005 Seth Vidal <skvidal at phy.duke.edu> 4.1.0-9
+- add openssl-devel to buildreqs
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-8
 - %%
 



From fedora-extras-commits at redhat.com  Tue Mar 22 21:13:10 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 22 Mar 2005 16:13:10 -0500
Subject: rpms/xffm/devel xffm.spec,1.5,1.6
Message-ID: <200503222113.j2MLDAmj023580@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23574

Modified Files:
	xffm.spec 
Log Message:
removed unneeded mandir and added dir to files
removed unneeded ldconfig and la/a files.



Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xffm.spec	20 Mar 2005 21:29:01 -0000	1.5
+++ xffm.spec	22 Mar 2005 21:13:08 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Next generation filemanager and SMB network navigator for Xfce4
 Name: xffm
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
@@ -12,7 +12,6 @@
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Prereq: /sbin/ldconfig
 
 Requires: libxfce4mcs >= %{version}
 Requires: libxfce4util >= %{version}
@@ -43,23 +42,24 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/xffm/*.la
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
 %{_bindir}/*
 %{_libdir}/lib*
 %{_libdir}/pkgconfig/*
+%{_libdir}/xfce4
 %{_libdir}/xfce4/mcs-plugins/*
 %{_libdir}/xfce4/xffm/*
 %{_datadir}/xffm
@@ -69,6 +69,10 @@
 %{_mandir}/man?/*
 
 %changelog
+* Tue Mar 22 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- removed unneeded mandir and added dir to files
+- removed unneeded ldconfig and la/a files. 
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - remove stuff
 



From ivazquez at ivazquez.net  Tue Mar 22 21:52:25 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Tue, 22 Mar 2005 16:52:25 -0500
Subject: rpms/xffm/devel xffm.spec,1.5,1.6
In-Reply-To: <200503222113.j2MLDAmj023580@cvs-int.fedora.redhat.com>
References: <200503222113.j2MLDAmj023580@cvs-int.fedora.redhat.com>
Message-ID: <1111528345.11822.0.camel@ignacio.ignacio.lan>

On Tue, 2005-03-22 at 16:13 -0500, Kevin Fenzi wrote:
> +%{_libdir}/xfce4
>  %{_libdir}/xfce4/mcs-plugins/*
>  %{_libdir}/xfce4/xffm/*

Shouldn't those other 2 lines be removed then?

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050322/1ab0f139/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Wed Mar 23 04:35:53 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 22 Mar 2005 23:35:53 -0500
Subject: rpms/aqhbci-qt-tools/devel aqhbci-qt-tools-build.patch, NONE,
	1.1 aqhbci-qt-tools.spec, 1.5, 1.6
Message-ID: <200503230435.j2N4ZrnR030424@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/aqhbci-qt-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30412

Modified Files:
	aqhbci-qt-tools.spec 
Added Files:
	aqhbci-qt-tools-build.patch 
Log Message:
fix build


aqhbci-qt-tools-build.patch:

--- NEW FILE aqhbci-qt-tools-build.patch ---
--- aqhbci-qt-tools-1.0.1beta/src/libs/dialogs/wizard.cpp.foo	2005-03-22 23:07:15.000000000 -0500
+++ aqhbci-qt-tools-1.0.1beta/src/libs/dialogs/wizard.cpp	2005-03-22 23:07:39.000000000 -0500
@@ -333,7 +333,7 @@
   }
 
   if (rv) {
-    DBG_NOTICE(0, "Pushing page %08x", (unsigned int)p);
+    DBG_NOTICE(0, "Pushing page %08x", (unsigned long)p);
     _pagesDone.push_front(p);
   }
   return rv;
@@ -399,7 +399,7 @@
     bool rv;
 
     p=_pagesDone.front();
-    DBG_NOTICE(0, "Undoing page %08x", (unsigned int)(p));
+    DBG_NOTICE(0, "Undoing page %08x", (unsigned long)(p));
     rv=_undoPage(p);
     if (!rv)
       _pagesDone.pop_front();


Index: aqhbci-qt-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/aqhbci-qt-tools/devel/aqhbci-qt-tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aqhbci-qt-tools.spec	15 Mar 2005 18:58:13 -0000	1.5
+++ aqhbci-qt-tools.spec	23 Mar 2005 04:35:51 -0000	1.6
@@ -1,8 +1,9 @@
 Name: aqhbci-qt-tools
 Summary: Setup wizard and debugger for the HBCI backend for the Aqbanking library
 Version: 1.0.1beta
-Release: 3
+Release: 4
 Source: http://download.sourceforge.net/aqhbci/%{name}-%{version}.tar.gz
+Patch: aqhbci-qt-tools-build.patch
 Group: System Environment/Libraries
 License: GPL
 URL: http://sourceforge.net/projects/aqhbci
@@ -16,6 +17,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 [ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
@@ -37,6 +39,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Tue Mar 22 2005  Bill Nottingham <notting at redhat.com> 1.0.1beta-4
+- fix build on x86-64
+
 * Tue Mar 15 2005  Bill Nottingham <notting at redhat.com> 1.0.1beta-3
 - buildreq qt-devel
 



From fedora-extras-commits at redhat.com  Wed Mar 23 06:32:40 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Wed, 23 Mar 2005 01:32:40 -0500
Subject: devel/anthy anthy.spec,1.4,1.5
Message-ID: <200503230632.j2N6WeNP032357@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/devel/anthy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32351

Modified Files:
	anthy.spec 
Log Message:

modify spec file to make it point to the right version of anthy that is in
the lookaside cache.



Index: anthy.spec
===================================================================
RCS file: /cvs/extras/devel/anthy/anthy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- anthy.spec	22 Mar 2005 08:05:33 -0000	1.4
+++ anthy.spec	23 Mar 2005 06:32:38 -0000	1.5
@@ -1,4 +1,4 @@
-%define	version	6300d
+%define	version	6131
 
 Name:		anthy
 Version:	%{version}



From fedora-extras-commits at redhat.com  Wed Mar 23 11:02:18 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 23 Mar 2005 06:02:18 -0500
Subject: devel/ifplugd ifplugd.spec,1.4,1.5
Message-ID: <200503231102.j2NB2IVS005906@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/ifplugd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5897/ifplugd

Modified Files:
	ifplugd.spec 
Log Message:
Fix real name in changelog entries.


Index: ifplugd.spec
===================================================================
RCS file: /cvs/extras/devel/ifplugd/ifplugd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ifplugd.spec	3 Mar 2005 21:46:21 -0000	1.4
+++ ifplugd.spec	23 Mar 2005 11:02:16 -0000	1.5
@@ -57,29 +57,29 @@
 /sbin/chkconfig --del ifplugd
 
 %changelog
-* Fri Jun 4 2004 <aaron.bennett at olin.edu> - 0:0.24-0.fdr.5
+* Fri Jun 4 2004 Aaron Bennett <aaron.bennett at olin.edu> - 0:0.24-0.fdr.5
 - Capitalized summary tag
 - Added /etc/ifplugd directory
 
-* Thu Jun  3 2004  <aaron.bennett at olin.edu> - 0:0.24-0.fdr.4
+* Thu Jun  3 2004 Aaron Bennett <aaron.bennett at olin.edu> - 0:0.24-0.fdr.4
 - renamed confpatches.patch to ifplugd-0.24-confpatches.patch
 - used %config for /etc/init.d/ifplugd
 - added %config(noreplace) for /etc/ifplugd/*
 - removed patch
 
-* Wed Jun  2 2004  <aaron.bennett at olin.edu> - 0:0.24-0.fdr.3
+* Wed Jun  2 2004 Aaron Bennett <aaron.bennett at olin.edu> - 0:0.24-0.fdr.3
 - Fixed summary
 - added -p option to install
 - added buildrequires
 
-* Tue May 3 2004 <aaron.bennett at olin.edu>
+* Tue May 3 2004 Aaron Bennett <aaron.bennett at olin.edu>
 - Changed Source0 to URL for source
 - signed package
 
-* Mon May 3 2004 <aaron.bennett at olin.edu>
+* Mon May 3 2004 Aaron Bennett <aaron.bennett at olin.edu>
 - Revamped for Fedora.us packaging guidelines
 
-* Wed Mar 31 2004  <abennett at olin.edu>
+* Wed Mar 31 2004 Aaron Bennett <abennett at olin.edu>
 - Initial build.
 
 



From fedora-extras-commits at redhat.com  Wed Mar 23 11:02:18 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 23 Mar 2005 06:02:18 -0500
Subject: devel/libdaemon libdaemon.spec,1.4,1.5
Message-ID: <200503231102.j2NB2I4V005910@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/libdaemon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5897/libdaemon

Modified Files:
	libdaemon.spec 
Log Message:
Fix real name in changelog entries.


Index: libdaemon.spec
===================================================================
RCS file: /cvs/extras/devel/libdaemon/libdaemon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libdaemon.spec	3 Mar 2005 22:41:31 -0000	1.4
+++ libdaemon.spec	23 Mar 2005 11:02:16 -0000	1.5
@@ -48,22 +48,22 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Thu May 13 2004 <aaron.bennett at olin.edu> 0:0.6-0.fdr.4
+* Thu May 13 2004 Aaron Bennett <aaron.bennett at olin.edu> 0:0.6-0.fdr.4
 - Added post and postun scripts to run ldconfig
 - changed group to standard System/Libraries group
 - removed libtool *.la files
 
-* Tue May 4 2004 <aaron.bennett at olin.edu> 0:0.6.-0.fdr.3
+* Tue May 4 2004 Aaron Bennett <aaron.bennett at olin.edu> 0:0.6.-0.fdr.3
 - Signed packaged with GPG key
 
-* Tue May 4 2004 <aaron.bennett at olin.edu> - 0:0.6-0.fdr.2
+* Tue May 4 2004 Aaron Bennett <aaron.bennett at olin.edu> - 0:0.6-0.fdr.2
 - Changed URL and Source tag for Fedora.us packaging compliance
 - Incremented release tag
 
-* Thu Apr 29 2004  <abennett at olin.edu> - 0:0.6-1
+* Thu Apr 29 2004 Aaron Bennett <abennett at olin.edu> - 0:0.6-1
 - Changed to version 0.6 of libdaemon
 
-* Wed Mar 31 2004  <abennett at olin.edu>
+* Wed Mar 31 2004 Aaron Bennett <abennett at olin.edu>
 - Initial build.
 
 



From fedora-extras-commits at redhat.com  Wed Mar 23 12:22:34 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 23 Mar 2005 07:22:34 -0500
Subject: devel/qof qof.spec,1.7,1.8
Message-ID: <200503231222.j2NCMYII007297@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/devel/qof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7291

Modified Files:
	qof.spec 
Log Message:
ltdl is a subpackage of libtool.


Index: qof.spec
===================================================================
RCS file: /cvs/extras/devel/qof/qof.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qof.spec	22 Mar 2005 19:46:47 -0000	1.7
+++ qof.spec	23 Mar 2005 12:22:32 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           qof
 Version:        0.5.0
-Release:        4
+Release:        5
 Summary:        QOF provides a query engine library for C objects
 
 Group:          System Environment/Libraries
@@ -16,7 +16,7 @@
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel
 BuildRequires: intltool
-BuildRequires: ltdl-devel
+BuildRequires: libtool-ltdl-devel
 # Only needed to compile the example programs.  I don't want the compiled
 # programs anyhow so how to get rid of that?
 BuildRequires: gtk2-devel
@@ -108,6 +108,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Mar 23 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.5.0-5
+- ltdl-devel package is libtool-ltdl-devel.
+
 * Tue Mar 22 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.5.0-4
 - BuildRequire ltdl-devel as libtool no longer pulls it in automatically.
 



From adrian at lisas.de  Wed Mar 23 12:35:07 2005
From: adrian at lisas.de (Adrian Reber)
Date: Wed, 23 Mar 2005 13:35:07 +0100
Subject: APPROVED: xlockmore
Message-ID: <20050323123507.GA30131@lisas.de>

Locks the local X display until a password is entered.

Reviewed by: Nils Philippsen
Maintainer: Adrian Reber
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050323/74d896f1/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Wed Mar 23 13:00:44 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 08:00:44 -0500
Subject: rpms/perl-Test-Manifest/FC-3 .cvsignore, 1.3,
	1.4 perl-Test-Manifest.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200503231300.j2ND0ijt007474@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Manifest/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7465/FC-3

Modified Files:
	.cvsignore perl-Test-Manifest.spec sources 
Log Message:
Update to 1.13


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2004 15:25:16 -0000	1.3
+++ .cvsignore	23 Mar 2005 13:00:42 -0000	1.4
@@ -1,2 +1 @@
-Test-Manifest-0.93.tar.gz
-Test-Manifest-1.11.tar.gz
+Test-Manifest-1.13.tar.gz


Index: perl-Test-Manifest.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/FC-3/perl-Test-Manifest.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-Manifest.spec	1 Dec 2004 15:25:16 -0000	1.4
+++ perl-Test-Manifest.spec	23 Mar 2005 13:00:42 -0000	1.5
@@ -1,20 +1,19 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Test-Manifest
-Version:        1.11
+Version:        1.13
 Release:        1
-Epoch:          0
 Summary:        Test case module for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Test-Manifest/
-Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.11.tar.gz
+Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.13.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -62,6 +61,9 @@
 
 
 %changelog
+* Wed Mar 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
+- Update to 1.13.
+
 * Sat Oct 30 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.11-1
 - Update to 1.11.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2004 15:25:16 -0000	1.3
+++ sources	23 Mar 2005 13:00:42 -0000	1.4
@@ -1 +1 @@
-6191645d223be819120b540fdf2c6cc9  Test-Manifest-1.11.tar.gz
+620d7172ff66a9dbe8f08c629ab5e521  Test-Manifest-1.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 23 13:00:44 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 08:00:44 -0500
Subject: rpms/perl-Test-Manifest/devel .cvsignore, 1.3,
	1.4 perl-Test-Manifest.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200503231300.j2ND0iJl007480@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Manifest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7465/devel

Modified Files:
	.cvsignore perl-Test-Manifest.spec sources 
Log Message:
Update to 1.13


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2004 15:25:16 -0000	1.3
+++ .cvsignore	23 Mar 2005 13:00:42 -0000	1.4
@@ -1,2 +1 @@
-Test-Manifest-0.93.tar.gz
-Test-Manifest-1.11.tar.gz
+Test-Manifest-1.13.tar.gz


Index: perl-Test-Manifest.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/perl-Test-Manifest.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Test-Manifest.spec	5 Mar 2005 21:10:23 -0000	1.6
+++ perl-Test-Manifest.spec	23 Mar 2005 13:00:42 -0000	1.7
@@ -1,19 +1,19 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Test-Manifest
-Version:        1.11
+Version:        1.13
 Release:        1
 Summary:        Test case module for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Test-Manifest/
-Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.11.tar.gz
+Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.13.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -55,12 +55,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes
+%doc Changes 
 %{perl_vendorlib}/Test/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Wed Mar 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
+- Update to 1.13.
+
 * Sat Oct 30 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.11-1
 - Update to 1.11.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2004 15:25:16 -0000	1.3
+++ sources	23 Mar 2005 13:00:42 -0000	1.4
@@ -1 +1 @@
-6191645d223be819120b540fdf2c6cc9  Test-Manifest-1.11.tar.gz
+620d7172ff66a9dbe8f08c629ab5e521  Test-Manifest-1.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 23 13:06:13 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 23 Mar 2005 08:06:13 -0500
Subject: devel/qof qof.spec,1.8,1.9
Message-ID: <200503231306.j2ND6Du9008332@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/devel/qof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8326

Modified Files:
	qof.spec 
Log Message:
libtool-ltdl-devel is a BuildRequires for the examples.  Note that.


Index: qof.spec
===================================================================
RCS file: /cvs/extras/devel/qof/qof.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qof.spec	23 Mar 2005 12:22:32 -0000	1.8
+++ qof.spec	23 Mar 2005 13:06:11 -0000	1.9
@@ -16,9 +16,9 @@
 BuildRequires: libxml2-devel
 BuildRequires: glib2-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
-# Only needed to compile the example programs.  I don't want the compiled
-# programs anyhow so how to get rid of that?
 BuildRequires: gtk2-devel
 # Patch1 changes a Makefile.am so we have to regenerate the build files.
 BuildRequires: libtool



From fedora-extras-commits at redhat.com  Wed Mar 23 14:54:11 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 09:54:11 -0500
Subject: rpms/gkrellmms import.log,1.3,1.4
Message-ID: <200503231454.j2NEsBTj009493@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gkrellmms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9484

Modified Files:
	import.log 
Log Message:
auto-import gkrellmms-2.1.22-1 on branch devel from gkrellmms-2.1.22-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 04:24:51 -0000	1.3
+++ import.log	23 Mar 2005 14:54:09 -0000	1.4
@@ -1,2 +1,3 @@
 gkrellmms-2_1_19-0_fdr_1_1:HEAD:gkrellmms-2.1.19-0.fdr.1.1.src.rpm:1099887885
 gkrellmms-2_1_19-0_fdr_1_2:HEAD:gkrellmms-2.1.19-0.fdr.1.2.src.rpm:1099887891
+gkrellmms-2_1_22-1:HEAD:gkrellmms-2.1.22-1.src.rpm:1111589643



From fedora-extras-commits at redhat.com  Wed Mar 23 14:54:12 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 09:54:12 -0500
Subject: rpms/gkrellmms/devel .cvsignore, 1.2, 1.3 gkrellmms.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200503231454.j2NEsB4h009497@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gkrellmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9484/devel

Modified Files:
	.cvsignore gkrellmms.spec sources 
Log Message:
auto-import gkrellmms-2.1.22-1 on branch devel from gkrellmms-2.1.22-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:24:45 -0000	1.2
+++ .cvsignore	23 Mar 2005 14:54:09 -0000	1.3
@@ -1 +1 @@
-gkrellmms-2.1.19.tar.gz
+gkrellmms-2.1.22.tar.gz


Index: gkrellmms.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/devel/gkrellmms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gkrellmms.spec	3 Mar 2005 21:26:02 -0000	1.4
+++ gkrellmms.spec	23 Mar 2005 14:54:09 -0000	1.5
@@ -1,19 +1,20 @@
 %define plugdir %{_libdir}/gkrellm2/plugins
 
 Name:           gkrellmms
-Version:        2.1.19
+Version:        2.1.22
 Release:        1
 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.19.tar.gz
+Source0:        http://gkrellm.luon.net/files/gkrellmms-2.1.22.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-BuildRequires:  gtk+-devel >= 1:1.2.10, gtk2-devel >= 2.0.1, xmms-devel >= 1:1.2.8
+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:1.2.8
+
+Requires:       gkrellm >= 2.0, xmms >= 1.2.8
 
 %description
 GKrellM plugin for controlling XMMS.
@@ -49,6 +50,10 @@
 
 
 %changelog
+* Wed Mar 23 2005 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-1
+- Updated to 2.1.22.
+- Drop epochs from BuildRequires.
+
 * Fri May  7 2004 Brian Pepple <bdpepple at ameritech.net> 0:2.1.19-0.fdr.1
 - Updated to 2.1.19.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:24:45 -0000	1.2
+++ sources	23 Mar 2005 14:54:09 -0000	1.3
@@ -1 +1 @@
-192b5f39094b8bff9a7ccc72dda362b8  gkrellmms-2.1.19.tar.gz
+2739eaf7047d7c8d203111a3c2e7eb17  gkrellmms-2.1.22.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 23 15:08:29 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 10:08:29 -0500
Subject: rpms/gkrellmms/FC-3 .cvsignore, 1.2, 1.3 gkrellmms.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200503231508.j2NF8TbZ010430@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gkrellmms/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10424/FC-3

Modified Files:
	.cvsignore gkrellmms.spec sources 
Log Message:
Update to 2.1.22


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:24:45 -0000	1.2
+++ .cvsignore	23 Mar 2005 15:08:27 -0000	1.3
@@ -1 +1 @@
-gkrellmms-2.1.19.tar.gz
+gkrellmms-2.1.22.tar.gz


Index: gkrellmms.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/FC-3/gkrellmms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gkrellmms.spec	10 Dec 2004 22:03:02 -0000	1.3
+++ gkrellmms.spec	23 Mar 2005 15:08:27 -0000	1.4
@@ -1,35 +1,32 @@
 %define plugdir %{_libdir}/gkrellm2/plugins
 
 Name:           gkrellmms
-Version:        2.1.19
+Version:        2.1.22
 Release:        1
-Epoch:          0
 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.19.tar.gz
+Source0:        http://gkrellm.luon.net/files/gkrellmms-2.1.22.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-BuildRequires:  gtk+-devel >= 1:1.2.10, gtk2-devel >= 0:2.0.1, xmms-devel >= 1:1.2.8
-BuildRequires:	gkrellm-devel, gettext
-Requires:       gkrellm >= 0:2.0, xmms >= 1:1.2.8
+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.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}
 
-# -----------------------------------------------------------------------------
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} enable_nls=1
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -41,21 +38,22 @@
   enable_nls=1
 %find_lang %{name}
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc Changelog README Themes FAQ
 %{plugdir}/*
 
-# -----------------------------------------------------------------------------
 
 %changelog
+* Wed Mar 23 2005 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-1
+- Updated to 2.1.22.
+- Drop epochs from BuildRequires.
+
 * Fri May  7 2004 Brian Pepple <bdpepple at ameritech.net> 0:2.1.19-0.fdr.1
 - Updated to 2.1.19.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:24:45 -0000	1.2
+++ sources	23 Mar 2005 15:08:27 -0000	1.3
@@ -1 +1 @@
-192b5f39094b8bff9a7ccc72dda362b8  gkrellmms-2.1.19.tar.gz
+2739eaf7047d7c8d203111a3c2e7eb17  gkrellmms-2.1.22.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 23 15:52:31 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 23 Mar 2005 10:52:31 -0500
Subject: rpms/tla/devel tla-1.3.1-gcc4.patch,NONE,1.1 tla.spec,1.8,1.9
Message-ID: <200503231552.j2NFqV9J010652@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/tla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10646

Modified Files:
	tla.spec 
Added Files:
	tla-1.3.1-gcc4.patch 
Log Message:
add patch to fix build with gcc4


tla-1.3.1-gcc4.patch:

--- NEW FILE tla-1.3.1-gcc4.patch ---
--- tla-1.3.1/src/hackerlab/vu/vu-virtual-null.c.orig	2005-03-17 11:05:57.000000000 -0800
+++ tla-1.3.1/src/hackerlab/vu/vu-virtual-null.c	2005-03-23 07:17:29.041691253 -0800
@@ -58,7 +58,7 @@
 static int vu_virtual_null_move_state (int * errn, int fd, int newfd, void * closure);
 
 
-static struct vu_fs_discipline vu_virtual_null_vtable
+struct vu_fs_discipline vu_virtual_null_vtable
   = { VU_FS_DISCIPLINE_INITIALIZERS (vu_virtual_null_) };
 
 /************************************************************************


Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tla.spec	22 Mar 2005 19:39:20 -0000	1.8
+++ tla.spec	23 Mar 2005 15:52:29 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           tla
 Version:        1.3.1
-Release:        2
+Release:        3
 Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
@@ -14,6 +14,7 @@
 Patch1:         tla-1.2-texi.diff
 Patch2:         tla-sysneon.patch
 Patch3:         tla-1.2-alt-texinfo.patch
+Patch4:         tla-1.3.1-gcc4.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -40,6 +41,7 @@
 rm -rf src/tla/libneon
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -94,6 +96,9 @@
 
 
 %changelog
+* Wed Mar 23 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.1-3
+- gcc4 build fixes
+
 * Tue Mar 22 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.1-2
 - Add BuildRequires which to fix building under mach
 



From fedora-extras-commits at redhat.com  Wed Mar 23 15:52:42 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 23 Mar 2005 10:52:42 -0500
Subject: rpms/bzflag/devel .cvsignore, 1.2, 1.3 bzflag.spec, 1.5, 1.6 sources,
	1.2, 1.3
Message-ID: <200503231552.j2NFqgsK010683@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10675

Modified Files:
	.cvsignore bzflag.spec sources 
Log Message:
version 2.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Mar 2005 14:10:26 -0000	1.2
+++ .cvsignore	23 Mar 2005 15:52:40 -0000	1.3
@@ -1 +1 @@
-bzflag-2.0.0.20050117.tar.bz2
+bzflag-2.0.2.20050318.tar.bz2


Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bzflag.spec	15 Mar 2005 15:49:29 -0000	1.5
+++ bzflag.spec	23 Mar 2005 15:52:40 -0000	1.6
@@ -1,10 +1,10 @@
 %define desktop_vendor fedora
-%define date           20050117
+%define date           20050318
 
 Summary: 3D multi-player tank battle game
 Name: bzflag
-Version: 2.0.0
-Release: 4
+Version: 2.0.2
+Release: 1
 License: GPL
 Group: Amusements/Games
 URL: http://bzflag.org
@@ -65,6 +65,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Mar 23 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.2-1
+- version 2.0.2
+
 * Tue Mar 15 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-4
 - buildrequire bc for curl version check
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 14:10:26 -0000	1.2
+++ sources	23 Mar 2005 15:52:40 -0000	1.3
@@ -1 +1 @@
-16da32cfaac130bf68ca156d0dec2b2e  bzflag-2.0.0.20050117.tar.bz2
+d4a72c6e85299fb72d5e8ab7450b31c3  bzflag-2.0.2.20050318.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar 23 16:41:01 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 11:41:01 -0500
Subject: rpms/xffm/devel xffm.spec,1.6,1.7
Message-ID: <200503231641.j2NGf1Tj011774@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11768

Modified Files:
	xffm.spec 
Log Message:
removed some unneeded directories. 



Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xffm.spec	22 Mar 2005 21:13:08 -0000	1.6
+++ xffm.spec	23 Mar 2005 16:40:59 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Next generation filemanager and SMB network navigator for Xfce4
 Name: xffm
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
@@ -60,8 +60,6 @@
 %{_libdir}/lib*
 %{_libdir}/pkgconfig/*
 %{_libdir}/xfce4
-%{_libdir}/xfce4/mcs-plugins/*
-%{_libdir}/xfce4/xffm/*
 %{_datadir}/xffm
 %{_datadir}/xfce4/*
 %{_datadir}/applications/*
@@ -69,6 +67,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.FC4
+- removed unneeded directories
+
 * Tue Mar 22 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - removed unneeded mandir and added dir to files
 - removed unneeded ldconfig and la/a files. 



From fedora-extras-commits at redhat.com  Wed Mar 23 19:52:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 23 Mar 2005 14:52:59 -0500
Subject: devel/edb edb.spec,1.5,1.6
Message-ID: <200503231952.j2NJqxgR014826@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/edb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14818

Modified Files:
	edb.spec 
Log Message:
Fix build error on GTK+ frontend


Index: edb.spec
===================================================================
RCS file: /cvs/extras/devel/edb/edb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- edb.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ edb.spec	23 Mar 2005 19:52:57 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           edb
 Version:        1.0.5
-Release:        5
+Release:        6
 Summary:        A database convenience library wrapped around BDB
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://enlightenment.org/index.php?id=23
 Source0:        http://prdownloads.sourceforge.net/enlightenment/edb-1.0.5.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gtk+-devel, ncurses-devel zlib-devel 
+BuildRequires:  gtk+-devel, ncurses-devel zlib-devel which
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -85,6 +85,9 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-6
+- Added which to BuildRequires
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-5
 - %%
 



From shahms at shahms.com  Wed Mar 23 20:03:40 2005
From: shahms at shahms.com (Shahms King)
Date: Wed, 23 Mar 2005 12:03:40 -0800
Subject: APPROVED: python-{protocols, psycopg, simpletal, tpg, psyco}
Message-ID: <1111608220.12534.19.camel@shahms.mesd.k12.or.us>

python-protocols -- 
PyProtocols 'adapt()' implementation

Reviewed By: Ignacio Vazquez-Abrams
Maintainer: Shahms King

--------------------------------------------------
python-psycopg   --
Alternative high-speed Postgres DB adapter

Reviewed By: Ignacio Vazquez-Abrams
Maintainer: Shahms King

--------------------------------------------------
python-simpletal -- 
Alternative implementation of Zope Page Templates

Reviewed By: Ignacio Vazquez-Abrams
Maintainer: Shahms King

--------------------------------------------------
python-tpg       -- 
Toy Parser Generator

Reviewed By: Ignacio Vazquez-Abrams
Maintainer: Shahms King

--------------------------------------------------
python-psyco     -- 
Python specializing compiler

Reviewed By: Ignacio Vazquez-Abrams
Maintainer: Shahms King

-- 
Shahms E. King <shahms at shahms.com>
Multnomah ESD

Public Key:
http://shahms.mesd.k12.or.us/~sking/shahms.asc
Fingerprint:
1612 054B CE92 8770 F1EA  AB1B FEAB 3636 45B2 D75B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050323/a361aac4/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Wed Mar 23 20:20:52 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 15:20:52 -0500
Subject: rpms/xfwm4/devel xfwm4.spec,1.3,1.4
Message-ID: <200503232020.j2NKKqWS015803@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15797

Modified Files:
	xfwm4.spec 
Log Message:
Removed unneeded a/la files



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfwm4.spec	20 Mar 2005 22:50:50 -0000	1.3
+++ xfwm4.spec	23 Mar 2005 20:20:50 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2
@@ -36,7 +36,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 
 %find_lang %{name}
 
@@ -55,6 +58,9 @@
 %{_datadir}/themes
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Removed unneeded a/la files
+
 * Sun Mar 20 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
 - Readded changelogs
 - Split old fedora patch into a bluecurve-prep and bluecurve patch and applied



From fedora-extras-commits at redhat.com  Wed Mar 23 20:46:55 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 15:46:55 -0500
Subject: rpms/xfdesktop/devel xfdesktop-image-4.2.1.patch, NONE,
	1.1 xfdesktop.spec, 1.4, 1.5
Message-ID: <200503232046.j2NKktD4016292@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16286

Modified Files:
	xfdesktop.spec 
Added Files:
	xfdesktop-image-4.2.1.patch 
Log Message:
Removed unneeded a/la files
Rediffed xfdesktop-image patch against current version and applied


xfdesktop-image-4.2.1.patch:

--- NEW FILE xfdesktop-image-4.2.1.patch ---
diff -Nur xfdesktop-4.2.1.orig/common/xfdesktop-common.h xfdesktop-4.2.1/common/xfdesktop-common.h
--- xfdesktop-4.2.1.orig/common/xfdesktop-common.h	2005-01-09 14:18:36.000000000 -0700
+++ xfdesktop-4.2.1/common/xfdesktop-common.h	2005-03-23 13:31:20.448625169 -0700
@@ -28,7 +28,8 @@
 #include <glib.h>
 
 #define BACKDROP_CHANNEL         "BACKDROP"
-#define DEFAULT_BACKDROP         DATADIR "/xfce4/backdrops/xfce-smoke.png"
+/* Use Fedora (tm) default background image */
+#define DEFAULT_BACKDROP         DATADIR "/backgrounds/images/default.png"
 #define LIST_TEXT                "# xfce backdrop list"
 #define XFDESKTOP_SELECTION_FMT  "XFDESKTOP_SELECTION_%d"
 #define XFDESKTOP_IMAGE_FILE_FMT "XFDESKTOP_IMAGE_FILE_%d"
diff -Nur xfdesktop-4.2.1.orig/settings/backdrop_settings.c xfdesktop-4.2.1/settings/backdrop_settings.c
--- xfdesktop-4.2.1.orig/settings/backdrop_settings.c	2005-01-10 03:05:16.000000000 -0700
+++ xfdesktop-4.2.1/settings/backdrop_settings.c	2005-03-23 13:33:09.725725691 -0700
@@ -242,10 +242,10 @@
 				bp->color1.blue = setting->data.v_color.blue;
 				bp->color1.alpha = setting->data.v_color.alpha;
 			} else {
-				/* Just a color by default #1f3f6f - That number looks cool :) */
-				bp->color1.red = (guint16)0x1f00;
-				bp->color1.green = (guint16)0x3f00;
-				bp->color1.blue = (guint16)0x6f00;
+                                /* Use Fedora (tm) default background color */
+                               bp->color1.red = (guint16) 0x2600;
+                               bp->color1.green = (guint16) 0x3200;
+                               bp->color1.blue  = (guint16) 0x4c00;
 				bp->color1.alpha = (guint16)0xffff;
 				mcs_manager_set_color(mcs_plugin->manager, setting_name,
 						BACKDROP_CHANNEL, &bp->color1);


Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfdesktop.spec	20 Mar 2005 22:41:19 -0000	1.4
+++ xfdesktop.spec	23 Mar 2005 20:46:53 -0000	1.5
@@ -1,13 +1,13 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.2.1
-Release: 1.FC4
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz/xfdesktop-4.2.1.tar.bz2
 
 # Change default for Fedora
-Patch1: xfdesktop-image.patch
+Patch0: xfdesktop-image-4.2.1.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,7 +28,7 @@
 %prep
 %setup -q
 
-#%patch1 -p1 -b .fedora
+%patch0 -p1 -b .fedora
 
 %build
 %configure
@@ -38,9 +38,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.la
 
 %find_lang %{name}
 
@@ -62,6 +63,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
+- Removed unneeded a/la files
+- Rediffed xfdesktop-image patch against current version and applied
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Wed Mar 23 21:13:27 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 16:13:27 -0500
Subject: rpms/xfce-utils/devel xfce-utils.spec,1.2,1.3
Message-ID: <200503232113.j2NLDRUd017173@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17167

Modified Files:
	xfce-utils.spec 
Log Message:
Removed unneeded la/a files



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce-utils.spec	20 Mar 2005 08:49:48 -0000	1.2
+++ xfce-utils.spec	23 Mar 2005 21:13:25 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
 Version: 4.2.1
-Release: 1.FC4
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-utils-4.2.1.tar.bz2
@@ -39,6 +39,9 @@
 
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/
 
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
+
 %find_lang %{name}
 
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11
@@ -59,6 +62,9 @@
 %{xsessiondir}/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
+- Removed unneeded la/a files
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 



From fedora-extras-commits at redhat.com  Wed Mar 23 21:32:46 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 16:32:46 -0500
Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins.spec,1.2,1.3
Message-ID: <200503232132.j2NLWkeX017289@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17283

Modified Files:
	xfce-mcs-plugins.spec 
Log Message:
Removed unneeded la/a files



Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce-mcs-plugins.spec	20 Mar 2005 08:47:57 -0000	1.2
+++ xfce-mcs-plugins.spec	23 Mar 2005 21:32:44 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-plugins-4.2.1.tar.bz2
@@ -32,6 +32,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 %find_lang %{name}
 
 %clean
@@ -47,6 +49,9 @@
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Removed unneeded la/a files
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - remove explicit gtk2 req
 



From fedora-extras-commits at redhat.com  Wed Mar 23 21:35:49 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 23 Mar 2005 16:35:49 -0500
Subject: devel/linphone linphone-0.12.2-pkgconfig.patch, NONE,
	1.1 linphone.spec, 1.5, 1.6
Message-ID: <200503232135.j2NLZnW6017327@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17321

Modified Files:
	linphone.spec 
Added Files:
	linphone-0.12.2-pkgconfig.patch 
Log Message:
Fix build on x86_64

linphone-0.12.2-pkgconfig.patch:

--- NEW FILE linphone-0.12.2-pkgconfig.patch ---
--- linphone-0.12.2/share/Makefile.in.orig	2005-03-23 16:26:52.922690626 -0500
+++ linphone-0.12.2/share/Makefile.in	2005-03-23 16:27:13.949932428 -0500
@@ -184,7 +184,7 @@
 confexdir = $(datadir)/linphonec
 confex_DATA = linphonec
 
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = linphone.pc
 
 EXTRA_DIST = $(LINPHONE_SOUNDS) \


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linphone.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ linphone.spec	23 Mar 2005 21:35:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        5
+Release:        6
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -9,6 +9,7 @@
 Source0:        http://simon.morlat.free.fr/download/0.12.2/source/linphone-0.12.2.tar.gz
 Patch:          linphone-0.12.2-docs.patch
 Patch1:         linphone-0.12.2-speex.patch
+Patch2:         linphone-0.12.2-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
@@ -42,6 +43,7 @@
 %setup -q
 %patch -p 1 -b .docs
 %patch1 -p 1 -b .speex
+%patch2 -p 1 -b .pkgconfig
 rm -r $RPM_BUILD_DIR/linphone-0.12.2/oRTP/docs
 rm -r $RPM_BUILD_DIR/linphone-0.12.2/speex
 
@@ -85,6 +87,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-6
+- Fix build on x86_64
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-5
 - %%
 



From fedora-extras-commits at redhat.com  Wed Mar 23 21:41:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 16:41:42 -0500
Subject: rpms/xfce4-trigger-launcher/devel xfce4-trigger-launcher.spec, 1.2,
	1.3
Message-ID: <200503232141.j2NLfgqc017374@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17368

Modified Files:
	xfce4-trigger-launcher.spec 
Log Message:
Removed unneeded la/a files



Index: xfce4-trigger-launcher.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-trigger-launcher/devel/xfce4-trigger-launcher.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-trigger-launcher.spec	21 Mar 2005 01:42:26 -0000	1.2
+++ xfce4-trigger-launcher.spec	23 Mar 2005 21:41:40 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: A panel plugin acting as a launcher with two states
 Name: xfce4-trigger-launcher
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-trigger-launcher-4.2.1.tar.bz2
@@ -28,6 +28,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
+
 %find_lang %{name}
 
 %clean
@@ -39,6 +42,9 @@
 %{_libdir}/xfce4/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Removed uneeded la/a files
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - fix BuildReqs
 



From fedora-extras-commits at redhat.com  Wed Mar 23 21:46:22 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 16:46:22 -0500
Subject: rpms/xfce4-toys/devel xfce4-toys.spec,1.2,1.3
Message-ID: <200503232146.j2NLkMsw017411@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17405

Modified Files:
	xfce4-toys.spec 
Log Message:
Removed unneeded la/a files. 



Index: xfce4-toys.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-toys/devel/xfce4-toys.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-toys.spec	21 Mar 2005 01:32:14 -0000	1.2
+++ xfce4-toys.spec	23 Mar 2005 21:46:20 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Various tools for Xfce4
 Name: xfce4-toys
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-toys-4.2.1.tar.bz2
@@ -29,6 +29,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
 %find_lang %{name}
 
 %clean
@@ -44,6 +46,9 @@
 %{_datadir}/xfce4/tips/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at scrye.com> - 4.2.1-3.FC4
+- Removed uneeded la/a files
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - fix BuildReqs
 



From fedora-extras-commits at redhat.com  Wed Mar 23 22:19:46 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 23 Mar 2005 17:19:46 -0500
Subject: rpms/pure-ftpd/FC-3 pure-ftpd.pure-ftpwho.consoleapp, NONE,
	1.1 pure-ftpd.pure-ftpwho.pam, NONE, 1.1 pure-ftpd.init, 1.1,
	1.2 pure-ftpd.spec, 1.2, 1.3
Message-ID: <200503232219.j2NMJkCw018291@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18282/FC-3

Modified Files:
	pure-ftpd.init pure-ftpd.spec 
Added Files:
	pure-ftpd.pure-ftpwho.consoleapp pure-ftpd.pure-ftpwho.pam 
Log Message:
- implement Jose's RFE in bug 151337: pure-ftpwho can be run by a normal user.
- change release tag for FC3/FC4



--- NEW FILE pure-ftpd.pure-ftpwho.consoleapp ---
USER=root
PROGRAM=/usr/sbin/pure-ftpwho
GUI=no


--- NEW FILE pure-ftpd.pure-ftpwho.pam ---
#%PAM-1.0
auth       sufficient   pam_rootok.so
auth       required     pam_localuser.so
account    required     pam_permit.so


Index: pure-ftpd.init
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/FC-3/pure-ftpd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pure-ftpd.init	13 Mar 2005 21:45:54 -0000	1.1
+++ pure-ftpd.init	23 Mar 2005 22:19:44 -0000	1.2
@@ -10,6 +10,8 @@
 
 # Source function library.
 . /etc/init.d/functions
+
+# Source networking configuration.
 . /etc/sysconfig/network
 
 # Check that networking is configured.


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/FC-3/pure-ftpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pure-ftpd.spec	13 Mar 2005 21:49:29 -0000	1.2
+++ pure-ftpd.spec	23 Mar 2005 22:19:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.20
-Release:    1
+Release:    2.fc3
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -10,6 +10,8 @@
 Source1:    pure-ftpd.init 
 Source2:    pure-ftpd.logrotate
 Source3:    pure-ftpd.xinetd
+Source4:    pure-ftpd.pure-ftpwho.pam
+Source5:    pure-ftpd.pure-ftpwho.consoleapp
 Patch0:     pure-ftpd-1.0.20-config.patch
 Patch1:     pure-ftpd-1.0.20-libdir.patch
 Provides:   ftpserver
@@ -23,7 +25,7 @@
 Requires(post):   chkconfig
 Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
-Requires:   logrotate
+Requires:   logrotate, usermode
 
 
 %description
@@ -83,7 +85,7 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8/
+install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8
 install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
 install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -112,17 +114,23 @@
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 # Pam 
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -p -m 644 pam/pure-ftpd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
 
 # Logrotate
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
 # xinetd support
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
 
+# pure-ftpwho and non-root users
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
+install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pure-ftpwho
+install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/pure-ftpwho
+ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/pure-ftpwho
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -158,11 +166,18 @@
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
+%config %{_sysconfdir}/pam.d/pure-ftpwho
+%config %{_sysconfdir}/security/console.apps/pure-ftpwho
 %{_mandir}/man8/*
 %dir /var/ftp/
 
 
 %changelog
+* Wed Mar 23 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.20-2
+- implement Jose's RFE in bug 151337: pure-ftpwho can be run
+  by a normal user.
+- change release tag for FC3
+
 * Sun Mar 13 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.20-1
 - adapt to Fedora Extras (drop Epoch, change Release tag)
 



From fedora-extras-commits at redhat.com  Wed Mar 23 22:19:46 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 23 Mar 2005 17:19:46 -0500
Subject: rpms/pure-ftpd/devel pure-ftpd.init,1.1,1.2 pure-ftpd.spec,1.2,1.3
Message-ID: <200503232219.j2NMJkeb018296@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18282/devel

Modified Files:
	pure-ftpd.init pure-ftpd.spec 
Log Message:
- implement Jose's RFE in bug 151337: pure-ftpwho can be run by a normal user.
- change release tag for FC3/FC4



Index: pure-ftpd.init
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pure-ftpd.init	13 Mar 2005 21:45:54 -0000	1.1
+++ pure-ftpd.init	23 Mar 2005 22:19:44 -0000	1.2
@@ -10,6 +10,8 @@
 
 # Source function library.
 . /etc/init.d/functions
+
+# Source networking configuration.
 . /etc/sysconfig/network
 
 # Check that networking is configured.


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pure-ftpd.spec	13 Mar 2005 21:49:29 -0000	1.2
+++ pure-ftpd.spec	23 Mar 2005 22:19:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.20
-Release:    1
+Release:    2.fc4
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -10,6 +10,8 @@
 Source1:    pure-ftpd.init 
 Source2:    pure-ftpd.logrotate
 Source3:    pure-ftpd.xinetd
+Source4:    pure-ftpd.pure-ftpwho.pam
+Source5:    pure-ftpd.pure-ftpwho.consoleapp
 Patch0:     pure-ftpd-1.0.20-config.patch
 Patch1:     pure-ftpd-1.0.20-libdir.patch
 Provides:   ftpserver
@@ -23,7 +25,7 @@
 Requires(post):   chkconfig
 Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
-Requires:   logrotate
+Requires:   logrotate, usermode
 
 
 %description
@@ -83,7 +85,7 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8/
+install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8
 install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
 install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -112,17 +114,23 @@
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 # Pam 
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -p -m 644 pam/pure-ftpd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
 
 # Logrotate
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
 # xinetd support
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
 
+# pure-ftpwho and non-root users
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
+install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pure-ftpwho
+install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/pure-ftpwho
+ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/pure-ftpwho
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -158,11 +166,18 @@
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
+%config %{_sysconfdir}/pam.d/pure-ftpwho
+%config %{_sysconfdir}/security/console.apps/pure-ftpwho
 %{_mandir}/man8/*
 %dir /var/ftp/
 
 
 %changelog
+* Wed Mar 23 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.20-2.fc4
+- implement Jose's RFE in bug 151337: pure-ftpwho can be run
+  by a normal user.
+- change release tag for FC4
+
 * Sun Mar 13 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.20-1
 - adapt to Fedora Extras (drop Epoch, change Release tag)
 



From fedora-extras-commits at redhat.com  Wed Mar 23 22:52:58 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Wed, 23 Mar 2005 17:52:58 -0500
Subject: devel/gazpacho gazpacho.spec,1.5,1.6
Message-ID: <200503232252.j2NMqwnO018375@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/devel/gazpacho
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18368

Modified Files:
	gazpacho.spec 
Log Message:

increment release for rebuild with python 2.4



Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/devel/gazpacho/gazpacho.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gazpacho.spec	16 Mar 2005 16:38:44 -0000	1.5
+++ gazpacho.spec	23 Mar 2005 22:52:56 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Glade Interface Creator
 Name: gazpacho
 Version: 0.5.2
-Release: 1
+Release: 2
 License: GPL
 Group: Development/Tools
 URL: http://gruppy.sicem.biz/descargas
@@ -39,6 +39,9 @@
 
 
 %changelog
+* Wed Mar 23 2005 Seth Vidal <skvidal at phy.duke.edu> - 0.5.2-2
+- increment release for rebuild on python 2.4
+
 * Mon Feb 21 2005 Jeremy Katz <katzj at redhat.com> - 0.5.2-1
 - update to 0.5.2
 



From fedora-extras-commits at redhat.com  Wed Mar 23 23:10:26 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 23 Mar 2005 18:10:26 -0500
Subject: devel/lock-keys-applet lock-keys-applet.spec,1.5,1.6
Message-ID: <200503232310.j2NNAQCs019267@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/lock-keys-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19260

Modified Files:
	lock-keys-applet.spec 
Log Message:
Added scrollkeeper to BuildRequires


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/extras/devel/lock-keys-applet/lock-keys-applet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lock-keys-applet.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ lock-keys-applet.spec	23 Mar 2005 23:10:24 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        5
+Release:        6
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
 License:        GPL
 URL:            http://mfcn.ilo.de/led_applet/
 Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgnomeui-devel gnome-panel-devel
+BuildRequires:  libgnomeui-devel gnome-panel-devel scrollkeeper
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -49,6 +49,9 @@
 %{_libexecdir}/%{name}
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-6
+- Added scrollkeeper to BuildRequires
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-5
 - %%
 



From fedora-extras-commits at redhat.com  Wed Mar 23 23:22:40 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 23 Mar 2005 18:22:40 -0500
Subject: devel/pam_mysql pam_mysql-0.5-vars.patch, NONE, 1.1 pam_mysql.spec,
	1.2, 1.3
Message-ID: <200503232322.j2NNMeqA019378@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/pam_mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19370

Modified Files:
	pam_mysql.spec 
Added Files:
	pam_mysql-0.5-vars.patch 
Log Message:
Fixed build on x86_64

pam_mysql-0.5-vars.patch:

--- NEW FILE pam_mysql-0.5-vars.patch ---
--- pam_mysql/Makefile.orig	2005-03-23 18:17:08.885220061 -0500
+++ pam_mysql/Makefile	2005-03-23 18:18:08.427578059 -0500
@@ -1,15 +1,16 @@
 # Convenient defaults for compiling independently of the full source
 # tree.
 ifndef FULL_LINUX_PAM_SOURCE_TREE
-export DYNAMIC=-DPAM_DYNAMIC
-export CC=gcc
-export CFLAGS=-O2 -Dlinux -DLINUX_PAM \
-       -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
-       -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \
-       -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \
-       -Wshadow -pedantic -fPIC
-export MKDIR=mkdir -p
-export LD_D=gcc -shared -Xlinker -x -L/usr/lib/mysql -lz
+DYNAMIC=-DPAM_DYNAMIC
+CC=gcc
+CFLAGS=-O2 -Dlinux -DLINUX_PAM \
+  -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
+  -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \
+  -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \
+  -Wshadow -pedantic -fPIC
+MKDIR=mkdir -p
+LIBDIR=/usr/lib
+LD_D=gcc -shared -Xlinker -x -L$(LIBDIR)/mysql -lz
 endif
 
 #


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/devel/pam_mysql/pam_mysql.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam_mysql.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ pam_mysql.spec	23 Mar 2005 23:22:38 -0000	1.3
@@ -1,10 +1,11 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
 Name:		pam_mysql
 Version:	0.50
-Release:	3
+Release:	4
 License:	GPL
 Group:		Base
 Source0:	http://dl.sf.net/pam-mysql/pam_mysql-0.5.tar.gz
+Patch:		pam_mysql-0.5-vars.patch
 URL:		http://sf.net/projects/pam-mysql/
 BuildRequires:	pam-devel mysql-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
@@ -15,9 +16,10 @@
 
 %prep
 %setup -q -n %{name}
+%patch -p 1 -b .vars
 
 %build
-make
+make LIBDIR=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -32,6 +34,9 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-4
+- Fixed build on x86_64
+
 * Wed Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-3
 - Removed explicit Requires
 - Removed Polish Summary and Description



From fedora-extras-commits at redhat.com  Wed Mar 23 23:28:07 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 23 Mar 2005 18:28:07 -0500
Subject: devel/hamlib hamlib-bindings.patch,1.1,1.2 hamlib.spec,1.7,1.8
Message-ID: <200503232328.j2NNS7XU019449@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19443

Modified Files:
	hamlib-bindings.patch hamlib.spec 
Log Message:
Fixed Python binding

hamlib-bindings.patch:

Index: hamlib-bindings.patch
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib-bindings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hamlib-bindings.patch	16 Mar 2005 17:05:32 -0000	1.1
+++ hamlib-bindings.patch	23 Mar 2005 23:28:05 -0000	1.2
@@ -14,7 +14,7 @@
  pyexecdir = @pyexecdir@
  
 -pythondir = $(prefix)/lib/python
-+pythondir = $(prefix)/lib/python2.3
++pythondir = $(libdir)/python2.3
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  subdirs = @subdirs@


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hamlib.spec	21 Mar 2005 18:36:05 -0000	1.7
+++ hamlib.spec	23 Mar 2005 23:28:05 -0000	1.8
@@ -1,6 +1,8 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Name: hamlib
 Version: 1.2.3
-Release: 7
+Release: 8
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transceivers and receivers
@@ -62,12 +64,13 @@
 %package python
 Summary: Hamlib radio control library Python binding
 Group: Development/Libraries
+Requires: python-abi = %(%{__python} -c 'import sys;print(sys.version[:3])')
 
 %description python
 Hamlib Python Language bindings to allow radio control from Python scripts.
 
 %prep
-%setup
+%setup -q
 %patch -p1
 %patch1 -p1
 %build
@@ -109,6 +112,7 @@
         sharedstatedir=$RPM_BUILD_ROOT%{_sharedstatedir} \
         mandir=$RPM_BUILD_ROOT%{_mandir} \
         infodir=$RPM_BUILD_ROOT%{_infodir} \
+        pythondir=$RPM_BUILD_ROOT%{python_sitelib} \
    install-pythonPYTHON
 
 # Install PERL 
@@ -182,9 +186,7 @@
 
 %files python
 %defattr(-, root, root)
-%{_libdir}/python2.3/Hamlib.py
-%{_libdir}/python2.3/Hamlib.pyc
-%{_libdir}/python2.3/Hamlib.pyo
+%{python_sitelib}/*.py*
 
 %files devel
 %defattr(-, root, root)
@@ -201,6 +203,10 @@
 
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-8
+- Added -q to %%setup
+- Fixed Python binding build and Requires
+
 * Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-7
 - Removed spurious period and spelling mistake in Summary
 



From fedora-extras-commits at redhat.com  Wed Mar 23 23:44:34 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 23 Mar 2005 18:44:34 -0500
Subject: devel/sylpheed-claws .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 sylpheed-claws.spec, 1.8, 1.9
Message-ID: <200503232344.j2NNiYV3019569@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/devel/sylpheed-claws
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19560

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- Version upgrade
- Fixes possible security vulnerability (see CAN-2005-0667)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Feb 2005 12:41:13 -0000	1.3
+++ .cvsignore	23 Mar 2005 23:44:32 -0000	1.4
@@ -1 +1 @@
-sylpheed-claws-1.0.1.tar.bz2
+sylpheed-claws-1.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2005 12:41:14 -0000	1.4
+++ sources	23 Mar 2005 23:44:32 -0000	1.5
@@ -1 +1 @@
-c297d397f99d97234df787dca61aa48e  sylpheed-claws-1.0.1.tar.bz2
+dba57595e89eef963a932ed5ea39c2a2  sylpheed-claws-1.0.3.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/sylpheed-claws.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sylpheed-claws.spec	18 Mar 2005 04:18:41 -0000	1.8
+++ sylpheed-claws.spec	23 Mar 2005 23:44:32 -0000	1.9
@@ -4,13 +4,13 @@
 %define         aspellver     %(rpm -q --qf "%%{version}" aspell)
 
 Name:           sylpheed-claws
-Version:        1.0.1
-Release:        3
+Version:        1.0.3
+Release:        1
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.1.tar.bz2
+Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.3.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -113,6 +113,9 @@
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 
 %changelog
+* Wed Mar 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.0.3-1
+- Version upgrade
 * Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.1-3
 - Don't include static libs in plugin directory.
 - Set --with-gpgme-prefix to use relocated gpgme03 package contents.



From jpo at di.uminho.pt  Thu Mar 24 00:18:55 2005
From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=)
Date: Thu, 24 Mar 2005 00:18:55 +0000
Subject: APPROVED: perl-Class-MethodMaker
Message-ID: <4242076F.6000204@di.uminho.pt>

[A couple of days later]

Summary:
   Perl module for creating generic object-oriented methods
Description:
   Class::MethodMaker solves the problem of having to continually write
   accessor methods for your objects that perform standard tasks.

Maintainer:
   Dennis Gregorovic
Reviewer:
   Jos? Pedro Oliveira
Review process:
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=149637

--
Jos? Pedro Oliveira
* mailto: jpo at di.uminho.pt * http://gsd.di.uminho.pt/~jpo *
* gpg fingerprint = F9B6 8D87 859D 1C94 48F0 84C0 9749 9EB5 91BD 851B *
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050324/3721c6ab/attachment-0001.sig>

From kevin at scrye.com  Wed Mar 23 16:39:11 2005
From: kevin at scrye.com (Kevin Fenzi)
Date: Wed, 23 Mar 2005 09:39:11 -0700
Subject: rpms/xffm/devel xffm.spec,1.5,1.6
References: <200503222113.j2MLDAmj023580@cvs-int.fedora.redhat.com>
	<1111528345.11822.0.camel@ignacio.ignacio.lan>
Message-ID: <20050323163915.6B733C50CC@voldemort.scrye.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

>>>>> "Ignacio" == Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> writes:

Ignacio> On Tue, 2005-03-22 at 16:13 -0500, Kevin Fenzi wrote:
>> +%{_libdir}/xfce4 %{_libdir}/xfce4/mcs-plugins/*
>> %{_libdir}/xfce4/xffm/*

Ignacio> Shouldn't those other 2 lines be removed then?

Quite right. I will remove them. Thanks. 

Ignacio> -- Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>

kevin
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Processed by Mailcrypt 3.5.8 <http://mailcrypt.sourceforge.net/>

iD8DBQFCQZuz3imCezTjY0ERAnlKAJ0fqHAuKWxDfx8vVM/CcSbtAe4UrACfQDV2
KjW5o7zZH7Pgar69p5Y2ekQ=
=sH5C
-----END PGP SIGNATURE-----



From fedora-extras-commits at redhat.com  Thu Mar 24 01:02:56 2005
From: fedora-extras-commits at redhat.com (Dennis Gregorovic (dgregor))
Date: Wed, 23 Mar 2005 20:02:56 -0500
Subject: rpms/perl-Class-MethodMaker/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4
Message-ID: <200503240102.j2O12urf021430@cvs-int.fedora.redhat.com>

Author: dgregor

Update of /cvs/extras/rpms/perl-Class-MethodMaker/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21421/FC-3

Modified Files:
	.cvsignore sources 
Log Message:
removed old source file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Mar 2005 15:36:05 -0000	1.3
+++ .cvsignore	24 Mar 2005 01:02:54 -0000	1.4
@@ -1,2 +1 @@
-Class-MethodMaker-2.05.tar.gz
 Class-MethodMaker-2.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Mar 2005 15:36:05 -0000	1.3
+++ sources	24 Mar 2005 01:02:54 -0000	1.4
@@ -1,2 +1 @@
-a4092146c05bac58b3f99b3f5d2a9a75  Class-MethodMaker-2.05.tar.gz
 21291a8033091c1f77ecdc339e167802  Class-MethodMaker-2.06.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 01:02:56 2005
From: fedora-extras-commits at redhat.com (Dennis Gregorovic (dgregor))
Date: Wed, 23 Mar 2005 20:02:56 -0500
Subject: rpms/perl-Class-MethodMaker/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4
Message-ID: <200503240102.j2O12u0H021435@cvs-int.fedora.redhat.com>

Author: dgregor

Update of /cvs/extras/rpms/perl-Class-MethodMaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21421/devel

Modified Files:
	.cvsignore sources 
Log Message:
removed old source file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Mar 2005 15:41:44 -0000	1.3
+++ .cvsignore	24 Mar 2005 01:02:54 -0000	1.4
@@ -1,2 +1 @@
-Class-MethodMaker-2.05.tar.gz
 Class-MethodMaker-2.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Mar 2005 15:41:44 -0000	1.3
+++ sources	24 Mar 2005 01:02:54 -0000	1.4
@@ -1,2 +1 @@
-a4092146c05bac58b3f99b3f5d2a9a75  Class-MethodMaker-2.05.tar.gz
 21291a8033091c1f77ecdc339e167802  Class-MethodMaker-2.06.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 01:04:20 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 20:04:20 -0500
Subject: rpms/freeciv - New directory
Message-ID: <200503240104.j2O14KNm021526@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21519/freeciv

Log Message:
Directory /cvs/extras/rpms/freeciv added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 01:04:20 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 20:04:20 -0500
Subject: rpms/freeciv/devel - New directory
Message-ID: <200503240104.j2O14K8P021529@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21519/freeciv/devel

Log Message:
Directory /cvs/extras/rpms/freeciv/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 01:04:35 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 20:04:35 -0500
Subject: rpms/freeciv Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503240104.j2O14Z5U021588@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21579

Added Files:
	Makefile import.log 
Log Message:
Setup of module freeciv


--- NEW FILE Makefile ---
# Top level Makefile for module freeciv
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 01:04:35 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 20:04:35 -0500
Subject: rpms/freeciv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503240104.j2O14Zuo021591@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21579/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module freeciv


--- 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 Mar 24 01:08:09 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 20:08:09 -0500
Subject: rpms/freeciv/devel NEWS-1.14.2, NONE,
	1.1 freeciv-1.13.0-aifill.patch, NONE,
	1.1 freeciv-desktop-xauth.patch, NONE,
	1.1 freeciv-desktop.patch, NONE, 1.1 freeciv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503240108.j2O189mW021718@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21705/devel

Modified Files:
	.cvsignore sources 
Added Files:
	NEWS-1.14.2 freeciv-1.13.0-aifill.patch 
	freeciv-desktop-xauth.patch freeciv-desktop.patch freeciv.spec 
Log Message:
auto-import freeciv-1.14.2-4 on branch devel from freeciv-1.14.2-4.src.rpm


--- NEW FILE NEWS-1.14.2 ---
=======================
Welcome to Freeciv 1.14
=======================

This is release 1.14.2.

Thanks again to all our developers, who continue to work so hard.

This release includes lots of changes, outlined below.  Those who
are interested in seeing the detailed changes should check the
ChangeLog file.

WHAT'S CHANGED SINCE 1.14.1
 - important compile fixes for some platforms
 - game balance adjustments:
        x all buildings except wonders and space parts 30% cheaper
        x some wonders cheaper: Colossus, Copernicus, Isaac Newton's,
          King Richard's, Oracle and Shakespeare's
        x submarine has more attack and movement, and costs less
 - reputation recovery fixed (now much slower)
 - a few other minor bugfixes

freeciv-1.13.0-aifill.patch:

--- NEW FILE freeciv-1.13.0-aifill.patch ---
--- freeciv-1.13.0/common/game.h.aifill	2002-11-07 14:02:46.000000000 +0100
+++ freeciv-1.13.0/common/game.h	2002-11-07 14:03:13.000000000 +0100
@@ -300,7 +300,7 @@
 #define GAME_MIN_MAX_PLAYERS         1
 #define GAME_MAX_MAX_PLAYERS         MAX_NUM_PLAYERS
 
-#define GAME_DEFAULT_AIFILL          0
+#define GAME_DEFAULT_AIFILL          5
 #define GAME_MIN_AIFILL              0
 #define GAME_MAX_AIFILL              GAME_MAX_MAX_PLAYERS
 

freeciv-desktop-xauth.patch:

--- NEW FILE freeciv-desktop-xauth.patch ---
diff -rcN freeciv-1.14.2,orig/desktop/civclient-wrapper.in freeciv-1.14.2/desktop/civclient-wrapper.in
*** freeciv-1.14.2,orig/desktop/civclient-wrapper.in	2004-10-25 20:02:15.588044089 -0400
--- freeciv-1.14.2/desktop/civclient-wrapper.in	2004-10-25 20:06:14.243634855 -0400
***************
*** 4,13 ****
  test -d $HOME/.freeciv/client || mkdir $HOME/.freeciv/client
  cd $HOME/.freeciv/client || exit 1
  
! if test ! -w /etc
  then
! 	[ ! -e ~/.civclientrc ] && touch ~/.civclientrc
! 	@bindir@/civclient "$@" &
! else
! 	su nobody -c "@bindir@/civclient $@ &"
  fi
--- 4,44 ----
  test -d $HOME/.freeciv/client || mkdir $HOME/.freeciv/client
  cd $HOME/.freeciv/client || exit 1
  
! if test -w /etc
  then
! 	if su -s /bin/bash nobody -c "id >/dev/null 2>/dev/null"; then
! 		TMP=`mktemp /tmp/xauthXXXXXX`
! 		xauth extract $TMP $DISPLAY
! 		chown nobody:nobody $TMP
! 		su -s /bin/bash nobody -c "XAUTHORITY=$TMP @bindir@/civclient $@" &
! 		sleep 3
! 		rm -f $TMP
! 	else
! 		BASEMESSAGE=$(printf "You are logged in as the super user (root).\n\nFreeCiv would prefer to run as a less-privileged user, such as nobody, just in case there is a bug in FreeCiv that would allow a malicious server to compromise your system. However, FreeCiv is unable to change from root to nobody.")
! 		ERRORMESSAGE=$(printf "${BASEMESSAGE}\n\nYou can not run this version of FreeCiv as root.")
! 		QUESTIONMESSAGE=$(printf "${BASEMESSAGE}\n\nWould you like to run FreeCiv as root anyway?")
! 		ANSWER=
! 		if civclient --help >/dev/null 2>/dev/null; then
! 			if [ -t 1 ]; then
! 				read -s -n 1 -p "${QUESTIONMESSAGE} [n]" ANSWER
! 			else
! 				if zenity --question --text="${QUESTIONMESSAGE}"; then
! 					ANSWER=y
! 				fi
! 			fi
! 			if [ x"${ANSWER}" != xy ]; then
! 				exit 1
! 			fi
! 		else
! 			if [ -t 0 ]; then
! 				echo "${ERRORMESSAGE}"
! 			else
! 				zenity --error --text="${ERRORMESSAGE}"
! 			fi
! 			exit 1
! 		fi
! 	fi
  fi
+ 
+ [ ! -e ~/.civclientrc ] && touch ~/.civclientrc
+ exec @bindir@/civclient "$@"
diff -rcN freeciv-1.14.2,orig/desktop/civserver-wrapper.in freeciv-1.14.2/desktop/civserver-wrapper.in
*** freeciv-1.14.2,orig/desktop/civserver-wrapper.in	2004-10-25 20:02:15.594043249 -0400
--- freeciv-1.14.2/desktop/civserver-wrapper.in	2004-10-25 20:07:59.911842434 -0400
***************
*** 4,12 ****
  test -d $HOME/.freeciv/server || mkdir $HOME/.freeciv/server
  cd $HOME/.freeciv/server || exit 1
  
! if test ! -w /etc
  then
! 	xterm -sb -fn 10x20 -fg black -bg white -T FreeCiv -e sh -c @bindir@/civserver &
! else
! 	su nobody -c 'xterm -sb -fn 10x20 -fg black -bg white -T FreeCiv -e @bindir@/civserver &'
  fi
--- 4,43 ----
  test -d $HOME/.freeciv/server || mkdir $HOME/.freeciv/server
  cd $HOME/.freeciv/server || exit 1
  
! if test -w /etc
  then
! 	if su -s /bin/bash nobody -c "id >/dev/null 2>/dev/null"; then
! 		TMP=`mktemp /tmp/xauthXXXXXX`
! 		xauth extract $TMP $DISPLAY
! 		chown nobody:nobody $TMP
! 		su -s /bin/bash nobody -c "XAUTHORITY=$TMP xterm -sb -fn 10x20 -fg black -bg white -T FreeCiv -e @bindir@/civserver $@" &
! 		sleep 3
! 		rm -f $TMP
! 	else
! 		BASEMESSAGE=$(printf "You are logged in as the super user (root).\n\nFreeCiv would prefer to run as a less-privileged user, such as nobody, just in case there is a bug in FreeCiv that would allow a malicious server to compromise your system. However, FreeCiv is unable to change from root to nobody.")
! 		ERRORMESSAGE=$(printf "${BASEMESSAGE}\n\nYou can not run this version of FreeCiv as root.")
! 		QUESTIONMESSAGE=$(printf "${BASEMESSAGE}\n\nWould you like to run FreeCiv as root anyway?")
! 		ANSWER=
! 		if civserver --help >/dev/null 2>/dev/null; then
! 			if [ -t 1 ]; then
! 				read -s -n 1 -p "${QUESTIONMESSAGE} [n]" ANSWER
! 			else
! 				if zenity --question --text="${QUESTIONMESSAGE}"; then
! 					ANSWER=y
! 				fi
! 			fi
! 			if [ x"${ANSWER}" != xy ]; then
! 				exit 1
! 			fi
! 		else
! 			if [ -t 0 ]; then
! 				echo "${ERRORMESSAGE}"
! 			else
! 				zenity --error --text="${ERRORMESSAGE}"
! 			fi
! 			exit 1
! 		fi
! 	fi
  fi
+ 
+ xterm -sb -fn 10x20 -fg black -bg white -T FreeCiv -e sh -c @bindir@/civserver &

freeciv-desktop.patch:

--- NEW FILE freeciv-desktop.patch ---
--- freeciv-1.14.0/configure.in.desktop	2003-01-17 10:09:14.000000000 +0100
+++ freeciv-1.14.0/configure.in	2003-05-09 01:01:28.000000000 +0200
@@ -710,4 +710,10 @@
 	  intl/Makefile
 	  po/Makefile.in
 	  doc/Makefile
+	  desktop/civclient-wrapper
+	  desktop/civserver-wrapper
+	  desktop/freeciv-engels.desktop
+	  desktop/freeciv-server.desktop
+	  desktop/freeciv-trident.desktop
+	  desktop/freeciv-client.desktop
 	  undep.sh, [ chmod +x undep.sh ; ./undep.sh ])
--- freeciv-1.14.0/configure.desktop	2003-01-17 10:10:32.000000000 +0100
+++ freeciv-1.14.0/configure	2003-05-09 01:01:58.000000000 +0200
@@ -14388,7 +14388,7 @@
 
 
 
-                                                                                                                                                                                                                                                                    ac_config_files="$ac_config_files Makefile data/Makefile data/misc/Makefile data/trident/Makefile data/isotrident/Makefile data/default/Makefile data/civ1/Makefile data/civ2/Makefile data/scenario/Makefile data/nation/Makefile data/history/Makefile common/Makefile ai/Makefile client/Makefile client/agents/Makefile client/include/Makefile client/gui-gtk/Makefile client/gui-gtk-2.0/Makefile client/gui-xaw/Makefile client/gui-win32/Makefile client/gui-stub/Makefile server/Makefile intl/Makefile po/Makefile.in doc/Makefile undep.sh"
+                                                                                                                                                                                                                                                                    ac_config_files="$ac_config_files Makefile data/Makefile data/misc/Makefile data/trident/Makefile data/isotrident/Makefile data/default/Makefile data/civ1/Makefile data/civ2/Makefile data/scenario/Makefile data/nation/Makefile data/history/Makefile common/Makefile ai/Makefile client/Makefile client/agents/Makefile client/include/Makefile client/gui-gtk/Makefile client/gui-gtk-2.0/Makefile client/gui-xaw/Makefile client/gui-win32/Makefile client/gui-stub/Makefile desktop/civclient-wrapper desktop/civserver-wrapper desktop/freeciv-engels.desktop desktop/freeciv-server.desktop desktop/freeciv-trident.desktop desktop/freeciv-client.desktop server/Makefile intl/Makefile po/Makefile.in doc/Makefile undep.sh"
 
           ac_config_commands="$ac_config_commands default"
 


--- NEW FILE freeciv.spec ---
%define desktop_file 1
%if %{desktop_file}
%define desktop_file_utils_version 0.2.93
%endif
Summary: The Freeciv multi-player strategy game.
Name:		freeciv
Version:	1.14.2
Release:	4
Source:		ftp://freeciv.org/pub/freeciv/stable/%{name}-%{version}.tar.bz2
Source1:	freeciv-desktop.tar.bz2
Source2:	http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz
Source3:	NEWS-1.14.2
Patch1:         freeciv-desktop.patch
Patch2:		freeciv-desktop-xauth.patch
Patch3:		freeciv-1.13.0-aifill.patch
License:	GPL
Group: Amusements/Games
BuildRoot:	%{_tmppath}/%{name}-%{version}-root
BuildPrereq:	gtk2-devel >= 2.0.5 imlib-devel
%if %{desktop_file}
Requires: /usr/bin/desktop-file-install
BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
%endif

%description
Freeciv is a turn-based, multi-player, X based strategy game. Freeciv
is generally comparable to, and has compatible rules with, the
Civilization II(R) game by Microprose(R). In Freeciv, each player is
the leader of a civilization, and is competing with the other players
in order to become the leader of the greatest civilization.

%prep
%setup -a 1
%patch1 -p1 -b .desktop
%patch2 -p1 -b .xauth
%patch3 -p1 -b .aifill

%build
export OLD_PO_FILE_INPUT=yes
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
%configure --enable-debug=no --enable-client=gtk-2.0
	   #--with-gtk-prefix=/usr/lib/gtk-2.0 #not used because of with-xaw3d
           #--prefix=/usr --bindir=/usr/bin  --with-glib-prefix=/usr 
make
cp %{SOURCE3} .

%install
rm -rf $RPM_BUILD_ROOT

%makeinstall
chmod +x desktop/*wrapper
cp desktop/*wrapper $RPM_BUILD_ROOT/usr/bin
mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Games $RPM_BUILD_ROOT/usr/share/pixmaps
cp desktop/*.desktop $RPM_BUILD_ROOT/etc/X11/applnk/Games

%if %{desktop_file}
mkdir -p $RPM_BUILD_ROOT/usr/share/applications
desktop-file-install --vendor net \
        --dir $RPM_BUILD_ROOT/usr/share/applications \
        --add-category "Application;Game;X-Red-Hat-Extra" \
        $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-client.desktop
desktop-file-install --vendor net \
        --dir $RPM_BUILD_ROOT/usr/share/applications \
        --add-category "Application;Game;X-Red-Hat-Extra" \
        $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-server.desktop
rm $RPM_BUILD_ROOT/etc/X11/applnk/Games/*.desktop
%endif

cp desktop/*.xpm $RPM_BUILD_ROOT/usr/share/pixmaps

pushd client
perl -p -i -e "s/CFLAGS = $RPM_OPT_FLAGS/CFLAGS = $RPM_OPT_FLAGS \`gtk-config --cflags\`/" gui-gtk/Makefile
make clean
for i in 0 1 2 3 4 5 6 7 8 9 10; do
  perl -p -i -e "s/gui-xaw/gui-gtk/" Makefile
  perl -p -i -e "s|-I/usr/X11R6/include|\`glib-config --cflags\` \`gtk-config --cflags\` \`imlib-config --cflags-gdk\` -I/usr/X11R6/include|" Makefile 
  perl -p -i -e "s|-lXaw3d|\`glib-config --libs\` \`gtk-config --libs\` \`imlib-config --libs-gdk\`|" Makefile
done
make
cp civclient $RPM_BUILD_ROOT/usr/bin/civclient-gtk
popd

/usr/bin/install -c civ  $RPM_BUILD_ROOT/usr/bin/civ

/usr/bin/install -d $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults
mv $RPM_BUILD_ROOT/usr/share/freeciv/Freeciv $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/Freeciv

mv $RPM_BUILD_ROOT/usr/bin/civclient $RPM_BUILD_ROOT/usr/bin/civclient-xaw
ln -sf civclient-gtk $RPM_BUILD_ROOT/usr/bin/civclient

(cd $RPM_BUILD_ROOT/usr/share/freeciv; tar xzf %{SOURCE2}; )

%find_lang %name

%clean
rm -rf $RPM_BUILD_ROOT 

%files -f %{name}.lang
%defattr(-,root,root)
%if %{desktop_file}
%config /usr/share/applications/*
%doc NEWS*
%else
%config /etc/X11/applnk/Games/*
%endif
%config /usr/X11R6/lib/X11/app-defaults/Freeciv
%{_bindir}/*
%{_datadir}/freeciv
%{_datadir}/pixmaps/*


%changelog
* Wed Jan 12 2005 Tim Waugh <twaugh at redhat.com> 1.14.2-4
- Rebuilt for new readline.

* Tue Oct 26 2004 Daniel Reed <djr at redhat.com> 1.14.2-3
- [136921] Try a little harder to run as nobody

* Mon Oct 25 2004 Daniel Reed <djr at redhat.com> 1.14.2-2
- [136921] Provide the user with the opportunity to run FreeCiv as root if unable to su to nobody, and throw up an error message if everything fails

* Mon Sep 13 2004 Karsten Hopp <karsten at redhat.de> 1.14.2-1 
- update to latest stable version

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Feb 23 2004 Karsten Hopp <karsten at redhat.de> 1.14.1-3
- rebuild with new chown syntax

* Mon Feb 23 2004 Tim Waugh <twaugh at redhat.com>
- Use ':' instead of '.' as separator for chown.

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Dec 03 2003 Karsten Hopp <karsten at redhat.de> 1.14.1-1
- update to bugfix release 1.14.1

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 08 2003 Karsten Hopp <karsten at redhat.de> 1.14.0-1
- update

* Thu Feb 20 2003 Karsten Hopp <karsten at redhat.de> 1.13.0-6
- remove last patch (obsolete)

* Wed Feb 19 2003 Karsten Hopp <karsten at redhat.de>
- fix message translation (#84599)

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Thu Nov 07 2002 Karsten Hopp <karsten at redhat.de>
- spelling fix (#75021)
- set aifill to 5 on new servers to get some opponents (#72586)

* Thu Aug 01 2002 Karsten Hopp <karsten at redhat.de>
- desktop fixes (#69391)

* Wed Jul 24 2002 Karsten Hopp <karsten at redhat.de>
- 0.1.13
- s/Games/Game in desktop-file-install
- fix URL
- add standard sounds 

* Wed Jul 17 2002 Karsten Hopp <karsten at redhat.de> 1.12.0-6
- fix path to datafiles if FREECIV_PATH is not set (#67922)
- fix desktop files (#67920)
- use desktop-file-install

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu Jan 24 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.12.0-2
- Rebuild in current environment

* Thu Aug 23 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.12.0-1
- 1.12.0 (non-beta)

* Tue Jul 31 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.11.4-9
- Rebuild - the fix for #49442 didn't seem to get in last time.

* Mon Jul 30 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.11.4-8
- Fix up demographics (#50119)

* Wed Jun 27 2001 Than Ngo <than at redhat.com>
- support new gettext
- add patch to build against new libtool

* Tue Mar 20 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- use gtk-config instead of glib-config

* Sun Feb 25 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- Fix up civclient-wrapper so it doesn't fail silently when started as
  potentially harmful user (Bug #28928)

* Tue Aug  1 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Fix warning in civclient-wrapper (Bug 14860)

* Fri Jul 21 2000 Trond Eivind Glomsr?d <teg at redhat.com>
- 1.11.4
- move to /usr/bin and /usr/share/freeciv (no more /usr/games)

* Wed Jul 12 2000 Trond Eivind Glomsr?d <teg at redhat.com>
- remove icon, glint is obsoleted
- don't use find to build file lists, it claimed to own
  lots of directories
- use %%{_tmppath}

* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Mon Jul 10 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 1.11.0 (Bug #13610)
- Add .desktop files (Bug #13610)
- Add BuildPrereq: lines
- fix build

* Thu Jun  8 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- move to dist
- update
- clean up the spec file
- fix build with gcc 2.96
- make the gtk client default; it's better than the Xaw one by now.

* Thu Feb 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 1.10.0

* Fri Feb  4 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 1.9.2
- use the configure macro

* Sun Nov  7 1999 Bernhard Rosenkraenzer <bero at redhat.com>
- redo RPM for 1.9.0 (many changes to build/install procedure)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 01:04:33 -0000	1.1
+++ .cvsignore	24 Mar 2005 01:08:07 -0000	1.2
@@ -0,0 +1,3 @@
+freeciv-1.14.2.tar.bz2
+freeciv-desktop.tar.bz2
+stdsounds2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 01:04:33 -0000	1.1
+++ sources	24 Mar 2005 01:08:07 -0000	1.2
@@ -0,0 +1,3 @@
+280770591c8f87ac542dcd50702da205  freeciv-1.14.2.tar.bz2
+4f8f5234c6d9719b8eb6fa2526616124  freeciv-desktop.tar.bz2
+63b06631addeaccf45bc4bf6b8ddf7b3  stdsounds2.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 01:08:09 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 20:08:09 -0500
Subject: rpms/freeciv import.log,1.1,1.2
Message-ID: <200503240108.j2O189Yu021714@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21705

Modified Files:
	import.log 
Log Message:
auto-import freeciv-1.14.2-4 on branch devel from freeciv-1.14.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/freeciv/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 01:04:33 -0000	1.1
+++ import.log	24 Mar 2005 01:08:07 -0000	1.2
@@ -0,0 +1 @@
+freeciv-1_14_2-4:HEAD:freeciv-1.14.2-4.src.rpm:1111626483



From bugs.michael at gmx.net  Thu Mar 24 01:30:29 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 24 Mar 2005 02:30:29 +0100
Subject: devel/hamlib hamlib-bindings.patch,1.1,1.2 hamlib.spec,1.7,1.8
In-Reply-To: <200503232328.j2NNS7XU019449@cvs-int.fedora.redhat.com>
References: <200503232328.j2NNS7XU019449@cvs-int.fedora.redhat.com>
Message-ID: <20050324023029.47758d91.bugs.michael@gmx.net>

On Wed, 23 Mar 2005 18:28:07 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/devel/hamlib

>  -pythondir = $(prefix)/lib/python
> -+pythondir = $(prefix)/lib/python2.3
> ++pythondir = $(libdir)/python2.3

> +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

> +        pythondir=$RPM_BUILD_ROOT%{python_sitelib} \
>     install-pythonPYTHON

If you install into python sitelib (= /usr/lib/python...) and can set
pythondir= during make install, what do you need the hamlib-bindings.patch
for which defaults to /usr/lib64/python... on x86_64? If the patch is
needed, because the python bindings configuration needs it, it's
inconsistent.

>  %files python
>  %defattr(-, root, root)
> -%{_libdir}/python2.3/Hamlib.py
> -%{_libdir}/python2.3/Hamlib.pyc
> -%{_libdir}/python2.3/Hamlib.pyo
> +%{python_sitelib}/*.py*


The %_libdir/pkgconfig/hamlib.pc hardcodes libdir=${exec_prefix}/lib


In "hamlib" main package, /usr/lib/libhamlib-1.2.3.so.2.0.2 is included,
but the softlink /usr/lib/libhamlib-1.2.3.so.2 created by ldconfig is not:

  $ rpm -qf /usr/lib/libhamlib-1.2.3.so.2
  file /usr/lib/libhamlib-1.2.3.so.2 is not owned by any package

It's an upstream bug. Same for c++ sub-package.
You can fix this in packages with "ldconfig -N -n buildroot/somedir"
in %install section.


Licence COPYING included in %doc directory is GPL, but "License:" field
says LGPL. COPYING.LIB should be included instead.


%dir %{_includedir}/hamlib in -devel package is not included.


In the -devel package, all the %_libdir/hamlib-*.a static archives are
not needed. Their *.so counterparts in the main hamlib package are
loaded at run-time as backends by the frontend library libhamlib.
libhamlib provides the frontend user API.




From fedora-extras-commits at redhat.com  Thu Mar 24 01:39:42 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 23 Mar 2005 20:39:42 -0500
Subject: rpms/freeciv/devel freeciv.spec,1.1,1.2
Message-ID: <200503240139.j2O1dgYJ021892@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21886/devel

Modified Files:
	freeciv.spec 
Log Message:
quick formatting changes


Index: freeciv.spec
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freeciv.spec	24 Mar 2005 01:08:07 -0000	1.1
+++ freeciv.spec	24 Mar 2005 01:39:40 -0000	1.2
@@ -2,10 +2,15 @@
 %if %{desktop_file}
 %define desktop_file_utils_version 0.2.93
 %endif
-Summary: The Freeciv multi-player strategy game.
+
 Name:		freeciv
 Version:	1.14.2
-Release:	4
+Release:	5
+Summary: 	The Freeciv multi-player strategy game
+
+Group:		Amusements/Games
+License:	GPL
+URL:		http://www.freeciv.org/index.php/Freeciv
 Source:		ftp://freeciv.org/pub/freeciv/stable/%{name}-%{version}.tar.bz2
 Source1:	freeciv-desktop.tar.bz2
 Source2:	http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz
@@ -13,13 +18,12 @@
 Patch1:         freeciv-desktop.patch
 Patch2:		freeciv-desktop-xauth.patch
 Patch3:		freeciv-1.13.0-aifill.patch
-License:	GPL
-Group: Amusements/Games
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildPrereq:	gtk2-devel >= 2.0.5 imlib-devel
 %if %{desktop_file}
-Requires: /usr/bin/desktop-file-install
-BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
+Requires: 	/usr/bin/desktop-file-install
+BuildPrereq: 	desktop-file-utils >= %{desktop_file_utils_version}
 %endif
 
 %description
@@ -57,11 +61,11 @@
 mkdir -p $RPM_BUILD_ROOT/usr/share/applications
 desktop-file-install --vendor net \
         --dir $RPM_BUILD_ROOT/usr/share/applications \
-        --add-category "Application;Game;X-Red-Hat-Extra" \
+        --add-category "Application;Game;X-Fedora" \
         $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-client.desktop
 desktop-file-install --vendor net \
         --dir $RPM_BUILD_ROOT/usr/share/applications \
-        --add-category "Application;Game;X-Red-Hat-Extra" \
+        --add-category "Application;Game;X-Fedora" \
         $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-server.desktop
 rm $RPM_BUILD_ROOT/etc/X11/applnk/Games/*.desktop
 %endif
@@ -110,6 +114,12 @@
 
 
 %changelog
+* Wed Mar 23 2005 Brian Pepple <bdpepple at ameritech.net> - 1.14.2-5
+- Changed X-Red-Hat-Extra to X-Fedora.
+- Added URL.
+- Changed BuildRoot to preferred value.
+- Removed period from summary.
+
 * Wed Jan 12 2005 Tim Waugh <twaugh at redhat.com> 1.14.2-4
 - Rebuilt for new readline.
 



From bugs.michael at gmx.net  Thu Mar 24 01:42:24 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 24 Mar 2005 02:42:24 +0100
Subject: devel/linphone linphone-0.12.2-pkgconfig.patch, NONE, 1.1
 linphone.spec, 1.5, 1.6
In-Reply-To: <200503232135.j2NLZnW6017327@cvs-int.fedora.redhat.com>
References: <200503232135.j2NLZnW6017327@cvs-int.fedora.redhat.com>
Message-ID: <20050324024224.0faa28fa.bugs.michael@gmx.net>

On Wed, 23 Mar 2005 16:35:49 -0500, Ignacio Vazquez-Abrams (ivazquez) wrote:

> Author: ivazquez
> 
> Update of /cvs/extras/devel/linphone

> -pkgconfigdir = $(prefix)/lib/pkgconfig
> +pkgconfigdir = $(libdir)/pkgconfig

$(libdir)/pkgconfig/linphone.pc hardcodes libdir=/usr/lib/...


The -devel package is missing "Requires: glib2-devel" in order to not
break the pkg-config dependency chain.

An explicit dependency on pkgconfig is not needed, since glib2-devel pulls
it in already.



From fedora-extras-commits at redhat.com  Thu Mar 24 01:57:48 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 23 Mar 2005 20:57:48 -0500
Subject: devel/kphone kphone-4.1.0-endian.patch, NONE, 1.1 kphone.spec, 1.9,
	1.10
Message-ID: <200503240157.j2O1vmH8022015@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22005

Modified Files:
	kphone.spec 
Added Files:
	kphone-4.1.0-endian.patch 
Log Message:
First attempt to get it working properly on PPC

kphone-4.1.0-endian.patch:

--- NEW FILE kphone-4.1.0-endian.patch ---
--- kphone/kphone/rtpdataheader.h.orig	2005-03-23 20:50:01.904726865 -0500
+++ kphone/kphone/rtpdataheader.h	2005-03-23 20:52:47.669099809 -0500
@@ -1,25 +1,24 @@
 #ifndef RTPDATAHEADER_H
 #define RTPDATAHEADER_H
 
+#include <endian.h>
+
 // For 32bit intel machines
 typedef short int16;
 typedef int   int32;
 typedef unsigned int u_int32;
 typedef unsigned short u_int16;
 
-#define RTP_BIG_ENDIAN 0
-#define RTP_LITTLE_ENDIAN 1
-
 //  RTP data header
 typedef __attribute__ ((__packed__)) struct {
-#if RTP_BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
 	unsigned int version:2;         // protocol version
 	unsigned int p:1;               // padding flag
 	unsigned int x:1;               // header extension flag
 	unsigned int cc:4;              // CSRC count
 	unsigned int m:1;               // marker bit
 	unsigned int pt:7;              // payload type
-#elif RTP_LITTLE_ENDIAN
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
 	unsigned int cc:4;              // CSRC count
 	unsigned int x:1;               // header extension flag
 	unsigned int p:1;               // padding flag
@@ -27,7 +26,7 @@
 	unsigned int pt:7;              // payload type
 	unsigned int m:1;               // marker bit
 #else
-#error Define one of RTP_LITTLE_ENDIAN or RTP_BIG_ENDIAN
+#error Unusable endianness detected
 #endif
 	unsigned int seq:16;            // sequence number
 	u_int32 ts;                     // timestamp 32bits


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kphone.spec	22 Mar 2005 20:51:59 -0000	1.9
+++ kphone.spec	24 Mar 2005 01:57:46 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        9
+Release:        10
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -9,6 +9,7 @@
 Source0:        http://www.wirlab.net/kphone/kphone-4.1.0.tar.gz
 Source1:        kphone.desktop
 Patch0:         kphone-4.1.0-po-hacks.patch
+Patch1:         kphone-4.1.0-endian.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
@@ -22,6 +23,7 @@
 %prep
 %setup -q -n kphone
 %patch -p1 -b .po-hacks
+%patch1 -p1 -b .endian
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -53,6 +55,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-10
+- First attempt to get it working properly on PPC
+
 * Tue Mar 22 2005 Seth Vidal <skvidal at phy.duke.edu> 4.1.0-9
 - add openssl-devel to buildreqs
 



From fedora-extras-commits at redhat.com  Thu Mar 24 01:58:02 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 20:58:02 -0500
Subject: rpms/tetex-bytefield - New directory
Message-ID: <200503240158.j2O1w27I022065@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-bytefield
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22058/tetex-bytefield

Log Message:
Directory /cvs/extras/rpms/tetex-bytefield added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 01:58:02 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 20:58:02 -0500
Subject: rpms/tetex-bytefield/devel - New directory
Message-ID: <200503240158.j2O1w2iG022068@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-bytefield/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22058/tetex-bytefield/devel

Log Message:
Directory /cvs/extras/rpms/tetex-bytefield/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 01:58:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 20:58:21 -0500
Subject: rpms/tetex-bytefield Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503240158.j2O1wLl8022127@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-bytefield
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22118

Added Files:
	Makefile import.log 
Log Message:
Setup of module tetex-bytefield


--- NEW FILE Makefile ---
# Top level Makefile for module tetex-bytefield
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 01:58:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 20:58:21 -0500
Subject: rpms/tetex-bytefield/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503240158.j2O1wLZ4022130@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-bytefield/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22118/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tetex-bytefield


--- 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 Mar 24 01:58:52 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 20:58:52 -0500
Subject: rpms/tetex-bytefield import.log,1.1,1.2
Message-ID: <200503240158.j2O1wq27022223@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-bytefield
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22214

Modified Files:
	import.log 
Log Message:
auto-import tetex-bytefield-1.2-1 on branch devel from tetex-bytefield-1.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tetex-bytefield/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 01:58:19 -0000	1.1
+++ import.log	24 Mar 2005 01:58:50 -0000	1.2
@@ -0,0 +1 @@
+tetex-bytefield-1_2-1:HEAD:tetex-bytefield-1.2-1.src.rpm:1111629525



From fedora-extras-commits at redhat.com  Thu Mar 24 01:58:52 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 20:58:52 -0500
Subject: rpms/tetex-bytefield/devel tetex-bytefield.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503240158.j2O1wqM1022227@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-bytefield/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22214/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tetex-bytefield.spec 
Log Message:
auto-import tetex-bytefield-1.2-1 on branch devel from tetex-bytefield-1.2-1.src.rpm


--- NEW FILE tetex-bytefield.spec ---
%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")}

%define texpkg      bytefield
%define texpkgdir   %{_texmf}/tex/latex/%{texpkg}
%define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}

Name:           tetex-%{texpkg}
Version:        1.2
Release:        1
Summary:        Create illustrations for network protocol specifications

Group:          Applications/Publishing
License:        LaTeX Project Public License
URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/bytefield.html
# DANTE generates CTAN packages tarballs on-the-fly
# ftp://ftp.dante.de/tex-archive/macros/latex/contrib/bytefield.tar.gz
Source0:        bytefield-1.2-20050315.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  tetex-latex
Requires:       tetex-latex
Requires(post): /usr/bin/texhash
Requires(postun): /usr/bin/texhash

%description
The bytefield package helps the user create illustrations for network
protocol specifications and anything else that utilizes fields of
data.  These illustrations show how the bits and bytes are laid out in
a packet or in memory.


%prep
%setup -q -n %{texpkg}

%build
latex bytefield.ins

%install
rm -rf $RPM_BUILD_ROOT

install -d -m 755 $RPM_BUILD_ROOT{%{texpkgdir},%{texpkgdoc}}
install -p -m 644 bytefield.sty $RPM_BUILD_ROOT%{texpkgdir}/
install -p -m 644 bytefield.pdf $RPM_BUILD_ROOT%{texpkgdoc}/

%clean
rm -rf $RPM_BUILD_ROOT


%post
texhash >/dev/null 2>&1 || :

%postun
texhash >/dev/null 2>&1 || :


%files
%defattr(-,root,root,-)
%doc README example.*
%{texpkgdir}/
%{_texmf}/doc/


%changelog
* Tue Mar 15 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.2-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-bytefield/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 01:58:19 -0000	1.1
+++ .cvsignore	24 Mar 2005 01:58:50 -0000	1.2
@@ -0,0 +1 @@
+bytefield-1.2-20050315.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-bytefield/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 01:58:19 -0000	1.1
+++ sources	24 Mar 2005 01:58:50 -0000	1.2
@@ -0,0 +1 @@
+8eca969277b7f9f3de746713f1d941ba  bytefield-1.2-20050315.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 02:02:34 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:02:34 -0500
Subject: rpms/tetex-xcolor - New directory
Message-ID: <200503240202.j2O22Ymj023146@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23139/tetex-xcolor

Log Message:
Directory /cvs/extras/rpms/tetex-xcolor added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 02:02:34 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:02:34 -0500
Subject: rpms/tetex-xcolor/devel - New directory
Message-ID: <200503240202.j2O22Yam023149@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23139/tetex-xcolor/devel

Log Message:
Directory /cvs/extras/rpms/tetex-xcolor/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 02:02:53 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:02:53 -0500
Subject: rpms/tetex-xcolor Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503240202.j2O22rmk023208@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23199

Added Files:
	Makefile import.log 
Log Message:
Setup of module tetex-xcolor


--- NEW FILE Makefile ---
# Top level Makefile for module tetex-xcolor
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 02:02:53 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:02:53 -0500
Subject: rpms/tetex-xcolor/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503240202.j2O22rvw023211@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23199/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tetex-xcolor


--- 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 Mar 24 02:03:26 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:03:26 -0500
Subject: rpms/tetex-xcolor import.log,1.1,1.2
Message-ID: <200503240203.j2O23Qfw023304@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23295

Modified Files:
	import.log 
Log Message:
auto-import tetex-xcolor-2.01-1 on branch devel from tetex-xcolor-2.01-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 02:02:51 -0000	1.1
+++ import.log	24 Mar 2005 02:03:24 -0000	1.2
@@ -0,0 +1 @@
+tetex-xcolor-2_01-1:HEAD:tetex-xcolor-2.01-1.src.rpm:1111629799



From fedora-extras-commits at redhat.com  Thu Mar 24 02:03:26 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:03:26 -0500
Subject: rpms/tetex-xcolor/devel tetex-xcolor.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503240203.j2O23Q72023308@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23295/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tetex-xcolor.spec 
Log Message:
auto-import tetex-xcolor-2.01-1 on branch devel from tetex-xcolor-2.01-1.src.rpm


--- NEW FILE tetex-xcolor.spec ---
%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")}

%define texpkg      xcolor
%define texpkgdir   %{_texmf}/tex/latex/%{texpkg}
%define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}

Name:           tetex-%{texpkg}
Version:        2.01
Release:        1
Summary:        Driver-independent color extensions for LaTeX and pdfLaTeX

Group:          Applications/Publishing
License:        LaTeX Project Public License
URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/xcolor.html
# DANTE generates CTAN packages tarballs on-the-fly
# ftp://ftp.dante.de/tex-archive/macros/latex/contrib/xcolor.tar.gz
Source0:        xcolor-2.01-20050323.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  tetex-latex
Requires:       tetex-latex
Requires(post): /usr/bin/texhash
Requires(postun): /usr/bin/texhash

%description
Provides easy driver-independent access to several kinds of color
tints, shades, tones, and mixes of arbitrary colors.  It allows a user
to select a document-wide target color model and offers complete tools
for conversion between eight color models.  Additionally, there is a
command for alternating row colors plus repeated non-aligned material
(like horizontal lines) in tables.  Colors can be mixed like
\color{red!30!green!40!blue}.


%prep
%setup -q -n %{texpkg}

%build
latex xcolor.ins
for example in xcolor1.tex xcolor3.tex; do
    pdflatex $example
    pdflatex $example
done

%install
rm -rf $RPM_BUILD_ROOT
 
install -d -m 755 $RPM_BUILD_ROOT{%{texpkgdir},%{texpkgdoc}}
install -d -m 755 $RPM_BUILD_ROOT%{_texmf}/dvips/%{texpkg}
install -p -m 644 *.sty *.def $RPM_BUILD_ROOT%{texpkgdir}/
install -p -m 644 *.pro $RPM_BUILD_ROOT%{_texmf}/dvips/%{texpkg}/
install -p -m 644 *.pdf $RPM_BUILD_ROOT%{texpkgdoc}/

%clean
rm -rf $RPM_BUILD_ROOT


%post
texhash >/dev/null 2>&1 || :

%postun
texhash >/dev/null 2>&1 || :


%files
%defattr(-,root,root,-)
%doc ChangeLog README xcolor?.tex
%{texpkgdir}/
%{_texmf}/dvips/%{texpkg}/
%{_texmf}/doc/


%changelog
* Wed Mar 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.01-1
- Update to 2.01.

* Wed Feb 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.00-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 02:02:51 -0000	1.1
+++ .cvsignore	24 Mar 2005 02:03:24 -0000	1.2
@@ -0,0 +1 @@
+xcolor-2.01-20050323.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 02:02:51 -0000	1.1
+++ sources	24 Mar 2005 02:03:24 -0000	1.2
@@ -0,0 +1 @@
+d60c7a02fc9f04b785f31c96c1fd8d4d  xcolor-2.01-20050323.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 02:04:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:04:21 -0500
Subject: rpms/tetex-pgf/devel - New directory
Message-ID: <200503240204.j2O24LQ1023427@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-pgf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23415/tetex-pgf/devel

Log Message:
Directory /cvs/extras/rpms/tetex-pgf/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 02:04:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:04:21 -0500
Subject: rpms/tetex-pgf - New directory
Message-ID: <200503240204.j2O24Lm8023424@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-pgf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23415/tetex-pgf

Log Message:
Directory /cvs/extras/rpms/tetex-pgf added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 02:04:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:04:35 -0500
Subject: rpms/tetex-pgf Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503240204.j2O24ZoY023486@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-pgf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23477

Added Files:
	Makefile import.log 
Log Message:
Setup of module tetex-pgf


--- NEW FILE Makefile ---
# Top level Makefile for module tetex-pgf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 02:04:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:04:35 -0500
Subject: rpms/tetex-pgf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503240204.j2O24ZwG023489@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-pgf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23477/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tetex-pgf


--- 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 Mar 24 02:05:07 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:05:07 -0500
Subject: rpms/tetex-pgf import.log,1.1,1.2
Message-ID: <200503240205.j2O2573f023582@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-pgf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23573

Modified Files:
	import.log 
Log Message:
auto-import tetex-pgf-0.65-1 on branch devel from tetex-pgf-0.65-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tetex-pgf/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 02:04:33 -0000	1.1
+++ import.log	24 Mar 2005 02:05:05 -0000	1.2
@@ -0,0 +1 @@
+tetex-pgf-0_65-1:HEAD:tetex-pgf-0.65-1.src.rpm:1111629900



From fedora-extras-commits at redhat.com  Thu Mar 24 02:05:07 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:05:07 -0500
Subject: rpms/tetex-pgf/devel tetex-pgf.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503240205.j2O257WL023586@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-pgf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23573/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tetex-pgf.spec 
Log Message:
auto-import tetex-pgf-0.65-1 on branch devel from tetex-pgf-0.65-1.src.rpm


--- NEW FILE tetex-pgf.spec ---
%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")}

%define texpkg      pgf
%define texpkgdir   %{_texmf}/tex/latex/%{texpkg}
%define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}

Name:           tetex-%{texpkg}
Version:        0.65
Release:        1
Summary:        Create PostScript and PDF graphics in TeX

Group:          Applications/Publishing
License:        LaTeX Project Public License
URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/pgf.html
# DANTE generates CTAN packages tarballs on-the-fly
# ftp://ftp.dante.de/tex-archive/graphics/pgf.tar.gz
Source0:        pgf-0.65-20050315.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       tetex-latex, tetex-xcolor
Requires(post): /usr/bin/texhash
Requires(postun): /usr/bin/texhash

%description
PGF is a macro package for creating graphics directly in TeX and
LaTeX.  Its usage is similar to pstricks and the standard picture
environment.  Unlike pstricks, it produces both PostScript and PDF
output and works together with latex, dvips, pdftex, and pdflatex.
PGF is used extensively with beamer for production of presentations.


%prep
%setup -q -n %{texpkg}

%build

%install
rm -rf $RPM_BUILD_ROOT
 
install -d -m 755 $RPM_BUILD_ROOT{%{texpkgdir},%{texpkgdoc}}
install -p -m 644 *.sty $RPM_BUILD_ROOT%{texpkgdir}/
install -p -m 644 *.pdf $RPM_BUILD_ROOT%{texpkgdoc}/

%clean
rm -rf $RPM_BUILD_ROOT


%post
texhash >/dev/null 2>&1 || :

%postun
texhash >/dev/null 2>&1 || :


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog README TODO pgfuserguide.tex *.eps *.jpg
%{texpkgdir}/
%{_texmf}/doc/


%changelog
* Wed Feb 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.65-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-pgf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 02:04:33 -0000	1.1
+++ .cvsignore	24 Mar 2005 02:05:05 -0000	1.2
@@ -0,0 +1 @@
+pgf-0.65-20050315.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-pgf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 02:04:33 -0000	1.1
+++ sources	24 Mar 2005 02:05:05 -0000	1.2
@@ -0,0 +1 @@
+25258180407513f071ae9aee3930d022  pgf-0.65-20050315.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 02:06:14 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:06:14 -0500
Subject: rpms/tetex-beamer - New directory
Message-ID: <200503240206.j2O26Edd023700@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-beamer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23693/tetex-beamer

Log Message:
Directory /cvs/extras/rpms/tetex-beamer added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 02:06:14 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:06:14 -0500
Subject: rpms/tetex-beamer/devel - New directory
Message-ID: <200503240206.j2O26Exd023703@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-beamer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23693/tetex-beamer/devel

Log Message:
Directory /cvs/extras/rpms/tetex-beamer/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 02:06:33 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:06:33 -0500
Subject: rpms/tetex-beamer Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503240206.j2O26XJw023762@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-beamer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23753

Added Files:
	Makefile import.log 
Log Message:
Setup of module tetex-beamer


--- NEW FILE Makefile ---
# Top level Makefile for module tetex-beamer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 02:06:33 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:06:33 -0500
Subject: rpms/tetex-beamer/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503240206.j2O26Xjg023765@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-beamer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23753/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tetex-beamer


--- 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 Mar 24 02:07:14 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:07:14 -0500
Subject: rpms/tetex-beamer import.log,1.1,1.2
Message-ID: <200503240207.j2O27EsZ023870@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-beamer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23861

Modified Files:
	import.log 
Log Message:
auto-import tetex-beamer-3.01-1 on branch devel from tetex-beamer-3.01-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tetex-beamer/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 02:06:31 -0000	1.1
+++ import.log	24 Mar 2005 02:07:12 -0000	1.2
@@ -0,0 +1 @@
+tetex-beamer-3_01-1:HEAD:tetex-beamer-3.01-1.src.rpm:1111630027



From fedora-extras-commits at redhat.com  Thu Mar 24 02:07:14 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 23 Mar 2005 21:07:14 -0500
Subject: rpms/tetex-beamer/devel tetex-beamer.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503240207.j2O27EiX023874@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-beamer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23861/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tetex-beamer.spec 
Log Message:
auto-import tetex-beamer-3.01-1 on branch devel from tetex-beamer-3.01-1.src.rpm


--- NEW FILE tetex-beamer.spec ---
%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")}

%define texpkg      beamer
%define texpkgdir   %{_texmf}/tex/latex/%{texpkg}
%define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}

Name:           tetex-%{texpkg}
Version:        3.01
Release:        1
Summary:        A LaTeX class for producing presentations and slides

Group:          Applications/Publishing
License:        GPL
URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/beamer.html
# DANTE generates CTAN packages tarballs on-the-fly
# ftp://ftp.dante.de/tex-archive/macros/latex/contrib/beamer.tar.gz
Source0:        beamer-3.01-20050315.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       tetex-latex
Requires:       tetex-pgf >= 0.63, tetex-xcolor >= 2.00
Requires(post): /usr/bin/texhash
Requires(postun): /usr/bin/texhash

%description
The beamer LaTeX class can be used for producing slides.  Its
functionality is similar to Prosper but does not need any external
programs and can directly produce a presentation using pdflatex.
Beamer uses pgf for pdf/ps independent graphics.  Frames are created
using \frame{...}, and a frame can build multiple slides through a
simple notation for specifying material for each slide within a frame.
Beamer supports bibliographies, appendicies and transitions.  Short
versions of title, authors, institute can also be specified as
optional parameters.  A \plainframe{} allows a picture, for example,
to fill the whole frame.  Support figure and table environments,
transparency effects, a \transduration command, animation commands, a
pauses environment.  Beamer also provides compatibility with other
packages like prosper. 


%prep
%setup -q -n %{texpkg}

%build

%install
rm -rf $RPM_BUILD_ROOT
 
install -d -m 755 $RPM_BUILD_ROOT{%{texpkgdir},%{texpkgdoc}}
cp -pr base $RPM_BUILD_ROOT%{texpkgdir}/
cp -pr emulation $RPM_BUILD_ROOT%{texpkgdir}/
cp -pr extensions $RPM_BUILD_ROOT%{texpkgdir}/
cp -pr themes $RPM_BUILD_ROOT%{texpkgdir}/
install -p -m 644 doc/*.pdf $RPM_BUILD_ROOT%{texpkgdoc}/

%clean
rm -rf $RPM_BUILD_ROOT


%post
texhash >/dev/null 2>&1 || :

%postun
texhash >/dev/null 2>&1 || :


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog README TODO doc/*.tex doc/Makefile
%doc examples/ solutions/
%doc emacs/ lyx/
%{texpkgdir}/
%{_texmf}/doc/


%changelog
* Wed Feb 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.01-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-beamer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 02:06:31 -0000	1.1
+++ .cvsignore	24 Mar 2005 02:07:12 -0000	1.2
@@ -0,0 +1 @@
+beamer-3.01-20050315.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-beamer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 02:06:31 -0000	1.1
+++ sources	24 Mar 2005 02:07:12 -0000	1.2
@@ -0,0 +1 @@
+1ead85c1e1fad388076bbc4c523b4c69  beamer-3.01-20050315.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 02:17:49 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 23 Mar 2005 21:17:49 -0500
Subject: devel/linphone linphone-0.12.2-pkgconfig.patch, 1.1,
	1.2 linphone.spec, 1.6, 1.7
Message-ID: <200503240217.j2O2Hngu023989@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23983

Modified Files:
	linphone-0.12.2-pkgconfig.patch linphone.spec 
Log Message:
pkgconfig and -devel fixes

linphone-0.12.2-pkgconfig.patch:

Index: linphone-0.12.2-pkgconfig.patch
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone-0.12.2-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linphone-0.12.2-pkgconfig.patch	23 Mar 2005 21:35:47 -0000	1.1
+++ linphone-0.12.2-pkgconfig.patch	24 Mar 2005 02:17:47 -0000	1.2
@@ -9,3 +9,17 @@
  pkgconfig_DATA = linphone.pc
  
  EXTRA_DIST = $(LINPHONE_SOUNDS) \
+--- linphone-0.12.2/share/linphone.pc.in.orig	2005-03-23 21:10:49.392763407 -0500
++++ linphone-0.12.2/share/linphone.pc.in	2005-03-23 21:11:21.983938389 -0500
+@@ -1,7 +1,7 @@
+-prefix=@prefix@
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
+ 
+ 
+ Name: liblinphone


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linphone.spec	23 Mar 2005 21:35:47 -0000	1.6
+++ linphone.spec	24 Mar 2005 02:17:47 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        6
+Release:        7
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -34,7 +34,7 @@
 %package devel
 Summary:        Development libraries for linphone
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release} glib2-devel
 
 %description    devel
 Libraries required to develop software with linphone
@@ -87,6 +87,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-7
+- pkgconfig and -devel fixes
+
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-6
 - Fix build on x86_64
 



From fedora-extras-commits at redhat.com  Thu Mar 24 03:14:22 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 22:14:22 -0500
Subject: rpms/xfce4-systray/devel xfce4-systray.spec,1.3,1.4
Message-ID: <200503240314.j2O3EM1j024931@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24925

Modified Files:
	xfce4-systray.spec 
Log Message:
Removed unneeded la/a files



Index: xfce4-systray.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systray/devel/xfce4-systray.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-systray.spec	20 Mar 2005 22:31:17 -0000	1.3
+++ xfce4-systray.spec	24 Mar 2005 03:14:20 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Systray for the Xfce4 Desktop Environment
 Name: xfce4-systray
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-systray-4.2.1.tar.bz2
@@ -28,7 +28,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -39,6 +41,9 @@
 %{_libdir}/xfce4
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Removed unneeded la/a files
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - remove macro from changelog
 



From fedora-extras-commits at redhat.com  Thu Mar 24 03:38:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 23 Mar 2005 22:38:42 -0500
Subject: rpms/xfce4-session/devel xfce4-session.spec,1.2,1.3
Message-ID: <200503240338.j2O3cgXR025033@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25025

Modified Files:
	xfce4-session.spec 
Log Message:
Removed unneeded la/a files
Added version to requires in devel and engine subpackages



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-session.spec	21 Mar 2005 01:22:26 -0000	1.2
+++ xfce4-session.spec	24 Mar 2005 03:38:40 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-session-4.2.1.tar.bz2
@@ -22,7 +22,7 @@
 %package devel
 Summary: Development files for xfce4-session
 Group: Development/Libraries
-Requires: xfce4-session
+Requires: xfce4-session >= %{version}
 
 %description devel
 Header files for the Xfce Session Manager.
@@ -30,7 +30,7 @@
 %package engines
 Summary: Additional engines for xfce4-session
 Group: User Interface/Desktops
-Requires: xfce4-session
+Requires: xfce4-session >= %{version}
 
 %description engines
 Additional splash screen engines for the Xfce Session Manager.
@@ -46,6 +46,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*/*.la
 %find_lang %{name}
 
 %clean
@@ -80,6 +84,10 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Removed unneeded la/a files
+- Added version to requires in devel and engine subpackages
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - fix BuildReqs
 



From fedora-extras-commits at redhat.com  Thu Mar 24 05:44:51 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu, 24 Mar 2005 00:44:51 -0500
Subject: devel/gazpacho setup-path.patch,NONE,1.1 gazpacho.spec,1.6,1.7
Message-ID: <200503240544.j2O5ipf6027064@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/devel/gazpacho
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27057

Modified Files:
	gazpacho.spec 
Added Files:
	setup-path.patch 
Log Message:

fix gazpacho so it runs using upstream patch to setup.py
patch will be in next release so it can be dropped when we
package next release


setup-path.patch:

--- NEW FILE setup-path.patch ---
--- gazpacho/setup.py   2005/02/21 17:00:53 953
+++ gazpacho/setup.py   2005/02/23 18:00:51 955
@@ -42,7 +42,7 @@
         i += 1
 
     # unless we are installing, don't generate the path.py file
-    if 'install' in sys.prefix:
+    if 'install' in sys.argv:
         f = file(join('gazpacho', 'path.py'), 'w')
         f.write('pixmaps_dir = r"%s"\n' % join(prefix, 'share', 'gazpacho',
                                                'pixmaps'))


Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/devel/gazpacho/gazpacho.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gazpacho.spec	23 Mar 2005 22:52:56 -0000	1.6
+++ gazpacho.spec	24 Mar 2005 05:44:49 -0000	1.7
@@ -1,12 +1,13 @@
 Summary: Glade Interface Creator
 Name: gazpacho
 Version: 0.5.2
-Release: 2
+Release: 3
 License: GPL
 Group: Development/Tools
 URL: http://gruppy.sicem.biz/descargas
 Provides: Gazpacho = %{version}-%{release}
 Source0: gazpacho-%{version}.tar.bz2
+Patch0: setup-path.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 Requires: pygtk2 >= 2.4.0, pygtk2-libglade
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q -n Gazpacho-%{version}
+%patch0 -p1
 
 %build
 python ./setup.py build
@@ -39,6 +41,9 @@
 
 
 %changelog
+* Thu Mar 24 2005 Seth Vidal <skvidal at phy.duke.edu> - 0.5.2-3
+- add patch for setup.py from upstream cvs to fix lack of gazpacho/path.py
+
 * Wed Mar 23 2005 Seth Vidal <skvidal at phy.duke.edu> - 0.5.2-2
 - increment release for rebuild on python 2.4
 



From fedora-extras-commits at redhat.com  Thu Mar 24 11:04:11 2005
From: fedora-extras-commits at redhat.com (Colin Charles (byte))
Date: Thu, 24 Mar 2005 06:04:11 -0500
Subject: rpms/tpb/devel tpb.spec,1.6,1.7
Message-ID: <200503241104.j2OB4BpS001699@cvs-int.fedora.redhat.com>

Author: byte

Update of /cvs/extras/rpms/tpb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1692

Modified Files:
	tpb.spec 
Log Message:
ExclusiveArch x86, since we don't really have IBM-based ppc laptops



Index: tpb.spec
===================================================================
RCS file: /cvs/extras/rpms/tpb/devel/tpb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tpb.spec	5 Mar 2005 19:43:17 -0000	1.6
+++ tpb.spec	24 Mar 2005 11:04:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           tpb
 Version:        0.6.3
-Release:        2
+Release:        3
 Summary:        IBM ThinkPad button support utility
 
 Group:          System Environment/Base
@@ -12,6 +12,7 @@
 Patch0:         %{name}-defaultconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+ExclusiveArch:	%{ix86}
 BuildRequires:  xosd-devel >= 2.0.0, XFree86-devel, gettext, /sbin/MAKEDEV
 Requires:       udev
 
@@ -68,6 +69,9 @@
 
 
 %changelog
+* Thu Mar 24 2005 Colin Charles <colin at fedoraproject.org> - 0:0.6.3-3
+- add ExclusiveArch x86 only
+
 * Wed Feb  9 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.3-2
 - Add udev-awareness to /dev/nvram handling (#147306, Matthew Saltzman).
 - Change default OSD font to "luxi sans", "sans" doesn't work early enough.



From fedora-extras-commits at redhat.com  Thu Mar 24 12:24:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 07:24:13 -0500
Subject: devel/hamlib hamlib-bindings.patch,1.2,1.3 hamlib.spec,1.8,1.9
Message-ID: <200503241224.j2OCODY9002798@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2790

Modified Files:
	hamlib-bindings.patch hamlib.spec 
Log Message:
Various spec and patch fixes

hamlib-bindings.patch:

Index: hamlib-bindings.patch
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib-bindings.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hamlib-bindings.patch	23 Mar 2005 23:28:05 -0000	1.2
+++ hamlib-bindings.patch	24 Mar 2005 12:24:11 -0000	1.3
@@ -9,12 +9,3 @@
  TCL_BIN_DIR = @TCL_BIN_DIR@
  TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
  TCL_LIB_FILE = @TCL_LIB_FILE@
-@@ -195,7 +195,7 @@
- program_transform_name = @program_transform_name@
- pyexecdir = @pyexecdir@
- 
--pythondir = $(prefix)/lib/python
-+pythondir = $(libdir)/python2.3
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- subdirs = @subdirs@


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hamlib.spec	23 Mar 2005 23:28:05 -0000	1.8
+++ hamlib.spec	24 Mar 2005 12:24:11 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name: hamlib
 Version: 1.2.3
-Release: 8
+Release: 9
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transceivers and receivers
@@ -97,6 +97,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
+rm -f $RPM_BUILD_ROOT%{_libdir}/hamlib-*.a $RPM_BUILD_ROOT%{_libdir}/hamlib-*.la
+/sbin/ldconfig -N -n $RPM_BUILDROOT%{_libdir}
 pushd bindings
 # Install Python
 make prefix=$RPM_BUILD_ROOT%{_prefix} \
@@ -145,7 +147,7 @@
 
 %files
 %defattr(-, root, root)
-%doc COPYING doc/html
+%doc COPYING.LIB doc/html
 %{_bindir}/rigctl
 %{_bindir}/rigmem
 %{_bindir}/rigswr
@@ -155,7 +157,6 @@
 %{_libdir}/libhamlib-%{version}.so.2.0.2
 %{_libdir}/hamlib-*.so
 %{_libdir}/libhamlib.la
-%{_libdir}/hamlib-*.la
 %{_mandir}/man8/rpc.rigd.8.gz
 %{_mandir}/man8/rpc.rotd.8.gz
 %{_mandir}/man1/rigctl.1.gz
@@ -190,10 +191,11 @@
 
 %files devel
 %defattr(-, root, root)
+%doc README.developer
 %{_libdir}/libhamlib.so
 %{_libdir}/libhamlib.a
-%{_libdir}/hamlib-*.a
 %{_datadir}/aclocal/hamlib.m4
+%dir %{_includedir}/hamlib
 %{_includedir}/hamlib/rig.h
 %{_includedir}/hamlib/riglist.h
 %{_includedir}/hamlib/rig_dll.h
@@ -203,6 +205,13 @@
 
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-9
+- Python binding cleanup
+- soname/ldconfig cleanup
+- Added %%{_includedir}/hamlib to -devel
+- Removed %%{_libdir}/hamlib-*.a and hamlib-*.la
+- %%doc cleanups
+
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-8
 - Added -q to %%setup
 - Fixed Python binding build and Requires



From fedora-extras-commits at redhat.com  Thu Mar 24 12:37:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 07:37:02 -0500
Subject: rpms/edb/FC-3 edb.spec,1.5,1.6
Message-ID: <200503241237.j2OCb2iE002918@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edb/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2912/FC-3

Modified Files:
	edb.spec 
Log Message:
Added which to BuildRequires


Index: edb.spec
===================================================================
RCS file: /cvs/extras/rpms/edb/FC-3/edb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- edb.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ edb.spec	24 Mar 2005 12:36:59 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           edb
 Version:        1.0.5
-Release:        5
+Release:        6
 Summary:        A database convenience library wrapped around BDB
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://enlightenment.org/index.php?id=23
 Source0:        http://prdownloads.sourceforge.net/enlightenment/edb-1.0.5.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gtk+-devel, ncurses-devel zlib-devel 
+BuildRequires:  gtk+-devel, ncurses-devel zlib-devel which
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -85,6 +85,9 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-6
+- Added which to BuildRequires
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5-5
 - %%
 



From fedora-extras-commits at redhat.com  Thu Mar 24 12:38:58 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 07:38:58 -0500
Subject: rpms/hamlib/FC-3 hamlib-bindings.patch,1.1,1.2 hamlib.spec,1.7,1.8
Message-ID: <200503241238.j2OCcw65002972@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/hamlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2966

Modified Files:
	hamlib-bindings.patch hamlib.spec 
Log Message:
Various fixes and cleanups

hamlib-bindings.patch:

Index: hamlib-bindings.patch
===================================================================
RCS file: /cvs/extras/rpms/hamlib/FC-3/hamlib-bindings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hamlib-bindings.patch	16 Mar 2005 17:05:32 -0000	1.1
+++ hamlib-bindings.patch	24 Mar 2005 12:38:56 -0000	1.2
@@ -9,12 +9,3 @@
  TCL_BIN_DIR = @TCL_BIN_DIR@
  TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
  TCL_LIB_FILE = @TCL_LIB_FILE@
-@@ -195,7 +195,7 @@
- program_transform_name = @program_transform_name@
- pyexecdir = @pyexecdir@
- 
--pythondir = $(prefix)/lib/python
-+pythondir = $(prefix)/lib/python2.3
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- subdirs = @subdirs@


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/rpms/hamlib/FC-3/hamlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hamlib.spec	21 Mar 2005 18:36:05 -0000	1.7
+++ hamlib.spec	24 Mar 2005 12:38:56 -0000	1.8
@@ -1,6 +1,8 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Name: hamlib
 Version: 1.2.3
-Release: 7
+Release: 9
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transceivers and receivers
@@ -62,12 +64,13 @@
 %package python
 Summary: Hamlib radio control library Python binding
 Group: Development/Libraries
+Requires: python-abi = %(%{__python} -c 'import sys;print(sys.version[:3])')
 
 %description python
 Hamlib Python Language bindings to allow radio control from Python scripts.
 
 %prep
-%setup
+%setup -q
 %patch -p1
 %patch1 -p1
 %build
@@ -94,6 +97,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
+rm -f $RPM_BUILD_ROOT%{_libdir}/hamlib-*.a $RPM_BUILD_ROOT%{_libdir}/hamlib-*.la
+/sbin/ldconfig -N -n $RPM_BUILDROOT%{_libdir}
 pushd bindings
 # Install Python
 make prefix=$RPM_BUILD_ROOT%{_prefix} \
@@ -109,6 +114,7 @@
         sharedstatedir=$RPM_BUILD_ROOT%{_sharedstatedir} \
         mandir=$RPM_BUILD_ROOT%{_mandir} \
         infodir=$RPM_BUILD_ROOT%{_infodir} \
+        pythondir=$RPM_BUILD_ROOT%{python_sitelib} \
    install-pythonPYTHON
 
 # Install PERL 
@@ -141,7 +147,7 @@
 
 %files
 %defattr(-, root, root)
-%doc COPYING doc/html
+%doc COPYING.LIB doc/html
 %{_bindir}/rigctl
 %{_bindir}/rigmem
 %{_bindir}/rigswr
@@ -151,7 +157,6 @@
 %{_libdir}/libhamlib-%{version}.so.2.0.2
 %{_libdir}/hamlib-*.so
 %{_libdir}/libhamlib.la
-%{_libdir}/hamlib-*.la
 %{_mandir}/man8/rpc.rigd.8.gz
 %{_mandir}/man8/rpc.rotd.8.gz
 %{_mandir}/man1/rigctl.1.gz
@@ -182,16 +187,15 @@
 
 %files python
 %defattr(-, root, root)
-%{_libdir}/python2.3/Hamlib.py
-%{_libdir}/python2.3/Hamlib.pyc
-%{_libdir}/python2.3/Hamlib.pyo
+%{python_sitelib}/*.py*
 
 %files devel
 %defattr(-, root, root)
+%doc README.developer
 %{_libdir}/libhamlib.so
 %{_libdir}/libhamlib.a
-%{_libdir}/hamlib-*.a
 %{_datadir}/aclocal/hamlib.m4
+%dir %{_includedir}/hamlib
 %{_includedir}/hamlib/rig.h
 %{_includedir}/hamlib/riglist.h
 %{_includedir}/hamlib/rig_dll.h
@@ -201,6 +205,17 @@
 
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-9
+- Python binding cleanup
+- soname/ldconfig cleanup
+- Added %%{_includedir}/hamlib to -devel
+- Removed %%{_libdir}/hamlib-*.a and hamlib-*.la
+- %%doc cleanups
+
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-8
+- Added -q to %%setup
+- Fixed Python binding build and Requires
+
 * Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-7
 - Removed spurious period and spelling mistake in Summary
 



From fedora-extras-commits at redhat.com  Thu Mar 24 12:40:49 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 07:40:49 -0500
Subject: rpms/linphone/FC-3 linphone-0.12.2-pkgconfig.patch, NONE,
	1.1 linphone.spec, 1.5, 1.6
Message-ID: <200503241240.j2OCenOq003024@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3018

Modified Files:
	linphone.spec 
Added Files:
	linphone-0.12.2-pkgconfig.patch 
Log Message:
pkgconfig and -devel fixes

linphone-0.12.2-pkgconfig.patch:

--- NEW FILE linphone-0.12.2-pkgconfig.patch ---
--- linphone-0.12.2/share/Makefile.in.orig	2005-03-23 16:26:52.922690626 -0500
+++ linphone-0.12.2/share/Makefile.in	2005-03-23 16:27:13.949932428 -0500
@@ -184,7 +184,7 @@
 confexdir = $(datadir)/linphonec
 confex_DATA = linphonec
 
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = linphone.pc
 
 EXTRA_DIST = $(LINPHONE_SOUNDS) \
--- linphone-0.12.2/share/linphone.pc.in.orig	2005-03-23 21:10:49.392763407 -0500
+++ linphone-0.12.2/share/linphone.pc.in	2005-03-23 21:11:21.983938389 -0500
@@ -1,7 +1,7 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 
 Name: liblinphone


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-3/linphone.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linphone.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ linphone.spec	24 Mar 2005 12:40:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        5
+Release:        7
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -9,6 +9,7 @@
 Source0:        http://simon.morlat.free.fr/download/0.12.2/source/linphone-0.12.2.tar.gz
 Patch:          linphone-0.12.2-docs.patch
 Patch1:         linphone-0.12.2-speex.patch
+Patch2:         linphone-0.12.2-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
@@ -33,7 +34,7 @@
 %package devel
 Summary:        Development libraries for linphone
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release} glib2-devel
 
 %description    devel
 Libraries required to develop software with linphone
@@ -42,6 +43,7 @@
 %setup -q
 %patch -p 1 -b .docs
 %patch1 -p 1 -b .speex
+%patch2 -p 1 -b .pkgconfig
 rm -r $RPM_BUILD_DIR/linphone-0.12.2/oRTP/docs
 rm -r $RPM_BUILD_DIR/linphone-0.12.2/speex
 
@@ -85,6 +87,12 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-7
+- pkgconfig and -devel fixes
+
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-6
+- Fix build on x86_64
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-5
 - %%
 



From fedora-extras-commits at redhat.com  Thu Mar 24 12:42:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 07:42:09 -0500
Subject: rpms/lock-keys-applet/FC-3 lock-keys-applet.spec,1.5,1.6
Message-ID: <200503241242.j2OCg9Kg003061@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3055

Modified Files:
	lock-keys-applet.spec 
Log Message:
Added scrollkeeper to BuildRequires


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/lock-keys-applet/FC-3/lock-keys-applet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lock-keys-applet.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ lock-keys-applet.spec	24 Mar 2005 12:42:07 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        5
+Release:        6
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
 License:        GPL
 URL:            http://mfcn.ilo.de/led_applet/
 Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgnomeui-devel gnome-panel-devel
+BuildRequires:  libgnomeui-devel gnome-panel-devel scrollkeeper
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -49,6 +49,9 @@
 %{_libexecdir}/%{name}
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-6
+- Added scrollkeeper to BuildRequires
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0-5
 - %%
 



From fedora-extras-commits at redhat.com  Thu Mar 24 12:43:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 07:43:47 -0500
Subject: rpms/pam_mysql/FC-3 pam_mysql-0.5-vars.patch, NONE,
	1.1 pam_mysql.spec, 1.2, 1.3
Message-ID: <200503241243.j2OChl8r003155@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3141

Modified Files:
	pam_mysql.spec 
Added Files:
	pam_mysql-0.5-vars.patch 
Log Message:
Fixed build on x86_64

pam_mysql-0.5-vars.patch:

--- NEW FILE pam_mysql-0.5-vars.patch ---
--- pam_mysql/Makefile.orig	2005-03-23 18:17:08.885220061 -0500
+++ pam_mysql/Makefile	2005-03-23 18:18:08.427578059 -0500
@@ -1,15 +1,16 @@
 # Convenient defaults for compiling independently of the full source
 # tree.
 ifndef FULL_LINUX_PAM_SOURCE_TREE
-export DYNAMIC=-DPAM_DYNAMIC
-export CC=gcc
-export CFLAGS=-O2 -Dlinux -DLINUX_PAM \
-       -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
-       -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \
-       -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \
-       -Wshadow -pedantic -fPIC
-export MKDIR=mkdir -p
-export LD_D=gcc -shared -Xlinker -x -L/usr/lib/mysql -lz
+DYNAMIC=-DPAM_DYNAMIC
+CC=gcc
+CFLAGS=-O2 -Dlinux -DLINUX_PAM \
+  -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
+  -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \
+  -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \
+  -Wshadow -pedantic -fPIC
+MKDIR=mkdir -p
+LIBDIR=/usr/lib
+LD_D=gcc -shared -Xlinker -x -L$(LIBDIR)/mysql -lz
 endif
 
 #


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/FC-3/pam_mysql.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam_mysql.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ pam_mysql.spec	24 Mar 2005 12:43:45 -0000	1.3
@@ -1,10 +1,11 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
 Name:		pam_mysql
 Version:	0.50
-Release:	3
+Release:	4
 License:	GPL
 Group:		Base
 Source0:	http://dl.sf.net/pam-mysql/pam_mysql-0.5.tar.gz
+Patch:		pam_mysql-0.5-vars.patch
 URL:		http://sf.net/projects/pam-mysql/
 BuildRequires:	pam-devel mysql-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
@@ -15,9 +16,10 @@
 
 %prep
 %setup -q -n %{name}
+%patch -p 1 -b .vars
 
 %build
-make
+make LIBDIR=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -32,6 +34,9 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-4
+- Fixed build on x86_64
+
 * Wed Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-3
 - Removed explicit Requires
 - Removed Polish Summary and Description



From fedora-extras-commits at redhat.com  Thu Mar 24 12:43:49 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 07:43:49 -0500
Subject: rpms/ufraw - New directory
Message-ID: <200503241243.j2OChnx1003177@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3148/ufraw

Log Message:
Directory /cvs/extras/rpms/ufraw added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 12:43:49 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 07:43:49 -0500
Subject: rpms/ufraw/devel - New directory
Message-ID: <200503241243.j2OChn9v003180@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3148/ufraw/devel

Log Message:
Directory /cvs/extras/rpms/ufraw/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 12:44:11 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 07:44:11 -0500
Subject: rpms/ufraw Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503241244.j2OCiBdY003239@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3230

Added Files:
	Makefile import.log 
Log Message:
Setup of module ufraw


--- NEW FILE Makefile ---
# Top level Makefile for module ufraw
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 12:44:11 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 07:44:11 -0500
Subject: rpms/ufraw/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503241244.j2OCiBbb003242@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3230/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ufraw


--- 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 Mar 24 12:44:56 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 07:44:56 -0500
Subject: rpms/ufraw import.log,1.1,1.2
Message-ID: <200503241244.j2OCiuba003341@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3332

Modified Files:
	import.log 
Log Message:
auto-import ufraw-0.4-1 on branch devel from ufraw-0.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ufraw/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 12:44:08 -0000	1.1
+++ import.log	24 Mar 2005 12:44:54 -0000	1.2
@@ -0,0 +1 @@
+ufraw-0_4-1:HEAD:ufraw-0.4-1.src.rpm:1111668258



From fedora-extras-commits at redhat.com  Thu Mar 24 12:44:56 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 07:44:56 -0500
Subject: rpms/ufraw/devel COPYING, NONE, 1.1 ufraw.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503241244.j2OCiulQ003345@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3332/devel

Modified Files:
	.cvsignore sources 
Added Files:
	COPYING ufraw.spec 
Log Message:
auto-import ufraw-0.4-1 on branch devel from ufraw-0.4-1.src.rpm


--- NEW FILE COPYING ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year  name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.


--- NEW FILE ufraw.spec ---
%define gimptool gimptool-2.0
%define gimpplugindir %(%gimptool --gimpplugindir)/plug-ins

Summary: A GIMP plugin to retreive raw image data from digital cameras.
Name: ufraw
Version: 0.4
Release: 1
Group: Applications/Multimedia
License: GPL
URL: http://ufraw.sourceforge.net
Source0: http://unc.dl.sourceforge.net/sourceforge/ufraw/ufraw-%{version}.tar.gz
Source1: COPYING
BuildRequires: gimp-devel >= 2.0
BuildRequires: gtk2-devel >= 2.4.0
BuildRequires: pkgconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

%description
UFRaw is a GIMP plug-in for opening digital cameras raw format images.

%prep
%setup -q
cp %{SOURCE1} .

%build
make

%install
rm -rf %buildroot
install -m 0755 -d %{buildroot}%{gimpplugindir}
install -m 0755 ufraw-gimp %{buildroot}%{gimpplugindir}

%clean
rm -rf %buildroot

%files
%defattr(-, root, root)
%doc COPYING README
%dir %{gimpplugindir}
%{gimpplugindir}/ufraw-gimp

%changelog
* Wed Mar 02 2005 Nils Philippsen <nphilipp at redhat.com>
- version 0.4
- update URLs

* Wed Dec 01 2004 Nils Philippsen <nphilipp at redhat.com>
- version 0.2
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 12:44:09 -0000	1.1
+++ .cvsignore	24 Mar 2005 12:44:54 -0000	1.2
@@ -0,0 +1 @@
+ufraw-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 12:44:09 -0000	1.1
+++ sources	24 Mar 2005 12:44:54 -0000	1.2
@@ -0,0 +1 @@
+c66a2498b3fb74eef6f3b7ce5477d44a  ufraw-0.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 13:10:42 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 08:10:42 -0500
Subject: rpms/ufraw/devel ufraw.spec,1.1,1.2
Message-ID: <200503241310.j2ODAg2I004391@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4377

Modified Files:
	ufraw.spec 
Log Message:
buildrequire lcms-devel
trim summary
change buildroot



Index: ufraw.spec
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ufraw.spec	24 Mar 2005 12:44:54 -0000	1.1
+++ ufraw.spec	24 Mar 2005 13:10:39 -0000	1.2
@@ -1,7 +1,7 @@
 %define gimptool gimptool-2.0
 %define gimpplugindir %(%gimptool --gimpplugindir)/plug-ins
 
-Summary: A GIMP plugin to retreive raw image data from digital cameras.
+Summary: GIMP plugin to retreive raw image data from digital cameras
 Name: ufraw
 Version: 0.4
 Release: 1
@@ -12,8 +12,9 @@
 Source1: COPYING
 BuildRequires: gimp-devel >= 2.0
 BuildRequires: gtk2-devel >= 2.4.0
+BuildRequires: lcms-devel
 BuildRequires: pkgconfig
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 
 %description
 UFRaw is a GIMP plug-in for opening digital cameras raw format images.
@@ -40,6 +41,11 @@
 %{gimpplugindir}/ufraw-gimp
 
 %changelog
+* Thu Mar 24 2005 Nils Philippsen <nphilipp at redhat.com> - 0.4-1
+- buildrequire lcms-devel
+- trim summary
+- change buildroot
+
 * Wed Mar 02 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 0.4
 - update URLs



From ivazquez at ivazquez.net  Thu Mar 24 14:14:50 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Thu, 24 Mar 2005 09:14:50 -0500
Subject: APPROVED: bmp
In-Reply-To: <20050317141328.2be51de0.bugs.michael@gmx.net>
References: <20050317141328.2be51de0.bugs.michael@gmx.net>
Message-ID: <1111673690.8887.4.camel@ignacio.ignacio.lan>

On Thu, 2005-03-17 at 14:13 +0100, Michael Schwendt wrote:
> Name: bmp
> Version: 0.9.7-4
> 
> BMP (Beep Media Player) is a media player that currently uses a skinned
> user interface based on Winamp 2.x skins. It is based on ("forked off")
> XMMS.

If bmp is going to have the xmms Bluecurve skin as a default then should
it have a dependency on either redhat-artwork
or /usr/share/xmms/Skins/Bluecurve-xmms.zip?

Oh, and it appears the windowshaded playlist part is wrong (grey when
focused, blue when unfocused), but that may be an upstream bug.

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050324/7403b312/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Thu Mar 24 14:34:12 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 24 Mar 2005 09:34:12 -0500
Subject: rpms/ufraw/devel ufraw.spec,1.2,1.3
Message-ID: <200503241434.j2OEYChR005539@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5533

Modified Files:
	ufraw.spec 
Log Message:
fix typo



Index: ufraw.spec
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ufraw.spec	24 Mar 2005 13:10:39 -0000	1.2
+++ ufraw.spec	24 Mar 2005 14:34:10 -0000	1.3
@@ -1,7 +1,7 @@
 %define gimptool gimptool-2.0
 %define gimpplugindir %(%gimptool --gimpplugindir)/plug-ins
 
-Summary: GIMP plugin to retreive raw image data from digital cameras
+Summary: GIMP plugin to retrieve raw image data from digital cameras
 Name: ufraw
 Version: 0.4
 Release: 1



From fedora-extras-commits at redhat.com  Thu Mar 24 15:16:19 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 24 Mar 2005 10:16:19 -0500
Subject: rpms/util-vserver/devel util-vserver.spec, 1.3, 1.4 sources, 1.3,
	1.4 .cvsignore, 1.3, 1.4
Message-ID: <200503241516.j2OFGJQK006637@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6631

Modified Files:
	util-vserver.spec sources .cvsignore 
Log Message:
version 0.30.205



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- util-vserver.spec	5 Mar 2005 19:55:54 -0000	1.3
+++ util-vserver.spec	24 Mar 2005 15:16:17 -0000	1.4
@@ -3,23 +3,26 @@
 ## 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...
-%{!?release_func:%define release_func() %1}
+%{!?_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
 
-%define confdir		%_sysconfdir/vservers
-%define confdefaultdir	%confdir/.defaults
-%define pkglibdir	%_libdir/%name
-%define __chattr	/usr/bin/chattr
-%define chkconfig	/sbin/chkconfig
+%global _localstatedir	%_var
 
-%define _localstatedir	%_var
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.203
+Version:	0.30.205
 Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
@@ -35,12 +38,12 @@
 Obsoletes:	vserver < %version
 BuildRequires:	mount vconfig gawk iproute iptables
 BuildRequires:	gcc-c++ wget
-BuildRequires:	e2fsprogs-devel
+BuildRequires:	e2fsprogs-devel beecrypt-devel
 BuildRequires:	doxygen tetex-latex
 Requires(post):		%__chattr
 Requires(pre):		%pkglibdir
 Requires(postun):	%pkglibdir
-%{!?_without_dietlibc:BuildRequires:	dietlibc >= 0:0.24}
+%{!?_without_dietlibc:BuildRequires:	dietlibc >= 0:0.25}
 %{!?_without_xalan:BuildRequires:	xalan-j}
 
 %package lib
@@ -88,7 +91,7 @@
 
 
 %description
-This package provides the components and a framework to setup virtual
+util-vserver provides the components and a framework to setup virtual
 servers.  A virtual server runs inside a linux server. It is nevertheless
 highly independent. As such, you can run various services with normal
 configuration. The various vservers can't interact with each other and
@@ -98,11 +101,66 @@
 set_ipv4root system call.
 
 %description lib
+util-vserver provides the components and a framework to setup virtual
+servers.  A virtual server runs inside a linux server. It is nevertheless
+highly independent. As such, you can run various services with normal
+configuration. The various vservers can't interact with each other and
+can't interact with services in the main server.
+
+This package contains the shared libraries needed by all other
+'util-vserver' subpackages.
+
 %description core
+util-vserver provides the components and a framework to setup virtual
+servers.  A virtual server runs inside a linux server. It is nevertheless
+highly independent. As such, you can run various services with normal
+configuration. The various vservers can't interact with each other and
+can't interact with services in the main server.
+
+This package contains utilities which are required to communicate with
+the Linux-Vserver enabled kernel.
+
+
 %description build
+util-vserver provides the components and a framework to setup virtual
+servers.  A virtual server runs inside a linux server. It is nevertheless
+highly independent. As such, you can run various services with normal
+configuration. The various vservers can't interact with each other and
+can't interact with services in the main server.
+
+This package contains utilities which assist in building Vservers.
+
 %description sysv
+util-vserver provides the components and a framework to setup virtual
+servers.  A virtual server runs inside a linux server. It is nevertheless
+highly independent. As such, you can run various services with normal
+configuration. The various vservers can't interact with each other and
+can't interact with services in the main server.
+
+This package contains the SysV initscripts which start and stop
+VServers and related tools.
+
+
 %description legacy
+util-vserver provides the components and a framework to setup virtual
+servers.  A virtual server runs inside a linux server. It is nevertheless
+highly independent. As such, you can run various services with normal
+configuration. The various vservers can't interact with each other and
+can't interact with services in the main server.
+
+This package contains the tools which are needed to work with VServers
+having an old-style configuration.
+
+
 %description devel
+util-vserver provides the components and a framework to setup virtual
+servers.  A virtual server runs inside a linux server. It is nevertheless
+highly independent. As such, you can run various services with normal
+configuration. The various vservers can't interact with each other and
+can't interact with services in the main server.
+
+This package contains header files and libraries which are needed to
+develop VServer related applications.
 
 
 %prep
@@ -167,6 +225,26 @@
 test "$1" = 0  || %_initrddir/vprocunhide condrestart >/dev/null || :
 
 
+%triggerin build -- fedora-release
+function copy()
+{
+    base=$1
+    shift
+
+    for i; do
+	test -r "$i" || continue
+
+	target=%confdir/.distributions/.common/pubkeys/$base-$(basename "$i")
+	cp -a "$i" "$target"
+    done
+}
+copy fedora /usr/share/doc/fedora-release-*/RPM-GPG-*
+
+
+%preun build
+test "$1" != 0 || rm -f %confdir/.distributions/.common/pubkeys/fedora-*
+
+
 ## Temporary workaround to remove old v_* files; it will conflict
 ## somehow with the -legacy package but can be fixed by reinstalling
 ## this package.
@@ -233,6 +311,10 @@
 %dir %confdir/.distributions
 %dir %confdir/.distributions/*
 %dir %confdir/.distributions/*/apt
+%dir %confdir/.distributions/.common
+%dir %confdir/.distributions/.common/pubkeys
+%dir %confdefaultdir/apps/vunify
+%dir %confdefaultdir/apps/vunify/hash
 
 
 %files legacy -f %name-legacy.list
@@ -247,6 +329,15 @@
 
 
 %changelog
+* Thu Mar 24 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.30.205-1
+- added some %%descriptions
+- copy GPG keys from the system into the confdir
+- buildrequire dietlibc-0.25
+- BuildRequire beecrypt-devel
+- cleanups
+- use %%global instead of %%define
+- removed 'run.rev' as a vserver-local variable and made it a system-wide setting
+
 * Wed Jan 26 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.30.198-0.3
 - updated BuildRequires:
 - use 'setattr --barrier' instead of 'chattr +t' in the %post scriptlet


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Feb 2005 00:54:37 -0000	1.3
+++ sources	24 Mar 2005 15:16:17 -0000	1.4
@@ -1,2 +1,2 @@
-205bed0babe0f64ce9073c5c15a3b8bb  util-vserver-0.30.203.tar.bz2
-1d8e15b81d7cc3d845851ce53c4ff433  util-vserver-0.30.203.tar.bz2.asc
+9d509327744fd5dfa84faa68531853c3  util-vserver-0.30.205.tar.bz2
+ce1b9390e89c332eec280a27883a6b46  util-vserver-0.30.205.tar.bz2.asc


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Feb 2005 00:53:05 -0000	1.3
+++ .cvsignore	24 Mar 2005 15:16:17 -0000	1.4
@@ -1 +1,4 @@
-util-vserver*.tar.bz2*
+util-vserver*.tar.bz2
+util-vserver*.tar.bz2.asc
+i386
+util-vserver*.src.rpm



From fedora-extras-commits at redhat.com  Thu Mar 24 15:28:20 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 10:28:20 -0500
Subject: devel/libosip libosip.spec,1.5,1.6
Message-ID: <200503241528.j2OFSKNZ006713@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/libosip
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6707

Modified Files:
	libosip.spec 
Log Message:
Moved osip.1 to -devel


Index: libosip.spec
===================================================================
RCS file: /cvs/extras/devel/libosip/libosip.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libosip.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ libosip.spec	24 Mar 2005 15:28:18 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libosip
 Version:        0.9.7
-Release:        5
+Release:        6
 Summary:        oSIP is an implementation of SIP
 
 Group:          System Environment/Libraries
@@ -63,7 +63,6 @@
 %files
 %defattr(-,root,root)
 %{_libdir}/*.so.*
-%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root)
@@ -71,8 +70,12 @@
 %{_libdir}/*.a
 %{_libdir}/*.la
 %{_libdir}/*.so
+%{_mandir}/man1/*
 
 %changelog
+* Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-6
+- Moved osip.1 to -devel
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.7-5
 - %%
 



From fedora-extras-commits at redhat.com  Thu Mar 24 15:41:01 2005
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Thu, 24 Mar 2005 10:41:01 -0500
Subject: rpms/sabayon/devel .cvsignore, 1.3, 1.4 sabayon.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200503241541.j2OFf1ic006804@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6798

Modified Files:
	.cvsignore sabayon.spec sources 
Log Message:
* Thu Mar 24 2005 Mark McLoughlin <markmc at redhat.com> - 0.17-1
- Update to 0.17
- Pass --with-prototype-user=sabayon-admin to configure



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Mar 2005 09:29:05 -0000	1.3
+++ .cvsignore	24 Mar 2005 15:40:59 -0000	1.4
@@ -1 +1 @@
-sabayon-0.16.tar.bz2
+sabayon-0.17.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sabayon.spec	21 Mar 2005 18:44:15 -0000	1.8
+++ sabayon.spec	24 Mar 2005 15:40:59 -0000	1.9
@@ -5,8 +5,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_pytho\n_lib()")}
 
 Name:    sabayon
-Version: 0.16
-Release: 8
+Version: 0.17
+Release: 1
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -51,7 +51,9 @@
 %setup -q
 
 %build
-%configure --enable-consolehelper=yes
+%configure					\
+	--enable-consolehelper=yes		\
+	 --with-prototype-user=%{name}-admin
 make %{?_smp_mflags}
 gzip -9 ChangeLog
 
@@ -171,6 +173,10 @@
 %ghost %{python_sitelib}/%{name}/userswindow.pyo
 
 %changelog
+* Thu Mar 24 2005 Mark McLoughlin <markmc at redhat.com> - 0.17-1
+- Update to 0.17
+- Pass --with-prototype-user=sabayon-admin to configure
+
 * Mon Mar 21 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-8
 - Add BuildRequires: usermode and pass --enable-consolehelper=yes
   to configure


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Mar 2005 09:29:05 -0000	1.3
+++ sources	24 Mar 2005 15:40:59 -0000	1.4
@@ -1 +1 @@
-3a2a9a18f44fa5e32dded73a4e111746  sabayon-0.16.tar.bz2
+e2727f9f63e60a734e0953a78f31565a  sabayon-0.17.tar.bz2



From bugs.michael at gmx.net  Thu Mar 24 15:54:27 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Thu, 24 Mar 2005 16:54:27 +0100
Subject: APPROVED: bmp
In-Reply-To: <1111673690.8887.4.camel@ignacio.ignacio.lan>
References: <20050317141328.2be51de0.bugs.michael@gmx.net>
	<1111673690.8887.4.camel@ignacio.ignacio.lan>
Message-ID: <20050324165427.3c66c2cc.bugs.michael@gmx.net>

On Thu, 24 Mar 2005 09:14:50 -0500, Ignacio Vazquez-Abrams wrote:

> On Thu, 2005-03-17 at 14:13 +0100, Michael Schwendt wrote:
> > Name: bmp
> > Version: 0.9.7-4
> > 
> > BMP (Beep Media Player) is a media player that currently uses a skinned
> > user interface based on Winamp 2.x skins. It is based on ("forked off")
> > XMMS.
> 
> If bmp is going to have the xmms Bluecurve skin as a default then should
> it have a dependency on either redhat-artwork
> or /usr/share/xmms/Skins/Bluecurve-xmms.zip?

No. First of all, see "rpm --redhatrequires redhat-artwork". And if the
Bluecurve skin is not available, BMP falls back to its own default skin.
 
> Oh, and it appears the windowshaded playlist part is wrong (grey when
> focused, blue when unfocused), but that may be an upstream bug.

I don't see anything like that here.



From fedora-extras-commits at redhat.com  Thu Mar 24 16:15:24 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 24 Mar 2005 11:15:24 -0500
Subject: devel/sylpheed .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sylpheed.spec,
	1.6, 1.7 sylpheed-1.0.3-draftsegf.patch, 1.1, NONE
Message-ID: <200503241615.j2OGFOSw007765@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/sylpheed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7759

Modified Files:
	.cvsignore sources sylpheed.spec 
Removed Files:
	sylpheed-1.0.3-draftsegf.patch 
Log Message:
Use release version 1.FC4 to allow for FC3 and FC2 updates.

* Thu Mar 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.4-1.FC4
- Update to 1.0.4 (minor security fixes).
- Patch4 (draftsegf) merged upstream.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/sylpheed/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Mar 2005 23:51:10 -0000	1.3
+++ .cvsignore	24 Mar 2005 16:15:22 -0000	1.4
@@ -1 +1 @@
-sylpheed-1.0.3.tar.bz2
+sylpheed-1.0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/devel/sylpheed/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Mar 2005 23:51:10 -0000	1.3
+++ sources	24 Mar 2005 16:15:22 -0000	1.4
@@ -1 +1 @@
-9e2733a0ea903c3fb29f537b67a6f15a  sylpheed-1.0.3.tar.bz2
+e47b275c281335d09201503af2115eaa  sylpheed-1.0.4.tar.bz2


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sylpheed.spec	17 Mar 2005 20:05:46 -0000	1.6
+++ sylpheed.spec	24 Mar 2005 16:15:22 -0000	1.7
@@ -4,8 +4,8 @@
 
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 1.0.3
-Release: 2
+Version: 1.0.4
+Release: 1.FC4
 License: GPL
 URL: http://sylpheed.good-day.net/
 Group: Applications/Internet
@@ -21,7 +21,6 @@
 Patch1: %{name}-0.8.9-ssl.patch
 Patch2: sylpheed-default-browser.patch
 Patch3: sylpheed-1.0.3-desktop.patch
-Patch4: sylpheed-1.0.3-draftsegf.patch
 
 %description
 This program is an X based fast email client which has features
@@ -44,7 +43,6 @@
 %patch1 -p1 -b .ssl
 %patch2 -p1 -b .default-browser
 %patch3 -p1 -b .desktop
-%patch4 -p1 -b .draftsegf
 
 %build
 autoconf
@@ -83,6 +81,10 @@
 %{_mandir}/man1
 
 %changelog
+* Thu Mar 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.4-1.FC4
+- Update to 1.0.4 (minor security fixes).
+- Patch4 (draftsegf) merged upstream.
+
 * Thu Mar 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-2
 - Fix segfault when reopening drafts.
 


--- sylpheed-1.0.3-draftsegf.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar 24 16:45:43 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 24 Mar 2005 11:45:43 -0500
Subject: rpms/fedora-rpmdevtools/devel .cvsignore, 1.6,
	1.7 fedora-rpmdevtools.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200503241645.j2OGjh1M007979@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fedora-rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7964/devel

Modified Files:
	.cvsignore fedora-rpmdevtools.spec sources 
Log Message:
1.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Feb 2005 22:12:33 -0000	1.6
+++ .cvsignore	24 Mar 2005 16:45:41 -0000	1.7
@@ -1 +1,2 @@
-fedora-rpmdevtools-0.3.1.tar.bz2
+fedora-rpmdevtools-1.0.tar.bz2
+spectool-1.0.4.tar.bz2


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-rpmdevtools.spec	3 Mar 2005 21:26:02 -0000	1.8
+++ fedora-rpmdevtools.spec	24 Mar 2005 16:45:41 -0000	1.9
@@ -1,20 +1,23 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
-%define xemacs_sitestart_d %{_prefix}/lib/xemacs/xemacs-packages/lisp/site-start.d %{_prefix}/lib64/xemacs/site-packages/lisp/site-start.d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%define spectool_version   1.0.4
 
 Name:           fedora-rpmdevtools
-Version:        0.3.1
+Version:        1.0
 Release:        1
 Summary:        Fedora RPM Development Tools
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://www.fedora.us/
+URL:            http://fedora.redhat.com/
 # rpminfo upstream: http://people.redhat.com/twoerner/rpminfo/bin/
 Source0:        %{name}-%{version}.tar.bz2
+Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 Provides:       %{name}-emacs = %{version}-%{release}
+Provides:       spectool = %{spectool_version}
 Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
 Requires:       rpm-python, python, cpio, sed, perl
@@ -27,22 +30,23 @@
 development of Fedora RPM packages.  These tools are designed for Red
 Hat Linux 8.0 and higher.
 fedora-buildrpmtree     Create RPM build tree within user's home directory
-fedora-installdevkeys   Install developer keys in alternate RPM keyring
+fedora-installdevkeys   Install GPG keys in alternate RPM keyring
 fedora-kmodhelper       Helper script for building kernel module RPMs
 fedora-md5              Display the md5sum of all files in an RPM
 fedora-newrpmspec       Creates new .spec from template
-fedora-pkgannfmt        Produce output for fedora-package-announce
 fedora-rmdevelrpms      Find (and optionally remove) "development" RPMs
 fedora-rpmchecksig      Check package signatures using alternate RPM keyring
 fedora-rpminfo          Prints information about executables and libraries
 fedora-rpmvercmp        RPM version comparison checker
 fedora-extract          Extract various archives, "tar xvf" style
 fedora-diffarchive      Diff contents of two archives
-fedora-wipebuildtree    Erases all files within dirs created by buildrpmtree
+fedora-wipebuildtree    Erase all files within dirs created by buildrpmtree
+spectool                Expand and download sources and patches in specfiles
 
 
 %prep
-%setup -q
+%setup -q -a 1
+cp -p spectool*/README README.spectool
 
 
 %build
@@ -57,7 +61,6 @@
 install -pm 755 fedora-kmodhelper      $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-md5             $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-newrpmspec      $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-pkgannfmt       $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-rmdevelrpms     $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-rpmchecksig     $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 rpminfo                $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo
@@ -65,6 +68,7 @@
 install -pm 755 fedora-diffarchive     $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-rpmvercmp       $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-wipebuildtree   $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 spectool*/spectool     $RPM_BUILD_ROOT%{_bindir}
 
 install -dm 755 $RPM_BUILD_ROOT%{_prefix}/lib/rpm
 install -pm 755 check-buildroot check-rpaths* \
@@ -81,7 +85,6 @@
   install -dm 755 $RPM_BUILD_ROOT$dir
   ln -s %{_datadir}/fedora/emacs/fedora-init.el $RPM_BUILD_ROOT$dir
   touch $RPM_BUILD_ROOT$dir/fedora-init.elc
-  echo "%ghost $dir/fedora-init.el*" >> %{name}-%{version}.files
 done
 
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/fedora
@@ -95,39 +98,49 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerin -- emacs
-if [ -d %{emacs_sitestart_d} ] ; then
-  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{emacs_sitestart_d}
-fi
-
-%triggerin -- xemacs
-for dir in %{xemacs_sitestart_d} ; do
-  if [ -d $dir ] ; then
-    ln -sf %{_datadir}/fedora/emacs/fedora-init.el $dir
-  fi
-done
 
-%triggerun -- emacs
-[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/fedora-init.{el,elc} || :
+%triggerin -- emacs-common
+[ -d %{emacs_sitestart_d} ] && \
+  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{emacs_sitestart_d} || :
+
+%triggerin -- xemacs-common
+[ -d %{xemacs_sitestart_d} ] && \
+  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{xemacs_sitestart_d} || :
 
-%triggerun -- xemacs
-if [ $2 -eq 0 ] ; then
-  for dir in %{xemacs_sitestart_d} ; do
-    rm -f $dir/fedora-init.{el,elc} || :
-  done
-fi
+%triggerun -- emacs-common
+[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/fedora-init.el* || :
 
+%triggerun -- xemacs-common
+[ $2 -eq 0 ] && rm -f %{xemacs_sitestart_d}/fedora-init.el* || :
 
-%files -f %{name}-%{version}.files
+
+%files
 %defattr(-,root,root,-)
-%doc COPYING emacs/*.patch
+%doc COPYING README*
 %config(noreplace) %{_sysconfdir}/fedora
 %{_datadir}/fedora
 %{_bindir}/fedora-*
+%{_bindir}/spectool
 %{_prefix}/lib/rpm/check-*
+%ghost %{_datadir}/*emacs
 
 
 %changelog
+* Thu Mar 24 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-1
+- Make fedora-diffarchive work better with archives containing dirs without
+  read/execute permissions.
+- Sync "Epoch: 0" drops with Fedora Extras CVS.
+- Include Nils Philippsen's spectool.
+- Own (%%ghost'd) more dirs from the site-lisp dir hierarchies.
+- Drop trigger support pre-FC2 Emacs and XEmacs packages.
+- Drop rpm-spec-mode.el patch, no longer needed for FC2 Emacs and later.
+- Update URLs.
+- Drop developer GPG keys from the package, add Fedora Extras key.
+- Drop fedora-pkgannfmt, it's no longer relevant.
+- Remove pre-FC2 compatibility stuff from Perl spec template.
+- Don't try to remove gcc-java and related packages by default in rmdevelrpms.
+- Remove "full featured" spec template, convert newrpmspec to use -minimal.
+
 * Sun Feb  6 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3.1-1
 - Make buildrpmtree and wipebuildtree less dependent on a specific
   configuration (#147014, Ignacio Vazquez-Abrams).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Feb 2005 22:12:33 -0000	1.6
+++ sources	24 Mar 2005 16:45:41 -0000	1.7
@@ -1 +1,2 @@
-f602fb0535375b4591c67319de60040f  fedora-rpmdevtools-0.3.1.tar.bz2
+2f20b353cb5795cf01742f8ca08e8d29  fedora-rpmdevtools-1.0.tar.bz2
+f88484ff2a2d83f0cc1d37bc71300f7a  spectool-1.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Mar 24 16:45:43 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 24 Mar 2005 11:45:43 -0500
Subject: rpms/fedora-rpmdevtools/FC-3 .cvsignore, 1.6,
	1.7 fedora-rpmdevtools.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <200503241645.j2OGjh55007973@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fedora-rpmdevtools/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7964/FC-3

Modified Files:
	.cvsignore fedora-rpmdevtools.spec sources 
Log Message:
1.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Feb 2005 22:12:33 -0000	1.6
+++ .cvsignore	24 Mar 2005 16:45:41 -0000	1.7
@@ -1 +1,2 @@
-fedora-rpmdevtools-0.3.1.tar.bz2
+fedora-rpmdevtools-1.0.tar.bz2
+spectool-1.0.4.tar.bz2


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/fedora-rpmdevtools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-rpmdevtools.spec	9 Feb 2005 22:12:33 -0000	1.6
+++ fedora-rpmdevtools.spec	24 Mar 2005 16:45:41 -0000	1.7
@@ -1,22 +1,24 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
-%define xemacs_sitestart_d %{_prefix}/lib/xemacs/xemacs-packages/lisp/site-start.d %{_prefix}/lib64/xemacs/site-packages/lisp/site-start.d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%define spectool_version   1.0.4
 
 Name:           fedora-rpmdevtools
-Version:        0.3.1
+Version:        1.0
 Release:        1
-Epoch:          0
 Summary:        Fedora RPM Development Tools
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://www.fedora.us/
+URL:            http://fedora.redhat.com/
 # rpminfo upstream: http://people.redhat.com/twoerner/rpminfo/bin/
 Source0:        %{name}-%{version}.tar.bz2
+Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Provides:       %{name}-emacs = %{epoch}:%{version}-%{release}
-Obsoletes:      %{name}-emacs < 0:0.1.9
+Provides:       %{name}-emacs = %{version}-%{release}
+Provides:       spectool = %{spectool_version}
+Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
 Requires:       rpm-python, python, cpio, sed, perl
 # Minimal RPM build requirements
@@ -28,22 +30,23 @@
 development of Fedora RPM packages.  These tools are designed for Red
 Hat Linux 8.0 and higher.
 fedora-buildrpmtree     Create RPM build tree within user's home directory
-fedora-installdevkeys   Install developer keys in alternate RPM keyring
+fedora-installdevkeys   Install GPG keys in alternate RPM keyring
 fedora-kmodhelper       Helper script for building kernel module RPMs
 fedora-md5              Display the md5sum of all files in an RPM
 fedora-newrpmspec       Creates new .spec from template
-fedora-pkgannfmt        Produce output for fedora-package-announce
 fedora-rmdevelrpms      Find (and optionally remove) "development" RPMs
 fedora-rpmchecksig      Check package signatures using alternate RPM keyring
 fedora-rpminfo          Prints information about executables and libraries
 fedora-rpmvercmp        RPM version comparison checker
 fedora-extract          Extract various archives, "tar xvf" style
 fedora-diffarchive      Diff contents of two archives
-fedora-wipebuildtree    Erases all files within dirs created by buildrpmtree
+fedora-wipebuildtree    Erase all files within dirs created by buildrpmtree
+spectool                Expand and download sources and patches in specfiles
 
 
 %prep
-%setup -q
+%setup -q -a 1
+cp -p spectool*/README README.spectool
 
 
 %build
@@ -58,7 +61,6 @@
 install -pm 755 fedora-kmodhelper      $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-md5             $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-newrpmspec      $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-pkgannfmt       $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-rmdevelrpms     $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-rpmchecksig     $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 rpminfo                $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo
@@ -66,6 +68,7 @@
 install -pm 755 fedora-diffarchive     $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-rpmvercmp       $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 fedora-wipebuildtree   $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 spectool*/spectool     $RPM_BUILD_ROOT%{_bindir}
 
 install -dm 755 $RPM_BUILD_ROOT%{_prefix}/lib/rpm
 install -pm 755 check-buildroot check-rpaths* \
@@ -82,7 +85,6 @@
   install -dm 755 $RPM_BUILD_ROOT$dir
   ln -s %{_datadir}/fedora/emacs/fedora-init.el $RPM_BUILD_ROOT$dir
   touch $RPM_BUILD_ROOT$dir/fedora-init.elc
-  echo "%ghost $dir/fedora-init.el*" >> %{name}-%{version}.files
 done
 
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/fedora
@@ -96,39 +98,49 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerin -- emacs
-if [ -d %{emacs_sitestart_d} ] ; then
-  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{emacs_sitestart_d}
-fi
-
-%triggerin -- xemacs
-for dir in %{xemacs_sitestart_d} ; do
-  if [ -d $dir ] ; then
-    ln -sf %{_datadir}/fedora/emacs/fedora-init.el $dir
-  fi
-done
 
-%triggerun -- emacs
-[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/fedora-init.{el,elc} || :
+%triggerin -- emacs-common
+[ -d %{emacs_sitestart_d} ] && \
+  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{emacs_sitestart_d} || :
+
+%triggerin -- xemacs-common
+[ -d %{xemacs_sitestart_d} ] && \
+  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{xemacs_sitestart_d} || :
 
-%triggerun -- xemacs
-if [ $2 -eq 0 ] ; then
-  for dir in %{xemacs_sitestart_d} ; do
-    rm -f $dir/fedora-init.{el,elc} || :
-  done
-fi
+%triggerun -- emacs-common
+[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/fedora-init.el* || :
 
+%triggerun -- xemacs-common
+[ $2 -eq 0 ] && rm -f %{xemacs_sitestart_d}/fedora-init.el* || :
 
-%files -f %{name}-%{version}.files
+
+%files
 %defattr(-,root,root,-)
-%doc COPYING emacs/*.patch
+%doc COPYING README*
 %config(noreplace) %{_sysconfdir}/fedora
 %{_datadir}/fedora
 %{_bindir}/fedora-*
+%{_bindir}/spectool
 %{_prefix}/lib/rpm/check-*
+%ghost %{_datadir}/*emacs
 
 
 %changelog
+* Thu Mar 24 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-1
+- Make fedora-diffarchive work better with archives containing dirs without
+  read/execute permissions.
+- Sync "Epoch: 0" drops with Fedora Extras CVS.
+- Include Nils Philippsen's spectool.
+- Own (%%ghost'd) more dirs from the site-lisp dir hierarchies.
+- Drop trigger support pre-FC2 Emacs and XEmacs packages.
+- Drop rpm-spec-mode.el patch, no longer needed for FC2 Emacs and later.
+- Update URLs.
+- Drop developer GPG keys from the package, add Fedora Extras key.
+- Drop fedora-pkgannfmt, it's no longer relevant.
+- Remove pre-FC2 compatibility stuff from Perl spec template.
+- Don't try to remove gcc-java and related packages by default in rmdevelrpms.
+- Remove "full featured" spec template, convert newrpmspec to use -minimal.
+
 * Sun Feb  6 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3.1-1
 - Make buildrpmtree and wipebuildtree less dependent on a specific
   configuration (#147014, Ignacio Vazquez-Abrams).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Feb 2005 22:12:33 -0000	1.6
+++ sources	24 Mar 2005 16:45:41 -0000	1.7
@@ -1 +1,2 @@
-f602fb0535375b4591c67319de60040f  fedora-rpmdevtools-0.3.1.tar.bz2
+2f20b353cb5795cf01742f8ca08e8d29  fedora-rpmdevtools-1.0.tar.bz2
+f88484ff2a2d83f0cc1d37bc71300f7a  spectool-1.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Mar 24 16:57:49 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 24 Mar 2005 11:57:49 -0500
Subject: rpms/hddtemp/FC-3 .cvsignore, 1.4, 1.5 hddtemp.db, 1.2,
	1.3 hddtemp.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200503241657.j2OGvnYS008109@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/hddtemp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8099/FC-3

Modified Files:
	.cvsignore hddtemp.db hddtemp.spec sources 
Log Message:
0.3-beta13, hddtemp.db 2005-03-22.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jan 2005 13:32:11 -0000	1.4
+++ .cvsignore	24 Mar 2005 16:57:47 -0000	1.5
@@ -1 +1 @@
-hddtemp-0.3-beta12.tar.bz2
+hddtemp-0.3-beta13.tar.bz2


Index: hddtemp.db
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/FC-3/hddtemp.db,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hddtemp.db	22 Jan 2005 13:39:06 -0000	1.2
+++ hddtemp.db	24 Mar 2005 16:57:47 -0000	1.3
@@ -18,7 +18,6 @@
 # HITACHI HITACHI_DK23CA-10 9.8GB
 # HITACHI HITACHI_DK23CA-15 14.7GB
 # HITACHI HITACHI_DK23CA-30 29.3GB
-# MAXTOR MAXTOR 4K020H1 19.9GB
 # SAMSUNG SAMSUNG SV3012H 29.4GB
 # SEAGATE ST310210A 10.0GB
 # SEAGATE ST310211A 9.8GB
@@ -74,6 +73,7 @@
 "FUJITSU MPG3409AH.*"           194  C  "Fujitsu MPG3409AH E"
 "FUJITSU MPG3204AH"		194  C  "Fujitsu MPG3204AH"
 
+
 ########################################
 ############# Hitachi drives
 ########################################
@@ -141,18 +141,22 @@
 #"Maxtor 4D040H2"					9    C	"Maxtor DiamondMax D540X-4D"
 #"Maxtor 4D040H2"                        		0    C  "Maxtor 4D040H2"
 #"Maxtor 4D080H4"					12   C	"Maxtor DiamondMax D540X-4D"
+#"Maxtor 4D060H3"					12   C	"Maxtor DiamondMax D540X-4D"
 #"Maxtor 4D080H4"					9    C	"Maxtor DiamondMax D540X-4D"
 "MAXTOR 4K0[468]0H[234]"				194  C  "Maxtor DiamondMax D540X serie"
+"MAXTOR 4K020H1"					194  C  "Maxtor 4K020H1"
 "Maxtor 4[RA](25|16|12|08|06)0[LJ]0"			194  C  "Maxtor DiamondMax 16"
 "Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)"	0    C	"Maxtor DiamondMax Plus 40"
 "Maxtor 5A250J0"					194  C  "Maxtor MaXline II 250GB 5400RPM"
 "Maxtor 5A300J0"					194  C  "Maxtor 5A300J0"
 "Maxtor 5T0[24]0H[24]"					0    C  "Maxtor DiamondMax Plus 60"
+"Maxtor 6B(08|12|16|20|25|30)0[RSPM]0"			194  C  "Maxtor DiamondMax Plus 10"
 "Maxtor 6E0[234]0L0"					194  C  "Maxtor DiamondMax Plus 8"
 "MAXTOR 6L0[2468]0[LJ][1234]"				194  C  "Maxtor DiamondMax Plus D740X family"
-"Maxtor 6[YB](04|06|08|12|16|20|25)0[LPM]0"		194  C  "Maxtor DiamondMax Plus 9" 
+"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0"			194  C  "Maxtor DiamondMax Plus 9" 
 "Maxtor 7Y250[PM]0"					194  C	"Maxtor MaXLine Plus II 250GB 7200RPM"
 "Maxtor 94098U8"			 		11   C  "Maxtor DiamondMax 40 94098U8"
+"Maxtor 6B200P0" 194 C "Maxtor DiamondMax 10"
 
 ########################################
 ############# Quantum drives
@@ -185,7 +189,6 @@
 "SAMSUNG SV(0401|0802|1203|1604)N"			194  C  "Samsung SpinPoint V80 serie"
 
 
-
 ########################################
 ############# Seagate drives
 ########################################
@@ -234,6 +237,9 @@
 "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"
+"ST3250823A"				194  C  "Seagate Barracuda 7200.8 250GB"
+"ST3400832A"                            194  C  "Seagate Barracuda 7200.8 Plus 400GB"
+"ST9100823A"				194  C	"Seagate Momentus 5400.2 100GB"
 "ST94[08]11A"				194  C  "Seagate ST94011A"
 
 
@@ -247,6 +253,7 @@
 "TOSHIBA MK3017GAP"			0    C  "Toshiba MK3017GAP"
 "TOSHIBA MK3021GAS"			194  C  "Toshiba MK3021GAS"
 #"TOSHIBA MK4019GAX"			222  C  "Toshiba MK4019GAX"
+"TOSHIBA MK4025GAS"			194  C  "Toshiba MK4025GAS 40 Go"
 "TOSHIBA MK6021GAS"			194  C	"Toshiba MK6021GAS"
 "TOSHIBA MK6022GAX"			194  C	"Toshiba MK6022GAX"
 "TOSHIBA MK6025GAS"			194  C  "Toshiba MK6025GAS"
@@ -254,41 +261,47 @@
 "TOSHIBA MK8026GAX"			194  C  "Toshiba MK8026GAX" 
 "MK4025GAS"                             194  C  "Toshiba MK4025GAS"
 
-
-
 ########################################
 ############# Western Digital drives
 ########################################
 # WDC AC310100B and WDC AC2850F are reported not working
 # no more informations were given
-"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 WD360GD-00FNA0"				194 C "Western Digital SATA Raptor 36.7GB"
-"WDC WD400BB-(18CA|00DE)A0"     		  0 C "Western Digital Caviar WD400BB"
-"WDC WD400EB-00CPF0"				  0 C "Western Digital 400EB-00CPF0"
-"WDC WD400JB-00FMA0"				194 C "Western Digital Caviar 40GB Special Edition 8MB"
-"WDC WD600BB-32BSA0"				  0 C "Western Digital 600BB-32BSA0"
-"WDC WD600LB-00DNA0"            		194 C "Western Digital 60GB"
-"WDC WD800BB-00CAA1"				  0 C "Western Digital WD800BB-00CAA1"
-"WDC WD800BB-22DKA0"				194 C "Western Digital 800BB-22DKA0"
-"WDC WD800BB-32CCB0"				194 C "Western Digital 800BB-32CCB0"
-"WDC WD800BB-55JKA0"				194 C "Western Digital 800BB-55JKA0" 
-"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-00JJA0"				194 C "Western Digital WD800JB"
-"WDC WD800JD-00HKA0"				194 C "Western Digital SATA 80GB, 8MB Cache"
-"WDC WD1200JB-00(EV|FU|GV)A0"   		194 C "Western Digital Caviar 120GB Special Edition 8MB" 
-"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-00(EV|FU|GV)A0"   		194 C "Western Digital Caviar 160GB Special Edition 8MB"
-"WDC WD2000JB-(00EV|34EV|00FU|00GV|98GV)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
-"WDC WD2500JB-(00FU|32FU|00GV)A0"		194 C "Western Digital Caviar 250GB Special Edition 8MB"
-"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-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)A0"				194 C "Western Digital Caviar 40GB Special Edition 8MB"
+"WDC WD600BB-32BSA0"					  0 C "Western Digital 600BB-32BSA0"
+"WDC WD600LB-00DNA0"            			194 C "Western Digital 60GB"
+"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-55JKA0"					194 C "Western Digital 800BB-55JKA0" 
+"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-00JJA0"					194 C "Western Digital WD800JB"
+"WDC WD800JD-00HKA0"					194 C "Western Digital SATA 80GB, 8MB Cache"
+"WDC WD1200BB-00FTA0"					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 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-00(EV|FU|GV)A0"   			194 C "Western Digital Caviar 160GB Special Edition 8MB"
+"WDC WD2000JB-(00EV|34EV|00FU|00GV|55GV|98GV)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
+"WDC WD2500JB-(00FU|32FU|00GV)A0"			194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC WD2500PB-98FBA0"					194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC AC420400D"                 			231 C "Western Digital Caviar AC420400D"
+"WDC AC418000D"						231 C "Western Digital AC418000D"
+"WDC WD135BA"						231 C "Western Digital WD135BA"
 
 # not sure for next
 # "WDC WD1200JB-00CRA1"		9   C "Western Digital 1200JB-00CRA1"
 # "WDC WD273BA"			9   C "Western Digital WD273BA"
+
+# SATA drive with libata passthru
+"WDC WD740GD-00FL21.0"				194 C "Western Digital SATA Raptor"


Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/FC-3/hddtemp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hddtemp.spec	22 Jan 2005 13:39:06 -0000	1.7
+++ hddtemp.spec	24 Mar 2005 16:57:47 -0000	1.8
@@ -1,13 +1,15 @@
+%define beta    beta13
+
 Name:           hddtemp
 Version:        0.3
-Release:        0.2.beta12
+Release:        0.2.%{beta}
 Epoch:          0
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.guzu.net/linux/hddtemp.php
-Source0:        http://www.guzu.net/linux/hddtemp-0.3-beta12.tar.bz2
+Source0:        http://www.guzu.net/linux/%{name}-%{version}-%{beta}.tar.bz2
 Source1:        http://www.guzu.net/linux/hddtemp.db
 Source2:        %{name}.init
 Source3:        %{name}.sysconfig
@@ -24,7 +26,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-beta12
+%setup -q -n %{name}-%{version}-%{beta}
 %{__perl} -pi -e \
   's|/usr/share/misc/hddtemp\.db\b|%{_datadir}/misc/hddtemp.db|' \
   src/db.h doc/hddtemp.8
@@ -35,6 +37,7 @@
    s|__INITDIR__|%{_initrddir}|g ;
    s|__LOCKDIR__|%{_localstatedir}/lock|g' \
   hddtemp.init
+chmod -x contribs/analyze/*
 
 
 %build
@@ -92,6 +95,9 @@
 
 
 %changelog
+* Thu Mar 24 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3-0.2.beta13
+- 0.3-beta13, hddtemp.db 2005-03-22.
+
 * Sat Jan 22 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.3-0.2.beta12
 - Update hddtemp.db to 2005-01-17.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Jan 2005 13:32:11 -0000	1.5
+++ sources	24 Mar 2005 16:57:47 -0000	1.6
@@ -1 +1 @@
-51f19658fa6e745eee62f6e100838884  hddtemp-0.3-beta12.tar.bz2
+36d98101daeac1ae8c1589a75aaab00c  hddtemp-0.3-beta13.tar.bz2



From fedora-extras-commits at redhat.com  Thu Mar 24 16:57:49 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 24 Mar 2005 11:57:49 -0500
Subject: rpms/hddtemp/devel .cvsignore, 1.4, 1.5 hddtemp.db, 1.3,
	1.4 hddtemp.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <200503241657.j2OGvnHv008116@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8099/devel

Modified Files:
	.cvsignore hddtemp.db hddtemp.spec sources 
Log Message:
0.3-beta13, hddtemp.db 2005-03-22.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jan 2005 13:32:11 -0000	1.4
+++ .cvsignore	24 Mar 2005 16:57:47 -0000	1.5
@@ -1 +1 @@
-hddtemp-0.3-beta12.tar.bz2
+hddtemp-0.3-beta13.tar.bz2


Index: hddtemp.db
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.db,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hddtemp.db	15 Mar 2005 11:59:32 -0000	1.3
+++ hddtemp.db	24 Mar 2005 16:57:47 -0000	1.4
@@ -18,7 +18,6 @@
 # HITACHI HITACHI_DK23CA-10 9.8GB
 # HITACHI HITACHI_DK23CA-15 14.7GB
 # HITACHI HITACHI_DK23CA-30 29.3GB
-# MAXTOR MAXTOR 4K020H1 19.9GB
 # SAMSUNG SAMSUNG SV3012H 29.4GB
 # SEAGATE ST310210A 10.0GB
 # SEAGATE ST310211A 9.8GB
@@ -145,6 +144,7 @@
 #"Maxtor 4D060H3"					12   C	"Maxtor DiamondMax D540X-4D"
 #"Maxtor 4D080H4"					9    C	"Maxtor DiamondMax D540X-4D"
 "MAXTOR 4K0[468]0H[234]"				194  C  "Maxtor DiamondMax D540X serie"
+"MAXTOR 4K020H1"					194  C  "Maxtor 4K020H1"
 "Maxtor 4[RA](25|16|12|08|06)0[LJ]0"			194  C  "Maxtor DiamondMax 16"
 "Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)"	0    C	"Maxtor DiamondMax Plus 40"
 "Maxtor 5A250J0"					194  C  "Maxtor MaXline II 250GB 5400RPM"


Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hddtemp.spec	15 Mar 2005 11:59:32 -0000	1.9
+++ hddtemp.spec	24 Mar 2005 16:57:47 -0000	1.10
@@ -1,12 +1,14 @@
+%define beta    beta13
+
 Name:           hddtemp
 Version:        0.3
-Release:        0.3.beta12
+Release:        0.3.%{beta}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.guzu.net/linux/hddtemp.php
-Source0:        http://www.guzu.net/linux/hddtemp-0.3-beta12.tar.bz2
+Source0:        http://www.guzu.net/linux/%{name}-%{version}-%{beta}.tar.bz2
 Source1:        http://www.guzu.net/linux/hddtemp.db
 Source2:        %{name}.init
 Source3:        %{name}.sysconfig
@@ -23,7 +25,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-beta12
+%setup -q -n %{name}-%{version}-%{beta}
 %{__perl} -pi -e \
   's|/usr/share/misc/hddtemp\.db\b|%{_datadir}/misc/hddtemp.db|' \
   src/db.h doc/hddtemp.8
@@ -34,6 +36,7 @@
    s|__INITDIR__|%{_initrddir}|g ;
    s|__LOCKDIR__|%{_localstatedir}/lock|g' \
   hddtemp.init
+chmod -x contribs/analyze/*
 
 
 %build
@@ -91,6 +94,9 @@
 
 
 %changelog
+* Thu Mar 24 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.3.beta13
+- 0.3-beta13, hddtemp.db 2005-03-22.
+
 * Tue Mar 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.3.beta12
 - Update hddtemp.db to 2005-03-15.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Jan 2005 13:32:11 -0000	1.5
+++ sources	24 Mar 2005 16:57:47 -0000	1.6
@@ -1 +1 @@
-51f19658fa6e745eee62f6e100838884  hddtemp-0.3-beta12.tar.bz2
+36d98101daeac1ae8c1589a75aaab00c  hddtemp-0.3-beta13.tar.bz2



From fedora-extras-commits at redhat.com  Thu Mar 24 17:48:04 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 12:48:04 -0500
Subject: rpms/libosip2 - New directory
Message-ID: <200503241748.j2OHm4ds009238@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/libosip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9231/libosip2

Log Message:
Directory /cvs/extras/rpms/libosip2 added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 17:48:04 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 12:48:04 -0500
Subject: rpms/libosip2/devel - New directory
Message-ID: <200503241748.j2OHm44T009241@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9231/libosip2/devel

Log Message:
Directory /cvs/extras/rpms/libosip2/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 17:48:25 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 12:48:25 -0500
Subject: rpms/libosip2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503241748.j2OHmPFt009300@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/libosip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9291

Added Files:
	Makefile import.log 
Log Message:
Setup of module libosip2


--- NEW FILE Makefile ---
# Top level Makefile for module libosip2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 17:48:25 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 12:48:25 -0500
Subject: rpms/libosip2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503241748.j2OHmPZ9009303@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9291/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libosip2


--- 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 Mar 24 17:49:12 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 12:49:12 -0500
Subject: rpms/libosip2 import.log,1.1,1.2
Message-ID: <200503241749.j2OHnC07009396@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/libosip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9387

Modified Files:
	import.log 
Log Message:
auto-import libosip2-2.2.0-1 on branch devel from libosip2-2.2.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libosip2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 17:48:23 -0000	1.1
+++ import.log	24 Mar 2005 17:49:10 -0000	1.2
@@ -0,0 +1 @@
+libosip2-2_2_0-1:HEAD:libosip2-2.2.0-1.src.rpm:1111686541



From fedora-extras-commits at redhat.com  Thu Mar 24 17:49:12 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 12:49:12 -0500
Subject: rpms/libosip2/devel libosip2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503241749.j2OHnCCp009400@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9387/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libosip2.spec 
Log Message:
auto-import libosip2-2.2.0-1 on branch devel from libosip2-2.2.0-1.src.rpm


--- NEW FILE libosip2.spec ---
Name:           libosip2
Version:        2.2.0
Release:        1
Summary:        oSIP is an implementation of SIP

Group:          System Environment/Libraries
License:        LGPL
URL:            http://www.gnu.org/software/osip/
Source0:        http://ftp.gnu.org/gnu/osip/libosip2-2.2.0.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
oSIP is an implementation of SIP.

SIP stands for the Session Initiation Protocol and is described by the rfc3261
(wich deprecates rfc2543). This library aims to provide multimedia and telecom
software developers an easy and powerful interface to initiate and control SIP
based sessions in their applications. SIP is a open standard replacement from
IETF for H.323.

%package        devel
Summary:        Development libraries for oSIP
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The GNU oSIP library is written in C and get no dependencies except the
standard C library. oSIP is thread safe and will generally be used in a
multi-threaded application. Nevertheless, this is optional.

oSIP is little in size and code and thus could be use to implement IP
soft-phone as well as embedded SIP software. oSIP is not limited to endpoint
agents, and can also be used to implement "SIP proxy".

oSIP does not intend to provide a high layer API for controlling "SIP Session"
at this step. Instead, it currently provides an API for the SIP message parser,
SDP message parser, and library to handle "SIP transactions" as defined by the
SIP document.

%prep
%setup -q

%build
%configure
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

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING ChangeLog FEATURES HISTORY NEWS README TODO
%{_libdir}/*.so.*
%{_mandir}/man[^3]/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/osip2
%{_includedir}/osipparser2
%{_libdir}/*.a
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc

%changelog
* Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.0-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 17:48:23 -0000	1.1
+++ .cvsignore	24 Mar 2005 17:49:10 -0000	1.2
@@ -0,0 +1 @@
+libosip2-2.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 17:48:23 -0000	1.1
+++ sources	24 Mar 2005 17:49:10 -0000	1.2
@@ -0,0 +1 @@
+f1237af0250c59b318bd64a59f5750ea  libosip2-2.2.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 18:33:28 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 13:33:28 -0500
Subject: devel/libosip2 libosip2.spec,1.1,1.2
Message-ID: <200503241833.j2OIXSEd010497@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/libosip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10491

Modified Files:
	libosip2.spec 
Log Message:
Renamed osip.1 and moved to -devel


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/devel/libosip2/libosip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libosip2.spec	24 Mar 2005 17:49:10 -0000	1.1
+++ libosip2.spec	24 Mar 2005 18:33:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libosip2
 Version:        2.2.0
-Release:        1
+Release:        2
 Summary:        oSIP is an implementation of SIP
 
 Group:          System Environment/Libraries
@@ -48,6 +48,7 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+rename .1 2.1 $RPM_BUILD_ROOT%{_mandir}/man1/osip.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,7 +61,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING ChangeLog FEATURES HISTORY NEWS README TODO
 %{_libdir}/*.so.*
-%{_mandir}/man[^3]/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -69,7 +69,11 @@
 %{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+%{_mandir}/man1/*
 
 %changelog
+* Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.0-2
+- Renamed osip.1 and moved to -devel
+
 * Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.0-1
 - Initial RPM release.



From fedora-extras-commits at redhat.com  Thu Mar 24 18:58:15 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 24 Mar 2005 13:58:15 -0500
Subject: rpms/contact-lookup-applet - New directory
Message-ID: <200503241858.j2OIwFfo010733@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10726/contact-lookup-applet

Log Message:
Directory /cvs/extras/rpms/contact-lookup-applet added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 18:58:15 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 24 Mar 2005 13:58:15 -0500
Subject: rpms/contact-lookup-applet/devel - New directory
Message-ID: <200503241858.j2OIwFsI010736@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-serv10726/contact-lookup-applet/devel

Log Message:
Directory /cvs/extras/rpms/contact-lookup-applet/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 24 18:58:29 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 24 Mar 2005 13:58:29 -0500
Subject: rpms/contact-lookup-applet Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503241858.j2OIwTuE010795@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10786

Added Files:
	Makefile import.log 
Log Message:
Setup of module contact-lookup-applet


--- NEW FILE Makefile ---
# Top level Makefile for module contact-lookup-applet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 24 18:58:29 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 24 Mar 2005 13:58:29 -0500
Subject: rpms/contact-lookup-applet/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200503241858.j2OIwTSt010798@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-serv10786/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module contact-lookup-applet


--- 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 Mar 24 18:58:57 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 24 Mar 2005 13:58:57 -0500
Subject: rpms/contact-lookup-applet import.log,1.1,1.2
Message-ID: <200503241858.j2OIwvn0010891@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10882

Modified Files:
	import.log 
Log Message:
auto-import contact-lookup-applet-0.10-2 on branch devel from contact-lookup-applet-0.10-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Mar 2005 18:58:27 -0000	1.1
+++ import.log	24 Mar 2005 18:58:55 -0000	1.2
@@ -0,0 +1 @@
+contact-lookup-applet-0_10-2:HEAD:contact-lookup-applet-0.10-2.src.rpm:1111690728



From fedora-extras-commits at redhat.com  Thu Mar 24 18:58:57 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 24 Mar 2005 13:58:57 -0500
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503241858.j2OIwv3C010895@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-serv10882/devel

Modified Files:
	.cvsignore sources 
Added Files:
	contact-lookup-applet.spec 
Log Message:
auto-import contact-lookup-applet-0.10-2 on branch devel from contact-lookup-applet-0.10-2.src.rpm


--- NEW FILE contact-lookup-applet.spec ---
Name:           contact-lookup-applet
Version:        0.10
Release:        2
Summary:        Contact Lookup Applet

Group:          Applications/Communications
License:        GPL
URL:            http://www.burtonini.com/blog/2004/Oct/27/
Source0:        http://www.burtonini.com/computing/contact-lookup-applet-0.10.tar.gz        
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.4.0
BuildRequires:  libgnomeui-devel >= 2.7.92
BuildRequires:  gnome-panel-devel >= 2.7.90
BuildRequires:  evolution-data-server-devel >= 1.0.0
BuildRequires: 	gettext

%description
This applet allows you to search your Evolution 2 address book for people. To
use, simply add it to your panel (Add to Panel -> Accessories -> Address book
Lookup), type a name into the field, and hit [return] or Search.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT}
%find_lang %{name}

%clean
rm -rf ${RPM_BUILD_ROOT}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libexecdir}/%{name}
%{_libdir}/bonobo/servers/*.server
%dir %{_datadir}/lookup-applet
%{_datadir}/lookup-applet/*.xml
%{_datadir}/lookup-applet/%{name}.glade

%changelog
* Mon Mar 21 2005 Brian Pepple <bdpepple at ameritech.net> - 0.10-2
- fixed ownership of %%{_datadir}.

* Mon Mar 14 2005 Brian Pepple <bdpepple at ameritech.net> - 0.10-1
- Initial Fedora Extras build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2005 18:58:27 -0000	1.1
+++ .cvsignore	24 Mar 2005 18:58:55 -0000	1.2
@@ -0,0 +1 @@
+contact-lookup-applet-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2005 18:58:27 -0000	1.1
+++ sources	24 Mar 2005 18:58:55 -0000	1.2
@@ -0,0 +1 @@
+d0a14459676a0f64e871d28dd334f5f8  contact-lookup-applet-0.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 19:27:22 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 24 Mar 2005 14:27:22 -0500
Subject: rpms/mknbi/devel mknbi.spec,1.5,1.6
Message-ID: <200503241927.j2OJRMPH011876@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mknbi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11863/devel

Modified Files:
	mknbi.spec 
Log Message:
ExclusiveArch: %%{ix86} -- does not build on PPC and x86_64 ATM and probably is of no use on PPC


Index: mknbi.spec
===================================================================
RCS file: /cvs/extras/rpms/mknbi/devel/mknbi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mknbi.spec	3 Mar 2005 23:01:24 -0000	1.5
+++ mknbi.spec	24 Mar 2005 19:27:20 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: 	Utility for creating network bootable images
 Name: 		mknbi
 Version:	1.4.0
-Release: 	3
+Release: 	4
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://etherboot.sourceforge.net/
@@ -9,6 +9,7 @@
 Patch1:		mknbi-makefile-optflags.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	perl
+ExclusiveArch:	%{ix86}
 %ifarch %{ix86}
 BuildRequires:	nasm
 %endif
@@ -49,6 +50,10 @@
 %{_mandir}/man1/mknbi.1*
 
 %changelog
+* Sun Mar 20 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 0:1.4.0-4
+- ExclusiveArch: %%{ix86} -- does not build on PPC and x86_64 ATM and
+  probably is of no use on PPC
+
 * Thu May 22 2003 Dams <anvil[AT]livna.org> 0:1.4.0-0.fdr.3
 - Added *.html in doc entry
 - slight change in build section



From fedora-extras-commits at redhat.com  Thu Mar 24 19:27:22 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 24 Mar 2005 14:27:22 -0500
Subject: rpms/mknbi/FC-3 mknbi.spec,1.4,1.5
Message-ID: <200503241927.j2OJRMEQ011873@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mknbi/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11863/FC-3

Modified Files:
	mknbi.spec 
Log Message:
ExclusiveArch: %%{ix86} -- does not build on PPC and x86_64 ATM and probably is of no use on PPC


Index: mknbi.spec
===================================================================
RCS file: /cvs/extras/rpms/mknbi/FC-3/mknbi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mknbi.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ mknbi.spec	24 Mar 2005 19:27:20 -0000	1.5
@@ -1,8 +1,7 @@
 Summary: 	Utility for creating network bootable images
 Name: 		mknbi
 Version:	1.4.0
-Release: 	3
-Epoch: 		0
+Release: 	4
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://etherboot.sourceforge.net/
@@ -10,6 +9,7 @@
 Patch1:		mknbi-makefile-optflags.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	perl
+ExclusiveArch:	%{ix86}
 %ifarch %{ix86}
 BuildRequires:	nasm
 %endif
@@ -50,6 +50,10 @@
 %{_mandir}/man1/mknbi.1*
 
 %changelog
+* Sun Mar 20 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 0:1.4.0-4
+- ExclusiveArch: %%{ix86} -- does not build on PPC and x86_64 ATM and
+  probably is of no use on PPC
+
 * Thu May 22 2003 Dams <anvil[AT]livna.org> 0:1.4.0-0.fdr.3
 - Added *.html in doc entry
 - slight change in build section
@@ -61,7 +65,7 @@
 
 * Tue May 20 2003 Dams <anvil[AT]livna.org> 0:1.4.0-0.fdr.1
 - nasm BuildRequires now arch dependent
-- Changed URL in Source0 
+- Changed URL in Source0
 - buildroot -> RPM_BUILD_ROOT
 - Modifed doc files
 
@@ -69,5 +73,5 @@
 - Updated to 1.4.0
 - Replaced /usr with %{_prefix} in sed
 
-* Sat Apr 26 2003 Dams <anvil[AT]livna.org> 
+* Sat Apr 26 2003 Dams <anvil[AT]livna.org>
 - Initial build.



From fedora-extras-commits at redhat.com  Thu Mar 24 19:32:20 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 24 Mar 2005 14:32:20 -0500
Subject: devel/linphone linphone-1.0.1-pkgconfig.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 linphone.spec, 1.7, 1.8 sources, 1.2,
	1.3 linphone-0.12.2-docs.patch, 1.1,
	NONE linphone-0.12.2-pkgconfig.patch, 1.2,
	NONE linphone-0.12.2-speex.patch, 1.1, NONE
Message-ID: <200503241932.j2OJWK8A011935@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11929

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.0.1-pkgconfig.patch 
Removed Files:
	linphone-0.12.2-docs.patch linphone-0.12.2-pkgconfig.patch 
	linphone-0.12.2-speex.patch 
Log Message:
Upstream update, separated ortp

linphone-1.0.1-pkgconfig.patch:

--- NEW FILE linphone-1.0.1-pkgconfig.patch ---
--- linphone-0.12.2/share/linphone.pc.in.orig	2005-03-23 21:10:49.392763407 -0500
+++ linphone-0.12.2/share/linphone.pc.in	2005-03-23 21:11:21.983938389 -0500
@@ -1,7 +1,7 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 
 Name: liblinphone
--- linphone-1.0.1/share/Makefile.in.pkgconfig	2005-03-23 03:17:48.000000000 -0500
+++ linphone-1.0.1/share/Makefile.in	2005-03-24 13:40:41.828557116 -0500
@@ -286,7 +286,7 @@
 #to be compliant with freedesktop.org:
 linphone_fddir = $(prefix)/share/applications/
 linphone_fd_DATA = linphone.desktop
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = linphone.pc
 EXTRA_DIST = $(LINPHONE_SOUNDS) \
 								$(LINPHONE_RINGS) \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/linphone/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Mar 2005 17:12:25 -0000	1.2
+++ .cvsignore	24 Mar 2005 19:32:18 -0000	1.3
@@ -1 +1 @@
-linphone-0.12.2.tar.gz
+linphone-1.0.1.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linphone.spec	24 Mar 2005 02:17:47 -0000	1.7
+++ linphone.spec	24 Mar 2005 19:32:18 -0000	1.8
@@ -1,19 +1,17 @@
 Name:           linphone
-Version:        0.12.2
-Release:        7
+Version:        1.0.1
+Release:        1
 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/0.12.2/source/linphone-0.12.2.tar.gz
-Patch:          linphone-0.12.2-docs.patch
-Patch1:         linphone-0.12.2-speex.patch
-Patch2:         linphone-0.12.2-pkgconfig.patch
+Source0:        http://simon.morlat.free.fr/download/1.0.x/source/linphone-1.0.1.tar.gz
+Patch:         linphone-1.0.1-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
-BuildRequires:  libosip-devel speex-devel gettext
+BuildRequires:  libosip2-devel speex-devel gettext desktop-file-utils
 
 %description
 Linphone is mostly sip compliant. It works successfully with these
@@ -37,15 +35,28 @@
 Requires:       %{name} = %{version}-%{release} glib2-devel
 
 %description    devel
-Libraries required to develop software with linphone
+Libraries and headers required to develop software with linphone.
+
+%package -n ortp
+Summary:        A C library implementing the RTP protocol (rfc1889)
+Group:          System Environment/Libraries
+Version:        0.7.0
+
+%description -n ortp
+oRTP is a LGPL licensed C library implementing the RTP protocol (rfc1889). It
+is available for most *nix clones (primilarly Linux and HP-UX), and Win32.
+
+%package -n ortp-devel
+Summary:        Development libraries for ortp
+Group:          Development/Libraries
+Version:        0.7.0
+
+%description -n ortp-devel
+Libraries and headers required to develop software with ortp.
 
 %prep
 %setup -q
-%patch -p 1 -b .docs
-%patch1 -p 1 -b .speex
-%patch2 -p 1 -b .pkgconfig
-rm -r $RPM_BUILD_DIR/linphone-0.12.2/oRTP/docs
-rm -r $RPM_BUILD_DIR/linphone-0.12.2/speex
+%patch -p 1 -b .pkgconfig
 
 %build
 %configure
@@ -55,6 +66,15 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
+desktop-file-install --vendor=fedora \
+  --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --remove-category Network \
+  --add-category X-Fedora \
+  --add-category Internet \
+  --add-category Telephony \
+  --add-category GTK \
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -63,30 +83,53 @@
 
 %postun -p /sbin/ldconfig
 
+%post -n ortp -p /sbin/ldconfig
+
+%postun -n ortp -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/*
 %{_libdir}/bonobo/servers/*.server
-%{_libdir}/*.so.*
+%{_libdir}/liblinphone.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
+%{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/apps/Internet/*.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/gtk-doc/html/mediastreamer
-%{_datadir}/linphonec
 %{_datadir}/pixmaps/linphone
 %{_datadir}/sounds/linphone
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/*
-%{_libdir}/*.a
-%{_libdir}/*.la
-%{_libdir}/*.so
+%{_datadir}/gtk-doc/html/ortp
+%{_includedir}/linphone
+%{_libdir}/liblinphone.a
+%{_libdir}/liblinphone.la
+%{_libdir}/liblinphone.so
 %{_libdir}/pkgconfig/*
 
+%files -n ortp
+%defattr(-,root,root)
+%doc oRTP/AUTHORS oRTP/ChangeLog oRTP/COPYING oRTP/NEWS oRTP/README oRTP/TODO oRTP/
+%{_libdir}/libortp.so.*
+
+%files -n ortp-devel
+%defattr(-,root,root)
+%{_includedir}/ortp
+%{_libdir}/libortp.a
+%{_libdir}/libortp.la
+%{_libdir}/libortp.so
+
 %changelog
+* Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.1-1
+- Upstream update
+- Separated ortp
+- Added %%doc
+
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-7
 - pkgconfig and -devel fixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/linphone/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Mar 2005 17:12:25 -0000	1.2
+++ sources	24 Mar 2005 19:32:18 -0000	1.3
@@ -1 +1 @@
-86c01dbbcdb41786229f51ec0994ff67  linphone-0.12.2.tar.gz
+d65f977dd6512b7725fcb2e2c9713e65  linphone-1.0.1.tar.gz


--- linphone-0.12.2-docs.patch DELETED ---


--- linphone-0.12.2-pkgconfig.patch DELETED ---


--- linphone-0.12.2-speex.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar 24 19:39:45 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 24 Mar 2005 14:39:45 -0500
Subject: rpms/synce/FC-3 synce.spec,1.1,1.2
Message-ID: <200503241939.j2OJdjrk011977@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/synce/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11968/FC-3

Modified Files:
	synce.spec 
Log Message:
ExcludeArch: x86_64; see #148003


Index: synce.spec
===================================================================
RCS file: /cvs/extras/rpms/synce/FC-3/synce.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synce.spec	8 Dec 2004 15:47:19 -0000	1.1
+++ synce.spec	24 Mar 2005 19:39:43 -0000	1.2
@@ -13,6 +13,7 @@
 Patch0: synce-rra-0.9.0-ambiguous.patch
 URL: http://synce.sourceforge.net/
 Distribution: Fedora Core
+ExcludeArch: x86_64
 Requires: ppp
 BuildRoot: /var/tmp/%{name}-%{version}-root
 
@@ -154,6 +155,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Mar 24 2005 Thorsten Leemhuis <fedora[at]leemhuis[dot]info> 0.9.0-2
+- ExcludeArch: x86_64; see #148003
+
 * Thu Aug 19 2004 Cristian Gafton <gafton at redhat.com> 0.9.0-1
 - build new spec file from scratch that groups all the little modules
   together to avoid the proliferation of another half dozen single



From fedora-extras-commits at redhat.com  Thu Mar 24 19:39:45 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 24 Mar 2005 14:39:45 -0500
Subject: rpms/synce/devel synce.spec,1.2,1.3
Message-ID: <200503241939.j2OJdjlx011981@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/synce/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11968/devel

Modified Files:
	synce.spec 
Log Message:
ExcludeArch: x86_64; see #148003


Index: synce.spec
===================================================================
RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- synce.spec	5 Mar 2005 21:10:24 -0000	1.2
+++ synce.spec	24 Mar 2005 19:39:43 -0000	1.3
@@ -12,6 +12,7 @@
 Source5: libmimedir-0.3.tar.gz
 Patch0: synce-rra-0.9.0-ambiguous.patch
 URL: http://synce.sourceforge.net/
+ExcludeArch: x86_64
 Requires: ppp
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -153,6 +154,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Mar 24 2005 Thorsten Leemhuis <fedora[at]leemhuis[dot]info> 0.9.0-2
+- ExcludeArch: x86_64; see #148003
+
 * Thu Aug 19 2004 Cristian Gafton <gafton at redhat.com> 0.9.0-1
 - build new spec file from scratch that groups all the little modules
   together to avoid the proliferation of another half dozen single



From shahms at shahms.com  Thu Mar 24 20:21:47 2005
From: shahms at shahms.com (Shahms King)
Date: Thu, 24 Mar 2005 12:21:47 -0800
Subject: APPROVED: tetex-{beamer,pgf,xcolor,bytefield}
Message-ID: <1111695707.12534.35.camel@shahms.mesd.k12.or.us>

tetex-beamer
------------
Summary: A LaTeX class for producing presentations and slides
Reviewer: Shahms King
Maintainer: Jos? Pedro Oliveira

tetex-pgf
---------
Summary: Create PostScript and PDF graphics in TeX
Reviewer: Shahms King
Maintainer: Jos? Pedro Oliveira

tetex-xcolor
------------
Summary: Driver-independent color extensions for LaTeX and pdfLaTeX
Reviewer: Shahms King
Maintainer: Jos? Pedro Oliveira

tetex-bytefield
---------------
Summary: Create illustrations for network protocol specifications
Reviewer: Shahms King
Maintainer: Jos? Pedro Oliveira

-- 
Shahms E. King <shahms at shahms.com>
Multnomah ESD

Public Key:
http://shahms.mesd.k12.or.us/~sking/shahms.asc
Fingerprint:
1612 054B CE92 8770 F1EA  AB1B FEAB 3636 45B2 D75B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050324/e510daee/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Thu Mar 24 20:30:28 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 15:30:28 -0500
Subject: rpms/zope/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 zope.spec, 1.3,
	1.4
Message-ID: <200503242030.j2OKUS3L013027@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/zope/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13018/FC-3

Modified Files:
	.cvsignore sources zope.spec 
Log Message:
- version 2.7.5
- drop Epoch
- change release tag for FC3/FC4
- convert some tabs into spaces




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Jan 2005 22:57:17 -0000	1.3
+++ .cvsignore	24 Mar 2005 20:30:26 -0000	1.4
@@ -1 +1 @@
-Zope-2.7.4-0.tgz
+Zope-2.7.5-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jan 2005 22:57:17 -0000	1.3
+++ sources	24 Mar 2005 20:30:26 -0000	1.4
@@ -1 +1 @@
-97c310f1de4609956c176588b08b25c5  Zope-2.7.4-0.tgz
+5b5c5823c62370d9f7325c6014a49d8b  Zope-2.7.5-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/zope.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zope.spec	2 Mar 2005 21:21:05 -0000	1.3
+++ zope.spec	24 Mar 2005 20:30:26 -0000	1.4
@@ -10,15 +10,14 @@
 %define zopectl        %{_bindir}/zopectl
 %define runzope        %{_bindir}/runzope
 
-Name: 	 zope
+Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.7.4
-Release: 1
-Epoch:	 0
+Version: 2.7.5
+Release: 1.fc3
 License: ZPL
 Group: 	 System Environment/Daemons
-URL:	 http://www.zope.org/
-Source:	 http://zope.org/Products/Zope/2.7.4/Zope-2.7.4-0.tgz
+URL:     http://www.zope.org/
+Source0: http://zope.org/Products/Zope/2.7.5/Zope-2.7.5-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -45,7 +44,7 @@
 
 
 %prep
-%setup -q -n Zope-%{version}-0
+%setup -q -n Zope-%{version}-final
 # Do not use -b option, or we'll install the backup too
 %patch0 -p1 -b .config
 rm -f skel/etc/zope.conf.in.config
@@ -181,6 +180,12 @@
 
 
 %changelog
+* Thu Mar 24 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-1.fc3
+- version 2.7.5
+- drop Epoch
+- change release tag for FC3
+- convert some tabs into spaces
+
 * Wed Jan 26 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.4-1
 - version 2.7.4
 - flag the documentation as %%doc



From fedora-extras-commits at redhat.com  Thu Mar 24 20:30:28 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 24 Mar 2005 15:30:28 -0500
Subject: rpms/zope/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 zope.spec,
	1.7, 1.8
Message-ID: <200503242030.j2OKUSA0013033@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/zope/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13018/devel

Modified Files:
	.cvsignore sources zope.spec 
Log Message:
- version 2.7.5
- drop Epoch
- change release tag for FC3/FC4
- convert some tabs into spaces




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Jan 2005 22:57:17 -0000	1.3
+++ .cvsignore	24 Mar 2005 20:30:26 -0000	1.4
@@ -1 +1 @@
-Zope-2.7.4-0.tgz
+Zope-2.7.5-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jan 2005 22:57:17 -0000	1.3
+++ sources	24 Mar 2005 20:30:26 -0000	1.4
@@ -1 +1 @@
-97c310f1de4609956c176588b08b25c5  Zope-2.7.4-0.tgz
+5b5c5823c62370d9f7325c6014a49d8b  Zope-2.7.5-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- zope.spec	5 Mar 2005 20:07:10 -0000	1.7
+++ zope.spec	24 Mar 2005 20:30:26 -0000	1.8
@@ -12,12 +12,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.7.4
-Release: 1
+Version: 2.7.5
+Release: 1.fc4
 License: ZPL
-Group:   System Environment/Daemons
+Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source:  http://zope.org/Products/Zope/2.7.4/Zope-2.7.4-0.tgz
+Source0: http://zope.org/Products/Zope/2.7.5/Zope-2.7.5-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -28,8 +28,8 @@
 Source6: zope.logrotate.cron.in
 Patch0:  zope-2.7.3-config.patch
 
-BuildRequires: python-devel >= %{python_minver}
-BuildRequires: python >= %{python_minver}
+BuildRequires: python-devel >= %{python_minver} 
+BuildRequires: python >= %{python_minver} 
 Requires:      python >= %{python_minver}
 
 Requires(pre): /usr/sbin/useradd
@@ -44,7 +44,7 @@
 
 
 %prep
-%setup -q -n Zope-%{version}-0
+%setup -q -n Zope-%{version}-final
 # Do not use -b option, or we'll install the backup too
 %patch0 -p1 -b .config
 rm -f skel/etc/zope.conf.in.config
@@ -58,7 +58,7 @@
   --with-python=%{__python} \
   --prefix=$RPM_BUILD_ROOT%{zope_home} \
   --optimize
-
+  
 #    --no-compile
 
 make %{?_smp_mflags}
@@ -146,7 +146,7 @@
 
 
 
-%files
+%files 
 %defattr(-, root, root, -)
 %doc %{zope_home}/doc
 %doc docs README.Fedora
@@ -180,6 +180,12 @@
 
 
 %changelog
+* Thu Mar 24 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-1.fc4
+- version 2.7.5
+- drop Epoch
+- change release tag for FC4
+- convert some tabs into spaces
+
 * Wed Jan 26 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.4-1
 - version 2.7.4
 - flag the documentation as %%doc
@@ -217,7 +223,7 @@
 - drop patch 1, fixed upstream
 
 * Tue Aug 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.3
-- add hotfix from Zope.org:
+- add hotfix from Zope.org: 
   http://zope.org/Products/Zope/Hotfix-200400807/Hotfix-20040807-alert
 
 * Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.2
@@ -233,8 +239,8 @@
 - 2.7.1
 - move files created in %%post back into rpm.  Unowned files are bad.
 - make (theoretically) buildable for all rh73-rh90,fc1/2,el3
-  NOTE: lowerred python_minver to 2.2.2 to test builds, though (most)
-  docs claim 2.3.3 is required.  (??)
+  NOTE: lowerred python_minver to 2.2.2 to test builds, though (most) 
+  docs claim 2.3.3 is required.  (??) 
 - don't use Requires(preun,postun)
 - use %%_smp_mflags
 



From fedora-extras-commits at redhat.com  Thu Mar 24 21:22:34 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 24 Mar 2005 16:22:34 -0500
Subject: rpms/perl-Config-Tiny/FC-3 .cvsignore, 1.2,
	1.3 perl-Config-Tiny.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200503242122.j2OLMYGd014218@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14209/FC-3

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.01.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:58:14 -0000	1.2
+++ .cvsignore	24 Mar 2005 21:22:32 -0000	1.3
@@ -1 +1 @@
-Config-Tiny-2.00.tar.gz
+Config-Tiny-2.01.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-3/perl-Config-Tiny.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Config-Tiny.spec	10 Dec 2004 22:03:07 -0000	1.4
+++ perl-Config-Tiny.spec	24 Mar 2005 21:22:32 -0000	1.5
@@ -1,20 +1,19 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Config-Tiny
-Version:        2.00
+Version:        2.01
 Release:        1
-Epoch:          0
 Summary:        Perl module for reading and writing .ini style configuration files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Config-Tiny/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.00.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.01.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::More), perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -56,6 +55,9 @@
 
 
 %changelog
+* Thu Mar 24 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.01-1
+- Updated to 2.01.
+
 * Sun Jul 25 2004 Marius L. J??hndal <mariuslj at ifi.uio.no> - 0:2.00-0.fdr.1
 - Updated to 2.00.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:58:14 -0000	1.2
+++ sources	24 Mar 2005 21:22:32 -0000	1.3
@@ -1 +1 @@
-a5b5d3b54f4c1c1574fee183103b0d41  Config-Tiny-2.00.tar.gz
+7ce2524c0eee4336f156caf729c17b02  Config-Tiny-2.01.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 24 21:22:34 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 24 Mar 2005 16:22:34 -0500
Subject: rpms/perl-Config-Tiny/devel .cvsignore, 1.2,
	1.3 perl-Config-Tiny.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200503242122.j2OLMYvG014224@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-serv14209/devel

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.01.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:58:14 -0000	1.2
+++ .cvsignore	24 Mar 2005 21:22:32 -0000	1.3
@@ -1 +1 @@
-Config-Tiny-2.00.tar.gz
+Config-Tiny-2.01.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Config-Tiny.spec	3 Mar 2005 23:46:26 -0000	1.5
+++ perl-Config-Tiny.spec	24 Mar 2005 21:22:32 -0000	1.6
@@ -1,19 +1,19 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Config-Tiny
-Version:        2.00
+Version:        2.01
 Release:        1
 Summary:        Perl module for reading and writing .ini style configuration files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Config-Tiny/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.00.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.01.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::More), perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Mar 24 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.01-1
+- Updated to 2.01.
+
 * Sun Jul 25 2004 Marius L. J??hndal <mariuslj at ifi.uio.no> - 0:2.00-0.fdr.1
 - Updated to 2.00.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:58:14 -0000	1.2
+++ sources	24 Mar 2005 21:22:32 -0000	1.3
@@ -1 +1 @@
-a5b5d3b54f4c1c1574fee183103b0d41  Config-Tiny-2.00.tar.gz
+7ce2524c0eee4336f156caf729c17b02  Config-Tiny-2.01.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 25 09:48:43 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 25 Mar 2005 04:48:43 -0500
Subject: rpms/snownews/devel snownews-1.5.6.1-destdir.patch, NONE,
	1.1 snownews-1.5.6.1-manpath.patch, NONE,
	1.1 snownews-1.5.6.1-nostrip.patch, NONE, 1.1 snownews.spec,
	1.3, 1.4 snownews-1.5.3-buildroot.patch, 1.1,
	NONE snownews-1.5.3-manpath.patch, 1.1,
	NONE snownews-1.5.3-nostrip.patch, 1.1, NONE
Message-ID: <200503250948.j2P9mhj8031408@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/snownews/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31394

Modified Files:
	snownews.spec 
Added Files:
	snownews-1.5.6.1-destdir.patch snownews-1.5.6.1-manpath.patch 
	snownews-1.5.6.1-nostrip.patch 
Removed Files:
	snownews-1.5.3-buildroot.patch snownews-1.5.3-manpath.patch 
	snownews-1.5.3-nostrip.patch 
Log Message:
1.5.6.1 and macroize dirs


snownews-1.5.6.1-destdir.patch:

--- NEW FILE snownews-1.5.6.1-destdir.patch ---
--- snownews-1.5.6.1/Makefile.orig	2005-02-25 00:13:44.962280604 -0500
+++ snownews-1.5.6.1/Makefile	2005-02-25 00:19:45.916256515 -0500
@@ -83,7 +83,7 @@
 		if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/$$L/man1" ]; then \
 			mkdir -p $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \
 		fi; \
-		$(INSTALL) -m 0644 $(DESTDIR)$(MAN)/$$L/snownews.1 $(PREFIX)/share/man/$$L/man1; \
+		$(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \
 	done
 
 ### Cleanup ###

snownews-1.5.6.1-manpath.patch:

--- NEW FILE snownews-1.5.6.1-manpath.patch ---
--- snownews-1.5.6.1/Makefile.orig	2004-12-09 06:29:08.000000000 -0500
+++ snownews-1.5.6.1/Makefile	2005-02-25 00:08:02.098175876 -0500
@@ -73,17 +73,17 @@
 	done
 
 install-man: manpages
-	if [ ! -d "$(DESTDIR)$(PREFIX)/man/man1" ]; then \
-		mkdir -p $(DESTDIR)$(PREFIX)/man/man1; \
+	if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/man1" ]; then \
+		mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1; \
 	fi
-	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/man/man1
-	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/man/man1
+	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/share/man/man1
+	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/share/man/man1
 	
 	for L in $(LANGS); do \
-		if [ ! -d "$(DESTDIR)$(PREFIX)/man/$$L/man1" ]; then \
-			mkdir -p $(DESTDIR)$(PREFIX)/man/$$L/man1; \
+		if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/$$L/man1" ]; then \
+			mkdir -p $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \
 		fi; \
-		$(INSTALL) -m 0644 $(DESTDIR)$(MAN)/$$L/snownews.1 $(PREFIX)/man/$$L/man1; \
+		$(INSTALL) -m 0644 $(DESTDIR)$(MAN)/$$L/snownews.1 $(PREFIX)/share/man/$$L/man1; \
 	done
 
 ### Cleanup ###

snownews-1.5.6.1-nostrip.patch:

--- NEW FILE snownews-1.5.6.1-nostrip.patch ---
--- snownews-1.5.6.1/Makefile.orig	2005-02-25 00:09:25.931552079 -0500
+++ snownews-1.5.6.1/Makefile	2005-02-25 00:12:47.288028006 -0500
@@ -60,7 +60,7 @@
 	if [ ! -d "$(DESTDIR)$(PREFIX)/bin" ]; then \
 		mkdir -p $(DESTDIR)$(PREFIX)/bin; \
 	fi
-	$(INSTALL) -s snownews $(DESTDIR)$(PREFIX)/bin
+	$(INSTALL) snownews $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL) opml2snow $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL) snowsync $(DESTDIR)$(PREFIX)/bin
 


Index: snownews.spec
===================================================================
RCS file: /cvs/extras/rpms/snownews/devel/snownews.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- snownews.spec	5 Mar 2005 21:10:24 -0000	1.3
+++ snownews.spec	25 Mar 2005 09:48:41 -0000	1.4
@@ -1,16 +1,16 @@
-Name:		snownews
-Version:	1.5.3
-Release:	4
-Summary:	RSS/RDF news aggregator
-Group:		Applications/Internet
-License:	GPL
-URL:		http://home.kcore.de/~kiza/software/snownews
-Source0:	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.3.tar.gz
+Name: 		snownews
+Version: 	1.5.6.1
+Release: 	3
+Summary: 	A text mode RSS/RDF newsreader
+Group: 		Applications/Internet
+License: 	GPL
+Url:		http://home.kcore.de/~kiza/software/snownews
+Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.6.1.tar.gz
 Patch0:		snownews-1.5.3-nocheck.patch
-Patch1:		snownews-1.5.3-manpath.patch
-Patch2:		snownews-1.5.3-nostrip.patch
-Patch3:		snownews-1.5.3-buildroot.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:		snownews-1.5.6.1-manpath.patch
+Patch2:		snownews-1.5.6.1-nostrip.patch
+Patch3:		snownews-1.5.6.1-destdir.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	gettext
@@ -19,7 +19,7 @@
 Snownews  is  a text mode RSS/RDF newsreader. It supports all versions
 of RSS natively and supports other formats via plugins.
 
-The program depends on ncurses for the user interface and uses libxml2
+The program depends on ncurses for the user interface and uses libxml2 
 for XML parsing. ncurses must be at least version 5.0. It should work
 with any version of libxml2.
 
@@ -31,12 +31,12 @@
 %patch3 -p1
 
 %build
-./configure --prefix=/usr --charset=UTF-8
+./configure --prefix=%{_prefix} --charset=UTF-8
 EXTRA_CFLAGS="$RPM_OPT_FLAGS -fpie" EXTRA_LDFLAGS="-pie" make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install
+make DESTDIR="$RPM_BUILD_ROOT" install
 %find_lang %name
 
 %clean
@@ -45,12 +45,23 @@
 %files -f %name.lang
 %defattr(-,root,root)
 %doc README* AUTHOR COPYING CREDITS Changelog
-/usr/bin/opml2snow
-/usr/bin/snownews
-/usr/share/man/man1/*
-/usr/share/man/*/man1/*
+%{_bindir}/opml2snow
+%{_bindir}/snownews
+%{_bindir}/snowsync
+%{_mandir}/man1/*
+%{_mandir}/*/man1/*
 
 %changelog
+* Thu Mar 24 2005 Warren Togami <wtogami at redhat.com> - 1.5.6.1-3
+- macroize dirs
+
+* Tue Mar 15 2005 Zing <shishz at hotpop.com> - 1.5.6.1-2
+- enable snowsync
+
+* Thu Feb 24 2005 Zing <shishz at hotpop.com> - 1.5.6.1-1
+- new upstream
+- remove snowsync for now. (we need perl-XML-LibXSLT)
+
 * Fri Jul 23 2004 Zing <shishz at hotpop.com> - 1.5.3-0.fdr.4
 - More cleanups from QA (M.Schwendt)
 -	do the buildroot better (grrr hopefully)


--- snownews-1.5.3-buildroot.patch DELETED ---


--- snownews-1.5.3-manpath.patch DELETED ---


--- snownews-1.5.3-nostrip.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar 25 10:17:55 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 25 Mar 2005 05:17:55 -0500
Subject: rpms/snownews/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200503251017.j2PAHt91032549@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/snownews/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32534

Modified Files:
	.cvsignore sources 
Log Message:
add sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/snownews/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:20:53 -0000	1.2
+++ .cvsignore	25 Mar 2005 10:17:52 -0000	1.3
@@ -1 +1,2 @@
 snownews-1.5.3.tar.gz
+snownews-1.5.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snownews/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:20:53 -0000	1.2
+++ sources	25 Mar 2005 10:17:52 -0000	1.3
@@ -1 +1 @@
-35aa49e42ac5232bf8ac0163e3793d4a  snownews-1.5.3.tar.gz
+466ca82e8df03d6126d6cc0f20772025  snownews-1.5.6.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 25 10:18:20 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 25 Mar 2005 05:18:20 -0500
Subject: rpms/snownews/devel snownews.spec,1.4,1.5
Message-ID: <200503251018.j2PAIKMf032601@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/snownews/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32587

Modified Files:
	snownews.spec 
Log Message:
bump for FC4 build



Index: snownews.spec
===================================================================
RCS file: /cvs/extras/rpms/snownews/devel/snownews.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- snownews.spec	25 Mar 2005 09:48:41 -0000	1.4
+++ snownews.spec	25 Mar 2005 10:18:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name: 		snownews
 Version: 	1.5.6.1
-Release: 	3
+Release: 	3.FC4
 Summary: 	A text mode RSS/RDF newsreader
 Group: 		Applications/Internet
 License: 	GPL



From fedora-extras-commits at redhat.com  Fri Mar 25 10:20:18 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 25 Mar 2005 05:20:18 -0500
Subject: rpms/snownews/FC-3 snownews-1.5.6.1-destdir.patch, NONE,
	1.1 snownews-1.5.6.1-manpath.patch, NONE,
	1.1 snownews-1.5.6.1-nostrip.patch, NONE, 1.1 snownews.spec,
	1.2, 1.3 sources, 1.2, 1.3 snownews-1.5.3-buildroot.patch, 1.1,
	NONE snownews-1.5.3-manpath.patch, 1.1,
	NONE snownews-1.5.3-nostrip.patch, 1.1, NONE
Message-ID: <200503251020.j2PAKIKd032694@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/snownews/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32680

Modified Files:
	snownews.spec sources 
Added Files:
	snownews-1.5.6.1-destdir.patch snownews-1.5.6.1-manpath.patch 
	snownews-1.5.6.1-nostrip.patch 
Removed Files:
	snownews-1.5.3-buildroot.patch snownews-1.5.3-manpath.patch 
	snownews-1.5.3-nostrip.patch 
Log Message:
macroize dirs, prep for FC3 build


snownews-1.5.6.1-destdir.patch:

--- NEW FILE snownews-1.5.6.1-destdir.patch ---
--- snownews-1.5.6.1/Makefile.orig	2005-02-25 00:13:44.962280604 -0500
+++ snownews-1.5.6.1/Makefile	2005-02-25 00:19:45.916256515 -0500
@@ -83,7 +83,7 @@
 		if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/$$L/man1" ]; then \
 			mkdir -p $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \
 		fi; \
-		$(INSTALL) -m 0644 $(DESTDIR)$(MAN)/$$L/snownews.1 $(PREFIX)/share/man/$$L/man1; \
+		$(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \
 	done
 
 ### Cleanup ###

snownews-1.5.6.1-manpath.patch:

--- NEW FILE snownews-1.5.6.1-manpath.patch ---
--- snownews-1.5.6.1/Makefile.orig	2004-12-09 06:29:08.000000000 -0500
+++ snownews-1.5.6.1/Makefile	2005-02-25 00:08:02.098175876 -0500
@@ -73,17 +73,17 @@
 	done
 
 install-man: manpages
-	if [ ! -d "$(DESTDIR)$(PREFIX)/man/man1" ]; then \
-		mkdir -p $(DESTDIR)$(PREFIX)/man/man1; \
+	if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/man1" ]; then \
+		mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1; \
 	fi
-	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/man/man1
-	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/man/man1
+	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/share/man/man1
+	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/share/man/man1
 	
 	for L in $(LANGS); do \
-		if [ ! -d "$(DESTDIR)$(PREFIX)/man/$$L/man1" ]; then \
-			mkdir -p $(DESTDIR)$(PREFIX)/man/$$L/man1; \
+		if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/$$L/man1" ]; then \
+			mkdir -p $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \
 		fi; \
-		$(INSTALL) -m 0644 $(DESTDIR)$(MAN)/$$L/snownews.1 $(PREFIX)/man/$$L/man1; \
+		$(INSTALL) -m 0644 $(DESTDIR)$(MAN)/$$L/snownews.1 $(PREFIX)/share/man/$$L/man1; \
 	done
 
 ### Cleanup ###

snownews-1.5.6.1-nostrip.patch:

--- NEW FILE snownews-1.5.6.1-nostrip.patch ---
--- snownews-1.5.6.1/Makefile.orig	2005-02-25 00:09:25.931552079 -0500
+++ snownews-1.5.6.1/Makefile	2005-02-25 00:12:47.288028006 -0500
@@ -60,7 +60,7 @@
 	if [ ! -d "$(DESTDIR)$(PREFIX)/bin" ]; then \
 		mkdir -p $(DESTDIR)$(PREFIX)/bin; \
 	fi
-	$(INSTALL) -s snownews $(DESTDIR)$(PREFIX)/bin
+	$(INSTALL) snownews $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL) opml2snow $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL) snowsync $(DESTDIR)$(PREFIX)/bin
 


Index: snownews.spec
===================================================================
RCS file: /cvs/extras/rpms/snownews/FC-3/snownews.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- snownews.spec	10 Dec 2004 22:03:11 -0000	1.2
+++ snownews.spec	25 Mar 2005 10:20:16 -0000	1.3
@@ -1,15 +1,15 @@
 Name: 		snownews
-Version: 	1.5.3
-Release: 	4
-Summary: 	A RSS/RDF news aggregator.
+Version: 	1.5.6.1
+Release: 	3.FC3
+Summary: 	A text mode RSS/RDF newsreader
 Group: 		Applications/Internet
 License: 	GPL
 Url:		http://home.kcore.de/~kiza/software/snownews
-Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.3.tar.gz
+Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.6.1.tar.gz
 Patch0:		snownews-1.5.3-nocheck.patch
-Patch1:		snownews-1.5.3-manpath.patch
-Patch2:		snownews-1.5.3-nostrip.patch
-Patch3:		snownews-1.5.3-buildroot.patch
+Patch1:		snownews-1.5.6.1-manpath.patch
+Patch2:		snownews-1.5.6.1-nostrip.patch
+Patch3:		snownews-1.5.6.1-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
@@ -31,12 +31,12 @@
 %patch3 -p1
 
 %build
-./configure --prefix=/usr --charset=UTF-8
+./configure --prefix=%{_prefix} --charset=UTF-8
 EXTRA_CFLAGS="$RPM_OPT_FLAGS -fpie" EXTRA_LDFLAGS="-pie" make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install
+make DESTDIR="$RPM_BUILD_ROOT" install
 %find_lang %name
 
 %clean
@@ -45,12 +45,23 @@
 %files -f %name.lang
 %defattr(-,root,root)
 %doc README* AUTHOR COPYING CREDITS Changelog
-/usr/bin/opml2snow
-/usr/bin/snownews
-/usr/share/man/man1/*
-/usr/share/man/*/man1/*
+%{_bindir}/opml2snow
+%{_bindir}/snownews
+%{_bindir}/snowsync
+%{_mandir}/man1/*
+%{_mandir}/*/man1/*
 
 %changelog
+* Thu Mar 24 2005 Warren Togami <wtogami at redhat.com> - 1.5.6.1-3
+- macroize dirs
+
+* Tue Mar 15 2005 Zing <shishz at hotpop.com> - 1.5.6.1-2
+- enable snowsync
+
+* Thu Feb 24 2005 Zing <shishz at hotpop.com> - 1.5.6.1-1
+- new upstream
+- remove snowsync for now. (we need perl-XML-LibXSLT)
+
 * Fri Jul 23 2004 Zing <shishz at hotpop.com> - 1.5.3-0.fdr.4
 - More cleanups from QA (M.Schwendt)
 -	do the buildroot better (grrr hopefully)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snownews/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:20:53 -0000	1.2
+++ sources	25 Mar 2005 10:20:16 -0000	1.3
@@ -1 +1 @@
-35aa49e42ac5232bf8ac0163e3793d4a  snownews-1.5.3.tar.gz
+466ca82e8df03d6126d6cc0f20772025  snownews-1.5.6.1.tar.gz


--- snownews-1.5.3-buildroot.patch DELETED ---


--- snownews-1.5.3-manpath.patch DELETED ---


--- snownews-1.5.3-nostrip.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Mar 25 12:16:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 25 Mar 2005 07:16:45 -0500
Subject: devel/sylpheed sylpheed.spec,1.7,1.8
Message-ID: <200503251216.j2PCGj1M002328@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/sylpheed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2322

Modified Files:
	sylpheed.spec 
Log Message:
lower-case dist tag should be safer


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sylpheed.spec	24 Mar 2005 16:15:22 -0000	1.7
+++ sylpheed.spec	25 Mar 2005 12:16:43 -0000	1.8
@@ -5,7 +5,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 1.0.4
-Release: 1.FC4
+Release: 1.fc4
 License: GPL
 URL: http://sylpheed.good-day.net/
 Group: Applications/Internet
@@ -81,7 +81,7 @@
 %{_mandir}/man1
 
 %changelog
-* Thu Mar 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.4-1.FC4
+* Thu Mar 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.4-1.fc4
 - Update to 1.0.4 (minor security fixes).
 - Patch4 (draftsegf) merged upstream.
 



From bugs.michael at gmx.net  Fri Mar 25 12:16:54 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 25 Mar 2005 13:16:54 +0100
Subject: rpms/snownews/devel snownews.spec,1.4,1.5
In-Reply-To: <200503251018.j2PAIKMf032601@cvs-int.fedora.redhat.com>
References: <200503251018.j2PAIKMf032601@cvs-int.fedora.redhat.com>
Message-ID: <20050325131654.3ab66f2f.bugs.michael@gmx.net>

On Fri, 25 Mar 2005 05:18:20 -0500, Warren Togami (wtogami) wrote:

> Author: wtogami
> 
> Update of /cvs/extras/rpms/snownews/devel

> -Release: 	3
> +Release: 	3.FC4

My interest in getting these dist tags standardised is unbroken, because
e.g.

  1.fc3 > 1.FC4

because of ASCII collation order. Current Dist Tag Guidelines at
http://fedoraproject.org/wiki/DistTag use lower-case dist tags, but
several packages and updates in Fedora Core use upper-case dist tags.

We [in Extras] should be safe if we used only lower-case dist tags.



From fedora-extras-commits at redhat.com  Fri Mar 25 15:19:07 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 25 Mar 2005 10:19:07 -0500
Subject: rpms/Macaulay2/FC-3 Macaulay2.spec,1.2,1.3
Message-ID: <200503251519.j2PFJ7GP005462@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/Macaulay2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5452/FC-3

Modified Files:
	Macaulay2.spec 
Log Message:
>From #149225

* Mon Feb 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.2-14
- x86_64 issues (%%_libdir -> %%_prefix/lib )
- remove desktop_file macro usage




Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/FC-3/Macaulay2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Macaulay2.spec	10 Dec 2004 22:03:01 -0000	1.2
+++ Macaulay2.spec	25 Mar 2005 15:19:05 -0000	1.3
@@ -1,10 +1,13 @@
-# $Id$
+# busted on x86_64 -- Rex
+# define m2home %{_libdir}/%{name}-%{version}
+# Makefiles hardcode "%prefix/lib" instead, ok?  -- Rex
+%define m2home %{_prefix}/lib/%{name}-%{version}
 
 Summary: A system for algebraic geometry and commutative algebra	
 Name:    Macaulay2 
 Epoch:	 0
 Version: 0.9.2
-Release: 13%{?dist_tag}
+Release: 14%{?dist_tag}
 License: GPL 
 Group:   Applications/Engineering
 URL:	 http://www.math.uiuc.edu/Macaulay2/
@@ -84,41 +87,36 @@
 %makeinstall
 
 # Fix locations
-perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
+perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \
 	$RPM_BUILD_ROOT%{_bindir}/M2 
-perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
+perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \
 	$RPM_BUILD_ROOT%{_bindir}/M2-help
-perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/emacs/*
+perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/*
 
 ## emacs files
 install -d      $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
-cp -alf	$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/emacs/*.el \
+cp -alf	$RPM_BUILD_ROOT%{m2home}/emacs/*.el \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 
 # app img
 install -p -D -m644 %{SOURCE1}      $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
-%if "%{?desktop_file}" != "0"
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
-
 desktop-file-install \
   --vendor fedora \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
   --add-category "X-Fedora" \
   %{SOURCE2}
-%else
-install -p -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Applications/%{name}.desktop
-%endif
 
 ## Unpackaged files
 # %doc stuff, no need to dup in appdir
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/{README,CHANGES,COPYING}
+rm -f $RPM_BUILD_ROOT%{m2home}/{README,CHANGES,COPYING}
 # created by make check
-find $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} \( -name test.out -o -name test.out*.trim \) -exec rm -v {} \;
+find $RPM_BUILD_ROOT%{m2home} \( -name test.out -o -name test.out*.trim \) -exec rm -v {} \;
 # .cvsignore
-find $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} -name .cvsignore -exec rm -v {} \;
+find $RPM_BUILD_ROOT%{m2home} -name .cvsignore -exec rm -v {} \;
 # unuseful files outside of build environment
-find  $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/packages -name "Makefile*" -exec rm -v {} \;
+find  $RPM_BUILD_ROOT%{m2home}/packages -name "Makefile*" -exec rm -v {} \;
 
 
 %clean
@@ -127,44 +125,44 @@
 
 %preun
 # Handle possibly existing dumpdata
-rm -f %{_libdir}/%{name}-%{version}/libexec/Macaulay2-*-data ||:
+rm -f %{m2home}/libexec/Macaulay2-*-data ||:
 
 
 %files
 %defattr(-,root,root)
 %doc Macaulay2/README Macaulay2/CHANGES
 %{_bindir}/M2
-%if "%{?desktop_file}" != "0"
 %{_datadir}/applications/*.desktop
-%else
-%{_sysconfdir}/X11/applnk/*/*.desktop
-%endif
 %{_datadir}/pixmaps/*.png
-%dir %{_libdir}/%{name}-%{version}
-%{_libdir}/%{name}-%{version}/cache
-%{_libdir}/%{name}-%{version}/libexec
-%{_libdir}/%{name}-%{version}/m2
-%{_libdir}/%{name}-%{version}/packages
+%dir %{m2home}
+%{m2home}/cache
+%{m2home}/libexec
+%{m2home}/m2
+%{m2home}/packages
 # Not needed/wanted
-%exclude %{_libdir}/%{name}-%{version}/setup
+%exclude %{m2home}/setup
 
 %files emacs
 %defattr(-,root,root)
-%dir %{_libdir}/%{name}-%{version}/emacs
-%doc %{_libdir}/%{name}-%{version}/emacs/*.m2
-%doc %{_libdir}/%{name}-%{version}/emacs/*.txt
-%doc %{_libdir}/%{name}-%{version}/emacs/README
-%{_libdir}/%{name}-%{version}/emacs/*.el
+%dir %{m2home}/emacs
+%doc %{m2home}/emacs/*.m2
+%doc %{m2home}/emacs/*.txt
+%doc %{m2home}/emacs/README
+%{m2home}/emacs/*.el
 %{_datadir}/emacs/site-lisp/*.el
 
 %files doc
 %defattr(-,root,root)
 %{_bindir}/M2-help
-%{_libdir}/%{name}-%{version}/html
-%{_libdir}/%{name}-%{version}/tutorial
+%{m2home}/html
+%{m2home}/tutorial
 
 
 %changelog
+* Mon Feb 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.2-14
+- x86_64 issues (%%_libdir -> %%_prefix/lib )
+- remove desktop_file macro usage
+
 * Sat Oct 23 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.13
 - BR: time (again)
 - omit m2_dir/setup (not needed/wanted)



From fedora-extras-commits at redhat.com  Fri Mar 25 15:19:07 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 25 Mar 2005 10:19:07 -0500
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.3,1.4
Message-ID: <200503251519.j2PFJ7Hc005465@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5452/devel

Modified Files:
	Macaulay2.spec 
Log Message:
>From #149225

* Mon Feb 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.2-14
- x86_64 issues (%%_libdir -> %%_prefix/lib )
- remove desktop_file macro usage




Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Macaulay2.spec	5 Mar 2005 21:10:20 -0000	1.3
+++ Macaulay2.spec	25 Mar 2005 15:19:05 -0000	1.4
@@ -1,9 +1,12 @@
-# $Id$
-
+# busted on x86_64 -- Rex
+# define m2home %{_libdir}/%{name}-%{version}
+# Makefiles hardcode "%prefix/lib" instead, ok?  -- Rex
+%define m2home %{_prefix}/lib/%{name}-%{version}
+ 
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.2
-Release: 13%{?dist_tag}
+Release: 14%{?dist_tag}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
@@ -83,41 +86,36 @@
 %makeinstall
 
 # Fix locations
-perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
+perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \
 	$RPM_BUILD_ROOT%{_bindir}/M2
-perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
+perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \
 	$RPM_BUILD_ROOT%{_bindir}/M2-help
-perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/emacs/*
+perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/*
 
 ## emacs files
 install -d      $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
-cp -alf	$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/emacs/*.el \
+cp -alf	$RPM_BUILD_ROOT%{m2home}/emacs/*.el \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 
 # app img
 install -p -D -m644 %{SOURCE1}      $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
-%if "%{?desktop_file}" != "0"
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
-
 desktop-file-install \
   --vendor fedora \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
   --add-category "X-Fedora" \
   %{SOURCE2}
-%else
-install -p -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Applications/%{name}.desktop
-%endif
 
 ## Unpackaged files
 # %doc stuff, no need to dup in appdir
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/{README,CHANGES,COPYING}
+rm -f $RPM_BUILD_ROOT%{m2home}/{README,CHANGES,COPYING}
 # created by make check
-find $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} \( -name test.out -o -name test.out*.trim \) -exec rm -v {} \;
+find $RPM_BUILD_ROOT%{m2home} \( -name test.out -o -name test.out*.trim \) -exec rm -v {} \;
 # .cvsignore
-find $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} -name .cvsignore -exec rm -v {} \;
+find $RPM_BUILD_ROOT%{m2home} -name .cvsignore -exec rm -v {} \;
 # unuseful files outside of build environment
-find  $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/packages -name "Makefile*" -exec rm -v {} \;
+find  $RPM_BUILD_ROOT%{m2home}/packages -name "Makefile*" -exec rm -v {} \;
 
 
 %clean
@@ -126,44 +124,44 @@
 
 %preun
 # Handle possibly existing dumpdata
-rm -f %{_libdir}/%{name}-%{version}/libexec/Macaulay2-*-data ||:
+rm -f %{m2home}/libexec/Macaulay2-*-data ||:
 
 
 %files
 %defattr(-,root,root)
 %doc Macaulay2/README Macaulay2/CHANGES
 %{_bindir}/M2
-%if "%{?desktop_file}" != "0"
 %{_datadir}/applications/*.desktop
-%else
-%{_sysconfdir}/X11/applnk/*/*.desktop
-%endif
 %{_datadir}/pixmaps/*.png
-%dir %{_libdir}/%{name}-%{version}
-%{_libdir}/%{name}-%{version}/cache
-%{_libdir}/%{name}-%{version}/libexec
-%{_libdir}/%{name}-%{version}/m2
-%{_libdir}/%{name}-%{version}/packages
+%dir %{m2home}
+%{m2home}/cache
+%{m2home}/libexec
+%{m2home}/m2
+%{m2home}/packages
 # Not needed/wanted
-%exclude %{_libdir}/%{name}-%{version}/setup
+%exclude %{m2home}/setup
 
 %files emacs
 %defattr(-,root,root)
-%dir %{_libdir}/%{name}-%{version}/emacs
-%doc %{_libdir}/%{name}-%{version}/emacs/*.m2
-%doc %{_libdir}/%{name}-%{version}/emacs/*.txt
-%doc %{_libdir}/%{name}-%{version}/emacs/README
-%{_libdir}/%{name}-%{version}/emacs/*.el
+%dir %{m2home}/emacs
+%doc %{m2home}/emacs/*.m2
+%doc %{m2home}/emacs/*.txt
+%doc %{m2home}/emacs/README
+%{m2home}/emacs/*.el
 %{_datadir}/emacs/site-lisp/*.el
 
 %files doc
 %defattr(-,root,root)
 %{_bindir}/M2-help
-%{_libdir}/%{name}-%{version}/html
-%{_libdir}/%{name}-%{version}/tutorial
+%{m2home}/html
+%{m2home}/tutorial
 
 
 %changelog
+* Mon Feb 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.2-14
+- x86_64 issues (%%_libdir -> %%_prefix/lib )
+- remove desktop_file macro usage
+
 * Sat Oct 23 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.13
 - BR: time (again)
 - omit m2_dir/setup (not needed/wanted)



From fedora-extras-commits at redhat.com  Fri Mar 25 16:14:08 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Fri, 25 Mar 2005 11:14:08 -0500
Subject: rpms/ipython/devel .cvsignore, 1.2, 1.3 ipython.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200503251614.j2PGE8Xc006682@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6658

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
New upstream version 0.6.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Mar 2005 17:33:52 -0000	1.2
+++ .cvsignore	25 Mar 2005 16:14:06 -0000	1.3
@@ -1 +1 @@
-ipython-0.6.11.tar.gz
+ipython-0.6.12.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/ipython.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipython.spec	9 Mar 2005 17:33:52 -0000	1.1
+++ ipython.spec	25 Mar 2005 16:14:06 -0000	1.2
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           ipython
-Version:        0.6.11
-Release:        2
+Version:        0.6.12
+Release:        1
 Summary:        An enhanced interactive Python shell
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://ipython.scipy.org/
-Source0:        http://ipython.scipy.org/dist/ipython-0.6.11.tar.gz
+Source0:        http://ipython.scipy.org/dist/ipython-0.6.12.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -82,6 +81,10 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Fri Mar 25 2005 Shahms E. King <shahms at shahms.com> 0.6.12-1
+- Update to 0.6.12
+- Removed unused python_sitearch define
+
 * Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 0.6.11-2
 - Fix up %doc file specifications
 - Use offical .tar.gz, not upstream .src.rpm .tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Mar 2005 17:33:52 -0000	1.2
+++ sources	25 Mar 2005 16:14:06 -0000	1.3
@@ -1 +1 @@
-cf4bdd4a89d71e497e76f0473cbe02f7  ipython-0.6.11.tar.gz
+3a72e214fe2164f9f86103523e3d8276  ipython-0.6.12.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 25 16:14:44 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Fri, 25 Mar 2005 11:14:44 -0500
Subject: rpms/ipython/FC-3 ipython.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200503251614.j2PGEiZ6006721@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6715

Modified Files:
	ipython.spec sources 
Log Message:
New upstream version 0.6.12



Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/ipython.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipython.spec	9 Mar 2005 17:33:52 -0000	1.1
+++ ipython.spec	25 Mar 2005 16:14:42 -0000	1.2
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           ipython
-Version:        0.6.11
-Release:        2
+Version:        0.6.12
+Release:        1
 Summary:        An enhanced interactive Python shell
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://ipython.scipy.org/
-Source0:        http://ipython.scipy.org/dist/ipython-0.6.11.tar.gz
+Source0:        http://ipython.scipy.org/dist/ipython-0.6.12.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -82,6 +81,10 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Fri Mar 25 2005 Shahms E. King <shahms at shahms.com> 0.6.12-1
+- Update to 0.6.12
+- Removed unused python_sitearch define
+
 * Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 0.6.11-2
 - Fix up %doc file specifications
 - Use offical .tar.gz, not upstream .src.rpm .tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Mar 2005 17:33:52 -0000	1.2
+++ sources	25 Mar 2005 16:14:42 -0000	1.3
@@ -1 +1 @@
-cf4bdd4a89d71e497e76f0473cbe02f7  ipython-0.6.11.tar.gz
+3a72e214fe2164f9f86103523e3d8276  ipython-0.6.12.tar.gz



From fedora-extras-commits at redhat.com  Fri Mar 25 16:20:45 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 25 Mar 2005 11:20:45 -0500
Subject: devel/taglib taglib.spec,1.7,1.8
Message-ID: <200503251620.j2PGKjKq006781@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/taglib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6775

Modified Files:
	taglib.spec 
Log Message:
* Fri Mar 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.3.1-2
- rebuild with g++4




Index: taglib.spec
===================================================================
RCS file: /cvs/extras/devel/taglib/taglib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- taglib.spec	5 Mar 2005 19:43:17 -0000	1.7
+++ taglib.spec	25 Mar 2005 16:20:43 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       taglib	
 Version:    1.3.1
-Release:    1
+Release:    2
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Fri Mar 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.3.1-2
+- rebuild with g++4
+
 * Mon Jan 10 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.3.1-1
 - version 1.3.1
 - drop patch0



From fedora-extras-commits at redhat.com  Fri Mar 25 16:31:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 25 Mar 2005 11:31:59 -0500
Subject: rpms/fyre - New directory
Message-ID: <200503251631.j2PGVxN8006921@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6914/fyre

Log Message:
Directory /cvs/extras/rpms/fyre added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 25 16:31:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 25 Mar 2005 11:31:59 -0500
Subject: rpms/fyre/devel - New directory
Message-ID: <200503251631.j2PGVxnZ006924@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6914/fyre/devel

Log Message:
Directory /cvs/extras/rpms/fyre/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Mar 25 16:32:20 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 25 Mar 2005 11:32:20 -0500
Subject: rpms/fyre Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503251632.j2PGWKPV006988@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6979

Added Files:
	Makefile import.log 
Log Message:
Setup of module fyre


--- NEW FILE Makefile ---
# Top level Makefile for module fyre
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 25 16:32:20 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 25 Mar 2005 11:32:20 -0500
Subject: rpms/fyre/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503251632.j2PGWKIT006991@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6979/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fyre


--- 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 Mar 25 16:33:17 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 25 Mar 2005 11:33:17 -0500
Subject: rpms/fyre import.log,1.1,1.2
Message-ID: <200503251633.j2PGXHC6007107@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7091

Modified Files:
	import.log 
Log Message:
auto-import fyre-1.0.0-2 on branch devel from fyre-1.0.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fyre/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Mar 2005 16:32:18 -0000	1.1
+++ import.log	25 Mar 2005 16:33:15 -0000	1.2
@@ -0,0 +1 @@
+fyre-1_0_0-2:HEAD:fyre-1.0.0-2.src.rpm:1111768390



From fedora-extras-commits at redhat.com  Fri Mar 25 16:33:17 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 25 Mar 2005 11:33:17 -0500
Subject: rpms/fyre/devel fyre-1.0.0-apps.patch, NONE, 1.1 fyre.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503251633.j2PGXHIe007111@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7091/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fyre-1.0.0-apps.patch fyre.spec 
Log Message:
auto-import fyre-1.0.0-2 on branch devel from fyre-1.0.0-2.src.rpm

fyre-1.0.0-apps.patch:

--- NEW FILE fyre-1.0.0-apps.patch ---
--- fyre-1.0.0/configure.orig	2005-03-24 15:41:35.969025049 -0500
+++ fyre-1.0.0/configure	2005-03-24 15:42:06.250612823 -0500
@@ -4936,13 +4936,13 @@
 fi
 
 
-if test "x$enable_xdgmime" = "xyes"; then
-  ENABLE_XDGMIME_TRUE=
-  ENABLE_XDGMIME_FALSE='#'
-else
+#if test "x$enable_xdgmime" = "xyes"; then
+#  ENABLE_XDGMIME_TRUE=
+#  ENABLE_XDGMIME_FALSE='#'
+#else
   ENABLE_XDGMIME_TRUE='#'
   ENABLE_XDGMIME_FALSE=
-fi
+#fi
 
 
 # Extract the first word of "update-desktop-database", so it can be a program name with args.
@@ -4992,13 +4992,13 @@
 fi
 
 
-if test "x$enable_fdodesktop" = "xyes"; then
-  ENABLE_FDODESKTOP_TRUE=
-  ENABLE_FDODESKTOP_FALSE='#'
-else
+#if test "x$enable_fdodesktop" = "xyes"; then
+#  ENABLE_FDODESKTOP_TRUE=
+#  ENABLE_FDODESKTOP_FALSE='#'
+#else
   ENABLE_FDODESKTOP_TRUE='#'
   ENABLE_FDODESKTOP_FALSE=
-fi
+#fi
 
 
 pkg_modules="glib-2.0 >= 2.0.0, gtk+-2.0 >= 2.0.0, libglade-2.0 >= 2.0"
--- fyre-1.0.0/data/Makefile.in.orig	2005-03-24 15:51:57.493939940 -0500
+++ fyre-1.0.0/data/Makefile.in	2005-03-24 15:53:41.478354812 -0500
@@ -175,18 +175,18 @@
         fyre-32x32.png          \
         fyre-16x16.png
 
- at ENABLE_FDODESKTOP_TRUE@desktopdir = $(datadir)/applications
- at ENABLE_FDODESKTOP_TRUE@desktop_DATA = fyre.desktop
- at ENABLE_FDODESKTOP_TRUE@icondir = $(datadir)/pixmaps
- at ENABLE_FDODESKTOP_TRUE@icon_DATA = fyre-48x48.png
+desktopdir = $(datadir)/applications
+desktop_DATA = fyre.desktop
+icondir = $(datadir)/pixmaps
+icon_DATA = fyre-48x48.png
 @ENABLE_FDODESKTOP_FALSE at update_fdodesktop = /bin/true
 @ENABLE_FDODESKTOP_TRUE at update_fdodesktop = update-desktop-database
- at ENABLE_XDGMIME_TRUE@xdgmimedir = $(datadir)/mime/packages
- at ENABLE_XDGMIME_TRUE@xdgmime_DATA = fyre.xml
+xdgmimedir = $(datadir)/mime/packages
+xdgmime_DATA = fyre.xml
 @ENABLE_XDGMIME_FALSE at update_xdgmime = /bin/true
 @ENABLE_XDGMIME_TRUE at update_xdgmime = update-mime-database $(datadir)/mime
- at ENABLE_XDGMIME_TRUE@xdgicondir = $(datadir)/icons/hicolor/48x48/mimetypes
- at ENABLE_XDGMIME_TRUE@xdgicon_DATA = application-x-fyre-animation.png
+xdgicondir = $(datadir)/icons/hicolor/48x48/mimetypes
+xdgicon_DATA = application-x-fyre-animation.png
 EXTRA_DIST = \
 	$(fyredata_DATA)	\
 	$(desktop_DATA)		\


--- NEW FILE fyre.spec ---
Name:           fyre
Version:        1.0.0
Release:        2
Summary:        A tool for creating artwork from chaotic functions

Group:          Amusements/Graphics
License:        GPL
URL:            http://fyre.navi.cx/
Source0:        http://flapjack.navi.cx/releases/fyre/fyre-1.0.0.tar.bz2
Patch:          fyre-1.0.0-apps.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel libglade2-devel desktop-file-utils
Requires(post): desktop-file-utils shared-mime-info
Requires(postun): desktop-file-utils shared-mime-info

%description
Fyre is a tool for producing computational artwork based on histograms of
iterated chaotic functions. At the moment, it implements the Peter de Jong map
in a fixed-function pipeline with an interactive GTK+ frontend and a command
line interface for easy and efficient rendering of high-resolution, high
quality images.

%prep
%setup -q
%patch -p 1 -b .apps

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
desktop-file-install --vendor=fedora \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category=X-Fedora \
  --add-category=GTK \
  --delete-original \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post
update-mime-database %{_datadir}/mime &> /dev/null
update-desktop-database &> /dev/null

%postun
update-mime-database %{_datadir}/mime &> /dev/null
update-desktop-database &> /dev/null

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/icons/hicolor/48x48/mimetypes/*
%{_datadir}/mime/packages/*
%{_datadir}/pixmaps/*

%changelog
* Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-2
- Summary and %%post/%%postun changes

* Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Mar 2005 16:32:18 -0000	1.1
+++ .cvsignore	25 Mar 2005 16:33:15 -0000	1.2
@@ -0,0 +1 @@
+fyre-1.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Mar 2005 16:32:18 -0000	1.1
+++ sources	25 Mar 2005 16:33:15 -0000	1.2
@@ -0,0 +1 @@
+5da821b3166d3de187cc7d84bb1dc4d3  fyre-1.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Mar 25 16:40:18 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 25 Mar 2005 11:40:18 -0500
Subject: rpms/fyre/devel fyre.spec,1.1,1.2
Message-ID: <200503251640.j2PGeI8G007301@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7295

Modified Files:
	fyre.spec 
Log Message:
Removed NEWS, added || : to %post* commands


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/fyre.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fyre.spec	25 Mar 2005 16:33:15 -0000	1.1
+++ fyre.spec	25 Mar 2005 16:40:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           fyre
 Version:        1.0.0
-Release:        2
+Release:        3
 Summary:        A tool for creating artwork from chaotic functions
 
 Group:          Amusements/Graphics
@@ -43,16 +43,16 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-update-mime-database %{_datadir}/mime &> /dev/null
-update-desktop-database &> /dev/null
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 %postun
-update-mime-database %{_datadir}/mime &> /dev/null
-update-desktop-database &> /dev/null
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
@@ -61,6 +61,10 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Mar 25 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-3
+- Removed NEWS
+- Added || : to %%post* commands
+
 * Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-2
 - Summary and %%post/%%postun changes
 



From fedora-extras-commits at redhat.com  Fri Mar 25 17:48:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 12:48:18 -0500
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec,1.2,1.3
Message-ID: <200503251748.j2PHmIK2008438@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8432

Modified Files:
	xfce4-mixer.spec 
Log Message:
Removed unneeded la files



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-mixer.spec	21 Mar 2005 01:12:49 -0000	1.2
+++ xfce4-mixer.spec	25 Mar 2005 17:48:15 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-mixer-4.2.1.tar.bz2
@@ -31,6 +31,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.la
 %find_lang %{name}
 
 %clean
@@ -45,6 +46,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-mixer.png
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Removed unneeded la files
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - fix BuildReqs
 



From fedora-extras-commits at redhat.com  Fri Mar 25 18:17:58 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 13:17:58 -0500
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.2,1.3
Message-ID: <200503251817.j2PIHwJI009407@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9401

Modified Files:
	xfce4-icon-theme.spec 
Log Message:
Added Obsoletes/Provides for xffm-icons



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-icon-theme.spec	21 Mar 2005 01:00:25 -0000	1.2
+++ xfce4-icon-theme.spec	25 Mar 2005 18:17:56 -0000	1.3
@@ -1,13 +1,15 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-icon-theme-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+Obsoletes: xffm-icons
+Provides: xffm-icons
 
 %description
 Icon theme for Xfce 4 Desktop Environment.
@@ -34,6 +36,9 @@
 %{_datadir}/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Added Obsoletes/Provides for xffm-icons
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - noarch
 



From fedora-extras-commits at redhat.com  Fri Mar 25 18:28:05 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 13:28:05 -0500
Subject: rpms/xfce4-iconbox/devel xfce4-iconbox.spec,1.2,1.3
Message-ID: <200503251828.j2PIS5Z0009468@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9462

Modified Files:
	xfce4-iconbox.spec 
Log Message:
Removed unneeded la/a files



Index: xfce4-iconbox.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-iconbox/devel/xfce4-iconbox.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-iconbox.spec	20 Mar 2005 08:40:42 -0000	1.2
+++ xfce4-iconbox.spec	25 Mar 2005 18:28:03 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Icon box for the Xfce4 Desktop Environment
 Name: xfce4-iconbox
 Version: 4.2.1
-Release: 1.FC4
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-iconbox-4.2.1.tar.bz2
@@ -30,7 +30,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 %find_lang %{name}
 
 %clean
@@ -45,6 +46,9 @@
 %{_datadir}/icons/hicolor/*/*/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
+- Removed unneeded la/a files
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to version 4.2.1
 



From fedora-extras-commits at redhat.com  Fri Mar 25 18:48:32 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 13:48:32 -0500
Subject: rpms/xfcalendar/devel xfcalendar.spec,1.2,1.3
Message-ID: <200503251848.j2PImWs5009616@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9610

Modified Files:
	xfcalendar.spec 
Log Message:
Remove unneeded la/a files



Index: xfcalendar.spec
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/devel/xfcalendar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfcalendar.spec	21 Mar 2005 00:46:01 -0000	1.2
+++ xfcalendar.spec	25 Mar 2005 18:48:30 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Time-managing application for Xfce4
 Name: xfcalendar
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfcalendar-4.2.1.tar.bz2
@@ -27,6 +27,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 %find_lang %{name}
 
 %clean
@@ -36,8 +38,6 @@
 %defattr(-,root,root)
 %doc README ChangeLog COPYING AUTHORS
 %{_bindir}/xfcalendar
-%{_libdir}/xfce4/mcs-plugins/xfcalendar_plugin.a
-%{_libdir}/xfce4/mcs-plugins/xfcalendar_plugin.la
 %{_libdir}/xfce4/mcs-plugins/xfcalendar_plugin.so
 %{_datadir}/applications/xfcalendar.desktop
 %{_datadir}/applications/xfce-xfcalendar-settings.desktop
@@ -45,6 +45,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
+- Remove unneeded la/a files
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - fix BuildRequires
 



From fedora-extras-commits at redhat.com  Fri Mar 25 18:57:55 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 13:57:55 -0500
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec,1.4,1.5
Message-ID: <200503251857.j2PIvti2009672@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9666

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
Removed unneeded la files



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtk-xfce-engine.spec	21 Mar 2005 00:27:35 -0000	1.4
+++ gtk-xfce-engine.spec	25 Mar 2005 18:57:53 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
 Version: 2.2.6
-Release: 1.FC4
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/gtk-xfce-engine-2.2.6.tar.bz2
@@ -24,7 +24,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*/*/engines/*.la
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -35,6 +35,9 @@
 %{_datadir}/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 2.2.6-2.FC4
+- Removed unneeded la files
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 2.2.6-1
 - Updated to 2.2.6 version
 



From fedora-extras-commits at redhat.com  Fri Mar 25 19:21:25 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 25 Mar 2005 14:21:25 -0500
Subject: rpms/Coin2/FC-3 coin-2.3.0-man3.diff, NONE, 1.1 .cvsignore, 1.2,
	1.3 Coin2.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200503251921.j2PJLP17010705@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/Coin2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10694/FC-3

Modified Files:
	.cvsignore Coin2.spec sources 
Added Files:
	coin-2.3.0-man3.diff 
Log Message:
* Tue Feb 22  2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-5
- Include simacros.
- Regenerate configure from simacros and FC3 libtool for x86_64.
- Don't install bogusly generated manpages for dirs.



coin-2.3.0-man3.diff:

--- NEW FILE coin-2.3.0-man3.diff ---
diff -u Coin-2.3.0.orig/man/man3/Makefile.am Coin-2.3.0/man/man3/Makefile.am
--- Coin-2.3.0.orig/man/man3/Makefile.am	2003-02-27 16:37:29.000000000 +0100
+++ Coin-2.3.0/man/man3/Makefile.am	2005-02-23 10:49:41.241888646 +0100
@@ -8,6 +8,7 @@
 	"$(sim_ac_doxygen_exe)" docs/coin.doxygen )
 
 filelist.txt: SoDB.3
+	rm -f *_.3
 	ls *.3 >filelist.txt
 
 
diff -u Coin-2.3.0.orig/man/man3/Makefile.in Coin-2.3.0/man/man3/Makefile.in
--- Coin-2.3.0.orig/man/man3/Makefile.in	2004-06-16 12:56:49.000000000 +0200
+++ Coin-2.3.0/man/man3/Makefile.in	2005-02-23 10:50:11.721791737 +0100
@@ -407,6 +407,7 @@
 	"$(sim_ac_doxygen_exe)" docs/coin.doxygen )
 
 filelist.txt: SoDB.3
+	rm -f *_.3
 	ls *.3 >filelist.txt
 
 @BUILD_MANPAGES_TRUE at all-local: filelist.txt


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 03:58:45 -0000	1.2
+++ .cvsignore	25 Mar 2005 19:21:23 -0000	1.3
@@ -1 +1,3 @@
 Coin-2.3.0.tar.gz
+coin-2.3.0-libtool.diff.bz2
+coin-2.3.0-simacros.diff.bz2


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-3/Coin2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Coin2.spec	10 Dec 2004 22:03:00 -0000	1.3
+++ Coin2.spec	25 Mar 2005 19:21:23 -0000	1.4
@@ -11,7 +11,7 @@
 Name: %{name}
 Version: %{srcvers}
 Epoch: 0
-Release: 4
+Release: 5
 
 License: GPL
 Group: System Environment/Libraries
@@ -22,6 +22,9 @@
 Patch0: coin-2.3.0-simage-soname.diff
 Patch1: coin-2.3.0-openal-soname.diff
 Patch2: coin-2.3.0-freetype-soname.diff
+Patch3: coin-2.3.0-simacros.diff.bz2
+Patch4: coin-2.3.0-libtool.diff.bz2
+Patch5: coin-2.3.0-man3.diff
 
 BuildRequires: libGL.so.1 libGLU.so.1 XFree86-devel
 BuildRequires: zlib-devel bzip2-devel
@@ -49,6 +52,9 @@
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .orig
 %patch2 -p1 -b .orig
+%patch3 -p1
+%patch4 -p1 -b .orig
+%patch5 -p1 -b .orig
 
 sed -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \
 < src/glue/freetype.c > src/glue/freetype.c~
@@ -106,6 +112,11 @@
 %doc %{_datadir}/Coin/html
 
 %changelog
+* Tue Feb 22  2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-5
+- Include simacros.
+- Regenerate configure from simacros and FC3 libtool for x86_64.
+- Don't install bogusly generated manpages for dirs.
+
 * Sun Jul 4  2004 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-0.fdr.4
 - Let Coin-devel Require: bzip2-devel, zlib-devel.
 - Use @XX@ patterns in soname sed calls.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 03:58:45 -0000	1.2
+++ sources	25 Mar 2005 19:21:23 -0000	1.3
@@ -1 +1,3 @@
 17fb23a394ab79f149878ea8a3845b32  Coin-2.3.0.tar.gz
+21483fa4cfff1fb57ad5811b998f9652  coin-2.3.0-libtool.diff.bz2
+30bc10eac1ad6d5daf0ffd3e5ac2b40f  coin-2.3.0-simacros.diff.bz2



From fedora-extras-commits at redhat.com  Fri Mar 25 19:21:25 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 25 Mar 2005 14:21:25 -0500
Subject: rpms/Coin2/devel coin-2.3.0-man3.diff, NONE, 1.1 .cvsignore, 1.2,
	1.3 Coin2.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200503251921.j2PJLPhi010713@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/Coin2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10694/devel

Modified Files:
	.cvsignore Coin2.spec sources 
Added Files:
	coin-2.3.0-man3.diff 
Log Message:
* Tue Feb 22  2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-5
- Include simacros.
- Regenerate configure from simacros and FC3 libtool for x86_64.
- Don't install bogusly generated manpages for dirs.



coin-2.3.0-man3.diff:

--- NEW FILE coin-2.3.0-man3.diff ---
diff -u Coin-2.3.0.orig/man/man3/Makefile.am Coin-2.3.0/man/man3/Makefile.am
--- Coin-2.3.0.orig/man/man3/Makefile.am	2003-02-27 16:37:29.000000000 +0100
+++ Coin-2.3.0/man/man3/Makefile.am	2005-02-23 10:49:41.241888646 +0100
@@ -8,6 +8,7 @@
 	"$(sim_ac_doxygen_exe)" docs/coin.doxygen )
 
 filelist.txt: SoDB.3
+	rm -f *_.3
 	ls *.3 >filelist.txt
 
 
diff -u Coin-2.3.0.orig/man/man3/Makefile.in Coin-2.3.0/man/man3/Makefile.in
--- Coin-2.3.0.orig/man/man3/Makefile.in	2004-06-16 12:56:49.000000000 +0200
+++ Coin-2.3.0/man/man3/Makefile.in	2005-02-23 10:50:11.721791737 +0100
@@ -407,6 +407,7 @@
 	"$(sim_ac_doxygen_exe)" docs/coin.doxygen )
 
 filelist.txt: SoDB.3
+	rm -f *_.3
 	ls *.3 >filelist.txt
 
 @BUILD_MANPAGES_TRUE at all-local: filelist.txt


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 03:58:45 -0000	1.2
+++ .cvsignore	25 Mar 2005 19:21:23 -0000	1.3
@@ -1 +1,3 @@
 Coin-2.3.0.tar.gz
+coin-2.3.0-libtool.diff.bz2
+coin-2.3.0-simacros.diff.bz2


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Coin2.spec	5 Mar 2005 21:10:19 -0000	1.4
+++ Coin2.spec	25 Mar 2005 19:21:23 -0000	1.5
@@ -10,7 +10,7 @@
 Summary: High-level 3D visualization library
 Name: %{name}
 Version: %{srcvers}
-Release: 4
+Release: 5
 
 License: GPL
 Group: System Environment/Libraries
@@ -21,6 +21,9 @@
 Patch0: coin-2.3.0-simage-soname.diff
 Patch1: coin-2.3.0-openal-soname.diff
 Patch2: coin-2.3.0-freetype-soname.diff
+Patch3: coin-2.3.0-simacros.diff.bz2
+Patch4: coin-2.3.0-libtool.diff.bz2
+Patch5: coin-2.3.0-man3.diff
 
 BuildRequires: libGL.so.1 libGLU.so.1 XFree86-devel
 BuildRequires: zlib-devel bzip2-devel
@@ -48,6 +51,9 @@
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .orig
 %patch2 -p1 -b .orig
+%patch3 -p1
+%patch4 -p1 -b .orig
+%patch5 -p1 -b .orig
 
 sed -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \
 < src/glue/freetype.c > src/glue/freetype.c~
@@ -105,6 +111,11 @@
 %doc %{_datadir}/Coin/html
 
 %changelog
+* Tue Feb 22  2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-5
+- Include simacros.
+- Regenerate configure from simacros and FC3 libtool for x86_64.
+- Don't install bogusly generated manpages for dirs.
+
 * Sun Jul 4  2004 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-0.fdr.4
 - Let Coin-devel Require: bzip2-devel, zlib-devel.
 - Use @XX@ patterns in soname sed calls.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 03:58:45 -0000	1.2
+++ sources	25 Mar 2005 19:21:23 -0000	1.3
@@ -1 +1,3 @@
 17fb23a394ab79f149878ea8a3845b32  Coin-2.3.0.tar.gz
+21483fa4cfff1fb57ad5811b998f9652  coin-2.3.0-libtool.diff.bz2
+30bc10eac1ad6d5daf0ffd3e5ac2b40f  coin-2.3.0-simacros.diff.bz2



From fedora-extras-commits at redhat.com  Fri Mar 25 19:39:47 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Fri, 25 Mar 2005 14:39:47 -0500
Subject: devel/jabberd jabberd.spec,1.4,1.5
Message-ID: <200503251939.j2PJdlcF010802@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10796

Modified Files:
	jabberd.spec 
Log Message:
* make backends optional during build
* use -p with the install command



Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jabberd.spec	22 Mar 2005 12:16:56 -0000	1.4
+++ jabberd.spec	25 Mar 2005 19:39:45 -0000	1.5
@@ -8,8 +8,12 @@
 Source1: jabberd
 URL: http://jabberd.jabberstudio.org/2/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel db4-devel libidn-devel pam-devel
-BuildRequires: openldap-devel postgresql-devel mysql-devel
+BuildRequires: openssl-devel libidn-devel
+%{!?_without_pam:BuildRequires: pam-devel}
+%{!?_without_db4:BuildRequires: db4-devel}
+%{!?_without_ldap:BuildRequires: openldap-devel}
+%{!?_without_mysql:BuildRequires: mysql-devel}
+%{!?_without_postgresql:BuildRequires: postgresql-devel}
 Requires(post): openssl chkconfig
 Requires(pre): shadow-utils
 Requires(preun): chkconfig shadow-utils
@@ -33,15 +37,21 @@
 %build
 %define _sysconfdir /etc/jabberd
 %define sysconfdir /etc/jabberd
-%{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g" \
-		configure
-%configure	--enable-db \
-		--enable-mysql \
-		--enable-pam \
-		--enable-ldap \
-		--enable-pgsql \
-		--with-extra-library-path=%{_libdir}/mysql \
-		--localstatedir=%{_var}/lib
+%{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g" configure
+
+%configure \
+	%{!?_without_pam:--enable-pam} \
+	%{?_without_pam:--disable-pam} \
+	%{!?_without_db4:--enable-db} \
+	%{?_without_db4:--disable-db} \
+	%{!?_without_mysql:--enable-mysql} \
+	%{!?_without_mysql:--with-extra-library-path=%{_libdir}/mysql} \
+	%{?_without_mysql:--disable-mysql} \
+	%{!?_without_ldap:--enable-ldap} \
+	%{?_without_ldap:--disable-ldap} \
+	%{!?_without_postgresql:--enable-pgsql} \
+	%{?_without_postgresql:--disable-pgsql} \
+	--localstatedir=%{_var}/lib
 
 %{__make} %{?_smp_mflags}
 
@@ -51,19 +61,19 @@
 %define _sysconfdir /etc
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_var}/lib/jabberd/{log,pid,db}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__install} -m 644 tools/db-setup.mysql $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__install} -m 644 tools/db-setup.pgsql $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__install} -m 644 tools/migrate.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__install} -m 644 tools/pipe-auth.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
-%{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
+%{__install} -p -m 644 tools/db-setup.mysql $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__install} -p -m 644 tools/db-setup.pgsql $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__install} -p -m 644 tools/migrate.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__install} -p -m 644 tools/pipe-auth.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 %{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
             -e "s,__ETCDIR__,%{sysconfdir},g" \
             -e "s,__PIDDIR__,%{_var}/lib/jabberd/pid,g" \
 		$RPM_BUILD_ROOT%{_initrddir}/%{name}
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
 %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/jabberd << END
 #%PAM-1.0
 auth       required     pam_nologin.so
@@ -168,6 +178,8 @@
 - typo 
 - changed db location to %%{_var}/lib/jabberd
 - removed noreplace for start script
+- make backends optional during build
+- use -p with the install command
 
 * Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
 - made password more random (/dev/random)



From fedora-extras-commits at redhat.com  Fri Mar 25 20:15:55 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:15:55 -0500
Subject: rpms/xfce4-panel/devel panel-htmlview.patch, NONE,
	1.1 xfce4-panel.spec, 1.2, 1.3
Message-ID: <200503252015.j2PKFtJs011708@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11702

Modified Files:
	xfce4-panel.spec 
Added Files:
	panel-htmlview.patch 
Log Message:
Added htmlview patch
Removed unneeded la/a files


panel-htmlview.patch:

--- NEW FILE panel-htmlview.patch ---
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml xfce4-panel-4.2.1.1/contents.xml
--- xfce4-panel-4.2.1.1.orig/contents.xml	2005-03-24 20:06:17.784671961 -0700
+++ xfce4-panel-4.2.1.1/contents.xml	2005-03-24 20:08:22.042455752 -0700
@@ -41,8 +41,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla Web Browser</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Web Browser</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ar xfce4-panel-4.2.1.1/contents.xml.ar
--- xfce4-panel-4.2.1.1.orig/contents.xml.ar	2005-03-24 20:06:17.784671961 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ar	2005-03-24 20:10:28.875841230 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>?????????? Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>??????????</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.az xfce4-panel-4.2.1.1/contents.xml.az
--- xfce4-panel-4.2.1.1.orig/contents.xml.az	2005-03-24 20:06:17.785671807 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.az	2005-03-24 20:10:41.511887092 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla Veb S??yyah??</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Veb S??yyah??</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ca xfce4-panel-4.2.1.1/contents.xml.ca
--- xfce4-panel-4.2.1.1.orig/contents.xml.ca	2005-03-24 20:06:17.786671652 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ca	2005-03-24 20:10:57.243454238 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Navegador mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Navegador</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.da xfce4-panel-4.2.1.1/contents.xml.da
--- xfce4-panel-4.2.1.1.orig/contents.xml.da	2005-03-05 04:21:43.000000000 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.da	2005-03-24 20:11:08.742675907 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla Web Browser</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Web Browser</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.eu xfce4-panel-4.2.1.1/contents.xml.eu
--- xfce4-panel-4.2.1.1.orig/contents.xml.eu	2005-03-24 20:06:17.786671652 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.eu	2005-03-24 20:11:21.628683112 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla Web Kudeatzailea</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Web Kudeatzailea</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.fi xfce4-panel-4.2.1.1/contents.xml.fi
--- xfce4-panel-4.2.1.1.orig/contents.xml.fi	2005-01-23 09:48:50.000000000 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.fi	2005-03-24 20:11:42.603439410 -0700
@@ -41,8 +41,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla Web-selain</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Web-selain</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.fr xfce4-panel-4.2.1.1/contents.xml.fr
--- xfce4-panel-4.2.1.1.orig/contents.xml.fr	2005-03-24 20:06:17.787671498 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.fr	2005-03-24 20:15:07.204798232 -0700
@@ -41,8 +41,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Navigateur Web Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Web</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.he xfce4-panel-4.2.1.1/contents.xml.he
--- xfce4-panel-4.2.1.1.orig/contents.xml.he	2005-03-24 20:06:17.787671498 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.he	2005-03-24 20:12:12.065883103 -0700
@@ -35,7 +35,7 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
+        <Command term="0" sn="0">htmlview</Command>
         <Tooltip>?????????? ????????????</Tooltip>
         <Icon id="7"/>
       </Control>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.hu xfce4-panel-4.2.1.1/contents.xml.hu
--- xfce4-panel-4.2.1.1.orig/contents.xml.hu	2005-03-24 20:06:17.788671343 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.hu	2005-03-24 20:12:24.431970714 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla webb??ng??sz??</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>webb??ng??sz??</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.it xfce4-panel-4.2.1.1/contents.xml.it
--- xfce4-panel-4.2.1.1.orig/contents.xml.it	2005-03-24 20:06:17.789671188 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.it	2005-03-24 20:12:38.720760982 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Browser Web Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Browser Web</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ja xfce4-panel-4.2.1.1/contents.xml.ja
--- xfce4-panel-4.2.1.1.orig/contents.xml.ja	2005-03-04 10:43:07.000000000 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ja	2005-03-24 20:12:49.108154593 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla ???????????????????????????????????????</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>???????????????????????????????????????</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ko xfce4-panel-4.2.1.1/contents.xml.ko
--- xfce4-panel-4.2.1.1.orig/contents.xml.ko	2005-03-24 20:06:17.789671188 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ko	2005-03-24 20:12:55.472170411 -0700
@@ -41,7 +41,7 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
+        <Command term="0" sn="0">htmlview</Command>
         <Tooltip>????????? ??? ????????????</Tooltip>
         <Icon id="7"/>
       </Control>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.lt xfce4-panel-4.2.1.1/contents.xml.lt
--- xfce4-panel-4.2.1.1.orig/contents.xml.lt	2005-03-24 20:06:17.790671034 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.lt	2005-03-24 20:13:04.482776939 -0700
@@ -41,8 +41,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla ??iniatinklio nar??ykl??</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>??iniatinklio nar??ykl??</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ms xfce4-panel-4.2.1.1/contents.xml.ms
--- xfce4-panel-4.2.1.1.orig/contents.xml.ms	2005-03-24 20:06:17.791670879 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ms	2005-03-24 20:13:12.433547369 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Pelayar Web Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Pelayar Web</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.nl xfce4-panel-4.2.1.1/contents.xml.nl
--- xfce4-panel-4.2.1.1.orig/contents.xml.nl	2005-03-24 20:06:17.791670879 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.nl	2005-03-24 20:13:20.923234456 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla Web Browser</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Web Browser</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ro xfce4-panel-4.2.1.1/contents.xml.ro
--- xfce4-panel-4.2.1.1.orig/contents.xml.ro	2005-03-24 20:06:17.792670724 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ro	2005-03-24 20:13:36.617807323 -0700
@@ -41,8 +41,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla -splash</Command>
-        <Tooltip>Navigatorul Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Navigatorul</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.ru xfce4-panel-4.2.1.1/contents.xml.ru
--- xfce4-panel-4.2.1.1.orig/contents.xml.ru	2005-03-24 20:06:17.792670724 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.ru	2005-03-24 20:13:44.978514357 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>????????????????-?????????????? Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>????????????????-??????????????</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.sk xfce4-panel-4.2.1.1/contents.xml.sk
--- xfce4-panel-4.2.1.1.orig/contents.xml.sk	2005-03-24 20:06:17.793670570 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.sk	2005-03-24 20:13:51.275540535 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Webov?? prehliada?? Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Webov?? prehliada??</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.tr xfce4-panel-4.2.1.1/contents.xml.tr
--- xfce4-panel-4.2.1.1.orig/contents.xml.tr	2005-03-24 20:06:17.794670415 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.tr	2005-03-24 20:14:00.384131910 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla Web Taray??c??s??</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Web Taray??c??s??</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.vi xfce4-panel-4.2.1.1/contents.xml.vi
--- xfce4-panel-4.2.1.1.orig/contents.xml.vi	2005-03-24 20:06:17.794670415 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.vi	2005-03-24 20:14:07.388048769 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Tr??nh duy???t web Mozilla</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>Tr??nh duy???t web</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.zh_CN xfce4-panel-4.2.1.1/contents.xml.zh_CN
--- xfce4-panel-4.2.1.1.orig/contents.xml.zh_CN	2005-02-01 10:25:19.000000000 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.zh_CN	2005-03-24 20:14:19.219219103 -0700
@@ -41,8 +41,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla ???????????????</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>???????????????</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>
diff -Nur xfce4-panel-4.2.1.1.orig/contents.xml.zh_TW xfce4-panel-4.2.1.1/contents.xml.zh_TW
--- xfce4-panel-4.2.1.1.orig/contents.xml.zh_TW	2005-03-24 20:06:17.795670261 -0700
+++ xfce4-panel-4.2.1.1/contents.xml.zh_TW	2005-03-24 20:14:29.898567563 -0700
@@ -35,8 +35,8 @@
     <Group>
       <Popup/>
       <Control id="-2" popup="0">
-        <Command term="0" sn="0">mozilla</Command>
-        <Tooltip>Mozilla ???????????????</Tooltip>
+        <Command term="0" sn="0">htmlview</Command>
+        <Tooltip>???????????????</Tooltip>
         <Icon id="7"/>
       </Control>
     </Group>


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-panel.spec	20 Mar 2005 07:50:46 -0000	1.2
+++ xfce4-panel.spec	25 Mar 2005 20:15:53 -0000	1.3
@@ -1,12 +1,13 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.2.1.1
-Release: 2.FC4
+Release: 3.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-panel-4.2.1.1.tar.bz2
 # Change default for Fedora
 Patch0: panel-launchmail.patch
+Patch1: panel-htmlview.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libxfcegui4 >= 4.2.1
@@ -34,7 +35,8 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .launchmail
+%patch1 -p1 -b .htmlview
 
 %build
 %configure
@@ -42,8 +44,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
-
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
 %find_lang %{name}
 
 %clean
@@ -65,6 +68,10 @@
 %{_includedir}/xfce4
 
 %changelog
+* Thu Mar 24 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1.1-3.FC4
+- Added htmlview patch
+- Removed unneeded la/a files
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1.1-2
 - remove stuff
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:33:00 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:33:00 -0500
Subject: rpms/dbh/devel dbh.spec,1.2,1.3
Message-ID: <200503252033.j2PKX002011996@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11988

Modified Files:
	dbh.spec 
Log Message:
lowercase Release



Index: dbh.spec
===================================================================
RCS file: /cvs/extras/rpms/dbh/devel/dbh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dbh.spec	20 Mar 2005 07:28:02 -0000	1.2
+++ dbh.spec	25 Mar 2005 20:32:58 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Disk based hash library
 Name: dbh
 Version: 1.0.22
-Release: 2.FC4
+Release: 3.fc4
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src/dbh-1.0.22.tar.gz
 Patch: dbh-1.0.22-rpath.patch
@@ -63,6 +63,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 1:1.0.22-3.fc4
+- lowercase Release
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 1:1.0.22-2
 - remove stuff
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:36:35 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:36:35 -0500
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec,1.5,1.6
Message-ID: <200503252036.j2PKaZag012046@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12040

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
lowercase Release



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk-xfce-engine.spec	25 Mar 2005 18:57:53 -0000	1.5
+++ gtk-xfce-engine.spec	25 Mar 2005 20:36:33 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
 Version: 2.2.6
-Release: 2.FC4
+Release: 3.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/gtk-xfce-engine-2.2.6.tar.bz2
@@ -35,6 +35,9 @@
 %{_datadir}/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 2.2.6-3.fc4
+- lowercase Release
+
 * Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 2.2.6-2.FC4
 - Removed unneeded la files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:40:06 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:40:06 -0500
Subject: rpms/libxfce4mcs/devel libxfce4mcs.spec,1.2,1.3
Message-ID: <200503252040.j2PKe6qZ012092@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12086

Modified Files:
	libxfce4mcs.spec 
Log Message:
lowercase Release



Index: libxfce4mcs.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/libxfce4mcs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libxfce4mcs.spec	20 Mar 2005 07:45:07 -0000	1.2
+++ libxfce4mcs.spec	25 Mar 2005 20:40:04 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Multi-channel settings management support for Xfce
 Name: libxfce4mcs
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4mcs-4.2.1.tar.bz2
@@ -61,6 +61,9 @@
 %{_datadir}/gtk-doc/html/libxfce4mcs
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - remove stuff
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:43:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:43:20 -0500
Subject: rpms/libxfce4util/devel libxfce4util.spec,1.3,1.4
Message-ID: <200503252043.j2PKhK5X012141@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12135

Modified Files:
	libxfce4util.spec 
Log Message:
lowercase Release



Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libxfce4util.spec	20 Mar 2005 07:42:15 -0000	1.3
+++ libxfce4util.spec	25 Mar 2005 20:43:18 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: BSD and LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4util-4.2.1.tar.bz2
@@ -34,7 +34,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,6 +58,9 @@
 %doc %{_datadir}/gtk-doc/html/libxfce4util
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - remove stuff 
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:49:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:49:42 -0500
Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.4,1.5
Message-ID: <200503252049.j2PKngM5012211@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12205

Modified Files:
	libxfcegui4.spec 
Log Message:
lowercase Release



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libxfcegui4.spec	20 Mar 2005 07:53:58 -0000	1.4
+++ libxfcegui4.spec	25 Mar 2005 20:49:40 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfcegui4-4.2.1.tar.bz2
@@ -67,6 +67,9 @@
 %{_datadir}/gtk-doc/html/libxfcegui4
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release 
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-3
 - remove stuff, remove version from dbh-devel buildreq
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:52:08 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:52:08 -0500
Subject: rpms/xfcalendar/devel xfcalendar.spec,1.3,1.4
Message-ID: <200503252052.j2PKq8K4012248@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12242

Modified Files:
	xfcalendar.spec 
Log Message:
lowercase Release



Index: xfcalendar.spec
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/devel/xfcalendar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfcalendar.spec	25 Mar 2005 18:48:30 -0000	1.3
+++ xfcalendar.spec	25 Mar 2005 20:52:06 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Time-managing application for Xfce4
 Name: xfcalendar
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfcalendar-4.2.1.tar.bz2
@@ -45,6 +45,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Remove unneeded la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:53:30 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:53:30 -0500
Subject: rpms/xfce4-appfinder/devel xfce4-appfinder.spec,1.2,1.3
Message-ID: <200503252053.j2PKrUZB012285@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12279

Modified Files:
	xfce4-appfinder.spec 
Log Message:
lowercase Release



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-appfinder.spec	21 Mar 2005 00:54:09 -0000	1.2
+++ xfce4-appfinder.spec	25 Mar 2005 20:53:28 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-appfinder-4.2.1.tar.bz2
@@ -40,6 +40,9 @@
 %{_datadir}/xfce4/doc/C/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - fix BuildReqs
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:54:35 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:54:35 -0500
Subject: rpms/xfce4-iconbox/devel xfce4-iconbox.spec,1.3,1.4
Message-ID: <200503252054.j2PKsZiG012326@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12319

Modified Files:
	xfce4-iconbox.spec 
Log Message:
lowercase Release



Index: xfce4-iconbox.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-iconbox/devel/xfce4-iconbox.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-iconbox.spec	25 Mar 2005 18:28:03 -0000	1.3
+++ xfce4-iconbox.spec	25 Mar 2005 20:54:33 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Icon box for the Xfce4 Desktop Environment
 Name: xfce4-iconbox
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-iconbox-4.2.1.tar.bz2
@@ -46,6 +46,9 @@
 %{_datadir}/icons/hicolor/*/*/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
 - Removed unneeded la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:55:40 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:55:40 -0500
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.3,1.4
Message-ID: <200503252055.j2PKte3m012368@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12359

Modified Files:
	xfce4-icon-theme.spec 
Log Message:
lowercase Release



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-icon-theme.spec	25 Mar 2005 18:17:56 -0000	1.3
+++ xfce4-icon-theme.spec	25 Mar 2005 20:55:38 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-icon-theme-4.2.1.tar.bz2
@@ -36,6 +36,9 @@
 %{_datadir}/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Added Obsoletes/Provides for xffm-icons
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:56:30 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:56:30 -0500
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec,1.3,1.4
Message-ID: <200503252056.j2PKuUAg012404@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12398

Modified Files:
	xfce4-mixer.spec 
Log Message:
lowercase Release



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-mixer.spec	25 Mar 2005 17:48:15 -0000	1.3
+++ xfce4-mixer.spec	25 Mar 2005 20:56:28 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-mixer-4.2.1.tar.bz2
@@ -46,6 +46,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-mixer.png
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Removed unneeded la files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 20:58:48 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 15:58:48 -0500
Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.3,1.4
Message-ID: <200503252058.j2PKwm2P012446@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12440

Modified Files:
	xfce4-panel.spec 
Log Message:
lowercase Release



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-panel.spec	25 Mar 2005 20:15:53 -0000	1.3
+++ xfce4-panel.spec	25 Mar 2005 20:58:46 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.2.1.1
-Release: 3.FC4
+Release: 4.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-panel-4.2.1.1.tar.bz2
@@ -68,6 +68,9 @@
 %{_includedir}/xfce4
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1.1-4.fc4
+- lowercase Release
+
 * Thu Mar 24 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1.1-3.FC4
 - Added htmlview patch
 - Removed unneeded la/a files



From fedora-extras-commits at redhat.com  Fri Mar 25 21:00:17 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:00:17 -0500
Subject: rpms/xfce4-session/devel xfce4-session.spec,1.3,1.4
Message-ID: <200503252100.j2PL0HSF012484@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12477

Modified Files:
	xfce4-session.spec 
Log Message:
lowercase Release



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-session.spec	24 Mar 2005 03:38:40 -0000	1.3
+++ xfce4-session.spec	25 Mar 2005 21:00:15 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-session-4.2.1.tar.bz2
@@ -84,6 +84,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Removed unneeded la/a files
 - Added version to requires in devel and engine subpackages



From fedora-extras-commits at redhat.com  Fri Mar 25 21:01:59 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:01:59 -0500
Subject: rpms/xfce4-systray/devel xfce4-systray.spec,1.4,1.5
Message-ID: <200503252101.j2PL1xAk013224@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13218

Modified Files:
	xfce4-systray.spec 
Log Message:
lowercase Release



Index: xfce4-systray.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systray/devel/xfce4-systray.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-systray.spec	24 Mar 2005 03:14:20 -0000	1.4
+++ xfce4-systray.spec	25 Mar 2005 21:01:57 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Systray for the Xfce4 Desktop Environment
 Name: xfce4-systray
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-systray-4.2.1.tar.bz2
@@ -41,6 +41,9 @@
 %{_libdir}/xfce4
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Removed unneeded la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:04:31 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:04:31 -0500
Subject: rpms/xfce4-toys/devel xfce4-toys.spec,1.3,1.4
Message-ID: <200503252104.j2PL4Vg9013365@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13359

Modified Files:
	xfce4-toys.spec 
Log Message:
lowercase Release



Index: xfce4-toys.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-toys/devel/xfce4-toys.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-toys.spec	23 Mar 2005 21:46:20 -0000	1.3
+++ xfce4-toys.spec	25 Mar 2005 21:04:29 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Various tools for Xfce4
 Name: xfce4-toys
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-toys-4.2.1.tar.bz2
@@ -46,6 +46,9 @@
 %{_datadir}/xfce4/tips/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at scrye.com> - 4.2.1-3.FC4
 - Removed uneeded la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:05:41 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:05:41 -0500
Subject: rpms/xfce4-trigger-launcher/devel xfce4-trigger-launcher.spec, 1.3,
	1.4
Message-ID: <200503252105.j2PL5fPp013402@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13396

Modified Files:
	xfce4-trigger-launcher.spec 
Log Message:
lowercase Release



Index: xfce4-trigger-launcher.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-trigger-launcher/devel/xfce4-trigger-launcher.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-trigger-launcher.spec	23 Mar 2005 21:41:40 -0000	1.3
+++ xfce4-trigger-launcher.spec	25 Mar 2005 21:05:39 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A panel plugin acting as a launcher with two states
 Name: xfce4-trigger-launcher
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-trigger-launcher-4.2.1.tar.bz2
@@ -42,6 +42,9 @@
 %{_libdir}/xfce4/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Removed uneeded la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:07:48 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:07:48 -0500
Subject: rpms/xfce-mcs-manager/devel xfce-mcs-manager.spec,1.2,1.3
Message-ID: <200503252107.j2PL7m4k013432@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13426

Modified Files:
	xfce-mcs-manager.spec 
Log Message:
lowercase Release



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/xfce-mcs-manager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce-mcs-manager.spec	20 Mar 2005 07:47:26 -0000	1.2
+++ xfce-mcs-manager.spec	25 Mar 2005 21:07:46 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-manager-4.2.1.tar.bz2
@@ -59,6 +59,9 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
 - remove stuff
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:08:54 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:08:54 -0500
Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins.spec,1.3,1.4
Message-ID: <200503252108.j2PL8smJ013471@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13465

Modified Files:
	xfce-mcs-plugins.spec 
Log Message:
lowercase Release



Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce-mcs-plugins.spec	23 Mar 2005 21:32:44 -0000	1.3
+++ xfce-mcs-plugins.spec	25 Mar 2005 21:08:52 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-plugins-4.2.1.tar.bz2
@@ -49,6 +49,9 @@
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release 
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Removed unneeded la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:10:03 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:10:03 -0500
Subject: rpms/xfce-utils/devel xfce-utils.spec,1.3,1.4
Message-ID: <200503252110.j2PLA3Dr013508@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13502

Modified Files:
	xfce-utils.spec 
Log Message:
lowercase Release



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce-utils.spec	23 Mar 2005 21:13:25 -0000	1.3
+++ xfce-utils.spec	25 Mar 2005 21:10:01 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-utils-4.2.1.tar.bz2
@@ -62,6 +62,9 @@
 %{xsessiondir}/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
 - Removed unneeded la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:11:02 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:11:02 -0500
Subject: rpms/xfdesktop/devel xfdesktop.spec,1.5,1.6
Message-ID: <200503252111.j2PLB2aN013547@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13541

Modified Files:
	xfdesktop.spec 
Log Message:
lowercase Release



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfdesktop.spec	23 Mar 2005 20:46:53 -0000	1.5
+++ xfdesktop.spec	25 Mar 2005 21:11:00 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz/xfdesktop-4.2.1.tar.bz2
@@ -63,6 +63,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
 - Removed unneeded a/la files
 - Rediffed xfdesktop-image patch against current version and applied



From fedora-extras-commits at redhat.com  Fri Mar 25 21:12:10 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:12:10 -0500
Subject: rpms/xffm/devel xffm.spec,1.7,1.8
Message-ID: <200503252112.j2PLCAkf013584@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13578

Modified Files:
	xffm.spec 
Log Message:
lowercase Release



Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xffm.spec	23 Mar 2005 16:40:59 -0000	1.7
+++ xffm.spec	25 Mar 2005 21:12:08 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Next generation filemanager and SMB network navigator for Xfce4
 Name: xffm
 Version: 4.2.1
-Release: 4.FC4
+Release: 5.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
@@ -67,6 +67,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-5.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.FC4
 - removed unneeded directories
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:13:16 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:13:16 -0500
Subject: rpms/xfprint/devel xfprint.spec,1.4,1.5
Message-ID: <200503252113.j2PLDGqZ013621@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13615

Modified Files:
	xfprint.spec 
Log Message:
lowercase Release



Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfprint.spec	22 Mar 2005 18:55:48 -0000	1.4
+++ xfprint.spec	25 Mar 2005 21:13:14 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: BSD
 URL: http://www.xfce.org
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfprint-4.2.1.tar.bz2
@@ -53,6 +53,9 @@
 %{_datadir}/icons/hicolor/*/*/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Tue Mar 22 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
 - Removed unneeded ldconfig and la/a files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:14:16 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:14:16 -0500
Subject: rpms/xfwm4/devel xfwm4.spec,1.4,1.5
Message-ID: <200503252114.j2PLEGn8013658@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13652

Modified Files:
	xfwm4.spec 
Log Message:
lowercase Release



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfwm4.spec	23 Mar 2005 20:20:50 -0000	1.4
+++ xfwm4.spec	25 Mar 2005 21:14:14 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.2.1
-Release: 3.FC4
+Release: 4.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2
@@ -58,6 +58,9 @@
 %{_datadir}/themes
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
+- lowercase Release
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
 - Removed unneeded a/la files
 



From fedora-extras-commits at redhat.com  Fri Mar 25 21:15:13 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:15:13 -0500
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec,1.3,1.4
Message-ID: <200503252115.j2PLFDg7013698@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13692

Modified Files:
	xfwm4-themes.spec 
Log Message:
lowercase Release



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/xfwm4-themes.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfwm4-themes.spec	20 Mar 2005 22:52:04 -0000	1.3
+++ xfwm4-themes.spec	25 Mar 2005 21:15:11 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
 Version: 4.2.1
-Release: 2.FC4
+Release: 3.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-themes-4.2.1.tar.bz2
@@ -35,6 +35,9 @@
 %{_datadir}/themes
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.fc4
+- lowercase Release
+
 * Sun Mar 20 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
 - Readded changelogs back in from core cvs
 



From bugs.michael at gmx.net  Fri Mar 25 21:18:21 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 25 Mar 2005 22:18:21 +0100
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.2,1.3
In-Reply-To: <200503251817.j2PIHwJI009407@cvs-int.fedora.redhat.com>
References: <200503251817.j2PIHwJI009407@cvs-int.fedora.redhat.com>
Message-ID: <20050325221821.228993bc.bugs.michael@gmx.net>

On Fri, 25 Mar 2005 13:17:58 -0500, Kevin Fenzi (kevin) wrote:

> Author: kevin
> 
> Update of /cvs/extras/rpms/xfce4-icon-theme/devel

> +Obsoletes: xffm-icons
> +Provides: xffm-icons

Obsoletes: xffm-icons <= %version-%release
Provides: xffm-icons = %version-%release

This is in the packaging guidelines somewhere, too, I think and makes it
easier to re-introduce a future xffm-icons package.



From kevin at scrye.com  Fri Mar 25 21:29:02 2005
From: kevin at scrye.com (Kevin Fenzi)
Date: Fri, 25 Mar 2005 14:29:02 -0700
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.2,1.3
References: <200503251817.j2PIHwJI009407@cvs-int.fedora.redhat.com>
	<20050325221821.228993bc.bugs.michael@gmx.net>
Message-ID: <20050325212906.218B3B8695@voldemort.scrye.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

>>>>> "Michael" == Michael Schwendt <bugs.michael at gmx.net> writes:

Michael> On Fri, 25 Mar 2005 13:17:58 -0500, Kevin Fenzi (kevin)
Michael> wrote:
>> Author: kevin
>> 
>> Update of /cvs/extras/rpms/xfce4-icon-theme/devel

>> +Obsoletes: xffm-icons +Provides: xffm-icons

Michael> Obsoletes: xffm-icons <= %version-%release Provides:
Michael> xffm-icons = %version-%release

Michael> This is in the packaging guidelines somewhere, too, I think
Michael> and makes it easier to re-introduce a future xffm-icons
Michael> package.

Makes sense. I will make that change. 

I don't see anything about Obsoletes/Provides on: 
http://fedoraproject.org/wiki/PackagingGuidelines

Or is there another packaging guidelines you are refering to?

kevin
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Processed by Mailcrypt 3.5.8 <http://mailcrypt.sourceforge.net/>

iD8DBQFCRIKh3imCezTjY0ERAvt3AJ0We8qTNODYUc3WZ0ymDdtvNUvbggCfb3rT
n/vl6JkwPJUmtHFdmtEMqLE=
=U4em
-----END PGP SIGNATURE-----



From fedora-extras-commits at redhat.com  Fri Mar 25 21:31:13 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 25 Mar 2005 16:31:13 -0500
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.4,1.5
Message-ID: <200503252131.j2PLVDW1013777@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13771

Modified Files:
	xfce4-icon-theme.spec 
Log Message:
Added version to Obsoletes/Provides xffm-icons



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-icon-theme.spec	25 Mar 2005 20:55:38 -0000	1.4
+++ xfce4-icon-theme.spec	25 Mar 2005 21:31:10 -0000	1.5
@@ -1,15 +1,15 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.2.1
-Release: 4.fc4
+Release: 5.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-icon-theme-4.2.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Obsoletes: xffm-icons
-Provides: xffm-icons
+Obsoletes: xffm-icons <= %{version}-%{release}
+Provides: xffm-icons = %{version}-%{release}
 
 %description
 Icon theme for Xfce 4 Desktop Environment.
@@ -36,6 +36,9 @@
 %{_datadir}/*
 
 %changelog
+* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> 4.2.1-5.fc4
+- add explicit version/release to obsoletes/provides
+
 * Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
 - lowercase Release
 



From bugs.michael at gmx.net  Fri Mar 25 21:46:19 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Fri, 25 Mar 2005 22:46:19 +0100
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.2,1.3
In-Reply-To: <20050325212906.218B3B8695@voldemort.scrye.com>
References: <200503251817.j2PIHwJI009407@cvs-int.fedora.redhat.com>
	<20050325221821.228993bc.bugs.michael@gmx.net>
	<20050325212906.218B3B8695@voldemort.scrye.com>
Message-ID: <20050325224619.5d8045c6.bugs.michael@gmx.net>

On Fri, 25 Mar 2005 14:29:02 -0700, Kevin Fenzi wrote:

> I don't see anything about Obsoletes/Provides on: 
> http://fedoraproject.org/wiki/PackagingGuidelines
> 
> Or is there another packaging guidelines you are refering to?

Found it:

http://fedoraproject.org/wiki/PackageNamingGuidelines#head-2c81f7aaf6772e9816f9cf8c5eb62efac828e902



From fedora-extras-commits at redhat.com  Fri Mar 25 22:49:06 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Fri, 25 Mar 2005 17:49:06 -0500
Subject: rpms/pybliographer/FC-3 pybliographer.spec,1.4,1.5
Message-ID: <200503252249.j2PMn6Q2014880@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14871/FC-3

Modified Files:
	pybliographer.spec 
Log Message:
add patch for gnome help display


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-3/pybliographer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pybliographer.spec	22 Feb 2005 22:46:02 -0000	1.4
+++ pybliographer.spec	25 Mar 2005 22:49:04 -0000	1.5
@@ -1,26 +1,27 @@
 Summary: A framework for working with bibliographic databases.
 Name: pybliographer
 Version: 1.2.6.2
-Release: 1
+Release: 2
 Epoch: 0
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.6.2.tar.gz
+Patch: gnome-help.patch
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 BuildRequires: pygtk2-libglade >= 0:2.0.0
-BuildRequires: gnome-python2 >= 0:2.0.0
-BuildRequires: gnome-python2-gconf >= 0:2.0.0
+BuildRequires: gnome-python2 >= 0:2.0.3
+BuildRequires: gnome-python2-gconf >= 0:2.0.3
 BuildRequires: python-bibtex >= 0:1.1.93.1
 BuildRequires: gettext
 BuildRequires: scrollkeeper
 BuildRequires: desktop-file-utils
 
 Requires: pygtk2-libglade >= 0:2.0.0
-Requires: gnome-python2 >= 0:2.0.0
-Requires: gnome-python2-gconf >= 0:2.0.0
+Requires: gnome-python2 >= 0:2.0.3
+Requires: gnome-python2-gconf >= 0:2.0.3
 Requires: python-bibtex >= 0:1.1.93.1
 
 Requires(post): scrollkeeper
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure
@@ -154,6 +156,10 @@
 
 
 %changelog
+* Fri Mar 25 2005 Zoltan Kota <z.kota at gmx.net> - 0:1.2.6.2-2
+- add patch for gnome help display
+- update gnome-python2 requirements
+
 * Tue Feb 22 2005 Zoltan Kota <z.kota at gmx.net> - 0:1.2.6.2-1
 - update to 1.2.6.2
 



From fedora-extras-commits at redhat.com  Fri Mar 25 22:49:06 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Fri, 25 Mar 2005 17:49:06 -0500
Subject: rpms/pybliographer/devel pybliographer.spec,1.6,1.7
Message-ID: <200503252249.j2PMn6GK014884@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14871/devel

Modified Files:
	pybliographer.spec 
Log Message:
add patch for gnome help display


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pybliographer.spec	5 Mar 2005 21:10:24 -0000	1.6
+++ pybliographer.spec	25 Mar 2005 22:49:04 -0000	1.7
@@ -1,25 +1,26 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
 Version: 1.2.6.2
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.6.2.tar.gz
+Patch: gnome-help.patch
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 BuildRequires: pygtk2-libglade >= 2.0.0
-BuildRequires: gnome-python2 >= 2.0.0
-BuildRequires: gnome-python2-gconf >= 2.0.0
+BuildRequires: gnome-python2 >= 2.0.3
+BuildRequires: gnome-python2-gconf >= 2.0.3
 BuildRequires: python-bibtex >= 1.1.93.1
 BuildRequires: gettext
 BuildRequires: scrollkeeper
 BuildRequires: desktop-file-utils
 
 Requires: pygtk2-libglade >= 2.0.0
-Requires: gnome-python2 >= 2.0.0
-Requires: gnome-python2-gconf >= 2.0.0
+Requires: gnome-python2 >= 2.0.3
+Requires: gnome-python2-gconf >= 2.0.3
 Requires: python-bibtex >= 1.1.93.1
 
 Requires(post): scrollkeeper
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure
@@ -153,6 +155,10 @@
 
 
 %changelog
+* Fri Mar 25 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.6.2-2
+- add patch for gnome help display
+- update gnome-python2 requirements
+
 * Tue Feb 22 2005 Zoltan Kota <z.kota at gmx.net> - 0:1.2.6.2-1
 - update to 1.2.6.2
 



From fedora-extras-commits at redhat.com  Fri Mar 25 23:07:05 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Fri, 25 Mar 2005 18:07:05 -0500
Subject: rpms/pybliographer/FC-3 gnome-help.patch,NONE,1.1
Message-ID: <200503252307.j2PN75ja015803@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15794/FC-3

Added Files:
	gnome-help.patch 
Log Message:
patch file commit

gnome-help.patch:

--- NEW FILE gnome-help.patch ---
--- pybliographer-1.2.6.2-orig/Pyblio/GnomeUI/Document.py	2005-02-21 18:50:41.000000000 +0100
+++ pybliographer-1.2.6.2/Pyblio/GnomeUI/Document.py	2005-03-24 23:45:06.359269808 +0100
@@ -800,7 +800,7 @@
         import gobject
 
         try:
-            gnome.help_display ('pybliographer', 'getting-started')
+            gnome.help_display ('pybliographer', None)
             
         except gobject.GError, msg:
             self.w.error (_("Can't display documentation:\n%s") % msg)



From fedora-extras-commits at redhat.com  Fri Mar 25 23:07:05 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Fri, 25 Mar 2005 18:07:05 -0500
Subject: rpms/pybliographer/devel gnome-help.patch,NONE,1.1
Message-ID: <200503252307.j2PN75Vi015808@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15794/devel

Added Files:
	gnome-help.patch 
Log Message:
patch file commit

gnome-help.patch:

--- NEW FILE gnome-help.patch ---
--- pybliographer-1.2.6.2-orig/Pyblio/GnomeUI/Document.py	2005-02-21 18:50:41.000000000 +0100
+++ pybliographer-1.2.6.2/Pyblio/GnomeUI/Document.py	2005-03-24 23:45:06.359269808 +0100
@@ -800,7 +800,7 @@
         import gobject
 
         try:
-            gnome.help_display ('pybliographer', 'getting-started')
+            gnome.help_display ('pybliographer', None)
             
         except gobject.GError, msg:
             self.w.error (_("Can't display documentation:\n%s") % msg)



From steve at kspei.com  Sat Mar 26 01:53:27 2005
From: steve at kspei.com (Steven Pritchard)
Date: Fri, 25 Mar 2005 19:53:27 -0600
Subject: devel/jabberd jabberd.spec,1.4,1.5
In-Reply-To: <200503251939.j2PJdlcF010802@cvs-int.fedora.redhat.com>
References: <200503251939.j2PJdlcF010802@cvs-int.fedora.redhat.com>
Message-ID: <20050326015327.GA30356@osiris.silug.org>

Not really important, but...

On Fri, Mar 25, 2005 at 02:39:47PM -0500, Adrian Reber wrote:
> +%{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g" configure

You can shorten that a lot.

  %{__sed} -i -e "s,sysconfdir=\"\$sysconfdir/jabberd\",#&,g" configure

Steve
-- 
Steven Pritchard - K&S Pritchard Enterprises, Inc.
Email: steve at kspei.com             http://www.kspei.com/
Phone: (618)398-3000               Mobile: (618)567-7320



From fedora-extras-commits at redhat.com  Sat Mar 26 08:47:55 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 26 Mar 2005 03:47:55 -0500
Subject: devel/jabberd jabberd.spec,1.5,1.6
Message-ID: <200503260847.j2Q8lt8O024776@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24759

Modified Files:
	jabberd.spec 
Log Message:
better sed magic (thanks Steve)



Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jabberd.spec	25 Mar 2005 19:39:45 -0000	1.5
+++ jabberd.spec	26 Mar 2005 08:47:53 -0000	1.6
@@ -37,7 +37,7 @@
 %build
 %define _sysconfdir /etc/jabberd
 %define sysconfdir /etc/jabberd
-%{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#sysconfdir=\"\$sysconfdir\/jabberd\",g" configure
+%{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#&,g" configure
 
 %configure \
 	%{!?_without_pam:--enable-pam} \



From fedora-extras-commits at redhat.com  Sat Mar 26 14:52:23 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 26 Mar 2005 09:52:23 -0500
Subject: rpms/freeciv/devel freeciv.spec,1.2,1.3
Message-ID: <200503261452.j2QEqNg1031003@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30996/devel

Modified Files:
	freeciv.spec 
Log Message:
minor spec file changes


Index: freeciv.spec
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freeciv.spec	24 Mar 2005 01:39:40 -0000	1.2
+++ freeciv.spec	26 Mar 2005 14:52:21 -0000	1.3
@@ -1,12 +1,9 @@
 %define desktop_file 1
-%if %{desktop_file}
-%define desktop_file_utils_version 0.2.93
-%endif
 
 Name:		freeciv
 Version:	1.14.2
-Release:	5
-Summary: 	The Freeciv multi-player strategy game
+Release:	6
+Summary:	The Freeciv multi-player strategy game
 
 Group:		Amusements/Games
 License:	GPL
@@ -15,15 +12,15 @@
 Source1:	freeciv-desktop.tar.bz2
 Source2:	http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz
 Source3:	NEWS-1.14.2
-Patch1:         freeciv-desktop.patch
+Patch1:		freeciv-desktop.patch
 Patch2:		freeciv-desktop-xauth.patch
 Patch3:		freeciv-1.13.0-aifill.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildPrereq:	gtk2-devel >= 2.0.5 imlib-devel
+BuildRequires:	gtk2-devel
+BuildRequires:	imlib-devel
 %if %{desktop_file}
-Requires: 	/usr/bin/desktop-file-install
-BuildPrereq: 	desktop-file-utils >= %{desktop_file_utils_version}
+BuildRequires:	desktop-file-utils
 %endif
 
 %description
@@ -53,24 +50,24 @@
 
 %makeinstall
 chmod +x desktop/*wrapper
-cp desktop/*wrapper $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Games $RPM_BUILD_ROOT/usr/share/pixmaps
+cp desktop/*wrapper $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Games $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp desktop/*.desktop $RPM_BUILD_ROOT/etc/X11/applnk/Games
 
 %if %{desktop_file}
-mkdir -p $RPM_BUILD_ROOT/usr/share/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor net \
-        --dir $RPM_BUILD_ROOT/usr/share/applications \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
         --add-category "Application;Game;X-Fedora" \
         $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-client.desktop
 desktop-file-install --vendor net \
-        --dir $RPM_BUILD_ROOT/usr/share/applications \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
         --add-category "Application;Game;X-Fedora" \
         $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-server.desktop
 rm $RPM_BUILD_ROOT/etc/X11/applnk/Games/*.desktop
 %endif
 
-cp desktop/*.xpm $RPM_BUILD_ROOT/usr/share/pixmaps
+cp desktop/*.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
 pushd client
 perl -p -i -e "s/CFLAGS = $RPM_OPT_FLAGS/CFLAGS = $RPM_OPT_FLAGS \`gtk-config --cflags\`/" gui-gtk/Makefile
@@ -81,18 +78,18 @@
   perl -p -i -e "s|-lXaw3d|\`glib-config --libs\` \`gtk-config --libs\` \`imlib-config --libs-gdk\`|" Makefile
 done
 make
-cp civclient $RPM_BUILD_ROOT/usr/bin/civclient-gtk
+cp civclient $RPM_BUILD_ROOT%{_bindir}/civclient-gtk
 popd
 
-/usr/bin/install -c civ  $RPM_BUILD_ROOT/usr/bin/civ
+/usr/bin/install -c civ  $RPM_BUILD_ROOT%{_bindir}/civ
 
 /usr/bin/install -d $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults
-mv $RPM_BUILD_ROOT/usr/share/freeciv/Freeciv $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/Freeciv
+mv $RPM_BUILD_ROOT%{_datadir}/freeciv/Freeciv $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/Freeciv
 
-mv $RPM_BUILD_ROOT/usr/bin/civclient $RPM_BUILD_ROOT/usr/bin/civclient-xaw
-ln -sf civclient-gtk $RPM_BUILD_ROOT/usr/bin/civclient
+mv $RPM_BUILD_ROOT%{_bindata}/civclient $RPM_BUILD_ROOT{%_bindir}/civclient-xaw
+ln -sf civclient-gtk $RPM_BUILD_ROOT%{_bindir}/civclient
 
-(cd $RPM_BUILD_ROOT/usr/share/freeciv; tar xzf %{SOURCE2}; )
+(cd $RPM_BUILD_ROOT%{_datadir}/freeciv; tar xzf %{SOURCE2}; )
 
 %find_lang %name
 
@@ -102,7 +99,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %if %{desktop_file}
-%config /usr/share/applications/*
+%config %{_datadir}/applications/*
 %doc NEWS*
 %else
 %config /etc/X11/applnk/Games/*
@@ -114,6 +111,11 @@
 
 
 %changelog
+* Sat Mar 26 2005 Brian Pepple <bdpepple at ameritech.net> - 1.14.2-6
+- Added more macros.
+- Replaced BuildPrereq with BuildRequires.
+- Drop version of gtk2-devel, since FC3 & later meet minimum needed.
+
 * Wed Mar 23 2005 Brian Pepple <bdpepple at ameritech.net> - 1.14.2-5
 - Changed X-Red-Hat-Extra to X-Fedora.
 - Added URL.



From fedora-extras-commits at redhat.com  Sat Mar 26 15:54:39 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 26 Mar 2005 10:54:39 -0500
Subject: rpms/freeciv/devel freeciv.spec,1.3,1.4
Message-ID: <200503261554.j2QFsd4S032063@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32056/devel

Modified Files:
	freeciv.spec 
Log Message:
fix typos


Index: freeciv.spec
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- freeciv.spec	26 Mar 2005 14:52:21 -0000	1.3
+++ freeciv.spec	26 Mar 2005 15:54:37 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		freeciv
 Version:	1.14.2
-Release:	6
+Release:	7
 Summary:	The Freeciv multi-player strategy game
 
 Group:		Amusements/Games
@@ -86,7 +86,7 @@
 /usr/bin/install -d $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults
 mv $RPM_BUILD_ROOT%{_datadir}/freeciv/Freeciv $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/Freeciv
 
-mv $RPM_BUILD_ROOT%{_bindata}/civclient $RPM_BUILD_ROOT{%_bindir}/civclient-xaw
+mv $RPM_BUILD_ROOT%{_bindir}/civclient $RPM_BUILD_ROOT%{_bindir}/civclient-xaw
 ln -sf civclient-gtk $RPM_BUILD_ROOT%{_bindir}/civclient
 
 (cd $RPM_BUILD_ROOT%{_datadir}/freeciv; tar xzf %{SOURCE2}; )
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Sat Mar 26 2005 Brian Pepple <bdpepple at ameritech.net> - 1.14.2-7
+- Fixed typos.
+
 * Sat Mar 26 2005 Brian Pepple <bdpepple at ameritech.net> - 1.14.2-6
 - Added more macros.
 - Replaced BuildPrereq with BuildRequires.



From fedora-extras-commits at redhat.com  Sat Mar 26 17:35:03 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Sat, 26 Mar 2005 12:35:03 -0500
Subject: rpms/ktrack/FC-3 ktrack.spec,1.8,1.9
Message-ID: <200503261735.j2QHZ3S3001436@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/ktrack/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1425

Modified Files:
	ktrack.spec 
Log Message:

add qt-devel to BuildRequires



Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/rpms/ktrack/FC-3/ktrack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ktrack.spec	21 Mar 2005 16:18:18 -0000	1.8
+++ ktrack.spec	26 Mar 2005 17:35:01 -0000	1.9
@@ -7,6 +7,7 @@
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
 Patch: ktrack-headers.patch
 BuildRequires: desktop-file-utils kdelibs-devel >= 3.3 hamlib-devel
+BuildRequires: qt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description



From fedora-extras-commits at redhat.com  Sat Mar 26 18:22:51 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 26 Mar 2005 13:22:51 -0500
Subject: devel/ocaml .cvsignore, 1.3, 1.4 ocaml.spec, 1.10, 1.11 sources, 1.3,
	1.4
Message-ID: <200503261822.j2QIMp76002763@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/devel/ocaml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2757

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/ocaml/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:49:55 -0000	1.3
+++ .cvsignore	26 Mar 2005 18:22:49 -0000	1.4
@@ -1,4 +1,4 @@
-ocaml-3.08.2.tar.bz2
+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


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/devel/ocaml/ocaml.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ocaml.spec	3 Mar 2005 23:53:13 -0000	1.10
+++ ocaml.spec	26 Mar 2005 18:22:49 -0000	1.11
@@ -1,12 +1,12 @@
 Name:		ocaml
-Version:	3.08.2
-Release:	2
+Version:	3.08.3
+Release:	1
 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.2.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.3.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
@@ -16,7 +16,7 @@
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
 Requires(post):	/sbin/install-info
-Requires(preun):	/sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 Objective Caml is a high-level, strongly-typed, functional and
@@ -176,6 +176,9 @@
 %doc emacs/README
 
 %changelog
+* Sat Mar 26 2005 Gerard Milmeister <gemi at bluewin.ch> - 3.08.3-1
+- New Version 3.08.3
+
 * Sat Feb 12 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:3.08.2-2
 - Added patch for removing rpath from shared libs
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/ocaml/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:49:55 -0000	1.3
+++ sources	26 Mar 2005 18:22:49 -0000	1.4
@@ -1,4 +1,4 @@
-608319707707cf4ac3f7a13eb63260ad  ocaml-3.08.2.tar.bz2
+8277bb1537051fe5151dc31c350d64cd  ocaml-3.08.3.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



From bugs.michael at gmx.net  Sat Mar 26 18:24:14 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Sat, 26 Mar 2005 19:24:14 +0100
Subject: rpms/ktrack/FC-3 ktrack.spec,1.8,1.9
In-Reply-To: <200503261735.j2QHZ3S3001436@cvs-int.fedora.redhat.com>
References: <200503261735.j2QHZ3S3001436@cvs-int.fedora.redhat.com>
Message-ID: <20050326192414.3b79f6b6.bugs.michael@gmx.net>

On Sat, 26 Mar 2005 12:35:03 -0500, Seth Vidal (skvidal) wrote:

> Author: skvidal
> 
> Update of /cvs/extras/rpms/ktrack/FC-3
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1425
> 
> Modified Files:
> 	ktrack.spec 
> Log Message:
> 
> add qt-devel to BuildRequires

Why?
 
> Index: ktrack.spec
> ===================================================================
> RCS file: /cvs/extras/rpms/ktrack/FC-3/ktrack.spec,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -r1.8 -r1.9
> --- ktrack.spec	21 Mar 2005 16:18:18 -0000	1.8
> +++ ktrack.spec	26 Mar 2005 17:35:01 -0000	1.9
> @@ -7,6 +7,7 @@
>  Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
>  Patch: ktrack-headers.patch
>  BuildRequires: desktop-file-utils kdelibs-devel >= 3.3 hamlib-devel
> +BuildRequires: qt-devel

$ rpm -qpR kdelibs-devel-3.3.1-2.6.FC3.i386.rpm | grep qt-devel
qt-devel >= 1:3.3.3



From skvidal at phy.duke.edu  Sat Mar 26 18:27:56 2005
From: skvidal at phy.duke.edu (seth vidal)
Date: Sat, 26 Mar 2005 13:27:56 -0500
Subject: rpms/ktrack/FC-3 ktrack.spec,1.8,1.9
In-Reply-To: <20050326192414.3b79f6b6.bugs.michael@gmx.net>
References: <200503261735.j2QHZ3S3001436@cvs-int.fedora.redhat.com>
	<20050326192414.3b79f6b6.bugs.michael@gmx.net>
Message-ID: <1111861677.26631.37.camel@cutter>

On Sat, 2005-03-26 at 19:24 +0100, Michael Schwendt wrote:
> On Sat, 26 Mar 2005 12:35:03 -0500, Seth Vidal (skvidal) wrote:
> 
> > Author: skvidal
> > 
> > Update of /cvs/extras/rpms/ktrack/FC-3
> > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1425
> > 
> > Modified Files:
> > 	ktrack.spec 
> > Log Message:
> > 
> > add qt-devel to BuildRequires
> 
> Why?

I thought it was the right one needed. I was wrong. I was going to
change it back and mark the package as broken b/c it's not looking
in /usr/lib64 properly.

-sv




From fedora-extras-commits at redhat.com  Sat Mar 26 18:41:38 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 26 Mar 2005 13:41:38 -0500
Subject: devel/kphone kphone.spec,1.10,1.11
Message-ID: <200503261841.j2QIfcsO002912@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2906

Modified Files:
	kphone.spec 
Log Message:
Added Network category to desktop entry


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kphone.spec	24 Mar 2005 01:57:46 -0000	1.10
+++ kphone.spec	26 Mar 2005 18:41:36 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        10
+Release:        11
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -39,6 +39,7 @@
   --add-category X-Fedora \
   --add-category Application \
   --add-category Internet \
+  --add-category Network \
   --add-category Telephony \
   --add-category Qt \
   %{SOURCE1}
@@ -55,6 +56,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Mar 26 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-11
+- Added Network category to desktop entry
+
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-10
 - First attempt to get it working properly on PPC
 



From fedora-extras-commits at redhat.com  Sat Mar 26 19:24:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 26 Mar 2005 14:24:57 -0500
Subject: devel/ktrack ktrack.spec,1.8,1.9
Message-ID: <200503261924.j2QJOv33003902@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3886/ktrack

Modified Files:
	ktrack.spec 
Log Message:
Make desktop vendor lower-case.


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ktrack.spec	21 Mar 2005 16:18:18 -0000	1.8
+++ ktrack.spec	26 Mar 2005 19:24:55 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 8.rc1
+Release: 9.rc1
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -21,13 +21,14 @@
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-%configure --disable-rpath
+%configure --disable-rpath \
+    --with-qt-libraries=${QTDIR}/lib --with-qt-includes=${QTDIR}/include
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-desktop-file-install --vendor=Fedora \
+desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
   --add-category Application \
@@ -53,11 +54,15 @@
 %{_datadir}/icons/locolor/32x32/apps/ktrack.png
 %{_datadir}/locale/de/LC_MESSAGES/ktrack.mo
 %{_datadir}/locale/fr/LC_MESSAGES/ktrack.mo
-%{_datadir}/applications/Fedora-ktrack.desktop
+%{_datadir}/applications/fedora-ktrack.desktop
 %{_datadir}/pixmaps/ktrack.png
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Sat Mar 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.3.0-9.rc1
+- Pass Qt library/header location to configure script to work around
+  broken Qt detection on x86_64.
+
 * Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-8.rc1
 - Use $QTDIR instead of hard-coding paths
 



From fedora-extras-commits at redhat.com  Sat Mar 26 19:24:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 26 Mar 2005 14:24:57 -0500
Subject: devel/leafpad leafpad.spec,1.5,1.6
Message-ID: <200503261924.j2QJOvrV003906@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/leafpad
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3886/leafpad

Modified Files:
	leafpad.spec 
Log Message:
Make desktop vendor lower-case.


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/devel/leafpad/leafpad.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- leafpad.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ leafpad.spec	26 Mar 2005 19:24:55 -0000	1.6
@@ -35,7 +35,7 @@
 cat >> leafpad.desktop << EOF
 StartupNotify=true
 EOF
-desktop-file-install --vendor=Fedora \
+desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
   --add-category Application \
@@ -56,7 +56,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/leafpad
-%{_datadir}/applications/Fedora-leafpad.desktop
+%{_datadir}/applications/fedora-leafpad.desktop
 %{_datadir}/locale/*/LC_MESSAGES/leafpad.mo
 %{_datadir}/pixmaps/leafpad.png
 



From fedora-extras-commits at redhat.com  Sat Mar 26 19:24:57 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 26 Mar 2005 14:24:57 -0500
Subject: devel/kphone kphone.spec,1.11,1.12
Message-ID: <200503261924.j2QJOvb0003899@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/kphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3886/kphone

Modified Files:
	kphone.spec 
Log Message:
Make desktop vendor lower-case.


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/devel/kphone/kphone.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kphone.spec	26 Mar 2005 18:41:36 -0000	1.11
+++ kphone.spec	26 Mar 2005 19:24:55 -0000	1.12
@@ -34,7 +34,7 @@
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 install -D -m 0644 icons/large-kphone.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kphone.png
-desktop-file-install --vendor=Fedora \
+desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
   --add-category Application \



From bugs.michael at gmx.net  Sat Mar 26 19:25:40 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Sat, 26 Mar 2005 20:25:40 +0100
Subject: rpms/ktrack/FC-3 ktrack.spec,1.8,1.9
In-Reply-To: <1111861677.26631.37.camel@cutter>
References: <200503261735.j2QHZ3S3001436@cvs-int.fedora.redhat.com>
	<20050326192414.3b79f6b6.bugs.michael@gmx.net>
	<1111861677.26631.37.camel@cutter>
Message-ID: <20050326202540.77da07d7.bugs.michael@gmx.net>

On Sat, 26 Mar 2005 13:27:56 -0500, seth vidal wrote:

> On Sat, 2005-03-26 at 19:24 +0100, Michael Schwendt wrote:
> > On Sat, 26 Mar 2005 12:35:03 -0500, Seth Vidal (skvidal) wrote:
> > 
> > > Author: skvidal
> > > 
> > > Update of /cvs/extras/rpms/ktrack/FC-3
> > > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1425
> > > 
> > > Modified Files:
> > > 	ktrack.spec 
> > > Log Message:
> > > 
> > > add qt-devel to BuildRequires
> > 
> > Why?
> 
> I thought it was the right one needed. I was wrong. I was going to
> change it back and mark the package as broken b/c it's not looking
> in /usr/lib64 properly.

Ah, I see. I've committed a work-around. ktrack appends kdelibsuff='64' in
other than the needed place and therefore looks in
/usr/lib64/qt-3.3.3/lib64, which doesn't exist.



From fedora-extras-commits at redhat.com  Sat Mar 26 19:28:04 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 26 Mar 2005 14:28:04 -0500
Subject: rpms/ocaml/FC-3 .cvsignore, 1.3, 1.4 ocaml.spec, 1.9, 1.10 sources,
	1.3, 1.4
Message-ID: <200503261928.j2QJS4SS003988@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3982

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
New Version 3.08.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:49:55 -0000	1.3
+++ .cvsignore	26 Mar 2005 19:28:02 -0000	1.4
@@ -1,4 +1,4 @@
-ocaml-3.08.2.tar.bz2
+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


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/ocaml.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ocaml.spec	12 Feb 2005 16:39:53 -0000	1.9
+++ ocaml.spec	26 Mar 2005 19:28:02 -0000	1.10
@@ -1,22 +1,22 @@
-Name: 		ocaml
-Version: 	3.08.2
-Release:	2
-Epoch:		0
-Summary: 	The Objective Caml compiler and programming environment
+Name:		ocaml
+Version:	3.08.3
+Release:	1
+Summary:	Objective Caml compiler and programming environment
 
-Group: 		Development/Languages
-License: 	QPL/LGPL
+Group:		Development/Languages
+License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0: 	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.2.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
-Patch:	 	ocaml-rpath.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.3.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
+Patch:		ocaml-rpath.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
-Requires(post,preun): /sbin/install-info
+Requires(post):	/sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 Objective Caml is a high-level, strongly-typed, functional and
@@ -30,7 +30,7 @@
 %package -n labltk
 Group:		Development/Languages
 Summary:	Tk bindings for Objective Caml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 
 %description -n labltk
 A library for interfacing Objective Caml with the scripting language
@@ -38,8 +38,8 @@
 
 %package -n camlp4
 Group:		Development/Languages
-Summary:	A Pre-Processor-Pretty-Printer for OCaml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Summary:	Pre-Processor-Pretty-Printer for OCaml
+Requires:	ocaml = %{version}-%{release}
 
 %description -n camlp4
 Camlp4 is a Pre-Processor-Pretty-Printer for OCaml, parsing a source
@@ -48,7 +48,7 @@
 %package ocamldoc
 Group:		Development/Languages
 Summary:	Documentation generator for OCaml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 
 %description ocamldoc
 Documentation generator for Objective Caml.
@@ -56,7 +56,7 @@
 %package emacs
 Group:		Development/Languages
 Summary:	Emacs mode for Objective Caml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 Requires:	emacs
 
 %description emacs
@@ -65,7 +65,7 @@
 %package docs
 Group:		Development/Languages
 Summary:	Documentation for OCaml
-Requires:	ocaml = %{epoch}:%{version}-%{release}
+Requires:	ocaml = %{version}-%{release}
 
 %description docs
 Documentation for Objective Caml.
@@ -113,7 +113,7 @@
     %{_infodir}/dir 2>/dev/null || :
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 fi
 
@@ -176,6 +176,9 @@
 %doc emacs/README
 
 %changelog
+* Sat Mar 26 2005 Gerard Milmeister <gemi at bluewin.ch> - 3.08.3-1
+- New Version 3.08.3
+
 * Sat Feb 12 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:3.08.2-2
 - Added patch for removing rpath from shared libs
 
@@ -183,7 +186,7 @@
 - New Version 3.08.2
 
 * Thu Dec 30 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:3.07-6
-- add -x11lib %%{_prefix}/X11R6/%%{_lib} to configure; fixes labltk build 
+- add -x11lib %%{_prefix}/X11R6/%%{_lib} to configure; fixes labltk build
   on x86_64
 
 * Tue Dec  2 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:3.07-0.fdr.5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:49:55 -0000	1.3
+++ sources	26 Mar 2005 19:28:02 -0000	1.4
@@ -1,4 +1,4 @@
-608319707707cf4ac3f7a13eb63260ad  ocaml-3.08.2.tar.bz2
+8277bb1537051fe5151dc31c350d64cd  ocaml-3.08.3.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



From fedora-extras-commits at redhat.com  Sun Mar 27 09:01:20 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:01:20 -0500
Subject: rpms/drscheme - New directory
Message-ID: <200503270901.j2R91Ku2018195@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18182/drscheme

Log Message:
Directory /cvs/extras/rpms/drscheme added to the repository




From fedora-extras-commits at redhat.com  Sun Mar 27 09:01:20 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:01:20 -0500
Subject: rpms/drscheme/devel - New directory
Message-ID: <200503270901.j2R91KCF018198@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18182/drscheme/devel

Log Message:
Directory /cvs/extras/rpms/drscheme/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Mar 27 09:01:43 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:01:43 -0500
Subject: rpms/drscheme Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503270901.j2R91hY2018278@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18263

Added Files:
	Makefile import.log 
Log Message:
Setup of module drscheme


--- NEW FILE Makefile ---
# Top level Makefile for module drscheme
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 27 09:01:43 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:01:43 -0500
Subject: rpms/drscheme/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503270901.j2R91h6b018281@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18263/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module drscheme


--- 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 Mar 27 09:03:37 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:03:37 -0500
Subject: rpms/drscheme/devel drscheme.png, NONE, 1.1 drscheme.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200503270903.j2R93bWL018773@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18753/devel

Modified Files:
	.cvsignore sources 
Added Files:
	drscheme.png drscheme.spec 
Log Message:
auto-import drscheme-299.100-1 on branch devel from drscheme-299.100-1.src.rpm


--- NEW FILE drscheme.spec ---
Name:           drscheme
Version:        299.100
Release:        1
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/299.100/plt/plt-299.100-src-unix.tgz
Source1:	drscheme.png
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel
BuildRequires:	desktop-file-utils
Obsoletes:	plt
Provides:	plt-scheme, mzscheme, mred, mrflow


%description
DrScheme is an interactive, integrated, graphical programming
environment for the MzScheme programming language, and the MrEd
windowing toolbox.

DrScheme provides source highlighting for syntax and run-time errors,
support for multiple language levels, an algebraic stepper, objects,
modules, a GUI library, TCP/IP, and much more. It includes an
extensive, hyper-linked help system called Help Desk, available from
the Help menu.

You can enhance DrScheme with many add-ons, including MrFlow, a static
debugger.

MzScheme is R5RS-compliant, including the full numerical tower. It
also provides threads (on all platforms), exceptions, modules,
class-based objects, regular-expression matching, TCP/IP, and more.

MrEd provides a windowing toolbox for creating windows and menus; a
drawing toolbox for drawing to windows, bitmaps, and printer devices;
and an editor toolbox for creating multimedia editors.

%prep
%setup -q -n plt

%build
cd src
%configure --enable-gl --enable-xrender --disable-xft
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/plt
(cd src; make install prefix=$RPM_BUILD_ROOT%{_libdir}/plt)
(cd $RPM_BUILD_ROOT%{_libdir}/plt/bin; ./setup-plt)

mkdir -p $RPM_BUILD_ROOT%{_bindir}
for i in $RPM_BUILD_ROOT%{_libdir}/plt/bin/{drscheme,help-desk,mzc,setup-plt,tex2page}
do
    perl -pi -e "s|PLTHOME=.*$|PLTHOME=/usr/lib/plt|" $i
done
(
   cd $RPM_BUILD_ROOT%{_bindir}
   ln -sf ../lib/plt/bin/{drscheme,mred,mzc,mzscheme} .
)
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
cp -f $RPM_BUILD_ROOT%{_libdir}/plt/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man
rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes
rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/install

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps

cat > drscheme.desktop <<EOF
[Desktop Entry]
Name=DrScheme
GenericName=Scheme programming
Comment=Programming environment for the Scheme programming language
Exec=drscheme
Terminal=false
Icon=drscheme.png
Type=Application
Encoding=UTF-8
X-Desktop-File-Install-Version=0.4
EOF

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora                     \
        --add-category X-Fedora                          \
        --add-category Application                       \
        --add-category Development                       \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications    \
        drscheme.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc notes/*
%{_bindir}/*
%{_libdir}/plt
%{_mandir}/*/*
%{_datadir}/pixmaps/*
%{_datadir}/applications/*

%changelog
* Sun Mar 27 2005 Gerard Milmeister <gemi at bluewin.ch> - 299.100-1
- New Version 299.100

* Sat Mar 26 2005 Gerard Milmeister <gemi at bluewin.ch> - 209-1
- Renamed package from plt to drscheme

* Sat Dec 18 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:209-0.fdr.1
- New Version 209

* Sat Nov 13 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:208-0.fdr.1
- New Version 208
- Added desktop file
- Added icon

* Sun Nov  9 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:205-0.fdr.1
- First Fedora release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/drscheme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Mar 2005 09:01:41 -0000	1.1
+++ .cvsignore	27 Mar 2005 09:03:35 -0000	1.2
@@ -0,0 +1 @@
+plt-299.100-src-unix.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/drscheme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Mar 2005 09:01:41 -0000	1.1
+++ sources	27 Mar 2005 09:03:35 -0000	1.2
@@ -0,0 +1 @@
+12186ba09947d9ebc3988e29de4ab104  plt-299.100-src-unix.tgz



From fedora-extras-commits at redhat.com  Sun Mar 27 09:03:37 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:03:37 -0500
Subject: rpms/drscheme import.log,1.1,1.2
Message-ID: <200503270903.j2R93bBP018772@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18753

Modified Files:
	import.log 
Log Message:
auto-import drscheme-299.100-1 on branch devel from drscheme-299.100-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/drscheme/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Mar 2005 09:01:41 -0000	1.1
+++ import.log	27 Mar 2005 09:03:35 -0000	1.2
@@ -0,0 +1 @@
+drscheme-299_100-1:HEAD:drscheme-299.100-1.src.rpm:1111914190



From fedora-extras-commits at redhat.com  Sun Mar 27 09:11:26 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:11:26 -0500
Subject: rpms/drscheme/devel drscheme.spec,1.1,1.2
Message-ID: <200503270911.j2R9BQ6m019321@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19309

Modified Files:
	drscheme.spec 
Log Message:
prep for FC4 build



Index: drscheme.spec
===================================================================
RCS file: /cvs/extras/rpms/drscheme/devel/drscheme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drscheme.spec	27 Mar 2005 09:03:35 -0000	1.1
+++ drscheme.spec	27 Mar 2005 09:11:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           drscheme
 Version:        299.100
-Release:        1
+Release:        1.fc4
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel
 BuildRequires:	desktop-file-utils
-Obsoletes:	plt
+Obsoletes:	plt <= %{version}
 Provides:	plt-scheme, mzscheme, mred, mrflow
 
 



From fedora-extras-commits at redhat.com  Sun Mar 27 09:11:45 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 27 Mar 2005 04:11:45 -0500
Subject: rpms/drscheme/FC-3 drscheme.spec,1.1,1.2
Message-ID: <200503270911.j2R9Bj0G019357@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/drscheme/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19345

Modified Files:
	drscheme.spec 
Log Message:
prep for FC3 build



Index: drscheme.spec
===================================================================
RCS file: /cvs/extras/rpms/drscheme/FC-3/drscheme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drscheme.spec	27 Mar 2005 09:03:35 -0000	1.1
+++ drscheme.spec	27 Mar 2005 09:11:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           drscheme
 Version:        299.100
-Release:        1
+Release:        1.fc3
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel
 BuildRequires:	desktop-file-utils
-Obsoletes:	plt
+Obsoletes:	plt <= %{version}
 Provides:	plt-scheme, mzscheme, mred, mrflow
 
 



From wtogami at redhat.com  Sun Mar 27 09:14:32 2005
From: wtogami at redhat.com (Warren Togami)
Date: Sat, 26 Mar 2005 23:14:32 -1000
Subject: APPROVED: drscheme
Message-ID: <42467978.8090706@redhat.com>

Name: drscheme
Summary: Graphical environment for developing programs using Scheme

Reviewed by: wtogami at redhat.com
Maintainer: gemi at bluewin.ch



From fedora-extras-commits at redhat.com  Sun Mar 27 12:08:40 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 27 Mar 2005 07:08:40 -0500
Subject: rpms/apt/devel apt-pymake.patch, NONE, 1.1 apt-scriptdir.patch, NONE,
	1.1 rpmpriorities, 1.2, 1.3 .cvsignore, 1.3, 1.4 apt.spec,
	1.12, 1.13 mirror-select.conf, 1.3, 1.4 sources, 1.3,
	1.4 apt-0.5.15cnc6-docbook.patch, 1.1,
	NONE apt-0.5.15cnc6-pymake.patch, 1.2,
	NONE apt-0.5.15cnc6-python-update.patch, 1.1,
	NONE apt-0.5.15cnc6-r362.patch, 1.1,
	NONE apt-0.5.15cnc6-scriptdir.patch, 1.1, NONE gpg-checker.lua,
	1.2, NONE gpg-import.lua, 1.2, NONE rpmpriorities.1, 1.3,
	NONE rpmpriorities.2, 1.3, NONE rpmpriorities.3, 1.1,
	NONE rpmpriorities.Rawhide, 1.1, NONE
Message-ID: <200503271208.j2RC8e4R025699@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25693

Modified Files:
	.cvsignore apt.spec mirror-select.conf sources 
Added Files:
	apt-pymake.patch apt-scriptdir.patch rpmpriorities 
Removed Files:
	apt-0.5.15cnc6-docbook.patch apt-0.5.15cnc6-pymake.patch 
	apt-0.5.15cnc6-python-update.patch apt-0.5.15cnc6-r362.patch 
	apt-0.5.15cnc6-scriptdir.patch gpg-checker.lua gpg-import.lua 
	rpmpriorities.1 rpmpriorities.2 rpmpriorities.3 
	rpmpriorities.Rawhide 
Log Message:
0.5.15cnc7, perms fix, cleanups, drop non-FC4 files and build hacks.

apt-pymake.patch:

--- NEW FILE apt-pymake.patch ---
Index: python/Makefile
===================================================================
--- python/Makefile	(revision 373)
+++ python/Makefile	(working copy)
@@ -16,10 +16,10 @@
 $(MODULES): %.py: _%.so
 
 _%.so: %_wrap.cxx
-	$(CC) -fPIC -shared -I.. $(PYTHONFLAGS) $(LUAFLAGS) -L../bin -L../build/bin -lapt-pkg -o $@ $<
+	$(CC) -fPIC -shared -I.. -I../include $(PYTHONFLAGS) $(LUAFLAGS) -L../apt-pkg/.libs -lapt-pkg -o $@ $<
 
 apt_wrap.cxx: apt.i
-	$(SWIG) $(SWIGFLAGS) -c++ -I.. $(LUAFLAGS) -python $<
+	$(SWIG) $(SWIGFLAGS) -c++ -I.. -I../include $(LUAFLAGS) -python $<
 
 clean:
 	rm -f *.cxx

apt-scriptdir.patch:

--- NEW FILE apt-scriptdir.patch ---
Index: contrib/apt-wrapper/apt.1.xml
===================================================================
--- contrib/apt-wrapper/apt.1.xml	(revision 373)
+++ contrib/apt-wrapper/apt.1.xml	(working copy)
@@ -325,7 +325,7 @@
 
  <refsect1><title>Files</title>
    <variablelist>
-     <varlistentry><term><filename>/usr/lib/apt/scripts</filename></term>
+     <varlistentry><term><filename>/usr/share/apt/scripts</filename></term>
      <listitem><para>APT lua scripts.
      Configuration item: <literal>Dir::Bin::scripts</literal>.</para></listitem>
      </varlistentry>
Index: contrib/apt-wrapper/apt.1
===================================================================
--- contrib/apt-wrapper/apt.1	(revision 373)
+++ contrib/apt-wrapper/apt.1	(working copy)
@@ -157,7 +157,7 @@
 .SH "FILES"
 
 .TP
-\fI/usr/lib/apt/scripts\fR
+\fI/usr/share/apt/scripts\fR
 APT lua scripts\&. Configuration item: Dir::Bin::scripts\&.
 
 .SH "ENVIRONMENT"
Index: contrib/apt-files/README
===================================================================
--- contrib/apt-files/README	(revision 373)
+++ contrib/apt-files/README	(working copy)
@@ -40,7 +40,7 @@
 these files in the following directories:
 
     /etc/apt/apt.conf.d/apt-files.conf
-    /usr/lib/apt/scripts/apt-files.lua
+    /usr/share/apt/scripts/apt-files.lua
     /var/state/apt/Contents.gz
 
 Bingo! It should be working. ;-)
Index: contrib/apt-groupinstall/apt-groupinstall.conf
===================================================================
--- contrib/apt-groupinstall/apt-groupinstall.conf	(revision 373)
+++ contrib/apt-groupinstall/apt-groupinstall.conf	(working copy)
@@ -10,7 +10,7 @@
 // For RHEL/FC systems
 Scripts::Groupinstall::Backend "groupinstall-backend-comps.py";
 Scripts::Groupinstall::DataPath "/usr/share/comps/i386/comps.xml";
-Synaptic::taskHelperProg "/usr/lib/apt/scripts/groupinstall-backend-comps.py";
+Synaptic::taskHelperProg "/usr/share/apt/scripts/groupinstall-backend-comps.py";
 
 // For Suse systems
 //Scripts::Groupinstall::Backend "groupinstall-backend-suse";
Index: apt-pkg/luaiface.cc
===================================================================
--- apt-pkg/luaiface.cc	(revision 373)
+++ apt-pkg/luaiface.cc	(working copy)
@@ -76,7 +76,7 @@
 Lua::Lua()
       : DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0)
 {
-   _config->CndSet("Dir::Bin::scripts", "/usr/lib/apt/scripts");
+   _config->CndSet("Dir::Bin::scripts", "/usr/share/apt/scripts");
 
    const luaL_reg lualibs[] = {
       {"base", luaopen_base},


Index: rpmpriorities
===================================================================
RCS file: rpmpriorities
diff -N rpmpriorities
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rpmpriorities	27 Mar 2005 12:08:38 -0000	1.3
@@ -0,0 +1,36 @@
+Essential:
+  grub
+  termcap
+  ed
+  kbd
+  iproute
+  libtermcap
+  libgcc
+  setserial
+  file
+  rpm
+  sysklogd
+  losetup
+  kudzu
+  glibc
+  shadow-utils
+  coreutils
+  bash
+  iputils
+  vim-minimal
+  passwd
+  cpio
+  raidtools
+  SysVinit
+  authconfig
+  hdparm
+  hotplug
+  readline
+  util-linux
+  basesystem
+  setup
+  e2fsprogs
+  procps
+  initscripts
+  filesystem
+  fedora-release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:04:37 -0000	1.3
+++ .cvsignore	27 Mar 2005 12:08:38 -0000	1.4
@@ -1 +1 @@
-apt-0.5.15cnc6.tar.bz2
+apt-0.5.15cnc7.tar.bz2


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apt.spec	19 Mar 2005 11:18:26 -0000	1.12
+++ apt.spec	27 Mar 2005 12:08:38 -0000	1.13
@@ -1,6 +1,3 @@
-# needed for rpmpriorities and mirror-select.conf:
-%{!?fcrel:%define fcrel %(cut -d' ' -f4 /etc/fedora-release )}
-
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define scriptdir %{_datadir}/apt/scripts/
@@ -8,23 +5,17 @@
 %define generate_rpmpriorities 0
 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
 
-# subversion revision for svn snapshots
-%define svnver r362
-
-# we need to work around various missing builddeps in rpm :-/
-%{!?rpmver:%define rpmver %(rpm --version | cut -d' ' -f3 | cut -d. -f1-2)}
-
 Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
-Version: 0.5.15cnc6
-Release: 16.%{svnver}
+Version: 0.5.15cnc7
+Release: 2
 Group: System Environment/Base
 URL: https://moin.conectiva.com.br/AptRpm
 License: GPL
 ExcludeArch: x86_64 ppc64
 
 # unfortunately the source isn't really directly downloadable with wget etc:
-#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc6.tar.bz2
+#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc7.tar.bz2
 Source0: %{name}-%{version}.tar.bz2
 
 # user editable template configs
@@ -34,10 +25,7 @@
 Source4: apt_preferences
 
 # rpmpriorities generated + manually tweaked from comps.xml core group
-Source5: rpmpriorities.1
-Source6: rpmpriorities.2
-Source6: rpmpriorities.3
-Source18: rpmpriorities.Rawhide
+Source5: rpmpriorities
 Source19: comps2prio.xsl
 
 # nightly updater scripts & config
@@ -78,44 +66,32 @@
 
 Provides: apt-mirrorselect
 
-# Others deps are automatically picked up by rpm
+# Other deps are automatically picked up by rpm
 Requires: gnupg, bzip2
 Requires(post): chkconfig, ldconfig
 Requires(preun): chkconfig
 # Needed by the mirror-selector script
 Requires: wget
 
-BuildRequires: beecrypt-devel
-BuildRequires: elfutils-devel
-# TODO: verify the required minimum version
+# TODO: verify the required minimum Python version
 BuildRequires: python-devel >= 2.2
 BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext
-BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel
-# for version detection to work
-BuildRequires: fedora-release
+BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel, libtool
 %if %{generate_rpmpriorities}
 BuildRequires: %{_bindir}/xsltproc, %{comps}
 %endif
-
-%if "%{rpmver}" >= "4.3"
-BuildRequires: libselinux-devel
-%endif
+# Work around missing deps in rpm-devel :-/
+BuildRequires: beecrypt-devel, elfutils-libelf-devel
 
 # Fix some issues in python binding build
-Patch1: apt-0.5.15cnc6-pymake.patch
+Patch1: apt-pymake.patch
 Patch5: apt-0.5.15cnc6-pymake2.patch
-# Update to current svn snapshot: svn diff -r316:%{svnver}
-Patch2: apt-0.5.15cnc6-%{svnver}.patch
 # Make rpm manifest usage configurable
 Patch3: apt-0.5.15cnc5-manifest-limit.patch
-# Docbook build fixes, send upstream
-Patch4: apt-0.5.15cnc6-docbook.patch
 # Take read-only, not exclusive rpmdb lock for the initial dependency processing
 Patch6: apt-0.5.15cnc6-rdonly.patch
 # Move scripts from /usr/lib/apt to /usr/share/apt
-Patch7: apt-0.5.15cnc6-scriptdir.patch
-# Update python bindings
-Patch8: apt-0.5.15cnc6-python-update.patch
+Patch7: apt-scriptdir.patch
 
 %description
 A port of Debian's apt tools for RPM based distributions.
@@ -161,23 +137,29 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .pymake
-%patch2 -p0 -b .svnsnap
+%patch1 -p0 -b .pymake
 %patch3 -p1 -b .manifest
-%patch4 -p0 -b .docbook
 %patch5 -p0 -b .pymake2
 %patch6 -p1 -b .rdonly
-%patch7 -p1 -b .scriptdir
-%patch8 -p1 -b .pyupdate
+%patch7 -p0 -b .scriptdir
 
 # fix docs to reference correct paths
 perl -pi -e \
   's|\bconfigure-index\.gz\b|configure-index| ;
    s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
-  doc/apt.ent doc/fr/apt.ent.fr
+  doc/apt.ent doc/*/apt.ent.*
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
+# don't require python, lua etc because of stuff in doc/contrib
+find contrib/ -type f | xargs chmod 0644
+
+# appease aclocal >= 1.8
+perl -pi -e 's|^(AC_DEFUN\()(\w+)|$1\[$2\]|' buildlib/*.m4
+
+# http://distro2.conectiva.com.br/pipermail/apt-rpm/2005-March/002664.html
+libtoolize -f && autoreconf
+
 
 %build
 %configure --disable-dependency-tracking
@@ -185,17 +167,12 @@
 SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \
 make %{?_smp_mflags}
 
-# prevent re-generation of the python wrapper, requires a patched swig :(
-#touch python/apt.py python/apt_wrap.cxx
-cp python/apt.py python/apt.py.pyupdate
-cp python/apt_wrap.cxx python/apt_wrap.cxx.pyupdate
 make -C python %{?_smp_mflags} PYTHON="%{__python}"
 %{__python} -c "import py_compile; py_compile.compile('python/apt.py')"
 
+cp -p %{SOURCE5} rpmpriorities
 %if %{generate_rpmpriorities}
 %{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
-%else
-cp -p $RPM_SOURCE_DIR/rpmpriorities.%{fcrel} rpmpriorities
 %endif
 
 
@@ -226,8 +203,6 @@
 for cnf in %{SOURCE150} %{SOURCE151}; do
 	install -p -m 644 $cnf $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
 done
-# fix mirror-select path
-perl -pi -e "s/FCREL/%{fcrel}/g" $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/mirror-select.conf
 
 install -p -m 644 %{SOURCE250} $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
@@ -259,14 +234,11 @@
 
 # apt-groupinstall from contrib
 install -p -m 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{scriptdir}
-install -p -m 755 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+install -p -m 644 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
 
 # nuke .la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# don't require python, lua etc because of stuff in doc/contrib
-find contrib/ -type f |xargs chmod 0644
-
 
 %pre
 if [ $1 -gt 1 ] && [ ! -f %{_sysconfdir}/apt/apt.conf.d/default.conf ]; then
@@ -287,7 +259,8 @@
 %post
 /sbin/ldconfig
 if [ ! -f %{_sysconfdir}/apt/apt.conf ]; then
- echo "// User customizable configuration goes here" > %{_sysconfdir}/apt/apt.conf
+ echo "// User customizable configuration goes here" \
+  > %{_sysconfdir}/apt/apt.conf
 fi
 /sbin/chkconfig --add apt
 
@@ -326,6 +299,7 @@
 %{_bindir}/apt-config
 %{_bindir}/apt-shell
 %{_bindir}/apt-get
+%{_bindir}/countpkglist
 %{_bindir}/genpkglist
 %{_bindir}/gensrclist
 %{_bindir}/genbasedir
@@ -359,6 +333,11 @@
 
 
 %changelog
+* Sat Mar 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15cnc7-2
+- 0.5.15cnc7, drop patches applied upstream.
+- Fix groupinstall config file permissions.
+- Various specfile and build cleanups and typo fixes.
+
 * Sat Mar 19 2005 Ville Skytt?? <ville.skytta at iki.fi>
 - Apply hack against missing libselinux-devel dep in rpm-devel for rpm 4.4 too.
 
@@ -401,7 +380,7 @@
 
 * Wed Aug 18 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r362
 - revision r362
-- add rpmprioties file for rawhide
+- add rpmpriorities file for rawhide
 
 * Sat Aug 14 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r361
 - update to revision r361
@@ -583,7 +562,7 @@
 - drop patches merged upstream
 
 * Tue Dec 23 2003 Panu Matilainen <pmatilai at welho.com>
-- remove extranuous mirror-select configs from default.conf
+- remove extraneous mirror-select configs from default.conf
 - updated mirror-select script
 
 * Fri Dec 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.4


Index: mirror-select.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/mirror-select.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mirror-select.conf	17 Jan 2005 22:01:26 -0000	1.3
+++ mirror-select.conf	27 Mar 2005 12:08:38 -0000	1.4
@@ -3,5 +3,5 @@
 Scripts::AptGet::Help::Command:: "mirror-select.lua";
 Dir::Etc::sourceparts::mirrorsource "mirror-select.list";
 Dir::State::mirrors "mirrors.list";
-Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fcFCREL-mirrors.list";
-Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fcFCREL-mirrors.list";
+Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fc4-mirrors.list";
+Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fc4-mirrors.list";


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:04:37 -0000	1.3
+++ sources	27 Mar 2005 12:08:38 -0000	1.4
@@ -1 +1 @@
-134575fd06c8c84d46766a65ed8a26af  apt-0.5.15cnc6.tar.bz2
+9e44ec1503fa96832bbd9b532543e4de  apt-0.5.15cnc7.tar.bz2


--- apt-0.5.15cnc6-docbook.patch DELETED ---


--- apt-0.5.15cnc6-pymake.patch DELETED ---


--- apt-0.5.15cnc6-python-update.patch DELETED ---


--- apt-0.5.15cnc6-r362.patch DELETED ---


--- apt-0.5.15cnc6-scriptdir.patch DELETED ---


--- gpg-checker.lua DELETED ---


--- gpg-import.lua DELETED ---


--- rpmpriorities.1 DELETED ---


--- rpmpriorities.2 DELETED ---


--- rpmpriorities.3 DELETED ---


--- rpmpriorities.Rawhide DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar 27 12:10:15 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 27 Mar 2005 07:10:15 -0500
Subject: rpms/apt/FC-3 apt-pymake.patch, NONE, 1.1 apt-scriptdir.patch, NONE,
	1.1 rpmpriorities, 1.2, 1.3 .cvsignore, 1.3, 1.4 apt.spec, 1.9,
	1.10 mirror-select.conf, 1.3, 1.4 sources, 1.3,
	1.4 apt-0.5.15cnc6-docbook.patch, 1.1,
	NONE apt-0.5.15cnc6-pymake.patch, 1.2,
	NONE apt-0.5.15cnc6-python-update.patch, 1.1,
	NONE apt-0.5.15cnc6-r362.patch, 1.1,
	NONE apt-0.5.15cnc6-scriptdir.patch, 1.1, NONE gpg-checker.lua,
	1.2, NONE gpg-import.lua, 1.2, NONE rpmpriorities.1, 1.3,
	NONE rpmpriorities.2, 1.3, NONE rpmpriorities.3, 1.1,
	NONE rpmpriorities.Rawhide, 1.1, NONE
Message-ID: <200503271210.j2RCAFbo025737@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/apt/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25731

Modified Files:
	.cvsignore apt.spec mirror-select.conf sources 
Added Files:
	apt-pymake.patch apt-scriptdir.patch rpmpriorities 
Removed Files:
	apt-0.5.15cnc6-docbook.patch apt-0.5.15cnc6-pymake.patch 
	apt-0.5.15cnc6-python-update.patch apt-0.5.15cnc6-r362.patch 
	apt-0.5.15cnc6-scriptdir.patch gpg-checker.lua gpg-import.lua 
	rpmpriorities.1 rpmpriorities.2 rpmpriorities.3 
	rpmpriorities.Rawhide 
Log Message:
0.5.15cnc7, perms fix, whitespace/cleanup sync w/devel, drop non-FC3 stuff.

apt-pymake.patch:

--- NEW FILE apt-pymake.patch ---
Index: python/Makefile
===================================================================
--- python/Makefile	(revision 373)
+++ python/Makefile	(working copy)
@@ -16,10 +16,10 @@
 $(MODULES): %.py: _%.so
 
 _%.so: %_wrap.cxx
-	$(CC) -fPIC -shared -I.. $(PYTHONFLAGS) $(LUAFLAGS) -L../bin -L../build/bin -lapt-pkg -o $@ $<
+	$(CC) -fPIC -shared -I.. -I../include $(PYTHONFLAGS) $(LUAFLAGS) -L../apt-pkg/.libs -lapt-pkg -o $@ $<
 
 apt_wrap.cxx: apt.i
-	$(SWIG) $(SWIGFLAGS) -c++ -I.. $(LUAFLAGS) -python $<
+	$(SWIG) $(SWIGFLAGS) -c++ -I.. -I../include $(LUAFLAGS) -python $<
 
 clean:
 	rm -f *.cxx

apt-scriptdir.patch:

--- NEW FILE apt-scriptdir.patch ---
Index: contrib/apt-wrapper/apt.1.xml
===================================================================
--- contrib/apt-wrapper/apt.1.xml	(revision 373)
+++ contrib/apt-wrapper/apt.1.xml	(working copy)
@@ -325,7 +325,7 @@
 
  <refsect1><title>Files</title>
    <variablelist>
-     <varlistentry><term><filename>/usr/lib/apt/scripts</filename></term>
+     <varlistentry><term><filename>/usr/share/apt/scripts</filename></term>
      <listitem><para>APT lua scripts.
      Configuration item: <literal>Dir::Bin::scripts</literal>.</para></listitem>
      </varlistentry>
Index: contrib/apt-wrapper/apt.1
===================================================================
--- contrib/apt-wrapper/apt.1	(revision 373)
+++ contrib/apt-wrapper/apt.1	(working copy)
@@ -157,7 +157,7 @@
 .SH "FILES"
 
 .TP
-\fI/usr/lib/apt/scripts\fR
+\fI/usr/share/apt/scripts\fR
 APT lua scripts\&. Configuration item: Dir::Bin::scripts\&.
 
 .SH "ENVIRONMENT"
Index: contrib/apt-files/README
===================================================================
--- contrib/apt-files/README	(revision 373)
+++ contrib/apt-files/README	(working copy)
@@ -40,7 +40,7 @@
 these files in the following directories:
 
     /etc/apt/apt.conf.d/apt-files.conf
-    /usr/lib/apt/scripts/apt-files.lua
+    /usr/share/apt/scripts/apt-files.lua
     /var/state/apt/Contents.gz
 
 Bingo! It should be working. ;-)
Index: contrib/apt-groupinstall/apt-groupinstall.conf
===================================================================
--- contrib/apt-groupinstall/apt-groupinstall.conf	(revision 373)
+++ contrib/apt-groupinstall/apt-groupinstall.conf	(working copy)
@@ -10,7 +10,7 @@
 // For RHEL/FC systems
 Scripts::Groupinstall::Backend "groupinstall-backend-comps.py";
 Scripts::Groupinstall::DataPath "/usr/share/comps/i386/comps.xml";
-Synaptic::taskHelperProg "/usr/lib/apt/scripts/groupinstall-backend-comps.py";
+Synaptic::taskHelperProg "/usr/share/apt/scripts/groupinstall-backend-comps.py";
 
 // For Suse systems
 //Scripts::Groupinstall::Backend "groupinstall-backend-suse";
Index: apt-pkg/luaiface.cc
===================================================================
--- apt-pkg/luaiface.cc	(revision 373)
+++ apt-pkg/luaiface.cc	(working copy)
@@ -76,7 +76,7 @@
 Lua::Lua()
       : DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0)
 {
-   _config->CndSet("Dir::Bin::scripts", "/usr/lib/apt/scripts");
+   _config->CndSet("Dir::Bin::scripts", "/usr/share/apt/scripts");
 
    const luaL_reg lualibs[] = {
       {"base", luaopen_base},


Index: rpmpriorities
===================================================================
RCS file: rpmpriorities
diff -N rpmpriorities
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rpmpriorities	27 Mar 2005 12:10:13 -0000	1.3
@@ -0,0 +1,37 @@
+Essential:
+  grub
+  termcap
+  ed
+  kbd
+  iproute
+  libtermcap
+  libgcc
+  setserial
+  file
+  rpm
+  sysklogd
+  losetup
+  kudzu
+  glibc
+  shadow-utils
+  coreutils
+  bash
+  iputils
+  vim-minimal
+  passwd
+  cpio
+  raidtools
+  SysVinit
+  authconfig
+  hdparm
+  hotplug
+  readline
+  util-linux
+  basesystem
+  setup
+  e2fsprogs
+  procps
+  initscripts
+  filesystem
+  fedora-release
+  udev


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:04:37 -0000	1.3
+++ .cvsignore	27 Mar 2005 12:10:13 -0000	1.4
@@ -1 +1 @@
-apt-0.5.15cnc6.tar.bz2
+apt-0.5.15cnc7.tar.bz2


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-3/apt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apt.spec	18 Feb 2005 22:14:10 -0000	1.9
+++ apt.spec	27 Mar 2005 12:10:13 -0000	1.10
@@ -1,6 +1,3 @@
-# needed for rpmpriorities and mirror-select.conf:
-%{!?fcrel:%define fcrel %(cut -d' ' -f4 /etc/fedora-release )}
-
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define scriptdir %{_datadir}/apt/scripts/
@@ -8,16 +5,10 @@
 %define generate_rpmpriorities 0
 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
 
-# subversion revision for svn snapshots
-%define svnver r362
-
-# we need to work around various missing builddeps in rpm :-/
-%{!?rpmver:%define rpmver %(rpm --version | cut -d' ' -f3 | cut -d. -f1-2)}
-
-Summary: Debian's Advanced Packaging Tool with RPM support.
+Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
-Version: 0.5.15cnc6
-Release: 16.%{svnver}
+Version: 0.5.15cnc7
+Release: 1
 Epoch: 0
 Group: System Environment/Base
 URL: https://moin.conectiva.com.br/AptRpm
@@ -25,7 +16,7 @@
 ExcludeArch: x86_64 ppc64
 
 # unfortunately the source isn't really directly downloadable with wget etc:
-#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc6.tar.bz2
+#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc7.tar.bz2
 Source0: %{name}-%{version}.tar.bz2
 
 # user editable template configs
@@ -35,10 +26,7 @@
 Source4: apt_preferences
 
 # rpmpriorities generated + manually tweaked from comps.xml core group
-Source5: rpmpriorities.1
-Source6: rpmpriorities.2
-Source6: rpmpriorities.3
-Source18: rpmpriorities.Rawhide
+Source5: rpmpriorities
 Source19: comps2prio.xsl
 
 # nightly updater scripts & config
@@ -79,49 +67,37 @@
 
 Provides: apt-mirrorselect
 
-# Others deps are automatically picked up by rpm
+# Other deps are automatically picked up by rpm
 Requires: gnupg, bzip2
 Requires(post): chkconfig, ldconfig
 Requires(preun): chkconfig
 # Needed by the mirror-selector script
 Requires: wget
 
-BuildRequires: beecrypt-devel
-BuildRequires: elfutils-devel
-# TODO: verify the required minimum version
+# TODO: verify the required minimum Python version
 BuildRequires: python-devel >= 0:2.2
 BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext
-BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel
-# for version detection to work 
-BuildRequires: fedora-release
+BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel, libtool
 %if %{generate_rpmpriorities}
 BuildRequires: %{_bindir}/xsltproc, %{comps}
 %endif
-
-%if "%{rpmver}" == "4.3"
-BuildRequires: libselinux-devel
-%endif
+# Work around missing deps in rpm-devel :-/
+BuildRequires: beecrypt-devel, elfutils-libelf-devel, libselinux-devel
 
 # Fix some issues in python binding build
-Patch1: apt-0.5.15cnc6-pymake.patch
+Patch1: apt-pymake.patch
 Patch5: apt-0.5.15cnc6-pymake2.patch
-# Update to current svn snapshot: svn diff -r316:%{svnver}
-Patch2: apt-0.5.15cnc6-%{svnver}.patch
 # Make rpm manifest usage configurable
 Patch3: apt-0.5.15cnc5-manifest-limit.patch
-# Docbook build fixes, send upstream
-Patch4: apt-0.5.15cnc6-docbook.patch
 # Take read-only, not exclusive rpmdb lock for the initial dependency processing
 Patch6: apt-0.5.15cnc6-rdonly.patch
 # Move scripts from /usr/lib/apt to /usr/share/apt
-Patch7: apt-0.5.15cnc6-scriptdir.patch
-# Update python bindings
-Patch8: apt-0.5.15cnc6-python-update.patch
+Patch7: apt-scriptdir.patch
 
 %description
 A port of Debian's apt tools for RPM based distributions.
-It provides the apt-get utility that provides a simpler, safer way to 
-install and upgrade packages. APT features complete installation ordering, 
+It provides the apt-get utility that provides a simpler, safer way to
+install and upgrade packages. APT features complete installation ordering,
 multiple source capability and several other unique features.
 
 %package devel
@@ -156,47 +132,48 @@
 apt-get groupremove <groupname> [<groupname2> ..]
 
 The group information is retrieved from comps.xml used by anaconda (the
-system installer) and other package management tools of RHL/RHEL/FC 
+system installer) and other package management tools of RHL/RHEL/FC
 distributions.
 
 
 %prep
 %setup -q
-%patch1 -p1 -b .pymake
-%patch2 -p0 -b .svnsnap
+%patch1 -p0 -b .pymake
 %patch3 -p1 -b .manifest
-%patch4 -p0 -b .docbook
 %patch5 -p0 -b .pymake2
 %patch6 -p1 -b .rdonly
-%patch7 -p1 -b .scriptdir
-%patch8 -p1 -b .pyupdate
+%patch7 -p0 -b .scriptdir
 
 # fix docs to reference correct paths
 perl -pi -e \
   's|\bconfigure-index\.gz\b|configure-index| ;
    s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
-  doc/apt.ent doc/fr/apt.ent.fr
+  doc/apt.ent doc/*/apt.ent.*
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
+# don't require python, lua etc because of stuff in doc/contrib
+find contrib/ -type f | xargs chmod 0644
+
+# appease aclocal >= 1.8
+perl -pi -e 's|^(AC_DEFUN\()(\w+)|$1\[$2\]|' buildlib/*.m4
+
+# http://distro2.conectiva.com.br/pipermail/apt-rpm/2005-March/002664.html
+libtoolize -f && autoreconf
+
 
 %build
 %configure --disable-dependency-tracking
 
 SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
-# prevent re-generation of the python wrapper, requires a patched swig :(
-#touch python/apt.py python/apt_wrap.cxx
-cp python/apt.py python/apt.py.pyupdate
-cp python/apt_wrap.cxx python/apt_wrap.cxx.pyupdate
 make -C python %{?_smp_mflags} PYTHON="%{__python}"
 %{__python} -c "import py_compile; py_compile.compile('python/apt.py')"
 
+cp -p %{SOURCE5} rpmpriorities
 %if %{generate_rpmpriorities}
 %{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
-%else
-cp -p $RPM_SOURCE_DIR/rpmpriorities.%{fcrel} rpmpriorities
 %endif
 
 
@@ -227,8 +204,6 @@
 for cnf in %{SOURCE150} %{SOURCE151}; do
 	install -p -m 644 $cnf $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
 done
-# fix mirror-select path
-perl -pi -e "s/FCREL/%{fcrel}/g" $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/mirror-select.conf
 
 install -p -m 644 %{SOURCE250} $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
@@ -260,14 +235,11 @@
 
 # apt-groupinstall from contrib
 install -p -m 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{scriptdir}
-install -p -m 755 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+install -p -m 644 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
 
 # nuke .la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# don't require python, lua etc because of stuff in doc/contrib
-find contrib/ -type f |xargs chmod 0644
-
 
 %pre
 if [ $1 -gt 1 ] && [ ! -f %{_sysconfdir}/apt/apt.conf.d/default.conf ]; then
@@ -285,10 +257,11 @@
 fi
 exit 0
 
-%post 
+%post
 /sbin/ldconfig
 if [ ! -f %{_sysconfdir}/apt/apt.conf ]; then
-	echo "// User customizable configuration goes here" > %{_sysconfdir}/apt/apt.conf
+ echo "// User customizable configuration goes here" \
+  > %{_sysconfdir}/apt/apt.conf
 fi
 /sbin/chkconfig --add apt
 
@@ -310,7 +283,7 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/apt
 %config(noreplace) %{_sysconfdir}/apt/rpmpriorities
 %config(noreplace) %{_sysconfdir}/apt/preferences
-%config(noreplace) %{_sysconfdir}/apt/apt.conf 
+%config(noreplace) %{_sysconfdir}/apt/apt.conf
 %config(noreplace) %{_sysconfdir}/apt/sources.list
 %config(noreplace) %{_sysconfdir}/apt/vendors.list
 # NOTE: no noreplace on these because we WANT to be able to change the defaults
@@ -327,6 +300,7 @@
 %{_bindir}/apt-config
 %{_bindir}/apt-shell
 %{_bindir}/apt-get
+%{_bindir}/countpkglist
 %{_bindir}/genpkglist
 %{_bindir}/gensrclist
 %{_bindir}/genbasedir
@@ -360,6 +334,11 @@
 
 
 %changelog
+* Sat Mar 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.15cnc7-1
+- 0.5.15cnc7, drop patches applied upstream.
+- Fix groupinstall config file permissions.
+- Various specfile and build cleanups and typo fixes.
+
 * Wed Feb 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.15cnc6-16.r362
 - Make mirror-select.lua write commented out rpm-src entries for Extras (Panu).
 - Add Extras GPG key (Panu), and add it to fedora-vendors.list.
@@ -399,7 +378,7 @@
 
 * Wed Aug 18 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r362
 - revision r362
-- add rpmprioties file for rawhide 
+- add rpmpriorities file for rawhide
 
 * Sat Aug 14 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r361
 - update to revision r361
@@ -407,7 +386,7 @@
 - provide apt-mirrorselect so repo-configs can depend on it
 - preliminary fixes for x86_64:
   - put scripts to /usr/share/apt/scripts instead of /usr/lib
-  - build python bindings with -fPIC 
+  - build python bindings with -fPIC
 
 * Thu Aug 12 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r360
 - update to revision r360
@@ -433,7 +412,7 @@
 - add new subpackage for groupinstall (to avoid dependening on comps and rhpl
   for core apt)
 - update to revision 353 from upstream for various bugfixes and enhancements,
-  drop merged patches 
+  drop merged patches
 - remove NOISY=1 from make, hasn't done anything in ages..
 
 * Thu Jun 17 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.13
@@ -492,7 +471,7 @@
 - Ville's docbook building fix
 
 * Tue Mar 30 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.4
-- add upgrade-virtual=true back to default.conf 
+- add upgrade-virtual=true back to default.conf
 - updated version of upgradevirt.lua, fixed kernel-module package handling
 
 * Mon Mar 29 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.3
@@ -510,7 +489,7 @@
 - remember to set kernel::module-prefix in default.conf
 - add upgradevirt.lua to all the necessary new slot
 - move kernel from Essential priority to Important in rpmpriorities, allow-
-  duplicated packages don't behave well with Essential priority 
+  duplicated packages don't behave well with Essential priority
 
 * Mon Mar 22 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.1
 - update to 0.5.15cnc6
@@ -531,14 +510,14 @@
 
 * Fri Feb 13 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.8
 - Pull patch for revs 266-274 from upstream, containing various important
-  fixes (epoch handling, build system related etc) 
+  fixes (epoch handling, build system related etc)
 
 * Thu Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.7
 - Fix build on FC2-test1 (conditional libselinux-devel buildreq)
 
 * Mon Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.6
 - automatically handle fedora.us style kernel-module packages with kernel
-  updates 
+  updates
 - don't run mirror-selector if quiet mode set (== non-interactive)
 - don't trash sources.list on upgrade, only if user chooses to do so
 
@@ -557,7 +536,7 @@
 
 * Mon Jan 19 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.3
 - make rpm manifest usage configurable per Enricos request (patch 4)
-- use mirror lists on fedora.us 
+- use mirror lists on fedora.us
 - include Fedora Legacy gpg key
 
 * Tue Jan 06 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.2
@@ -581,7 +560,7 @@
 - drop patches merged upstream
 
 * Tue Dec 23 2003 Panu Matilainen <pmatilai at welho.com>
-- remove extranuous mirror-select configs from default.conf 
+- remove extraneous mirror-select configs from default.conf
 - updated mirror-select script
 
 * Fri Dec 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.4
@@ -650,7 +629,7 @@
 * Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.1
 - update rpmlib patch to -7 which has more sensible error reporting
 
-* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com> 
+* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com>
 - update to 0.5.15cnc2
 - remove patches 6-9, they're merged upstream now
 - use fedora-style buildroot
@@ -749,12 +728,12 @@
 - drop patches merged upstream
 
 * Tue Jun 10 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.9
-- patch from upstream to fix a security problem where lua-scripts can get 
+- patch from upstream to fix a security problem where lua-scripts can get
   accidentally executed from cwd
 
 * Mon Jun 09 2003 Panu Matilainen <pmatilai at welho.com>
 - apt doesn't like build deps on versioned virtual provides -> only RH7.3
-  package buildrequires python2-devel, newer ones have python-devel 
+  package buildrequires python2-devel, newer ones have python-devel
 
 * Thu Jun 05 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.8
 - fix the proxy template format in apt.conf
@@ -778,11 +757,11 @@
 - fix #259
 - add missing ncurses-devel buildreq (for apt-shell)
 
-* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com> 
+* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com>
 - add missing libelf-devel buildreq for RH8.0 (#254)
 - add missing readline-devel buildreq (for apt-shell)
 
-* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com> 
+* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com>
 - add /etc/apt/scripts directory (for Lua scripts)
 
 * Tue Apr 22 2003 Warren Togami <warren at togami.com> 0.5.5cnc5-0.fdr.5
@@ -802,7 +781,7 @@
 * Wed Apr 16 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.1
 - patch to speed up apt startup and genbasedir
 - drop "counting sheep" patch, not needed anymore
-- include current mirrors in sources.list 
+- include current mirrors in sources.list
 - autodetect RH version
 
 * Tue Apr 15 2003 Panu Matilainen <pmatilai at welho.com>
@@ -824,7 +803,7 @@
 - add epoch to requires =, >= too
 
 * Thu Apr 03 2003 Panu Matilainen <pmatilai at welho.com>
-- fix segfault if rpm-dir index is a broken symlink 
+- fix segfault if rpm-dir index is a broken symlink
 - rpmpriorities generated from comps.xml
 - dont tag the various keys as %dir :-/
 


Index: mirror-select.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-3/mirror-select.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mirror-select.conf	17 Jan 2005 22:01:26 -0000	1.3
+++ mirror-select.conf	27 Mar 2005 12:10:13 -0000	1.4
@@ -3,5 +3,5 @@
 Scripts::AptGet::Help::Command:: "mirror-select.lua";
 Dir::Etc::sourceparts::mirrorsource "mirror-select.list";
 Dir::State::mirrors "mirrors.list";
-Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fcFCREL-mirrors.list";
-Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fcFCREL-mirrors.list";
+Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fc3-mirrors.list";
+Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fc3-mirrors.list";


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:04:37 -0000	1.3
+++ sources	27 Mar 2005 12:10:13 -0000	1.4
@@ -1 +1 @@
-134575fd06c8c84d46766a65ed8a26af  apt-0.5.15cnc6.tar.bz2
+9e44ec1503fa96832bbd9b532543e4de  apt-0.5.15cnc7.tar.bz2


--- apt-0.5.15cnc6-docbook.patch DELETED ---


--- apt-0.5.15cnc6-pymake.patch DELETED ---


--- apt-0.5.15cnc6-python-update.patch DELETED ---


--- apt-0.5.15cnc6-r362.patch DELETED ---


--- apt-0.5.15cnc6-scriptdir.patch DELETED ---


--- gpg-checker.lua DELETED ---


--- gpg-import.lua DELETED ---


--- rpmpriorities.1 DELETED ---


--- rpmpriorities.2 DELETED ---


--- rpmpriorities.3 DELETED ---


--- rpmpriorities.Rawhide DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar 27 12:17:00 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 27 Mar 2005 07:17:00 -0500
Subject: rpms/apt/devel rpmpriorities,1.3,1.4
Message-ID: <200503271217.j2RCH0RJ025787@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25781

Modified Files:
	rpmpriorities 
Log Message:
udev is probably Essential here too.


Index: rpmpriorities
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/rpmpriorities,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmpriorities	27 Mar 2005 12:08:38 -0000	1.3
+++ rpmpriorities	27 Mar 2005 12:16:58 -0000	1.4
@@ -34,3 +34,4 @@
   initscripts
   filesystem
   fedora-release
+  udev



From fedora-extras-commits at redhat.com  Sun Mar 27 14:17:33 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Sun, 27 Mar 2005 09:17:33 -0500
Subject: rpms/anthy/devel .cvsignore, 1.3, 1.4 anthy.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200503271417.j2REHX8Z027769@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/anthy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27763

Modified Files:
	.cvsignore anthy.spec sources 
Log Message:
* Sun Mar 27 2005 Akira TAGOH <tagoh at redhat.com> - 6300d-2
- real updates (#152203)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anthy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Feb 2005 14:31:30 -0000	1.3
+++ .cvsignore	27 Mar 2005 14:17:31 -0000	1.4
@@ -3,3 +3,4 @@
 *.rpm
 anthy-6024.tar.gz
 anthy-6131.tar.gz
+anthy-6300d.tar.gz


Index: anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- anthy.spec	23 Mar 2005 06:32:38 -0000	1.5
+++ anthy.spec	27 Mar 2005 14:17:31 -0000	1.6
@@ -1,8 +1,8 @@
-%define	version	6131
+%define	version	6300d
 
 Name:		anthy
 Version:	%{version}
-Release:	1
+Release:	2
 License:	GPL
 Group:		System Environment/Libraries
 URL:		http://sourceforge.jp/projects/anthy/
@@ -110,6 +110,9 @@
 %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el
 
 %changelog
+* Sun Mar 27 2005 Akira TAGOH <tagoh at redhat.com> - 6300d-2
+- real updates (#152203)
+
 * Sun Mar 20 2005 Akira TAGOH <tagoh at redhat.com> - 6300d-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anthy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Feb 2005 14:31:31 -0000	1.3
+++ sources	27 Mar 2005 14:17:31 -0000	1.4
@@ -1 +1 @@
-ee094243b33fc75f144da56f5ebb580e  anthy-6131.tar.gz
+7bbb58cb2c759ca065dad40b194ff118  anthy-6300d.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 28 04:55:03 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 27 Mar 2005 23:55:03 -0500
Subject: rpms/xfwm4/devel xfwm4-focus-bug.patch,NONE,1.1 xfwm4.spec,1.5,1.6
Message-ID: <200503280455.j2S4t3CJ008611@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8605

Modified Files:
	xfwm4.spec 
Added Files:
	xfwm4-focus-bug.patch 
Log Message:
Add patch for focus issue (bug #152299)


xfwm4-focus-bug.patch:

--- NEW FILE xfwm4-focus-bug.patch ---
diff -Nur xfwm4-4.2.1.orig/src/client.c xfwm4-4.2.1/src/client.c
--- xfwm4-4.2.1.orig/src/client.c	2005-03-14 13:11:55.000000000 -0700
+++ xfwm4-4.2.1/src/client.c	2005-03-27 21:10:57.241200236 -0700
@@ -1,4 +1,4 @@
-/*      $Id: client.c,v 1.461.2.11 2005/03/14 19:48:50 olivier Exp $
+/*      $Id: client.c,v 1.461.2.12 2005/03/16 20:38:45 olivier Exp $
  
         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
@@ -3130,18 +3130,14 @@
     g1 = myScreenGrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
     g2 = myScreenGrabPointer (screen_info, ButtonMotionMask | ButtonReleaseMask, 
                               cursor, myDisplayGetCurrentTime (display_info));
-    if (((passdata.use_keys) && !g1) || !g2)
+    if (!g1 || !g2)
     {
         TRACE ("grab failed in clientMove");
+
         gdk_beep ();
-        if ((passdata.use_keys) && g1)
-        {
-            myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
-        }
-        if (g2)
-        {
-            myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
-        }
+        myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
+        myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
+
         return;
     }
 
@@ -3592,18 +3588,14 @@
                               myDisplayGetCursorResize(display_info, passdata.corner), 
                               myDisplayGetCurrentTime (display_info));
 
-    if (((passdata.use_keys) && !g1) || !g2)
+    if (!g1 || !g2)
     {
         TRACE ("grab failed in clientResize");
+
         gdk_beep ();
-        if ((passdata.use_keys) && (g1 == GrabSuccess))
-        {
-            myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
-        }
-        if (g2 == GrabSuccess)
-        {
-            myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
-        }
+        myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
+        myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
+
         return;
     }
 
@@ -3799,15 +3791,11 @@
     if (!g1 || !g2)
     {
         TRACE ("grab failed in clientCycle");
+
         gdk_beep ();
-        if (g1 == GrabSuccess)
-        {
-            myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
-        }
-        if (g2 == GrabSuccess)
-        {
-            myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
-        }
+        myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
+        myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
+
         return;
     }
 
diff -Nur xfwm4-4.2.1.orig/src/events.c xfwm4-4.2.1/src/events.c
--- xfwm4-4.2.1.orig/src/events.c	2005-02-12 14:29:37.000000000 -0700
+++ xfwm4-4.2.1/src/events.c	2005-03-27 21:10:57.244199772 -0700
@@ -1,4 +1,4 @@
-/*      $Id: events.c,v 1.297.2.2 2005/02/12 21:29:37 olivier Exp $
+/*      $Id: events.c,v 1.297.2.3 2005/03/22 22:37:42 olivier Exp $
  
         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
@@ -205,6 +205,7 @@
     {
         TRACE ("grab failed in typeOfClick");
         gdk_beep ();
+        myScreenUngrabPointer (screen_info, ev->xbutton.time);
         return XFWM_BUTTON_UNDEFINED;
     }
 
diff -Nur xfwm4-4.2.1.orig/src/stacking.c xfwm4-4.2.1/src/stacking.c
--- xfwm4-4.2.1.orig/src/stacking.c	2005-02-08 15:16:11.000000000 -0700
+++ xfwm4-4.2.1/src/stacking.c	2005-03-27 21:10:57.245199617 -0700
@@ -1,4 +1,4 @@
-/*      $Id: stacking.c,v 1.26.2.2 2005/02/08 22:16:11 olivier Exp $
+/*      $Id: stacking.c,v 1.26.2.3 2005/03/27 19:32:37 olivier Exp $
  
         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
@@ -240,7 +240,7 @@
     Client *c = NULL;
     Client *c2 = NULL;
 
-    TRACE ("entering clientAtPos");
+    TRACE ("entering clientAtPosition");
 
     for (index = g_list_last (screen_info->windows_stack); index; index = g_list_previous (index))
     {
@@ -252,8 +252,8 @@
                 && (c2 != exclude))
             {
                 c = c2;
+        	break;
             }
-            break;
         }
     }
 


Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfwm4.spec	25 Mar 2005 21:14:14 -0000	1.5
+++ xfwm4.spec	28 Mar 2005 04:55:01 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.2.1
-Release: 4.fc4
+Release: 5.fc4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2
@@ -9,6 +9,7 @@
 # Change default for Fedora
 Patch0: xfwm4-bluecurve-prep.patch
 Patch1: xfwm4-bluecurve.patch
+Patch2: xfwm4-focus-bug.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +29,7 @@
 
 %patch0 -p1 -b .bluecurve-prep
 %patch1 -p1 -b .bluecurve
+%patch2 -p1 -b .focus
 
 %build
 %configure
@@ -58,6 +60,9 @@
 %{_datadir}/themes
 
 %changelog
+* Sun Mar 27 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-5.fc4
+- Add patch for focus issue (bug #152299)
+
 * Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
 - lowercase Release
 



From fedora-extras-commits at redhat.com  Mon Mar 28 09:27:49 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 28 Mar 2005 04:27:49 -0500
Subject: devel/jabberd jabberd.sysconfig,NONE,1.1
Message-ID: <200503280927.j2S9RnnT014306@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14300

Added Files:
	jabberd.sysconfig 
Log Message:
/etc/sysconfig/jabberd



--- NEW FILE jabberd.sysconfig ---
# __SYSCONF__/jabberd
# this files controls which daemons are started by the jabberd startscript
#
# the following example shows a configuration for a startup of jabberd daemons
# necessary for a jabberd server running on one host
# START_DAEMONS="router resolver sm c2s s2s"
START_DAEMONS="router resolver sm c2s s2s"



From fedora-extras-commits at redhat.com  Mon Mar 28 15:23:39 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 28 Mar 2005 10:23:39 -0500
Subject: rpms/enchant/devel enchant.spec, 1.1,
	1.2 enchant-1.1.5-manpage.patch, 1.1, NONE
Message-ID: <200503281523.j2SFNdiV020423@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20413

Modified Files:
	enchant.spec 
Removed Files:
	enchant-1.1.5-manpage.patch 
Log Message:
Update enchant to 1.1.6




Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/enchant.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- enchant.spec	14 Mar 2005 22:34:59 -0000	1.1
+++ enchant.spec	28 Mar 2005 15:23:37 -0000	1.2
@@ -1,19 +1,17 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.1.5
-Release: 3
+Version: 1.1.6
+Release: 1
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
-Source: http://prdownloads.sourceforge.net/abiword/enchant-%{version}.tar.gz
+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
 
-Patch0: enchant-1.1.5-manpage.patch
-
 %description
 A library that wraps other spell checking backends.
 
@@ -27,7 +25,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .manpage
 
 %build
 %configure --disable-ispell
@@ -64,13 +61,18 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
-* Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.15-3
+* Mon Mar 28 2005 Marc Maurer <uwog at abisource.com> 1:1.1.6-1
+- update to 1.1.6
+- drop the manpage patch (RH#145010#)
+- fix version numbers in the spec changelog
+
+* Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.5-3
 - rebuild with gcc4
 
-* Fri Jan 14 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.15-2
+* Fri Jan 14 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.5-2
 - RH#145010# misformatted manpage
 
-* Mon Dec 20 2004 Caolan McNamara <caolanm at redhat.com> 1:1.1.15-1
+* Mon Dec 20 2004 Caolan McNamara <caolanm at redhat.com> 1:1.1.5-1
 - initial fedora import
 
 * Sun Aug 24 2003 Rui Miguel Seabra <rms at 1407.org>


--- enchant-1.1.5-manpage.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 28 15:26:01 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 28 Mar 2005 10:26:01 -0500
Subject: rpms/enchant/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200503281526.j2SFQ10B020470@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20464

Modified Files:
	.cvsignore sources 
Log Message:
Add enchant-1.1.6.tar.gz




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2005 22:34:59 -0000	1.2
+++ .cvsignore	28 Mar 2005 15:25:59 -0000	1.3
@@ -1 +1,2 @@
 enchant-1.1.5.tar.gz
+enchant-1.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2005 22:34:59 -0000	1.2
+++ sources	28 Mar 2005 15:25:59 -0000	1.3
@@ -1 +1,2 @@
 b7f266ca9241797839929972395a76cf  enchant-1.1.5.tar.gz
+57727c23059e260a2c116c40f005439c  enchant-1.1.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 28 16:27:45 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 28 Mar 2005 11:27:45 -0500
Subject: rpms/tla/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tla.spec, 1.9,
	1.10
Message-ID: <200503281627.j2SGRjCO021545@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/tla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21526

Modified Files:
	.cvsignore sources tla.spec 
Log Message:
Update to 1.3.1-fix-1 for segfault fix



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Mar 2005 20:01:07 -0000	1.5
+++ .cvsignore	28 Mar 2005 16:27:43 -0000	1.6
@@ -1,2 +1,2 @@
-tla-1.3.1.tar.gz
-tla-1.3.1.tar.gz.sig
+tla-1.3.1-fix-1.tar.gz
+tla-1.3.1-fix-1.tar.gz.sig


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Mar 2005 20:01:07 -0000	1.5
+++ sources	28 Mar 2005 16:27:43 -0000	1.6
@@ -1,2 +1,2 @@
-e3e2a92b9ddd9221d70bdd9134ae45d6  tla-1.3.1.tar.gz
-c199bae883584950cd1464ea69e25077  tla-1.3.1.tar.gz.sig
+bab3b300176c5d038e190602eac40e86  tla-1.3.1-fix-1.tar.gz
+3c24ed067763fec10a3bdb22f8a78665  tla-1.3.1-fix-1.tar.gz.sig


Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tla.spec	23 Mar 2005 15:52:29 -0000	1.9
+++ tla.spec	28 Mar 2005 16:27:43 -0000	1.10
@@ -1,13 +1,13 @@
 Name:           tla
 Version:        1.3.1
-Release:        3
+Release:        4.fix.1
 Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://www.gnu.org/software/gnu-arch/
-Source0:        http://ftp.gnu.org/gnu/gnu-arch/%{name}-%{version}.tar.gz
-Source1:        http://ftp.gnu.org/gnu/gnu-arch/%{name}-%{version}.tar.gz.sig
+Source0:        http://ftp.gnu.org/gnu/gnu-arch/tla-1.3.1-fix-1.tar.gz
+Source1:        http://ftp.gnu.org/gnu/gnu-arch/tla-1.3.1-fix-1.tar.gz.sig
 # Patch0 from SuSE 9.1's tla-1.2-15
 Patch0:         tla-1.2pre0-posix.patch
 # Patch1,3 from ALT Linux's tla-1.2-alt6
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n tla-1.3.1-fix-1
 cd src
 %patch0 -p0
 cd ..
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Mar 28 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.1-4.fix.1
+- Update to 1.3.1-fix-1 (hopefully fix PPC segfault)
+
 * Wed Mar 23 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.1-3
 - gcc4 build fixes
 



From fedora-extras-commits at redhat.com  Mon Mar 28 17:34:06 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 28 Mar 2005 12:34:06 -0500
Subject: devel/jabberd jabberd.sysconfig,1.1,1.2
Message-ID: <200503281734.j2SHY6B7022578@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22570

Modified Files:
	jabberd.sysconfig 
Log Message:
added some information about the different jabberd processes



Index: jabberd.sysconfig
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jabberd.sysconfig	28 Mar 2005 09:27:47 -0000	1.1
+++ jabberd.sysconfig	28 Mar 2005 17:34:04 -0000	1.2
@@ -4,4 +4,12 @@
 # the following example shows a configuration for a startup of jabberd daemons
 # necessary for a jabberd server running on one host
 # START_DAEMONS="router resolver sm c2s s2s"
+#
+# a jabberd server consists of:
+# * router
+# * resolver
+# * sm (Session Manager)
+# * c2s (Client to Server)
+# * s2s (Server to Server)
+#
 START_DAEMONS="router resolver sm c2s s2s"



From fedora-extras-commits at redhat.com  Mon Mar 28 17:35:05 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 28 Mar 2005 12:35:05 -0500
Subject: devel/jabberd jabberd.spec,1.6,1.7
Message-ID: <200503281735.j2SHZ5Iq022615@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22609

Modified Files:
	jabberd.spec 
Log Message:
* combined some of the sed magic
* added a jabberd file in sysconfig to control if all daemons should be started



Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jabberd.spec	26 Mar 2005 08:47:53 -0000	1.6
+++ jabberd.spec	28 Mar 2005 17:35:03 -0000	1.7
@@ -6,6 +6,7 @@
 Group: System Environment/Daemons
 Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s6.tar.gz
 Source1: jabberd
+Source2: jabberd.sysconfig
 URL: http://jabberd.jabberstudio.org/2/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel libidn-devel
@@ -63,16 +64,20 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 %{__install} -p -m 644 tools/db-setup.mysql $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -p -m 644 tools/db-setup.pgsql $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -p -m 644 tools/migrate.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -p -m 644 tools/pipe-auth.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
+%{__install} -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
 
 %{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
             -e "s,__ETCDIR__,%{sysconfdir},g" \
             -e "s,__PIDDIR__,%{_var}/lib/jabberd/pid,g" \
-		$RPM_BUILD_ROOT%{_initrddir}/%{name}
+            -e "s,__SYSCONF__,%{_sysconfdir}/sysconfig,g" \
+		$RPM_BUILD_ROOT%{_initrddir}/%{name} \
+		$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
 
 %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/jabberd << END
 #%PAM-1.0
@@ -83,23 +88,20 @@
 END
 
 #default driver for storage
-%{__sed} -i -e "s,<driver>mysql</driver>,<driver>db</driver>,g" \
-	$RPM_BUILD_ROOT%{sysconfdir}/sm.xml
+#the default pam backend needs auto creation of accounts
+%{__sed} -i -e ':a;N;$!ba' \
+            -e 's,<driver>mysql</driver>,<driver>db</driver>,g' \
+            -e 's,<!--\n    <auto-create/>\n    -->,<auto-create/>,g' \
+		$RPM_BUILD_ROOT%{sysconfdir}/sm.xml
 
 #default authentication backend
-%{__sed} -i -e "s,<module>mysql</module>,<module>pam</module>,g" \
-	$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
-
 #enable SSL certificate
-%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <pemfile>/etc/jabberd/server.pem</pemfile>\n    -->,<pemfile>/etc/jabberd/server.pem</pemfile>,g' $RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
-
-#the default pam backend needs auto creation of accounts
-%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <auto-create/>\n    -->,<auto-create/>,g' \
-	$RPM_BUILD_ROOT%{sysconfdir}/sm.xml
-
 #clients must do STARTTLS
-%{__sed} -i -e  ':a;N;$!ba;s,<!--\n    <require-startls/>\n    -->,<require-startls/>,g' \
-	$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
+%{__sed} -i -e ':a;N;$!ba' \
+            -e 's,<module>mysql</module>,<module>pam</module>,g' \
+            -e 's,<!--\n    <pemfile>/etc/jabberd/server.pem</pemfile>\n    -->,<pemfile>/etc/jabberd/server.pem</pemfile>,g' \
+            -e 's,<!--\n    <require-starttls/>\n    -->,<require-starttls/>,g' \
+		$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
 
 #ghost file
 touch $RPM_BUILD_ROOT%{sysconfdir}/server.pem
@@ -168,6 +170,7 @@
 %{_datadir}/%{name}/
 %config %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/pam.d/jabberd
+%config(noreplace) %{_sysconfdir}/sysconfig/jabberd
 %attr(-,jabber,jabber) %{_var}/lib/jabberd
 %ghost %{_sysconfdir}/jabberd/server.pem
 
@@ -180,6 +183,9 @@
 - removed noreplace for start script
 - make backends optional during build
 - use -p with the install command
+- combined some of the sed magic
+- added a jabberd file in sysconfig to control if all daemons
+  should be started
 
 * Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
 - made password more random (/dev/random)



From fedora-extras-commits at redhat.com  Mon Mar 28 17:35:58 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 28 Mar 2005 12:35:58 -0500
Subject: devel/jabberd jabberd,1.3,1.4
Message-ID: <200503281735.j2SHZwAV022652@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22646

Modified Files:
	jabberd 
Log Message:
script reads config file from sysconfig



Index: jabberd
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jabberd	22 Mar 2005 12:18:13 -0000	1.3
+++ jabberd	28 Mar 2005 17:35:56 -0000	1.4
@@ -8,16 +8,18 @@
 # chkconfig: 2345 85 15
 #
 
-if [ -f /etc/init.d/functions ]; then
-	. /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ]; then
-	. /etc/rc.d/init.d/functions
-else
-	echo "jabberd: unable to locate functions lib. Cannot continue."
-	exit -1
+# source function library
+. /etc/rc.d/init.d/functions
+
+# pull in sysconfig settings
+[ -f __SYSCONF__/jabberd ] && . __SYSCONF__/jabberd
+
+if [ -z "$START_DAEMONS" ]; then
+	START_DAEMONS="router resolver sm c2s s2s"
 fi
+
 #
-progs="router resolver sm c2s s2s"
+progs="$START_DAEMONS"
 progsPath="__BINDIR__"
 confPath="__ETCDIR__"
 pidPath="__PIDDIR__"



From fedora-extras-commits at redhat.com  Mon Mar 28 19:47:56 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 28 Mar 2005 14:47:56 -0500
Subject: devel/pam_mysql pam_mysql.spec,1.3,1.4
Message-ID: <200503281947.j2SJlu6C024979@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/pam_mysql
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24973

Modified Files:
	pam_mysql.spec 
Log Message:
Added zlib-devel to BuildRequires


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/devel/pam_mysql/pam_mysql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pam_mysql.spec	23 Mar 2005 23:22:38 -0000	1.3
+++ pam_mysql.spec	28 Mar 2005 19:47:54 -0000	1.4
@@ -1,13 +1,13 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
 Name:		pam_mysql
 Version:	0.50
-Release:	4
+Release:	5
 License:	GPL
 Group:		Base
 Source0:	http://dl.sf.net/pam-mysql/pam_mysql-0.5.tar.gz
 Patch:		pam_mysql-0.5-vars.patch
 URL:		http://sf.net/projects/pam-mysql/
-BuildRequires:	pam-devel mysql-devel
+BuildRequires:	pam-devel mysql-devel zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,6 +34,9 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Man Mar 28 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-5
+- Added zlib-devel to BuildRequires
+
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-4
 - Fixed build on x86_64
 



From fedora-extras-commits at redhat.com  Mon Mar 28 19:58:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 28 Mar 2005 14:58:30 -0500
Subject: rpms/pam_mysql/FC-3 pam_mysql.spec,1.3,1.4
Message-ID: <200503281958.j2SJwUnE025075@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25069

Modified Files:
	pam_mysql.spec 
Log Message:
Added zlib-devel to BuildRequires


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/FC-3/pam_mysql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pam_mysql.spec	24 Mar 2005 12:43:45 -0000	1.3
+++ pam_mysql.spec	28 Mar 2005 19:58:28 -0000	1.4
@@ -1,13 +1,13 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
 Name:		pam_mysql
 Version:	0.50
-Release:	4
+Release:	5
 License:	GPL
 Group:		Base
 Source0:	http://dl.sf.net/pam-mysql/pam_mysql-0.5.tar.gz
 Patch:		pam_mysql-0.5-vars.patch
 URL:		http://sf.net/projects/pam-mysql/
-BuildRequires:	pam-devel mysql-devel
+BuildRequires:	pam-devel mysql-devel zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,6 +34,9 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Man Mar 28 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-5
+- Added zlib-devel to BuildRequires
+
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-4
 - Fixed build on x86_64
 



From fedora-extras-commits at redhat.com  Mon Mar 28 20:02:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 28 Mar 2005 15:02:39 -0500
Subject: rpms/kphone/FC-3 kphone.spec,1.9,1.10
Message-ID: <200503282002.j2SK2d51025860@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25852

Modified Files:
	kphone.spec 
Log Message:
Import devel changes


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-3/kphone.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kphone.spec	22 Mar 2005 20:48:34 -0000	1.9
+++ kphone.spec	28 Mar 2005 20:02:37 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.1.0
-Release:        9
+Release:        11
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -9,6 +9,7 @@
 Source0:        http://www.wirlab.net/kphone/kphone-4.1.0.tar.gz
 Source1:        kphone.desktop
 Patch0:         kphone-4.1.0-po-hacks.patch
+Patch1:         kphone-4.1.0-endian.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
@@ -22,6 +23,7 @@
 %prep
 %setup -q -n kphone
 %patch -p1 -b .po-hacks
+%patch1 -p1 -b .endian
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -32,11 +34,12 @@
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 install -D -m 0644 icons/large-kphone.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kphone.png
-desktop-file-install --vendor=Fedora \
+desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
   --add-category Application \
   --add-category Internet \
+  --add-category Network \
   --add-category Telephony \
   --add-category Qt \
   %{SOURCE1}
@@ -53,8 +56,14 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Mar 26 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-11
+- Added Network category to desktop entry
+
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-10
+- First attempt to get it working properly on PPC
+
 * Tue Mar 22 2005 Seth Vidal <skvidal at phy.duke.edu> 4.1.0-9
-- add required openssl-devel to buildreqs
+- add openssl-devel to buildreqs
 
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-8
 - %%



From fedora-extras-commits at redhat.com  Mon Mar 28 20:02:51 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Mon, 28 Mar 2005 15:02:51 -0500
Subject: rpms/pam_mysql/FC-3 pam_mysql.spec,1.4,1.5
Message-ID: <200503282002.j2SK2pMg025888@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/pam_mysql/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25871

Modified Files:
	pam_mysql.spec 
Log Message:

fix typo in Changelog: Man->Mon



Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/FC-3/pam_mysql.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pam_mysql.spec	28 Mar 2005 19:58:28 -0000	1.4
+++ pam_mysql.spec	28 Mar 2005 20:02:49 -0000	1.5
@@ -34,7 +34,7 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
-* Man Mar 28 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-5
+* Mon Mar 28 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-5
 - Added zlib-devel to BuildRequires
 
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-4



From fedora-extras-commits at redhat.com  Mon Mar 28 20:03:24 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 28 Mar 2005 15:03:24 -0500
Subject: rpms/kphone/FC-3 kphone-4.1.0-endian.patch,NONE,1.1
Message-ID: <200503282003.j2SK3O2h025941@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/kphone/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25935

Added Files:
	kphone-4.1.0-endian.patch 
Log Message:
Need the patch too

kphone-4.1.0-endian.patch:

--- NEW FILE kphone-4.1.0-endian.patch ---
--- kphone/kphone/rtpdataheader.h.orig	2005-03-23 20:50:01.904726865 -0500
+++ kphone/kphone/rtpdataheader.h	2005-03-23 20:52:47.669099809 -0500
@@ -1,25 +1,24 @@
 #ifndef RTPDATAHEADER_H
 #define RTPDATAHEADER_H
 
+#include <endian.h>
+
 // For 32bit intel machines
 typedef short int16;
 typedef int   int32;
 typedef unsigned int u_int32;
 typedef unsigned short u_int16;
 
-#define RTP_BIG_ENDIAN 0
-#define RTP_LITTLE_ENDIAN 1
-
 //  RTP data header
 typedef __attribute__ ((__packed__)) struct {
-#if RTP_BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
 	unsigned int version:2;         // protocol version
 	unsigned int p:1;               // padding flag
 	unsigned int x:1;               // header extension flag
 	unsigned int cc:4;              // CSRC count
 	unsigned int m:1;               // marker bit
 	unsigned int pt:7;              // payload type
-#elif RTP_LITTLE_ENDIAN
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
 	unsigned int cc:4;              // CSRC count
 	unsigned int x:1;               // header extension flag
 	unsigned int p:1;               // padding flag
@@ -27,7 +26,7 @@
 	unsigned int pt:7;              // payload type
 	unsigned int m:1;               // marker bit
 #else
-#error Define one of RTP_LITTLE_ENDIAN or RTP_BIG_ENDIAN
+#error Unusable endianness detected
 #endif
 	unsigned int seq:16;            // sequence number
 	u_int32 ts;                     // timestamp 32bits



From fedora-extras-commits at redhat.com  Mon Mar 28 20:09:08 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 28 Mar 2005 15:09:08 -0500
Subject: rpms/pam_mysql/devel pam_mysql.spec,1.4,1.5
Message-ID: <200503282009.j2SK98Ce026094@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26088/devel

Modified Files:
	pam_mysql.spec 
Log Message:
Yes, it's Monday. How did you guess?


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/devel/pam_mysql.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pam_mysql.spec	28 Mar 2005 19:47:54 -0000	1.4
+++ pam_mysql.spec	28 Mar 2005 20:09:06 -0000	1.5
@@ -34,7 +34,7 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
-* Man Mar 28 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-5
+* Mon Mar 28 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-5
 - Added zlib-devel to BuildRequires
 
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-4



From fedora-extras-commits at redhat.com  Mon Mar 28 20:51:14 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 28 Mar 2005 15:51:14 -0500
Subject: rpms/ktrack/FC-3 ktrack.spec,1.9,1.10
Message-ID: <200503282051.j2SKpEcB026239@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/ktrack/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26233

Modified Files:
	ktrack.spec 
Log Message:
* Sat Mar 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.3.0-9.rc1.fc3
- Pass Qt library/header location to configure script to work around
  broken Qt detection on x86_64.




Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/rpms/ktrack/FC-3/ktrack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ktrack.spec	26 Mar 2005 17:35:01 -0000	1.9
+++ ktrack.spec	28 Mar 2005 20:51:11 -0000	1.10
@@ -1,13 +1,12 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 8.rc1
+Release: 9.rc1.fc3
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
 Patch: ktrack-headers.patch
 BuildRequires: desktop-file-utils kdelibs-devel >= 3.3 hamlib-devel
-BuildRequires: qt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -22,13 +21,14 @@
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-%configure --disable-rpath
+%configure --disable-rpath \
+    --with-qt-libraries=${QTDIR}/lib --with-qt-includes=${QTDIR}/include
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-desktop-file-install --vendor=Fedora \
+desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
   --add-category Application \
@@ -54,11 +54,15 @@
 %{_datadir}/icons/locolor/32x32/apps/ktrack.png
 %{_datadir}/locale/de/LC_MESSAGES/ktrack.mo
 %{_datadir}/locale/fr/LC_MESSAGES/ktrack.mo
-%{_datadir}/applications/Fedora-ktrack.desktop
+%{_datadir}/applications/fedora-ktrack.desktop
 %{_datadir}/pixmaps/ktrack.png
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Sat Mar 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.3.0-9.rc1.fc3
+- Pass Qt library/header location to configure script to work around
+  broken Qt detection on x86_64.
+
 * Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.3.0-8.rc1
 - Use $QTDIR instead of hard-coding paths
 



From fedora-extras-commits at redhat.com  Mon Mar 28 20:52:04 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 28 Mar 2005 15:52:04 -0500
Subject: devel/ktrack ktrack.spec,1.9,1.10
Message-ID: <200503282052.j2SKq4xu026269@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/ktrack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26263

Modified Files:
	ktrack.spec 
Log Message:
ktrack is available for FC3 Extras, too, so release versions should differ


Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/devel/ktrack/ktrack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ktrack.spec	26 Mar 2005 19:24:55 -0000	1.9
+++ ktrack.spec	28 Mar 2005 20:52:02 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 9.rc1
+Release: 9.rc1.fc4
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -59,7 +59,7 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
-* Sat Mar 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.3.0-9.rc1
+* Sat Mar 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.3.0-9.rc1.fc4
 - Pass Qt library/header location to configure script to work around
   broken Qt detection on x86_64.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 14:21:18 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 29 Mar 2005 09:21:18 -0500
Subject: rpms/tetex-xcolor/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tetex-xcolor.spec, 1.1, 1.2
Message-ID: <200503291421.j2TELIEu013234@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13224/FC-3

Modified Files:
	.cvsignore sources tetex-xcolor.spec 
Log Message:
Update to 2.02.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Mar 2005 02:03:24 -0000	1.2
+++ .cvsignore	29 Mar 2005 14:21:16 -0000	1.3
@@ -1 +1 @@
-xcolor-2.01-20050323.tar.gz
+xcolor-2.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Mar 2005 02:03:24 -0000	1.2
+++ sources	29 Mar 2005 14:21:16 -0000	1.3
@@ -1 +1 @@
-d60c7a02fc9f04b785f31c96c1fd8d4d  xcolor-2.01-20050323.tar.gz
+d0520f50a8f8aebabe3a7a39b73a1f24  xcolor-2.02.tar.gz


Index: tetex-xcolor.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/tetex-xcolor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tetex-xcolor.spec	24 Mar 2005 02:03:24 -0000	1.1
+++ tetex-xcolor.spec	29 Mar 2005 14:21:16 -0000	1.2
@@ -5,7 +5,7 @@
 %define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        2.01
+Version:        2.02
 Release:        1
 Summary:        Driver-independent color extensions for LaTeX and pdfLaTeX
 
@@ -14,7 +14,7 @@
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/xcolor.html
 # DANTE generates CTAN packages tarballs on-the-fly
 # ftp://ftp.dante.de/tex-archive/macros/latex/contrib/xcolor.tar.gz
-Source0:        xcolor-2.01-20050323.tar.gz
+Source0:        xcolor-2.02.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Mar 28 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.02-1
+- Update to 2.02.
+
 * Wed Mar 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.01-1
 - Update to 2.01.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 14:21:18 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 29 Mar 2005 09:21:18 -0500
Subject: rpms/tetex-xcolor/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tetex-xcolor.spec, 1.1, 1.2
Message-ID: <200503291421.j2TELIjn013239@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13224/devel

Modified Files:
	.cvsignore sources tetex-xcolor.spec 
Log Message:
Update to 2.02.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Mar 2005 02:03:24 -0000	1.2
+++ .cvsignore	29 Mar 2005 14:21:16 -0000	1.3
@@ -1 +1 @@
-xcolor-2.01-20050323.tar.gz
+xcolor-2.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Mar 2005 02:03:24 -0000	1.2
+++ sources	29 Mar 2005 14:21:16 -0000	1.3
@@ -1 +1 @@
-d60c7a02fc9f04b785f31c96c1fd8d4d  xcolor-2.01-20050323.tar.gz
+d0520f50a8f8aebabe3a7a39b73a1f24  xcolor-2.02.tar.gz


Index: tetex-xcolor.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/devel/tetex-xcolor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tetex-xcolor.spec	24 Mar 2005 02:03:24 -0000	1.1
+++ tetex-xcolor.spec	29 Mar 2005 14:21:16 -0000	1.2
@@ -5,7 +5,7 @@
 %define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        2.01
+Version:        2.02
 Release:        1
 Summary:        Driver-independent color extensions for LaTeX and pdfLaTeX
 
@@ -14,7 +14,7 @@
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/xcolor.html
 # DANTE generates CTAN packages tarballs on-the-fly
 # ftp://ftp.dante.de/tex-archive/macros/latex/contrib/xcolor.tar.gz
-Source0:        xcolor-2.01-20050323.tar.gz
+Source0:        xcolor-2.02.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Mar 28 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.02-1
+- Update to 2.02.
+
 * Wed Mar 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.01-1
 - Update to 2.01.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 14:51:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 29 Mar 2005 09:51:21 -0500
Subject: rpms/perl-ExtUtils-ParseXS/FC-3 .cvsignore, 1.2,
	1.3 perl-ExtUtils-ParseXS.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200503291451.j2TEpL5J013420@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13410/FC-3

Modified Files:
	.cvsignore perl-ExtUtils-ParseXS.spec sources 
Log Message:
Update to 2.09.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:59:56 -0000	1.2
+++ .cvsignore	29 Mar 2005 14:51:18 -0000	1.3
@@ -1 +1 @@
-ExtUtils-ParseXS-2.08.tar.gz
+ExtUtils-ParseXS-2.09.tar.gz


Index: perl-ExtUtils-ParseXS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-3/perl-ExtUtils-ParseXS.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-ExtUtils-ParseXS.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-ExtUtils-ParseXS.spec	29 Mar 2005 14:51:18 -0000	1.5
@@ -1,15 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-ExtUtils-ParseXS
-Version:        2.08
-Release:        2
-Epoch:          0
+Version:        2.09
+Release:        1
 Summary:        Module and a script for converting Perl XS code into C code
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-ParseXS/
-Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-2.08.tar.gz
+Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-2.09.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -56,6 +55,9 @@
 
 
 %changelog
+* Tue Mar 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-1
+- Update to 2.09.
+
 * Sat May 15 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:2.08-0.fdr.2
 - Avoid creation of the perllocal.pod file (make pure_install).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:59:56 -0000	1.2
+++ sources	29 Mar 2005 14:51:18 -0000	1.3
@@ -1 +1 @@
-96a63d75e5ff2e2665ee97370690068a  ExtUtils-ParseXS-2.08.tar.gz
+6320ff9a597d9fdf1660a35724d7f3c1  ExtUtils-ParseXS-2.09.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 29 14:51:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 29 Mar 2005 09:51:21 -0500
Subject: rpms/perl-ExtUtils-ParseXS/devel .cvsignore, 1.2,
	1.3 perl-ExtUtils-ParseXS.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200503291451.j2TEpLKn013425@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13410/devel

Modified Files:
	.cvsignore perl-ExtUtils-ParseXS.spec sources 
Log Message:
Update to 2.09.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:59:56 -0000	1.2
+++ .cvsignore	29 Mar 2005 14:51:18 -0000	1.3
@@ -1 +1 @@
-ExtUtils-ParseXS-2.08.tar.gz
+ExtUtils-ParseXS-2.09.tar.gz


Index: perl-ExtUtils-ParseXS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/perl-ExtUtils-ParseXS.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-ExtUtils-ParseXS.spec	3 Mar 2005 23:46:26 -0000	1.5
+++ perl-ExtUtils-ParseXS.spec	29 Mar 2005 14:51:18 -0000	1.6
@@ -1,14 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-ExtUtils-ParseXS
-Version:        2.08
-Release:        2
+Version:        2.09
+Release:        1
 Summary:        Module and a script for converting Perl XS code into C code
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-ParseXS/
-Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-2.08.tar.gz
+Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-2.09.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Tue Mar 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-1
+- Update to 2.09.
+
 * Sat May 15 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:2.08-0.fdr.2
 - Avoid creation of the perllocal.pod file (make pure_install).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:59:56 -0000	1.2
+++ sources	29 Mar 2005 14:51:19 -0000	1.3
@@ -1 +1 @@
-96a63d75e5ff2e2665ee97370690068a  ExtUtils-ParseXS-2.08.tar.gz
+6320ff9a597d9fdf1660a35724d7f3c1  ExtUtils-ParseXS-2.09.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 29 15:04:44 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 29 Mar 2005 10:04:44 -0500
Subject: rpms/perl-Test-Manifest/FC-3 .cvsignore, 1.4,
	1.5 perl-Test-Manifest.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200503291504.j2TF4iZ7014454@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Manifest/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14444/FC-3

Modified Files:
	.cvsignore perl-Test-Manifest.spec sources 
Log Message:
Update to 1.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Mar 2005 13:00:42 -0000	1.4
+++ .cvsignore	29 Mar 2005 15:04:42 -0000	1.5
@@ -1 +1 @@
-Test-Manifest-1.13.tar.gz
+Test-Manifest-1.14.tar.gz


Index: perl-Test-Manifest.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/FC-3/perl-Test-Manifest.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-Manifest.spec	23 Mar 2005 13:00:42 -0000	1.5
+++ perl-Test-Manifest.spec	29 Mar 2005 15:04:42 -0000	1.6
@@ -1,14 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Test-Manifest
-Version:        1.13
+Version:        1.14
 Release:        1
 Summary:        Test case module for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Test-Manifest/
-Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.13.tar.gz
+Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.14.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Mar 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-1
+- Update to 1.14.
+
 * Wed Mar 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
 - Update to 1.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Mar 2005 13:00:42 -0000	1.4
+++ sources	29 Mar 2005 15:04:42 -0000	1.5
@@ -1 +1 @@
-620d7172ff66a9dbe8f08c629ab5e521  Test-Manifest-1.13.tar.gz
+4b0a8c9789b65647024e62cd1ee1fb8f  Test-Manifest-1.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 29 15:04:44 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 29 Mar 2005 10:04:44 -0500
Subject: rpms/perl-Test-Manifest/devel .cvsignore, 1.4,
	1.5 perl-Test-Manifest.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200503291504.j2TF4iCO014459@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Manifest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14444/devel

Modified Files:
	.cvsignore perl-Test-Manifest.spec sources 
Log Message:
Update to 1.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Mar 2005 13:00:42 -0000	1.4
+++ .cvsignore	29 Mar 2005 15:04:42 -0000	1.5
@@ -1 +1 @@
-Test-Manifest-1.13.tar.gz
+Test-Manifest-1.14.tar.gz


Index: perl-Test-Manifest.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/perl-Test-Manifest.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Test-Manifest.spec	23 Mar 2005 13:00:42 -0000	1.7
+++ perl-Test-Manifest.spec	29 Mar 2005 15:04:42 -0000	1.8
@@ -1,14 +1,14 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Test-Manifest
-Version:        1.13
+Version:        1.14
 Release:        1
 Summary:        Test case module for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Test-Manifest/
-Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.13.tar.gz
+Source0:    http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Manifest-1.14.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Mar 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-1
+- Update to 1.14.
+
 * Wed Mar 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
 - Update to 1.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Manifest/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Mar 2005 13:00:42 -0000	1.4
+++ sources	29 Mar 2005 15:04:42 -0000	1.5
@@ -1 +1 @@
-620d7172ff66a9dbe8f08c629ab5e521  Test-Manifest-1.13.tar.gz
+4b0a8c9789b65647024e62cd1ee1fb8f  Test-Manifest-1.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 29 15:27:25 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 29 Mar 2005 10:27:25 -0500
Subject: rpms/pure-ftpd/devel pure-ftpd.pure-ftpwho.consoleapp, NONE,
	1.1 pure-ftpd.pure-ftpwho.pam, NONE, 1.1
Message-ID: <200503291527.j2TFROow014646@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14636/devel

Added Files:
	pure-ftpd.pure-ftpwho.consoleapp pure-ftpd.pure-ftpwho.pam 
Log Message:
- add missing usermode files



--- NEW FILE pure-ftpd.pure-ftpwho.consoleapp ---
USER=root
PROGRAM=/usr/sbin/pure-ftpwho
GUI=no


--- NEW FILE pure-ftpd.pure-ftpwho.pam ---
#%PAM-1.0
auth       sufficient   pam_rootok.so
auth       required     pam_localuser.so
account    required     pam_permit.so



From fedora-extras-commits at redhat.com  Tue Mar 29 15:27:53 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 29 Mar 2005 10:27:53 -0500
Subject: devel/ufraw ufraw.spec,1.3,1.4
Message-ID: <200503291527.j2TFRr1S014676@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/devel/ufraw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14652

Modified Files:
	ufraw.spec 
Log Message:
buildreq for libtiff-devel and libjpeg-devel




Index: ufraw.spec
===================================================================
RCS file: /cvs/extras/devel/ufraw/ufraw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ufraw.spec	24 Mar 2005 14:34:10 -0000	1.3
+++ ufraw.spec	29 Mar 2005 15:27:51 -0000	1.4
@@ -13,6 +13,8 @@
 BuildRequires: gimp-devel >= 2.0
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: lcms-devel
+BuildRequires: libtiff-devel 
+BuildRequires: libjpeg-devel
 BuildRequires: pkgconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 
@@ -41,6 +43,9 @@
 %{gimpplugindir}/ufraw-gimp
 
 %changelog
+* Tue Mar 29 2005 Seth Vidal <skvidal at phy.duke.edu> - 0.4-1
+- buildrequire libtiff-devel and libjpeg-devel
+
 * Thu Mar 24 2005 Nils Philippsen <nphilipp at redhat.com> - 0.4-1
 - buildrequire lcms-devel
 - trim summary



From fedora-extras-commits at redhat.com  Tue Mar 29 15:39:11 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 29 Mar 2005 10:39:11 -0500
Subject: extras-buildsys-temp/scripts mach.in,1.2,1.3
Message-ID: <200503291539.j2TFdBsj014737@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/extras-buildsys-temp/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14724/scripts

Modified Files:
	mach.in 
Log Message:

make output on failure a little more useful



Index: mach.in
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/scripts/mach.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mach.in	24 Mar 2005 05:03:58 -0000	1.2
+++ mach.in	29 Mar 2005 15:39:09 -0000	1.3
@@ -524,7 +524,7 @@
         
         if message and not progress: self.stdout('\n')
         if status != 0:
-            raise self.Error, "Could not run: %s" % command
+            raise self.Error, "Could not run: %s output was:\n %s" % (command, output)
 
     def group_installer (self, groups, message = None,
                 progress = False, interactive = False):



From fedora-extras-commits at redhat.com  Tue Mar 29 17:37:45 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 29 Mar 2005 12:37:45 -0500
Subject: rpms/alsa-tools/FC-3 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200503291737.j2THbj8C017085@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/alsa-tools/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17079

Modified Files:
	.cvsignore sources 
Log Message:
Add missing sources; sorry skvidal for missing them on the first commit


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:01:52 -0000	1.2
+++ .cvsignore	29 Mar 2005 17:37:43 -0000	1.3
@@ -1 +1 @@
-alsa-tools-1.0.4.tar.bz2
+alsa-tools-1.0.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:01:52 -0000	1.2
+++ sources	29 Mar 2005 17:37:43 -0000	1.3
@@ -1 +1 @@
-c901a79e60a42f82f07f7a77cb45691a  alsa-tools-1.0.4.tar.bz2
+d8047c270d7033c00f1f64cde0f67d99  alsa-tools-1.0.6.tar.bz2



From fedora-extras-commits at redhat.com  Tue Mar 29 18:13:40 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 29 Mar 2005 13:13:40 -0500
Subject: rpms/contact-lookup-applet import.log,1.2,1.3
Message-ID: <200503291813.j2TIDexc018140@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18131

Modified Files:
	import.log 
Log Message:
auto-import contact-lookup-applet-0.11-1 on branch devel from contact-lookup-applet-0.11-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	24 Mar 2005 18:58:55 -0000	1.2
+++ import.log	29 Mar 2005 18:13:38 -0000	1.3
@@ -1 +1,2 @@
 contact-lookup-applet-0_10-2:HEAD:contact-lookup-applet-0.10-2.src.rpm:1111690728
+contact-lookup-applet-0_11-1:HEAD:contact-lookup-applet-0.11-1.src.rpm:1112120013



From fedora-extras-commits at redhat.com  Tue Mar 29 18:13:40 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 29 Mar 2005 13:13:40 -0500
Subject: rpms/contact-lookup-applet/devel .cvsignore, 1.2,
	1.3 contact-lookup-applet.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200503291813.j2TIDeEU018144@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-serv18131/devel

Modified Files:
	.cvsignore contact-lookup-applet.spec sources 
Log Message:
auto-import contact-lookup-applet-0.11-1 on branch devel from contact-lookup-applet-0.11-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Mar 2005 18:58:55 -0000	1.2
+++ .cvsignore	29 Mar 2005 18:13:38 -0000	1.3
@@ -1 +1 @@
-contact-lookup-applet-0.10.tar.gz
+contact-lookup-applet-0.11.tar.gz


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- contact-lookup-applet.spec	24 Mar 2005 18:58:55 -0000	1.1
+++ contact-lookup-applet.spec	29 Mar 2005 18:13:38 -0000	1.2
@@ -1,19 +1,18 @@
-Name:           contact-lookup-applet
-Version:        0.10
-Release:        2
-Summary:        Contact Lookup Applet
-
-Group:          Applications/Communications
-License:        GPL
-URL:            http://www.burtonini.com/blog/2004/Oct/27/
-Source0:        http://www.burtonini.com/computing/contact-lookup-applet-0.10.tar.gz        
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gtk2-devel >= 2.4.0
-BuildRequires:  libgnomeui-devel >= 2.7.92
-BuildRequires:  gnome-panel-devel >= 2.7.90
-BuildRequires:  evolution-data-server-devel >= 1.0.0
-BuildRequires: 	gettext
+Name:		contact-lookup-applet
+Version:	0.11
+Release:	1
+Summary:	Contact Lookup Applet
+
+Group:		Applications/Communications
+License:	GPL
+URL:		http://www.burtonini.com/blog/computers/contact-lookup-applet-0.11
+Source0:	http://www.burtonini.com/computing/contact-lookup-applet-0.11.tar.gz       
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	libgnomeui-devel >= 2.7.92
+BuildRequires:	gnome-panel-devel >= 2.9.4
+BuildRequires:	evolution-data-server-devel >= 1.2.0
+BuildRequires:	gettext
 
 %description
 This applet allows you to search your Evolution 2 address book for people. To
@@ -45,6 +44,11 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Tue Mar 29 2005 Brian Pepple <bdpepple at ameritech.net> - 0.11-1
+- Updated to 0.11.
+- Drop BuildRequires for gtk2-devel.
+- Bump gnome-panel-devel & evolution-data-server-devel versions to minimum needed.
+
 * Mon Mar 21 2005 Brian Pepple <bdpepple at ameritech.net> - 0.10-2
 - fixed ownership of %%{_datadir}.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Mar 2005 18:58:55 -0000	1.2
+++ sources	29 Mar 2005 18:13:38 -0000	1.3
@@ -1 +1 @@
-d0a14459676a0f64e871d28dd334f5f8  contact-lookup-applet-0.10.tar.gz
+bb7567971fa807326600b686ce366bc3  contact-lookup-applet-0.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Mar 29 19:19:12 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 29 Mar 2005 14:19:12 -0500
Subject: rpms/fslint import.log,1.4,1.5
Message-ID: <200503291919.j2TJJCgp019415@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fslint
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19406

Modified Files:
	import.log 
Log Message:
auto-import fslint-2.11-1 on branch FC-3 from fslint-2.11-1.src.rpm
http://bugzilla.fedora.us/show_bug.cgi?id=1572


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fslint/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 04:20:50 -0000	1.4
+++ import.log	29 Mar 2005 19:19:10 -0000	1.5
@@ -1,3 +1,4 @@
 fslint-2_02-0_fdr_2_rh90:HEAD:fslint-2.02-0.fdr.2.rh90.src.rpm:1099887632
 fslint-2_02-0_fdr_2_1:HEAD:fslint-2.02-0.fdr.2.1.src.rpm:1099887638
 fslint-2_02-0_fdr_2_2:HEAD:fslint-2.02-0.fdr.2.2.src.rpm:1099887650
+fslint-2_11-1:FC-3:fslint-2.11-1.src.rpm:1112123943



From fedora-extras-commits at redhat.com  Tue Mar 29 19:19:12 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 29 Mar 2005 14:19:12 -0500
Subject: rpms/fslint/FC-3 .cvsignore, 1.2, 1.3 fslint.spec, 1.4, 1.5 sources,
	1.2, 1.3 fslint-desktop.patch, 1.1, NONE
Message-ID: <200503291919.j2TJJCZw019420@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fslint/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19406/FC-3

Modified Files:
	.cvsignore fslint.spec sources 
Removed Files:
	fslint-desktop.patch 
Log Message:
auto-import fslint-2.11-1 on branch FC-3 from fslint-2.11-1.src.rpm
http://bugzilla.fedora.us/show_bug.cgi?id=1572


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:20:32 -0000	1.2
+++ .cvsignore	29 Mar 2005 19:19:10 -0000	1.3
@@ -1 +1 @@
-FSlint-2.02.tar.gz
+FSlint-2.11.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-3/fslint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fslint.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ fslint.spec	29 Mar 2005 19:19:10 -0000	1.5
@@ -1,35 +1,30 @@
-%define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pysitedir %{_libdir}/python%{pyver}/site-packages
-
 Name:           fslint
-Version:        2.02
-Release:        2
+Version:        2.11
+Release:        1
 Epoch:          0
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.pixelbeat.org/fslint/
-Source0:        http://www.pixelbeat.org/fslint/FSlint-2.02.tar.gz
-Patch0:         %{name}-desktop.patch
+Source0:        http://www.pixelbeat.org/fslint/FSlint-2.11.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
+BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 0:%{pyver}, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
-FSlint is a toolkit to find all redundant disk usage.  It includes a
-GUI as well as a command line interface.
+FSlint is a toolkit to find all redundant disk usage (duplicate files
+for e.g.). It includes a GUI as well as a command line interface.
 
 
 %prep
 %setup -q -n FSlint-%{version}
-%patch0 -p0
+%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' FSlint
+%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' FSlint
 mv fslint/fstool/README README.fstool
 mv fslint/rmlint/README README.rmlint
-echo "liblocation = '%{_datadir}/%{name}'" > __init__.py
-perl -pi -e 's|^Icon=(.*)$|Icon=%{_datadir}/%{name}/$1|' fslint.desktop
 
 
 %build
@@ -38,29 +33,28 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -p -m 0755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
-install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/{fstool,rmlint}
-install -p -m 0644 fslint.glade fslint_icon.png \
+install -Dpm 755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
+ln -s FSlint $RPM_BUILD_ROOT%{_bindir}/fslint
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,rmlint}
+install -pm 644 fslint.glade fslint_icon.png \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -p -m 0755 fslint/{find*,fsl*,get*,zipdir} \
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ln -s %{_datadir}/%{name}/fslint_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -pm 755 fslint/{find*,fsl*,get*,zipdir} \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint
-install -p -m 0755 fslint/fstool/* \
+install -pm 755 fslint/fstool/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/fstool
-install -p -m 0755 fslint/rmlint/* \
+install -pm 755 fslint/rmlint/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/rmlint
 
 make -C po DESTDIR=$RPM_BUILD_ROOT LOCALEDIR=%{_datadir}/locale install
 
-install -D -p -m 0644 __init__.py \
-  $RPM_BUILD_ROOT%{pysitedir}/FSlint/__init__.py
-touch $RPM_BUILD_ROOT%{pysitedir}/FSlint/__init__.py{c,o}
-
 desktop-file-install \
   --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode 0644 \
+  --mode 644 \
   --add-category X-Fedora \
-  fslint.desktop
+  %{name}.desktop
 
 %find_lang %{name}
 
@@ -72,15 +66,31 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc doc/* README.*
-%{_bindir}/*
-%dir %{pysitedir}/FSlint
-%{pysitedir}/FSlint/*.py
-%ghost %{pysitedir}/FSlint/*.py?
+%{_bindir}/*lint
 %{_datadir}/%{name}
-%{_datadir}/applications/*
+%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/pixmaps/fslint_icon.png
 
 
 %changelog
+* Fri Mar 18 2005 P??draig Brady <P at draigBrady.com> - 0:2.11-1
+- Update to 2.11
+
+* Wed Mar 16 2005 P??draig Brady <P at draigBrady.com> - 0:2.10-0.fdr.2
+- Update to 2.10
+
+* Tue Sep  9 2004 P??draig Brady <P at draigBrady.com> - 0:2.08-0.fdr.2
+- Fix locale support broken in previous version
+
+* Wed Sep  1 2004 P??draig Brady <P at draigBrady.com> - 0:2.08-0.fdr.1
+- Update to 2.08.
+- Remove redundant patch.
+
+* Wed May  5 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.06-0.fdr.1
+- Update to 2.06.
+- Add %%{_bindir}/fslint symlink.
+- Make installation Python version independent.
+
 * Thu Aug 28 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.02-0.fdr.2
 - Requires: cpio, remove redundant findutils dependency (bug 539).
 - Fix version in dependency on python.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:20:32 -0000	1.2
+++ sources	29 Mar 2005 19:19:10 -0000	1.3
@@ -1 +1 @@
-24d101f560d9018161ee10e1eb12ec37  FSlint-2.02.tar.gz
+518ef710828f6b55adf7fc665e9146f9  FSlint-2.11.tar.gz


--- fslint-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Mar 29 19:19:17 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 29 Mar 2005 14:19:17 -0500
Subject: rpms/contact-lookup-applet/FC-3 contact-lookup-applet.spec,1.1,1.2
Message-ID: <200503291919.j2TJJHse019453@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19446

Modified Files:
	contact-lookup-applet.spec 
Log Message:
Remove gtk2-devel BR.


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-3/contact-lookup-applet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- contact-lookup-applet.spec	24 Mar 2005 18:58:55 -0000	1.1
+++ contact-lookup-applet.spec	29 Mar 2005 19:19:15 -0000	1.2
@@ -1,19 +1,18 @@
-Name:           contact-lookup-applet
-Version:        0.10
-Release:        2
-Summary:        Contact Lookup Applet
-
-Group:          Applications/Communications
-License:        GPL
-URL:            http://www.burtonini.com/blog/2004/Oct/27/
-Source0:        http://www.burtonini.com/computing/contact-lookup-applet-0.10.tar.gz        
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gtk2-devel >= 2.4.0
-BuildRequires:  libgnomeui-devel >= 2.7.92
-BuildRequires:  gnome-panel-devel >= 2.7.90
-BuildRequires:  evolution-data-server-devel >= 1.0.0
-BuildRequires: 	gettext
+Name:		contact-lookup-applet
+Version:	0.10
+Release:	3
+Summary:	Contact Lookup Applet
+
+Group:		Applications/Communications
+License:	GPL
+URL:		http://www.burtonini.com/blog/2004/Oct/27/
+Source0:	http://www.burtonini.com/computing/contact-lookup-applet-0.10.tar.gz        
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	libgnomeui-devel >= 2.7.92
+BuildRequires:	gnome-panel-devel >= 2.7.90
+BuildRequires:	evolution-data-server-devel >= 1.0.0
+BuildRequires:	gettext
 
 %description
 This applet allows you to search your Evolution 2 address book for people. To
@@ -45,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Tue Mar 29 2005 Brian Pepple <bdpepple at ameritech.net> - 0.10-3
+- Drop BuldRequires for gtk2-devel.
+
 * Mon Mar 21 2005 Brian Pepple <bdpepple at ameritech.net> - 0.10-2
 - fixed ownership of %%{_datadir}.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 19:20:09 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 29 Mar 2005 14:20:09 -0500
Subject: rpms/fslint import.log,1.5,1.6
Message-ID: <200503291920.j2TJK9RK019572@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fslint
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19563

Modified Files:
	import.log 
Log Message:
auto-import fslint-2.11-2 on branch devel from fslint-2.11-2.src.rpm
http://bugzilla.fedora.us/show_bug.cgi?id=1572


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fslint/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	29 Mar 2005 19:19:10 -0000	1.5
+++ import.log	29 Mar 2005 19:20:07 -0000	1.6
@@ -2,3 +2,4 @@
 fslint-2_02-0_fdr_2_1:HEAD:fslint-2.02-0.fdr.2.1.src.rpm:1099887638
 fslint-2_02-0_fdr_2_2:HEAD:fslint-2.02-0.fdr.2.2.src.rpm:1099887650
 fslint-2_11-1:FC-3:fslint-2.11-1.src.rpm:1112123943
+fslint-2_11-2:HEAD:fslint-2.11-2.src.rpm:1112123998



From fedora-extras-commits at redhat.com  Tue Mar 29 19:20:09 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 29 Mar 2005 14:20:09 -0500
Subject: rpms/fslint/devel .cvsignore, 1.2, 1.3 fslint.spec, 1.5, 1.6 sources,
	1.2, 1.3 fslint-desktop.patch, 1.1, NONE
Message-ID: <200503291920.j2TJK9IC019576@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fslint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19563/devel

Modified Files:
	.cvsignore fslint.spec sources 
Removed Files:
	fslint-desktop.patch 
Log Message:
auto-import fslint-2.11-2 on branch devel from fslint-2.11-2.src.rpm
http://bugzilla.fedora.us/show_bug.cgi?id=1572


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:20:32 -0000	1.2
+++ .cvsignore	29 Mar 2005 19:20:07 -0000	1.3
@@ -1 +1 @@
-FSlint-2.02.tar.gz
+FSlint-2.11.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/fslint.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fslint.spec	3 Mar 2005 20:33:53 -0000	1.5
+++ fslint.spec	29 Mar 2005 19:20:07 -0000	1.6
@@ -1,34 +1,29 @@
-%define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pysitedir %{_libdir}/python%{pyver}/site-packages
-
 Name:           fslint
-Version:        2.02
+Version:        2.11
 Release:        2
-Summary:        Utility to find and clean "lint" on a filesystem
+Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.pixelbeat.org/fslint/
-Source0:        http://www.pixelbeat.org/fslint/FSlint-2.02.tar.gz
-Patch0:         %{name}-desktop.patch
+Source0:        http://www.pixelbeat.org/fslint/FSlint-2.11.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
+BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= %{pyver}, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
-FSlint is a toolkit to find all redundant disk usage.  It includes a
-GUI as well as a command line interface.
+FSlint is a toolkit to find all redundant disk usage (duplicate files
+for e.g.). It includes a GUI as well as a command line interface.
 
 
 %prep
 %setup -q -n FSlint-%{version}
-%patch0 -p0
+%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' FSlint
+%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' FSlint
 mv fslint/fstool/README README.fstool
 mv fslint/rmlint/README README.rmlint
-echo "liblocation = '%{_datadir}/%{name}'" > __init__.py
-perl -pi -e 's|^Icon=(.*)$|Icon=%{_datadir}/%{name}/$1|' fslint.desktop
 
 
 %build
@@ -37,29 +32,28 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -p -m 0755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
-install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/{fstool,rmlint}
-install -p -m 0644 fslint.glade fslint_icon.png \
+install -Dpm 755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
+ln -s FSlint $RPM_BUILD_ROOT%{_bindir}/fslint
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,rmlint}
+install -pm 644 fslint.glade fslint_icon.png \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -p -m 0755 fslint/{find*,fsl*,get*,zipdir} \
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ln -s %{_datadir}/%{name}/fslint_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -pm 755 fslint/{find*,fsl*,get*,zipdir} \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint
-install -p -m 0755 fslint/fstool/* \
+install -pm 755 fslint/fstool/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/fstool
-install -p -m 0755 fslint/rmlint/* \
+install -pm 755 fslint/rmlint/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/rmlint
 
 make -C po DESTDIR=$RPM_BUILD_ROOT LOCALEDIR=%{_datadir}/locale install
 
-install -D -p -m 0644 __init__.py \
-  $RPM_BUILD_ROOT%{pysitedir}/FSlint/__init__.py
-touch $RPM_BUILD_ROOT%{pysitedir}/FSlint/__init__.py{c,o}
-
 desktop-file-install \
   --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode 0644 \
+  --mode 644 \
   --add-category X-Fedora \
-  fslint.desktop
+  %{name}.desktop
 
 %find_lang %{name}
 
@@ -71,15 +65,31 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc doc/* README.*
-%{_bindir}/*
-%dir %{pysitedir}/FSlint
-%{pysitedir}/FSlint/*.py
-%ghost %{pysitedir}/FSlint/*.py?
+%{_bindir}/*lint
 %{_datadir}/%{name}
-%{_datadir}/applications/*
+%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/pixmaps/fslint_icon.png
 
 
 %changelog
+* Fri Mar 18 2005 P??draig Brady <P at draigBrady.com> - 2.11-2
+- Update to 2.11
+
+* Wed Mar 16 2005 P??draig Brady <P at draigBrady.com> - 0:2.10-0.fdr.2
+- Update to 2.10
+
+* Tue Sep  9 2004 P??draig Brady <P at draigBrady.com> - 0:2.08-0.fdr.2
+- Fix locale support broken in previous version
+
+* Wed Sep  1 2004 P??draig Brady <P at draigBrady.com> - 0:2.08-0.fdr.1
+- Update to 2.08.
+- Remove redundant patch.
+
+* Wed May  5 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.06-0.fdr.1
+- Update to 2.06.
+- Add %%{_bindir}/fslint symlink.
+- Make installation Python version independent.
+
 * Thu Aug 28 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.02-0.fdr.2
 - Requires: cpio, remove redundant findutils dependency (bug 539).
 - Fix version in dependency on python.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:20:32 -0000	1.2
+++ sources	29 Mar 2005 19:20:07 -0000	1.3
@@ -1 +1 @@
-24d101f560d9018161ee10e1eb12ec37  FSlint-2.02.tar.gz
+518ef710828f6b55adf7fc665e9146f9  FSlint-2.11.tar.gz


--- fslint-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Mar 29 19:36:51 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 29 Mar 2005 14:36:51 -0500
Subject: common Makefile.common,1.5,1.6
Message-ID: <200503291936.j2TJapWT019953@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19938

Modified Files:
	Makefile.common 
Log Message:
add tag target



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.common	3 Mar 2005 20:02:52 -0000	1.5
+++ Makefile.common	29 Mar 2005 19:36:49 -0000	1.6
@@ -276,6 +276,13 @@
 verrel:
 	@echo $(NAME)-$(VERSION)-$(RELEASE)
 
+# If you build a new version into the tree, first do "make tag",
+# then "make srpm", then build the package.  
+tag::    $(SPECFILE)
+	cvs tag $(TAG_OPTS) -c $(TAG)
+	@echo "Tagged with: $(TAG)"
+	@echo
+
 # "make new | less" to see what has changed since the last tag was assigned
 new:
 	- at cvs diff -u -r$$(cvs log Makefile 2>/dev/null | awk '/^symbolic names:$$/ {getline; sub(/^[ \t]*/, "") ; sub (/:.*$$/, ""); print; exit 0}')



From fedora-extras-commits at redhat.com  Tue Mar 29 19:48:36 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 29 Mar 2005 14:48:36 -0500
Subject: devel/kover kover.spec,1.7,1.8
Message-ID: <200503291948.j2TJma2r020069@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/kover
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20028

Modified Files:
	kover.spec 
Log Message:
add --disable-rpath to configure



Index: kover.spec
===================================================================
RCS file: /cvs/extras/devel/kover/kover.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kover.spec	3 Mar 2005 21:56:40 -0000	1.7
+++ kover.spec	29 Mar 2005 19:48:34 -0000	1.8
@@ -1,7 +1,7 @@
 Name: kover
 Summary: WYSIWYG CD cover printer with CDDB support
 Version: 2.9.6
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Publishing
 Source0 http://lisas.de/kover/kover-2.9.6.tar.gz
@@ -20,7 +20,7 @@
 
 %build
 [ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
-%configure --with-xinerama
+%configure --with-xinerama --disable-rpath
 %{__make} %{?_smp_mflags}
 
 %clean
@@ -58,6 +58,9 @@
 %attr(755,root,root)%{_bindir}/cd-text
 
 %changelog
+* Tue Mar 29 2005 Adrian Reber <adrian at lisas.de> - 0:2.9.6-2
+- add --disable-rpath to configure
+
 * Sun Feb 13 2005 Adrian Reber <adrian at lisas.de> - 0:2.9.6-1
 - updated to 2.9.6 to hopefully fix x86_64 build
 



From fedora-extras-commits at redhat.com  Tue Mar 29 20:24:52 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 29 Mar 2005 15:24:52 -0500
Subject: devel/sopwith sopwith-gcc4.patch,NONE,1.1 sopwith.spec,1.5,1.6
Message-ID: <200503292024.j2TKOqb7021260@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/sopwith
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21251

Modified Files:
	sopwith.spec 
Added Files:
	sopwith-gcc4.patch 
Log Message:
fix gcc4 compiler error


sopwith-gcc4.patch:

--- NEW FILE sopwith-gcc4.patch ---
--- sdl_sopwith-1.7.1/src/swmain.h	2003-06-08 20:20:30.000000000 +0200
+++ sdl_sopwith-1.7.1.new/src/swmain.h	2005-03-29 22:17:32.000000000 +0200
@@ -46,7 +46,7 @@
 extern int     targrnge;
 extern BOOL    hires;
 extern BOOL    disppos;
-extern BOOL    titleflg;
+static BOOL    titleflg;
 extern int     dispdbg;
 extern BOOL    soundflg;
 extern BOOL    repflag;


Index: sopwith.spec
===================================================================
RCS file: /cvs/extras/devel/sopwith/sopwith.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sopwith.spec	5 Mar 2005 19:28:28 -0000	1.5
+++ sopwith.spec	29 Mar 2005 20:24:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           sopwith
 Version:        1.7.1
-Release:        1
+Release:        2
 Summary:        SDL port of the sopwith game
 
 Group:          Amusements/Games
@@ -8,6 +8,7 @@
 URL:            http://sdl-sopwith.sourceforge.net/
 Source0:        http://dl.sf.net/sdl-sopwith/sdl_sopwith-1.7.1.tar.gz
 Source1:        sopwith.png
+Patch0:         sopwith-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q -n sdl_sopwith-%{version}
+%patch0 -p1
 
 
 %build
@@ -68,6 +70,9 @@
 
 
 %changelog
+* Tue Mar 29 2005 Adrian Reber <adrian at lisas.de> - 1.7.1-2
+- added patch to fix gcc4 compiler error
+
 * Wed Jun 18 2003 Adrian Reber <adrian at lisas.de> - 0:1.7.1-0.fdr.1
 - updated to 1.7.1
 - changed category from desktop entry from "Games" to "Game"



From fedora-extras-commits at redhat.com  Tue Mar 29 20:38:06 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 29 Mar 2005 15:38:06 -0500
Subject: devel/cvsup cvsup-gcc4.patch,NONE,1.1
Message-ID: <200503292038.j2TKc6LF021317@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/cvsup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21309

Added Files:
	cvsup-gcc4.patch 
Log Message:
gcc4 patch


cvsup-gcc4.patch:

--- NEW FILE cvsup-gcc4.patch ---
--- cvsup-snap-16.1h/ezm3-1.2/language/modula3/m3compiler/m3cc/gcc/include/obstack.h	2003-01-11 21:58:43.000000000 +0100
+++ cvsup-snap-16.1h.new/ezm3-1.2/language/modula3/m3compiler/m3cc/gcc/include/obstack.h	2005-03-26 18:44:03.000000000 +0100
@@ -423,7 +423,8 @@
 ({ struct obstack *__o = (OBSTACK);					\
    if (__o->next_free + sizeof (void *) > __o->chunk_limit)		\
      _obstack_newchunk (__o, sizeof (void *));				\
-   *((void **)__o->next_free)++ = ((void *)datum);			\
+   *((void **)__o->next_free) = ((void *)datum);			\
+   __o->next_free += sizeof(void *);					\
    (void) 0; })
 
 # define obstack_int_grow(OBSTACK,datum)				\



From fedora-extras-commits at redhat.com  Tue Mar 29 20:41:06 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 29 Mar 2005 15:41:06 -0500
Subject: devel/cvsup cvsup.spec,1.7,1.8
Message-ID: <200503292041.j2TKf6Hi021377@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/cvsup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21371

Modified Files:
	cvsup.spec 
Log Message:
added gcc4 patch



Index: cvsup.spec
===================================================================
RCS file: /cvs/extras/devel/cvsup/cvsup.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cvsup.spec	3 Mar 2005 20:08:37 -0000	1.7
+++ cvsup.spec	29 Mar 2005 20:41:04 -0000	1.8
@@ -7,7 +7,7 @@
 Summary: CVS-Optimized General-Purpose Network File Distribution System client
 Name: cvsup
 Version: 16.1
-Release: 7.h
+Release: 8.h
 URL: http://www.polstra.com/projects/freeware/CVSup/
 License: BSD
 Group: Applications/Internet
@@ -27,6 +27,7 @@
 Patch5: ezm3-1.2-PPC-setjmp.patch
 # ... and this should be the real fix. Unfortunately it doesn't work..
 Patch6: ezm3-1.2-ppc-jmpbufsize.patch
+Patch7: cvsup-gcc4.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: mktemp, sed, XFree86-devel, zlib-devel
@@ -96,6 +97,7 @@
 %patch5 -p1
 #%patch6 -p1
 popd
+%patch7 -p1
 
 %build
 # ------------------------- Begin hackery ------------------------- #
@@ -202,6 +204,9 @@
 %doc Acknowledgments Announce Blurb ChangeLog Install License doc examples
 
 %changelog
+* Tue Mar 28 2005 Adrian Reber <adrian at lisas.de> - 0.16.1-8h
+- added gcc4 patch
+
 * Sun Feb 13 2005 David Woodhouse <dwmw2 at infradead.org> - 0.16.1-7h
 - Add PPC support. My brain hurts.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 20:55:16 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Tue, 29 Mar 2005 15:55:16 -0500
Subject: rpms/python-bibtex/devel python-bibtex.spec,1.5,1.6
Message-ID: <200503292055.j2TKtGne021466@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/python-bibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21460

Modified Files:
	python-bibtex.spec 
Log Message:
minor update for rebuild


Index: python-bibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/python-bibtex/devel/python-bibtex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-bibtex.spec	3 Mar 2005 23:53:13 -0000	1.5
+++ python-bibtex.spec	29 Mar 2005 20:55:14 -0000	1.6
@@ -5,7 +5,7 @@
 Summary: Python extension to parse BibTeX files
 Name: python-bibtex
 Version: 1.2.1
-Release: 1
+Release: 2
 License: GPL
 Group: Development/Libraries
 Source: http://dl.sf.net/pybliographer/python-bibtex-1.2.1.tar.gz
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Mar 29 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.1-2
+- rebuild for python 2.4
+
 * Tue Aug 17 2004 Zoltan Kota <z.kota at gmx.net> - 0:1.2.1-0.fdr.1
 - update to 1.2.1
 - using macro for python and sitearch



From fedora-extras-commits at redhat.com  Tue Mar 29 21:55:52 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 29 Mar 2005 16:55:52 -0500
Subject: rpms/contact-lookup-applet/FC-3 contact-lookup-applet.spec,1.2,1.3
Message-ID: <200503292155.j2TLtq0u022562@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22553/FC-3

Modified Files:
	contact-lookup-applet.spec 
Log Message:
added dist tags


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-3/contact-lookup-applet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- contact-lookup-applet.spec	29 Mar 2005 19:19:15 -0000	1.2
+++ contact-lookup-applet.spec	29 Mar 2005 21:55:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.10
-Release:	3
+Release:	4.fc3
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Tue Mar 29 2005 Brian Pepple <bdpepple at ameritech.net> - 0.10-4.fc3
+- Add dist tag.
+
 * Tue Mar 29 2005 Brian Pepple <bdpepple at ameritech.net> - 0.10-3
 - Drop BuldRequires for gtk2-devel.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 21:55:52 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 29 Mar 2005 16:55:52 -0500
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, 1.2,
	1.3
Message-ID: <200503292155.j2TLtq9w022566@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-serv22553/devel

Modified Files:
	contact-lookup-applet.spec 
Log Message:
added dist tags


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- contact-lookup-applet.spec	29 Mar 2005 18:13:38 -0000	1.2
+++ contact-lookup-applet.spec	29 Mar 2005 21:55:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.11
-Release:	1
+Release:	2.fc4
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Tue Mar 29 2005 Brian Pepple <bdpepple at ameritech.net> - 0.11-2.fc4
+- Added dist tag.
+
 * Tue Mar 29 2005 Brian Pepple <bdpepple at ameritech.net> - 0.11-1
 - Updated to 0.11.
 - Drop BuildRequires for gtk2-devel.



From fedora-extras-commits at redhat.com  Tue Mar 29 22:05:52 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 29 Mar 2005 17:05:52 -0500
Subject: rpms/xmms-lirc/FC-3 xmms-lirc.spec,1.5,1.6
Message-ID: <200503292205.j2TM5qY9023532@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xmms-lirc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23515/FC-3

Modified Files:
	xmms-lirc.spec 
Log Message:
BR lirc-devel


Index: xmms-lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-lirc/FC-3/xmms-lirc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmms-lirc.spec	13 Jan 2005 18:17:29 -0000	1.5
+++ xmms-lirc.spec	29 Mar 2005 22:05:32 -0000	1.6
@@ -4,14 +4,14 @@
 Summary: X MultiMedia System control plugin to use infrared devices
 Name: xmms-lirc
 Version: 1.4
-Release: 4
+Release: 4.1
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.lirc.org/
 Source: http://dl.sf.net/lirc/lirc-xmms-plugin-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xmms >= 1.0.0, glib >= 1.2.7, gtk+ >= 1.2.7, lirc
-BuildRequires: xmms-devel, glib-devel >= 1.2.7, gtk+-devel >= 1.2.7, lirc
+BuildRequires: xmms-devel, glib-devel >= 1.2.7, gtk+-devel >= 1.2.7, lirc-devel
 
 
 %description
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.4-4.1
+- BuildRequire lirc-devel.
+
 * Thu Jan 13 2005 Matthias Saou <http://freshrpms.net/> 1.4-4
 - Bump release for upgrade path.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 22:05:52 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 29 Mar 2005 17:05:52 -0500
Subject: rpms/xmms-lirc/devel xmms-lirc.spec,1.5,1.6
Message-ID: <200503292205.j2TM5qa7023529@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xmms-lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23515/devel

Modified Files:
	xmms-lirc.spec 
Log Message:
BR lirc-devel


Index: xmms-lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-lirc/devel/xmms-lirc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmms-lirc.spec	13 Jan 2005 18:17:29 -0000	1.5
+++ xmms-lirc.spec	29 Mar 2005 22:05:50 -0000	1.6
@@ -4,14 +4,14 @@
 Summary: X MultiMedia System control plugin to use infrared devices
 Name: xmms-lirc
 Version: 1.4
-Release: 4
+Release: 5
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.lirc.org/
 Source: http://dl.sf.net/lirc/lirc-xmms-plugin-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xmms >= 1.0.0, glib >= 1.2.7, gtk+ >= 1.2.7, lirc
-BuildRequires: xmms-devel, glib-devel >= 1.2.7, gtk+-devel >= 1.2.7, lirc
+BuildRequires: xmms-devel, glib-devel >= 1.2.7, gtk+-devel >= 1.2.7, lirc-devel
 
 
 %description
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.4-5
+- BuildRequire lirc-devel.
+
 * Thu Jan 13 2005 Matthias Saou <http://freshrpms.net/> 1.4-4
 - Bump release for upgrade path.
 



From fedora-extras-commits at redhat.com  Tue Mar 29 22:27:41 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 29 Mar 2005 17:27:41 -0500
Subject: rpms/ip-sentinel/devel sources, 1.2, 1.3 ip-sentinel.spec, 1.3,
	1.4 .cvsignore, 1.2, 1.3
Message-ID: <200503292227.j2TMRfHK023729@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23723/devel

Modified Files:
	sources ip-sentinel.spec .cvsignore 
Log Message:
version 0.12



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Feb 2005 23:21:16 -0000	1.2
+++ sources	29 Mar 2005 22:27:39 -0000	1.3
@@ -1,2 +1,2 @@
-4cf7988f8e7eff68c535dec50ba79ba3  ip-sentinel-0.11.tar.bz2
-f8e4e911ec72bc28ba3c09bd39456b39  ip-sentinel-0.11.tar.bz2.asc
+eb83cda53fcfed7d9826eab1640a2d2a  ip-sentinel-0.12.tar.bz2
+d00e5e0c6ea8354d2c1ba1257e8f5cf3  ip-sentinel-0.12.tar.bz2.sig


Index: ip-sentinel.spec
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ip-sentinel.spec	3 Mar 2005 21:46:22 -0000	1.3
+++ ip-sentinel.spec	29 Mar 2005 22:27:39 -0000	1.4
@@ -1,6 +1,6 @@
 ## $id: ip-sentinel.spec.in,v 1.3 2003/05/26 21:53:02 ensc Exp $		--*- rpm-spec -*--
 
-# Copyright (C) 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
+# Copyright (C) 2004,2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 #  
 # 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
@@ -17,9 +17,9 @@
 
 
 ## This package understands the following switches:
-## --without dietlibc        ...   disable usage of dietlibc
-## --without minit           ...   disable creation of 'minit' subpackage
-## --with    fedora          ...   enable fedora.us specific parts
+## --without dietlibc	     ...   disable usage of dietlibc
+## --without minit	     ...   disable creation of 'minit' subpackage
+## --with    fedora	     ...   enable fedora.us specific parts
 ## --define  username\ name  ...   set the name of the user running the daemon
 
 
@@ -29,32 +29,32 @@
 ##
 
 
-%define uid		1
-%define useradd		/usr/sbin/%{?_with_fedora:fedora-}useradd  %{?_with_fedora:%uid }
-%define groupadd	/usr/sbin/%{?_with_fedora:fedora-}groupadd %{?_with_fedora:%uid}
-%define userdel		/usr/sbin/%{?_with_fedora:fedora-}userdel
-%define groupdel	/usr/sbin/%{?_with_fedora:fedora-}groupdel
+%global uid		1
+%global useradd		/usr/sbin/%{?_with_fedora:fedora-}useradd  %{?_with_fedora:%uid }
+%global groupadd	/usr/sbin/%{?_with_fedora:fedora-}groupadd %{?_with_fedora:%uid}
+%global userdel		/usr/sbin/%{?_with_fedora:fedora-}userdel
+%global groupdel	/usr/sbin/%{?_with_fedora:fedora-}groupdel
 
 %{!?username:%global username	ip-sentinel}
-%define service		ip-sentinel
-%define homedir		%_var/lib/ip-sentinel
-%define minitdir	%_sysconfdir/minit
-%define minitsvcdir	%minitdir/services/%name
+%global service		ip-sentinel
+%global homedir		%_var/lib/ip-sentinel
+%global minitdir	%_sysconfdir/minit
+%global minitsvcdir	%minitdir/services/%name
 
 
-%{!?release_func:%global release_func() %1}
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	Tool to prevent unauthorized usage of IP addresses
 Name:		ip-sentinel
-Version:	0.11
+Version:	0.12
 Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Daemons
-URL:		http://www.tu-chemnitz.de/~ensc/ip-sentinel
-Source0:	http://www.tu-chemnitz.de/~ensc/ip-sentinel/files/%name-%version.tar.bz2
-Source1:	http://www.tu-chemnitz.de/~ensc/ip-sentinel/files/%name-%version.tar.bz2.asc
+URL:		http://www.nongnu.org/ip-sentinel/
+Source0:	http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2
+Source1:	http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2.sig
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
-Requires:	init(ip-sentinel)
+Requires:		init(ip-sentinel)
 
 %{!?_without_dietlibc:BuildRequires:	dietlibc}
 
@@ -81,7 +81,7 @@
 Summary:		minit initscripts for ip-sentinel
 Group:			System Environment/Base
 Provides:		init(ip-sentinel)
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(pre):		minit-setup
 Requires(postun):	minit-setup
 
@@ -111,23 +111,17 @@
 with the minit initconcept.
 
 
-
-
 %prep
 %setup -q
 
 
-
-
 %build
 %configure --enable-release \
-           --with-initrddir=%{_initrddir} \
-           --with-username=%username %{?_without_dietlibc:--disable-dietlibc}
+	   --with-initrddir=%_initrddir \
+	   --with-username=%username %{?_without_dietlibc:--disable-dietlibc}
 %__make %{?_smp_mflags} all
 
 
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -137,20 +131,14 @@
 %{?_without_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 
 
-
-
 %check
 %__make check
 
 
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-
-
 %pre
 %groupadd -r %username &>/dev/null || :
 %useradd  -r -s /sbin/nologin -M -d %homedir		\
@@ -176,7 +164,6 @@
 test "$1" = 0 || %_initrddir/%service condrestart &>/dev/null
 
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS
@@ -204,6 +191,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.12-1
+- updated to 0.12
+
 * Thu Aug 19 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.10.2-0
 - added support for 'fedora-usermgmt' (enabled with '--with fedora' switch)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Feb 2005 23:21:16 -0000	1.2
+++ .cvsignore	29 Mar 2005 22:27:39 -0000	1.3
@@ -1 +1,2 @@
 ip-sentinel*.tar.bz2*
+ip-sentinel*.tar.bz2.asc



From fedora-extras-commits at redhat.com  Tue Mar 29 22:29:13 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 29 Mar 2005 17:29:13 -0500
Subject: rpms/ip-sentinel/devel .cvsignore,1.3,1.4
Message-ID: <200503292229.j2TMTDUs023776@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23767/devel

Modified Files:
	.cvsignore 
Log Message:
added *.sig



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Mar 2005 22:27:39 -0000	1.3
+++ .cvsignore	29 Mar 2005 22:29:11 -0000	1.4
@@ -1,2 +1,3 @@
 ip-sentinel*.tar.bz2*
 ip-sentinel*.tar.bz2.asc
+ip-sentinel*.tar.bz2.sig



From fedora-extras-commits at redhat.com  Tue Mar 29 23:52:50 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 29 Mar 2005 18:52:50 -0500
Subject: rpms/clamav/devel clamav.spec,1.10,1.11
Message-ID: <200503292352.j2TNqoJx024807@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24801/devel

Modified Files:
	clamav.spec 
Log Message:
use %global instead of %define



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- clamav.spec	3 Mar 2005 21:23:41 -0000	1.10
+++ clamav.spec	29 Mar 2005 23:52:48 -0000	1.11
@@ -8,16 +8,16 @@
 ##
 
 
-%define username	clamav
-%define homedir		%_var/lib/clamav
-%define freshclamlog	%_var/log/freshclam.log
-%define milterlog	%_var/log/clamd.milter
-%define milteruser	clamilt
-%define milterstatedir	%_var/run/clamav-milter
-%define pkgdatadir	%_datadir/%name
+%global username	clamav
+%global homedir		%_var/lib/clamav
+%global freshclamlog	%_var/log/freshclam.log
+%global milterlog	%_var/log/clamd.milter
+%global milteruser	clamilt
+%global milterstatedir	%_var/run/clamav-milter
+%global pkgdatadir	%_datadir/%name
 
 
-%{!?release_func:%define release_func() %1}
+%{!?release_func:%global release_func() %1}
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav



From fedora-extras-commits at redhat.com  Wed Mar 30 09:56:45 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 30 Mar 2005 04:56:45 -0500
Subject: rpms/xca/FC-3 xca-0.5.1-langinst.patch, NONE,
	1.1 xca-0.5.1-gcc4.patch, NONE, 1.1 xca-0.5.1-db43.patch, NONE,
	1.1 xca.spec, 1.4, 1.5 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3
Message-ID: <200503300956.j2U9ujjq004002@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3996

Modified Files:
	xca.spec sources .cvsignore 
Added Files:
	xca-0.5.1-langinst.patch xca-0.5.1-gcc4.patch 
	xca-0.5.1-db43.patch 
Log Message:
copied from devel branch


xca-0.5.1-langinst.patch:

--- NEW FILE xca-0.5.1-langinst.patch ---
--- lang/Makefile~	2004-02-18 19:29:50.000000000 +0200
+++ lang/Makefile	2004-08-27 20:09:02.910204474 +0300
@@ -3,7 +3,7 @@
 
 install:
 	install -m 755 -d $(destdir)$(prefix)/share/xca
-	install -m 644 lang/xca_??.qm $(destdir)$(prefix)/share/xca || true
+	install -m 644 xca_??.qm $(destdir)$(prefix)/share/xca || true
 
 include $(TOPDIR)/Local.mak
 

xca-0.5.1-gcc4.patch:

--- NEW FILE xca-0.5.1-gcc4.patch ---
===================================================================
RCS file: /cvsroot/xca/xca/widgets/clicklabel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xca/xca/widgets/clicklabel.cpp	2003/11/26 22:03:18	1.3
+++ xca/xca/widgets/clicklabel.cpp	2005/02/07 21:56:27	1.4
@@ -45,7 +45,7 @@
  * http://www.hohnstaedt.de/xca
  * email: christian at hohnstaedt.de
  *
- * $Id: clicklabel.cpp,v 1.3 2003/11/26 22:03:18 chris2511 Exp $ 
+ * $Id: clicklabel.cpp,v 1.4 2005/02/07 21:56:27 chris2511 Exp $ 
  *
  */                           
 
@@ -58,9 +58,9 @@
 ClickLabel::ClickLabel( QWidget* parent,  const char* name, WFlags f )
 	:QLabel( parent, name, f )
 {
-	QFont font( font() );
-	font.setBold(true);
-	setFont( font );
+	QFont fnt( font() );
+	fnt.setBold(true);
+	setFont( fnt );
 	setFrameShape( QLabel::Panel );
 	setFrameShadow( QLabel::Sunken );
 	setAlignment( int( QLabel::AlignCenter ) );

xca-0.5.1-db43.patch:

--- NEW FILE xca-0.5.1-db43.patch ---
--- xca-0.5.1/widgets/MainWindow.h.db43	2004-04-15 01:36:56.000000000 +0200
+++ xca-0.5.1/widgets/MainWindow.h	2005-03-08 17:36:26.000000000 +0100
@@ -105,6 +105,10 @@ class MainWindow: public MainWindow_UI
 	static int passRead(char *buf, int size, int rwflag, void *userdata);
 	static int passWrite(char *buf, int size, int rwflag, void *userdata);
 	static void dberr(const char *errpfx, char *msg);
+	static void dberr(DbEnv const *, const char *errpfx, char const *msg)
+	{
+	  dberr(errpfx, const_cast<char *>(msg));
+	}
 	static NewX509 *newX509();
 	static QString md5passwd(const char *pass);
 	static void Error(errorEx &err);


Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/FC-3/xca.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xca.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ xca.spec	30 Mar 2005 09:56:43 -0000	1.5
@@ -1,24 +1,24 @@
-## For RHL7.3 compile with '--without desktop' flag
+## $Id$
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
-Version:	0.4.6
-Release:	1
-Epoch:		0
+Version:	0.5.1
+Release:	%release_func 0
 License:	BSD
 Group:		Applications/Productivity
 URL:		http://www.hohnstaedt.de/xca.html
-Source0:	http://download.sourceforge.net/sourceforge/xca/%{name}-%{version}.tar.gz
-Source1:	http://www.hohnstaedt.de/xca/cxx_common.h
-Source2:	http://www.hohnstaedt.de/xca/cxx_except.h
-# http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/MainWindow.cpp?r1=1.33&r2=1.34&diff_format=u
-Patch0:		xca-0.4.6-gcc3.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source0:	http://download.sourceforge.net/sourceforge/xca/%name-%version.tar.gz
+Patch0:		%name-0.5.1-langinst.patch
+# http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/clicklabel.cpp?r1=1.3&r2=1.4&diff_format=u
+Patch1:		%name-0.5.1-gcc4.patch
+Patch2:		%name-0.5.1-db43.patch
+BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt-devel openssl-devel
 BuildRequires:	/usr/include/db.h
-%if 0%{!?_without_desktop:1}
 BuildRequires:	desktop-file-utils
-%endif
+
 
 %description
 The Program uses a Berkeley db for storage and supports RSA keys.
@@ -28,73 +28,66 @@
 can be imported and exported in several formats like PKCS#7, PKCS#12,
 PEM, DER, PKCS#8.
 
-#-----------------------
 
 %prep
 %setup -q
-%patch0 -p2 -b .gcc3
+%patch0 -p0 -b .langinst
+%patch1 -p2 -b .gcc4
+%patch2 -p1 -b .db43
 
-#-----------------------
-
-%build
-test -n "$QTDIR" || . %{_sysconfdir}/profile.d/qt.sh
+sed -i 's! db_cxx-4 ! db_cxx-4 db_cxx-4.3 !g' configure
 
-db_inc=/usr/include/db
-rpm -q db3-devel && db_inc=/usr/include/db3 || :
-rpm -q db4-devel && db_inc=/usr/include/db4 || :
-
-## Hacky workaround for broken db[34]-devel package:
-## https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=59759
-echo '#include "db_cxx.h"' | g++ -x c++ -E -I $db_inc - &>/dev/null || {
-	cp -a %{SOURCE1} %{SOURCE2} .
-	export CPPFLAGS="-I`pwd`"
-}
 
+%build
+test -n "$QTDIR" || . %_sysconfdir/profile.d/qt.sh
 CC='%__cc' LD='%__ld' CFLAGS="$RPM_OPT_FLAGS" STRIP=: prefix=%_prefix \
 ./configure
-%__make
+%__make %{?_smp_mflags}
+lrelease xca.pro
 
-#-----------------------
 
 %install
-rm -rf "$RPM_BUILD_ROOT" _doc
-%{__make} destdir="$RPM_BUILD_ROOT" install
+rm -rf "$RPM_BUILD_ROOT"
+%__make destdir="$RPM_BUILD_ROOT" mandir=share/man install
 
-%{__install} -d -m755 _doc/html $RPM_BUILD_ROOT%{_datadir}/applications
-%{__install} -p -m644 doc/*.html _doc/html/
+%__install -d -m755 $RPM_BUILD_ROOT%_datadir/applications
 
-%if 0%{!?_without_desktop:1}
 desktop-file-install --vendor fedora -m644 --delete-original	\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
+  --dir $RPM_BUILD_ROOT%_datadir/applications			\
   --add-category X-Fedora					\
-  $RPM_BUILD_ROOT%{_datadir}/applications/xca.desktop
-%endif
+  $RPM_BUILD_ROOT%_datadir/applications/xca.desktop
 
-#-----------------------
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
-#-----------------------
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYRIGHT _doc/html
+%doc AUTHORS COPYRIGHT
 %doc debian/changelog
-%{_bindir}/*
+%_bindir/*
+%_mandir/*/*
 %dir %{_datadir}/xca
-%{_datadir}/xca/*.png
-%{_datadir}/pixmaps/*.xpm
-%lang(de) %{_datadir}/xca/xca_de.qm
-%lang(es) %{_datadir}/xca/xca_es.qm
-
-%if 0%{!?_without_desktop:1}
-%{_datadir}/applications/*
-%endif
+%_datadir/xca/*.png
+%_datadir/xca/*.txt
+%_datadir/xca/*.html
+%_datadir/pixmaps/*.xpm
+%lang(de) %_datadir/xca/xca_de.qm
+%lang(es) %_datadir/xca/xca_es.qm
+
+%_datadir/applications/*
 
-#-----------------------
 
 %changelog
+* Tue Mar  8 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.1
+- updated to 0.5.1
+- (re)enabled parallel build
+- applied -langinst patch and other ideas from
+  https://bugzilla.fedora.us/show_bug.cgi?id=2019 (Ville Skytt??)
+- fixed build with gcc4 and db43
+- removed old cruft from the specfile
+
 * Sat Dec 13 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.4.6-0.fdr.1
 - changed compile/install commands to work with the new, yet-another configure system
 - removed libpthread test since it went upstream
@@ -104,7 +97,7 @@
 - removed desktop patch which went upstream
 
 * Fri Aug 15 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:0.4.5-0.fdr.2
-- applied Ville Skytt??'s patch to add categories and to fix encoding of desktop-file 
+- applied Ville Skytt??'s patch to add categories and to fix encoding of desktop-file
   (http://sourceforge.net/tracker/index.php?func=detail&aid=789374&group_id=62274&atid=500027)
 - removed '--add-category ...' options which become obsoleted by this
   patch
@@ -150,5 +143,5 @@
 - added dbpriv patch
 - added desktop entry
 
-* Fri Jun  6 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 
+* Fri Jun  6 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xca/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:33:36 -0000	1.2
+++ sources	30 Mar 2005 09:56:43 -0000	1.3
@@ -1 +1 @@
-3defe69788b9e0eb738f374143be6e12  xca-0.4.6.tar.gz
+24e0289c189b8db2f1f15a4ddac1b1c3  xca-0.5.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xca/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:33:36 -0000	1.2
+++ .cvsignore	30 Mar 2005 09:56:43 -0000	1.3
@@ -1 +1,3 @@
-xca-0.4.6.tar.gz
+xca-*.tar.gz
+xca-*.*.rpm
+i386



From fedora-extras-commits at redhat.com  Wed Mar 30 10:00:23 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 30 Mar 2005 05:00:23 -0500
Subject: rpms/xca/FC-3 cxx_common.h, 1.1, NONE cxx_except.h, 1.1,
	NONE xca-0.4.6-gcc3.patch, 1.1, NONE
Message-ID: <200503301000.j2UA0NwF004070@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4064

Removed Files:
	cxx_common.h cxx_except.h xca-0.4.6-gcc3.patch 
Log Message:
copied from devel branch


--- cxx_common.h DELETED ---


--- cxx_except.h DELETED ---


--- xca-0.4.6-gcc3.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar 30 10:29:52 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Wed, 30 Mar 2005 05:29:52 -0500
Subject: rpms/pybliographer/devel pybliographer.spec,1.7,1.8
Message-ID: <200503301029.j2UATqAZ005052@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5046

Modified Files:
	pybliographer.spec 
Log Message:
update for rebuild


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pybliographer.spec	25 Mar 2005 22:49:04 -0000	1.7
+++ pybliographer.spec	30 Mar 2005 10:29:50 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
 Version: 1.2.6.2
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.6.2.tar.gz
@@ -155,6 +155,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.6.2-3
+- rebuild
+
 * Fri Mar 25 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.6.2-2
 - add patch for gnome help display
 - update gnome-python2 requirements



From fedora-extras-commits at redhat.com  Wed Mar 30 10:45:15 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 30 Mar 2005 05:45:15 -0500
Subject: rpms/python-dialog/devel python-dialog.spec,1.4,1.5
Message-ID: <200503301045.j2UAjFaf005145@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/python-dialog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5138

Modified Files:
	python-dialog.spec 
Log Message:
- change release tag for FC4



Index: python-dialog.spec
===================================================================
RCS file: /cvs/extras/rpms/python-dialog/devel/python-dialog.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-dialog.spec	3 Mar 2005 23:53:13 -0000	1.4
+++ python-dialog.spec	30 Mar 2005 10:45:13 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:           python-dialog
 Version:        2.7
-Release:        1
+Release:        1.fc4
 Summary:        Python interface to the Unix dialog utility
 
 Group:          Development/Languages
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Wed Mar 30 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7-1.fc4
+- change release tag for FC4
+- drop Epoch
+
 * Thu Feb 10 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.7-1
 - update to version 2.7
 - update URL



From fedora-extras-commits at redhat.com  Wed Mar 30 11:25:18 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 30 Mar 2005 06:25:18 -0500
Subject: devel/putty putty.spec,1.8,1.9
Message-ID: <200503301125.j2UBPIvW006093@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/putty
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6087

Modified Files:
	putty.spec 
Log Message:
fix build with gcc4



Index: putty.spec
===================================================================
RCS file: /cvs/extras/devel/putty/putty.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- putty.spec	3 Mar 2005 23:53:13 -0000	1.8
+++ putty.spec	30 Mar 2005 11:25:16 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		putty
 Version:	0.57
-Release:	1
+Release:	2
 Summary:	SSH, Telnet and Rlogin client
 License:	MIT
 Group:		Applications/Internet
@@ -23,7 +23,9 @@
 %build
 ./mkfiles.pl
 pushd unix
-perl -pi -e "s,-O2,$RPM_OPT_FLAGS,g;s,/usr/local,%{_prefix},g" Makefile.gtk
+%{__sed} -i -e "s/-O2 -Wall -Werror/$RPM_OPT_FLAGS/g" \
+            -e "s,/usr/local,%{_prefix},g" \
+            Makefile.gtk
 ln -s Makefile.gtk Makefile
 make %{?_smp_mflags}
 popd
@@ -62,6 +64,9 @@
 
 
 %changelog
+* Tue Feb 29 2005 Adrian Reber <adrian at lisas.de> - 0.57-2
+- fix build with gcc4
+
 * Mon Feb 21 2005 Adrian Reber <adrian at lisas.de> - 0.57-1
 - Updated to 0.57
 



From fedora-extras-commits at redhat.com  Wed Mar 30 12:22:55 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 30 Mar 2005 07:22:55 -0500
Subject: rpms/easytag/FC-3 .cvsignore, 1.2, 1.3 easytag.spec, 1.6,
	1.7 sources, 1.2, 1.3 easytag-0.30.2-desktop.patch, 1.1, NONE
Message-ID: <200503301222.j2UCMtUv007161@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/easytag/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7155

Modified Files:
	.cvsignore easytag.spec sources 
Removed Files:
	easytag-0.30.2-desktop.patch 
Log Message:
Update to 1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/easytag/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:15:14 -0000	1.2
+++ .cvsignore	30 Mar 2005 12:22:53 -0000	1.3
@@ -1 +1 @@
-easytag-0.31.tar.bz2
+easytag-1.0.tar.bz2


Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/FC-3/easytag.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- easytag.spec	10 Dec 2004 20:20:47 -0000	1.6
+++ easytag.spec	30 Mar 2005 12:22:53 -0000	1.7
@@ -1,18 +1,14 @@
-Name:           easytag
-Version:        0.31
-Release:        1
-Summary:        Tag editor for MP3, MP2, FLAC and OGG files
-
-Group:          Applications/Multimedia
-License:        GPL
-URL:            http://easytag.sourceforge.net/
-Source0:        http://dl.sf.net/easytag/easytag-%{version}.tar.bz2
-Patch0:         easytag-0.30.2-desktop.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gtk+-devel, id3lib-devel >= 0:3.7.12
-BuildRequires:  libvorbis-devel >= 0:1.0, flac-devel, gettext
-BuildRequires:  desktop-file-utils
+Summary: Tag editor for mp3, ogg, flac and other music files
+Name: easytag
+Version: 1.0
+Release: 2
+License: GPL
+Group: Applications/Multimedia
+URL: http://easytag.sourceforge.net/
+Source: http://dl.sf.net/easytag/easytag-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: gtk+-devel >= 1.2.7, id3lib-devel >= 3.7.12
+BuildRequires: libvorbis-devel >= 1.0, flac-devel, gettext
 
 %description
 EasyTAG is a utility for viewing, editing and writing the tags of MP3,
@@ -21,43 +17,38 @@
 
 %prep
 %setup -q
-%patch -p2
 
 
 %build
 %configure
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 %makeinstall
 %find_lang %{name}
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --add-category Application \
-  --add-category AudioVideo \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
+%defattr(-, root, root, 0755)
 %doc COPYING ChangeLog README TODO THANKS USERS-GUIDE
 %{_bindir}/easytag
-%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/easytag
+%{_datadir}/applications/easytag.desktop
+%{_datadir}/easytag/
 %{_datadir}/pixmaps/*
-%{_mandir}/man[^3]/*
+%{_mandir}/man?/*
 
 
 %changelog
+* Wed Mar 30 2005 Matthias Saou <http://freshrpms.net/> 1.0-2
+- Update again to 1.0.
+- Remove desktop file patch, the original is now UTF-8.
+
 * Fri Dec 10 2004 Michael Schwendt <mschwendt[AT]users.sf.et> - 0.31-1
 - Downgrade version again until somebody really updates the
   entire package contents.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/easytag/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:15:14 -0000	1.2
+++ sources	30 Mar 2005 12:22:53 -0000	1.3
@@ -1 +1 @@
-9cfb29a81f251891ec4dbae4cd39821d  easytag-0.31.tar.bz2
+2edda10af47a52c7f74c77fa0b45cd38  easytag-1.0.tar.bz2


--- easytag-0.30.2-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar 30 12:24:12 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 30 Mar 2005 07:24:12 -0500
Subject: rpms/easytag/devel .cvsignore, 1.2, 1.3 easytag.spec, 1.7,
	1.8 sources, 1.2, 1.3 easytag-0.30.2-desktop.patch, 1.1, NONE
Message-ID: <200503301224.j2UCOCeC007212@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/easytag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7205

Modified Files:
	.cvsignore easytag.spec sources 
Removed Files:
	easytag-0.30.2-desktop.patch 
Log Message:
Update to 1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:15:14 -0000	1.2
+++ .cvsignore	30 Mar 2005 12:24:10 -0000	1.3
@@ -1 +1 @@
-easytag-0.31.tar.bz2
+easytag-1.0.tar.bz2


Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/easytag.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- easytag.spec	5 Mar 2005 21:10:21 -0000	1.7
+++ easytag.spec	30 Mar 2005 12:24:10 -0000	1.8
@@ -1,18 +1,14 @@
-Name:           easytag
-Version:        0.31
-Release:        1
-Summary:        Tag editor for MP3, MP2, FLAC and OGG files
-
-Group:          Applications/Multimedia
-License:        GPL
-URL:            http://easytag.sourceforge.net/
-Source0:        http://dl.sf.net/easytag/easytag-%{version}.tar.bz2
-Patch0:         easytag-0.30.2-desktop.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gtk+-devel, id3lib-devel >= 3.7.12
-BuildRequires:  libvorbis-devel >= 1.0, flac-devel, gettext
-BuildRequires:  desktop-file-utils
+Summary: Tag editor for mp3, ogg, flac and other music files
+Name: easytag
+Version: 1.0
+Release: 3
+License: GPL
+Group: Applications/Multimedia
+URL: http://easytag.sourceforge.net/
+Source: http://dl.sf.net/easytag/easytag-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: gtk+-devel >= 1.2.7, id3lib-devel >= 3.7.12
+BuildRequires: libvorbis-devel >= 1.0, flac-devel, gettext
 
 %description
 EasyTAG is a utility for viewing, editing and writing the tags of MP3,
@@ -21,43 +17,38 @@
 
 %prep
 %setup -q
-%patch -p2
 
 
 %build
 %configure
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 %makeinstall
 %find_lang %{name}
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --add-category Application \
-  --add-category AudioVideo \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
+%defattr(-, root, root, 0755)
 %doc COPYING ChangeLog README TODO THANKS USERS-GUIDE
 %{_bindir}/easytag
-%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/easytag
+%{_datadir}/applications/easytag.desktop
+%{_datadir}/easytag/
 %{_datadir}/pixmaps/*
-%{_mandir}/man[^3]/*
+%{_mandir}/man?/*
 
 
 %changelog
+* Wed Mar 30 2005 Matthias Saou <http://freshrpms.net/> 1.0-3
+- Update again to 1.0.
+- Remove desktop file patch, the original is now UTF-8.
+
 * Fri Dec 10 2004 Michael Schwendt <mschwendt[AT]users.sf.et> - 0.31-1
 - Downgrade version again until somebody really updates the
   entire package contents.
@@ -87,7 +78,7 @@
 - Updated to 0.28.
 
 * Sat May 24 2003 Marius J??hndal <mariuslj at ifi.uio.no> 0:0.27-0.fdr.3.a
-- Removed version from BuildRequires: gtk+-devel (RH 7.0 and newer ship with
+- Removed version from BuildRequires: gtk+-devel (RH 7.0 and newer ship with 
   gtk+-devel >= 1.2.8).
 
 * Mon May 19 2003 Marius J??hndal <mariuslj at ifi.uio.no> 0:0.27-0.fdr.2.a


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:15:14 -0000	1.2
+++ sources	30 Mar 2005 12:24:10 -0000	1.3
@@ -1 +1 @@
-9cfb29a81f251891ec4dbae4cd39821d  easytag-0.31.tar.bz2
+2edda10af47a52c7f74c77fa0b45cd38  easytag-1.0.tar.bz2


--- easytag-0.30.2-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Mar 30 14:30:38 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 30 Mar 2005 09:30:38 -0500
Subject: rpms/htmltmpl/devel htmltmpl.spec,1.8,1.9
Message-ID: <200503301430.j2UEUcUH009470@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/htmltmpl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9460/htmltmpl/devel

Modified Files:
	htmltmpl.spec 
Log Message:
Rebuild with Python 2.4.


Index: htmltmpl.spec
===================================================================
RCS file: /cvs/extras/rpms/htmltmpl/devel/htmltmpl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- htmltmpl.spec	3 Mar 2005 21:46:21 -0000	1.8
+++ htmltmpl.spec	30 Mar 2005 14:30:36 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           htmltmpl
 Version:        1.22
-Release:        5
+Release:        6
 Summary:        Templating engine for separation of code and HTML
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.22-6
+- Rebuild with Python 2.4.
+
 * Thu Dec 16 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.22-5
 - Sync with Python spec template from fedora-rpmdevtools.
 



From fedora-extras-commits at redhat.com  Wed Mar 30 14:30:39 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 30 Mar 2005 09:30:39 -0500
Subject: rpms/id3-py/devel id3-py.spec,1.7,1.8
Message-ID: <200503301430.j2UEUdoD009473@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/id3-py/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9460/id3-py/devel

Modified Files:
	id3-py.spec 
Log Message:
Rebuild with Python 2.4.


Index: id3-py.spec
===================================================================
RCS file: /cvs/extras/rpms/id3-py/devel/id3-py.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- id3-py.spec	3 Mar 2005 21:46:21 -0000	1.7
+++ id3-py.spec	30 Mar 2005 14:30:36 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           id3-py
 Version:        1.2
-Release:        6
+Release:        7
 Summary:        Python ID3 tag library
 
 Group:          Development/Libraries
@@ -10,8 +10,8 @@
 URL:            http://id3-py.sourceforge.net/
 Source0:        http://download.sourceforge.net/id3-py/id3-py_1.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
+BuildArch:      noarch
 BuildRequires:  python-devel
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.2-7
+- Rebuild with Python 2.4.
+
 * Thu Dec 16 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2-6
 - Sync with Python spec template from fedora-rpmdevtools.
 - Improve description.



From fedora-extras-commits at redhat.com  Wed Mar 30 14:32:45 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 30 Mar 2005 09:32:45 -0500
Subject: devel/most most.spec,1.5,1.6
Message-ID: <200503301432.j2UEWj7d009526@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/most
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9520

Modified Files:
	most.spec 
Log Message:
fix build on ppc/ppc64



Index: most.spec
===================================================================
RCS file: /cvs/extras/devel/most/most.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- most.spec	3 Mar 2005 23:01:24 -0000	1.5
+++ most.spec	30 Mar 2005 14:32:43 -0000	1.6
@@ -1,9 +1,7 @@
-# $Id$
-
 Summary:	more, less, most
 Name:		most
 Version:	4.9.5
-Release:	3
+Release:	4
 License:	GPL
 URL:		ftp://space.mit.edu/pub/davis/most/
 Group:		Applications/Text
@@ -22,7 +20,7 @@
 
 %build
 sed -i 's!s\%@RPATH@\%.*!s\%@RPATH@\%\%g!' configure
-%ifarch x86_64
+%ifarch x86_64 ppc ppc64
 sed -i 's|/usr/lib|%{_libdir}|g' configure
 %endif
 chmod +x configure
@@ -45,6 +43,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Adrian Reber <adrian at lisas.de> - 4.9.5-4
+- fix build on ppc/ppc64
+
 * Sat Feb 12 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 4.9.5-3
 - sed -i 's|/usr/lib|%%{_libdir}|g' configure fixes x86_64 build;
 



From fedora-extras-commits at redhat.com  Wed Mar 30 15:01:08 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 30 Mar 2005 10:01:08 -0500
Subject: rpms/bzflag/devel bzflag.spec,1.6,1.7
Message-ID: <200503301501.j2UF18v5010326@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10319

Modified Files:
	bzflag.spec 
Log Message:
work around missing dependency in xorg-x11-devel



Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bzflag.spec	23 Mar 2005 15:52:40 -0000	1.6
+++ bzflag.spec	30 Mar 2005 15:01:06 -0000	1.7
@@ -12,6 +12,8 @@
 Source1: bzflag.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: xorg-x11-devel
+# work around missing dependency in xorg-x11-devel:
+BuildRequires: libGL.so.1 libGLU.so.1
 BuildRequires: gcc-c++
 BuildRequires: desktop-file-utils
 BuildRequires: SDL-devel
@@ -66,6 +68,9 @@
 
 %changelog
 * Wed Mar 23 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.2-1
+- work around missing dependency in xorg-x11-devel
+
+* Wed Mar 23 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 2.0.2
 
 * Tue Mar 15 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.0-4



From fedora-extras-commits at redhat.com  Wed Mar 30 15:11:22 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:11:22 -0500
Subject: rpms/python-elementtree - New directory
Message-ID: <200503301511.j2UFBMY1010735@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-elementtree
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10728/python-elementtree

Log Message:
Directory /cvs/extras/rpms/python-elementtree added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 30 15:11:22 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:11:22 -0500
Subject: rpms/python-elementtree/devel - New directory
Message-ID: <200503301511.j2UFBMrX010738@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-elementtree/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10728/python-elementtree/devel

Log Message:
Directory /cvs/extras/rpms/python-elementtree/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 30 15:11:36 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:11:36 -0500
Subject: rpms/python-elementtree Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503301511.j2UFBa8o010800@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-elementtree
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10791

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-elementtree


--- NEW FILE Makefile ---
# Top level Makefile for module python-elementtree
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 30 15:11:36 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:11:36 -0500
Subject: rpms/python-elementtree/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503301511.j2UFBa1A010803@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-elementtree/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10791/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-elementtree


--- 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 Mar 30 15:12:00 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:12:00 -0500
Subject: rpms/python-elementtree import.log,1.1,1.2
Message-ID: <200503301512.j2UFC0oJ010911@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-elementtree
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10902

Modified Files:
	import.log 
Log Message:
auto-import python-elementtree-1.2.6-3 on branch devel from python-elementtree-1.2.6-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-elementtree/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Mar 2005 15:11:34 -0000	1.1
+++ import.log	30 Mar 2005 15:11:58 -0000	1.2
@@ -0,0 +1 @@
+python-elementtree-1_2_6-3:HEAD:python-elementtree-1.2.6-3.src.rpm:1112195689



From fedora-extras-commits at redhat.com  Wed Mar 30 15:12:00 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:12:00 -0500
Subject: rpms/python-elementtree/devel cElementTree-system-expat-setup.py,
	NONE, 1.1 python-elementtree.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503301512.j2UFC093010915@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-elementtree/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10902/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cElementTree-system-expat-setup.py python-elementtree.spec 
Log Message:
auto-import python-elementtree-1.2.6-3 on branch devel from python-elementtree-1.2.6-3.src.rpm


--- NEW FILE cElementTree-system-expat-setup.py ---
#!/usr/bin/env python
#
# Setup script for the cElementTree accelerator
# $Id: setup.py 2294 2005-02-13 12:09:00Z fredrik $
#
# Usage: python setup.py install
#

from distutils.core import setup, Extension
from distutils import sysconfig

# --------------------------------------------------------------------
# identification

NAME = "cElementTree"
VERSION = "1.0.2-20050302"
DESCRIPTION = "A fast C implementation of the ElementTree API."
AUTHOR = "Fredrik Lundh", "fredrik at pythonware.com"
HOMEPAGE = "http://www.effbot.org/zone/celementtree.htm"
DOWNLOAD = "http://effbot.org/downloads#celementtree"

# --------------------------------------------------------------------
# distutils declarations

celementtree_module = Extension(
    "cElementTree", ["cElementTree.c"],
    include_dirs=['/usr/include'],
    libraries=['expat']
    )

try:
    # add classifiers and download_url syntax to distutils
    from distutils.dist import DistributionMetadata
    DistributionMetadata.classifiers = None
    DistributionMetadata.download_url = None
except:
    pass

setup(
    author=AUTHOR[0],
    author_email=AUTHOR[1],
    classifiers=[
        "Development Status :: 5 - Production/Stable",
        "Operating System :: OS Independent",
        "Topic :: Text Processing :: Markup :: XML",
        ],
    description=DESCRIPTION,
    download_url=DOWNLOAD,
    ext_modules = [celementtree_module],
    license="Python (MIT style)",
    long_description=DESCRIPTION,
    name=NAME,
    platforms="Python 2.1 and later.",
    url=HOMEPAGE,
    version=VERSION,
    )


--- NEW FILE python-elementtree.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)")}

%define     _upstream_nvr   elementtree-1.2.6-20050316
%define     _upstream_cnvr  cElementTree-1.0.2-20050302    

Name:           python-elementtree
Version:        1.2.6
Release:        3
Summary:        Fast XML parser and writer

Group:          Development/Libraries
License:        PSF
URL:            http://effbot.org/zone/element-index.htm
Source0:        http://effbot.org/downloads/%{_upstream_nvr}.zip
Source1:        http://effbot.org/downloads/%{_upstream_cnvr}.zip
Source2:        cElementTree-system-expat-setup.py
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

BuildRequires:  expat-devel, python-devel
Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
The Element type is a simple but flexible container object, designed
to store hierarchical data structures, such as simplified XML
infosets, in memory. The element type can be described as a cross
between a Python list and a Python dictionary.

This package also includes the C implementation, %{_upstream_cnvr}.

%prep
%setup -q -n %{_upstream_nvr}
## Take care of cElementTree
%{__unzip} %{SOURCE1}
pushd %{_upstream_cnvr}
mv -f setup.py setup.py-orig
cp -f %{SOURCE2} setup.py
cp -f README ../README-cElementTree
cp -f CHANGES ../CHANGES-cElementTree
popd


%build
%{__python} setup.py build
pushd %{_upstream_cnvr}
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
popd


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
pushd %{_upstream_cnvr}
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs samples README* CHANGES* benchmark.py
%dir %{python_sitelib}/elementtree
%{python_sitelib}/elementtree/*.py
%{python_sitelib}/elementtree/*.pyc
%ghost %{python_sitelib}/elementtree/*.pyo
%{python_sitearch}/*.so

%changelog
* Tue Mar 30 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 1.2.6-3
- Use python_sitearch for the C library.

* Tue Mar 29 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 1.2.6-2
- Use python_sitelib
- Own the elementtree dir in site-packages
- BuildRequire python-devel
- Do not namely require expat
- Do not use INSTALLED_FILES (safer)
- Use ghosting for .pyo

* Thu Mar 17 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 1.2.6-1
- Version 1.2.6 of ElementTree.

* Thu Mar 10 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 1.2.5-1
- Rename as python-elementtree.

* Sat Mar  5 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 1.2.5-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-elementtree/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Mar 2005 15:11:34 -0000	1.1
+++ .cvsignore	30 Mar 2005 15:11:58 -0000	1.2
@@ -0,0 +1,2 @@
+cElementTree-1.0.2-20050302.zip
+elementtree-1.2.6-20050316.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-elementtree/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Mar 2005 15:11:34 -0000	1.1
+++ sources	30 Mar 2005 15:11:58 -0000	1.2
@@ -0,0 +1,2 @@
+aba87db5932ac46fd7a75cfbc711f6ba  cElementTree-1.0.2-20050302.zip
+6751a9005efbd2c543ef32905d4a0acd  elementtree-1.2.6-20050316.zip



From fedora-extras-commits at redhat.com  Wed Mar 30 15:15:12 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:15:12 -0500
Subject: rpms/python-kid - New directory
Message-ID: <200503301515.j2UFFC6C011061@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11054/python-kid

Log Message:
Directory /cvs/extras/rpms/python-kid added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 30 15:15:12 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:15:12 -0500
Subject: rpms/python-kid/devel - New directory
Message-ID: <200503301515.j2UFFCi9011064@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11054/python-kid/devel

Log Message:
Directory /cvs/extras/rpms/python-kid/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 30 15:15:26 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:15:26 -0500
Subject: rpms/python-kid Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503301515.j2UFFQhp011126@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11117

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-kid


--- NEW FILE Makefile ---
# Top level Makefile for module python-kid
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 30 15:15:26 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:15:26 -0500
Subject: rpms/python-kid/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503301515.j2UFFQnI011129@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11117/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-kid


--- 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 Mar 30 15:15:46 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:15:46 -0500
Subject: rpms/python-kid import.log,1.1,1.2
Message-ID: <200503301515.j2UFFk0D011234@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11225

Modified Files:
	import.log 
Log Message:
auto-import python-kid-0.6.3-2 on branch devel from python-kid-0.6.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-kid/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Mar 2005 15:15:24 -0000	1.1
+++ import.log	30 Mar 2005 15:15:44 -0000	1.2
@@ -0,0 +1 @@
+python-kid-0_6_3-2:HEAD:python-kid-0.6.3-2.src.rpm:1112195916



From fedora-extras-commits at redhat.com  Wed Mar 30 15:15:46 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:15:46 -0500
Subject: rpms/python-kid/devel python-kid.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503301515.j2UFFkD2011239@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11225/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-kid.spec 
Log Message:
auto-import python-kid-0.6.3-2 on branch devel from python-kid-0.6.3-2.src.rpm


--- NEW FILE python-kid.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-kid
Version:        0.6.3
Release:        2
Summary:        Kid - A simple and pythonic XML template language

Group:          Applications/Publishing
License:        MIT
URL:            http://www.lesscode.org/projects/kid
Source0:        http://lesscode.org/dist/kid/kid-0.6.3.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch:      noarch

BuildRequires:  python-devel
Requires:       python-elementtree
Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
Kid is a simple Python based template language for generating and
transforming XML vocabularies. Templates are compiled to native Python 
byte-code and may be imported and used like normal Python modules.


%prep
%setup -q -n kid-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT/%{python_sitelib}/kid/test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING HISTORY README doc test
%dir %{python_sitelib}/kid
%{python_sitelib}/kid/*.py
%{python_sitelib}/kid/*.pyc
%ghost %{python_sitelib}/kid/*.pyo
%{_bindir}/*


%changelog
* Tue Mar 29 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 0.6.3-2
- Add docs and list files instead of using INSTALLED_FILES (safer)
- Trim description a little
- Require python-abi
- BuildRequire python-devel
- Use python_sitelib
- Remove test directory from site_packages
- Use ghosting for .pyo

* Mon Mar 14 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 0.6.3-1
- Version 0.6.3

* Thu Mar 10 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 0.6.2-1
- Initial build in Fedora Extras format.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-kid/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Mar 2005 15:15:24 -0000	1.1
+++ .cvsignore	30 Mar 2005 15:15:44 -0000	1.2
@@ -0,0 +1 @@
+kid-0.6.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-kid/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Mar 2005 15:15:24 -0000	1.1
+++ sources	30 Mar 2005 15:15:44 -0000	1.2
@@ -0,0 +1 @@
+ddc1db3b7d17372d18f095680e0992c8  kid-0.6.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 30 15:15:54 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 30 Mar 2005 10:15:54 -0500
Subject: devel/linux_logo linux_logo-gcc4.patch, NONE, 1.1 linux_logo.spec,
	1.5, 1.6
Message-ID: <200503301515.j2UFFsGc011307@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/linux_logo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11218

Modified Files:
	linux_logo.spec 
Added Files:
	linux_logo-gcc4.patch 
Log Message:
added gcc4 patch


linux_logo-gcc4.patch:

--- NEW FILE linux_logo-gcc4.patch ---
diff -ur linux_logo-4.09/linux_logo.c linux_logo-4.09.new/linux_logo.c
--- linux_logo-4.09/linux_logo.c	2004-03-17 16:01:00.000000000 -0500
+++ linux_logo-4.09.new/linux_logo.c	2029-02-21 03:21:23.569055000 -0500
@@ -106,7 +106,7 @@
       if (logo_start) {
 	 size+=strlen(temp_st);
 	 if (new_logo->logo==NULL) {
-	    (char *)new_logo->logo=strdup(temp_st);
+	    new_logo->logo=(char **)strdup(temp_st);
 	 }
 	 else {
 	    new_logo->logo=realloc(new_logo->logo,size+1);
@@ -117,7 +117,7 @@
       if (ascii_logo_start) {
          ascii_size+=strlen(temp_st);
 	 if (new_logo->ascii_logo==NULL) {
-	    (char *)new_logo->ascii_logo=strdup(temp_st);
+	    new_logo->ascii_logo=(char **)strdup(temp_st);
 	 }
 	 else {
 	    new_logo->ascii_logo=realloc(new_logo->ascii_logo,ascii_size+1);
diff -ur linux_logo-4.09/parse_logos.c linux_logo-4.09.new/parse_logos.c
--- linux_logo-4.09/parse_logos.c	2004-03-14 00:45:53.000000000 -0500
+++ linux_logo-4.09.new/parse_logos.c	2029-02-21 03:23:34.462989000 -0500
@@ -37,7 +37,7 @@
       if (logo_start) {
 	 size+=strlen(temp_st);
 	 if (new_logo->logo==NULL) {
-	    (char *)new_logo->logo=strdup(temp_st);
+	    new_logo->logo=(char **)strdup(temp_st);
 	 }
 	 else {
 	    new_logo->logo=realloc(new_logo->logo,size+1);
@@ -48,7 +48,7 @@
       if (ascii_logo_start) {
          ascii_size+=strlen(temp_st);
 	 if (new_logo->ascii_logo==NULL) {
-	    (char *)new_logo->ascii_logo=strdup(temp_st);
+	    new_logo->ascii_logo=(char **)strdup(temp_st);
 	 }
 	 else {
 	    new_logo->ascii_logo=realloc(new_logo->ascii_logo,ascii_size+1);
@@ -69,7 +69,7 @@
 	 }
 	 if (!strncmp(temp_st,"DESCRIPTION_STRING",18)) {
 	    new_logo->description=strdup(temp_st+19);	   
-	    (char)(new_logo->description)[strlen(new_logo->description)-1]
+	    new_logo->description[strlen(new_logo->description)-1]
 	      ='\0';
 	 }
       }
@@ -173,11 +173,11 @@
 	  
 	  fprintf(ggg,"\tnew_logo->description=strdup(\"%s\");\n",
 		      logo_info_temp->description);
-	  fprintf(ggg,"\t(char *)new_logo->logo=strdup(\"");
+	  fprintf(ggg,"\tnew_logo->logo=(char **)strdup(\"");
 	  sanitize_print_string((char *)logo_info_temp->logo,ggg);
 	  fprintf(ggg,"\");\n");
 	  fprintf(ggg,"\tnew_logo->ysize=%d;\n",logo_info_temp->ysize);
-	  fprintf(ggg,"\t(char *)new_logo->ascii_logo=strdup(\"");
+	  fprintf(ggg,"\tnew_logo->ascii_logo=(char **)strdup(\"");
 	  sanitize_print_string((char *)logo_info_temp->ascii_logo,ggg);
 	  fprintf(ggg,"\");\n");
 	  fprintf(ggg,"\tnew_logo->ascii_ysize=%d;\n",


Index: linux_logo.spec
===================================================================
RCS file: /cvs/extras/devel/linux_logo/linux_logo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux_logo.spec	16 Nov 2004 17:52:18 -0000	1.5
+++ linux_logo.spec	30 Mar 2005 15:15:52 -0000	1.6
@@ -3,11 +3,12 @@
 Summary: The linux logo - a colorful console penguin logo
 Name: linux_logo
 Version: 4.09
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/System
 URL: http://www.deater.net/weave/vmwprod/linux_logo/
 Source: http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-%{version}.tar.gz
+Patch0: linux_logo-gcc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gettext
 
@@ -17,7 +18,7 @@
 
 %prep
 %setup
-
+%patch0 -p1
 
 %build
 for logo in ./logos/*.logo ./logos/*/*.logo; do
@@ -43,12 +44,16 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
-%doc CHANGES COPYING README LINUX_LOGO.FAQ README* TODO USAGE
+%doc CHANGES COPYING LINUX_LOGO.FAQ README* TODO USAGE
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 
 
 %changelog
+* Wed Mar 30 2005 Adrian Reber <adrian at lisas.de> 4.09-3
+- Added gcc4 patch
+- Fixed a warning
+
 * Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 4.09-2
 - Bump release to provide Extras upgrade path.
 



From fedora-extras-commits at redhat.com  Wed Mar 30 15:17:26 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:17:26 -0500
Subject: rpms/repoview - New directory
Message-ID: <200503301517.j2UFHQPa011392@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11385/repoview

Log Message:
Directory /cvs/extras/rpms/repoview added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 30 15:17:26 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:17:26 -0500
Subject: rpms/repoview/devel - New directory
Message-ID: <200503301517.j2UFHQts011395@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11385/repoview/devel

Log Message:
Directory /cvs/extras/rpms/repoview/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Mar 30 15:17:40 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:17:40 -0500
Subject: rpms/repoview Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503301517.j2UFHeC3011457@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11448

Added Files:
	Makefile import.log 
Log Message:
Setup of module repoview


--- NEW FILE Makefile ---
# Top level Makefile for module repoview
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 30 15:17:40 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:17:40 -0500
Subject: rpms/repoview/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200503301517.j2UFHeZM011460@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11448/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module repoview


--- 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 Mar 30 15:18:02 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:18:02 -0500
Subject: rpms/repoview import.log,1.1,1.2
Message-ID: <200503301518.j2UFI2IS011559@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11550

Modified Files:
	import.log 
Log Message:
auto-import repoview-0.3-2 on branch devel from repoview-0.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/repoview/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Mar 2005 15:17:38 -0000	1.1
+++ import.log	30 Mar 2005 15:18:00 -0000	1.2
@@ -0,0 +1 @@
+repoview-0_3-2:HEAD:repoview-0.3-2.src.rpm:1112196051



From fedora-extras-commits at redhat.com  Wed Mar 30 15:18:02 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 30 Mar 2005 10:18:02 -0500
Subject: rpms/repoview/devel repoview.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200503301518.j2UFI2MG011563@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11550/devel

Modified Files:
	.cvsignore sources 
Added Files:
	repoview.spec 
Log Message:
auto-import repoview-0.3-2 on branch devel from repoview-0.3-2.src.rpm


--- NEW FILE repoview.spec ---
Name:           repoview
Version:        0.3
Release:        2
Summary:        Creates a set of static HTML pages in a yum repository

Group:          Applications/System
License:        GPL
URL:            http://linux.duke.edu/projects/mini/repoview
Source0:        http://linux.duke.edu/projects/mini/repoview/download/repoview-0.3.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-root
BuildArch:      noarch

BuildRequires:  sed >= 4
Requires:       python-kid >= 0.6.3, python-elementtree

%description
RepoView creates a set of static HTML pages in a yum repository for easy
browsing.


%prep
%setup -q
##
# Fix version and default templates dir.
#
sed -i -e \
    "s|^VERSION =.*|VERSION = '%{version}-%{release}'|g" repoview.py
sed -i -e \
    "s|^DEFAULT_TEMPLATEDIR =.*|DEFAULT_TEMPLATEDIR = '%{_datadir}/%{name}/templates'|g" \
    repoview.py

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p -m 755                         \
    $RPM_BUILD_ROOT/%{_datadir}/%{name} \
    $RPM_BUILD_ROOT/%{_bindir}          \
    $RPM_BUILD_ROOT/%{_mandir}/man8
install -p -m 755 repoview.py  $RPM_BUILD_ROOT/%{_bindir}/repoview
install -p -m 644 repoview.8   $RPM_BUILD_ROOT/%{_mandir}/man8/
cp -rp templates               $RPM_BUILD_ROOT/%{_datadir}/%{name}/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog
%{_datadir}/%{name}
%{_bindir}/*
%{_mandir}/man*/*


%changelog
* Tue Mar 29 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 0.3-2
- Preserve timestamps on installed files
- Do not use macros in source tags
- Omit Epoch

* Fri Mar 25 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 0.3-1
- Version 0.3

* Thu Mar 10 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 0.2-1
- Version 0.2
- Fix URL
- Comply with fedora extras specfile format.
- Depend on python-elementtree and python-kid -- the names in extras.

* Thu Mar 03 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 0.1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Mar 2005 15:17:38 -0000	1.1
+++ .cvsignore	30 Mar 2005 15:18:00 -0000	1.2
@@ -0,0 +1 @@
+repoview-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Mar 2005 15:17:38 -0000	1.1
+++ sources	30 Mar 2005 15:18:00 -0000	1.2
@@ -0,0 +1 @@
+03a14fccdb7cae46d3a6da9f1069ca14  repoview-0.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Mar 30 15:40:00 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 30 Mar 2005 10:40:00 -0500
Subject: rpms/gnome-blog/FC-3 gnome-blog.spec,1.4,1.5
Message-ID: <200503301540.j2UFe0gu011735@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11726/FC-3

Modified Files:
	gnome-blog.spec 
Log Message:
add dist tags, and rebuild FC4 for python 2.4


Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/FC-3/gnome-blog.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-blog.spec	13 Mar 2005 02:58:17 -0000	1.4
+++ gnome-blog.spec	30 Mar 2005 15:39:58 -0000	1.5
@@ -5,7 +5,7 @@
 
 Name:		gnome-blog
 Version:	0.8
-Release:	5
+Release:	6.fc3
 Summary:	GNOME panel object for posting blog entries
 
 Group:		Applications/Internet
@@ -93,6 +93,9 @@
 %ghost %{python_sitelib}/gnomeblog/*.pyo
 
 %changelog
+* Wed Mar 30 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-6.fc3
+- Add dist tag.
+
 * Tue Mar  1 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-5
 - Add build requires: intltool
 - Drop epoch: 0.



From fedora-extras-commits at redhat.com  Wed Mar 30 15:40:00 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 30 Mar 2005 10:40:00 -0500
Subject: rpms/gnome-blog/devel gnome-blog.spec,1.6,1.7
Message-ID: <200503301540.j2UFe0lw011739@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11726/devel

Modified Files:
	gnome-blog.spec 
Log Message:
add dist tags, and rebuild FC4 for python 2.4


Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/gnome-blog.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-blog.spec	13 Mar 2005 02:02:33 -0000	1.6
+++ gnome-blog.spec	30 Mar 2005 15:39:58 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name:		gnome-blog
 Version:	0.8
-Release:	5
+Release:	6.fc4
 Summary:	GNOME panel object for posting blog entries
 
 Group:		Applications/Internet
@@ -93,6 +93,10 @@
 %ghost %{python_sitelib}/gnomeblog/*.pyo
 
 %changelog
+* Wed Mar 30 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-6.fc4
+- Rebuild with Python 2.4.
+- Add dist tag.
+
 * Tue Mar  1 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-5
 - Add build requires: intltool
 - Drop epoch: 0.



From fedora-extras-commits at redhat.com  Wed Mar 30 16:13:01 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 30 Mar 2005 11:13:01 -0500
Subject: rpms/python-reportlab import.log,1.3,1.4
Message-ID: <200503301613.j2UGD1Om012754@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-reportlab
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12744

Modified Files:
	import.log 
Log Message:
auto-import python-reportlab-1.20-1.fc4 on branch devel from python-reportlab-1.20-1.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	8 Nov 2004 05:16:13 -0000	1.3
+++ import.log	30 Mar 2005 16:12:59 -0000	1.4
@@ -1,2 +1,3 @@
 python-reportlab-1_19-0_fdr_2_1:HEAD:python-reportlab-1.19-0.fdr.2.1.src.rpm:1099890957
 python-reportlab-1_19-0_fdr_2_2:HEAD:python-reportlab-1.19-0.fdr.2.2.src.rpm:1099890973
+python-reportlab-1_20-1_fc4:HEAD:python-reportlab-1.20-1.fc4.src.rpm:1112199175



From fedora-extras-commits at redhat.com  Wed Mar 30 16:13:01 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 30 Mar 2005 11:13:01 -0500
Subject: rpms/python-reportlab/devel .cvsignore, 1.2,
	1.3 python-reportlab.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200503301613.j2UGD16J012757@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-reportlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12744/devel

Modified Files:
	.cvsignore python-reportlab.spec sources 
Log Message:
auto-import python-reportlab-1.20-1.fc4 on branch devel from python-reportlab-1.20-1.fc4.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:15:57 -0000	1.2
+++ .cvsignore	30 Mar 2005 16:12:59 -0000	1.3
@@ -1 +1 @@
-ReportLab_1_19.tgz
+ReportLab_1_20.tgz


Index: python-reportlab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/devel/python-reportlab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-reportlab.spec	3 Mar 2005 23:53:13 -0000	1.4
+++ python-reportlab.spec	30 Mar 2005 16:12:59 -0000	1.5
@@ -1,27 +1,27 @@
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pynext %(python -c 'print %{pyver} + 0.1')
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-Name:           python-reportlab
-Version:        1.19
-Release:        2
-Summary:        Python PDF generation library
-
-Group:          Development/Libraries
-License:        BSD
-URL:            http://www.reportlab.org/
-Source0:        http://www.reportlab.org/ftp/ReportLab_1_19.tgz
+Name:		python-reportlab
+Version:	1.20
+Release:	1.fc4
+Summary:	Python PDF generation library
+
+Group:		Development/Libraries
+License:	BSD
+URL:		http://www.reportlab.org/
+Source0:	http://www.reportlab.org/ftp/ReportLab_1_20.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel >= 2.2
-Requires:       python >= %{pyver}, python < %{pynext}
+BuildRequires:	python-devel >= 2.2
+Requires:	python-abi = %{pyver}
 
 %description
 Python PDF generation library.
 
 
 %prep
-%setup -q -n reportlab-1_19
+%setup -q -n reportlab_1_20
 
 
 %build
@@ -34,9 +34,9 @@
 cd ./reportlab
 %{__python} setup.py install --root $RPM_BUILD_ROOT
 
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{pyver}/reportlab/README
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{pyver}/reportlab/changes
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{pyver}/reportlab/license.txt
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/README
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/changes
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/license.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,10 +45,16 @@
 %files
 %defattr(-,root,root,-)
 %doc reportlab/README reportlab/changes reportlab/license.txt
-%{_libdir}/python%{pyver}/*
+%{python_sitelib}/*
 
 
 %changelog
+* Wed Mar 30 2005 Brian Pepple <bdpepple at ameritech.net> - 1.20-1.fc4
+- Rebuild for Python 2.4.
+- Update to 1.20.
+- Switch to the new python macros for python-abi
+- Add dist tag.
+
 * Sat Apr 24 2004 Brian Pepple <bdpepple at ameritech.net> 0:1.19-0.fdr.2
 - Removed %ghosts.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:15:57 -0000	1.2
+++ sources	30 Mar 2005 16:12:59 -0000	1.3
@@ -1 +1 @@
-02eeec6481f71918bf469a78edc4437c  ReportLab_1_19.tgz
+8d374b9b6f7db3fc0821082347d5e6b5  ReportLab_1_20.tgz



From fedora-extras-commits at redhat.com  Wed Mar 30 16:17:06 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 30 Mar 2005 11:17:06 -0500
Subject: rpms/python-reportlab/FC-3 python-reportlab.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200503301617.j2UGH6ax012853@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-reportlab/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12847

Modified Files:
	python-reportlab.spec sources 
Log Message:
update to 1.20


Index: python-reportlab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/FC-3/python-reportlab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-reportlab.spec	10 Dec 2004 22:03:10 -0000	1.3
+++ python-reportlab.spec	30 Mar 2005 16:17:03 -0000	1.4
@@ -1,28 +1,27 @@
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pynext %(python -c 'print %{pyver} + 0.1')
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-Name:           python-reportlab
-Version:        1.19
-Release:        2
-Epoch:          0
-Summary:        Python PDF generation library
-
-Group:          Development/Libraries
-License:        BSD
-URL:            http://www.reportlab.org/
-Source0:        http://www.reportlab.org/ftp/ReportLab_1_19.tgz
-         
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		python-reportlab
+Version:	1.20
+Release:	1.fc3
+Summary:	Python PDF generation library
+
+Group:		Development/Libraries
+License:	BSD
+URL:		http://www.reportlab.org/
+Source0:	http://www.reportlab.org/ftp/ReportLab_1_20.tgz
 
-BuildRequires:  python-devel >= 0:2.2  
-Requires:       python >= 0:%{pyver}, python < 0:%{pynext}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	python-devel >= 2.2
+Requires:	python-abi = %{pyver}
 
 %description
 Python PDF generation library.
 
 
 %prep
-%setup -q -n reportlab-1_19
+%setup -q -n reportlab_1_20
 
 
 %build
@@ -35,9 +34,9 @@
 cd ./reportlab
 %{__python} setup.py install --root $RPM_BUILD_ROOT
 
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{pyver}/reportlab/README
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{pyver}/reportlab/changes
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{pyver}/reportlab/license.txt
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/README
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/changes
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/license.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -46,10 +45,15 @@
 %files
 %defattr(-,root,root,-)
 %doc reportlab/README reportlab/changes reportlab/license.txt
-%{_libdir}/python%{pyver}/*
+%{python_sitelib}/*
 
 
 %changelog
+* Wed Mar 30 2005 Brian Pepple <bdpepple at ameritech.net> - 1.20-1.fc3
+- Update to 1.20.
+- Switch to the new python macros for python-abi
+- Add dist tag.
+
 * Sat Apr 24 2004 Brian Pepple <bdpepple at ameritech.net> 0:1.19-0.fdr.2
 - Removed %ghosts.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:15:57 -0000	1.2
+++ sources	30 Mar 2005 16:17:03 -0000	1.3
@@ -1 +1 @@
-02eeec6481f71918bf469a78edc4437c  ReportLab_1_19.tgz
+8d374b9b6f7db3fc0821082347d5e6b5  ReportLab_1_20.tgz



From fedora-extras-commits at redhat.com  Wed Mar 30 16:33:40 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 30 Mar 2005 11:33:40 -0500
Subject: rpms/revelation/FC-3 revelation.spec,1.4,1.5
Message-ID: <200503301633.j2UGXeOF012995@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/revelation/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12986/FC-3

Modified Files:
	revelation.spec 
Log Message:
* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.2-2
- Devel rebuild

* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.2-1
- Update to 0.4.2



Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/FC-3/revelation.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- revelation.spec	2 Mar 2005 19:05:15 -0000	1.4
+++ revelation.spec	30 Mar 2005 16:33:38 -0000	1.5
@@ -3,12 +3,12 @@
 
 Summary:	Password manager for GNOME 2
 Name: 		revelation
-Version: 	0.4.0
+Version: 	0.4.2
 Epoch: 		0
 Release: 	1
 License: 	GPL
 Group: 		Applications/Productivity
-Source: 	ftp://oss.codepoet.no/revelation/revelation-0.4.0.tar.bz2
+Source: 	ftp://oss.codepoet.no/revelation/revelation-0.4.2.tar.bz2
 URL: 		http://oss.codepoet.no/revelation/
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	python-crypto >= 0:2.0
@@ -82,10 +82,12 @@
 %{_datadir}/revelation/
 %{_datadir}/icons/hicolor/??x??/mimetypes/gnome-mime-application-x-revelation.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/filesystems/%{name}*
+# the next two entries should be python_sitearch, but the packages currently does it
+# wrong on install and during execution. So leave them in {python_sitelib} for now
 #dir %{python_sitearch}/revelation/
-# the next entry should be python_sitearch, but the packages currently does it 
-# wrong on install and during execution. So leave it in {python_sitelib} for now
 %{python_sitelib}/revelation/authmanager.so
+%{python_sitelib}/revelation/crack.so
 %dir %{python_sitelib}/revelation/
 %dir %{python_sitelib}/revelation/datahandler/
 %{_datadir}/mime/packages/*
@@ -97,6 +99,9 @@
 %ghost %{python_sitelib}/revelation/datahandler/*.pyo
 
 %changelog
+* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.2-1
+- Update to 0.4.2
+
 * Tue Mar 01 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.0-1
 - Update to 0.4.0 - depends on gtk 2.4 now
 - Uses configure now



From fedora-extras-commits at redhat.com  Wed Mar 30 16:33:40 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 30 Mar 2005 11:33:40 -0500
Subject: rpms/revelation/devel .cvsignore, 1.4, 1.5 revelation.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200503301633.j2UGXeqx012999@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/revelation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12986/devel

Modified Files:
	.cvsignore revelation.spec sources 
Log Message:
* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.2-2
- Devel rebuild

* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.2-1
- Update to 0.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Mar 2005 19:05:15 -0000	1.4
+++ .cvsignore	30 Mar 2005 16:33:38 -0000	1.5
@@ -1 +1 @@
-revelation-0.4.0.tar.bz2
+revelation-0.4.2.tar.bz2


Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- revelation.spec	4 Mar 2005 00:05:42 -0000	1.6
+++ revelation.spec	30 Mar 2005 16:33:38 -0000	1.7
@@ -3,11 +3,11 @@
 
 Summary:	Password manager for GNOME 2
 Name:		revelation
-Version:	0.4.0
-Release:	1
+Version:	0.4.2
+Release:	2
 License:	GPL
 Group:		Applications/Productivity
-Source:		ftp://oss.codepoet.no/revelation/revelation-0.4.0.tar.bz2
+Source:		ftp://oss.codepoet.no/revelation/revelation-0.4.2.tar.bz2
 URL:		http://oss.codepoet.no/revelation/
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	python-crypto >= 2.0
@@ -81,10 +81,12 @@
 %{_datadir}/revelation/
 %{_datadir}/icons/hicolor/??x??/mimetypes/gnome-mime-application-x-revelation.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/filesystems/%{name}*
+# the next two entries should be python_sitearch, but the packages currently does it
+# wrong on install and during execution. So leave them in {python_sitelib} for now
 #dir %{python_sitearch}/revelation/
-# the next entry should be python_sitearch, but the packages currently does it
-# wrong on install and during execution. So leave it in {python_sitelib} for now
 %{python_sitelib}/revelation/authmanager.so
+%{python_sitelib}/revelation/crack.so
 %dir %{python_sitelib}/revelation/
 %dir %{python_sitelib}/revelation/datahandler/
 %{_datadir}/mime/packages/*
@@ -96,6 +98,12 @@
 %ghost %{python_sitelib}/revelation/datahandler/*.pyo
 
 %changelog
+* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.2-2
+- Devel rebuild
+
+* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.2-1
+- Update to 0.4.2
+
 * Tue Mar 01 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:0.4.0-1
 - Update to 0.4.0 - depends on gtk 2.4 now
 - Uses configure now


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Mar 2005 19:05:15 -0000	1.4
+++ sources	30 Mar 2005 16:33:38 -0000	1.5
@@ -1 +1 @@
-d00dd223a1c35472e573fb11d758cd98  revelation-0.4.0.tar.bz2
+a2e58904072a58473245037976cca569  revelation-0.4.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar 30 16:35:50 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 30 Mar 2005 11:35:50 -0500
Subject: rpms/notemeister/devel notemeister.spec,1.3,1.4
Message-ID: <200503301635.j2UGZo3M013054@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/notemeister/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13048

Modified Files:
	notemeister.spec 
Log Message:
* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0.1.7-3
- Devel rebuild




Index: notemeister.spec
===================================================================
RCS file: /cvs/extras/rpms/notemeister/devel/notemeister.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- notemeister.spec	3 Mar 2005 23:01:24 -0000	1.3
+++ notemeister.spec	30 Mar 2005 16:35:48 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           notemeister
 Version:        0.1.7
-Release:        2
+Release:        3
 Summary:        Small, simple note organizer made for the GNOME2 desktop
 
 Group:          Applications/Productivity
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Wed Mar 30 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0.1.7-3
+- Devel rebuild
+
 * Fri Nov 19 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.1.7-0.fdr.2
 - Don't ship empty NEWS file
 - Point Source0 to sourceforge download redirector



From fedora-extras-commits at redhat.com  Wed Mar 30 16:57:03 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 30 Mar 2005 11:57:03 -0500
Subject: rpms/revelation/FC-3 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200503301657.j2UGv3RX013217@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/revelation/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13207

Modified Files:
	.cvsignore sources 
Log Message:
forgot sources update on FC-3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/revelation/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Mar 2005 19:05:15 -0000	1.4
+++ .cvsignore	30 Mar 2005 16:57:01 -0000	1.5
@@ -1 +1 @@
-revelation-0.4.0.tar.bz2
+revelation-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/revelation/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Mar 2005 19:05:15 -0000	1.4
+++ sources	30 Mar 2005 16:57:01 -0000	1.5
@@ -1 +1 @@
-d00dd223a1c35472e573fb11d758cd98  revelation-0.4.0.tar.bz2
+a2e58904072a58473245037976cca569  revelation-0.4.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Mar 30 17:47:30 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 30 Mar 2005 12:47:30 -0500
Subject: web - Imported sources
Message-ID: <200503301747.j2UHlUT5014280@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/web
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14267

Log Message:
Import into public repo

Status:

Vendor Tag:	FEDORA
Release Tags:	V1_1
		
N web/Makefile
N web/TODO
N web/website-architecture
N web/website-sitemap
N web/config/HOWTO-DOCS
N web/config/HOWTO
N web/config/HOWTO-LIVE
N web/config/httpd.conf
N web/config/php.ini
N web/config/tux.mime.types
N web/config/tux.sysconfig
N web/html/common.inc
N web/html/404.php
N web/html/index.php
N web/html/about/index.php
N web/html/about/leadership.php
N web/html/about/name.php
N web/html/about/objectives.php
N web/html/about/rhel.php
N web/html/about/faq/index.php
N web/html/about/history/index.php
N web/html/about/security/1CDDBCA9.txt
N web/html/about/security/30C9ECF8.txt
N web/html/about/security/4F2A6FD2.txt
N web/html/about/security/8DF56D05.txt
N web/html/about/security/index.php
N web/html/about/trademarks/common.inc
N web/html/about/trademarks/index.php
N web/html/about/trademarks/trademark_usage.pdf
N web/html/about/trademarks/guidelines/common.inc
N web/html/about/trademarks/guidelines/index.php
N web/html/about/trademarks/guidelines/page1.php
N web/html/about/trademarks/guidelines/page2.php
N web/html/about/trademarks/guidelines/page3.php
N web/html/about/trademarks/guidelines/page4.php
N web/html/about/trademarks/guidelines/page5.php
N web/html/about/trademarks/guidelines/page6.php
N web/html/about/trademarks/guidelines/page7.php
N web/html/css/content.css
N web/html/css/docbook.css
N web/html/css/layout.css
N web/html/css/print.css
N web/html/docs/index.php
N web/html/docs/severn-announce.php
N web/html/docs/jargon-buster/fedora-glossary.php
N web/html/docs/jargon-buster/index.php
N web/html/docs/jargon-buster/ln-legalnotice.php
N web/html/docs/package-list/index.php
N web/html/docs/package-list/fc2/index.php
N web/html/docs/package-list/fc2/package.list
N web/html/docs/release-notes/common.inc
N web/html/docs/release-notes/index.php
N web/html/docs/release-notes/fc2/x86/common.inc
N web/html/docs/release-notes/fc2/x86/index.php
N web/html/docs/release-notes/fc2/x86_64/common.inc
N web/html/docs/release-notes/fc2/x86_64/index.php
N web/html/docs/release-notes/fc3/x86/common.inc
N web/html/docs/release-notes/fc3/x86/index.php
N web/html/docs/release-notes/fc3/x86_64/common.inc
N web/html/docs/release-notes/fc3/x86_64/index.php
N web/html/docs/selinux-apache-fc3/index.php
N web/html/docs/selinux-apache-fc3/ln-legalnotice.php
N web/html/docs/selinux-apache-fc3/sn-debugging-and-customizing.php
N web/html/docs/selinux-apache-fc3/sn-further-approaches.php
N web/html/docs/selinux-apache-fc3/sn-getting-started.php
N web/html/docs/selinux-apache-fc3/sn-security-overview.php
N web/html/docs/selinux-apache-fc3/sn-simple-setup.php
N web/html/docs/selinux-apache-fc3/sn-strict-policy.php
N web/html/docs/selinux-apache-fc3/sn-suexec-and-cgi-scripts.php
N web/html/docs/selinux-apache-fc3/sn-user-homedir.php
N web/html/docs/selinux-apache-fc3/sn-using-other-types.php
N web/html/docs/selinux-apache-fc3/stylesheet-images/caution.png
N web/html/docs/selinux-apache-fc3/stylesheet-images/important.png
N web/html/docs/selinux-apache-fc3/stylesheet-images/note.png
N web/html/docs/selinux-apache-fc3/stylesheet-images/tip.png
N web/html/docs/selinux-apache-fc3/stylesheet-images/warning.png
N web/html/docs/selinux-faq/index.php
N web/html/docs/selinux-faq-fc2/common.inc
N web/html/docs/selinux-faq-fc2/index.php
N web/html/docs/selinux-faq-fc2/ln-legalnotice.php
N web/html/docs/selinux-faq-fc2/stylesheet-images/caution.png
N web/html/docs/selinux-faq-fc2/stylesheet-images/important.png
N web/html/docs/selinux-faq-fc2/stylesheet-images/note.png
N web/html/docs/selinux-faq-fc2/stylesheet-images/tip.png
N web/html/docs/selinux-faq-fc2/stylesheet-images/warning.png
N web/html/docs/selinux-faq-fc3/index.php
N web/html/docs/selinux-faq-fc3/ln-legalnotice.php
N web/html/docs/selinux-faq-fc3/stylesheet-images/caution.png
N web/html/docs/selinux-faq-fc3/stylesheet-images/important.png
N web/html/docs/selinux-faq-fc3/stylesheet-images/note.png
N web/html/docs/selinux-faq-fc3/stylesheet-images/tip.png
N web/html/docs/selinux-faq-fc3/stylesheet-images/warning.png
N web/html/docs/selinux-faq-fc3test2/index.php
N web/html/docs/selinux-faq-fc3test2/ln-legalnotice.php
N web/html/docs/selinux-faq-fc3test2/stylesheet-images/caution.png
N web/html/docs/selinux-faq-fc3test2/stylesheet-images/important.png
N web/html/docs/selinux-faq-fc3test2/stylesheet-images/note.png
N web/html/docs/selinux-faq-fc3test2/stylesheet-images/tip.png
N web/html/docs/selinux-faq-fc3test2/stylesheet-images/warning.png
N web/html/docs/stateless/index.php
N web/html/docs/stateless/ln-legalnotice.php
N web/html/docs/stateless/sn-caching-clients.php
N web/html/docs/stateless/sn-diskless-clients.php
N web/html/docs/stateless/sn-live-cd.php
N web/html/docs/stateless/sn-managing-protosystems.php
N web/html/docs/stateless/sn-protosystem-setup.php
N web/html/docs/stateless/sn-server-setup.php
N web/html/docs/stateless/sn-snapshot-setup.php
N web/html/docs/stateless/stylesheet-images/caution.png
N web/html/docs/stateless/stylesheet-images/important.png
N web/html/docs/stateless/stylesheet-images/note.png
N web/html/docs/stateless/stylesheet-images/tip.png
N web/html/docs/stateless/stylesheet-images/warning.png
N web/html/docs/udev/index.php
N web/html/docs/updates/fedora.css
N web/html/docs/updates/generated-index.php
N web/html/docs/updates/index.php
N web/html/docs/updates/ln-legalnotice.php
N web/html/docs/updates/refs.php
N web/html/docs/updates/update-sources.php
N web/html/docs/updates/updating-sources.php
N web/html/docs/updates/using-yum.php
N web/html/download/index.php
N web/html/download/mirrors.php
N web/html/download/test.php
N web/html/download/updates.php
N web/html/download/vendors.list
N web/html/download/vendors.php
N web/html/download/mirrors/fedora-core-1
N web/html/download/mirrors/fedora-core-1.at
N web/html/download/mirrors/fedora-core-1.au
N web/html/download/mirrors/fedora-core-1.br
N web/html/download/mirrors/fedora-core-1.cz
N web/html/download/mirrors/fedora-core-1.de
N web/html/download/mirrors/fedora-core-1.ee
N web/html/download/mirrors/fedora-core-1.es
N web/html/download/mirrors/fedora-core-1.fr
N web/html/download/mirrors/fedora-core-1.gr
N web/html/download/mirrors/fedora-core-1.ie
N web/html/download/mirrors/fedora-core-1.is
N web/html/download/mirrors/fedora-core-1.jp
N web/html/download/mirrors/fedora-core-1.ro
N web/html/download/mirrors/fedora-core-1.ru
N web/html/download/mirrors/fedora-core-1.uk
N web/html/download/mirrors/fedora-core-1.us.east
N web/html/download/mirrors/fedora-core-1.us.west
N web/html/download/mirrors/fedora-core-2
N web/html/download/mirrors/fedora-core-2.at
N web/html/download/mirrors/fedora-core-2.au
N web/html/download/mirrors/fedora-core-2.br
N web/html/download/mirrors/fedora-core-2.cz
N web/html/download/mirrors/fedora-core-2.de
N web/html/download/mirrors/fedora-core-2.ee
N web/html/download/mirrors/fedora-core-2.es
N web/html/download/mirrors/fedora-core-2.fr
N web/html/download/mirrors/fedora-core-2.gr
N web/html/download/mirrors/fedora-core-2.ie
N web/html/download/mirrors/fedora-core-2.is
N web/html/download/mirrors/fedora-core-2.jp
N web/html/download/mirrors/fedora-core-2.ro
N web/html/download/mirrors/fedora-core-2.ru
N web/html/download/mirrors/fedora-core-2.uk
N web/html/download/mirrors/fedora-core-2.us.east
N web/html/download/mirrors/fedora-core-2.us.west
N web/html/download/mirrors/fedora-core-3
N web/html/download/mirrors/fedora-core-3.at
N web/html/download/mirrors/fedora-core-3.br
N web/html/download/mirrors/fedora-core-3.ca
N web/html/download/mirrors/fedora-core-3.ch
N web/html/download/mirrors/fedora-core-3.cl
N web/html/download/mirrors/fedora-core-3.cz
N web/html/download/mirrors/fedora-core-3.de
N web/html/download/mirrors/fedora-core-3.dk
N web/html/download/mirrors/fedora-core-3.fr
N web/html/download/mirrors/fedora-core-3.hk
N web/html/download/mirrors/fedora-core-3.ie
N web/html/download/mirrors/fedora-core-3.is
N web/html/download/mirrors/fedora-core-3.jp
N web/html/download/mirrors/fedora-core-3.pl
N web/html/download/mirrors/fedora-core-3.ro
N web/html/download/mirrors/fedora-core-3.ru
N web/html/download/mirrors/fedora-core-3.tw
N web/html/download/mirrors/fedora-core-3.uk
N web/html/download/mirrors/fedora-core-3.us.east
N web/html/download/mirrors/fedora-core-3.us.west
N web/html/download/mirrors/fedora-core-3.yu
N web/html/download/mirrors/fedora-core-rawhide
N web/html/download/mirrors/fedora-core-rawhide.at
N web/html/download/mirrors/fedora-core-rawhide.au
N web/html/download/mirrors/fedora-core-rawhide.br
N web/html/download/mirrors/fedora-core-rawhide.cz
N web/html/download/mirrors/fedora-core-rawhide.de
N web/html/download/mirrors/fedora-core-rawhide.ee
N web/html/download/mirrors/fedora-core-rawhide.es
N web/html/download/mirrors/fedora-core-rawhide.fr
N web/html/download/mirrors/fedora-core-rawhide.gr
N web/html/download/mirrors/fedora-core-rawhide.ie
N web/html/download/mirrors/fedora-core-rawhide.is
N web/html/download/mirrors/fedora-core-rawhide.jp
N web/html/download/mirrors/fedora-core-rawhide.ro
N web/html/download/mirrors/fedora-core-rawhide.ru
N web/html/download/mirrors/fedora-core-rawhide.uk
N web/html/download/mirrors/fedora-core-rawhide.us.east
N web/html/download/mirrors/fedora-core-rawhide.us.west
N web/html/download/mirrors/index.php
N web/html/download/mirrors/updates-released
N web/html/download/mirrors/updates-released-fc1
N web/html/download/mirrors/updates-released-fc1.at
N web/html/download/mirrors/updates-released-fc1.au
N web/html/download/mirrors/updates-released-fc1.br
N web/html/download/mirrors/updates-released-fc1.de
N web/html/download/mirrors/updates-released-fc1.ee
N web/html/download/mirrors/updates-released-fc1.es
N web/html/download/mirrors/updates-released-fc1.fr
N web/html/download/mirrors/updates-released-fc1.gr
N web/html/download/mirrors/updates-released-fc1.ie
N web/html/download/mirrors/updates-released-fc1.is
N web/html/download/mirrors/updates-released-fc1.jp
N web/html/download/mirrors/updates-released-fc1.ro
N web/html/download/mirrors/updates-released-fc1.ru
N web/html/download/mirrors/updates-released-fc1.uk
N web/html/download/mirrors/updates-released-fc1.us.east
N web/html/download/mirrors/updates-released-fc1.us.west
N web/html/download/mirrors/updates-released-fc2
N web/html/download/mirrors/updates-released-fc2.br
N web/html/download/mirrors/updates-released-fc2.cz
N web/html/download/mirrors/updates-released-fc2.de
N web/html/download/mirrors/updates-released-fc2.ee
N web/html/download/mirrors/updates-released-fc2.es
N web/html/download/mirrors/updates-released-fc2.fr
N web/html/download/mirrors/updates-released-fc2.gr
N web/html/download/mirrors/updates-released-fc2.ie
N web/html/download/mirrors/updates-released-fc2.is
N web/html/download/mirrors/updates-released-fc2.jp
N web/html/download/mirrors/updates-released-fc2.ro
N web/html/download/mirrors/updates-released-fc2.ru
N web/html/download/mirrors/updates-released-fc2.uk
N web/html/download/mirrors/updates-released-fc2.us.east
N web/html/download/mirrors/updates-released-fc2.us.west
N web/html/download/mirrors/updates-released-fc3
N web/html/download/mirrors/updates-released-fc3.at
N web/html/download/mirrors/updates-released-fc3.br
N web/html/download/mirrors/updates-released-fc3.ca
N web/html/download/mirrors/updates-released-fc3.ch
N web/html/download/mirrors/updates-released-fc3.cl
N web/html/download/mirrors/updates-released-fc3.cz
N web/html/download/mirrors/updates-released-fc3.de
N web/html/download/mirrors/updates-released-fc3.dk
N web/html/download/mirrors/updates-released-fc3.fr
N web/html/download/mirrors/updates-released-fc3.hk
N web/html/download/mirrors/updates-released-fc3.ie
N web/html/download/mirrors/updates-released-fc3.is
N web/html/download/mirrors/updates-released-fc3.jp
N web/html/download/mirrors/updates-released-fc3.pl
N web/html/download/mirrors/updates-released-fc3.ro
N web/html/download/mirrors/updates-released-fc3.ru
N web/html/download/mirrors/updates-released-fc3.tw
N web/html/download/mirrors/updates-released-fc3.uk
N web/html/download/mirrors/updates-released-fc3.us.east
N web/html/download/mirrors/updates-released-fc3.us.west
N web/html/download/mirrors/updates-released-fc3.yu
N web/html/download/mirrors/updates-released.at
N web/html/download/mirrors/updates-released.au
N web/html/download/mirrors/updates-released.br
N web/html/download/mirrors/updates-released.de
N web/html/download/mirrors/updates-released.ee
N web/html/download/mirrors/updates-released.es
N web/html/download/mirrors/updates-released.fr
N web/html/download/mirrors/updates-released.gr
N web/html/download/mirrors/updates-released.ie
N web/html/download/mirrors/updates-released.is
N web/html/download/mirrors/updates-released.jp
N web/html/download/mirrors/updates-released.ro
N web/html/download/mirrors/updates-released.ru
N web/html/download/mirrors/updates-released.uk
N web/html/download/mirrors/updates-released.us.east
N web/html/download/mirrors/updates-released.us.west
N web/html/download/mirrors/updates-testing
N web/html/download/mirrors/updates-testing-fc1
N web/html/download/mirrors/updates-testing-fc1.at
N web/html/download/mirrors/updates-testing-fc1.au
N web/html/download/mirrors/updates-testing-fc1.br
N web/html/download/mirrors/updates-testing-fc1.cz
N web/html/download/mirrors/updates-testing-fc1.de
N web/html/download/mirrors/updates-testing-fc1.ee
N web/html/download/mirrors/updates-testing-fc1.es
N web/html/download/mirrors/updates-testing-fc1.fr
N web/html/download/mirrors/updates-testing-fc1.gr
N web/html/download/mirrors/updates-testing-fc1.ie
N web/html/download/mirrors/updates-testing-fc1.is
N web/html/download/mirrors/updates-testing-fc1.jp
N web/html/download/mirrors/updates-testing-fc1.ro
N web/html/download/mirrors/updates-testing-fc1.ru
N web/html/download/mirrors/updates-testing-fc1.uk
N web/html/download/mirrors/updates-testing-fc1.us.east
N web/html/download/mirrors/updates-testing-fc1.us.west
N web/html/download/mirrors/updates-testing-fc2
N web/html/download/mirrors/updates-testing-fc2.at
N web/html/download/mirrors/updates-testing-fc2.au
N web/html/download/mirrors/updates-testing-fc2.br
N web/html/download/mirrors/updates-testing-fc2.cz
N web/html/download/mirrors/updates-testing-fc2.de
N web/html/download/mirrors/updates-testing-fc2.ee
N web/html/download/mirrors/updates-testing-fc2.es
N web/html/download/mirrors/updates-testing-fc2.fr
N web/html/download/mirrors/updates-testing-fc2.gr
N web/html/download/mirrors/updates-testing-fc2.ie
N web/html/download/mirrors/updates-testing-fc2.is
N web/html/download/mirrors/updates-testing-fc2.jp
N web/html/download/mirrors/updates-testing-fc2.ro
N web/html/download/mirrors/updates-testing-fc2.ru
N web/html/download/mirrors/updates-testing-fc2.uk
N web/html/download/mirrors/updates-testing-fc2.us.east
N web/html/download/mirrors/updates-testing-fc2.us.west
N web/html/download/mirrors/updates-testing-fc3
N web/html/download/mirrors/updates-testing-fc3.at
N web/html/download/mirrors/updates-testing-fc3.br
N web/html/download/mirrors/updates-testing-fc3.ca
N web/html/download/mirrors/updates-testing-fc3.ch
N web/html/download/mirrors/updates-testing-fc3.cl
N web/html/download/mirrors/updates-testing-fc3.cz
N web/html/download/mirrors/updates-testing-fc3.de
N web/html/download/mirrors/updates-testing-fc3.dk
N web/html/download/mirrors/updates-testing-fc3.fr
N web/html/download/mirrors/updates-testing-fc3.hk
N web/html/download/mirrors/updates-testing-fc3.ie
N web/html/download/mirrors/updates-testing-fc3.is
N web/html/download/mirrors/updates-testing-fc3.jp
N web/html/download/mirrors/updates-testing-fc3.pl
N web/html/download/mirrors/updates-testing-fc3.ro
N web/html/download/mirrors/updates-testing-fc3.ru
N web/html/download/mirrors/updates-testing-fc3.tw
N web/html/download/mirrors/updates-testing-fc3.uk
N web/html/download/mirrors/updates-testing-fc3.us.east
N web/html/download/mirrors/updates-testing-fc3.us.west
N web/html/download/mirrors/updates-testing-fc3.yu
N web/html/download/mirrors/updates-testing.at
N web/html/download/mirrors/updates-testing.au
N web/html/download/mirrors/updates-testing.br
N web/html/download/mirrors/updates-testing.cz
N web/html/download/mirrors/updates-testing.de
N web/html/download/mirrors/updates-testing.ee
N web/html/download/mirrors/updates-testing.es
N web/html/download/mirrors/updates-testing.fr
N web/html/download/mirrors/updates-testing.gr
N web/html/download/mirrors/updates-testing.ie
N web/html/download/mirrors/updates-testing.is
N web/html/download/mirrors/updates-testing.jp
N web/html/download/mirrors/updates-testing.ro
N web/html/download/mirrors/updates-testing.ru
N web/html/download/mirrors/updates-testing.uk
N web/html/download/mirrors/updates-testing.us.east
N web/html/download/mirrors/updates-testing.us.west
N web/html/download/up2date-mirrors/fedora-core-1
N web/html/download/up2date-mirrors/fedora-core-1.at
N web/html/download/up2date-mirrors/fedora-core-1.au
N web/html/download/up2date-mirrors/fedora-core-1.br
N web/html/download/up2date-mirrors/fedora-core-1.cz
N web/html/download/up2date-mirrors/fedora-core-1.de
N web/html/download/up2date-mirrors/fedora-core-1.ee
N web/html/download/up2date-mirrors/fedora-core-1.es
N web/html/download/up2date-mirrors/fedora-core-1.fr
N web/html/download/up2date-mirrors/fedora-core-1.gr
N web/html/download/up2date-mirrors/fedora-core-1.ie
N web/html/download/up2date-mirrors/fedora-core-1.is
N web/html/download/up2date-mirrors/fedora-core-1.jp
N web/html/download/up2date-mirrors/fedora-core-1.ro
N web/html/download/up2date-mirrors/fedora-core-1.ru
N web/html/download/up2date-mirrors/fedora-core-1.uk
N web/html/download/up2date-mirrors/fedora-core-1.us.east
N web/html/download/up2date-mirrors/fedora-core-1.us.west
N web/html/download/up2date-mirrors/fedora-core-2
N web/html/download/up2date-mirrors/fedora-core-2.at
N web/html/download/up2date-mirrors/fedora-core-2.au
N web/html/download/up2date-mirrors/fedora-core-2.br
N web/html/download/up2date-mirrors/fedora-core-2.cz
N web/html/download/up2date-mirrors/fedora-core-2.de
N web/html/download/up2date-mirrors/fedora-core-2.ee
N web/html/download/up2date-mirrors/fedora-core-2.es
N web/html/download/up2date-mirrors/fedora-core-2.fr
N web/html/download/up2date-mirrors/fedora-core-2.gr
N web/html/download/up2date-mirrors/fedora-core-2.ie
N web/html/download/up2date-mirrors/fedora-core-2.is
N web/html/download/up2date-mirrors/fedora-core-2.jp
N web/html/download/up2date-mirrors/fedora-core-2.ro
N web/html/download/up2date-mirrors/fedora-core-2.ru
N web/html/download/up2date-mirrors/fedora-core-2.uk
N web/html/download/up2date-mirrors/fedora-core-2.us.east
N web/html/download/up2date-mirrors/fedora-core-2.us.west
N web/html/download/up2date-mirrors/fedora-core-3
N web/html/download/up2date-mirrors/fedora-core-3.at
N web/html/download/up2date-mirrors/fedora-core-3.br
N web/html/download/up2date-mirrors/fedora-core-3.ca
N web/html/download/up2date-mirrors/fedora-core-3.ch
N web/html/download/up2date-mirrors/fedora-core-3.cl
N web/html/download/up2date-mirrors/fedora-core-3.cz
N web/html/download/up2date-mirrors/fedora-core-3.de
N web/html/download/up2date-mirrors/fedora-core-3.dk
N web/html/download/up2date-mirrors/fedora-core-3.fr
N web/html/download/up2date-mirrors/fedora-core-3.hk
N web/html/download/up2date-mirrors/fedora-core-3.ie
N web/html/download/up2date-mirrors/fedora-core-3.is
N web/html/download/up2date-mirrors/fedora-core-3.jp
N web/html/download/up2date-mirrors/fedora-core-3.pl
N web/html/download/up2date-mirrors/fedora-core-3.ro
N web/html/download/up2date-mirrors/fedora-core-3.ru
N web/html/download/up2date-mirrors/fedora-core-3.tw
N web/html/download/up2date-mirrors/fedora-core-3.uk
N web/html/download/up2date-mirrors/fedora-core-3.us.east
N web/html/download/up2date-mirrors/fedora-core-3.us.west
N web/html/download/up2date-mirrors/fedora-core-3.yu
N web/html/download/up2date-mirrors/fedora-core-rawhide
N web/html/download/up2date-mirrors/fedora-core-rawhide.at
N web/html/download/up2date-mirrors/fedora-core-rawhide.au
N web/html/download/up2date-mirrors/fedora-core-rawhide.br
N web/html/download/up2date-mirrors/fedora-core-rawhide.cz
N web/html/download/up2date-mirrors/fedora-core-rawhide.de
N web/html/download/up2date-mirrors/fedora-core-rawhide.ee
N web/html/download/up2date-mirrors/fedora-core-rawhide.es
N web/html/download/up2date-mirrors/fedora-core-rawhide.fr
N web/html/download/up2date-mirrors/fedora-core-rawhide.gr
N web/html/download/up2date-mirrors/fedora-core-rawhide.ie
N web/html/download/up2date-mirrors/fedora-core-rawhide.is
N web/html/download/up2date-mirrors/fedora-core-rawhide.jp
N web/html/download/up2date-mirrors/fedora-core-rawhide.ro
N web/html/download/up2date-mirrors/fedora-core-rawhide.ru
N web/html/download/up2date-mirrors/fedora-core-rawhide.uk
N web/html/download/up2date-mirrors/fedora-core-rawhide.us.east
N web/html/download/up2date-mirrors/fedora-core-rawhide.us.west
N web/html/download/up2date-mirrors/index.php
N web/html/download/up2date-mirrors/updates-released
N web/html/download/up2date-mirrors/updates-released-fc1
N web/html/download/up2date-mirrors/updates-released-fc1.at
N web/html/download/up2date-mirrors/updates-released-fc1.au
N web/html/download/up2date-mirrors/updates-released-fc1.br
N web/html/download/up2date-mirrors/updates-released-fc1.de
N web/html/download/up2date-mirrors/updates-released-fc1.ee
N web/html/download/up2date-mirrors/updates-released-fc1.es
N web/html/download/up2date-mirrors/updates-released-fc1.fr
N web/html/download/up2date-mirrors/updates-released-fc1.gr
N web/html/download/up2date-mirrors/updates-released-fc1.ie
N web/html/download/up2date-mirrors/updates-released-fc1.is
N web/html/download/up2date-mirrors/updates-released-fc1.jp
N web/html/download/up2date-mirrors/updates-released-fc1.ro
N web/html/download/up2date-mirrors/updates-released-fc1.ru
N web/html/download/up2date-mirrors/updates-released-fc1.uk
N web/html/download/up2date-mirrors/updates-released-fc1.us.east
N web/html/download/up2date-mirrors/updates-released-fc1.us.west
N web/html/download/up2date-mirrors/updates-released-fc2
N web/html/download/up2date-mirrors/updates-released-fc2.br
N web/html/download/up2date-mirrors/updates-released-fc2.cz
N web/html/download/up2date-mirrors/updates-released-fc2.de
N web/html/download/up2date-mirrors/updates-released-fc2.ee
N web/html/download/up2date-mirrors/updates-released-fc2.es
N web/html/download/up2date-mirrors/updates-released-fc2.fr
N web/html/download/up2date-mirrors/updates-released-fc2.gr
N web/html/download/up2date-mirrors/updates-released-fc2.ie
N web/html/download/up2date-mirrors/updates-released-fc2.is
N web/html/download/up2date-mirrors/updates-released-fc2.jp
N web/html/download/up2date-mirrors/updates-released-fc2.ro
N web/html/download/up2date-mirrors/updates-released-fc2.ru
N web/html/download/up2date-mirrors/updates-released-fc2.uk
N web/html/download/up2date-mirrors/updates-released-fc2.us.east
N web/html/download/up2date-mirrors/updates-released-fc2.us.west
N web/html/download/up2date-mirrors/updates-released-fc3
N web/html/download/up2date-mirrors/updates-released-fc3.at
N web/html/download/up2date-mirrors/updates-released-fc3.br
N web/html/download/up2date-mirrors/updates-released-fc3.ca
N web/html/download/up2date-mirrors/updates-released-fc3.ch
N web/html/download/up2date-mirrors/updates-released-fc3.cl
N web/html/download/up2date-mirrors/updates-released-fc3.cz
N web/html/download/up2date-mirrors/updates-released-fc3.de
N web/html/download/up2date-mirrors/updates-released-fc3.dk
N web/html/download/up2date-mirrors/updates-released-fc3.fr
N web/html/download/up2date-mirrors/updates-released-fc3.hk
N web/html/download/up2date-mirrors/updates-released-fc3.ie
N web/html/download/up2date-mirrors/updates-released-fc3.is
N web/html/download/up2date-mirrors/updates-released-fc3.jp
N web/html/download/up2date-mirrors/updates-released-fc3.pl
N web/html/download/up2date-mirrors/updates-released-fc3.ro
N web/html/download/up2date-mirrors/updates-released-fc3.ru
N web/html/download/up2date-mirrors/updates-released-fc3.tw
N web/html/download/up2date-mirrors/updates-released-fc3.uk
N web/html/download/up2date-mirrors/updates-released-fc3.us.east
N web/html/download/up2date-mirrors/updates-released-fc3.us.west
N web/html/download/up2date-mirrors/updates-released-fc3.yu
N web/html/download/up2date-mirrors/updates-released.at
N web/html/download/up2date-mirrors/updates-released.au
N web/html/download/up2date-mirrors/updates-released.br
N web/html/download/up2date-mirrors/updates-released.de
N web/html/download/up2date-mirrors/updates-released.ee
N web/html/download/up2date-mirrors/updates-released.es
N web/html/download/up2date-mirrors/updates-released.fr
N web/html/download/up2date-mirrors/updates-released.gr
N web/html/download/up2date-mirrors/updates-released.ie
N web/html/download/up2date-mirrors/updates-released.is
N web/html/download/up2date-mirrors/updates-released.jp
N web/html/download/up2date-mirrors/updates-released.ro
N web/html/download/up2date-mirrors/updates-released.ru
N web/html/download/up2date-mirrors/updates-released.uk
N web/html/download/up2date-mirrors/updates-released.us.east
N web/html/download/up2date-mirrors/updates-released.us.west
N web/html/download/up2date-mirrors/updates-testing
N web/html/download/up2date-mirrors/updates-testing-fc1
N web/html/download/up2date-mirrors/updates-testing-fc1.at
N web/html/download/up2date-mirrors/updates-testing-fc1.au
N web/html/download/up2date-mirrors/updates-testing-fc1.br
N web/html/download/up2date-mirrors/updates-testing-fc1.cz
N web/html/download/up2date-mirrors/updates-testing-fc1.de
N web/html/download/up2date-mirrors/updates-testing-fc1.ee
N web/html/download/up2date-mirrors/updates-testing-fc1.es
N web/html/download/up2date-mirrors/updates-testing-fc1.fr
N web/html/download/up2date-mirrors/updates-testing-fc1.gr
N web/html/download/up2date-mirrors/updates-testing-fc1.ie
N web/html/download/up2date-mirrors/updates-testing-fc1.is
N web/html/download/up2date-mirrors/updates-testing-fc1.jp
N web/html/download/up2date-mirrors/updates-testing-fc1.ro
N web/html/download/up2date-mirrors/updates-testing-fc1.ru
N web/html/download/up2date-mirrors/updates-testing-fc1.uk
N web/html/download/up2date-mirrors/updates-testing-fc1.us.east
N web/html/download/up2date-mirrors/updates-testing-fc1.us.west
N web/html/download/up2date-mirrors/updates-testing-fc2
N web/html/download/up2date-mirrors/updates-testing-fc2.at
N web/html/download/up2date-mirrors/updates-testing-fc2.au
N web/html/download/up2date-mirrors/updates-testing-fc2.br
N web/html/download/up2date-mirrors/updates-testing-fc2.cz
N web/html/download/up2date-mirrors/updates-testing-fc2.de
N web/html/download/up2date-mirrors/updates-testing-fc2.ee
N web/html/download/up2date-mirrors/updates-testing-fc2.es
N web/html/download/up2date-mirrors/updates-testing-fc2.fr
N web/html/download/up2date-mirrors/updates-testing-fc2.gr
N web/html/download/up2date-mirrors/updates-testing-fc2.ie
N web/html/download/up2date-mirrors/updates-testing-fc2.is
N web/html/download/up2date-mirrors/updates-testing-fc2.jp
N web/html/download/up2date-mirrors/updates-testing-fc2.ro
N web/html/download/up2date-mirrors/updates-testing-fc2.ru
N web/html/download/up2date-mirrors/updates-testing-fc2.uk
N web/html/download/up2date-mirrors/updates-testing-fc2.us.east
N web/html/download/up2date-mirrors/updates-testing-fc2.us.west
N web/html/download/up2date-mirrors/updates-testing-fc3
N web/html/download/up2date-mirrors/updates-testing-fc3.at
N web/html/download/up2date-mirrors/updates-testing-fc3.br
N web/html/download/up2date-mirrors/updates-testing-fc3.ca
N web/html/download/up2date-mirrors/updates-testing-fc3.ch
N web/html/download/up2date-mirrors/updates-testing-fc3.cl
N web/html/download/up2date-mirrors/updates-testing-fc3.cz
N web/html/download/up2date-mirrors/updates-testing-fc3.de
N web/html/download/up2date-mirrors/updates-testing-fc3.dk
N web/html/download/up2date-mirrors/updates-testing-fc3.fr
N web/html/download/up2date-mirrors/updates-testing-fc3.hk
N web/html/download/up2date-mirrors/updates-testing-fc3.ie
N web/html/download/up2date-mirrors/updates-testing-fc3.is
N web/html/download/up2date-mirrors/updates-testing-fc3.jp
N web/html/download/up2date-mirrors/updates-testing-fc3.pl
N web/html/download/up2date-mirrors/updates-testing-fc3.ro
N web/html/download/up2date-mirrors/updates-testing-fc3.ru
N web/html/download/up2date-mirrors/updates-testing-fc3.tw
N web/html/download/up2date-mirrors/updates-testing-fc3.uk
N web/html/download/up2date-mirrors/updates-testing-fc3.us.east
N web/html/download/up2date-mirrors/updates-testing-fc3.us.west
N web/html/download/up2date-mirrors/updates-testing-fc3.yu
N web/html/download/up2date-mirrors/updates-testing.at
N web/html/download/up2date-mirrors/updates-testing.au
N web/html/download/up2date-mirrors/updates-testing.br
N web/html/download/up2date-mirrors/updates-testing.cz
N web/html/download/up2date-mirrors/updates-testing.de
N web/html/download/up2date-mirrors/updates-testing.ee
N web/html/download/up2date-mirrors/updates-testing.es
N web/html/download/up2date-mirrors/updates-testing.fr
N web/html/download/up2date-mirrors/updates-testing.gr
N web/html/download/up2date-mirrors/updates-testing.ie
N web/html/download/up2date-mirrors/updates-testing.is
N web/html/download/up2date-mirrors/updates-testing.jp
N web/html/download/up2date-mirrors/updates-testing.ro
N web/html/download/up2date-mirrors/updates-testing.ru
N web/html/download/up2date-mirrors/updates-testing.uk
N web/html/download/up2date-mirrors/updates-testing.us.east
N web/html/download/up2date-mirrors/updates-testing.us.west
N web/html/images/corner-bl.png
N web/html/images/corner-br.png
N web/html/images/corner-tl.png
N web/html/images/corner-tr.png
N web/html/images/favicon.ico
N web/html/images/header-download.png
N web/html/images/header-faq.png
N web/html/images/header-fedora_logo.png
N web/html/images/header-fedora_text.png
N web/html/images/header-projects.png
N web/html/images/header-search.png
N web/html/images/intro-computer.png
N web/html/images/intro-download.png
N web/html/images/intro-participate.png
N web/html/images/link-offsite-content.png
N web/html/images/link-offsite-side.png
N web/html/images/printable.png
N web/html/legal/common.inc
N web/html/legal/index.php
N web/html/licenses/beta_eula.php
N web/html/licenses/common.inc
N web/html/licenses/eula.php
N web/html/licenses/index.php
N web/html/licenses/export/common.inc
N web/html/licenses/export/index.php
N web/html/participate/common.inc
N web/html/participate/index.php
N web/html/participate/terminology.php
N web/html/participate/artwork-guide/common.inc
N web/html/participate/artwork-guide/index.php
N web/html/participate/communicate/index.php
N web/html/participate/developers-guide/ch-console-access.php
N web/html/participate/developers-guide/ch-cvs.php
N web/html/participate/developers-guide/ch-guidelines.php
N web/html/participate/developers-guide/ch-menus.php
N web/html/participate/developers-guide/ch-package-versions.php
N web/html/participate/developers-guide/ch-rpm-building.php
N web/html/participate/developers-guide/ch-ui-guidelines.php
N web/html/participate/developers-guide/common.inc
N web/html/participate/developers-guide/index.php
N web/html/participate/developers-guide/ln-legalnotice.php
N web/html/participate/developers-guide/s1-cvs-configure.php
N web/html/participate/developers-guide/s1-cvs-cvscommands.php
N web/html/participate/developers-guide/s1-rpm-guidelines.php
N web/html/participate/developers-guide/s1-rpm-more-guidelines.php
N web/html/participate/developers-guide/s1-ui-get-details.php
N web/html/participate/developers-guide/s1-ui-get-religion.php
N web/html/participate/developers-guide/s1-ui-gnome-guidelines.php
N web/html/participate/developers-guide/s1-ui-more-suggestions.php
N web/html/participate/developers-guide/s1-ui-scaling.php
N web/html/participate/developers-guide/stylesheet-images/caution.png
N web/html/participate/developers-guide/stylesheet-images/important.png
N web/html/participate/developers-guide/stylesheet-images/note.png
N web/html/participate/developers-guide/stylesheet-images/tip.png
N web/html/participate/developers-guide/stylesheet-images/warning.png
N web/html/participate/documentation-faq/index.php
N web/html/participate/documentation-guide/acknowledgments.php
N web/html/participate/documentation-guide/ch-converting.php
N web/html/participate/documentation-guide/ch-cvs.php
N web/html/participate/documentation-guide/ch-emacs-nxml.php
N web/html/participate/documentation-guide/ch-emacs.php
N web/html/participate/documentation-guide/ch-getting-files.php
N web/html/participate/documentation-guide/ch-intro.php
N web/html/participate/documentation-guide/ch-rh-guidelines.php
N web/html/participate/documentation-guide/ch-tutorial.php
N web/html/participate/documentation-guide/ch-vim.php
N web/html/participate/documentation-guide/ch-xml-tags.php
N web/html/participate/documentation-guide/common.inc
N web/html/participate/documentation-guide/generated-index.php
N web/html/participate/documentation-guide/index.php
N web/html/participate/documentation-guide/ln-legalnotice.php
N web/html/participate/documentation-guide/s1-cvs-configure.php
N web/html/participate/documentation-guide/s1-cvs-cvscommands.php
N web/html/participate/documentation-guide/s1-diagrams-images.php
N web/html/participate/documentation-guide/s1-emacs-additional-resources.php
N web/html/participate/documentation-guide/s1-emacs-basic-commands.php
N web/html/participate/documentation-guide/s1-emacs-cedfile.php
N web/html/participate/documentation-guide/s1-emacs-colors.php
N web/html/participate/documentation-guide/s1-emacs-examples.php
N web/html/participate/documentation-guide/s1-emacs-loadced.php
N web/html/participate/documentation-guide/s1-emacs-nxml-additional-resources.php
N web/html/participate/documentation-guide/s1-emacs-nxml-readme.php
N web/html/participate/documentation-guide/s1-nxml-examples.php
N web/html/participate/documentation-guide/s1-screenshots.php
N web/html/participate/documentation-guide/s1-tutorial-license.php
N web/html/participate/documentation-guide/s1-vim-additional-resources.php
N web/html/participate/documentation-guide/s1-vim-keymapping.php
N web/html/participate/documentation-guide/s1-xml-admon.php
N web/html/participate/documentation-guide/s1-xml-guidelines-header.php
N web/html/participate/documentation-guide/s1-xml-tag-sulink.php
N web/html/participate/documentation-guide/s1-xml-tags-application.php
N web/html/participate/documentation-guide/s1-xml-tags-chapter.php
N web/html/participate/documentation-guide/s1-xml-tags-citetitle.php
N web/html/participate/documentation-guide/s1-xml-tags-command.php
N web/html/participate/documentation-guide/s1-xml-tags-compoutput.php
N web/html/participate/documentation-guide/s1-xml-tags-emphasis.php
N web/html/participate/documentation-guide/s1-xml-tags-example.php
N web/html/participate/documentation-guide/s1-xml-tags-figure.php
N web/html/participate/documentation-guide/s1-xml-tags-filename.php
N web/html/participate/documentation-guide/s1-xml-tags-firstterm.php
N web/html/participate/documentation-guide/s1-xml-tags-footnote.php
N web/html/participate/documentation-guide/s1-xml-tags-gui.php
N web/html/participate/documentation-guide/s1-xml-tags-indexing.php
N web/html/participate/documentation-guide/s1-xml-tags-keycap.php
N web/html/participate/documentation-guide/s1-xml-tags-lists.php
N web/html/participate/documentation-guide/s1-xml-tags-option.php
N web/html/participate/documentation-guide/s1-xml-tags-para.php
N web/html/participate/documentation-guide/s1-xml-tags-part.php
N web/html/participate/documentation-guide/s1-xml-tags-prompt.php
N web/html/participate/documentation-guide/s1-xml-tags-replaceable.php
N web/html/participate/documentation-guide/s1-xml-tags-screen.php
N web/html/participate/documentation-guide/s1-xml-tags-sections.php
N web/html/participate/documentation-guide/s1-xml-tags-table.php
N web/html/participate/documentation-guide/s1-xml-tags-trademark.php
N web/html/participate/documentation-guide/s1-xml-tags-userinput.php
N web/html/participate/documentation-guide/s1-xml-tags-wordasword.php
N web/html/participate/documentation-guide/s1-xml-tags-xref.php
N web/html/participate/documentation-guide/stylesheet-images/caution.png
N web/html/participate/documentation-guide/stylesheet-images/important.png
N web/html/participate/documentation-guide/stylesheet-images/note.png
N web/html/participate/documentation-guide/stylesheet-images/tip.png
N web/html/participate/documentation-guide/stylesheet-images/warning.png
N web/html/participate/documentation-quick-start/index.php
N web/html/participate/qa-guide/ch-intro.php
N web/html/participate/qa-guide/common.inc
N web/html/participate/qa-guide/general-applications.php
N web/html/participate/qa-guide/index.php
N web/html/participate/qa-guide/individual-packages.php
N web/html/participate/qa-guide/infrastructure.php
N web/html/participate/qa-guide/installation.php
N web/html/participate/qa-guide/kernel.php
N web/html/participate/qa-guide/ln-legalnotice.php
N web/html/participate/qa-guide/qa-guide.pdf
N web/html/participate/qa-guide/release-engineering.php
N web/html/participate/qa-guide/toolchain.php
N web/html/participate/roadmap/index.php
N web/html/participate/schedule/fedora-project.ics
N web/html/participate/schedule/index.php
N web/html/participate/translation-faq/index.php
N web/html/participate/translation-guide/common.inc
N web/html/participate/translation-guide/index.php
N web/html/participate/translation-windows/fedora.css
N web/html/participate/translation-windows/generated-index.php
N web/html/participate/translation-windows/index.php
N web/html/participate/translation-windows/ln-legalnotice.php
N web/html/participate/translation-windows/s1-cvs.php
N web/html/participate/translation-windows/s1-cycle.php
N web/html/participate/translation-windows/s1-poedit.php
N web/html/participate/translation-windows/s1-reg.php
N web/html/participate/translation-windows/s1-resource.php
N web/html/participate/translation-windows/s1-setup.php
N web/html/participate/translation-windows/s1-ssh.php
N web/html/participate/translation-windows/figs/account/image001.jpg
N web/html/participate/translation-windows/figs/account/image002.jpg
N web/html/participate/translation-windows/figs/account/image003.jpg
N web/html/participate/translation-windows/figs/cycle/conflict.jpg
N web/html/participate/translation-windows/figs/cycle/cvs_up.jpg
N web/html/participate/translation-windows/figs/cycle/cvs_up_commit.jpg
N web/html/participate/translation-windows/figs/cycle/cvs_up_finish.jpg
N web/html/participate/translation-windows/figs/cycle/cvs_up_menu_commit.jpg
N web/html/participate/translation-windows/figs/cycle/cvs_up_modified.jpg
N web/html/participate/translation-windows/figs/cycle/fedora_assign_to_you.jpg
N web/html/participate/translation-windows/figs/cycle/fedora_assigned.jpg
N web/html/participate/translation-windows/figs/cycle/fedora_auth_denied.jpg
N web/html/participate/translation-windows/figs/cycle/fedora_login.jpg
N web/html/participate/translation-windows/figs/cycle/fedora_released.jpg
N web/html/participate/translation-windows/figs/cycle/fedora_take.jpg
N web/html/participate/translation-windows/figs/key/image001.jpg
N web/html/participate/translation-windows/figs/key/image002.jpg
N web/html/participate/translation-windows/figs/key/image003.jpg
N web/html/participate/translation-windows/figs/key/image004.jpg
N web/html/participate/translation-windows/figs/poedit/image001.jpg
N web/html/participate/translation-windows/figs/poedit/image002.jpg
N web/html/participate/translation-windows/figs/poedit/image003.jpg
N web/html/participate/translation-windows/figs/poedit/image004.jpg
N web/html/participate/translation-windows/figs/poedit/image005.jpg
N web/html/participate/translation-windows/figs/poedit/image006.jpg
N web/html/participate/translation-windows/figs/poedit/image007.jpg
N web/html/participate/translation-windows/figs/poedit/image008.jpg
N web/html/participate/translation-windows/figs/poedit/menu_preferences.jpg
N web/html/participate/translation-windows/figs/poedit/poEdit_start.jpg
N web/html/participate/translation-windows/figs/poedit/preferences.jpg
N web/html/participate/translation-windows/figs/setup/image001.jpg
N web/html/participate/translation-windows/figs/setup/image002.jpg
N web/html/participate/translation-windows/figs/setup/image003.jpg
N web/html/participate/translation-windows/figs/tortoise/cvs20.jpg
N web/html/participate/translation-windows/figs/tortoise/cvs_co.jpg
N web/html/participate/translation-windows/figs/tortoise/cvs_commit.jpg
N web/html/participate/translation-windows/figs/tortoise/cvs_cvsroot_module.jpg
N web/html/participate/translation-windows/figs/tortoise/cvs_right_click_menu.jpg
N web/html/participate/translation-windows/figs/tortoise/cvs_tortoisePlink.jpg
N web/html/participate/translation-windows/figs/tortoise/image001.jpg
N web/html/participate/translation-windows/figs/tortoise/image002.jpg
N web/html/participate/translation-windows/figs/tortoise/image003.jpg
N web/html/participate/translation-windows/figs/tortoise/image004.jpg
N web/html/participate/translation-windows/figs/tortoise/image005.jpg
N web/html/participate/translation-windows/stylesheet-images/caution.png
N web/html/participate/translation-windows/stylesheet-images/important.png
N web/html/participate/translation-windows/stylesheet-images/note.png
N web/html/participate/translation-windows/stylesheet-images/tip.png
N web/html/participate/translation-windows/stylesheet-images/warning.png
N web/html/projects/index.php
N web/html/projects/artwork/index.php
N web/html/projects/artwork/redhat-artwork.todo
N web/html/projects/additional-projects/index.php
N web/html/projects/additional-projects/benchmarks/benchmarks.todo
N web/html/projects/additional-projects/benchmarks/index.php
N web/html/projects/additional-projects/initscripts/index.php
N web/html/projects/additional-projects/kudzu/index.php
N web/html/projects/additional-projects/rhgb/index.php
N web/html/projects/anaconda-installer/common.inc
N web/html/projects/anaconda-installer/comps.php
N web/html/projects/anaconda-installer/index.php
N web/html/projects/anaconda-installer/manualtest.php
N web/html/projects/anaconda-installer/mediacheck.php
N web/html/projects/anaconda-installer/update-disks.php
N web/html/projects/anaconda-installer/images/screenshot-0000-thumb.png
N web/html/projects/anaconda-installer/images/screenshot-0000.png
N web/html/projects/anaconda-installer/images/screenshot-0001-thumb.png
N web/html/projects/anaconda-installer/images/screenshot-0001.png
N web/html/projects/anaconda-installer/images/screenshot-0002-thumb.png
N web/html/projects/anaconda-installer/images/screenshot-0002.png
N web/html/projects/anaconda-installer/images/screenshot-0003-thumb.png
N web/html/projects/anaconda-installer/images/screenshot-0003.png
N web/html/projects/anaconda-installer/images/screenshot-0004.png
N web/html/projects/config-tools/authconfig.php
N web/html/projects/config-tools/common.inc
N web/html/projects/config-tools/firstboot.php
N web/html/projects/config-tools/hwbrowser.php
N web/html/projects/config-tools/index.php
N web/html/projects/config-tools/redhat-config-bind.php
N web/html/projects/config-tools/redhat-config-date.php
N web/html/projects/config-tools/redhat-config-httpd.php
N web/html/projects/config-tools/redhat-config-keyboard.php
N web/html/projects/config-tools/redhat-config-kickstart.php
N web/html/projects/config-tools/redhat-config-language.php
N web/html/projects/config-tools/redhat-config-mouse.php
N web/html/projects/config-tools/redhat-config-network.php
N web/html/projects/config-tools/redhat-config-nfs.php
N web/html/projects/config-tools/redhat-config-packages.php
N web/html/projects/config-tools/redhat-config-printer.php
N web/html/projects/config-tools/redhat-config-rootpassword.php
N web/html/projects/config-tools/redhat-config-samba.php
N web/html/projects/config-tools/redhat-config-securitylevel.php
N web/html/projects/config-tools/redhat-config-services.php
N web/html/projects/config-tools/redhat-config-soundcard.php
N web/html/projects/config-tools/redhat-config-users.php
N web/html/projects/config-tools/redhat-config-xfree86.php
N web/html/projects/config-tools/redhat-logviewer.php
N web/html/projects/config-tools/redhat-template.todo
N web/html/projects/config-tools/template.php
N web/html/projects/config-tools/images/authconfig1-thumb.png
N web/html/projects/config-tools/images/authconfig1.png
N web/html/projects/config-tools/images/authconfig2-thumb.png
N web/html/projects/config-tools/images/authconfig2.png
N web/html/projects/config-tools/images/authconfig3-thumb.png
N web/html/projects/config-tools/images/authconfig3.png
N web/html/projects/config-tools/images/authconfig4-thumb.png
N web/html/projects/config-tools/images/authconfig4.png
N web/html/projects/config-tools/images/firstboot1-thumb.png
N web/html/projects/config-tools/images/firstboot1.png
N web/html/projects/config-tools/images/firstboot2-thumb.png
N web/html/projects/config-tools/images/firstboot2.png
N web/html/projects/config-tools/images/firstboot3-thumb.png
N web/html/projects/config-tools/images/firstboot3.png
N web/html/projects/config-tools/images/firstboot4-thumb.png
N web/html/projects/config-tools/images/firstboot4.png
N web/html/projects/config-tools/images/firstboot5-thumb.png
N web/html/projects/config-tools/images/firstboot5.png
N web/html/projects/config-tools/images/hwbrowser-thumb.png
N web/html/projects/config-tools/images/hwbrowser.png
N web/html/projects/config-tools/images/redhat-config-bind-thumb.png
N web/html/projects/config-tools/images/redhat-config-bind.png
N web/html/projects/config-tools/images/redhat-config-date1-thumb.png
N web/html/projects/config-tools/images/redhat-config-date1.png
N web/html/projects/config-tools/images/redhat-config-date2-thumb.png
N web/html/projects/config-tools/images/redhat-config-date2.png
N web/html/projects/config-tools/images/redhat-config-httpd1-thumb.png
N web/html/projects/config-tools/images/redhat-config-httpd1.png
N web/html/projects/config-tools/images/redhat-config-httpd2-thumb.png
N web/html/projects/config-tools/images/redhat-config-httpd2.png
N web/html/projects/config-tools/images/redhat-config-httpd3-thumb.png
N web/html/projects/config-tools/images/redhat-config-httpd3.png
N web/html/projects/config-tools/images/redhat-config-httpd4-thumb.png
N web/html/projects/config-tools/images/redhat-config-httpd4.png
N web/html/projects/config-tools/images/redhat-config-keyboard-thumb.png
N web/html/projects/config-tools/images/redhat-config-keyboard.png
N web/html/projects/config-tools/images/redhat-config-kickstart1-thumb.png
N web/html/projects/config-tools/images/redhat-config-kickstart1.png
N web/html/projects/config-tools/images/redhat-config-kickstart2-thumb.png
N web/html/projects/config-tools/images/redhat-config-kickstart2.png
N web/html/projects/config-tools/images/redhat-config-kickstart3-thumb.png
N web/html/projects/config-tools/images/redhat-config-kickstart3.png
N web/html/projects/config-tools/images/redhat-config-kickstart4-thumb.png
N web/html/projects/config-tools/images/redhat-config-kickstart4.png
N web/html/projects/config-tools/images/redhat-config-kickstart5-thumb.png
N web/html/projects/config-tools/images/redhat-config-kickstart5.png
N web/html/projects/config-tools/images/redhat-config-kickstart6-thumb.png
N web/html/projects/config-tools/images/redhat-config-kickstart6.png
N web/html/projects/config-tools/images/redhat-config-language-thumb.png
N web/html/projects/config-tools/images/redhat-config-language.png
N web/html/projects/config-tools/images/redhat-config-mouse-thumb.png
N web/html/projects/config-tools/images/redhat-config-mouse.png
N web/html/projects/config-tools/images/redhat-config-network1-thumb.png
N web/html/projects/config-tools/images/redhat-config-network1.png
N web/html/projects/config-tools/images/redhat-config-network2-thumb.png
N web/html/projects/config-tools/images/redhat-config-network2.png
N web/html/projects/config-tools/images/redhat-config-network3-thumb.png
N web/html/projects/config-tools/images/redhat-config-network3.png
N web/html/projects/config-tools/images/redhat-config-network4-thumb.png
N web/html/projects/config-tools/images/redhat-config-network4.png
N web/html/projects/config-tools/images/redhat-config-nfs-thumb.png
N web/html/projects/config-tools/images/redhat-config-nfs.png
N web/html/projects/config-tools/images/redhat-config-packages-thumb.png
N web/html/projects/config-tools/images/redhat-config-packages.png
N web/html/projects/config-tools/images/redhat-config-printer-thumb.png
N web/html/projects/config-tools/images/redhat-config-printer.png
N web/html/projects/config-tools/images/redhat-config-rootpassword-thumb.png
N web/html/projects/config-tools/images/redhat-config-rootpassword.png
N web/html/projects/config-tools/images/redhat-config-samba-thumb.png
N web/html/projects/config-tools/images/redhat-config-samba.png
N web/html/projects/config-tools/images/redhat-config-securitylevel-thumb.png
N web/html/projects/config-tools/images/redhat-config-securitylevel.png
N web/html/projects/config-tools/images/redhat-config-services-thumb.png
N web/html/projects/config-tools/images/redhat-config-services.png
N web/html/projects/config-tools/images/redhat-config-soundcard1-thumb.png
N web/html/projects/config-tools/images/redhat-config-soundcard1.png
N web/html/projects/config-tools/images/redhat-config-soundcard2-thumb.png
N web/html/projects/config-tools/images/redhat-config-soundcard2.png
N web/html/projects/config-tools/images/redhat-config-users-thumb.png
N web/html/projects/config-tools/images/redhat-config-users.png
N web/html/projects/config-tools/images/redhat-config-xfree86-1-thumb.png
N web/html/projects/config-tools/images/redhat-config-xfree86-1.png
N web/html/projects/config-tools/images/redhat-config-xfree86-2-thumb.png
N web/html/projects/config-tools/images/redhat-config-xfree86-2.png
N web/html/projects/config-tools/images/redhat-config-xfree86-3-thumb.png
N web/html/projects/config-tools/images/redhat-config-xfree86-3.png
N web/html/projects/config-tools/images/redhat-logviewer-thumb.png
N web/html/projects/config-tools/images/redhat-logviewer.png
N web/html/projects/config-tools/specs/redhat-config-packages/AddGroup.png
N web/html/projects/config-tools/specs/redhat-config-packages/AddPackage.png
N web/html/projects/config-tools/specs/redhat-config-packages/RemovePackage.png
N web/html/projects/config-tools/specs/redhat-config-packages/index.php
N web/html/projects/config-tools/specs/redhat-config-packages/preferences-locations.png
N web/html/projects/config-tools/specs/redhat-config-packages/preferences-noupgrade.png
N web/html/projects/config-tools/specs/redhat-config-packages/preferences-proxy.png
N web/html/projects/config-tools/specs/redhat-config-packages/redhat-config-packages-flowchart.png
N web/html/projects/config-tools/specs/redhat-config-packages/software-updates.png
N web/html/projects/desktop/common.inc
N web/html/projects/desktop/defaults.php
N web/html/projects/desktop/index.php
N web/html/projects/desktop/mozilla/index.php
N web/html/projects/desktop/mozilla/plugins-fc1.php
N web/html/projects/docs/index.php
N web/html/projects/i18n/iiimf-faq.php
N web/html/projects/i18n/index.php
N web/html/projects/qa/index.php
N web/html/projects/selinux/index.php
N web/html/projects/stateless/index.php
N web/html/projects/translations/index.php
N web/html/projects/virtualisation/index.php
N web/html/projects/virtualization/index.php
N web/html/stylesheet-images/caution.png
N web/html/stylesheet-images/important.png
N web/html/stylesheet-images/note.png
N web/html/stylesheet-images/tip.png
N web/html/stylesheet-images/warning.png
N web/include/navigation.inc
N web/include/project.inc
N web/include/site.inc
N web/include/template.inc
N web/include/utils.inc
N web/include/vendors.inc
N web/include/widgets.inc
N web/scripts/docbookhtml2php.py
N web/scripts/dotphp2dothtml.sh
N web/scripts/listnotice.py
N web/scripts/makehtml.sh
N web/scripts/makepackagelist.sh
N web/scripts/mangle.sh
N web/scripts/test-html.sh
N web/scripts/websync
N web/template-mockup/column_1.html
N web/template-mockup/column_2.html
N web/template-mockup/column_3.html
N web/template-mockup/corner-bl.png
N web/template-mockup/corner-br.png
N web/template-mockup/corner-tl.png
N web/template-mockup/corner-tr.png
N web/template-mockup/layout.css
N web/template-mockup/style.css

No conflicts created by this import




From fedora-extras-commits at redhat.com  Wed Mar 30 17:52:20 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 30 Mar 2005 12:52:20 -0500
Subject: CVSROOT config,1.1,1.2
Message-ID: <200503301752.j2UHqKbv014448@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14436

Modified Files:
	config 
Log Message:
sync





From fedora-extras-commits at redhat.com  Wed Mar 30 18:17:03 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed, 30 Mar 2005 13:17:03 -0500
Subject: CVSROOT avail,1.1,1.2
Message-ID: <200503301817.j2UIH3on015450@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15438

Modified Files:
	avail 
Log Message:


Add ACLs for 'web' module.



Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avail	25 Feb 2005 00:23:03 -0000	1.1
+++ avail	30 Mar 2005 18:17:01 -0000	1.2
@@ -16,3 +16,27 @@
 avail | gafton,notting,sopwith,wtogami,katzj | CVSROOT
 # trusted developers that can add modules
 avail | | CVSROOT/modules
+
+# Fedora Web site
+unavail | | web
+avail | gafton,tfox,notting,sopwith,gdk | web
+avail | havill,hp,bennet | web
+avail | katzj | web/html/projects/anaconda-installer
+avail | bfox | web/html/projects/config-tools
+avail | blizzard,krh | web/html/projects/desktop
+avail | wcohen | web/html/projects/additional-projects/benchmarks
+avail | sopwith,dwalsh,kwade | web/html/projects/selinux
+avail | ezannoni | web/html/projects/additional-projects/gdb
+avail | alikins | web/html/download
+avail | llch | web/html/projects/i18n
+avail | sarahs | web/html/projects/translations
+avail | harald | web/html/projects/config-tools
+avail | kwade | web/html/docs
+avail | sarahs | web/html/participate/translation-faq
+avail | sarahs | web/html/participate/translation-guide
+avail | sarahs | web/html/participate/translation-windows
+avail | dmalcolm | web/html/projects/stateless
+avail | dmalcolm | web/html/docs/stateless
+avail | riel | web/html/docs/virtualisation
+avail | riel | web/html/projects/virtualisation
+avail | harald | web/html/docs/udev



From fedora-extras-commits at redhat.com  Wed Mar 30 19:46:33 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 30 Mar 2005 14:46:33 -0500
Subject: devel/jabberd jabberd, 1.4, 1.5 jabberd.spec, 1.7,
	1.8 jabberd.sysconfig, 1.2, 1.3
Message-ID: <200503301946.j2UJkXQj016568@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16562

Modified Files:
	jabberd jabberd.spec jabberd.sysconfig 
Log Message:
* c2s isn't suid anymore
* added option to start as root if required



Index: jabberd
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jabberd	28 Mar 2005 17:35:56 -0000	1.4
+++ jabberd	30 Mar 2005 19:46:31 -0000	1.5
@@ -71,7 +71,15 @@
 		rm -f /var/lock/subsys/${prog}
 		rm -f ${pidPath}/${prog}.pid
 		args="-c ${confPath}/${prog}.xml"
-		daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
+		if [ ${prog} == "c2s" -a ! -z "$C2S_AS_ROOT" ]; then
+			if [ $C2S_AS_ROOT == "yes" ]; then
+				daemon --user root "${progsPath}/${prog} ${args} & 2> /dev/null"
+			else
+				daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
+			fi
+		else
+			daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
+		fi
 		retval=$?
 		echo
 		if [ ${retval} == 0 ]; then


Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jabberd.spec	28 Mar 2005 17:35:03 -0000	1.7
+++ jabberd.spec	30 Mar 2005 19:46:31 -0000	1.8
@@ -109,6 +109,9 @@
 # we have our own start script
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/jabberd
 
+# we have our own start script
+%{__rm} $RPM_BUILD_ROOT%{sysconfdir}/jabberd.cfg*
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -159,11 +162,7 @@
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README PROTOCOL TODO
-%attr(4755, root, root) %{_bindir}/c2s
-%{_bindir}/router
-%{_bindir}/resolver
-%{_bindir}/s2s
-%{_bindir}/sm
+%{_bindir}/*
 %attr(750, jabber, jabber) %dir %{sysconfdir}/
 %attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/*
 %{_datadir}/man/man8/*
@@ -186,6 +185,8 @@
 - combined some of the sed magic
 - added a jabberd file in sysconfig to control if all daemons
   should be started
+- don't suid c2s and add config option in sysconfig/jabberd
+  to start c2s as root if required to authenticate against pam/shadow
 
 * Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
 - made password more random (/dev/random)


Index: jabberd.sysconfig
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jabberd.sysconfig	28 Mar 2005 17:34:04 -0000	1.2
+++ jabberd.sysconfig	30 Mar 2005 19:46:31 -0000	1.3
@@ -13,3 +13,7 @@
 # * s2s (Server to Server)
 #
 START_DAEMONS="router resolver sm c2s s2s"
+
+# set C2S_AS_ROOT to "yes" to start c2s as root
+# this can be necessary if c2s needs to authenticate against pam/shadow
+C2S_AS_ROOT="no"



From fedora-extras-commits at redhat.com  Wed Mar 30 20:16:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 15:16:01 -0500
Subject: devel/fyre fyre.spec,1.2,1.3
Message-ID: <200503302016.j2UKG1YU017515@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/fyre
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17508

Modified Files:
	fyre.spec 
Log Message:
Disabled OpenEXR and GNet and removed gtk2-devel from BuildRequires


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/devel/fyre/fyre.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fyre.spec	25 Mar 2005 16:40:16 -0000	1.2
+++ fyre.spec	30 Mar 2005 20:15:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           fyre
 Version:        1.0.0
-Release:        3
+Release:        4
 Summary:        A tool for creating artwork from chaotic functions
 
 Group:          Amusements/Graphics
@@ -10,7 +10,7 @@
 Patch:          fyre-1.0.0-apps.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel libglade2-devel desktop-file-utils
+BuildRequires:  libglade2-devel desktop-file-utils
 Requires(post): desktop-file-utils shared-mime-info
 Requires(postun): desktop-file-utils shared-mime-info
 
@@ -26,7 +26,7 @@
 %patch -p 1 -b .apps
 
 %build
-%configure
+%configure --disable-openexr --disable-gnet
 make %{?_smp_mflags}
 
 %install
@@ -61,6 +61,10 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Wed Mar 30 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-4
+- Disabled OpenEXR and GNet in %%configure
+- Removed gtk2-devel from BuildRequires
+
 * Fri Mar 25 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-3
 - Removed NEWS
 - Added || : to %%post* commands



From fedora-extras-commits at redhat.com  Wed Mar 30 20:18:28 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 15:18:28 -0500
Subject: rpms/python-amara/FC-3 python-amara.spec,1.6,1.7
Message-ID: <200503302018.j2UKIS93017559@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17549/FC-3

Modified Files:
	python-amara.spec 
Log Message:
Added disttag


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/rpms/python-amara/FC-3/python-amara.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-amara.spec	19 Mar 2005 17:52:45 -0000	1.6
+++ python-amara.spec	30 Mar 2005 20:18:26 -0000	1.7
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        0.9.4
-Release:        6
+Release:        6.fc3
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 %doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
+* Wed Mar 30 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-6.fc3
+- Added disttag
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-6
 - %%
 



From fedora-extras-commits at redhat.com  Wed Mar 30 20:18:28 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 15:18:28 -0500
Subject: rpms/python-amara/devel python-amara.spec,1.6,1.7
Message-ID: <200503302018.j2UKIS1h017562@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17549/devel

Modified Files:
	python-amara.spec 
Log Message:
Added disttag


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/rpms/python-amara/devel/python-amara.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-amara.spec	19 Mar 2005 17:52:45 -0000	1.6
+++ python-amara.spec	30 Mar 2005 20:18:26 -0000	1.7
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        0.9.4
-Release:        6
+Release:        6.fc4
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 %doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
+* Wed Mar 30 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-6.fc4
+- Added disttag
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-6
 - %%
 



From fedora-extras-commits at redhat.com  Wed Mar 30 20:20:45 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 15:20:45 -0500
Subject: rpms/python-HTMLgen/FC-3 python-HTMLgen.spec,1.7,1.8
Message-ID: <200503302020.j2UKKjcM017618@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17609/FC-3

Modified Files:
	python-HTMLgen.spec 
Log Message:
Added disttag


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/rpms/python-HTMLgen/FC-3/python-HTMLgen.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-HTMLgen.spec	19 Mar 2005 17:52:45 -0000	1.7
+++ python-HTMLgen.spec	30 Mar 2005 20:20:43 -0000	1.8
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        2.2.2
-Release:        6
+Release:        6.fc3
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 %{python_sitelib}/*.py[co]
 
 %changelog
+* Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-6.fc3
+- Added disttag
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-6
 - %%
 



From fedora-extras-commits at redhat.com  Wed Mar 30 20:20:45 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 15:20:45 -0500
Subject: rpms/python-HTMLgen/devel python-HTMLgen.spec,1.7,1.8
Message-ID: <200503302020.j2UKKjXs017622@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17609/devel

Modified Files:
	python-HTMLgen.spec 
Log Message:
Added disttag


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/rpms/python-HTMLgen/devel/python-HTMLgen.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-HTMLgen.spec	19 Mar 2005 17:52:45 -0000	1.7
+++ python-HTMLgen.spec	30 Mar 2005 20:20:43 -0000	1.8
@@ -10,7 +10,7 @@
 
 Name:           %name
 Version:        2.2.2
-Release:        6
+Release:        6.fc4
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 %{python_sitelib}/*.py[co]
 
 %changelog
+* Wed Mar 30 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-6.fc4
+- Added disttag
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-6
 - %%
 



From ivazquez at ivazquez.net  Wed Mar 30 21:06:03 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Wed, 30 Mar 2005 16:06:03 -0500
Subject: APPROVED: fyre
Message-ID: <1112216763.8866.15.camel@ignacio.ignacio.lan>

fyre: A tool for creating artwork from chaotic functions

Fyre is a tool for producing computational artwork based on histograms
of iterated chaotic functions. At the moment, it implements the Peter de
Jong map in a fixed-function pipeline with an interactive GTK+ frontend
and a command line interface for easy and efficient rendering of high-
resolution, high quality images.

Reviewers: Kevin Fenzi, Brian Pepple
Maintainer: Ignacio Vazquez-Abrams

-- 
Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
http://fedora.ivazquez.net/

gpg --keyserver hkp://subkeys.pgp.net --recv-key 38028b72
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-extras-commits/attachments/20050330/59da5198/attachment-0001.sig>

From fedora-extras-commits at redhat.com  Thu Mar 31 00:30:54 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 30 Mar 2005 19:30:54 -0500
Subject: rpms/sylpheed/devel .cvsignore, 1.3.2.1, 1.3.2.2 sources, 1.3.2.1,
	1.3.2.2 sylpheed.spec, 1.6.2.1,
	1.6.2.2 sylpheed-1.0.3-draftsegf.patch, 1.1, NONE
Message-ID: <200503310030.j2V0UsiI022234@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22228

Modified Files:
      Tag: sylpheed-1_9_6-devel
	.cvsignore sources sylpheed.spec 
Removed Files:
      Tag: sylpheed-1_9_6-devel
	sylpheed-1.0.3-draftsegf.patch 
Log Message:
* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.7-1
- Update to 1.9.7.
- Patch4 (draftsegf) merged upstream.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- .cvsignore	21 Mar 2005 21:44:51 -0000	1.3.2.1
+++ .cvsignore	31 Mar 2005 00:30:52 -0000	1.3.2.2
@@ -1 +1 @@
-sylpheed-1.9.6.tar.bz2
+sylpheed-1.9.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- sources	21 Mar 2005 21:44:51 -0000	1.3.2.1
+++ sources	31 Mar 2005 00:30:52 -0000	1.3.2.2
@@ -1 +1 @@
-1cdee69bd724f20786e5390891eb4c23  sylpheed-1.9.6.tar.bz2
+ef5ddd410cf19007a502f44274bee04c  sylpheed-1.9.7.tar.bz2


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- sylpheed.spec	21 Mar 2005 21:44:51 -0000	1.6.2.1
+++ sylpheed.spec	31 Mar 2005 00:30:52 -0000	1.6.2.2
@@ -4,7 +4,7 @@
 
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 1.9.6
+Version: 1.9.7
 Release: 1
 License: GPL
 URL: http://sylpheed.good-day.net/
@@ -24,7 +24,6 @@
 Patch1: sylpheed-1.9.6-ssl.patch
 Patch2: sylpheed-default-browser.patch
 Patch3: sylpheed-1.0.3-desktop.patch
-Patch4: sylpheed-1.0.3-draftsegf.patch
 
 %description
 This program is an X based fast email client which has features
@@ -47,7 +46,6 @@
 %patch1 -p1 -b .ssl
 %patch2 -p1 -b .default-browser
 %patch3 -p1 -b .desktop
-%patch4 -p1 -b .draftsegf
 
 %build
 autoconf
@@ -89,6 +87,10 @@
 %{_mandir}/man1
 
 %changelog
+* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.7-1
+- Update to 1.9.7.
+- Patch4 (draftsegf) merged upstream.
+
 * Sun Mar 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.6-1
 - Update to 1.9.6 development release for testing purposes.
 


--- sylpheed-1.0.3-draftsegf.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar 31 02:52:56 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 21:52:56 -0500
Subject: rpms/feh - New directory
Message-ID: <200503310252.j2V2qui6024565@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/feh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24558/feh

Log Message:
Directory /cvs/extras/rpms/feh added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 31 02:52:56 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 21:52:56 -0500
Subject: rpms/feh/devel - New directory
Message-ID: <200503310252.j2V2qutb024568@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/feh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24558/feh/devel

Log Message:
Directory /cvs/extras/rpms/feh/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Mar 31 02:53:10 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 21:53:10 -0500
Subject: rpms/feh Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200503310253.j2V2rAUa024633@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/feh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24624

Added Files:
	Makefile import.log 
Log Message:
Setup of module feh


--- NEW FILE Makefile ---
# Top level Makefile for module feh
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Mar 31 02:53:10 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 21:53:10 -0500
Subject: rpms/feh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200503310253.j2V2rAZU024636@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/feh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24624/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module feh


--- 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 Mar 31 02:53:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 21:53:39 -0500
Subject: rpms/feh import.log,1.1,1.2
Message-ID: <200503310253.j2V2rdda024736@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/feh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24726

Modified Files:
	import.log 
Log Message:
auto-import feh-1.3.0-2 on branch devel from feh-1.3.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/feh/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Mar 2005 02:53:08 -0000	1.1
+++ import.log	31 Mar 2005 02:53:37 -0000	1.2
@@ -0,0 +1 @@
+feh-1_3_0-2:HEAD:feh-1.3.0-2.src.rpm:1112237613



From fedora-extras-commits at redhat.com  Thu Mar 31 02:53:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 30 Mar 2005 21:53:39 -0500
Subject: rpms/feh/devel feh.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200503310253.j2V2rdNA024739@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/feh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24726/devel

Modified Files:
	.cvsignore sources 
Added Files:
	feh.spec 
Log Message:
auto-import feh-1.3.0-2 on branch devel from feh-1.3.0-2.src.rpm


--- NEW FILE feh.spec ---
Name:         	feh 
Version:        1.3.0
Release:        2
Summary:        Image viewer using Imlib2

Group:          Applications/Multimedia
License:        BSD
URL:            http://linuxbrit.co.uk/feh/
Source0:        http://linuxbrit.co.uk/feh/feh-1.3.0.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: giblib-devel imlib2-devel libjpeg-devel libpng-devel

%description
feh is a versatile and fast image viewer using imlib2, the
premier image file handling library. feh has many features,
from simple single file viewing, to multiple file modes using
a slideshow or multiple windows. feh supports the creation of
montages as index prints with many user-configurable options.

%prep
%setup -q


%build
%configure
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 {} ';'
rm -rf $RPM_BUILD_ROOT/usr/doc

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/man[^3]/*

%changelog
* Wed May 30 2005 Aaron Kurtz <a.kurtz at hardsun.net> - 0:1.3.0-2
  Spec file cleanup, plus would upgrade linuxbrit rpm.

* Fri May 25 2005 Aaron Kurtz <a.kurtz at hardsun.net> - 0:1.3.0-1
- Initial Fedora RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/feh/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Mar 2005 02:53:08 -0000	1.1
+++ .cvsignore	31 Mar 2005 02:53:37 -0000	1.2
@@ -0,0 +1 @@
+feh-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/feh/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Mar 2005 02:53:08 -0000	1.1
+++ sources	31 Mar 2005 02:53:37 -0000	1.2
@@ -0,0 +1 @@
+41cbfbd0c1535a7162d199cf2d448f5b  feh-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Mar 31 03:04:06 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 30 Mar 2005 22:04:06 -0500
Subject: devel/gnotime gnotime-gtkhtml3.6-qof.patch, NONE, 1.1 gnotime.spec,
	1.4, 1.5 gnotime-gtkhtml3-qof.patch, 1.1, NONE
Message-ID: <200503310304.j2V3466k025718@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/devel/gnotime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25712

Modified Files:
	gnotime.spec 
Added Files:
	gnotime-gtkhtml3.6-qof.patch 
Removed Files:
	gnotime-gtkhtml3-qof.patch 
Log Message:
* Fix scriptlets for gconf schema install/uninstall.
* Fix gtkhtml3 detection so 3.6 is detected.


gnotime-gtkhtml3.6-qof.patch:

--- NEW FILE gnotime-gtkhtml3.6-qof.patch ---
Index: configure.in
===================================================================
RCS file: /cvsroot/gttr/gnotime/configure.in,v
retrieving revision 1.44
diff -u -r1.44 configure.in
--- configure.in	23 May 2004 21:15:00 -0000	1.44
+++ configure.in	20 Jul 2004 18:36:02 -0000
@@ -50,6 +50,8 @@
 LIBGTKHTML_REQUIRED=3.0.0
 LIBXML2_REQUIRED=2.0.0
 SCROLLKEEPER_BUILD_REQUIRED=0.3.5
+LIBQOF_REQUIRED_MIN=0.5.0
+LIBQOF_REQUIRED_MAX=0.5.0
 
 dnl *******************************
 dnl Guile checks
@@ -167,7 +169,12 @@
 dnl gtkhtml
 dnl *******************************
 
-PKG_CHECK_MODULES(LIBGTKHTML, libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED)
+for GTKHTMLVER in 3.6 3.5 3.4 3.2 3.1 3.0; do
+  if $PKG_CONFIG --exists libgtkhtml-$GTKHTMLVER; then
+    PKG_CHECK_MODULES(LIBGTKHTML, libgtkhtml-$GTKHTMLVER >= $LIBGTKHTML_REQUIRED)
+    break
+  fi
+done
 AC_SUBST(LIBGTKHTML_CFLAGS)
 AC_SUBST(LIBGTKHTML_LIBS)
 
@@ -182,6 +189,42 @@
 AC_SUBST(LIBXML2_LIBS)
 
 dnl *****************************
+dnl libqof
+dnl *****************************
+
+AC_ARG_WITH(system-qof,
+AC_HELP_STRING([--with-system-qof],
+[use installed libqof rather than the bundled one.  If not specified, configure will use the system qof if installed, otherwise its own.]),
+
+[
+if test x$withval = "xyes"; then
+	PKG_CHECK_MODULES(LIBQOF, qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX)
+	qofbuild=no
+else
+	AC_MSG_NOTICE([Using internal libqof])
+	LIBQOF_CFLAGS='-I$(top_srcdir)/lib -I$(top_srcdir)/lib/qof'
+	LIBQOF_LIBS='$(top_builddir)/lib/qof/libqof.la $(top_builddir)/lib/libqofsql/libqofsql.la'
+	qofbuild=yes
+fi
+],
+[
+if $PKG_CONFIG --exists "qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX"; then
+	PKG_CHECK_MODULES(LIBQOF, qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX)
+	qofbuild=no
+else
+	AC_MSG_NOTICE([Using internal libqof])
+	LIBQOF_CFLAGS='-I$(top_srcdir)/lib -I$(top_srcdir)/lib/qof'
+	LIBQOF_LIBS='$(top_builddir)/lib/qof/libqof.la $(top_builddir)/lib/libqofsql/libqofsql.la'
+	qofbuild=yes
+fi
+])
+
+AM_CONDITIONAL(QOFBUILD, test x$qofbuild = xyes)
+
+AC_SUBST(LIBQOF_CFLAGS)
+AC_SUBST(LIBQOF_LIBS)
+
+dnl *****************************
 dnl scrollkeeper
 dnl *****************************
 dnl To substitute into the gnotime.spec
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/gttr/gnotime/src/Makefile.am,v
retrieving revision 1.28
--- src/Makefile.am	24 Apr 2004 00:39:56 -0000	1.28
+++ src/Makefile.am	20 Jul 2004 18:36:02 -0000
@@ -91,11 +91,10 @@
 	${LIBGNOMEVFS_CFLAGS} \
 	${LIBGTKHTML_CFLAGS}  \
 	${LIBGLADE_CFLAGS}    \
+	${LIBQOF_CFLAGS}      \
 	${LIBXML2_CFLAGS}
 
 INCLUDES =                                   \
-	-I../lib                                  \
-	-I../lib/qof                              \
 	-I$(includedir)                           \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"  \
 	-DGTTGLADEDIR=\""$(datadir)/gnotime"\"    \
@@ -109,8 +108,7 @@
 						 
 gnotime_LDADD =         \
 	$(GNOTIME_LIBS)      \
-	../lib/qof/libqof.la \
-	../lib/libqofsql/libqofsql.la \
+	$(LIBQOF_LIBS)	     \
 	$(LIBGLADE_LIBS)     \
 	$(LIBGTKHTML_LIBS)   \
 	${LIBGNOMEVFS_LIBS}  \
@@ -125,7 +123,3 @@
 	down.xpm		\
 	left.xpm		\
 	design.txt
-
-
-                                                                                
-
Index: lib/libqofsql/Makefile.am
===================================================================
RCS file: /cvsroot/gttr/gnotime/lib/libqofsql/Makefile.am,v
retrieving revision 1.1
--- lib/libqofsql/Makefile.am	9 Apr 2004 04:58:52 -0000	1.1
+++ lib/libqofsql/Makefile.am	20 Jul 2004 18:36:02 -0000
@@ -1,6 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 
+if QOFBUILD
 lib_LTLIBRARIES = libqofsql.la
+noinst_PROGRAMS = sql_parse_test
+endif
 
 libqofsql_la_SOURCES = \
 	parser.c \
@@ -15,9 +18,11 @@
 	sql_tree.h
 
 qofsqlincludedir = ${pkgincludedir}
+if QOFBUILD
 qofsqlinclude_HEADERS = sql_parser.h
-
-noinst_PROGRAMS = sql_parse_test
+else
+noinst_HEADERS = sql_parser.h
+endif
 
 EXTRA_DIST =       \
 	.cvsignore      \
Index: lib/qof/Makefile.am
===================================================================
RCS file: /cvsroot/gttr/gnotime/lib/qof/Makefile.am,v
retrieving revision 1.7
--- lib/qof/Makefile.am	3 May 2004 03:46:59 -0000	1.7
+++ lib/qof/Makefile.am	20 Jul 2004 18:36:03 -0000
@@ -1,7 +1,8 @@
 
 # pkglib_LTLIBRARIES = libqof.la
-
+if QOFBUILD
 lib_LTLIBRARIES = libqof.la
+endif
 
 libqof_la_SOURCES =  \
    gnc-date.c        \
@@ -28,7 +29,7 @@
    qofsql.c
 
 qofincludedir = ${pkgincludedir}
-qofinclude_HEADERS = \
+public_headers = \
    gnc-date.h        \
    gnc-engine-util.h \
    gnc-numeric.h     \
@@ -67,7 +68,14 @@
    qofquerycore-p.h   \
    qofsession-p.h
 
-   
+if QOFBUILD
+qofinclude_HEADERS = \
+	$(public_headers)
+else
+noinst_HEADERS += \
+	$(public_headers)
+endif
+
 EXTRA_DIST =          \
 	README             \
    .cvsignore
@@ -83,6 +91,3 @@
    -I$(includedir)             \
    -DPREFIX=\""$(prefix)"\"    \
    -DDATADIR=\""$(datadir)"\" 
-                   
-
-


Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/devel/gnotime/gnotime.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnotime.spec	5 Mar 2005 21:10:21 -0000	1.4
+++ gnotime.spec	31 Mar 2005 03:04:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.2.1
-Release:        5
+Release:        6
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
@@ -14,7 +14,7 @@
 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-qof.patch
+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.
@@ -100,16 +100,34 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule \
+    %{_syscondir}/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
+
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCES
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/gnotime.schemas &>/dev/null || :
+unset GCONF_CONFIG_SOURCE
+killall -HUP gconfd-2 || :
 scrollkeeper-update -q -o %{_datadir}/omf/gnotime || :
 
 %preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCE
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule \
+    %{_sysconfdir}/gconf/schemas/gnotime.schemas &> /dev/null || :
+  unset GCONF_CONFIG_SOURCE
+  killall -HUP gconfd-2 || :
+fi
 
 %postun
 scrollkeeper-update -q || :
@@ -125,6 +143,12 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sat Mar 19 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-6
+- Rebuild for FC4t1
+- Fix up scriptlets to properly install and uninstall gconf schemas via
+  gconftool-2.
+- Fix gtkhtml3 detection so 3.6 (as used in FC4) is detected.
+
 * Sat Nov 27 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-5
 - Patch to fix a crash when invoking gnome_help.
 - Patch to wordwrap diary notes.


--- gnotime-gtkhtml3-qof.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Mar 31 03:48:10 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 30 Mar 2005 22:48:10 -0500
Subject: devel/gnotime gnotime.spec,1.5,1.6
Message-ID: <200503310348.j2V3mAR7025867@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/devel/gnotime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25861

Modified Files:
	gnotime.spec 
Log Message:
Correct typo in %pre.



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/devel/gnotime/gnotime.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnotime.spec	31 Mar 2005 03:04:04 -0000	1.5
+++ gnotime.spec	31 Mar 2005 03:48:08 -0000	1.6
@@ -104,7 +104,7 @@
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
-    %{_syscondir}/gconf/schemas/gnotime.schemas &> /dev/null || :
+    %{_sysconfdir}/gconf/schemas/gnotime.schemas &> /dev/null || :
   # If applicable:
   # gconftool-2 --makefile-uninstall-rule \
   #  %{_sysconfdir}/gconf/schemas/OLDSCHEMA.schemas &> /dev/null || :



From fedora-extras-commits at redhat.com  Thu Mar 31 03:56:05 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 30 Mar 2005 22:56:05 -0500
Subject: devel/gnotime gnotime.spec,1.6,1.7
Message-ID: <200503310356.j2V3u5S5025943@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/devel/gnotime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25935

Modified Files:
	gnotime.spec 
Log Message:
Bump release to 2.2.1-7 as I can't seem to move the 2.2.1-6 tag to HEAD.



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/devel/gnotime/gnotime.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnotime.spec	31 Mar 2005 03:48:08 -0000	1.6
+++ gnotime.spec	31 Mar 2005 03:56:03 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.2.1
-Release:        6
+Release:        7
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
@@ -143,8 +143,11 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Wed Mar 30 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-7
+- Rebuild for FC4t1.
+- Fix typo in the %%pre scriptlet.
+  
 * Sat Mar 19 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-6
-- Rebuild for FC4t1
 - Fix up scriptlets to properly install and uninstall gconf schemas via
   gconftool-2.
 - Fix gtkhtml3 detection so 3.6 (as used in FC4) is detected.



From fedora-extras-commits at redhat.com  Thu Mar 31 04:08:13 2005
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 30 Mar 2005 23:08:13 -0500
Subject: devel/gnotime gnotime.spec,1.7,1.8
Message-ID: <200503310408.j2V48DeT026929@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/devel/gnotime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26923

Modified Files:
	gnotime.spec 
Log Message:
Requires(pre) GConf2



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/devel/gnotime/gnotime.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnotime.spec	31 Mar 2005 03:56:03 -0000	1.7
+++ gnotime.spec	31 Mar 2005 04:08:11 -0000	1.8
@@ -42,6 +42,7 @@
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
+Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -146,6 +147,7 @@
 * Wed Mar 30 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-7
 - Rebuild for FC4t1.
 - Fix typo in the %%pre scriptlet.
+- Require(pre): GConf2.
   
 * Sat Mar 19 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-6
 - Fix up scriptlets to properly install and uninstall gconf schemas via



From fedora-extras-commits at redhat.com  Thu Mar 31 10:53:16 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 31 Mar 2005 05:53:16 -0500
Subject: devel/sylpheed-claws .cvsignore, 1.4, 1.5 sources, 1.5,
	1.6 sylpheed-claws.spec, 1.9, 1.10
Message-ID: <200503311053.j2VArGDM002174@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/devel/sylpheed-claws
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2168

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- Version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Mar 2005 23:44:32 -0000	1.4
+++ .cvsignore	31 Mar 2005 10:53:14 -0000	1.5
@@ -1 +1 @@
-sylpheed-claws-1.0.3.tar.bz2
+sylpheed-claws-1.0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Mar 2005 23:44:32 -0000	1.5
+++ sources	31 Mar 2005 10:53:14 -0000	1.6
@@ -1 +1 @@
-dba57595e89eef963a932ed5ea39c2a2  sylpheed-claws-1.0.3.tar.bz2
+ac473de7189a4a9baecf16b72c34dff4  sylpheed-claws-1.0.4.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/sylpheed-claws.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sylpheed-claws.spec	23 Mar 2005 23:44:32 -0000	1.9
+++ sylpheed-claws.spec	31 Mar 2005 10:53:14 -0000	1.10
@@ -4,13 +4,13 @@
 %define         aspellver     %(rpm -q --qf "%%{version}" aspell)
 
 Name:           sylpheed-claws
-Version:        1.0.3
+Version:        1.0.4
 Release:        1
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.3.tar.bz2
+Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.4.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -113,9 +113,14 @@
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 
 %changelog
+* Thu Mar 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.0.4-1
+- Version upgrade
+
 * Wed Mar 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.0.3-1
 - Version upgrade
+
 * Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.1-3
 - Don't include static libs in plugin directory.
 - Set --with-gpgme-prefix to use relocated gpgme03 package contents.



From fedora-extras-commits at redhat.com  Thu Mar 31 19:11:55 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Thu, 31 Mar 2005 14:11:55 -0500
Subject: extras-buildsys-temp/etc/dist.d fedora-3-i386, 1.1.1.1,
	1.2 fedora-3-x86_64, 1.1.1.1, 1.2 fedora-development-i386, 1.2,
	1.3 fedora-development-ppc, 1.1.1.1,
	1.2 fedora-development-x86_64, 1.2, 1.3
Message-ID: <200503311911.j2VJBtHU011748@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/fedora/extras-buildsys-temp/etc/dist.d
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11728

Modified Files:
	fedora-3-i386 fedora-3-x86_64 fedora-development-i386 
	fedora-development-ppc fedora-development-x86_64 
Log Message:
add -extras config for 3, change name from -extras-stable to -extras to match
more with current naming



Index: fedora-3-i386
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/etc/dist.d/fedora-3-i386,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-3-i386	21 Mar 2005 20:49:35 -0000	1.1.1.1
+++ fedora-3-i386	31 Mar 2005 19:11:53 -0000	1.2
@@ -30,5 +30,13 @@
 
 # FC3 roots should use runuser instead of su
 config['fedora-3-i386-core'] = {'runuser': '/sbin/runuser'}
+config['fedora-3-i386-extras'] = {'runuser': '/sbin/runuser'}
+
+# Fedora Core 3 with Extras
+packages['fedora-3-i386-extras'] = packages['fedora-3-i386-core'].copy ()
+groups['fedora-3-i386-extras'] = groups['fedora-3-i386-core'].copy ()
+sourceslist['fedora-3-i386-extras'] = {
+    'fedoracore-3-i386': ('core', 'buildgroups', 'extras', )
+
 
 


Index: fedora-3-x86_64
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/etc/dist.d/fedora-3-x86_64,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-3-x86_64	21 Mar 2005 20:49:35 -0000	1.1.1.1
+++ fedora-3-x86_64	31 Mar 2005 19:11:53 -0000	1.2
@@ -30,5 +30,12 @@
 
 # FC3 roots should use runuser instead of su
 config['fedora-3-x86_64-core'] = {'runuser': '/sbin/runuser'}
+config['fedora-3-x86_64-extras'] = {'runuser': '/sbin/runuser'}
+
+# Fedora Core 3 with Extras
+packages['fedora-3-x86_64-extras'] = packages['fedora-3-x86_64-core'].copy ()
+groups['fedora-3-x86_64-extras'] = groups['fedora-3-x86_64-core'].copy ()
+sourceslist['fedora-3-x86_64-extras'] = {
+    'fedoracore-3-x86_64': ('core', 'buildgroups', 'extras', )
 
 


Index: fedora-development-i386
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/etc/dist.d/fedora-development-i386,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-development-i386	21 Mar 2005 21:51:45 -0000	1.2
+++ fedora-development-i386	31 Mar 2005 19:11:53 -0000	1.3
@@ -28,11 +28,11 @@
 }
 
 config['fedora-development-i386-core'] = {'runuser': '/sbin/runuser'}
-config['fedora-development-i386-extras-stable'] = {'runuser': '/sbin/runuser'}
+config['fedora-development-i386-extras'] = {'runuser': '/sbin/runuser'}
 
 # Fedora Core development with Extras
-packages['fedora-development-i386-extras-stable'] = packages['fedora-development-i386-core'].copy ()
-groups['fedora-development-i386-extras-stable'] = groups['fedora-development-i386-core'].copy ()
-sourceslist['fedora-development-i386-extras-stable'] = {
+packages['fedora-development-i386-extras'] = packages['fedora-development-i386-core'].copy ()
+groups['fedora-development-i386-extras'] = groups['fedora-development-i386-core'].copy ()
+sourceslist['fedora-development-i386-extras'] = {
     'fedora-development-i386': ('core', 'buildgroups', 'extras', )
 }


Index: fedora-development-ppc
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/etc/dist.d/fedora-development-ppc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-development-ppc	21 Mar 2005 20:49:35 -0000	1.1.1.1
+++ fedora-development-ppc	31 Mar 2005 19:11:53 -0000	1.2
@@ -30,8 +30,8 @@
 config['fedora-development-ppc-core'] = {'runuser': '/sbin/runuser'}
 
 # Fedora Core development with Extras
-packages['fedora-development-ppc-extras-stable'] = packages['fedora-development-ppc-core'].copy ()
-groups['fedora-development-ppc-extras-stable'] = groups['fedora-development-ppc-core'].copy ()
-sourceslist['fedora-development-ppc-extras-stable'] = {
+packages['fedora-development-ppc-extras'] = packages['fedora-development-ppc-core'].copy ()
+groups['fedora-development-ppc-extras'] = groups['fedora-development-ppc-core'].copy ()
+sourceslist['fedora-development-ppc-extras'] = {
     'fedora-development-ppc': ('core', 'buildgroups', 'extras', )
 }


Index: fedora-development-x86_64
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/etc/dist.d/fedora-development-x86_64,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-development-x86_64	21 Mar 2005 22:07:23 -0000	1.2
+++ fedora-development-x86_64	31 Mar 2005 19:11:53 -0000	1.3
@@ -28,11 +28,11 @@
 }
 
 config['fedora-development-x86_64-core'] = {'runuser': '/sbin/runuser'}
-config['fedora-development-x86_64-extras-stable'] = {'runuser': '/sbin/runuser'}
+config['fedora-development-x86_64-extras'] = {'runuser': '/sbin/runuser'}
 
 # Fedora Core development with Extras
-packages['fedora-development-x86_64-extras-stable'] = packages['fedora-development-x86_64-core'].copy ()
-groups['fedora-development-x86_64-extras-stable'] = groups['fedora-development-x86_64-core'].copy ()
-sourceslist['fedora-development-x86_64-extras-stable'] = {
+packages['fedora-development-x86_64-extras'] = packages['fedora-development-x86_64-core'].copy ()
+groups['fedora-development-x86_64-extras'] = groups['fedora-development-x86_64-core'].copy ()
+sourceslist['fedora-development-x86_64-extras'] = {
     'fedora-development-x86_64': ('core', 'buildgroups', 'extras', )
 }



From fedora-extras-commits at redhat.com  Thu Mar 31 19:15:27 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 31 Mar 2005 14:15:27 -0500
Subject: devel/gnome-theme-clearlooks .cvsignore, 1.2,
	1.3 gnome-theme-clearlooks.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200503311915.j2VJFRH3011841@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/devel/gnome-theme-clearlooks
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11835

Modified Files:
	.cvsignore gnome-theme-clearlooks.spec sources 
Log Message:
Updated Metacity theme to 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/gnome-theme-clearlooks/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Mar 2005 22:16:03 -0000	1.2
+++ .cvsignore	31 Mar 2005 19:15:25 -0000	1.3
@@ -1,2 +1,2 @@
-21237-clearlooks-metacity-0.5.tar.gz
+21237-clearlooks-metacity-0.5.1.tar.gz
 clearlooks-0.5.tar.bz2


Index: gnome-theme-clearlooks.spec
===================================================================
RCS file: /cvs/extras/devel/gnome-theme-clearlooks/gnome-theme-clearlooks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-theme-clearlooks.spec	21 Mar 2005 22:16:03 -0000	1.1
+++ gnome-theme-clearlooks.spec	31 Mar 2005 19:15:25 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           gnome-theme-clearlooks
 Version:        0.5
-Release:        2
+Release:        3
 Summary:        An attractive GTK+ 2 engine with a focus on usability
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://clearlooks.sourceforge.net/screenshots/
 Source0:        http://prdownloads.sourceforge.net/clearlooks/clearlooks-0.5.tar.bz2
-Source1:        http://www.gnome-look.org/content/files/21237-clearlooks-metacity-0.5.tar.gz
+Source1:        http://www.gnome-look.org/content/files/21237-clearlooks-metacity-0.5.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel libgnome-devel
 
@@ -38,6 +38,9 @@
 %{_libdir}/gtk-2.0/2.4.0/engines/*
 
 %changelog
+* Thu Mar 31 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5-3
+- Updated Metacity theme to 0.5.1
+
 * Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5-2
 - Name changed from "clearlooks" to "gnome-theme-clearlooks"
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/gnome-theme-clearlooks/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Mar 2005 22:16:03 -0000	1.2
+++ sources	31 Mar 2005 19:15:25 -0000	1.3
@@ -1,2 +1,2 @@
-7cad4d05b820260b61d63d3cb361877b  21237-clearlooks-metacity-0.5.tar.gz
+8274a3f363a72577097d682e113abed0  21237-clearlooks-metacity-0.5.1.tar.gz
 16ad9981ebbd816d7adfe05aadb0503b  clearlooks-0.5.tar.bz2



From fedora-extras-commits at redhat.com  Thu Mar 31 19:55:20 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu, 31 Mar 2005 14:55:20 -0500
Subject: web/html/participate naming.php,NONE,1.1
Message-ID: <200503311955.j2VJtKkx012113@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/web/html/participate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12101

Added Files:
	naming.php 
Log Message:
add naming.php


***** Error reading new file: [Errno 2] No such file or directory: 'naming.php'



From fedora-extras-commits at redhat.com  Thu Mar 31 20:31:00 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 31 Mar 2005 15:31:00 -0500
Subject: rpms/amarok/FC-3 .cvsignore, 1.7, 1.8 amarok.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <200503312031.j2VKV0Rv013105@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13095/FC-3

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.2.3
- add libtool to BuildRequirements (libtool-ltdl-devel for FC4)
- change release tag for FC3/FC4
- add new akode subpackage for FC4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2005 15:36:12 -0000	1.7
+++ .cvsignore	31 Mar 2005 20:30:57 -0000	1.8
@@ -1 +1 @@
-amarok-1.2.2.tar.bz2
+amarok-1.2.3.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/amarok.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- amarok.spec	15 Mar 2005 15:36:12 -0000	1.9
+++ amarok.spec	31 Mar 2005 20:30:57 -0000	1.10
@@ -6,13 +6,13 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.2.2
-Release:    1
+Version:    1.2.3
+Release:    1.fc3
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.2.2.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.2.3.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -22,6 +22,7 @@
 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
 
 %if  0%{?use_xine}
 BuildRequires:  xine-lib-devel >= 0:1.0.0
@@ -175,6 +176,11 @@
 
 
 %changelog
+* Tue Mar 29 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.3-1
+- version 1.2.3
+- add libtool to BuildRequirements
+- change release tag for FC3
+
 * Mon Mar 14 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.2-1
 - version 1.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Mar 2005 15:36:12 -0000	1.7
+++ sources	31 Mar 2005 20:30:57 -0000	1.8
@@ -1 +1 @@
-af3bd552fbc61168a894a9cd447d2b2e  amarok-1.2.2.tar.bz2
+0082f47cb4503afc7d8e671cfd5cb983  amarok-1.2.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Mar 31 20:31:00 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 31 Mar 2005 15:31:00 -0500
Subject: rpms/amarok/devel .cvsignore, 1.7, 1.8 amarok.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <200503312031.j2VKV01T013111@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13095/devel

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.2.3
- add libtool to BuildRequirements (libtool-ltdl-devel for FC4)
- change release tag for FC3/FC4
- add new akode subpackage for FC4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2005 15:36:12 -0000	1.7
+++ .cvsignore	31 Mar 2005 20:30:58 -0000	1.8
@@ -1 +1 @@
-amarok-1.2.2.tar.bz2
+amarok-1.2.3.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- amarok.spec	15 Mar 2005 15:36:12 -0000	1.11
+++ amarok.spec	31 Mar 2005 20:30:58 -0000	1.12
@@ -6,13 +6,13 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.2.2
-Release:    1
+Version:    1.2.3
+Release:    1.fc4
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.2.2.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.2.3.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -22,6 +22,7 @@
 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
 
 %if  0%{?use_xine}
 BuildRequires:  xine-lib-devel >= 0:1.0.0
@@ -60,6 +61,16 @@
 enables it.
 
 
+%package akode
+Summary:    AKode engine for Amarok
+Group:      Applications/Multimedia
+Requires:   %{name} = %{version}
+
+%description akode
+Amarok can also use the akode engine to decode sound. This package
+enables it.
+
+
 %if 0%{?use_xine}
 %package xine
 Summary:    Xine engine for Amarok
@@ -165,6 +176,12 @@
 %{_datadir}/services/amarok_artsengine_plugin.desktop
 
 
+%files akode
+%defattr(-,root,root)
+%{_libdir}/kde3/libamarok_aKode-engine.*
+%{_datadir}/services/amarok_aKode-engine.desktop
+
+
 %if 0%{?use_xine}
 %files xine
 %defattr(-,root,root)
@@ -175,6 +192,12 @@
 
 
 %changelog
+* Tue Mar 29 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.3-1.fc4
+- version 1.2.3
+- add libtool to BuildRequirements
+- change release tag for FC4
+- add a subpackage for aKode engine
+
 * Mon Mar 14 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.2-1
 - version 1.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Mar 2005 15:36:12 -0000	1.7
+++ sources	31 Mar 2005 20:30:58 -0000	1.8
@@ -1 +1 @@
-af3bd552fbc61168a894a9cd447d2b2e  amarok-1.2.2.tar.bz2
+0082f47cb4503afc7d8e671cfd5cb983  amarok-1.2.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Mar 31 21:02:39 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Thu, 31 Mar 2005 16:02:39 -0500
Subject: common tobuild,NONE,1.1 Makefile.common,1.6,1.7
Message-ID: <200503312102.j2VL2dN1014324@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14312

Modified Files:
	Makefile.common 
Added Files:
	tobuild 
Log Message:
first pass build: target and build control file.

NOTE: THIS DOES NOT DO ANYTHING YET.  YOU MUST STILL UPDATE THE WIKI
TO GET BUILDS COMPLETED.



--- NEW FILE tobuild ---
# this is the build control file.  the format is
# user	repo	tag	target	status
# 


Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.common	29 Mar 2005 19:36:49 -0000	1.6
+++ Makefile.common	31 Mar 2005 21:02:37 -0000	1.7
@@ -283,6 +283,25 @@
 	@echo "Tagged with: $(TAG)"
 	@echo
 
+define find-common-dir
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then echo "$$d"; break ; fi ; done
+endef
+COMMON_DIR := $(shell $(find-common-dir))
+
+define find-user
+if [ `cat CVS/Root |grep -c @` -ne 0 ]; then cat CVS/Root  |cut -d @ -f 1 |  sed 's/:.*://' ; else echo $(USER); fi
+endef
+USER := $(shell $(find-user))
+
+build: 
+	@if [ -z "$(TARGET)" ]; then echo "Must specify a target to build into"; exit 1; fi
+	@(pushd $(COMMON_DIR) >/dev/null ;\
+	cvs -Q update ;\
+	echo -e "$(USER)\t$(CVS_REPOSITORY)\t$(TAG)\t$(TARGET)" >> tobuild ;\
+	cvs commit -m"request build of $(CVS_REPOSITORY) $(TAG) for $(TARGET)" tobuild ;\
+	popd >/dev/null)
+
+
 # "make new | less" to see what has changed since the last tag was assigned
 new:
 	- at cvs diff -u -r$$(cvs log Makefile 2>/dev/null | awk '/^symbolic names:$$/ {getline; sub(/^[ \t]*/, "") ; sub (/:.*$$/, ""); print; exit 0}')



From fedora-extras-commits at redhat.com  Thu Mar 31 21:19:52 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 31 Mar 2005 16:19:52 -0500
Subject: rpms/aiksaurus/devel aiksaurus.spec,1.1,1.2
Message-ID: <200503312119.j2VLJqeO014635@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aiksaurus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14629

Modified Files:
	aiksaurus.spec 
Log Message:
* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.2.1-6
- add dep gtk2-devel for pkgconfig in -gtk-devel sub-package 
- include %{_includedir}/Aiksaurus dir in -devel sub-package
- remove redundant deps "gtk2" and "Aiksaurus" in -gtk sub-package




Index: aiksaurus.spec
===================================================================
RCS file: /cvs/extras/rpms/aiksaurus/devel/aiksaurus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aiksaurus.spec	14 Mar 2005 22:33:24 -0000	1.1
+++ aiksaurus.spec	31 Mar 2005 21:19:50 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: An English-language thesaurus library.
 Name: aiksaurus
 Version: 1.2.1
-Release: 5
+Release: 6
 Epoch: 1
 Group: System Environment/Libraries
 License: GPL
@@ -28,10 +28,8 @@
 
 %package gtk
 Requires: aiksaurus >= %{version}
-Requires: gtk2
 Summary: A GTK+ frontend to aiksaurus.
 Group: System Environment/Libraries
-Requires: aiksaurus
 
 %description gtk
 AiksaurusGTK is a GTK+ interface to the Aiksaurus library.  
@@ -42,6 +40,7 @@
 %package gtk-devel
 Requires: aiksaurus-gtk
 Requires: aiksaurus-devel >= %{version}
+Requires: gtk2-devel
 Summary: Files for developing with aiksaurus-gtk.
 Group: Development/Libraries
                                                                                 
@@ -78,6 +77,7 @@
 
 %files devel
 %defattr(-, root, root)
+%dir %{_includedir}/Aiksaurus
 %{_includedir}/Aiksaurus/Aiksaurus.h
 %{_includedir}/Aiksaurus/AiksaurusC.h
 %{_libdir}/*Aiksaurus.so
@@ -104,6 +104,11 @@
 %{_libdir}/pkgconfig/gaiksaurus-1.0.pc
 
 %changelog
+* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.2.1-6
+- add dep gtk2-devel for pkgconfig in -gtk-devel sub-package 
+- include %%{_includedir}/Aiksaurus dir in -devel sub-package
+- remove redundant deps "gtk2" and "Aiksaurus" in -gtk sub-package
+
 * Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1.2.1-5
 - rebuild with gcc4
 



From fedora-extras-commits at redhat.com  Thu Mar 31 21:20:53 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 31 Mar 2005 16:20:53 -0500
Subject: rpms/enchant/devel enchant.spec,1.2,1.3
Message-ID: <200503312120.j2VLKr5W014712@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14702

Modified Files:
	enchant.spec 
Log Message:
* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1:1.1.6-2
- add dep glib2-devel for pkgconfig in -devel package
- include %{_libdir}/enchant dir in main package
- make -devel package require exact VR of main package
- use -p /sbin/ldconfig in scriptlets




Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/enchant.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- enchant.spec	28 Mar 2005 15:23:37 -0000	1.2
+++ enchant.spec	31 Mar 2005 21:20:51 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
 Version: 1.1.6
-Release: 1
+Release: 2
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -18,7 +18,8 @@
 %package devel
 Summary: Support files necessary to compile applications with libenchant.
 Group: Development/Libraries
-Requires: enchant
+Requires: enchant = %{version}-%{release}
+Requires: glib2-devel
 
 %description devel
 Libraries, headers, and support files necessary to compile applications using libenchant.
@@ -40,6 +41,7 @@
 %doc AUTHORS COPYING.LIB README
 %{_bindir}/*
 %{_libdir}/lib*.so.*
+%dir %{_libdir}/enchant
 %{_libdir}/enchant/lib*.so*
 %{_mandir}/man1/enchant.1.gz
 
@@ -51,16 +53,20 @@
 %{_libdir}/pkgconfig/enchant.pc
 %{_includedir}/enchant
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1:1.1.6-2
+- add dep glib2-devel for pkgconfig in -devel package
+- include %%{_libdir}/enchant dir in main package
+- make -devel package require exact VR of main package
+- use -p /sbin/ldconfig in scriptlets
+
 * Mon Mar 28 2005 Marc Maurer <uwog at abisource.com> 1:1.1.6-1
 - update to 1.1.6
 - drop the manpage patch (RH#145010#)



From fedora-extras-commits at redhat.com  Thu Mar 31 21:21:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 31 Mar 2005 16:21:50 -0500
Subject: rpms/gmime/devel gmime.spec,1.3,1.4
Message-ID: <200503312121.j2VLLoQ0014776@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gmime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14767

Modified Files:
	gmime.spec 
Log Message:
* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.1.9-4
- add dep glib2-devel for pkgconfig in -devel package




Index: gmime.spec
===================================================================
RCS file: /cvs/extras/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gmime.spec	3 Mar 2005 21:26:03 -0000	1.3
+++ gmime.spec	31 Mar 2005 21:21:48 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gmime
 Version:        2.1.9
-Release:        3
+Release:        4
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -22,6 +22,7 @@
 Summary:        Header files to develop libgmime applications
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       glib2-devel
 
 %description    devel
 The GMime suite provides a core library and set of utilities which may be
@@ -74,6 +75,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.1.9-4
+- add dep glib2-devel for pkgconfig in -devel package
+
 * Mon Oct 18 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.1.9-0.fdr.3
 - Remove ldconfig from Requires pre and post
 



From fedora-extras-commits at redhat.com  Thu Mar 31 21:22:35 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 31 Mar 2005 16:22:35 -0500
Subject: rpms/gstreamer-python/devel gstreamer-python.spec,1.4,1.5
Message-ID: <200503312122.j2VLMZIr014834@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gstreamer-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14828

Modified Files:
	gstreamer-python.spec 
Log Message:
* 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




Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/devel/gstreamer-python.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gstreamer-python.spec	10 Feb 2005 19:15:26 -0000	1.4
+++ gstreamer-python.spec	31 Mar 2005 21:22:33 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:           %{gstreamer}-python
 Version:        0.8.1
-Release:        1
+Release:        2
 Summary:        Python bindings for GStreamer.
 
 Group:          Development/Languages
@@ -35,6 +35,8 @@
 
 # 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
@@ -67,6 +69,9 @@
 %{_libdir}/pkgconfig/gst-python-0.8.pc
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Thu Mar 31 21:27:43 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 31 Mar 2005 16:27:43 -0500
Subject: devel/aiksaurus aiksaurus.spec,1.2,1.3
Message-ID: <200503312127.j2VLRhe8014936@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/aiksaurus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14930

Modified Files:
	aiksaurus.spec 
Log Message:
fix typo in changelog entry


Index: aiksaurus.spec
===================================================================
RCS file: /cvs/extras/devel/aiksaurus/aiksaurus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aiksaurus.spec	31 Mar 2005 21:19:50 -0000	1.2
+++ aiksaurus.spec	31 Mar 2005 21:27:41 -0000	1.3
@@ -107,7 +107,7 @@
 * Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.2.1-6
 - add dep gtk2-devel for pkgconfig in -gtk-devel sub-package 
 - include %%{_includedir}/Aiksaurus dir in -devel sub-package
-- remove redundant deps "gtk2" and "Aiksaurus" in -gtk sub-package
+- remove redundant deps "gtk2" and "aiksaurus" in -gtk sub-package
 
 * Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1.2.1-5
 - rebuild with gcc4