packages: amavisd/amavisd.spec, beagle/beagle.spec, fltk2/fltk2.spec, gstre...

sparky sparky at pld-linux.org
Sun Feb 6 02:45:43 CET 2011 

Author: sparky                       Date: Sun Feb  6 01:45:43 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- bconds should be the very first thing, moved defines and includes after them

---- Files affected:
packages/amavisd:
   amavisd.spec (1.65 -> 1.66) 
packages/beagle:
   beagle.spec (1.142 -> 1.143) 
packages/fltk2:
   fltk2.spec (1.14 -> 1.15) 
packages/gstreamer-gnonlin:
   gstreamer-gnonlin.spec (1.15 -> 1.16) 
packages/libcroco:
   libcroco.spec (1.24 -> 1.25) 
packages/parselog:
   parselog.spec (1.13 -> 1.14) 
packages/python-aggdraw:
   python-aggdraw.spec (1.4 -> 1.5) 
packages/python-gnome-desktop:
   python-gnome-desktop.spec (1.63 -> 1.64) 
packages/ruby-builder:
   ruby-builder.spec (1.15 -> 1.16) 
packages/sword:
   sword.spec (1.10 -> 1.11) 
packages/tasque:
   tasque.spec (1.2 -> 1.3) 
packages/texlive:
   texlive.spec (1.329 -> 1.330) 
packages/texlive-texmf:
   texlive-texmf.spec (1.40 -> 1.41) 
packages/vsftpd:
   vsftpd.spec (1.76 -> 1.77) 

---- Diffs:

================================================================
Index: packages/amavisd/amavisd.spec
diff -u packages/amavisd/amavisd.spec:1.65 packages/amavisd/amavisd.spec:1.66
--- packages/amavisd/amavisd.spec:1.65	Sat Feb 27 22:11:12 2010
+++ packages/amavisd/amavisd.spec	Sun Feb  6 02:45:38 2011
@@ -1,8 +1,9 @@
 # $Revision$, $Date$
-%include	/usr/lib/rpm/macros.perl
-
+#
+# Conditional build:
 %bcond_with	qmail		# enable qmail
 
+%include	/usr/lib/rpm/macros.perl
 Summary:	A Mail Virus Scanner - Daemon
 Summary(pl.UTF-8):	Antywirusowy skaner poczty elektronicznej - Demon
 Name:		amavisd
@@ -334,6 +335,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66  2011/02/06 01:45:38  sparky
+- bconds should be the very first thing, moved defines and includes after them
+
 Revision 1.65  2010/02/27 21:11:12  sparky
 - unify %attr() %ghost order
 

================================================================
Index: packages/beagle/beagle.spec
diff -u packages/beagle/beagle.spec:1.142 packages/beagle/beagle.spec:1.143
--- packages/beagle/beagle.spec:1.142	Sat Feb  5 00:19:37 2011
+++ packages/beagle/beagle.spec	Sun Feb  6 02:45:38 2011
@@ -4,8 +4,6 @@
 #       - kill bashisms in crawl stuff
 #	- add qyoto based settings (requires new packages)
 #
-%include	/usr/lib/rpm/macros.mono
-#
 # Conditional build:
 %bcond_without	apidocs		# don't build API documentation
 %bcond_with	avahi		# enable Avahi support
@@ -20,7 +18,8 @@
 %if !%{with gui}
 %undefine	with_evolution
 %endif
-#
+
+%include	/usr/lib/rpm/macros.mono
 Summary:	Beagle - An indexing subsystem
 Summary(pl.UTF-8):	Beagle - podsystem indeksujący
 Name:		beagle
@@ -450,6 +449,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.143  2011/02/06 01:45:38  sparky
+- bconds should be the very first thing, moved defines and includes after them
+
 Revision 1.142  2011/02/04 23:19:37  sparky
 - %description for correct %package
 

