SPECS: antargis.spec, archivemail.spec, ekg.spec, gpm.spec, kpogre.spec, ly...

[adamg]

Author: adamg                        Date: Sun May 18 16:19:32 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- previous commit reverted (mistake)

---- Files affected:
SPECS:
   antargis.spec (1.5 -> 1.6) , archivemail.spec (1.20 -> 1.21) , ekg.spec (1.218 -> 1.219) , gpm.spec (1.146 -> 1.147) , kpogre.spec (1.11 -> 1.12) , lyx.spec (1.124 -> 1.125) , openttd.spec (1.48 -> 1.49) , php-pear-Date_Holidays.spec (1.31 -> 1.32) , php-pear-PhpDocumentor.spec (1.34 -> 1.35) , pida.spec (1.19 -> 1.20) , python-kiwi.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/antargis.spec
diff -u SPECS/antargis.spec:1.5 SPECS/antargis.spec:1.6
--- SPECS/antargis.spec:1.5	Sun May 18 18:12:22 2008
+++ SPECS/antargis.spec	Sun May 18 18:19:26 2008
@@ -2,12 +2,12 @@
 Summary:	Battles of Antargis - medieval RTS
 Summary(pl.UTF-8):	Battles of Antargis - osadzona w średniowieczu gra typu RTS
 Name:		antargis
-Version:	0.2.1.4
+Version:	0.1.2
 Release:	0.1
 License:	GPL
 Group:		X11/Applications/Games/Strategy
-Source0:	http://download.berlios.de/antargis/%{name}-source-%{version}.tar.gz
-# Source0-md5:	8e45ba040ad025ddbf84a624ade97ea5
+Source0:	http://download.berlios.de/antargis/%{name}-%{version}.tar.gz
+# Source0-md5:	94f8173e2eb1fea4d9d2949803055f87
 URL:		http://antargis.berlios.de/
 BuildRequires:	OpenGL-devel
 BuildRequires:	SDL_image-devel
@@ -40,13 +40,12 @@
 - początek właściwej kampanii
 
 %prep
-%setup -q -n %{name}-source-%{version}
+%setup -q
 
 %build
-ruby build.rb \
+rake \
 	CC="%{__cc}" \
-	CXX="%{__cxx}" \
-	COMPILE_PARAMS="%{rpmcflags} -fPIC"
+	CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -69,10 +68,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.5  2008-05-18 16:12:22  adamg
-- new
+Revision 1.6  2008-05-18 16:19:26  adamg
+- previous commit reverted (mistake)
 
-Revision 1.4  2007/02/12 22:09:09  glen
+Revision 1.4  2007-02-12 22:09:09  glen
 - tabs in preamble
 
 Revision 1.3  2007/02/12 01:06:30  baggins

================================================================
Index: SPECS/archivemail.spec
diff -u SPECS/archivemail.spec:1.20 SPECS/archivemail.spec:1.21
--- SPECS/archivemail.spec:1.20	Sun May 18 18:12:22 2008
+++ SPECS/archivemail.spec	Sun May 18 18:19:26 2008
@@ -2,12 +2,12 @@
 Summary:	Archive and compress old email
 Summary(pl.UTF-8):	Archiwizowanie starej poczty
 Name:		archivemail
-Version:	0.7.2
-Release:	1
+Version:	0.7.0
+Release:	2
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://dl.sourceforge.net/archivemail/%{name}-%{version}.tar.gz
-# Source0-md5:	e444424688e6ec063e829176e4eb62e2
+# Source0-md5:	087c9707daa6bb5c44cd052b6d71ce88
 Patch0:		%{name}-invalid-message.patch
 URL:		http://archivemail.sourceforge.net/
 BuildRequires:	python-devel >= 2.0
@@ -82,10 +82,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.20  2008-05-18 16:12:22  adamg
-- new
+Revision 1.21  2008-05-18 16:19:26  adamg
+- previous commit reverted (mistake)
 
-Revision 1.19  2007/09/18 10:54:09  glen
+Revision 1.19  2007-09-18 10:54:09  glen
 - bugfix for empty emails (thx jajcus for helping tracing it down)
 - rel 2
 

================================================================
Index: SPECS/ekg.spec
diff -u SPECS/ekg.spec:1.218 SPECS/ekg.spec:1.219
--- SPECS/ekg.spec:1.218	Sun May 18 18:12:22 2008
+++ SPECS/ekg.spec	Sun May 18 18:19:26 2008
@@ -15,16 +15,16 @@
 Summary(pl.UTF-8):	Klient kompatybilny z Gadu-Gadu
 Name:		ekg
 Version:	1.7