================================================================
Index: packages/fltk2/fltk2.spec
diff -u packages/fltk2/fltk2.spec:1.14 packages/fltk2/fltk2.spec:1.15
--- packages/fltk2/fltk2.spec:1.14	Wed Feb 24 19:11:48 2010
+++ packages/fltk2/fltk2.spec	Sun Feb  6 02:45:38 2011
@@ -2,12 +2,12 @@
 # TODO:
 #	- tons of "Unresolved symbols found in: ..."
 #
+# Conditional build:
+%bcond_with	cairo	# without cairo support
+
 %define		_name		fltk
 %define		_snap		r6970
 %define		_version	2.0
-# Conditional build:
-%bcond_with	cairo	# without cairo support
-#
 Summary:	Fast Light Tool Kit 2.x
 Summary(pl.UTF-8):	FLTK - "lekki" X11 toolkit wersja 2.x
 Summary(pt_BR.UTF-8):	Interface gráfica em C++ para X, OpenGL e Windows
@@ -183,6 +183,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2011/02/06 01:45:38  sparky
+- bconds should be the very first thing, moved defines and includes after them
+
 Revision 1.14  2010/02/24 18:11:48  sls
 - added TODO
 - rel. 0.2

================================================================
Index: packages/gstreamer-gnonlin/gstreamer-gnonlin.spec
diff -u packages/gstreamer-gnonlin/gstreamer-gnonlin.spec:1.15 packages/gstreamer-gnonlin/gstreamer-gnonlin.spec:1.16
--- packages/gstreamer-gnonlin/gstreamer-gnonlin.spec:1.15	Thu Jan 27 22:05:25 2011
+++ packages/gstreamer-gnonlin/gstreamer-gnonlin.spec	Sun Feb  6 02:45:39 2011
@@ -1,11 +1,11 @@
 # $Revision$, $Date$
-%define		gst_major_ver	0.10
-%define		gst_req_ver	0.10.30
-%define		gstpb_req_ver	0.10.30
 #
 # Conditional build:
 %bcond_without	apidocs		# disable gtk-doc
-#
+
+%define		gst_major_ver	0.10
+%define		gst_req_ver	0.10.30
+%define		gstpb_req_ver	0.10.30
 Summary:	GStreamer extension library for non-linear editing
 Summary(pl.UTF-8):	Biblioteka rozszerzenia GStreamera do edycji nieliniowej
 Name:		gstreamer-gnonlin
@@ -89,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2011/02/06 01:45:39  sparky
+- bconds should be the very first thing, moved defines and includes after them
+
 Revision 1.15  2011/01/27 21:05:25  sparky
 - BR: docbook-dtd412-xml
 

================================================================
Index: packages/libcroco/libcroco.spec
diff -u packages/libcroco/libcroco.spec:1.24 packages/libcroco/libcroco.spec:1.25
--- packages/libcroco/libcroco.spec:1.24	Tue Dec  1 02:09:42 2009
+++ packages/libcroco/libcroco.spec	Sun Feb  6 02:45:39 2011
@@ -1,10 +1,9 @@
 # $Revision$, $Date$
 #
-%define		_mver	0.6
-#
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
-#
+
+%define		_mver	0.6
 Summary:	A CSS2 parsing library
 Summary(pl.UTF-8):	Biblioteka analizująca CSS2
 Name:		libcroco
@@ -118,6 +117,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2011/02/06 01:45:39  sparky
+- bconds should be the very first thing, moved defines and includes after them
+
 Revision 1.24  2009/12/01 01:09:42  sparky
 - BR: gtk-doc-automake
 

================================================================
Index: packages/parselog/parselog.spec
diff -u packages/parselog/parselog.spec:1.13 packages/parselog/parselog.spec:1.14
--- packages/parselog/parselog.spec:1.13	Tue Feb 13 08:16:52 2007
+++ packages/parselog/parselog.spec	Sun Feb  6 02:45:39 2011
@@ -2,12 +2,12 @@
 # TODO
 # - cgi outputs just 'XML::API::XHTML=HASH(0x834c240)' instead of real html
 #
+# Conditional build:
+%bcond_without	tests		# do not perform "make test"
+
 %define		cgi_version 0.04
 %define		main_version 0.09
 
-# Conditional build:
-%bcond_without	tests		# do not perform "make test"
-#
 %include	/usr/lib/rpm/macros.perl
 %define		pdir parselog
 %define		pnam cgi
@@ -238,6 +238,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2011/02/06 01:45:39  sparky
+- bconds should be the very first thing, moved defines and includes after them
+
 Revision 1.13  2007/02/13 07:16:52  glen
 - tabs in preamble
 

================================================================
Index: packages/python-aggdraw/python-aggdraw.spec
diff -u packages/python-aggdraw/python-aggdraw.spec:1.4 packages/python-aggdraw/python-aggdraw.spec:1.5
--- packages/python-aggdraw/python-aggdraw.spec:1.4	Sun May 16 16:14:29 2010
+++ packages/python-aggdraw/python-aggdraw.spec	Sun Feb  6 02:45:39 2011
@@ -4,12 +4,12 @@
 #       source tree and the module itself isn't dynamically linked with
 #       AGG, so there's no need for 'BR: agg-devel' and 'R: agg'. This
 #       however may change in the future versions of aggdraw.
-%define		package		aggdraw
-%define		buildver	20051010
 #
 # Conditional build:
 %bcond_without	freetype	# Build without freetype support
 #
+%define		package		aggdraw
+%define		buildver	20051010
 Summary:	An add-on to the PIL library that supports anti-aliased drawing
 Summary(pl.UTF-8):	Dodatek do biblioteki PIL z obsługą rysowania z wygładzaniem
 Name:		python-aggdraw
@@ -72,6 +72,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/02/06 01:45:39  sparky
+- bconds should be the very first thing, moved defines and includes after them
+
 Revision 1.4  2010/05/16 14:14:29  sparky
 - BR: unzip
 

================================================================
Index: packages/python-gnome-desktop/python-gnome-desktop.spec
diff -u packages/python-gnome-desktop/python-gnome-desktop.spec:1.63 packages/python-gnome-desktop/python-gnome-desktop.spec:1.64
--- packages/python-gnome-desktop/python-gnome-desktop.spec:1.63	Sat Nov 13 01:19:15 2010
+++ packages/python-gnome-desktop/python-gnome-desktop.spec	Sun Feb  6 02:45:39 2011
@@ -1,11 +1,11 @@
 # $Revision$, $Date$
-%define		module			gnome-python-desktop
-%define		pygtk_req		2:2.12.0
-%define		gnome_python_req	2.26.0
 #
 # Conditional builds:
 %bcond_without	totem		# disable totem support
 #
+%define		module			gnome-python-desktop
+%define		pygtk_req		2:2.12.0
+%define		gnome_python_req	2.26.0
 Summary:	GNOME bindings for Python
 Summary(pl.UTF-8):	Wiązania Pythona do bibliotek GNOME
 Name:		python-gnome-desktop
@@ -384,6 +384,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2011/02/06 01:45:39  sparky
+- bconds should be the very first thing, moved defines and includes after them
+
 Revision 1.63  2010/11/13 00:19:15  pawelz
 - release 3
 

================================================================
Index: packages/ruby-builder/ruby-builder.spec
diff -u packages/ruby-builder/ruby-builder.spec:1.15 packages/ruby-builder/ruby-builder.spec:1.16
--- packages/ruby-builder/ruby-builder.spec:1.15	Tue Nov 30 23:20:00 2010
+++ packages/ruby-builder/ruby-builder.spec	Sun Feb  6 02:45:39 2011
@@ -1,6 +1,9 @@
 # $Revision$, $Date$
-%define pkgname builder
+#
+# Conditional build:
 %bcond_without 	doc