-%define		snap 20071225
-Release:	4.20071225
+Release:	4
 Epoch:		4
 License:	GPL v2
 Group:		Applications/Communications
-Source0:	http://ekg.chmurka.net/%{name}-%{snap}.tar.gz
-# Source0-md5:	34b541bb6c58695dee2b9aea0a5d6d74
+Source0:	http://ekg.chmurka.net/%{name}-%{version}.tar.gz
+# Source0-md5:	2aa92b56517fdf09d75519a105772b74
 Source1:	%{name}.conf
 Patch0:		%{name}-LDFLAGS.patch
 Patch1:		%{name}-lock_reason.patch
+Patch2:		%{name}-external_libgadu.patch
 URL:		http://ekg.chmurka.net/
 BuildRequires:	%{_bindir}/perl
 %{?with_aspell:BuildRequires:	aspell-devel}
@@ -90,11 +90,12 @@
 polsku (jednak komendy są w języku angielskim).
 
 %prep
-%setup -q -n %{name}-%{snap}
+%setup -q
 %patch0 -p0
 %if %{with lock_reason}
 %patch1 -p1
 %endif
+%patch2 -p0
 
 %build
 %{__aclocal} -I m4
@@ -156,15 +157,15 @@
 %lang(pl) %{_mandir}/pl/man1/*
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
-:q%changelog
+%changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.218  2008-05-18 16:12:22  adamg
-- new
+Revision 1.219  2008-05-18 16:19:26  adamg
+- previous commit reverted (mistake)
 
-Revision 1.217  2007/06/20 15:52:06  qboosh
+Revision 1.217  2007-06-20 15:52:06  qboosh
 - keep versioned libgadu R
 
 Revision 1.216  2007/06/20 08:54:40  shadzik

================================================================
Index: SPECS/gpm.spec
diff -u SPECS/gpm.spec:1.146 SPECS/gpm.spec:1.147
--- SPECS/gpm.spec:1.146	Sun May 18 18:12:22 2008
+++ SPECS/gpm.spec	Sun May 18 18:19:26 2008
@@ -12,13 +12,13 @@
 Summary(tr.UTF-8):	Genel amaçlı fare desteği
 Summary(uk.UTF-8):	Сервер роботи з мишою для консолі Linux
 Name:		gpm
-Version:	1.20.3
-Release:	1
+Version:	1.20.1
+Release:	11
 Epoch:		1
 License:	GPL
 Group:		Daemons
 Source0:	http://linux.schottelius.org/gpm/archives/%{name}-%{version}.tar.bz2
-# Source0-md5:	dd6054c488fc36fec327acc5b1f3e7d6
+# Source0-md5:	2c63e827d755527950d9d13fe3d87692
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
@@ -316,8 +316,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.146  2008-05-18 16:12:22  adamg
-- new
+Revision 1.147  2008-05-18 16:19:26  adamg
+- previous commit reverted (mistake)
 
 Revision 1.145  2008-05-17 22:44:08  areq
 - fix log

================================================================
Index: SPECS/kpogre.spec
diff -u SPECS/kpogre.spec:1.11 SPECS/kpogre.spec:1.12
--- SPECS/kpogre.spec:1.11	Sun May 18 18:12:22 2008
+++ SPECS/kpogre.spec	Sun May 18 18:19:26 2008
@@ -2,12 +2,12 @@
 Summary:	PostgreSQL grafical frontend for KDE
 Summary(pl.UTF-8):	Graficzny frontend do PostgreSQL-a dla KDE 
 Name:		kpogre
-Version:	1.6.4
+Version:	1.5.8
 Release:	1
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
 Source0:	http://dl.sourceforge.net/kpogre/%{name}-%{version}.tar.gz
-# Source0-md5:	d994b0ef67c3586a9c81aeff1be21340
+# Source0-md5:	683e6f3b84342ea5ace6262e5ff832d1
 Patch0:		%{name}-missing-include.patch
 URL:		http://kpogre.sourceforge.net/
 BuildRequires:	kdelibs-devel
@@ -66,8 +66,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.11  2008-05-18 16:12:22  adamg
-- new
+Revision 1.12  2008-05-18 16:19:26  adamg
+- previous commit reverted (mistake)
 
 Revision 1.10  2007-11-11 12:56:53  adamg
 - updated to 1.5.8

================================================================
Index: SPECS/lyx.spec
diff -u SPECS/lyx.spec:1.124 SPECS/lyx.spec:1.125
--- SPECS/lyx.spec:1.124	Sun May 18 18:12:22 2008
+++ SPECS/lyx.spec	Sun May 18 18:19:26 2008
@@ -3,13 +3,13 @@
 Summary(pl.UTF-8):	Nakładka WYSIWYM na LaTeXa
 Summary(pt_BR.UTF-8):	Editor de Textos para ambiente Desktop
 Name:		lyx
-Version:	1.5.5
+Version:	1.5.4
 Release:	1
 Epoch:		1
 License:	GPL
 Group:		Applications/Publishing/TeX
 Source0:	ftp://ftp.lyx.org/pub/lyx/stable/%{name}-%{version}.tar.bz2
-# Source0-md5:	310bf760e8fdf85c7ad3a19b90ddc91c
+# Source0-md5:	6f424dc23af78e1d39c6962101cde2e9
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 URL:		http://www.lyx.org/
@@ -180,8 +180,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.124  2008-05-18 16:12:22  adamg
-- new
+Revision 1.125  2008-05-18 16:19:26  adamg
+- previous commit reverted (mistake)
 
 Revision 1.123  2008-04-29 14:06:07  pluto
 - reorganize boost BRs (boost-devel >= 1.35.0).

================================================================
Index: SPECS/openttd.spec
diff -u SPECS/openttd.spec:1.48 SPECS/openttd.spec:1.49
--- SPECS/openttd.spec:1.48	Sun May 18 18:12:22 2008
+++ SPECS/openttd.spec	Sun May 18 18:19:26 2008
@@ -6,16 +6,17 @@
 Summary:	An open source reimplementation of the Microprose game "Transport Tycoon Deluxe"
 Summary(pl.UTF-8):	Otwarta reimplementacja gry Transport Tycoon Deluxe
 Name:		openttd
-Version:	0.6.0
+Version:	0.5.3
 Release:	1
 License:	GPL
 Group:		X11/Applications/Games
 Source0:	http://dl.sourceforge.net/openttd/%{name}-%{version}-source.tar.bz2
-# Source0-md5:	dcf63687c73ff56887049fedaf6c6019
+# Source0-md5:	592c047903a3e7f17f95279f77b8a1dd
 Source1:	%{name}.desktop
 Source2:	%{name}-server.desktop
 Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-personal-data.patch
+Patch2:		%{name}-pthread.patch
 URL:		http://www.openttd.com/
 BuildRequires:	SDL-devel
 BuildRequires:	freetype-devel
@@ -76,14 +77,14 @@
 %prep
 %setup -q
 %{?with_home_etc:%patch0 -p1}
-#%patch1 -p1
+%patch1 -p1
+%patch2 -p0
 
+%{__sed} 's/ifndef USE_HOMEDIR/ifdef USE_HOMEDIR/' -i Makefile
 # Let's pldize
-find src/lang/ -type f -exec sed -i 's/:Unix/:PLD Linux/' \{\} \;
+find lang/ -type f -exec sed -i 's/:Unix/:PLD Linux/' \{\} \;
 
 %build
-./configure \
-	%{?with_home_etc:--:
 %{__make} \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
@@ -175,8 +176,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.48  2008-05-18 16:12:22  adamg
-- new
+Revision 1.49  2008-05-18 16:19:26  adamg
+- previous commit reverted (mistake)
 
 Revision 1.47  2008-01-02 15:30:53  hawk
 - release should be 1

================================================================
Index: SPECS/php-pear-Date_Holidays.spec
diff -u SPECS/php-pear-Date_Holidays.spec:1.31 SPECS/php-pear-Date_Holidays.spec:1.32
--- SPECS/php-pear-Date_Holidays.spec:1.31	Sun May 18 18:12:22 2008
+++ SPECS/php-pear-Date_Holidays.spec	Sun May 18 18:19:26 2008
@@ -8,19 +8,18 @@
 Summary:	%{_pearname} - driver based class to calculate holidays
 Summary(pl.UTF-8):	%{_pearname} - klasa oparta na sterownikach do wyliczania świąt
 Name:		php-pear-%{_pearname}
-Version:	0.19.1
+Version:	0.18.0
 Release:	1
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5:	9ffe33dce4a579853f6046c0bed62e6f
+# Source0-md5:	f59aa74f64c85136d1be8dd66a2e906f
 URL:		http://pear.php.net/package/Date_Holidays/
 BuildRequires:	php-pear-PEAR
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	php-pear
 Requires:	php-pear-Date
-Requires:	php-pear-Date-Holidays(driver)
 Requires:	php-pear-PEAR-core >= 1:1.3.1
 Requires:	php-pear-XML_Serializer
 BuildArch:	noarch
@@ -95,8 +94,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.31  2008-05-18 16:12:22  adamg
-- new
+Revision 1.32  2008-05-18 16:19:26  adamg
+- previous commit reverted (mistake)
 
 Revision 1.30  2008-05-02 23:04:28  adamg
 - updated to 0.18.0

================================================================
Index: SPECS/php-pear-PhpDocumentor.spec
diff -u SPECS/php-pear-PhpDocumentor.spec:1.34 SPECS/php-pear-PhpDocumentor.spec:1.35
--- SPECS/php-pear-PhpDocumentor.spec:1.34	Sun May 18 18:12:22 2008
+++ SPECS/php-pear-PhpDocumentor.spec	Sun May 18 18:19:26 2008
@@ -14,13 +14,13 @@
 Summary:	%{_pearname} - provides automatic documenting of PHP API directly from source
 Summary(pl.UTF-8):	%{_pearname} - automatyczne tworzenie dokumentacji API PHP prosto ze źródeł
 Name:		php-pear-%{_pearname}
-Version:	1.4.2
+Version:	1.4.0
 Release:	0.1
 Epoch:		0
 License:	PHP 3.00
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5:	778bea6edb876c70d906bec8c4490a0e
+# Source0-md5:	058cafda76f10a693cd33687fb2b9144
 Patch0:		%{name}-includes_fix.patch
 Patch1:		%{name}-smarty.patch
 Patch2:		%{name}-html_treemenu_includes_fix.patch
@@ -201,8 +201,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.34  2008-05-18 16:12:22  adamg
-- new
+Revision 1.35  2008-05-18 16:19:26  adamg
+- previous commit reverted (mistake)
 
 Revision 1.33  2007-09-26 20:32:06  adamg
 - release 0.1; needs some work

================================================================
Index: SPECS/pida.spec
diff -u SPECS/pida.spec:1.19 SPECS/pida.spec:1.20
--- SPECS/pida.spec:1.19	Sun May 18 18:12:22 2008
+++ SPECS/pida.spec	Sun May 18 18:19:26 2008
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	Szkielet do programowania zintegrowanego
 Name:		pida
 Version:	0.5.1
-Release:	0.1
+Release:	4
 License:	GPL
 Group:		Development/Tools
 Source0:	http://pida.googlecode.com/files/%{realname}-%{version}.tar.gz
@@ -122,6 +122,7 @@
 %lang(fr) %{py_sitedir}/pida/services/webbrowser/locale/fr_FR
 %lang(fr) %{py_sitedir}/pida/services/window/locale/fr_FR
 
+%{py_sitedir}/*-py2.5.egg-info
 %dir %{py_sitedir}/pida
 %attr(755,root,root) %{py_sitedir}/moo_stub.so
 %{py_sitedir}/pida/*.py[co]
@@ -241,8 +242,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.19  2008-05-18 16:12:22  adamg
-- new
+Revision 1.20  2008-05-18 16:19:26  adamg
+- previous commit reverted (mistake)
 
 Revision 1.18  2008-01-08 16:35:19  glen
 - missing dir :)

================================================================
Index: SPECS/python-kiwi.spec
diff -u SPECS/python-kiwi.spec:1.7 SPECS/python-kiwi.spec:1.8
--- SPECS/python-kiwi.spec:1.7	Sun May 18 18:12:22 2008
+++ SPECS/python-kiwi.spec	Sun May 18 18:19:26 2008
@@ -73,7 +73,7 @@
 sed -i -e 's|share/doc/kiwi|share/doc/%{name}-%{version}|' setup.py
 
 %build
-CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags} -L/usr/X11R6/lib" %{__python} setup.py build
+CFLAGS="%{rpmcflags}" %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -102,7 +102,8 @@
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/kiwi
-%{py_sitedir}/kiwi
+%{py_sitescriptdir}/kiwi
+%{py_sitescriptdir}/kiwi-*.egg-info
 
 %files gazpacho
 %defattr(644,root,root,755)
@@ -120,8 +121,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.7  2008-05-18 16:12:22  adamg
-- new
+Revision 1.8  2008-05-18 16:19:26  adamg
+- previous commit reverted (mistake)
 
 Revision 1.6  2007-11-17 09:44:04  qboosh
 - more python deps
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/antargis.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/archivemail.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ekg.spec?r1=1.218&r2=1.219&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gpm.spec?r1=1.146&r2=1.147&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kpogre.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lyx.spec?r1=1.124&r2=1.125&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openttd.spec?r1=1.48&r2=1.49&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php-pear-Date_Holidays.spec?r1=1.31&r2=1.32&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php-pear-PhpDocumentor.spec?r1=1.34&r2=1.35&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pida.spec?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/python-kiwi.spec?r1=1.7&r2=1.8&f=u