+
+%define	pkgname	builder
 Summary:	Simple builder to facilitate programatic generation of XML markup
 Summary(pl.UTF-8):	Proste narzędzie do budowania ułatwiające programowe generowanie znaczników XML
 Name:		ruby-%{pkgname}
@@ -103,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2011/02/06 01:45:39  sparky
+- bconds should be the very first thing, moved defines and includes after them
+
 Revision 1.15  2010/11/30 22:20:00  aredridel
 - 3.0.0
 - C: ruby-activesupport < 3.0.0

================================================================
Index: packages/sword/sword.spec
diff -u packages/sword/sword.spec:1.10 packages/sword/sword.spec:1.11
--- packages/sword/sword.spec:1.10	Sat Oct 23 09:22:38 2010
+++ packages/sword/sword.spec	Sun Feb  6 02:45:39 2011
@@ -1,16 +1,16 @@
 # $Revision$, $Date$
-#
 # TODO:
 # - Package icu-sword and add bcond for it here
-
-%define debug_package 0
-
+#
+# Conditional build:
 #%bcond_with	icusword
 %bcond_without	clucene
 %bcond_without	curl
 %bcond_without	icu
 %bcond_without	utilities
 
+%define debug_package 0
+
 Summary:	The SWORD Project framework for manipulating Bible texts
 Name:		sword
 Version:	1.6.2
@@ -135,6 +135,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2011/02/06 01:45:39  sparky
+- bconds should be the very first thing, moved defines and includes after them
+
 Revision 1.10  2010/10/23 07:22:38  caleb
 - Up to 1.6.2
 

================================================================
Index: packages/tasque/tasque.spec
diff -u packages/tasque/tasque.spec:1.2 packages/tasque/tasque.spec:1.3
--- packages/tasque/tasque.spec:1.2	Sat Jan 29 01:46:19 2011
+++ packages/tasque/tasque.spec	Sun Feb  6 02:45:40 2011
@@ -4,16 +4,17 @@
 # - Enable more backends
 # - Fix requires esp for various backend support
 # - Unpackages files? Need for mono macros?
+#
+# Conditional build:
+%bcond_with	eds
+%bcond_with	hiveminder
+%bcond_with	icecore
+%bcond_with	sqlite
+%bcond_without	dummy
+%bcond_without	rtm
 
 %include	/usr/lib/rpm/macros.mono
 
-%bcond_with eds
-%bcond_with hiveminder
-%bcond_with icecore
-%bcond_with sqlite
-%bcond_without dummy
-%bcond_without rtm
-
 Summary:	Tasque is a simple task management app
 Name:		tasque
 Version:	0.1.9
@@ -96,6 +97,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2011/02/06 01:45:40  sparky
+- bconds should be the very first thing, moved defines and includes after them
+
 Revision 1.2  2011/01/29 00:46:19  sparky
 - BR: dotnet-ndesk-dbus-glib-sharp-devel, dotnet-ndesk-dbus-sharp-devel,
   gettext-devel, intltool, mono-csharp, pkgconfig

================================================================
Index: packages/texlive/texlive.spec
diff -u packages/texlive/texlive.spec:1.329 packages/texlive/texlive.spec:1.330
--- packages/texlive/texlive.spec:1.329	Sat Feb  5 00:44:52 2011
+++ packages/texlive/texlive.spec	Sun Feb  6 02:45:40 2011
@@ -40,7 +40,6 @@
 #   /var/lib/texmf/web2c/texsis/texsis.fmt
 #   /var/lib/texmf/web2c/xelatex/xelatex.fmt
 
-%include	/usr/lib/rpm/macros.perl
 # Conditional build:
 %bcond_without	bootstrap	# bootstrap build
 %bcond_without	xindy		# do not build xindy packages
@@ -49,7 +48,8 @@
 %undefine	with_xindy
 %endif
 
-#
+%include	/usr/lib/rpm/macros.perl
+
 %define		year	2010
 %define		monthday	0722
 %define		texmfversion 20091107
@@ -14041,6 +14041,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.330  2011/02/06 01:45:40  sparky
+- bconds should be the very first thing, moved defines and includes after them
+
 Revision 1.329  2011/02/04 23:44:52  sparky
 - %description <name> for correct %package
 

================================================================
Index: packages/texlive-texmf/texlive-texmf.spec
diff -u packages/texlive-texmf/texlive-texmf.spec:1.40 packages/texlive-texmf/texlive-texmf.spec:1.41
--- packages/texlive-texmf/texlive-texmf.spec:1.40	Sat Feb  5 00:06:23 2011
+++ packages/texlive-texmf/texlive-texmf.spec	Sun Feb  6 02:45:40 2011
@@ -4,15 +4,14 @@
 # - latex subpackage (maybe rename latex-base and texlive-latex requires latex-base)
 # - maybe tex4ht-data splitting
 
-%include	/usr/lib/rpm/macros.perl
 # Conditional build:
 %bcond_with	bootstrap	# bootstrap build
 
-%define shortname texlive
+%define		shortname	texlive
+%define		year		2010
+%define		monthday	0722
 
-#
-%define		year 2010
-%define		monthday 0722
+%include	/usr/lib/rpm/macros.perl
 Summary:	TeX typesetting system and MetaFont font formatter
 Summary(de.UTF-8):	TeX-Satzherstellungssystem und MetaFont-Formatierung
 Summary(es.UTF-8):	Sistema de typesetting TeX y formateador de fuentes MetaFont
@@ -13095,6 +13094,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2011/02/06 01:45:40  sparky
+- bconds should be the very first thing, moved defines and includes after them
+
 Revision 1.40  2011/02/04 23:06:23  sparky
 - %description: first always put -l after -n
 

================================================================
Index: packages/vsftpd/vsftpd.spec
diff -u packages/vsftpd/vsftpd.spec:1.76 packages/vsftpd/vsftpd.spec:1.77
--- packages/vsftpd/vsftpd.spec:1.76	Tue Dec 28 17:39:20 2010
+++ packages/vsftpd/vsftpd.spec	Sun Feb  6 02:45:41 2011
@@ -1,11 +1,11 @@
 # $Revision$, $Date$
-### TODO:
+# TODO:
 # - default config does not work with inetd configuration
 #
-%define		_ftpdir	/home/services/ftp
-#
+# Conditional build:
 %bcond_with	clamav	#ClamAV scanning support
 
+%define		_ftpdir	/home/services/ftp
 Summary:	vsftpd - Very Secure FTP Daemon
 Summary(pl.UTF-8):	Bardzo Bezpieczny Demon FTP
 Summary(pt_BR.UTF-8):	vsftpd - Daemon FTP Muito Seguro
@@ -189,6 +189,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2011/02/06 01:45:41  sparky
+- bconds should be the very first thing, moved defines and includes after them
+
 Revision 1.76  2010/12/28 16:39:20  blues
 - rel.2: allow ssl build on AC - changed sha256 to sha1 (less secure but
   still ok and working)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amavisd/amavisd.spec?r1=1.65&r2=1.66&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/beagle/beagle.spec?r1=1.142&r2=1.143&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fltk2/fltk2.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gstreamer-gnonlin/gstreamer-gnonlin.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libcroco/libcroco.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/parselog/parselog.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-aggdraw/python-aggdraw.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-gnome-desktop/python-gnome-desktop.spec?r1=1.63&r2=1.64&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-builder/ruby-builder.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sword/sword.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tasque/tasque.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/texlive/texlive.spec?r1=1.329&r2=1.330&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/texlive-texmf/texlive-texmf.spec?r1=1.40&r2=1.41&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vsftpd/vsftpd.spec?r1=1.76&r2=1.77&f=u

More information about the pld-cvs-commit mailing list